@kvman/kvcoder 0.1.6 → 0.1.8

package/dist/delegate/permission.d.ts

@@ -0,0 +1,240 @@
+import { ProblemError, type Ctx, type Stored } from '@kvman/sdk';
+import { type GrantPreparation } from '../prompt/session-grants.ts';
+import type { Pending, RunDoc, SessionDoc } from '../schemas/records.ts';
+import { type TxRecords } from '../store/collections.ts';
+import type { StepLease } from '../turns/step-claim.ts';
+import type { Worker } from './workers.ts';
+export type CreationGuard = (store: TxRecords) => Stored<SessionDoc>;
+export type PendingAuthority = {
+    sessionId: string;
+    turnId: string;
+    pending: Pending;
+};
+/** A waiting resource must still belong unambiguously to the exact originating open turn. */
+export declare function waitingInTx(store: TxRecords, authority: PendingAuthority): {
+    session: Stored<{
+        title: string;
+        autoTitle: boolean;
+        deleting: boolean;
+        status: "idle" | "running" | "waiting";
+        parentId: string | null;
+        worker: {
+            name: string;
+            instructions: string;
+            readOnly: boolean;
+        } | null;
+        model: string | null;
+        thinking: "off" | "minimal" | "low" | "medium" | "high";
+        usageBy: {
+            summary: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+            title: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+            helpers: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+        };
+        stepJobId: string | null;
+        stepGeneration: number;
+        stepIntentId: string | null;
+        turnId: string | null;
+        endedTurns: number;
+        nextSeq: number;
+        usage: {
+            input: number;
+            output: number;
+            cacheRead: number;
+            cacheWrite: number;
+            cost: number;
+        };
+        durationMs: number;
+        checks: {
+            name: string;
+            passed: boolean;
+        }[] | null;
+        connectors: string[] | null;
+        optedIn: string[];
+        createdAt: string;
+        updatedAt: string;
+    }>;
+    turn: Stored<{
+        sessionId: string;
+        startedAt: string;
+        endedAt: string | null;
+        durationMs: number;
+        steps: number;
+        lost: number;
+        incomplete: number;
+        usage: {
+            input: number;
+            output: number;
+            cacheRead: number;
+            cacheWrite: number;
+            cost: number;
+        };
+        outcome: "done" | "cancelled" | "failed" | "interrupted" | "maxSteps" | null;
+        calls: {
+            toolCallId: string;
+            toolName: string;
+        }[];
+        pending: {
+            toolCallId: string;
+            kind: "subagent" | "worker" | "question" | "approval";
+            questionId: string | null;
+            question: import("zod").JSONType;
+            childSessionId: string | null;
+            runId: string | null;
+        }[];
+        results: {
+            toolCallId: string;
+            text: string;
+            details: import("zod").JSONType;
+            isError: boolean;
+            run: {
+                description: string;
+                connector: string;
+                command: string;
+                payload: Record<string, import("zod").JSONType>;
+            } | {
+                command: string;
+                timeoutMs: number;
+            } | null;
+        }[];
+        deferredCalls: {
+            toolCallId: string;
+            call: {
+                description: string;
+                connector: string;
+                command: string;
+                payload: Record<string, import("zod").JSONType>;
+            };
+        }[];
+    }>;
+} | undefined;
+/** Captures only a well-formed exact foreground worker wait, never a call-ID-only match. */
+export declare function runAuthorityInTx(store: TxRecords, run: Stored<RunDoc>): PendingAuthority | undefined;
+/** Current parent grants and named worker presence; captured scope/instructions/argv are not regenerated. */
+export declare function delegationInTx(store: TxRecords, sessionId: string, prepared: GrantPreparation, name: string, kind?: Worker['kind']): {
+    session: Stored<{
+        title: string;
+        autoTitle: boolean;
+        deleting: boolean;
+        status: "idle" | "running" | "waiting";
+        parentId: string | null;
+        worker: {
+            name: string;
+            instructions: string;
+            readOnly: boolean;
+        } | null;
+        model: string | null;
+        thinking: "off" | "minimal" | "low" | "medium" | "high";
+        usageBy: {
+            summary: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+            title: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+            helpers: {
+                input: number;
+                output: number;
+                cacheRead: number;
+                cacheWrite: number;
+                cost: number;
+            };
+        };
+        stepJobId: string | null;
+        stepGeneration: number;
+        stepIntentId: string | null;
+        turnId: string | null;
+        endedTurns: number;
+        nextSeq: number;
+        usage: {
+            input: number;
+            output: number;
+            cacheRead: number;
+            cacheWrite: number;
+            cost: number;
+        };
+        durationMs: number;
+        checks: {
+            name: string;
+            passed: boolean;
+        }[] | null;
+        connectors: string[] | null;
+        optedIn: string[];
+        createdAt: string;
+        updatedAt: string;
+    }>;
+    worker: {
+        kind: "opencode";
+        model: string | null;
+        agent: string | null;
+        autoApprove: boolean;
+        approval: "ask" | "auto";
+        timeoutMs: number;
+        name: string;
+        description: string;
+        enabled: boolean;
+        instructions: string;
+    } | {
+        kind: "claude";
+        model: string | null;
+        effort: "low" | "medium" | "high" | "xhigh" | "max" | null;
+        permissionMode: "auto" | "bypassPermissions" | "dontAsk" | "acceptEdits" | "plan";
+        approval: "ask" | "auto";
+        timeoutMs: number;
+        name: string;
+        description: string;
+        enabled: boolean;
+        instructions: string;
+    } | {
+        kind: "subagent";
+        readOnly: boolean;
+        connectors: string[] | null;
+        model: string | null;
+        thinking: "off" | "minimal" | "low" | "medium" | "high" | null;
+        name: string;
+        description: string;
+        enabled: boolean;
+        instructions: string;
+    } | {
+        kind: "pi";
+        model: string | null;
+        thinking: "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max" | null;
+        tools: string[] | null;
+        approval: "ask" | "auto";
+        timeoutMs: number;
+        name: string;
+        description: string;
+        enabled: boolean;
+        instructions: string;
+    };
+};
+/** Preparation precedes the creation transaction, which rereads the canonical lease and stored grants. */
+export declare function creationGuard(ctx: Ctx, lease: StepLease, worker: Worker): Promise<CreationGuard>;
+/** Refuse only this still-current resource; never resolve a newer turn by tool-call ID alone. */
+export declare function refusePending(ctx: Ctx, authority: PendingAuthority, error: ProblemError): Promise<string | null>;
+//# sourceMappingURL=permission.d.ts.map

package/dist/delegate/permission.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/delegate/permission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AAGjE,OAAO,EAA6B,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;AACrE,MAAM,MAAM,gBAAgB,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvF,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAQxE;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,GAAG,SAAS,CAOpG;AAED,6GAA6G;AAC7G,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYlI;AAED,0GAA0G;AAC1G,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAStG;AAED,iGAAiG;AACjG,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUtH"}

package/dist/delegate/permission.js

@@ -0,0 +1,78 @@
+import { isDeepStrictEqual } from 'node:util';
+import { ProblemError } from '@kvman/sdk';
+import { errorOutput } from "../connector-call.js";
+import { invalid } from "../problems.js";
+import { grantsInTx, prepareGrants } from "../prompt/session-grants.js";
+import { now } from "../sessions/session-lookup.js";
+import { txRecords } from "../store/collections.js";
+import { heldText, resolvePendingInTx } from "../turns/resolve.js";
+import { dispatchStep } from "../turns/start-turn.js";
+import { liveStep } from "../turns/step-intents.js";
+/** A waiting resource must still belong unambiguously to the exact originating open turn. */
+export function waitingInTx(store, authority) {
+    const { sessionId, turnId, pending } = authority;
+    const session = store.sessions.get(sessionId), turn = store.turns.get(turnId);
+    if (session?.status !== 'waiting' || session.turnId !== turnId || turn?.sessionId !== sessionId || turn.outcome !== null || turn.endedAt !== null)
+        return undefined;
+    const matches = turn.pending.filter(item => item.toolCallId === pending.toolCallId || (pending.runId !== null && item.runId === pending.runId) || (pending.childSessionId !== null && item.childSessionId === pending.childSessionId) || (pending.questionId !== null && item.questionId === pending.questionId));
+    const calls = turn.calls.filter(call => call.toolCallId === pending.toolCallId);
+    if (matches.length !== 1 || !isDeepStrictEqual(matches[0], pending) || calls.length !== 1 || calls[0]?.toolName !== 'run' || turn.results.some(item => item.toolCallId === pending.toolCallId))
+        return undefined;
+    return { session, turn };
+}
+/** Captures only a well-formed exact foreground worker wait, never a call-ID-only match. */
+export function runAuthorityInTx(store, run) {
+    if (run.toolCallId === null)
+        return undefined;
+    const session = store.sessions.get(run.sessionId), turn = session?.turnId === null || session === undefined ? undefined : store.turns.get(session.turnId);
+    const pending = turn?.pending.find(item => item.runId === run.id && item.toolCallId === run.toolCallId);
+    if (turn === undefined || pending?.kind !== 'worker' || pending.childSessionId !== null || pending.questionId !== null || pending.question !== null)
+        return undefined;
+    const authority = { sessionId: run.sessionId, turnId: turn.id, pending };
+    return waitingInTx(store, authority) === undefined ? undefined : authority;
+}
+/** Current parent grants and named worker presence; captured scope/instructions/argv are not regenerated. */
+export function delegationInTx(store, sessionId, prepared, name, kind) {
+    const session = store.sessions.get(sessionId);
+    const grants = session === undefined ? undefined : grantsInTx(store, session, prepared);
+    if (grants === undefined)
+        throw invalid('The session ancestry is no longer available.');
+    const worker = grants.workers.find(item => item.name === name);
+    if (worker === undefined) {
+        const names = grants.workers.map(item => item.name);
+        throw new ProblemError({ code: 'kvcoder/WORKER_NOT_FOUND', message: `There is no worker ${name}. ${names.length === 0 ? 'No worker is available.' : `The workers are: ${names.join(', ')}.`}`, params: { worker: name } });
+    }
+    if (!grants.names.includes('delegate'))
+        throw invalid('There is no connector delegate. Make this call again when delegation is available.');
+    if (kind !== undefined && worker.kind !== kind)
+        throw invalid(`The worker ${name} changed while the call waited. Make the call again.`);
+    return { session: grants.session, worker };
+}
+/** Preparation precedes the creation transaction, which rereads the canonical lease and stored grants. */
+export async function creationGuard(ctx, lease, worker) {
+    const prepared = await prepareGrants(ctx);
+    return store => {
+        ctx.job.signal.throwIfAborted();
+        if (ctx.job.id !== lease.jobId || liveStep(store, lease, lease.jobId) === undefined)
+            throw invalid('The originating step is no longer current.');
+        const current = delegationInTx(store, lease.sessionId, prepared, worker.name, worker.kind);
+        if (worker.kind !== 'subagent' && current.worker.kind !== 'subagent' && current.worker.approval !== worker.approval)
+            throw invalid('The worker approval requirement changed. Make this call again.');
+        return current.session;
+    };
+}
+/** Refuse only this still-current resource; never resolve a newer turn by tool-call ID alone. */
+export async function refusePending(ctx, authority, error) {
+    const text = errorOutput(error.problem).output;
+    const identity = await ctx.store.transaction(tx => {
+        const store = txRecords(tx);
+        if (waitingInTx(store, authority) === undefined)
+            return null;
+        const runId = authority.pending.runId, run = runId === null ? undefined : store.runs.get(runId);
+        if (run !== undefined && run.status === 'running' && run.sessionId === authority.sessionId && run.toolCallId === authority.pending.toolCallId)
+            store.runs.update(run.id, { status: 'failed', endedAt: now(), output: text });
+        return resolvePendingInTx(store, authority.sessionId, authority.pending.toolCallId, heldText(authority.pending.toolCallId, text, true));
+    });
+    return identity === null ? null : dispatchStep(ctx, identity, false);
+}
+//# sourceMappingURL=permission.js.map

package/dist/delegate/permission.js.map

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

package/dist/delegate/program-permission.d.ts

@@ -0,0 +1,27 @@
+import { type Ctx } from '@kvman/sdk';
+/** A queued job has no step lease. Existing foreground membership proves only its current waiting call. */
+export declare function programPermission(ctx: Ctx, runId: string): Promise<import("@kvman/sdk").Stored<{
+    sessionId: string;
+    toolCallId: string | null;
+    worker: string;
+    kind: "opencode" | "pi" | "claude";
+    call: string;
+    command: string;
+    args: string[];
+    timeoutMs: number;
+    jobId: string | null;
+    status: "running" | "cancelled" | "failed" | "interrupted" | "succeeded";
+    startedAt: string;
+    endedAt: string | null;
+    exitCode: number | null;
+    output: string | null;
+    staging: {
+        tree: string;
+        after: string;
+        head: string | null;
+        headMoved: boolean;
+        paths: number;
+        restored: boolean;
+    } | null;
+}> | undefined>;
+//# sourceMappingURL=program-permission.d.ts.map

package/dist/delegate/program-permission.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"program-permission.d.ts","sourceRoot":"","sources":["../../src/delegate/program-permission.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAQpD,2GAA2G;AAC3G,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;gBAgC9D"}

package/dist/delegate/program-permission.js

@@ -0,0 +1,53 @@
+import { isDeepStrictEqual } from 'node:util';
+import { ProblemError } from '@kvman/sdk';
+import { invalid } from "../problems.js";
+import { prepareGrants } from "../prompt/session-grants.js";
+import { txRecords } from "../store/collections.js";
+import { delegationInTx, refusePending, waitingInTx } from "./permission.js";
+import { finishRun } from "./runs.js";
+import { errorOutput } from "../connector-call.js";
+/** A queued job has no step lease. Existing foreground membership proves only its current waiting call. */
+export async function programPermission(ctx, runId) {
+    const captured = await ctx.store.transaction(tx => {
+        const store = txRecords(tx), run = store.runs.get(runId);
+        if (run?.status !== 'running')
+            return undefined;
+        const session = store.sessions.get(run.sessionId), turn = session?.turnId === null || session === undefined ? undefined : store.turns.get(session.turnId);
+        const pending = turn?.pending.find(item => item.runId === runId && item.toolCallId === run.toolCallId);
+        const authority = turn === undefined || pending === undefined ? undefined : { sessionId: run.sessionId, turnId: turn.id, pending };
+        return { run, authority };
+    });
+    if (captured === undefined)
+        return undefined;
+    const { authority } = captured;
+    try {
+        const prepared = await prepareGrants(ctx);
+        return await ctx.store.transaction(tx => {
+            ctx.job.signal.throwIfAborted();
+            const store = txRecords(tx), run = store.runs.get(runId);
+            if (run?.status !== 'running')
+                return undefined;
+            if (run.jobId !== null && run.jobId !== ctx.job.id)
+                return undefined;
+            if (run.sessionId !== captured.run.sessionId || run.toolCallId !== captured.run.toolCallId || run.worker !== captured.run.worker || run.kind !== captured.run.kind || run.command !== captured.run.command || !isDeepStrictEqual(run.args, captured.run.args) || run.timeoutMs !== captured.run.timeoutMs)
+                throw invalid('The worker run changed before execution.');
+            if (run.toolCallId !== null) {
+                const pending = authority?.pending;
+                if (authority === undefined || pending?.kind !== 'worker' || pending.runId !== runId || pending.childSessionId !== null || pending.questionId !== null || pending.question !== null || waitingInTx(store, authority) === undefined)
+                    throw invalid('The originating delegation is no longer current.');
+            }
+            delegationInTx(store, run.sessionId, prepared, run.worker, run.kind);
+            return run;
+        });
+    }
+    catch (error) {
+        if (!(error instanceof ProblemError) || ctx.job.signal.aborted)
+            throw error;
+        if (authority !== undefined)
+            await refusePending(ctx, authority, error);
+        else if (captured.run.toolCallId === null)
+            await finishRun(ctx, runId, { status: 'failed', exitCode: null, text: errorOutput(error.problem).output, isError: true }, true);
+        return undefined;
+    }
+}
+//# sourceMappingURL=program-permission.js.map

package/dist/delegate/program-permission.js.map

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

package/dist/delegate/register-worker-run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-worker-run.d.ts","sourceRoot":"","sources":["../../src/delegate/register-worker-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAiBzC,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAelF;AAED,6FAA6F;AAC7F,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAGzF;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA8BhD"}
+{"version":3,"file":"register-worker-run.d.ts","sourceRoot":"","sources":["../../src/delegate/register-worker-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAsBzC,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBlF;AAED,6FAA6F;AAC7F,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAGzF;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAoChD"}

package/dist/delegate/register-worker-run.js

@@ -1,9 +1,14 @@
 import { z } from '@kvman/sdk';
-import { records } from "../store/collections.js";
-import { endTurn } from "../turns/end-turn.js";
+import { records, txRecords } from "../store/collections.js";
+import { notifyEnded } from "../turns/end-turn.js";
+import { endTurnState } from "../turns/end-turn-state.js";
 import { checkCommand, runResult } from "./programs.js";
 import { programFound, runProgram } from "./run-program.js";
 import { finishRun } from "./runs.js";
+import { stagingMark } from "./git-staging.js";
+import { registerStagingRestore, stagingChange, stagingLines } from "./staging-guard.js";
+import { programPermission } from "./program-permission.js";
+import { runAuthorityInTx } from "./permission.js";
 import { isProgram, listedWorker, listedWorkers, workerCheckName } from "./workers.js";
 // The job that runs a program worker, and the check of its program (plan 08 §8.5, ADR 0021, 11, 35, and 37). The job
 // is queued by a step or by an answer, never by a handler, so when the program exits it may hold the result and queue
@@ -24,11 +29,16 @@ export async function runLost(ctx, jobId, code) {
         await finishRun(ctx, run.id, { status, exitCode: null, text, isError: true }, false);
         return;
     }
-    await store.runs.update(run.id, { status, endedAt: new Date().toISOString(), output: text });
-    const session = await store.sessions.get(run.sessionId);
-    if (session === undefined || session.turnId === null)
-        return;
-    await endTurn(ctx, session.id, session.turnId, status, 'handler', { code: interrupted ? 'INTERRUPTED' : 'STEP_FAILED', params: { code } });
+    const ended = await ctx.store.transaction(tx => {
+        const current = txRecords(tx), saved = current.runs.get(run.id);
+        if (saved?.status !== 'running' || saved.jobId !== jobId || saved.sessionId !== run.sessionId || saved.toolCallId !== run.toolCallId)
+            return undefined;
+        const authority = runAuthorityInTx(current, saved);
+        current.runs.update(saved.id, { status, endedAt: new Date().toISOString(), output: text });
+        return authority === undefined ? undefined : endTurnState(current, authority.sessionId, authority.turnId, status, 'handler', { code: interrupted ? 'INTERRUPTED' : 'STEP_FAILED', params: { code } });
+    });
+    if (ended !== undefined)
+        await notifyEnded(ctx, ended);
 }
 /** The checks of the workspace's program workers, as a session keeps them (ADR 0021, 37). */
 export async function workerChecks(ctx) {
@@ -36,20 +46,26 @@ export async function workerChecks(ctx) {
     return Promise.all(programs.map(async (worker) => ({ name: workerCheckName(worker.name), passed: await programFound(checkCommand(worker.kind), ctx.job.workspace.path, ctx.job.signal) })));
 }
 export function registerWorkerRun(ctx) {
+    registerStagingRestore(ctx);
     ctx.registerCommand('kvcoder.delegate.worker.run', {
         description: "Runs a program worker's program on its task, and gives the chat its answer.",
         input: z.strictObject({ runId: z.string() }),
         output: z.object({}),
         ...runOptions,
         handle: async ({ runId }) => {
-            const run = await records(ctx.store).runs.get(runId);
-            if (run === undefined || run.status !== 'running')
+            const run = await programPermission(ctx, runId);
+            if (run === undefined)
                 return {};
-            const end = await runProgram({ command: run.command, args: run.args }, ctx.job.workspace.path, run.timeoutMs, ctx.job.signal);
+            ctx.job.signal.throwIfAborted();
+            const folder = ctx.job.workspace.path;
+            const before = await stagingMark(folder, ctx.job.signal);
+            const end = await runProgram({ command: run.command, args: run.args }, folder, run.timeoutMs, ctx.job.signal);
             // A cancelled or interrupted job leaves the run to whoever stopped it, or to `kernel.job.failed`.
             ctx.job.signal.throwIfAborted();
             const result = runResult({ name: run.worker, kind: run.kind, timeoutMs: run.timeoutMs }, end);
-            await finishRun(ctx, runId, { status: result.isError ? 'failed' : 'succeeded', exitCode: end.timedOut ? null : end.exitCode, ...result }, true);
+            const staging = await stagingChange(folder, before, ctx.job.signal);
+            const text = staging === undefined || before === undefined ? result.text : `${result.text}\n\n${stagingLines(staging, before)}`;
+            await finishRun(ctx, runId, { status: result.isError ? 'failed' : 'succeeded', exitCode: end.timedOut ? null : end.exitCode, text, isError: result.isError, ...(staging === undefined ? {} : { staging }) }, true);
             return {};
         },
     });

package/dist/delegate/register-worker-run.js.map

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

package/dist/delegate/run-program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-program.d.ts","sourceRoot":"","sources":["../../src/delegate/run-program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM7D,iHAAiH;AACjH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,CAElG;AAmBD,wGAAwG;AACxG,wBAAsB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxG;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA0BtH"}
+{"version":3,"file":"run-program.d.ts","sourceRoot":"","sources":["../../src/delegate/run-program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM7D,iHAAiH;AACjH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,CAElG;AAmBD,wGAAwG;AACxG,wBAAsB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxG;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA0CtH"}

package/dist/delegate/run-program.js

@@ -29,20 +29,30 @@ export async function programFound(line, cwd, signal) {
     return end.startError === null && !end.timedOut && end.exitCode === 0;
 }
 export function runProgram(line, cwd, timeoutMs, signal) {
-    return new Promise((resolve) => {
-        const child = spawn(line.command, line.args, programSpawn(process.platform, cwd, process.env));
+    return new Promise((resolve, reject) => {
+        signal.throwIfAborted();
+        const command = line.command;
+        const args = line.args;
+        const options = programSpawn(process.platform, cwd, process.env);
+        signal.throwIfAborted();
+        const child = spawn(command, args, options);
         const stdout = tail();
         const stderr = tail();
         let timedOut = false;
+        let settled = false;
+        let stopRequested = false;
         child.stdout?.on('data', stdout.add);
         child.stderr?.on('data', stderr.add);
+        const abort = () => {
+            if (settled || stopRequested)
+                return;
+            stopRequested = true;
+            killTree(child.pid);
+        };
         const timer = setTimeout(() => {
             timedOut = true;
-            killTree(child.pid);
+            abort();
         }, timeoutMs);
-        const abort = () => killTree(child.pid);
-        signal.addEventListener('abort', abort, { once: true });
-        let settled = false;
         // A program that can't start reports an error and may then close as well.
         const settle = (end) => {
             if (settled)
@@ -50,10 +60,21 @@ export function runProgram(line, cwd, timeoutMs, signal) {
             settled = true;
             clearTimeout(timer);
             signal.removeEventListener('abort', abort);
-            resolve({ stdout: stdout.text(), stderr: stderr.text(), timedOut, ...end });
+            if (signal.aborted)
+                reject(signal.reason);
+            else
+                resolve({ stdout: stdout.text(), stderr: stderr.text(), timedOut, ...end });
         };
-        child.once('error', (error) => settle({ exitCode: null, startError: error.message }));
+        child.once('error', (error) => {
+            // An error with a pid does not confirm a cancelled child's shutdown; wait for close.
+            if (signal.aborted && child.pid !== undefined)
+                return;
+            settle({ exitCode: null, startError: error.message });
+        });
         child.once('close', (code) => settle({ exitCode: code, startError: null }));
+        signal.addEventListener('abort', abort, { once: true });
+        if (signal.aborted)
+            abort();
     });
 }
 //# sourceMappingURL=run-program.js.map

package/dist/delegate/run-program.js.map

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