macro-agent 0.1.5 → 0.1.7

package/dist/map/trajectory-reporter.js

@@ -2,153 +2,39 @@
  * Trajectory Reporter — builds and reports trajectory checkpoints to the MAP hub.
  *
  * Sends checkpoints via the `trajectory/checkpoint` JSON-RPC extension.
- * Handles inbound `trajectory/content.request` notifications by serving
- * session transcripts via sessionlog's SessionStore and CheckpointStore.
- * Supports all agent types (Claude Code, Codex, Gemini, etc.) through
- * sessionlog's adapter system.
+ * Also handles inbound `trajectory/content.request` notifications by serving
+ * session transcript data.
  *
  * @module map/trajectory-reporter
  */
-/**
- * Resolve transcript content for a checkpoint ID using sessionlog.
- *
- * Two-source strategy (matching cc-swarm):
- * 1. Live session — use sessionlog's SessionStore to find a session
- *    matching the checkpoint ID, then read its transcript from disk.
- * 2. Committed checkpoint — use sessionlog's CheckpointStore to read
- *    content from the git history.
- *
- * Returns null if no content is found or sessionlog is unavailable.
- */
-async function resolveContent(checkpointId, sessionDirs) {
-    let sessionlog = null;
-    try {
-        sessionlog = await import("sessionlog");
-    }
-    catch {
-        return null; // sessionlog not available
-    }
-    const { readFileSync, existsSync } = await import("node:fs");
-    // Derive the session ID from checkpoint ID (e.g., "sess-abc-step3" → "sess-abc")
-    const sessionId = checkpointId.replace(/-step\d+$/, "");
-    // ── 1. Live session lookup via SessionStore ────────────────────────────
-    for (const sessionsDir of sessionDirs) {
-        if (!existsSync(sessionsDir))
-            continue;
-        try {
-            const store = sessionlog.createSessionStore(undefined, sessionsDir);
-            // Try loading by derived session ID first, then by raw checkpoint ID
-            let state = await store.load(sessionId);
-            if (!state)
-                state = await store.load(checkpointId);
-            // If not found by ID, scan all sessions for checkpoint match
-            if (!state) {
-                const allSessions = await store.list();
-                state = allSessions.find((s) => s.lastCheckpointID === checkpointId ||
-                    (s.turnCheckpointIDs || []).includes(checkpointId)) ?? null;
-            }
-            if (!state?.transcriptPath || !existsSync(state.transcriptPath))
-                continue;
-            const transcript = readFileSync(state.transcriptPath, "utf-8");
-            // Use sessionlog's prompt extraction if the agent has a TranscriptAnalyzer,
-            // otherwise fall back to the prompts stored in state
-            let prompts = "";
-            if (state.firstPrompt) {
-                // Collect from promptAttributions if available, otherwise use firstPrompt
-                const attrs = state.promptAttributions;
-                if (attrs && attrs.length > 0) {
-                    prompts = attrs.map((a) => a.prompt).join("\n---\n");
-                }
-                else {
-                    prompts = state.firstPrompt;
-                }
-            }
-            return {
-                transcript,
-                prompts,
-                metadata: {
-                    sessionID: state.sessionID,
-                    phase: state.phase,
-                    agentType: state.agentType,
-                    stepCount: state.stepCount || 0,
-                    filesTouched: state.filesTouched || [],
-                    tokenUsage: state.tokenUsage || {},
-                    startedAt: state.startedAt,
-                    endedAt: state.endedAt,
-                    source: "live",
-                },
-                context: `Session ${state.sessionID} (${state.phase})`,
-            };
-        }
-        catch {
-            continue;
-        }
-    }
-    // ── 2. Committed checkpoint via CheckpointStore ────────────────────────
-    try {
-        if (sessionlog.createCheckpointStore) {
-            const store = sessionlog.createCheckpointStore();
-            const content = await store.readSessionContent(checkpointId, 0);
-            if (content) {
-                return {
-                    transcript: content.transcript,
-                    prompts: content.prompts,
-                    metadata: { ...content.metadata, source: "committed" },
-                    context: content.context,
-                };
-            }
-        }
-    }
-    catch {
-        // Checkpoint not found or store unavailable
-    }
-    return null;
-}
 /**
  * Create a trajectory reporter that sends checkpoints to the MAP hub
- * and serves session transcript content on demand via sessionlog.
+ * and serves content on demand.
  */
 export function createTrajectoryReporter(connection, config) {
     // Cache the resource_id from the first checkpoint response
     // so subsequent calls reuse it (avoids creating duplicate session resources)
     let cachedResourceId;
-    // Build session directory search list
-    const defaultDirs = [];
-    try {
-        const cwd = process.cwd();
-        defaultDirs.push(`${cwd}/.git/sessionlog-sessions`, `${cwd}/.swarm/sessionlog/sessions`);
-    }
-    catch {
-        // Can't resolve paths — will use config dirs only
-    }
-    const sessionDirs = [...(config.sessionDirs ?? []), ...defaultDirs];
     // Handler for inbound content requests
     const contentHandler = async (params) => {
         const req = params;
         if (!req?.request_id)
             return;
         try {
-            const content = await resolveContent(req.checkpoint_id, sessionDirs);
-            if (content) {
-                await connection.sendNotification("trajectory/content.response", {
-                    request_id: req.request_id,
-                    transcript: content.transcript,
-                    metadata: content.metadata,
-                    prompts: content.prompts,
-                    context: content.context,
-                });
-            }
-            else {
-                await connection.sendNotification("trajectory/content.response", {
-                    request_id: req.request_id,
-                    transcript: "",
-                    metadata: { source: "macro-agent" },
-                    prompts: "",
-                    context: "",
-                });
-            }
+            // Respond with what we have — macro-agent doesn't store full transcripts
+            // like sessionlog does, so we send a minimal response.
+            // Future: integrate with ACP session history for richer content.
+            await connection.sendNotification("trajectory/content.response", {
+                request_id: req.request_id,
+                transcript: null,
+                metadata: {
+                    source: "macro-agent",
+                    note: "Full transcript serving not yet implemented",
+                },
+            });
         }
         catch {
+            // Best effort
             try {
                 await connection.sendNotification("trajectory/content.response", {
                     request_id: req.request_id,

package/dist/map/trajectory-reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"trajectory-reporter.js","sourceRoot":"","sources":["../../src/map/trajectory-reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trajectory-reporter.js","sourceRoot":"","sources":["../../src/map/trajectory-reporter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4BH;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAAgC,EAChC,MAAqD;IAErD,2DAA2D;IAC3D,6EAA6E;IAC7E,IAAI,gBAAoC,CAAC;IAEzC,uCAAuC;IACvC,MAAM,cAAc,GAAG,KAAK,EAAE,MAAe,EAAiB,EAAE;QAC9D,MAAM,GAAG,GAAG,MAAkC,CAAC;QAC/C,IAAI,CAAC,GAAG,EAAE,UAAU;YAAE,OAAO;QAE7B,IAAI,CAAC;YACH,yEAAyE;YACzE,uDAAuD;YACvD,iEAAiE;YACjE,MAAM,UAAU,CAAC,gBAAgB,CAAC,6BAA6B,EAAE;gBAC/D,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE;oBACR,MAAM,EAAE,aAAa;oBACrB,IAAI,EAAE,6CAA6C;iBACpD;aACF,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,cAAc;YACd,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,gBAAgB,CAAC,6BAA6B,EAAE;oBAC/D,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,KAAK,EAAE,wBAAwB;iBAChC,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,oCAAoC;YACtC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,mCAAmC;IACnC,UAAU,CAAC,cAAc,CAAC,4BAA4B,EAAE,cAAc,CAAC,CAAC;IAExE,OAAO;QACL,KAAK,CAAC,gBAAgB,CACpB,UAAuC;YAEvC,IAAI,CAAC,UAAU,CAAC,WAAW;gBAAE,OAAO,IAAI,CAAC;YACzC,IAAI,MAAM,CAAC,mBAAmB,KAAK,KAAK;gBAAE,OAAO,IAAI,CAAC;YAEtD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,aAAa,CAG3C,uBAAuB,EAAE;oBACzB,UAAU;oBACV,WAAW,EAAE,gBAAgB;iBAC9B,CAAC,CAAC;gBAEH,6CAA6C;gBAC7C,IAAI,MAAM,EAAE,WAAW,EAAE,CAAC;oBACxB,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC;gBACxC,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,kDAAkD;gBAClD,IAAI,CAAC;oBACH,MAAM,UAAU,CAAC,gBAAgB,CAAC,uBAAuB,EAAE;wBACzD,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACP,6CAA6C;gBAC/C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI;YACF,UAAU,CAAC,eAAe,CACxB,4BAA4B,EAC5B,cAAc,CACf,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/map/types.d.ts

@@ -23,6 +23,8 @@ export interface MAPSidecarConfig {
     credential?: string;
     /** Agent name for MAP registration (default: "macro-agent-sidecar") */
     agentName?: string;
+    /** Swarm ID for stable identity across reconnections */
+    swarmId?: string;
     /** Trajectory sync level */
     trajectorySyncLevel?: "off" | "lifecycle" | "metrics" | "full";
     /** Mesh transport (agentic-mesh P2P) */
@@ -103,6 +105,43 @@ export interface TrajectoryContentRequest {
     request_id: string;
     checkpoint_id: string;
 }
+/** Inbound task assignment from hub */
+export interface CoordinationTaskAssign {
+    title: string;
+    description?: string;
+    assigned_to?: string;
+    assigned_by: string;
+    priority?: string;
+    context?: Record<string, unknown>;
+    deadline?: string;
+}
+/** Inbound task status update from hub */
+export interface CoordinationTaskStatus {
+    task_id: string;
+    status: string;
+    progress?: number;
+    result?: unknown;
+    error?: string;
+}
+/** Inbound context share from hub */
+export interface CoordinationContextShare {
+    hive_id?: string;
+    source_swarm_id: string;
+    context_type: string;
+    data: unknown;
+    target_swarm_ids?: string[];
+    ttl_seconds?: number;
+}
+/** Inbound message from hub */
+export interface CoordinationMessage {
+    hive_id?: string;
+    from_swarm_id: string;
+    to_swarm_id: string;
+    content_type: string;
+    content: unknown;
+    reply_to?: string;
+    metadata?: Record<string, unknown>;
+}
 /** Task bridge interface for emitting task events to MAP */
 export interface TaskBridge {
     taskCreated(task: {

package/dist/map/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMvE,MAAM,WAAW,gBAAgB;IAC/B,sFAAsF;IACtF,MAAM,EAAE,MAAM,CAAC;IAEf,6DAA6D;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,4BAA4B;IAC5B,mBAAmB,CAAC,EAAE,KAAK,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;IAE/D,wCAAwC;IACxC,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF,wCAAwC;IACxC,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF,+EAA+E;IAC/E,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,iDAAiD;IACjD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,kDAAkD;IAClD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,8CAA8C;IAC9C,gBAAgB,CACd,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;CAC/C;AAMD;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8CAA8C;IAC9C,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,wCAAwC;IACxC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yDAAyD;IACzD,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,0BAA0B;IAC1B,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;CACH;AAED,yDAAyD;AACzD,MAAM,WAAW,0BAA0B;IACzC,EAAE,EAAE,OAAO,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,2CAA2C;AAC3C,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAMD,uCAAuC;AACvC,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,+BAA+B;AAC/B,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAMD,4DAA4D;AAC5D,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,IAAI,EAAE;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,CACd,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;IAC9C,IAAI,IAAI,IAAI,CAAC;CACd;AAMD,wEAAwE;AACxE,MAAM,WAAW,eAAe;IAC9B,oDAAoD;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,uBAAuB;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,sBAAsB;IACtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,4BAA4B;IAC5B,MAAM,IAAI,MAAM,CAAC;IACjB,uCAAuC;IACvC,kBAAkB,IAAI,MAAM,CAAC;CAC9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macro-agent",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Interact with multiple agents as if they were a single agent.",
   "type": "module",
   "main": "dist/index.js",
@@ -49,11 +49,10 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",
-    "@multi-agent-protocol/sdk": "^0.1.8",
+    "@multi-agent-protocol/sdk": "^0.1.11",
     "@sudocode-ai/claude-code-acp": "^0.13.9",
     "acp-factory": "^0.1.12",
     "agent-inbox": "^0.1.8",
-    "agent-workspace": "^0.1.5",
     "better-sqlite3": "^12.5.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",

package/src/__tests__/e2e/cognitive-workspace.e2e.test.ts

@@ -149,7 +149,7 @@ describe("Cognitive Workspace E2E", () => {
       expect(sentMessages.length).toBe(1);
       const result = sentMessages[0] as any;
       expect(result.jsonrpc).toBe("2.0");
-      expect(result.method).toBe("x-workspace/task.result");
+      expect(result.method).toBe("x-openhive/learning.workspace.result");
       expect(result.params.request_id).toBe("e2e-001");
       expect(result.params.duration_ms).toBeGreaterThanOrEqual(0);
       // Success or failure depends on whether mocked agent wrote output

package/src/acp/macro-agent.ts

@@ -414,11 +414,8 @@ export function createMacroAgent(
       params: NewSessionRequest,
     ): Promise<NewSessionResponse> {
       const cwd = params.cwd ?? defaultCwd;
-
       // Get or create a head manager for this workspace
-      const headManager = await agentManager.getOrCreateHeadManager({
-        cwd,
-      });
+      const headManager = await agentManager.getOrCreateHeadManager({ cwd });
 
       // Create session mapping
       const mapping = sessionMapper.createMapping(

package/src/boot-v2.ts

@@ -110,6 +110,7 @@ export interface BootV2Config {
     systemId?: string;
     credential?: string;
     agentName?: string;
+    swarmId?: string;
     trajectorySyncLevel?: "off" | "lifecycle" | "metrics" | "full";
     reconnectIntervalMs?: number;
     reconnection?: {
@@ -476,6 +477,7 @@ export async function bootV2(
           systemId: config.map.systemId,
           credential: config.map.credential,
           agentName: config.map.agentName,
+          swarmId: config.map.swarmId,
           trajectorySyncLevel: config.map.trajectorySyncLevel,
           reconnectIntervalMs: config.map.reconnectIntervalMs,
           reconnection: config.map.reconnection,

package/src/cognitive/__tests__/workspace-handler.test.ts

@@ -52,15 +52,7 @@ function createMockBackend(session?: CognitiveAgentSession): MacroAgentBackend {
 }
 
 describe("isWorkspaceExecuteMessage", () => {
-  it("should return true for x-workspace/task.execute", () => {
-    expect(
-      isWorkspaceExecuteMessage({
-        method: "x-workspace/task.execute",
-      }),
-    ).toBe(true);
-  });
-
-  it("should return true for legacy x-openhive/learning.workspace.execute", () => {
+  it("should return true for workspace.execute messages", () => {
     expect(
       isWorkspaceExecuteMessage({
         method: "x-openhive/learning.workspace.execute",
@@ -119,7 +111,7 @@ describe("handleWorkspaceExecute", () => {
     expect(sentMessages.length).toBe(1);
     const result = sentMessages[0] as any;
     expect(result.jsonrpc).toBe("2.0");
-    expect(result.method).toBe("x-workspace/task.result");
+    expect(result.method).toBe("x-openhive/learning.workspace.result");
     expect(result.params.request_id).toBe("req-001");
     expect(result.params.success).toBe(true);
     expect(result.params.duration_ms).toBeGreaterThanOrEqual(0);

package/src/cognitive/workspace-handler.ts

@@ -1,22 +1,20 @@
 /**
  * Workspace Execution Handler
  *
- * Bridge between workspace task execution MAP messages and
+ * Bridge between OpenHive's workspace.execute MAP messages and
  * macro-agent's MacroAgentBackend. Receives workspace tasks from
- * a hub, spawns analyst agents, and sends results back.
+ * OpenHive, spawns analyst agents, and sends results back.
  *
  * Registered as a MAP notification handler on the swarm's inbound
- * WebSocket connection to the hub.
+ * WebSocket connection to the OpenHive hub.
  *
- * Protocol (defined by agent-workspace):
- *   Hub → Swarm: x-workspace/task.execute
+ * Protocol:
+ *   Hive → Swarm: x-openhive/learning.workspace.execute
  *     { request_id, prompt, cwd, system_context, timeout }
- *   Swarm → Hub: x-workspace/task.result
+ *   Swarm → Hive: x-openhive/learning.workspace.result
  *     { request_id, success, output, structured, duration_ms }
  */
 
-import { WORKSPACE_METHODS, WORKSPACE_METHODS_LEGACY } from "agent-workspace";
-import type { WorkspaceExecuteParams, WorkspaceResultParams } from "agent-workspace";
 import type { MacroAgentBackend } from "./macro-agent-backend.js";
 import type { CognitiveAgentSpawnConfig } from "./types.js";
 
@@ -26,8 +24,13 @@ export interface WorkspaceHandlerDeps {
   sendToHub: (message: object) => void;
 }
 
-// Re-export the protocol type for consumers
-export type { WorkspaceExecuteParams } from "agent-workspace";
+export interface WorkspaceExecuteParams {
+  request_id: string;
+  prompt: string;
+  cwd: string;
+  system_context?: string;
+  timeout?: number;
+}
 
 /**
  * Handle an incoming workspace.execute request from OpenHive.
@@ -76,7 +79,7 @@ export async function handleWorkspaceExecute(
       await backend.terminate(session.id).catch(() => {});
       sendToHub({
         jsonrpc: "2.0",
-        method: WORKSPACE_METHODS.RESULT,
+        method: "x-openhive/learning.workspace.result",
         params: {
           request_id,
           success: false,
@@ -125,7 +128,7 @@ export async function handleWorkspaceExecute(
 
     sendToHub({
       jsonrpc: "2.0",
-      method: WORKSPACE_METHODS.RESULT,
+      method: "x-openhive/learning.workspace.result",
       params: {
         request_id,
         success: finalSession.state === "completed",
@@ -138,7 +141,7 @@ export async function handleWorkspaceExecute(
   } catch (err) {
     sendToHub({
       jsonrpc: "2.0",
-      method: WORKSPACE_METHODS.RESULT,
+      method: "x-openhive/learning.workspace.result",
       params: {
         request_id,
         success: false,
@@ -155,6 +158,6 @@ export async function handleWorkspaceExecute(
  */
 export function isWorkspaceExecuteMessage(
   msg: { method?: string },
-): boolean {
-  return msg.method === WORKSPACE_METHODS.EXECUTE || msg.method === WORKSPACE_METHODS_LEGACY.EXECUTE;
+): msg is { method: "x-openhive/learning.workspace.execute"; params: WorkspaceExecuteParams } {
+  return msg.method === "x-openhive/learning.workspace.execute";
 }