@lucasschirm/devinp 0.1.10 → 0.1.13

package/README.md

@@ -24,18 +24,48 @@ The package ships as a self-contained bundle — no dependencies are installed.
   not authenticated, `devinp` exits with an error (use `--source` for a saved
   snapshot).
 
-### When `devin` fails or truncates
-
-- Prices are captured through a temp file in `os.tmpdir()` — `devin`'s
-  interactive CLI can truncate a pipe stream mid-write, so `devinp` points
-  `devin`'s stdout at a real file instead. The temp file is always removed
-  after the run.
+### When `devin` fails, pages, or truncates
+
+`devin` is an interactive CLI, and on some machines it stays interactive even
+when a script calls it: the model list comes back paged ("click to show more")
+and the JSON never reaches stdout, so `devinp` used to die with *"returned
+invalid JSON (… 0 bytes)"*. It now works harder to get the whole document:
+
+- Prices are captured through a temp file in `os.tmpdir()` — a pipe stream from
+  `devin` can be truncated mid-write, so `devinp` points `devin`'s stdout at a
+  real file first. The temp file is always removed after the run.
+- **Retries that take the terminal away from `devin`.** If an attempt yields no
+  usable JSON, `devinp` runs `devin` again, each time stripping more of the
+  interactive terminal off it:
+
+  | # | stdout goes to | environment | controlling terminal |
+  | - | ------------ | -------------------------------------------------------- | --------------------- |
+  | 1 | temp file | yours, untouched | yes — the healthy path, one `devin` call |
+  | 2 | temp file | `PAGER=cat`, `GIT_PAGER=cat`, `TERM=dumb`, `NO_COLOR=1`, `CI=1` | **none** |
+  | 3 | pipe | same | **none** |
+
+  Spawned in its own session, `devin` cannot open `/dev/tty`: a pager or a TUI
+  that paints a "click to show more" view onto the terminal has nowhere to
+  draw, so the document has to come out of stdout. Nothing lands on the screen
+  you are typing in, and Ctrl-C there no longer kills the lookup. The first
+  attempt that parses wins, so the healthy path is unchanged.
+- Noise around the document is tolerated: ANSI colours, an update banner in
+  front, or the `pass a slug to --model` hint behind are stripped before the
+  JSON is parsed.
 - If `devin`'s output is cut off mid-stream, `devinp` repairs the document,
   prints a warning, and renders the partial table.
-- If the output cannot be recovered, `devinp` reports a diagnostic with the
-  size and tail of what `devin` wrote, and suggests re-running or saving the
-  output manually: `devin models list --format json > models.json`, then
-  `devinp --source models.json`.
+- A real CLI failure (not signed in, network down) is reported as-is instead of
+  being retried.
+- If nothing worked, the error lists all three attempts — bytes, exit code,
+  stderr, timeout — and how to feed the data in yourself. That always works,
+  because a redirect or a pipe makes `devin` write the whole document in one go:
+  (and if it does not, `command -v devin` tells you whether devinp is even
+  talking to the CLI and not to a shell function or agent wrapper around it).
+
+  ```sh
+  devin models list --format json > models.json && devinp --source models.json
+  devin models list --format json | devinp --source=-
+  ```
 
 ## Usage
 
@@ -55,6 +85,7 @@ devinp --web                 # serve an interactive page on http://127.0.0.1:432
 devinp --web --port 8080     # pick a port
 
 devinp --source models.json  # read a saved `devin models list --format json`
+devin models list --format json | devinp --source=-   # feed it straight from stdin
 devinp --json                # emit normalized rows as JSON
 ```
 
@@ -106,11 +137,25 @@ so `npm publish`, git-URL installs, and `npm link` always ship a fresh bundle.
 
 ## Publishing
 
-`.github/workflows/publish.yml` bumps the patch version and publishes with
-[npm trusted publishing](https://docs.npmjs.com/trusted-publishers) (OIDC —
+`.github/workflows/publish.yml` publishes a patch release on every push to main
+with [npm trusted publishing](https://docs.npmjs.org/trusted-publishers) (OIDC —
 no `NPM_TOKEN`). Requires the trusted publisher to be configured on npmjs.com:
 repository `lucasschirm/devinp`, workflow `publish.yml`.
 
+It **never commits to main** — the branch ruleset requires every change to
+arrive through a pull request, and a rejected release commit used to strand the
+publish step that ran after it (GH013, then `npm publish` skipped). The released
+version therefore lives in the npm registry and in the git tag, not in main's
+`package.json`:
+
+```sh
+git ls-remote --tags origin                 # released versions
+npm view @lucasschirm/devinp version       # latest published
+```
+
+The workflow takes the first patch number that is free in both places, so a tag
+left behind by an older run cannot wedge it.
+
 ## License
 
 MIT

package/bin/command.js

@@ -4193,14 +4193,14 @@ var require_emoji_regex = __commonJS({
 var require_string_width = __commonJS({
   "node_modules/string-width/index.js"(exports, module) {
     "use strict";
-    var stripAnsi = require_strip_ansi();
+    var stripAnsi2 = require_strip_ansi();
     var isFullwidthCodePoint = require_is_fullwidth_code_point();
     var emojiRegex = require_emoji_regex();
     var stringWidth = (string) => {
       if (typeof string !== "string" || string.length === 0) {
         return 0;
       }
-      string = stripAnsi(string);
+      string = stripAnsi2(string);
       if (string.length === 0) {
         return 0;
       }
@@ -5332,7 +5332,7 @@ var require_wrap_ansi = __commonJS({
   "node_modules/wrap-ansi/index.js"(exports, module) {
     "use strict";
     var stringWidth = require_string_width();
-    var stripAnsi = require_strip_ansi();
+    var stripAnsi2 = require_strip_ansi();
     var ansiStyles = require_ansi_styles();
     var ESCAPES = /* @__PURE__ */ new Set([
       "\x1B",
@@ -5351,7 +5351,7 @@ var require_wrap_ansi = __commonJS({
       const characters = [...word];
       let isInsideEscape = false;
       let isInsideLinkEscape = false;
-      let visible2 = stringWidth(stripAnsi(rows[rows.length - 1]));
+      let visible2 = stringWidth(stripAnsi2(rows[rows.length - 1]));
       for (const [index, character] of characters.entries()) {
         const characterLength = stringWidth(character);
         if (visible2 + characterLength <= columns) {
@@ -13355,7 +13355,7 @@ var require_parse2 = __commonJS({
       const parts = [];
       let bracket = 0;
       let paren = 0;
-      let quote = 0;
+      let quote2 = 0;
       let value = "";
       let escaped = false;
       for (const ch of input) {
@@ -13370,11 +13370,11 @@ var require_parse2 = __commonJS({
           continue;
         }
         if (ch === '"') {
-          quote = quote === 1 ? 0 : 1;
+          quote2 = quote2 === 1 ? 0 : 1;
           value += ch;
           continue;
         }
-        if (quote === 0) {
+        if (quote2 === 0) {
           if (ch === "[") {
             bracket++;
           } else if (ch === "]" && bracket > 0) {
@@ -13451,7 +13451,7 @@ var require_parse2 = __commonJS({
       }
       let bracket = 0;
       let paren = 0;
-      let quote = 0;
+      let quote2 = 0;
       let escaped = false;
       for (let i = 1; i < pattern.length; i++) {
         const ch = pattern[i];
@@ -13464,10 +13464,10 @@ var require_parse2 = __commonJS({
           continue;
         }
         if (ch === '"') {
-          quote = quote === 1 ? 0 : 1;
+          quote2 = quote2 === 1 ? 0 : 1;
           continue;
         }
-        if (quote === 1) {
+        if (quote2 === 1) {
           continue;
         }
         if (ch === "[") {
@@ -17633,7 +17633,7 @@ var require_parse3 = __commonJS({
       debug = () => {
       };
     }
-    var readStdin = async () => {
+    var readStdin2 = async () => {
       const { stdin, stdout } = process;
       if (stdin.isTTY)
         return null;
@@ -17669,7 +17669,7 @@ var require_parse3 = __commonJS({
         }, { once: true });
       });
     };
-    exports.readStdin = readStdin;
+    exports.readStdin = readStdin2;
     function isNegativeNumber(input) {
       return /^-\d/g.test(input);
     }
@@ -41394,15 +41394,15 @@ var require_quote = __commonJS({
       '"': '\\"',
       "\\": "\\\\"
     };
-    function quote(s) {
+    function quote2(s) {
       rxEscapable.lastIndex = 0;
       return '"' + (rxEscapable.test(s) ? s.replace(rxEscapable, (a2) => {
         const c = escaped[a2];
         return typeof c === "string" ? c : "\\u" + ("0000" + a2.charCodeAt(0).toString(16)).slice(-4);
       }) : s) + '"';
     }
-    exports.default = quote;
-    quote.code = 'require("ajv/dist/runtime/quote").default';
+    exports.default = quote2;
+    quote2.code = 'require("ajv/dist/runtime/quote").default';
   }
 });
 
@@ -55088,45 +55088,115 @@ function scanJson(s, end) {
 
 // src/lib/source.js
 var DEVIN_TIMEOUT_MS = 3e4;
-async function runDevinJson({ command = "devin", timeoutMs = DEVIN_TIMEOUT_MS } = {}) {
+var NON_INTERACTIVE_ENV = {
+  PAGER: "cat",
+  GIT_PAGER: "cat",
+  TERM: "dumb",
+  NO_COLOR: "1",
+  CI: "1"
+};
+var DETACHED_SPAWN = { detached: true, windowsHide: true };
+var STRATEGIES = [
+  { label: "temp file", file: true, env: null },
+  { label: "temp file, paging disabled, no controlling terminal", file: true, env: NON_INTERACTIVE_ENV, detached: true },
+  { label: "pipe, paging disabled, no controlling terminal", file: false, env: NON_INTERACTIVE_ENV, detached: true }
+];
+var ANSI = /\u001b\[[0-9;?]*[ -/]*[@-~]|\u001b\][\s\S]*?(?:\u0007|\u001b\\)|\u001b[@-Z\\-_]/g;
+function stripAnsi(text) {
+  return text.replace(ANSI, "");
+}
+function parseJsonLoosely(text) {
+  const clean = stripAnsi(text);
+  try {
+    return JSON.parse(clean);
+  } catch {
+  }
+  const start = clean.indexOf("{");
+  const end = clean.lastIndexOf("}");
+  if (start >= 0 && end > start) {
+    try {
+      return JSON.parse(clean.slice(start, end + 1));
+    } catch {
+    }
+  }
+  return null;
+}
+function spawnDevin({ command, env, stdout, timeoutMs, detached = false }) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, ["models", "list", "--format", "json"], {
+      stdio: ["ignore", stdout, "pipe"],
+      ...env ? { env: { ...process.env, ...env } } : {},
+      ...detached ? DETACHED_SPAWN : {}
+    });
+    let stdoutText = "";
+    let stderr = "";
+    let timedOut = false;
+    const timer = setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGKILL");
+    }, timeoutMs);
+    child.stdout?.on("data", (chunk) => {
+      stdoutText += chunk;
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    child.on("error", (error) => {
+      clearTimeout(timer);
+      reject(error);
+    });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      resolve({ stdout: stdoutText, stderr, code, timedOut });
+    });
+  });
+}
+async function captureToFile({ command, env, timeoutMs, detached }) {
   const file = join2(tmpdir(), `devinp-models-${process.pid}-${Date.now()}.json`);
   const handle = await open(file, "w");
   try {
-    const { code, stderr, timedOut } = await new Promise((resolve, reject) => {
-      const child = spawn(command, ["models", "list", "--format", "json"], {
-        stdio: ["ignore", handle.fd, "pipe"]
-      });
-      let stderr2 = "";
-      let timedOut2 = false;
-      const timer = setTimeout(() => {
-        timedOut2 = true;
-        child.kill("SIGKILL");
-      }, timeoutMs);
-      child.stderr.on("data", (chunk) => {
-        stderr2 += chunk;
-      });
-      child.on("error", (error) => {
-        clearTimeout(timer);
-        reject(error);
-      });
-      child.on("close", (childCode) => {
-        clearTimeout(timer);
-        resolve({ code: childCode, stderr: stderr2, timedOut: timedOut2 });
-      });
-    });
-    if (timedOut) {
-      throw new Error(`\`devin models list\` timed out after ${timeoutMs / 1e3}s`);
-    }
-    if (code !== 0) {
-      throw new Error(`\`devin models list\` failed \u2014 ${stderr.trim() || `exited with code ${code}`}`);
-    }
-    return await readFile2(file, "utf8");
+    const result = await spawnDevin({ command, env, stdout: handle.fd, timeoutMs, detached });
+    result.stdout = await readFile2(file, "utf8");
+    return result;
   } finally {
     await handle.close();
     await unlink(file).catch(() => {
     });
   }
 }
+async function runDevinJson({ command = "devin", timeoutMs = DEVIN_TIMEOUT_MS } = {}) {
+  const attempts = [];
+  for (const [index, strategy] of STRATEGIES.entries()) {
+    let result;
+    try {
+      result = strategy.file ? await captureToFile({ command, env: strategy.env, timeoutMs, detached: strategy.detached }) : await spawnDevin({ command, env: strategy.env, stdout: "pipe", timeoutMs, detached: strategy.detached });
+    } catch (error) {
+      if (error.code === "ENOENT") throw error;
+      attempts.push({ label: strategy.label, bytes: 0, code: null, stderr: "", timedOut: false, note: error.message });
+      continue;
+    }
+    const raw = result.stdout ?? "";
+    const parsed = raw.trim() ? parseJsonLoosely(raw) : null;
+    attempts.push({
+      label: strategy.label,
+      bytes: raw.length,
+      code: result.code,
+      stderr: result.stderr.trim(),
+      timedOut: result.timedOut,
+      raw
+    });
+    if (parsed != null) return { raw, parsed, attempts, timeoutMs };
+    if (index === 0 && result.code !== 0 && !result.timedOut && result.stderr.trim()) {
+      throw new Error(`\`devin models list\` failed \u2014 ${result.stderr.trim()}`);
+    }
+  }
+  const explained = [...attempts].reverse().find((a2) => a2.stderr);
+  if (explained && attempts.every((a2) => a2.timedOut || a2.code !== 0)) {
+    throw new Error(`\`devin models list\` failed \u2014 ${explained.stderr}`);
+  }
+  const longest = attempts.reduce((acc, a2) => (a2.raw?.length ?? 0) > acc.length ? a2.raw : acc, "");
+  return { raw: longest || "", parsed: null, attempts, timeoutMs };
+}
 function assertFamilies(data, sourceName) {
   if (data == null || typeof data !== "object" || !Array.isArray(data.families)) {
     throw new Error(`Unable to get model prices: ${sourceName} has no "families" array (expected \`devin models list --format json\` output)`);
@@ -55136,43 +55206,87 @@ function assertFamilies(data, sourceName) {
   }
   return data;
 }
-async function loadModelData({ source, command = "devin", timeoutMs = DEVIN_TIMEOUT_MS } = {}) {
+function quote(text) {
+  return JSON.stringify(text.length > 200 ? `\u2026${text.slice(-199)}` : text);
+}
+function describeAttempt(attempt, timeoutMs) {
+  const parts = [`${attempt.label}: ${attempt.bytes} bytes`];
+  if (attempt.timedOut) parts.push(`timed out after ${timeoutMs / 1e3}s`);
+  else parts.push(`exit ${attempt.code}`);
+  if (attempt.stderr) parts.push(`stderr ${quote(attempt.stderr)}`);
+  if (attempt.note) parts.push(attempt.note);
+  return parts.join(", ");
+}
+function describeFailure(attempts, timeoutMs) {
+  const bytes = Math.max(...attempts.map((a2) => a2.bytes), 0);
+  const longest = attempts.find((a2) => a2.bytes === bytes);
+  const tail = longest?.raw?.trimEnd().slice(-200) ?? "";
+  const lines = [];
+  if (bytes === 0) {
+    lines.push(
+      'Unable to get model prices: `devin models list --format json` exited without writing the JSON to stdout (0 bytes). devinp re-ran it with paging disabled and in a session with no controlling terminal, so the CLI had no terminal to paint a "click to show more" view on \u2014 whatever swallowed the output sits between devinp and `devin` (a shell function or agent wrapper around it, or a broken install).'
+    );
+  } else {
+    let parseError = "";
+    try {
+      JSON.parse(stripAnsi(longest.raw));
+    } catch (error) {
+      parseError = `${error.message} \u2014 `;
+    }
+    lines.push(
+      `Unable to get model prices: \`devin models list --format json\` returned invalid JSON (${parseError}${bytes} bytes, output ends with ${JSON.stringify(tail)}). The output may have been truncated mid-stream.`
+    );
+  }
+  lines.push(`Tried: ${attempts.map((a2) => describeAttempt(a2, timeoutMs)).join("; ")}.`);
+  lines.push("Capture the JSON yourself and hand it to devinp \u2014 piping or redirecting makes `devin` write the whole document in one go:");
+  lines.push("  devin models list --format json > models.json && devinp --source models.json");
+  lines.push("  devin models list --format json | devinp --source=-");
+  lines.push("Check `command -v devin` \u2014 if that is not the real CLI, devinp is asking the wrong program. If a plain redirect still prints a paged view, update the CLI (`devin update`).");
+  return lines.join("\n");
+}
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) chunks.push(chunk);
+  return Buffer.concat(chunks.map((c) => typeof c === "string" ? Buffer.from(c) : c)).toString("utf8");
+}
+async function loadModelData({
+  source,
+  command = "devin",
+  timeoutMs = DEVIN_TIMEOUT_MS,
+  readStdinFrom = readStdin
+} = {}) {
   if (source) {
-    let raw2;
+    const label = source === "-" ? "stdin" : `"${source}"`;
+    let raw;
     try {
-      raw2 = await readFile2(source, "utf8");
+      raw = source === "-" ? await readStdinFrom() : await readFile2(source, "utf8");
     } catch (error) {
-      throw new Error(`Unable to get model prices: cannot read source file "${source}" (${error.code ?? error.message})`);
+      throw new Error(`Unable to get model prices: cannot read ${source === "-" ? "stdin" : `source file "${source}"`} (${error.code ?? error.message})`);
     }
     try {
-      return { data: assertFamilies(JSON.parse(raw2), source) };
+      return { data: assertFamilies(JSON.parse(raw), label), retries: 0 };
     } catch (error) {
       if (error.message.startsWith("Unable to get model prices")) throw error;
-      throw new Error(`Unable to get model prices: "${source}" is not valid JSON (expected \`devin models list --format json\` output)`);
+      throw new Error(`Unable to get model prices: ${label} is not valid JSON (expected \`devin models list --format json\` output)`);
     }
   }
-  let raw;
+  let outcome;
   try {
-    raw = await runDevinJson({ command, timeoutMs });
+    outcome = await runDevinJson({ command, timeoutMs });
   } catch (error) {
     if (error.code === "ENOENT") {
-      throw new Error("Unable to get model prices: `devin` CLI not found in PATH. Install it or pass --source <file>.");
+      throw new Error("Unable to get model prices: `devin` CLI not found in PATH. Install it, or pass --source <file> / --source=- to supply the JSON yourself.");
     }
     throw new Error(`Unable to get model prices: ${error.message}`);
   }
-  try {
-    return { data: assertFamilies(JSON.parse(raw), "devin models list") };
-  } catch (error) {
-    if (error.message.startsWith("Unable to get model prices")) throw error;
-    const recovered = recoverTruncatedJson(raw);
-    if (recovered != null) {
-      return { data: assertFamilies(recovered, "devin models list (recovered)"), truncated: true };
-    }
-    const tail = raw.trimEnd().slice(-200);
-    throw new Error(
-      `Unable to get model prices: \`devin models list --format json\` returned invalid JSON (${error.message} \u2014 ${raw.length} bytes, output ends with ${JSON.stringify(tail)}). The output may have been truncated mid-stream: re-run, or save the output with \`devin models list --format json > models.json\` and pass \`--source models.json\`.`
-    );
+  if (outcome.parsed != null) {
+    return { data: assertFamilies(outcome.parsed, "devin models list"), retries: outcome.attempts.length - 1 };
+  }
+  const recovered = recoverTruncatedJson(outcome.raw);
+  if (recovered != null) {
+    return { data: assertFamilies(recovered, "devin models list (recovered)"), truncated: true, retries: outcome.attempts.length - 1 };
   }
+  throw new Error(describeFailure(outcome.attempts, outcome.timeoutMs));
 }
 
 // src/command.js
@@ -55189,7 +55303,8 @@ var Devinp = class _Devinp extends import_core.Command {
     "<%= config.bin %> -o=input",
     "<%= config.bin %> -o=bench -g=family",
     "<%= config.bin %> --web --port 8080",
-    "<%= config.bin %> --source sample/models.json"
+    "<%= config.bin %> --source sample/models.json",
+    "devin models list --format json | <%= config.bin %> --source=-"
   ];
   static flags = {
     order: import_core.Flags.string({
@@ -55214,7 +55329,7 @@ var Devinp = class _Devinp extends import_core.Command {
       dependsOn: ["web"]
     }),
     source: import_core.Flags.string({
-      summary: "load prices from a saved `devin models list --format json` file"
+      summary: "load prices from a saved `devin models list --format json` file, or from stdin with --source=- (use it when the CLI pages its output instead of writing it to the pipe)"
     }),
     json: import_core.Flags.boolean({
       summary: "print normalized rows as JSON instead of a table",
@@ -55229,6 +55344,9 @@ var Devinp = class _Devinp extends import_core.Command {
       if (loaded.truncated) {
         this.warn("devin output was truncated mid-stream \u2014 showing partial data, re-run for the full list");
       }
+      if (loaded.retries > 0) {
+        this.warn(`devin needed ${loaded.retries + 1} attempts to hand over the model list \u2014 something on this machine (pager, paged "show more" view, wrapper) interferes with \`devin models list\``);
+      }
       data = loaded.data;
     } catch (error) {
       this.error(error instanceof Error ? error.message : String(error), { exit: 1 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucasschirm/devinp",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "description": "Pretty pricing table for Devin models, powered by `devin models list`",
   "type": "module",
   "bin": {