tickmarkr 2.8.2 → 2.8.3

package/dist/adapters/qwen.d.ts

@@ -1,6 +1,6 @@
 import { type ClassifiedWorkerResult } from "./prompt.js";
 import { type WorkerAdapter } from "./types.js";
 export declare const QWEN_VERSION_IDENTITY: RegExp;
-export declare const QWEN_HARNESS_BANNER_ROWS: readonly ["⚠ SAFE MODE — all customizations disabled (hooks, extensions, skills, MCP servers, QWEN.md). Restart without --safe-mode to resume normal operation.", "Warning: running headless with --yolo / approval-mode=yolo and no sandbox. All tool calls (shell, write, edit) auto-execute at this process's privilege level. Enable a sandbox via --sandbox / QWEN_SANDBOX, or set QWEN_CODE_SUPPRESS_YOLO_WARNING=1 to silence this notice."];
+export declare const QWEN_HARNESS_BANNER_ROWS: readonly ["⚠ SAFE MODE — all customizations disabled (hooks, extensions, skills, MCP servers, QWEN.md). Restart without --safe-mode to resume normal operation.", "Warning: running headless with --yolo / approval-mode=yolo and no sandbox. All tool calls (shell, write, edit) auto-execute at this process's privilege level. Enable a sandbox via --sandbox / QWEN_SANDBOX, or set QWEN_CODE_SUPPRESS_YOLO_WARNING=1 to silence this notice.", "Warning: running headless with --yolo / approval-mode=yolo and no sandbox. All tool calls (shell, write, edit) auto-execute at this process's privilege level. Configure tools.executionSandbox on Linux or a supported legacy sandbox via --sandbox / QWEN_SANDBOX, or set QWEN_CODE_SUPPRESS_YOLO_WARNING=1 to silence this notice."];
 export declare function parseQwenResult(raw: string, nonce: string): ClassifiedWorkerResult;
 export declare const qwen: WorkerAdapter;

package/dist/adapters/qwen.js

@@ -3,12 +3,14 @@ import { parseWorkerResult } from "./prompt.js";
 import { channelsFromConfig, shq, } from "./types.js";
 export const QWEN_VERSION_IDENTITY = /^\d+\.\d+\.\d+/;
 const QWEN_SKIP_UPDATE = "QWEN_CODE_SKIP_UPDATE_CHECK_ONCE=true";
-// Verbatim stderr from tests/fixtures/qwen/safe-mode.stderr (qwen 0.21.15). These bytes are launch
-// harness, not evidence that a reviewer took a turn. Keep the declaration closed and row-shaped so
-// llm.ts can sweep partial terminal paints without a broad SAFE MODE/warning regex.
+// Verbatim stderr rows, in render order: the SAFE MODE row both recorded versions print, then the yolo
+// row of tests/fixtures/qwen/safe-mode.stderr (qwen 0.21.15) and of safe-mode-0.25.1.stderr (qwen 0.25.1).
+// These bytes are launch harness, not evidence that a reviewer took a turn. Keep the declaration closed
+// and row-shaped so llm.ts can sweep partial terminal paints without a broad SAFE MODE/warning regex.
 export const QWEN_HARNESS_BANNER_ROWS = [
     "⚠ SAFE MODE — all customizations disabled (hooks, extensions, skills, MCP servers, QWEN.md). Restart without --safe-mode to resume normal operation.",
     "Warning: running headless with --yolo / approval-mode=yolo and no sandbox. All tool calls (shell, write, edit) auto-execute at this process's privilege level. Enable a sandbox via --sandbox / QWEN_SANDBOX, or set QWEN_CODE_SUPPRESS_YOLO_WARNING=1 to silence this notice.",
+    "Warning: running headless with --yolo / approval-mode=yolo and no sandbox. All tool calls (shell, write, edit) auto-execute at this process's privilege level. Configure tools.executionSandbox on Linux or a supported legacy sandbox via --sandbox / QWEN_SANDBOX, or set QWEN_CODE_SUPPRESS_YOLO_WARNING=1 to silence this notice.",
 ];
 function decodeQwenEvents(events) {
     const text = [];

package/dist/cli/commands/approve.js

@@ -1,4 +1,5 @@
 import { graphDefinitionHash, loadGraph, saveGraph, taskDefinitionFingerprint } from "../../graph/graph.js";
+import { filesGlob } from "../../graph/files-glob.js";
 import { execFileSync } from "node:child_process";
 import { userInfo } from "node:os";
 import { allAdapters } from "../../adapters/registry.js";
@@ -242,7 +243,7 @@ export async function approve(argv, cwd = process.cwd()) {
             if (amendedFiles.length === task.files.length)
                 throw new Error("--files must extend the parked files[] revision");
             const amended = { ...graph, tasks: graph.tasks.map((t) => t.id === taskId ? { ...t, files: amendedFiles } : t) };
-            const conflicts = separabilityErrors(amended.tasks);
+            const conflicts = scopeGrantConflicts(cwd, journal, runId, taskId, amended.tasks, events);
             if (conflicts.length)
                 throw new Error(`refusing scope-request approval for ${taskId}: ${conflicts.join("\n")}`);
             // C4: a live grant may not take a task past the bounds that fail every compile. The exception
@@ -394,6 +395,110 @@ function integrationBase(events, byName) {
     const branch = String(events.find((e) => e.event === "run-start").data.branch);
     return "anchor" in anchor ? { branch, base: anchor.anchor } : { branch, base: "unknown", unreadable: anchor.unreadable };
 }
+/**
+ * Queue 169 (D-1982/D-1983/D-1986): the in-run OBS-212 check a scope-request grant runs. Only the
+ * pairs this amendment changes are judged — the requester against each unordered sibling; a pair
+ * another amendment created was judged by that grant and is never re-judged here. A sibling is
+ * exempt only when this run already merged it into the requester's branch: its replayed status is
+ * done, its NEWEST journaled merge row names a full lowercase object id, and that commit is an
+ * ancestor of the requester's task branch (the run's integration branch plus --taskId, read exactly
+ * as the failed-task recheck reads it — a marked run's branch comes from its run-start record, never
+ * the current config). Every other overlapping pair keeps the compile-time refusal, an unreadable
+ * git answer included. The surviving errors are separabilityErrors' own rows, so the refusal text
+ * and its pair order are unchanged.
+ */
+function scopeGrantConflicts(cwd, journal, runId, requesterId, tasks, events) {
+    const errors = separabilityErrors(tasks);
+    if (!errors.length)
+        return errors;
+    const pairs = separabilityPairs(tasks);
+    if (pairs.length !== errors.length)
+        return errors; // a misaligned local fold refuses everything
+    const statuses = journal.replayStatuses();
+    let taskRef;
+    const requesterRef = () => (taskRef ??= `${integrationBase(events, () => integrationBranch(loadConfig(cwd), runId)).branch}--${requesterId}`);
+    const kept = [];
+    for (let i = 0; i < errors.length; i++) {
+        const { a, b } = pairs[i];
+        const sibling = a === requesterId ? b : b === requesterId ? a : undefined;
+        if (sibling === undefined)
+            continue;
+        if (mergedSiblingExempt(cwd, events, statuses.get(sibling), sibling, requesterRef))
+            continue;
+        kept.push(errors[i]);
+    }
+    return kept;
+}
+/** A full lowercase git object id: 40 (SHA-1) or 64 (SHA-256) hex, nothing else. */
+const FULL_OBJECT_ID = /^[0-9a-f]{40}([0-9a-f]{24})?$/;
+/**
+ * The one exemption: the sibling is done in THIS run's replay and its newest merge row's commit is a
+ * full object id that is an ancestor of the requester's task branch. Any unreadable git answer — a
+ * missing requester branch, a commit the repository lacks, a failed ancestry read — is no exemption.
+ */
+function mergedSiblingExempt(cwd, events, status, siblingId, requesterRef) {
+    if (status !== "done")
+        return false;
+    const merge = [...events].reverse().find((e) => e.event === "merge" && e.taskId === siblingId);
+    const commit = typeof merge?.data.commit === "string" ? merge.data.commit : undefined;
+    if (commit === undefined || !FULL_OBJECT_ID.test(commit))
+        return false;
+    const ref = requesterRef();
+    try {
+        execFileSync("git", ["rev-parse", "--verify", ref], { cwd, stdio: "ignore" });
+        execFileSync("git", ["merge-base", "--is-ancestor", commit, ref], { cwd, stdio: "ignore" });
+    }
+    catch {
+        return false;
+    }
+    return true;
+}
+/** The conflicting unordered pairs of separabilityErrors, in its exact emission order. */
+function separabilityPairs(tasks) {
+    const byId = new Map(tasks.map((t) => [t.id, t.deps ?? []]));
+    const pairs = [];
+    for (let i = 0; i < tasks.length; i++) {
+        for (let j = i + 1; j < tasks.length; j++) {
+            const a = tasks[i], b = tasks[j];
+            if (pairReachable(a.id, byId).has(b.id) || pairReachable(b.id, byId).has(a.id))
+                continue; // ordered
+            if (pairOverlap(a.files ?? [], b.files ?? []).length > 0)
+                pairs.push({ a: a.id, b: b.id });
+        }
+    }
+    return pairs;
+}
+/** Tasks reachable from `id` through deps (transitive) — separabilityErrors' own fold. */
+function pairReachable(id, byId) {
+    const seen = new Set();
+    const stack = [...(byId.get(id) ?? [])];
+    while (stack.length) {
+        const next = stack.pop();
+        if (seen.has(next))
+            continue;
+        seen.add(next);
+        stack.push(...(byId.get(next) ?? []));
+    }
+    return seen;
+}
+/** separabilityErrors' conservative overlap: identical patterns, or a glob matching the other's literal path. */
+function pairOverlap(a, b) {
+    const hits = new Set();
+    const isGlob = (p) => /[*?[\]{}]/.test(p);
+    for (const pa of a) {
+        for (const pb of b) {
+            if (pa === pb) {
+                hits.add(pa);
+                continue;
+            }
+            if (isGlob(pa) && !isGlob(pb) && filesGlob(pa)(pb))
+                hits.add(`${pb} ⊂ ${pa}`);
+            else if (isGlob(pb) && !isGlob(pa) && filesGlob(pb)(pa))
+                hits.add(`${pa} ⊂ ${pb}`);
+        }
+    }
+    return [...hits].sort();
+}
 /** The row a decision on this task answers right now: its newest failure when failed, else its newest park. */
 function openDecision(journal, taskId) {
     const { events, sourceIndexes } = readJournalEvents(journal);

package/dist/gates/llm.d.ts

@@ -1,7 +1,7 @@
 import { type WorkerAdapter } from "../adapters/types.js";
 import type { Effort } from "../graph/schema.js";
 import { type ExecutorDriver, type Slot } from "../drivers/types.js";
-import type { SeatLaunchCause } from "../drivers/orca.js";
+import { type SeatLaunchCause } from "../drivers/orca.js";
 export declare const GATE_PANE_SEP = " \u00B7 ";
 export declare const COMPLETION_FAKING_CHECKLIST = "## Completion-faking checklist\nHunt for these concrete completion-faking shortcuts before ruling on any criterion:\n- hardcoded-result: output or fixture hardcoded to satisfy the stated criterion instead of real logic\n- test-weakening: tests skipped, deleted, or assertions loosened until failing behavior looks green\n- vacuous-assertion: a test that cannot fail (asserts a constant, asserts its own setup, no assertion)\n- fixture-overfit: implementation narrowed to the exact test inputs rather than the described behavior\n- echo-not-implement: criterion text echoed in names, comments, or strings without the behavior itself\n- stub-left-behind: TODO, throw, or no-op stub where the real implementation should be\n- error-swallowing: catch or fallback that hides failures instead of handling them\n- self-mocking: the code under test mocked or faked so the test exercises the mock\n- check-bypass: lint, type, or CI checks disabled, relaxed, or excluded to get green\n- rename-as-work: code moved or renamed and presented as the requested change\n- scope-padding: unrelated edits padding the diff while the criterion's behavior is untouched\nWhen a criterion fails, the verdict MUST name which shortcut above it matches, or state that none does.";
 /** Fable F3: per-call nonce echoed in verdict JSON and gate exit markers. */

package/dist/gates/llm.js

@@ -1,11 +1,13 @@
 import { stripVTControlCharacters } from "node:util";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { constants } from "node:buffer";
 import { randomBytes } from "node:crypto";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { matchesTrustDialog } from "../adapters/types.js";
+import { matchesTrustDialog, shq } from "../adapters/types.js";
 import { formatOwnedName, parseOwnedName } from "../drivers/types.js";
+import { CHECKOUT_MARK, checkoutProofLine } from "../drivers/orca.js";
 import { bannerShell, paneDispatchCommand, PLAIN_BANNER } from "../brand.js";
 import { sh } from "../run/git.js";
 import { harvestCpuFlatWindowMs, normalizeStallSnapshot, WorkerTreeCpuAccountant, } from "../run/stall.js";
@@ -204,6 +206,64 @@ const START_MARKER = "TICKMARKR_START_";
 const START_ROW = /^TICKMARKR_START_[\w-]+$/;
 const IDENTITY_LINE = /^(?:review\s*·|tickmarkr(?::|$))/;
 const IDENTITY_OPENERS = ["review ·", "tickmarkr"];
+// Row 135(a): the orca driver's launch preamble. create returns only once it read the complete checkout
+// frame, so every gate read holds the frame row whole — exactly checkoutProofLine's form (declared length
+// equal to half its lowercase hex, terminated) — or, as the last row, a strict prefix of that form.
+// Above it, as the first non-blank row, the shell may echo the typed launch line, which names that
+// frame's own checkout as `cd <shq checkout>`. Anything else shaped like them is the seat's. Frame rows
+// are read untrimmed: a trailing space or tab can never complete a frame or extend its prefix.
+function frameCheckout(row) {
+    const hex = /^TICKMARKR_CHECKOUT \d+:(.*);$/.exec(row)?.[1];
+    if (hex === undefined)
+        return undefined;
+    const checkout = Buffer.from(hex, "hex").toString("utf8");
+    return checkoutProofLine(checkout) === row ? checkout : undefined;
+}
+function partialFrameRow(row) {
+    if (row.length > 0 && `${CHECKOUT_MARK} `.startsWith(row))
+        return true;
+    const m = /^TICKMARKR_CHECKOUT (0|[1-9]\d*)(?::([0-9a-f]*))?$/.exec(row);
+    if (m === null || !printableFrameLength(m[1]))
+        return false;
+    return m[2] === undefined || frameHexCompletable(m[2], Number(m[1]));
+}
+// checkoutProofLine prints `TICKMARKR_CHECKOUT <n>:`, 2n hex digits and `;` as one string, so the length it
+// declares is a safe integer whose row fits the runtime's longest string. Any other length, unsafe or
+// non-finite included, is never its output, nor a prefix of one.
+function printableFrameLength(digits) {
+    const n = Number(digits);
+    return Number.isSafeInteger(n) && CHECKOUT_MARK.length + digits.length + 2 * n + 3 <= constants.MAX_STRING_LENGTH;
+}
+// A hex prefix checkoutProofLine could still extend to `bytes` bytes: valid UTF-8 so far, with its open
+// sequence closable inside the declared length. A trailing half byte is tried at each of its 16 values.
+function frameHexCompletable(hex, bytes) {
+    if (hex.length > bytes * 2)
+        return false;
+    const whole = Buffer.from(hex.slice(0, hex.length - (hex.length % 2)), "hex");
+    const candidates = hex.length % 2 === 0 ? [whole]
+        : Array.from({ length: 16 }, (_, lo) => Buffer.concat([whole, Buffer.of(parseInt(hex.at(-1), 16) * 16 + lo)]));
+    return candidates.some((c) => {
+        const owed = utf8Owed(c);
+        return owed !== undefined && owed <= bytes - c.length;
+    });
+}
+// Continuation bytes the last sequence still owes, or undefined when no continuation makes it UTF-8.
+function utf8Owed(bytes) {
+    try {
+        new TextDecoder("utf-8", { fatal: true }).decode(bytes, { stream: true });
+    }
+    catch {
+        return undefined;
+    }
+    let lead = bytes.length;
+    while (lead > 0 && bytes.length - lead < 3 && (bytes[lead - 1] & 0xc0) === 0x80)
+        lead--;
+    if (lead === 0)
+        return 0;
+    const b = bytes[lead - 1];
+    const size = b >= 0xf0 ? 4 : b >= 0xe0 ? 3 : b >= 0xc0 ? 2 : 1;
+    return Math.max(0, size - (bytes.length - lead + 1));
+}
 // Stages of the preamble walk. Each complete harness row is accepted only at or after its stage.
 const ECHO = 0, START = 1, BANNER = 2, IDENTITY = 3, SEAT = 4;
 // The char offset where the seat's own text begins, or -1 when the capture ends inside the preamble.
@@ -215,6 +275,7 @@ function seatStart(output, adapterBannerRows) {
     let bannerAt; // next banner row expected once the banner has begun
     let adapterBannerAt;
     let identitySeen = false;
+    let frameSeen = false;
     let offset = 0;
     for (let i = 0; i < rows.length; i++) {
         const row = rows[i].replace(/[ \t]+$/, "");
@@ -222,8 +283,15 @@ function seatStart(output, adapterBannerRows) {
         const last = i === rows.length - 1;
         // Complete harness rows: equality against the shape the preamble allows at this stage.
         let accepted = false;
+        const below = last ? undefined : frameCheckout(rows[i + 1]);
         if (!identitySeen && stage < SEAT && t.length === 0)
             accepted = true; // blank rows between preamble rows
+        else if (stage === ECHO && !frameSeen && frameCheckout(rows[i]) !== undefined) {
+            frameSeen = true;
+            accepted = true;
+        }
+        else if (below !== undefined && row.includes(`cd ${shq(below)}`) && rows.slice(0, i).every((r) => r.trim() === ""))
+            accepted = true; // orca launch echo
         else if (stage <= ECHO && completeEchoRow(row))
             accepted = true;
         else if (stage <= START && START_ROW.test(row)) {
@@ -239,13 +307,10 @@ function seatStart(output, adapterBannerRows) {
             bannerAt++;
             accepted = true;
         }
-        else if (stage <= IDENTITY && adapterBannerAt === undefined && adapterBannerRows.includes(row)) {
+        else if (stage <= IDENTITY && adapterBannerRows.indexOf(row, adapterBannerAt ?? 0) >= 0) {
+            // A closed list in render order: each row at most once, in list order, skipping allowed.
             stage = BANNER;
-            adapterBannerAt = adapterBannerRows.indexOf(row) + 1;
-            accepted = true;
-        }
-        else if (stage <= IDENTITY && adapterBannerAt !== undefined && row === adapterBannerRows[adapterBannerAt]) {
-            adapterBannerAt++;
+            adapterBannerAt = adapterBannerRows.indexOf(row, adapterBannerAt ?? 0) + 1;
             accepted = true;
         }
         else if (!identitySeen && stage <= IDENTITY && IDENTITY_LINE.test(t)) {
@@ -262,21 +327,20 @@ function seatStart(output, adapterBannerRows) {
         // The last row may be a partial paint: a prefix of the next harness row the preamble allows.
         if (stage <= ECHO && partialEchoRow(row))
             return -1;
+        if (stage === ECHO && !frameSeen && partialFrameRow(rows[i]))
+            return -1;
         if (stage <= START && (START_MARKER.startsWith(row) || /^TICKMARKR_START_[\w-]*$/.test(row)))
             return -1;
         if (stage <= BANNER && (bannerAt === undefined
             ? BANNER_ROWS.some((b) => b.startsWith(row))
             : BANNER_ROWS[bannerAt]?.startsWith(row) === true))
             return -1;
-        if (stage <= IDENTITY && (adapterBannerAt === undefined
-            ? adapterBannerRows.some((b) => b.startsWith(row))
-            : adapterBannerRows[adapterBannerAt]?.startsWith(row) === true))
+        if (stage <= IDENTITY && adapterBannerRows.slice(adapterBannerAt ?? 0).some((b) => b.startsWith(row)))
             return -1;
         // The identity row is painted right after the banner, so its prefix is a partial paint only there;
         // with no banner in the capture, "review" or "tick" alone is the seat's own first row.
         if (!identitySeen && stage <= IDENTITY
-            && (bannerAt === BANNER_ROWS.length
-                || (adapterBannerRows.length > 0 && adapterBannerAt === adapterBannerRows.length))
+            && (bannerAt === BANNER_ROWS.length || adapterBannerAt !== undefined)
             && IDENTITY_OPENERS.some((o) => o.startsWith(t)))
             return -1;
         return offset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",