@agents-ensemble/core 0.20.0 → 0.21.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 +2 -0
- package/dist/conductor/conductor-auth.d.ts.map +1 -1
- package/dist/conductor/conductor-auth.js +15 -2
- package/dist/conductor/conductor-auth.js.map +1 -1
- package/dist/conductor/conductor-history.d.ts +9 -0
- package/dist/conductor/conductor-history.d.ts.map +1 -1
- package/dist/conductor/conductor-history.js +27 -1
- package/dist/conductor/conductor-history.js.map +1 -1
- package/dist/conductor/conductor-send-reconnect.d.ts +10 -3
- package/dist/conductor/conductor-send-reconnect.d.ts.map +1 -1
- package/dist/conductor/conductor-send-reconnect.js +22 -6
- package/dist/conductor/conductor-send-reconnect.js.map +1 -1
- package/dist/conductor/conductor-session-driver.d.ts +9 -1
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +219 -6
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +2 -0
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +24 -1
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/index.d.ts +3 -1
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +1 -0
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/operator-command.d.ts +5 -0
- package/dist/conductor/operator-command.d.ts.map +1 -1
- package/dist/conductor/operator-command.js +6 -0
- package/dist/conductor/operator-command.js.map +1 -1
- package/dist/conductor/operator-input-binding.d.ts +5 -0
- package/dist/conductor/operator-input-binding.d.ts.map +1 -1
- package/dist/conductor/pi-auth-recovery-snapshot-store.d.ts +42 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.d.ts.map +1 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.js +113 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.js.map +1 -0
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +5 -1
- package/dist/conductor/pi-conductor-agent.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-event.d.ts +30 -1
- package/dist/conductor/session/events/session-event.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +1 -1
- 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/format-session-event.js +32 -1
- package/dist/conductor/session/format-session-event.js.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.d.ts.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.js +5 -0
- package/dist/conductor/session/select-dispatch-batch.js.map +1 -1
- package/dist/conductor/session/session-event-queue.d.ts +9 -0
- package/dist/conductor/session/session-event-queue.d.ts.map +1 -1
- package/dist/conductor/session/session-event-queue.js +43 -8
- package/dist/conductor/session/session-event-queue.js.map +1 -1
- package/dist/conductor/session/session-event.d.ts +1 -1
- package/dist/conductor/session/session-event.d.ts.map +1 -1
- package/dist/conductor/session-policy.d.ts.map +1 -1
- package/dist/conductor/session-policy.js +4 -2
- package/dist/conductor/session-policy.js.map +1 -1
- package/dist/operator-runtime.d.ts +3 -1
- package/dist/operator-runtime.d.ts.map +1 -1
- package/dist/operator-runtime.js +2 -0
- package/dist/operator-runtime.js.map +1 -1
- package/dist/session/index.d.ts +2 -0
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js +2 -0
- package/dist/session/index.js.map +1 -1
- package/dist/session/session-resume-store.d.ts +2 -0
- package/dist/session/session-resume-store.d.ts.map +1 -1
- package/dist/session/session-resume-store.js +7 -0
- package/dist/session/session-resume-store.js.map +1 -1
- package/dist/session/session-snapshot-paths.d.ts +5 -0
- package/dist/session/session-snapshot-paths.d.ts.map +1 -0
- package/dist/session/session-snapshot-paths.js +38 -0
- package/dist/session/session-snapshot-paths.js.map +1 -0
- package/dist/session/worker-session-history.d.ts +39 -0
- package/dist/session/worker-session-history.d.ts.map +1 -0
- package/dist/session/worker-session-history.js +533 -0
- package/dist/session/worker-session-history.js.map +1 -0
- package/package.json +1 -1
|
@@ -46,6 +46,8 @@ export declare function isConductorAuthError(message: string): boolean;
|
|
|
46
46
|
export declare function isBareConductorSendAuthError(result: ConductorSendResult): boolean;
|
|
47
47
|
/** send 結果が auth-like(明示 message または保守的 bare error)か。 */
|
|
48
48
|
export declare function isConductorSendAuthError(result: ConductorSendResult): boolean;
|
|
49
|
+
/** Pi の API key 解決が provider request 前に失敗した結果か。 */
|
|
50
|
+
export declare function isPiApiKeyResolutionFailure(result: ConductorSendResult): boolean;
|
|
49
51
|
/** auth エラー時に stderr へ出す短い復旧手順。 */
|
|
50
52
|
export declare function formatConductorAuthRecoveryHint(agentId?: string, options?: ConductorAuthRecoveryOptions): string;
|
|
51
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-auth.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAML,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAEiD,CAAC;AAElF,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,gBAAgB,CAAA;SAAE,CAAA;KAAE,CAAC;IACzD,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,EAAE,CAAC,EAAE,sBAAsB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,mBAAmB,CAAC;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,qBAAqB,CAAC;AACxE,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,sBAAsB,CAAC;AAC3E,MAAM,MAAM,qBAAqB,GAAG,IAAI,GAAG,uBAAuB,CAAC;AAEnE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,EAAE,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,kFAAkF;AAClF,wBAAgB,2BAA2B,CACzC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,GACzE,gBAAgB,CASlB;AAED,wDAAwD;AACxD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI7D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAejF;AAED,yDAAyD;AACzD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"conductor-auth.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAML,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAEiD,CAAC;AAElF,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,gBAAgB,CAAA;SAAE,CAAA;KAAE,CAAC;IACzD,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,EAAE,CAAC,EAAE,sBAAsB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,mBAAmB,CAAC;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,qBAAqB,CAAC;AACxE,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,sBAAsB,CAAC;AAC3E,MAAM,MAAM,qBAAqB,GAAG,IAAI,GAAG,uBAAuB,CAAC;AAEnE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,EAAE,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,kFAAkF;AAClF,wBAAgB,2BAA2B,CACzC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,GACzE,gBAAgB,CASlB;AAED,wDAAwD;AACxD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI7D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAejF;AAED,yDAAyD;AACzD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAW7E;AAED,mDAAmD;AACnD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAYT;AAED,mCAAmC;AACnC,wBAAgB,+BAA+B,CAC7C,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,4BAAiC,GACzC,MAAM,CA4BR;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM5E;AAED,uDAAuD;AACvD,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAU5E;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAS9B;AAED,wBAAsB,cAAc,CAClC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAW/B;AAED,wBAAsB,eAAe,CACnC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,qBAAqB,CAAC,CAShC"}
|
|
@@ -22,7 +22,7 @@ export function resolveConductorAuthBackend(options = {}) {
|
|
|
22
22
|
}
|
|
23
23
|
/** RunResult.error 等の message が conductor 認証失敗か判定する。 */
|
|
24
24
|
export function isConductorAuthError(message) {
|
|
25
|
-
return /authentication error|not logged in|invalid api key|no api key(?: for provider)?\s*[: ]|unauthenticated|unauthorized|\b(?:http\s*)?401\b|try logging out/i.test(message);
|
|
25
|
+
return /authentication error|not logged in|invalid api key|api key auth failed for provider|no api key(?: for provider)?\s*[: ]|unauthenticated|unauthorized|\b(?:http\s*)?401\b|try logging out/i.test(message);
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* SDK idle / stale 接続で message 欠落の bare `status: "error"` が返る既知ケース。
|
|
@@ -49,11 +49,24 @@ export function isConductorSendAuthError(result) {
|
|
|
49
49
|
if (result.status !== 'error') {
|
|
50
50
|
return false;
|
|
51
51
|
}
|
|
52
|
+
if (result.error?.code?.trim().toLowerCase() === 'auth') {
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
52
55
|
if (isConductorAuthError(result.error?.message ?? '')) {
|
|
53
56
|
return true;
|
|
54
57
|
}
|
|
55
58
|
return isBareConductorSendAuthError(result);
|
|
56
59
|
}
|
|
60
|
+
/** Pi の API key 解決が provider request 前に失敗した結果か。 */
|
|
61
|
+
export function isPiApiKeyResolutionFailure(result) {
|
|
62
|
+
if (result.status !== 'error' ||
|
|
63
|
+
result.error?.code?.trim().toLowerCase() !== 'auth') {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
const message = result.error.message;
|
|
67
|
+
return (/api key auth failed for provider\b/i.test(message) &&
|
|
68
|
+
/failed to resolve api key for (?:pi )?provider\b/i.test(message));
|
|
69
|
+
}
|
|
57
70
|
/** auth エラー時に stderr へ出す短い復旧手順。 */
|
|
58
71
|
export function formatConductorAuthRecoveryHint(agentId, options = {}) {
|
|
59
72
|
const resume = agentId ? `--resume ${agentId}` : '--resume <agentId>';
|
|
@@ -61,7 +74,7 @@ export function formatConductorAuthRecoveryHint(agentId, options = {}) {
|
|
|
61
74
|
const provider = options.provider ?? '<provider>';
|
|
62
75
|
const agentDir = options.pi?.agentDir ?? '~/.ensemble/pi';
|
|
63
76
|
const resumeInstruction = options.resumeInstruction ??
|
|
64
|
-
|
|
77
|
+
`認証設定を直した後、同じ TTY では /reconnect を試してください。再送されない場合や tool が始まっていた場合は状態を確認し、新しい operator message で未完了分を伝えてください。process 終了後は ensemble issue ... ${resume} で session を再開できます。`;
|
|
65
78
|
return (`[auth] Pi 認証エラー(provider=${provider})。` +
|
|
66
79
|
`ensemble auth login --provider ${provider} を実行するか、${agentDir}/auth.json または ` +
|
|
67
80
|
`環境変数 ${formatPiProviderEnvHint(provider)} を確認してください。` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-auth.js","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,uBAAuB,GAKxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAI/E;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAC9B,qHAAqH;IACnH,6EAA6E,CAAC;AA0BlF,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CACzC,UAAwE,EAAE;IAE1E,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAC5C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,8BAA8B,CAAC;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"conductor-auth.js","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,uBAAuB,GAKxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAI/E;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAC9B,qHAAqH;IACnH,6EAA6E,CAAC;AA0BlF,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CACzC,UAAwE,EAAE;IAE1E,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAC5C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,8BAA8B,CAAC;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,2LAA2L,CAAC,IAAI,CACrM,OAAO,CACR,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAA2B;IACtE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,wBAAwB,CAAC,MAA2B;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,oBAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,2BAA2B,CACzC,MAA2B;IAE3B,IACE,MAAM,CAAC,MAAM,KAAK,OAAO;QACzB,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,MAAM,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;IACrC,OAAO,CACL,qCAAqC,CAAC,IAAI,CAAC,OAAO,CAAC;QACnD,mDAAmD,CAAC,IAAI,CAAC,OAAO,CAAC,CAClE,CAAC;AACJ,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,+BAA+B,CAC7C,OAAgB,EAChB,UAAwC,EAAE;IAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC;IAEtE,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,YAAY,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,EAAE,QAAQ,IAAI,gBAAgB,CAAC;QAC1D,MAAM,iBAAiB,GACrB,OAAO,CAAC,iBAAiB;YACzB,8IAA8I,MAAM,qBAAqB,CAAC;QAC5K,OAAO,CACL,4BAA4B,QAAQ,IAAI;YACxC,kCAAkC,QAAQ,WAAW,QAAQ,iBAAiB;YAC9E,QAAQ,uBAAuB,CAAC,QAAQ,CAAC,aAAa;YACtD,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAC/B,OAAO,CACL,kEAAkE;YAClE,sBAAsB,MAAM,uBAAuB,CACpD,CAAC;IACJ,CAAC;IAED,OAAO,CACL,4DAA4D;QAC5D,sBAAsB,MAAM,sCAAsC,CACnE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAiB;IACtD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IACpC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,gBAAgB,CAAC,UAAgC,EAAE;IACjE,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,kBAAkB,CAAC;YACxB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC;IAC5C,OAAO,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,wBAAwB,CAAC;YAC9B,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,gBAAgB,CAAC;YACtB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,iBAAiB,CAAC;YACvB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -19,6 +19,13 @@ export interface ConductorProviderHistoryResult {
|
|
|
19
19
|
messages: ConductorProviderHistoryMessage[];
|
|
20
20
|
hasMore: boolean;
|
|
21
21
|
}
|
|
22
|
+
/** Free-text fields in each returned provider-history message. */
|
|
23
|
+
export type ConductorProviderHistoryTextField = 'inbound' | 'text';
|
|
24
|
+
/**
|
|
25
|
+
* Caller-provided transformation for provider-history free text.
|
|
26
|
+
* It does not guarantee that secrets are detected or removed.
|
|
27
|
+
*/
|
|
28
|
+
export type ConductorProviderHistorySanitizer = (value: string, field: ConductorProviderHistoryTextField) => string | Promise<string>;
|
|
22
29
|
/** Read the latest eligible user/final-response pairs from a provider session. */
|
|
23
30
|
export declare function listConductorProviderHistory(input: {
|
|
24
31
|
backend: ConductorBackend;
|
|
@@ -26,5 +33,7 @@ export declare function listConductorProviderHistory(input: {
|
|
|
26
33
|
cwd: string;
|
|
27
34
|
cursorBootstrapRunId?: string;
|
|
28
35
|
query: ConductorProviderHistoryQuery;
|
|
36
|
+
/** Optional post-page text transformation; omitted to preserve raw values. */
|
|
37
|
+
sanitizer?: ConductorProviderHistorySanitizer;
|
|
29
38
|
}): Promise<ConductorProviderHistoryResult>;
|
|
30
39
|
//# sourceMappingURL=conductor-history.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-history.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAM3D,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAEpD,MAAM,WAAW,+BAA+B;IAC9C,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,EAAE,+BAA+B,EAAE,CAAC;IAC5C,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,kFAAkF;AAClF,wBAAsB,4BAA4B,CAAC,KAAK,EAAE;IACxD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-history.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAM3D,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAEpD,MAAM,WAAW,+BAA+B;IAC9C,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,EAAE,+BAA+B,EAAE,CAAC;IAC5C,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,kEAAkE;AAClE,MAAM,MAAM,iCAAiC,GAAG,SAAS,GAAG,MAAM,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,iCAAiC,GAAG,CAC9C,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,iCAAiC,KACrC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE9B,kFAAkF;AAClF,wBAAsB,4BAA4B,CAAC,KAAK,EAAE;IACxD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,6BAA6B,CAAC;IACrC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,iCAAiC,CAAC;CAC/C,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAuC1C"}
|
|
@@ -24,11 +24,37 @@ export async function listConductorProviderHistory(input) {
|
|
|
24
24
|
}
|
|
25
25
|
matching = ordered.slice(cursorIndex + 1);
|
|
26
26
|
}
|
|
27
|
+
const messages = matching.slice(0, input.query.limit);
|
|
27
28
|
return {
|
|
28
|
-
messages:
|
|
29
|
+
messages: input.sanitizer === undefined
|
|
30
|
+
? messages
|
|
31
|
+
: await sanitizeProviderHistoryMessages(messages, input.sanitizer, input.conductorAgentId, input.backend),
|
|
29
32
|
hasMore: matching.length > input.query.limit,
|
|
30
33
|
};
|
|
31
34
|
}
|
|
35
|
+
async function sanitizeProviderHistoryMessages(messages, sanitizer, conductorAgentId, backend) {
|
|
36
|
+
const sanitized = [];
|
|
37
|
+
try {
|
|
38
|
+
if (typeof sanitizer !== 'function') {
|
|
39
|
+
throw new Error('The provider history sanitizer is not a function.');
|
|
40
|
+
}
|
|
41
|
+
for (const message of messages) {
|
|
42
|
+
const inbound = await sanitizer(message.inbound, 'inbound');
|
|
43
|
+
if (typeof inbound !== 'string') {
|
|
44
|
+
throw new Error('The provider history sanitizer returned a non-string value.');
|
|
45
|
+
}
|
|
46
|
+
const text = await sanitizer(message.text, 'text');
|
|
47
|
+
if (typeof text !== 'string') {
|
|
48
|
+
throw new Error('The provider history sanitizer returned a non-string value.');
|
|
49
|
+
}
|
|
50
|
+
sanitized.push({ ...message, inbound, text });
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
throw new Error(`Provider history sanitizer failed for conductor session ${conductorAgentId} (${backend}).`);
|
|
55
|
+
}
|
|
56
|
+
return sanitized;
|
|
57
|
+
}
|
|
32
58
|
function readPiConductorHistory(input) {
|
|
33
59
|
const cwd = input.cwd;
|
|
34
60
|
const sessionDir = join(cwd, PI_SESSION_ROOT);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-history.js","sourceRoot":"","sources":["../../src/conductor/conductor-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAY,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,cAAc,GAEf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,uCAAuC,EACvC,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-history.js","sourceRoot":"","sources":["../../src/conductor/conductor-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,11 @@ export interface ConductorReconnectCompleteInfo {
|
|
|
8
8
|
success: boolean;
|
|
9
9
|
error?: string;
|
|
10
10
|
}
|
|
11
|
+
export interface ConductorAutomaticRetryInfo {
|
|
12
|
+
/** 同一 prompt の自動 retry は1回だけ。 */
|
|
13
|
+
attempt: 1;
|
|
14
|
+
reason: 'auth' | 'transport';
|
|
15
|
+
}
|
|
11
16
|
export interface ConductorReconnectCallbacks {
|
|
12
17
|
onReconnectAttempt?: (input: {
|
|
13
18
|
agentId: string;
|
|
@@ -39,6 +44,8 @@ export interface ConductorSendReconnectOptions extends ConductorReconnectCallbac
|
|
|
39
44
|
}) => void;
|
|
40
45
|
onAuthReconnectComplete?: (input: ConductorReconnectCompleteInfo) => void;
|
|
41
46
|
onTransportReconnectComplete?: (input: ConductorReconnectCompleteInfo) => void;
|
|
47
|
+
/** 自動 retry を行う場合、その直前に一度だけ呼び出す。 */
|
|
48
|
+
onAutomaticRetry?: (input: ConductorAutomaticRetryInfo) => void;
|
|
42
49
|
}
|
|
43
50
|
/** close → factory.resume(sameId) で in-process の agent を差し替える。 */
|
|
44
51
|
export declare function reconnectConductorAgent(handle: ConductorAgentHandle, options: ConductorReconnectOptions): Promise<string>;
|
|
@@ -48,9 +55,9 @@ export declare function reconnectConductorAgent(handle: ConductorAgentHandle, op
|
|
|
48
55
|
*/
|
|
49
56
|
export declare function isConductorSendTransportError(result: ConductorSendResult): boolean;
|
|
50
57
|
/**
|
|
51
|
-
* send 経路の auth/transport error 時に同一 agentId で in-process
|
|
52
|
-
*
|
|
53
|
-
* error
|
|
58
|
+
* send 経路の auth/transport error 時に同一 agentId で in-process 再接続する。
|
|
59
|
+
* tool 開始通知がなければ同じ prompt を 1 回だけ再試行する。tool が始まっていた場合は
|
|
60
|
+
* 副作用の重複を避けて再送せず、元の error 結果を返す。
|
|
54
61
|
*/
|
|
55
62
|
export declare function sendConductorWithReconnect(handle: ConductorAgentHandle, message: string, options: ConductorSendReconnectOptions & ConductorSendCallbacks): Promise<ConductorSendResult>;
|
|
56
63
|
//# sourceMappingURL=conductor-send-reconnect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-send-reconnect.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAG9B,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CACvE;AAED,+DAA+D;AAC/D,MAAM,MAAM,yBAAyB,GACjC,CAAC,2BAA2B,GAC1B,2BAA2B,GAAG;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC,GACJ,CAAC;IACC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,GAAG,2BAA2B,CAAC,CAAC;AAErC,MAAM,WAAW,6BACf,SAAQ,2BAA2B;IACnC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,wEAAwE;IACxE,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9D,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;IAC1E,4BAA4B,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-send-reconnect.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAG9B,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,iCAAiC;IACjC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;CAC9B;AAED,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;CACvE;AAED,+DAA+D;AAC/D,MAAM,MAAM,yBAAyB,GACjC,CAAC,2BAA2B,GAC1B,2BAA2B,GAAG;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC,GACJ,CAAC;IACC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,GAAG,2BAA2B,CAAC,CAAC;AAErC,MAAM,WAAW,6BACf,SAAQ,2BAA2B;IACnC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,wEAAwE;IACxE,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9D,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;IAC1E,4BAA4B,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,CAAC;IAC/E,oCAAoC;IACpC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,2BAA2B,KAAK,IAAI,CAAC;CACjE;AAMD,kEAAkE;AAClE,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,MAAM,CAAC,CAyCjB;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAWT;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,6BAA6B,GAAG,sBAAsB,GAC9D,OAAO,CAAC,mBAAmB,CAAC,CA+C9B"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { isConductorSendAuthError } from './conductor-auth.js';
|
|
2
|
+
// resume に失敗した時点で旧 agent は close 済み。次の operator reconnect では
|
|
3
|
+
// 同じ handle を再度 close せず、resume を再試行する。
|
|
4
|
+
const closedForReconnect = new WeakSet();
|
|
2
5
|
/** close → factory.resume(sameId) で in-process の agent を差し替える。 */
|
|
3
6
|
export async function reconnectConductorAgent(handle, options) {
|
|
4
7
|
const agentId = handle.conductor.agentId;
|
|
@@ -16,8 +19,12 @@ export async function reconnectConductorAgent(handle, options) {
|
|
|
16
19
|
conductorOptions = sdkOptions;
|
|
17
20
|
}
|
|
18
21
|
try {
|
|
19
|
-
|
|
22
|
+
if (!closedForReconnect.has(handle)) {
|
|
23
|
+
await handle.conductor.close();
|
|
24
|
+
closedForReconnect.add(handle);
|
|
25
|
+
}
|
|
20
26
|
handle.conductor = await conductorAgentFactory.resume(agentId, conductorOptions);
|
|
27
|
+
closedForReconnect.delete(handle);
|
|
21
28
|
options.onReconnectComplete?.({ agentId, success: true });
|
|
22
29
|
return agentId;
|
|
23
30
|
}
|
|
@@ -43,13 +50,17 @@ export function isConductorSendTransportError(result) {
|
|
|
43
50
|
return /connection stalled(?: repeatedly)?|network error|transport error|socket error|connection (?:reset|refused|closed|timed out)|(?:request|operation) timed out|deadline exceeded|service unavailable|retriableerror|econnreset|econnrefused|etimedout|enetunreach|eai again/.test(signal);
|
|
44
51
|
}
|
|
45
52
|
/**
|
|
46
|
-
* send 経路の auth/transport error 時に同一 agentId で in-process
|
|
47
|
-
*
|
|
48
|
-
* error
|
|
53
|
+
* send 経路の auth/transport error 時に同一 agentId で in-process 再接続する。
|
|
54
|
+
* tool 開始通知がなければ同じ prompt を 1 回だけ再試行する。tool が始まっていた場合は
|
|
55
|
+
* 副作用の重複を避けて再送せず、元の error 結果を返す。
|
|
49
56
|
*/
|
|
50
57
|
export async function sendConductorWithReconnect(handle, message, options) {
|
|
58
|
+
let toolCallStarted = false;
|
|
51
59
|
const sendCallbacks = {
|
|
52
|
-
onToolCallStarted:
|
|
60
|
+
onToolCallStarted: (info) => {
|
|
61
|
+
toolCallStarted = true;
|
|
62
|
+
options.onToolCallStarted?.(info);
|
|
63
|
+
},
|
|
53
64
|
history: options.history,
|
|
54
65
|
};
|
|
55
66
|
const result = await handle.conductor.send(message, sendCallbacks);
|
|
@@ -75,9 +86,14 @@ export async function sendConductorWithReconnect(handle, message, options) {
|
|
|
75
86
|
return result;
|
|
76
87
|
}
|
|
77
88
|
if (options.signal?.aborted ||
|
|
78
|
-
options.retrySuppressionSignal?.aborted
|
|
89
|
+
options.retrySuppressionSignal?.aborted ||
|
|
90
|
+
toolCallStarted) {
|
|
79
91
|
return result;
|
|
80
92
|
}
|
|
93
|
+
options.onAutomaticRetry?.({
|
|
94
|
+
attempt: 1,
|
|
95
|
+
reason: reconnectReason,
|
|
96
|
+
});
|
|
81
97
|
return handle.conductor.send(message, sendCallbacks);
|
|
82
98
|
}
|
|
83
99
|
function resolveReconnectAttempt(options, reason) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import type { PermissionPipeline } from '../permission/permission-pipeline.js';
|
|
|
5
5
|
import type { WorkerFailureRecord } from '../runtime/types.js';
|
|
6
6
|
import type { WorkerSession } from '../runtime/worker-session.js';
|
|
7
7
|
import type { ConductorSendResult } from './conductor-agent.js';
|
|
8
|
+
import type { PiAuthRecoverySnapshotStore, PiAuthRecoverySnapshotSummary } from './pi-auth-recovery-snapshot-store.js';
|
|
8
9
|
import type { ConductorAgentHandle, ConductorSendReconnectOptions } from './conductor-send-reconnect.js';
|
|
9
10
|
import { SessionEventQueue } from './session/session-event-queue.js';
|
|
10
11
|
import type { SessionEvent } from './session/session-event.js';
|
|
@@ -13,7 +14,7 @@ import { type IssueLoopStopReason } from './session-policy.js';
|
|
|
13
14
|
export interface ConductorSendStartedInfo {
|
|
14
15
|
/** これから実行する send の通し番号(1 始まり)。 */
|
|
15
16
|
sendCount: number;
|
|
16
|
-
/** dispatch 束の source key(`operator` / `permission` / `permission.stall` / `worker:*` / `initial`)。 */
|
|
17
|
+
/** dispatch 束の source key(`operator` / `permission` / `permission.stall` / `worker:*` / `conductor.recovery.report` / `initial`)。 */
|
|
17
18
|
dispatchSource?: string;
|
|
18
19
|
}
|
|
19
20
|
export interface ConductorSendProgressInfo {
|
|
@@ -97,6 +98,13 @@ export interface ConductorSessionDriverOptions {
|
|
|
97
98
|
resetOutboundDispatchesThisSend?: () => void;
|
|
98
99
|
/** `prompt_worker` 等の outbound dispatch 件数(ループ停止判定向け)。 */
|
|
99
100
|
getOutboundDispatchesThisSend?: () => number;
|
|
101
|
+
/** Failed dispatch の本文を operator-only の process 内 snapshot に保存する。 */
|
|
102
|
+
piAuthRecoverySnapshotStore?: PiAuthRecoverySnapshotStore;
|
|
103
|
+
/** Snapshot の保存・上限 eviction を本文なしで通知する。 */
|
|
104
|
+
onPiAuthRecoverySnapshotStored?: (input: {
|
|
105
|
+
snapshot: PiAuthRecoverySnapshotSummary;
|
|
106
|
+
evictedRecoveryIds: string[];
|
|
107
|
+
}) => void;
|
|
100
108
|
}
|
|
101
109
|
export interface ConductorSessionDriverResult {
|
|
102
110
|
stopReason: IssueLoopStopReason;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-session-driver.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-session-driver.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"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"}
|