macro-agent 0.1.8 → 0.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CLAUDE.md +263 -33
- package/README.md +781 -131
- package/dist/acp/claude-code-replay.d.ts +11 -0
- package/dist/acp/claude-code-replay.d.ts.map +1 -0
- package/dist/acp/claude-code-replay.js +190 -0
- package/dist/acp/claude-code-replay.js.map +1 -0
- package/dist/acp/macro-agent.d.ts.map +1 -1
- package/dist/acp/macro-agent.js +192 -7
- package/dist/acp/macro-agent.js.map +1 -1
- package/dist/acp/types.d.ts +9 -0
- package/dist/acp/types.d.ts.map +1 -1
- package/dist/acp/types.js.map +1 -1
- package/dist/adapters/tasks-adapter.d.ts.map +1 -1
- package/dist/adapters/tasks-adapter.js +3 -0
- package/dist/adapters/tasks-adapter.js.map +1 -1
- package/dist/adapters/types.d.ts +1 -0
- package/dist/adapters/types.d.ts.map +1 -1
- package/dist/agent/agent-manager-v2.d.ts +21 -0
- package/dist/agent/agent-manager-v2.d.ts.map +1 -1
- package/dist/agent/agent-manager-v2.js +308 -54
- package/dist/agent/agent-manager-v2.js.map +1 -1
- package/dist/agent/agent-manager.d.ts +12 -0
- package/dist/agent/agent-manager.d.ts.map +1 -1
- package/dist/agent/agent-manager.js.map +1 -1
- package/dist/agent/agent-store.d.ts +10 -0
- package/dist/agent/agent-store.d.ts.map +1 -1
- package/dist/agent/agent-store.js +22 -0
- package/dist/agent/agent-store.js.map +1 -1
- package/dist/agent/types.d.ts +15 -2
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/boot-v2.d.ts +129 -1
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +359 -8
- package/dist/boot-v2.js.map +1 -1
- package/dist/cli/acp.js +4 -0
- package/dist/cli/acp.js.map +1 -1
- package/dist/cli/index.js +56 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cognitive/macro-agent-backend.d.ts.map +1 -1
- package/dist/cognitive/macro-agent-backend.js +40 -22
- package/dist/cognitive/macro-agent-backend.js.map +1 -1
- package/dist/integrations/skilltree.d.ts.map +1 -1
- package/dist/integrations/skilltree.js +1 -0
- package/dist/integrations/skilltree.js.map +1 -1
- package/dist/lifecycle/cascade.d.ts +25 -2
- package/dist/lifecycle/cascade.d.ts.map +1 -1
- package/dist/lifecycle/cascade.js +70 -2
- package/dist/lifecycle/cascade.js.map +1 -1
- package/dist/lifecycle/cleanup.d.ts +33 -2
- package/dist/lifecycle/cleanup.d.ts.map +1 -1
- package/dist/lifecycle/cleanup.js +28 -6
- package/dist/lifecycle/cleanup.js.map +1 -1
- package/dist/lifecycle/handlers-v2.d.ts +7 -0
- package/dist/lifecycle/handlers-v2.d.ts.map +1 -1
- package/dist/lifecycle/handlers-v2.js +28 -2
- package/dist/lifecycle/handlers-v2.js.map +1 -1
- package/dist/lifecycle/types.d.ts +11 -0
- package/dist/lifecycle/types.d.ts.map +1 -1
- package/dist/lifecycle/types.js.map +1 -1
- package/dist/map/acp-bridge.d.ts +9 -0
- package/dist/map/acp-bridge.d.ts.map +1 -1
- package/dist/map/acp-bridge.js +15 -2
- package/dist/map/acp-bridge.js.map +1 -1
- package/dist/map/cascade-action-handler.d.ts +24 -0
- package/dist/map/cascade-action-handler.d.ts.map +1 -0
- package/dist/map/cascade-action-handler.js +170 -0
- package/dist/map/cascade-action-handler.js.map +1 -0
- package/dist/map/cascade-bridge.d.ts +44 -0
- package/dist/map/cascade-bridge.d.ts.map +1 -0
- package/dist/map/cascade-bridge.js +294 -0
- package/dist/map/cascade-bridge.js.map +1 -0
- package/dist/map/coordination-handler.d.ts.map +1 -1
- package/dist/map/coordination-handler.js +12 -1
- package/dist/map/coordination-handler.js.map +1 -1
- package/dist/map/lifecycle-bridge.d.ts +1 -1
- package/dist/map/lifecycle-bridge.d.ts.map +1 -1
- package/dist/map/lifecycle-bridge.js +58 -23
- package/dist/map/lifecycle-bridge.js.map +1 -1
- package/dist/map/server.d.ts.map +1 -1
- package/dist/map/server.js +219 -7
- package/dist/map/server.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +49 -2
- package/dist/map/sidecar.js.map +1 -1
- package/dist/map/types.d.ts +22 -0
- package/dist/map/types.d.ts.map +1 -1
- package/dist/mcp/tools/done-v2.d.ts.map +1 -1
- package/dist/mcp/tools/done-v2.js +8 -0
- package/dist/mcp/tools/done-v2.js.map +1 -1
- package/dist/teams/team-manager-v2.d.ts.map +1 -1
- package/dist/teams/team-manager-v2.js +26 -0
- package/dist/teams/team-manager-v2.js.map +1 -1
- package/dist/teams/team-runtime-v2.d.ts.map +1 -1
- package/dist/teams/team-runtime-v2.js +16 -3
- package/dist/teams/team-runtime-v2.js.map +1 -1
- package/dist/workspace/config.d.ts +10 -10
- package/dist/workspace/config.d.ts.map +1 -1
- package/dist/workspace/config.js +4 -4
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/git-cascade-adapter.d.ts +510 -0
- package/dist/workspace/git-cascade-adapter.d.ts.map +1 -0
- package/dist/workspace/git-cascade-adapter.js +934 -0
- package/dist/workspace/git-cascade-adapter.js.map +1 -0
- package/dist/workspace/index.d.ts +3 -3
- package/dist/workspace/index.d.ts.map +1 -1
- package/dist/workspace/index.js +4 -4
- package/dist/workspace/index.js.map +1 -1
- package/dist/workspace/landing/direct-push.d.ts +20 -0
- package/dist/workspace/landing/direct-push.d.ts.map +1 -0
- package/dist/workspace/landing/direct-push.js +74 -0
- package/dist/workspace/landing/direct-push.js.map +1 -0
- package/dist/workspace/landing/index.d.ts +29 -0
- package/dist/workspace/landing/index.d.ts.map +1 -0
- package/dist/workspace/landing/index.js +37 -0
- package/dist/workspace/landing/index.js.map +1 -0
- package/dist/workspace/landing/merge-to-parent.d.ts +41 -0
- package/dist/workspace/landing/merge-to-parent.d.ts.map +1 -0
- package/dist/workspace/landing/merge-to-parent.js +186 -0
- package/dist/workspace/landing/merge-to-parent.js.map +1 -0
- package/dist/workspace/landing/optimistic-push.d.ts +16 -0
- package/dist/workspace/landing/optimistic-push.d.ts.map +1 -0
- package/dist/workspace/landing/optimistic-push.js +27 -0
- package/dist/workspace/landing/optimistic-push.js.map +1 -0
- package/dist/workspace/landing/queue-to-branch.d.ts +24 -0
- package/dist/workspace/landing/queue-to-branch.d.ts.map +1 -0
- package/dist/workspace/landing/queue-to-branch.js +79 -0
- package/dist/workspace/landing/queue-to-branch.js.map +1 -0
- package/dist/workspace/merge-queue/merge-queue.d.ts +10 -0
- package/dist/workspace/merge-queue/merge-queue.d.ts.map +1 -1
- package/dist/workspace/merge-queue/merge-queue.js +10 -0
- package/dist/workspace/merge-queue/merge-queue.js.map +1 -1
- package/dist/workspace/merge-queue/types.d.ts +16 -2
- package/dist/workspace/merge-queue/types.d.ts.map +1 -1
- package/dist/workspace/merge-queue/types.js +9 -0
- package/dist/workspace/merge-queue/types.js.map +1 -1
- package/dist/workspace/pool/types.d.ts +1 -0
- package/dist/workspace/pool/types.d.ts.map +1 -1
- package/dist/workspace/pool/worktree-pool.d.ts.map +1 -1
- package/dist/workspace/pool/worktree-pool.js +1 -0
- package/dist/workspace/pool/worktree-pool.js.map +1 -1
- package/dist/workspace/recovery/abandon.d.ts +15 -0
- package/dist/workspace/recovery/abandon.d.ts.map +1 -0
- package/dist/workspace/recovery/abandon.js +45 -0
- package/dist/workspace/recovery/abandon.js.map +1 -0
- package/dist/workspace/recovery/auto-resolve.d.ts +27 -0
- package/dist/workspace/recovery/auto-resolve.d.ts.map +1 -0
- package/dist/workspace/recovery/auto-resolve.js +99 -0
- package/dist/workspace/recovery/auto-resolve.js.map +1 -0
- package/dist/workspace/recovery/defer.d.ts +15 -0
- package/dist/workspace/recovery/defer.d.ts.map +1 -0
- package/dist/workspace/recovery/defer.js +16 -0
- package/dist/workspace/recovery/defer.js.map +1 -0
- package/dist/workspace/recovery/escalate.d.ts +16 -0
- package/dist/workspace/recovery/escalate.d.ts.map +1 -0
- package/dist/workspace/recovery/escalate.js +24 -0
- package/dist/workspace/recovery/escalate.js.map +1 -0
- package/dist/workspace/recovery/index.d.ts +32 -0
- package/dist/workspace/recovery/index.d.ts.map +1 -0
- package/dist/workspace/recovery/index.js +45 -0
- package/dist/workspace/recovery/index.js.map +1 -0
- package/dist/workspace/recovery/spawn-resolver.d.ts +45 -0
- package/dist/workspace/recovery/spawn-resolver.d.ts.map +1 -0
- package/dist/workspace/recovery/spawn-resolver.js +118 -0
- package/dist/workspace/recovery/spawn-resolver.js.map +1 -0
- package/dist/workspace/recovery/types.d.ts +63 -0
- package/dist/workspace/recovery/types.d.ts.map +1 -0
- package/dist/workspace/recovery/types.js +12 -0
- package/dist/workspace/recovery/types.js.map +1 -0
- package/dist/workspace/topology/index.d.ts +9 -0
- package/dist/workspace/topology/index.d.ts.map +1 -0
- package/dist/workspace/topology/index.js +8 -0
- package/dist/workspace/topology/index.js.map +1 -0
- package/dist/workspace/topology/no-workspace.d.ts +18 -0
- package/dist/workspace/topology/no-workspace.d.ts.map +1 -0
- package/dist/workspace/topology/no-workspace.js +25 -0
- package/dist/workspace/topology/no-workspace.js.map +1 -0
- package/dist/workspace/topology/types.d.ts +97 -0
- package/dist/workspace/topology/types.d.ts.map +1 -0
- package/dist/workspace/topology/types.js +20 -0
- package/dist/workspace/topology/types.js.map +1 -0
- package/dist/workspace/topology/yaml-driven.d.ts +69 -0
- package/dist/workspace/topology/yaml-driven.d.ts.map +1 -0
- package/dist/workspace/topology/yaml-driven.js +273 -0
- package/dist/workspace/topology/yaml-driven.js.map +1 -0
- package/dist/workspace/types-v3.d.ts +117 -0
- package/dist/workspace/types-v3.d.ts.map +1 -0
- package/dist/workspace/types-v3.js +20 -0
- package/dist/workspace/types-v3.js.map +1 -0
- package/dist/workspace/types.d.ts +162 -17
- package/dist/workspace/types.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.d.ts +101 -13
- package/dist/workspace/workspace-manager.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.js +416 -13
- package/dist/workspace/workspace-manager.js.map +1 -1
- package/dist/workspace/yaml-schema.d.ts +254 -0
- package/dist/workspace/yaml-schema.d.ts.map +1 -0
- package/dist/workspace/yaml-schema.js +170 -0
- package/dist/workspace/yaml-schema.js.map +1 -0
- package/docs/conflict-recovery.md +472 -0
- package/docs/design/task-dispatcher.md +880 -0
- package/docs/git-cascade-integration-gaps.md +678 -0
- package/docs/workspace-interfaces.md +731 -0
- package/docs/workspace-redesign-plan.md +302 -0
- package/package.json +6 -5
- package/src/__tests__/boot-v2.test.ts +435 -0
- package/src/__tests__/e2e/acp-over-map.e2e.test.ts +92 -0
- package/src/__tests__/e2e/auto-sync.e2e.test.ts +257 -0
- package/src/__tests__/e2e/bootstrap.e2e.test.ts +319 -0
- package/src/__tests__/e2e/cascade-rebase.e2e.test.ts +254 -0
- package/src/__tests__/e2e/cli-run.e2e.test.ts +167 -0
- package/src/__tests__/e2e/dispatch-coordination.e2e.test.ts +495 -0
- package/src/__tests__/e2e/dispatch-live.e2e.test.ts +564 -0
- package/src/__tests__/e2e/dispatch-opentasks.e2e.test.ts +496 -0
- package/src/__tests__/e2e/dispatch-phase2-live.e2e.test.ts +456 -0
- package/src/__tests__/e2e/dispatch-phase2.e2e.test.ts +386 -0
- package/src/__tests__/e2e/dispatch.e2e.test.ts +376 -0
- package/src/__tests__/e2e/self-driving-v3.e2e.test.ts +197 -0
- package/src/__tests__/e2e/spawn-resolver.e2e.test.ts +200 -0
- package/src/__tests__/e2e/workspace-lifecycle.e2e.test.ts +30 -22
- package/src/__tests__/e2e/workspace-v3.e2e.test.ts +413 -0
- package/src/acp/__tests__/claude-code-replay.test.ts +225 -0
- package/src/acp/__tests__/macro-agent.test.ts +39 -1
- package/src/acp/claude-code-replay.ts +208 -0
- package/src/acp/macro-agent.ts +203 -10
- package/src/acp/types.ts +10 -0
- package/src/adapters/__tests__/tasks-adapter.test.ts +1 -0
- package/src/adapters/tasks-adapter.ts +3 -0
- package/src/adapters/types.ts +1 -0
- package/src/agent/__tests__/agent-manager-topology.test.ts +73 -0
- package/src/agent/__tests__/agent-manager-v2.test.ts +66 -0
- package/src/agent/__tests__/agent-store.test.ts +52 -0
- package/src/agent/__tests__/task-ref-resolution.test.ts +231 -0
- package/src/agent/agent-manager-v2.ts +372 -59
- package/src/agent/agent-manager.ts +14 -0
- package/src/agent/agent-store.ts +24 -0
- package/src/agent/types.ts +16 -2
- package/src/boot-v2.ts +589 -35
- package/src/cli/acp.ts +4 -0
- package/src/cli/index.ts +61 -0
- package/src/cognitive/macro-agent-backend.ts +45 -29
- package/src/integrations/skilltree.ts +1 -0
- package/src/lifecycle/__tests__/cascade-consolidation.test.ts +240 -0
- package/src/lifecycle/cascade.ts +77 -2
- package/src/lifecycle/cleanup.ts +52 -3
- package/src/lifecycle/handlers-v2.ts +40 -3
- package/src/lifecycle/types.ts +12 -0
- package/src/map/__tests__/cascade-bridge.test.ts +229 -0
- package/src/map/__tests__/emit-event.test.ts +71 -0
- package/src/map/__tests__/lifecycle-bridge.test.ts +86 -10
- package/src/map/acp-bridge.ts +26 -3
- package/src/map/cascade-action-handler.ts +205 -0
- package/src/map/cascade-bridge.ts +339 -0
- package/src/map/coordination-handler.ts +13 -1
- package/src/map/lifecycle-bridge.ts +52 -17
- package/src/map/server.ts +225 -7
- package/src/map/sidecar.ts +48 -1
- package/src/map/types.ts +23 -0
- package/src/mcp/tools/done-v2.ts +9 -0
- package/src/teams/team-manager-v2.ts +37 -0
- package/src/teams/team-runtime-v2.ts +23 -3
- package/src/workspace/__tests__/{dataplane-adapter.test.ts → git-cascade-adapter.test.ts} +209 -14
- package/src/workspace/__tests__/land-dispatch.test.ts +214 -0
- package/src/workspace/__tests__/self-driving-yaml.test.ts +114 -0
- package/src/workspace/__tests__/shared-worktree-refcount.test.ts +154 -0
- package/src/workspace/__tests__/standalone-mode.test.ts +118 -0
- package/src/workspace/__tests__/workspace-manager-v3.test.ts +245 -0
- package/src/workspace/__tests__/yaml-schema.test.ts +210 -0
- package/src/workspace/config.ts +11 -11
- package/src/workspace/git-cascade-adapter.ts +1213 -0
- package/src/workspace/index.ts +11 -11
- package/src/workspace/landing/__tests__/strategies.test.ts +184 -0
- package/src/workspace/landing/direct-push.ts +91 -0
- package/src/workspace/landing/index.ts +40 -0
- package/src/workspace/landing/merge-to-parent.ts +229 -0
- package/src/workspace/landing/optimistic-push.ts +36 -0
- package/src/workspace/landing/queue-to-branch.ts +108 -0
- package/src/workspace/merge-queue/merge-queue.ts +10 -0
- package/src/workspace/merge-queue/types.ts +16 -2
- package/src/workspace/pool/__tests__/worktree-pool.integration.test.ts +5 -5
- package/src/workspace/pool/types.ts +1 -0
- package/src/workspace/pool/worktree-pool.ts +1 -0
- package/src/workspace/recovery/__tests__/auto-resolve-integration.test.ts +127 -0
- package/src/workspace/recovery/__tests__/spawn-resolver.test.ts +139 -0
- package/src/workspace/recovery/__tests__/strategies.test.ts +145 -0
- package/src/workspace/recovery/abandon.ts +51 -0
- package/src/workspace/recovery/auto-resolve.ts +119 -0
- package/src/workspace/recovery/defer.ts +23 -0
- package/src/workspace/recovery/escalate.ts +30 -0
- package/src/workspace/recovery/index.ts +58 -0
- package/src/workspace/recovery/spawn-resolver.ts +152 -0
- package/src/workspace/recovery/types.ts +54 -0
- package/src/workspace/topology/__tests__/yaml-driven.test.ts +345 -0
- package/src/workspace/topology/index.ts +18 -0
- package/src/workspace/topology/no-workspace.ts +39 -0
- package/src/workspace/topology/types.ts +116 -0
- package/src/workspace/topology/yaml-driven.ts +316 -0
- package/src/workspace/types-v3.ts +162 -0
- package/src/workspace/types.ts +211 -20
- package/src/workspace/workspace-manager.ts +533 -19
- package/src/workspace/yaml-schema.ts +216 -0
- package/dist/workspace/dataplane-adapter.d.ts +0 -260
- package/dist/workspace/dataplane-adapter.d.ts.map +0 -1
- package/dist/workspace/dataplane-adapter.js +0 -416
- package/dist/workspace/dataplane-adapter.js.map +0 -1
- package/src/workspace/dataplane-adapter.ts +0 -546
package/dist/map/server.js
CHANGED
|
@@ -46,6 +46,14 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
46
46
|
const clientWebSockets = new Map(); // participant/agent ID → WebSocket
|
|
47
47
|
// Track subscription IDs by client agent ID for ACP response delivery
|
|
48
48
|
const clientSubscriptions = new Map(); // agent ID → subscription IDs
|
|
49
|
+
/**
|
|
50
|
+
* Per-subscription monotonic event counter. The MAP SDK's Subscription
|
|
51
|
+
* checks `sequenceNumber !== lastSequenceNumber + 1` and warns on gaps —
|
|
52
|
+
* using `Date.now()` (millisecond timestamp) breaks that assumption since
|
|
53
|
+
* each event becomes a "gap". Track a per-subscription counter starting
|
|
54
|
+
* at 1 and increment per event.
|
|
55
|
+
*/
|
|
56
|
+
const subscriptionSequence = new Map(); // subscription ID → next sequence number
|
|
49
57
|
// Track original ws.send for each WebSocket (before interception)
|
|
50
58
|
const originalSends = new Map();
|
|
51
59
|
/**
|
|
@@ -57,11 +65,21 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
57
65
|
const handlers = {};
|
|
58
66
|
// ── Agent extensions ──────────────────────────────────────────
|
|
59
67
|
handlers["_macro/spawnAgent"] = async (params, ctx) => {
|
|
68
|
+
// Forward the full SpawnAgentOptions surface so callers can set
|
|
69
|
+
// permission mode, agent type, custom prompt, model config, etc.
|
|
70
|
+
// Previously this handler dropped everything except role/cwd/task,
|
|
71
|
+
// making _macro/spawnAgent useless for any non-default agent.
|
|
60
72
|
const spawned = await agentManager.spawn({
|
|
61
73
|
task: params.task ?? "Spawned via MAP",
|
|
62
74
|
parent: params.parent ?? null,
|
|
63
75
|
cwd: params.cwd,
|
|
64
76
|
role: params.role ?? "worker",
|
|
77
|
+
permissionMode: params.permissionMode,
|
|
78
|
+
agentType: params.agentType,
|
|
79
|
+
customPrompt: params.customPrompt,
|
|
80
|
+
topics: params.topics,
|
|
81
|
+
config: params.config,
|
|
82
|
+
taskRef: params.taskRef,
|
|
65
83
|
});
|
|
66
84
|
// Ensure agent is registered in MAPServer's registry.
|
|
67
85
|
// The lifecycle bridge may have already done this, but we also
|
|
@@ -73,7 +91,7 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
73
91
|
role: params.role ?? "worker",
|
|
74
92
|
state: "idle",
|
|
75
93
|
sessionId: ctx?.session?.id,
|
|
76
|
-
metadata: {
|
|
94
|
+
metadata: { peerAgentId: spawned.id, task: params.task },
|
|
77
95
|
});
|
|
78
96
|
if (registered?.id) {
|
|
79
97
|
mapIdToLocalId.set(registered.id, spawned.id);
|
|
@@ -104,6 +122,153 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
104
122
|
const spawned = await agentManager.resume(params.agentId);
|
|
105
123
|
return { agent: { id: spawned.id } };
|
|
106
124
|
};
|
|
125
|
+
/**
|
|
126
|
+
* Resume an agent session with full routing + session info returned.
|
|
127
|
+
*
|
|
128
|
+
* Session-first resolution: given a Claude Code `providerSessionId` (the
|
|
129
|
+
* session UUID persisted on the session record), reverse-look-up the
|
|
130
|
+
* owning agent. Falls back to `agentId` (either the MAP ULID or the
|
|
131
|
+
* local store id) when no providerSessionId is given or the reverse
|
|
132
|
+
* lookup misses.
|
|
133
|
+
*
|
|
134
|
+
* Behavior:
|
|
135
|
+
* 1. Resolve the local agent id.
|
|
136
|
+
* 2. Call `agentManager.resume(localId)` — idempotent; the manager
|
|
137
|
+
* re-spawns the coordinator/head-manager if its process isn't live,
|
|
138
|
+
* otherwise returns the existing handle.
|
|
139
|
+
* 3. Ensure the agent is registered in the MAPServer's registry so
|
|
140
|
+
* ACP streams can target it via the returned peerMapId.
|
|
141
|
+
* 4. Return `{ agent: { id: peerMapId, localId, name }, acpSessionId,
|
|
142
|
+
* providerSessionId }` — the caller needs peerMapId to open the
|
|
143
|
+
* ACP stream and providerSessionId to pass into `session/load` so
|
|
144
|
+
* Claude Code replays its on-disk transcript.
|
|
145
|
+
*
|
|
146
|
+
* Used by OpenHive's POST /sessions/:id/resume to revive a session whose
|
|
147
|
+
* swarm has been offline for longer than the hub's stale-grace window.
|
|
148
|
+
*/
|
|
149
|
+
handlers["_macro/resumeAgent"] = async (params, ctx) => {
|
|
150
|
+
const providerSessionIdParam = params.providerSessionId;
|
|
151
|
+
const agentIdParam = params.agentId;
|
|
152
|
+
let localId;
|
|
153
|
+
let providerSessionId;
|
|
154
|
+
if (providerSessionIdParam) {
|
|
155
|
+
const session = agentStore.findSessionByProviderSessionId(providerSessionIdParam);
|
|
156
|
+
if (session) {
|
|
157
|
+
localId = session.agent_id;
|
|
158
|
+
providerSessionId = session.provider_session_id;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
if (!localId && agentIdParam) {
|
|
162
|
+
localId = mapIdToLocalId.get(agentIdParam) ?? agentIdParam;
|
|
163
|
+
const session = agentStore.getSession(localId);
|
|
164
|
+
providerSessionId = session?.provider_session_id;
|
|
165
|
+
}
|
|
166
|
+
if (!localId) {
|
|
167
|
+
return {
|
|
168
|
+
success: false,
|
|
169
|
+
error: "providerSessionId or agentId required",
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
const agentRec = agentStore.getAgent(localId);
|
|
173
|
+
if (!agentRec) {
|
|
174
|
+
return { success: false, error: `Agent not found: ${localId}` };
|
|
175
|
+
}
|
|
176
|
+
// Already-running case: skip resume() (which rejects with ALREADY_RUNNING)
|
|
177
|
+
// and return the live agent's session info straight from the store.
|
|
178
|
+
// This makes the call idempotent — callers don't need to pre-check.
|
|
179
|
+
let resumedId;
|
|
180
|
+
let resumedSessionId;
|
|
181
|
+
let resumedName;
|
|
182
|
+
if (agentManager.hasActiveSession(localId)) {
|
|
183
|
+
resumedId = localId;
|
|
184
|
+
resumedName = agentRec.name;
|
|
185
|
+
const liveSession = agentStore.getSession(localId);
|
|
186
|
+
if (!liveSession) {
|
|
187
|
+
return {
|
|
188
|
+
success: false,
|
|
189
|
+
error: `Agent ${localId} is active but has no session record`,
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
resumedSessionId = liveSession.session_id;
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
try {
|
|
196
|
+
const resumed = await agentManager.resume(localId);
|
|
197
|
+
resumedId = resumed.id;
|
|
198
|
+
resumedSessionId = resumed.session_id;
|
|
199
|
+
resumedName = resumed.name;
|
|
200
|
+
}
|
|
201
|
+
catch (err) {
|
|
202
|
+
return { success: false, error: err.message };
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
// Ensure agent is registered in MAPServer's registry. resume() fires
|
|
206
|
+
// the spawned lifecycle event, which the lifecycle bridge handles —
|
|
207
|
+
// but we also register here for subscription routing context on the
|
|
208
|
+
// current MAP session (mirrors _macro/spawnAgent).
|
|
209
|
+
if (mapServer && !localIdToMapId.has(resumedId)) {
|
|
210
|
+
try {
|
|
211
|
+
const registered = mapServer.agents.register({
|
|
212
|
+
name: resumedName ?? resumedId,
|
|
213
|
+
role: agentRec.role,
|
|
214
|
+
state: "idle",
|
|
215
|
+
sessionId: ctx?.session?.id,
|
|
216
|
+
metadata: { peerAgentId: resumedId },
|
|
217
|
+
});
|
|
218
|
+
if (registered?.id) {
|
|
219
|
+
mapIdToLocalId.set(registered.id, resumedId);
|
|
220
|
+
localIdToMapId.set(resumedId, registered.id);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
// Best effort; lifecycle bridge will register on spawned event
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
const peerMapId = localIdToMapId.get(resumedId) ?? resumedId;
|
|
228
|
+
return {
|
|
229
|
+
success: true,
|
|
230
|
+
agent: {
|
|
231
|
+
id: peerMapId,
|
|
232
|
+
localId: resumedId,
|
|
233
|
+
name: resumedName,
|
|
234
|
+
role: agentRec.role,
|
|
235
|
+
},
|
|
236
|
+
acpSessionId: resumedSessionId,
|
|
237
|
+
providerSessionId,
|
|
238
|
+
};
|
|
239
|
+
};
|
|
240
|
+
/**
|
|
241
|
+
* Terminate a running agent. Accepts either the agent's local ID or the
|
|
242
|
+
* MAP-assigned ULID (we resolve back to local via mapIdToLocalId).
|
|
243
|
+
* Reason defaults to "stopped"; use "cancelled" for user-initiated stops.
|
|
244
|
+
*/
|
|
245
|
+
handlers["_macro/terminateAgent"] = async (params) => {
|
|
246
|
+
const agentIdParam = params.agentId;
|
|
247
|
+
const reason = params.reason ?? "cancelled";
|
|
248
|
+
if (!agentIdParam) {
|
|
249
|
+
return { success: false, error: "agentId is required" };
|
|
250
|
+
}
|
|
251
|
+
// Resolve either a MAP ULID or a local agent ID to our internal ID.
|
|
252
|
+
const localId = mapIdToLocalId.get(agentIdParam) ?? agentIdParam;
|
|
253
|
+
try {
|
|
254
|
+
await agentManager.terminate(localId, reason);
|
|
255
|
+
return { success: true };
|
|
256
|
+
}
|
|
257
|
+
catch (err) {
|
|
258
|
+
return { success: false, error: err.message };
|
|
259
|
+
}
|
|
260
|
+
};
|
|
261
|
+
/**
|
|
262
|
+
* Inspect ACP stream → peer agent bindings on this MAP server.
|
|
263
|
+
* Each stream carries the peer agent id (macro-agent's internal store id)
|
|
264
|
+
* it was opened against, set by the bridge from MAP routing. Useful for
|
|
265
|
+
* routing tests and debugging multi-coordinator scenarios.
|
|
266
|
+
*/
|
|
267
|
+
handlers["_macro/getAcpStreamBindings"] = async () => {
|
|
268
|
+
if (!acpBridge)
|
|
269
|
+
return { bindings: [] };
|
|
270
|
+
return { bindings: acpBridge.getStreamBindings() };
|
|
271
|
+
};
|
|
107
272
|
// ── Task extensions ───────────────────────────────────────────
|
|
108
273
|
handlers["_macro/task/list"] = async () => {
|
|
109
274
|
if (!tasksAdapter.connected)
|
|
@@ -204,15 +369,21 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
204
369
|
const subIds = clientSubscriptions.get(clientId) ?? [];
|
|
205
370
|
// Send as subscription event notification (what ACPStreamConnection expects).
|
|
206
371
|
// The _pushEvent method expects: { subscriptionId, sequenceNumber, eventId, timestamp, event }
|
|
372
|
+
//
|
|
373
|
+
// sequenceNumber must be a per-subscription monotonic counter that
|
|
374
|
+
// increments by exactly 1 — the SDK warns on any gap. Don't use
|
|
375
|
+
// Date.now() here (breaks the contract on every event).
|
|
207
376
|
for (const subId of subIds) {
|
|
208
377
|
const event = rawEvent.params?.event ?? rawEvent;
|
|
209
378
|
const eventId = event.id ?? `acp-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
379
|
+
const nextSeq = (subscriptionSequence.get(subId) ?? 0) + 1;
|
|
380
|
+
subscriptionSequence.set(subId, nextSeq);
|
|
210
381
|
const notification = JSON.stringify({
|
|
211
382
|
jsonrpc: "2.0",
|
|
212
383
|
method: "map/event",
|
|
213
384
|
params: {
|
|
214
385
|
subscriptionId: subId,
|
|
215
|
-
sequenceNumber:
|
|
386
|
+
sequenceNumber: nextSeq,
|
|
216
387
|
eventId,
|
|
217
388
|
timestamp: Date.now(),
|
|
218
389
|
event,
|
|
@@ -319,6 +490,33 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
319
490
|
}
|
|
320
491
|
return originalSend(data, ...args);
|
|
321
492
|
};
|
|
493
|
+
// Observe incoming messages so we drop subscription IDs from our
|
|
494
|
+
// routing array when the client unsubscribes. Without this, closed
|
|
495
|
+
// ACP streams keep receiving events ("MAP: Event for unknown
|
|
496
|
+
// subscription" warnings on the client). We don't intercept the
|
|
497
|
+
// SDK's processing — this listener runs alongside it.
|
|
498
|
+
ws.on("message", (data) => {
|
|
499
|
+
try {
|
|
500
|
+
const text = typeof data === "string"
|
|
501
|
+
? data
|
|
502
|
+
: Buffer.isBuffer(data)
|
|
503
|
+
? data.toString("utf-8")
|
|
504
|
+
: String(data);
|
|
505
|
+
const msg = JSON.parse(text);
|
|
506
|
+
if (msg?.method === "map/unsubscribe") {
|
|
507
|
+
const subId = msg?.params?.subscriptionId;
|
|
508
|
+
if (typeof subId === "string") {
|
|
509
|
+
const idx = subscriptionIds.indexOf(subId);
|
|
510
|
+
if (idx >= 0)
|
|
511
|
+
subscriptionIds.splice(idx, 1);
|
|
512
|
+
subscriptionSequence.delete(subId);
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
catch {
|
|
517
|
+
// Non-JSON or parse failure — ignore
|
|
518
|
+
}
|
|
519
|
+
});
|
|
322
520
|
const stream = websocketStream(ws);
|
|
323
521
|
const router = mapServer.accept(stream, {
|
|
324
522
|
role: "client",
|
|
@@ -327,6 +525,11 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
327
525
|
router.start();
|
|
328
526
|
ws.on("close", () => {
|
|
329
527
|
connectionCount--;
|
|
528
|
+
// Clear sequence counters for any subscriptions belonging to this
|
|
529
|
+
// connection. Use a copy of subscriptionIds since we don't mutate it.
|
|
530
|
+
for (const subId of subscriptionIds) {
|
|
531
|
+
subscriptionSequence.delete(subId);
|
|
532
|
+
}
|
|
330
533
|
if (clientAgentId) {
|
|
331
534
|
clientWebSockets.delete(clientAgentId);
|
|
332
535
|
clientSubscriptions.delete(clientAgentId);
|
|
@@ -340,16 +543,22 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
340
543
|
try {
|
|
341
544
|
if (event.type === "spawned" || event.type === "started") {
|
|
342
545
|
const agent = event.agent;
|
|
343
|
-
// Register agent
|
|
344
|
-
//
|
|
345
|
-
//
|
|
546
|
+
// Register agent ONCE. spawn() fires "spawned" immediately followed
|
|
547
|
+
// by "started", so without this guard the listener re-registers
|
|
548
|
+
// on the second event — generating a fresh MAP ULID and overwriting
|
|
549
|
+
// localIdToMapId. Consumers racing against that overwrite (like the
|
|
550
|
+
// sidecar's lifecycle bridge, which snapshots peerMapId into hub
|
|
551
|
+
// metadata) end up disagreeing with _macro/spawnAgent's return
|
|
552
|
+
// value on which ULID refers to this agent.
|
|
553
|
+
if (localIdToMapId.has(agent.id))
|
|
554
|
+
return;
|
|
346
555
|
try {
|
|
347
556
|
const registered = mapServer.agents.register({
|
|
348
557
|
name: agent.name ?? agent.id,
|
|
349
558
|
role: agent.role ?? "worker",
|
|
350
559
|
state: "idle",
|
|
351
560
|
metadata: {
|
|
352
|
-
|
|
561
|
+
peerAgentId: agent.id, // macro-agent's internal store id
|
|
353
562
|
parent: agent.parent ?? null,
|
|
354
563
|
task: agent.task ?? null,
|
|
355
564
|
cwd: agent.cwd ?? null,
|
|
@@ -393,7 +602,7 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
393
602
|
role: agent.role ?? "worker",
|
|
394
603
|
state: agent.state === "running" ? "busy" : "idle",
|
|
395
604
|
metadata: {
|
|
396
|
-
|
|
605
|
+
peerAgentId: agent.id,
|
|
397
606
|
parent: agent.parent ?? null,
|
|
398
607
|
task: agent.task ?? null,
|
|
399
608
|
},
|
|
@@ -466,6 +675,9 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
466
675
|
getConnectionCount() {
|
|
467
676
|
return connectionCount;
|
|
468
677
|
},
|
|
678
|
+
getLocalMapId(localAgentId) {
|
|
679
|
+
return localIdToMapId.get(localAgentId);
|
|
680
|
+
},
|
|
469
681
|
};
|
|
470
682
|
}
|
|
471
683
|
//# sourceMappingURL=server.js.map
|
package/dist/map/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,
|
|
1
|
+
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,CA0UZ"}
|
package/dist/map/sidecar.js
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
* when disconnected. macro-agent continues working normally.
|
|
21
21
|
*/
|
|
22
22
|
export function createMAPSidecar(deps, config) {
|
|
23
|
-
const { agentManager, agentStore, inboxAdapter, tasksAdapter } = deps;
|
|
23
|
+
const { agentManager, agentStore, inboxAdapter, tasksAdapter, getLocalMapId, gitCascadeAdapter } = deps;
|
|
24
24
|
const scope = config.scope ?? "swarm:macro-agent";
|
|
25
25
|
const agentName = config.agentName ?? "macro-agent-sidecar";
|
|
26
26
|
// Connection state
|
|
@@ -33,6 +33,7 @@ export function createMAPSidecar(deps, config) {
|
|
|
33
33
|
let trajectoryReporter = null;
|
|
34
34
|
let taskBridge = null;
|
|
35
35
|
let coordinationCleanup = null;
|
|
36
|
+
let cascadeBridgeCleanup = null;
|
|
36
37
|
let reconnectTimer = null;
|
|
37
38
|
/**
|
|
38
39
|
* Build the MAP connection URL with auth token.
|
|
@@ -63,6 +64,13 @@ export function createMAPSidecar(deps, config) {
|
|
|
63
64
|
coordinationCleanup();
|
|
64
65
|
coordinationCleanup = null;
|
|
65
66
|
}
|
|
67
|
+
if (cascadeBridgeCleanup) {
|
|
68
|
+
try {
|
|
69
|
+
cascadeBridgeCleanup();
|
|
70
|
+
}
|
|
71
|
+
catch { /* non-critical */ }
|
|
72
|
+
cascadeBridgeCleanup = null;
|
|
73
|
+
}
|
|
66
74
|
if (trajectoryReporter) {
|
|
67
75
|
trajectoryReporter.stop();
|
|
68
76
|
trajectoryReporter = null;
|
|
@@ -103,6 +111,10 @@ export function createMAPSidecar(deps, config) {
|
|
|
103
111
|
metadata: {
|
|
104
112
|
systemId: config.systemId ?? "macro-agent",
|
|
105
113
|
type: "macro-agent-sidecar",
|
|
114
|
+
// Signals that this swarm can spawn ACP-capable coordinators on demand,
|
|
115
|
+
// even before any coordinator has registered. The hub's /sessions/create-acp
|
|
116
|
+
// endpoint handles the spawn via _macro/spawnAgent when no ACP agent exists.
|
|
117
|
+
canHostAcp: true,
|
|
106
118
|
},
|
|
107
119
|
reconnection: {
|
|
108
120
|
enabled: config.reconnection?.enabled ?? true,
|
|
@@ -149,6 +161,19 @@ export function createMAPSidecar(deps, config) {
|
|
|
149
161
|
}
|
|
150
162
|
isConnected = true;
|
|
151
163
|
} // end if (!isConnected)
|
|
164
|
+
// Publish sidecar metadata to the hub. The MAP SDK's connect()/register()
|
|
165
|
+
// does not propagate the `metadata` field from connect options — it only
|
|
166
|
+
// forwards name/role/capabilities/scopes. Call updateMetadata explicitly
|
|
167
|
+
// so the hub sees canHostAcp (and any other metadata the UI relies on).
|
|
168
|
+
try {
|
|
169
|
+
const metadata = connectOpts.metadata ?? {};
|
|
170
|
+
if (typeof connection.updateMetadata === "function") {
|
|
171
|
+
await connection.updateMetadata(metadata);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
catch {
|
|
175
|
+
// Non-fatal — metadata is advisory
|
|
176
|
+
}
|
|
152
177
|
// Monitor connection state
|
|
153
178
|
connection.onStateChange((newState, _oldState) => {
|
|
154
179
|
isConnected = newState === "connected";
|
|
@@ -210,7 +235,7 @@ export function createMAPSidecar(deps, config) {
|
|
|
210
235
|
taskBridge = createTaskBridge(connection, scope);
|
|
211
236
|
// 2. Lifecycle Bridge
|
|
212
237
|
const { createLifecycleBridge } = await import("./lifecycle-bridge.js");
|
|
213
|
-
const bridge = createLifecycleBridge(connection, agentStore, scope, taskBridge);
|
|
238
|
+
const bridge = createLifecycleBridge(connection, agentStore, scope, taskBridge, getLocalMapId);
|
|
214
239
|
lifecycleCallback = bridge.callback;
|
|
215
240
|
lifecycleCleanup = bridge.cleanup;
|
|
216
241
|
lifecycleUnsubscribe = agentManager.onLifecycleEvent(lifecycleCallback);
|
|
@@ -226,6 +251,18 @@ export function createMAPSidecar(deps, config) {
|
|
|
226
251
|
tasksAdapter,
|
|
227
252
|
trajectoryReporter,
|
|
228
253
|
});
|
|
254
|
+
// 5. Cascade Bridge + Action Handler (optional — only when a GitCascadeAdapter is available)
|
|
255
|
+
if (gitCascadeAdapter) {
|
|
256
|
+
const { createCascadeBridge } = await import("./cascade-bridge.js");
|
|
257
|
+
const cascadeBridge = createCascadeBridge(connection, gitCascadeAdapter);
|
|
258
|
+
// 5b. Inbound action handler — receives x-cascade/request.* from hub
|
|
259
|
+
const { setupCascadeActionHandlers } = await import("./cascade-action-handler.js");
|
|
260
|
+
const actionCleanup = setupCascadeActionHandlers(connection, gitCascadeAdapter);
|
|
261
|
+
cascadeBridgeCleanup = () => {
|
|
262
|
+
cascadeBridge.dispose();
|
|
263
|
+
actionCleanup();
|
|
264
|
+
};
|
|
265
|
+
}
|
|
229
266
|
}
|
|
230
267
|
return {
|
|
231
268
|
async start() {
|
|
@@ -266,6 +303,16 @@ export function createMAPSidecar(deps, config) {
|
|
|
266
303
|
return null;
|
|
267
304
|
return trajectoryReporter.reportCheckpoint(checkpoint);
|
|
268
305
|
},
|
|
306
|
+
async emitEvent(event) {
|
|
307
|
+
if (!connection || !isConnected)
|
|
308
|
+
return;
|
|
309
|
+
try {
|
|
310
|
+
await connection.send({ scope }, { ...event, _origin: "macro-agent" });
|
|
311
|
+
}
|
|
312
|
+
catch {
|
|
313
|
+
// Best effort — MAP hub may be temporarily unavailable
|
|
314
|
+
}
|
|
315
|
+
},
|
|
269
316
|
};
|
|
270
317
|
}
|
|
271
318
|
//# sourceMappingURL=sidecar.js.map
|
package/dist/map/sidecar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,MAAwB;IAExB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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"}
|
package/dist/map/types.d.ts
CHANGED
|
@@ -47,6 +47,21 @@ export interface MAPSidecarDeps {
|
|
|
47
47
|
agentStore: AgentStore;
|
|
48
48
|
inboxAdapter: InboxAdapter;
|
|
49
49
|
tasksAdapter: TasksAdapter;
|
|
50
|
+
/**
|
|
51
|
+
* Optional lookup for the local MAP server's ULID for a given local agent ID.
|
|
52
|
+
* When provided, the lifecycle bridge includes this ID in hub registration
|
|
53
|
+
* metadata so clients (e.g., SwarmCraft) can target the agent correctly on
|
|
54
|
+
* the macro-agent's own MAP server.
|
|
55
|
+
*/
|
|
56
|
+
getLocalMapId?: (localAgentId: string) => string | undefined;
|
|
57
|
+
/**
|
|
58
|
+
* Optional GitCascadeAdapter. When provided, the sidecar wires a cascade
|
|
59
|
+
* bridge that forwards the adapter's event stream to the hub as
|
|
60
|
+
* `x-cascade/*` MAP notifications. Leave undefined to disable cascade
|
|
61
|
+
* event forwarding (macro-agent will still use cascade internally, just
|
|
62
|
+
* without hub observability).
|
|
63
|
+
*/
|
|
64
|
+
gitCascadeAdapter?: import("../workspace/git-cascade-adapter.js").GitCascadeAdapter;
|
|
50
65
|
}
|
|
51
66
|
export interface MAPSidecar {
|
|
52
67
|
/** Start the sidecar (connect to hub, subscribe to events) */
|
|
@@ -57,6 +72,8 @@ export interface MAPSidecar {
|
|
|
57
72
|
readonly connected: boolean;
|
|
58
73
|
/** Report a trajectory checkpoint manually */
|
|
59
74
|
reportCheckpoint(checkpoint: TrajectoryCheckpointPayload): Promise<TrajectoryCheckpointResult | null>;
|
|
75
|
+
/** Emit a custom event to the MAP hub scope (best-effort, no-op if disconnected) */
|
|
76
|
+
emitEvent?(event: Record<string, unknown>): Promise<void>;
|
|
60
77
|
}
|
|
61
78
|
/**
|
|
62
79
|
* Trajectory checkpoint payload — matches cc-swarm wire format.
|
|
@@ -179,5 +196,10 @@ export interface MAPServerInstance {
|
|
|
179
196
|
getUrl(): string;
|
|
180
197
|
/** Get number of active connections */
|
|
181
198
|
getConnectionCount(): number;
|
|
199
|
+
/**
|
|
200
|
+
* Resolve a local agent ID (macro-agent internal) to its MAP server-assigned ULID.
|
|
201
|
+
* Returns undefined if the agent is not registered on the MAP server yet.
|
|
202
|
+
*/
|
|
203
|
+
getLocalMapId(localAgentId: string): string | undefined;
|
|
182
204
|
}
|
|
183
205
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/map/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"done-v2.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/done-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,0BAA0B,CAAC;AAQ7E,eAAO,MAAM,UAAU;;;;;;;;;;CAgBtB,CAAC;AAMF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,sCAAsC,EAAE,mBAAmB,CAAC;CACjF;
|
|
1
|
+
{"version":3,"file":"done-v2.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/done-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,0BAA0B,CAAC;AAQ7E,eAAO,MAAM,UAAU;;;;;;;;;;CAgBtB,CAAC;AAMF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,sCAAsC,EAAE,mBAAmB,CAAC;CACjF;AAmFD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,cAAc,IAEN,MAAM;IAClB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,KAAG,OAAO,CAAC,UAAU,CAAC,CA2DxB;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;CAK1B,CAAC"}
|
|
@@ -64,6 +64,14 @@ function buildLifecycleContext(toolContext, agentStore, role, roleRegistry) {
|
|
|
64
64
|
workspacePath: record?.workspace_path ?? toolContext.cwd,
|
|
65
65
|
streamId: record?.workspace_stream_id ?? process.env.MACRO_STREAM_ID,
|
|
66
66
|
};
|
|
67
|
+
// Pull task_ref out of agent metadata if it was stashed there at spawn
|
|
68
|
+
// time. Validates the shape — bad data is silently dropped rather than
|
|
69
|
+
// pushed downstream into cascade payloads.
|
|
70
|
+
const meta = record?.metadata;
|
|
71
|
+
const tr = meta?.task_ref;
|
|
72
|
+
if (tr && typeof tr.resource_id === "string" && typeof tr.node_id === "string") {
|
|
73
|
+
ctx.taskRef = { resource_id: tr.resource_id, node_id: tr.node_id };
|
|
74
|
+
}
|
|
67
75
|
// Resolve capabilities for dispatch
|
|
68
76
|
if (roleRegistry) {
|
|
69
77
|
try {
|