tickmarkr 1.75.0 → 1.77.0

package/dist/adapters/kimi.d.ts

@@ -3,6 +3,11 @@ import { type Assignment, type WorkerAdapter, type WorkerResult } from "./types.
 export declare function kimiAuthed(credentialsText: string, nowMs: number): boolean;
 export declare function parseKimiModels(raw: string): string[];
 export declare function parseKimiResult(raw: string, nonce: string): WorkerResult;
+export interface KimiDoctorTurnResult {
+    ok: boolean;
+    evidence: string;
+}
+export declare function probeKimiDoctorTurn(cwd: string): Promise<KimiDoctorTurnResult>;
 export declare function kimiSessionId(output: string): string | undefined;
 export declare function kimiBannerModel(banner: string): string | undefined;
 export declare function kimiBannerSessionId(banner: string): string | undefined;

package/dist/adapters/kimi.js

@@ -64,6 +64,28 @@ export function parseKimiResult(raw, nonce) {
     const stripped = raw.split("\n").map((l) => l.replace(/^[\s]*[•*-]\s+/, "")).join("\n");
     return parseWorkerResult(stripped, nonce);
 }
+const KIMI_DOCTOR_TURN_MODEL = "kimi-code/k3";
+const KIMI_DOCTOR_TURN_PROMPT = "Reply with exactly OK and nothing else.";
+const KIMI_DOCTOR_TURN_TIMEOUT_MS = 60000;
+// OBS-141: intentionally separate from probe() so plan/run remain free file checks. Only doctor
+// calls this one-turn contract probe; its test seam stubs sh and never launches a real agent CLI.
+export async function probeKimiDoctorTurn(cwd) {
+    const command = `kimi -p ${shq(KIMI_DOCTOR_TURN_PROMPT)} --model ${shq(KIMI_DOCTOR_TURN_MODEL)} --output-format text`;
+    const r = await sh(command, cwd, KIMI_DOCTOR_TURN_TIMEOUT_MS);
+    if (r.timedOut) {
+        return { ok: false, evidence: `turn timed out after ${KIMI_DOCTOR_TURN_TIMEOUT_MS}ms` };
+    }
+    const output = `${r.stderr}\n${r.stdout}`.trim().replace(/\s+/g, " ");
+    if (r.code !== 0) {
+        return { ok: false, evidence: output || `turn exited ${r.code}` };
+    }
+    const returnedOk = r.stdout.split("\n")
+        .map((line) => line.replace(/^[\s]*[•*-]\s+/, "").trim())
+        .includes("OK");
+    return returnedOk
+        ? { ok: true, evidence: `model turn returned OK with ${KIMI_DOCTOR_TURN_MODEL}` }
+        : { ok: false, evidence: `turn returned no exact OK answer${output ? `: ${output}` : ""}` };
+}
 // v1.53 T3: session-id capture from the run-output trailer — every `kimi -p` run (fresh or resumed)
 // ends with `To resume this session: kimi -r session_<uuid>` (live probe 2026-07-18). Anchored full
 // line only: prompt/model prose can contain lookalike text, and the anchored charset keeps a
@@ -89,23 +111,20 @@ export function kimiSessionId(output) {
     }
     return id;
 }
-// v1.69 T6: the native TUI takes -m <alias>, where config.toml aliases are the bare model suffix of
-// the tickmarkr channel id (live probe 2026-07-22). Keep the mapping explicit and localized.
-function kimiAlias(model) {
-    return model.replace(/^kimi-code\//, "");
-}
 // v1.69 T7: the cold-start banner prints the model alias and session id. Parse them from the
-// banner text already captured for the readiness match — no new probe, no extra dispatch.
+// banner text already captured for the readiness match — no new probe, no extra dispatch. Kimi
+// 0.29.0 may print either the full config key or its display suffix; normalize both idempotently
+// to the full channel identifier routing uses.
 const BANNER_MODEL_RE = /^Model:\s*(.+)$/m;
 const BANNER_SESSION_RE = /^Session:\s*(session_[0-9a-f-]+)$/m;
 export function kimiBannerModel(banner) {
     const m = BANNER_MODEL_RE.exec(banner);
     if (!m)
         return undefined;
-    const alias = m[1].trim();
-    if (!alias)
+    const printedModel = m[1].trim();
+    if (!printedModel)
         return undefined;
-    return `kimi-code/${alias}`;
+    return printedModel.startsWith("kimi-code/") ? printedModel : `kimi-code/${printedModel}`;
 }
 export function kimiBannerSessionId(banner) {
     return BANNER_SESSION_RE.exec(banner)?.[1];
@@ -118,15 +137,37 @@ export function confirmKimiSeedBanner(banner, assignedModel) {
     }
     return { ok: true, sessionId: kimiBannerSessionId(banner) };
 }
-// v1.75 T1 / OBS-136: this readiness line is rendered inside Kimi Code's bordered steady-state
-// input box. The adapter owns the fingerprint; the driver only consults declarations generically.
+const kimiTuiLaunch = (model) => `kimi -y -m ${shq(model)}`;
+const KIMI_ANSI_SGR_RE = /\u001B\[[0-9;]*m/g;
+const KIMI_EDITOR_TOP_RE = /^╭─+╮$/;
+const KIMI_EDITOR_INPUT_RE = /^│ > .*│$/;
+const KIMI_EDITOR_EMPTY_RE = /^│ > +│$/;
+const KIMI_EDITOR_BOTTOM_RE = /^╰─+╯$/;
+function matchesKimiEditorBox(paneText, empty) {
+    const lines = paneText.replace(KIMI_ANSI_SGR_RE, "").split("\n");
+    const input = empty ? KIMI_EDITOR_EMPTY_RE : KIMI_EDITOR_INPUT_RE;
+    return lines.some((line, index) => input.test(line)
+        && index > 0
+        && index + 1 < lines.length
+        && KIMI_EDITOR_TOP_RE.test(lines[index - 1])
+        && KIMI_EDITOR_BOTTOM_RE.test(lines[index + 1]));
+}
+// v1.75 T1 / OBS-136: Kimi's actual editor is a three-line bordered box whose content row starts
+// `│ > `. The welcome panel separately contains "Send /help..." and is only launch-liveness
+// evidence (OBS-142), so it must never satisfy this declaration. The adapter owns the full matcher,
+// empty-state matcher, launch distinction, and bounded cold-start window; the driver stays generic.
 export const KIMI_INPUT_BOX = declareInputBox("kimi", {
-    fingerprint: "Send /help for help information.",
+    fingerprint: "│ > ",
+    match: (paneText) => matchesKimiEditorBox(paneText, false),
+    emptyMatch: (paneText) => matchesKimiEditorBox(paneText, true),
+    launchCommand: (command) => command.startsWith("kimi -y -m "),
+    readinessTimeoutMs: 15_000,
 });
 // Shared launch-then-seed surface (T6) + banner confirm (T7/T2). One definition so the adapter
 // property and the daemon's generic runInteractiveSeed path cannot drift.
 const KIMI_SEED = {
-    launch: (model) => `kimi -y -m ${shq(kimiAlias(model))}`,
+    // v1.76 T2 / OBS-141: 0.29.0 resolves only the full config.toml model key on the first turn.
+    launch: kimiTuiLaunch,
     readinessMatch: "Send /help for help information.",
     seedLine: (promptFile) => `Read ${promptFile} and do exactly what it says.`,
     confirmBanner: confirmKimiSeedBanner,

package/dist/adapters/types.d.ts

@@ -84,10 +84,15 @@ export interface TrustDialog {
 export declare function matchesTrustDialog(paneText: string, dialog: TrustDialog): boolean;
 export interface InputBox {
     fingerprint: string;
+    match?(paneText: string): boolean;
+    emptyMatch?(paneText: string): boolean;
+    launchCommand?(command: string): boolean;
+    readinessTimeoutMs?: number;
 }
 export declare function declareInputBox(adapterId: string, inputBox: InputBox): InputBox;
 export declare function declaredInputBoxForWorkerName(workerName: string): InputBox | undefined;
 export declare function matchesInputBox(paneText: string, inputBox: InputBox): boolean;
+export declare function matchesEmptyInputBox(paneText: string, inputBox: InputBox): boolean;
 export interface WorkerAdapter {
     id: string;
     vendor: string;

package/dist/adapters/types.js

@@ -40,7 +40,10 @@ export function declaredInputBoxForWorkerName(workerName) {
     return adapterId === undefined ? undefined : inputBoxes.get(adapterId);
 }
 export function matchesInputBox(paneText, inputBox) {
-    return paneText.includes(inputBox.fingerprint);
+    return inputBox.match?.(paneText) ?? paneText.includes(inputBox.fingerprint);
+}
+export function matchesEmptyInputBox(paneText, inputBox) {
+    return inputBox.emptyMatch?.(paneText) === true;
 }
 export function channelsFromConfig(adapterId, cfg) {
     const e = cfg.tiers[adapterId];

package/dist/cli/commands/doctor.d.ts

@@ -1,5 +1,7 @@
 import type { WorkerAdapter } from "../../adapters/types.js";
+import { type KimiDoctorTurnResult } from "../../adapters/kimi.js";
 export type DoctorOpts = {
     banner?: boolean;
+    kimiTurnProbe?: (cwd: string) => Promise<KimiDoctorTurnResult>;
 };
 export declare function doctor(_argv: string[], cwd?: string, adapters?: WorkerAdapter[], opts?: DoctorOpts): Promise<string>;

package/dist/cli/commands/doctor.js

@@ -6,6 +6,7 @@ import { tickmarkrDir, stateDirName } from "../../graph/graph.js";
 import { declaredModelWindow, hasWindowsConfig, modelLints, suggestOverlay, ttyVisual } from "../../adapters/model-lints.js";
 import { DEFAULT_CONFIG, loadConfig, overlayPreferShapes } from "../../config/config.js";
 import { HerdrDriver } from "../../drivers/herdr.js";
+import { kimi, probeKimiDoctorTurn } from "../../adapters/kimi.js";
 import { denyPreferCollisionLine, denyPreferCollisions, disallowedBy, excludedChannels, exclusionLine, preferRanks } from "../../route/preference.js";
 const visual = () => process.stdout.isTTY === true && process.env.NO_COLOR === undefined;
 const alignedStatusRow = (verdict, key, value) => `  ${statusRow(verdict, kvRow(key, value).slice(2))}`;
@@ -20,6 +21,26 @@ export async function doctor(_argv, cwd = process.cwd(), adapters = allAdapters(
     console.error("probing installed agent CLIs — one short LLM call per configured model, may take a minute...");
     const probeProgressTTY = process.stderr.isTTY === true;
     const health = await probeAll(adapters, { cwd });
+    const kimiAdapter = adapters.find((a) => a.id === kimi.id);
+    const kimiTurnEnabled = kimiAdapter !== undefined
+        && (kimiAdapter === kimi || opts.kimiTurnProbe !== undefined);
+    if (kimiTurnEnabled) {
+        const h = health.kimi;
+        if (h.installed && h.authed) {
+            let turn;
+            try {
+                turn = await (opts.kimiTurnProbe ?? probeKimiDoctorTurn)(cwd);
+            }
+            catch (e) {
+                turn = { ok: false, evidence: e instanceof Error ? e.message : String(e) };
+            }
+            health.kimi = {
+                ...h,
+                authed: turn.ok,
+                note: `${h.note ? `${h.note}; ` : ""}${turn.ok ? turn.evidence : `model turn failed: ${turn.evidence}`}`,
+            };
+        }
+    }
     // MODEL-02: detect models where the adapter exposes a list surface, BEFORE writing doctor.json (write once, below).
     // Fail OPEN — the inverse of gates' fail-closed: detection is advisory, so a broken list surface NEVER fails doctor.
     for (const a of adapters) {
@@ -35,14 +56,20 @@ export async function doctor(_argv, cwd = process.cwd(), adapters = allAdapters(
         }
         catch { /* fail open: leave models as-is, doctor stays healthy */ }
     }
-    await probeModels(cfg, cwd, adapters, health, probeProgressTTY
+    // A free Kimi auth failure or failed earned-green turn must not spend more probes. Every other
+    // adapter keeps the exact existing model-sweep path.
+    const modelProbeAdapters = kimiTurnEnabled && health.kimi.authed === false
+        ? adapters.filter((a) => a !== kimiAdapter)
+        : adapters;
+    await probeModels(cfg, cwd, modelProbeAdapters, health, probeProgressTTY
         ? (adapter, model, status, durationMs) => console.error(`  ${adapter}:${model} ${status} (${(durationMs / 1000).toFixed(1)}s)`)
         : undefined);
     writeDoctor(cwd, health);
     const rows = adapters.map((a) => {
         const h = health[a.id];
         const state = !h.installed ? "not installed" : `${h.version ?? "installed"}${h.note ? ` (${h.note})` : ""}`;
-        return alignedStatusRow(h.installed ? "pass" : "fail", a.id, state);
+        const healthy = h.installed && (a.id !== kimi.id || h.authed);
+        return alignedStatusRow(healthy ? "pass" : "fail", a.id, state);
     });
     // v1.48 T1: advisory sweep for known agent CLIs with no adapter — never written to doctor.json health.
     rows.push(...detectCandidateClis().map(({ binary, version }) => alignedStatusRow("warn", binary, `detected: ${version ?? "version unknown"} (no tickmarkr adapter — not routable)`)));

package/dist/drivers/herdr.d.ts

@@ -2,6 +2,12 @@ import { type ExecutorDriver, type NotifyOpts, type Slot, type SlotOpts } from "
 export declare const TRAILER_SAFE_FLOOR_COLS = 108;
 export declare const TRAILER_WIDTH_MARGIN = 2;
 export declare const DELIVERY_ATTEMPTS = 3;
+export declare class DeliveryReadinessError extends Error {
+    readonly waitedMs: number;
+    readonly transcript: string;
+    readonly phase = "READINESS";
+    constructor(waitedMs: number, transcript: string);
+}
 /** First-generation join direction from measured trailer-safe floor (43-MEASUREMENT.md). */
 export declare function workerSplitDirection(paneCols: number | null, safeFloor?: number, margin?: number): "right" | "down";
 export declare class HerdrDriver implements ExecutorDriver {
@@ -24,6 +30,7 @@ export declare class HerdrDriver implements ExecutorDriver {
     private reserveDispatch;
     private verifyPaneIdentityBinding;
     private deliveryMatches;
+    private submissionRegistered;
     static available(): boolean;
     private herdr;
     private namedPaneId;
@@ -40,7 +47,10 @@ export declare class HerdrDriver implements ExecutorDriver {
     private joinGroup;
     run(slot: Slot, cmd: string): Promise<void>;
     private deliver;
+    private deliverPersistentShellCommand;
+    private submitVerifiedDelivery;
     private settleDeliveryLine;
+    private awaitDeliveryReadiness;
     private deliveryReadMatches;
     private waitOk;
     waitOutput(slot: Slot, pattern: string, timeoutMs: number, opts?: {

package/dist/drivers/herdr.js

@@ -1,4 +1,4 @@
-import { declaredInputBoxForWorkerName, matchesInputBox, shq } from "../adapters/types.js";
+import { declaredInputBoxForWorkerName, matchesEmptyInputBox, matchesInputBox, shq } from "../adapters/types.js";
 import { PANE_IDENTITY_ENV, paneIdentityLine } from "../brand.js";
 import { createWorktree, sh } from "../run/git.js";
 import { herdrSealShellPrefix } from "./subprocess.js";
@@ -8,10 +8,26 @@ export const TRAILER_SAFE_FLOOR_COLS = 108;
 export const TRAILER_WIDTH_MARGIN = 2; // cols below (floor + margin) refuse a rightward first split
 // OBS-85 verified delivery: bounded type→read-back→enter attempts before failing closed.
 export const DELIVERY_ATTEMPTS = 3;
+const DELIVERY_SUBMIT_ATTEMPTS = 2; // initial Enter + one evidence-backed re-press (OBS-140)
 const DELIVERY_VERIFY_TIMEOUT_MS = 2000; // per attempt — a paste that hasn't rendered in 2s is retyped
 const DELIVERY_READ_LINES = 80;
 const DELIVERY_SETTLE_READ_ATTEMPTS = 6;
 const DELIVERY_SETTLE_POLL_MS = 100;
+const DELIVERY_READINESS_TIMEOUT_MS = 1_000;
+// OBS-142: a typed identity lets the daemon's next task distinguish cold-start variance from
+// structural driver faults without parsing prose. The message also carries the bounded wait and
+// final pane evidence so a terminal failure is diagnosable on its own.
+export class DeliveryReadinessError extends Error {
+    waitedMs;
+    transcript;
+    phase = "READINESS";
+    constructor(waitedMs, transcript) {
+        super(`herdr delivery READINESS failed after ${waitedMs}ms — interface never became interactive (OBS-142); pane transcript:\n${transcript}`);
+        this.waitedMs = waitedMs;
+        this.transcript = transcript;
+        this.name = "DeliveryReadinessError";
+    }
+}
 /** First-generation join direction from measured trailer-safe floor (43-MEASUREMENT.md). */
 export function workerSplitDirection(paneCols, safeFloor = TRAILER_SAFE_FLOOR_COLS, margin = TRAILER_WIDTH_MARGIN) {
     if (paneCols == null || paneCols <= 0)
@@ -95,6 +111,23 @@ export class HerdrDriver {
         const needle = norm(cmd);
         return needle.length > 0 && hay.includes(needle);
     }
+    // Submission requires positive post-Enter evidence. A prompt echoed above a fresh input target
+    // proves registration; a declared box that is visibly empty after the verified paste also proves
+    // it consumed the prompt. Prompt absence alone is never success (OBS-142).
+    submissionRegistered(transcript, cmd, inputBox) {
+        const norm = (s) => s.replace(/\s+/g, "");
+        const hay = norm(transcript);
+        const needle = norm(cmd);
+        const promptAt = hay.lastIndexOf(needle);
+        if (needle.length === 0)
+            return false;
+        if (promptAt < 0)
+            return inputBox !== undefined && matchesEmptyInputBox(transcript, inputBox);
+        if (inputBox && matchesInputBox(transcript, inputBox)) {
+            return hay.lastIndexOf(norm(inputBox.fingerprint)) > promptAt;
+        }
+        return promptAt + needle.length < hay.length;
+    }
     static available() {
         return process.env.HERDR_ENV === "1";
     }
@@ -392,7 +425,8 @@ export class HerdrDriver {
             this.deliveredPanes.set(slot, paneId);
         });
     }
-    async deliver(slot, cmd, pane) {
+    async deliver(slot, cmd, pane, verifySubmission = true) {
+        const readiness = await this.awaitDeliveryReadiness(slot, cmd, pane);
         let transcript = "";
         for (let attempt = 0; attempt < DELIVERY_ATTEMPTS; attempt++) {
             if (attempt > 0) {
@@ -419,9 +453,14 @@ export class HerdrDriver {
                 throw new Error(`herdr pane send-text failed: ${typed.stderr || typed.stdout}`);
             const back = await this.herdr(`pane wait-output ${shq(pane)} --match ${shq(cmd)} --timeout ${DELIVERY_VERIFY_TIMEOUT_MS}`, slot.cwd, DELIVERY_VERIFY_TIMEOUT_MS + 15_000);
             if (this.waitOk(back.code, back.stdout) || await this.deliveryReadMatches(pane, cmd, slot.cwd)) {
-                const enter = await this.herdr(`pane send-keys ${shq(pane)} Enter`, slot.cwd);
-                if (enter.code !== 0)
-                    throw new Error(`herdr pane send-keys Enter failed: ${enter.stderr || enter.stdout}`);
+                if (verifySubmission) {
+                    await this.submitVerifiedDelivery(slot, cmd, pane, readiness);
+                }
+                else {
+                    const enter = await this.herdr(`pane send-keys ${shq(pane)} Enter`, slot.cwd);
+                    if (enter.code !== 0)
+                        throw new Error(`herdr pane send-keys Enter failed: ${enter.stderr || enter.stdout}`);
+                }
                 return;
             }
             // capture the corrupted delivery BEFORE clearing it — the OBS-85 byte-level evidence
@@ -429,13 +468,57 @@ export class HerdrDriver {
         }
         throw new Error(`herdr delivery corrupted after ${DELIVERY_ATTEMPTS} attempts — enter never pressed (OBS-85); pane transcript:\n${transcript}`);
     }
-    async settleDeliveryLine(pane, cwd, initialTranscript, inputBox) {
+    // The narrator launches a perpetual shell watch, not an adapter-backed input interface. Keep
+    // OBS-85's readiness + paste read-back and the historical single Enter, while worker/gate runs
+    // continue through positive post-Enter evidence in submitVerifiedDelivery.
+    async deliverPersistentShellCommand(slot, cmd) {
+        return this.deliveryQueue(async () => {
+            const pane = await this.paneId(slot);
+            await this.deliver(slot, cmd, pane, false);
+            this.deliveredPanes.set(slot, pane);
+        });
+    }
+    async submitVerifiedDelivery(slot, cmd, pane, readiness) {
+        let transcript = "";
+        const inputBox = this.inputBoxes.get(slot);
+        // The base window preserves OBS-140's bounded behavior. A slow readiness observation grants
+        // the same measured time once more for submit paint, capped by the readiness bound itself.
+        const baseVerifyMs = (DELIVERY_SETTLE_READ_ATTEMPTS - 1) * DELIVERY_SETTLE_POLL_MS;
+        const verifyWindowMs = Math.min(baseVerifyMs + readiness.timeoutMs, baseVerifyMs + readiness.waitedMs);
+        for (let attempt = 0; attempt < DELIVERY_SUBMIT_ATTEMPTS; attempt++) {
+            const enter = await this.herdr(`pane send-keys ${shq(pane)} Enter`, slot.cwd);
+            if (enter.code !== 0)
+                throw new Error(`herdr pane send-keys Enter failed: ${enter.stderr || enter.stdout}`);
+            // Reuse the existing settle-read window. A first-read success returns before any timer; only
+            // a prompt that still occupies the delivery target spends the bounded settle window. This
+            // verification always completes before a possible re-press, so a slow submit cannot duplicate.
+            const settled = await this.settleDeliveryLine(pane, slot.cwd, transcript, inputBox, (candidate) => this.submissionRegistered(candidate, cmd, inputBox), verifyWindowMs);
+            transcript = settled.transcript;
+            if (settled.ok)
+                return;
+            if (settled.readFailed) {
+                throw new Error(`herdr delivery corrupted — submission verification failed, refusing to re-press Enter (OBS-140); pane transcript:\n${transcript}`);
+            }
+        }
+        throw new Error(`herdr delivery corrupted after ${DELIVERY_SUBMIT_ATTEMPTS} submit attempts — submission never registered (OBS-140); pane transcript:\n${transcript}`);
+    }
+    async settleDeliveryLine(pane, cwd, initialTranscript, inputBox, accept, settleWindowMs) {
         let transcript = initialTranscript;
-        for (let readAttempt = 0; readAttempt < DELIVERY_SETTLE_READ_ATTEMPTS; readAttempt++) {
+        const readAttempts = settleWindowMs === undefined
+            ? DELIVERY_SETTLE_READ_ATTEMPTS
+            : Math.max(DELIVERY_SETTLE_READ_ATTEMPTS, Math.floor(settleWindowMs / DELIVERY_SETTLE_POLL_MS) + 1);
+        for (let readAttempt = 0; readAttempt < readAttempts; readAttempt++) {
             const read = await this.herdr(`pane read ${shq(pane)} --source recent-unwrapped --lines ${DELIVERY_READ_LINES}`, cwd);
             if (read.code !== 0)
-                return { ok: false, transcript: read.stdout || transcript, recognizedInputBox: false };
-            if (read.stdout === transcript) {
+                return { ok: false, transcript: read.stdout || transcript, recognizedInputBox: false, readFailed: true };
+            if (accept?.(read.stdout)) {
+                return {
+                    ok: true,
+                    transcript: read.stdout,
+                    recognizedInputBox: inputBox !== undefined && matchesInputBox(read.stdout, inputBox),
+                };
+            }
+            if (accept === undefined && read.stdout === transcript) {
                 return {
                     ok: true,
                     transcript,
@@ -443,12 +526,58 @@ export class HerdrDriver {
                 };
             }
             transcript = read.stdout;
-            if (readAttempt < DELIVERY_SETTLE_READ_ATTEMPTS - 1) {
+            if (readAttempt < readAttempts - 1) {
                 await new Promise((resolve) => setTimeout(resolve, DELIVERY_SETTLE_POLL_MS));
             }
         }
         return { ok: false, transcript, recognizedInputBox: false };
     }
+    async awaitDeliveryReadiness(slot, cmd, pane) {
+        const inputBox = this.inputBoxes.get(slot);
+        const requireInputBox = inputBox !== undefined && inputBox.launchCommand?.(cmd) !== true;
+        const timeoutMs = inputBox?.readinessTimeoutMs ?? DELIVERY_READINESS_TIMEOUT_MS;
+        const started = Date.now();
+        let previous;
+        let transcript = "";
+        let reads = 0;
+        while (true) {
+            const elapsedBeforeRead = Date.now() - started;
+            const remainingBeforeRead = timeoutMs - elapsedBeforeRead;
+            if (remainingBeforeRead <= 0)
+                throw new DeliveryReadinessError(elapsedBeforeRead, transcript);
+            const read = await this.herdr(`pane read ${shq(pane)} --source recent-unwrapped --lines ${DELIVERY_READ_LINES}`, slot.cwd, Math.max(1, Math.ceil(remainingBeforeRead)));
+            reads++;
+            transcript = read.stdout || transcript;
+            const waitedMs = Date.now() - started;
+            if (read.code !== 0) {
+                // Once at least one valid frame has been observed, a read that consumes the remainder of
+                // the readiness budget is the bounded window expiring, not a new submission/protocol
+                // identity. A first-read timeout and every non-timeout read failure remain structural.
+                if (read.timedOut && previous !== undefined && waitedMs >= timeoutMs) {
+                    throw new DeliveryReadinessError(waitedMs, transcript);
+                }
+                const detail = read.stderr || read.stdout || `exit ${read.code}`;
+                throw new Error(`herdr pane read failed during readiness${read.timedOut ? " (timed out)" : ""}: ${detail}`);
+            }
+            if (previous !== undefined) {
+                const stableFrame = read.stdout === previous;
+                const targetReady = stableFrame && (requireInputBox
+                    ? matchesInputBox(previous, inputBox) && matchesInputBox(read.stdout, inputBox)
+                    : !this.deliveryMatches(read.stdout, cmd));
+                if (targetReady)
+                    return { waitedMs, timeoutMs, transcript: read.stdout };
+            }
+            previous = read.stdout;
+            const remaining = timeoutMs - waitedMs;
+            if (remaining <= 0)
+                throw new DeliveryReadinessError(waitedMs, transcript);
+            // The second read is immediate: an already-painted stable target proves readiness with no
+            // added delay. Only observed change spends a poll interval, and every path remains bounded.
+            if (reads > 1) {
+                await new Promise((resolve) => setTimeout(resolve, Math.min(DELIVERY_SETTLE_POLL_MS, remaining)));
+            }
+        }
+    }
     async deliveryReadMatches(pane, cmd, cwd) {
         const read = await this.herdr(`pane read ${shq(pane)} --source recent-unwrapped --lines ${DELIVERY_READ_LINES}`, cwd);
         return read.code === 0 && this.deliveryMatches(read.stdout, cmd);
@@ -638,7 +767,7 @@ export class HerdrDriver {
             const s = await this.watchSlot(cwd, name);
             this.watches.set(name, s);
             try {
-                await this.run(s, command);
+                await this.deliverPersistentShellCommand(s, command);
             }
             catch (err) {
                 this.watches.delete(name);

package/dist/run/daemon.js

@@ -9,6 +9,7 @@ import { allAdapters, discoverChannels, getAdapter, probeAll, readDoctor } from
 import { addUsage, channelKey, matchesTrustDialog, QUOTA_RE } from "../adapters/types.js";
 import { bannerShell, paneDispatchCommand } from "../brand.js";
 import { globalConfigDir, loadConfigWithMode, readOverlayFile, repoOverlayPath, } from "../config/config.js";
+import { DeliveryReadinessError } from "../drivers/herdr.js";
 import { herdrSealShellPrefix, SubprocessDriver } from "../drivers/subprocess.js";
 import { formatOwnedName } from "../drivers/types.js";
 import { captureBaseline, detectGateCommands, detectVacuousOracles } from "../gates/baseline.js";
@@ -24,7 +25,7 @@ import { acquireRunLock, releaseRunLock } from "./lock.js";
 import { ensureIntegration, integrationBranch, integrationHead, mergeTask, verifyIntegrationTip } from "./merge.js";
 import { nextChannel, route } from "../route/router.js";
 import { desiredPanes } from "./reconcile.js";
-import { normalizeStallSnapshot } from "./stall.js";
+import { StallProgressTracker } from "./stall.js";
 const MODE_RANK = { "staff-led": 0, "risk-based": 1, "partner-led": 2 };
 // An override (flag/spec) re-resolves through loadConfigWithMode itself, via a synthesized repo overlay
 // carrying routing.mode — floors, explore, lints, and provenance all come from config.ts's preset
@@ -795,13 +796,13 @@ export async function runDaemon(repoRoot, opts = {}) {
                 // single site, so a test can reason about it; keep Date.now() out of profile.ts (still pure) and
                 // out of adapter module scope (the cursor is a parameter, threaded from the daemon).
                 const attemptStart = Date.now();
-                // v1.23 T2: once-per-attempt latch for context threshold crossing. Sample ONLY at existing poll
-                // seams (interactive wait slices) — never a new timer loop. null/unknown usage fails OPEN
+                // v1.23 T2: once-per-attempt latch for context threshold crossing. Sample ONLY at existing worker
+                // wait slices — never a new timer loop. null/unknown usage fails OPEN
                 // (never treated as over-threshold). Journal + notify fire at most once while the value stays high.
                 let contextWarned = false;
                 let contextTokens;
                 const sampleContext = async () => {
-                    if (contextWarned || !adapter.contextUsage)
+                    if (!adapter.contextUsage)
                         return;
                     let usage = null;
                     try {
@@ -814,7 +815,7 @@ export async function runDaemon(repoRoot, opts = {}) {
                     if (!usage || typeof usage.tokens !== "number" || !Number.isFinite(usage.tokens))
                         return;
                     contextTokens = usage.tokens; // last known valid sample, including under-threshold resume candidates
-                    if (usage.tokens < cfg.contextWarnTokens)
+                    if (contextWarned || usage.tokens < cfg.contextWarnTokens)
                         return;
                     contextWarned = true;
                     lastContextTokens = usage.tokens;
@@ -833,6 +834,38 @@ export async function runDaemon(repoRoot, opts = {}) {
                 let earlyLaunchDead = false;
                 let settleParsed;
                 let seedResult;
+                const handleDeliveryReadiness = async (error) => {
+                    journal.append("delivery-readiness-failed", t.id, {
+                        attempt,
+                        waitedMs: error.waitedMs,
+                        transcript: error.transcript,
+                    });
+                    if (keepOpen)
+                        keptSlots.push(slot);
+                    else
+                        await closeSlot(slot);
+                    feedback = `delivery readiness failed after ${error.waitedMs}ms; pane transcript:\n${error.transcript}`;
+                    const step = r.ladder[Math.min(ladderIdx++, r.ladder.length - 1)];
+                    journal.append("escalation", t.id, { step, attempt: attempt + 1 });
+                    await driver.notify(`tickmarkr ${runId}: ${t.id} escalation: ${step}`, { tier: "attention" });
+                    if (step === "retry")
+                        return true;
+                    if (step === "escalate") {
+                        const next = failover("escalate");
+                        if (next) {
+                            assignment = next;
+                            tried.push(channelKey(next));
+                            return true;
+                        }
+                        // no channel left — fall through to a consult
+                    }
+                    if (step === "escalate" || step === "consult") {
+                        const v = await runConsult("delivery-readiness", error.transcript, feedback, []);
+                        return applyVerdict(v, attempt + 1, "dispatch");
+                    }
+                    await park(t, "escalation ladder exhausted", "ladder-exhausted", assignment, attempt + 1, startMs, gateFails, consults, tokens, metered, retryMode);
+                    return false;
+                };
                 if (interactive) {
                     // v1.2 interactive: the TUI doesn't exit on completion — the trailer is the finish line.
                     // The exit wrapper still fires if the TUI dies (crash/quit): fast-fail instead of burning the timeout.
@@ -842,11 +875,29 @@ export async function runDaemon(repoRoot, opts = {}) {
                         // v1.69 T6: launch the real TUI without a prompt, wait for readiness, inject one seed turn,
                         // then fall through to the normal trailer harvest. A failed seed is recorded as a finished
                         // failure rather than allowed to race the trailer wait.
-                        seedResult = await runInteractiveSeed({ driver, slot, adapter, assignment, promptFile, taskTimeoutMinutes });
+                        try {
+                            seedResult = await runInteractiveSeed({ driver, slot, adapter, assignment, promptFile, taskTimeoutMinutes });
+                        }
+                        catch (error) {
+                            if (!(error instanceof DeliveryReadinessError))
+                                throw error;
+                            if (await handleDeliveryReadiness(error))
+                                continue attempts;
+                            return;
+                        }
                         output = seedResult.output;
                     }
                     else {
-                        await driver.run(slot, paneDispatchCommand(dispatchScript));
+                        try {
+                            await driver.run(slot, paneDispatchCommand(dispatchScript));
+                        }
+                        catch (error) {
+                            if (!(error instanceof DeliveryReadinessError))
+                                throw error;
+                            if (await handleDeliveryReadiness(error))
+                                continue attempts;
+                            return;
+                        }
                         output = await driver.read(slot, 1000);
                     }
                     if (seedResult?.seedFailed) {
@@ -862,15 +913,15 @@ export async function runDaemon(repoRoot, opts = {}) {
                         // OBS-54: reaping keys on new pane output, not dispatch wall clock. Poll at least twice per
                         // stall window (and at the existing 30s cadence for normal windows) so an active worker resets it.
                         const stallWindowMs = taskTimeoutMinutes * 60_000;
-                        // OBS-82: the stall clock compares NORMALIZED snapshots so a spinner glyph/elapsed-time
-                        // repaint is silence, not activity. ONLY this inactivity compare sees normalized text —
-                        // trailer detection, harvest, paging, and quota checks all read the raw pane.
+                        // v1.76: only monotonic work (seed submission, transcript growth, or context growth) resets
+                        // the stall clock. Raw pane differences are terminal chrome until proven otherwise.
                         let everHadOutput = output.length > 0;
-                        let lastStallSnapshot = normalizeStallSnapshot(output);
-                        let lastOutputAt = Date.now();
-                        while (Date.now() - lastOutputAt < stallWindowMs) {
+                        const stallProgress = new StallProgressTracker();
+                        stallProgress.observe({ paneText: output, seedSubmitted: true, contextTokens });
+                        let lastProgressAt = Date.now();
+                        while (Date.now() - lastProgressAt < stallWindowMs) {
                             const sliceStart = Date.now();
-                            const remaining = stallWindowMs - (sliceStart - lastOutputAt);
+                            const remaining = stallWindowMs - (sliceStart - lastProgressAt);
                             let slice = Math.min(BLOCKED_POLL_MS, Math.max(100, Math.min(stallWindowMs / 2, remaining)));
                             if (!everHadOutput) {
                                 const earlyLeft = earlyLaunchLivenessMs - (sliceStart - attemptStart);
@@ -893,11 +944,6 @@ export async function runDaemon(repoRoot, opts = {}) {
                             const paneText = await driver.read(slot, 1000);
                             if (paneText.length > 0)
                                 everHadOutput = true;
-                            const currentStallSnapshot = normalizeStallSnapshot(paneText);
-                            if (currentStallSnapshot !== lastStallSnapshot) {
-                                lastStallSnapshot = currentStallSnapshot;
-                                lastOutputAt = Date.now();
-                            }
                             // OBS-117 (v1.71 T6): zero raw output by the early-launch deadline is a dead channel now.
                             if (!everHadOutput && Date.now() - attemptStart >= earlyLaunchLivenessMs) {
                                 earlyLaunchDead = true;
@@ -906,6 +952,8 @@ export async function runDaemon(repoRoot, opts = {}) {
                             }
                             // v1.23 T2: piggyback on this poll slice — same cadence as blocked/idle checks, no new timer.
                             await sampleContext();
+                            if (stallProgress.observe({ paneText, contextTokens }))
+                                lastProgressAt = Date.now();
                             // page on "idle" too: herdr's blocked-scrape is strict and proved flaky for TUI dialogs
                             // (live check: cursor's trust dialog scraped as idle). "unknown" never pages — that's just
                             // a pane the scraper can't read (subprocess, dead pane); the task timeout covers those.
@@ -943,7 +991,7 @@ export async function runDaemon(repoRoot, opts = {}) {
                         }
                         if (!finished && exitCode === null) {
                             // timed out (or only ever saw false positives): harvest whatever the pane holds now
-                            timedOut = Date.now() - lastOutputAt >= stallWindowMs;
+                            timedOut = Date.now() - lastProgressAt >= stallWindowMs;
                             output = await driver.read(slot, 1000);
                             finished = new RegExp(trailerPattern(nonce)).test(output);
                             const exit = exitRe.exec(output);
@@ -979,18 +1027,27 @@ export async function runDaemon(repoRoot, opts = {}) {
                     }
                 }
                 else {
-                    await driver.run(slot, paneDispatchCommand(dispatchScript));
+                    try {
+                        await driver.run(slot, paneDispatchCommand(dispatchScript));
+                    }
+                    catch (error) {
+                        if (!(error instanceof DeliveryReadinessError))
+                            throw error;
+                        if (await handleDeliveryReadiness(error))
+                            continue attempts;
+                        return;
+                    }
                     // OBS-54: headless workers have the same output-inactivity budget as visible panes.
-                    // OBS-82: same normalized-snapshot compare as the interactive site — spinner-only repaints
-                    // exhaust the budget here too; harvest below still reads the raw pane.
+                    // v1.76: same monotonic-progress measure as the interactive site; harvest stays raw.
                     const stallWindowMs = taskTimeoutMinutes * 60_000;
                     const initialPane = await driver.read(slot, 500);
                     let everHadOutput = initialPane.length > 0;
-                    let lastStallSnapshot = normalizeStallSnapshot(initialPane);
-                    let lastOutputAt = Date.now();
+                    const stallProgress = new StallProgressTracker();
+                    stallProgress.observe({ paneText: initialPane, seedSubmitted: true, contextTokens });
+                    let lastProgressAt = Date.now();
                     finished = false;
-                    while (Date.now() - lastOutputAt < stallWindowMs) {
-                        const remaining = stallWindowMs - (Date.now() - lastOutputAt);
+                    while (Date.now() - lastProgressAt < stallWindowMs) {
+                        const remaining = stallWindowMs - (Date.now() - lastProgressAt);
                         let slice = Math.min(BLOCKED_POLL_MS, Math.max(100, Math.min(stallWindowMs / 2, remaining)));
                         if (!everHadOutput) {
                             const earlyLeft = earlyLaunchLivenessMs - (Date.now() - attemptStart);
@@ -1004,19 +1061,17 @@ export async function runDaemon(repoRoot, opts = {}) {
                         const paneText = await driver.read(slot, 500);
                         if (paneText.length > 0)
                             everHadOutput = true;
-                        const currentStallSnapshot = normalizeStallSnapshot(paneText);
-                        if (currentStallSnapshot !== lastStallSnapshot) {
-                            lastStallSnapshot = currentStallSnapshot;
-                            lastOutputAt = Date.now();
-                        }
                         if (!everHadOutput && Date.now() - attemptStart >= earlyLaunchLivenessMs) {
                             earlyLaunchDead = true;
                             break;
                         }
+                        await sampleContext();
+                        if (stallProgress.observe({ paneText, contextTokens }))
+                            lastProgressAt = Date.now();
                     }
                     output = await driver.read(slot, 500);
                     exitCode = Number(exitRe.exec(output)?.[1] ?? 1);
-                    timedOut = !finished && Date.now() - lastOutputAt >= stallWindowMs;
+                    timedOut = !finished && Date.now() - lastProgressAt >= stallWindowMs;
                 }
                 // SPEND-01 interactive metering race: the harvest loop breaks on the trailer, but the worker
                 // shell may still be running post-trailer bookkeeping (session-store flush, fake usage stamp,

package/dist/run/stall.d.ts

@@ -1,8 +1,25 @@
-/** Normalize one pane snapshot for the stall-inactivity compare (trailer parsing, harvest,
- * waitOutput, and paging read the raw text; the LLM transcript filter below reuses this to
- * CLASSIFY presentation-only lines, never to rewrite kept bytes). Two snapshots that normalize
- * equal are the same frame modulo spinner presentation; any other byte difference is activity. */
+/** Normalize presentation tokens for transcript extent and LLM-noise classification. Trailer
+ * parsing, harvest, waitOutput, and paging always read the raw text. */
 export declare function normalizeStallSnapshot(text: string): string;
+export interface StallProgressSample {
+    paneText: string;
+    seedSubmitted?: boolean;
+    contextTokens?: number;
+}
+/**
+ * Monotonic worker-progress measure for the stall watchdog.
+ *
+ * Terminal chrome is allowed to repaint arbitrary bytes in place, so byte differences are not
+ * evidence of work. A rendered transcript is only known to have grown when it occupies more
+ * non-empty rows than any prior sample. Same-row rewrites are deliberately ambiguous and do not
+ * advance the clock: a recoverable early consult is safer than silencing the watchdog forever.
+ */
+export declare class StallProgressTracker {
+    private transcriptRows;
+    private seedSubmitted;
+    private contextTokens;
+    observe(sample: StallProgressSample): boolean;
+}
 /** Filter transcript text bound for an LLM prompt (consult dossiers, gate prompts). The classify
  * seam exists for fault injection in tests only — production callers pass text alone. */
 export declare function filterLlmTranscript(text: string, classify?: (t: string) => string): string;

package/dist/run/stall.js

@@ -1,12 +1,9 @@
-// OBS-82: codex's MCP-startup spinner repaints a braille glyph + elapsed-time cell forever, so the
-// daemon's raw snapshot compare reads a wedged pane as active and the stall clock never fires.
-// This normalizer deletes ONLY presentation tokens from a closed allowlist — ANSI/VT escape
-// sequences, braille-range spinner glyphs, and elapsed-time tokens bound to time-unit suffixes.
-// Every other byte passes through identical: words, paths, server names, and progress counts
-// (a five-of-seven counter change IS activity) all remain change-sensitive. The asymmetry is the
-// design: an allowlist MISS degrades to today's recoverable no-reap behavior, while an over-broad
-// deletion would reap a healthy worker — a new failure class. Grow the allowlist only with
-// captured evidence (tests/fixtures/codex-mcp-spinner/).
+// OBS-82: normalize known presentation tokens before measuring transcript extent or filtering an
+// LLM-bound transcript. This remains a closed allowlist — ANSI/VT escapes, braille-range spinner
+// glyphs, and elapsed-time tokens bound to time-unit suffixes. Every other byte passes through
+// identical. v1.76 deliberately stopped treating arbitrary normalized byte changes as progress:
+// StallProgressTracker below requires monotonic evidence, so an unknown repaint fails closed toward
+// a recoverable consult instead of holding the watchdog silent.
 // CSI (with intermediates), OSC (BEL- or ST-terminated), DCS/SOS/PM/APC strings, single-char
 // escapes, and charset selection — the raw-pty forms; herdr pane reads are already rendered.
 // eslint-disable-next-line no-control-regex
@@ -16,13 +13,46 @@ const SPINNER_RE = /[⠀-⣿]/g;
 // A digit run (optionally decimal) bound directly to a time-unit suffix, standing alone as a
 // word: 9s, 41s, 3m, 1h, 800ms. Never bare digits — "(6/7)" and "5 of 7" stay change-sensitive.
 const ELAPSED_RE = /(?<![\w.])\d+(?:\.\d+)?(?:ms|[hms])(?!\w)/g;
-/** Normalize one pane snapshot for the stall-inactivity compare (trailer parsing, harvest,
- * waitOutput, and paging read the raw text; the LLM transcript filter below reuses this to
- * CLASSIFY presentation-only lines, never to rewrite kept bytes). Two snapshots that normalize
- * equal are the same frame modulo spinner presentation; any other byte difference is activity. */
+/** Normalize presentation tokens for transcript extent and LLM-noise classification. Trailer
+ * parsing, harvest, waitOutput, and paging always read the raw text. */
 export function normalizeStallSnapshot(text) {
     return text.replace(ANSI_RE, "").replace(SPINNER_RE, "").replace(ELAPSED_RE, "");
 }
+/**
+ * Monotonic worker-progress measure for the stall watchdog.
+ *
+ * Terminal chrome is allowed to repaint arbitrary bytes in place, so byte differences are not
+ * evidence of work. A rendered transcript is only known to have grown when it occupies more
+ * non-empty rows than any prior sample. Same-row rewrites are deliberately ambiguous and do not
+ * advance the clock: a recoverable early consult is safer than silencing the watchdog forever.
+ */
+export class StallProgressTracker {
+    transcriptRows = 0;
+    seedSubmitted = false;
+    contextTokens;
+    observe(sample) {
+        let advanced = false;
+        const rows = normalizeStallSnapshot(sample.paneText)
+            .split("\n")
+            .filter((line) => line.trim().length > 0)
+            .length;
+        if (rows > this.transcriptRows) {
+            this.transcriptRows = rows;
+            advanced = true;
+        }
+        if (sample.seedSubmitted && !this.seedSubmitted) {
+            this.seedSubmitted = true;
+            advanced = true;
+        }
+        const tokens = sample.contextTokens;
+        if (tokens !== undefined && Number.isFinite(tokens)) {
+            if (tokens > (this.contextTokens ?? 0))
+                advanced = true;
+            this.contextTokens = Math.max(this.contextTokens ?? 0, tokens);
+        }
+        return advanced;
+    }
+}
 // ─── v1.65 T2: LLM-bound transcript filter ──────────────────────────────────────────────────────
 // Consult dossiers and gate prompts pay tokens per transcript byte, so LLM-bound text runs through
 // a per-line classifier: carriage-return overwrite churn keeps only the final paint, lines that are

package/package.json

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