@agents-ensemble/core 0.7.0 → 0.9.0
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/conductor/conductor-auth.d.ts +36 -6
- package/dist/conductor/conductor-auth.d.ts.map +1 -1
- package/dist/conductor/conductor-auth.js +59 -7
- package/dist/conductor/conductor-auth.js.map +1 -1
- package/dist/conductor/conductor-pi-auth.d.ts +75 -0
- package/dist/conductor/conductor-pi-auth.d.ts.map +1 -0
- package/dist/conductor/conductor-pi-auth.js +656 -0
- package/dist/conductor/conductor-pi-auth.js.map +1 -0
- package/dist/conductor/conductor-session-driver.d.ts +2 -0
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +18 -1
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +69 -7
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/conductor-tool-pi-adapter.d.ts +6 -8
- package/dist/conductor/conductor-tool-pi-adapter.d.ts.map +1 -1
- package/dist/conductor/conductor-tool-pi-adapter.js +5 -8
- package/dist/conductor/conductor-tool-pi-adapter.js.map +1 -1
- package/dist/conductor/index.d.ts +7 -8
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +4 -4
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/list-conductor-models.d.ts +7 -2
- package/dist/conductor/list-conductor-models.d.ts.map +1 -1
- package/dist/conductor/list-conductor-models.js +9 -1
- package/dist/conductor/list-conductor-models.js.map +1 -1
- package/dist/conductor/pi-conductor-agent.d.ts +23 -6
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +317 -130
- package/dist/conductor/pi-conductor-agent.js.map +1 -1
- package/dist/conductor/pi-resource-loader.d.ts +7 -4
- package/dist/conductor/pi-resource-loader.d.ts.map +1 -1
- package/dist/conductor/pi-resource-loader.js +6 -4
- package/dist/conductor/pi-resource-loader.js.map +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts +14 -0
- package/dist/conductor/session/dispatch-hold.d.ts.map +1 -1
- package/dist/conductor/session/dispatch-hold.js +30 -0
- package/dist/conductor/session/dispatch-hold.js.map +1 -1
- package/dist/conductor/session/events/index.d.ts +1 -1
- package/dist/conductor/session/events/index.d.ts.map +1 -1
- package/dist/conductor/session/events/index.js.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +2 -2
- package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.js +1 -0
- package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
- package/dist/conductor/session/events/session-log-event.d.ts +10 -1
- package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
- package/dist/conductor/session/format-session-event.js +3 -0
- package/dist/conductor/session/format-session-event.js.map +1 -1
- package/dist/conductor/session/session-logger.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.js +1 -0
- package/dist/conductor/session/session-logger.js.map +1 -1
- package/dist/github/fetch-github-updates.d.ts.map +1 -1
- package/dist/github/fetch-github-updates.js +109 -80
- package/dist/github/fetch-github-updates.js.map +1 -1
- package/dist/github/github-client.d.ts.map +1 -1
- package/dist/github/github-client.js +8 -0
- package/dist/github/github-client.js.map +1 -1
- package/dist/github/github-monitor-cursor.d.ts +19 -8
- package/dist/github/github-monitor-cursor.d.ts.map +1 -1
- package/dist/github/github-monitor-cursor.js +8 -52
- package/dist/github/github-monitor-cursor.js.map +1 -1
- package/dist/github/github-monitor.d.ts +2 -0
- package/dist/github/github-monitor.d.ts.map +1 -1
- package/dist/github/github-monitor.js +13 -0
- package/dist/github/github-monitor.js.map +1 -1
- package/dist/github/github-test-fixtures.d.ts +9 -0
- package/dist/github/github-test-fixtures.d.ts.map +1 -1
- package/dist/github/github-test-fixtures.js +6 -0
- package/dist/github/github-test-fixtures.js.map +1 -1
- package/dist/github/github-update-types.d.ts +10 -0
- package/dist/github/github-update-types.d.ts.map +1 -1
- package/dist/github/index.d.ts +3 -1
- package/dist/github/index.d.ts.map +1 -1
- package/dist/github/index.js +1 -0
- package/dist/github/index.js.map +1 -1
- package/dist/github/register-github-watch-tool.d.ts +5 -0
- package/dist/github/register-github-watch-tool.d.ts.map +1 -1
- package/dist/github/register-github-watch-tool.js +30 -24
- package/dist/github/register-github-watch-tool.js.map +1 -1
- package/dist/github/unregister-github-watch-tool.d.ts +11 -0
- package/dist/github/unregister-github-watch-tool.d.ts.map +1 -0
- package/dist/github/unregister-github-watch-tool.js +52 -0
- package/dist/github/unregister-github-watch-tool.js.map +1 -0
- package/dist/mcp/load-mcp-config.d.ts +8 -0
- package/dist/mcp/load-mcp-config.d.ts.map +1 -1
- package/dist/mcp/load-mcp-config.js +24 -0
- package/dist/mcp/load-mcp-config.js.map +1 -1
- package/dist/prompt/modules/ensemble/base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/base-module.js +2 -1
- package/dist/prompt/modules/ensemble/base-module.js.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js +4 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
- package/dist/runtime/worker-session.d.ts +5 -0
- package/dist/runtime/worker-session.d.ts.map +1 -1
- package/dist/runtime/worker-session.js +5 -1
- package/dist/runtime/worker-session.js.map +1 -1
- package/dist/session/session-sidecar.d.ts +6 -0
- package/dist/session/session-sidecar.d.ts.map +1 -1
- package/dist/session/session-sidecar.js +17 -0
- package/dist/session/session-sidecar.js.map +1 -1
- package/package.json +4 -4
- package/dist/conductor/pi-conductor-session.d.ts +0 -20
- package/dist/conductor/pi-conductor-session.d.ts.map +0 -1
- package/dist/conductor/pi-conductor-session.js +0 -60
- package/dist/conductor/pi-conductor-session.js.map +0 -1
- package/dist/conductor/pi-mcp-bridge.d.ts +0 -65
- package/dist/conductor/pi-mcp-bridge.d.ts.map +0 -1
- package/dist/conductor/pi-mcp-bridge.js +0 -259
- package/dist/conductor/pi-mcp-bridge.js.map +0 -1
|
@@ -15,6 +15,8 @@ export const conductorBaseModule = {
|
|
|
15
15
|
'- 作業フローの連鎖(Issue の明確さ → worker の自律実行 → オペレータのゲート)が途切れないよう調整する。',
|
|
16
16
|
'- Issue / PR を正本とし、`prompt_worker` で常駐 worker に作業を指示する。',
|
|
17
17
|
'- チーム内の出来事を非同期で処理する必要があります。`Await` ツールは使わないようにしてください',
|
|
18
|
+
'- conductor からオペレータに対してエスカレーションするときは、必ずOpen Questionの機構を利用する',
|
|
19
|
+
'- オペレータからの問いかけがあったとき、 conductor はオペレータと対話を優先し、作業の手を止めて集中する',
|
|
18
20
|
{
|
|
19
21
|
type: 'subsection',
|
|
20
22
|
title: 'harnessからのイベント',
|
|
@@ -84,7 +86,8 @@ export const conductorBaseModule = {
|
|
|
84
86
|
items: [
|
|
85
87
|
'- implementer から PR 作成の報告を受けたら、GitHub Search の反映を待たず `register_github_watch` で監視登録する',
|
|
86
88
|
'- `register_github_watch` には `prNumber` または `prUrl` を渡す。同じリポジトリの PR だけを登録する',
|
|
87
|
-
'- `kinds` を省略すると PR review / review comment / CI
|
|
89
|
+
'- `kinds` を省略すると PR review / review comment / CI 集約状態遷移を監視する。登録済み PR の再登録は不要',
|
|
90
|
+
'- PR がマージ完了・誤登録・監視不要になったら `unregister_github_watch` で明示登録を解除する。Search に残る PR は引き続き監視される',
|
|
88
91
|
],
|
|
89
92
|
},
|
|
90
93
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAkC;IAChE,SAAS,EAAE;QACT,+BAA+B;QAC/B,2CAA2C;KAC5C;IACD,KAAK,EAAE;QACL,wDAAwD;QACxD,qEAAqE;KACtE;IACD,YAAY,EAAE;QACZ,gEAAgE;QAChE,yDAAyD;QACzD,sDAAsD;QACtD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,gBAAgB;YACvB,KAAK,EAAE;gBACL,mCAAmC;gBACnC,wCAAwC;gBACxC,wCAAwC;gBACxC,kKAAkK;gBAClK,2CAA2C;aAC5C;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,6FAA6F;gBAC7F,8HAA8H;gBAC9H,+LAA+L;gBAC/L,wCAAwC;aACzC;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE;gBACL,sDAAsD;gBACtD,gFAAgF;gBAChF,gDAAgD;gBAChD,mFAAmF;aACpF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,gDAAgD;gBAChD,2CAA2C;gBAC3C,oCAAoC;gBACpC,2EAA2E;gBAC3E,qDAAqD;gBACrD,4EAA4E;aAC7E;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,iGAAiG;gBACjG,yEAAyE;gBACzE,iEAAiE;gBACjE,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,8FAA8F;gBAC9F,uEAAuE;gBACvE,8DAA8D;gBAC9D,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE;gBACL,sFAAsF;gBACtF,6EAA6E;gBAC7E,
|
|
1
|
+
{"version":3,"file":"conductor-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAkC;IAChE,SAAS,EAAE;QACT,+BAA+B;QAC/B,2CAA2C;KAC5C;IACD,KAAK,EAAE;QACL,wDAAwD;QACxD,qEAAqE;KACtE;IACD,YAAY,EAAE;QACZ,gEAAgE;QAChE,yDAAyD;QACzD,sDAAsD;QACtD,8DAA8D;QAC9D,4DAA4D;QAC5D;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,gBAAgB;YACvB,KAAK,EAAE;gBACL,mCAAmC;gBACnC,wCAAwC;gBACxC,wCAAwC;gBACxC,kKAAkK;gBAClK,2CAA2C;aAC5C;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,6FAA6F;gBAC7F,8HAA8H;gBAC9H,+LAA+L;gBAC/L,wCAAwC;aACzC;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE;gBACL,sDAAsD;gBACtD,gFAAgF;gBAChF,gDAAgD;gBAChD,mFAAmF;aACpF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,gDAAgD;gBAChD,2CAA2C;gBAC3C,oCAAoC;gBACpC,2EAA2E;gBAC3E,qDAAqD;gBACrD,4EAA4E;aAC7E;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,iGAAiG;gBACjG,yEAAyE;gBACzE,iEAAiE;gBACjE,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,8FAA8F;gBAC9F,uEAAuE;gBACvE,8DAA8D;gBAC9D,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE;gBACL,sFAAsF;gBACtF,6EAA6E;gBAC7E,8EAA8E;gBAC9E,yFAAyF;aAC1F;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE;gBACL,+CAA+C;gBAC/C,8CAA8C;gBAC9C,yCAAyC;gBACzC,iCAAiC;gBACjC,uDAAuD;aACxD;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,wCAAwC;gBACxC,cAAc;gBACd,qDAAqD;gBACrD,+BAA+B;gBAC/B,qDAAqD;gBACrD,0DAA0D;aAC3D;SACF;KACF;CACF,CAAC"}
|
|
@@ -7,6 +7,7 @@ import type { ConnectWorkerAcpFn } from '../dispatch/worker-acp-session.js';
|
|
|
7
7
|
import type { SendWorkerMessageOptions, SendWorkerMessageResult } from './send-worker-message.js';
|
|
8
8
|
import type { PermissionPipeline } from '../permission/permission-pipeline.js';
|
|
9
9
|
import type { PermissionRequest } from '../permission/permission-request.js';
|
|
10
|
+
import type { PendingPermission } from '../permission/pending-permission.js';
|
|
10
11
|
import { ConductorInbox } from './conductor-inbox.js';
|
|
11
12
|
import type { WorkerFailureRecord } from './types.js';
|
|
12
13
|
import { WorkerRuntime } from './worker-runtime.js';
|
|
@@ -32,6 +33,10 @@ export interface WorkerSessionOptions {
|
|
|
32
33
|
permissionPipeline?: PermissionPipeline;
|
|
33
34
|
decidePermission?: (request: PermissionRequest, workerId: string, requestId: string) => PermissionDecision | null | Promise<PermissionDecision | null>;
|
|
34
35
|
onWorkerCompleted?: (result: WorkerDispatchResult) => void;
|
|
36
|
+
onPermissionCleanup?: (event: {
|
|
37
|
+
workerId: string;
|
|
38
|
+
entries: PendingPermission[];
|
|
39
|
+
}) => void;
|
|
35
40
|
onWorkerFailed?: (failure: WorkerFailureRecord) => void;
|
|
36
41
|
onPromptTelemetry?: (event: import('./types.js').WorkerPromptTelemetry) => void;
|
|
37
42
|
onAcpUpdate?: (event: import('./types.js').WorkerAcpUpdateTelemetry) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,YAAY,EAAE,oBAAoB,CAAC;IACnC,+CAA+C;IAC/C,sBAAsB,CAAC,EAAE,MAAM,CAC7B,MAAM,EACJ,MAAM,GACN;QACE,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;KAChC,CACJ,CAAC;IACF,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,kDAAkD;IAClD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,gBAAgB,CAAC,EAAE,CACjB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,KACd,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACpE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAChF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,QAAQ,CAAC,KAAK,iBAAwB;IACtC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAEzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAEE,OAAO,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,11 @@ export class WorkerSession {
|
|
|
40
40
|
decidePermission,
|
|
41
41
|
onWorkerCompleted: options.onWorkerCompleted,
|
|
42
42
|
onWorkerFailed: (failure) => {
|
|
43
|
-
options.permissionPipeline?.denyPendingForWorker(this.inbox, failure.workerId);
|
|
43
|
+
const entries = options.permissionPipeline?.denyPendingForWorker(this.inbox, failure.workerId) ?? [];
|
|
44
|
+
options.onPermissionCleanup?.({
|
|
45
|
+
workerId: failure.workerId,
|
|
46
|
+
entries,
|
|
47
|
+
});
|
|
44
48
|
options.onWorkerFailed?.(failure);
|
|
45
49
|
},
|
|
46
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ export interface SessionSidecar {
|
|
|
31
31
|
workers: Record<string, WorkerSessionSidecar>;
|
|
32
32
|
/** GitHub 監視カーソル(#39)。 */
|
|
33
33
|
githubMonitor?: GitHubMonitorCursor;
|
|
34
|
+
/** Harness-resolved MCP map digest used to reject unsafe resume. */
|
|
35
|
+
mcpConfigDigest?: string;
|
|
34
36
|
/** flush 時刻(Unix ms)。`--continue` で最新セッションを選ぶために使う。 */
|
|
35
37
|
updatedAt: number;
|
|
36
38
|
}
|
|
@@ -59,5 +61,9 @@ export declare function assertSessionSidecarMatches(sidecar: SessionSidecar, inp
|
|
|
59
61
|
repoRoot: string;
|
|
60
62
|
conductorAgentId: string;
|
|
61
63
|
conductorBackend?: ConductorBackend;
|
|
64
|
+
/** Current harness-resolved MCP map digest. */
|
|
65
|
+
mcpConfigDigest?: string;
|
|
66
|
+
/** Whether the current resolved map contains at least one server. */
|
|
67
|
+
mcpConfigConfigured?: boolean;
|
|
62
68
|
}): void;
|
|
63
69
|
//# sourceMappingURL=session-sidecar.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-sidecar.d.ts","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,qBAAa,2BAA4B,SAAQ,KAAK;aAIlC,gBAAgB,EAAE,MAAM;aACxB,IAAI,EAAE,MAAM;IAJ9B,QAAQ,CAAC,IAAI,+BAA+B;gBAG1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM;CAO/B;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,uBAAuB,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC9C,0BAA0B;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAE7E;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAQrC;AAED,kDAAkD;AAClD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,cAAc,CAAC,CAO1B;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CAiB3B;AAED,oDAAoD;AACpD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAWrC;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE;IACL,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-sidecar.d.ts","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,6 +91,16 @@ export function assertSessionSidecarMatches(sidecar, input) {
|
|
|
91
91
|
(sidecar.conductorBackend ?? 'cursor') !== input.conductorBackend) {
|
|
92
92
|
throw new Error(`Session sidecar conductorBackend mismatch: ${sidecar.conductorBackend ?? 'cursor'} !== ${input.conductorBackend}`);
|
|
93
93
|
}
|
|
94
|
+
if (input.mcpConfigDigest !== undefined) {
|
|
95
|
+
if (sidecar.mcpConfigDigest === undefined) {
|
|
96
|
+
if (input.mcpConfigConfigured) {
|
|
97
|
+
throw new Error('Session sidecar MCP config digest missing; cannot safely resume with MCP configuration.');
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
else if (sidecar.mcpConfigDigest !== input.mcpConfigDigest) {
|
|
101
|
+
throw new Error(`Session sidecar MCP config digest mismatch: ${sidecar.mcpConfigDigest} !== ${input.mcpConfigDigest}`);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
94
104
|
}
|
|
95
105
|
function parseSessionSidecar(value) {
|
|
96
106
|
if (!value || typeof value !== 'object') {
|
|
@@ -122,6 +132,10 @@ function parseSessionSidecar(value) {
|
|
|
122
132
|
if (!record.workers || typeof record.workers !== 'object') {
|
|
123
133
|
throw new Error('Invalid session sidecar: workers');
|
|
124
134
|
}
|
|
135
|
+
if (record.mcpConfigDigest !== undefined &&
|
|
136
|
+
typeof record.mcpConfigDigest !== 'string') {
|
|
137
|
+
throw new Error('Invalid session sidecar: mcpConfigDigest');
|
|
138
|
+
}
|
|
125
139
|
const updatedAt = typeof record.updatedAt === 'number' ? record.updatedAt : 0;
|
|
126
140
|
let githubMonitor;
|
|
127
141
|
if (record.githubMonitor && typeof record.githubMonitor === 'object') {
|
|
@@ -158,6 +172,9 @@ function parseSessionSidecar(value) {
|
|
|
158
172
|
sequence: record.sequence,
|
|
159
173
|
workers,
|
|
160
174
|
...(githubMonitor ? { githubMonitor } : {}),
|
|
175
|
+
...(typeof record.mcpConfigDigest === 'string'
|
|
176
|
+
? { mcpConfigDigest: record.mcpConfigDigest }
|
|
177
|
+
: {}),
|
|
161
178
|
updatedAt,
|
|
162
179
|
};
|
|
163
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-sidecar.js","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAO1C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IAIlC;IACA;IAJT,IAAI,GAAG,2BAA2B,CAAC;IAE5C,YACkB,gBAAwB,EACxB,IAAY;QAE5B,KAAK,CACH,iDAAiD,gBAAgB,UAAU,IAAI,GAAG,CACnF,CAAC;QALc,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,SAAI,GAAJ,IAAI,CAAQ;QAK5B,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"session-sidecar.js","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agents-ensemble/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Core types and orchestration logic for agents-ensemble",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@cursor/sdk": "1.0.27",
|
|
30
|
-
"@earendil-works/pi-agent-core": "0.
|
|
31
|
-
"@earendil-works/pi-ai": "0.
|
|
32
|
-
"@
|
|
30
|
+
"@earendil-works/pi-agent-core": "1.0.2",
|
|
31
|
+
"@earendil-works/pi-ai": "1.0.2",
|
|
32
|
+
"@earendil-works/pi-coding-agent": "1.0.2",
|
|
33
33
|
"@modular-prompt/core": "0.3.0",
|
|
34
34
|
"js-yaml": "4.1.0"
|
|
35
35
|
},
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import type { AgentMessage } from '@earendil-works/pi-agent-core/node';
|
|
2
|
-
/** Project-local Pi transcript storage used by the conductor backend. */
|
|
3
|
-
export declare const PI_SESSION_ROOT = ".ensemble/pi/sessions";
|
|
4
|
-
/**
|
|
5
|
-
* The Pi Agent Core `Agent` keeps its transcript in memory. This small adapter
|
|
6
|
-
* persists the same messages through Pi's JSONL session API so a new process
|
|
7
|
-
* can rebuild `Agent.state.messages` for `--resume`.
|
|
8
|
-
*/
|
|
9
|
-
export declare class PiConductorSession {
|
|
10
|
-
private readonly session;
|
|
11
|
-
private persistedMessages;
|
|
12
|
-
private writeQueue;
|
|
13
|
-
private constructor();
|
|
14
|
-
static create(cwd: string, sessionId: string): Promise<PiConductorSession>;
|
|
15
|
-
static resume(cwd: string, sessionId: string): Promise<PiConductorSession>;
|
|
16
|
-
get messages(): readonly AgentMessage[];
|
|
17
|
-
/** Append only the suffix not already written to the JSONL transcript. */
|
|
18
|
-
appendNewMessages(messages: readonly AgentMessage[]): Promise<void>;
|
|
19
|
-
}
|
|
20
|
-
//# sourceMappingURL=pi-conductor-session.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"pi-conductor-session.d.ts","sourceRoot":"","sources":["../../src/conductor/pi-conductor-session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAW,MAAM,oCAAoC,CAAC;AAEhF,yEAAyE;AACzE,eAAO,MAAM,eAAe,0BAA0B,CAAC;AAEvD;;;;GAIG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,UAAU,CAAoC;IAEtD,OAAO;WAOM,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;WAMnE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiBhF,IAAI,QAAQ,IAAI,SAAS,YAAY,EAAE,CAEtC;IAED,0EAA0E;IACpE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAgB1E"}
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import { JsonlSessionRepo, NodeExecutionEnv } from '@earendil-works/pi-agent-core/node';
|
|
2
|
-
/** Project-local Pi transcript storage used by the conductor backend. */
|
|
3
|
-
export const PI_SESSION_ROOT = '.ensemble/pi/sessions';
|
|
4
|
-
/**
|
|
5
|
-
* The Pi Agent Core `Agent` keeps its transcript in memory. This small adapter
|
|
6
|
-
* persists the same messages through Pi's JSONL session API so a new process
|
|
7
|
-
* can rebuild `Agent.state.messages` for `--resume`.
|
|
8
|
-
*/
|
|
9
|
-
export class PiConductorSession {
|
|
10
|
-
session;
|
|
11
|
-
persistedMessages;
|
|
12
|
-
writeQueue = Promise.resolve();
|
|
13
|
-
constructor(session, messages) {
|
|
14
|
-
this.session = session;
|
|
15
|
-
this.persistedMessages = [...messages];
|
|
16
|
-
}
|
|
17
|
-
static async create(cwd, sessionId) {
|
|
18
|
-
const repo = createSessionRepo(cwd);
|
|
19
|
-
const session = await repo.create({ cwd, id: sessionId });
|
|
20
|
-
return new PiConductorSession(session, []);
|
|
21
|
-
}
|
|
22
|
-
static async resume(cwd, sessionId) {
|
|
23
|
-
const repo = createSessionRepo(cwd);
|
|
24
|
-
const metadata = (await repo.list({ cwd })).find((candidate) => candidate.id === sessionId);
|
|
25
|
-
if (!metadata) {
|
|
26
|
-
throw new Error(`Pi session not found for resume (sessionId=${sessionId}, cwd=${cwd}, ` +
|
|
27
|
-
`sessionsRoot=${PI_SESSION_ROOT})`);
|
|
28
|
-
}
|
|
29
|
-
const session = await repo.open(metadata);
|
|
30
|
-
const context = await session.buildContext();
|
|
31
|
-
return new PiConductorSession(session, context.messages);
|
|
32
|
-
}
|
|
33
|
-
get messages() {
|
|
34
|
-
return this.persistedMessages;
|
|
35
|
-
}
|
|
36
|
-
/** Append only the suffix not already written to the JSONL transcript. */
|
|
37
|
-
async appendNewMessages(messages) {
|
|
38
|
-
const write = this.writeQueue.then(async () => {
|
|
39
|
-
const newMessages = messages.slice(this.persistedMessages.length);
|
|
40
|
-
for (const message of newMessages) {
|
|
41
|
-
await this.session.appendMessage(message);
|
|
42
|
-
}
|
|
43
|
-
if (newMessages.length > 0) {
|
|
44
|
-
this.persistedMessages = [
|
|
45
|
-
...this.persistedMessages,
|
|
46
|
-
...newMessages,
|
|
47
|
-
];
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
this.writeQueue = write.catch(() => { });
|
|
51
|
-
await write;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
function createSessionRepo(cwd) {
|
|
55
|
-
return new JsonlSessionRepo({
|
|
56
|
-
fs: new NodeExecutionEnv({ cwd }),
|
|
57
|
-
sessionsRoot: PI_SESSION_ROOT,
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
//# sourceMappingURL=pi-conductor-session.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"pi-conductor-session.js","sourceRoot":"","sources":["../../src/conductor/pi-conductor-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAGxF,yEAAyE;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAuB,CAAC;AAEvD;;;;GAIG;AACH,MAAM,OAAO,kBAAkB;IAKV;IAJX,iBAAiB,CAAiB;IAClC,UAAU,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAEtD,YACmB,OAAgB,EACjC,QAAwB;QADP,YAAO,GAAP,OAAO,CAAS;QAGjC,IAAI,CAAC,iBAAiB,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,SAAiB;QAChD,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1D,OAAO,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,SAAiB;QAChD,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAC9C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,SAAS,CAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,8CAA8C,SAAS,SAAS,GAAG,IAAI;gBACrE,gBAAgB,eAAe,GAAG,CACrC,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;QAC7C,OAAO,IAAI,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,iBAAiB,CAAC,QAAiC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAClE,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;gBAClC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,iBAAiB,GAAG;oBACvB,GAAG,IAAI,CAAC,iBAAiB;oBACzB,GAAG,WAAW;iBACf,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACxC,MAAM,KAAK,CAAC;IACd,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,IAAI,gBAAgB,CAAC;QAC1B,EAAE,EAAE,IAAI,gBAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;QACjC,YAAY,EAAE,eAAe;KAC9B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import type { AgentTool } from '@earendil-works/pi-agent-core';
|
|
2
|
-
import type { McpServerConfigMap } from '../mcp/load-mcp-config.js';
|
|
3
|
-
/** The bridge dependency is intentionally exact-pinned in packages/core. */
|
|
4
|
-
export declare const PI_MCP_SDK_VERSION = "1.30.0";
|
|
5
|
-
interface McpToolDefinition {
|
|
6
|
-
name: string;
|
|
7
|
-
description?: string;
|
|
8
|
-
inputSchema: Record<string, unknown>;
|
|
9
|
-
}
|
|
10
|
-
interface McpClient {
|
|
11
|
-
connect(transport: unknown): Promise<void>;
|
|
12
|
-
listTools(): Promise<{
|
|
13
|
-
tools: McpToolDefinition[];
|
|
14
|
-
}>;
|
|
15
|
-
callTool(params: {
|
|
16
|
-
name: string;
|
|
17
|
-
arguments?: Record<string, unknown>;
|
|
18
|
-
}, resultSchema?: unknown, options?: {
|
|
19
|
-
signal?: AbortSignal;
|
|
20
|
-
}): Promise<unknown>;
|
|
21
|
-
close(): Promise<void>;
|
|
22
|
-
}
|
|
23
|
-
export interface PiMcpBridgeSdk {
|
|
24
|
-
Client: new (info: {
|
|
25
|
-
name: string;
|
|
26
|
-
version: string;
|
|
27
|
-
}) => McpClient;
|
|
28
|
-
StdioClientTransport: new (options: {
|
|
29
|
-
command: string;
|
|
30
|
-
args?: string[];
|
|
31
|
-
env?: Record<string, string>;
|
|
32
|
-
cwd?: string;
|
|
33
|
-
}) => unknown;
|
|
34
|
-
StreamableHTTPClientTransport: new (url: URL, options?: {
|
|
35
|
-
requestInit?: RequestInit;
|
|
36
|
-
}) => unknown;
|
|
37
|
-
SSEClientTransport: new (url: URL, options?: {
|
|
38
|
-
requestInit?: RequestInit;
|
|
39
|
-
}) => unknown;
|
|
40
|
-
}
|
|
41
|
-
/** Injectable only for unit tests; production uses the pinned SDK loader. */
|
|
42
|
-
export interface PiMcpBridgeDependencies {
|
|
43
|
-
sdk?: PiMcpBridgeSdk;
|
|
44
|
-
loadSdk?: () => Promise<PiMcpBridgeSdk>;
|
|
45
|
-
}
|
|
46
|
-
export interface PiMcpBridgeOptions {
|
|
47
|
-
cwd: string;
|
|
48
|
-
env?: NodeJS.ProcessEnv;
|
|
49
|
-
}
|
|
50
|
-
export interface PiMcpBridge {
|
|
51
|
-
readonly tools: AgentTool[];
|
|
52
|
-
close(): Promise<void>;
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* Load the harness-owned in-process Pi MCP bridge for one resolved mcp.json
|
|
56
|
-
* snapshot. This is not a Pi ExtensionAPI extension.
|
|
57
|
-
*
|
|
58
|
-
* The bridge is deliberately in-memory: it does not write `.pi/mcp.json` or
|
|
59
|
-
* mutate Pi settings. The Pi resource loader resolves user/project Pi
|
|
60
|
-
* resources separately; this bridge remains the harness-owned connection for
|
|
61
|
-
* the already-resolved ensemble MCP map.
|
|
62
|
-
*/
|
|
63
|
-
export declare function createPiMcpBridge(mcpServers: McpServerConfigMap | undefined, options: PiMcpBridgeOptions, dependencies?: PiMcpBridgeDependencies): Promise<PiMcpBridge | undefined>;
|
|
64
|
-
export {};
|
|
65
|
-
//# sourceMappingURL=pi-mcp-bridge.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"pi-mcp-bridge.d.ts","sourceRoot":"","sources":["../../src/conductor/pi-mcp-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC,4EAA4E;AAC5E,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAE3C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AA8CD,UAAU,SAAS;IACjB,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;KAAE,CAAC,CAAC;IACrD,QAAQ,CACN,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EAC7D,YAAY,CAAC,EAAE,OAAO,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,KAAK,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IACnE,oBAAoB,EAAE,KAAK,OAAO,EAAE;QAClC,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,KAAK,OAAO,CAAC;IACd,6BAA6B,EAAE,KAC7B,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,WAAW,CAAA;KAAE,KACpC,OAAO,CAAC;IACb,kBAAkB,EAAE,KAClB,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,WAAW,CAAA;KAAE,KACpC,OAAO,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAOD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,OAAO,EAAE,kBAAkB,EAC3B,YAAY,GAAE,uBAA4B,GACzC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAoClC"}
|