macro-agent 0.1.8 → 0.1.10
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 +166 -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 +155 -6
- 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/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 +234 -43
- 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/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 +41 -0
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +16 -1
- package/dist/boot-v2.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/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-bridge.d.ts +44 -0
- package/dist/map/cascade-bridge.d.ts.map +1 -0
- package/dist/map/cascade-bridge.js +257 -0
- package/dist/map/cascade-bridge.js.map +1 -0
- 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 +47 -6
- package/dist/map/server.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +33 -2
- package/dist/map/sidecar.js.map +1 -1
- package/dist/map/types.d.ts +20 -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 +908 -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 +185 -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 +111 -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 +110 -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 +145 -17
- package/dist/workspace/types.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.d.ts +92 -13
- package/dist/workspace/workspace-manager.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.js +373 -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/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 +4 -4
- package/src/__tests__/e2e/auto-sync.e2e.test.ts +257 -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/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 +167 -9
- package/src/acp/types.ts +10 -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__/task-ref-resolution.test.ts +231 -0
- package/src/agent/agent-manager-v2.ts +293 -48
- package/src/agent/agent-manager.ts +14 -0
- package/src/agent/types.ts +16 -2
- package/src/boot-v2.ts +68 -1
- 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/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__/lifecycle-bridge.test.ts +86 -10
- package/src/map/acp-bridge.ts +26 -3
- package/src/map/cascade-bridge.ts +301 -0
- package/src/map/lifecycle-bridge.ts +52 -17
- package/src/map/server.ts +47 -6
- package/src/map/sidecar.ts +31 -1
- package/src/map/types.ts +20 -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__/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 +1186 -0
- package/src/workspace/index.ts +11 -11
- package/src/workspace/landing/__tests__/strategies.test.ts +142 -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 +228 -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 +145 -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 +155 -0
- package/src/workspace/types.ts +191 -20
- package/src/workspace/workspace-manager.ts +474 -19
- package/src/workspace/yaml-schema.ts +216 -0
- package/src/workspace/dataplane-adapter.ts +0 -546
|
@@ -12,8 +12,26 @@
|
|
|
12
12
|
* Returns an `AgentLifecycleCallback` to register via `agentManager.onLifecycleEvent()`,
|
|
13
13
|
* plus a `cleanup()` function to unregister all tracked agents on shutdown.
|
|
14
14
|
*/
|
|
15
|
-
export function createLifecycleBridge(connection, agentStore, scope, taskBridge) {
|
|
15
|
+
export function createLifecycleBridge(connection, agentStore, scope, taskBridge, getLocalMapId) {
|
|
16
16
|
const registered = new Map();
|
|
17
|
+
/**
|
|
18
|
+
* Poll for the local MAP server's assigned ID for an agent.
|
|
19
|
+
* The local MAP server and the lifecycle bridge both listen to the same
|
|
20
|
+
* lifecycle callback, so they may fire in any order. Poll briefly to handle
|
|
21
|
+
* the race.
|
|
22
|
+
*/
|
|
23
|
+
async function waitForLocalMapId(localAgentId, timeoutMs = 500) {
|
|
24
|
+
if (!getLocalMapId)
|
|
25
|
+
return undefined;
|
|
26
|
+
const deadline = Date.now() + timeoutMs;
|
|
27
|
+
while (Date.now() < deadline) {
|
|
28
|
+
const id = getLocalMapId(localAgentId);
|
|
29
|
+
if (id)
|
|
30
|
+
return id;
|
|
31
|
+
await new Promise((r) => setTimeout(r, 20));
|
|
32
|
+
}
|
|
33
|
+
return getLocalMapId(localAgentId);
|
|
34
|
+
}
|
|
17
35
|
const callback = (event) => {
|
|
18
36
|
if (!connection.isConnected)
|
|
19
37
|
return;
|
|
@@ -34,29 +52,46 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
34
52
|
capabilities.acp = { version: "2024-10-07" };
|
|
35
53
|
}
|
|
36
54
|
// Register agent with MAP hub (use map/agents/register to preserve
|
|
37
|
-
// per-agent capabilities; map/agents/spawn drops them)
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
+
// per-agent capabilities; map/agents/spawn drops them).
|
|
56
|
+
// Include the local MAP server's ID in metadata so clients can route
|
|
57
|
+
// ACP messages to the correct agent on the macro-agent's own MAP server.
|
|
58
|
+
// Also include provider_session_id so OpenHive can find the underlying
|
|
59
|
+
// Claude Code JSONL transcript on disk for history recovery.
|
|
60
|
+
const agentMetadata = agent.metadata;
|
|
61
|
+
const providerSessionId = typeof agentMetadata?.provider_session_id === "string"
|
|
62
|
+
? agentMetadata.provider_session_id
|
|
63
|
+
: undefined;
|
|
64
|
+
(async () => {
|
|
65
|
+
const peerMapId = await waitForLocalMapId(agent.id);
|
|
66
|
+
try {
|
|
67
|
+
const result = await connection.callExtension("map/agents/register", {
|
|
68
|
+
name,
|
|
69
|
+
role,
|
|
70
|
+
capabilities,
|
|
71
|
+
metadata: {
|
|
72
|
+
// From the hub's perspective these IDs identify this agent on
|
|
73
|
+
// the macro-agent (peer) side. `peerAgentId` is macro-agent's
|
|
74
|
+
// internal store id; `peerMapId` is its local MAP server ULID.
|
|
75
|
+
// Hub callers use these to address the agent in routing
|
|
76
|
+
// (ACP streams target peerMapId, lifecycle ops use peerAgentId).
|
|
77
|
+
peerAgentId: agent.id,
|
|
78
|
+
peerMapId,
|
|
79
|
+
provider_session_id: providerSessionId,
|
|
80
|
+
parent: agent.parent_id ?? undefined,
|
|
81
|
+
team: agent.team ?? undefined,
|
|
82
|
+
cwd: agent.cwd ?? undefined,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
// Track the MAP-assigned agent ID for unregistration
|
|
86
|
+
const mapId = result?.agent?.id ?? result?.id;
|
|
87
|
+
if (mapId) {
|
|
88
|
+
entry.mapId = mapId;
|
|
89
|
+
}
|
|
55
90
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
});
|
|
91
|
+
catch {
|
|
92
|
+
// Silent — MAP hub may be temporarily unavailable
|
|
93
|
+
}
|
|
94
|
+
})();
|
|
60
95
|
// Bridge task creation if agent has a task
|
|
61
96
|
if (taskBridge && agent.task_id) {
|
|
62
97
|
taskBridge
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAoBH;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,UAAqC,EACrC,UAAsB,EACtB,KAAa,EACb,UAAuB;
|
|
1
|
+
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAoBH;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,UAAqC,EACrC,UAAsB,EACtB,KAAa,EACb,UAAuB,EACvB,aAA4D;IAE5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEtD;;;;;OAKG;IACH,KAAK,UAAU,iBAAiB,CAAC,YAAoB,EAAE,SAAS,GAAG,GAAG;QACpE,IAAI,CAAC,aAAa;YAAE,OAAO,SAAS,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;YACvC,IAAI,EAAE;gBAAE,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,QAAQ,GAA2B,CAAC,KAAK,EAAE,EAAE;QACjD,IAAI,CAAC,UAAU,CAAC,WAAW;YAAE,OAAO;QAEpC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC;gBACpC,MAAM,KAAK,GAAoB,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBAC5D,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;gBAEhC,gCAAgC;gBAChC,iEAAiE;gBACjE,MAAM,YAAY,GAA4B;oBAC5C,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;iBAChC,CAAC;gBACF,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC3B,YAAY,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC;oBACjC,YAAY,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC/C,CAAC;gBAED,mEAAmE;gBACnE,wDAAwD;gBACxD,qEAAqE;gBACrE,yEAAyE;gBACzE,uEAAuE;gBACvE,6DAA6D;gBAC7D,MAAM,aAAa,GAAI,KAAa,CAAC,QAA+C,CAAC;gBACrF,MAAM,iBAAiB,GACrB,OAAO,aAAa,EAAE,mBAAmB,KAAK,QAAQ;oBACpD,CAAC,CAAC,aAAa,CAAC,mBAAmB;oBACnC,CAAC,CAAC,SAAS,CAAC;gBAChB,CAAC,KAAK,IAAI,EAAE;oBACV,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACpD,IAAI,CAAC;wBACH,MAAM,MAAM,GAAQ,MAAM,UAAU,CAAC,aAAa,CAAC,qBAAqB,EAAE;4BACxE,IAAI;4BACJ,IAAI;4BACJ,YAAY;4BACZ,QAAQ,EAAE;gCACR,8DAA8D;gCAC9D,8DAA8D;gCAC9D,+DAA+D;gCAC/D,wDAAwD;gCACxD,iEAAiE;gCACjE,WAAW,EAAE,KAAK,CAAC,EAAE;gCACrB,SAAS;gCACT,mBAAmB,EAAE,iBAAiB;gCACtC,MAAM,EAAG,KAAa,CAAC,SAAS,IAAI,SAAS;gCAC7C,IAAI,EAAG,KAAa,CAAC,IAAI,IAAI,SAAS;gCACtC,GAAG,EAAG,KAAa,CAAC,GAAG,IAAI,SAAS;6BACrC;yBACF,CAAC,CAAC;wBACH,qDAAqD;wBACrD,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,EAAE,CAAC;wBAC9C,IAAI,KAAK,EAAE,CAAC;4BACV,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;wBACtB,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,kDAAkD;oBACpD,CAAC;gBACH,CAAC,CAAC,EAAE,CAAC;gBAEL,2CAA2C;gBAC3C,IAAI,UAAU,IAAK,KAAa,CAAC,OAAO,EAAE,CAAC;oBACzC,UAAU;yBACP,WAAW,CAAC;wBACX,EAAE,EAAG,KAAa,CAAC,OAAO;wBAC1B,KAAK,EAAG,KAAa,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;wBACxC,MAAM,EAAE,MAAM;wBACd,QAAQ,EAAE,KAAK,CAAC,EAAE;qBACnB,CAAC;yBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACrB,CAAC;gBACD,MAAM;YACR,CAAC;YAED,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAE5B,mEAAmE;gBACnE,MAAM,OAAO,GAAG,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,EAAE,CAAC;gBACzC,UAAU;qBACP,aAAa,CAAC,uBAAuB,EAAE;oBACtC,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,SAAS;iBAClC,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE;oBACV,kBAAkB;gBACpB,CAAC,CAAC,CAAC;gBAEL,yBAAyB;gBACzB,IAAI,UAAU,IAAK,KAAa,CAAC,OAAO,EAAE,CAAC;oBACzC,MAAM,MAAM,GACV,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACxD,UAAU;yBACP,iBAAiB,CACf,KAAa,CAAC,OAAO,EACtB,aAAa,EACb,MAAM,EACN,KAAK,CAAC,EAAE,CACT;yBACA,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACrB,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;QACxC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5B,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,uDAAuD;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7D,UAAU;aACP,aAAa,CAAC,uBAAuB,EAAE;YACtC,OAAO,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,EAAE;YAChC,MAAM,EAAE,kBAAkB;SAC3B,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CACnB,CAAC;QACF,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnC,UAAU,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC"}
|
package/dist/map/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,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;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAMD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,aAAa,EACnB,MAAM,GAAE,eAAoB,GAC3B,iBAAiB,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,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;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAMD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,aAAa,EACnB,MAAM,GAAE,eAAoB,GAC3B,iBAAiB,CA8gBnB"}
|
package/dist/map/server.js
CHANGED
|
@@ -73,7 +73,7 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
73
73
|
role: params.role ?? "worker",
|
|
74
74
|
state: "idle",
|
|
75
75
|
sessionId: ctx?.session?.id,
|
|
76
|
-
metadata: {
|
|
76
|
+
metadata: { peerAgentId: spawned.id, task: params.task },
|
|
77
77
|
});
|
|
78
78
|
if (registered?.id) {
|
|
79
79
|
mapIdToLocalId.set(registered.id, spawned.id);
|
|
@@ -104,6 +104,38 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
104
104
|
const spawned = await agentManager.resume(params.agentId);
|
|
105
105
|
return { agent: { id: spawned.id } };
|
|
106
106
|
};
|
|
107
|
+
/**
|
|
108
|
+
* Terminate a running agent. Accepts either the agent's local ID or the
|
|
109
|
+
* MAP-assigned ULID (we resolve back to local via mapIdToLocalId).
|
|
110
|
+
* Reason defaults to "stopped"; use "cancelled" for user-initiated stops.
|
|
111
|
+
*/
|
|
112
|
+
handlers["_macro/terminateAgent"] = async (params) => {
|
|
113
|
+
const agentIdParam = params.agentId;
|
|
114
|
+
const reason = params.reason ?? "cancelled";
|
|
115
|
+
if (!agentIdParam) {
|
|
116
|
+
return { success: false, error: "agentId is required" };
|
|
117
|
+
}
|
|
118
|
+
// Resolve either a MAP ULID or a local agent ID to our internal ID.
|
|
119
|
+
const localId = mapIdToLocalId.get(agentIdParam) ?? agentIdParam;
|
|
120
|
+
try {
|
|
121
|
+
await agentManager.terminate(localId, reason);
|
|
122
|
+
return { success: true };
|
|
123
|
+
}
|
|
124
|
+
catch (err) {
|
|
125
|
+
return { success: false, error: err.message };
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
/**
|
|
129
|
+
* Inspect ACP stream → peer agent bindings on this MAP server.
|
|
130
|
+
* Each stream carries the peer agent id (macro-agent's internal store id)
|
|
131
|
+
* it was opened against, set by the bridge from MAP routing. Useful for
|
|
132
|
+
* routing tests and debugging multi-coordinator scenarios.
|
|
133
|
+
*/
|
|
134
|
+
handlers["_macro/getAcpStreamBindings"] = async () => {
|
|
135
|
+
if (!acpBridge)
|
|
136
|
+
return { bindings: [] };
|
|
137
|
+
return { bindings: acpBridge.getStreamBindings() };
|
|
138
|
+
};
|
|
107
139
|
// ── Task extensions ───────────────────────────────────────────
|
|
108
140
|
handlers["_macro/task/list"] = async () => {
|
|
109
141
|
if (!tasksAdapter.connected)
|
|
@@ -340,16 +372,22 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
340
372
|
try {
|
|
341
373
|
if (event.type === "spawned" || event.type === "started") {
|
|
342
374
|
const agent = event.agent;
|
|
343
|
-
// Register agent
|
|
344
|
-
//
|
|
345
|
-
//
|
|
375
|
+
// Register agent ONCE. spawn() fires "spawned" immediately followed
|
|
376
|
+
// by "started", so without this guard the listener re-registers
|
|
377
|
+
// on the second event — generating a fresh MAP ULID and overwriting
|
|
378
|
+
// localIdToMapId. Consumers racing against that overwrite (like the
|
|
379
|
+
// sidecar's lifecycle bridge, which snapshots peerMapId into hub
|
|
380
|
+
// metadata) end up disagreeing with _macro/spawnAgent's return
|
|
381
|
+
// value on which ULID refers to this agent.
|
|
382
|
+
if (localIdToMapId.has(agent.id))
|
|
383
|
+
return;
|
|
346
384
|
try {
|
|
347
385
|
const registered = mapServer.agents.register({
|
|
348
386
|
name: agent.name ?? agent.id,
|
|
349
387
|
role: agent.role ?? "worker",
|
|
350
388
|
state: "idle",
|
|
351
389
|
metadata: {
|
|
352
|
-
|
|
390
|
+
peerAgentId: agent.id, // macro-agent's internal store id
|
|
353
391
|
parent: agent.parent ?? null,
|
|
354
392
|
task: agent.task ?? null,
|
|
355
393
|
cwd: agent.cwd ?? null,
|
|
@@ -393,7 +431,7 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
393
431
|
role: agent.role ?? "worker",
|
|
394
432
|
state: agent.state === "running" ? "busy" : "idle",
|
|
395
433
|
metadata: {
|
|
396
|
-
|
|
434
|
+
peerAgentId: agent.id,
|
|
397
435
|
parent: agent.parent ?? null,
|
|
398
436
|
task: agent.task ?? null,
|
|
399
437
|
},
|
|
@@ -466,6 +504,9 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
466
504
|
getConnectionCount() {
|
|
467
505
|
return connectionCount;
|
|
468
506
|
},
|
|
507
|
+
getLocalMapId(localAgentId) {
|
|
508
|
+
return localIdToMapId.get(localAgentId);
|
|
509
|
+
},
|
|
469
510
|
};
|
|
470
511
|
}
|
|
471
512
|
//# 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,CAyTZ"}
|
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,12 @@ export function createMAPSidecar(deps, config) {
|
|
|
226
251
|
tasksAdapter,
|
|
227
252
|
trajectoryReporter,
|
|
228
253
|
});
|
|
254
|
+
// 5. Cascade Bridge (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
|
+
cascadeBridgeCleanup = cascadeBridge.dispose;
|
|
259
|
+
}
|
|
229
260
|
}
|
|
230
261
|
return {
|
|
231
262
|
async start() {
|
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":"AAAA;;;;;;;;;;;;;GAaG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,MAAwB;IAExB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IACxG,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,mBAAmB,CAAC;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,qBAAqB,CAAC;IAE5D,mBAAmB;IACnB,IAAI,UAAU,GAAQ,IAAI,CAAC,CAAC,gDAAgD;IAC5E,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,mBAAmB;IACnB,IAAI,iBAAiB,GAAkC,IAAI,CAAC;IAC5D,IAAI,oBAAoB,GAAwB,IAAI,CAAC;IACrD,IAAI,gBAAgB,GAAiC,IAAI,CAAC;IAC1D,IAAI,kBAAkB,GAA8B,IAAI,CAAC;IACzD,IAAI,UAAU,GAAsB,IAAI,CAAC;IACzC,IAAI,mBAAmB,GAAwB,IAAI,CAAC;IACpD,IAAI,oBAAoB,GAAwB,IAAI,CAAC;IACrD,IAAI,cAAc,GAAyC,IAAI,CAAC;IAEhE;;OAEG;IACH,SAAS,QAAQ;QACf,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,gDAAgD;QAChD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QACD,6DAA6D;QAC7D,mEAAmE;QACnE,mDAAmD;QACnD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,iBAAiB;QAC9B,IAAI,mBAAmB,EAAE,CAAC;YACxB,mBAAmB,EAAE,CAAC;YACtB,mBAAmB,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,oBAAoB,EAAE,CAAC;YACzB,IAAI,CAAC;gBAAC,oBAAoB,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YAC5D,oBAAoB,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,IAAI,kBAAkB,EAAE,CAAC;YACvB,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAC1B,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,gBAAgB,EAAE,CAAC;YACzB,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,EAAE,CAAC;YACvB,oBAAoB,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,iBAAiB,GAAG,IAAI,CAAC;QACzB,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,OAAO;QACpB,IAAI,CAAC;YACH,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CACtC,2BAA2B,CAC5B,CAAC;YAEF,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;YACvB,MAAM,WAAW,GAA4B;gBAC3C,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,CAAC,KAAK,CAAC;gBACf,YAAY,EAAE;oBACZ,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;oBAC9C,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE;oBAC9D,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE;oBACvD,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI;wBACf,SAAS,EAAE,IAAI;wBACf,SAAS,EAAE,IAAI;wBACf,OAAO,EAAE,IAAI;qBACd;iBACF;gBACD,QAAQ,EAAE;oBACR,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,aAAa;oBAC1C,IAAI,EAAE,qBAAqB;oBAC3B,wEAAwE;oBACxE,6EAA6E;oBAC7E,6EAA6E;oBAC7E,UAAU,EAAE,IAAI;iBACjB;gBACD,YAAY,EAAE;oBACZ,OAAO,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,IAAI,IAAI;oBAC7C,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,UAAU,IAAI,EAAE;oBACjD,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW,IAAI,IAAI;oBACrD,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,UAAU,IAAI,KAAK;iBACrD;aACF,CAAC;YAEF,uEAAuE;YACvE,IAAI,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC;oBACH,UAAU,GAAG,MAAO,eAAuB,CAAC,WAAW,CAAC;wBACtD,GAAG,WAAW;wBACd,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,GAAG,SAAS,OAAO,EAAE;wBAC3D,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC,CAAC;oBACH,WAAW,GAAG,IAAI,CAAC;oBACnB,OAAO,CAAC,GAAG,CAAC,2CAA2C,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBAAC,OAAO,OAAO,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CACV,6DAA8D,OAAiB,CAAC,OAAO,EAAE,CAC1F,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,sDAAsD;YACtD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,sDAAsD;gBACtD,uDAAuD;gBACvD,IAAI,MAAM,CAAC,UAAU,IAAK,eAAuB,CAAC,gBAAgB,EAAE,CAAC;oBACnE,4EAA4E;oBAC5E,UAAU,GAAG,MAAO,eAAuB,CAAC,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;oBAC/E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;oBAC9C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;wBACxB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC;wBACjE,MAAM,UAAU,CAAC,YAAY,CAAC;4BAC5B,MAAM;4BACN,KAAK,EAAE,MAAM,CAAC,UAAU;yBACzB,CAAC,CAAC;oBACL,CAAC;oBACD,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACN,0CAA0C;oBAC1C,UAAU,GAAG,MAAO,eAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBACxE,CAAC;gBACD,WAAW,GAAG,IAAI,CAAC;YACnB,CAAC,CAAC,wBAAwB;YAE1B,0EAA0E;YAC1E,yEAAyE;YACzE,yEAAyE;YACzE,wEAAwE;YACxE,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAI,WAAW,CAAC,QAAoC,IAAI,EAAE,CAAC;gBACzE,IAAI,OAAO,UAAU,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;oBACpD,MAAM,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,mCAAmC;YACrC,CAAC;YAED,2BAA2B;YAC3B,UAAU,CAAC,aAAa,CACtB,CAAC,QAAgB,EAAE,SAAiB,EAAE,EAAE;gBACtC,WAAW,GAAG,QAAQ,KAAK,WAAW,CAAC;gBACvC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CACV,mCAAmC,QAAQ,EAAE,CAC9C,CAAC;gBACJ,CAAC;YACH,CAAC,CACF,CAAC;YAEF,2DAA2D;YAC3D,UAAU,CAAC,MAAM;iBACd,IAAI,CAAC,GAAG,EAAE;gBACT,WAAW,GAAG,KAAK,CAAC;gBACpB,iBAAiB,EAAE,CAAC;YACtB,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,WAAW,GAAG,KAAK,CAAC;gBACpB,iBAAiB,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;YAEL,OAAO,CAAC,GAAG,CACT,yCAAyC,MAAM,CAAC,MAAM,EAAE,CACzD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CACV,+CAAgD,GAAa,CAAC,OAAO,EAAE,CACxE,CAAC;YACF,WAAW,GAAG,KAAK,CAAC;YACpB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;OAEG;IACH,SAAS,iBAAiB;QACxB,IAAI,cAAc;YAAE,OAAO;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC;QAEtD,cAAc,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACrC,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,WAAW;gBAAE,OAAO;YAExB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,4CAA4C;YAC5C,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM,EAAE,GAAG,MAAM,OAAO,EAAE,CAAC;YAC3B,IAAI,EAAE,EAAE,CAAC;gBACP,MAAM,cAAc,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,iBAAiB,EAAE,CAAC;YACtB,CAAC;QACH,CAAC,EAAE,QAAQ,CAAC,CAAC;QACb,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,6BAA6B;IACzD,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,cAAc;QAC3B,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,sEAAsE;QACtE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC9D,UAAU,GAAG,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAEjD,sBAAsB;QACtB,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,qBAAqB,CAClC,UAAU,EACV,UAAU,EACV,KAAK,EACL,UAAU,EACV,aAAa,CACd,CAAC;QACF,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC;QACpC,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC;QAClC,oBAAoB,GAAG,YAAY,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAExE,yBAAyB;QACzB,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC9E,kBAAkB,GAAG,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAElE,0BAA0B;QAC1B,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAChF,mBAAmB,GAAG,yBAAyB,CAAC;YAC9C,UAAU;YACV,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,kBAAkB;SACnB,CAAC,CAAC;QAEH,4EAA4E;QAC5E,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACpE,MAAM,aAAa,GAAG,mBAAmB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;YACzE,oBAAoB,GAAG,aAAa,CAAC,OAAO,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,KAAK;YACT,MAAM,EAAE,GAAG,MAAM,OAAO,EAAE,CAAC;YAC3B,IAAI,EAAE,EAAE,CAAC;gBACP,MAAM,cAAc,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,gEAAgE;gBAChE,iBAAiB,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;QAED,KAAK,CAAC,IAAI;YACR,wBAAwB;YACxB,IAAI,cAAc,EAAE,CAAC;gBACnB,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC7B,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;YAED,2BAA2B;YAC3B,MAAM,iBAAiB,EAAE,CAAC;YAE1B,sBAAsB;YACtB,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,CAAC;oBACH,MAAM,UAAU,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;gBAClD,CAAC;gBAAC,MAAM,CAAC;oBACP,uBAAuB;gBACzB,CAAC;gBACD,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;YAED,WAAW,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,IAAI,SAAS;YACX,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,KAAK,CAAC,gBAAgB,CACpB,UAAuC;YAEvC,IAAI,CAAC,kBAAkB;gBAAE,OAAO,IAAI,CAAC;YACrC,OAAO,kBAAkB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzD,CAAC;KACF,CAAC;AACJ,CAAC"}
|
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) */
|
|
@@ -179,5 +194,10 @@ export interface MAPServerInstance {
|
|
|
179
194
|
getUrl(): string;
|
|
180
195
|
/** Get number of active connections */
|
|
181
196
|
getConnectionCount(): number;
|
|
197
|
+
/**
|
|
198
|
+
* Resolve a local agent ID (macro-agent internal) to its MAP server-assigned ULID.
|
|
199
|
+
* Returns undefined if the agent is not registered on the MAP server yet.
|
|
200
|
+
*/
|
|
201
|
+
getLocalMapId(localAgentId: string): string | undefined;
|
|
182
202
|
}
|
|
183
203
|
//# 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 {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"done-v2.js","sourceRoot":"","sources":["../../../src/mcp/tools/done-v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"done-v2.js","sourceRoot":"","sources":["../../../src/mcp/tools/done-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team-manager-v2.d.ts","sourceRoot":"","sources":["../../src/teams/team-manager-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,2BAA2B,CAAC;AAGhF,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,KAAK,mBAAmB,EAAuB,MAAM,sBAAsB,CAAC;AAOpG,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAMD,qBAAa,aAAa;IAgBZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAfrC,2CAA2C;IAC3C,OAAO,CAAC,SAAS,CAAmC;IAEpD,sCAAsC;IACtC,OAAO,CAAC,YAAY,CAAmC;IAEvD,qCAAqC;IACrC,OAAO,CAAC,oBAAoB,CAAC,CAAa;IAE1C,wCAAwC;IACxC,OAAO,CAAC,SAAS,CAAS;IAE1B,sCAAsC;IACtC,OAAO,CAAC,eAAe,CAAK;gBAEC,QAAQ,EAAE,qBAAqB;IAM5D;;;OAGG;IACH,OAAO,IAAI,IAAI;IA6Bf;;OAEG;IACH,SAAS,IAAI,IAAI;IAiBjB;;;;;;;;;OASG;IACG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"team-manager-v2.d.ts","sourceRoot":"","sources":["../../src/teams/team-manager-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,2BAA2B,CAAC;AAGhF,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,KAAK,mBAAmB,EAAuB,MAAM,sBAAsB,CAAC;AAOpG,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAMD,qBAAa,aAAa;IAgBZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAfrC,2CAA2C;IAC3C,OAAO,CAAC,SAAS,CAAmC;IAEpD,sCAAsC;IACtC,OAAO,CAAC,YAAY,CAAmC;IAEvD,qCAAqC;IACrC,OAAO,CAAC,oBAAoB,CAAC,CAAa;IAE1C,wCAAwC;IACxC,OAAO,CAAC,SAAS,CAAS;IAE1B,sCAAsC;IACtC,OAAO,CAAC,eAAe,CAAK;gBAEC,QAAQ,EAAE,qBAAqB;IAM5D;;;OAGG;IACH,OAAO,IAAI,IAAI;IA6Bf;;OAEG;IACH,SAAS,IAAI,IAAI;IAiBjB;;;;;;;;;OASG;IACG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyFjE;;;;;OAKG;IACG,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBjD;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC,iDAAiD;IACjD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI1D,iCAAiC;IACjC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIjD,qCAAqC;IACrC,YAAY,IAAI,YAAY,EAAE;IAI9B,4CAA4C;IAC5C,aAAa,IAAI,OAAO;IAQxB,OAAO,CAAC,+BAA+B;CAgBxC"}
|
|
@@ -97,6 +97,32 @@ export class TeamManagerV2 {
|
|
|
97
97
|
const { loadTeam } = await import("./team-loader.js");
|
|
98
98
|
const roleRegistry = agentManager.getRoleRegistry();
|
|
99
99
|
const manifest = await loadTeam(name, roleRegistry, basePath ?? process.cwd());
|
|
100
|
+
// V3: auto-wire TopologyPolicy when the team declares
|
|
101
|
+
// `macro_agent.workspace`. Requires a WorkspaceManager to be present.
|
|
102
|
+
if (workspaceManager) {
|
|
103
|
+
try {
|
|
104
|
+
const { extractWorkspaceConfig } = await import("../workspace/yaml-schema.js");
|
|
105
|
+
const workspaceConfig = extractWorkspaceConfig(manifest);
|
|
106
|
+
if (workspaceConfig) {
|
|
107
|
+
const { YamlDrivenTopology } = await import("../workspace/topology/yaml-driven.js");
|
|
108
|
+
const policy = new YamlDrivenTopology(workspaceConfig);
|
|
109
|
+
agentManager.setTopologyPolicy(policy);
|
|
110
|
+
// Kick the topology's onTeamStart so team-root streams get
|
|
111
|
+
// created before any agents spawn.
|
|
112
|
+
await policy.onTeamStart({
|
|
113
|
+
teamName: name,
|
|
114
|
+
teamInstanceId: `${name}-${this.instanceCounter + 1}`,
|
|
115
|
+
workspaceConfig,
|
|
116
|
+
workspaceManager,
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
catch (err) {
|
|
121
|
+
// Non-fatal: topology wiring is a progressive enhancement. Log and
|
|
122
|
+
// fall through to legacy capability-based dispatch.
|
|
123
|
+
console.warn(`[TeamManagerV2] topology auto-wire skipped for team "${name}": ${err instanceof Error ? err.message : String(err)}`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
100
126
|
// Create runtime
|
|
101
127
|
const runtimeServices = {
|
|
102
128
|
agentManager,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team-manager-v2.js","sourceRoot":"","sources":["../../src/teams/team-manager-v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"team-manager-v2.js","sourceRoot":"","sources":["../../src/teams/team-manager-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team-runtime-v2.d.ts","sourceRoot":"","sources":["../../src/teams/team-runtime-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAEhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EAGtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAO9D,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAqCD,qBAAa,aAAa;IAoCtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAnC3B,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,oBAAoB,CAAC,CAAa;IAC1C,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,YAAY,CAAC,CAAiC;IACtD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,YAAY,CAAC,CAAS;IAE9B,4BAA4B;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IAEjD,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAEpD,mCAAmC;IACnC,OAAO,CAAC,YAAY,CAA8B;IAElD,mFAAmF;IACnF,OAAO,CAAC,iBAAiB,CAA+B;IAExD,2BAA2B;IAC3B,OAAO,CAAC,YAAY,CAA8B;IAElD,4CAA4C;IAC5C,OAAO,CAAC,kBAAkB,CAA0C;IAEpE,8CAA8C;IAC9C,OAAO,CAAC,iBAAiB,CAAwB;IAEjD,qDAAqD;IACrD,OAAO,CAAC,qBAAqB,CAAC,CAAa;gBAGzC,KAAK,EAAE,YAAY,GAAG,qBAAqB,EAC1B,QAAQ,EAAE,cAAc;IAc3C,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,aAAa,GAExB;IAMD;;;;;OAKG;IACG,UAAU,CAAC,QAAQ,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4DvE;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAuEzC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B/B,WAAW,IAAI,MAAM,GAAG,MAAM;IAI9B,eAAe,IAAI,MAAM;IAIzB,WAAW,IAAI,YAAY;IAY3B,mBAAmB,IAAI,qBAAqB;IAI5C,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,oBAAoB,IAAI,MAAM,EAAE;IAIhC,sBAAsB,IAAI,mBAAmB,GAAG,SAAS;IAIzD,eAAe,IAAI,MAAM,GAAG,SAAS;IAIrC,oBAAoB,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAIrD,eAAe,IAAI,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC;IAI/C;;;;;;;;;OASG;IACH,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKvD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIlC,+CAA+C;IAC/C,QAAQ,IAAI,MAAM;IAQlB;;;;;OAKG;IACH,kBAAkB,IAAI,cAAc;IAyBpC;;;;OAIG;IACH,uBAAuB,IAAI,mBAAmB;IAgC9C;;;;;;OAMG;IACH,iBAAiB,IAAI,IAAI;IAQzB,qBAAqB,IAAI,IAAI;IAU7B,sBAAsB,IAAI,gBAAgB;IAwE1C,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,wBAAwB;IAOhC,OAAO,CAAC,sBAAsB;IAyC9B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAiBrB;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,uBAAuB;IA+B/B,OAAO,CAAC,yBAAyB;IA0BjC,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAS;IAExD,OAAO,CAAC,cAAc;IAuEtB,OAAO,CAAC,yBAAyB;
|
|
1
|
+
{"version":3,"file":"team-runtime-v2.d.ts","sourceRoot":"","sources":["../../src/teams/team-runtime-v2.ts"],"names":[],"mappings":"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"}
|