@agents-ensemble/core 0.20.0 → 0.22.0

package/dist/conductor/conductor-send-reconnect.js

@@ -1,32 +1,89 @@
 import { isConductorSendAuthError } from './conductor-auth.js';
-/** close → factory.resume(sameId) で in-process の agent を差し替える。 */
+const conductorClosePromises = new WeakMap();
+/**
+ * Share one close attempt between reconnect and session teardown.
+ *
+ * A failed reconnect leaves the old agent in the handle after its close was
+ * attempted. Reusing the same promise prevents a finalizer from invoking close
+ * a second time, including while the first close is pending.
+ */
+export function closeConductorAgentOnce(agent, options = {}) {
+    const existing = conductorClosePromises.get(agent);
+    if (existing)
+        return existing;
+    const closePromise = Promise.resolve().then(() => {
+        const close = options.forResume && agent.closeForResume
+            ? agent.closeForResume
+            : agent.close;
+        return close.call(agent);
+    });
+    conductorClosePromises.set(agent, closePromise);
+    return closePromise;
+}
+/**
+ * close → factory.resume(sameId) で in-process の agent を差し替える。
+ * automatic reconnect は close reject で停止する。operator の明示操作である
+ * manual reconnect は、close が reject しても同じ ID の resume を試みる。
+ */
 export async function reconnectConductorAgent(handle, options) {
     const agentId = handle.conductor.agentId;
-    options.onReconnectAttempt?.({ agentId });
+    const source = options.source ?? 'manual';
+    throwIfReconnectAborted(options.signal);
+    options.onReconnectAttempt?.({ agentId, source });
     let conductorOptions;
     const conductorAgentFactory = options.conductorAgentFactory;
     if ('conductorOptions' in options) {
         conductorOptions = options.conductorOptions;
     }
     else {
-        const { onReconnectAttempt, onReconnectComplete, conductorAgentFactory: _conductorAgentFactory, ...sdkOptions } = options;
+        const { onReconnectAttempt, onReconnectComplete, source: _source, signal: _signal, conductorAgentFactory: _conductorAgentFactory, ...sdkOptions } = options;
         void onReconnectAttempt;
         void onReconnectComplete;
+        void _source;
+        void _signal;
         void _conductorAgentFactory;
         conductorOptions = sdkOptions;
     }
+    let closeFailed = false;
     try {
-        await handle.conductor.close();
-        handle.conductor = await conductorAgentFactory.resume(agentId, conductorOptions);
-        options.onReconnectComplete?.({ agentId, success: true });
+        try {
+            await closeConductorAgentOnce(handle.conductor);
+        }
+        catch (error) {
+            closeFailed = true;
+            if (source === 'automatic') {
+                throw error;
+            }
+            // Manual reconnect is the operator's explicit decision to replace the
+            // unavailable handle. The settled close attempt is not repeated because
+            // backend cleanup may not be idempotent.
+        }
+        throwIfReconnectAborted(options.signal);
+        const resumedAgent = await conductorAgentFactory.resume(agentId, conductorOptions);
+        if (options.signal?.aborted) {
+            await closeConductorAgentOnce(resumedAgent);
+            throwIfReconnectAborted(options.signal);
+        }
+        handle.conductor = resumedAgent;
+        options.onReconnectComplete?.({
+            agentId,
+            success: true,
+            source,
+            ...(closeFailed ? { closeFailed: true } : {}),
+        });
         return agentId;
     }
     catch (error) {
+        if (options.signal?.aborted) {
+            throw error;
+        }
         const message = formatReconnectError(error);
         options.onReconnectComplete?.({
             agentId,
             success: false,
+            source,
             error: message,
+            ...(closeFailed ? { closeFailed: true } : {}),
         });
         throw error;
     }
@@ -43,9 +100,8 @@ export function isConductorSendTransportError(result) {
     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);
 }
 /**
- * send 経路の auth/transport error 時に同一 agentId で in-process 再接続し、prompt を再試行する。
- * close → resume(sameId) → retry（各 send につき 1 回）。resume に失敗した場合は元の
- * error 結果を返し、呼び出し元の continueOnConductorError 契約を維持する。
+ * send 経路の auth/transport error 時に同一 agentId で in-process 再接続する。
+ * send 結果だけでは request 未受理を証明できないため、prompt は再送しない。
  */
 export async function sendConductorWithReconnect(handle, message, options) {
     const sendCallbacks = {
@@ -58,15 +114,19 @@ export async function sendConductorWithReconnect(handle, message, options) {
         : isConductorSendTransportError(result)
             ? 'transport'
             : undefined;
+    const reconnectSignal = options.signal && options.retrySuppressionSignal
+        ? AbortSignal.any([options.signal, options.retrySuppressionSignal])
+        : options.signal ?? options.retrySuppressionSignal;
     if (!reconnectReason ||
-        options.signal?.aborted ||
-        options.retrySuppressionSignal?.aborted) {
+        reconnectSignal?.aborted) {
         return result;
     }
     try {
         await reconnectConductorAgent(handle, {
             conductorAgentFactory: options.conductorAgentFactory,
             conductorOptions: options.conductorOptions,
+            source: 'automatic',
+            signal: reconnectSignal,
             onReconnectAttempt: resolveReconnectAttempt(options, reconnectReason),
             onReconnectComplete: resolveReconnectComplete(options, reconnectReason),
         });
@@ -74,23 +134,28 @@ export async function sendConductorWithReconnect(handle, message, options) {
     catch {
         return result;
     }
-    if (options.signal?.aborted ||
-        options.retrySuppressionSignal?.aborted) {
-        return result;
-    }
-    return handle.conductor.send(message, sendCallbacks);
+    return result;
+}
+function throwIfReconnectAborted(signal) {
+    if (!signal?.aborted)
+        return;
+    if (signal.reason !== undefined)
+        throw signal.reason;
+    const error = new Error('Conductor reconnect was aborted.');
+    error.name = 'AbortError';
+    throw error;
 }
 function resolveReconnectAttempt(options, reason) {
-    if (reason === 'auth') {
-        return options.onAuthReconnectAttempt ?? options.onReconnectAttempt;
-    }
-    return options.onTransportReconnectAttempt ?? options.onReconnectAttempt;
+    const callback = reason === 'auth'
+        ? options.onAuthReconnectAttempt ?? options.onReconnectAttempt
+        : options.onTransportReconnectAttempt ?? options.onReconnectAttempt;
+    return callback;
 }
 function resolveReconnectComplete(options, reason) {
-    if (reason === 'auth') {
-        return options.onAuthReconnectComplete;
-    }
-    return options.onTransportReconnectComplete;
+    const callback = reason === 'auth'
+        ? options.onAuthReconnectComplete
+        : options.onTransportReconnectComplete;
+    return callback;
 }
 function normalizeTransportSignal(signal) {
     return signal.toLowerCase().replace(/[_-]+/g, ' ');

package/dist/conductor/conductor-send-reconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conductor-send-reconnect.js","sourceRoot":"","sources":["../../src/conductor/conductor-send-reconnect.ts"],"names":[],"mappings":"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"}

package/dist/conductor/conductor-session-driver.d.ts

@@ -5,7 +5,11 @@ import type { PermissionPipeline } from '../permission/permission-pipeline.js';
 import type { WorkerFailureRecord } from '../runtime/types.js';
 import type { WorkerSession } from '../runtime/worker-session.js';
 import type { ConductorSendResult } from './conductor-agent.js';
+import { ConductorDispatchLifecycle } from './conductor-dispatch-lifecycle.js';
+import { ConductorRecoveryInbox } from './conductor-recovery-inbox.js';
+import type { ConductorRecoveryBackend, ConductorRecoveryFailureClass, ConductorRecoverySnapshotSummary } from './conductor-recovery-inbox.js';
 import type { ConductorAgentHandle, ConductorSendReconnectOptions } from './conductor-send-reconnect.js';
+import type { CursorBootstrapState } from './cursor-bootstrap-state.js';
 import { SessionEventQueue } from './session/session-event-queue.js';
 import type { SessionEvent } from './session/session-event.js';
 import { type DispatchHoldChange, type DispatchHoldState } from './session/dispatch-hold.js';
@@ -13,7 +17,7 @@ import { type IssueLoopStopReason } from './session-policy.js';
 export interface ConductorSendStartedInfo {
     /** これから実行する send の通し番号（1 始まり）。 */
     sendCount: number;
-    /** dispatch 束の source key（`operator` / `permission` / `permission.stall` / `worker:*` / `initial`）。 */
+    /** dispatch 束の source key（`operator` / `permission` / `permission.stall` / `worker:*` / `conductor.recovery.report` / `initial`）。 */
     dispatchSource?: string;
 }
 export interface ConductorSendProgressInfo {
@@ -33,6 +37,8 @@ export interface ConductorSendCompleteInfo {
     status: ConductorSendResult['status'];
     /** Exact user message passed to this agent.send. */
     inbound: string;
+    /** User event text to retain locally when `inbound` also restores Cursor bootstrap context. */
+    historyInbound?: string;
     dispatchSource?: string;
     /** GitHub update IDs included in this send; used to acknowledge the durable outbox. */
     githubUpdateIds?: string[];
@@ -89,6 +95,10 @@ export interface ConductorSessionDriverOptions {
     resumeStore?: Pick<ConductorSessionDriverResult, 'sendCount' | 'autonomousTurns' | 'lastSendResult'> & {
         lastDispatchesThisTurn: number;
     };
+    /** Cursor の compiled prompt が既存 provider session に bootstrap 済みか。 */
+    cursorBootstrapComplete?: boolean;
+    /** Cursor resume 中の未知状態を operator が解決するまで dispatch を止める。 */
+    cursorBootstrapState?: CursorBootstrapState;
     /** conductor send 中だけ有効な dispatch 保留状態。SessionResumeStore には保存しない。 */
     dispatchHoldState?: DispatchHoldState;
     /** dispatch 保留の切替・件数変化を TUI/観測へ通知する。 */
@@ -97,6 +107,29 @@ export interface ConductorSessionDriverOptions {
     resetOutboundDispatchesThisSend?: () => void;
     /** `prompt_worker` 等の outbound dispatch 件数（ループ停止判定向け）。 */
     getOutboundDispatchesThisSend?: () => number;
+    /** Process-local, operator-only storage for failed operator-authored input. */
+    recoveryInbox?: ConductorRecoveryInbox;
+    recoveryBackend?: ConductorRecoveryBackend;
+    /** Shared with the local operator binding so `/recovery continue` releases the same gate. */
+    dispatchLifecycle?: ConductorDispatchLifecycle<ConductorDispatchPayload>;
+    /** Sensitive recovery inspection is available through an interactive TTY binding. */
+    operatorCanInspectRecovery?: boolean;
+    onRecoveryAttention?: (input: {
+        attemptId: string;
+        sourceKey: string;
+        status: string;
+        failureClass: ConductorRecoveryFailureClass;
+        confirmationRequired: boolean;
+        pendingOperatorMessageCount: number;
+        snapshot?: ConductorRecoverySnapshotSummary;
+        agentAvailable: boolean;
+    }) => void;
+    onRecoveryCapacityBlocked?: () => void;
+}
+export interface ConductorDispatchPayload {
+    events: SessionEvent[];
+    sourceKey: string;
+    operatorInputTexts: string[];
 }
 export interface ConductorSessionDriverResult {
     stopReason: IssueLoopStopReason;

package/dist/conductor/conductor-session-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conductor-session-driver.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conductor-session-driver.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session-driver.ts"],"names":[],"mappings":"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"}