macro-agent 0.0.13 → 0.0.15
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/settings.local.json +59 -0
- package/dist/agent/agent-manager.d.ts.map +1 -1
- package/dist/agent/agent-manager.js +10 -4
- package/dist/agent/agent-manager.js.map +1 -1
- package/dist/cli/acp.d.ts +6 -0
- package/dist/cli/acp.d.ts.map +1 -1
- package/dist/cli/acp.js +16 -2
- package/dist/cli/acp.js.map +1 -1
- package/dist/map/adapter/index.d.ts +1 -1
- package/dist/map/adapter/index.d.ts.map +1 -1
- package/dist/map/adapter/index.js +1 -1
- package/dist/map/adapter/index.js.map +1 -1
- package/dist/map/utils/address-translation.d.ts +99 -0
- package/dist/map/utils/address-translation.d.ts.map +1 -0
- package/dist/map/utils/address-translation.js +285 -0
- package/dist/map/utils/address-translation.js.map +1 -0
- package/dist/map/utils/index.d.ts +7 -0
- package/dist/map/utils/index.d.ts.map +1 -0
- package/dist/map/utils/index.js +7 -0
- package/dist/map/utils/index.js.map +1 -0
- package/dist/server/combined-server.d.ts.map +1 -1
- package/dist/server/combined-server.js +8 -1
- package/dist/server/combined-server.js.map +1 -1
- package/dist/store/event-store.js +9 -2
- package/dist/store/event-store.js.map +1 -1
- package/dist/store/types/agents.d.ts +2 -0
- package/dist/store/types/agents.d.ts.map +1 -1
- package/package.json +4 -4
- package/references/acp-factory-ref/CHANGELOG.md +33 -0
- package/references/acp-factory-ref/LICENSE +21 -0
- package/references/acp-factory-ref/README.md +341 -0
- package/references/acp-factory-ref/package-lock.json +3102 -0
- package/references/acp-factory-ref/package.json +96 -0
- package/references/acp-factory-ref/python/CHANGELOG.md +33 -0
- package/references/acp-factory-ref/python/LICENSE +21 -0
- package/references/acp-factory-ref/python/Makefile +57 -0
- package/references/acp-factory-ref/python/README.md +253 -0
- package/references/acp-factory-ref/python/pyproject.toml +73 -0
- package/references/acp-factory-ref/python/tests/__init__.py +0 -0
- package/references/acp-factory-ref/python/tests/e2e/__init__.py +1 -0
- package/references/acp-factory-ref/python/tests/e2e/test_codex_e2e.py +349 -0
- package/references/acp-factory-ref/python/tests/e2e/test_gemini_e2e.py +165 -0
- package/references/acp-factory-ref/python/tests/e2e/test_opencode_e2e.py +296 -0
- package/references/acp-factory-ref/python/tests/test_client_handler.py +543 -0
- package/references/acp-factory-ref/python/tests/test_pushable.py +199 -0
- package/references/claude-code-acp/.github/workflows/ci.yml +45 -0
- package/references/claude-code-acp/.github/workflows/publish.yml +34 -0
- package/references/claude-code-acp/.prettierrc.json +4 -0
- package/references/claude-code-acp/CHANGELOG.md +249 -0
- package/references/claude-code-acp/LICENSE +222 -0
- package/references/claude-code-acp/README.md +53 -0
- package/references/claude-code-acp/docs/RELEASES.md +24 -0
- package/references/claude-code-acp/eslint.config.js +48 -0
- package/references/claude-code-acp/package-lock.json +4570 -0
- package/references/claude-code-acp/package.json +88 -0
- package/references/claude-code-acp/scripts/release.sh +119 -0
- package/references/claude-code-acp/src/acp-agent.ts +2079 -0
- package/references/claude-code-acp/src/index.ts +26 -0
- package/references/claude-code-acp/src/lib.ts +38 -0
- package/references/claude-code-acp/src/mcp-server.ts +911 -0
- package/references/claude-code-acp/src/settings.ts +522 -0
- package/references/claude-code-acp/src/tests/.claude/commands/quick-math.md +5 -0
- package/references/claude-code-acp/src/tests/.claude/commands/say-hello.md +6 -0
- package/references/claude-code-acp/src/tests/acp-agent-fork.test.ts +479 -0
- package/references/claude-code-acp/src/tests/acp-agent.test.ts +1502 -0
- package/references/claude-code-acp/src/tests/extract-lines.test.ts +103 -0
- package/references/claude-code-acp/src/tests/fork-session.test.ts +335 -0
- package/references/claude-code-acp/src/tests/replace-and-calculate-location.test.ts +334 -0
- package/references/claude-code-acp/src/tests/settings.test.ts +617 -0
- package/references/claude-code-acp/src/tests/skills-options.test.ts +187 -0
- package/references/claude-code-acp/src/tests/tools.test.ts +318 -0
- package/references/claude-code-acp/src/tests/typescript-declarations.test.ts +558 -0
- package/references/claude-code-acp/src/tools.ts +819 -0
- package/references/claude-code-acp/src/utils.ts +171 -0
- package/references/claude-code-acp/tsconfig.json +18 -0
- package/references/claude-code-acp/vitest.config.ts +19 -0
- package/references/multi-agent-protocol/.sudocode/issues.jsonl +111 -0
- package/references/multi-agent-protocol/.sudocode/specs.jsonl +13 -0
- package/references/multi-agent-protocol/LICENSE +21 -0
- package/references/multi-agent-protocol/README.md +113 -0
- package/references/multi-agent-protocol/docs/00-design-specification.md +496 -0
- package/references/multi-agent-protocol/docs/01-open-questions.md +1050 -0
- package/references/multi-agent-protocol/docs/02-wire-protocol.md +296 -0
- package/references/multi-agent-protocol/docs/03-streaming-semantics.md +252 -0
- package/references/multi-agent-protocol/docs/04-error-handling.md +231 -0
- package/references/multi-agent-protocol/docs/05-connection-model.md +244 -0
- package/references/multi-agent-protocol/docs/06-visibility-permissions.md +243 -0
- package/references/multi-agent-protocol/docs/07-federation.md +259 -0
- package/references/multi-agent-protocol/docs/08-macro-agent-migration.md +253 -0
- package/references/multi-agent-protocol/docs/09-authentication.md +680 -0
- package/references/multi-agent-protocol/docs/10-mail-protocol.md +553 -0
- package/references/multi-agent-protocol/docs/agent-iam-integration.md +877 -0
- package/references/multi-agent-protocol/docs/agentic-mesh-integration-draft.md +459 -0
- package/references/multi-agent-protocol/docs/git-transport-draft.md +251 -0
- package/references/multi-agent-protocol/docs-site/Gemfile +22 -0
- package/references/multi-agent-protocol/docs-site/README.md +82 -0
- package/references/multi-agent-protocol/docs-site/_config.yml +91 -0
- package/references/multi-agent-protocol/docs-site/_includes/head_custom.html +20 -0
- package/references/multi-agent-protocol/docs-site/_sass/color_schemes/map.scss +42 -0
- package/references/multi-agent-protocol/docs-site/_sass/custom/custom.scss +34 -0
- package/references/multi-agent-protocol/docs-site/examples/full-integration.md +510 -0
- package/references/multi-agent-protocol/docs-site/examples/index.md +138 -0
- package/references/multi-agent-protocol/docs-site/examples/simple-chat.md +282 -0
- package/references/multi-agent-protocol/docs-site/examples/task-queue.md +399 -0
- package/references/multi-agent-protocol/docs-site/getting-started/index.md +98 -0
- package/references/multi-agent-protocol/docs-site/getting-started/installation.md +219 -0
- package/references/multi-agent-protocol/docs-site/getting-started/overview.md +172 -0
- package/references/multi-agent-protocol/docs-site/getting-started/quickstart.md +237 -0
- package/references/multi-agent-protocol/docs-site/index.md +136 -0
- package/references/multi-agent-protocol/docs-site/protocol/authentication.md +391 -0
- package/references/multi-agent-protocol/docs-site/protocol/connection-model.md +376 -0
- package/references/multi-agent-protocol/docs-site/protocol/design.md +284 -0
- package/references/multi-agent-protocol/docs-site/protocol/error-handling.md +312 -0
- package/references/multi-agent-protocol/docs-site/protocol/federation.md +449 -0
- package/references/multi-agent-protocol/docs-site/protocol/index.md +129 -0
- package/references/multi-agent-protocol/docs-site/protocol/permissions.md +398 -0
- package/references/multi-agent-protocol/docs-site/protocol/streaming.md +353 -0
- package/references/multi-agent-protocol/docs-site/protocol/wire-protocol.md +369 -0
- package/references/multi-agent-protocol/docs-site/sdk/api/agent.md +357 -0
- package/references/multi-agent-protocol/docs-site/sdk/api/client.md +380 -0
- package/references/multi-agent-protocol/docs-site/sdk/api/index.md +62 -0
- package/references/multi-agent-protocol/docs-site/sdk/api/server.md +453 -0
- package/references/multi-agent-protocol/docs-site/sdk/api/types.md +468 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/agent.md +375 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/authentication.md +405 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/client.md +352 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/index.md +89 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/server.md +360 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/testing.md +446 -0
- package/references/multi-agent-protocol/docs-site/sdk/guides/transports.md +363 -0
- package/references/multi-agent-protocol/docs-site/sdk/index.md +206 -0
- package/references/multi-agent-protocol/package-lock.json +3886 -0
- package/references/multi-agent-protocol/package.json +56 -0
- package/references/multi-agent-protocol/schema/meta.json +467 -0
- package/references/multi-agent-protocol/schema/schema.json +2558 -0
- package/src/agent/__tests__/agent-manager.test.ts +67 -1
- package/src/agent/agent-manager.ts +10 -4
- package/src/cli/__tests__/stable-instance-id.test.ts +57 -0
- package/src/cli/acp.ts +17 -2
- package/src/map/adapter/index.ts +3 -0
- package/src/server/combined-server.ts +10 -0
- package/src/store/event-store.ts +10 -3
- package/src/store/types/agents.ts +2 -0
|
@@ -0,0 +1,285 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Address Translation Utilities
|
|
3
|
+
*
|
|
4
|
+
* Provides bidirectional translation between MAP addresses and
|
|
5
|
+
* legacy MessageRouter channel format. Used during migration to
|
|
6
|
+
* support both addressing schemes.
|
|
7
|
+
*
|
|
8
|
+
* @see specs/s-5qir_map_integration_for_macro_agent.md
|
|
9
|
+
*/
|
|
10
|
+
import { isAgentAddress, isAgentsAddress, isScopeAddress, isRoleAddress, isBroadcastAddress, isTaskAddress, isAncestorsAddress, isDescendantsAddress, isParentAddress, isChildrenAddress, isSiblingsAddress, } from "../types.js";
|
|
11
|
+
// =============================================================================
|
|
12
|
+
// Address to Channel Translation
|
|
13
|
+
// =============================================================================
|
|
14
|
+
/**
|
|
15
|
+
* Translate a MAP Address to legacy MessageRouter channel format.
|
|
16
|
+
*
|
|
17
|
+
* Used during migration to route messages through the existing
|
|
18
|
+
* MessageRouter while accepting MAP-style addresses.
|
|
19
|
+
*
|
|
20
|
+
* @param address - MAP address to translate
|
|
21
|
+
* @returns Legacy channel format
|
|
22
|
+
* @throws Error if address type is not supported in legacy format
|
|
23
|
+
*/
|
|
24
|
+
export function addressToChannel(address) {
|
|
25
|
+
// Direct agent addressing
|
|
26
|
+
if (isAgentAddress(address)) {
|
|
27
|
+
return {
|
|
28
|
+
type: "agent",
|
|
29
|
+
target: address.agent,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
// Multi-agent addressing (not supported in legacy)
|
|
33
|
+
if (isAgentsAddress(address)) {
|
|
34
|
+
throw new AddressTranslationError("Multi-agent addressing not supported in legacy format", address);
|
|
35
|
+
}
|
|
36
|
+
// Scope addressing → topic channel
|
|
37
|
+
if (isScopeAddress(address)) {
|
|
38
|
+
return {
|
|
39
|
+
type: "topic",
|
|
40
|
+
target: address.scope,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
// Role addressing
|
|
44
|
+
if (isRoleAddress(address)) {
|
|
45
|
+
return {
|
|
46
|
+
type: "role",
|
|
47
|
+
target: address.role,
|
|
48
|
+
role: address.role,
|
|
49
|
+
coordinatorId: address.within,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
// Broadcast addressing
|
|
53
|
+
if (isBroadcastAddress(address)) {
|
|
54
|
+
return {
|
|
55
|
+
type: "broadcast",
|
|
56
|
+
target: "all",
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
// Task addressing (macro-agent extension)
|
|
60
|
+
if (isTaskAddress(address)) {
|
|
61
|
+
return {
|
|
62
|
+
type: "task",
|
|
63
|
+
target: address.task,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
// Ancestors → lineage channel
|
|
67
|
+
if (isAncestorsAddress(address)) {
|
|
68
|
+
return {
|
|
69
|
+
type: "lineage",
|
|
70
|
+
target: "ancestors",
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
// Descendants → subtree channel
|
|
74
|
+
if (isDescendantsAddress(address)) {
|
|
75
|
+
return {
|
|
76
|
+
type: "subtree",
|
|
77
|
+
target: "descendants",
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
// New hierarchical types not supported in legacy
|
|
81
|
+
if (isParentAddress(address)) {
|
|
82
|
+
throw new AddressTranslationError("Parent addressing not supported in legacy format", address);
|
|
83
|
+
}
|
|
84
|
+
if (isChildrenAddress(address)) {
|
|
85
|
+
throw new AddressTranslationError("Children addressing not supported in legacy format", address);
|
|
86
|
+
}
|
|
87
|
+
if (isSiblingsAddress(address)) {
|
|
88
|
+
throw new AddressTranslationError("Siblings addressing not supported in legacy format", address);
|
|
89
|
+
}
|
|
90
|
+
throw new AddressTranslationError("Unknown address type", address);
|
|
91
|
+
}
|
|
92
|
+
// =============================================================================
|
|
93
|
+
// Channel to Address Translation
|
|
94
|
+
// =============================================================================
|
|
95
|
+
/**
|
|
96
|
+
* Translate a legacy MessageRouter channel to MAP address format.
|
|
97
|
+
*
|
|
98
|
+
* Used to migrate existing code to the new addressing scheme.
|
|
99
|
+
*
|
|
100
|
+
* @param channel - Legacy channel to translate
|
|
101
|
+
* @returns MAP address
|
|
102
|
+
* @throws Error if channel type is unknown
|
|
103
|
+
*/
|
|
104
|
+
export function channelToAddress(channel) {
|
|
105
|
+
switch (channel.type) {
|
|
106
|
+
case "agent":
|
|
107
|
+
return { agent: channel.target };
|
|
108
|
+
case "task":
|
|
109
|
+
return { task: channel.target };
|
|
110
|
+
case "topic":
|
|
111
|
+
return { scope: channel.target };
|
|
112
|
+
case "role":
|
|
113
|
+
if (channel.coordinatorId) {
|
|
114
|
+
return { role: channel.role ?? channel.target, within: channel.coordinatorId };
|
|
115
|
+
}
|
|
116
|
+
return { role: channel.role ?? channel.target };
|
|
117
|
+
case "broadcast":
|
|
118
|
+
// Check for scoped broadcast (e.g., "workers" → role: "worker")
|
|
119
|
+
if (channel.scope && channel.scope !== "all") {
|
|
120
|
+
// Convert plural scope to singular role: "workers" → "worker"
|
|
121
|
+
const role = channel.scope.replace(/s$/, "");
|
|
122
|
+
return { role };
|
|
123
|
+
}
|
|
124
|
+
return { broadcast: true };
|
|
125
|
+
case "lineage":
|
|
126
|
+
return { ancestors: true };
|
|
127
|
+
case "subtree":
|
|
128
|
+
return { descendants: true };
|
|
129
|
+
default:
|
|
130
|
+
throw new ChannelTranslationError(`Unknown channel type: ${channel.type}`, channel);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
// =============================================================================
|
|
134
|
+
// Legacy Compatibility Check
|
|
135
|
+
// =============================================================================
|
|
136
|
+
/**
|
|
137
|
+
* Check if a MAP address can be translated to legacy channel format.
|
|
138
|
+
*
|
|
139
|
+
* Returns false for address types that were added in MAP and have
|
|
140
|
+
* no equivalent in the legacy MessageRouter.
|
|
141
|
+
*
|
|
142
|
+
* @param address - Address to check
|
|
143
|
+
* @returns true if address can be translated to legacy format
|
|
144
|
+
*/
|
|
145
|
+
export function isLegacyCompatible(address) {
|
|
146
|
+
// Multi-agent addressing is new
|
|
147
|
+
if (isAgentsAddress(address))
|
|
148
|
+
return false;
|
|
149
|
+
// These hierarchical types are new
|
|
150
|
+
if (isParentAddress(address))
|
|
151
|
+
return false;
|
|
152
|
+
if (isChildrenAddress(address))
|
|
153
|
+
return false;
|
|
154
|
+
if (isSiblingsAddress(address))
|
|
155
|
+
return false;
|
|
156
|
+
// All other types have legacy equivalents
|
|
157
|
+
return true;
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Get a list of address features that are not legacy compatible.
|
|
161
|
+
*
|
|
162
|
+
* @param address - Address to check
|
|
163
|
+
* @returns Array of incompatible feature names, empty if fully compatible
|
|
164
|
+
*/
|
|
165
|
+
export function getLegacyIncompatibilities(address) {
|
|
166
|
+
const incompatibilities = [];
|
|
167
|
+
if (isAgentsAddress(address)) {
|
|
168
|
+
incompatibilities.push("multi-agent addressing");
|
|
169
|
+
}
|
|
170
|
+
if (isParentAddress(address)) {
|
|
171
|
+
incompatibilities.push("parent addressing");
|
|
172
|
+
}
|
|
173
|
+
if (isChildrenAddress(address)) {
|
|
174
|
+
incompatibilities.push("children addressing");
|
|
175
|
+
}
|
|
176
|
+
if (isSiblingsAddress(address)) {
|
|
177
|
+
incompatibilities.push("siblings addressing");
|
|
178
|
+
}
|
|
179
|
+
return incompatibilities;
|
|
180
|
+
}
|
|
181
|
+
// =============================================================================
|
|
182
|
+
// Error Classes
|
|
183
|
+
// =============================================================================
|
|
184
|
+
/**
|
|
185
|
+
* Error thrown when a MAP address cannot be translated to legacy format.
|
|
186
|
+
*/
|
|
187
|
+
export class AddressTranslationError extends Error {
|
|
188
|
+
address;
|
|
189
|
+
constructor(message, address) {
|
|
190
|
+
super(`${message}: ${JSON.stringify(address)}`);
|
|
191
|
+
this.name = "AddressTranslationError";
|
|
192
|
+
this.address = address;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Error thrown when a legacy channel cannot be translated to MAP format.
|
|
197
|
+
*/
|
|
198
|
+
export class ChannelTranslationError extends Error {
|
|
199
|
+
channel;
|
|
200
|
+
constructor(message, channel) {
|
|
201
|
+
super(`${message}: ${JSON.stringify(channel)}`);
|
|
202
|
+
this.name = "ChannelTranslationError";
|
|
203
|
+
this.channel = channel;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
// =============================================================================
|
|
207
|
+
// Utility Functions
|
|
208
|
+
// =============================================================================
|
|
209
|
+
/**
|
|
210
|
+
* Attempt to translate an address, returning undefined if not compatible.
|
|
211
|
+
*
|
|
212
|
+
* @param address - Address to translate
|
|
213
|
+
* @returns Legacy channel or undefined if not compatible
|
|
214
|
+
*/
|
|
215
|
+
export function tryAddressToChannel(address) {
|
|
216
|
+
if (!isLegacyCompatible(address)) {
|
|
217
|
+
return undefined;
|
|
218
|
+
}
|
|
219
|
+
try {
|
|
220
|
+
return addressToChannel(address);
|
|
221
|
+
}
|
|
222
|
+
catch {
|
|
223
|
+
return undefined;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
/**
|
|
227
|
+
* Get the address mapping table for documentation.
|
|
228
|
+
*/
|
|
229
|
+
export function getAddressMappingTable() {
|
|
230
|
+
return [
|
|
231
|
+
{
|
|
232
|
+
mapAddress: '{ agent: "id" }',
|
|
233
|
+
legacyChannel: '{ type: "agent", target: "id" }',
|
|
234
|
+
},
|
|
235
|
+
{
|
|
236
|
+
mapAddress: '{ task: "id" }',
|
|
237
|
+
legacyChannel: '{ type: "task", target: "id" }',
|
|
238
|
+
},
|
|
239
|
+
{
|
|
240
|
+
mapAddress: '{ scope: "id" }',
|
|
241
|
+
legacyChannel: '{ type: "topic", target: "id" }',
|
|
242
|
+
},
|
|
243
|
+
{
|
|
244
|
+
mapAddress: '{ role: "worker" }',
|
|
245
|
+
legacyChannel: '{ type: "role", role: "worker" }',
|
|
246
|
+
},
|
|
247
|
+
{
|
|
248
|
+
mapAddress: '{ role: "worker", within: "scope" }',
|
|
249
|
+
legacyChannel: '{ type: "role", role: "worker", coordinatorId: "scope" }',
|
|
250
|
+
},
|
|
251
|
+
{
|
|
252
|
+
mapAddress: "{ broadcast: true }",
|
|
253
|
+
legacyChannel: '{ type: "broadcast" }',
|
|
254
|
+
},
|
|
255
|
+
{
|
|
256
|
+
mapAddress: "{ ancestors: true }",
|
|
257
|
+
legacyChannel: '{ type: "lineage" }',
|
|
258
|
+
},
|
|
259
|
+
{
|
|
260
|
+
mapAddress: "{ descendants: true }",
|
|
261
|
+
legacyChannel: '{ type: "subtree" }',
|
|
262
|
+
},
|
|
263
|
+
{
|
|
264
|
+
mapAddress: "{ parent: true }",
|
|
265
|
+
legacyChannel: "N/A",
|
|
266
|
+
notes: "Not supported in legacy format",
|
|
267
|
+
},
|
|
268
|
+
{
|
|
269
|
+
mapAddress: "{ children: true }",
|
|
270
|
+
legacyChannel: "N/A",
|
|
271
|
+
notes: "Not supported in legacy format",
|
|
272
|
+
},
|
|
273
|
+
{
|
|
274
|
+
mapAddress: "{ siblings: true }",
|
|
275
|
+
legacyChannel: "N/A",
|
|
276
|
+
notes: "Not supported in legacy format",
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
mapAddress: '{ agents: ["a", "b"] }',
|
|
280
|
+
legacyChannel: "N/A",
|
|
281
|
+
notes: "Not supported in legacy format",
|
|
282
|
+
},
|
|
283
|
+
];
|
|
284
|
+
}
|
|
285
|
+
//# sourceMappingURL=address-translation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"address-translation.js","sourceRoot":"","sources":["../../../src/map/utils/address-translation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/map/utils/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/map/utils/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combined-server.d.ts","sourceRoot":"","sources":["../../src/server/combined-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAI3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,
|
|
1
|
+
{"version":3,"file":"combined-server.d.ts","sourceRoot":"","sources":["../../src/server/combined-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAI3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAIL,KAAK,UAAU,EAGhB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAO1F,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,wDAAwD;IACxD,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,uBAAuB;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,iCAAiC;IACjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,yBAAyB;IACzB,MAAM,IAAI,MAAM,CAAC;IAEjB,oCAAoC;IACpC,qBAAqB,IAAI,MAAM,CAAC;IAEhC,oCAAoC;IACpC,qBAAqB,IAAI,MAAM,CAAC;IAEhC,kBAAkB;IAClB,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IAEjC,kBAAkB;IAClB,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IAEtB,gCAAgC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAEjC,+CAA+C;IAC/C,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAEnC,4DAA4D;IAC5D,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC5C;AA2ED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,sBAAsB,EAChC,MAAM,GAAE,oBAAyB,GAChC,cAAc,CAgMhB"}
|
|
@@ -11,7 +11,7 @@ import { WebSocketServer } from "ws";
|
|
|
11
11
|
import { getAncestors } from "../activity/index.js";
|
|
12
12
|
import { setupACPWebSocket } from "../acp/websocket-server.js";
|
|
13
13
|
import { createAPIApp, setupAPIWebSocket } from "../api/server.js";
|
|
14
|
-
import { createMAPAdapter, createMAPWebSocketHandler, } from "../map/adapter/index.js";
|
|
14
|
+
import { createMAPAdapter, createMAPWebSocketHandler, registerWorkspaceFileExtensions, } from "../map/adapter/index.js";
|
|
15
15
|
import { createMailService } from "../mail/mail-service.js";
|
|
16
16
|
import { createConversationMap } from "../mail/conversation-map.js";
|
|
17
17
|
import { createTurnRecorder } from "../mail/turn-recorder.js";
|
|
@@ -113,6 +113,13 @@ export function createCombinedServer(services, config = {}) {
|
|
|
113
113
|
mailService,
|
|
114
114
|
};
|
|
115
115
|
mapAdapter = createMAPAdapter({ name: "macro-agent", version: "1.0.0" }, mapServices);
|
|
116
|
+
// Register workspace file extensions for TUI file attachment.
|
|
117
|
+
// Uses defaultCwd (project root) as the workspace path for all agents,
|
|
118
|
+
// since the head manager doesn't have an isolated worktree.
|
|
119
|
+
registerWorkspaceFileExtensions(mapAdapter, {
|
|
120
|
+
getWorkspace: () => ({ path: defaultCwd }),
|
|
121
|
+
agentExists: () => true,
|
|
122
|
+
});
|
|
116
123
|
mapHandler = createMAPWebSocketHandler(mapAdapter);
|
|
117
124
|
}
|
|
118
125
|
// Handle upgrade requests - route by path
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combined-server.js","sourceRoot":"","sources":["../../src/server/combined-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,eAAe,EAAa,MAAM,IAAI,CAAC;AAShD,OAAO,EAAE,YAAY,EAA6B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,gBAAgB,EAChB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"combined-server.js","sourceRoot":"","sources":["../../src/server/combined-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1025,6 +1025,7 @@ function applySpawnEvent(store, event, notify) {
|
|
|
1025
1025
|
store.setRow('agents', agentId, {
|
|
1026
1026
|
id: agentId,
|
|
1027
1027
|
session_id: payload.session_id,
|
|
1028
|
+
provider_session_id: '',
|
|
1028
1029
|
parent: parent ?? '',
|
|
1029
1030
|
lineage: JSON.stringify(lineage),
|
|
1030
1031
|
state: 'spawning',
|
|
@@ -1069,11 +1070,16 @@ function applyStatusEvent(store, event, notify) {
|
|
|
1069
1070
|
const payload = event.payload;
|
|
1070
1071
|
// Handle specific status types
|
|
1071
1072
|
if (payload.status_type === 'started') {
|
|
1072
|
-
|
|
1073
|
+
const updates = {
|
|
1073
1074
|
state: 'running',
|
|
1074
1075
|
started_at: event.timestamp,
|
|
1075
1076
|
last_activity_at: event.timestamp,
|
|
1076
|
-
}
|
|
1077
|
+
};
|
|
1078
|
+
// Store the provider's session ID (e.g., Claude Code UUID for --resume)
|
|
1079
|
+
if (payload.provider_session_id) {
|
|
1080
|
+
updates.provider_session_id = payload.provider_session_id;
|
|
1081
|
+
}
|
|
1082
|
+
store.setPartialRow('agents', agentId, updates);
|
|
1077
1083
|
}
|
|
1078
1084
|
else {
|
|
1079
1085
|
// Always update last_activity_at on any status event
|
|
@@ -1311,6 +1317,7 @@ function rowToAgent(row) {
|
|
|
1311
1317
|
return {
|
|
1312
1318
|
id: row.id,
|
|
1313
1319
|
session_id: row.session_id,
|
|
1320
|
+
provider_session_id: row.provider_session_id || undefined,
|
|
1314
1321
|
parent: row.parent || null,
|
|
1315
1322
|
lineage: row.lineage ? JSON.parse(row.lineage) : [],
|
|
1316
1323
|
state: row.state,
|