macro-agent 0.0.15 → 0.0.17

package/src/acp/types.ts

@@ -630,10 +630,44 @@ export interface ResumeAgentResponse {
   /** The resumed agent's ID */
   agentId: AgentId;
 
-  /** The agent's session ID */
+  /** The agent's session ID (from resume) */
   sessionId: string;
 }
 
+// ─────────────────────────────────────────────────────────────────
+// History Extension Types
+// ─────────────────────────────────────────────────────────────────
+
+/**
+ * A historical turn in a session conversation
+ */
+export interface HistoryTurn {
+  /** Turn role */
+  role: "user" | "assistant";
+  /** Timestamp of the turn */
+  timestamp: number;
+  /** Turn content — plain text for user, structured parts for assistant */
+  content: unknown;
+}
+
+/**
+ * Request for _macro/getHistory extension
+ */
+export interface GetHistoryRequest {
+  /** ACP session ID to get history for */
+  sessionId: string;
+  /** Maximum number of turns to return */
+  limit?: number;
+}
+
+/**
+ * Response for _macro/getHistory extension
+ */
+export interface GetHistoryResponse {
+  /** Conversation turns in chronological order */
+  turns: HistoryTurn[];
+}
+
 // ─────────────────────────────────────────────────────────────────
 // Extension Method Types (Union)
 // ─────────────────────────────────────────────────────────────────
@@ -657,7 +691,8 @@ export type ACPExtensionMethod =
   | "_macro/checkCapability"
   | "_macro/respondToPermission"
   | "_macro/cancelPermission"
-  | "_macro/resume";
+  | "_macro/resume"
+  | "_macro/getHistory";
 
 /**
  * Map of extension methods to their request types
@@ -679,6 +714,7 @@ export interface ACPExtensionRequests {
   "_macro/respondToPermission": RespondToPermissionRequest;
   "_macro/cancelPermission": CancelPermissionRequest;
   "_macro/resume": ResumeAgentRequest;
+  "_macro/getHistory": GetHistoryRequest;
 }
 
 /**
@@ -701,6 +737,7 @@ export interface ACPExtensionResponses {
   "_macro/respondToPermission": RespondToPermissionResponse;
   "_macro/cancelPermission": CancelPermissionResponse;
   "_macro/resume": ResumeAgentResponse;
+  "_macro/getHistory": GetHistoryResponse;
 }
 
 // ─────────────────────────────────────────────────────────────────

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,
       },
     });