tickmarkr 2.6.1 → 2.6.2

package/dist/tui/ink/fleet-app.js

@@ -3,12 +3,13 @@ import { Box, render, Text, useApp, useInput } from "ink";
 import { useRef, useState } from "react";
 import { MODEL_ID_RE } from "../../adapters/types.js";
 import { retiredModelReason } from "../../adapters/model-lints.js";
-import { DENY_SCOPES, denyBlockFrom, denyEntriesAt, initialDenyPropOf, stagedDenyKeyOf } from "../../config/config.js";
+import { DENY_SCOPES, EFFORT_ADAPTERS, denyBlockFrom, denyEntriesAt, initialDenyPropOf, stagedDenyKeyOf } from "../../config/config.js";
 import { fleetFirstTouchProvenance } from "../../config/fleet-overlay.js";
 import { exclusionReason } from "../../config/fleet-why.js";
 import { entryMatchesChannel, exclusionCollector } from "../../route/preference.js";
-import { TIERS } from "../../graph/schema.js";
+import { EFFORTS, TIERS } from "../../graph/schema.js";
 import { windowRows } from "./components.js";
+import { wrapCells } from "../cockpit/width.js";
 import { clip, clipPathTail, ElisionMark, enterAltScreen, fmtCtx, fmtMs, fmtUsdPair, Glyph, INK, inkInput, inkOutput, KeyBar, OverlayPanel, padCell, padCellStart, Pointer, SearchRow, } from "./frame.js";
 const STEERING_KEYS = ["review", "consult"];
 /** every scope's staged list, empty — the "every policy scope open" probe the picker lifts against */
@@ -31,12 +32,18 @@ function splitSeat(seat) {
     const at = seat.indexOf(":");
     return { adapter: seat.slice(0, at), model: seat.slice(at + 1) };
 }
+// a picker ledger row is labelled "adapter/model — …" (fleet.ts channelLedger); this is its seat id
+function ledgerChannelId(line) {
+    const head = line.split(" — ")[0];
+    const slash = head.indexOf("/");
+    return slash === -1 ? undefined : `${head.slice(0, slash)}:${head.slice(slash + 1)}`;
+}
 const REACH_CHOICES = [
     { id: "in", label: "in", gloss: "every seat may route here" },
     { id: "out-workers", label: "out · workers", gloss: "workers skip it; judge/review/consult unaffected" },
     { id: "out-all", label: "out · all seats", gloss: "no seat routes here" },
 ];
-export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, stagedRouting, entry = "probe", initialJudge = "", judgeSeats = [], viewRows = Number.POSITIVE_INFINITY, frameColumns = 100, frameRows, ...initialDenyProps }) {
+export function FleetApp({ ageMs, agents, initialAllowOut = [], initialEfforts = {}, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewAdvisories = [], reviewOverlay, reloadGuard, stagedRouting, entry = "probe", initialJudge = "", judgeSeats = [], viewRows = Number.POSITIVE_INFINITY, frameColumns = 100, frameRows, ...initialDenyProps }) {
     const { exit } = useApp();
     const [, setRevision] = useState(0);
     // the props are the fleet command's contract, one per schema-enumerated scope (initialDeny…),
@@ -60,6 +67,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
         allowOut: new Set(initialAllowOut),
         ...Object.fromEntries(DENY_SCOPES.map((scope) => [scope.key, new Set(initialDeny[scope.key])])),
         classifications: [],
+        efforts: structuredClone(initialEfforts),
         selectedMode: initialMode,
         map: structuredClone(initialMap),
         steering: structuredClone(initialSteering),
@@ -100,6 +108,12 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
             if (JSON.stringify(ui.steering[key]) !== JSON.stringify(initialSteering[key]))
                 n += 1;
         }
+        for (const adapter of new Set([...Object.keys(initialEfforts), ...Object.keys(ui.efforts)])) {
+            for (const model of new Set([...Object.keys(initialEfforts[adapter] ?? {}), ...Object.keys(ui.efforts[adapter] ?? {})])) {
+                if (initialEfforts[adapter]?.[model] !== ui.efforts[adapter]?.[model])
+                    n += 1;
+            }
+        }
         return n;
     };
     // ── derived data ───────────────────────────────────────────────────────────
@@ -367,6 +381,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                 }),
             }
             : classification),
+        efforts: structuredClone(ui.efforts),
         selectedMode: ui.selectedMode,
         map: ui.map,
         ...(ui.judgeSeat ? { judgeSeat: splitSeat(ui.judgeSeat) } : {}),
@@ -704,10 +719,9 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
     // same picker reopens over the recomputed policy — a shared or adapter-wide entry is refused by
     // name and the row stays greyed
     const liftFromPicker = (overlay, line) => {
-        const head = line.split(" — ")[0];
-        const slash = head.indexOf("/");
-        const self = slash === -1 ? undefined
-            : displayedChannels().find((channel) => channel.adapter === head.slice(0, slash) && channel.model === head.slice(slash + 1));
+        const lineId = ledgerChannelId(line);
+        const self = lineId === undefined ? undefined
+            : displayedChannels().find((channel) => `${channel.adapter}:${channel.model}` === lineId);
         if (!self) {
             ui.notice = `nothing to lift on this row — ${line}`;
             bump();
@@ -747,7 +761,12 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
         bump();
     };
     const reviewWindow = (overlay) => {
-        const lines = overlay.review.diff.split("\n");
+        // OBS-1144: notes are pre-wrapped to the diff's width and lead the SAME scrolled buffer, so a
+        // note never sits past the terminal's last row, unreachable, while y still saves.
+        const notes = (overlay.review.notes ?? [])
+            .flatMap((note) => wrapCells(`! ${note}`, bodyW - 6, { continuationPrefix: "  " }))
+            .map((text) => ({ text, note: true }));
+        const lines = [...notes, ...overlay.review.diff.split("\n").map((text) => ({ text, note: false }))];
         const cap = reviewCapacity();
         const maxScroll = Math.max(lines.length - cap, 0);
         const scroll = Math.min(Math.max(overlay.scroll, 0), maxScroll);
@@ -1059,16 +1078,39 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                     bump();
                     return;
                 }
-                if (input === " " && rows[overlay.at]) {
-                    const id = rows[overlay.at].id;
+                if (input === " ") {
+                    const offered = rows[overlay.at];
+                    const greyed = offered ? undefined : ledger[overlay.at - rows.length];
+                    const id = offered?.id ?? (greyed === undefined ? undefined : ledgerChannelId(greyed));
+                    if (id === undefined)
+                        return;
                     const at = overlay.chain.indexOf(id);
-                    if (at === -1)
+                    // OBS-1145 add.1: Space drops ANY carried member, admitted or not, and leaves its deny
+                    // alone; only an offered row joins — a greyed one still enters through its reach (Enter)
+                    if (at !== -1)
+                        overlay.chain.splice(at, 1);
+                    else if (offered)
                         overlay.chain.push(id);
                     else
-                        overlay.chain.splice(at, 1);
+                        ui.notice = `${id} is not offered — Enter lifts it first; Space pools offered rows only`;
                     bump();
                     return;
                 }
+                // a selection is a POOL, and its mode is a decision, not a default — the tiny
+                // poolmode overlay asks it; Esc there restores this picker with the chain intact
+                // OBS-525: an existing pool's mode seeds the cursor so a round-trip keeps it
+                const askPoolMode = () => setOverlay({ kind: "poolmode", picker: overlay, at: ui.map[overlay.shape]?.pool?.mode === "ordered" ? 1 : 0 });
+                // OBS-1145 add.1: Tab applies the chain from ANY row — in an all-greyed picker every row is
+                // ✗ and Enter lifts it, so a Space drop there had no commit path; Tab lifts no deny
+                if (key.tab) {
+                    if (overlay.chain.length)
+                        askPoolMode();
+                    else {
+                        ui.notice = `the ${overlay.shape} pool is empty — Esc keeps it; a on the shape reverts it to auto`;
+                        bump();
+                    }
+                    return;
+                }
                 if (key.return) {
                     const greyed = ledger[overlay.at - rows.length];
                     if (!rows[overlay.at] && greyed !== undefined) {
@@ -1076,10 +1118,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                         return;
                     }
                     if (overlay.chain.length) {
-                        // a selection is a POOL, and its mode is a decision, not a default — the tiny
-                        // poolmode overlay asks it; Esc there restores this picker with the chain intact
-                        // OBS-525: an existing pool's mode seeds the cursor so a round-trip keeps it
-                        setOverlay({ kind: "poolmode", picker: overlay, at: ui.map[overlay.shape]?.pool?.mode === "ordered" ? 1 : 0 });
+                        askPoolMode();
                         return;
                     }
                     if (rows[overlay.at]) {
@@ -1448,6 +1487,29 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                 setOverlay({ kind: "lift", id: `${row.adapter}:${row.model}`, covering: row.covering });
                 return;
             }
+            if (hotkey === "e" && row) {
+                // OBS-1182: e cycles launch effort default → low → medium → high → default; the seat's
+                // identity (adapter:model) never changes, only tiers.<adapter>.modelOverrides.<model>.effort
+                if (!EFFORT_ADAPTERS.includes(row.adapter)) {
+                    ui.notice = `${row.adapter} takes no effort level — effort is launch metadata only ${EFFORT_ADAPTERS.join(" and ")} accept`;
+                }
+                else if (!row.tier) {
+                    ui.notice = `${row.adapter}:${row.model} is unclassified — classify it before setting its effort`;
+                }
+                else {
+                    const current = ui.efforts[row.adapter]?.[row.model];
+                    const next = EFFORTS[current === undefined ? 0 : EFFORTS.indexOf(current) + 1];
+                    const models = { ...ui.efforts[row.adapter] };
+                    if (next === undefined)
+                        delete models[row.model];
+                    else
+                        models[row.model] = next;
+                    ui.efforts = { ...ui.efforts, [row.adapter]: models };
+                    ui.notice = `${row.adapter}:${row.model} effort → ${next ?? "CLI default"} — w writes tiers.${row.adapter}.modelOverrides.${row.model}.effort`;
+                }
+                bump();
+                return;
+            }
             if (hotkey === "t" && row) {
                 if (row.tier) {
                     ui.notice = "tier reassignment on classified models is not supported in v1 — edit config directly";
@@ -1657,6 +1719,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
         const parts = [
             `${row.adapter}:${row.model}`,
             row.tier ?? "unclassified",
+            ui.efforts[row.adapter]?.[row.model] ? `effort ${ui.efforts[row.adapter][row.model]}` : "",
             ui.lastEdit?.id === `${row.adapter}:${row.model}` ? ui.lastEdit.text : "",
             identityDetail(row),
             row.tier ? reachDetail(row) : "",
@@ -1734,7 +1797,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
         if (overlay.kind === "review") {
             const { visible, scroll, cap, lines } = reviewWindow(overlay);
             const below = lines.length - scroll - visible.length;
-            return (_jsxs(OverlayPanel, { title: `review · ${overlay.review.path}`, width: bodyW, children: [_jsx(Text, { dimColor: true, wrap: "truncate", children: clip("everything staged lands in this one diff — y writes, n discards, ↑↓ scroll, Esc keeps editing", bodyW - 4) }), scroll > 0 && _jsx(ElisionMark, { count: scroll, side: "above" }), visible.map((line, index) => (_jsx(Text, { wrap: "truncate", color: line.startsWith("+") ? INK.brand : line.startsWith("-") ? INK.fail : undefined, dimColor: line.startsWith("@") || line.startsWith("---") || line.startsWith("+++"), children: clip(line, bodyW - 6) || " " }, `${scroll + index}:${line}`))), below > 0 && _jsx(ElisionMark, { count: below, side: "below", hint: `↓ scrolls · PgDn jumps ${cap} lines` })] }));
+            return (_jsxs(OverlayPanel, { title: clipPathTail(`review · ${overlay.review.path}`, bodyW - 4), width: bodyW, children: [_jsx(Text, { dimColor: true, wrap: "truncate", children: clip("everything staged lands in this one diff — y writes, n discards, ↑↓ scroll, Esc keeps editing", bodyW - 4) }), scroll > 0 && _jsx(ElisionMark, { count: scroll, side: "above" }), visible.map(({ text: line, note }, index) => (_jsx(Text, { wrap: "truncate", color: note ? INK.warn : line.startsWith("+") ? INK.brand : line.startsWith("-") ? INK.fail : undefined, dimColor: !note && (line.startsWith("@") || line.startsWith("---") || line.startsWith("+++")), children: clip(line, bodyW - 6) || " " }, `${scroll + index}:${line}`))), below > 0 && _jsx(ElisionMark, { count: below, side: "below", hint: `↓ scrolls · PgDn jumps ${cap} lines` })] }));
         }
         if (overlay.kind === "classify") {
             const subject = overlay.bulk
@@ -1767,10 +1830,13 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
             ];
             const { visible, start, above, below } = windowRows(items, overlay.at, Math.max(1, capacity - noteLines.length + 1));
             const chained = overlay.chain.length > 0;
-            return (_jsxs(OverlayPanel, { title: chained ? `pool · ${overlay.shape}` : `pin · ${overlay.shape}`, width: bodyW, children: [_jsx(Text, { dimColor: true, wrap: "truncate", children: clip("Enter pins one channel · Space selects a pool in order — Enter then asks its mode (pool replaces pin)", bodyW - 4) }), _jsx(SearchRow, { filter: ui.filter, active: true }), noteLines.map((line, index) => _jsx(Text, { dimColor: true, wrap: "truncate", children: clip(line, bodyW - 4) }, `excluded-${index}`)), above > 0 && _jsx(ElisionMark, { count: above, side: "above" }), visible.map(({ candidate, line }, index) => {
+            return (_jsxs(OverlayPanel, { title: chained ? `pool · ${overlay.shape}` : `pin · ${overlay.shape}`, width: bodyW, children: [_jsx(Text, { dimColor: true, wrap: "truncate", children: clip("Enter pins one channel · Space pools in order · Tab applies the pool from any row — Enter on an offered row too (pool replaces pin)", bodyW - 4) }), _jsx(SearchRow, { filter: ui.filter, active: true }), noteLines.map((line, index) => _jsx(Text, { dimColor: true, wrap: "truncate", children: clip(line, bodyW - 4) }, `excluded-${index}`)), above > 0 && _jsx(ElisionMark, { count: above, side: "above" }), visible.map(({ candidate, line }, index) => {
                         const selected = start + index === overlay.at;
                         if (candidate === undefined) {
-                            return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Pointer, { on: selected }), _jsx(Text, { dimColor: true, children: "✗ " }), _jsx(Text, { bold: selected, dimColor: !selected, children: clip(line, bodyW - 10) })] }, `ledger-${start + index}`));
+                            // OBS-1145 add.1: a carried chain member the picker cannot offer keeps its ordinal
+                            const id = ledgerChannelId(line);
+                            const at = id === undefined ? -1 : overlay.chain.indexOf(id);
+                            return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Pointer, { on: selected }), at !== -1 && _jsx(Text, { color: INK.brand, children: `${at + 1} ` }), _jsx(Text, { dimColor: true, children: "✗ " }), _jsx(Text, { bold: selected, dimColor: !selected, children: clip(line, bodyW - (at === -1 ? 10 : 12)) })] }, `ledger-${start + index}`));
                         }
                         const at = overlay.chain.indexOf(candidate.id);
                         return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Pointer, { on: selected }), at === -1 ? _jsx(Text, { dimColor: true, children: "· " }) : _jsx(Text, { color: INK.brand, children: `${at + 1} ` }), _jsx(Text, { bold: selected, children: clip(candidate.label, bodyW - 10) })] }, candidate.id));
@@ -1840,7 +1906,8 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
             return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: "Shapes" }), _jsx(Text, { dimColor: true, children: `  routed under ${ui.selectedMode}` })] }), _jsx(Text, { children: " " }), rows.map((row, index) => renderShapeRow(row, ui.focus === "list" && index === ui.listAt))] }));
         }
         const rows = steeringList();
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: "Steering" }), _jsx(Text, { dimColor: true, children: "  review · consult · judge" })] }), _jsx(Text, { children: " " }), rows.map((row, index) => renderPlainRow(row.id, row.label, ui.focus === "list" && index === ui.listAt))] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: "Steering" }), _jsx(Text, { dimColor: true, children: "  review · consult · judge" })] }), _jsx(Text, { children: " " }), rows.map((row, index) => renderPlainRow(row.id, row.label, ui.focus === "list" && index === ui.listAt)), reviewAdvisories.length ? _jsx(Text, { children: " " }) : null, reviewAdvisories.flatMap((line) => wrapCells(`! ${line}`, bodyW - 4, { continuationPrefix: "  " }))
+                    .map((text, index) => _jsx(Text, { color: INK.warn, children: text }, `advisory-${index}`))] }));
     })();
     // ── footer ─────────────────────────────────────────────────────────────────
     const detailLines = () => {
@@ -1911,6 +1978,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
             if (overlay.kind === "candidates") {
                 return [
                     { key: "Enter", label: overlay.chain.length ? "apply pool" : "pin · lift greyed" },
+                    ...(overlay.chain.length ? [{ key: "Tab", label: "apply from any row" }] : []),
                     { key: "Space", label: "pool in order" },
                     { key: "type", label: "search" },
                     { key: "Esc", label: "cancel" },
@@ -1955,6 +2023,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                 { key: "Enter", label: "assign/classify" },
                 { key: "Space", label: "reach picker" },
                 { key: "l", label: "lift entry" },
+                { key: "e", label: "effort" },
                 { key: "m", label: "presets" },
                 { key: "w", label: "review + write" },
                 { key: "←", label: "rail" },
@@ -1985,7 +2054,7 @@ export function FleetApp({ ageMs, agents, initialAllowOut = [], modelGroups, ini
                 ? _jsx(Text, { color: INK.warn, children: ` ! ${clip(ui.notice, width - 4)}` })
                 : details.map((line) => _jsx(Text, { dimColor: true, children: ` ${clip(line, width - 2)}` }, line)), _jsx(KeyBar, { binds: keyBinds() })] }));
 }
-export async function runFleetInkEditor({ ageMs, adapters, health, initialAllowOut = [], modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewOverlay, reloadGuard, stagedRouting, entry = "probe", initialJudge = "", judgeSeats = [], initialInput = [], input, output, debug = false, ...initialDenyProps }) {
+export async function runFleetInkEditor({ ageMs, adapters, health, initialAllowOut = [], initialEfforts, modelGroups, initialMode, modeOptions, initialMap, modePreview, shapeRows, candidatesForShape, preferOptionsForShape, initialSteering, steeringOptionsFor, reviewAdvisories = [], reviewOverlay, reloadGuard, stagedRouting, entry = "probe", initialJudge = "", judgeSeats = [], initialInput = [], input, output, debug = false, ...initialDenyProps }) {
     const agents = adapters.flatMap((adapter) => {
         const state = health[adapter.id];
         if (!state?.installed)
@@ -2009,7 +2078,7 @@ export async function runFleetInkEditor({ ageMs, adapters, health, initialAllowO
     // rebuilt from output.columns/rows so a pane resize re-renders at the new size. Same root
     // element type on every rerender ⇒ React keeps the component instance, so staged edits,
     // cursor, and overlays all survive the resize.
-    const editorElement = () => (_jsx(FleetApp, { ageMs: ageMs, agents: agents, ...initialDenyProps, initialAllowOut: initialAllowOut, modelGroups: declaredModelGroups, initialMode: initialMode, modeOptions: modeOptions, initialMap: initialMap, modePreview: modePreview, shapeRows: shapeRows, candidatesForShape: candidatesForShape, preferOptionsForShape: preferOptionsForShape, initialSteering: initialSteering, steeringOptionsFor: steeringOptionsFor, reviewOverlay: reviewOverlay, reloadGuard: reloadGuard, stagedRouting: stagedRouting, entry: entry, initialJudge: initialJudge, judgeSeats: judgeSeats, 
+    const editorElement = () => (_jsx(FleetApp, { ageMs: ageMs, agents: agents, ...initialDenyProps, initialAllowOut: initialAllowOut, initialEfforts: initialEfforts, modelGroups: declaredModelGroups, initialMode: initialMode, modeOptions: modeOptions, initialMap: initialMap, modePreview: modePreview, shapeRows: shapeRows, candidatesForShape: candidatesForShape, preferOptionsForShape: preferOptionsForShape, initialSteering: initialSteering, steeringOptionsFor: steeringOptionsFor, reviewAdvisories: reviewAdvisories, reviewOverlay: reviewOverlay, reloadGuard: reloadGuard, stagedRouting: stagedRouting, entry: entry, initialJudge: initialJudge, judgeSeats: judgeSeats, 
         // v1.90.9: cap every list to the terminal minus chrome so the cursor and header can
         // never scroll off-screen (omp's 218-model list did exactly that pre-cap).
         // OBS-523: chrome is ≤12 rows worst case (header, borders, padding, scope+search,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",
@@ -80,6 +80,7 @@
         "scripts/assert-test-file-count.sh",
         "scripts/emit-schema.ts",
         "scripts/probe-rig.mjs",
+        "scripts/run-ci-vitest.sh",
         "specs/export-selftest.spec.md"
       ],
       "prefixes": [