agentgui 1.0.60 → 1.0.62

package/acp-launcher.js

@@ -1,14 +1,27 @@
 import { query } from '@anthropic-ai/claude-code';
-import { default as SYSTEM_PROMPT } from './system-prompt.js';
 
+/**
+ * ACPConnection - Uses @anthropic-ai/claude-code SDK directly
+ *
+ * This uses the real Claude Code SDK which handles:
+ * - Plugin execution with real system prompt
+ * - Actual filesystem operations
+ * - Streaming responses with onUpdate callbacks
+ * - No subprocess spawning needed (SDK handles it)
+ */
 export default class ACPConnection {
   constructor() {
     this.sessionId = null;
     this.onUpdate = null;
+    this.cwd = process.cwd();
   }
 
   async connect(agentType, cwd) {
-    console.log(`[ACP] Using Claude Code SDK (${agentType})`);
+    console.log(`[ACP] Using @anthropic-ai/claude-code SDK (${agentType})`);
+    if (cwd) {
+      this.cwd = cwd;
+    }
+    return { connected: true };
   }
 
   async initialize() {
@@ -17,6 +30,10 @@ export default class ACPConnection {
 
   async newSession(cwd) {
     this.sessionId = Math.random().toString(36).substring(7);
+    if (cwd) {
+      this.cwd = cwd;
+    }
+    console.log(`[ACP] Session ${this.sessionId} in ${this.cwd}`);
     return { sessionId: this.sessionId };
   }
 
@@ -29,49 +46,63 @@ export default class ACPConnection {
   }
 
   async injectSystemContext() {
-    return { context: SYSTEM_PROMPT };
+    return { context: 'Using Claude Code SDK with real plugins' };
   }
 
   async sendPrompt(prompt) {
-    let fullResponse = '';
+    const promptText = typeof prompt === 'string' ? prompt : prompt.map(p => p.text).join('\n');
 
     try {
-      const promptText = typeof prompt === 'string' ? prompt : prompt.map(p => p.text).join('\n');
-      const systemMessage = `${SYSTEM_PROMPT}\n\nUser Request: ${promptText}`;
-
-      const response = query({
-        prompt: systemMessage,
-        options: {}
+      console.log(`[ACP] Sending prompt (${promptText.length} chars) in ${this.cwd}`);
+
+      // Use the SDK directly to execute the prompt
+      // The SDK handles plugins, system prompt, and all real execution
+      const session = await query({
+        prompt: promptText,
+        options: {
+          cwd: this.cwd
+        }
       });
 
-      // query() returns an async iterable
-      // Iterate through all messages and collect the response
-      for await (const message of response) {
-        // Try multiple content paths: direct .content or .message.content
-        let content = message.content || message.message?.content;
-
-        if (content && Array.isArray(content)) {
-          const textChunks = content.map(c => c.text || '').join('');
-          fullResponse += textChunks;
-
-          // Emit update for real-time display
-          if (this.onUpdate && textChunks) {
-            this.onUpdate({
-              update: {
-                sessionUpdate: 'agent_message_chunk',
-                content: { text: textChunks }
-              }
-            });
+      let fullResponse = '';
+
+      // Stream messages and collect the final result
+      for await (const message of session.sdkMessages) {
+        if (message.type === 'result') {
+          // Extract the actual result from the final message
+          if (message.result) {
+            fullResponse = String(message.result);
+            console.log(`[ACP] Got result: ${fullResponse.length} chars`);
+
+            // Emit update callback if provided
+            if (this.onUpdate && fullResponse) {
+              this.onUpdate({
+                update: {
+                  sessionUpdate: 'agent_message_chunk',
+                  content: { text: fullResponse }
+                }
+              });
+            }
           }
+
+          return {
+            content: fullResponse,
+            stopReason: 'end_turn',
+            result: fullResponse,
+            sessionId: this.sessionId,
+            usage: message.usage
+          };
         }
       }
 
-      // Fallback if nothing was collected
-      if (!fullResponse) {
-        fullResponse = 'No response from agent';
-      }
+      // Fallback if no result message found
+      return {
+        content: fullResponse,
+        stopReason: 'end_turn',
+        result: fullResponse,
+        sessionId: this.sessionId
+      };
 
-      return { content: fullResponse };
     } catch (err) {
       console.error(`[ACP] Query error: ${err.message}`);
       throw err;
@@ -79,10 +110,11 @@ export default class ACPConnection {
   }
 
   isRunning() {
-    return true;
+    return true; // SDK manages process lifecycle
   }
 
   async terminate() {
-    return;
+    console.log(`[ACP] Terminating session ${this.sessionId}`);
+    return { terminated: true };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -455,19 +455,16 @@ async function processMessage(conversationId, messageId, sessionId, content, age
         data: { promptSentTime: Date.now(), responseReceivedTime: Date.now() }
       });
 
-      console.log(`[processMessage] ACP returned: stopReason=${result?.stopReason}, streamUpdates=${streamHandler.getUpdateCount()}`);
-
-      // Agent sends HTML directly - no conversion needed
-      // Extract HTML code block from response
-      const responseText = fullText || result?.result || 'No response.';
-      const htmlMatch = responseText.match(/```html\n([\s\S]*?)\n```/);
-      const htmlContent = htmlMatch ? htmlMatch[1] : responseText;
-
-      const messageContent = {
-        text: htmlContent,
-        html: true,
-        streamUpdatesCount: streamHandler.getUpdateCount()
-      };
+       console.log(`[processMessage] ACP returned: stopReason=${result?.stopReason}, streamUpdates=${streamHandler.getUpdateCount()}`);
+
+       // Save agent's complete response as-is, without any processing
+       // The agent workflow must flow naturally - no HTML extraction or interference
+       const responseText = fullText || result?.result || 'No response.';
+
+       const messageContent = {
+         text: responseText,
+         streamUpdatesCount: streamHandler.getUpdateCount()
+       };
 
       // Save consolidated response to database
       const assistantMessage = queries.createMessage(conversationId, 'assistant', messageContent);