macro-agent 0.2.0 → 0.2.2
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/dist/acp/macro-agent.d.ts.map +1 -1
- package/dist/acp/macro-agent.js +18 -40
- package/dist/acp/macro-agent.js.map +1 -1
- package/dist/agent/agent-manager-v2.d.ts.map +1 -1
- package/dist/agent/agent-manager-v2.js +1 -1
- package/dist/agent/agent-manager-v2.js.map +1 -1
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +2 -0
- package/dist/boot-v2.js.map +1 -1
- package/dist/dispatch/mail-inbound-consumer.d.ts +47 -0
- package/dist/dispatch/mail-inbound-consumer.d.ts.map +1 -1
- package/dist/dispatch/mail-inbound-consumer.js +117 -18
- package/dist/dispatch/mail-inbound-consumer.js.map +1 -1
- package/dist/map/mail-bridge.d.ts.map +1 -1
- package/dist/map/mail-bridge.js +8 -1
- package/dist/map/mail-bridge.js.map +1 -1
- package/dist/map/repo-workspace.d.ts +46 -0
- package/dist/map/repo-workspace.d.ts.map +1 -0
- package/dist/map/repo-workspace.js +39 -0
- package/dist/map/repo-workspace.js.map +1 -0
- package/dist/map/server.d.ts.map +1 -1
- package/dist/map/server.js +1 -0
- package/dist/map/server.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +63 -0
- package/dist/map/sidecar.js.map +1 -1
- package/dist/map/types.d.ts +14 -0
- package/dist/map/types.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/acp/macro-agent.ts +20 -42
- package/src/agent/agent-manager-v2.ts +1 -0
- package/src/boot-v2.ts +2 -0
- package/src/dispatch/__tests__/mail-inbound-consumer.test.ts +211 -0
- package/src/dispatch/mail-inbound-consumer.ts +195 -32
- package/src/map/__tests__/mail-bridge.test.ts +88 -0
- package/src/map/mail-bridge.ts +13 -1
- package/src/map/repo-workspace.ts +82 -0
- package/src/map/server.ts +1 -0
- package/src/map/sidecar.ts +85 -0
- package/src/map/types.ts +13 -0
package/dist/map/sidecar.js
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*
|
|
13
13
|
* @module map/sidecar
|
|
14
14
|
*/
|
|
15
|
+
import { REPO_PROTOCOL_VERSION, RepoClient, RepoManager, } from "./repo-workspace.js";
|
|
15
16
|
/**
|
|
16
17
|
* Create a MAP sidecar that connects macro-agent to an OpenHive MAP hub.
|
|
17
18
|
*
|
|
@@ -38,7 +39,19 @@ export function createMAPSidecar(deps, config) {
|
|
|
38
39
|
let dispatchSpawnHandlerCleanup = null;
|
|
39
40
|
let dispatchMessageHandlerCleanup = null;
|
|
40
41
|
let dispatchPermissionsHandlerCleanup = null;
|
|
42
|
+
let workspaceManager = null;
|
|
43
|
+
let workspaceTransport = null;
|
|
41
44
|
let reconnectTimer = null;
|
|
45
|
+
// Resolve the workspace capability from env vars. Setting OPENHIVE_WORKSPACE_DECLARE=off
|
|
46
|
+
// disables both explicit declare AND trajectory-handler bootstrap on the hub side.
|
|
47
|
+
const workspaceCapability = {
|
|
48
|
+
protocolVersion: REPO_PROTOCOL_VERSION,
|
|
49
|
+
declare: {
|
|
50
|
+
enabled: process.env.OPENHIVE_WORKSPACE_DECLARE !== "off",
|
|
51
|
+
defaultVisibility: process.env.OPENHIVE_WORKSPACE_VISIBILITY ?? "hub_local",
|
|
52
|
+
},
|
|
53
|
+
list: { enabled: true },
|
|
54
|
+
};
|
|
42
55
|
/**
|
|
43
56
|
* Build the MAP connection URL with auth token.
|
|
44
57
|
*/
|
|
@@ -117,6 +130,8 @@ export function createMAPSidecar(deps, config) {
|
|
|
117
130
|
}
|
|
118
131
|
lifecycleCallback = null;
|
|
119
132
|
taskBridge = null;
|
|
133
|
+
workspaceManager = null;
|
|
134
|
+
workspaceTransport = null;
|
|
120
135
|
}
|
|
121
136
|
/**
|
|
122
137
|
* Attempt to connect to the MAP hub.
|
|
@@ -139,6 +154,7 @@ export function createMAPSidecar(deps, config) {
|
|
|
139
154
|
canUpdate: true,
|
|
140
155
|
canList: true,
|
|
141
156
|
},
|
|
157
|
+
workspace: workspaceCapability,
|
|
142
158
|
},
|
|
143
159
|
metadata: {
|
|
144
160
|
systemId: config.systemId ?? "macro-agent",
|
|
@@ -486,6 +502,47 @@ export function createMAPSidecar(deps, config) {
|
|
|
486
502
|
actionCleanup();
|
|
487
503
|
};
|
|
488
504
|
}
|
|
505
|
+
// 6. Workspace (kinds/repo) — declare attached repos to the hub.
|
|
506
|
+
// Discovers repos from WORKSPACE_* env vars (set by openhive's swarm-spawn
|
|
507
|
+
// flow when spawning with a `repo_id`) plus OPENHIVE_WORKSPACE_REPOS for
|
|
508
|
+
// multi-repo declarations. Skipped entirely when capability.declare is off.
|
|
509
|
+
if (workspaceCapability.declare.enabled) {
|
|
510
|
+
try {
|
|
511
|
+
// OpenHive's MAP server registers x-workspace/repo.* as request handlers
|
|
512
|
+
// (additionalHandlers), not notification handlers — so route notify
|
|
513
|
+
// through callExtension and ignore the (void) response.
|
|
514
|
+
const repoTransport = {
|
|
515
|
+
notify: async (method, params) => {
|
|
516
|
+
await connection.callExtension(method, params);
|
|
517
|
+
},
|
|
518
|
+
request: (method, params) => connection.callExtension(method, params),
|
|
519
|
+
};
|
|
520
|
+
const manager = new RepoManager();
|
|
521
|
+
const single = process.env.WORKSPACE_REPO_URL && process.env.WORKSPACE_LOCAL_PATH
|
|
522
|
+
? [{
|
|
523
|
+
remoteUrl: process.env.WORKSPACE_REPO_URL,
|
|
524
|
+
localPath: process.env.WORKSPACE_LOCAL_PATH,
|
|
525
|
+
}]
|
|
526
|
+
: [];
|
|
527
|
+
const multi = process.env.OPENHIVE_WORKSPACE_REPOS
|
|
528
|
+
? JSON.parse(process.env.OPENHIVE_WORKSPACE_REPOS)
|
|
529
|
+
: [];
|
|
530
|
+
for (const cfg of [...single, ...multi]) {
|
|
531
|
+
await manager.attach(cfg);
|
|
532
|
+
}
|
|
533
|
+
if (manager.list().length > 0) {
|
|
534
|
+
const client = new RepoClient(repoTransport);
|
|
535
|
+
await client.declare(RepoClient.snapshot(manager));
|
|
536
|
+
workspaceManager = manager;
|
|
537
|
+
workspaceTransport = repoTransport;
|
|
538
|
+
console.log(`[map-sidecar] Declared ${manager.list().length} workspace(s) to hub`);
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
catch (err) {
|
|
542
|
+
// Non-fatal — sidecar continues without workspace declarations
|
|
543
|
+
console.warn(`[map-sidecar] Workspace declare failed: ${err.message}`);
|
|
544
|
+
}
|
|
545
|
+
}
|
|
489
546
|
}
|
|
490
547
|
return {
|
|
491
548
|
async start() {
|
|
@@ -557,6 +614,12 @@ export function createMAPSidecar(deps, config) {
|
|
|
557
614
|
`${err.message ?? String(err)}`);
|
|
558
615
|
}
|
|
559
616
|
},
|
|
617
|
+
getWorkspaceManager() {
|
|
618
|
+
return workspaceManager;
|
|
619
|
+
},
|
|
620
|
+
getRepoTransport() {
|
|
621
|
+
return workspaceTransport;
|
|
622
|
+
},
|
|
560
623
|
};
|
|
561
624
|
}
|
|
562
625
|
//# sourceMappingURL=sidecar.js.map
|
package/dist/map/sidecar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAYH,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,WAAW,GAGZ,MAAM,qBAAqB,CAAC;AAE7B;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,MAAwB;IAExB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAC3H,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,iBAAiB,GAAwB,IAAI,CAAC;IAClD,IAAI,2BAA2B,GAAwB,IAAI,CAAC;IAC5D,IAAI,6BAA6B,GAAwB,IAAI,CAAC;IAC9D,IAAI,iCAAiC,GAAwB,IAAI,CAAC;IAClE,IAAI,gBAAgB,GAAuB,IAAI,CAAC;IAChD,IAAI,kBAAkB,GAA+B,IAAI,CAAC;IAC1D,IAAI,cAAc,GAAyC,IAAI,CAAC;IAEhE,yFAAyF;IACzF,mFAAmF;IACnF,MAAM,mBAAmB,GAAwB;QAC/C,eAAe,EAAE,qBAAqB;QACtC,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,KAAK;YACzD,iBAAiB,EACd,OAAO,CAAC,GAAG,CAAC,6BAGG,IAAI,WAAW;SAClC;QACD,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;KACxB,CAAC;IAEF;;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,iBAAiB,EAAE,CAAC;YACtB,IAAI,CAAC;gBAAC,iBAAiB,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACzD,iBAAiB,GAAG,IAAI,CAAC;QAC3B,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,6BAA6B,EAAE,CAAC;YAClC,IAAI,CAAC;gBAAC,6BAA6B,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACrE,6BAA6B,GAAG,IAAI,CAAC;QACvC,CAAC;QACD,IAAI,2BAA2B,EAAE,CAAC;YAChC,IAAI,CAAC;gBAAC,2BAA2B,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACnE,2BAA2B,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,IAAI,iCAAiC,EAAE,CAAC;YACtC,IAAI,CAAC;gBAAC,iCAAiC,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACzE,iCAAiC,GAAG,IAAI,CAAC;QAC3C,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;QAClB,gBAAgB,GAAG,IAAI,CAAC;QACxB,kBAAkB,GAAG,IAAI,CAAC;IAC5B,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;oBACD,SAAS,EAAE,mBAAmB;iBAC/B;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,MAAM,oBAAoB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAC;QAC3D,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,yEAAyE;QACzE,qEAAqE;QACrE,kEAAkE;QAClE,8CAA8C;QAC9C,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC7D,iBAAiB,GAAG,MAAM,eAAe,CAAC;YACxC,UAAU;YACV,YAAY;YACZ,iBAAiB;YACjB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;SAC/B,CAAC,CAAC;QAEH,kEAAkE;QAClE,EAAE;QACF,qEAAqE;QACrE,gEAAgE;QAChE,iEAAiE;QACjE,+DAA+D;QAC/D,EAAE;QACF,+CAA+C;QAC/C,sEAAsE;QACtE,gEAAgE;QAChE,6DAA6D;QAC7D,2BAA2B;QAC3B,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAC/C,oCAAoC,CACrC,CAAC;QACF,MAAM,EACJ,uBAAuB,EACvB,kBAAkB,EAAE,aAAa,EACjC,mCAAmC,EACnC,oCAAoC,GACrC,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAE1C,MAAM,gBAAgB,GAAG,CACvB,cAAsB,EACgB,EAAE,CACxC,KAAK,EAAE,MAAM,EAAE,EAAE;YACf,MAAM,uBAAuB,CAAC;gBAC5B,MAAM;gBACN,OAAO,EAAE;oBACP,KAAK,CAAC,KAAK,CAAC,GAAG;wBACb,OAAO,wBAAwB,CAC7B,GAAgE,EAChE;4BACE,YAAY;4BACZ,+CAA+C;4BAC/C,yDAAyD;4BACzD,qDAAqD;4BACrD,sBAAsB,EAAE,oBAAoB;4BAC5C,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;yBAC/B,CACF,CAAC;oBACJ,CAAC;iBACF;gBACD,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;oBACrC,MAAM,UAAU,CAAC,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;gBACpE,CAAC;gBACD,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;aAC/B,CAAC,CAAC;QACL,CAAC,CAAC;QAEJ,MAAM,qBAAqB,GAAG,gBAAgB,CAC5C,aAAa,CAAC,oBAAoB,CACnC,CAAC;QACF,MAAM,kBAAkB,GAAG,gBAAgB,CACzC,oCAAoC,CACrC,CAAC;QAEF,UAAU,CAAC,cAAc,CACvB,aAAa,CAAC,mBAAmB,EACjC,qBAAqB,CACtB,CAAC;QACF,UAAU,CAAC,cAAc,CACvB,mCAAmC,EACnC,kBAAkB,CACnB,CAAC;QACF,2BAA2B,GAAG,GAAG,EAAE;YACjC,IAAI,CAAC;gBACH,IAAI,OAAO,UAAU,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;oBACrD,UAAU,CAAC,eAAe,CACxB,aAAa,CAAC,mBAAmB,EACjC,qBAAqB,CACtB,CAAC;oBACF,UAAU,CAAC,eAAe,CACxB,mCAAmC,EACnC,kBAAkB,CACnB,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;QACH,CAAC,CAAC;QAEF,uEAAuE;QACvE,sEAAsE;QACtE,oEAAoE;QACpE,2DAA2D;QAC3D,sDAAsD;QACtD,qDAAqD;QACrD,sEAAsE;QACtE,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,EACJ,oBAAoB,EACpB,sBAAsB,EACtB,8BAA8B,GAC/B,GAAG,MAAM,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAEvD,iEAAiE;QACjE,kDAAkD;QAClD,4DAA4D;QAC5D,iEAAiE;QACjE,MAAM,uBAAuB,GAAG,KAAK,EACnC,MAAc,EACd,aAAiC,EACjC,MAAmD,EACpC,EAAE;YACjB,MAAM,IAAI,GAA4B,EAAE,CAAC;YACzC,IAAI,aAAa;gBAAE,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;YACvD,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YACzC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CACV,IAAI,MAAM,2BAA4B,GAAa,CAAC,OAAO,EAAE,CAC9D,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,qBAAqB,GAAG,KAAK,EAAE,MAAe,EAAiB,EAAE;YACrE,MAAM,aAAa,GAChB,MAAsC,EAAE,cAAc,CAAC;YAC1D,MAAM,MAAM,GAAG,oBAAoB,CACjC,MAAoD,EACpD,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC1B,CAAC;YACF,MAAM,uBAAuB,CAC3B,8BAA8B,CAAC,YAAY,EAC3C,aAAa,EACb,MAAM,CACP,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,MAAe,EAAiB,EAAE;YACvE,MAAM,aAAa,GAChB,MAAsC,EAAE,cAAc,CAAC;YAC1D,MAAM,MAAM,GAAG,sBAAsB,CACnC,MAAsD,EACtD,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC1B,CAAC;YACF,MAAM,uBAAuB,CAC3B,8BAA8B,CAAC,cAAc,EAC7C,aAAa,EACb,MAAM,CACP,CAAC;QACJ,CAAC,CAAC;QAEF,UAAU,CAAC,cAAc,CACvB,8BAA8B,CAAC,WAAW,EAC1C,qBAAqB,CACtB,CAAC;QACF,UAAU,CAAC,cAAc,CACvB,8BAA8B,CAAC,aAAa,EAC5C,uBAAuB,CACxB,CAAC;QACF,iCAAiC,GAAG,GAAG,EAAE;YACvC,IAAI,CAAC;gBACH,IAAI,OAAO,UAAU,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;oBACrD,UAAU,CAAC,eAAe,CACxB,8BAA8B,CAAC,WAAW,EAC1C,qBAAqB,CACtB,CAAC;oBACF,UAAU,CAAC,eAAe,CACxB,8BAA8B,CAAC,aAAa,EAC5C,uBAAuB,CACxB,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;QACH,CAAC,CAAC;QAEF,mEAAmE;QACnE,qEAAqE;QACrE,iEAAiE;QACjE,iEAAiE;QACjE,sEAAsE;QACtE,uEAAuE;QACvE,0CAA0C;QAC1C,EAAE;QACF,oEAAoE;QACpE,8DAA8D;QAC9D,6CAA6C;QAC7C,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAe,EAAiB,EAAE;YACtE,MAAM,CAAC,GAAG,MAMG,CAAC;YACd,MAAM,SAAS,GAAG,CAAC,EAAE,WAAW,CAAC;YACjC,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,CAAC;YAC7B,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CACV,0EAA0E,CAC3E,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,YAAY,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CACV,4CAA4C,SAAS,mCAAmC,CACzF,CAAC;gBACF,OAAO;YACT,CAAC;YACD,sEAAsE;YACtE,6DAA6D;YAC7D,yCAAyC;YACzC,EAAE;YACF,sEAAsE;YACtE,mEAAmE;YACnE,qDAAqD;YACrD,iEAAiE;YACjE,+DAA+D;YAC/D,kCAAkC;YAClC,MAAM,GAAG,GAAG,QAA6D,CAAC;YAC1E,MAAM,cAAc,GAClB,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,KAAK,QAAQ;gBACtD,CAAC,CAAE,GAAG,CAAC,IAAI,CAAC,eAA0B;gBACtC,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,OAAO,GACX,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI;gBAClB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;gBACtC,CAAC,CAAE,QAAoC,CAAC;YAC5C,MAAM,iBAAiB,GAA4B;gBACjD,IAAI,EAAE,MAAM;gBACZ,GAAG,OAAO;gBACV,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,YAAY,CAAC,IAAI,CACpB,CAAC,EAAE,aAAoC,IAAI,cAAc,EAC1D,YAAY,EACZ,iBAA0B,EAC1B,EAAE,UAAU,EAAE,QAAQ,EAAE,CACzB,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CACV,wDAAwD,YAAY,IAAI;oBACtE,GAAI,GAAa,CAAC,OAAO,EAAE,CAC9B,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QACF,oEAAoE;QACpE,oEAAoE;QACpE,8DAA8D;QAC9D,mEAAmE;QACnE,oEAAoE;QACpE,wCAAwC;QACxC,MAAM,EACJ,kBAAkB,EAClB,kCAAkC,GACnC,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAC1C,UAAU,CAAC,cAAc,CACvB,kBAAkB,CAAC,OAAO,EAC1B,sBAAsB,CACvB,CAAC;QACF,UAAU,CAAC,cAAc,CACvB,kCAAkC,EAClC,sBAAsB,CACvB,CAAC;QACF,6BAA6B,GAAG,GAAG,EAAE;YACnC,IAAI,CAAC;gBACH,IAAI,OAAO,UAAU,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;oBACrD,UAAU,CAAC,eAAe,CACxB,kBAAkB,CAAC,OAAO,EAC1B,sBAAsB,CACvB,CAAC;oBACF,UAAU,CAAC,eAAe,CACxB,kCAAkC,EAClC,sBAAsB,CACvB,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;QACH,CAAC,CAAC;QAEF,6FAA6F;QAC7F,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;YAEzE,qEAAqE;YACrE,MAAM,EAAE,0BAA0B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACnF,MAAM,aAAa,GAAG,0BAA0B,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;YAEhF,oBAAoB,GAAG,GAAG,EAAE;gBAC1B,aAAa,CAAC,OAAO,EAAE,CAAC;gBACxB,aAAa,EAAE,CAAC;YAClB,CAAC,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,8EAA8E;QAC9E,4EAA4E;QAC5E,+EAA+E;QAC/E,IAAI,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,yEAAyE;gBACzE,oEAAoE;gBACpE,wDAAwD;gBACxD,MAAM,aAAa,GAAwB;oBACzC,MAAM,EAAE,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;wBAChD,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBACjD,CAAC;oBACD,OAAO,EAAE,CAAC,MAAc,EAAE,MAAe,EAAE,EAAE,CAC3C,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC;iBAC3C,CAAC;gBACF,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;gBAClC,MAAM,MAAM,GACV,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB;oBAChE,CAAC,CAAC,CAAC;4BACC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;4BACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;yBAC5C,CAAC;oBACJ,CAAC,CAAC,EAAE,CAAC;gBACT,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB;oBAChD,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAG7C;oBACL,CAAC,CAAC,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;oBACxC,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC5B,CAAC;gBACD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;oBAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;oBACnD,gBAAgB,GAAG,OAAO,CAAC;oBAC3B,kBAAkB,GAAG,aAAa,CAAC;oBACnC,OAAO,CAAC,GAAG,CACT,0BAA0B,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,sBAAsB,CACtE,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,+DAA+D;gBAC/D,OAAO,CAAC,IAAI,CACV,2CAA4C,GAAa,CAAC,OAAO,EAAE,CACpE,CAAC;YACJ,CAAC;QACH,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;QAED,KAAK,CAAC,SAAS,CAAC,KAA8B;YAC5C,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW;gBAAE,OAAO;YACxC,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;YACzE,CAAC;YAAC,MAAM,CAAC;gBACP,uDAAuD;YACzD,CAAC;QACH,CAAC;QAED,KAAK,CAAC,YAAY,CAChB,cAAsB,EACtB,aAAqB,EACrB,OAAe;YAEf,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;gBAChC,OAAO,CAAC,IAAI,CACV,kDAAkD,CAAC,CAAC,UAAU,GAAG;oBAC/D,eAAe,WAAW,UAAU,cAAc,EAAE,CACvD,CAAC;gBACF,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE;oBAC7C,cAAc;oBACd,aAAa;oBACb,WAAW,EAAE,YAAY;oBACzB,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,gEAAgE;gBAChE,oDAAoD;gBACpD,OAAO,CAAC,IAAI,CACV,8CAA8C,cAAc,IAAI;oBAC9D,GAAI,GAAa,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAC7C,CAAC;YACJ,CAAC;QACH,CAAC;QAED,mBAAmB;YACjB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,gBAAgB;YACd,OAAO,kBAAkB,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/map/types.d.ts
CHANGED
|
@@ -89,6 +89,20 @@ export interface MAPSidecar {
|
|
|
89
89
|
* No-op if disconnected.
|
|
90
90
|
*/
|
|
91
91
|
postMailTurn?(conversationId: string, participantId: string, content: string): Promise<void>;
|
|
92
|
+
/**
|
|
93
|
+
* Access the sidecar's workspace RepoManager (if workspace declarations
|
|
94
|
+
* are enabled and the sidecar is connected). Used by mail-inbound-consumer
|
|
95
|
+
* for pre-spawn repo mount.
|
|
96
|
+
*/
|
|
97
|
+
getWorkspaceManager?(): unknown;
|
|
98
|
+
/**
|
|
99
|
+
* Access the sidecar's repo client transport for declaring newly-attached
|
|
100
|
+
* repos to the hub. Used by mail-inbound-consumer after pre-spawn clone.
|
|
101
|
+
*/
|
|
102
|
+
getRepoTransport?(): {
|
|
103
|
+
notify(method: string, params: unknown): Promise<void>;
|
|
104
|
+
request(method: string, params: unknown): Promise<unknown>;
|
|
105
|
+
} | null;
|
|
92
106
|
}
|
|
93
107
|
/**
|
|
94
108
|
* Trajectory checkpoint payload — matches cc-swarm wire format.
|
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;IAC3B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC7D;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,OAAO,qCAAqC,EAAE,iBAAiB,CAAC;IAEpF;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAMD,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,iDAAiD;IACjD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,kDAAkD;IAClD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,8CAA8C;IAC9C,gBAAgB,CACd,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;IAE9C,oFAAoF;IACpF,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1D;;;;;OAKG;IACH,YAAY,CAAC,CACX,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "macro-agent",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"description": "Interact with multiple agents as if they were a single agent.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -52,7 +52,8 @@
|
|
|
52
52
|
"@modelcontextprotocol/sdk": "^1.25.1",
|
|
53
53
|
"@multi-agent-protocol/sdk": "^0.1.12",
|
|
54
54
|
"acp-factory": "^0.1.14",
|
|
55
|
-
"agent-inbox": "^0.2.
|
|
55
|
+
"agent-inbox": "^0.2.3",
|
|
56
|
+
"agent-workspace": "^0.1.5",
|
|
56
57
|
"better-sqlite3": "^12.5.0",
|
|
57
58
|
"chalk": "^5.6.2",
|
|
58
59
|
"commander": "^14.0.2",
|
package/src/acp/macro-agent.ts
CHANGED
|
@@ -205,18 +205,22 @@ export function createMacroAgent(
|
|
|
205
205
|
method: string,
|
|
206
206
|
params: Record<string, unknown>,
|
|
207
207
|
): Promise<Record<string, unknown>> {
|
|
208
|
+
const normalizedMethod = method.startsWith("macro/")
|
|
209
|
+
? `_${method}`
|
|
210
|
+
: method;
|
|
211
|
+
|
|
208
212
|
// Check if it's a stubbed peer method
|
|
209
213
|
if (
|
|
210
|
-
(STUBBED_PEER_EXTENSIONS as readonly string[]).includes(
|
|
214
|
+
(STUBBED_PEER_EXTENSIONS as readonly string[]).includes(normalizedMethod)
|
|
211
215
|
) {
|
|
212
216
|
throw new ACPError(
|
|
213
|
-
`Peer manager not available: ${
|
|
217
|
+
`Peer manager not available: ${normalizedMethod}`,
|
|
214
218
|
"NO_PEER_MANAGER",
|
|
215
|
-
{ method },
|
|
219
|
+
{ method: normalizedMethod },
|
|
216
220
|
);
|
|
217
221
|
}
|
|
218
222
|
|
|
219
|
-
switch (
|
|
223
|
+
switch (normalizedMethod as SupportedExtension) {
|
|
220
224
|
case "_macro/spawnAgent": {
|
|
221
225
|
const task = params.task as string;
|
|
222
226
|
if (!task) throw RequestError.invalidParams(params, "task is required");
|
|
@@ -226,6 +230,7 @@ export function createMacroAgent(
|
|
|
226
230
|
cwd: (params.cwd as string) ?? defaultCwd,
|
|
227
231
|
role: params.role as string | undefined,
|
|
228
232
|
permissionMode: params.permissionMode as "auto-approve" | undefined,
|
|
233
|
+
askForAllTools: params.askForAllTools as boolean | undefined,
|
|
229
234
|
});
|
|
230
235
|
return {
|
|
231
236
|
agentId: spawned.id,
|
|
@@ -837,45 +842,18 @@ export function createMacroAgent(
|
|
|
837
842
|
}
|
|
838
843
|
|
|
839
844
|
// Handle permission requests from the underlying agent.
|
|
840
|
-
// When the agent is in interactive mode,
|
|
841
|
-
// PermissionRequestUpdate objects
|
|
842
|
-
//
|
|
843
|
-
//
|
|
845
|
+
// When the agent is in interactive mode, acp-factory yields
|
|
846
|
+
// PermissionRequestUpdate objects. Forward them as session updates
|
|
847
|
+
// instead of AgentSideConnection.requestPermission(): MAP-routed
|
|
848
|
+
// browser clients already consume session/update, and replies come
|
|
849
|
+
// back through _macro/respondToPermission or _macro/cancelPermission.
|
|
844
850
|
if (isPermissionRequestUpdate(update)) {
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
status: update.toolCall.status as any,
|
|
852
|
-
rawInput: update.toolCall.rawInput,
|
|
853
|
-
},
|
|
854
|
-
options: update.options,
|
|
855
|
-
});
|
|
856
|
-
// Relay the permission response back to the agent.
|
|
857
|
-
// ACP response: { outcome: { outcome: "selected", optionId } | { outcome: "cancelled" } }
|
|
858
|
-
const outcome = permResponse?.outcome;
|
|
859
|
-
if (outcome) {
|
|
860
|
-
if (outcome.outcome === "selected" && "optionId" in outcome) {
|
|
861
|
-
agentManager.respondToPermission(
|
|
862
|
-
agentId,
|
|
863
|
-
update.requestId,
|
|
864
|
-
outcome.optionId,
|
|
865
|
-
);
|
|
866
|
-
} else if (outcome.outcome === "cancelled") {
|
|
867
|
-
agentManager.cancelPermission(agentId, update.requestId);
|
|
868
|
-
}
|
|
869
|
-
}
|
|
870
|
-
} catch {
|
|
871
|
-
// If the permission request fails (e.g., client disconnected),
|
|
872
|
-
// cancel it so the agent doesn't hang.
|
|
873
|
-
try {
|
|
874
|
-
agentManager.cancelPermission(agentId, update.requestId);
|
|
875
|
-
} catch {
|
|
876
|
-
// Best effort
|
|
877
|
-
}
|
|
878
|
-
}
|
|
851
|
+
const forwardedUpdate = { ...update, _agentId: agentId };
|
|
852
|
+
appendSessionUpdate(params.sessionId, forwardedUpdate as any);
|
|
853
|
+
await connection.sessionUpdate({
|
|
854
|
+
sessionId: params.sessionId,
|
|
855
|
+
update: forwardedUpdate as any,
|
|
856
|
+
});
|
|
879
857
|
continue;
|
|
880
858
|
}
|
|
881
859
|
|
package/src/boot-v2.ts
CHANGED
|
@@ -592,6 +592,8 @@ export async function bootV2(
|
|
|
592
592
|
agentManager,
|
|
593
593
|
agentStore,
|
|
594
594
|
getSidecar: () => (systemRef as any).mapSidecar ?? null,
|
|
595
|
+
getRepoManager: () => (systemRef as any).mapSidecar?.getWorkspaceManager?.() ?? null,
|
|
596
|
+
getRepoTransport: () => (systemRef as any).mapSidecar?.getRepoTransport?.() ?? null,
|
|
595
597
|
log: (msg) => console.log(msg),
|
|
596
598
|
});
|
|
597
599
|
|
|
@@ -586,4 +586,215 @@ describe("createMailInboundConsumer", () => {
|
|
|
586
586
|
expect(consumer.stats().seenTaskIds).toBe(1);
|
|
587
587
|
expect(consumer.stats().droppedMalformed).toBe(2);
|
|
588
588
|
});
|
|
589
|
+
|
|
590
|
+
// ── Pre-spawn repo mount ──────────────────────────────────────────
|
|
591
|
+
|
|
592
|
+
describe("pre-spawn repo mount", () => {
|
|
593
|
+
function workEnvelopeWithRepo(
|
|
594
|
+
taskId: string,
|
|
595
|
+
prompt: string,
|
|
596
|
+
repoMeta: Record<string, unknown>,
|
|
597
|
+
conversationId?: string,
|
|
598
|
+
): InboxMessageEvent {
|
|
599
|
+
return {
|
|
600
|
+
agentId: DISPATCHER_ID,
|
|
601
|
+
message: {
|
|
602
|
+
id: `msg-${taskId}`,
|
|
603
|
+
content: {
|
|
604
|
+
schema: "x-dispatch/work",
|
|
605
|
+
data: {
|
|
606
|
+
taskId,
|
|
607
|
+
prompt,
|
|
608
|
+
role: "worker",
|
|
609
|
+
metadata: repoMeta,
|
|
610
|
+
},
|
|
611
|
+
...(conversationId ? { _conversationId: conversationId } : {}),
|
|
612
|
+
},
|
|
613
|
+
},
|
|
614
|
+
};
|
|
615
|
+
}
|
|
616
|
+
|
|
617
|
+
function makeRepoManager(existingRepos: Array<{ canonicalUrl: string; localPath: string }> = []) {
|
|
618
|
+
const attached: Array<{ remoteUrl: string; localPath: string }> = [];
|
|
619
|
+
return {
|
|
620
|
+
manager: {
|
|
621
|
+
list: () =>
|
|
622
|
+
[
|
|
623
|
+
...existingRepos.map((r) => ({
|
|
624
|
+
identity: { canonicalUrl: r.canonicalUrl },
|
|
625
|
+
localPath: r.localPath,
|
|
626
|
+
})),
|
|
627
|
+
...attached.map((r) => ({
|
|
628
|
+
identity: { canonicalUrl: r.remoteUrl },
|
|
629
|
+
localPath: r.localPath,
|
|
630
|
+
})),
|
|
631
|
+
],
|
|
632
|
+
attach: vi.fn(async (config: { remoteUrl: string; localPath: string }) => {
|
|
633
|
+
attached.push(config);
|
|
634
|
+
return { localPath: config.localPath };
|
|
635
|
+
}),
|
|
636
|
+
},
|
|
637
|
+
attached,
|
|
638
|
+
};
|
|
639
|
+
}
|
|
640
|
+
|
|
641
|
+
it("passes cwd from already-attached repo to spawn", async () => {
|
|
642
|
+
const repo = makeRepoManager([
|
|
643
|
+
{ canonicalUrl: "https://github.com/org/repo.git", localPath: "/repos/repo" },
|
|
644
|
+
]);
|
|
645
|
+
const logs: string[] = [];
|
|
646
|
+
|
|
647
|
+
createMailInboundConsumer({
|
|
648
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
649
|
+
inboxEvents,
|
|
650
|
+
agentManager: am.manager as AgentManager,
|
|
651
|
+
agentStore: store as AgentStore,
|
|
652
|
+
getSidecar: () => sidecar,
|
|
653
|
+
getRepoManager: () => repo.manager,
|
|
654
|
+
log: (m) => logs.push(m),
|
|
655
|
+
});
|
|
656
|
+
|
|
657
|
+
inboxEvents.fire(
|
|
658
|
+
workEnvelopeWithRepo("task-repo-1", "work on repo", {
|
|
659
|
+
repo_id: "repo_abc",
|
|
660
|
+
canonical_url: "https://github.com/org/repo.git",
|
|
661
|
+
}),
|
|
662
|
+
);
|
|
663
|
+
|
|
664
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
665
|
+
|
|
666
|
+
expect(am.spawnFn).toHaveBeenCalledOnce();
|
|
667
|
+
expect(am.spawnFn).toHaveBeenCalledWith(
|
|
668
|
+
expect.objectContaining({ cwd: "/repos/repo" }),
|
|
669
|
+
);
|
|
670
|
+
expect(logs.some((l) => l.includes("already attached"))).toBe(true);
|
|
671
|
+
});
|
|
672
|
+
|
|
673
|
+
it("spawns without cwd when clone_policy is not 'allowed' and repo not attached", async () => {
|
|
674
|
+
const repo = makeRepoManager([]);
|
|
675
|
+
const logs: string[] = [];
|
|
676
|
+
|
|
677
|
+
createMailInboundConsumer({
|
|
678
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
679
|
+
inboxEvents,
|
|
680
|
+
agentManager: am.manager as AgentManager,
|
|
681
|
+
agentStore: store as AgentStore,
|
|
682
|
+
getSidecar: () => sidecar,
|
|
683
|
+
getRepoManager: () => repo.manager,
|
|
684
|
+
log: (m) => logs.push(m),
|
|
685
|
+
});
|
|
686
|
+
|
|
687
|
+
inboxEvents.fire(
|
|
688
|
+
workEnvelopeWithRepo("task-repo-2", "work", {
|
|
689
|
+
repo_id: "repo_xyz",
|
|
690
|
+
canonical_url: "https://github.com/org/other.git",
|
|
691
|
+
}),
|
|
692
|
+
);
|
|
693
|
+
|
|
694
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
695
|
+
|
|
696
|
+
expect(am.spawnFn).toHaveBeenCalledOnce();
|
|
697
|
+
// No cwd passed — clone_policy defaults to 'none'
|
|
698
|
+
const spawnArgs = am.spawnFn.mock.calls[0]![0] as Record<string, unknown>;
|
|
699
|
+
expect(spawnArgs.cwd).toBeUndefined();
|
|
700
|
+
expect(logs.some((l) => l.includes("skipping mount"))).toBe(true);
|
|
701
|
+
});
|
|
702
|
+
|
|
703
|
+
it("spawns without cwd when no repo metadata in envelope", async () => {
|
|
704
|
+
const repo = makeRepoManager([]);
|
|
705
|
+
|
|
706
|
+
createMailInboundConsumer({
|
|
707
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
708
|
+
inboxEvents,
|
|
709
|
+
agentManager: am.manager as AgentManager,
|
|
710
|
+
agentStore: store as AgentStore,
|
|
711
|
+
getSidecar: () => sidecar,
|
|
712
|
+
getRepoManager: () => repo.manager,
|
|
713
|
+
});
|
|
714
|
+
|
|
715
|
+
// Standard envelope without repo metadata
|
|
716
|
+
inboxEvents.fire(workEnvelope("task-no-repo", "plain work"));
|
|
717
|
+
|
|
718
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
719
|
+
|
|
720
|
+
expect(am.spawnFn).toHaveBeenCalledOnce();
|
|
721
|
+
const spawnArgs = am.spawnFn.mock.calls[0]![0] as Record<string, unknown>;
|
|
722
|
+
expect(spawnArgs.cwd).toBeUndefined();
|
|
723
|
+
});
|
|
724
|
+
|
|
725
|
+
it("spawns without cwd when getRepoManager is not provided", async () => {
|
|
726
|
+
createMailInboundConsumer({
|
|
727
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
728
|
+
inboxEvents,
|
|
729
|
+
agentManager: am.manager as AgentManager,
|
|
730
|
+
agentStore: store as AgentStore,
|
|
731
|
+
getSidecar: () => sidecar,
|
|
732
|
+
// no getRepoManager
|
|
733
|
+
});
|
|
734
|
+
|
|
735
|
+
inboxEvents.fire(
|
|
736
|
+
workEnvelopeWithRepo("task-no-mgr", "work", {
|
|
737
|
+
repo_id: "repo_abc",
|
|
738
|
+
canonical_url: "https://github.com/org/repo.git",
|
|
739
|
+
clone_policy: "allowed",
|
|
740
|
+
}),
|
|
741
|
+
);
|
|
742
|
+
|
|
743
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
744
|
+
|
|
745
|
+
expect(am.spawnFn).toHaveBeenCalledOnce();
|
|
746
|
+
const spawnArgs = am.spawnFn.mock.calls[0]![0] as Record<string, unknown>;
|
|
747
|
+
expect(spawnArgs.cwd).toBeUndefined();
|
|
748
|
+
});
|
|
749
|
+
|
|
750
|
+
it("spawns without cwd when canonical_url is missing from repo metadata", async () => {
|
|
751
|
+
const repo = makeRepoManager([]);
|
|
752
|
+
|
|
753
|
+
createMailInboundConsumer({
|
|
754
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
755
|
+
inboxEvents,
|
|
756
|
+
agentManager: am.manager as AgentManager,
|
|
757
|
+
agentStore: store as AgentStore,
|
|
758
|
+
getSidecar: () => sidecar,
|
|
759
|
+
getRepoManager: () => repo.manager,
|
|
760
|
+
});
|
|
761
|
+
|
|
762
|
+
inboxEvents.fire(
|
|
763
|
+
workEnvelopeWithRepo("task-no-url", "work", {
|
|
764
|
+
repo_id: "repo_abc",
|
|
765
|
+
// no canonical_url
|
|
766
|
+
}),
|
|
767
|
+
);
|
|
768
|
+
|
|
769
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
770
|
+
|
|
771
|
+
expect(am.spawnFn).toHaveBeenCalledOnce();
|
|
772
|
+
const spawnArgs = am.spawnFn.mock.calls[0]![0] as Record<string, unknown>;
|
|
773
|
+
expect(spawnArgs.cwd).toBeUndefined();
|
|
774
|
+
});
|
|
775
|
+
|
|
776
|
+
it("logs repo_id in the received message log line", async () => {
|
|
777
|
+
const logs: string[] = [];
|
|
778
|
+
|
|
779
|
+
createMailInboundConsumer({
|
|
780
|
+
dispatcherAgentId: DISPATCHER_ID,
|
|
781
|
+
inboxEvents,
|
|
782
|
+
agentManager: am.manager as AgentManager,
|
|
783
|
+
agentStore: store as AgentStore,
|
|
784
|
+
getSidecar: () => sidecar,
|
|
785
|
+
log: (m) => logs.push(m),
|
|
786
|
+
});
|
|
787
|
+
|
|
788
|
+
inboxEvents.fire(
|
|
789
|
+
workEnvelopeWithRepo("task-log", "work", {
|
|
790
|
+
repo_id: "repo_visible",
|
|
791
|
+
canonical_url: "https://github.com/org/visible.git",
|
|
792
|
+
}),
|
|
793
|
+
);
|
|
794
|
+
|
|
795
|
+
await new Promise((r) => setTimeout(r, 20));
|
|
796
|
+
|
|
797
|
+
expect(logs.some((l) => l.includes("repo=repo_visible"))).toBe(true);
|
|
798
|
+
});
|
|
799
|
+
});
|
|
589
800
|
});
|