@modelstatus/cli 0.1.27 → 0.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelstatus/cli",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "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/detect/project.js

@@ -0,0 +1,88 @@
+/** Human-readable PROJECT identity for a scanned file, so a multi-repo workspace
+ * reads as its real parts (listingpro, pophire, …) instead of one folder name.
+ *
+ * Priority, best → worst:
+ *   1. The H1 title of the README at the file's nearest git repo root.
+ *   2. That repo root's folder name.
+ *   3. The top path segment under the scan root (a "path chunk").
+ *   4. The scan root's folder name.
+ *
+ * Pure fs reads (no `git` shell-out); results are cached per directory so a big
+ * repo reads its README + walks for .git exactly once. */
+import fs from "node:fs";
+import path from "node:path";
+
+const gitRootCache = new Map(); // dir → repoRoot | null
+const nameCache = new Map(); // repoRoot → project name
+
+/** Nearest ancestor dir containing a `.git` (dir OR file, for submodules/worktrees),
+ * not climbing above `stopAt` (the scan root). null if none. */
+function findGitRoot(startDir, stopAt) {
+  let d = startDir;
+  const visited = [];
+  for (;;) {
+    if (gitRootCache.has(d)) {
+      const r = gitRootCache.get(d);
+      for (const v of visited) gitRootCache.set(v, r);
+      return r;
+    }
+    visited.push(d);
+    let hit = false;
+    try { hit = fs.existsSync(path.join(d, ".git")); } catch { /* unreadable → not a root */ }
+    if (hit) {
+      for (const v of visited) gitRootCache.set(v, d);
+      return d;
+    }
+    const parent = path.dirname(d);
+    if (parent === d || d === stopAt || (stopAt && d.length <= stopAt.length)) {
+      for (const v of visited) gitRootCache.set(v, null);
+      return null;
+    }
+    d = parent;
+  }
+}
+
+/** First markdown H1 of a README at `root`, cleaned + capped, or null. */
+function readmeTitle(root) {
+  for (const name of ["README.md", "readme.md", "Readme.md", "README.markdown", "README"]) {
+    let txt;
+    try { txt = fs.readFileSync(path.join(root, name), "utf8"); } catch { continue; }
+    const m = txt.match(/^\s{0,3}#\s+(.+?)\s*#*\s*$/m);
+    if (!m) return null; // README exists but has no usable title
+    const title = m[1]
+      .replace(/!?\[([^\]]*)\]\([^)]*\)/g, "$1") // [text](url) / ![alt](url) → text/alt
+      .replace(/[`*_]/g, "") // emphasis / code ticks
+      .trim();
+    return title ? title.slice(0, 48) : null;
+  }
+  return null;
+}
+
+/** { project, repo } for an absolute file path within an absolute scan root. */
+export function deriveProject(absFile, scanRoot) {
+  const gitRoot = findGitRoot(path.dirname(absFile), scanRoot);
+  const root = gitRoot || scanRoot;
+  let name = nameCache.get(root);
+  if (name === undefined) {
+    name = readmeTitle(root) || path.basename(root) || "project";
+    nameCache.set(root, name);
+  }
+  // NO git root found anywhere up to the scan root → prefer the TOP folder under
+  // the scan root (a "path chunk") so a plain parent-of-projects dir still splits.
+  // (Only when there's genuinely no repo — a single-repo scan keeps the repo name.)
+  if (!gitRoot) {
+    const rel = path.relative(scanRoot, absFile);
+    const seg = rel.split(path.sep)[0];
+    if (rel.includes(path.sep) && seg && seg !== ".." && !seg.startsWith(".")) {
+      const sub = path.join(scanRoot, seg);
+      return { project: readmeTitle(sub) || seg, repo: seg };
+    }
+  }
+  return { project: name, repo: path.basename(root) };
+}
+
+/** Test/long-run hygiene: drop the per-process caches. */
+export function _resetProjectCache() {
+  gitRootCache.clear();
+  nameCache.clear();
+}

package/src/index.js

@@ -5,6 +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 { loginViaBrowser } from "./auth.js";
 import { maybeCheckForUpdate } from "./updater.js";
 import { track, maybeAnalyticsNotice } from "./telemetry.js";
@@ -194,15 +195,52 @@ async function cmdScan(positional, flags) {
     return;
   }
 
-  let projectId = null;
   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;
   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 client.createProject(flags.project)).id;
+    if (!projectId) projectId = await ensureProject(flags.project);
   } else {
-    projectId = projects[0]?.id ?? (await client.createProject(path.basename(dir))).id;
+    // 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;
+    }
+    projectId = usages.find((u) => u.project_id)?.project_id ?? defaultProjectId ?? (await ensureProject(path.basename(scanRoot)));
   }
 
   const res = await client.bulkUpload(projectId, usages);

package/src/tui/snippet.js

@@ -90,6 +90,22 @@ function highlightLine(line, ext, matchStr) {
  * the matched model string on the match line. Returns { path, line, rows } where
  * each row is { num, isMatch, segs }; null if the file can't be read.
  */
+/** Resolve a scan-root-relative source_path to a real local file, searching from
+ * `fromDir` upward (the inventory may be viewed from a subdir of, or a sibling
+ * within, the originally-scanned tree). Returns an absolute path or null. */
+export function findSourceFile(sourcePath, fromDir, maxUp = 8) {
+  if (!sourcePath) return null;
+  let d = path.resolve(fromDir || ".");
+  for (let i = 0; i <= maxUp; i++) {
+    const abs = path.resolve(d, sourcePath);
+    try { if (fs.statSync(abs).isFile()) return abs; } catch { /* keep climbing */ }
+    const parent = path.dirname(d);
+    if (parent === d) break;
+    d = parent;
+  }
+  return null;
+}
+
 export function readSnippet(absPath, line, matchStr, ctx = 3) {
   let content;
   try {

package/src/tui/views/inventory.js

@@ -9,7 +9,7 @@ import {
   h, C, GLYPH, ListRow, StateLine, EmptyCard, healthColor, healthGlyph,
   relativeTime, envTag, cell, cellE, snippetLines, SPINNER, useTick, useAsync, clampCursor,
 } from "../ui.js";
-import { readSnippet } from "../snippet.js";
+import { readSnippet, findSourceFile } from "../snippet.js";
 
 const ENV_ORDER = ["prod", "staging", "dev", "other"];
 
@@ -46,7 +46,10 @@ export function InventoryView({ client, ui, dir = ".", active, width = 78, heigh
   const matchStr = cur ? (cur.custom_model_name || (cur.model_display || "").split("/").pop() || cur.model_display) : null;
   const snippet = React.useMemo(() => {
     if (!cur || !cur.source_path) return null;
-    return readSnippet(path.resolve(dir, cur.source_path), cur.source_line, matchStr);
+    // Search from the launch dir UPWARD — the inventory may be viewed from a
+    // subdir of (or a sibling within) the originally-scanned tree.
+    const abs = findSourceFile(cur.source_path, dir);
+    return abs ? readSnippet(abs, cur.source_line, matchStr) : null;
   }, [cur?.source_path, cur?.source_line, matchStr, dir]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Push health legend + tracked context up to the shell status bar.
@@ -118,6 +121,10 @@ export function InventoryView({ client, ui, dir = ".", active, width = 78, heigh
   // LOCAL file at source_path). Reserve rows only with room to keep the bordered
   // drawer (~11 rows) intact, so small terminals never overflow + scroll.
   const srcRef = cur && cur.source_path ? `${cur.source_path}${cur.source_line ? ":" + cur.source_line : ""}` : null;
+  // A GitHub deep-link when the usage carries an owner/name repo slug (CI scans).
+  const ghUrl = cur && cur.source_repo && cur.source_repo.includes("/") && cur.source_path
+    ? `github.com/${cur.source_repo}/blob/HEAD/${cur.source_path}${cur.source_line ? "#L" + cur.source_line : ""}`
+    : null;
   const SNIP = snippet ? Math.max(0, Math.min(8, height - 12)) : 0;
   const showSnip = SNIP >= 3; // sep + header + ≥1 code line
   const showNote = !showSnip && !!srcRef && height >= 14; // has a path but no local file
@@ -184,6 +191,7 @@ export function InventoryView({ client, ui, dir = ".", active, width = 78, heigh
             cur.is_critical ? h(Text, { color: "#ea580c" }, `  ${GLYPH.crit} critical`) : null,
           ),
           h(Text, {}, h(Text, { color: C.FG_DIM }, "project "), h(Text, { color: C.FG }, projName(cur.project_id))),
+          cur.source_repo ? h(Text, {}, h(Text, { color: C.FG_DIM }, "repo "), h(Text, { color: C.FG }, cur.source_repo)) : null,
           h(Text, {}, h(Text, { color: C.FG_DIM }, "where "), h(Text, { color: C.FG_DIM }, where)),
           rt && rt.text
             ? h(Text, {}, h(Text, { color: C.FG_DIM }, "retires "), h(Text, { color: rt.color, bold: rt.bold }, rt.text))
@@ -202,6 +210,19 @@ export function InventoryView({ client, ui, dir = ".", active, width = 78, heigh
     h(Box, { flexDirection: "row" }, list, h(Box, { width: 2 }), drawer),
     showSnip || showNote ? h(Text, { color: C.BORDER }, "─".repeat(width)) : null,
     ...(showSnip ? snippetLines(snippet, width, SNIP - 2) : []),
-    showNote ? h(Text, { color: C.FG_FAINT }, cellE(`  ↳ ${srcRef} — not found in this directory; open the repo to preview the code`, width)) : null,
+    showNote
+      ? h(
+          Text,
+          { color: C.FG_FAINT },
+          cellE(
+            cur && cur.discovered_by === "manual"
+              ? `  ↳ ${srcRef} — added manually; no source file to preview.`
+              : ghUrl
+                ? `  ↳ ${ghUrl}`
+                : `  ↳ ${srcRef} — not on this machine (scanned from another location).`,
+            width,
+          ),
+        )
+      : null,
   );
 }