tickmarkr 2.5.4 → 2.5.6

package/dist/tui/cockpit/run-view.js

@@ -1,9 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box } from "ink";
+import { useContext } from "react";
 import { GLYPHS } from "../../brand.js";
 import { GATE_NAMES } from "../../graph/schema.js";
 import { normalizeGateOutcome } from "../../run/outcome.js";
-import { BodyText, Panel } from "./components.js";
+import { BOARD_KEYS, boardFooter, clipBoard, renderBoardLines } from "./board.js";
+import { BodyText, Panel, ShellTheme } from "./components.js";
 import { applyDecisionKey, decisionConfirmLines, decisionKeybar, decisionReceiptLines, initialDecisionSession, } from "./decision-actions.js";
 import { fitCells, wrapCells } from "./width.js";
 /** Bounded history first, then the store's page accessor for an evicted line. */
@@ -170,15 +172,13 @@ export function runSummaryLine(s) {
 }
 const attemptLabel = (t) => (t.attempt !== undefined ? `attempt ${t.attempt}` : t.dispatches === 0 ? "never dispatched" : "attempt unknown");
 const parkOf = (t) => (t.state === "human" ? `human · ${t.parkKind ?? "unknown kind"}` : t.state);
-/** One matrix row: id, state, the seven letters in declaration order, the recorded attempt. */
-export function runTaskRow(t, cells) {
-    return `${t.id.padEnd(4)} ${parkOf(t).padEnd(20)} ${cells.map((c) => c.letter).join("  ")}  ${attemptLabel(t)}`;
-}
-const MATRIX_HEADER = `${"Task".padEnd(4)} ${"state".padEnd(20)} ${GATE_NAMES.map((g) => g.slice(0, 2)).join(" ")}  latest attempt`;
-const MATRIX_LEGEND = "P pass · F fail · R running · - not run · D disabled · ? unknown | declaration order, not a timeline · acceptance/review concurrent, optional";
-/** The Run body. Every line is measured through the width module; nothing overflows its column. */
-export function RunView({ snapshot, rows, page, graph, decisions, session, columns, run }) {
+/** The board's footer keys merged with the cockpit's own — every one of them handled by this view or the shell. */
+export const RUN_VIEW_KEYS = [...BOARD_KEYS.slice(0, 2), "←→ verdict gate", "PgUp/PgDn page", "x outcome", "a actions", "o pane", "Tab focus", "? keys", BOARD_KEYS[2]];
+/** The Run body: the approved board (BD-1) over the fold, then the selected task's detail panels. */
+export function RunView({ snapshot, rows, page, graph, decisions, session, columns, run, now = Date.now }) {
     const inner = Math.max(1, Math.floor(columns) - 4);
+    const colour = useContext(ShellTheme).mode !== "none";
+    const width = Math.max(1, Math.floor(columns));
     const fit = (text) => fitCells(text, inner);
     const decisionLines = (lines) => lines.flatMap((line) => wrapCells(line, inner));
     const lookup = evidenceLookup(rows, page);
@@ -194,9 +194,10 @@ export function RunView({ snapshot, rows, page, graph, decisions, session, colum
     const decision = task === undefined ? undefined : decisions.find((d) => d.taskId === task.id);
     const { menu, confirming, receipt, notice } = session.decisions;
     const blocked = task === undefined ? [] : graph?.tasks.filter((g) => g.deps.includes(task.id)).map((g) => g.id) ?? decision?.blocks ?? [];
-    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsxs(Panel, { title: `RUN / ${snapshot.lifecycle}`, focused: true, children: [_jsx(BodyText, { emphasis: "dim", children: fit(runSummaryLine(snapshot)) }), _jsx(BodyText, { emphasis: "dim", children: fit(`  ${MATRIX_HEADER}`) }), tasks.map((t, i) => (_jsx(BodyText, { emphasis: i === selection ? "strong" : "normal", children: fit(`${i === selection ? `${GLYPHS.pointer} ` : "  "}${runTaskRow(t, GATE_NAMES.map((gate) => ({ letter: GATE_CELL_LETTERS[t.gates[gate].state] })))}`) }, t.id))), tasks.length === 0 && _jsx(BodyText, { children: fit("no tasks recorded — no plan") }), _jsx(BodyText, { emphasis: "dim", children: fit(MATRIX_LEGEND) })] }), task !== undefined && (_jsxs(Panel, { title: `SELECTED / ${task.id}${task.title ? ` · ${task.title}` : ""}`, children: [_jsx(BodyText, { children: fit(`state ${parkOf(task)} · ${attemptLabel(task)} · dispatches ${task.dispatches} · path ${task.path ?? "unknown"} · pane ${task.pane ?? "unknown"} · alarm ${task.alarmMs === undefined ? "unknown" : `${task.alarmMs}ms`}${task.mergeEvidence ? ` · merged #L${task.mergeEvidence.line}` : ""}`) }), _jsx(BodyText, { emphasis: "dim", children: fit(`outcome filter ${session.outcomeFilter} (x cycles) · ${shown.length} of ${cells.length} gates shown`) }), shown.map((c) => (_jsx(BodyText, { children: fit(`${c.letter} ${c.gate.padEnd(10)} ${c.labels.join(" · ")}${c.line === undefined ? "" : ` · #L${c.line}`}`) }, c.gate)))] })), verdictCell !== undefined && (_jsxs(Panel, { title: `VERDICT / ${verdictCell.gate}${verdictCell.line === undefined ? "" : ` #L${verdictCell.line}`} · ${verdict.length === 0 ? "no verdict text" : `lines ${from + 1}–${from + window.length} of ${verdict.length}`}`, children: [window.map((line, i) => _jsx(BodyText, { children: fit(`${String(from + i + 1).padStart(4)} ${line}`) }, `${from + i}:${line}`)), _jsx(BodyText, { emphasis: "dim", children: fit("←→ gate · PageUp/PageDown page") })] })), task?.state === "human" && (_jsx(Panel, { title: `PARK / ${task.id}`, children: decision === undefined
+    const board = renderBoardLines({ runId: run.runId, snapshot, graph, now: now(), live: run.live, selection: task?.id, keys: false, colour }, width);
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(BodyText, { emphasis: "dim", children: fitCells(`RUN / ${snapshot.lifecycle} · ${runSummaryLine(snapshot)}`, width) }), board.map((line, i) => _jsx(BodyText, { children: line || " " }, `${i}:${line}`)), tasks.length === 0 && _jsx(BodyText, { children: fitCells("no tasks recorded — no plan", width) }), task !== undefined && (_jsxs(Panel, { title: `SELECTED / ${task.id}${task.title ? ` · ${task.title}` : ""}`, children: [_jsx(BodyText, { children: fit(`state ${parkOf(task)} · ${attemptLabel(task)} · dispatches ${task.dispatches} · path ${task.path ?? "unknown"} · pane ${task.pane ?? "unknown"} · alarm ${task.alarmMs === undefined ? "unknown" : `${task.alarmMs}ms`}${task.mergeEvidence ? ` · merged #L${task.mergeEvidence.line}` : ""}`) }), _jsx(BodyText, { emphasis: "dim", children: fit(`outcome filter ${session.outcomeFilter} (x cycles) · ${shown.length} of ${cells.length} gates shown`) }), shown.map((c) => (_jsx(BodyText, { children: fit(`${c.letter} ${c.gate.padEnd(10)} ${c.labels.join(" · ")}${c.line === undefined ? "" : ` · #L${c.line}`}`) }, c.gate)))] })), verdictCell !== undefined && (_jsxs(Panel, { title: `VERDICT / ${verdictCell.gate}${verdictCell.line === undefined ? "" : ` #L${verdictCell.line}`} · ${verdict.length === 0 ? "no verdict text" : `lines ${from + 1}–${from + window.length} of ${verdict.length}`}`, children: [window.map((line, i) => _jsx(BodyText, { children: fit(`${String(from + i + 1).padStart(4)} ${line}`) }, `${from + i}:${line}`)), _jsx(BodyText, { emphasis: "dim", children: fit("←→ gate · PageUp/PageDown page") })] })), task?.state === "human" && (_jsx(Panel, { title: `PARK / ${task.id}`, children: decision === undefined
                     ? _jsx(BodyText, { children: fit("park evidence unavailable — refresh before deciding") })
                     : (_jsxs(_Fragment, { children: [_jsx(BodyText, { children: fit(`#L${decision.park.line} ${decision.park.kind ?? "unknown kind"}${decision.park.failedGate ? ` · failed gate ${decision.park.failedGate}` : ""} · ${decision.park.reason ?? "no reason recorded"}`) }), _jsx(BodyText, { children: fit(`blocks ${blocked.length === 0 ? "nothing" : blocked.join(", ")} · attempts ${decision.attempts}`) }), _jsx(BodyText, { children: fit(decision.verbs.length === 0 ? `diagnostic: ${decision.diagnostic ?? "no verb"}` : `decisions: ${decision.verbs.join(" · ")} (a Actions)`) }), _jsx(BodyText, { emphasis: "dim", children: fit(run.live ? "matching live daemon enacts a release at its next task boundary" : run.blockingRunId ? `other live run ${run.blockingRunId} holds the lock; resume after it ends` : "no live owner: a release records permission; resume dispatches") })] })) })), menu !== null && (_jsx(Panel, { title: `ACTIONS / ${menu.taskId}`, focused: true, children: menu.verbs.length === 0
                     ? _jsx(BodyText, { children: fit(`no decision — ${decision?.diagnostic ?? "no verb for this park"}`) })
-                    : menu.verbs.map((verb, i) => _jsx(BodyText, { emphasis: i === menu.selection ? "strong" : "normal", children: fit(`${i === menu.selection ? `${GLYPHS.pointer} ` : "  "}${verb}`) }, verb)) })), confirming !== null && (_jsx(Panel, { title: `CONFIRM ${confirming.command.verb.toUpperCase()}`, focused: true, children: decisionLines(decisionConfirmLines(confirming)).map((line, i) => _jsx(BodyText, { children: line }, `${i}:${line}`)) })), receipt !== null && (_jsx(Panel, { title: receipt.ok ? "RECEIPT · appended" : "RECEIPT · refused", children: decisionLines(decisionReceiptLines(receipt)).map((line, i) => _jsx(BodyText, { children: line }, `${i}:${line}`)) })), notice !== null && _jsx(BodyText, { children: notice }), _jsx(BodyText, { emphasis: "dim", children: fitCells(["↑↓ Task", "←→ Verdict gate", "PgUp/PgDn Page", "x Outcome", decisionKeybar(session.decisions, decision)].filter(Boolean).join(" · "), Math.max(1, Math.floor(columns))) })] }));
+                    : menu.verbs.map((verb, i) => _jsx(BodyText, { emphasis: i === menu.selection ? "strong" : "normal", children: fit(`${i === menu.selection ? `${GLYPHS.pointer} ` : "  "}${verb}`) }, verb)) })), confirming !== null && (_jsx(Panel, { title: `CONFIRM ${confirming.command.verb.toUpperCase()}`, focused: true, children: decisionLines(decisionConfirmLines(confirming)).map((line, i) => _jsx(BodyText, { children: line }, `${i}:${line}`)) })), receipt !== null && (_jsx(Panel, { title: receipt.ok ? "RECEIPT · appended" : "RECEIPT · refused", children: decisionLines(decisionReceiptLines(receipt)).map((line, i) => _jsx(BodyText, { children: line }, `${i}:${line}`)) })), notice !== null && _jsx(BodyText, { children: notice }), _jsx(BodyText, { emphasis: "dim", children: clipBoard(boardFooter([...RUN_VIEW_KEYS, decisionKeybar(session.decisions, decision)].filter(Boolean), colour), width) })] }));
 }

package/dist/tui/ink/fleet-app.d.ts

@@ -1,10 +1,14 @@
 import { type AuthHealth, type WorkerAdapter } from "../../adapters/types.js";
-import type { MapEntry, RoutingMode, Tier } from "../../config/config.js";
+import type { MapEntry, RoutingMode, Tier, TickmarkrConfig } from "../../config/config.js";
 import { type Shape } from "../../graph/schema.js";
 export type FleetSteeringKey = "review" | "consult";
 export type FleetEditorState = {
     denyAdapters: string[];
     denyModels: string[];
+    /** OBS-1046: the staged routing.allow complement, distinct from the authored deny lists above */
+    allowOut?: string[];
+    denyWorkersAdapters: string[];
+    denyWorkersModels: string[];
     classifications: FleetClassification[];
     selectedMode: RoutingMode;
     map: Record<string, MapEntry>;
@@ -56,6 +60,17 @@ export type FleetModelEvidence = {
     probeMs?: number;
     /** OBS-519: doctor's failed model-auth verdict reason — the row must not render like a healthy one */
     unauthed?: string;
+    /** OBS-972/FL-1: a floating alias's resolved concrete model id (e.g. "opus" → "claude-opus-5") */
+    identity?: string;
+};
+/** The four staged deny sets every preview and the staged routing policy are computed from. */
+export type FleetStagedDeny = {
+    adapters: string[];
+    models: string[];
+    workersAdapters: string[];
+    workersModels: string[];
+    /** OBS-1046: the staged routing.allow complement; absent ⇒ the session's initial one */
+    allowOut?: string[];
 };
 export type FleetModelGroup = {
     adapter: string;
@@ -99,35 +114,43 @@ export type FleetCandidateOption = {
     };
 };
 export declare function formatDoctorAge(ageMs: number | null): string;
-export declare function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, entry, initialJudge, judgeSeats, viewRows, frameColumns, frameRows, }: {
+export type FleetReach = "in" | "out-workers" | "out-all" | "out-allow" | "unknown";
+/** The staged routing policy, or the loader's refusal of the staged overlay. */
+export type FleetStagedRouting = {
+    ok: true;
+    routing: TickmarkrConfig["routing"];
+} | {
+    ok: false;
+    error: string;
+};
+export declare function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels, initialAllowOut, initialDenyWorkersAdapters, initialDenyWorkersModels, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, stagedRouting, entry, initialJudge, judgeSeats, viewRows, frameColumns, frameRows, }: {
     ageMs: number | null;
     agents: AgentCli[];
     initialDenyAdapters: string[];
     initialDenyModels: string[];
+    /** OBS-1046: adapter ids and adapter:model keys routing.allow leaves out of the fleet */
+    initialAllowOut?: string[];
+    initialDenyWorkersAdapters?: string[];
+    initialDenyWorkersModels?: string[];
     modelGroups: FleetModelGroup[];
     initialMode: RoutingMode;
     modeOptions: FleetModeOption[];
     initialMap: Record<string, MapEntry>;
-    modePreview: (mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => string[];
-    shapeRows: (mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => FleetShapeRow[];
-    candidatesForShape: (shape: Shape, mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => {
+    modePreview: (mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => string[];
+    shapeRows: (mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => FleetShapeRow[];
+    candidatesForShape: (shape: Shape, mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => {
         rows: FleetCandidateOption[];
         excludedNote?: string;
+        ledger?: string[];
     };
     preferOptionsForShape: (shape: Shape, current: string[]) => string[];
     initialSteering: Record<FleetSteeringKey, string[] | undefined>;
     steeringOptionsFor: (which: FleetSteeringKey, current: string[]) => string[];
     reviewOverlay: (state: FleetEditorState) => FleetOverlayReview;
     reloadGuard: (bytes: string) => string | null;
+    /** the routing policy the staged deny sets load as (fleet: the config loader over the candidate
+     * bytes); absent ⇒ the four staged sets alone, with no allowlist */
+    stagedRouting?: (deny: FleetStagedDeny) => FleetStagedRouting;
     entry?: "presets" | "probe";
     /** resolved config judge as "adapter:model" — shown on the (keep default) picker row */
     initialJudge?: string;
@@ -140,36 +163,35 @@ export declare function FleetApp({ ageMs, agents, initialDenyAdapters, initialDe
     /** terminal height — set only on a real TTY so the footer sticks to the bottom */
     frameRows?: number;
 }): import("react").JSX.Element;
-export declare function runFleetInkEditor({ ageMs, adapters, health, initialDenyAdapters, initialDenyModels, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, entry, initialJudge, judgeSeats, initialInput, input, output, debug, }: {
+export declare function runFleetInkEditor({ ageMs, adapters, health, initialDenyAdapters, initialDenyModels, initialAllowOut, initialDenyWorkersAdapters, initialDenyWorkersModels, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, stagedRouting, entry, initialJudge, judgeSeats, initialInput, input, output, debug, }: {
     ageMs: number | null;
     adapters: WorkerAdapter[];
     health: Record<string, AuthHealth>;
     initialDenyAdapters: string[];
     initialDenyModels: string[];
+    /** OBS-1046: adapter ids and adapter:model keys routing.allow leaves out of the fleet */
+    initialAllowOut?: string[];
+    initialDenyWorkersAdapters?: string[];
+    initialDenyWorkersModels?: string[];
     modelGroups: FleetModelGroup[];
     initialMode: RoutingMode;
     modeOptions: FleetModeOption[];
     initialMap: Record<string, MapEntry>;
-    modePreview: (mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => string[];
-    shapeRows: (mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => FleetShapeRow[];
-    candidatesForShape: (shape: Shape, mode: RoutingMode, map: Record<string, MapEntry>, deny: {
-        adapters: string[];
-        models: string[];
-    }) => {
+    modePreview: (mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => string[];
+    shapeRows: (mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => FleetShapeRow[];
+    candidatesForShape: (shape: Shape, mode: RoutingMode, map: Record<string, MapEntry>, deny: FleetStagedDeny) => {
         rows: FleetCandidateOption[];
         excludedNote?: string;
+        ledger?: string[];
     };
     preferOptionsForShape: (shape: Shape, current: string[]) => string[];
     initialSteering: Record<FleetSteeringKey, string[] | undefined>;
     steeringOptionsFor: (which: FleetSteeringKey, current: string[]) => string[];
     reviewOverlay: (state: FleetEditorState) => FleetOverlayReview;
     reloadGuard: (bytes: string) => string | null;
+    /** the routing policy the staged deny sets load as (fleet: the config loader over the candidate
+     * bytes); absent ⇒ the four staged sets alone, with no allowlist */
+    stagedRouting?: (deny: FleetStagedDeny) => FleetStagedRouting;
     /** "presets" = init's entry: Esc in the browser is HOME to the preset overlay, not quit */
     entry?: "presets" | "probe";
     initialJudge?: string;