@agents-ensemble/core 0.21.0 → 0.22.0

package/dist/acp/validate-acp-preset-prerequisites.js

@@ -1,5 +1,6 @@
 import { isBuiltinAcpPresetId } from './resolve-acp-spawn.js';
-import { ACP_PRESET_BIN_NAMES, ACP_PRESET_EXTERNAL_CLI, ACP_PRESET_OPTIONAL_PACKAGES, } from './acp-preset-bins.js';
+import { ACP_PRESET_BIN_NAMES, ACP_PRESET_EXTERNAL_CLI, ACP_PRESET_ADAPTER_PACKAGES, } from './acp-preset-bins.js';
+import { assertBuiltinPiNodeVersionSupported, resolveBuiltinPiAcpEntrypointPath, resolveBuiltinPiAcpWrapperPath, resolveBuiltinPiCliEnvWrapperPath, resolveBundledPiCliPath, } from './pi-runtime.js';
 import { resolveAcpBin, resolveAcpBinFromPath, resolveBundledAcpBin, } from './resolve-bundled-acp-bin.js';
 export class AcpPresetPrerequisiteError extends Error {
     constructor(message) {
@@ -14,7 +15,7 @@ export function formatAcpPresetInstallHint(preset) {
             return ('[acp] cursor preset: Cursor Agent CLI (`agent`) が PATH にありません。\n' +
                 '  https://cursor.com/docs/cli を参照してインストールし、`agent login` を実行してください。');
         case 'claude': {
-            const { packageName, binName } = ACP_PRESET_OPTIONAL_PACKAGES.claude;
+            const { packageName, binName } = ACP_PRESET_ADAPTER_PACKAGES.claude;
             return (`[acp] claude preset: ACP adapter \`${binName}\` が見つかりません。\n` +
                 '  開発: リポジトリルートで `pnpm install`（optional 再試行）\n' +
                 `  利用者: \`npm i -g ${packageName}\`\n` +
@@ -22,7 +23,7 @@ export function formatAcpPresetInstallHint(preset) {
                 '  Claude Code の認証: 先に `claude` / Claude Code でログインしてください（ensemble は ACP authenticate を skip し CLI セッションを利用）。');
         }
         case 'codex': {
-            const { packageName, binName } = ACP_PRESET_OPTIONAL_PACKAGES.codex;
+            const { packageName, binName } = ACP_PRESET_ADAPTER_PACKAGES.codex;
             return (`[acp] codex preset: ACP adapter \`${binName}\` が見つかりません。\n` +
                 '  開発: リポジトリルートで `pnpm install`（optional 再試行）\n' +
                 `  利用者: \`npm i -g ${packageName}\`\n` +
@@ -30,11 +31,10 @@ export function formatAcpPresetInstallHint(preset) {
                 '  Codex の認証: `~/.codex` 等の runtime 設定（`model_provider` / `[model_providers.*.auth]`）を整えてください（ensemble は既定で ACP authenticate を skip し移譲 — ADR 0028）。');
         }
         case 'pi': {
-            const { packageName, binName } = ACP_PRESET_OPTIONAL_PACKAGES.pi;
+            const { packageName, binName } = ACP_PRESET_ADAPTER_PACKAGES.pi;
             return (`[acp] pi preset: ACP adapter \`${binName}\` が見つかりません。\n` +
-                '  開発: リポジトリルートで `pnpm install`（optional 再試行）\n' +
-                `  利用者: \`npm i -g ${packageName}\`\n` +
-                `  または PATH 上に \`${binName}\` を配置してください。`);
+                `  \`@agents-ensemble/core\` の依存を再インストールするか、\`npm i -g ${packageName}\` を実行してください。\n` +
+                `  PATH 上の \`${binName}\` も fallback として使えます。`);
         }
         case 'custom':
             return ('[acp] custom preset: 指定した command が PATH にありません。\n' +
@@ -52,8 +52,21 @@ export function formatAcpExternalCliInstallHint(preset, cliName) {
     return (`[acp] ${preset} preset: 外部 CLI \`${cliName}\` が PATH にありません。\n` +
         '  必要な CLI をインストールして PATH に追加してください。');
 }
-function validateBuiltinPreset(preset, fromModuleUrl) {
+function validateBuiltinPreset(preset, piRuntime, fromModuleUrl) {
     const moduleUrl = fromModuleUrl ?? import.meta.url;
+    if (preset === 'pi' && piRuntime === 'builtin') {
+        try {
+            resolveBuiltinPiAcpEntrypointPath(moduleUrl);
+            assertBuiltinPiNodeVersionSupported();
+            resolveBundledPiCliPath(moduleUrl);
+            resolveBuiltinPiAcpWrapperPath();
+            resolveBuiltinPiCliEnvWrapperPath(moduleUrl);
+        }
+        catch (error) {
+            throw new AcpPresetPrerequisiteError(error instanceof Error ? error.message : String(error));
+        }
+        return;
+    }
     if (preset === 'cursor') {
         if (!resolveAcpBinFromPath(ACP_PRESET_BIN_NAMES.cursor)) {
             throw new AcpPresetPrerequisiteError(formatAcpPresetInstallHint('cursor'));
@@ -70,7 +83,7 @@ function validateBuiltinPreset(preset, fromModuleUrl) {
         throw new AcpPresetPrerequisiteError(formatAcpExternalCliInstallHint(preset, externalCli));
     }
 }
-/** spawn 前に preset 前提（optional bin / 外部 CLI）を検証する。不足時は throw。 */
+/** spawn 前に preset 前提（同梱または PATH adapter / 外部 CLI）を検証する。 */
 export function validateAcpPresetPrerequisites(spawn, options) {
     if (spawn.preset === 'custom') {
         if (!resolveAcpBinFromPath(spawn.command)) {
@@ -81,7 +94,7 @@ export function validateAcpPresetPrerequisites(spawn, options) {
     if (!isBuiltinAcpPresetId(spawn.preset)) {
         throw new AcpPresetPrerequisiteError(`[acp] Unknown ACP preset "${spawn.preset}".`);
     }
-    validateBuiltinPreset(spawn.preset, options?.fromModuleUrl);
+    validateBuiltinPreset(spawn.preset, spawn.piRuntime, options?.fromModuleUrl);
 }
 /** 検証済み spawn の command を bundled / PATH 解決後の絶対パスへ置き換える。 */
 export function resolveAcpSpawnExecutable(spawn, options) {
@@ -92,6 +105,13 @@ export function resolveAcpSpawnExecutable(spawn, options) {
     if (!isBuiltinAcpPresetId(spawn.preset)) {
         throw new Error(`Unknown ACP preset "${spawn.preset}"`);
     }
+    if (spawn.preset === 'pi' && spawn.piRuntime === 'builtin') {
+        return {
+            ...spawn,
+            command: process.execPath,
+            args: [resolveBuiltinPiAcpWrapperPath(), ...spawn.args],
+        };
+    }
     const resolved = resolveAcpBin(spawn.preset, options?.fromModuleUrl ?? import.meta.url);
     if (!resolved) {
         throw new AcpPresetPrerequisiteError(formatAcpPresetInstallHint(spawn.preset));

package/dist/acp/validate-acp-preset-prerequisites.js.map

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

package/dist/conductor/conductor-agent.d.ts

@@ -13,10 +13,20 @@ export interface ConductorAgentCreateOptions {
     systemPrompt: string;
     /** Whether backend built-in coding tools are available; omitted means enabled. */
     builtinTools?: boolean;
+    /**
+     * Pi backend only: load and expand Pi prompt templates and explicit skill
+     * invocations; omitted means enabled.
+     */
+    piPromptResources?: boolean;
     /** Pi backend only: use Pi standard skill discovery; omitted means enabled. */
     piSkills?: boolean;
     /** Pi backend only: load configured extension modules and tools; omitted means enabled. */
     piExtensions?: boolean;
+    /**
+     * Pi backend only: register Pi's built-in MCP, Codemode, and Tool Search
+     * extensions; omitted means enabled.
+     */
+    piInternalExtensions?: boolean;
     /** Pi backend only: called when `compaction_end` reports a successful compaction. */
     onContextCompaction?: () => void;
     apiKey?: string;
@@ -30,10 +40,12 @@ export interface ConductorAgentCreateOptions {
     mcpServers?: McpServerConfigMap;
     /** Pi-only resource root overrides; ignored by other backends. */
     pi?: ConductorPiResourceOptions;
-    /** Pi-only session transcript directory resolved by the harness. */
+    /** Pi-only Issue identity used to resolve the canonical transcript directory. */
+    issueUrl?: string;
+    /** Pi-only explicit transcript directory override. Defaults to the canonical user store from issueUrl. */
     sessionDir?: string;
-    /** Pi-only legacy transcript directory used for resume migration. */
-    legacySessionDir?: string;
+    /** CWDs from the saved session whose Pi transcript may be resumed in this clone. */
+    resumeCwds?: readonly string[];
     customTools?: ConductorToolSet;
     onStreamText?: (text: string) => void;
 }

package/dist/conductor/conductor-agent.d.ts.map

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

package/dist/conductor/conductor-auth.d.ts

@@ -1,6 +1,5 @@
 import type { SdkAuthStatus, SdkLoginResult } from '@cursor/sdk';
-import type { OAuthLoginCallbacks } from '@earendil-works/pi-ai/compat';
-import { type PiConductorAuthOptions, type PiConductorAuthStatus, type PiConductorLoginResult, type PiConductorLogoutResult } from './conductor-pi-auth.js';
+import { type PiConductorAuthOptions, type PiConductorAuthStatus, type PiConductorLoginResult, type PiConductorLogoutResult, type PiConductorOAuthLoginCallbacks } from './conductor-pi-auth.js';
 import type { ConductorBackend, EnsembleConfig } from '../config/types.js';
 import type { ConductorSendResult } from './conductor-agent.js';
 /**
@@ -21,7 +20,7 @@ export interface ConductorAuthOptions {
     provider?: string;
     modelId?: string;
     apiKey?: string;
-    oauthCallbacks?: OAuthLoginCallbacks;
+    oauthCallbacks?: PiConductorOAuthLoginCallbacks;
 }
 export type ConductorAuthStatus = SdkAuthStatus | PiConductorAuthStatus;
 export type ConductorLoginResult = SdkLoginResult | PiConductorLoginResult;

package/dist/conductor/conductor-auth.d.ts.map

@@ -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,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"}
+{"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,EAML,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,8BAA8B,EACpC,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,8BAA8B,CAAC;CACjD;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,CA+BR;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"}

package/dist/conductor/conductor-auth.js

@@ -76,8 +76,11 @@ export function formatConductorAuthRecoveryHint(agentId, options = {}) {
         const resumeInstruction = options.resumeInstruction ??
             `認証設定を直した後、同じ TTY では /reconnect を試してください。再送されない場合や tool が始まっていた場合は状態を確認し、新しい operator message で未完了分を伝えてください。process 終了後は ensemble issue ... ${resume} で session を再開できます。`;
         return (`[auth] Pi 認証エラー（provider=${provider}）。` +
-            `ensemble auth login --provider ${provider} を実行するか、${agentDir}/auth.json または ` +
-            `環境変数 ${formatPiProviderEnvHint(provider)} を確認してください。` +
+            `API key を使う場合は、TTY で \`ensemble auth login --provider ${provider} --api-key-prompt\` ` +
+            `（非表示 prompt）を実行してください。非 TTY では \`ensemble auth login --provider ${provider} --api-key-stdin\` ` +
+            `に stdin から key を渡します。key を command line や hint に含めないでください。` +
+            `OAuth を使う場合は TTY で \`ensemble auth login --provider ${provider}\` を実行してください。` +
+            `${agentDir}/auth.json または request 時に使う環境変数 ${formatPiProviderEnvHint(provider)} も確認してください。` +
             resumeInstruction);
     }
     if (process.env.CURSOR_API_KEY) {

package/dist/conductor/conductor-auth.js.map

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

package/dist/conductor/conductor-dispatch-lifecycle.d.ts

@@ -0,0 +1,85 @@
+import type { ConductorSendResult } from './conductor-agent.js';
+import { type ConductorRecoveryAttemptMetadata, type ConductorRecoveryBackend, type ConductorRecoveryFailureClass, type ConductorRecoveryReservation, type ConductorRecoverySnapshotSummary, type ConductorRecoveryWorkflow, ConductorRecoveryInbox } from './conductor-recovery-inbox.js';
+export type ConductorDispatchState = 'ready' | 'in_flight' | 'reconnecting' | 'unavailable' | 'attention';
+export interface ConductorDispatchLease<T> {
+    readonly id: number;
+    readonly attemptId: string;
+    readonly kind: 'send';
+    readonly payload: T;
+    readonly token: symbol;
+}
+export interface ConductorReconnectLease {
+    readonly id: number;
+    readonly attemptId: string;
+    readonly kind: 'reconnect';
+    readonly token: symbol;
+}
+export interface SettleConductorDispatchInput<T> {
+    lifecycle: ConductorDispatchLifecycle<T>;
+    lease: ConductorDispatchLease<T>;
+    inbox?: ConductorRecoveryInbox;
+    reservation?: ConductorRecoveryReservation;
+    workflow: ConductorRecoveryWorkflow;
+    backend: ConductorRecoveryBackend;
+    sendCount: number;
+    sourceKey: string;
+    eventTypes: readonly string[];
+    operatorInputTexts: readonly string[];
+    result: ConductorSendResult;
+    automaticReconnect?: ConductorRecoveryAttemptMetadata['automaticReconnect'];
+    toolCallStarted: boolean;
+    /** Shutdown does not leave process-local recovery content behind. */
+    captureFailure?: boolean;
+    /** A workflow-specific retry can keep its existing settlement contract. */
+    requiresConfirmation?: boolean;
+    failureClass?: ConductorRecoveryFailureClass;
+    /** A rejected send closes the handle until an explicit reconnect. */
+    agentAvailable?: boolean;
+}
+export interface SettleConductorDispatchResult {
+    completed: boolean;
+    failureClass?: ConductorRecoveryFailureClass;
+    snapshot?: ConductorRecoverySnapshotSummary;
+}
+/**
+ * Applies one final send result to the shared lifecycle and optional inbox.
+ * Workflow queues retain their own event-specific acknowledgement behavior.
+ */
+export declare function settleConductorDispatch<T>(input: SettleConductorDispatchInput<T>): SettleConductorDispatchResult;
+/**
+ * Owns the single in-flight conductor operation and its post-failure gate.
+ * Workflow queues keep their selectors and settle their own event types.
+ */
+export declare class ConductorDispatchLifecycle<T> {
+    private sequence;
+    private activeLease;
+    private agentAvailable;
+    private attentionAttemptId;
+    private lastFailureClass;
+    private readonly listeners;
+    get state(): ConductorDispatchState;
+    get available(): boolean;
+    get confirmationRequired(): boolean;
+    get pendingAttemptId(): string | undefined;
+    get lastFailure(): ConductorRecoveryFailureClass | undefined;
+    get canDispatch(): boolean;
+    subscribe(listener: () => void): () => void;
+    beginSend(payload: T): ConductorDispatchLease<T> | undefined;
+    beginReconnect(): ConductorReconnectLease | undefined;
+    settleSend(lease: ConductorDispatchLease<T>, outcome: {
+        completed: boolean;
+        failureClass?: ConductorRecoveryFailureClass;
+        /** Omit to preserve availability reported by an automatic reconnect. */
+        agentAvailable?: boolean;
+        /** Report-only retries keep their existing workflow-specific contract. */
+        requiresConfirmation?: boolean;
+    }): void;
+    settleReconnect(lease: ConductorReconnectLease, succeeded: boolean): void;
+    setAgentAvailable(available: boolean): void;
+    /** Explicit operator confirmation releases the later-dispatch gate. */
+    confirmRecovery(): boolean;
+    wake(): void;
+    private assertActiveLease;
+    private notify;
+}
+//# sourceMappingURL=conductor-dispatch-lifecycle.d.ts.map

package/dist/conductor/conductor-dispatch-lifecycle.d.ts.map

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

package/dist/conductor/conductor-dispatch-lifecycle.js

@@ -0,0 +1,190 @@
+import { classifyConductorRecoveryFailure, CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT, } from './conductor-recovery-inbox.js';
+/**
+ * Applies one final send result to the shared lifecycle and optional inbox.
+ * Workflow queues retain their own event-specific acknowledgement behavior.
+ */
+export function settleConductorDispatch(input) {
+    const completed = input.result.status === 'finished' ||
+        input.result.status === 'completed' ||
+        // The Issue workflow has historically treated `running` as a normal
+        // nonterminal result and continues consuming later events. The
+        // operator-agent workflow keeps its narrower acknowledgement contract so
+        // watched reports can retry while user input waits for confirmation.
+        (input.workflow === 'issue' && input.result.status === 'running');
+    if (completed) {
+        if (input.reservation)
+            input.inbox?.release(input.reservation);
+        input.lifecycle.settleSend(input.lease, { completed: true });
+        return { completed: true };
+    }
+    const failureClass = classifyConductorRecoveryFailure(input.result);
+    let snapshot;
+    const shouldCapture = input.captureFailure !== false;
+    if (shouldCapture && input.operatorInputTexts.length > 0) {
+        if (!input.inbox || !input.reservation) {
+            throw new Error('Operator input failed without an admitted recovery inbox reservation.');
+        }
+        if (input.operatorInputTexts.reduce((total, text) => total + Buffer.byteLength(text, 'utf8'), 0) > CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT) {
+            throw new Error('Operator input exceeded the recovery admission limit after selection.');
+        }
+        const metadata = {
+            recoveryId: `conductor-recovery-${input.lease.attemptId}`,
+            workflow: input.workflow,
+            backend: input.backend,
+            sendCount: input.sendCount,
+            ...(input.result.runId ? { runId: input.result.runId } : {}),
+            sourceKey: input.sourceKey,
+            eventTypes: [...new Set(input.eventTypes)],
+            status: input.result.status,
+            failureClass,
+            ...(input.automaticReconnect
+                ? { automaticReconnect: { ...input.automaticReconnect } }
+                : {}),
+            automaticRetryAttempts: 0,
+            toolCallStarted: input.toolCallStarted,
+        };
+        snapshot = input.inbox.commit(input.reservation, metadata, input.operatorInputTexts);
+        if (!snapshot) {
+            throw new Error('Could not commit a reserved operator input to the recovery inbox.');
+        }
+    }
+    else if (input.reservation) {
+        input.inbox?.release(input.reservation);
+    }
+    input.lifecycle.settleSend(input.lease, {
+        completed: false,
+        failureClass,
+        ...(input.agentAvailable !== undefined
+            ? { agentAvailable: input.agentAvailable }
+            : {}),
+        ...(input.requiresConfirmation !== undefined
+            ? { requiresConfirmation: input.requiresConfirmation }
+            : {}),
+    });
+    return { completed: false, failureClass, ...(snapshot ? { snapshot } : {}) };
+}
+/**
+ * Owns the single in-flight conductor operation and its post-failure gate.
+ * Workflow queues keep their selectors and settle their own event types.
+ */
+export class ConductorDispatchLifecycle {
+    sequence = 0;
+    activeLease;
+    agentAvailable = true;
+    attentionAttemptId;
+    lastFailureClass;
+    listeners = new Set();
+    get state() {
+        if (this.activeLease?.kind === 'send')
+            return 'in_flight';
+        if (this.activeLease?.kind === 'reconnect')
+            return 'reconnecting';
+        if (!this.agentAvailable)
+            return 'unavailable';
+        if (this.attentionAttemptId !== undefined)
+            return 'attention';
+        return 'ready';
+    }
+    get available() {
+        return this.agentAvailable;
+    }
+    get confirmationRequired() {
+        return this.attentionAttemptId !== undefined;
+    }
+    get pendingAttemptId() {
+        return this.attentionAttemptId;
+    }
+    get lastFailure() {
+        return this.lastFailureClass;
+    }
+    get canDispatch() {
+        return (this.activeLease === undefined &&
+            this.agentAvailable &&
+            this.attentionAttemptId === undefined);
+    }
+    subscribe(listener) {
+        this.listeners.add(listener);
+        return () => this.listeners.delete(listener);
+    }
+    beginSend(payload) {
+        if (!this.canDispatch)
+            return undefined;
+        const id = ++this.sequence;
+        const token = Symbol(`conductor-send-${id}`);
+        this.activeLease = { token, kind: 'send', id };
+        this.notify();
+        return {
+            id,
+            attemptId: String(id),
+            kind: 'send',
+            payload,
+            token,
+        };
+    }
+    beginReconnect() {
+        if (this.activeLease !== undefined)
+            return undefined;
+        const id = ++this.sequence;
+        const token = Symbol(`conductor-reconnect-${id}`);
+        this.activeLease = { token, kind: 'reconnect', id };
+        this.notify();
+        return { id, attemptId: String(id), kind: 'reconnect', token };
+    }
+    settleSend(lease, outcome) {
+        this.assertActiveLease(lease, 'send');
+        this.activeLease = undefined;
+        if (outcome.agentAvailable !== undefined) {
+            this.agentAvailable = outcome.agentAvailable;
+        }
+        if (outcome.completed) {
+            this.attentionAttemptId = undefined;
+            this.lastFailureClass = undefined;
+        }
+        else if (outcome.requiresConfirmation !== false) {
+            this.attentionAttemptId = lease.attemptId;
+            this.lastFailureClass = outcome.failureClass;
+        }
+        else {
+            this.lastFailureClass = outcome.failureClass;
+        }
+        this.notify();
+    }
+    settleReconnect(lease, succeeded) {
+        this.assertActiveLease(lease, 'reconnect');
+        this.activeLease = undefined;
+        this.agentAvailable = succeeded;
+        this.notify();
+    }
+    setAgentAvailable(available) {
+        if (this.agentAvailable === available)
+            return;
+        this.agentAvailable = available;
+        this.notify();
+    }
+    /** Explicit operator confirmation releases the later-dispatch gate. */
+    confirmRecovery() {
+        if (this.activeLease !== undefined || this.attentionAttemptId === undefined) {
+            return false;
+        }
+        this.attentionAttemptId = undefined;
+        this.notify();
+        return true;
+    }
+    wake() {
+        this.notify();
+    }
+    assertActiveLease(lease, kind) {
+        if (this.activeLease?.token !== lease.token ||
+            this.activeLease.id !== lease.id ||
+            this.activeLease.kind !== kind ||
+            lease.kind !== kind) {
+            throw new Error(`Cannot settle inactive conductor ${kind} lease.`);
+        }
+    }
+    notify() {
+        for (const listener of [...this.listeners]) {
+            listener();
+        }
+    }
+}
+//# sourceMappingURL=conductor-dispatch-lifecycle.js.map

package/dist/conductor/conductor-dispatch-lifecycle.js.map

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

package/dist/conductor/conductor-history.d.ts

@@ -31,6 +31,12 @@ export declare function listConductorProviderHistory(input: {
     backend: ConductorBackend;
     conductorAgentId: string;
     cwd: string;
+    /** Repository root for Pi's user-level transcript path; defaults to cwd. */
+    repoRoot?: string;
+    /** Issue URL scopes Pi transcripts to their canonical repository slug. */
+    issueUrl?: string;
+    /** Saved workspaces used only to resolve CWD metadata for canonical transcripts. */
+    resumeCwds?: readonly string[];
     cursorBootstrapRunId?: string;
     query: ConductorProviderHistoryQuery;
     /** Optional post-page text transformation; omitted to preserve raw values. */

package/dist/conductor/conductor-history.d.ts.map

@@ -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,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"}
+{"version":3,"file":"conductor-history.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-history.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,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,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,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"}

package/dist/conductor/conductor-history.js

@@ -1,7 +1,7 @@
-import { join } from 'node:path';
 import { Agent } from '@cursor/sdk';
 import { SessionManager, } from '@earendil-works/pi-coding-agent';
-import { PI_CONDUCTOR_MESSAGE_HISTORY_ENTRY_TYPE, PI_SESSION_ROOT, } from './pi-conductor-agent.js';
+import { PI_CONDUCTOR_MESSAGE_HISTORY_ENTRY_TYPE } from './pi-conductor-agent.js';
+import { findPiConductorSessionFile } from './pi-conductor-session-file.js';
 export const CONDUCTOR_PROVIDER_HISTORY_LIMIT = 100;
 /** Read the latest eligible user/final-response pairs from a provider session. */
 export async function listConductorProviderHistory(input) {
@@ -57,14 +57,19 @@ async function sanitizeProviderHistoryMessages(messages, sanitizer, conductorAge
 }
 function readPiConductorHistory(input) {
     const cwd = input.cwd;
-    const sessionDir = join(cwd, PI_SESSION_ROOT);
-    const sessionFile = SessionManager.findById(cwd, input.conductorAgentId, sessionDir);
-    if (!sessionFile) {
+    const location = findPiConductorSessionFile({
+        conductorAgentId: input.conductorAgentId,
+        cwd,
+        repoRoot: input.repoRoot,
+        issueUrl: input.issueUrl,
+        resumeCwds: input.resumeCwds,
+    });
+    if (!location) {
         throw new Error('The Pi provider session is missing or unreadable.');
     }
     let session;
     try {
-        session = SessionManager.open(sessionFile, sessionDir, cwd);
+        session = SessionManager.open(location.sessionFile, location.sessionDir, cwd);
     }
     catch {
         throw new Error('The Pi provider session could not be read.');