@rizal72/oc-models-pro 0.1.5 → 0.3.0

package/tui.js

@@ -18,137 +18,24 @@ import { createElement as _$createElement } from "@opentui/solid";
 // is the first row whatever it costs: the free/paying split never buries it.
 import { Plugin } from "@opencode/plugin/tui";
 import { For, Show, createEffect, createMemo, createSignal, onCleanup } from "solid-js";
-import { appendFileSync, readFileSync, renameSync, watch, writeFileSync } from "node:fs";
+import { appendFileSync, readFileSync, watch, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
-import { benchFor, benchIndex } from "./bench.ts";
-import { credits, goPlan, key } from "./multipliers.ts";
+import { benchFor, benchIndex, benchKey } from "./bench.ts";
+import { aaIndex } from "./aa.ts";
+import { speedIndex } from "./tps.ts";
+import { credits, goPlan, key, nativePeak } from "./multipliers.ts";
 import { LEGEND_MIN, fit, hintLines, rowWidth } from "./fit.ts";
 import { tagsFor } from "./tags.ts";
+import { prefKey, readFavourites, readPrefs, toggleFavorite, writeFavourites, PREFS_FILE } from "./prefs.ts";
+import { ORDER, ORDERS, arrange, compare, isFree } from "./rows.ts";
 const SCOPES = ["all", "favorites", "paying"];
-const prefKey = (providerID, modelID) => providerID + "/" + modelID;
-
-/** The picker's own state file: `favorite[]` and `recent[]` are `{ providerID, modelID }`. */
-
-const PREFS_FILE = join(homedir(), ".local/state/opencode/model.json");
-/** Same directory, a leading dot: the host watches `model.json.*`, not this. */
-const TEMP_FILE = join(homedir(), ".local/state/opencode", ".model.json.tmp");
 let prefs = {
   favorite: new Set(),
   recent: new Map(),
   variants: new Map()
 };
 
-/** The host's `favorite[]` as it is in the file: a key cannot be split back — a model id may hold a slash. */
-function readFavourites() {
-  try {
-    const data = JSON.parse(readFileSync(PREFS_FILE, "utf8"));
-    if (!Array.isArray(data.favorite)) return [];
-    return data.favorite.filter(entry => typeof entry?.providerID === "string" && typeof entry?.modelID === "string");
-  } catch (error) {
-    // A missing file is not an error: starting empty creates it on the write. Anything else is.
-    if (error?.code === "ENOENT") return [];
-    trace("favourites: " + (error instanceof Error ? error.message : String(error)));
-    return undefined;
-  }
-}
-
-/** Rewrites `favorite[]` with the rest of the file untouched. The host watches this path and
- *  `model.json.*`, so the atomic rename is seen and the native picker, `model.cycle_favorite` and this
- *  list stay in step; a dot in front keeps the temp name outside that glob. */
-function writeFavourites(list) {
-  try {
-    let raw;
-    try {
-      raw = JSON.parse(readFileSync(PREFS_FILE, "utf8"));
-    } catch (error) {
-      if (error?.code !== "ENOENT") throw error;
-      raw = {};
-    }
-    raw.favorite = list;
-    writeFileSync(TEMP_FILE, JSON.stringify(raw));
-    renameSync(TEMP_FILE, PREFS_FILE);
-    return true;
-  } catch (error) {
-    trace("favourites: " + (error instanceof Error ? error.message : String(error)));
-    return false;
-  }
-}
-function toggleFavorite(providerID, modelID) {
-  const key = prefKey(providerID, modelID);
-  const list = readFavourites();
-  if (!list) return undefined;
-  const kept = list.filter(entry => prefKey(entry.providerID, entry.modelID) !== key);
-  const on = kept.length === list.length;
-  return writeFavourites(on ? [...kept, {
-    providerID,
-    modelID
-  }] : kept) ? on : undefined;
-}
-function readPrefs() {
-  const parsed = {
-    favorite: new Set(),
-    recent: new Map(),
-    variants: new Map()
-  };
-  try {
-    const data = JSON.parse(readFileSync(PREFS_FILE, "utf8"));
-    for (const entry of data.favorite ?? []) parsed.favorite.add(prefKey(entry.providerID, entry.modelID));
-    for (const [index, entry] of (data.recent ?? []).entries()) parsed.recent.set(prefKey(entry.providerID, entry.modelID), index);
-    for (const [model, variant] of Object.entries(data.variant ?? {})) if (typeof variant === "string") parsed.variants.set(model, variant);
-  } catch (error) {
-    // A corrupt state file empties the favourites and the recent list: say so instead of pretending.
-    trace("prefs unreadable: " + (error instanceof Error ? error.message : String(error)));
-  }
-  return parsed;
-}
-
-/** What the Go plan makes a model cost: the figure the effective order sorts by. An unknown price is
- *  not zero — it sorts last, or it would sit at the top of the cheapest list forever. */
-function effective(row) {
-  if (row.input === undefined) return Number.POSITIVE_INFINITY;
-  return row.input / (row.credit || 1);
-}
-const SORTS = [{
-  label: "effective price",
-  short: "effective↑",
-  value: effective
-}, {
-  label: "input price",
-  short: "in↑",
-  value: row => row.input ?? Number.POSITIVE_INFINITY
-}, {
-  label: "output price",
-  short: "out↑",
-  value: row => row.output ?? Number.POSITIVE_INFINITY
-}, {
-  label: "input + output",
-  short: "in+out↑",
-  value: row => row.input === undefined || row.output === undefined ? Number.POSITIVE_INFINITY : (row.input + row.output) / (row.credit || 1)
-}, {
-  label: "context window",
-  short: "ctx↓",
-  value: row => row.context === undefined ? Number.POSITIVE_INFINITY : -row.context
-},
-// A missing score sorts last, never first: Pi's rule, and the honest one.
-{
-  label: "intelligence",
-  short: "int↓",
-  value: row => -(row.int ?? -1)
-}, {
-  label: "speed",
-  short: "speed↓",
-  value: row => -(row.tps ?? -1)
-}, {
-  label: "recently used",
-  short: "recent",
-  value: row => prefs.recent.get(prefKey(row.providerID, row.modelID)) ?? 1e9
-}, {
-  label: "name",
-  short: "name",
-  value: row => 0
-}];
-
 /** Fallbacks, used only when the theme defines none of the candidates. */
 const FALLBACK_DIM = "#8a8a8a";
 const FALLBACK_ACCENT = "#5a9fd4";
@@ -191,17 +78,39 @@ function price(value, width) {
 function isGo(providerID) {
   return providerID === "opencode-go";
 }
-function free(row) {
-  return row.input === 0 && row.output === 0;
-}
 function headerRow(f) {
   return ["  ", "    ", "model".padEnd(f.name), cell("in", 6), cell("out", 6), ...(f.ctx ? [cell("ctx", 5)] : []), ...(f.int ? [cell("int", 5)] : []), ...(f.tkps ? [cell("tok/s", 6)] : []), cell("cred", 4), ...(f.note ? [cell("note", 6)] : [])].join(" ");
 }
-function modelRow(row, mine, favourite, f) {
+
+/** The speed cell on its own, so the renderer can colour it apart from the rest of the row. */
+function speedCell(row, f) {
+  if (!f.tkps) return "";
+  const text = row.measured !== undefined ? String(Math.round(row.measured)) : row.tps !== undefined ? "~" + Math.round(row.tps) : "";
+  return cell(text, 6);
+}
+
+/** A row in three pieces: everything before the speed, the speed, everything after. */
+function rowParts(row, mine, favourite, f) {
   const notes = [row.peak ? "peak*" + row.peak : "", row.promo ? "+" + row.promo + "x" : ""].filter(Boolean);
-  return [(mine ? "●" : " ") + (favourite ? "*" : " "), padTag(row.tag), label(row.name, f.name), price(row.input, 6), price(row.output, 6), ...(f.ctx ? [cell(tokens(row.context), 5)] : []), ...(f.int ? [cell(row.int !== undefined ? row.int.toFixed(1) : "", 5)] : []), ...(f.tkps ? [cell(row.tps !== undefined ? "~" + Math.round(row.tps) : "", 6)] : []),
+  const head = [(mine ? "●" : " ") + (favourite ? "*" : " "), padTag(row.tag), label(row.name, f.name), price(row.input, 6), price(row.output, 6), ...(f.ctx ? [cell(tokens(row.context), 5)] : []), ...(f.int ? [cell(row.int !== undefined ? row.int.toFixed(1) : "", 5)] : [])];
+  const tail = [
   // Any credit other than 1 changes the effective price, so any of them is shown.
-  cell(row.credit !== 1 ? "×" + row.credit : "", 4), ...(f.note ? [cell(notes.join(" "), 6)] : [])].join(" ");
+  cell(row.credit !== 1 ? "×" + row.credit : "", 4), ...(f.note ? [cell(notes.join(" "), 6)] : [])];
+  const speed = speedCell(row, f);
+  if (!speed) return {
+    before: head.concat(tail).join(" "),
+    speed: "",
+    after: ""
+  };
+  return {
+    before: head.join(" ") + " ",
+    speed,
+    after: tail.length ? " " + tail.join(" ") : ""
+  };
+}
+function modelRow(row, mine, favourite, f) {
+  const parts = rowParts(row, mine, favourite, f);
+  return parts.before + parts.speed + parts.after;
 }
 const TRACE = join(tmpdir(), "oc-models-pro.log");
 
@@ -254,11 +163,15 @@ export default Plugin.define({
     prefs = readPrefs();
     let creditIndex = new Map();
     let bench = new Map();
+    /** Measured on this machine, keyed `providerID/modelID`: it wins over any catalogue figure. */
+    let measured = new Map();
+    /** From Artificial Analysis, for the models this machine never ran. */
+    let estimated = new Map();
     /** False when the Go page could not be read and no cache was there: the credits are all 1. */
     let creditsKnown = false;
     // Signals, not plain variables: the header shows them, and a plain variable left the title
     // saying "effective price" whatever the list was actually sorted by.
-    const [sort, setSort] = createSignal(0);
+    const [sort, setSort] = createSignal("effective");
     const [grouped, setGrouped] = createSignal(true);
     const [scope, setScope] = createSignal("all");
     function fail(label, error) {
@@ -296,6 +209,10 @@ export default Plugin.define({
         const cost = (model.cost ?? []).find(entry => !entry.tier) ?? model.cost?.[0];
         const limit = model.limit ?? {};
         const score = benchFor(bench, model.name, model.modelID);
+        // Three sources, one order: what this machine measured, then Artificial Analysis, then
+        // the catalogue. A measured figure is never displaced by an estimate.
+        const mine = measured.get(model.providerID + "/" + model.modelID);
+        const theirs = mine === undefined ? estimated.get(benchKey(model.name)) ?? estimated.get(benchKey(model.modelID)) ?? score?.tps : undefined;
         result.push({
           name: model.name,
           providerID: model.providerID,
@@ -314,9 +231,12 @@ export default Plugin.define({
           // "DeepSeek V4.1 Flash" inherited the Go credit.
           credit: isGo(model.providerID) ? creditIndex.get(key(model.modelID))?.credit ?? 1 : 1,
           promo: isGo(model.providerID) ? creditIndex.get(key(model.modelID))?.promo : undefined,
-          peak: isGo(model.providerID) ? creditIndex.get(key(model.modelID))?.peak : undefined,
+          // Measured on the Go plan first, then the native rule: the catalogue lists one
+          // DeepSeek price, so only the second can say it doubles.
+          peak: (isGo(model.providerID) ? creditIndex.get(key(model.modelID))?.peak : undefined) ?? nativePeak(model.providerID),
           int: score?.int,
-          tps: score?.tps,
+          tps: theirs,
+          measured: mine,
           enabled: model.enabled !== false
         });
       }
@@ -340,7 +260,21 @@ export default Plugin.define({
       // One fetch a day at most; a failure only costs the credit column and the effective ordering.
       const plan = await goPlan();
       creditIndex = plan ? credits(plan) : new Map();
-      bench = await benchIndex();
+      // The three reads run together: the panel waits for the slowest, not for their sum. Measured
+      // comes first in the ordering below — the only figure that is this provider's own behaviour.
+      const started = Date.now();
+      const [benchmarks, speeds, estimates] = await Promise.all([benchIndex(), speedIndex(), aaIndex()]);
+      bench = benchmarks;
+      measured = new Map([...speeds.speeds].map(([key, speed]) => [key, speed.tps]));
+      estimated = estimates;
+      // How many of the models on offer actually come out with a figure: the one number that says
+      // whether a thin column is a thin source or a broken key.
+      const offer = listModels();
+      const withSpeed = offer.filter(model => {
+        if (measured.has(model.providerID + "/" + model.modelID)) return true;
+        return estimated.get(benchKey(model.name)) !== undefined || estimated.get(benchKey(model.modelID)) !== undefined;
+      }).length;
+      trace("open: tps=" + speeds.turns + " turns, " + measured.size + " measured, " + estimated.size + " from AA, " + withSpeed + "/" + offer.length + " with a speed, " + (Date.now() - started) + " ms");
       creditsKnown = creditIndex.size > 0;
       trace("open: models=" + listModels().length + " bench=" + bench.size + " plan=" + (plan ? "$" + plan.price + " " + plan.limits.length + " rows" : "none") + " credits=" + creditIndex.size + " prefs=" + prefs.favorite.size + "/" + prefs.recent.size);
       if (!ui.panel.open("oc-models-pro")) {
@@ -452,66 +386,35 @@ export default Plugin.define({
         const needle = query().trim().toLowerCase();
         let list = rows().filter(row => row.enabled);
         if (scope() === "favorites") list = list.filter(row => prefs.favorite.has(prefKey(row.providerID, row.modelID)) || prefKey(row.providerID, row.modelID) === mine);
-        if (scope() === "paying") list = list.filter(row => !free(row) || prefKey(row.providerID, row.modelID) === mine);
+        if (scope() === "paying") list = list.filter(row => !isFree(row) || prefKey(row.providerID, row.modelID) === mine);
         if (needle) list = list.filter(row => (row.name + " " + row.provider + " " + row.providerID).toLowerCase().includes(needle));
         list = [...list].sort((a, b) => {
           const mineA = prefKey(a.providerID, a.modelID) === mine;
           const mineB = prefKey(b.providerID, b.modelID) === mine;
           if (mineA !== mineB) return mineA ? -1 : 1;
-          if (SORTS[sort()].label !== "name") {
-            const delta = SORTS[sort()].value(a) - SORTS[sort()].value(b);
-            if (delta) return delta;
-          }
-          return a.name.localeCompare(b.name);
+          return compare(sort(), a, b, {
+            recent: prefs.recent
+          });
         });
 
         // Free models never enter the price order: they are not cheap, they are unmetered, and at
         // the top they hide everything that costs something. Grouped, each one still sits under
         // its own provider, after that provider's paying rows — the group answers "who serves
         // this", and a global "Free" bucket would answer it wrong. Flat, they keep one bucket.
+        // What is drawn, and in which order, is `arrange`'s business — the same function the
+        // desktop panel calls. This half only turns sections into the headers and rows a
+        // terminal list wants.
         const items = [];
-        if (grouped()) {
-          const groups = new Map();
-          for (const row of list) {
-            const bucket = groups.get(row.provider) ?? [];
-            bucket.push(row);
-            groups.set(row.provider, bucket);
-          }
-          // Two bits: the model in use first, then the active order inside each of the two classes.
-          // It leads its group even when it is free — it is the state of the session, not a price.
-          for (const bucket of groups.values()) bucket.sort((a, b) => {
-            const mineA = prefKey(a.providerID, a.modelID) === mine;
-            const mineB = prefKey(b.providerID, b.modelID) === mine;
-            if (mineA !== mineB) return mineA ? -1 : 1;
-            return Number(free(a)) - Number(free(b));
+        for (const section of arrange(list, {
+          inUse: mine,
+          grouped: grouped()
+        })) {
+          if (section.title) items.push({
+            header: section.title
           });
-          const names = [...groups.keys()].sort((a, b) => a.localeCompare(b));
-          // The provider of the model in use comes first, like the native picker.
-          const mineProvider = list.find(row => prefKey(row.providerID, row.modelID) === mine)?.provider;
-          if (mineProvider) names.sort((a, b) => a === mineProvider ? -1 : b === mineProvider ? 1 : 0);
-          for (const name of names) {
-            items.push({
-              header: name
-            });
-            for (const row of groups.get(name)) items.push({
-              row
-            });
-          }
-        } else {
-          // The model in use leads the list, free or not: it is the state of the session, not a
-          // price to compare. The other free models keep the bucket at the end.
-          for (const row of list) if (!free(row) || prefKey(row.providerID, row.modelID) === mine) items.push({
+          for (const row of section.rows) items.push({
             row
           });
-          const freeRows = list.filter(row => free(row) && prefKey(row.providerID, row.modelID) !== mine);
-          if (freeRows.length) {
-            items.push({
-              header: "Free"
-            });
-            for (const row of freeRows) items.push({
-              row
-            });
-          }
         }
         return items;
       });
@@ -663,10 +566,10 @@ export default Plugin.define({
         trace("variant set: " + chosen + " -> " + applied);
       }
       function cycleSort() {
-        setSort((sort() + 1) % SORTS.length);
+        setSort(ORDER[(ORDER.indexOf(sort()) + 1) % ORDER.length]);
       }
       function recentSort() {
-        setSort(SORTS.findIndex(entry => entry.label === "recently used"));
+        setSort("recent");
       }
       function toggleGroups() {
         setGrouped(!grouped());
@@ -823,7 +726,7 @@ export default Plugin.define({
         _$insertNode(_el$6, _el$8);
         _$setProp(_el$6, "fg", DIM);
         _$setProp(_el$6, "wrapMode", "none");
-        _$insert(_el$6, () => "sort: " + SORTS[sort()].short, _el$8);
+        _$insert(_el$6, () => "sort: " + ORDERS[sort()].short, _el$8);
         _$insertNode(_el$9, _el$0);
         _$setProp(_el$9, "fg", BASE);
         _$setProp(_el$9, "wrapMode", "none");
@@ -899,29 +802,43 @@ export default Plugin.define({
               return scope() !== "favorites" && prefs.favorite.has(key);
             };
             return (() => {
-              var _el$19 = _$createElement("box"),
-                _el$20 = _$createElement("text");
-              _$insertNode(_el$19, _el$20);
+              var _el$19 = _$createElement("box");
               _$setProp(_el$19, "id", "mp-" + key);
               _$setProp(_el$19, "height", 1);
+              _$setProp(_el$19, "flexDirection", "row");
               _$setProp(_el$19, "onMouseOver", () => hover(key));
               _$setProp(_el$19, "onMouseMove", () => hover(key));
               _$setProp(_el$19, "onMouseDown", () => {
                 setSelected(key);
                 choose(row);
               });
-              _$setProp(_el$20, "wrapMode", "none");
-              _$insert(_el$20, () => modelRow(row, mine(), favourite(), fitted()));
-              _$effect(_p$ => {
-                var _v$6 = active() ? SELECTED : undefined,
-                  _v$7 = active() ? ON_SELECTED : mine() ? ACCENT : BASE;
-                _v$6 !== _p$.e && (_p$.e = _$setProp(_el$19, "backgroundColor", _v$6, _p$.e));
-                _v$7 !== _p$.t && (_p$.t = _$setProp(_el$20, "fg", _v$7, _p$.t));
-                return _p$;
-              }, {
-                e: undefined,
-                t: undefined
+              _$insert(_el$19, () => {
+                const parts = rowParts(row, mine(), favourite(), fitted());
+                const fg = active() ? ON_SELECTED : mine() ? ACCENT : BASE;
+                // Dim marks the borrowed figure; the tilde says it too, for a reader who
+                // cannot see the colour. Measured values keep the row's own colour.
+                const speedFg = active() ? ON_SELECTED : row.tps !== undefined ? DIM : fg;
+                return [(() => {
+                  var _el$20 = _$createElement("text");
+                  _$setProp(_el$20, "fg", fg);
+                  _$setProp(_el$20, "wrapMode", "none");
+                  _$insert(_el$20, () => parts.before);
+                  return _el$20;
+                })(), _$memo(() => _$memo(() => !!parts.speed)() ? (() => {
+                  var _el$21 = _$createElement("text");
+                  _$setProp(_el$21, "fg", speedFg);
+                  _$setProp(_el$21, "wrapMode", "none");
+                  _$insert(_el$21, () => parts.speed);
+                  return _el$21;
+                })() : null), _$memo(() => _$memo(() => !!parts.after)() ? (() => {
+                  var _el$22 = _$createElement("text");
+                  _$setProp(_el$22, "fg", fg);
+                  _$setProp(_el$22, "wrapMode", "none");
+                  _$insert(_el$22, () => parts.after);
+                  return _el$22;
+                })() : null)];
               });
+              _$effect(_$p => _$setProp(_el$19, "backgroundColor", active() ? SELECTED : undefined, _$p));
               return _el$19;
             })();
           }
@@ -934,14 +851,14 @@ export default Plugin.define({
             return hints();
           },
           children: line => (() => {
-            var _el$21 = _$createElement("box"),
-              _el$22 = _$createElement("text");
-            _$insertNode(_el$21, _el$22);
-            _$setProp(_el$21, "height", 1);
-            _$setProp(_el$22, "fg", DIM);
-            _$setProp(_el$22, "wrapMode", "none");
-            _$insert(_el$22, line);
-            return _el$21;
+            var _el$23 = _$createElement("box"),
+              _el$24 = _$createElement("text");
+            _$insertNode(_el$23, _el$24);
+            _$setProp(_el$23, "height", 1);
+            _$setProp(_el$24, "fg", DIM);
+            _$setProp(_el$24, "wrapMode", "none");
+            _$insert(_el$24, line);
+            return _el$23;
           })()
         }));
         _$effect(_p$ => {

package/vite.config.ts

@@ -0,0 +1,6 @@
+import { defineConfig } from "vite"
+import { gui } from "@opencode/plugin/gui/vite"
+
+export default defineConfig({
+	plugins: [gui({ entry: "gui.tsx", outFile: "dist/gui-experimental.cjs" })],
+})