feat: use acp for desktop chat prompt (feature toggle off)

crates/goose/src/acp/server.rs

@@ -2356,22 +2356,14 @@ impl GooseAcpAgent {
 
         let run_id = format!("run_{}", Uuid::new_v4());
         let cancel_token = CancellationToken::new();
+        let agent = self.get_session_agent(&session_id, None).await?;
         self.start_active_run(&session_id, run_id.clone(), cancel_token.clone())
             .await?;
         if let Err(error) = Self::send_active_run_update(cx, &args.session_id, Some(&run_id)) {
             self.clear_active_run(&session_id, &run_id).await;
             return Err(error);
         }
 
-        let agent = match self.get_session_agent(&session_id, None).await {
-            Ok(agent) => agent,
-            Err(error) => {
-                self.clear_active_run(&session_id, &run_id).await;
-                let _ = Self::send_active_run_update(cx, &args.session_id, None);
-                return Err(error);
-            }
-        };
-
         let user_message = Self::convert_acp_prompt_to_message(&args.prompt);
 
         let message_text = user_message.as_concat_text();

ui/desktop/src/acp/__tests__/errors.test.ts

@@ -0,0 +1,48 @@
+import { describe, expect, it } from 'vitest';
+import { parseAcpCreditsExhaustedError } from '../errors';
+
+describe('parseAcpCreditsExhaustedError', () => {
+  it('parses structured ACP credits exhausted errors', () => {
+    expect(
+      parseAcpCreditsExhaustedError({
+        code: -32603,
+        message: 'Please add credits to your account, then resend your message to continue.',
+        data: {
+          reason: 'credits_exhausted',
+          url: 'https://router.tetrate.ai/billing',
+        },
+      })
+    ).toEqual({
+      message: 'Please add credits to your account, then resend your message to continue.',
+      url: 'https://router.tetrate.ai/billing',
+    });
+  });
+
+  it('parses wrapped JSON-RPC errors', () => {
+    expect(
+      parseAcpCreditsExhaustedError({
+        error: {
+          code: -32603,
+          message: 'Add credits to continue.',
+          data: {
+            reason: 'credits_exhausted',
+          },
+        },
+      })
+    ).toEqual({
+      message: 'Add credits to continue.',
+    });
+  });
+
+  it('ignores non-credits-exhausted errors', () => {
+    expect(
+      parseAcpCreditsExhaustedError({
+        code: -32603,
+        message: 'Something failed.',
+        data: {
+          reason: 'provider_error',
+        },
+      })
+    ).toBeNull();
+  });
+});

ui/desktop/src/acp/__tests__/prompt.test.ts

@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest';
+import type { Message } from '../../api';
+import { messageToAcpPromptContent } from '../prompt';
+
+describe('messageToAcpPromptContent', () => {
+  it('converts text and image content into ACP prompt blocks', () => {
+    const message: Message = {
+      id: 'message-1',
+      role: 'user',
+      created: 123,
+      content: [
+        { type: 'text', text: 'Describe this' },
+        { type: 'image', data: 'abc123', mimeType: 'image/png' },
+      ],
+      metadata: { userVisible: true, agentVisible: true },
+    };
+
+    expect(messageToAcpPromptContent(message)).toEqual([
+      { type: 'text', text: 'Describe this' },
+      { type: 'image', data: 'abc123', mimeType: 'image/png' },
+    ]);
+  });
+
+  it('omits empty text content and unsupported content blocks', () => {
+    const message: Message = {
+      id: 'message-1',
+      role: 'user',
+      created: 123,
+      content: [
+        { type: 'text', text: '   ' },
+        {
+          type: 'toolResponse',
+          id: 'tool-1',
+          toolResult: { status: 'success', value: [] },
+        },
+      ],
+      metadata: { userVisible: true, agentVisible: true },
+    } as Message;
+
+    expect(messageToAcpPromptContent(message)).toEqual([]);
+  });
+});