@xiaoso/dsh-tool-plus 0.1.14 → 0.1.16-beta.0

package/README.en.md

@@ -1,130 +1,164 @@
-<div align="center">
-  <img width="160" src="assets/icon.png" alt="dsh tool plus icon"><br>
-  <img width="240" src="assets/wordmark.png" alt="dsh tool plus">
-</div>
-
-<div align="center">
-
-[简体中文](./README.md) | English
-
-</div>
-
-<div align="center">
-
-[![npm version](https://img.shields.io/npm/v/@xiaoso/dsh-tool-plus?logo=npm)](https://www.npmjs.com/package/@xiaoso/dsh-tool-plus)
-[![License: MIT](https://img.shields.io/github/license/xiaoso456/dsh-tool-plus)](LICENSE)
-[![Node](https://img.shields.io/badge/node-%3E%3D22.19%20%7C%20%3E%3D24-339933?logo=nodedotjs)](https://nodejs.org)
-[![Platform](https://img.shields.io/badge/platform-windows%20%7C%20macos%20%7C%20linux-lightgrey)]()
-
-</div>
-
-Essential tools enhancement for DeepSeek Harness: persistent bash, structured read, multi-mode edit, atomic write, full-text search, and direct image reading — one plugin covers it all. Ported from the [Oh My Pi](https://github.com/can1357/oh-my-pi) core; once installed it automatically takes over the official bash / pwsh / file / search tools, with optional `ast_grep` / `ast_edit` structural search and rewrite.
-
-## Features
-
-- **bash**: persistent shell; `cd` and `export` keep state across calls; verbose logs (git/npm/cargo…) are condensed automatically; overlong output keeps only head and tail, with the full content written to disk for later retrieval; long-running commands are moved to the background automatically; optionally intercepts `cat`, `grep`, `find`, and `sed -i` to steer you toward the dedicated tools
-- **Safe delete**: `rm` moves files to the system trash by default instead of deleting permanently, so accidental deletes are recoverable; use `command rm` for a real delete
-- **read**: precise line-range reading (supports `:N-M`, `:raw`, and multiple ranges); large code files return a structural summary by default, with details expanded on demand; zip/tar archives, SQLite, notebooks, and PDFs read directly; PNG / JPEG / WebP / GIF images read directly, oversized ones scaled down automatically; can fetch web content (including images embedded in the page); SPA sites (content rendered dynamically by JS, e.g. excalidraw.com) are automatically fetched via local browser rendering
-- **write**: atomic writes that return a diff of the changes; supports patch-style writing, and can write directly into zip/tar archive members and SQLite data
-- **edit**: `replace` by default, with patch / hashline / apply-patch formats also supported; multi-hunk edits, uniqueness validation, fuzzy matching tolerant of whitespace differences
-- **grep / glob**: full-text search and filename matching; mtime sorting, context lines, and configurable ignore rules
-- **ast_grep / ast_edit** (optional): syntax-tree based structural code search and rewrite, enabled in settings
-- **agent presets**: two companion templates — Standard enhanced and PTC (Code Mode)
-
-Settings panel (Bash tab):
-
-![Tool Plus settings panel (Bash)](docs/screenshots/settings-bash-en.png)
-
-## Recommended Environment & Configuration
-
-- **Full-access mode**: the plugin is best used under `danger-full-access`, which avoids file writes being blocked by mistake in sandboxed modes.
-
-## Installation
-
-### Install from npm (recommended)
-
-#### Web
-
-```sh
-dsh plugin --profile web add --allow-build=@xiaoso/dsh-tool-plus --allow-build=koffi @xiaoso/dsh-tool-plus
-```
-
-`--allow-build` lets install scripts run (once for this package, once for `koffi`); it requires pnpm ≥ 10.4, and on pnpm 11+ omitting it fails the install with `ERR_PNPM_IGNORED_BUILDS`. If your pnpm is too old for the flag, allow the scripts first and re-run:
-
-- Append to `~/.dsh/profiles/web/pnpm-workspace.yaml`: `allowBuilds:`, `  '@xiaoso/dsh-tool-plus': true` and `  koffi: true`
-- Or run `cd ~/.dsh/profiles/web && pnpm approve-builds --all` (pnpm ≥ 10.32)
-
-#### Desktop
-
-The profile is owned by the desktop app, so `dsh plugin --profile desktop` is refused; install inside the profile directory instead:
-
-```sh
-cd ~/.dsh/profiles/desktop
-pnpm add --allow-build=@xiaoso/dsh-tool-plus --allow-build=koffi @xiaoso/dsh-tool-plus
-```
-
-### Local development
-
-```sh
-dsh plugin --profile web add link:<path to this repo>
-```
-
-### Presets
-
-| Preset | Base | What it is |
-|---|---|---|
-| **Tool Plus 标准增强版** | official standard | everything in standard mode, with the file/shell toolset swapped for this plugin |
-| **Tool Plus PTC 增强版** | official PTC (Code Mode) | same, but composing multi-step operations through Code Mode's `run_code` |
-
-Both presets are **declared by the plugin**: installing it (as a profile bundle) brings two `@deepseek-ai/dsh-agent-preset` declaration rows along in its patch layer, so they appear in the preset list immediately. There is no install step, and the plugin writes nothing at startup.
-
-**Tool Plus → Presets** in the settings page is where you change them. Since dsh 0.1.7 the official preset page is read-only and the `agent_preset` tool is gone, so this panel is the only graphical entry point:
-
-- **Minimal update** — disables just the official tool rows still mounted, touching nothing else
-- **Align to template** — replaces this row's whole plugin list with the selected template
-- **Revert to bundled** — removes the override you wrote in the profile configuration (`<profile>/cordis.patch.yml`), falling back to the bundled declaration
-- **View differences** — shows which entries differ before you touch anything
-
-Writes go through the harness's own `ctx.configEditor`, so they inherit the profile lock, concurrency protection, atomic write and rollback.
-
-> Upgrading from 0.1.9 or earlier: `~/.dsh/.agent-presets/` is **read by nothing** any more (0.1.7 moved presets into the patch layer), so it is safe to delete; the panel tells you when it finds one.
-
-## Configuration
-
-Works out of the box, no configuration needed. Common tweaks: background threshold (`autoBackgroundMs`), timeouts (`defaultTimeoutMs` / `maxTimeoutMs`), the output truncation window, the default edit mode (`editMode`, default `replace`), and the structured summary toggle (`readSummarizeEnabled`).
-
-## Requirements
-
-- **dsh CLI**: installed globally, `npm i -g @deepseek-ai/dsh`
-- **Node.js** ≥ 22.19 or ≥ 24
-- **Git Bash** (recommended): serves as the bash execution environment on Windows
-- Targets DeepSeek Harness `dsh` v0.2.0-rc.2 (pre-release; interfaces may change)
-
-## Notes
-
-- No standalone `pwsh` tool: shell work is handled by the more capable persistent `bash`
-
-**Safe rm sends deleted files to the system trash.** Where they land, and whether you can see them:
-
-| | Windows | macOS | Linux |
-|---|---|---|---|
-| **Location** | Recycle Bin | Trash `~/.Trash` | `$XDG_DATA_HOME/Trash`; defaults to `~/.local/share/Trash` |
-| **Another volume / external disk** | That volume's Recycle Bin | That volume's `.Trashes` | `.Trash-<uid>` at that mount point |
-| **Visible in the OS trash** | Yes | Yes | Same volume: yes; another volume: open that location |
-| **File name** | Unchanged | Unchanged | A UUID; the original name comes from `.trashinfo` |
-| **Put back** | Yes | Yes | Depends on the file manager |
-| **Implementation** | Shell API | System API | Third-party XDG implementation |
-| **Known limits** | No Recycle Bin on network drives | Requires macOS 10.12+ | Some desktops do not list it — restore from the location above |
-
-## Build
-
-```sh
-pnpm install
-pnpm build     # type declarations (tsc) + tsdown bundle + asset copy
-pnpm typecheck
-pnpm test      # includes real-bash cases; needs Git Bash on Windows, auto-skips when missing
-```
-
-## License
-
-[MIT](LICENSE); third-party component licenses in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
+<div align="center">
+  <img width="160" src="assets/icon.png" alt="dsh tool plus icon"><br>
+  <img width="240" src="assets/wordmark.png" alt="dsh tool plus">
+</div>
+
+<div align="center">
+
+[简体中文](./README.md) | English
+
+</div>
+
+<div align="center">
+
+[![npm version](https://img.shields.io/npm/v/@xiaoso/dsh-tool-plus?logo=npm)](https://www.npmjs.com/package/@xiaoso/dsh-tool-plus)
+[![License: MIT](https://img.shields.io/github/license/xiaoso456/dsh-tool-plus)](LICENSE)
+[![Node](https://img.shields.io/badge/node-%3E%3D22.19%20%7C%20%3E%3D24-339933?logo=nodedotjs)](https://nodejs.org)
+[![Platform](https://img.shields.io/badge/platform-windows%20%7C%20macos%20%7C%20linux-lightgrey)]()
+
+</div>
+
+Essential tools enhancement for DeepSeek Harness: persistent bash, structured read, multi-mode edit, atomic write, full-text search, and direct image reading — one plugin covers it all. Ported from the [Oh My Pi](https://github.com/can1357/oh-my-pi) core; once installed it automatically takes over the official bash / pwsh / file / search tools, with optional `ast_grep` / `ast_edit` structural search and rewrite.
+
+## Features
+
+- **bash**: persistent shell; `cd` and `export` keep state across calls; verbose logs (git/npm/cargo…) are condensed automatically; overlong output keeps only head and tail, with the full content written to disk for later retrieval; long-running commands are moved to the background automatically; optionally intercepts `cat`, `grep`, `find`, and `sed -i` to steer you toward the dedicated tools (off by default)
+- **Safe delete**: `rm` moves files to the system trash by default instead of deleting permanently, so accidental deletes are recoverable; use `command rm` for a real delete
+- **read**: precise line-range reading (supports `:N-M`, `:raw`, and multiple ranges); large code files return a structural summary by default, with details expanded on demand; zip/tar archives, SQLite, notebooks, and PDFs read directly; PNG / JPEG / WebP / GIF images read directly, oversized ones scaled down automatically; can fetch web content (including images embedded in the page); SPA sites (content rendered dynamically by JS, e.g. excalidraw.com) are automatically fetched via local browser rendering
+- **write**: atomic writes that return a diff of the changes; supports patch-style writing, and can write directly into zip/tar archive members and SQLite data
+- **edit**: `replace` by default, with patch / hashline / apply-patch formats also supported; multi-hunk edits, uniqueness validation, fuzzy matching tolerant of whitespace differences
+- **grep / glob**: full-text search and filename matching; mtime sorting, context lines, and configurable ignore rules
+- **ast_grep / ast_edit** (optional): syntax-tree based structural code search and rewrite, enabled in settings
+- **agent presets**: two companion templates — Standard enhanced and PTC (Code Mode)
+
+Settings panel (Bash tab):
+
+![Tool Plus settings panel (Bash)](docs/screenshots/settings-bash-en.png)
+
+## Recommended Environment & Configuration
+
+- **Full-access mode**: the plugin is best used under `danger-full-access`, which avoids file writes being blocked by mistake in sandboxed modes.
+
+## Installation
+
+### Install from npm (recommended)
+
+#### Web
+
+```sh
+dsh plugin --profile web add --allow-build=@xiaoso/dsh-tool-plus --allow-build=koffi @xiaoso/dsh-tool-plus
+```
+
+`--allow-build` lets install scripts run (once for this package, once for `koffi`); it requires pnpm ≥ 10.4, and on pnpm 11+ omitting it fails the install with `ERR_PNPM_IGNORED_BUILDS`. If your pnpm is too old for the flag, allow the scripts first and re-run:
+
+- Append to `~/.dsh/profiles/web/pnpm-workspace.yaml`: `allowBuilds:`, `  '@xiaoso/dsh-tool-plus': true` and `  koffi: true`
+- Or run `cd ~/.dsh/profiles/web && pnpm approve-builds --all` (pnpm ≥ 10.32)
+
+#### Desktop
+
+The profile is owned by the desktop app, so `dsh plugin --profile desktop` is refused; install inside the profile directory instead:
+
+```sh
+cd ~/.dsh/profiles/desktop
+pnpm add --allow-build=@xiaoso/dsh-tool-plus --allow-build=koffi @xiaoso/dsh-tool-plus
+```
+
+### Local development
+
+```sh
+dsh plugin --profile web add link:<path to this repo>
+```
+
+### Presets
+
+| Preset | Base | What it is |
+|---|---|---|
+| **Tool Plus 标准增强版** | official standard | everything in standard mode, with the file/shell toolset swapped for this plugin |
+| **Tool Plus PTC 增强版** | official PTC (Code Mode) | same, but composing multi-step operations through Code Mode's `run_code` |
+
+Both presets are **declared by the plugin**: installing it (as a profile bundle) brings two `@deepseek-ai/dsh-agent-preset` declaration rows along in its patch layer, so they appear in the preset list immediately. There is no install step, and the plugin writes nothing at startup.
+
+**Tool Plus → Presets** in the settings page is where you change them. Since dsh 0.1.7 the official preset page is read-only and the `agent_preset` tool is gone, so this panel is the only graphical entry point:
+
+- **Minimal update** — disables just the official tool rows still mounted, touching nothing else
+- **Align to template** — replaces this row's whole plugin list with the selected template
+- **Revert to bundled** — removes the override you wrote in the profile configuration (`<profile>/cordis.patch.yml`), falling back to the bundled declaration
+- **View differences** — shows which entries differ before you touch anything
+
+Writes go through the harness's own `ctx.configEditor`, so they inherit the profile lock, concurrency protection, atomic write and rollback.
+
+> Upgrading from 0.1.9 or earlier: `~/.dsh/.agent-presets/` is **read by nothing** any more (0.1.7 moved presets into the patch layer), so it is safe to delete; the panel tells you when it finds one.
+
+## Configuration
+
+Works out of the box, no configuration needed. Common tweaks: background threshold (`autoBackgroundMs`), timeouts (`defaultTimeoutMs` / `maxTimeoutMs`), the output truncation window, the default edit mode (`editMode`, default `replace`), and the structured summary toggle (`readSummarizeEnabled`).
+
+## Performance
+
+On Linux, comparing the official standard mode with this plugin's Standard enhanced preset (SWE-bench Multilingual, 20 tasks × 3 rounds):
+
+| Metric | Official tool surface | This plugin (command interception on) | This plugin (command interception off, default) |
+|---|---|---|---|
+| Resolve rate | 83.3% | **83.3%** | 81.7% (1 task lower, within normal variance) |
+| Steps / task | 24.4 | 29.7 (+21.7%) | 25.3 (+3.8%) |
+| Total tokens / task | **729,434** | 954,100 (+30.8%) | 779,799 (+6.9%) |
+| System prompt / step (incl. tool definitions) | **4,642** | 6,305 (+35.8%) | 6,305 (+35.8%) |
+| System prompt total / task (per step × steps) | **113,265** | 187,259 (+65.3%) | 159,622 (+40.9%) |
+| Net tokens / task (excl. system prompt) | **616,169** | 766,841 (+24.5%) | 620,177 (+0.7%) |
+| Average context length at task end (tokens) | **42,817** | 48,645 (+13.6%) | 44,781 (+4.6%) |
+| `read` calls | 225 | 459 | **198** |
+| `bash` time per call | 3,140 ms | **2,391 ms** | 2,045 ms |
+| `bash` tokens returned per call | 790 tok | **343 tok** | 638 tok |
+| Average time / task (excludes token-rate and network-speed fluctuation) | **123 s** | 135 s | 151 s |
+
+Notes:
+
+1. The average time is an end-to-end measurement that does not account for token-rate or network-speed fluctuation; use the absolute values for horizontal comparison only.
+2. The figures above describe this benchmark only (its tasks use little context, so they do not represent large tasks).
+
+Conclusions:
+
+1. The resolve rate matches the official tools (the interception-off group is 1 task lower, within normal variance).
+2. `bash` itself is leaner, and the tokens it saves roughly offset the extra system prompt from thicker tool definitions (the plugin adds capabilities, so its definitions are thicker than the official preset's).
+3. `bash` is faster, but the gain is cancelled out by side effects from `bash` itself and the other enhanced tools.
+4. On Linux the combined performance is on par with the official standard-mode tools, with a richer feature set.
+
+So on Linux this plugin cannot promise lower token usage or better performance; Windows is not suitable for running the standard benchmark, so the only claim there is a **personal impression** that it is more pleasant to use than PowerShell.
+
+Full data and the per-task matrix: [docs/benchmark/sbml-compare-ops.md](docs/benchmark/sbml-compare-ops.md) (Chinese).
+
+## Requirements
+
+- **dsh CLI**: installed globally, `npm i -g @deepseek-ai/dsh`
+- **Node.js** ≥ 22.19 or ≥ 24
+- **Git Bash** (recommended): serves as the bash execution environment on Windows
+- Targets DeepSeek Harness `dsh` v0.2.0-rc.2 (pre-release; interfaces may change)
+
+## Notes
+
+- No standalone `pwsh` tool: shell work is handled by the more capable persistent `bash`
+
+**Safe rm sends deleted files to the system trash.** Where they land, and whether you can see them:
+
+| | Windows | macOS | Linux |
+|---|---|---|---|
+| **Location** | Recycle Bin | Trash `~/.Trash` | `$XDG_DATA_HOME/Trash`; defaults to `~/.local/share/Trash` |
+| **Another volume / external disk** | That volume's Recycle Bin | That volume's `.Trashes` | `.Trash-<uid>` at that mount point |
+| **Visible in the OS trash** | Yes | Yes | Same volume: yes; another volume: open that location |
+| **File name** | Unchanged | Unchanged | A UUID; the original name comes from `.trashinfo` |
+| **Put back** | Yes | Yes | Depends on the file manager |
+| **Implementation** | Shell API | System API | Third-party XDG implementation |
+| **Known limits** | No Recycle Bin on network drives | Requires macOS 10.12+ | Some desktops do not list it — restore from the location above |
+
+## Build
+
+```sh
+pnpm install
+pnpm build     # type declarations (tsc) + tsdown bundle + asset copy
+pnpm typecheck
+pnpm test      # includes real-bash cases; needs Git Bash on Windows, auto-skips when missing
+```
+
+## License
+
+[MIT](LICENSE); third-party component licenses in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).

package/README.md

@@ -22,7 +22,7 @@ DeepSeek Harness 基础工具增强：持久 bash、结构化 read、多模式 e
 
 ## 功能特性
 
-- **bash**：持久 shell，`cd`、`export` 跨调用保持状态；冗长日志（git/npm/cargo…）自动压缩；超长输出只保留头尾，完整内容落盘可回读；长命令自动转后台；可选拦截 `cat`、`grep`、`find`、`sed -i`，引导改用专用工具
+- **bash**：持久 shell，`cd`、`export` 跨调用保持状态；冗长日志（git/npm/cargo…）自动压缩；超长输出只保留头尾，完整内容落盘可回读；长命令自动转后台；可选拦截 `cat`、`grep`、`find`、`sed -i`，引导改用专用工具（默认关闭）
 - **安全删除**：`rm` 默认把文件移入系统回收站而非永久删除，误删可恢复；需要真删时用 `command rm`
 - **read**：按行区间精准读取（支持 `:N-M`、`:raw`、多区间）；大代码文件默认返回结构摘要，细节按需展开；zip/tar 归档、SQLite、notebook、PDF 直接读；PNG / JPEG / WebP / GIF 图片直读，超大图自动缩放；可抓取网页内容（含网页内图片）；SPA 站点（内容由 JS 动态渲染，如 excalidraw.com）自动改用本机浏览器渲染后抓取
 - **write**：原子写入，返回修改 diff；支持补丁式写入，可直接写 zip/tar 归档成员与 SQLite 数据
@@ -87,12 +87,45 @@ dsh plugin --profile web add link:<本仓库路径>
 
 写入通过宿主自己的 `ctx.configEditor` 完成，因此自带 profile 锁、并发保护、原子写与失败回滚。
 
-> 从 0.1.9 或更早升级过来的话：`~/.dsh/.agent-presets/` 目录**已经没有任何代码读它**（0.1.7 起预设改为补丁层声明），可以安全删除；设置页检测到它会给出提示。
-
 ## 配置
 
 开箱即用，无需配置。需要微调时常用项有：后台阈值（`autoBackgroundMs`）、超时（`defaultTimeoutMs` / `maxTimeoutMs`）、输出截断窗口、编辑默认模式（`editMode`，默认 `replace`）、结构化摘要开关（`readSummarizeEnabled`）。抓取相关：可切换网页转 Markdown 的后端（`fetchReader`，含浏览器 JS 渲染——SPA 页面），设置面板里可一键「探测浏览器」查看本机可用的 Chrome/Edge。
 
+## 性能
+
+标准模式/标准模式增强下，在 Linux 上跑 SWE-bench Multilingual（20 题 × 3 轮）：
+
+| 指标 | 官方工具面 | 本插件（命令拦截开） | 本插件（命令拦截关，默认） |
+|---|---|---|---|
+| 解题率 | 83.3% | **83.3%** | 81.7%（低 1 题，正常波动） |
+| 步数 / 题 | 24.4 | 29.7（+21.7%） | 25.3（+3.8%） |
+| 总 token / 题 | **729,434** | 954,100（+30.8%） | 779,799（+6.9%） |
+| 系统提示词 / 步（含工具定义） | **4,642** | 6,305（+35.8%） | 6,305（+35.8%） |
+| 系统提示词累计 / 题（单步 × 步数） | **113,265** | 187,259（+65.3%） | 159,622（+40.9%） |
+| 净 token / 题（除系统提示词） | **616,169** | 766,841（+24.5%） | 620,177（+0.7%） |
+| 任务结束后平均上下文长度（token） | **42,817** | 48,645（+13.6%） | 44,781（+4.6%） |
+| `read` 调用次数 | 225 | 459 | **198** |
+| `bash` 每次调用耗时 | 3,140 ms | **2,391 ms** | 2,045 ms |
+| `bash` 每次调用返回 token | 790 tok | **343 tok** | 638 tok |
+| 平均耗时 / 题（未计入 token 速率波动、网络速度带来的误差） | **123 s** | 135 s | 151 s |
+
+注：
+
+1. 平均耗时是端到端实测，未计入 `token` 速率波动、网络速度带来的误差，绝对值只作横向参考。
+2. 本节性能只代表在该基准测试下的表现（该基准任务占用上下文较低，因此无法代表大任务情况）
+3. 由大模型计算统计核对，数据可能有疏漏，但不影响整体结论
+
+结论：
+
+1. 解题率与官方持平（命令拦截关的那组低 1 题，属正常波动）
+2. `bash` 本身更省，省下的 token 基本能抵消工具定义变厚带来的系统提示词增量（功能更强，工具定义比官方预设更厚）
+3. `bash` 更快，但带来的增益会被 `bash` 自身以及其他增强工具带来的副作用抹平
+4. 在 `linux` 上，综合性能和官方默认标准模式工具相当，但功能更丰富
+
+因此本插件工具在 `linux` 上，无法承诺更省 `token` 或具有更强的性能；`windows` 不适合跑标准测试，只能从**个人体感**说比 `powershell` 更好用。
+
+完整的四组数据与逐题矩阵见 [docs/benchmark/sbml-compare-ops.md](docs/benchmark/sbml-compare-ops.md)。
+
 ## 环境要求
 
 - **dsh CLI**：需全局安装，`npm i -g @deepseek-ai/dsh`

package/lib/client.js

@@ -64,7 +64,7 @@ window.__ModuleLoader__.load({
 			{
 				name: "interceptorEnabled",
 				kind: "boolean",
-				default: true,
+				default: false,
 				labelKey: "interceptorEnabled",
 				hintKey: "interceptorEnabledHint",
 				group: "behavior",

package/lib/index.mjs

@@ -3,7 +3,7 @@ __installBunShim();
 import { n as fs_promises_shim_exports, t as exists } from "./fs-promises-shim-B2YFWkcd.mjs";
 import { i as setRuntimeLogger, n as systemChromiumCandidatesForTest, r as runtimeLogger } from "./launch-BIWNyrBB.mjs";
 import { $ as isEnoent, A as formatCount, C as warn, D as installBunShim, F as $flag, N as $env, O as formatAge, P as $envpos, Q as hasFsCode, U as getAutoQaDbPath, V as VERSION, X as getRemoteDir, Y as getPuppeteerDir, at as findOnPath, b as debug, c as combineSignals, d as $which, et as isEnotdir, it as untilAborted, k as formatBytes$1, l as exec, m as readImageMetadata, nt as peekFile, q as getInstallId, tt as isProbablyBinary, u as render, x as error } from "./src-AELUUb5U.mjs";
-import { C as truncateToWidth$1, S as replaceTabs, _ as formatCodeFrameLine, a as fetchBinary, b as LRUCache, c as getParallelExtractContent, d as convertFileWithMarkit, f as Settings, g as capParseErrors, h as OMP_DEFAULTS, i as convertWithMarkit, l as ensureTool, m as settings, o as extractWithParallel, p as isSettingsInitialized, s as findParallelApiKey, u as CONVERTIBLE_EXTENSIONS, v as formatParseErrors, x as padding, y as shortenPath } from "./utils-CHnQw1zZ.mjs";
+import { C as truncateToWidth$1, S as replaceTabs, _ as formatCodeFrameLine, a as fetchBinary, b as LRUCache, c as getParallelExtractContent, d as convertFileWithMarkit, f as Settings, g as capParseErrors, h as OMP_DEFAULTS, i as convertWithMarkit, l as ensureTool, m as settings, o as extractWithParallel, p as isSettingsInitialized, s as findParallelApiKey, u as CONVERTIBLE_EXTENSIONS, v as formatParseErrors, x as padding, y as shortenPath } from "./utils-eJcxzVy7.mjs";
 import { t as sanitizeText } from "./sanitize-text-BCf5KmCf.mjs";
 import { n as isRecord$5 } from "./type-guards-CttAANEx.mjs";
 import { n as ToolError, r as throwIfAborted, t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
@@ -4202,7 +4202,7 @@ const TOOL_PLUS_FIELDS = [
 	{
 		name: "interceptorEnabled",
 		kind: "boolean",
-		default: true,
+		default: false,
 		labelKey: "interceptorEnabled",
 		hintKey: "interceptorEnabledHint",
 		group: "behavior",
@@ -4958,7 +4958,7 @@ const Config = z.object({
 	outputSinkTailBytes: z.number().default(fieldDefault("outputSinkTailBytes", 51200)).volatile(),
 	outputSinkHeadBytes: z.number().default(fieldDefault("outputSinkHeadBytes", 20480)).volatile(),
 	minimizerEnabled: z.boolean().default(fieldDefault("minimizerEnabled", true)).volatile(),
-	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", true)).volatile(),
+	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", false)).volatile(),
 	nonInteractiveEnv: z.boolean().default(fieldDefault("nonInteractiveEnv", true)).volatile(),
 	snapshotEnabled: z.boolean().default(fieldDefault("snapshotEnabled", true)).volatile(),
 	rmSafe: z.boolean().default(fieldDefault("rmSafe", true)).volatile(),
@@ -5069,7 +5069,7 @@ function resolveConfig(input) {
 		outputSinkTailBytes: config.outputSinkTailBytes ?? fieldDefault("outputSinkTailBytes", 51200),
 		outputSinkHeadBytes: config.outputSinkHeadBytes ?? fieldDefault("outputSinkHeadBytes", 20480),
 		minimizer: resolveMinimizer(),
-		interceptorEnabled: config.interceptorEnabled ?? fieldDefault("interceptorEnabled", true),
+		interceptorEnabled: config.interceptorEnabled ?? fieldDefault("interceptorEnabled", false),
 		nonInteractiveEnv: config.nonInteractiveEnv ?? fieldDefault("nonInteractiveEnv", true),
 		snapshotEnabled: config.snapshotEnabled ?? fieldDefault("snapshotEnabled", true),
 		rmSafe: config.rmSafe ?? fieldDefault("rmSafe", true),
@@ -11479,7 +11479,7 @@ let specialHandlersPromise;
 * requires a special handler, so we keep them out of the cold-startup graph.
 */
 function loadSpecialHandlers() {
-	specialHandlersPromise ??= import("./scrapers-DSZkQist.mjs").then((m) => m.specialHandlers);
+	specialHandlersPromise ??= import("./scrapers-C6oBIusN.mjs").then((m) => m.specialHandlers);
 	return specialHandlersPromise;
 }
 /**

package/lib/pi-natives-bootstrap.mjs

@@ -0,0 +1,34 @@
+/**
+ * tool-plus package entry — pi-natives compatibility bootstrap.
+ *
+ * \`@oh-my-pi/pi-natives\` ships a Bun-only \`import.meta.dir\` in
+ * native/loader-state.js. A postinstall patch alone is not enough under pnpm:
+ * the file is a hardlink to the content-addressable store, and a later
+ * install that repairs or re-links the store can restore the buggy bytes.
+ *
+ * This entry runs the shared patch helper first, then dynamically imports the
+ * real plugin entry. It must not statically import index.mjs (or any module
+ * that reaches pi-natives): static imports are evaluated before this body.
+ *
+ * The helper writes through a temp file + rename, so it breaks the store
+ * hardlink and keeps this profile's copy private.
+ */
+import { ensurePiNativesPatched } from "../scripts/patch-pi-natives.mjs";
+
+const result = ensurePiNativesPatched({ detach: true });
+if (result.error) {
+  console.warn("[tool-plus] pi-natives compat: " + result.error);
+} else if (result.patched > 0 || result.detached > 0) {
+  console.log(
+    "[tool-plus] pi-natives compat: patched=" + result.patched + ", detached=" + result.detached,
+  );
+}
+
+// Runtime-computed URL: keep this dynamic so a bundler never inlines the
+// plugin graph (and its static pi-natives imports) ahead of the patch above.
+const mod = await import(new URL("./index.mjs", import.meta.url).href);
+
+export const name = mod.name;
+export const inject = mod.inject;
+export const Config = mod.Config;
+export const apply = mod.apply;

package/lib/{scrapers-DSZkQist.mjs → scrapers-C6oBIusN.mjs}

@@ -3,7 +3,7 @@ __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-B2YFWkcd.mjs";
 import { $ as isEnoent, B as USER_AGENT, C as warn, G as getDocsRsCacheDir, N as $env, c as combineSignals, j as formatNumber, k as formatBytes, l as exec, s as Snowflake, y as parseFrontmatter } from "./src-AELUUb5U.mjs";
 import { W as tryParseJson } from "./utils-cZX3f_Ls.mjs";
-import { a as fetchBinary, c as getParallelExtractContent, i as convertWithMarkit, l as ensureTool, m as settings, n as asRecord, o as extractWithParallel, r as asString, s as findParallelApiKey, t as asNumber } from "./utils-CHnQw1zZ.mjs";
+import { a as fetchBinary, c as getParallelExtractContent, i as convertWithMarkit, l as ensureTool, m as settings, n as asRecord, o as extractWithParallel, r as asString, s as findParallelApiKey, t as asNumber } from "./utils-eJcxzVy7.mjs";
 import { n as isRecord } from "./type-guards-CttAANEx.mjs";
 import { r as throwIfAborted, t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
 import { c as getLocalizedText, d as looksLikeHtml, i as decodeHtmlEntities, l as htmlToBasicMarkdown, o as formatIsoDate, r as buildResult, s as formatMediaDuration, u as loadPage } from "./types-BLrLohwK.mjs";

package/lib/{utils-CHnQw1zZ.mjs → utils-eJcxzVy7.mjs}

@@ -6267,7 +6267,7 @@ const settings = {
 };
 //#endregion
 //#region package.json
-var version = "0.1.14";
+var version = "0.1.16-beta.0";
 /** `.tmp` files older than this are treated as orphaned writes and swept. */
 const TMP_ORPHAN_MAX_AGE_MS = 3e5;
 function markitConversionCacheKey(bytes, extension) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xiaoso/dsh-tool-plus",
   "description": "Oh My Pi bash runtime ported as a deepseek-harness tool plugin: persistent shell session, output minimizer, managed background jobs, command interception",
-  "version": "0.1.14",
+  "version": "0.1.16-beta.0",
   "license": "MIT",
   "keywords": [
     "deepseek-harness",
@@ -36,13 +36,13 @@
     "node": "^22.19.0 || >=24.0.0",
     "dsh": ">=0.2.1-0 <0.3.0-0"
   },
-  "main": "lib/index.mjs",
+  "main": "lib/pi-natives-bootstrap.mjs",
   "types": "lib/types/index.d.ts",
   "icon": "./assets/icon.png",
   "exports": {
     ".": {
       "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.mjs"
+      "default": "./lib/pi-natives-bootstrap.mjs"
     },
     "./client": {
       "types": "./lib/types/client/index.d.ts",

package/scripts/patch-pi-natives.mjs

@@ -1,108 +1,241 @@
-#!/usr/bin/env node
-/**
- * Self-heal `@oh-my-pi/pi-natives` for Node runtimes after installs that did
- * NOT go through pnpm (plain npm / yarn / npx of this package).
- *
- * Background: upstream pi-natives@17.3.5 locates its prebuilt binaries with
- * the Bun-only API `import.meta.dir` (native/loader-state.js). Under pnpm,
- * `patches/@oh-my-pi__pi-natives.patch` (declared in pnpm-workspace.yaml)
- * fixes that line automatically; every other package manager ignores pnpm
- * patch declarations, so their installs keep the bug and the tool plugin
- * crashes on first native access. This hook folds in the SAME one-line fix,
- * making the dependency-tree end state identical across all managers.
- *
- * Idempotent by construction:
- *   - file absent            -> warn, exit 0 (unknown layout must not brick installs)
- *   - line already fixed     -> no-op ("already patched")
- *   - buggy literal found    -> rewrite `import.meta.dir` -> `import.meta.dirname`
- *
- * Usage: node scripts/patch-pi-natives.mjs [searchRoot]
- *   Without argument the script walks ancestors of this file looking for a
- *   node_modules/@oh-my-pi/pi-natives package (hoisting-safe). With an
- *   argument, that directory is used as the walk root (for isolated tests).
- *
- * Never throws: a packaging lifecycle hook must not fail installs; if
- * anything unexpected happens it warns so the (pre-existing) runtime error
- * stays the single source of truth.
- */
-
-import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const PKG_SUBPATH = join("node_modules", "@oh-my-pi", "pi-natives");
-const TARGET_REL = join("native", "loader-state.js");
-// Exact buggy token; `\b` keeps an already-fixed `import.meta.dirname` intact.
-const BUGGY = /import\.meta\.dir\b/g;
-
-function log(message) {
-  console.log(`[patch-pi-natives] ${message}`);
-}
-
-/** Walk upwards from `start`, yielding every candidate package directory. */
-function* candidatePackageDirs(start) {
-  let current = resolve(start);
-  for (;;) {
-    const candidate = join(current, PKG_SUBPATH);
-    if (existsSync(candidate)) yield candidate;
-    const parent = dirname(current);
-    if (parent === current) return;
-    current = parent;
-  }
-}
-
-function firstMatchedFile(packageDir) {
-  // The known target first (byte-for-byte what the pnpm patch touches).
-  const direct = join(packageDir, TARGET_REL);
-  if (existsSync(direct)) return direct;
-  // Unknown layouts: locate any loader-state.js so we can still heal them.
-  const stack = [packageDir];
-  while (stack.length > 0) {
-    const entry = stack.pop();
-    for (const item of readdirSync(entry)) {
-      const full = join(entry, item);
-      const stat = statSync(full);
-      if (stat.isDirectory()) stack.push(full);
-      else if (item === "loader-state.js") return full;
-    }
-  }
-  return undefined;
-}
-
-function main() {
-  // Default: walk ancestors starting at THIS script's directory (`scripts/`),
-  // so the repo root's node_modules is covered both here and in published
-  // layouts (where the package sits inside someone else's node_modules tree).
-  const scriptDir = dirname(fileURLToPath(import.meta.url));
-  const searchRoot = process.argv[2] ? resolve(process.argv[2]) : scriptDir;
-
-  let inspected = 0;
-  let healed = 0;
-  for (const packageDir of candidatePackageDirs(searchRoot)) {
-    inspected += 1;
-    const file = firstMatchedFile(packageDir);
-    if (file === undefined) {
-      log(`WARN ${packageDir}: loader-state.js not found, skipped`);
-      continue;
-    }
-    const source = readFileSync(file, "utf8");
-    BUGGY.lastIndex = 0;
-    if (!BUGGY.test(source)) {
-      log(`${file}: already patched`);
-      continue;
-    }
-    BUGGY.lastIndex = 0;
-    writeFileSync(file, source.replace(BUGGY, "import.meta.dirname"));
-    healed += 1;
-    log(`${file}: patched import.meta.dir -> import.meta.dirname`);
-  }
-
-  if (inspected === 0) log(`WARN no @oh-my-pi/pi-natives found under ${searchRoot}`);
-  else log(`done: ${inspected} package(s) seen, ${healed} patched`);
-}
-
-try {
-  main();
-} catch (error) {
-  log(`WARN self-heal skipped: ${error?.message ?? error}`);
-}
+#!/usr/bin/env node
+/**
+ * Self-heal \`@oh-my-pi/pi-natives\` for Node runtimes.
+ *
+ * The upstream package locates its prebuilt binaries with the Bun-only
+ * \`import.meta.dir\` (native/loader-state.js). Node has no such property, so
+ * \`path.join(undefined, "..", "native")\` throws ERR_INVALID_ARG_TYPE before
+ * any tool can load.
+ *
+ * Two callers share this module:
+ *   - the package postinstall (plain npm / yarn / npx installs), and
+ *   - lib/pi-natives-bootstrap.mjs, which runs before the real plugin entry
+ *     so a pnpm store repair/re-link cannot break the next dsh start.
+ *
+ * Copy-on-patch is intentional. pnpm links package files from its
+ * content-addressable store with hardlinks; writing the linked file in place
+ * mutates the store and every profile that shares that inode. Writing a temp
+ * file and renaming it over the target gives this profile a private inode and
+ * leaves the store untouched. When the file is already patched but still
+ * shared, the same operation detaches it once.
+ *
+ * Resolution prefers \`import.meta.resolve("@oh-my-pi/pi-natives")\` because the
+ * package is ESM-only; createRequire.resolve throws
+ * ERR_PACKAGE_PATH_NOT_EXPORTED for it. The historical ancestor walk remains
+ * as a fallback for unknown layouts, and can be forced with a searchRoot.
+ *
+ * Idempotent; the CLI never throws.
+ *
+ * Usage: node scripts/patch-pi-natives.mjs [searchRoot]
+ */
+
+import {
+  existsSync,
+  readdirSync,
+  readFileSync,
+  realpathSync,
+  renameSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const PKG_SUBPATH = join("node_modules", "@oh-my-pi", "pi-natives");
+const TARGET_REL = join("native", "loader-state.js");
+// Exact buggy token; \b keeps an already-fixed \`import.meta.dirname\` intact.
+const BUGGY = /import\.meta\.dir\b/g;
+const PATCHED_LITERAL = "import.meta.dirname";
+const PKG_NAME = "@oh-my-pi/pi-natives";
+
+function log(message) {
+  console.log("[patch-pi-natives] " + message);
+}
+
+function warn(message) {
+  console.warn("[patch-pi-natives] " + message);
+}
+
+/** Walk upwards from start, yielding every candidate package directory. */
+function* candidatePackageDirs(start) {
+  let current = resolve(start);
+  for (;;) {
+    const candidate = join(current, PKG_SUBPATH);
+    if (existsSync(candidate)) yield candidate;
+    const parent = dirname(current);
+    if (parent === current) return;
+    current = parent;
+  }
+}
+
+function firstMatchedFile(packageDir) {
+  const direct = join(packageDir, TARGET_REL);
+  if (existsSync(direct)) return direct;
+  const stack = [packageDir];
+  while (stack.length > 0) {
+    const entry = stack.pop();
+    for (const item of readdirSync(entry)) {
+      const full = join(entry, item);
+      const stat = statSync(full);
+      if (stat.isDirectory()) stack.push(full);
+      else if (item === "loader-state.js") return full;
+    }
+  }
+  return undefined;
+}
+
+/** Walk up from a resolved entry until the pi-natives package root. */
+function packageRootFor(entry) {
+  let dir = dirname(entry);
+  for (;;) {
+    const manifest = join(dir, "package.json");
+    if (existsSync(manifest)) {
+      try {
+        const pkg = JSON.parse(readFileSync(manifest, "utf8"));
+        if (pkg.name === PKG_NAME) return dir;
+      } catch {
+        // Keep walking: a malformed package.json is not our target.
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return undefined;
+    dir = parent;
+  }
+}
+
+/**
+ * @param {string | undefined} searchRoot
+ * @param {boolean} preferExact
+ * @returns {{ file: string | undefined, inspected: number }}
+ */
+function resolveTarget(searchRoot, preferExact) {
+  if (preferExact) {
+    try {
+      const entry = fileURLToPath(import.meta.resolve(PKG_NAME));
+      const packageRoot = packageRootFor(entry);
+      if (packageRoot !== undefined) {
+        const direct = join(packageRoot, TARGET_REL);
+        if (existsSync(direct)) return { file: direct, inspected: 1 };
+      }
+    } catch {
+      // Fall through to the ancestor walk.
+    }
+  }
+
+  const start = searchRoot ? resolve(searchRoot) : dirname(fileURLToPath(import.meta.url));
+  let inspected = 0;
+  for (const packageDir of candidatePackageDirs(start)) {
+    inspected += 1;
+    const file = firstMatchedFile(packageDir);
+    if (file !== undefined) return { file, inspected };
+  }
+  return { file: undefined, inspected };
+}
+
+/**
+ * Replace the target with a private inode. rename() removes this path's link
+ * to the old inode (the store and other profiles keep theirs); the temp file
+ * becomes the new content.
+ */
+function atomicReplace(file, content) {
+  const real = realpathSync(file);
+  const mode = statSync(real).mode;
+  const tmp = real + "." + process.pid + "." + Date.now() + ".tmp";
+  writeFileSync(tmp, content, { mode });
+  try {
+    renameSync(tmp, real);
+  } catch (error) {
+    const code = error && error.code;
+    if (code !== "EEXIST" && code !== "EPERM" && code !== "EXDEV") throw error;
+    rmSync(real, { force: true });
+    renameSync(tmp, real);
+  } finally {
+    rmSync(tmp, { force: true });
+  }
+  return real;
+}
+
+/**
+ * @param {{
+ *   target?: string,
+ *   searchRoot?: string,
+ *   detach?: boolean,
+ *   copyOnPatch?: boolean,
+ * }} [options]
+ * @returns {{ inspected: number, patched: number, detached: number, files: string[], error?: string }}
+ */
+export function ensurePiNativesPatched(options = {}) {
+  const { target, searchRoot, detach = true, copyOnPatch = true } = options;
+
+  try {
+    let found;
+    if (target) {
+      found = { file: existsSync(target) ? target : undefined, inspected: existsSync(target) ? 1 : 0 };
+    } else {
+      found = resolveTarget(searchRoot, searchRoot === undefined);
+    }
+
+    if (found.file === undefined) {
+      return {
+        inspected: found.inspected,
+        patched: 0,
+        detached: 0,
+        files: [],
+        error: "no " + PKG_NAME + "/" + TARGET_REL + " found",
+      };
+    }
+
+    const real = realpathSync(found.file);
+    const source = readFileSync(real, "utf8");
+    const next = source.replace(BUGGY, PATCHED_LITERAL);
+    const patched = next !== source;
+    const shared = statSync(real).nlink > 1;
+    const shouldDetach = !patched && detach && shared;
+
+    if (!patched && !shouldDetach) {
+      return { inspected: found.inspected, patched: 0, detached: 0, files: [real] };
+    }
+
+    if (copyOnPatch) atomicReplace(real, next);
+    else writeFileSync(real, next);
+
+    return {
+      inspected: found.inspected,
+      patched: patched ? 1 : 0,
+      detached: shouldDetach ? 1 : 0,
+      files: [real],
+    };
+  } catch (error) {
+    return {
+      inspected: 0,
+      patched: 0,
+      detached: 0,
+      files: [],
+      error: error && error.message ? error.message : String(error),
+    };
+  }
+}
+
+function main() {
+  const searchRoot = process.argv[2] ? resolve(process.argv[2]) : undefined;
+  const result = ensurePiNativesPatched({ detach: true, searchRoot });
+  if (result.error) {
+    warn("WARN " + result.error);
+    return;
+  }
+  for (const file of result.files) {
+    if (result.patched > 0) log(file + ": patched import.meta.dir -> import.meta.dirname");
+    else if (result.detached > 0) log(file + ": detached hardlink (private copy)");
+    else log(file + ": already patched");
+  }
+  log("done: patched=" + result.patched + ", detached=" + result.detached);
+}
+
+if (process.argv[1] && pathToFileURL(process.argv[1]).href === import.meta.url) {
+  try {
+    main();
+  } catch (error) {
+    warn("WARN self-heal skipped: " + (error && error.message ? error.message : String(error)));
+  }
+}