kiokuko-dsh 0.2.0 → 0.2.2

package/dist/dsh/execution-journal.d.ts

@@ -0,0 +1,17 @@
+import type { ExecutionReceipt } from './owned-execution.js';
+export interface JournalRecord {
+    digest: string;
+    receipt: ExecutionReceipt;
+}
+/** Local outbox survives a failed SQLite save. It contains no command output. */
+export declare class ExecutionJournal {
+    readonly directory: string;
+    constructor(directory: string);
+    private filename;
+    read(id: string): Promise<JournalRecord | undefined>;
+    private write;
+    private syncDirectory;
+    reserve(record: JournalRecord): Promise<boolean>;
+    save(record: JournalRecord): Promise<void>;
+}
+//# sourceMappingURL=execution-journal.d.ts.map

package/dist/dsh/execution-journal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution-journal.d.ts","sourceRoot":"","sources":["../../src/dsh/execution-journal.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAA;AAE1D,MAAM,WAAW,aAAa;IAAE,MAAM,EAAC,MAAM,CAAC;IAAA,OAAO,EAAC,gBAAgB,CAAA;CAAC;AACvE,iFAAiF;AACjF,qBAAa,gBAAgB;IACf,QAAQ,CAAC,SAAS,EAAC,MAAM;gBAAhB,SAAS,EAAC,MAAM;IACrC,OAAO,CAAC,QAAQ;IAIV,IAAI,CAAC,EAAE,EAAC,MAAM,GAAE,OAAO,CAAC,aAAa,GAAC,SAAS,CAAC;YAIxC,KAAK;YAIL,aAAa;IAIrB,OAAO,CAAC,MAAM,EAAC,aAAa,GAAE,OAAO,CAAC,OAAO,CAAC;IAK9C,IAAI,CAAC,MAAM,EAAC,aAAa,GAAE,OAAO,CAAC,IAAI,CAAC;CAI/C"}

package/dist/dsh/execution-journal.js

@@ -0,0 +1,69 @@
+import { mkdir, open, readFile, rename, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+/** Local outbox survives a failed SQLite save. It contains no command output. */
+export class ExecutionJournal {
+    directory;
+    constructor(directory) {
+        this.directory = directory;
+    }
+    filename(id) {
+        if (!/^[a-f0-9]{64}$/u.test(id))
+            throw new Error('Invalid execution operation ID');
+        return join(this.directory, id + '.json');
+    }
+    async read(id) {
+        try {
+            return JSON.parse(await readFile(this.filename(id), 'utf8'));
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return undefined;
+            throw error;
+        }
+    }
+    async write(filename, record) {
+        const file = await open(filename, 'wx', 0o600);
+        try {
+            await file.writeFile(JSON.stringify(record));
+            await file.sync();
+        }
+        finally {
+            await file.close();
+        }
+    }
+    async syncDirectory() {
+        const directory = await open(this.directory, 'r');
+        try {
+            await directory.sync();
+        }
+        finally {
+            await directory.close();
+        }
+    }
+    async reserve(record) {
+        await mkdir(this.directory, { recursive: true, mode: 0o700 });
+        try {
+            await this.write(this.filename(record.receipt.operationId), record);
+            await this.syncDirectory();
+            return true;
+        }
+        catch (error) {
+            if (error.code === 'EEXIST')
+                return false;
+            throw error;
+        }
+    }
+    async save(record) {
+        const filename = this.filename(record.receipt.operationId), temporary = filename + '.' + randomUUID();
+        try {
+            await this.write(temporary, record);
+            await rename(temporary, filename);
+            await this.syncDirectory();
+        }
+        finally {
+            await rm(temporary, { force: true });
+        }
+    }
+}
+//# sourceMappingURL=execution-journal.js.map

package/dist/dsh/execution-journal.js.map

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

package/dist/dsh/execution-result.d.ts

@@ -0,0 +1,20 @@
+import type { TapSummary } from './node-tap-summary.js';
+export interface HostProcessResult {
+    isError: boolean;
+    value: {
+        exitCode: number | null;
+        signal: string | null;
+        timedOut: boolean;
+        aborted: boolean;
+        processStarted?: boolean;
+        outputComplete?: boolean;
+        summary?: TapSummary | undefined;
+    };
+    content: {
+        type: 'text';
+        text: string;
+    }[];
+}
+export declare function observeProcessResult(result: HostProcessResult): HostProcessResult;
+export declare function isHostExecutionResult(result: unknown): result is HostProcessResult;
+//# sourceMappingURL=execution-result.d.ts.map

package/dist/dsh/execution-result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution-result.d.ts","sourceRoot":"","sources":["../../src/dsh/execution-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIvD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;KAAE,CAAA;IACpL,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAC1C;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAAwC;AAC1H,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAElF"}

package/dist/dsh/execution-result.js

@@ -0,0 +1,7 @@
+// Object identity is private to the host. Model/Lisp JSON cannot mint proof.
+const observed = new WeakSet();
+export function observeProcessResult(result) { observed.add(result); return result; }
+export function isHostExecutionResult(result) {
+    return typeof result === 'object' && result !== null && observed.has(result);
+}
+//# sourceMappingURL=execution-result.js.map

package/dist/dsh/execution-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution-result.js","sourceRoot":"","sources":["../../src/dsh/execution-result.ts"],"names":[],"mappings":"AAEA,6EAA6E;AAC7E,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAU,CAAA;AAMtC,MAAM,UAAU,oBAAoB,CAAC,MAAyB,IAAuB,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,CAAA,CAAC,CAAC;AAC1H,MAAM,UAAU,qBAAqB,CAAC,MAAe;IACnD,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC9E,CAAC"}

package/dist/dsh/execution-selection.d.ts

@@ -12,7 +12,7 @@ export declare const ExecutionSelectionSchema: z.ZodObject<{
         selecting: "selecting";
         reselect: "reselect";
     }>;
-    configuration: z.ZodOptional<z.ZodObject<{
+    configuration: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         routeBindings: z.ZodOptional<z.ZodArray<z.ZodObject<{
             provider: z.ZodString;
             family: z.ZodEnum<{
@@ -70,8 +70,66 @@ export declare const ExecutionSelectionSchema: z.ZodObject<{
         }, z.core.$strict>>;
         custom: z.ZodBoolean;
         maxConcurrentChildren: z.ZodNumber;
-    }, z.core.$strict>>;
-    deepConfiguration: z.ZodOptional<z.ZodObject<{
+    }, z.core.$strict>, z.ZodObject<{
+        roles: z.ZodObject<{
+            ideal: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            zenki: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            goki: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            worker: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            check: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+        }, z.core.$strict>;
+        template: z.ZodOptional<z.ZodObject<{
+            id: z.ZodString;
+            version: z.ZodNumber;
+        }, z.core.$strict>>;
+        custom: z.ZodBoolean;
+        maxConcurrentChildren: z.ZodNumber;
+        routeBindings: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            provider: z.ZodString;
+            connection: z.ZodDefault<z.ZodEnum<{
+                api: "api";
+                codex: "codex";
+                local: "local";
+            }>>;
+            protocol: z.ZodDefault<z.ZodEnum<{
+                unknown: "unknown";
+                responses: "responses";
+                "chat-completions": "chat-completions";
+                messages: "messages";
+            }>>;
+            family: z.ZodEnum<{
+                openai: "openai";
+                deepseek: "deepseek";
+                "opencode-go": "opencode-go";
+                "opencode-zen": "opencode-zen";
+                openrouter: "openrouter";
+                orcarouter: "orcarouter";
+                ollama: "ollama";
+                other: "other";
+            }>;
+        }, z.core.$strict>>>;
+    }, z.core.$strict>]>>;
+    deepConfiguration: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         roles: z.ZodObject<{
             planner: z.ZodObject<{
                 provider: z.ZodString;
@@ -140,15 +198,64 @@ export declare const ExecutionSelectionSchema: z.ZodObject<{
                 messages: "messages";
             }>;
         }, z.core.$strict>>>;
-    }, z.core.$strict>>;
-    ordinaryModel: z.ZodOptional<z.ZodObject<{
-        provider: z.ZodString;
-        model: z.ZodString;
-        reasoningEffort: z.ZodOptional<z.ZodString>;
-    }, z.core.$strict>>;
-    draft: z.ZodOptional<z.ZodObject<{
-        routeBindings: z.ZodOptional<z.ZodArray<z.ZodObject<{
+    }, z.core.$strict>, z.ZodObject<{
+        roles: z.ZodObject<{
+            planner: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            solver: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            critic: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+            synthesizer: z.ZodObject<{
+                provider: z.ZodString;
+                model: z.ZodString;
+                reasoningEffort: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>;
+        }, z.core.$strict>;
+        reasoningMode: z.ZodOptional<z.ZodEnum<{
+            standard: "standard";
+            quality: "quality";
+        }>>;
+        alternativeSolver: z.ZodOptional<z.ZodObject<{
             provider: z.ZodString;
+            model: z.ZodString;
+            reasoningEffort: z.ZodOptional<z.ZodString>;
+        }, z.core.$strict>>;
+        budget: z.ZodPrefault<z.ZodObject<{
+            maxConcurrentAgents: z.ZodDefault<z.ZodNumber>;
+            maxDepth: z.ZodDefault<z.ZodNumber>;
+            maxNodes: z.ZodDefault<z.ZodNumber>;
+            maxChildrenPerNode: z.ZodDefault<z.ZodNumber>;
+            maxReplansPerNode: z.ZodDefault<z.ZodNumber>;
+            maxAgentJobs: z.ZodDefault<z.ZodNumber>;
+            maxModelRequests: z.ZodDefault<z.ZodNumber>;
+            maxTotalTokens: z.ZodDefault<z.ZodNumber>;
+            maxOutputTokensPerRequest: z.ZodDefault<z.ZodNumber>;
+            maxActiveSeconds: z.ZodDefault<z.ZodNumber>;
+        }, z.core.$strict>>;
+        localProviders: z.ZodDefault<z.ZodArray<z.ZodString>>;
+        routeBindings: z.ZodDefault<z.ZodArray<z.ZodObject<{
+            provider: z.ZodString;
+            connection: z.ZodEnum<{
+                api: "api";
+                codex: "codex";
+                local: "local";
+            }>;
+            protocol: z.ZodEnum<{
+                unknown: "unknown";
+                responses: "responses";
+                "chat-completions": "chat-completions";
+                messages: "messages";
+            }>;
             family: z.ZodEnum<{
                 openai: "openai";
                 deepseek: "deepseek";
@@ -159,18 +266,14 @@ export declare const ExecutionSelectionSchema: z.ZodObject<{
                 ollama: "ollama";
                 other: "other";
             }>;
-            connection: z.ZodDefault<z.ZodEnum<{
-                api: "api";
-                codex: "codex";
-                local: "local";
-            }>>;
-            protocol: z.ZodDefault<z.ZodEnum<{
-                unknown: "unknown";
-                responses: "responses";
-                "chat-completions": "chat-completions";
-                messages: "messages";
-            }>>;
         }, z.core.$strict>>>;
+    }, z.core.$strict>]>>;
+    ordinaryModel: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodString;
+        model: z.ZodString;
+        reasoningEffort: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>>;
+    draft: z.ZodOptional<z.ZodObject<{
         template: z.ZodOptional<z.ZodObject<{
             id: z.ZodString;
             version: z.ZodNumber;
@@ -204,6 +307,30 @@ export declare const ExecutionSelectionSchema: z.ZodObject<{
                 reasoningEffort: z.ZodOptional<z.ZodString>;
             }, z.core.$strict>>;
         }, z.core.$strict>;
+        routeBindings: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            provider: z.ZodString;
+            connection: z.ZodDefault<z.ZodEnum<{
+                api: "api";
+                codex: "codex";
+                local: "local";
+            }>>;
+            protocol: z.ZodDefault<z.ZodEnum<{
+                unknown: "unknown";
+                responses: "responses";
+                "chat-completions": "chat-completions";
+                messages: "messages";
+            }>>;
+            family: z.ZodEnum<{
+                openai: "openai";
+                deepseek: "deepseek";
+                "opencode-go": "opencode-go";
+                "opencode-zen": "opencode-zen";
+                openrouter: "openrouter";
+                orcarouter: "orcarouter";
+                ollama: "ollama";
+                other: "other";
+            }>;
+        }, z.core.$strict>>>;
     }, z.core.$strict>>;
     problem: z.ZodOptional<z.ZodString>;
     discussion: z.ZodOptional<z.ZodObject<{

package/dist/dsh/execution-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-selection.d.ts","sourceRoot":"","sources":["../../src/dsh/execution-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAItD,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmBnC,CAAA;AACF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACzE,MAAM,WAAW,wBAAwB;IAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE;AAC3G,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS,CAKpH;AACD,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAG1F;AACD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,wBAAwB,CAO9J;AACD,2EAA2E;AAC3E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAIjF"}
+{"version":3,"file":"execution-selection.d.ts","sourceRoot":"","sources":["../../src/dsh/execution-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAItD,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmBnC,CAAA;AACF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACzE,MAAM,WAAW,wBAAwB;IAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE;AAC3G,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS,CAWpH;AACD,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAG1F;AACD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,wBAAwB,CAW9J;AACD,2EAA2E;AAC3E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAIjF"}

package/dist/dsh/execution-selection.js

@@ -1,14 +1,14 @@
 import { z } from 'zod';
-import { DeepConfigurationSchema } from '../deep-thinker/core/contracts.js';
+import { LegacyDeepConfigurationSchema, DeepConfigurationSchema } from '../deep-thinker/core/contracts.js';
 import { KiokukoError } from '../errors.js';
-import { ModelConfigurationSchema, ModelConfigurationDraftSchema, ModelBindingSchema } from './model-configuration.js';
+import { LegacyModelConfigurationSchema, ModelConfigurationSchema, LegacyModelConfigurationDraftSchema, ModelBindingSchema } from './model-configuration.js';
 export const ExecutionSelectionSchema = z.object({
     mode: z.enum(['pending', 'normal', 'enno', 'deep-thinker']),
     status: z.enum(['selecting', 'ready', 'reselect']),
-    configuration: ModelConfigurationSchema.optional(),
-    deepConfiguration: DeepConfigurationSchema.optional(),
+    configuration: z.union([ModelConfigurationSchema, LegacyModelConfigurationSchema]).optional(),
+    deepConfiguration: z.union([DeepConfigurationSchema, LegacyDeepConfigurationSchema]).optional(),
     ordinaryModel: ModelBindingSchema.optional(),
-    draft: ModelConfigurationDraftSchema.optional(),
+    draft: LegacyModelConfigurationDraftSchema.optional(),
     problem: z.string().max(1024).optional(),
     discussion: z.object({
         questionId: z.string().min(1).max(256),
@@ -33,7 +33,13 @@ export function readExecutionSelection(database, runId) {
     const row = database.prepare('SELECT revision, state_json FROM dsh_execution_selections WHERE run_id = ?').get(runId);
     if (!row)
         return undefined; // Legacy runs retain their original contract.
-    return { revision: row.revision, value: ExecutionSelectionSchema.parse(JSON.parse(row.state_json)) };
+    const value = ExecutionSelectionSchema.parse(JSON.parse(row.state_json));
+    const configurations = [value.configuration, value.deepConfiguration, value.draft].filter(Boolean);
+    if (configurations.some(c => c.routeBindings?.some(r => r.family === 'orcarouter') || Object.values(c.roles).some(binding => binding?.provider === 'orcarouter'))) {
+        value.status = 'reselect';
+        value.problem = 'OrcaRouter is retired; explicitly select replacement models before running again';
+    }
+    return { revision: row.revision, value };
 }
 export function initializeExecutionSelection(database, runId) {
     database.prepare('INSERT OR IGNORE INTO dsh_execution_selections (run_id, state_json, updated_at) VALUES (?, ?, ?)')
@@ -41,6 +47,12 @@ export function initializeExecutionSelection(database, runId) {
 }
 export function writeExecutionSelection(database, runId, expectedRevision, value) {
     const parsed = ExecutionSelectionSchema.parse(value);
+    if (parsed.status === 'ready') {
+        if (parsed.configuration)
+            ModelConfigurationSchema.parse(parsed.configuration);
+        if (parsed.deepConfiguration)
+            DeepConfigurationSchema.parse(parsed.deepConfiguration);
+    }
     database.prepare('UPDATE dsh_execution_selections SET state_json = ?, revision = revision + 1, updated_at = ? WHERE run_id = ? AND revision = ?')
         .run(JSON.stringify(parsed), new Date().toISOString(), runId, expectedRevision);
     if (database.prepare('SELECT changes() AS count').get()?.count !== 1)

package/dist/dsh/execution-selection.js.map

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

package/dist/dsh/host-adapter/admission.d.ts.map

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

package/dist/dsh/host-adapter/admission.js

@@ -130,9 +130,18 @@ export function createAdmission({ native, skills, tools, userQuestions, sessions
         }));
     };
     class CapturingGate extends DshIntakeGate {
+        supersededChoices = new Map();
         async choose(event, result) {
             const runId = result.prepared.run.runId;
             let stored = await runtime.withDatabase(db => readExecutionSelection(db, runId));
+            const key = `${event.sessionId}\u0000${event.turn}`;
+            const inherited = this.supersededChoices.get(key);
+            if (stored?.value.mode === 'pending' && inherited?.value.status === 'ready' && ['normal', 'enno'].includes(inherited.value.mode)
+                && (!explicitExecutionMode(event.task) || explicitExecutionMode(event.task) === inherited.value.mode)) {
+                const revision = stored.revision;
+                stored = await runtime.withDatabase(db => writeExecutionSelection(db, runId, revision, inherited.value));
+                this.supersededChoices.delete(key);
+            }
             if (result.admitted && result.prepared.selectedSkills === undefined) {
                 const task = await runtime.withDatabase(db => readAkinatorSession(db, { workspace: result.prepared.project.workspace, sessionId: result.prepared.intake.sessionId }).task);
                 result.prepared.selectedSkills = await selectInstalledSkills(decisions, `run:${runId}`, task, [...event.capabilities.skills, ...event.capabilities.tools], result.prepared.capabilities, event.signal);
@@ -198,6 +207,16 @@ export function createAdmission({ native, skills, tools, userQuestions, sessions
             // work. Revision ordering alone cannot distinguish two same-revision
             // context deliveries that finish out of order.
             const generation = ++prepareGeneration;
+            const prior = currentForAgentEvent(event.agent.id, event.sessionId, undefined, event.nativeSession, event.nativeAgent);
+            if (prior && prior.turn === event.turn && !prior.closed && prior.task !== event.task && hasHumanInput(event.nativeMessages ?? [])) {
+                const choice = getSelection(prior.runId);
+                if (choice?.value.status === 'ready')
+                    this.supersededChoices.set(`${event.sessionId}\u0000${event.turn}`, choice);
+                await retireSupersededRun(prior, 'cancelled');
+                this.supersedeTurn(event.sessionId, event.turn);
+                continuedTurns.delete(`${event.sessionId}\u0000${event.turn}`);
+                resumedTurns.delete(`${event.sessionId}\u0000${event.turn}`);
+            }
             const reviewProject = await runtime.withDatabase((database) => resolveProjectWorkspaceReadOnly(database, event.cwd, { allowDirectory: true }));
             if (reviewProject)
                 await autoReview.acceptInput(reviewProject.workspace, event.sessionId, event.task);
@@ -516,6 +535,7 @@ export function createAdmission({ native, skills, tools, userQuestions, sessions
         }
         clearTurn(sessionId, turn) {
             super.clearTurn(sessionId, turn);
+            this.supersededChoices.delete(`${sessionId}\u0000${turn}`);
             continuedTurns.delete(`${sessionId}\u0000${turn}`);
             resumedTurns.delete(`${sessionId}\u0000${turn}`);
         }