fix: Report billing attachment errors

test/local/tools.test.js

@@ -64,7 +64,7 @@ describe('registerTools', () => {
   });
 
   describe('create_project', () => {
-    it('should create a project with a provided id', async () => {
+    it('should return a simple success message when billing is attached', async () => {
       const server = {
         registerTool: mock.fn(),
       };
@@ -73,8 +73,8 @@ describe('registerTools', () => {
         '../../lib/gcp-projects.js': {
           createProjectAndAttachBilling: (projectId) =>
             Promise.resolve({
-              projectId: projectId,
-              billingMessage: 'billing message',
+              projectId: 'my-project',
+              billingMessage: 'Successfully attached billing.',
             }),
         },
       });
@@ -96,7 +96,7 @@ describe('registerTools', () => {
       });
     });
 
-    it('should create a project with a generated id', async () => {
+    it('should return the full warning message when billing fails', async () => {
       const server = {
         registerTool: mock.fn(),
       };
@@ -106,7 +106,7 @@ describe('registerTools', () => {
           createProjectAndAttachBilling: () =>
             Promise.resolve({
               projectId: 'generated-project',
-              billingMessage: 'billing message',
+              billingMessage: 'Project created. No billing accounts found.',
             }),
         },
       });
@@ -122,7 +122,7 @@ describe('registerTools', () => {
         content: [
           {
             type: 'text',
-            text: 'Successfully created GCP project with ID "generated-project". You can now use this project ID for deployments.',
+            text: 'Project created. No billing accounts found.',
           },
         ],
       });

test/need-gcp/gcp-projects.test.js

@@ -61,7 +61,18 @@ async function main() {
         `Successfully created project: ${newProjectResult.projectId}`
       );
       console.log(newProjectResult.billingMessage);
-      console.log('\nProject creation test completed successfully.');
+
+      if (newProjectResult.billingMessage.includes('No billing accounts found')) {
+        console.log(
+          '\nTest passed: Correctly received the billing warning message.'
+        );
+        process.exit(0);
+      } else {
+        console.error(
+          '\nTest failed: Did not receive the expected billing warning message.'
+        );
+        process.exit(1);
+      }
     } else {
       console.error(
         'Failed to create a new project or retrieve project details.'

tools.js

@@ -123,14 +123,25 @@ export const registerTools = (
       }
       try {
         const result = await createProjectAndAttachBilling(projectId);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Successfully created GCP project with ID "${result.projectId}". You can now use this project ID for deployments.`,
-            },
-          ],
-        };
+        if (result.billingMessage.includes('Successfully')) {
+          return {
+            content: [
+              {
+                type: 'text',
+                text: `Successfully created GCP project with ID "${result.projectId}". You can now use this project ID for deployments.`,
+              },
+            ],
+          };
+        } else {
+          return {
+            content: [
+              {
+                type: 'text',
+                text: result.billingMessage,
+              },
+            ],
+          };
+        }
       } catch (error) {
         return {
           content: [