tickmarkr 1.85.0 → 1.87.0

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

@@ -3,10 +3,13 @@ import { emitKeypressEvents } from "node:readline";
 import { PassThrough } from "node:stream";
 import { render, Text, useApp, useInput } from "ink";
 import { useRef, useState } from "react";
+import { MODEL_ID_RE } from "../../adapters/types.js";
+import { fleetFirstTouchProvenance } from "../../config/fleet-overlay.js";
 import { TIERS } from "../../graph/schema.js";
 import { FleetListScreen, FleetReviewScreen, ToggleMark } from "./components.js";
 const STEERING_KEYS = ["review", "consult"];
 const escape = String.fromCharCode(27);
+const CHANNELS = ["sub", "api"];
 const inkBookkeepingWrites = new Set(["", `${escape}[?25l`, `${escape}[?25h`, `${escape}[?2026h`, `${escape}[?2026l`]);
 function inkOutput(output) {
     if (typeof output.on === "function" && typeof output.off === "function")
@@ -117,6 +120,11 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
     const [modelGroup, setModelGroup] = useState(0);
     const modelCursorRef = useRef(0);
     const [modelCursor, setModelCursor] = useState(0);
+    const modelIdRef = useRef("");
+    const [modelId, setModelId] = useState("");
+    const channelCursorRef = useRef(0);
+    const [channelCursor, setChannelCursor] = useState(0);
+    const channelByAdapterRef = useRef({});
     const tierCursorRef = useRef(0);
     const [tierCursor, setTierCursor] = useState(0);
     const pendingClassificationRef = useRef(null);
@@ -160,15 +168,30 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         const group = enabledModelGroups()[modelGroupRef.current];
         if (!group)
             return [];
-        return group.rows.map((row) => {
+        const rows = group.rows.map((row) => {
             const staged = classificationsRef.current.find((classification) => classification.adapter === group.adapter && classification.model === row.model);
             return staged ? { ...row, tier: staged.tier } : row;
         });
+        const known = new Set(rows.map((row) => row.model));
+        for (const staged of classificationsRef.current) {
+            if (staged.adapter === group.adapter && !known.has(staged.model)) {
+                rows.push({ model: staged.model, tier: staged.tier });
+            }
+        }
+        return rows;
     };
     const editorState = () => ({
         denyAdapters: [...(denyRef.current ?? [])].sort(),
         denyModels: [...(denyModelsRef.current ?? [])].sort(),
-        classifications: classificationsRef.current,
+        classifications: classificationsRef.current.map((classification) => classification.vendor && classification.channel
+            ? {
+                ...classification,
+                note: fleetFirstTouchProvenance(classification.note, {
+                    vendor: classification.vendor,
+                    channel: classification.channel,
+                }),
+            }
+            : classification),
         selectedMode: selectedModeRef.current,
         map: stagedMap(),
         steering: structuredClone(steeringRef.current),
@@ -186,6 +209,38 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         screenRef.current = next;
         setScreen(next);
     };
+    const beginClassification = (group, model) => {
+        tierCursorRef.current = 0;
+        setTierCursor(0);
+        const firstTouch = !group.rows.some((row) => row.tier !== undefined);
+        const pending = {
+            adapter: group.adapter,
+            model,
+            tier: TIERS[0],
+        };
+        if (!firstTouch) {
+            pendingClassificationRef.current = pending;
+            showScreen("tiers");
+            return;
+        }
+        if (!group.vendor) {
+            setNotice(`fleet: ${group.adapter} has no vendor declaration — classification cannot be saved`);
+            return;
+        }
+        pending.vendor = group.vendor;
+        const answered = channelByAdapterRef.current[group.adapter];
+        if (answered) {
+            pending.channel = answered;
+            pendingClassificationRef.current = pending;
+            showScreen("tiers");
+            return;
+        }
+        pendingClassificationRef.current = pending;
+        channelCursorRef.current = 0;
+        setChannelCursor(0);
+        setNotice("");
+        showScreen("channel");
+    };
     useInput((input, key) => {
         if (doneRef.current)
             return;
@@ -197,7 +252,13 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
             showScreen("steering");
             return;
         }
-        if (key.escape || (screenRef.current !== "provenance" && input === "q") || (key.ctrl && input === "c")) {
+        if (key.escape && screenRef.current === "add-model") {
+            setNotice("");
+            showScreen("models");
+            return;
+        }
+        const typing = screenRef.current === "provenance" || screenRef.current === "add-model";
+        if (key.escape || (!typing && input === "q") || (key.ctrl && input === "c")) {
             finish({ kind: "quit" });
             return;
         }
@@ -276,14 +337,14 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                     setNotice("fleet: tier reassignment on classified models is not supported in v1 — edit config directly");
                     return;
                 }
-                tierCursorRef.current = 0;
-                setTierCursor(0);
-                pendingClassificationRef.current = {
-                    adapter: group.adapter,
-                    model: row.model,
-                    tier: TIERS[0],
-                };
-                showScreen("tiers");
+                beginClassification(group, row.model);
+                return;
+            }
+            if (input === "n" && group) {
+                modelIdRef.current = "";
+                setModelId("");
+                setNotice("");
+                showScreen("add-model");
                 return;
             }
             if (key.return) {
@@ -300,6 +361,57 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
             }
             return;
         }
+        if (screenRef.current === "add-model") {
+            if (key.return) {
+                const group = enabledModelGroups()[modelGroupRef.current];
+                const candidate = modelIdRef.current;
+                if (!MODEL_ID_RE.test(candidate)) {
+                    setNotice(`fleet: model id must match ${MODEL_ID_RE.source}`);
+                    return;
+                }
+                if (currentModelRows().some((row) => row.model === candidate)) {
+                    setNotice(`fleet: ${candidate} is already listed for ${group?.adapter ?? "this adapter"}`);
+                    return;
+                }
+                if (group)
+                    beginClassification(group, candidate);
+                return;
+            }
+            if (key.backspace || key.delete) {
+                const next = modelIdRef.current.slice(0, -1);
+                modelIdRef.current = next;
+                setModelId(next);
+                return;
+            }
+            if (input && !key.ctrl && !key.meta) {
+                const next = modelIdRef.current + input;
+                modelIdRef.current = next;
+                setModelId(next);
+                setNotice("");
+            }
+            return;
+        }
+        if (screenRef.current === "channel") {
+            if (key.downArrow || input === "j") {
+                const next = Math.min(channelCursorRef.current + 1, CHANNELS.length - 1);
+                channelCursorRef.current = next;
+                setChannelCursor(next);
+                return;
+            }
+            if (key.upArrow || input === "k") {
+                const next = Math.max(channelCursorRef.current - 1, 0);
+                channelCursorRef.current = next;
+                setChannelCursor(next);
+                return;
+            }
+            if (key.return && pendingClassificationRef.current) {
+                const channel = CHANNELS[channelCursorRef.current];
+                channelByAdapterRef.current[pendingClassificationRef.current.adapter] = channel;
+                pendingClassificationRef.current.channel = channel;
+                showScreen("tiers");
+            }
+            return;
+        }
         if (screenRef.current === "tiers") {
             if (key.downArrow || input === "j") {
                 const next = Math.min(tierCursorRef.current + 1, TIERS.length - 1);
@@ -596,8 +708,12 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                 content: row.tier ? (_jsxs(_Fragment, { children: [_jsx(ToggleMark, { active: !denied }), _jsx(Text, { children: ` ${row.model}  ${row.tier}  ${denied ? "denied" : "allowed"}` })] })) : _jsx(Text, { children: `( ) ${row.model}  ???  unclassified${row.detectedAt ? ` (${row.detectedAt})` : ""}` }),
             };
         });
-        return (_jsx(FleetListScreen, { title: `step 3/6 · models · ${group?.adapter ?? ""}`, legend: "\u2191\u2193/jk move \u00B7 space toggle \u00B7 t tier \u00B7 enter next \u00B7 esc/q quit", rows: rows, cursor: modelCursor, details: notice ? [notice] : [] }));
+        return (_jsx(FleetListScreen, { title: `step 3/6 · models · ${group?.adapter ?? ""}`, legend: "\u2191\u2193/jk move \u00B7 space toggle \u00B7 t tier \u00B7 n add model \u00B7 enter next \u00B7 esc/q quit", rows: rows, cursor: modelCursor, details: notice ? [notice] : [] }));
     }
+    if (screen === "add-model")
+        return (_jsx(FleetListScreen, { title: `add model · ${group?.adapter ?? ""}`, legend: "type model id \u00B7 enter classify \u00B7 esc cancel", rows: [{ id: "model", content: _jsx(Text, { children: modelId || "model id (required):" }) }], cursor: 0, details: notice ? [notice] : [] }));
+    if (screen === "channel")
+        return (_jsx(FleetListScreen, { title: `channel · ${pendingClassificationRef.current?.adapter ?? ""}`, legend: "\u2191\u2193/jk move \u00B7 enter select \u00B7 esc/q quit", rows: CHANNELS.map((channel) => ({ id: channel, content: _jsx(Text, { children: channel }) })), cursor: channelCursor }));
     if (screen === "tiers") {
         return (_jsx(FleetListScreen, { title: `pick · tier · ${pendingClassificationRef.current?.adapter}:${pendingClassificationRef.current?.model}`, legend: "\u2191\u2193/jk move \u00B7 enter select \u00B7 esc/q quit", rows: TIERS.map((tier) => ({ id: tier, content: _jsx(Text, { children: tier }) })), cursor: tierCursor }));
     }
@@ -651,9 +767,14 @@ export async function runFleetInkEditor({ ageMs, adapters, health, initialDenyAd
                 authed: state.authed,
             }];
     });
+    const vendors = new Map(adapters.map((adapter) => [adapter.id, adapter.vendor]));
+    const declaredModelGroups = modelGroups.map((group) => ({
+        ...group,
+        vendor: group.vendor ?? vendors.get(group.adapter),
+    }));
     const bridgedInput = inkInput(input, initialInput);
     const legacyOutput = typeof output.on !== "function" || typeof output.off !== "function";
-    const app = render(_jsx(FleetApp, { ageMs: ageMs, agents: agents, initialDenyAdapters: initialDenyAdapters, initialDenyModels: initialDenyModels, modelGroups: modelGroups, initialMode: initialMode, modeOptions: modeOptions, initialMap: initialMap, modePreview: modePreview, shapeRows: shapeRows, candidatesForShape: candidatesForShape, preferOptionsForShape: preferOptionsForShape, initialSteering: initialSteering, steeringOptionsFor: steeringOptionsFor, reviewOverlay: reviewOverlay, reloadGuard: reloadGuard }), {
+    const app = render(_jsx(FleetApp, { ageMs: ageMs, agents: agents, initialDenyAdapters: initialDenyAdapters, initialDenyModels: initialDenyModels, modelGroups: declaredModelGroups, initialMode: initialMode, modeOptions: modeOptions, initialMap: initialMap, modePreview: modePreview, shapeRows: shapeRows, candidatesForShape: candidatesForShape, preferOptionsForShape: preferOptionsForShape, initialSteering: initialSteering, steeringOptionsFor: steeringOptionsFor, reviewOverlay: reviewOverlay, reloadGuard: reloadGuard }), {
         // FleetIO's injected stream predates Ink and did not require ref/unref.
         // Real terminal streams pass through unchanged; the compatibility facade
         // adds only those lifecycle methods and leaves input decoding to Ink.