macro-agent 0.1.7 → 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 +179 -38
- 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 -71
- 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 +34 -37
- 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 -8
- package/dist/map/lifecycle-bridge.d.ts.map +1 -1
- package/dist/map/lifecycle-bridge.js +76 -22
- 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 -4
- 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 +71 -11
- package/src/agent/__tests__/task-ref-resolution.test.ts +231 -0
- package/src/agent/agent-manager-v2.ts +293 -77
- package/src/agent/agent-manager.ts +14 -0
- package/src/agent/types.ts +16 -2
- package/src/boot-v2.ts +87 -36
- package/src/cli/index.ts +61 -0
- package/src/cognitive/__tests__/macro-agent-backend.test.ts +47 -5
- 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 +165 -22
- package/src/map/acp-bridge.ts +26 -3
- package/src/map/cascade-bridge.ts +301 -0
- package/src/map/lifecycle-bridge.ts +77 -27
- package/src/map/server.ts +47 -6
- package/src/map/sidecar.ts +31 -3
- 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
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Cascade Bridge — forwards GitCascadeAdapter events to the MAP hub as
|
|
3
|
+
* `x-cascade/*` notifications.
|
|
4
|
+
*
|
|
5
|
+
* macro-agent's GitCascadeAdapter maintains a structured `GitCascadeEvent`
|
|
6
|
+
* stream (translated from git-cascade's native `x-cascade/*` emissions + local
|
|
7
|
+
* adapter events). This bridge subscribes to that stream and translates
|
|
8
|
+
* **back** to `x-cascade/*` MAP method calls so the OpenHive hub receives the
|
|
9
|
+
* canonical event schema.
|
|
10
|
+
*
|
|
11
|
+
* The round-trip (git-cascade → adapter translation → bridge re-translation)
|
|
12
|
+
* is deliberate: it preserves the adapter's internal abstraction (other
|
|
13
|
+
* macro-agent code consumes `GitCascadeEvent`, not raw MAP params) while
|
|
14
|
+
* guaranteeing the hub sees the same schema git-cascade defines. The bridge
|
|
15
|
+
* is the only place that knows about both shapes.
|
|
16
|
+
*
|
|
17
|
+
* Standalone-safe: when `connection.isConnected` is false, events are
|
|
18
|
+
* dropped. macro-agent continues to work without an OpenHive hub.
|
|
19
|
+
*
|
|
20
|
+
* @module map/cascade-bridge
|
|
21
|
+
*/
|
|
22
|
+
import { CASCADE_METHODS } from 'git-cascade/events';
|
|
23
|
+
/**
|
|
24
|
+
* Create a cascade bridge.
|
|
25
|
+
*
|
|
26
|
+
* Subscribes to `adapter.onEvent()` and forwards a fixed subset of events
|
|
27
|
+
* (the ones that have a canonical `x-cascade/*` method name) as MAP
|
|
28
|
+
* notifications via `connection.callExtension()`. Events with no MAP
|
|
29
|
+
* counterpart (`stream:forked`, `worktree:*`, `task:*`, `mergeQueue:*`, etc.)
|
|
30
|
+
* are silently ignored.
|
|
31
|
+
*
|
|
32
|
+
* @returns A disposable that unsubscribes from the adapter stream.
|
|
33
|
+
*/
|
|
34
|
+
export function createCascadeBridge(connection, adapter, options = {}) {
|
|
35
|
+
const verbose = options.verbose ?? false;
|
|
36
|
+
const unsubscribe = adapter.onEvent((event) => {
|
|
37
|
+
if (!connection.isConnected)
|
|
38
|
+
return;
|
|
39
|
+
const mapped = translate(event);
|
|
40
|
+
if (!mapped)
|
|
41
|
+
return;
|
|
42
|
+
// Fire-and-forget: never block the adapter's event loop on a MAP RPC.
|
|
43
|
+
// Errors are swallowed to preserve standalone-safety; they indicate the
|
|
44
|
+
// hub is unreachable or the method isn't registered, neither of which
|
|
45
|
+
// should break local cascade operations.
|
|
46
|
+
void connection
|
|
47
|
+
.callExtension(mapped.method, mapped.params)
|
|
48
|
+
.catch((err) => {
|
|
49
|
+
if (verbose) {
|
|
50
|
+
// eslint-disable-next-line no-console
|
|
51
|
+
console.warn(`[cascade-bridge] failed to forward ${event.type} as ${mapped.method}:`, err instanceof Error ? err.message : err);
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
return { dispose: unsubscribe };
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Translate a `GitCascadeEvent` into a MAP method call.
|
|
59
|
+
*
|
|
60
|
+
* Covers the 7 event types that have canonical MAP method names. Returns
|
|
61
|
+
* `null` for events that are macro-agent-internal (worktree/task/mergeQueue
|
|
62
|
+
* lifecycle, local-only forks, etc.).
|
|
63
|
+
*
|
|
64
|
+
* Field names flip from camelCase (macro-agent internal) back to snake_case
|
|
65
|
+
* (MAP wire format). The bridge is intentionally conservative — it only
|
|
66
|
+
* emits fields present on the event, letting the hub back-fill/ignore as
|
|
67
|
+
* needed.
|
|
68
|
+
*/
|
|
69
|
+
function translate(event) {
|
|
70
|
+
const d = event.data;
|
|
71
|
+
switch (event.type) {
|
|
72
|
+
case 'stream:created':
|
|
73
|
+
return {
|
|
74
|
+
method: CASCADE_METHODS.STREAM_OPENED,
|
|
75
|
+
params: {
|
|
76
|
+
stream_id: d.streamId,
|
|
77
|
+
name: d.name,
|
|
78
|
+
agent_id: d.agentId,
|
|
79
|
+
base_commit: d.baseCommit,
|
|
80
|
+
parent_stream: d.parentStream,
|
|
81
|
+
branch_name: d.branchName,
|
|
82
|
+
metadata: d.metadata,
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
case 'stream:committed':
|
|
86
|
+
return {
|
|
87
|
+
method: CASCADE_METHODS.STREAM_COMMITTED,
|
|
88
|
+
params: {
|
|
89
|
+
stream_id: d.streamId,
|
|
90
|
+
commit_hash: d.commit,
|
|
91
|
+
change_id: d.changeId,
|
|
92
|
+
agent_id: d.agentId,
|
|
93
|
+
message_summary: d.messageSummary,
|
|
94
|
+
files_touched: d.filesTouched,
|
|
95
|
+
parent_commit: d.parentCommit,
|
|
96
|
+
metadata: d.metadata,
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
case 'stream:merged':
|
|
100
|
+
return {
|
|
101
|
+
method: CASCADE_METHODS.STREAM_MERGED,
|
|
102
|
+
params: {
|
|
103
|
+
source_stream_id: d.sourceStreamId,
|
|
104
|
+
target_stream_id: d.targetStreamId,
|
|
105
|
+
merge_commit: d.mergeCommit,
|
|
106
|
+
agent_id: d.agentId,
|
|
107
|
+
strategy: d.strategy,
|
|
108
|
+
source_commit: d.sourceCommit,
|
|
109
|
+
metadata: d.metadata,
|
|
110
|
+
},
|
|
111
|
+
};
|
|
112
|
+
case 'stream:conflicted':
|
|
113
|
+
return {
|
|
114
|
+
method: CASCADE_METHODS.STREAM_CONFLICTED,
|
|
115
|
+
params: {
|
|
116
|
+
stream_id: d.streamId,
|
|
117
|
+
conflict_id: d.conflictId,
|
|
118
|
+
conflicted_files: d.conflictedFiles,
|
|
119
|
+
agent_id: d.agentId,
|
|
120
|
+
conflicting_commit: d.conflictingCommit,
|
|
121
|
+
target_commit: d.targetCommit,
|
|
122
|
+
source: d.source,
|
|
123
|
+
metadata: d.metadata,
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
case 'conflict:resolved':
|
|
127
|
+
// The adapter emits this from two sources: workspace-manager's local
|
|
128
|
+
// resolveConflict path (carries resolvedBy + resolutionCommit) AND the
|
|
129
|
+
// forwarded git-cascade stream.conflict_resolved (carries the explicit
|
|
130
|
+
// resolution_method). Bridge only forwards events with conflict_id +
|
|
131
|
+
// stream_id present (the cascade-driven shape).
|
|
132
|
+
if (!d.streamId || !d.conflictId)
|
|
133
|
+
return null;
|
|
134
|
+
return {
|
|
135
|
+
method: CASCADE_METHODS.STREAM_CONFLICT_RESOLVED,
|
|
136
|
+
params: {
|
|
137
|
+
stream_id: d.streamId,
|
|
138
|
+
conflict_id: d.conflictId,
|
|
139
|
+
resolution_method: d.resolutionMethod ??
|
|
140
|
+
(d.resolvedBy ? 'agent' : 'manual'),
|
|
141
|
+
resolved_by: d.resolvedBy,
|
|
142
|
+
resolution_summary: d.resolutionSummary,
|
|
143
|
+
metadata: d.metadata,
|
|
144
|
+
},
|
|
145
|
+
};
|
|
146
|
+
case 'stream:abandoned':
|
|
147
|
+
return {
|
|
148
|
+
method: CASCADE_METHODS.STREAM_ABANDONED,
|
|
149
|
+
params: {
|
|
150
|
+
stream_id: d.streamId,
|
|
151
|
+
reason: d.reason,
|
|
152
|
+
cascade: d.cascade,
|
|
153
|
+
metadata: d.metadata,
|
|
154
|
+
},
|
|
155
|
+
};
|
|
156
|
+
case 'stream:pushed':
|
|
157
|
+
// Trunk-style push to a remote (direct-push / optimistic-push). Hub
|
|
158
|
+
// sees this as the "merged" equivalent for non-stream targets.
|
|
159
|
+
if (!d.streamId || !d.pushedCommit || !d.remoteRef)
|
|
160
|
+
return null;
|
|
161
|
+
return {
|
|
162
|
+
method: CASCADE_METHODS.STREAM_PUSHED,
|
|
163
|
+
params: {
|
|
164
|
+
stream_id: d.streamId,
|
|
165
|
+
agent_id: d.agentId,
|
|
166
|
+
pushed_commit: d.pushedCommit,
|
|
167
|
+
remote: d.remote ?? 'origin',
|
|
168
|
+
remote_ref: d.remoteRef,
|
|
169
|
+
strategy: d.strategy,
|
|
170
|
+
metadata: d.metadata,
|
|
171
|
+
},
|
|
172
|
+
};
|
|
173
|
+
case 'cascade:rebased':
|
|
174
|
+
return {
|
|
175
|
+
method: CASCADE_METHODS.CASCADE_REBASED,
|
|
176
|
+
params: {
|
|
177
|
+
stream_id: d.streamId,
|
|
178
|
+
agent_id: d.agentId,
|
|
179
|
+
triggered_by_stream_id: d.triggeredByStreamId,
|
|
180
|
+
triggered_by_agent_id: d.triggeredByAgentId,
|
|
181
|
+
new_base_commit: d.newBaseCommit,
|
|
182
|
+
new_head: d.newHead,
|
|
183
|
+
new_commits: d.newCommits,
|
|
184
|
+
metadata: d.metadata,
|
|
185
|
+
},
|
|
186
|
+
};
|
|
187
|
+
case 'cascade:completed':
|
|
188
|
+
return {
|
|
189
|
+
method: CASCADE_METHODS.CASCADE_COMPLETED,
|
|
190
|
+
params: {
|
|
191
|
+
root_stream_id: d.rootStreamId,
|
|
192
|
+
agent_id: d.agentId,
|
|
193
|
+
strategy: d.strategy,
|
|
194
|
+
updated_streams: d.updatedStreams,
|
|
195
|
+
failed_streams: d.failedStreams,
|
|
196
|
+
skipped_streams: d.skippedStreams,
|
|
197
|
+
deferred_streams: d.deferredStreams,
|
|
198
|
+
metadata: d.metadata,
|
|
199
|
+
},
|
|
200
|
+
};
|
|
201
|
+
case 'mergeQueue:added':
|
|
202
|
+
if (!d.entryId || !d.streamId)
|
|
203
|
+
return null;
|
|
204
|
+
return {
|
|
205
|
+
method: CASCADE_METHODS.QUEUE_ADDED,
|
|
206
|
+
params: {
|
|
207
|
+
entry_id: d.entryId,
|
|
208
|
+
stream_id: d.streamId,
|
|
209
|
+
target_branch: d.targetBranch ?? 'main',
|
|
210
|
+
metadata: d.metadata,
|
|
211
|
+
},
|
|
212
|
+
};
|
|
213
|
+
case 'mergeQueue:ready':
|
|
214
|
+
if (!d.entryId || !d.streamId)
|
|
215
|
+
return null;
|
|
216
|
+
return {
|
|
217
|
+
method: CASCADE_METHODS.QUEUE_READY,
|
|
218
|
+
params: {
|
|
219
|
+
entry_id: d.entryId,
|
|
220
|
+
stream_id: d.streamId,
|
|
221
|
+
target_branch: d.targetBranch ?? 'main',
|
|
222
|
+
},
|
|
223
|
+
};
|
|
224
|
+
case 'mergeQueue:cancelled':
|
|
225
|
+
if (!d.entryId || !d.streamId)
|
|
226
|
+
return null;
|
|
227
|
+
return {
|
|
228
|
+
method: CASCADE_METHODS.QUEUE_CANCELLED,
|
|
229
|
+
params: {
|
|
230
|
+
entry_id: d.entryId,
|
|
231
|
+
stream_id: d.streamId,
|
|
232
|
+
target_branch: d.targetBranch ?? 'main',
|
|
233
|
+
reason: d.reason,
|
|
234
|
+
},
|
|
235
|
+
};
|
|
236
|
+
case 'mergeQueue:removed':
|
|
237
|
+
if (!d.entryId || !d.streamId)
|
|
238
|
+
return null;
|
|
239
|
+
return {
|
|
240
|
+
method: CASCADE_METHODS.QUEUE_REMOVED,
|
|
241
|
+
params: {
|
|
242
|
+
entry_id: d.entryId,
|
|
243
|
+
stream_id: d.streamId,
|
|
244
|
+
target_branch: d.targetBranch ?? 'main',
|
|
245
|
+
outcome: d.outcome,
|
|
246
|
+
},
|
|
247
|
+
};
|
|
248
|
+
// Local-only events with no MAP counterpart (Phase 1 scope).
|
|
249
|
+
// 'stream:updated', 'stream:forked', 'stream:paused', 'stream:resumed',
|
|
250
|
+
// 'worktree:*', 'task:*', 'change:*', 'conflict:*' (legacy local-only
|
|
251
|
+
// variant — cascade-bridge handles the cascade-driven 'conflict:resolved'
|
|
252
|
+
// separately above)
|
|
253
|
+
default:
|
|
254
|
+
return null;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
//# sourceMappingURL=cascade-bridge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cascade-bridge.js","sourceRoot":"","sources":["../../src/map/cascade-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,6 @@ import type { AgentStore } from "../agent/agent-store.js";
|
|
|
11
11
|
import type { TaskBridge } from "./types.js";
|
|
12
12
|
/** Minimal interface for the MAP connection methods we need */
|
|
13
13
|
export interface LifecycleBridgeConnection {
|
|
14
|
-
spawn(options: {
|
|
15
|
-
agentId?: string | undefined;
|
|
16
|
-
name?: string | undefined;
|
|
17
|
-
role?: string | undefined;
|
|
18
|
-
scopes?: string[];
|
|
19
|
-
metadata?: Record<string, unknown>;
|
|
20
|
-
}): Promise<unknown>;
|
|
21
14
|
callExtension(method: string, params?: unknown): Promise<unknown>;
|
|
22
15
|
get isConnected(): boolean;
|
|
23
16
|
}
|
|
@@ -27,7 +20,7 @@ export interface LifecycleBridgeConnection {
|
|
|
27
20
|
* Returns an `AgentLifecycleCallback` to register via `agentManager.onLifecycleEvent()`,
|
|
28
21
|
* plus a `cleanup()` function to unregister all tracked agents on shutdown.
|
|
29
22
|
*/
|
|
30
|
-
export declare function createLifecycleBridge(connection: LifecycleBridgeConnection, agentStore: AgentStore, scope: string, taskBridge?: TaskBridge): {
|
|
23
|
+
export declare function createLifecycleBridge(connection: LifecycleBridgeConnection, agentStore: AgentStore, scope: string, taskBridge?: TaskBridge, getLocalMapId?: (localAgentId: string) => string | undefined): {
|
|
31
24
|
callback: AgentLifecycleCallback;
|
|
32
25
|
cleanup: () => Promise<void>;
|
|
33
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-bridge.d.ts","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACxC,
|
|
1
|
+
{"version":3,"file":"lifecycle-bridge.d.ts","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,WAAW,IAAI,OAAO,CAAC;CAC5B;AAUD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,yBAAyB,EACrC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAC3D;IAAE,QAAQ,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAsJpE"}
|
|
@@ -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;
|
|
@@ -24,22 +42,56 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
24
42
|
const role = agent.role ?? "worker";
|
|
25
43
|
const entry = { id: agent.id, name, role };
|
|
26
44
|
registered.set(agent.id, entry);
|
|
27
|
-
//
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
45
|
+
// Build per-agent capabilities.
|
|
46
|
+
// Coordinators (head managers) support ACP for interactive chat.
|
|
47
|
+
const capabilities = {
|
|
48
|
+
messaging: { canReceive: true },
|
|
49
|
+
};
|
|
50
|
+
if (role === "coordinator") {
|
|
51
|
+
capabilities.protocols = ["acp"];
|
|
52
|
+
capabilities.acp = { version: "2024-10-07" };
|
|
53
|
+
}
|
|
54
|
+
// Register agent with MAP hub (use map/agents/register to preserve
|
|
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
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
// Silent — MAP hub may be temporarily unavailable
|
|
93
|
+
}
|
|
94
|
+
})();
|
|
43
95
|
// Bridge task creation if agent has a task
|
|
44
96
|
if (taskBridge && agent.task_id) {
|
|
45
97
|
taskBridge
|
|
@@ -55,11 +107,13 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
55
107
|
}
|
|
56
108
|
case "stopped": {
|
|
57
109
|
const agent = event.agent;
|
|
110
|
+
const entry = registered.get(agent.id);
|
|
58
111
|
registered.delete(agent.id);
|
|
59
|
-
// Unregister agent from MAP hub
|
|
112
|
+
// Unregister agent from MAP hub (use MAP-assigned ID if available)
|
|
113
|
+
const unregId = entry?.mapId ?? agent.id;
|
|
60
114
|
connection
|
|
61
115
|
.callExtension("map/agents/unregister", {
|
|
62
|
-
agentId:
|
|
116
|
+
agentId: unregId,
|
|
63
117
|
reason: event.reason ?? "stopped",
|
|
64
118
|
})
|
|
65
119
|
.catch(() => {
|
|
@@ -81,10 +135,10 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
81
135
|
registered.clear();
|
|
82
136
|
return;
|
|
83
137
|
}
|
|
84
|
-
// Unregister all tracked agents
|
|
85
|
-
const promises = Array.from(registered.
|
|
138
|
+
// Unregister all tracked agents (use MAP-assigned IDs)
|
|
139
|
+
const promises = Array.from(registered.values()).map((entry) => connection
|
|
86
140
|
.callExtension("map/agents/unregister", {
|
|
87
|
-
agentId,
|
|
141
|
+
agentId: entry.mapId ?? entry.id,
|
|
88
142
|
reason: "sidecar_shutdown",
|
|
89
143
|
})
|
|
90
144
|
.catch(() => { }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"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"}
|
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"}
|