@liustack/modlens 2.7.4 → 2.7.5

package/dist/main.js

@@ -7,128 +7,6 @@ import { spawn } from "child_process";
 import * as os from "os";
 import * as crypto from "crypto";
 import { createRequire } from "module";
-const CONFIG_DIR = path.join(os.homedir(), ".modlens");
-const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
-const ENV_BINDINGS = {
-  "gemini-api": { apiKey: "GEMINI_API_KEY" },
-  openai: { apiKey: "OPENAI_API_KEY", baseUrl: "OPENAI_BASE_URL" },
-  anthropic: { apiKey: "ANTHROPIC_API_KEY", baseUrl: "ANTHROPIC_BASE_URL" }
-};
-function loadConfigFile(configPath = CONFIG_PATH) {
-  let raw;
-  try {
-    raw = fs.readFileSync(configPath, "utf-8");
-  } catch {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object") {
-      return {};
-    }
-    return parsed;
-  } catch (error) {
-    throw new Error(
-      `Failed to parse ${configPath}: ${error.message}. Fix or delete the file.`
-    );
-  }
-}
-function defaultProviderName(config2) {
-  return config2.provider?.trim() || "antigravity-cli";
-}
-const PROVIDER_ALIASES = {
-  antigravity: "antigravity-cli",
-  agy: "antigravity-cli",
-  gemini: "gemini-api",
-  claude: "claude-cli"
-};
-function resolveProviderSettings(providerName, config2, env = process.env) {
-  const aliasNames = Object.entries(PROVIDER_ALIASES).filter(([, canonical]) => canonical === providerName).map(([alias]) => alias);
-  const fromFile = {
-    ...Object.assign({}, ...aliasNames.map((alias) => config2.providers?.[alias] ?? {})),
-    ...config2.providers?.[providerName] ?? {}
-  };
-  const bindings = ENV_BINDINGS[providerName] ?? {};
-  const settings = { ...fromFile };
-  for (const [field, envName] of Object.entries(bindings)) {
-    const value = env[envName]?.trim();
-    if (value) {
-      settings[field] = value;
-    }
-  }
-  return settings;
-}
-function setConfigValue(dottedKey, value, configPath = CONFIG_PATH) {
-  const config2 = loadConfigFile(configPath);
-  if (dottedKey === "provider") {
-    config2.provider = value;
-  } else {
-    const dot = dottedKey.indexOf(".");
-    if (dot <= 0 || dot === dottedKey.length - 1) {
-      throw new Error(
-        `Invalid config key: ${dottedKey}. Use "provider" or "<provider>.<apiKey|baseUrl|model>".`
-      );
-    }
-    const providerName = dottedKey.slice(0, dot);
-    const field = dottedKey.slice(dot + 1);
-    if (!["apiKey", "baseUrl", "model"].includes(field)) {
-      throw new Error(`Unknown config field: ${field}. Use apiKey, baseUrl, or model.`);
-    }
-    config2.providers ??= {};
-    config2.providers[providerName] ??= {};
-    config2.providers[providerName][field] = value;
-  }
-  fs.mkdirSync(path.dirname(configPath), { recursive: true });
-  fs.writeFileSync(configPath, `${JSON.stringify(config2, null, 2)}
-`, { mode: 384 });
-  try {
-    fs.chmodSync(configPath, 384);
-  } catch {
-  }
-}
-const CONFIG_TEMPLATE = {
-  provider: "antigravity-cli",
-  providers: {
-    "antigravity-cli": { model: "gemini-3.6-flash-low" },
-    "gemini-api": { apiKey: "", model: "gemini-3.6-flash" },
-    openai: { baseUrl: "", apiKey: "", model: "" },
-    anthropic: { apiKey: "", model: "claude-haiku-4-5-20251001" },
-    "claude-cli": { model: "haiku" }
-  }
-};
-function initConfigFile(configPath = CONFIG_PATH, force = false) {
-  if (!force && fs.existsSync(configPath)) {
-    throw new Error(`${configPath} already exists. Use --force to overwrite.`);
-  }
-  fs.mkdirSync(path.dirname(configPath), { recursive: true });
-  fs.writeFileSync(configPath, `${JSON.stringify(CONFIG_TEMPLATE, null, 2)}
-`, { mode: 384 });
-  try {
-    fs.chmodSync(configPath, 384);
-  } catch {
-  }
-}
-function renderConfig(config2) {
-  const masked = {
-    ...config2,
-    providers: Object.fromEntries(
-      Object.entries(config2.providers ?? {}).map(([name, settings]) => [
-        name,
-        {
-          ...settings,
-          ...settings.apiKey ? { apiKey: maskKey(settings.apiKey) } : {}
-        }
-      ])
-    )
-  };
-  return JSON.stringify(masked, null, 2);
-}
-function maskKey(key) {
-  if (key.length <= 8) {
-    return "****";
-  }
-  return `${key.slice(0, 6)}...${key.slice(-2)}`;
-}
 function buildVisionPrompt(options) {
   const readInstruction = options.imageKind === "inline" ? "Analyze the image attached to this message." : options.imageKind === "remote" ? `Fetch the image at this URL and analyze it: ${options.imageSource}` : `Read the image file at this path and analyze it: ${options.imageSource}`;
   const basePrompt = `${readInstruction}
@@ -370,6 +248,23 @@ function agyLogDir() {
   return path.join(os.homedir(), ".gemini", "antigravity-cli", "log");
 }
 const LOG_FRESHNESS_MS = 2 * 60 * 1e3;
+function parseAgyLogTime(line, now = /* @__PURE__ */ new Date()) {
+  const match = /\b[IWEF](\d{2})(\d{2})\s+(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?/.exec(line);
+  if (!match) {
+    return null;
+  }
+  const [, month, day, hour, minute, second, fraction] = match;
+  const stamp = new Date(
+    now.getFullYear(),
+    Number(month) - 1,
+    Number(day),
+    Number(hour),
+    Number(minute),
+    Number(second),
+    fraction ? Number(fraction.slice(0, 3)) : 0
+  ).getTime();
+  return stamp - now.getTime() > 24 * 60 * 60 * 1e3 ? new Date(new Date(stamp).setFullYear(now.getFullYear() - 1)).getTime() : stamp;
+}
 function readRecentAgyLog(since) {
   try {
     const dir = agyLogDir();
@@ -380,7 +275,11 @@ function readRecentAgyLog(since) {
     if (!newest || newest.mtime < since) {
       return "";
     }
-    return fs.readFileSync(newest.full, "utf-8").slice(-8e3);
+    const recent = fs.readFileSync(newest.full, "utf-8").slice(-64e3).split("\n").filter((line) => {
+      const stamp = parseAgyLogTime(line);
+      return stamp !== null && stamp >= since;
+    });
+    return recent.join("\n");
   } catch {
     return "";
   }
@@ -743,11 +642,8 @@ Respond with ONE JSON object only, no markdown fences, no commentary. Fill this
   if (result === null) {
     throw new Error(`OpenAI-compatible API returned non-JSON output: ${truncate(text)}`);
   }
-  const shaped = result;
-  const missing = ["summary", "ocr", "layout", "semantics", "visual", "uncertainty"].filter(
-    (field) => shaped[field] === void 0 || shaped[field] === null
-  );
-  if (missing.length > 0 || typeof shaped.summary !== "string" || typeof shaped.ocr !== "object" || !Array.isArray(shaped.uncertainty)) {
+  const missing = missingSchemaFields(result);
+  if (missing.length > 0) {
     throw new Error(
       `OpenAI-compatible API returned JSON that does not match the vision schema${missing.length > 0 ? ` (missing: ${missing.join(", ")})` : ""}. Retry, or switch to gemini-api / anthropic for enforced schemas. Got: ${truncate(text)}`
     );
@@ -761,6 +657,28 @@ Respond with ONE JSON object only, no markdown fences, no commentary. Fill this
     }
   };
 }
+function missingSchemaFields(result) {
+  const missing = [];
+  const root = result ?? {};
+  const child = (key) => root[key] && typeof root[key] === "object" ? root[key] : {};
+  const expect = (path2, ok) => {
+    if (!ok) {
+      missing.push(path2);
+    }
+  };
+  expect("summary", typeof root.summary === "string");
+  expect("ocr", typeof root.ocr === "object" && root.ocr !== null);
+  expect("ocr.full_text", typeof child("ocr").full_text === "string");
+  expect("ocr.lines", Array.isArray(child("ocr").lines));
+  expect("layout", typeof root.layout === "object" && root.layout !== null);
+  expect("layout.regions", Array.isArray(child("layout").regions));
+  expect("semantics", typeof root.semantics === "object" && root.semantics !== null);
+  expect("semantics.scene", typeof child("semantics").scene === "string");
+  expect("semantics.entities", Array.isArray(child("semantics").entities));
+  expect("visual", typeof root.visual === "object" && root.visual !== null);
+  expect("uncertainty", Array.isArray(root.uncertainty));
+  return missing;
+}
 function toDataUrl(image) {
   return `data:${image.mimeType};base64,${image.data}`;
 }
@@ -795,9 +713,135 @@ function resolveProvider(providerName = "antigravity-cli") {
   }
   return provider;
 }
+function providerAliases() {
+  return Object.fromEntries(
+    Object.entries(PROVIDERS).map(([alias, provider]) => [alias, provider.name])
+  );
+}
 function listProviders() {
   return [...new Set(Object.values(PROVIDERS).map((provider) => provider.name))];
 }
+const CONFIG_DIR = path.join(os.homedir(), ".modlens");
+const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
+const ENV_BINDINGS = {
+  "gemini-api": { apiKey: "GEMINI_API_KEY" },
+  openai: { apiKey: "OPENAI_API_KEY", baseUrl: "OPENAI_BASE_URL" },
+  anthropic: { apiKey: "ANTHROPIC_API_KEY", baseUrl: "ANTHROPIC_BASE_URL" }
+};
+function loadConfigFile(configPath = CONFIG_PATH) {
+  let raw;
+  try {
+    raw = fs.readFileSync(configPath, "utf-8");
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return {};
+    }
+    throw new Error(
+      `Cannot read ${configPath}: ${error.message}. Fix the file or its permissions.`
+    );
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") {
+      return {};
+    }
+    return parsed;
+  } catch (error) {
+    throw new Error(
+      `Failed to parse ${configPath}: ${error.message}. Fix or delete the file.`
+    );
+  }
+}
+function defaultProviderName(config2) {
+  return config2.provider?.trim() || "antigravity-cli";
+}
+function resolveProviderSettings(providerName, config2, env = process.env) {
+  const aliasNames = Object.entries(providerAliases()).filter(([alias, canonical]) => canonical === providerName && alias !== providerName).map(([alias]) => alias);
+  const fromFile = {
+    ...Object.assign({}, ...aliasNames.map((alias) => config2.providers?.[alias] ?? {})),
+    ...config2.providers?.[providerName] ?? {}
+  };
+  const bindings = ENV_BINDINGS[providerName] ?? {};
+  const settings = { ...fromFile };
+  for (const [field, envName] of Object.entries(bindings)) {
+    const value = env[envName]?.trim();
+    if (value) {
+      settings[field] = value;
+    }
+  }
+  return settings;
+}
+function setConfigValue(dottedKey, value, configPath = CONFIG_PATH) {
+  const config2 = loadConfigFile(configPath);
+  if (dottedKey === "provider") {
+    config2.provider = value;
+  } else {
+    const dot = dottedKey.indexOf(".");
+    if (dot <= 0 || dot === dottedKey.length - 1) {
+      throw new Error(
+        `Invalid config key: ${dottedKey}. Use "provider" or "<provider>.<apiKey|baseUrl|model>".`
+      );
+    }
+    const providerName = dottedKey.slice(0, dot);
+    const field = dottedKey.slice(dot + 1);
+    if (!["apiKey", "baseUrl", "model"].includes(field)) {
+      throw new Error(`Unknown config field: ${field}. Use apiKey, baseUrl, or model.`);
+    }
+    config2.providers ??= {};
+    config2.providers[providerName] ??= {};
+    config2.providers[providerName][field] = value;
+  }
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  fs.writeFileSync(configPath, `${JSON.stringify(config2, null, 2)}
+`, { mode: 384 });
+  try {
+    fs.chmodSync(configPath, 384);
+  } catch {
+  }
+}
+const CONFIG_TEMPLATE = {
+  provider: "antigravity-cli",
+  providers: {
+    "antigravity-cli": { model: "gemini-3.6-flash-low" },
+    "gemini-api": { apiKey: "", model: "gemini-3.6-flash" },
+    openai: { baseUrl: "", apiKey: "", model: "" },
+    anthropic: { apiKey: "", model: "claude-haiku-4-5-20251001" },
+    "claude-cli": { model: "haiku" }
+  }
+};
+function initConfigFile(configPath = CONFIG_PATH, force = false) {
+  if (!force && fs.existsSync(configPath)) {
+    throw new Error(`${configPath} already exists. Use --force to overwrite.`);
+  }
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  fs.writeFileSync(configPath, `${JSON.stringify(CONFIG_TEMPLATE, null, 2)}
+`, { mode: 384 });
+  try {
+    fs.chmodSync(configPath, 384);
+  } catch {
+  }
+}
+function renderConfig(config2) {
+  const masked = {
+    ...config2,
+    providers: Object.fromEntries(
+      Object.entries(config2.providers ?? {}).map(([name, settings]) => [
+        name,
+        {
+          ...settings,
+          ...settings.apiKey ? { apiKey: maskKey(settings.apiKey) } : {}
+        }
+      ])
+    )
+  };
+  return JSON.stringify(masked, null, 2);
+}
+function maskKey(key) {
+  if (key.length <= 8) {
+    return "****";
+  }
+  return `${key.slice(0, 6)}...${key.slice(-2)}`;
+}
 const DEFAULT_TIMEOUT_MS = 18e4;
 const KILL_GRACE_MS = 3e4;
 const DRAIN_GRACE_MS = 500;
@@ -972,37 +1016,44 @@ const EXT_BY_MIME = {
   "image/webp": "webp",
   "image/gif": "gif"
 };
-function transcriptBelongsTo(filePath, cwd) {
+function transcriptBelongsTo(lines, cwd) {
   const wanted = path.resolve(cwd);
-  let raw;
-  try {
-    raw = fs.readFileSync(filePath, "utf-8");
-  } catch {
-    return false;
-  }
-  for (const line of raw.split("\n")) {
+  let sawCwd = false;
+  for (const line of lines) {
     if (!line.includes('"cwd"')) {
       continue;
     }
     try {
       const recorded = JSON.parse(line).cwd;
-      if (typeof recorded === "string") {
-        const resolved = path.resolve(recorded);
-        return resolved === wanted || resolved.startsWith(`${wanted}${path.sep}`);
+      if (typeof recorded !== "string") {
+        continue;
+      }
+      sawCwd = true;
+      const resolved = path.resolve(recorded);
+      if (resolved === wanted || resolved.startsWith(`${wanted}${path.sep}`)) {
+        return true;
       }
     } catch {
     }
   }
-  return true;
+  return !sawCwd;
 }
-function forEachJsonLine(filePath, visit) {
-  let raw;
+function readLines(filePath) {
   try {
-    raw = fs.readFileSync(filePath, "utf-8");
+    return fs.readFileSync(filePath, "utf-8").split("\n");
   } catch {
+    return null;
+  }
+}
+function forEachJsonLine(filePath, visit) {
+  const lines = readLines(filePath);
+  if (!lines) {
     return;
   }
-  for (const line of raw.split("\n")) {
+  forEachParsedLine(lines, visit);
+}
+function forEachParsedLine(lines, visit) {
+  for (const line of lines) {
     if (!line.includes('"image"')) {
       continue;
     }
@@ -1025,9 +1076,9 @@ function jsonlSource(harness, filePath, extractLine) {
     }
   };
 }
-function newestJsonlTimestamp(filePath, extractLine) {
+function newestJsonlTimestamp(lines, extractLine) {
   let latest = null;
-  forEachJsonLine(filePath, (line) => {
+  forEachParsedLine(lines, (line) => {
     if (extractLine(line).length === 0) {
       return;
     }
@@ -1054,10 +1105,11 @@ function jsonlAdapter(options) {
     findNewest: (cwd) => {
       let best = null;
       for (const file of listJsonl(dirFor(cwd))) {
-        if (!transcriptBelongsTo(file, cwd)) {
+        const lines = readLines(file);
+        if (!lines || !transcriptBelongsTo(lines, cwd)) {
           continue;
         }
-        const timestamp = newestJsonlTimestamp(file, extractLine);
+        const timestamp = newestJsonlTimestamp(lines, extractLine);
         if (timestamp !== null && (!best || timestamp > best.timestamp)) {
           best = { ref: jsonlSource(name, file, extractLine), timestamp };
         }
@@ -1066,7 +1118,11 @@ function jsonlAdapter(options) {
     },
     findSession: (cwd, sessionId) => {
       for (const file of listJsonl(dirFor(cwd))) {
-        if (matchesSession(path.basename(file), sessionId) && transcriptBelongsTo(file, cwd)) {
+        if (!matchesSession(path.basename(file), sessionId)) {
+          continue;
+        }
+        const lines = readLines(file);
+        if (lines && transcriptBelongsTo(lines, cwd)) {
           return jsonlSource(name, file, extractLine);
         }
       }
@@ -1240,7 +1296,7 @@ function harnessFromPsTable(psOutput, startPid) {
     const tokens = proc.command.trim().split(/\s+/);
     const candidates = [tokens[0]];
     if (/^(node|bun|deno)$/.test(path.basename(tokens[0] ?? ""))) {
-      const script = tokens.slice(1).find((token) => !token.startsWith("-"));
+      const script = tokens.slice(1).find((token) => !token.startsWith("-") && /[/\\]|\.(m|c)?[jt]s$/.test(token));
       if (script) {
         candidates.push(script);
       }
@@ -1348,6 +1404,12 @@ function recoverPastedImages(options = {}) {
       "This is a Codex session: pasted images already exist as temp files, and each image tag in the message carries its path. Read the path from the tag instead of running recover-paste."
     );
   }
+  const requested = options.harness?.trim();
+  if (requested && requested !== "none" && !ADAPTERS.some((a) => a.name === requested)) {
+    throw new Error(
+      `Unknown harness "${requested}". Supported: ${ADAPTERS.map((a) => a.name).join(", ")} (or none to scan all).`
+    );
+  }
   const scoped = detected && detected !== "none" ? detected : null;
   if (scoped && !ADAPTERS.some((adapter) => adapter.name === scoped)) {
     throw new Error(
@@ -1412,7 +1474,7 @@ function recoverPastedImages(options = {}) {
   return result;
 }
 const program = new Command();
-program.name("modlens").description("Plug-in vision for text-only LLMs: image in, structured JSON evidence out").version("2.7.4");
+program.name("modlens").description("Plug-in vision for text-only LLMs: image in, structured JSON evidence out").version("2.7.5");
 program.command("analyze", { isDefault: true }).description("Analyze an image into structured JSON evidence (default command)").requiredOption("-i, --input <path|url>", "Input image path or https URL").option("-o, --output <path>", "Write result JSON to a file").option("-m, --model <name>", "Provider model name").option("-p, --provider <name>", `Vision provider (${listProviders().join(", ")})`).option("--prompt <text>", "Extra focus for this image").option("--timeout <ms>", "Provider timeout in milliseconds", "180000").option("--provider-bin <path>", "Provider binary path (default: agy)").option("--workdir <path>", "Working directory for the provider").action(async (options) => {
   try {
     const timeoutMs = Number.parseInt(options.timeout, 10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liustack/modlens",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "description": "Plug-in vision for text-only LLMs, powered by the free Antigravity CLI",
   "type": "module",
   "bin": {