@modelstatus/cli 0.1.29 → 0.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelstatus/cli",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Track which AI models you use, where, and never get surprised by a retirement. Free offline model-health for any repo (mm status), browser sign-in for cloud inventory + alerts.",
   "keywords": [
     "llm",

package/src/index.js

@@ -5,7 +5,7 @@ import { resolveAuth, loadConfig, saveConfig, clearAuth, configFilePath } from "
 import { createClient } from "./api.js";
 import { collectFrom, availability, ALL_SOURCE_IDS } from "./sources/index.js";
 import { redactValue } from "./redact.js";
-import { deriveProject } from "./detect/project.js";
+import { assignProjects } from "./upload.js";
 import { loginViaBrowser } from "./auth.js";
 import { maybeCheckForUpdate } from "./updater.js";
 import { track, maybeAnalyticsNotice } from "./telemetry.js";
@@ -195,53 +195,19 @@ async function cmdScan(positional, flags) {
     return;
   }
 
-  const projects = (await client.listProjects()).data;
-  const byName = new Map(projects.map((p) => [p.name.toLowerCase(), p.id]));
-  const scanRoot = path.resolve(dir);
-  // Reuse a project by name, create on demand. If creation is blocked (the free
-  // plan's project cap), STOP creating and route everything to one project — the
-  // per-file source_repo still preserves which repo each usage came from, so the
-  // multi-repo scan degrades gracefully instead of crashing. Pro = real per-repo.
-  let capHit = false;
-  let defaultProjectId = projects[0]?.id ?? null;
-  const ensureProject = async (name) => {
-    const key = name.toLowerCase();
-    if (byName.has(key)) return byName.get(key);
-    if (capHit) return defaultProjectId;
-    try {
-      const id = (await client.createProject(name)).id;
-      byName.set(key, id);
-      if (!defaultProjectId) defaultProjectId = id;
-      return id;
-    } catch {
-      capHit = true; // plan cap or any create failure → don't make more projects
-      if (!defaultProjectId) {
-        try { defaultProjectId = (await client.createProject(path.basename(scanRoot))).id; } catch { defaultProjectId = null; }
-      }
-      return defaultProjectId;
-    }
-  };
-
-  let projectId = null;
+  // --project routes everything to one project; otherwise assignProjects derives a
+  // real per-file project (git-root README › repo › path chunk). Shared with the
+  // TUI so the command + tabs assign identically.
+  let forceProjectId = null;
   if (flags.project) {
-    // Explicit --project: one project for the whole scan (unchanged behavior).
-    projectId = uuidish(flags.project)
-      ? flags.project
-      : projects.find((p) => p.name === flags.project || p.slug === flags.project)?.id;
-    if (!projectId) projectId = await ensureProject(flags.project);
-  } else {
-    // Derive a real project PER FILE (git-root README › repo name › path chunk) so
-    // a multi-repo workspace uploads as its parts, not one generic folder name.
-    // The bulk endpoint honors per-item project_id (falling back to the batch one).
-    for (let i = 0; i < usages.length; i++) {
-      const sp = rows[i].source_path;
-      const ctx = sp ? deriveProject(path.resolve(scanRoot, sp), scanRoot) : { project: path.basename(scanRoot), repo: path.basename(scanRoot) };
-      const pid = await ensureProject(ctx.project);
-      if (pid) usages[i].project_id = pid;
-      if (!usages[i].source_repo) usages[i].source_repo = ctx.repo;
+    if (uuidish(flags.project)) forceProjectId = flags.project;
+    else {
+      const projects = (await client.listProjects()).data;
+      forceProjectId = projects.find((p) => p.name === flags.project || p.slug === flags.project)?.id
+        ?? (await client.createProject(flags.project)).id;
     }
-    projectId = usages.find((u) => u.project_id)?.project_id ?? defaultProjectId ?? (await ensureProject(path.basename(scanRoot)));
   }
+  const projectId = await assignProjects(client, usages, path.resolve(dir), { forceProjectId });
 
   const res = await client.bulkUpload(projectId, usages);
   track("usages_uploaded", { count: usages.length, created: res.created, updated: res.updated, source: "cli" });

package/src/tui/views/local.js

@@ -14,6 +14,7 @@ import {
   useTick, useCursorList, useSearch,
 } from "../ui.js";
 import { useStreamingScan, countHealth } from "../scan-stream.js";
+import { buildUsages, assignProjects } from "../../upload.js";
 import { readSnippet } from "../snippet.js";
 import { openLocation } from "../../openUrl.js";
 import { addGlobalIgnore } from "../../sources/filesystem.js";
@@ -26,6 +27,7 @@ export const meta = {
     { k: "/", label: "search" },
     { k: "p", label: "pause" },
     { k: "g", label: "rescan" },
+    { k: "u", label: "push to inventory" },
   ],
 };
 
@@ -41,10 +43,40 @@ const agoText = (ms) => {
   return `${Math.round(hr / 24)}d ago`;
 };
 
-export function LocalView({ dir, ui, width = 78, height = 14, active = true, fresh = false }) {
+export function LocalView({ client, me, dir, ui, width = 78, height = 14, active = true, fresh = false }) {
   const scan = useStreamingScan(dir, { fresh });
   const running = scan.phase === "registry" || scan.phase === "scanning";
-  const tick = useTick(80, running);
+  const [pushing, setPushing] = React.useState(false);
+
+  // u: push this local scan to your cloud Inventory (the Here tab is local-only
+  // otherwise). Each usage lands in a project derived from its repo (README › repo
+  // › path), so a multi-repo workspace syncs as its real parts. Needs sign-in.
+  async function pushToInventory() {
+    if (!me) return ui?.showToast?.("sign in (7 Account) to push these to your inventory", "#d97706");
+    const cands = scan.candidates || [];
+    if (!cands.length) return ui?.showToast?.("nothing to push yet — let the scan finish", "#d97706");
+    const seen = new Set();
+    const rows = [];
+    for (const c of cands) {
+      const k = `${c.model_string}|${c.location_label}`;
+      if (seen.has(k)) continue;
+      seen.add(k);
+      rows.push({ model_string: c.model_string, environment: c.environment, location_label: c.location_label, source_path: c.source_path, source_line: c.source_line });
+    }
+    setPushing(true);
+    try {
+      const usages = await buildUsages(client, rows);
+      const projectId = await assignProjects(client, usages, path.resolve(dir), {});
+      const res = await client.bulkUpload(projectId, usages);
+      const nproj = new Set(usages.map((u) => u.project_id)).size;
+      ui?.showToast?.(`${GLYPH.check} pushed ${usages.length} → ${res.created} new, ${res.updated} updated · ${nproj} project${nproj === 1 ? "" : "s"} (open 3 Inv)`);
+    } catch (e) {
+      ui?.showToast?.(e?.message || "push failed", "#dc2626");
+    } finally {
+      setPushing(false);
+    }
+  }
+  const tick = useTick(80, running || pushing);
   const spin = SPINNER[tick % SPINNER.length];
   const search = useSearch();
   const [focus, setFocus] = React.useState("list"); // list | refs
@@ -174,6 +206,7 @@ export function LocalView({ dir, ui, width = 78, height = 14, active = true, fre
       if (input === "e") return excludeRef(drefs[0]); // exclude the highlighted model's location (editable)
       if (input === "p" && running) return scan.togglePause();
       if (input === "g") { justReloadedRef.current = true; return scan.reload(); }
+      if (input === "u" && !pushing) return pushToInventory();
     },
     { isActive: active },
   );
@@ -184,7 +217,8 @@ export function LocalView({ dir, ui, width = 78, height = 14, active = true, fre
   const counters = `${fmtNum(filesScanned)} files · ${fmtNum(dirsSeen)} dirs · ${fmtNum(candidateCount)} refs${catalogsSkipped ? ` · ${catalogsSkipped} catalog${catalogsSkipped === 1 ? "" : "s"} skipped` : ""}`;
   const attention = rows.filter((r) => r.health !== "ok").length;
   let strip;
-  if (phase === "registry") strip = h(StateLine, { kind: "loading", spin, text: "fetching the signed registry…" });
+  if (pushing) strip = h(StateLine, { kind: "loading", spin, text: "pushing to inventory…" });
+  else if (phase === "registry") strip = h(StateLine, { kind: "loading", spin, text: "fetching the signed registry…" });
   else if (phase === "scanning" && scan.paused)
     strip = h(Box, {}, h(Text, { color: "#d97706" }, ` ${GLYPH.pause} paused  `), h(Text, { color: C.FG_DIM }, `${counters}  ·  p resume`));
   else if (phase === "scanning")

package/src/tui/views/scan.js

@@ -17,6 +17,7 @@ import { HEALTH_RANK, countHealth, useStreamingScan } from "../scan-stream.js";
 import { resolveLocal, computeHealth } from "../../registry/local.js";
 import { addGlobalIgnore } from "../../sources/filesystem.js";
 import { readSnippet } from "../snippet.js";
+import { buildUsages, assignProjects } from "../../upload.js";
 import { track } from "../../telemetry.js";
 import { openUrl, openLocation } from "../../openUrl.js";
 
@@ -53,7 +54,11 @@ export function ScanView({ client, dir, ui, active, width = 78, height = 14, fre
   // Upload-target projects (cheap; independent of the scan).
   const projQ = useAsync(() => client.listProjects().then((r) => r.data || []).catch(() => []), []);
   const projects = projQ.data || [];
-  const project = projects[clampCursor(projectIdx, projects.length)] || null;
+  // "auto · per repo" (id:null) is the DEFAULT upload target — each usage lands in
+  // a project derived from its git-root README / repo / path. Cycle with p to force
+  // everything into one specific project instead.
+  const projOptions = [{ id: null, name: "auto · per repo" }, ...projects];
+  const project = projOptions[clampCursor(projectIdx, projOptions.length)];
 
   // Selectable per-(model, location) rows derived from the cached scan's
   // candidates — resolved locally for display/health; server model_ids are
@@ -166,18 +171,14 @@ export function ScanView({ client, dir, ui, active, width = 78, height = 14, fre
     if (!selected.length) return ui.showToast("nothing selected", "#d97706");
     setBusy(true);
     try {
-      let projectId = project?.id;
-      if (!projectId) projectId = (await client.createProject(path.basename(path.resolve(dir)))).id;
-      const uniq = [...new Set(selected.filter((r) => r.slug).map((r) => r.model_string))];
-      const ids = uniq.length ? (await client.resolve(uniq)).data || [] : [];
-      const idByStr = new Map(ids.map((r) => [r.input.toLowerCase(), r.model_id]));
-      const usages = selected.map((r) => {
-        const mid = idByStr.get(r.model_string.toLowerCase());
-        return { model_id: mid ?? undefined, custom_model_name: mid ? undefined : r.model_string, environment: r.environment, location_label: r.location_label, source_repo: (process.env.GITHUB_REPOSITORY || "").trim() || undefined, source_path: r.source_path, source_line: r.source_line };
-      });
+      const usages = await buildUsages(client, selected);
+      // id:null = "auto · per repo" → derive a project per file; else force the pick.
+      const forceProjectId = project && project.id ? project.id : null;
+      const projectId = await assignProjects(client, usages, path.resolve(dir), { forceProjectId });
       const res = await client.bulkUpload(projectId, usages);
       track("usages_uploaded", { count: usages.length, created: res.created, updated: res.updated, source: "tui" });
-      ui.showToast(`uploaded ${usages.length} → ${res.created} new, ${res.updated} updated`);
+      const nproj = new Set(usages.map((u) => u.project_id)).size;
+      ui.showToast(`${GLYPH.check} uploaded ${usages.length} → ${res.created} new, ${res.updated} updated${forceProjectId ? "" : ` · ${nproj} project${nproj === 1 ? "" : "s"}`}`);
     } catch (e) {
       ui.showToast(e.message, "#dc2626");
     } finally {
@@ -225,7 +226,7 @@ export function ScanView({ client, dir, ui, active, width = 78, height = 14, fre
       if (input === "e") return excludeRef(drefs[0]); // exclude the highlighted model's location (editable)
       if (input === "a") return setItems((its) => its.map((it) => ({ ...it, selected: true })));
       if (input === "x") return setItems((its) => its.map((it) => ({ ...it, selected: false })));
-      if (input === "p") return setProjectIdx((i) => (projects.length ? (i + 1) % projects.length : 0));
+      if (input === "p") return setProjectIdx((i) => (i + 1) % projOptions.length);
       if (input === "P") return ui.askPrompt("New project", { onSubmit: createProject });
       if (input === "g") return scan.reload();
       if (input === "u") return upload();

package/src/upload.js

@@ -0,0 +1,74 @@
+/** Shared upload helpers used by the `mm scan` command, the TUI Scan tab, and the
+ * TUI Here tab — so all three produce identical usage payloads + per-repo project
+ * assignment. Keeping one implementation is why the CLI and TUI stay in sync. */
+import path from "node:path";
+import { redactValue } from "./redact.js";
+import { deriveProject } from "./detect/project.js";
+
+/** Resolve deduped detection rows → usage payloads. Each row needs at least
+ * { model_string, environment, location_label, source_path?, source_line? }.
+ * Model ids are resolved server-side; unresolved strings become a redacted
+ * custom_model_name (an .env glob hit can over-capture a secret fragment). */
+export async function buildUsages(client, rows) {
+  const uniq = [...new Set(rows.map((r) => r.model_string).filter(Boolean))];
+  const resolved = uniq.length ? (await client.resolve(uniq)).data || [] : [];
+  const idByStr = new Map(resolved.map((r) => [String(r.input).toLowerCase(), r.model_id]));
+  const ghRepo = (process.env.GITHUB_REPOSITORY || "").trim();
+  return rows.map((r) => {
+    const mid = idByStr.get(String(r.model_string).toLowerCase());
+    return {
+      model_id: mid ?? undefined,
+      custom_model_name: mid ? undefined : redactValue(r.model_string).slice(0, 120),
+      environment: r.environment,
+      location_label: r.location_label,
+      source_repo: r.source_repo || ghRepo || undefined,
+      source_path: r.source_path,
+      source_line: r.source_line ?? undefined,
+    };
+  });
+}
+
+/** Create/reuse projects + assign a per-file project_id to each usage
+ * (git-root README › repo folder › path chunk › scan root). Mutates each usage
+ * with project_id + source_repo and returns a batch-fallback projectId.
+ *
+ * Resilient to the free plan's project cap: if a create is blocked, it stops
+ * creating and routes everything to one project (source_repo still preserves the
+ * repo) rather than aborting. `forceProjectId` routes everything to one project
+ * (an explicit --project, or a TUI project pick).  */
+export async function assignProjects(client, usages, scanRoot, { forceProjectId = null } = {}) {
+  if (forceProjectId) {
+    for (const u of usages) u.project_id = forceProjectId;
+    return forceProjectId;
+  }
+  const projects = (await client.listProjects()).data || [];
+  const byName = new Map(projects.map((p) => [String(p.name).toLowerCase(), p.id]));
+  let capHit = false;
+  let fallback = projects[0]?.id ?? null;
+  const ensure = async (name) => {
+    const key = String(name).toLowerCase();
+    if (byName.has(key)) return byName.get(key);
+    if (capHit) return fallback;
+    try {
+      const id = (await client.createProject(name)).id;
+      byName.set(key, id);
+      if (!fallback) fallback = id;
+      return id;
+    } catch {
+      capHit = true; // plan cap or any failure → don't create more
+      if (!fallback) {
+        try { fallback = (await client.createProject(path.basename(scanRoot))).id; } catch { fallback = null; }
+      }
+      return fallback;
+    }
+  };
+  for (const u of usages) {
+    const ctx = u.source_path
+      ? deriveProject(path.resolve(scanRoot, u.source_path), scanRoot)
+      : { project: path.basename(scanRoot), repo: path.basename(scanRoot) };
+    const pid = await ensure(ctx.project);
+    if (pid) u.project_id = pid;
+    if (!u.source_repo) u.source_repo = ctx.repo;
+  }
+  return usages.find((u) => u.project_id)?.project_id ?? fallback ?? (await ensure(path.basename(scanRoot)));
+}