toolroll 0.9.57 → 0.9.59

package/dist/builder.js

@@ -857,9 +857,11 @@ export async function build(store, request) {
             // still-blocked history) is left alone rather than having a
             // revision 1 invented underneath it.
             if (planDocument !== null && store.latestPlanRevision(taskRef) === null) {
+                // Revision 1 for a task planned once; past every earlier generation's revisions for one planned again (v119).
+                planRevisionNumber = store.nextPlanRevisionNumber(taskRef);
                 planRevisionId = store.insertPlanRevision({
                     taskRef,
-                    revision: 1,
+                    revision: planRevisionNumber,
                     artifact: planArtifact.id,
                     parentHash: null,
                     reason: "the plan the operator approved",
@@ -1803,7 +1805,7 @@ function settleRevisionProposal(captured, binding) {
     if (latest !== null && latest.status === "blocked") {
         return broke("the agent proposed a plan revision, but one is already awaiting your approval on this task");
     }
-    const revisionNumber = (latest?.revision ?? 0) + 1;
+    const revisionNumber = store.nextPlanRevisionNumber(taskRef);
     // Stored re-serialized from the validated shape, never the agent's raw
     // bytes: what a later brief quotes and hash-verifies is exactly what this
     // parser admitted.

package/dist/chat-channel.d.ts

@@ -81,6 +81,7 @@ export declare function confirmedLink(store: Store, outcome: DoorOutcome, propos
 export declare function proposalPreview(store: Store, proposal: LeadProposal, repos: readonly string[], channel?: ChatChannelName | null): {
     text: string;
     buttons: boolean;
+    closed?: true;
 };
 /** The card after it resolves, from the recorded outcome — the same words every surface shows. */
 export declare function proposalOutcomeText(proposal: LeadProposal): string;

package/dist/chat-channel.js

@@ -1,5 +1,6 @@
 /** Shared membership-chat identity, proposal previews and result links. Transport adapters never grant authority. */
 import { FLOW_HREF } from "./flow-engine.js";
+import { closedQuestionWords } from "./decision.js";
 import { createHash } from "node:crypto";
 import { sharedActionPayload, sharedActionNeedsReview, sharedActionReviewPath, sharedActionAllowsChallenge, CHAT_ACTIONS, } from "./chat-actions.js";
 import { isDirectChatProvider, subscriptionCredentialKey } from "./converse.js";
@@ -366,6 +367,8 @@ export function proposalPreview(store, proposal, repos, channel = null) {
         case "answer": {
             const id = typeof payload["decision"] === "number" ? payload["decision"] : null;
             const decision = id === null ? null : store.getDecision(id);
+            if (decision?.supersededReason != null)
+                return { text: closedQuestionWords(decision.supersededReason), buttons: false, closed: true };
             const pick = t("option", 64);
             const irreversible = payload["reversible"] === false;
             const body = decision === null

package/dist/chat-delivery.js

@@ -600,6 +600,8 @@ export function applyChatAction(options, event, binding, repos) {
         const phase = action.phase;
         if (proposal.state !== "pending")
             content = { text: proposalOutcomeText(proposal), edit: event.ts };
+        else if (preview.closed)
+            content = { text: preview.text, edit: event.ts };
         else if (!preview.buttons ||
             preview.text.length > (options.maxProposal ?? 10_000))
             content = { ...content, text: "Review this action in Toolroll." };

package/dist/cli-http.d.ts

@@ -3,6 +3,7 @@ import type { Store } from './store.js';
 import type { Principal } from './operate.js';
 import { type RemoteCommandLookup } from './remote-command.js';
 import { type Admission, type BudgetLimit } from './request-budget.js';
+import type { SessionRunner } from './session-remote.js';
 /**
  * `POST /api/cli` (remote CLI, Phase 1): a teammate's laptop sends the argv it would have run locally, and the central
  * server runs that same command as that person. There is no per-resource API here and no second policy: the transport
@@ -11,6 +12,10 @@ import { type Admission, type BudgetLimit } from './request-budget.js';
  *
  * Only `Authorization: Bearer so_…` is accepted — never a password, cookie or the owner's saved login — and a request
  * carrying a browser Origin is refused, so a page can never drive it.
+ *
+ * `session …` (D7) is the one command the server answers through its own owner rather than runOperateAs: native
+ * session operations need the server's live coding workspace (session-remote.ts). They are admitted, budgeted and
+ * refused here exactly like every other command.
  */
 /** Who a remote command runs as, and the runner: operate.ts's own types, so a change there breaks this build instead of
  * drifting. Type-only: the value is loaded lazily through `run` (operate.ts imports the server that imports this). */
@@ -45,6 +50,8 @@ export type CliHttpOptions = {
     modeOf?: RemoteCommandLookup | undefined;
     /** The token's request budget (request-budget.ts), charged once per request before its body is read. */
     admit?: ((principal: Principal) => Admission) | undefined;
+    /** Native session operations (`session …`), run by the server's session owner; absent where none is ready. */
+    session?: SessionRunner | undefined;
     store: Store;
 };
 /** Decode the request's shape and byte limits. The endpoint checks file references against its command policy. */

package/dist/cli-http.js

@@ -1,6 +1,7 @@
 import { adapterPolicy } from "./server/route-policy.js";
 import { contractRow, fileArguments, STEP_UP_MESSAGE } from './remote-command.js';
 import { limitWords } from './request-budget.js';
+import { TOKEN_REPLACEMENT } from './password-bearer.js';
 /** Inlined file contents, summed as UTF-8 bytes. */
 export const CLI_FILES_BYTES = 256 * 1024;
 /** The whole JSON body: the files plus argv and JSON escaping headroom. */
@@ -8,11 +9,15 @@ export const CLI_REQUEST_BYTES = 2 * CLI_FILES_BYTES;
 const ARGV_MAX = 256;
 const ARG_BYTES = 16 * 1024;
 const FILES_MAX = 16;
+/** What a missing or unusable token hears: how to get one, and how to save it. */
+const SIGN_IN = `Sign in with an API token: ${TOKEN_REPLACEMENT.charAt(0).toLowerCase()}${TOKEN_REPLACEMENT.slice(1)}, then toolroll connect <origin> --token-stdin.`;
 function send(response, status, value, headers = {}) {
     if (response.destroyed || response.writableEnded)
         return;
-    response.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store', 'x-content-type-options': 'nosniff', ...headers });
-    response.end(JSON.stringify(value));
+    // A declared length: the client can tell a complete answer from a cut-off one.
+    const text = JSON.stringify(value);
+    response.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'content-length': String(Buffer.byteLength(text)), 'cache-control': 'no-store', 'x-content-type-options': 'nosniff', ...headers });
+    response.end(text);
 }
 async function body(request) {
     const chunks = [];
@@ -83,7 +88,7 @@ export async function handleCliHttp(request, response, options) {
     if (names.includes('cookie'))
         return reject(400, 'cookie-refused', 'Remote commands sign in with an API token only.');
     if (!/^Bearer so_\S+$/.test(request.headers.authorization ?? ''))
-        return reject(401, 'unauthenticated', 'Sign in with your API token: toolroll connect <origin> --token-stdin.');
+        return reject(401, 'unauthenticated', SIGN_IN);
     if (request.headers['content-type']?.split(';')[0]?.trim() !== 'application/json')
         return reject(415, 'invalid-content-type', 'Send application/json.');
     if (Number(request.headers['content-length'] ?? 0) > CLI_REQUEST_BYTES)
@@ -96,7 +101,7 @@ export async function handleCliHttp(request, response, options) {
         return reject(503, 'authentication-unavailable', 'Sign-in could not be checked.');
     }
     if (!principal)
-        return reject(401, 'unauthenticated', 'This API token is not valid (expired, revoked or its person removed).');
+        return reject(401, 'unauthenticated', `This API token is not valid (expired, revoked or its person removed). ${TOKEN_REPLACEMENT}.`);
     // Counted once here, however long the command then holds the request (a task wait is one request).
     const admitted = options.admit === undefined ? { ok: true } : options.admit(principal);
     if (!admitted.ok && admitted.status === 503)
@@ -118,6 +123,8 @@ export async function handleCliHttp(request, response, options) {
     const parsed = cliRequest(value);
     if ('problem' in parsed)
         return reject(parsed.tooLarge ? 413 : 400, 'invalid-request', parsed.problem);
+    if (parsed.argv[0] === 'session')
+        return runSession(response, options, principal, parsed);
     const row = (options.modeOf ?? contractRow)(parsed.argv);
     if (row?.mode === 'step-up')
         return reject(403, 'step-up', STEP_UP_MESSAGE);
@@ -154,3 +161,22 @@ export async function handleCliHttp(request, response, options) {
     send(response, 200, { exitCode, stdout: out.join(''), stderr: '' });
     return true;
 }
+/** `session …`: the prompt is the request's one file; the session owner answers one session envelope on stdout. */
+async function runSession(response, options, principal, parsed) {
+    const refuse = (status, code, message) => { send(response, status, { ok: false, code, message }); return true; };
+    if (options.session === undefined)
+        return refuse(501, 'remote-unavailable', 'This server cannot run session commands. Update it, or use the console.');
+    const at = parsed.argv.indexOf('--file'), file = at < 0 ? undefined : parsed.argv[at + 1];
+    if (Object.keys(parsed.files).some(path => path !== file))
+        return refuse(400, 'invalid-request', 'Each file must name a declared input file argument.');
+    const out = [];
+    let exitCode;
+    try {
+        exitCode = await options.session(principal, parsed.argv, parsed.files, line => { out.push(`${line}\n`); });
+    }
+    catch {
+        return refuse(500, 'command-failed', 'The command stopped unexpectedly on the server. Check its state before running it again.');
+    }
+    send(response, 200, { exitCode, stdout: out.join(''), stderr: '' });
+    return true;
+}

package/dist/cli.js

@@ -424,7 +424,8 @@ async function dispatch(argv, write, mainOptions) {
     if (first === "session") {
         // D5: native coding sessions are deprecated. They still run this release; each use says so once, on stderr.
         (mainOptions.session?.stderr ?? (line => process.stderr.write(`${line}\n`)))(deprecationWarning(`session ${rest.find(arg => !arg.startsWith("-")) ?? ""}`.trim(), "session"));
-        return runSessionCommand(rest, write, mainOptions.session);
+        // D7: it runs on the saved connection over /api/cli, signed in with that profile's API token.
+        return runSessionCommand(rest, write, { ...(mainOptions.remote ?? mainOptions.team), ...mainOptions.session });
     }
     if (first === "demo")
         return runDemoCommand(rest, write);

package/dist/contract-changes.d.ts

@@ -0,0 +1,52 @@
+/**
+ * The mechanical difference between two sets of contract terms — a task's goal, exclusions, touches and acceptance
+ * rubric. Pure and import-light, so both the planner's source (planner-source.ts) and scope filing (scope.ts, which
+ * restarts planning when the terms truly change) read the same comparison.
+ */
+import type { AcceptanceCriterion, EvidenceKind } from "./scope.js";
+/** The four contract fields a planner may propose to amend. */
+export type ContractTerms = {
+    goal: string;
+    outOfScope: string | null;
+    touches: string[];
+    acceptance: AcceptanceCriterion[];
+};
+export type ContractChange = {
+    field: "goal";
+    kind: "changed";
+    before: string;
+    after: string;
+} | {
+    field: "outOfScope";
+    kind: "added" | "removed" | "changed";
+    before: string | null;
+    after: string | null;
+} | {
+    field: "touches";
+    kind: "added" | "removed";
+    path: string;
+} | {
+    field: "acceptance";
+    kind: "added" | "removed" | "changed";
+    id: string;
+    before: {
+        statement: string;
+        evidence: EvidenceKind[];
+        how: string | null;
+    } | null;
+    after: {
+        statement: string;
+        evidence: EvidenceKind[];
+        how: string | null;
+    } | null;
+    /** For `changed`: which parts moved. `how` is advisory and unsigned,
+     * but a planner rewriting it is still a change the operator sees. */
+    moved: ("statement" | "evidence" | "how")[];
+};
+/**
+ * Every addition, change, and removal between the filed contract and a
+ * proposed one. Whitespace at the ends and touch/evidence order do not
+ * count (the scope digest ignores them too); everything else does,
+ * including the advisory `how`, because the operator wrote it.
+ */
+export declare function contractChangesOf(filed: ContractTerms, proposed: ContractTerms): ContractChange[];

package/dist/contract-changes.js

@@ -0,0 +1,61 @@
+const trimmed = (text) => {
+    if (text === null)
+        return null;
+    const t = text.trim();
+    return t === "" ? null : t;
+};
+/**
+ * Every addition, change, and removal between the filed contract and a
+ * proposed one. Whitespace at the ends and touch/evidence order do not
+ * count (the scope digest ignores them too); everything else does,
+ * including the advisory `how`, because the operator wrote it.
+ */
+export function contractChangesOf(filed, proposed) {
+    const changes = [];
+    if (filed.goal.trim() !== proposed.goal.trim()) {
+        changes.push({ field: "goal", kind: "changed", before: filed.goal, after: proposed.goal });
+    }
+    const filedOut = trimmed(filed.outOfScope);
+    const proposedOut = trimmed(proposed.outOfScope);
+    if (filedOut !== proposedOut) {
+        changes.push({
+            field: "outOfScope",
+            kind: filedOut === null ? "added" : proposedOut === null ? "removed" : "changed",
+            before: filed.outOfScope,
+            after: proposed.outOfScope,
+        });
+    }
+    const filedTouches = new Set(filed.touches.map(one => one.trim()).filter(one => one !== ""));
+    const proposedTouches = new Set(proposed.touches.map(one => one.trim()).filter(one => one !== ""));
+    for (const path of filedTouches)
+        if (!proposedTouches.has(path))
+            changes.push({ field: "touches", kind: "removed", path });
+    for (const path of proposedTouches)
+        if (!filedTouches.has(path))
+            changes.push({ field: "touches", kind: "added", path });
+    const criterionOf = (one) => ({ statement: one.statement, evidence: [...one.evidence].sort(), how: one.how });
+    const filedById = new Map(filed.acceptance.map(one => [one.id, one]));
+    const proposedById = new Map(proposed.acceptance.map(one => [one.id, one]));
+    for (const [id, before] of filedById) {
+        const after = proposedById.get(id);
+        if (after === undefined) {
+            changes.push({ field: "acceptance", kind: "removed", id, before: criterionOf(before), after: null, moved: [] });
+            continue;
+        }
+        const moved = [];
+        if (before.statement.trim() !== after.statement.trim())
+            moved.push("statement");
+        if ([...before.evidence].sort().join(",") !== [...after.evidence].sort().join(","))
+            moved.push("evidence");
+        if (trimmed(before.how) !== trimmed(after.how))
+            moved.push("how");
+        if (moved.length > 0) {
+            changes.push({ field: "acceptance", kind: "changed", id, before: criterionOf(before), after: criterionOf(after), moved });
+        }
+    }
+    for (const [id, after] of proposedById) {
+        if (!filedById.has(id))
+            changes.push({ field: "acceptance", kind: "added", id, before: null, after: criterionOf(after), moved: [] });
+    }
+    return changes;
+}

package/dist/coordinator.d.ts

@@ -2,7 +2,8 @@
  * The coordinator principal (MCP gateway spec v6; DESIGN.md §9b).
  *
  * A coordinator is the ONE credential the MCP surface accepts: minted by
- * an operator password ceremony, hashed at rest, repo-scoped at the mint,
+ * an operator password ceremony, hashed at rest (a `credential` row of kind
+ * 'coordinator', v118: the shared codec and table), repo-scoped at the mint,
  * rate-limited, revocable — and able to do exactly one thing: file a
  * proposal through the canonical door. What it files is an ordinary
  * UNAPPROVED task; admission is the operator's existing scope ceremony,

package/dist/coordinator.js

@@ -2,7 +2,8 @@
  * The coordinator principal (MCP gateway spec v6; DESIGN.md §9b).
  *
  * A coordinator is the ONE credential the MCP surface accepts: minted by
- * an operator password ceremony, hashed at rest, repo-scoped at the mint,
+ * an operator password ceremony, hashed at rest (a `credential` row of kind
+ * 'coordinator', v118: the shared codec and table), repo-scoped at the mint,
  * rate-limited, revocable — and able to do exactly one thing: file a
  * proposal through the canonical door. What it files is an ordinary
  * UNAPPROVED task; admission is the operator's existing scope ceremony,
@@ -14,7 +15,8 @@
  * the exported-cast mistake is named in the spec and not repeated here.
  * Steering and every operator-speech surface cannot accept this type.
  */
-import { createHash, randomBytes } from "node:crypto";
+import { createHash } from "node:crypto";
+import { hashSecret, mintCredential } from "./api-tokens.js";
 import { canonicalRepos } from "./runner.js";
 import { fileTaskProposal } from "./proposal.js";
 import { describeScope } from "./scope.js";
@@ -27,18 +29,7 @@ function verified(row) {
     return row;
 }
 const NAME = /^[a-z0-9-]{1,32}$/;
-const CID_ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789";
 const KEY = /^[\x21-\x7e]{8,64}$/;
-function hashSecret(token) {
-    return createHash("sha256").update(token, "utf8").digest("hex");
-}
-function mintCid() {
-    const bytes = randomBytes(12);
-    let cid = "";
-    for (const b of bytes)
-        cid += CID_ALPHABET[b % CID_ALPHABET.length];
-    return cid;
-}
 export function mintCoordinator(store, input) {
     const days = input.days ?? 90;
     if (!Number.isInteger(days) || days < 1 || days > 365)
@@ -53,15 +44,16 @@ export function mintCoordinator(store, input) {
     if (input.repos.length === 0)
         return { ok: false, reason: "no-repos" };
     const repos = canonicalRepos(input.repos);
-    const token = (input.newToken ?? (() => randomBytes(32).toString("base64url")))();
+    const token = (input.newToken ?? (() => mintCredential("coordinator").token))();
     return store.transact(() => {
         for (let attempt = 0; attempt < 5; attempt += 1) {
-            const cid = (input.newCid ?? mintCid)();
+            const cid = (input.newCid ?? (() => mintCredential("coordinator").id))();
             try {
+                // Its generation: which coordinator of this name it is (revoke-and-remint keeps the earlier one's history apart).
                 store.handle
-                    .prepare(`INSERT INTO coordinator_credential (cid, name, credential_hash, repos, per_hour, created_by, created_at, expires_at)
-             VALUES (?, ?, ?, ?, ?, ?, ?, ?)`)
-                    .run(cid, name, hashSecret(token), JSON.stringify(repos), perHour, input.by, input.now.toISOString(), expiresAt);
+                    .prepare(`INSERT INTO credential (id, kind, public_id, account, name, secret_hash, access, projects_json, per_hour, created_by, created_at, expires_at, generation)
+             VALUES (?, 'coordinator', ?, ?, ?, ?, 'act', ?, ?, ?, ?, ?, 1 + (SELECT count(*) FROM credential WHERE kind = 'coordinator' AND name = ?))`)
+                    .run(cid, cid, input.by, name, hashSecret(token), JSON.stringify(repos), perHour, input.by, input.now.toISOString(), expiresAt, name);
                 return { ok: true, cid, token, repos };
             }
             catch (error) {
@@ -81,9 +73,8 @@ export function mintCoordinator(store, input) {
  * the stored hash; the caller re-runs this INSIDE any mutating
  * transaction (the startup check is a courtesy; the txn check is law). */
 export function authenticateCoordinator(store, token) {
-    const row = store.handle
-        .prepare("SELECT * FROM coordinator_credential WHERE credential_hash = ?")
-        .get(hashSecret(token));
+    const found = store.presentedCredential(token);
+    const row = found?.kind === "coordinator" ? store.handle.prepare("SELECT * FROM credential WHERE id = ? AND kind = 'coordinator'").get(found.id) : undefined;
     if (row === undefined)
         return { ok: false, reason: "unknown" };
     if (row["revoked_at"] !== null)
@@ -94,23 +85,23 @@ export function authenticateCoordinator(store, token) {
     return {
         ok: true,
         who: verified({
-            cid: String(row["cid"]),
+            cid: String(row["id"]),
             name: String(row["name"]),
-            repos: JSON.parse(String(row["repos"])),
+            repos: JSON.parse(String(row["projects_json"])),
             perHour: Number(row["per_hour"]),
         }),
     };
 }
 export function revokeCoordinator(store, cid, by, now) {
     return store.transact(() => {
-        const row = store.handle.prepare("SELECT revoked_at FROM coordinator_credential WHERE cid = ?").get(cid);
+        const row = store.handle.prepare("SELECT revoked_at FROM credential WHERE id = ? AND kind = 'coordinator'").get(cid);
         if (row === undefined)
             return { ok: false, reason: "unknown" };
         if (row["revoked_at"] !== null)
             return { ok: false, reason: "already-revoked" };
         store.handle
-            .prepare("UPDATE coordinator_credential SET revoked_at = ? WHERE cid = ?")
-            .run(now.toISOString(), cid);
+            .prepare("UPDATE credential SET revoked_at = ?, revoked_by = ? WHERE id = ? AND kind = 'coordinator'")
+            .run(now.toISOString(), by, cid);
         // The revocation event rides the SAME transaction as the state change,
         // and the credential's pending proposals expire with it (mate arc v3).
         store.handle
@@ -122,13 +113,13 @@ export function revokeCoordinator(store, cid, by, now) {
 }
 export function listCoordinators(store) {
     return store.handle
-        .prepare(`SELECT c.*, (SELECT MAX(e.created_at) FROM coordinator_event e WHERE e.cid = c.cid AND e.kind = 'filed') AS last_filed
-         FROM coordinator_credential c ORDER BY c.created_at, c.cid`)
+        .prepare(`SELECT c.*, (SELECT MAX(e.created_at) FROM coordinator_event e WHERE e.cid = c.id AND e.kind = 'filed') AS last_filed
+         FROM credential c WHERE c.kind = 'coordinator' ORDER BY c.created_at, c.id`)
         .all()
         .map(row => ({
-        cid: String(row["cid"]),
+        cid: String(row["id"]),
         name: String(row["name"]),
-        repos: JSON.parse(String(row["repos"])),
+        repos: JSON.parse(String(row["projects_json"])),
         perHour: Number(row["per_hour"]),
         createdBy: String(row["created_by"]),
         createdAt: String(row["created_at"]),
@@ -253,7 +244,7 @@ export function fileCoordinatorProposal(store, token, input, now) {
                     ],
                 }),
             ...(input.deliverable === undefined ? {} : { deliverable: input.deliverable }),
-            filedVia: `mcp:${who.name}`, filedBy: { name: store.handle.prepare("SELECT created_by FROM coordinator_credential WHERE cid = ?").get(who.cid)?.["created_by"] ?? null, kind: "coordinator" },
+            filedVia: `mcp:${who.name}`, filedBy: { name: store.handle.prepare("SELECT created_by FROM credential WHERE id = ? AND kind = 'coordinator'").get(who.cid)?.["created_by"] ?? null, kind: "coordinator" },
             admittedRepos: who.repos,
         }, now);
         if (!made.ok)

package/dist/decision.d.ts

@@ -43,6 +43,10 @@ export declare const LIMITS: {
 };
 /** Bytes an operator's note may occupy — the UTF-8 backstop under LIMITS.note. */
 export declare const NOTE_BYTE_CAP: 16000;
+/** Why a question closed without an answer (v119), in plain words. */
+export declare function closedQuestionReason(reason: "scope-changed" | "cancelled"): string;
+/** The same, said once on one line wherever its answer would show. */
+export declare function closedQuestionWords(reason: "scope-changed" | "cancelled"): string;
 /**
  * The one validator every note passes — before a draft persists AND inside
  * the answer CAS, which stays the final gate. Trims, then refuses empty,

package/dist/decision.js

@@ -25,6 +25,14 @@ export const LIMITS = {
 };
 /** Bytes an operator's note may occupy — the UTF-8 backstop under LIMITS.note. */
 export const NOTE_BYTE_CAP = TEXT_LIMITS.noteBytes;
+/** Why a question closed without an answer (v119), in plain words. */
+export function closedQuestionReason(reason) {
+    return reason === "scope-changed" ? "The scope changed, so planning started again." : "The task was cancelled.";
+}
+/** The same, said once on one line wherever its answer would show. */
+export function closedQuestionWords(reason) {
+    return `Closed without an answer. ${closedQuestionReason(reason)}`;
+}
 /**
  * Unicode that reorders or breaks lines invisibly: bidi controls and the
  * line/paragraph separators. A note carrying these can spoof what a

package/dist/deploy-lock.d.ts

@@ -0,0 +1,8 @@
+/** Separate from orders.db: no live writer is reserved while deployment drains or backs up.
+ * SQLite owns the OS lock until close/process death, including SIGKILL. Never unlink this file:
+ * replacing its inode would let two contenders hold different locks for the same journal. */
+export type DeploymentLock = {
+    assertHeld(journalFile: string): void;
+    release(): void;
+};
+export declare function acquireDeploymentLock(journalFile: string, waitMs?: number): DeploymentLock;

package/dist/deploy-lock.js

@@ -0,0 +1,45 @@
+import { createRequire } from "node:module";
+import { closeSync, constants, lstatSync, openSync, realpathSync } from "node:fs";
+import { dirname, join, basename } from "node:path";
+const canonical = (file) => join(realpathSync(dirname(file)), basename(file));
+export function acquireDeploymentLock(journalFile, waitMs = 5000) {
+    if (!Number.isInteger(waitMs) || waitMs < 0 || waitMs > 5000)
+        throw Error("Invalid deployment lock wait.");
+    const journal = canonical(journalFile), file = `${journal}.lock.sqlite`;
+    // Only create a missing file. On POSIX, closing ANY independently opened descriptor
+    // for an existing inode can drop this process's fcntl lock, even another connection's.
+    // Let SQLite manage all descriptors for an existing coordination file.
+    try {
+        const fd = openSync(file, constants.O_CREAT | constants.O_EXCL | constants.O_RDWR | constants.O_NOFOLLOW, 0o600);
+        closeSync(fd);
+    }
+    catch (error) {
+        if (error.code !== "EEXIST")
+            throw error;
+    }
+    if (!lstatSync(file).isFile())
+        throw Error(`Unexpected deployment lock: ${file}`);
+    // Lazy, as elsewhere in the CLI: merely importing the help must not load SQLite.
+    const { DatabaseSync } = createRequire(import.meta.url)("node:sqlite");
+    const db = new DatabaseSync(file);
+    try {
+        db.exec(`PRAGMA busy_timeout=${waitMs}; BEGIN EXCLUSIVE`);
+    }
+    catch (cause) {
+        db.close();
+        throw new Error(`Deployment is busy or its lock is unavailable: ${journal}. Let it finish, then retry.`, { cause });
+    }
+    let held = true;
+    return {
+        assertHeld(expected) {
+            if (!held || canonical(expected) !== journal)
+                throw Error("The deployment journal lock is not held.");
+        },
+        release() {
+            if (!held)
+                return;
+            db.close();
+            held = false;
+        },
+    };
+}

package/dist/desktop-update.d.ts

@@ -94,6 +94,7 @@ export declare function prepareDesktopUpdate(stateDir: string, installed: string
 export declare function sqliteLock(file: string, busyTimeoutMs?: number): DatabaseSync | null;
 export declare const installationLock: (j: UpdateJournal) => DatabaseSync | null;
 export declare function desktopUpdateStatus(stateDir: string): {
+    version?: never;
     active: boolean;
     phase: string;
     detail: string;
@@ -107,7 +108,6 @@ export declare function desktopUpdateStatus(stateDir: string): {
     wasRunning?: never;
     backupPath?: never;
     updateId?: never;
-    version?: never;
     buildId?: never;
     workDir?: never;
 } | {

package/dist/dispatch.js

@@ -319,7 +319,7 @@ export function diagnoseTaskDispatch(store, taskId, now, readableRepos = null) {
         // this is where the task page says so.
         const sourceProblem = plannerSourceProblemOf(store, taskId);
         if (sourceProblem !== null)
-            return answer("planner-source", "waiting", "The filed request cannot be planned as filed", sourceProblem, { action: "write-scope", role });
+            return answer("planner-source", "waiting", sourceProblem.title, sourceProblem.detail, { action: "write-scope", role });
         return answer("planning-ready", "retrying", "Planner ready", "An eligible worker can draft the scope on the next pass.", { role });
     }
     if (role === "scout")

package/dist/export.js

@@ -33,7 +33,7 @@ const SECRET_TABLES = new Set(["web_session", "ceremony_nonce", "chat_pair", "oa
 const DERIVED_TABLE = /^(sqlite_|memory_search)/;
 /** Columns that hold a secret (or what stands in for one): never exported. */
 const SECRET_COLUMNS = new Set([
-    "api_token.secret_hash", "lead_credential.secret_hash", "approver.credential_hash", "coordinator_credential.credential_hash", "runner.credential_hash", "invite.token_hash",
+    "credential.secret_hash", "approver.credential_hash", "runner.credential_hash", "invite.token_hash",
     "flow_trigger.hook_hash", "push_subscription.endpoint", "push_subscription.p256dh", "push_subscription.auth",
     "chat_turn.credential_key", "lead_session.credential_key", "mate_turn.credential_key", "chat_runtime.push_url", "workflow_preview.token",
     "quota.credential_fp", "oauth_grant.renew_hash", "oauth_client.source_hash",
@@ -56,7 +56,7 @@ export function categoryOf(table) {
         [/^subagent/, "subagents"],
         [/^(flow|workflow_)/, "flows"],
         [/^(chat_|lead_|team_|notification|push_)/, "chats"],
-        [/^(approver|api_token|lead_credential|invite|sso_identity|coordinator_|oauth_)/, "people"],
+        [/^(approver|credential$|invite|sso_identity|coordinator_|oauth_)/, "people"],
         [/^(run|artifact|claim|worktree$|execution_slot|criterion_review|diff_comment|proof_|review_request|repair_chain|incident|publication$|merge_|side_spend|knowledge_snapshot|learning_snapshot|skill_snapshot)/, "runs"],
         [/^(task|hold$|plan_|scope_|tool_seal|decision|external_|skill_test)/, "tasks"],
         [/^(project|approval_policy|capability|verify_command|worktree_setup|backend_grant|intake_grant|publication_grant|operating_mode|knowledge_|learning_|memory_|skill_)/, "projects"],

package/dist/lead-cli.js

@@ -1,4 +1,5 @@
 import { configureLeadFollow, leadFollowStatus } from './lead-follow.js';
+import { closedQuestionWords } from "./decision.js";
 /**
  * `toolroll chat` (mate arc §6): the same thread the console shows,
  * driven from a terminal. The password is typed once — it mints the lead
@@ -45,6 +46,8 @@ export function answerContextLines(store, payload) {
     const decision = id === null ? null : store.getDecision(id);
     if (decision === null)
         return ["     (the decision is gone)"];
+    if (decision.supersededReason !== null)
+        return [`     ${decision.question}`, `     ${closedQuestionWords(decision.supersededReason)}`];
     const pick = typeof payload["option"] === "string" ? payload["option"] : "";
     return [
         `     ${decision.question}${decision.state !== "open" ? ` [${decision.state}]` : ""}`,

package/dist/lead-doors.js

@@ -14,6 +14,7 @@ import { executeSharedAction, sharedActionPayload, sharedActionAllowsChallenge,
  * scope was rewritten, the decision answered) is a refusal, never a
  * silent re-read.
  */
+import { closedQuestionWords } from "./decision.js";
 import { isCheckLevel, setTaskCheckLevel } from "./check-levels.js";
 import { leadTurnKeepsProposals, verifiedAuthor } from "./store.js";
 import { isVerifiedApprover, reproveApprover } from "./principal.js";
@@ -317,6 +318,8 @@ function executeProposal(store, actor, kind, payload, now, options) {
             return refuse("stale", "that option no longer exists on the decision");
         // The proposal contract is "open": a decision past its deadline — swept
         // or not — is not answered through a card (v3 review, finding 7).
+        if (decision.supersededReason !== null)
+            return refuse("stale", closedQuestionWords(decision.supersededReason));
         if (decision.state === "answered")
             return refuse("already-answered", "already answered — somebody got there first");
         if (decision.state !== "open" || (decision.deadline !== null && Date.parse(decision.deadline) <= now.getTime())) {

package/dist/lead-tools.js

@@ -284,12 +284,13 @@ export function decisionOver(store, repos, decisionId, now) {
         return null;
     // "Open" is derived, not stored (v3 review, finding 7): a decision past
     // its deadline is expired here whether or not the sweep has run.
-    const state = decision.state === "open" && decision.deadline !== null && Date.parse(decision.deadline) <= now.getTime() ? "expired" : decision.state;
+    const state = decision.supersededReason !== null ? "closed" : decision.state === "open" && decision.deadline !== null && Date.parse(decision.deadline) <= now.getTime() ? "expired" : decision.state;
     return {
         repoIndex,
         decision: decision.id,
         task: ref.externalId,
         state,
+        ...(decision.supersededReason === null ? {} : { closedBecause: decision.supersededReason }),
         question: decision.question,
         options: decision.options.map(one => ({ id: one.id, label: one.label, reversible: one.reversible, consequence: one.consequence })),
         ageHours: Math.max(0, Math.round((now.getTime() - Date.parse(decision.createdAt)) / 3_600_000)),

package/dist/mcp-http.js

@@ -1,6 +1,6 @@
 import { adapterPolicy } from "./server/route-policy.js";
 import { PACKAGE_VERSION } from "./version.js";
-import { parseApiToken, secretMatches, tokenLive, tokenProjects } from "./api-tokens.js";
+import { tokenLive, tokenProjects } from "./api-tokens.js";
 import { oauthProjects, oauthTokenAllowed, RESOURCE_PATH } from "./mcp-oauth.js";
 import { authenticateCoordinator } from "./coordinator.js";
 import { LEGACY, MAX_REQUEST, META_CAPABILITIES, META_SERVER, META_VERSION, MODERN, TOOLS, UNSUPPORTED_VERSION, callCoordinatorTool, capabilitiesShape, readMessage, shapeResult, toolsPayload, } from "./mcp-core.js";
@@ -26,10 +26,10 @@ export function createMcpHttp(options) {
         if (presented.startsWith("so_")) {
             if (!options.signedIn(request))
                 return null;
-            const parsed = parseApiToken(presented);
-            const kept = parsed === null ? null : store.apiTokenSecret(parsed.id);
-            // The secret is checked here too, so this door never rests on how signedIn reads the request.
-            if (parsed === null || kept === null || !secretMatches(parsed.secret, kept.secretHash))
+            // The secret is checked here too (the one credential check), so this door never rests on how signedIn reads the request.
+            const found = store.presentedCredential(presented);
+            const kept = found?.kind === "person" ? store.apiTokenSecret(found.id) : null;
+            if (kept === null)
                 return null;
             if (!tokenLive(kept.row, options.clock().getTime()))
                 return null;