@liustack/modlens 3.12.0 → 3.13.0

package/dsh/index.js

@@ -47,8 +47,16 @@ export function apply(ctx, config = {}) {
   // the developer-preview registry accepts these and out-of-tree resolution
   // of @deepseek-ai/dsh-tools is not yet reliable), so this plugin owns its
   // own argument validation inside execute.
-  ctx.tools.register({
-    name: 'read_image',
+  //
+  // The name can collide: hosts with a durable attachment store mount their
+  // own native read_image (dsh-tool-fs), and a duplicate registration throws,
+  // which used to fail the whole plugin fiber (issue #21). The collision
+  // falls back to a prefixed name — valuable exactly there, since the native
+  // tool is gated on the model declaring image input and vanishes for
+  // text-only models — and any other registration error degrades loudly
+  // instead of taking the vision wrapper down with it.
+  const readImageTool = (toolName) => ({
+    name: toolName,
     description:
       'Read an image through the modlens vision bridge. Use whenever a message references an image the current model cannot see: a local file path or an http(s) URL to a screenshot, photo, chart, diagram, or document scan. Returns structured evidence with every word transcribed (ocr.full_text), layout regions in reading order, semantics, and an uncertainty list; quote the evidence instead of guessing. Requires a configured modlens engine (run `npx @liustack/modlens doctor` in a terminal to check).',
     parameters: {
@@ -106,6 +114,24 @@ export function apply(ctx, config = {}) {
       return parsed.result
     },
   })
+  const preferred = config.toolName || 'read_image'
+  try {
+    ctx.tools.register(readImageTool(preferred))
+  } catch (error) {
+    const fallback = 'modlens_read_image'
+    if (preferred !== fallback && /already|duplicate/i.test(String(error))) {
+      try {
+        ctx.tools.register(readImageTool(fallback))
+        console.error(
+          `[modlens] tool name "${preferred}" is taken by the host; registered as "${fallback}" instead`,
+        )
+      } catch (retryError) {
+        console.error(`[modlens] read_image registration skipped: ${retryError}`)
+      }
+    } else {
+      console.error(`[modlens] read_image registration skipped: ${error}`)
+    }
+  }
 }
 
 /**
@@ -271,21 +297,47 @@ function abortableWait(promise, signal) {
   })
 }
 
+/**
+ * Image blocks hide at two depths: top-level message content (pastes), and
+ * inside tool-result content (dsh's own read_image tool nests one there).
+ * The upstream adapter's rejection check recurses (issue #24), so the
+ * conversion must recurse the same way or a nested image wedges the session
+ * permanently — the durable log keeps the real block, and every later turn
+ * re-fails on it.
+ */
+function contentHasImage(blocks) {
+  return (
+    Array.isArray(blocks) &&
+    blocks.some(
+      (b) => b?.type === 'image' || (b?.type === 'tool-result' && contentHasImage(b.content)),
+    )
+  )
+}
+
+async function convertBlocks(blocks, convertOne) {
+  const out = []
+  for (const block of blocks) {
+    if (block?.type === 'image') {
+      out.push(await convertOne(block))
+    } else if (block?.type === 'tool-result' && contentHasImage(block.content)) {
+      out.push({ ...block, content: await convertBlocks(block.content, convertOne) })
+    } else {
+      out.push(block)
+    }
+  }
+  return out
+}
+
 async function convertImagesToEvidence(ctx, messages, signal, adapter) {
   const out = []
   for (const message of messages) {
-    if (!Array.isArray(message.content) || !message.content.some((b) => b?.type === 'image')) {
+    if (!contentHasImage(message.content)) {
       out.push(message)
       continue
     }
-    const content = []
-    for (const block of message.content) {
-      if (block?.type !== 'image') {
-        content.push(block)
-        continue
-      }
-      content.push(await abortableWait(cachedEvidence(ctx, adapter, block), signal))
-    }
+    const content = await convertBlocks(message.content, (block) =>
+      abortableWait(cachedEvidence(ctx, adapter, block), signal),
+    )
     out.push({ ...message, content })
   }
   return out
@@ -305,28 +357,19 @@ function registerAutoRead(ctx) {
     if (decision.kind !== 'enter') {
       return decision
     }
-    const hasImage = decision.messages.some(
-      (message) =>
-        Array.isArray(message.content) &&
-        message.content.some((block) => block?.type === 'image'),
-    )
-    if (!hasImage) {
+    if (!decision.messages.some((message) => contentHasImage(message.content))) {
       return decision
     }
     const messages = []
     for (const message of decision.messages) {
-      if (!Array.isArray(message.content)) {
+      if (!contentHasImage(message.content)) {
         messages.push(message)
         continue
       }
-      const content = []
-      for (const block of message.content) {
-        if (block?.type !== 'image') {
-          content.push(block)
-          continue
-        }
-        content.push((await readImageBlock(ctx, block, payload.signal)).block)
-      }
+      const content = await convertBlocks(
+        message.content,
+        async (block) => (await readImageBlock(ctx, block, payload.signal)).block,
+      )
       messages.push({ ...message, content })
     }
     return { kind: 'enter', messages }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liustack/modlens",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Plug-in vision for text-only LLMs, powered by the free Antigravity CLI",
   "type": "module",
   "bin": {
@@ -53,7 +53,7 @@
   },
   "homepage": "https://github.com/liustack/modlens#readme",
   "engines": {
-    "node": ">=22.13"
+    "node": ">=22.19"
   },
   "dependencies": {
     "commander": "^13.1.0",

package/skills/modlens/SKILL.md

@@ -20,12 +20,12 @@ powershell -ExecutionPolicy Bypass -File <skill-dir>\scripts\run.ps1 <args>
 
 It resolves a working runtime (PATH `modlens`, then `npx`, then `bunx`) and forwards your arguments unchanged. Exit 78 means no runtime: relay the `nextSteps` from its stderr JSON instead of retrying.
 
-If your harness forbids running scripts, reason through the same order by hand and run the first line that works (the pinned version is 3.12.0):
+If your harness forbids running scripts, reason through the same order by hand and run the first line that works (the pinned version is 3.13.0):
 
-1. A `modlens` on `PATH` whose major version is 3 and is at least 3.12.0: `modlens <args>`.
-2. Otherwise, if `npx` exists: `npx --yes --package @liustack/modlens@3.12.0 modlens <args>`.
-3. Otherwise, if `bunx` exists: `bunx --bun @liustack/modlens@3.12.0 <args>`.
-4. Otherwise tell the user no JavaScript runtime was found and that installing Node 22.13+ (https://nodejs.org) or Bun (https://bun.sh) is the next step. Do not claim modlens itself failed.
+1. A `modlens` on `PATH` whose major version is 3 and is at least 3.13.0: `modlens <args>`.
+2. Otherwise, if `npx` exists: `npx --yes --package @liustack/modlens@3.13.0 modlens <args>`.
+3. Otherwise, if `bunx` exists: `bunx --bun @liustack/modlens@3.13.0 <args>`.
+4. Otherwise tell the user no JavaScript runtime was found and that installing Node 22.19+ (https://nodejs.org) or Bun (https://bun.sh) is the next step. Do not claim modlens itself failed.
 
 `references/runtime.md` documents the pin and the diagnostic fields.
 

package/skills/modlens/references/runtime.md

@@ -8,7 +8,7 @@ shell syntax.
 
 ## Pinned version
 
-- Pinned CLI version: 3.12.0
+- Pinned CLI version: 3.13.0
 - npm package: `@liustack/modlens`
 - CLI binary name: `modlens`
 
@@ -22,7 +22,7 @@ launcher/reference copies ever drift from `package.json`.
 Each call resolves a way to run the CLI, in this order:
 
 1. **A compatible `modlens` already on `PATH`** — run it directly, by name.
-2. **`npx` present, and `node` meets the CLI's 22.13 floor** — `npx --yes --package @liustack/modlens@<pinned> modlens <args>`. An npx sitting on an older node is skipped: it would select a path known to fail at run time.
+2. **`npx` present, and `node` meets the CLI's 22.19 floor** — `npx --yes --package @liustack/modlens@<pinned> modlens <args>`. An npx sitting on an older node is skipped: it would select a path known to fail at run time.
 3. **`bunx` present** — `bunx --bun @liustack/modlens@<pinned> <args>`.
 4. **A native artifact** — reserved for phase B. None is published yet, so this
    branch reports `nativeArtifact.available: false` and moves on.
@@ -70,13 +70,13 @@ would have set.
 - `checked.pathCli` — `{ present, path, version, compatible }` for a `modlens`
   on `PATH`, with `compatible` applying the rule above.
 - `checked.npx` — `{ present, path, nodeMeetsFloor }`; `nodeMeetsFloor` is whether
-  the local node satisfies the CLI's 22.13 floor, required for the npx path.
+  the local node satisfies the CLI's 22.19 floor, required for the npx path.
 - `checked.bunx` — `{ present, path }`.
 - `checked.node` — `{ present, version }`.
 - `nativeArtifact` — `{ available, note }`; `available` is `false` in phase A.
 - `selected` — the resolved path: `path`, `npx`, `bunx`, or `none`.
 - `nextSteps` — when `selected` is `none`, one or two plain-language actions for
-  the user (install Node 22.13+, or Bun); empty otherwise.
+  the user (install Node 22.19+, or Bun); empty otherwise.
 - `cliDoctor` — when a CLI is resolvable, the CLI's own `doctor --json` report
   (provider, config, and harness diagnosis) is nested here; `null` otherwise.
 
@@ -87,8 +87,9 @@ first time (that is how those runners work); after that it is served from the
 local cache.
 
 One capability note for the bunx path: Bun cannot load `node:sqlite`, which
-OpenCode paste recovery needs, so on a machine where the launcher resolved to
-bunx, `recover-paste` for OpenCode requires installing Node 22.13+ instead.
+OpenCode paste recovery needs (unflagged in Node since 22.13), so on a machine
+where the launcher resolved to bunx, `recover-paste` for OpenCode requires a
+real Node install — 22.19+, since that is the floor this launcher accepts.
 
 ## Delivery form: local CLI, long term
 

package/skills/modlens/scripts/run.ps1

@@ -24,7 +24,7 @@ $ErrorActionPreference = 'Stop'
 # package.json version, and the release script rewrites it on every bump.
 $Package = '@liustack/modlens'
 $Bin = 'modlens'
-$Pinned = '3.12.0'
+$Pinned = '3.13.0'
 # -------------------------------------------------------------------------------
 
 $NativeNote = 'no native artifact is published for this tool yet; phase A ships npm launch paths only'
@@ -72,7 +72,7 @@ function Test-Compatible {
 # The npx path runs the CLI on this machine's node, so npx is only usable when
 # node itself meets the CLI's floor. An old node with a working npx used to be
 # selected anyway, a path known to fail at run time.
-$NodeFloor = '22.13.0'
+$NodeFloor = '22.19.0'
 function Test-NodeMeetsFloor {
     if (-not (Get-Command node -ErrorAction SilentlyContinue)) { return $false }
     try { $nv = ((& node --version 2>$null) -replace '^v', '') } catch { return $false }
@@ -165,7 +165,7 @@ function Build-DiagnosisJson {
     $steps = @()
     if ($script:Selected -eq 'none') {
         $major = $Pinned.Split('.')[0]
-        $first = "Install Node 22.13+ from https://nodejs.org so npx can run $Package@$Pinned, then re-run this launcher."
+        $first = "Install Node 22.19+ from https://nodejs.org so npx can run $Package@$Pinned, then re-run this launcher."
         if ($script:NpxPresent -and (-not $script:NodeFloorOk)) {
             $first = "npx is present but node $(if ($script:NodeVer) { $script:NodeVer } else { 'missing' }) is below the $NodeFloor floor this CLI needs. Upgrade Node at https://nodejs.org, then re-run this launcher."
         }
@@ -215,7 +215,7 @@ function Write-DiagnosisText {
         Write-Output ''
         Write-Output ("No runtime can launch {0} here. {1}" -f $Bin, $NativeNote)
         Write-Output 'Next steps:'
-        Write-Output '  - Install Node 22.13+ from https://nodejs.org, then re-run this launcher.'
+        Write-Output '  - Install Node 22.19+ from https://nodejs.org, then re-run this launcher.'
         Write-Output ("  - Or install Bun from https://bun.sh, or put a compatible {0} on PATH." -f $Bin)
     }
 }

package/skills/modlens/scripts/run.sh

@@ -22,7 +22,7 @@ set -eu
 # package.json version, and the release script rewrites it on every bump.
 PKG="@liustack/modlens"
 BIN="modlens"
-PINNED="3.12.0"
+PINNED="3.13.0"
 # -------------------------------------------------------------------------------
 
 NATIVE_NOTE="no native artifact is published for this tool yet; phase A ships npm launch paths only"
@@ -70,7 +70,7 @@ cli_version() {
 # The npx path runs the CLI on this machine's node, so npx is only usable when
 # node itself meets the CLI's floor. An old node with a working npx used to be
 # selected anyway, a path known to fail at run time.
-NODE_FLOOR="22.13.0"
+NODE_FLOOR="22.19.0"
 node_meets_floor() {
   command -v node >/dev/null 2>&1 || return 1
   _nv="$(node --version 2>/dev/null | sed 's/^v//')"
@@ -189,7 +189,7 @@ compute_next_steps() {
     if [ "$G_NPX_PRESENT" = 1 ] && [ "$G_NODE_FLOOR_OK" = 0 ]; then
       _s1="npx is present but node ${G_NODE_VER:-missing} is below the $NODE_FLOOR floor this CLI needs. Upgrade Node at https://nodejs.org, then re-run this launcher."
     else
-      _s1="Install Node 22.13+ from https://nodejs.org so npx can run $PKG@$PINNED, then re-run this launcher."
+      _s1="Install Node 22.19+ from https://nodejs.org so npx can run $PKG@$PINNED, then re-run this launcher."
     fi
     _s2="No JavaScript runtime? Install Bun from https://bun.sh to use bunx, or put a compatible $BIN (major ${PINNED%%.*}, at or above $PINNED) on PATH."
     G_NEXTSTEPS="$(printf '"%s", "%s"' "$(json_escape "$_s1")" "$(json_escape "$_s2")")"
@@ -255,7 +255,7 @@ emit_text() {
   if [ "$G_SEL" = "none" ]; then
     printf '\nNo runtime can launch %s here. %s\n' "$BIN" "$NATIVE_NOTE"
     printf 'Next steps:\n'
-    printf '  - Install Node 22.13+ from https://nodejs.org, then re-run this launcher.\n'
+    printf '  - Install Node 22.19+ from https://nodejs.org, then re-run this launcher.\n'
     printf '  - Or install Bun from https://bun.sh, or put a compatible %s on PATH.\n' "$BIN"
   fi
 }