@open-code-review/cli 2.1.0 → 2.2.1

package/dist/lib/models.js

@@ -7,31 +7,70 @@ import {
 import { promisify } from "node:util";
 var execFilePromise = promisify(execFile);
 var isWindows = process.platform === "win32";
-function execBinary(binary, args, opts) {
-  return execFileSync(binary, args, {
+async function execBinaryAsync(binary, args, opts) {
+  return execFilePromise(binary, args, {
     ...opts,
     shell: isWindows
   });
 }
 
 // src/lib/models.ts
-var BUNDLED_CLAUDE_MODELS = [
-  { id: "claude-opus-4-7", displayName: "Claude Opus 4.7" },
-  { id: "claude-sonnet-4-6", displayName: "Claude Sonnet 4.6" },
-  { id: "claude-haiku-4-5-20251001", displayName: "Claude Haiku 4.5" }
-];
-var BUNDLED_OPENCODE_MODELS = [
-  { id: "anthropic/claude-opus-4-7", provider: "anthropic" },
-  { id: "anthropic/claude-sonnet-4-6", provider: "anthropic" },
-  { id: "anthropic/claude-haiku-4-5-20251001", provider: "anthropic" }
-];
-function detectActiveVendor() {
-  for (const vendor of ["claude", "opencode"]) {
+function parseOpenCodeModelList(stdout) {
+  const models = [];
+  for (const rawLine of stdout.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!/^[^\s:]+\/\S+$/.test(line)) continue;
+    const provider = line.slice(0, line.indexOf("/"));
+    models.push({ id: line, provider });
+  }
+  return models.length > 0 ? models : null;
+}
+var VENDOR_MODEL_STRATEGIES = {
+  claude: {
+    displayName: "Claude Code",
+    native: {
+      // Verified against Claude Code 2.1.x: the CLI has no model-listing
+      // subcommand (`claude models --json` → "unknown option"). Revisit if
+      // a future release adds one.
+      unavailableReason: "Claude Code does not provide a model-listing command; showing its documented model aliases instead"
+    },
+    // Vendor-documented aliases that always track the latest generation —
+    // dated ids here would go stale by construction (the exact bug class of
+    // issue #39). Pinned dated ids remain available via free-text entry.
+    bundled: [
+      { id: "opus", displayName: "Claude Opus (latest)" },
+      { id: "sonnet", displayName: "Claude Sonnet (latest)" },
+      { id: "haiku", displayName: "Claude Haiku (latest)" }
+    ]
+  },
+  opencode: {
+    displayName: "OpenCode",
+    native: {
+      // Plain `opencode models` — newline-delimited ids. (`--json` is not a
+      // real flag, and `--verbose` interleaves JSON metadata blocks that
+      // defeat line parsing.)
+      args: ["models"],
+      parse: parseOpenCodeModelList
+    },
+    bundled: [
+      { id: "anthropic/claude-opus-4-8", provider: "anthropic" },
+      { id: "anthropic/claude-sonnet-4-6", provider: "anthropic" },
+      { id: "anthropic/claude-haiku-4-5", provider: "anthropic" }
+    ]
+  }
+};
+var SUPPORTED_VENDORS = Object.keys(
+  VENDOR_MODEL_STRATEGIES
+);
+function isModelVendor(value) {
+  return Object.hasOwn(VENDOR_MODEL_STRATEGIES, value);
+}
+async function detectActiveVendor() {
+  for (const vendor of SUPPORTED_VENDORS) {
     try {
-      execBinary(vendor, ["--version"], {
+      await execBinaryAsync(vendor, ["--version"], {
         encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["ignore", "pipe", "ignore"]
+        timeout: 3e3
       });
       return vendor;
     } catch {
@@ -39,47 +78,83 @@ function detectActiveVendor() {
   }
   return null;
 }
-function tryNativeEnumeration(vendor) {
+function describeProbeFailure(vendor, args, err) {
+  const command = `${vendor} ${args.join(" ")}`;
+  const e = err;
+  if (e.code === "ENOENT") {
+    return `\`${vendor}\` is not installed or not on PATH`;
+  }
+  if (e.killed) {
+    return `\`${command}\` timed out or exceeded output limits`;
+  }
+  const stderr = typeof e.stderr === "string" ? e.stderr.trim() : "";
+  const firstLine = (stderr.split(/\r?\n/)[0] ?? "").replace(/\u001b\[[0-9;]*[A-Za-z]/g, "").replace(/[\u0000-\u001f\u007f]/g, "").slice(0, 200);
+  const detail = firstLine ? `: ${firstLine}` : "";
+  const exit = typeof e.code === "number" ? ` with exit code ${e.code}` : "";
+  return `\`${command}\` failed${exit}${detail}`;
+}
+async function tryNativeEnumeration(vendor, probe) {
+  let stdout;
   try {
-    const output = execBinary(vendor, ["models", "--json"], {
+    const result = await execBinaryAsync(vendor, probe.args, {
       encoding: "utf-8",
-      timeout: 5e3,
-      stdio: ["ignore", "pipe", "ignore"]
+      timeout: 5e3
     });
-    const parsed = JSON.parse(output);
-    if (!Array.isArray(parsed)) return null;
-    const models = [];
-    for (const item of parsed) {
-      if (typeof item === "string") {
-        models.push({ id: item });
-      } else if (typeof item === "object" && item !== null && "id" in item && typeof item.id === "string") {
-        const obj = item;
-        const desc = { id: obj.id };
-        if (typeof obj.displayName === "string") desc.displayName = obj.displayName;
-        if (typeof obj.provider === "string") desc.provider = obj.provider;
-        if (Array.isArray(obj.tags)) {
-          desc.tags = obj.tags.filter((t) => typeof t === "string");
-        }
-        models.push(desc);
-      }
-    }
-    return models.length > 0 ? models : null;
-  } catch {
-    return null;
+    stdout = result.stdout;
+  } catch (err) {
+    return { models: null, reason: describeProbeFailure(vendor, probe.args, err) };
   }
+  const models = probe.parse(stdout);
+  if (!models) {
+    return {
+      models: null,
+      reason: `\`${vendor} ${probe.args.join(" ")}\` output did not contain any model identifiers`
+    };
+  }
+  return { models };
 }
-function bundledForVendor(vendor) {
-  if (vendor === "claude") return BUNDLED_CLAUDE_MODELS;
-  return BUNDLED_OPENCODE_MODELS;
+var SUCCESS_TTL_MS = 6e4;
+var FAILURE_TTL_MS = 1e4;
+var cache = /* @__PURE__ */ new Map();
+function clearModelListCache() {
+  cache.clear();
 }
-function listModelsForVendor(vendor) {
-  const native = tryNativeEnumeration(vendor);
-  if (native) {
-    return { vendor, source: "native", models: native };
+async function listModelsForVendor(vendor) {
+  const cached = cache.get(vendor);
+  if (cached && cached.expiresAt > Date.now()) {
+    return cached.result;
+  }
+  const strategy = VENDOR_MODEL_STRATEGIES[vendor];
+  if (!strategy) {
+    throw new Error(`Unknown vendor: ${vendor}`);
+  }
+  let result;
+  if ("unavailableReason" in strategy.native) {
+    result = {
+      vendor,
+      source: "bundled",
+      models: strategy.bundled,
+      nativeUnavailableReason: strategy.native.unavailableReason
+    };
+  } else {
+    const native = await tryNativeEnumeration(vendor, strategy.native);
+    result = native.models ? { vendor, source: "native", models: native.models } : {
+      vendor,
+      source: "bundled",
+      models: strategy.bundled,
+      nativeUnavailableReason: native.reason
+    };
   }
-  return { vendor, source: "bundled", models: bundledForVendor(vendor) };
+  const ttl = result.source === "native" ? SUCCESS_TTL_MS : FAILURE_TTL_MS;
+  cache.set(vendor, { result, expiresAt: Date.now() + ttl });
+  return result;
 }
 export {
+  SUPPORTED_VENDORS,
+  VENDOR_MODEL_STRATEGIES,
+  clearModelListCache,
   detectActiveVendor,
-  listModelsForVendor
+  isModelVendor,
+  listModelsForVendor,
+  parseOpenCodeModelList
 };

package/dist/lib/runtime-config.js

@@ -2,38 +2,54 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 var DEFAULT_AGENT_HEARTBEAT_SECONDS = 60;
-function getAgentHeartbeatSeconds(ocrDir) {
+var DEFAULT_WORKFLOW_HARD_DEADLINE_MINUTES = 60;
+function readRuntimePositiveInt(ocrDir, key, defaultValue) {
   const configPath = join(ocrDir, "config.yaml");
-  if (!existsSync(configPath)) {
-    return DEFAULT_AGENT_HEARTBEAT_SECONDS;
-  }
+  if (!existsSync(configPath)) return defaultValue;
   let content;
   try {
     content = readFileSync(configPath, "utf-8");
   } catch {
-    return DEFAULT_AGENT_HEARTBEAT_SECONDS;
+    return defaultValue;
   }
   const blockMatch = content.match(
-    /^runtime:\s*\n(?:\s+[^\n]*\n)*?\s+agent_heartbeat_seconds:\s*([^\s#\n]+)/m
+    new RegExp(
+      String.raw`^runtime:\s*\n(?:\s+[^\n]*\n)*?\s+${key}:\s*([^\s#\n]+)`,
+      "m"
+    )
   );
   const inlineMatch = content.match(
-    /^runtime:\s*\{[^}]*\bagent_heartbeat_seconds:\s*([^\s,}]+)/m
+    new RegExp(String.raw`^runtime:\s*\{[^}]*\b${key}:\s*([^\s,}]+)`, "m")
   );
   const raw = blockMatch?.[1] ?? inlineMatch?.[1];
-  if (!raw) {
-    return DEFAULT_AGENT_HEARTBEAT_SECONDS;
-  }
+  if (!raw) return defaultValue;
   const parsed = Number(raw);
   if (!Number.isFinite(parsed) || parsed <= 0 || !Number.isInteger(parsed)) {
     process.stderr.write(
-      `[ocr] runtime.agent_heartbeat_seconds is not a positive integer (got "${raw}"); falling back to ${DEFAULT_AGENT_HEARTBEAT_SECONDS}s.
+      `[ocr] runtime.${key} is not a positive integer (got "${raw}"); falling back to ${defaultValue}.
 `
     );
-    return DEFAULT_AGENT_HEARTBEAT_SECONDS;
+    return defaultValue;
   }
   return parsed;
 }
+function getAgentHeartbeatSeconds(ocrDir) {
+  return readRuntimePositiveInt(
+    ocrDir,
+    "agent_heartbeat_seconds",
+    DEFAULT_AGENT_HEARTBEAT_SECONDS
+  );
+}
+function getWorkflowHardDeadlineMs(ocrDir) {
+  return readRuntimePositiveInt(
+    ocrDir,
+    "workflow_hard_deadline_minutes",
+    DEFAULT_WORKFLOW_HARD_DEADLINE_MINUTES
+  ) * 60 * 1e3;
+}
 export {
   DEFAULT_AGENT_HEARTBEAT_SECONDS,
-  getAgentHeartbeatSeconds
+  DEFAULT_WORKFLOW_HARD_DEADLINE_MINUTES,
+  getAgentHeartbeatSeconds,
+  getWorkflowHardDeadlineMs
 };