macro-agent 0.0.16 → 0.0.17

package/references/claude-code-acp/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@sudocode-ai/claude-code-acp",
-  "version": "0.13.8",
+  "version": "0.13.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sudocode-ai/claude-code-acp",
-      "version": "0.13.8",
+      "version": "0.13.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "0.13.1",

package/references/claude-code-acp/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.13.8",
+  "version": "0.13.9",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",

package/references/claude-code-acp/src/acp-agent.ts

@@ -1635,7 +1635,7 @@ export class ClaudeAcpAgent implements Agent {
 
     // Fetch commands and models in the background to avoid blocking session creation.
     // These calls wait for the Claude Code subprocess to initialize, which can be slow.
-    // Results are sent via sessionUpdate notifications when ready.
+    // Results are sent via sessionUpdate; models via extension notification (_model_state_update).
     void (async () => {
       try {
         const [availableCommands, models] = await Promise.all([
@@ -1649,12 +1649,9 @@ export class ClaudeAcpAgent implements Agent {
             availableCommands,
           },
         });
-        this.client.sessionUpdate({
+        this.client.extNotification("_model_state_update", {
           sessionId,
-          update: {
-            sessionUpdate: "model_state_update",
-            models,
-          },
+          models,
         });
       } catch (e) {
         this.logger.error("Failed to fetch session metadata:", e);

package/src/agent/__tests__/agent-manager.test.ts

@@ -720,7 +720,7 @@ describe("AgentManager Integration (with mocked acp-factory)", () => {
       );
     });
 
-    it("should fall back to session_id if provider_session_id is not set", async () => {
+    it("should create new session if provider_session_id is not set", async () => {
       // Create agent directly without provider_session_id
       const agentId = "agent_no_provider";
       const sessionId = "session_no_provider";
@@ -744,11 +744,9 @@ describe("AgentManager Integration (with mocked acp-factory)", () => {
 
       await agentManager.resume(agentId);
 
-      // Should fall back to the macro-agent session_id
-      expect(mockHandle.loadSession).toHaveBeenCalledWith(
-        sessionId,
-        "/tmp",
-      );
+      // Should create a new session instead of loading with invalid macro-agent session_id
+      expect(mockHandle.createSession).toHaveBeenCalledWith("/tmp");
+      expect(mockHandle.loadSession).not.toHaveBeenCalled();
     });
   });
 

package/src/agent/agent-manager.ts

@@ -901,16 +901,34 @@ export function createAgentManager(
       );
     }
 
-    // Spawn new process and load existing session
+    // Spawn new process
     const handle = await AgentFactory.spawn(defaultAgentType, {
       permissionMode: defaultPermissionMode,
     });
 
-    // Load the existing session using the provider's session ID (e.g., Claude Code UUID)
-    // Falls back to macro-agent session_id for backwards compatibility
-    const loadSessionId = agent.provider_session_id ?? agent.session_id;
     const agentCwd = agent.cwd ?? defaultCwd;
-    const session = await handle.loadSession(loadSessionId, agentCwd);
+    let session;
+
+    if (agent.provider_session_id) {
+      // Load existing session using the provider's session ID (e.g., Claude Code UUID)
+      session = await handle.loadSession(agent.provider_session_id, agentCwd);
+    } else {
+      // No provider session ID available (agent predates this feature or wasn't persisted).
+      // Create a new session instead of loading with the macro-agent session_id
+      // which is not a valid provider session ID (e.g., Claude Code expects UUIDs).
+      session = await handle.createSession(agentCwd);
+
+      // Store the provider session ID for future resumes
+      eventStore.emit({
+        type: "status",
+        source: { agent_id: agentId },
+        payload: {
+          status_type: "started",
+          summary: "Agent session created (no provider session to resume)",
+          provider_session_id: session.id,
+        },
+      });
+    }
 
     // Track active session
     const activeSession: ActiveSession = {
@@ -929,6 +947,7 @@ export function createAgentManager(
       payload: {
         status_type: "started",
         summary: "Agent session resumed",
+        provider_session_id: session.id,
       },
     });