@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
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ensureMaxTurnsOpenQuestion } from '../escalation/enqueue-max-turns-question.js';
|
|
2
|
+
import { isPiApiKeyResolutionFailure } from './conductor-auth.js';
|
|
2
3
|
import { reconnectConductorAgent, sendConductorWithReconnect, } from './conductor-send-reconnect.js';
|
|
3
4
|
import { formatSessionEventsForConductor } from './session/format-session-event.js';
|
|
4
5
|
import { bufferDispatchHoldEvents, createDispatchHoldState, pruneStalePermissionEvents, } from './session/dispatch-hold.js';
|
|
@@ -22,6 +23,12 @@ export async function runConductorSessionDriver(options) {
|
|
|
22
23
|
let inFlightSend;
|
|
23
24
|
let postLoopWaiting = false;
|
|
24
25
|
const dispatchHoldState = options.dispatchHoldState ?? createDispatchHoldState();
|
|
26
|
+
let conductorAvailable = true;
|
|
27
|
+
let pendingAuthRecoveryCandidate;
|
|
28
|
+
let pendingRecoveryReport;
|
|
29
|
+
const sendReconnect = withAgentAvailabilityCallbacks(options.sendReconnect, (available) => {
|
|
30
|
+
conductorAvailable = available;
|
|
31
|
+
});
|
|
25
32
|
const hasDispatchableWorkerOutcome = () => selectDispatchBatch({
|
|
26
33
|
queue: options.eventQueue.snapshot().filter((event) => event.type === 'worker.completed' || event.type === 'worker.failed'),
|
|
27
34
|
state: dispatchBatchState,
|
|
@@ -82,7 +89,7 @@ export async function runConductorSessionDriver(options) {
|
|
|
82
89
|
// fetched and compiled the prompt itself.
|
|
83
90
|
message: await Promise.resolve(options.initialPrompt),
|
|
84
91
|
conductorHandle: options.conductorHandle,
|
|
85
|
-
sendReconnect
|
|
92
|
+
sendReconnect,
|
|
86
93
|
signal: options.shutdownSignal,
|
|
87
94
|
workerDispatches: options.workerDispatches,
|
|
88
95
|
workerFailures: options.workerFailures,
|
|
@@ -103,6 +110,10 @@ export async function runConductorSessionDriver(options) {
|
|
|
103
110
|
});
|
|
104
111
|
}
|
|
105
112
|
while (true) {
|
|
113
|
+
if (options.shutdownSignal.aborted) {
|
|
114
|
+
stopReason = 'interrupted';
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
106
117
|
if (options.isPermissionPending) {
|
|
107
118
|
pruneStalePermissionEvents({
|
|
108
119
|
state: dispatchHoldState,
|
|
@@ -130,6 +141,10 @@ export async function runConductorSessionDriver(options) {
|
|
|
130
141
|
stopReason = 'interrupted';
|
|
131
142
|
break;
|
|
132
143
|
}
|
|
144
|
+
if (options.shutdownSignal.aborted) {
|
|
145
|
+
stopReason = 'interrupted';
|
|
146
|
+
break;
|
|
147
|
+
}
|
|
133
148
|
lastSendResult = awaited.value;
|
|
134
149
|
inFlightSend = undefined;
|
|
135
150
|
if (lastSendResult.status === 'cancelled' &&
|
|
@@ -204,6 +219,8 @@ export async function runConductorSessionDriver(options) {
|
|
|
204
219
|
onDispatchHoldChanged: options.onDispatchHoldChanged,
|
|
205
220
|
onOperatorQueueChanged: options.onOperatorQueueChanged,
|
|
206
221
|
isPermissionPending: options.isPermissionPending,
|
|
222
|
+
isConductorAvailable: () => conductorAvailable,
|
|
223
|
+
hasPendingRecoveryReport: () => pendingRecoveryReport !== undefined,
|
|
207
224
|
canDispatchIdleOperatorMessage: () => canDispatchIdleOperatorMessage({
|
|
208
225
|
eventQueue: options.eventQueue,
|
|
209
226
|
dispatchHoldState,
|
|
@@ -224,16 +241,39 @@ export async function runConductorSessionDriver(options) {
|
|
|
224
241
|
if (!dispatchResult) {
|
|
225
242
|
continue;
|
|
226
243
|
}
|
|
227
|
-
|
|
244
|
+
if (options.shutdownSignal.aborted) {
|
|
245
|
+
stopReason = 'interrupted';
|
|
246
|
+
break;
|
|
247
|
+
}
|
|
248
|
+
const { events: selectedBatch, selected } = dispatchResult;
|
|
228
249
|
postLoopWaiting = false;
|
|
229
250
|
if (selected) {
|
|
230
251
|
dispatchBatchState = markContinuationConsumed(dispatchBatchState, selected);
|
|
231
252
|
}
|
|
232
253
|
if (dispatchResult.sourceKey === 'operator.reconnect') {
|
|
233
254
|
dispatchBatchState = dispatchBatchStateAfterSend(dispatchResult.sourceKey);
|
|
234
|
-
await runOperatorReconnect(options);
|
|
255
|
+
const reconnected = await runOperatorReconnect(options);
|
|
256
|
+
conductorAvailable = reconnected;
|
|
257
|
+
if (reconnected && !options.shutdownSignal.aborted) {
|
|
258
|
+
// 再接続の await 中に届いた reconnect は今回の成功で満たされた。
|
|
259
|
+
// 新しい handle を重ねて close / resume しないよう、ここでまとめて消費する。
|
|
260
|
+
options.eventQueue.findSendEvents((event) => event.type === 'operator.reconnect');
|
|
261
|
+
if (pendingAuthRecoveryCandidate) {
|
|
262
|
+
pendingRecoveryReport = {
|
|
263
|
+
type: 'conductor.recovery.report',
|
|
264
|
+
...pendingAuthRecoveryCandidate,
|
|
265
|
+
reconnect: { kind: 'manual', succeeded: true },
|
|
266
|
+
};
|
|
267
|
+
pendingAuthRecoveryCandidate = undefined;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
235
270
|
continue;
|
|
236
271
|
}
|
|
272
|
+
const recoveryReport = pendingRecoveryReport;
|
|
273
|
+
const batch = recoveryReport
|
|
274
|
+
? [recoveryReport, ...selectedBatch]
|
|
275
|
+
: selectedBatch;
|
|
276
|
+
const originalEvents = batch.filter((event) => event.type !== 'conductor.recovery.report');
|
|
237
277
|
const autonomousTurnsAfter = autonomousTurnsAfterConductorBatch(batch, autonomousTurns);
|
|
238
278
|
const { workerDispatches, workerFailures } = countWorkerOutcomesInBatch(batch);
|
|
239
279
|
options.onOperatorDispatched?.(batch);
|
|
@@ -241,10 +281,20 @@ export async function runConductorSessionDriver(options) {
|
|
|
241
281
|
triggers: batch.filter(isTriggerSessionEvent).length,
|
|
242
282
|
sources: uniqueSources(batch, dispatchResult.sourceKey),
|
|
243
283
|
});
|
|
284
|
+
// 通常 send を開始したら未報告 candidate は失効する。
|
|
285
|
+
// 準備済み report はこの send に一度だけ加え、開始時に消費して replay しない。
|
|
286
|
+
const message = formatSessionEventsForConductor(batch);
|
|
287
|
+
const recoverySnapshotContent = recoveryReport
|
|
288
|
+
? formatSessionEventsForConductor(originalEvents)
|
|
289
|
+
: message;
|
|
290
|
+
pendingRecoveryReport = undefined;
|
|
291
|
+
pendingAuthRecoveryCandidate = undefined;
|
|
292
|
+
let dispatchHadToolCalls = false;
|
|
293
|
+
let automaticRetryAttempts = 0;
|
|
244
294
|
const dispatchSend = runEventConductorSend({
|
|
245
|
-
message
|
|
295
|
+
message,
|
|
246
296
|
conductorHandle: options.conductorHandle,
|
|
247
|
-
sendReconnect
|
|
297
|
+
sendReconnect,
|
|
248
298
|
signal: options.shutdownSignal,
|
|
249
299
|
workerDispatches: options.workerDispatches,
|
|
250
300
|
workerFailures: options.workerFailures,
|
|
@@ -259,13 +309,38 @@ export async function runConductorSessionDriver(options) {
|
|
|
259
309
|
resetOutboundDispatchesThisSend: options.resetOutboundDispatchesThisSend,
|
|
260
310
|
getOutboundDispatchesThisSend: options.getOutboundDispatchesThisSend,
|
|
261
311
|
onSendStarted: options.onSendStarted,
|
|
262
|
-
onSendProgress:
|
|
312
|
+
onSendProgress: (info) => {
|
|
313
|
+
dispatchHadToolCalls = true;
|
|
314
|
+
options.onSendProgress?.(info);
|
|
315
|
+
},
|
|
316
|
+
onAutomaticRetryAttempt: ({ attempt }) => {
|
|
317
|
+
automaticRetryAttempts = attempt;
|
|
318
|
+
},
|
|
263
319
|
onSendComplete: (info) => {
|
|
264
320
|
sendCount = info.sendCount;
|
|
265
321
|
lastDispatchesThisTurn = info.conductorDispatchesThisTurn;
|
|
266
322
|
autonomousTurns = info.autonomousTurns;
|
|
267
323
|
options.onSendComplete(info);
|
|
268
324
|
},
|
|
325
|
+
}).then((result) => {
|
|
326
|
+
if (isPiApiKeyResolutionFailure(result) && originalEvents.length > 0) {
|
|
327
|
+
// Pi は1回の send で複数回 auth を解決するため、後続の失敗から
|
|
328
|
+
// 先行 tool round に副作用がなかったとは判断できない。
|
|
329
|
+
// event は再送せず、report 用 candidate と operator-only snapshot を別々に保持する。
|
|
330
|
+
pendingAuthRecoveryCandidate = createPiAuthRecoveryCandidate({
|
|
331
|
+
events: originalEvents,
|
|
332
|
+
sendCount,
|
|
333
|
+
runId: result.runId,
|
|
334
|
+
sourceKey: dispatchResult.sourceKey,
|
|
335
|
+
automaticRetryAttempts,
|
|
336
|
+
toolCallStarted: dispatchHadToolCalls,
|
|
337
|
+
});
|
|
338
|
+
const storedSnapshot = options.piAuthRecoverySnapshotStore?.add(pendingAuthRecoveryCandidate, recoverySnapshotContent);
|
|
339
|
+
if (storedSnapshot) {
|
|
340
|
+
options.onPiAuthRecoverySnapshotStored?.(storedSnapshot);
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
return result;
|
|
269
344
|
});
|
|
270
345
|
if (options.onDispatchBatchSettled &&
|
|
271
346
|
batch.some((event) => event.type === 'operator.message')) {
|
|
@@ -297,6 +372,99 @@ function uniqueSources(batch, fallback) {
|
|
|
297
372
|
const sources = [...new Set(batch.map((event) => eventSourceKey(event)))];
|
|
298
373
|
return sources.length > 0 ? sources : [fallback];
|
|
299
374
|
}
|
|
375
|
+
const MAX_RECOVERY_EVENT_REFERENCES = 20;
|
|
376
|
+
function createPiAuthRecoveryCandidate(input) {
|
|
377
|
+
const eventReferences = input.events.map((event, index) => ({
|
|
378
|
+
eventIndex: index + 1,
|
|
379
|
+
...recoveryEventReference(event),
|
|
380
|
+
}));
|
|
381
|
+
return {
|
|
382
|
+
recoveryId: `pi-auth-recovery-${input.sendCount}`,
|
|
383
|
+
failedDispatch: {
|
|
384
|
+
sendCount: input.sendCount,
|
|
385
|
+
runId: input.runId,
|
|
386
|
+
sourceKey: input.sourceKey,
|
|
387
|
+
eventTypes: [...new Set(input.events.map((event) => event.type))],
|
|
388
|
+
eventCount: input.events.length,
|
|
389
|
+
eventReferences: eventReferences.slice(0, MAX_RECOVERY_EVENT_REFERENCES),
|
|
390
|
+
eventReferencesTruncated: eventReferences.length > MAX_RECOVERY_EVENT_REFERENCES,
|
|
391
|
+
},
|
|
392
|
+
failure: {
|
|
393
|
+
kind: 'pi_api_key_resolution',
|
|
394
|
+
automaticRetryAttempts: input.automaticRetryAttempts,
|
|
395
|
+
toolCallStarted: input.toolCallStarted,
|
|
396
|
+
},
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
function recoveryEventReference(event) {
|
|
400
|
+
switch (event.type) {
|
|
401
|
+
case 'operator.message':
|
|
402
|
+
return {
|
|
403
|
+
type: event.type,
|
|
404
|
+
reference: `delivery:${event.delivery ?? 'next'}`,
|
|
405
|
+
};
|
|
406
|
+
case 'operator.reconnect':
|
|
407
|
+
return { type: event.type };
|
|
408
|
+
case 'worker.completed':
|
|
409
|
+
return {
|
|
410
|
+
type: event.type,
|
|
411
|
+
reference: `worker:${event.result.name}:${event.result.kind}`,
|
|
412
|
+
};
|
|
413
|
+
case 'worker.failed':
|
|
414
|
+
return {
|
|
415
|
+
type: event.type,
|
|
416
|
+
reference: `worker:${event.failure.name}:${event.failure.kind}`,
|
|
417
|
+
};
|
|
418
|
+
case 'permission.pending':
|
|
419
|
+
return {
|
|
420
|
+
type: event.type,
|
|
421
|
+
reference: `permission:${event.permission.id}`,
|
|
422
|
+
};
|
|
423
|
+
case 'permission.stall':
|
|
424
|
+
return {
|
|
425
|
+
type: event.type,
|
|
426
|
+
reference: summarizeRecoveryReferences('permissions', event.pendingPermissionIds),
|
|
427
|
+
};
|
|
428
|
+
case 'harness.connectivity.recovered':
|
|
429
|
+
return {
|
|
430
|
+
type: event.type,
|
|
431
|
+
reference: `${event.source}:${event.suppressedErrorCount}`,
|
|
432
|
+
};
|
|
433
|
+
case 'conductor.recovery.report':
|
|
434
|
+
return {
|
|
435
|
+
type: event.type,
|
|
436
|
+
reference: `recovery:${event.recoveryId}`,
|
|
437
|
+
};
|
|
438
|
+
case 'github.update':
|
|
439
|
+
return {
|
|
440
|
+
type: event.type,
|
|
441
|
+
reference: summarizeRecoveryReferences('items', event.items.map((item) => item.id)),
|
|
442
|
+
};
|
|
443
|
+
default: {
|
|
444
|
+
const _exhaustive = event;
|
|
445
|
+
return { type: String(_exhaustive) };
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
function summarizeRecoveryReferences(prefix, values) {
|
|
450
|
+
const sampleCount = 5;
|
|
451
|
+
const sample = values.slice(0, sampleCount).join(',');
|
|
452
|
+
const remaining = values.length - sampleCount;
|
|
453
|
+
return `${prefix}:${sample}${remaining > 0 ? `,+${remaining} more` : ''}`;
|
|
454
|
+
}
|
|
455
|
+
function withAgentAvailabilityCallbacks(options, onAvailabilityChanged) {
|
|
456
|
+
return {
|
|
457
|
+
...options,
|
|
458
|
+
onAuthReconnectComplete: (info) => {
|
|
459
|
+
onAvailabilityChanged(info.success);
|
|
460
|
+
(options.onAuthReconnectComplete ?? options.onReconnectComplete)?.(info);
|
|
461
|
+
},
|
|
462
|
+
onTransportReconnectComplete: (info) => {
|
|
463
|
+
onAvailabilityChanged(info.success);
|
|
464
|
+
(options.onTransportReconnectComplete ?? options.onReconnectComplete)?.(info);
|
|
465
|
+
},
|
|
466
|
+
};
|
|
467
|
+
}
|
|
300
468
|
function runEventConductorSend(input) {
|
|
301
469
|
const workersBefore = input.workerDispatches.length;
|
|
302
470
|
const failuresBefore = input.workerFailures.length;
|
|
@@ -320,6 +488,10 @@ function runEventConductorSend(input) {
|
|
|
320
488
|
tool: info.tool,
|
|
321
489
|
});
|
|
322
490
|
},
|
|
491
|
+
onAutomaticRetry: (info) => {
|
|
492
|
+
input.onAutomaticRetryAttempt?.(info);
|
|
493
|
+
input.sendReconnect.onAutomaticRetry?.(info);
|
|
494
|
+
},
|
|
323
495
|
}).then((sendResult) => {
|
|
324
496
|
const completedDuringSend = input.workerDispatches.length - workersBefore;
|
|
325
497
|
const outboundDispatches = input.getOutboundDispatchesThisSend?.() ?? 0;
|
|
@@ -346,6 +518,32 @@ function runEventConductorSend(input) {
|
|
|
346
518
|
}
|
|
347
519
|
async function waitForDispatchBatch(input) {
|
|
348
520
|
for (;;) {
|
|
521
|
+
if (!input.isConductorAvailable()) {
|
|
522
|
+
const queuedReconnects = input.eventQueue.findSendEvents((event) => event.type === 'operator.reconnect');
|
|
523
|
+
if (queuedReconnects.length > 0) {
|
|
524
|
+
if (input.eventQueue
|
|
525
|
+
.snapshot()
|
|
526
|
+
.some((event) => event.type === 'operator.message')) {
|
|
527
|
+
input.onOperatorQueueChanged?.();
|
|
528
|
+
}
|
|
529
|
+
return {
|
|
530
|
+
events: queuedReconnects,
|
|
531
|
+
sourceKey: 'operator.reconnect',
|
|
532
|
+
};
|
|
533
|
+
}
|
|
534
|
+
const reconnect = await input.eventQueue.waitForMatchingEvent((event) => event.type === 'operator.reconnect', input.signal);
|
|
535
|
+
const reconnects = [
|
|
536
|
+
reconnect,
|
|
537
|
+
...input.eventQueue.findSendEvents((event) => event.type === 'operator.reconnect'),
|
|
538
|
+
];
|
|
539
|
+
if (input.eventQueue.snapshot().some((event) => event.type === 'operator.message')) {
|
|
540
|
+
input.onOperatorQueueChanged?.();
|
|
541
|
+
}
|
|
542
|
+
return {
|
|
543
|
+
events: reconnects,
|
|
544
|
+
sourceKey: 'operator.reconnect',
|
|
545
|
+
};
|
|
546
|
+
}
|
|
349
547
|
if (input.dispatchHoldState.dispatchHold) {
|
|
350
548
|
bufferDispatchHoldEvents({
|
|
351
549
|
state: input.dispatchHoldState,
|
|
@@ -416,6 +614,19 @@ async function waitForDispatchBatch(input) {
|
|
|
416
614
|
selected,
|
|
417
615
|
};
|
|
418
616
|
}
|
|
617
|
+
const hasDeferredIdleOperatorMessage = input.eventQueue
|
|
618
|
+
.snapshot()
|
|
619
|
+
.some((event) => event.type === 'operator.message' && event.delivery === 'idle') && !input.canDispatchIdleOperatorMessage();
|
|
620
|
+
// report 単独 send で dispatch hold を迂回しない。hold 解除後は held event が
|
|
621
|
+
// maxTurns で保留中でも、この有限の通知は送れる。
|
|
622
|
+
if (input.hasPendingRecoveryReport() &&
|
|
623
|
+
!input.dispatchHoldState.dispatchHold &&
|
|
624
|
+
!hasDeferredIdleOperatorMessage) {
|
|
625
|
+
return {
|
|
626
|
+
events: [],
|
|
627
|
+
sourceKey: 'conductor.recovery.report',
|
|
628
|
+
};
|
|
629
|
+
}
|
|
419
630
|
const hadQueued = input.eventQueue.size > 0;
|
|
420
631
|
const incoming = await input.eventQueue.waitForEvent(input.signal, {
|
|
421
632
|
onlyNew: hadQueued,
|
|
@@ -467,10 +678,12 @@ async function runOperatorReconnect(options) {
|
|
|
467
678
|
onReconnectComplete: options.sendReconnect.onTransportReconnectComplete ??
|
|
468
679
|
options.sendReconnect.onReconnectComplete,
|
|
469
680
|
});
|
|
681
|
+
return true;
|
|
470
682
|
}
|
|
471
683
|
catch {
|
|
472
684
|
// Reconnect failures are observable through the callback above. Keep the
|
|
473
685
|
// session alive so the operator can retry or submit another message.
|
|
686
|
+
return false;
|
|
474
687
|
}
|
|
475
688
|
}
|
|
476
689
|
function notifyHeldDispatchProgress(input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-session-driver.js","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conductor-session-driver.js","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ export interface RunConductorSessionOptions {
|
|
|
31
31
|
profile: ResolvedProfile;
|
|
32
32
|
profilePath?: string;
|
|
33
33
|
resumeAgentId?: string;
|
|
34
|
+
/** 新規 Store に記録する CLI package version。resume 時は保存済み値を使う。 */
|
|
35
|
+
cliPackageVersion?: string;
|
|
34
36
|
/** Optional factory override. Without it, `conductor.backend` selects the factory. */
|
|
35
37
|
conductorAgentFactory?: ConductorAgentFactory;
|
|
36
38
|
apiKey?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-session.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAO3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAKnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAKnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAW1E,OAAO,KAAK,EAAW,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EAAE,2BAA2B,EAAuB,MAAM,6BAA6B,CAAC;AA4BpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAGV,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAWhE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkB5D,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,qBAAqB,CAAC;AAkB7B,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,4CAA4C,CAAC;AA2BpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAK7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-session.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ import { CONDUCTOR_MESSAGE_HISTORY_MAX_ENTRIES, OpenQuestionControlOperationErro
|
|
|
50
50
|
import { formatPermissionSummaryForOperator } from '../permission/format-permission-summary-for-operator.js';
|
|
51
51
|
import { enrichSessionUsageWithCost } from '../usage/enrich-session-usage-cost.js';
|
|
52
52
|
import { SessionUsageTracker } from '../usage/session-usage-tracker.js';
|
|
53
|
+
import { PiAuthRecoverySnapshotStore } from './pi-auth-recovery-snapshot-store.js';
|
|
53
54
|
import { enqueueOperatorMessage as enqueueOperatorMessageEvent, submitOperatorInput, } from './submit-operator-input.js';
|
|
54
55
|
import { createGitHubMonitor, } from '../github/github-monitor.js';
|
|
55
56
|
import { resolveConductorBackendSetting, resolveConductorPiResourcePaths, resolveGitHubMonitorEnabled, } from '../config/resolve-settings.js';
|
|
@@ -185,6 +186,8 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
185
186
|
let lastConductorMessage = null;
|
|
186
187
|
const conductorMessages = [];
|
|
187
188
|
const eventQueue = new SessionEventQueue();
|
|
189
|
+
const piAuthRecoverySnapshotStore = new PiAuthRecoverySnapshotStore();
|
|
190
|
+
startupCleanup.add(() => piAuthRecoverySnapshotStore.dispose());
|
|
188
191
|
const openQuestionDispatchReceipts = new WeakMap();
|
|
189
192
|
const pendingOpenQuestionDispatchReceipts = new Set();
|
|
190
193
|
const dispatchHoldState = createDispatchHoldState();
|
|
@@ -207,6 +210,7 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
207
210
|
let githubMonitorCursor;
|
|
208
211
|
let githubMonitor;
|
|
209
212
|
let activeResumeStorePath;
|
|
213
|
+
let createdHarnessCliVersion = options.cliPackageVersion;
|
|
210
214
|
let activeStoreLocation = 'user-path-hash';
|
|
211
215
|
let drainStartupResumeStoreWrites = async () => { };
|
|
212
216
|
const pendingGitHubRecoveries = [];
|
|
@@ -223,6 +227,8 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
223
227
|
conductorAgentId: options.resumeAgentId,
|
|
224
228
|
});
|
|
225
229
|
const loadedResumeStore = locatedResumeStore.resumeStore;
|
|
230
|
+
// A resume keeps its origin version; a legacy store stays without one.
|
|
231
|
+
createdHarnessCliVersion = loadedResumeStore.createdHarnessCliVersion;
|
|
226
232
|
activeResumeStorePath = locatedResumeStore.path;
|
|
227
233
|
activeStoreLocation = locatedResumeStore.location;
|
|
228
234
|
const savedConfigDigestScheme = loadedResumeStore.ensembleConfigDigestScheme;
|
|
@@ -996,6 +1002,9 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
996
1002
|
version: SESSION_RESUME_STORE_VERSION,
|
|
997
1003
|
conductorAgentId: conductorHandle.conductor.agentId,
|
|
998
1004
|
conductorBackend,
|
|
1005
|
+
...(createdHarnessCliVersion !== undefined
|
|
1006
|
+
? { createdHarnessCliVersion }
|
|
1007
|
+
: {}),
|
|
999
1008
|
conductorCwd,
|
|
1000
1009
|
...(cursorBootstrapRunId
|
|
1001
1010
|
? { cursorBootstrapRunId }
|
|
@@ -1395,6 +1404,9 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
1395
1404
|
}]
|
|
1396
1405
|
: []),
|
|
1397
1406
|
}),
|
|
1407
|
+
listPiAuthRecoverySnapshots: () => piAuthRecoverySnapshotStore.list(),
|
|
1408
|
+
getPiAuthRecoverySnapshot: (recoveryId) => piAuthRecoverySnapshotStore.get(recoveryId),
|
|
1409
|
+
clearPiAuthRecoverySnapshot: (recoveryId) => piAuthRecoverySnapshotStore.remove(recoveryId),
|
|
1398
1410
|
});
|
|
1399
1411
|
if (typeof bindingDispose === 'function') {
|
|
1400
1412
|
disposeOperatorInput = bindingDispose;
|
|
@@ -1589,6 +1601,7 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
1589
1601
|
conductorHandle,
|
|
1590
1602
|
sendReconnect,
|
|
1591
1603
|
eventQueue,
|
|
1604
|
+
piAuthRecoverySnapshotStore,
|
|
1592
1605
|
dispatchHoldState,
|
|
1593
1606
|
onDispatchHoldChanged,
|
|
1594
1607
|
resetOutboundDispatchesThisSend: () => {
|
|
@@ -1652,6 +1665,14 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
1652
1665
|
});
|
|
1653
1666
|
},
|
|
1654
1667
|
onSendComplete: recordSendComplete,
|
|
1668
|
+
onPiAuthRecoverySnapshotStored: ({ snapshot, evictedRecoveryIds }) => {
|
|
1669
|
+
sessionLogger.emit({
|
|
1670
|
+
type: 'harness.warning',
|
|
1671
|
+
message: evictedRecoveryIds.length > 0
|
|
1672
|
+
? `Pi recovery inbox reached its four-dispatch limit; evicted ${evictedRecoveryIds.join(', ')}. Snapshot ${snapshot.recoveryId} remains available for local TTY inspection until ${new Date(snapshot.expiresAt).toISOString()}.`
|
|
1673
|
+
: `Pi authentication failure snapshot ${snapshot.recoveryId} is available for local TTY inspection until ${new Date(snapshot.expiresAt).toISOString()}. Use /recovery list, then /recovery show <id>.`,
|
|
1674
|
+
});
|
|
1675
|
+
},
|
|
1655
1676
|
onDispatchBatchSettled: ({ events, result, error }) => {
|
|
1656
1677
|
for (const event of events) {
|
|
1657
1678
|
if (event.type !== 'operator.message')
|
|
@@ -1798,6 +1819,9 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
1798
1819
|
}
|
|
1799
1820
|
}
|
|
1800
1821
|
finally {
|
|
1822
|
+
disposeOperatorInput?.();
|
|
1823
|
+
disposeOperatorInput = undefined;
|
|
1824
|
+
piAuthRecoverySnapshotStore.dispose();
|
|
1801
1825
|
const lifecycle = operatorRequestedClose
|
|
1802
1826
|
? 'closed'
|
|
1803
1827
|
: operatorRequestedExit
|
|
@@ -1857,7 +1881,6 @@ async function runConductorSessionWithStartupGuard(options, startupCleanup) {
|
|
|
1857
1881
|
}
|
|
1858
1882
|
teardownPhases.openQuestionControl = Date.now() - phaseStart;
|
|
1859
1883
|
}
|
|
1860
|
-
disposeOperatorInput?.();
|
|
1861
1884
|
if (dispatchHoldReminderMonitor) {
|
|
1862
1885
|
emitTeardownPhase('dispatchHoldReminderMonitor');
|
|
1863
1886
|
dispatchHoldReminderMonitor.stop();
|