@kvman/kvcoder 0.1.6 → 0.1.8

package/dist/turns/recover-workspace.d.ts

@@ -0,0 +1,9 @@
+import { type Ctx, type Job } from '@kvman/sdk';
+import { type RecoveryState } from './recovery-state.ts';
+/** Exact immutable binding, not a bounded jobs.list result or evidence from schema defaults. */
+export declare function recoveryJobMatches(state: RecoveryState, job: Job, workspaceId: string): boolean;
+/** Inspection never claims. SQLite decisions revalidate the snapshot after metadata awaits. */
+export declare function recoverSession(ctx: Ctx, sessionId: string, dispatch?: boolean): Promise<void>;
+/** Positive authorized send/answer only. Stop/delete/injection/handlers never call this dispatcher. */
+export declare function recoverWorkspace(ctx: Ctx, deferSessionId?: string): Promise<void>;
+//# sourceMappingURL=recover-workspace.d.ts.map

package/dist/turns/recover-workspace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recover-workspace.d.ts","sourceRoot":"","sources":["../../src/turns/recover-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAG9D,OAAO,EAA0G,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIjK,gGAAgG;AAChG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAU/F;AAeD,+FAA+F;AAC/F,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,uGAAuG;AACvG,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvF"}

package/dist/turns/recover-workspace.js

@@ -0,0 +1,79 @@
+import { ProblemError } from '@kvman/sdk';
+import { records, txRecords } from "../store/collections.js";
+import { notifyEnded } from "./end-turn.js";
+import { boundRecoveryIntent, interruptUncertain, preparedRecovery, recoveryJobId, recoveryState, retryPrepared } from "./recovery-state.js";
+import { dispatchStep } from "./start-turn.js";
+import { stepInputSchema } from "./step-claim.js";
+/** Exact immutable binding, not a bounded jobs.list result or evidence from schema defaults. */
+export function recoveryJobMatches(state, job, workspaceId) {
+    if (state.session.stepIntentId !== null && !boundRecoveryIntent(state))
+        return false;
+    const expectedId = recoveryJobId(state);
+    if (job.id !== expectedId || job.name !== 'kvcoder.turn.step' || job.workspaceId !== workspaceId || job.retries !== 0)
+        return false;
+    if (job.status === 'queued' ? job.attempts !== 0 || state.intent?.phase === 'claimed' : job.status !== 'running' || job.attempts !== 1)
+        return false;
+    const parsed = stepInputSchema.safeParse(job.input);
+    if (!parsed.success || parsed.data.sessionId !== state.session.id || parsed.data.turnId !== state.turn.id)
+        return false;
+    if (state.intent !== undefined && state.session.stepJobId !== state.intent.jobId)
+        return false;
+    if ('intentId' in parsed.data)
+        return state.intent !== undefined && state.intent.legacyJobId === null && parsed.data.intentId === state.intent.id && parsed.data.generation === state.intent.generation;
+    return state.session.stepIntentId === null || (state.intent?.phase === 'claimed' && state.intent.legacyJobId === job.id);
+}
+async function knownJob(ctx, id) {
+    if (id === null)
+        return undefined;
+    try {
+        const job = await ctx.exec('kernel.jobs.get', { id });
+        ctx.job.signal.throwIfAborted();
+        return job;
+    }
+    catch (error) {
+        ctx.job.signal.throwIfAborted();
+        if (error instanceof ProblemError && error.problem.code === 'NOT_FOUND')
+            return undefined;
+        throw error;
+    }
+}
+/** Inspection never claims. SQLite decisions revalidate the snapshot after metadata awaits. */
+export async function recoverSession(ctx, sessionId, dispatch = true) {
+    ctx.job.signal.throwIfAborted();
+    const state = await ctx.store.transaction(tx => {
+        ctx.job.signal.throwIfAborted();
+        return recoveryState(txRecords(tx), sessionId);
+    });
+    if (state === undefined)
+        return;
+    const job = await knownJob(ctx, recoveryJobId(state));
+    if (job !== undefined && recoveryJobMatches(state, job, ctx.job.workspace.id))
+        return;
+    const result = await ctx.store.transaction(tx => {
+        ctx.job.signal.throwIfAborted();
+        const store = txRecords(tx);
+        if (preparedRecovery(state))
+            return { step: retryPrepared(store, state) };
+        return { ended: interruptUncertain(store, state, job?.problem?.code ?? 'STEP_EFFECTS_UNKNOWN') };
+    });
+    if ('step' in result && result.step !== undefined && dispatch)
+        await dispatchStep(ctx, result.step, false);
+    if ('ended' in result && result.ended !== undefined)
+        await notifyEnded(ctx, result.ended);
+}
+/** Positive authorized send/answer only. Stop/delete/injection/handlers never call this dispatcher. */
+export async function recoverWorkspace(ctx, deferSessionId) {
+    let after;
+    for (;;) {
+        ctx.job.signal.throwIfAborted();
+        const page = await records(ctx.store).sessions.find({}, { limit: 1000, ...(after === undefined ? {} : { after }) });
+        for (const session of page) {
+            if (session.status === 'running')
+                await recoverSession(ctx, session.id, session.id !== deferSessionId);
+        }
+        if (page.length < 1000)
+            return;
+        after = page[page.length - 1]?.id;
+    }
+}
+//# sourceMappingURL=recover-workspace.js.map

package/dist/turns/recover-workspace.js.map

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

package/dist/turns/recovery-state.d.ts

@@ -0,0 +1,19 @@
+import type { Stored } from '@kvman/sdk';
+import type { SessionDoc, StepIntentDoc, TurnDoc } from '../schemas/records.ts';
+import type { TxRecords } from '../store/collections.ts';
+import { type StepIdentity } from './step-intents.ts';
+export type RecoveryState = {
+    session: Stored<SessionDoc>;
+    turn: Stored<TurnDoc>;
+    intent: Stored<StepIntentDoc> | undefined;
+};
+/** An open runnable turn remains a candidate even when its stored ownership cannot be proved. */
+export declare function recoveryState(store: TxRecords, sessionId: string): RecoveryState | undefined;
+export declare function boundRecoveryIntent(state: RecoveryState): boolean;
+export declare function preparedRecovery(state: RecoveryState): boolean;
+export declare function recoveryJobId(state: RecoveryState): string | null;
+/** Only modern prepared work has durable proof of no claimed effects. Never cancel an unverified job. */
+export declare function retryPrepared(store: TxRecords, expected: RecoveryState): StepIdentity | undefined;
+/** Retain uncertain bindings and end interrupted atomically, without effects or replay. */
+export declare function interruptUncertain(store: TxRecords, expected: RecoveryState, code: string): import("./end-turn-state.ts").EndedTurn | undefined;
+//# sourceMappingURL=recovery-state.d.ts.map

package/dist/turns/recovery-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-state.d.ts","sourceRoot":"","sources":["../../src/turns/recovery-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC;AAE9H,iGAAiG;AACjG,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM5F;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAGjE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAE9D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAGjE;AAUD,yGAAyG;AACzG,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS,CAOjG;AA6BD,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,uDAOzF"}

package/dist/turns/recovery-state.js

@@ -0,0 +1,87 @@
+import { invalid } from "../problems.js";
+import { now } from "../sessions/session-lookup.js";
+import { endTurnState } from "./end-turn-state.js";
+import { preparedStep } from "./step-intents.js";
+/** An open runnable turn remains a candidate even when its stored ownership cannot be proved. */
+export function recoveryState(store, sessionId) {
+    const session = store.sessions.get(sessionId);
+    if (session?.status !== 'running' || session.turnId === null)
+        return undefined;
+    const turn = store.turns.get(session.turnId);
+    if (turn?.sessionId !== sessionId || turn.outcome !== null || turn.endedAt !== null || turn.pending.length > 0)
+        return undefined;
+    return { session, turn, intent: session.stepIntentId === null ? undefined : store.stepIntents.get(session.stepIntentId) };
+}
+export function boundRecoveryIntent(state) {
+    const { intent, session, turn } = state;
+    return intent !== undefined && intent.id === session.stepIntentId && intent.sessionId === session.id && intent.turnId === turn.id && intent.generation === session.stepGeneration && (intent.phase === 'prepared' || intent.phase === 'claimed') && session.stepJobId === intent.jobId && (intent.phase !== 'claimed' || intent.jobId !== null);
+}
+export function preparedRecovery(state) {
+    return boundRecoveryIntent(state) && state.intent?.phase === 'prepared' && state.intent.legacyJobId === null;
+}
+export function recoveryJobId(state) {
+    const { intent, session, turn } = state;
+    return intent?.sessionId === session.id && intent.turnId === turn.id ? intent.jobId ?? intent.legacyJobId ?? session.stepJobId : session.stepJobId;
+}
+/** Metadata was awaited outside SQLite. Recheck every ownership field before using that observation. */
+function unchanged(store, expected) {
+    const current = recoveryState(store, expected.session.id);
+    if (current === undefined || current.turn.id !== expected.turn.id || current.session.stepGeneration !== expected.session.stepGeneration || current.session.stepIntentId !== expected.session.stepIntentId || current.session.stepJobId !== expected.session.stepJobId)
+        return undefined;
+    if (current.intent?.id !== expected.intent?.id || current.intent?.sessionId !== expected.intent?.sessionId || current.intent?.turnId !== expected.intent?.turnId || current.intent?.generation !== expected.intent?.generation || current.intent?.phase !== expected.intent?.phase || current.intent?.jobId !== expected.intent?.jobId || current.intent?.legacyJobId !== expected.intent?.legacyJobId)
+        return undefined;
+    return current;
+}
+/** Only modern prepared work has durable proof of no claimed effects. Never cancel an unverified job. */
+export function retryPrepared(store, expected) {
+    const current = unchanged(store, expected);
+    if (current === undefined || !preparedRecovery(current) || current.intent === undefined)
+        return undefined;
+    const updatedAt = now();
+    store.stepIntents.update(current.intent.id, { jobId: null, updatedAt });
+    store.sessions.update(current.session.id, { stepJobId: null, updatedAt });
+    return preparedStep(store, current.session.id, current.turn.id);
+}
+/** Retain ALL owned unsettled references for this turn; a foreign pointer is never write authority. */
+function retainUncertain(store, current) {
+    const { session, turn } = current;
+    let after, hasTracking = false, savedTracked = session.stepJobId === null;
+    for (;;) {
+        const page = store.stepIntents.find({ sessionId: session.id, turnId: turn.id }, { limit: 1000, ...(after === undefined ? {} : { after }) });
+        for (const intent of page) {
+            if (intent.phase !== 'prepared' && intent.phase !== 'claimed')
+                continue;
+            hasTracking = true;
+            if (intent.jobId === session.stepJobId || intent.legacyJobId === session.stepJobId)
+                savedTracked = true;
+            store.stepIntents.update(intent.id, { phase: 'needs-review', reason: 'STEP_EFFECTS_UNKNOWN', updatedAt: now() });
+        }
+        if (page.length < 1000)
+            break;
+        after = page[page.length - 1]?.id;
+    }
+    if (hasTracking && savedTracked)
+        return;
+    // Diagnostics never acquire executable authority, including under deleting or broken ancestry.
+    // Legacy saved references retain their legacy slot; unprovable modern candidates are not fabricated claims.
+    const legacy = session.stepIntentId === null, generation = session.stepGeneration + 1;
+    if (!Number.isSafeInteger(generation))
+        throw invalid('The next step generation exceeds the safe integer range.');
+    const stamp = now();
+    const intent = store.stepIntents.insert({ sessionId: session.id, turnId: turn.id, generation,
+        phase: 'needs-review', jobId: legacy ? null : session.stepJobId, legacyJobId: legacy ? session.stepJobId : null,
+        reason: 'STEP_EFFECTS_UNKNOWN', createdAt: stamp, updatedAt: stamp });
+    store.sessions.update(session.id, { stepGeneration: generation, stepIntentId: intent.id, stepJobId: null, updatedAt: stamp });
+}
+/** Retain uncertain bindings and end interrupted atomically, without effects or replay. */
+export function interruptUncertain(store, expected, code) {
+    const current = unchanged(store, expected);
+    if (current === undefined)
+        return undefined;
+    retainUncertain(store, current);
+    const ended = endTurnState(store, current.session.id, current.turn.id, 'interrupted', 'handler', { code: 'INTERRUPTED', params: { code } });
+    if (ended === undefined)
+        throw invalid('The uncertain step must end in its current turn transaction.');
+    return ended;
+}
+//# sourceMappingURL=recovery-state.js.map

package/dist/turns/recovery-state.js.map

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

package/dist/turns/register-interruptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-interruptions.d.ts","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAetC,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAcpD"}
+{"version":3,"file":"register-interruptions.d.ts","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAuBtC,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAcpD"}

package/dist/turns/register-interruptions.js

@@ -1,14 +1,25 @@
 import { runLost } from "../delegate/register-worker-run.js";
-import { records } from "../store/collections.js";
-import { endTurn } from "./end-turn.js";
+import { records, txRecords } from "../store/collections.js";
+import { notifyEnded } from "./end-turn.js";
+import { interruptUncertain, preparedRecovery, recoveryState } from "./recovery-state.js";
 // Steps that end without finishing (plan 08 §8.1, ADR 0009, 95): a step cut off by a stop, a crash, or a timeout ends
 // its turn with a notice. These handlers queue nothing, since their jobs carry the `fromHandler` mark.
-async function stepEnded(ctx, jobId, outcome, code) {
+async function stepEnded(ctx, jobId, code) {
     const [session] = await records(ctx.store).sessions.find({ stepJobId: jobId }, { limit: 1 });
-    if (session === undefined || session.turnId === null)
+    if (session === undefined)
         return;
-    const notice = outcome === 'cancelled' ? { code: 'CANCELLED' } : { code: outcome === 'interrupted' ? 'INTERRUPTED' : 'STEP_FAILED', params: { code } };
-    await endTurn(ctx, session.id, session.turnId, outcome, 'handler', notice);
+    const ended = await ctx.store.transaction(tx => {
+        ctx.job.signal.throwIfAborted();
+        const store = txRecords(tx), state = recoveryState(store, session.id);
+        if (state?.session.stepJobId !== jobId)
+            return undefined;
+        // A modern prepared job never claimed effects. Keep its recoverable intent instead of ending it.
+        if (preparedRecovery(state))
+            return undefined;
+        return interruptUncertain(store, state, code);
+    });
+    if (ended !== undefined)
+        await notifyEnded(ctx, ended);
 }
 export function registerInterruptions(ctx) {
     ctx.registerHandler('kernel.job.failed', {
@@ -17,14 +28,14 @@ export function registerInterruptions(ctx) {
             if (name === 'kvcoder.delegate.worker.run')
                 await runLost(ctx, jobId, problem.code);
             if (name === 'kvcoder.turn.step')
-                await stepEnded(ctx, jobId, problem.code === 'INTERRUPTED' ? 'interrupted' : 'failed', problem.code);
+                await stepEnded(ctx, jobId, problem.code);
         },
     });
     ctx.registerHandler('kernel.job.cancelled', {
         description: 'Ends the turn of a cancelled step.',
         handle: async ({ jobId, name }) => {
             if (name === 'kvcoder.turn.step')
-                await stepEnded(ctx, jobId, 'cancelled', 'CANCELLED');
+                await stepEnded(ctx, jobId, 'CANCELLED');
         },
     });
 }

package/dist/turns/register-interruptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-interruptions.js","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,sHAAsH;AACtH,uGAAuG;AAEvG,KAAK,UAAU,SAAS,CAAC,GAAQ,EAAE,KAAa,EAAE,OAA+C,EAAE,IAAY;IAC7G,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7F,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO;IAC7D,MAAM,MAAM,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;IACvJ,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAQ;IAC5C,GAAG,CAAC,eAAe,CAAC,mBAAmB,EAAE;QACvC,WAAW,EAAE,kFAAkF;QAC/F,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,IAAI,IAAI,KAAK,6BAA6B;gBAAE,MAAM,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACpF,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzI,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,eAAe,CAAC,sBAAsB,EAAE;QAC1C,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YAChC,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC1F,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"register-interruptions.js","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE1F,sHAAsH;AACtH,uGAAuG;AAEvG,KAAK,UAAU,SAAS,CAAC,GAAQ,EAAE,KAAa,EAAE,IAAY;IAC5D,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7F,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAClC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;QAC7C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACtE,IAAI,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,KAAK;YAAE,OAAO,SAAS,CAAC;QACzD,iGAAiG;QACjG,IAAI,gBAAgB,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC9C,OAAO,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAQ;IAC5C,GAAG,CAAC,eAAe,CAAC,mBAAmB,EAAE;QACvC,WAAW,EAAE,kFAAkF;QAC/F,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,IAAI,IAAI,KAAK,6BAA6B;gBAAE,MAAM,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACpF,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9E,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,eAAe,CAAC,sBAAsB,EAAE;QAC1C,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YAChC,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7E,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/turns/register-turns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-turns.d.ts","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAYzC,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAmD5C"}
+{"version":3,"file":"register-turns.d.ts","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAczC,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA8D5C"}

package/dist/turns/register-turns.js

@@ -1,22 +1,36 @@
 import { z } from '@kvman/sdk';
-import { isDelegateRun, startApprovedRun } from "../delegate/approved-run.js";
-import { checkedAnswer } from "../connectors/ask.js";
-import { runCallSchema } from "../schemas/records.js";
+import { startApprovedRun } from "../delegate/approved-run.js";
 import { findSession, ownSession, userOnly } from "../sessions/session-lookup.js";
 import { turnSchema, turnView } from "../sessions/session-view.js";
 import { records, txRecords } from "../store/collections.js";
-import { cancelTurn } from "./cancel-turn.js";
-import { heldText, resolvePending } from "./resolve.js";
-// Turns (plan 08 §8.6): cancel, list, and the person's answer to a question or approval.
+import { cancelTurn } from "./end-turn.js";
+import { applyAnswer } from "./apply-answer.js";
+import { receiptJob } from "./receipt-job.js";
+import { recoverWorkspace } from "./recover-workspace.js";
+import { retryTurn } from "./retry-turn.js";
+import { dispatchStep } from "./start-turn.js";
+// Turns (plan 08 §8.6): retry, cancel, list, and the person's answer to a question or approval.
 export function registerTurns(ctx) {
-    ctx.registerCommand('kvcoder.turn.cancel', {
-        description: "Cancels a session's turn: its step, its subagents' turns, and its questions.",
+    ctx.registerCommand('kvcoder.turn.retry', {
+        description: "Runs a stopped turn again on the session's history, without adding a message.",
         input: z.object({ sessionId: z.string() }),
         output: z.object({}),
         public: true,
+        retries: 0,
         handle: async ({ sessionId }) => {
+            userOnly(ctx, 'kvcoder.turn.retry');
+            await retryTurn(ctx, await ownSession(ctx, sessionId));
+            return {};
+        },
+    });
+    ctx.registerCommand('kvcoder.turn.cancel', {
+        description: "Cancels a session's turn: its step, its subagents' turns, and its questions. With turnId, only when that turn is still the current one.",
+        input: z.object({ sessionId: z.string(), turnId: z.string().exactOptional() }),
+        output: z.object({}),
+        public: true,
+        handle: async ({ sessionId, turnId }) => {
             await ownSession(ctx, sessionId);
-            await cancelTurn(ctx, sessionId, true);
+            await cancelTurn(ctx, sessionId, true, turnId);
             return {};
         },
     });
@@ -38,28 +52,25 @@ export function registerTurns(ctx) {
         retries: 0,
         handle: async ({ questionId, answer }) => {
             userOnly(ctx, 'kvcoder.question.answer');
-            const question = await records(ctx.store).questions.get(questionId);
-            if (question === undefined)
-                throw ctx.problem('kvcoder/QUESTION_NOT_FOUND', { questionId });
-            const checked = checkedAnswer(question, answer);
-            const taken = await ctx.store.transaction((tx) => {
-                const { questions } = txRecords(tx);
-                if (questions.get(questionId) === undefined)
-                    return false;
-                questions.delete(questionId);
-                return true;
-            });
-            if (!taken)
-                throw ctx.problem('kvcoder/QUESTION_NOT_FOUND', { questionId });
-            const approvedCall = checked.kind !== 'result' && checked.approved ? runCallSchema.parse(question.question) : undefined;
-            if (approvedCall !== undefined && isDelegateRun(approvedCall))
-                return { jobId: await startApprovedRun(ctx, { sessionId: question.sessionId, toolCallId: question.toolCallId, call: approvedCall }) };
-            const held = checked.kind === 'result'
-                ? heldText(question.toolCallId, checked.text, false)
-                : checked.approved
-                    ? { toolCallId: question.toolCallId, text: '', details: null, isError: false, run: runCallSchema.parse(question.question) }
-                    : heldText(question.toolCallId, 'denied by the user', true);
-            return { jobId: await resolvePending(ctx, question.sessionId, question.toolCallId, held, false) };
+            let result = await ctx.store.transaction(tx => applyAnswer(ctx, txRecords(tx), questionId, answer));
+            if (result.kind === 'delegate') {
+                // Legacy positive launch has no receipt: recover first, then retain exact approval identity through preparation.
+                await recoverWorkspace(ctx);
+                const expected = result.question;
+                result = await ctx.store.transaction(tx => {
+                    const store = txRecords(tx), current = applyAnswer(ctx, store, questionId, answer, expected);
+                    return current;
+                });
+                if (result.kind === 'delegate') {
+                    ctx.job.signal.throwIfAborted();
+                    return { jobId: await startApprovedRun(ctx, { question: result.question, call: result.call }) };
+                }
+            }
+            if (result.kind === 'acknowledged')
+                return { jobId: await receiptJob(ctx, result.receipt) };
+            // Only a newly committed application authorizes recovery; racing receipt acknowledgments never enter it.
+            await recoverWorkspace(ctx, result.receipt.sessionId);
+            return { jobId: result.identity === null ? null : await dispatchStep(ctx, result.identity, false) };
         },
     });
 }

package/dist/turns/register-turns.js.map

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

package/dist/turns/resolve.d.ts

@@ -1,5 +1,9 @@
 import type { Ctx } from '@kvman/sdk';
 import type { HeldResult } from '../schemas/records.ts';
+import { type TxRecords } from '../store/collections.ts';
+import { type StepIdentity } from './step-intents.ts';
+/** Synchronous transition for callers that must commit additional records with this held result. */
+export declare function resolvePendingInTx(store: TxRecords, sessionId: string, toolCallId: string, held: HeldResult): StepIdentity | null;
 /** Holds a result for a pending call; resolves to the next step's job id when it was the last, else `null`. */
 export declare function resolvePending(ctx: Ctx, sessionId: string, toolCallId: string, held: HeldResult, follow: boolean): Promise<string | null>;
 /** A result that is plain text. */

package/dist/turns/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQxD,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc/I;AAED,mCAAmC;AACnC,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAEvF"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKnE,oGAAoG;AACpG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAUjI;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAG/I;AAED,mCAAmC;AACnC,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAEvF"}

package/dist/turns/resolve.js

@@ -1,26 +1,28 @@
 import { now } from "../sessions/session-lookup.js";
 import { txRecords } from "../store/collections.js";
-import { queueStep } from "./start-turn.js";
+import { dispatchStep } from "./start-turn.js";
+import { prepareStep } from "./step-intents.js";
 // Resolving a pending call (plan 08 §8.1): its result is held in the turn; when the last one resolves, the session runs
 // again and the next step appends every result in the model's call order before it calls the model.
+/** Synchronous transition for callers that must commit additional records with this held result. */
+export function resolvePendingInTx(store, sessionId, toolCallId, held) {
+    const session = store.sessions.get(sessionId);
+    if (session === undefined || session.turnId === null)
+        return null;
+    const turn = store.turns.get(session.turnId);
+    if (session.status !== 'waiting' || turn?.sessionId !== sessionId || turn.outcome !== null || turn.endedAt !== null || !turn.pending.some(item => item.toolCallId === toolCallId))
+        return null;
+    const pending = turn.pending.filter(item => item.toolCallId !== toolCallId);
+    store.turns.update(turn.id, { pending, results: [...turn.results, held] });
+    if (pending.length > 0)
+        return null;
+    store.sessions.update(sessionId, { status: 'running', updatedAt: now() });
+    return prepareStep(store, sessionId, turn.id);
+}
 /** Holds a result for a pending call; resolves to the next step's job id when it was the last, else `null`. */
 export async function resolvePending(ctx, sessionId, toolCallId, held, follow) {
-    const turnId = await ctx.store.transaction((tx) => {
-        const store = txRecords(tx);
-        const session = store.sessions.get(sessionId);
-        if (session === undefined || session.turnId === null)
-            return null;
-        const turn = store.turns.get(session.turnId);
-        if (turn === undefined || !turn.pending.some((item) => item.toolCallId === toolCallId))
-            return null;
-        const pending = turn.pending.filter((item) => item.toolCallId !== toolCallId);
-        store.turns.update(turn.id, { pending, results: [...turn.results, held] });
-        if (pending.length > 0)
-            return null;
-        store.sessions.update(sessionId, { status: 'running', updatedAt: now() });
-        return turn.id;
-    });
-    return turnId === null ? null : queueStep(ctx, sessionId, turnId, follow);
+    const identity = await ctx.store.transaction(tx => resolvePendingInTx(txRecords(tx), sessionId, toolCallId, held));
+    return identity === null ? null : dispatchStep(ctx, identity, follow);
 }
 /** A result that is plain text. */
 export function heldText(toolCallId, text, isError) {

package/dist/turns/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,wHAAwH;AACxH,oGAAoG;AAEpG,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAQ,EAAE,SAAiB,EAAE,UAAkB,EAAE,IAAgB,EAAE,MAAe;IACrH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAClE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QACpG,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QAC9E,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5E,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,QAAQ,CAAC,UAAkB,EAAE,IAAY,EAAE,OAAgB;IACzE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAqB,MAAM,mBAAmB,CAAC;AAEnE,wHAAwH;AACxH,oGAAoG;AAEpG,oGAAoG;AACpG,MAAM,UAAU,kBAAkB,CAAC,KAAgB,EAAE,SAAiB,EAAE,UAAkB,EAAE,IAAgB;IAC1G,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,EAAE,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/L,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;IAC5E,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC1E,OAAO,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAQ,EAAE,SAAiB,EAAE,UAAkB,EAAE,IAAgB,EAAE,MAAe;IACrH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IACnH,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,QAAQ,CAAC,UAAkB,EAAE,IAAY,EAAE,OAAgB;IACzE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC"}

package/dist/turns/retry-turn.d.ts

@@ -0,0 +1,4 @@
+import type { Ctx, Stored } from '@kvman/sdk';
+import type { SessionDoc } from '../schemas/records.ts';
+export declare function retryTurn(ctx: Ctx, session: Stored<SessionDoc>): Promise<void>;
+//# sourceMappingURL=retry-turn.d.ts.map

package/dist/turns/retry-turn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry-turn.d.ts","sourceRoot":"","sources":["../../src/turns/retry-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASxD,wBAAsB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}

package/dist/turns/retry-turn.js

@@ -0,0 +1,20 @@
+import { invalid } from "../problems.js";
+import { txRecords } from "../store/collections.js";
+import { beginTurn, openTurn } from "./start-turn.js";
+// Retry (ADR 0050, 3): a turn that stopped runs again on the session's history as it stands. No message is added, so
+// the chat and the model's context stay as the person left them.
+const stopped = new Set(['STEP_FAILED', 'REPLY_LOST', 'REPLY_INCOMPLETE', 'INTERRUPTED']);
+export async function retryTurn(ctx, session) {
+    const turnId = await ctx.store.transaction((tx) => {
+        const store = txRecords(tx);
+        const fresh = store.sessions.get(session.id);
+        if (fresh === undefined)
+            throw ctx.problem('kvcoder/SESSION_NOT_FOUND', { sessionId: session.id });
+        const [last] = store.messages.find({ sessionId: session.id }, { limit: 1, order: 'desc' });
+        if (fresh.status !== 'idle' || last?.kind !== 'notice' || !stopped.has(String(last.content['code'])))
+            throw invalid("Only a chat whose last turn stopped can be retried.", { sessionId: session.id });
+        return openTurn(store, fresh);
+    });
+    await beginTurn(ctx, session.id, turnId, true);
+}
+//# sourceMappingURL=retry-turn.js.map

package/dist/turns/retry-turn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry-turn.js","sourceRoot":"","sources":["../../src/turns/retry-turn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qHAAqH;AACrH,iEAAiE;AAEjE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;AAE1F,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAQ,EAAE,OAA2B;IACnE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACnG,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3F,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,MAAM,OAAO,CAAC,qDAAqD,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtM,OAAO,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC"}

package/dist/turns/run-calls.d.ts

@@ -1,8 +1,10 @@
-import type { Ctx, Stored } from '@kvman/sdk';
+import { type Ctx, type Stored } from '@kvman/sdk';
 import { type QuestionKind } from '../connectors/ask.ts';
+import { type RunCall } from '../calls/run-tool.ts';
 import { type JsonValue } from '../connector-call.ts';
 import type { SessionTools } from '../prompt/session-prompt.ts';
 import type { HeldResult, SessionDoc } from '../schemas/records.ts';
+import { type StepLease } from './step-claim.ts';
 export type ToolCall = {
     id: string;
     name: string;
@@ -21,14 +23,29 @@ export type CallOutcome = {
 } | {
     kind: 'worker';
     runId: string;
+}
+/** An effect held back behind an earlier call's pending approval, to run in the model's order (ADR 0046). */
+ | {
+    kind: 'deferred';
+    call: RunCall;
 };
 export type CallEnv = {
     ctx: Ctx;
     session: Stored<SessionDoc>;
     tools: SessionTools;
-    approval: 'ask' | 'auto';
+    approval: 'ask' | 'auto' | 'never';
+    lease: StepLease;
 };
-export declare function evaluateCall(env: CallEnv, toolCall: ToolCall): Promise<CallOutcome>;
+/**
+ * Evaluates a reply's calls (ADR 0046): those that could change something one after another in the model's order,
+ * each told whether an earlier one still waits for the person's decision; the others at once, in parallel.
+ */
+export declare function evaluateCalls(env: CallEnv, calls: readonly ToolCall[]): Promise<CallOutcome[]>;
 /** Runs an approved call held in the turn. */
-export declare function runApproved(ctx: Ctx, session: Stored<SessionDoc>, held: HeldResult): Promise<HeldResult>;
+export declare function runApproved(ctx: Ctx, session: Stored<SessionDoc>, held: HeldResult, lease?: StepLease): Promise<HeldResult | undefined>;
+/** Runs a call that was held back behind an approval: it was permitted to run by itself, and is checked again now. */
+export declare function runDeferred(ctx: Ctx, session: Stored<SessionDoc>, deferred: {
+    toolCallId: string;
+    call: RunCall;
+}, lease: StepLease): Promise<HeldResult | undefined>;
 //# sourceMappingURL=run-calls.d.ts.map

package/dist/turns/run-calls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-calls.d.ts","sourceRoot":"","sources":["../../src/turns/run-calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMpE,OAAO,EAA8F,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAClJ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAUpE,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,CAAC;AAE1F,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,GACrF;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,MAAM,MAAM,OAAO,GAAG;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAAC,KAAK,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AA4C/G,wBAAsB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAoBzF;AAKD,8CAA8C;AAC9C,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAO9G"}
+{"version":3,"file":"run-calls.d.ts","sourceRoot":"","sources":["../../src/turns/run-calls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AASlE,OAAO,EAAqC,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGpE,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAa9D,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,CAAC;AAE1F,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,GACrF;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AACnC,6GAA6G;GAC3G;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAAC,KAAK,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAuE3I;;;GAGG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAmBpG;AAoDD,8CAA8C;AAC9C,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAKvI;AAWD,sHAAsH;AACtH,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAM3K"}