tickmarkr 2.3.0 → 2.4.0

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

@@ -68,6 +68,10 @@ export type FleetModelGroup = {
         detectedAt?: string;
         suggestion?: FleetModelSuggestion;
         evidence?: FleetModelEvidence;
+        classifyModel?: string;
+        variants?: string[];
+        foldedModels?: string[];
+        score?: number;
     }>;
 };
 export type FleetClassification = {

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

@@ -96,7 +96,8 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
     };
     const groupRows = (group) => {
         const rows = group.rows.map((row) => {
-            const staged = ui.classifications.find((classification) => classification.adapter === group.adapter && classification.model === row.model);
+            const staged = ui.classifications.find((classification) => classification.adapter === group.adapter
+                && (classification.model === row.model || classification.model === row.classifyModel));
             return {
                 adapter: group.adapter,
                 model: row.model,
@@ -105,10 +106,14 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                 suggestion: row.suggestion,
                 evidence: row.evidence,
                 channel: group.channel,
+                classifyModel: row.classifyModel,
+                variants: row.variants,
+                foldedModels: row.foldedModels,
+                score: row.score,
                 denied: ui.denyModels.has(`${group.adapter}:${row.model}`),
             };
         });
-        const known = new Set(rows.map((row) => row.model));
+        const known = new Set(rows.flatMap((row) => row.classifyModel ? [row.model, row.classifyModel] : [row.model]));
         for (const staged of ui.classifications) {
             if (staged.adapter === group.adapter && !known.has(staged.model)) {
                 rows.push({
@@ -125,10 +130,21 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
     const matches = (label, f) => f === "" || label.toLowerCase().includes(f.toLowerCase());
     // Operator directive 2026-08-13: retired shapes (dated snapshots, previews, non-worker SKUs,
     // legacy families) hide by DEFAULT. `a` reveals them; a CLASSIFIED row is never hidden.
-    const modelRows = (f = ui.filter) => scopedGroups().flatMap(groupRows).filter((row) => matches(`${row.adapter}/${row.model}`, f)
-        && (ui.showAll || row.tier !== undefined || retiredModelReason(row.model) === null));
-    const hiddenModelCount = (f = ui.filter) => scopedGroups().flatMap(groupRows).filter((row) => matches(`${row.adapter}/${row.model}`, f)).length
+    const modelRows = (f = ui.filter) => {
+        const rows = scopedGroups().flatMap(groupRows).filter((row) => matches(`${row.adapter}/${row.model} ${(row.foldedModels ?? []).join(" ")}`, f)
+            && (ui.showAll || row.tier !== undefined || retiredModelReason(row.model) === null));
+        const classified = rows.filter((row) => row.tier !== undefined);
+        const unclassified = rows.filter((row) => row.tier === undefined).sort((a, b) => Number(!!b.suggestion) - Number(!!a.suggestion)
+            || (b.detectedAt ?? "").localeCompare(a.detectedAt ?? "")
+            || (b.score ?? Number.NEGATIVE_INFINITY) - (a.score ?? Number.NEGATIVE_INFINITY)
+            || `${a.adapter}/${a.model}`.localeCompare(`${b.adapter}/${b.model}`));
+        return [...classified, ...unclassified];
+    };
+    const hiddenModelCount = (f = ui.filter) => scopedGroups().flatMap(groupRows)
+        .filter((row) => matches(`${row.adapter}/${row.model} ${(row.foldedModels ?? []).join(" ")}`, f)).length
         - modelRows(f).length;
+    const foldedModelCount = (f = ui.filter) => modelRows(f)
+        .reduce((count, row) => count + Math.max((row.foldedModels?.length ?? 1) - 1, 0), 0);
     /** rail counts mirror the list's retired-hide (never the text filter) so numbers agree on screen */
     const visibleCount = (scope) => {
         const groups = scope === -1 ? enabledGroups() : (modelGroups[scope] ? [modelGroups[scope]] : []);
@@ -232,14 +248,17 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
             return;
         // OBS-508: catalog evidence prefills the flow — the tier cursor lands on the suggested band and
         // (when the operator keeps that band) the provenance note arrives pre-typed. Free to override.
-        const suggestion = group.rows.find((row) => row.model === model)?.suggestion ?? null;
+        const source = group.rows.find((row) => row.model === model);
+        const suggestion = source?.suggestion ?? null;
+        const classifyModel = source?.classifyModel ?? model;
         const tierAt = suggestion ? Math.max(TIERS.indexOf(suggestion.tier), 0) : 0;
         const firstTouch = !group.rows.some((row) => row.tier !== undefined)
             && !ui.classifications.some((c) => c.adapter === adapter);
         const base = {
             kind: "classify",
             adapter,
-            model,
+            model: classifyModel,
+            ...(classifyModel !== model ? { displayModel: model } : {}),
             channelAt: 0,
             tierAt,
             note: "",
@@ -966,7 +985,7 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                 const group = modelGroups[ui.adapterAt];
                 const suggested = rows
                     .filter((candidate) => candidate.adapter === group.adapter && !candidate.tier && candidate.suggestion !== undefined)
-                    .map((candidate) => ({ model: candidate.model, suggestion: candidate.suggestion }));
+                    .map((candidate) => ({ model: candidate.classifyModel ?? candidate.model, suggestion: candidate.suggestion }));
                 if (!suggested.length) {
                     ui.notice = "no catalog tier suggestions among the visible unclassified models — evidence comes from the cached catalogs (AA index / API pricing)";
                     bump();
@@ -1101,6 +1120,9 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         const parts = [
             `${row.adapter}:${row.model}`,
             row.tier ?? "unclassified",
+            row.variants?.length ? `variants ${row.variants.join(", ")}` : "",
+            row.classifyModel ? `classify writes ${row.classifyModel}` : "",
+            row.foldedModels?.length ? `${row.foldedModels.length} gateway ids folded: ${row.foldedModels.join(", ")}` : "",
             row.evidence?.unauthed !== undefined ? `UNAUTHED — ${row.evidence.unauthed}` : "",
             row.evidence?.contextWindow !== undefined ? `${fmtCtx(row.evidence.contextWindow)} ctx` : "",
             row.evidence?.outputWindow !== undefined ? `${fmtCtx(row.evidence.outputWindow)} out` : "",
@@ -1120,7 +1142,8 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         const nameW = bodyW - 4 - 11 - 6 - (showPrice ? 12 : 0) - (showProbe ? 7 : 0);
         // OBS-531: deep router ids (omp/prime-agent) clip tail-preserving — the LAST segment is the
         // distinguishing half; end-clipping rendered ten identical "prime-agent/anthropic/claude-…" rows.
-        const name = clipPathTail(`${row.adapter}/${row.model}`, nameW);
+        const folded = row.foldedModels?.length ?? 1;
+        const name = clipPathTail(`${row.adapter}/${row.model}${folded > 1 ? ` ×${folded}` : ""}`, nameW);
         const prefixLen = Math.min(name.length, row.adapter.length + 1);
         return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Pointer, { on: selected }), row.denied
                     ? _jsx(Glyph, { kind: "off" })
@@ -1174,7 +1197,9 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         if (overlay.kind === "classify") {
             const subject = overlay.bulk
                 ? `${overlay.adapter} · ${overlay.bulk.rows.length} suggested models`
-                : `${overlay.adapter}:${overlay.model}`;
+                : overlay.displayModel
+                    ? `${overlay.adapter}:${overlay.displayModel} · writes ${overlay.model}`
+                    : `${overlay.adapter}:${overlay.model}`;
             return (_jsxs(OverlayPanel, { title: `classify · ${subject}`, width: bodyW, children: [overlay.stage === "channel" && (_jsxs(_Fragment, { children: [_jsxs(Text, { dimColor: true, children: ["first touch for ", overlay.adapter, " \u2014 how is this CLI billed?"] }), _jsx(Text, { children: " " }), CHANNELS.map((channel, index) => (_jsxs(Text, { children: [_jsx(Pointer, { on: overlay.channelAt === index }), _jsx(Text, { bold: overlay.channelAt === index, children: padCell(channel, 5) }), _jsx(Text, { dimColor: true, children: channel === "sub" ? "flat-rate subscription quota" : "metered API billing" })] }, channel)))] })), overlay.stage === "tier" && (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: overlay.suggestion
                                     ? `catalog suggests ${overlay.suggestion.tier} — keep it and the provenance note arrives pre-typed`
                                     : "pick the capability band this model routes as" }), _jsx(Text, { children: " " }), TIERS.map((tier, index) => (_jsxs(Text, { children: [_jsx(Pointer, { on: overlay.tierAt === index }), overlay.suggestion?.tier === tier ? _jsx(Glyph, { kind: "on" }) : _jsx(Text, { children: " " }), _jsx(Text, { bold: overlay.tierAt === index, children: ` ${padCell(tier, 9)}` }), _jsx(Text, { dimColor: true, children: tier === "frontier" ? "strongest band — integrity shapes" : tier === "mid" ? "capable daily driver" : "fast + cheap" })] }, tier)))] })), overlay.stage === "note" && (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "benchmark provenance (required) \u2014 where does this tier claim come from?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: INK.brand, children: "> " }), _jsx(Text, { children: clip(overlay.note, bodyW - 6) || "" }), _jsx(Text, { color: INK.brand, children: "\u2588" })] })] }))] }));
@@ -1220,6 +1245,15 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
         const selectedSeat = ui.judgeSeat ?? judgeKeepRow;
         return (_jsxs(OverlayPanel, { title: "pick \u00B7 judge", width: bodyW, children: [_jsx(Text, { dimColor: true, children: "one seat judges acceptance criteria \u2014 failover stays runtime (GATE-09)" }), _jsx(SearchRow, { filter: ui.filter, active: true }), above > 0 && _jsx(ElisionMark, { count: above, side: "above" }), visible.map((label, index) => (_jsxs(Text, { children: [_jsx(Pointer, { on: start + index === overlay.at }), label === selectedSeat ? _jsx(Glyph, { kind: "on" }) : _jsx(Text, { children: " " }), _jsx(Text, { bold: start + index === overlay.at, children: ` ${clip(label, bodyW - 10)}` })] }, label))), below > 0 && _jsx(ElisionMark, { count: below, side: "below" })] }));
     })();
+    const modelVisibilityLine = () => {
+        const hidden = hiddenModelCount();
+        const folded = foldedModelCount();
+        return [
+            ...(folded ? [`${folded} same-model gateway id${folded === 1 ? "" : "s"} folded`] : []),
+            ...(hidden ? [`${hidden} retired/preview/non-worker hidden — a shows all`] : []),
+            ...(ui.showAll ? ["showing retired models — a hides them again"] : []),
+        ].join(" · ");
+    };
     const listNode = (() => {
         if (overlayNode)
             return overlayNode;
@@ -1230,7 +1264,7 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                 ? "All models"
                 : modelGroups[ui.adapterAt]?.adapter ?? "";
             const scopeDenied = ui.adapterAt !== -1 && ui.deny.has(modelGroups[ui.adapterAt]?.adapter ?? "");
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: scopeLabel }), _jsx(Text, { dimColor: true, children: `  ${rows.length}` })] }), _jsx(SearchRow, { filter: ui.filter, active: ui.searching, hint: "/ to search" }), scopeDenied && _jsx(Text, { color: INK.warn, children: `${modelGroups[ui.adapterAt]?.adapter} is out of the fleet — Space on its rail row adds it back` }), above > 0 && _jsx(ElisionMark, { count: above, side: "above" }), visible.map((row, index) => renderModelRow(row, ui.focus === "list" && start + index === ui.listAt)), below > 0 && _jsx(ElisionMark, { count: below, side: "below", hint: "/ to search" }), rows.length === 0 && !scopeDenied && _jsx(Text, { dimColor: true, children: "  no models match" })] }));
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: scopeLabel }), _jsx(Text, { dimColor: true, children: `  ${rows.length}` })] }), _jsx(SearchRow, { filter: ui.filter, active: ui.searching, hint: "/ to search" }), modelVisibilityLine() && _jsx(Text, { dimColor: true, children: `  ${modelVisibilityLine()}` }), scopeDenied && _jsx(Text, { color: INK.warn, children: `${modelGroups[ui.adapterAt]?.adapter} is out of the fleet — Space on its rail row adds it back` }), above > 0 && _jsx(ElisionMark, { count: above, side: "above" }), visible.map((row, index) => renderModelRow(row, ui.focus === "list" && start + index === ui.listAt)), below > 0 && _jsx(ElisionMark, { count: below, side: "below", hint: "/ to search" }), rows.length === 0 && !scopeDenied && _jsx(Text, { dimColor: true, children: "  no models match" })] }));
         }
         if (ui.view === "shapes") {
             const rows = shapeList();
@@ -1266,11 +1300,6 @@ export function FleetApp({ ageMs, agents, initialDenyAdapters, initialDenyModels
                         : "unclassified — Space/Enter classifies; unclassified models are never routed");
                 }
             }
-            const hidden = hiddenModelCount();
-            if (hidden > 0 && lines.length < 2)
-                lines.push(`${hidden} retired/preview/non-worker hidden — a shows all`);
-            if (ui.showAll && lines.length < 2)
-                lines.push("showing retired models — a hides them again");
             return lines;
         }
         if (ui.view === "shapes") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",
@@ -57,5 +57,63 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "^3.0.0"
+  },
+  "tickmarkrExport": {
+    "publicPaths": {
+      "exact": [
+        ".gitignore",
+        ".oxlintrc.json",
+        "CHANGELOG.md",
+        "CODE_OF_CONDUCT.md",
+        "CONTRIBUTING.md",
+        "FLEET.md",
+        "LICENSE",
+        "README.md",
+        "RELEASING.md",
+        "SECURITY.md",
+        "package-lock.json",
+        "package.json",
+        "tickmarkr.spec.md",
+        "tsconfig.json",
+        "vitest.config.ts",
+        ".github/pull_request_template.md",
+        "scripts/assert-test-file-count.sh",
+        "scripts/emit-schema.ts",
+        "scripts/probe-rig.mjs",
+        "specs/export-selftest.spec.md"
+      ],
+      "prefixes": [
+        ".github/ISSUE_TEMPLATE/",
+        ".github/workflows/",
+        "assets/",
+        "docs/codebase/",
+        "fixtures/",
+        "schema/",
+        "skills/tickmarkr-auto/",
+        "skills/tickmarkr-loop/",
+        "skills/tickmarkr-overseer/",
+        "src/",
+        "tests/"
+      ]
+    },
+    "excludedPaths": [
+      ".planning",
+      "specs",
+      ".tickmarkr",
+      ".overseer",
+      ".claude",
+      "docs",
+      "ASSESSMENT-*.md",
+      ".gitignore",
+      "scripts/measure-trailer-width.mjs",
+      "scripts/scan-scope-corpus.mjs",
+      "scripts/repro-obs96.mjs",
+      "CLAUDE.md",
+      "scripts/export-public.sh",
+      "scripts/verify-export.sh",
+      "tests/scripts/verify-export.test.ts",
+      ".github/workflows/ci.yml",
+      "**/*.local.*"
+    ]
   }
 }