ycodium-acp-executor 0.2.3080 → 0.2.3088

package/dist/executor/requests.js

@@ -0,0 +1,215 @@
+// @effect-diagnostics nodeBuiltinImport:off
+// @effect-diagnostics globalDate:off
+// @effect-diagnostics globalTimers:off
+import { acpApprovalOptions, isAcpRequestPermissionParams, selectAcpPermissionOptionId, selectAutoApprovedAcpPermissionOption, } from "../adapter-support.js";
+import { approvalOutcomeForDecision, } from "../approvals.js";
+import { AcpExecutorRequestError } from "../errors.js";
+import { fileChangesFromAcpPermission, makeAcpRequestOpenedEvent, makeAcpRequestResolvedEvent, } from "../events.js";
+import { CLIENT_METHODS, RequestError } from "../protocol.js";
+import { parsePermissionRequest } from "../runtime-model.js";
+import { userInputAnswerOptionId } from "../user-input-pending.js";
+import { isRecord } from "../util.js";
+import {} from "../vendor-hooks.js";
+export function createExecutorRequests({ emit, stamp, options, approvals, pendingUserInputs, failIfDisposed, randomId, hooks, shared, }) {
+    const emitResolved = (pending, decision, reason) => {
+        emit(makeAcpRequestResolvedEvent({
+            stamp: stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            turnId: pending.turnId,
+            requestId: pending.requestId,
+            permissionRequest: pending.permissionRequest,
+            decision,
+            ...(reason !== undefined ? { reason } : {}),
+        }));
+    };
+    const settleApproval = (pending, outcome, decision, reason) => {
+        if (!approvals.settle(pending, outcome)) {
+            return false;
+        }
+        emitResolved(pending, decision, reason);
+        return true;
+    };
+    const settleAllApprovals = (decision) => {
+        for (const entry of approvals.settleAll({ outcome: "cancelled" })) {
+            emitResolved(entry, decision);
+        }
+    };
+    const emitUserInputResolved = (pending, answers) => {
+        emit({
+            type: "user-input.resolved",
+            ...stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            ...(pending.turnId !== undefined ? { turnId: pending.turnId } : {}),
+            requestId: pending.requestId,
+            payload: { answers },
+        });
+    };
+    const settleAllUserInputs = () => {
+        for (const pending of pendingUserInputs.values()) {
+            if (pending.settled)
+                continue;
+            pending.settled = true;
+            pending.resolve({ kind: "cancelled" });
+        }
+        pendingUserInputs.clear();
+    };
+    /**
+     * 把一组问题交给用户，等回答。权限那条（Kimi 借 permission 传提问）与厂商扩展那条
+     * （Grok 的 `_x.ai/ask_user_question`）共用这一份等待表——两边各自登记会让
+     * `settleAllUserInputs` 漏掉一半，CLI 崩溃时那一半永远不 settle。
+     */
+    const askUserInput = async (input) => {
+        // dispose 之后迟到的请求不得再登记：清理已经跑完，塞进去就再也 settle 不了。
+        failIfDisposed();
+        const requestId = randomId();
+        const { promise: settlement, resolve: settle } = Promise.withResolvers();
+        const pending = {
+            requestId,
+            questions: input.questions,
+            turnId: shared.activeTurnId,
+            settled: false,
+            resolve: settle,
+        };
+        pendingUserInputs.set(requestId, pending);
+        emit({
+            type: "user-input.requested",
+            ...stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            ...(shared.activeTurnId !== undefined ? { turnId: shared.activeTurnId } : {}),
+            requestId,
+            payload: { questions: input.questions },
+            raw: {
+                source: "acp.jsonrpc",
+                method: input.method,
+                payload: input.payload,
+            },
+        });
+        const resolution = await settlement;
+        pendingUserInputs.delete(requestId);
+        emitUserInputResolved(pending, resolution.kind === "answered" ? resolution.answers : {});
+        return resolution;
+    };
+    /** 每次扩展请求现造一份，把真实方法名与原始载荷带进 `raw`，排障时看得出是谁问的。 */
+    const makeExtensionContext = (method, params) => ({
+        askUserInput: (questions) => askUserInput({ questions, method, payload: params }),
+    });
+    /** 厂商钩子认出的提问/计划走 `user-input.*`，返回 undefined 表示没接管。 */
+    const handlePermissionAsUserInput = async (params) => {
+        if (hooks.permissionUserInput === undefined)
+            return undefined;
+        let question;
+        try {
+            question = hooks.permissionUserInput(params);
+        }
+        catch (error) {
+            // 认出来却形状不全的交互绝不能降格成批准/拒绝两档——回协议错误。
+            throw RequestError.invalidParams({
+                detail: error instanceof Error ? error.message : String(error),
+            });
+        }
+        if (question === undefined)
+            return undefined;
+        const resolution = await askUserInput({
+            questions: [question],
+            method: CLIENT_METHODS.session_request_permission,
+            payload: params,
+        });
+        const optionId = resolution.kind === "answered"
+            ? userInputAnswerOptionId(question, resolution.answers)
+            : undefined;
+        return {
+            outcome: optionId !== undefined ? { outcome: "selected", optionId } : { outcome: "cancelled" },
+        };
+    };
+    const handlePermissionRequest = async (params) => {
+        if (!isAcpRequestPermissionParams(params)) {
+            throw RequestError.invalidParams({ detail: "Malformed session/request_permission" });
+        }
+        const userInputOutcome = await handlePermissionAsUserInput(params);
+        if (userInputOutcome !== undefined)
+            return userInputOutcome;
+        const permissionRequest = parsePermissionRequest(params);
+        if (options.autoApprove?.(permissionRequest) === true) {
+            // 选项表认不出唯一的「允许」项就照常弹给用户，不替它猜。
+            const optionId = selectAutoApprovedAcpPermissionOption(params);
+            if (optionId !== undefined) {
+                return { outcome: { outcome: "selected", optionId } };
+            }
+        }
+        const requestId = randomId();
+        const outcome = await new Promise((resolve) => {
+            const pending = {
+                requestId,
+                request: params,
+                permissionRequest,
+                turnId: shared.activeTurnId,
+                settled: false,
+                resolve,
+            };
+            approvals.add(pending);
+            emit(makeAcpRequestOpenedEvent({
+                stamp: stamp(),
+                provider: options.provider,
+                threadId: options.threadId,
+                turnId: shared.activeTurnId,
+                requestId,
+                permissionRequest,
+                detail: permissionRequest.detail ?? "Approve this tool call?",
+                args: permissionRequest.toolCall?.data["rawInput"] ?? params.toolCall.rawInput,
+                options: acpApprovalOptions(params),
+                fileChanges: fileChangesFromAcpPermission(permissionRequest),
+                source: "acp.jsonrpc",
+                method: "session/request_permission",
+                rawPayload: params,
+            }));
+        });
+        return { outcome };
+    };
+    const respondToRequest = async (requestId, decision, reason) => {
+        failIfDisposed();
+        const apply = () => {
+            const pending = approvals.get(requestId);
+            if (!pending || pending.requestId !== requestId) {
+                throw new AcpExecutorRequestError("session/request_permission", `Unknown pending approval request: ${requestId}`);
+            }
+            if (pending.settled) {
+                return;
+            }
+            const selectedOptionId = decision === "cancel" ? undefined : selectAcpPermissionOptionId(pending.request, decision);
+            if (decision !== "cancel" && selectedOptionId === undefined) {
+                throw new AcpExecutorRequestError("session/request_permission", `Unsupported approval decision for this request: ${decision}`);
+            }
+            settleApproval(pending, approvalOutcomeForDecision(decision, selectedOptionId), decision, reason);
+        };
+        // 审批答复同样不走 thread 锁，理由同 `cancel`。
+        apply();
+    };
+    const respondToUserInput = async (requestId, answers) => {
+        failIfDisposed();
+        const pending = pendingUserInputs.get(requestId);
+        if (pending === undefined) {
+            throw new AcpExecutorRequestError("session/request_permission", `Unknown pending user-input request: ${requestId}`);
+        }
+        if (pending.settled) {
+            return;
+        }
+        pending.settled = true;
+        pendingUserInputs.delete(requestId);
+        pending.resolve({
+            kind: "answered",
+            answers: isRecord(answers) ? answers : {},
+        });
+    };
+    return {
+        settleAllApprovals,
+        settleAllUserInputs,
+        makeExtensionContext,
+        handlePermissionRequest,
+        respondToRequest,
+        respondToUserInput,
+    };
+}
+//# sourceMappingURL=requests.js.map

package/dist/executor/requests.js.map

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

package/dist/executor/runtime.d.ts

@@ -0,0 +1,14 @@
+import type { AcpEventStamp, ExecutorEvent } from "../types.ts";
+import type { AcpExecutorSupport } from "./support.ts";
+export declare function createExecutorRuntime({ randomId, nowIso, eventStream, options, assistantItemRuntimeId, promptMutex, shared, }: Pick<AcpExecutorSupport, "randomId" | "nowIso" | "eventStream" | "options" | "assistantItemRuntimeId" | "promptMutex" | "shared">): {
+    stamp: () => AcpEventStamp;
+    isLive: (expectedGeneration: number) => boolean;
+    emit: (event: ExecutorEvent) => void;
+    emitArtifacts: (artifacts: ReadonlyArray<import("../artifacts.ts").AcpArtifact>, toolCallId?: string) => void;
+    failIfDisposed: () => void;
+    closeActiveAssistantSegment: (turnId: string | undefined) => void;
+    ensureActiveAssistantSegment: (acpSessionId: string, turnId: string | undefined) => string;
+    notifyPromptSettled: () => void;
+    waitForPromptIdle: (timeoutMs: number) => Promise<boolean>;
+};
+//# sourceMappingURL=runtime.d.ts.map

package/dist/executor/runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/executor/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,QAAQ,EACR,MAAM,EACN,WAAW,EACX,OAAO,EACP,sBAAsB,EACtB,WAAW,EACX,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAChB,UAAU,GACV,QAAQ,GACR,aAAa,GACb,SAAS,GACT,wBAAwB,GACxB,aAAa,GACb,QAAQ,CACX;iBACmB,aAAa;iCAOK,MAAM,KAAG,OAAO;kBAchC,aAAa,KAAK,IAAI;;0BASf,IAAI;0CAMc,MAAM,GAAG,SAAS,KAAG,IAAI;iDAmBtD,MAAM,UACZ,MAAM,GAAG,SAAS,KACzB,MAAM;+BAsBuB,IAAI;mCAOQ,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EA4BtE"}

package/dist/executor/runtime.js

@@ -0,0 +1,103 @@
+// @effect-diagnostics nodeBuiltinImport:off
+// @effect-diagnostics globalDate:off
+// @effect-diagnostics globalTimers:off
+import { makeArtifactEmitter } from "../artifacts.js";
+import { AcpExecutorDisposedError } from "../errors.js";
+import { makeAcpAssistantItemEvent } from "../events.js";
+export function createExecutorRuntime({ randomId, nowIso, eventStream, options, assistantItemRuntimeId, promptMutex, shared, }) {
+    const stamp = () => ({
+        eventId: randomId(),
+        createdAt: nowIso(),
+    });
+    // 迟到的结果先验身份：dispose 之后、或已经换代的那次 start/prompt 完成时，
+    // 不许回写状态。`Promise.race` 输掉的那一方还在跑，这是唯一的拦截点。
+    const isLive = (expectedGeneration) => !shared.disposed && shared.generation === expectedGeneration;
+    const publish = (event) => {
+        if (shared.disposed) {
+            return;
+        }
+        eventStream.publish(options.originBindingGeneration === undefined
+            ? event
+            : { ...event, originBindingGeneration: options.originBindingGeneration });
+    };
+    const emit = publish;
+    const emitArtifacts = makeArtifactEmitter({
+        emit,
+        stamp,
+        options,
+        turnId: () => shared.activeTurnId,
+    });
+    const failIfDisposed = () => {
+        if (shared.disposed) {
+            throw new AcpExecutorDisposedError();
+        }
+    };
+    const closeActiveAssistantSegment = (turnId) => {
+        if (!shared.assistantSegment.activeItemId) {
+            return;
+        }
+        const itemId = shared.assistantSegment.activeItemId;
+        shared.assistantSegment = { nextSegmentIndex: shared.assistantSegment.nextSegmentIndex };
+        emit(makeAcpAssistantItemEvent({
+            stamp: stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            turnId,
+            itemId,
+            lifecycle: "item.completed",
+        }));
+    };
+    const ensureActiveAssistantSegment = (acpSessionId, turnId) => {
+        if (shared.assistantSegment.activeItemId) {
+            return shared.assistantSegment.activeItemId;
+        }
+        const itemId = `assistant:${acpSessionId}:runtime:${assistantItemRuntimeId}:segment:${shared.assistantSegment.nextSegmentIndex}`;
+        shared.assistantSegment = {
+            nextSegmentIndex: shared.assistantSegment.nextSegmentIndex + 1,
+            activeItemId: itemId,
+        };
+        emit(makeAcpAssistantItemEvent({
+            stamp: stamp(),
+            provider: options.provider,
+            threadId: options.threadId,
+            turnId,
+            itemId,
+            lifecycle: "item.started",
+        }));
+        return itemId;
+    };
+    const notifyPromptSettled = () => {
+        const waiters = shared.promptWaiters.splice(0);
+        for (const waiter of waiters) {
+            waiter();
+        }
+    };
+    const waitForPromptIdle = async (timeoutMs) => {
+        if (!promptMutex.isLocked) {
+            return true;
+        }
+        return await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                shared.promptWaiters = shared.promptWaiters.filter((waiter) => waiter !== onSettle);
+                resolve(false);
+            }, timeoutMs);
+            const onSettle = () => {
+                clearTimeout(timer);
+                resolve(true);
+            };
+            shared.promptWaiters.push(onSettle);
+        });
+    };
+    return {
+        stamp,
+        isLive,
+        emit,
+        emitArtifacts,
+        failIfDisposed,
+        closeActiveAssistantSegment,
+        ensureActiveAssistantSegment,
+        notifyPromptSettled,
+        waitForPromptIdle,
+    };
+}
+//# sourceMappingURL=runtime.js.map

package/dist/executor/runtime.js.map

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

package/dist/executor/session.d.ts

@@ -0,0 +1,19 @@
+import { type AcpModelSelectionState } from "../model-selection.ts";
+import type { AcpSessionStartResult } from "../types.ts";
+import type { createExecutorRuntime } from "./runtime.ts";
+import type { AcpExecutorSupport } from "./support.ts";
+export declare function createExecutorSession({ options, connection, isLive, emit, stamp, failIfDisposed, shared, }: Pick<AcpExecutorSupport, "options" | "connection" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "isLive" | "emit" | "stamp" | "failIfDisposed">): {
+    applyRequestedModel: (input: {
+        readonly state: AcpModelSelectionState;
+        readonly acpSessionId: string;
+        readonly requestedModelId: string | undefined;
+        readonly expectedGeneration: number;
+    }) => Promise<AcpModelSelectionState>;
+    start: () => Promise<AcpSessionStartResult>;
+    requireStarted: () => {
+        readonly sessionId: string;
+        readonly generation: number;
+    };
+    setNativeMode: (modeId: string) => Promise<void>;
+};
+//# sourceMappingURL=session.d.ts.map

package/dist/executor/session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAU/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,UAAU,EACV,MAAM,EACN,IAAI,EACJ,KAAK,EACL,cAAc,EACd,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,GAC9D,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,gBAAgB,CAAC;iCACpD;QACxC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;QACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;KACrC,KAAG,OAAO,CAAC,sBAAsB,CAAC;iBAgLX,OAAO,CAAC,qBAAqB,CAAC;0BA4B3B;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE;4BAQjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EAwB5D"}

package/dist/executor/session.js

@@ -0,0 +1,225 @@
+// @effect-diagnostics nodeBuiltinImport:off
+// @effect-diagnostics globalDate:off
+// @effect-diagnostics globalTimers:off
+import { applyRequestedEffort } from "../apply-effort.js";
+import { unhandledConfigCategories } from "../config-option-wiring.js";
+import { AcpExecutorDisposedError, AcpExecutorNotStartedError, AcpExecutorRequestError, withStartupStderr, } from "../errors.js";
+import { acpInitializePayload } from "../handshake.js";
+import { modelSelectionStateFromSetup, normalizeModelId, } from "../model-selection.js";
+import {} from "../protocol.js";
+import { acpModeConfigId } from "../runtime-mode.js";
+import { extractModelConfigId, filterMcpServersByAgentCapabilities, matchAdvertisedModelValue, parseSessionModeState, } from "../runtime-model.js";
+export function createExecutorSession({ options, connection, isLive, emit, stamp, failIfDisposed, shared, }) {
+    const applyRequestedModel = async (input) => {
+        const requestedModelId = normalizeModelId(input.requestedModelId);
+        if (requestedModelId === undefined ||
+            requestedModelId === input.state.currentModelId ||
+            (input.state.strategy === "session/set_model" && !input.state.sessionModelsAdvertised) ||
+            (input.state.strategy === "config-option" && input.state.modelConfigId === undefined)) {
+            return input.state;
+        }
+        const value = matchAdvertisedModelValue(requestedModelId, input.state.advertisedModelValues);
+        if (value === undefined) {
+            // 对不上就保留手自己的型号，只记一次日志（带上手的目录）；没有别处替它改写上游请求。
+            if (requestedModelId !== shared.lastUnmatchedModelId) {
+                shared.lastUnmatchedModelId = requestedModelId;
+                options.log?.info("requested model is not in the agent catalog; keeping its own model", {
+                    requestedModelId,
+                    currentModelId: input.state.currentModelId,
+                    advertisedModelValues: input.state.advertisedModelValues,
+                });
+            }
+            return input.state;
+        }
+        if (value === input.state.currentModelId) {
+            return input.state;
+        }
+        let configOptions = input.state.configOptions;
+        if (input.state.strategy === "config-option") {
+            const switched = await connection.request("session/set_config_option", { sessionId: input.acpSessionId, configId: input.state.modelConfigId, value });
+            configOptions = switched?.configOptions ?? configOptions;
+        }
+        else {
+            await connection.request("session/set_model", {
+                sessionId: input.acpSessionId,
+                modelId: value,
+            });
+        }
+        if (!isLive(input.expectedGeneration)) {
+            throw new AcpExecutorDisposedError();
+        }
+        return { ...input.state, currentModelId: value, configOptions };
+    };
+    const startOnce = async (expectedGeneration) => {
+        // 载荷与探测路径共用一份（`handshake.ts`）：agent 按客户端能力决定播报什么，两边各写一份就会问出两个不同的问题。
+        const initializePayload = acpInitializePayload(options.clientInfo, options.clientCapabilities);
+        const initialized = await connection.request("initialize", initializePayload);
+        if (!isLive(expectedGeneration)) {
+            throw new AcpExecutorDisposedError();
+        }
+        shared.initializeResult = initialized;
+        const authMethodId = typeof options.authMethodId === "function"
+            ? options.authMethodId(initialized)
+            : options.authMethodId;
+        if (authMethodId !== undefined) {
+            await connection.request("authenticate", { methodId: authMethodId });
+            if (!isLive(expectedGeneration)) {
+                throw new AcpExecutorDisposedError();
+            }
+        }
+        const mcpServers = filterMcpServersByAgentCapabilities(options.mcpServers ?? [], initialized.agentCapabilities);
+        const additionalDirectories = options.additionalDirectories !== undefined && options.additionalDirectories.length > 0
+            ? { additionalDirectories: options.additionalDirectories }
+            : {};
+        let setup;
+        let nextSessionId;
+        if (options.resumeSessionId && options.resumeMethod === "session/resume") {
+            setup = await connection.request("session/resume", {
+                sessionId: options.resumeSessionId,
+                cwd: options.cwd,
+                mcpServers,
+                ...additionalDirectories,
+            });
+            nextSessionId = options.resumeSessionId;
+        }
+        else if (options.resumeSessionId) {
+            shared.sessionLoadInFlight = true;
+            try {
+                setup = await connection.request("session/load", {
+                    sessionId: options.resumeSessionId,
+                    cwd: options.cwd,
+                    mcpServers,
+                    ...additionalDirectories,
+                });
+            }
+            finally {
+                shared.sessionLoadInFlight = false;
+            }
+            options.log?.info("acp session loaded; replayed history was not projected", {
+                sessionId: options.resumeSessionId,
+                droppedReplayUpdates: shared.droppedReplayUpdates,
+            });
+            nextSessionId = options.resumeSessionId;
+        }
+        else {
+            const created = await connection.request("session/new", {
+                cwd: options.cwd,
+                mcpServers,
+                ...additionalDirectories,
+            });
+            nextSessionId = created.sessionId;
+            setup = created;
+        }
+        // 报了一类从没登记过的选项，说一声。在此之前只挑 `model` 与力度档，其余整个丢掉、
+        // 零痕迹——界面上少一格，日志里一个字都没有（2026-09-19 力度档就是这么漏的）。
+        const unhandledCategories = unhandledConfigCategories(setup.configOptions);
+        if (unhandledCategories.length > 0) {
+            options.log?.info("acp session reported config option categories we do not handle", {
+                sessionId: nextSessionId,
+                categories: unhandledCategories,
+            });
+        }
+        const nextModelSelectionState = await applyRequestedModel({
+            state: modelSelectionStateFromSetup(setup),
+            acpSessionId: nextSessionId,
+            requestedModelId: options.requestedModelId,
+            expectedGeneration,
+        });
+        // 切过型号就按切型号回包里的那份认档（见 `AcpModelSelectionState.configOptions`）。
+        await applyRequestedEffort({
+            connection,
+            log: options.log,
+            isLive,
+            configOptions: nextModelSelectionState.configOptions,
+            acpSessionId: nextSessionId,
+            requestedEffort: options.requestedEffort,
+            expectedGeneration,
+        });
+        if (options.beforeApplyResult) {
+            await options.beforeApplyResult();
+        }
+        if (!isLive(expectedGeneration)) {
+            throw new AcpExecutorDisposedError();
+        }
+        shared.sessionId = nextSessionId;
+        shared.modelSelectionState = nextModelSelectionState;
+        shared.modeState = parseSessionModeState(setup);
+        const result = {
+            sessionId: nextSessionId,
+            generation: expectedGeneration,
+            initializeResult: initialized,
+            sessionSetupResult: setup,
+            modelConfigId: extractModelConfigId(setup),
+            modelId: nextModelSelectionState.currentModelId,
+        };
+        shared.startResult = result;
+        shared.status = "ready";
+        emit({
+            type: "session.started",
+            ...stamp(),
+            provider: options.provider,
+            ...(options.providerInstanceId ? { providerInstanceId: options.providerInstanceId } : {}),
+            threadId: options.threadId,
+            payload: {
+                sessionId: nextSessionId,
+                cwd: options.cwd,
+            },
+        });
+        return result;
+    };
+    const start = async () => {
+        failIfDisposed();
+        if (shared.startResult) {
+            return shared.startResult;
+        }
+        if (shared.startInFlight) {
+            return shared.startInFlight;
+        }
+        shared.generation += 1;
+        const expectedGeneration = shared.generation;
+        shared.status = "starting";
+        shared.startInFlight = startOnce(expectedGeneration).then((result) => {
+            shared.startInFlight = undefined;
+            return result;
+        }, async (error) => {
+            shared.startInFlight = undefined;
+            if (isLive(expectedGeneration) && !shared.startResult) {
+                shared.status = "idle";
+                shared.generation = expectedGeneration;
+            }
+            throw await withStartupStderr(error, options.stderrTail);
+        });
+        return shared.startInFlight;
+    };
+    const requireStarted = () => {
+        failIfDisposed();
+        if (!shared.sessionId || !shared.startResult) {
+            throw new AcpExecutorNotStartedError();
+        }
+        return { sessionId: shared.sessionId, generation: shared.startResult.generation };
+    };
+    const setNativeMode = async (modeId) => {
+        failIfDisposed();
+        const started = shared.startResult;
+        if (started === undefined) {
+            throw new AcpExecutorRequestError("session/set_mode", "session has not started yet");
+        }
+        // 报了 configOptions 那一项就走它，否则走 session/set_mode——两种报法各家挑一种，
+        // 发错通道会被回 `-32601 Method not found`（dsh 实测）。
+        const configId = acpModeConfigId(started.sessionSetupResult);
+        if (configId !== undefined) {
+            await connection.request("session/set_config_option", {
+                sessionId: started.sessionId,
+                configId,
+                value: modeId,
+            });
+            return;
+        }
+        await connection.request("session/set_mode", {
+            sessionId: started.sessionId,
+            modeId,
+        });
+    };
+    return { applyRequestedModel, start, requireStarted, setNativeMode };
+}
+//# sourceMappingURL=session.js.map

package/dist/executor/session.js.map

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

package/dist/executor/settlement.d.ts

@@ -0,0 +1,8 @@
+import { type AcpFailureCategory } from "../failureCategory.ts";
+import type { AcpExecutorSupport } from "./support.ts";
+export declare function createExecutorSettlement({ hooks, shared, }: Pick<AcpExecutorSupport, "hooks" | "shared">): {
+    rememberSettledPromptKey: (key: string) => void;
+    abortPendingSettlement: (reason: string, failureCategory?: AcpFailureCategory) => void;
+    settleFromNotification: (method: string, params: unknown) => boolean;
+};
+//# sourceMappingURL=settlement.d.ts.map

package/dist/executor/settlement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settlement.d.ts","sourceRoot":"","sources":["../../src/executor/settlement.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvD,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,CAAC;oCAON,MAAM,KAAG,IAAI;qCAOZ,MAAM,oBAAoB,kBAAkB,KAAG,IAAI;qCAsBnD,MAAM,UAAU,OAAO,KAAG,OAAO;EAkC1E"}