tickmarkr 1.65.0 → 1.67.0

package/dist/cli/commands/run.js

@@ -4,6 +4,7 @@ import { ROUTING_MODES } from "../../config/config.js";
 import { pickDriver } from "../../drivers/index.js";
 import { loadGraph } from "../../graph/graph.js";
 import { formatSummary, resolveRunMode, runDaemon } from "../../run/daemon.js";
+import { isRunLockLive } from "../../run/lock.js";
 import { route, NO_EXPLORE_ENV } from "../../route/router.js";
 import { formatJournalNarration, loadRoutingProfile } from "../../run/journal.js";
 import { ttyVisual } from "../../adapters/model-lints.js";
@@ -65,6 +66,14 @@ export async function run(argv, cwd = process.cwd()) {
             throw new Error(`--route-strict: refusing to dispatch — ${conflict}`);
         console.warn(`tickmarkr: !! ${conflict}`);
     }
+    // OBS-107 (v1.67 T5): advisory only — a stale compiled graph with prior terminal statuses and no
+    // live daemon will otherwise finish with zero work and confuse the operator. The recompile remedy
+    // is named; dispatch proceeds unchanged.
+    const TERMINAL_STATUSES = ["done", "failed", "human"];
+    if (graph.tasks.some((t) => TERMINAL_STATUSES.includes(t.status)) && !isRunLockLive(cwd)) {
+        console.warn("tickmarkr: compiled graph carries terminal statuses from a prior run and no daemon is active — "
+            + "run `tickmarkr compile <src>` to recompile; proceeding with stale graph");
+    }
     const noExplore = !!values["no-explore"];
     const exploreCtx = noExplore ? { noExplore } : undefined;
     if (noExplore)

package/dist/cli/commands/status.js

@@ -60,8 +60,6 @@ const GATE_STATE_TOKEN = { pass: ok, fail, skip: dim, open: dim };
 const gateChain = (states, unicode) => GATE_NAMES.map((gate, i) => unicode
     ? GATE_STATE_TOKEN[states[i]](gateBox(states[i], true))
     : `${GATE_KEYS[gate]}${gateBox(states[i], false)}`).join(" ");
-// plain (uncolored) cell width for column math — ANSI codes have zero display width
-const gateChainWidth = (unicode) => GATE_NAMES.reduce((w, gate) => w + (unicode ? 1 : GATE_KEYS[gate].length + 3) + 1, -1);
 const failedGates = (states) => GATE_NAMES.filter((_, i) => states[i] === "fail");
 // plain-text form of the failed-gate words for column math; rendered with a dim dot + red names
 const failedSuffix = (states) => {
@@ -182,10 +180,13 @@ const renderFrame = (cwd) => {
     const done = effective.tasks.filter((t) => t.status === "done").length;
     const cells = g.tasks.map((t) => {
         const st = replayed?.get(t.id) ?? t.status;
-        const label = starved.has(t.id) ? " starved" : activity.cells.has(t.id) ? ` ${activity.cells.get(t.id)}` : "";
+        const isStarved = starved.has(t.id);
+        const phrase = isStarved ? undefined : activity.cells.get(t.id);
+        const label = isStarved ? " starved" : phrase ? ` ${phrase}` : "";
         const channel = assignments.get(t.id) ?? "-";
-        const assignCol = contexts.has(t.id) ? `${channel}${divider}ctx ${contexts.get(t.id)}` : channel;
-        return { t, st, label, assignCol, states: comparable ? gateStates(t, events) : defaultGateStates(t) };
+        const ctx = contexts.get(t.id);
+        const assignCol = ctx !== undefined ? `${channel}${divider}ctx ${ctx}` : channel;
+        return { t, st, label, assignCol, isStarved, phrase, channel, ctx, states: comparable ? gateStates(t, events) : defaultGateStates(t) };
     });
     if (!unicode) {
         // machine/CI surface — layout unchanged (pipes, greps, and the golden pins depend on it)
@@ -227,26 +228,39 @@ const renderFrame = (cwd) => {
     // rows: the line names task ids, and rows must stay the first id-bearing lines for grep consumers.
     const nowLine = activity.now ? [legend(`   now: ${activity.now}`)] : [];
     const gatesLegend = legend(`   gates: ${GATE_NAMES.join(" · ")}`);
+    // Two-line card per task (operator request, v1.67): line 1 carries identity + verdict — glyph,
+    // id, goal at full width, and only SHORT status words. Line 2 carries the machinery, dim and
+    // aligned under the goal: gate chain, live activity phrase (or channel), ctx. Long channel names
+    // and activity phrases live on line 2 only, so they can never squeeze the goal or wrap line 1.
     const taskVerdict = (st) => st === "done" ? "pass" : st === "failed" ? "fail" : st === "human" ? "warn" : "neutral";
     const idW = Math.max(...cells.map((c) => c.t.id.length), 2);
-    const stW = Math.max(...cells.map((c) => (String(c.st) + c.label + failedSuffix(c.states) + humanGateSuffix(c.t, c.st, c.states)).length));
-    const chainW = gateChainWidth(true);
-    const assignW = Math.max(...cells.map((c) => c.assignCol.length));
-    const goalW = Math.max(8, width - (5 + idW) - 2 - chainW - 2 - stW - 2 - assignW);
-    const rows = cells.map(({ t, st, label, assignCol, states }) => {
-        const goal = shortGoal(t.goal, goalW).padEnd(goalW);
+    // plain-text status suffixes for width math only — starved / failed gate names / approval hint
+    const suffixPlain = (c) => (c.isStarved ? " · starved" : "") + failedSuffix(c.states) + humanGateSuffix(c.t, c.st, c.states);
+    const stW = Math.max(...cells.map((c) => String(c.st).length + suffixPlain(c).length));
+    const avail = Math.max(8, width - (5 + idW) - 2 - stW);
+    const goals = cells.map((c) => shortGoal(c.t.goal, avail));
+    const goalW = Math.max(8, ...goals.map((s) => s.length));
+    const indent = " ".repeat(idW + 5); // line 2 starts under the goal column
+    const rows = cells.map(({ t, st, states, isStarved, phrase, channel, ctx }, i) => {
         const stWord = st === "done" ? ok(String(st)) : st === "failed" ? fail(String(st)) : st === "human" ? warn(String(st)) : String(st);
         // a fail names its gate in words right here — the one moment gate identity is needed on a row
         const f = failedGates(states);
         const human = humanGateSuffix(t, st, states);
         const statusCell = stWord +
-            (label ? (label === " starved" ? fail(label) : dim(label)) : "") +
-            (f.length ? dim(" · ") + fail(f.join(", ")) : "") +
-            (human ? dim(" · ") + warn("awaiting approval") : "") +
-            " ".repeat(stW - (String(st) + label + failedSuffix(states) + human).length);
-        return `  ${statusRow(taskVerdict(st), `${t.id.padEnd(idW)} ${goal}  ${gateChain(states, true)}  ${statusCell}  ${dim(assignCol)}`)}`;
-    });
-    return [header, hr, gatesLegend, ...rows, ...nowLine].join("\n");
+            (isStarved ? dot + fail("starved") : "") +
+            (f.length ? dot + fail(f.join(", ")) : "") +
+            (human ? dot + warn("awaiting approval") : "");
+        const line1 = `  ${statusRow(taskVerdict(st), `${t.id.padEnd(idW)} ${goals[i].padEnd(goalW)}  ${statusCell}`)}`;
+        // activity already names its channel for in-flight attempts — never repeat it
+        const detail = [
+            ...(phrase ? [phrase, ...(phrase.includes(channel) || channel === "-" ? [] : [channel])] : [channel]),
+            ...(ctx !== undefined ? [`ctx ${ctx}`] : []),
+        ].join(" · ");
+        return [line1, `${indent}${gateChain(states, true)}  ${dim(detail)}`, ""];
+    }).flat();
+    if (!nowLine.length)
+        rows.pop(); // cards end blank-separated; drop the dangling one
+    return [header, hr, gatesLegend, "", ...rows, ...nowLine].join("\n");
 };
 export async function status(argv, cwd = process.cwd(), opts = {}) {
     // cockpit surface: banner + frame on a TTY (doctor's pattern); pipes get the bare frame

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

@@ -0,0 +1,5 @@
+import { type StudioOptions } from "../../tui/app.js";
+export declare function ui(_argv: string[], io?: Partial<StudioOptions>): Promise<string | {
+    out: string;
+    code: number;
+}>;

package/dist/cli/commands/ui.js

@@ -0,0 +1,13 @@
+import { StudioApp } from "../../tui/app.js";
+const NON_TTY_MSG = "tickmarkr ui: studio requires a TTY — use `tickmarkr fleet --print` or `tickmarkr status --watch` for line-mode output";
+export async function ui(_argv, io = {}) {
+    const input = io.input ?? process.stdin;
+    const output = io.output ?? process.stdout;
+    if (input.isTTY !== true || output.isTTY !== true) {
+        return { out: NON_TTY_MSG, code: 1 };
+    }
+    const app = new StudioApp({ input, output });
+    app.start();
+    await app.exited;
+    return "ui: closed";
+}

package/dist/cli/index.d.ts

@@ -5,7 +5,7 @@ export type CommandResult = string | {
 };
 export type CommandMap = Record<string, (argv: string[]) => Promise<CommandResult>>;
 export declare const COMMANDS: CommandMap;
-export declare const USAGE = "tickmarkr \u2014 spec-driven orchestration harness for AI coding agents\nusage: tickmarkr <command>\n  init          guided setup + doctor; init --agent [--force] [--docs] adds agent skills/docs\n  doctor        re-probe adapters, herdr, auth; print capability matrix\n  fleet         interactive fleet editor (fleet --print for CI drift checks)\n  compile <src> spec \u2192 .tickmarkr/graph.json (fails without acceptance criteria)\n  scope <intent> draft a compiled native spec beside an answered intent (--force to overwrite)\n  plan          dry-run routing table + cost estimate + floor lints\n  run           execute the graph (--concurrency N --driver herdr|subprocess --route-strict)\n  status        live run state\n  resume <id>   continue a run from its journal\n  report <id>   cost/quality report (--md for committable execution record)\n  profile       show learned routing profile (profile reset = forget history via cursor, keeps telemetry)\n  unlock        remove a stale/garbage run lock (refuses if the holder is alive)\n  approve <id> <task>  approve a parked human gate (--by <name> --reason <text>); takes effect on resume";
+export declare const USAGE = "tickmarkr \u2014 spec-driven orchestration harness for AI coding agents\nusage: tickmarkr <command>\n  init          guided setup + doctor; init --agent [--force] [--docs] adds agent skills/docs\n  doctor        re-probe adapters, herdr, auth; print capability matrix\n  fleet         interactive fleet editor (fleet --print for CI drift checks)\n  compile <src> spec \u2192 .tickmarkr/graph.json (fails without acceptance criteria)\n  scope <intent> draft a compiled native spec beside an answered intent (--force to overwrite)\n  plan          dry-run routing table + cost estimate + floor lints\n  run           execute the graph (--concurrency N --driver herdr|subprocess --route-strict)\n  status        live run state\n  resume <id>   continue a run from its journal\n  report <id>   cost/quality report (--md for committable execution record)\n  profile       show learned routing profile (profile reset = forget history via cursor, keeps telemetry)\n  ui            open the Fleet Studio TUI (full-screen tabbed cockpit)\n  unlock        remove a stale/garbage run lock (refuses if the holder is alive)\n  approve <id> <task>  approve a parked human gate (--by <name> --reason <text>); takes effect on resume";
 export declare function dispatch(cmd: string | undefined, argv: string[], commands?: CommandMap): Promise<{
     out: string;
     code: number;

package/dist/cli/index.js

@@ -13,11 +13,12 @@ import { resume } from "./commands/resume.js";
 import { run } from "./commands/run.js";
 import { scope } from "./commands/scope.js";
 import { status } from "./commands/status.js";
+import { ui } from "./commands/ui.js";
 import { unlock } from "./commands/unlock.js";
 import { version } from "./commands/version.js";
 const normalize = (r) => typeof r === "string" ? { out: r, code: 0 } : r;
 export const COMMANDS = {
-    init, doctor, fleet, compile, scope, plan, run, status, resume, report, profile, unlock, approve, version,
+    init, doctor, fleet, compile, scope, plan, run, status, resume, report, profile, ui, unlock, approve, version,
 };
 const VERSION_FLAGS = new Set(["version", "--version", "-v"]);
 const HELP_CMDS = new Set(["help", "-h", "--help"]);
@@ -35,6 +36,7 @@ usage: tickmarkr <command>
   resume <id>   continue a run from its journal
   report <id>   cost/quality report (--md for committable execution record)
   profile       show learned routing profile (profile reset = forget history via cursor, keeps telemetry)
+  ui            open the Fleet Studio TUI (full-screen tabbed cockpit)
   unlock        remove a stale/garbage run lock (refuses if the holder is alive)
   approve <id> <task>  approve a parked human gate (--by <name> --reason <text>); takes effect on resume`;
 // pure, testable dispatcher: resolves a command, forwards argv, shapes the result — no side effects.

package/dist/compile/collateral.d.ts

@@ -4,6 +4,7 @@ import { type Task } from "../graph/schema.js";
  * Each line names the task id and at least one missing collateral test path.
  */
 export declare function collateralLints(tasks: ReadonlyArray<Pick<Task, "id" | "files">>, repoRoot: string): string[];
+export declare function newDirectoryLints(tasks: ReadonlyArray<Pick<Task, "id" | "files">>, repoRoot: string): string[];
 /**
  * OBS-76 class: sweep src/ for out-of-scope source files that reference a symbol the acceptance
  * criteria name — the v1.52 router.ts omission, named at plan time instead of one judge round in.

package/dist/compile/collateral.js

@@ -145,20 +145,69 @@ function criteriaSymbols(acceptance) {
     }
     return [...out].sort();
 }
+const ARCH_PAGES = ["docs/codebase/ARCHITECTURE.md", "docs/codebase/STRUCTURE.md"];
+function topLevelSrcDir(file) {
+    const parts = file.replace(/^\.\//, "").replace(/\/+$/, "").split("/");
+    if (parts[0] !== "src" || parts.length < 2 || !parts[1])
+        return undefined;
+    return parts[1];
+}
+function existingSrcTopLevels(repoRoot) {
+    const out = new Set();
+    let entries;
+    try {
+        entries = readdirSync(join(repoRoot, "src"), { withFileTypes: true });
+    }
+    catch {
+        return out;
+    }
+    for (const e of entries) {
+        if (e.isDirectory())
+            out.add(e.name);
+    }
+    return out;
+}
+// OBS-108 (v1.67 T5): a task whose files[] creates a new top-level src/ directory must also
+// include the architecture pages the docs-truth suite pins. Advisory only — never blocks compile.
+export function newDirectoryLints(tasks, repoRoot) {
+    const existing = existingSrcTopLevels(repoRoot);
+    const lines = [];
+    for (const t of tasks) {
+        // OBS-22: scopeGate accepts picomatch globs; advisory warnings must agree.
+        const scoped = picomatch(t.files.map((f) => f.replace(/^\.\//, "")), { dot: true });
+        const newDirs = new Set();
+        for (const f of t.files) {
+            const dir = topLevelSrcDir(f);
+            if (!dir || existing.has(dir))
+                continue;
+            newDirs.add(`src/${dir}/`);
+        }
+        if (!newDirs.size)
+            continue;
+        const missing = ARCH_PAGES.filter((p) => !scoped(p));
+        if (!missing.length)
+            continue;
+        const dirList = [...newDirs].sort().join(", ");
+        const dirLabel = newDirs.size > 1 ? "directories" : "directory";
+        lines.push(`${t.id}: new top-level source ${dirLabel} ${dirList} must include ${missing.join(" and ")} in files[]`);
+    }
+    return lines;
+}
 /**
  * OBS-76 class: sweep src/ for out-of-scope source files that reference a symbol the acceptance
  * criteria name — the v1.52 router.ts omission, named at plan time instead of one judge round in.
  * Advisory plan output only, same contract as collateralLints.
  */
 export function sourceScopeLints(tasks, repoRoot) {
+    const newDirLints = newDirectoryLints(tasks, repoRoot);
     const perTask = tasks
         .map((t) => ({ t, needles: criteriaSymbols(t.acceptance) }))
         .filter((x) => x.needles.length);
     if (!perTask.length)
-        return [];
+        return newDirLints;
     const srcFiles = walkCode(repoRoot, "src");
     if (!srcFiles.length)
-        return [];
+        return newDirLints;
     const read = makeReader(repoRoot);
     const lines = [];
     for (const { t, needles } of perTask) {
@@ -183,5 +232,5 @@ export function sourceScopeLints(tasks, repoRoot) {
         const tail = hits.length > MAX_HITS_PER_TASK ? " (capped)" : "";
         lines.push(`${t.id}: criteria implicate out-of-scope source not in files[]: ${listed}${tail}`);
     }
-    return lines;
+    return [...newDirLints, ...lines];
 }

package/dist/gates/run-gates.js

@@ -72,16 +72,23 @@ export async function runGates(task, ctx) {
         // worker attempt — exactly what this fix forbids; only its meta-carries-channel pattern is mirrored.
         // Straight-line single `if` — NO loop/counter/knob: exactly-once by construction (a knob is a
         // fail-closed weakening vector); a second garbage verdict fails the gate closed exactly as today.
+        // T6: exclusion mirrors consult reroute semantics — the flaked channel's whole adapter is banned, not
+        // just its exact channel key, so an outage window cannot re-select the vendor being routed around.
+        // If no other adapter is live, the exclusion degrades to a channel-level reroute within the same
+        // adapter so a single-adapter fleet still retries (matching the daemon's unknown-excludeAdapter
+        // degradation path).
         if (a.meta?.unparseable === true && typeof a.meta.judge === "string") {
             const flakedKey = a.meta.judge;
-            const candidate = ctx.channels
-                .filter((c) => channelKey(c) !== flakedKey)
+            const flakedAdapter = flakedKey.slice(0, flakedKey.indexOf(":"));
+            const pick = (pool) => pool
                 // pickReviewer's sort (review.ts:37): TIER_RANK desc, marginalCostRank asc — proven ordering; both
-                // symbols already imported by a sibling gate file. No vendor-diversity axis (the judge isn't review).
+                // symbols already imported by a sibling gate file.
                 .sort((x, y) => TIER_RANK[y.tier] - TIER_RANK[x.tier] || marginalCostRank(x) - marginalCostRank(y))[0];
-            // ponytail: same-channel fallback when the fleet has no alternative (D-03). One judge call against a
-            // deterministic garbage source is wasted, bounded; fail-closed unchanged on a second garbage verdict.
-            const retry = candidate ?? { adapter: ctx.cfg.judge.adapter, model: ctx.cfg.judge.model };
+            const crossAdapter = pick(ctx.channels.filter((c) => c.adapter !== flakedAdapter));
+            const sameAdapter = pick(ctx.channels.filter((c) => c.adapter === flakedAdapter && channelKey(c) !== flakedKey));
+            // Prefer a different adapter; if the fleet only has one adapter, retry on a different channel of
+            // that adapter; if the fleet has only one channel, fall back to the original judge config.
+            const retry = crossAdapter ?? sameAdapter ?? { adapter: ctx.cfg.judge.adapter, model: ctx.cfg.judge.model };
             const retryAdapter = getAdapter(retry.adapter, ctx.adapters);
             const retryJvia = ctx.via
                 // unconditional -r1 suffix: under keepPanes:forever a same-channel retry cannot collide with the

package/dist/tui/app.d.ts

@@ -0,0 +1,69 @@
+import { type OutputStream } from "../tui/engine.js";
+import type { InputStream } from "../tui/input.js";
+import type { FleetEditable } from "../config/config.js";
+import { type FleetEdit } from "./staging.js";
+export type View = {
+    id: string;
+    label: string;
+    render(props: {
+        cols: number;
+        rows: number;
+    }): string[];
+};
+export type StudioOptions = {
+    input: InputStream;
+    output: OutputStream;
+    /** Loaded fleet state the buffer wraps. Defaults to an empty editable for the no-arg shell path. */
+    loaded?: FleetEditable;
+    /** Repository root used for overlay paths and live-run detection. Defaults to cwd. */
+    repoRoot?: string;
+    /** Global config directory override. */
+    globalDir?: string;
+};
+export declare class StudioApp {
+    private engine;
+    private views;
+    private active;
+    private showingHelp;
+    private confirmingQuit;
+    private showingSave;
+    private saveTarget;
+    private saveProposal;
+    private notice;
+    private staging;
+    private repoRoot;
+    private globalDir;
+    private _lines;
+    private resolveExit;
+    readonly exited: Promise<void>;
+    constructor(opts: StudioOptions);
+    /** Current line model last rendered or prepared. */
+    get lines(): string[];
+    /** Labels of every registered view, in order. */
+    get viewLabels(): string[];
+    /** Enter the alternate screen and start routing input. */
+    start(): void;
+    /** Restore the terminal and release the input stream. */
+    stop(): void;
+    /** Apply an edit to the staging buffer and repaint. Intended as the test seam and future edit hook. */
+    stageEdit(edit: FleetEdit): void;
+    private get isModalOpen();
+    private bindKeys;
+    private handleEscape;
+    private handleQuit;
+    private handleSaveOpen;
+    private handleSaveToggle;
+    private handleConfirm;
+    private handleCancel;
+    private executeSave;
+    private closeSave;
+    private handleRevert;
+    private setView;
+    private showNotice;
+    private paint;
+    private buildFrame;
+    private renderTabBar;
+    private renderStatusBar;
+    private renderHelp;
+    private renderQuitConfirm;
+}