@xiaoso/dsh-tool-plus 0.1.0-beta.2 → 0.1.0-beta.4

package/README.en.md

@@ -0,0 +1,122 @@
+# dsh-tool-plus — Essential Tools Enhancement for DeepSeek Harness
+
+[简体中文](./README.md) | English
+
+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.
+
+> Currently in early beta — behavior and configuration may change at any time.
+
+## 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
+- **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)
+- **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) — installable in one command (see Installation)
+
+## 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 **both** the plugin and the presets:
+
+- **Tool plugin**: provides the full toolset and takes over the official bash / pwsh / file / search tools;
+- **Agent presets**: the official presets contain no configuration for these tools, so the stock setup is missing capabilities — the Standard / PTC templates exist to fill exactly that gap.
+
+### Install from npm (recommended)
+
+```sh
+dsh plugin --profile web add @xiaoso/dsh-tool-plus@beta
+```
+
+### Install from GitHub
+
+Track the latest development build (the project has no formal release yet — every install is a test build):
+
+```sh
+dsh plugin --profile web add github:xiaoso456/dsh-tool-plus
+```
+
+### Local development
+
+```sh
+dsh plugin --profile web add link:<path to this repo>
+```
+
+### Preset installation
+
+**Option 1 · Install with the npx script**
+
+```sh
+npx @xiaoso/dsh-tool-plus-presets@beta
+```
+
+**Option 2 · Have an AI session configure the presets** (no dependency on the package above) — paste the following into an AI session that can edit files on your machine:
+
+```text
+Please install the two enhanced agent presets for DeepSeek Harness.
+
+1. Locate the official preset directory config/agent-presets/ inside the globally installed dsh package;
+   it contains the standard and code templates, each with preset.yml and agent.cordis.yml.
+   (On Windows it is under the global node_modules\@deepseek-ai\dsh\ directory; on macOS/Linux run
+   npm root -g first to locate it; if you cannot find it, search the whole disk for the installed
+   @deepseek-ai/dsh package.)
+2. Create two directories under ~/.dsh/.agent-presets/: tool-plus-standard and tool-plus-ptc.
+
+3. tool-plus-standard: copy over the two files from the official standard template, then modify:
+   - Replace preset.yml entirely with:
+       name: Tool Plus 标准增强版
+       description: Full standard-mode capabilities, file/shell toolset replaced by @xiaoso/dsh-tool-plus, pwsh disabled by default
+       order: 2
+   - agent.cordis.yml:
+     a. Change the entry with id: tool-bash to
+          - id: tool-plus
+            name: '@xiaoso/dsh-tool-plus'
+            disabled: true
+     b. Change the id: tool-pwsh entry's platform-conditional disable into a plain disabled: true line
+     c. Delete the two entries with id: tool-fs and id: tool-fs-search entirely
+        (the latter also carries a sampleOverCapGlobResults setting)
+
+4. tool-plus-ptc: copy over the two files from the official code template and make exactly the same
+   three changes as in step 3, except replace preset.yml with:
+       name: Tool Plus PTC 增强版
+       description: Full PTC (Code Mode) capabilities, file/shell toolset replaced by @xiaoso/dsh-tool-plus, pwsh disabled by default
+       order: 3
+
+5. When done, list the file trees of both directories and remind me to restart any running dsh
+   so the presets take effect.
+```
+
+Keep the `name:` fields as shown — they match the templates the npx script installs. Both options produce the same result: the files land in `~/.dsh/.agent-presets/`; restart dsh and select the preset in your session to activate it.
+
+## 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.1.1-rc.2 (pre-release; interfaces may change)
+
+## Notes
+
+- No standalone `pwsh` tool: shell work is handled by the more capable persistent `bash`
+
+## 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

@@ -1,5 +1,7 @@
 # dsh-tool-plus — DeepSeek Harness 基础工具增强
 
+简体中文 | [English](./README.en.md)
+
 DeepSeek Harness 基础工具增强：持久 bash、结构化 read、多模式 edit、原子 write、全文搜索、图像直读，一个插件全覆盖。基于 [Oh My Pi](https://github.com/can1357/oh-my-pi) 内核移植，安装后自动接管官方 bash / pwsh / 文件 / 搜索工具，另有可选的 `ast_grep` / `ast_edit` 结构化搜索与重写。
 
 > 当前为早期测试版（beta），行为与配置可能随时调整。
@@ -7,11 +9,10 @@ DeepSeek Harness 基础工具增强：持久 bash、结构化 read、多模式 e
 ## 功能特性
 
 - **bash**：持久 shell，`cd`、`export` 跨调用保持状态；冗长日志（git/npm/cargo…）自动压缩；超长输出只保留头尾，完整内容落盘可回读；长命令自动转后台；可选拦截 `cat`、`grep`、`find`、`sed -i`，引导改用专用工具
-- **read**：按行区间精准读取（支持 `:N-M`、`:raw`、多区间）；大代码文件默认返回结构摘要，细节按需展开；zip/tar 归档、SQLite、notebook、PDF 直接读；可抓取网页内容
+- **read**：按行区间精准读取（支持 `:N-M`、`:raw`、多区间）；大代码文件默认返回结构摘要，细节按需展开；zip/tar 归档、SQLite、notebook、PDF 直接读；PNG / JPEG / WebP / GIF 图片直读，超大图自动缩放；可抓取网页内容（含网页内图片）
 - **write**：原子写入，返回修改 diff；支持补丁式写入，可直接写 zip/tar 归档成员与 SQLite 数据
 - **edit**：replace 默认，另支持 patch / hashline / apply-patch 三种补丁格式；多段编辑、唯一性校验、空白差异模糊匹配
 - **grep / glob**：全文搜索与文件名匹配；mtime 排序、上下文行、忽略规则可配置
-- **read_image**：直读 PNG / JPEG / WebP / GIF，超大图自动缩放。*备注：图像读取不在本插件的初始规划内——官方工具套件把多个工具捆绑在同一插件里，为保证完整体验而一并移植。*
 - **ast_grep / ast_edit**（可选）：基于语法树的结构化代码搜索与重写，可在设置中开启
 - **agent 预设**：标准增强版 / PTC（Code Mode）两套配套模板，一条命令安装（见安装章节）
 

package/THIRD_PARTY_NOTICES.md

@@ -1,19 +1,15 @@
 # Third-Party Notices
 
-This project contains code adapted from two upstream projects:
-[oh-my-pi](https://github.com/can1357/oh-my-pi) and the official DeepSeek
-Harness tool packages ([@deepseek-ai/dsh-tool-fs](https://www.npmjs.com/package/@deepseek-ai/dsh-tool-fs)).
+This project contains code adapted from the upstream project
+[oh-my-pi](https://github.com/can1357/oh-my-pi).
 
 Scope of ported upstream code:
 
-- from **oh-my-pi** (MIT, first notice below): the tool suite sources under
+- from **oh-my-pi** (MIT, notice below): the tool suite sources under
   `src/tools/` (bash runtime, read, write, edit, grep, glob, plus the OMP
   `omp/` engine sources they wrap), and the hashline patch engine fused
   in-repo at `src/tools/hashline/engine/` (upstream `packages/hashline`,
-  with small Node-runtime adaptations);
-- from **`@deepseek-ai/dsh-tool-fs`** (MIT, second notice below): the
-  `read_image` image tool at `src/tools/read-image/`, ported from the
-  official read-image implementation to keep the tool surface identical.
+  with small Node-runtime adaptations).
 
 ---
 
@@ -44,30 +40,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
----
-
-@deepseek-ai/dsh-tool-fs (read_image portion) - MIT
-
--- License
-
-(The MIT License)
-
-Copyright (c) 2026 DeepSeek
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/lib/abort-B7izMMna.mjs

@@ -0,0 +1,51 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { v as AbortError } from "./error-B3bevhrs.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/abort.ts
+/**
+* Tracks whether a merged request signal was aborted by the caller or by provider-local logic.
+*
+* Caller aborts always take priority. When both the caller and a local watchdog fire near
+* each other, the merged `requestSignal.reason` reflects whichever AbortController called
+* `.abort()` first — but ordering is racy and not meaningful for upstream consumers. What
+* matters is intent: if the caller's signal aborted, the request was cancelled by the
+* caller, and any local watchdog reason is incidental and **MUST NOT** be surfaced as a
+* retryable transient error (which would cause auto-retry to re-enter streaming and leave
+* the UI showing a spinner the user already tried to cancel).
+*/
+function createAbortSourceTracker(callerSignal) {
+	const requestAbortController = new AbortController();
+	const requestSignal = callerSignal ? AbortSignal.any([callerSignal, requestAbortController.signal]) : requestAbortController.signal;
+	let localAbortReason;
+	return {
+		requestAbortController,
+		requestSignal,
+		abortLocally(reason) {
+			localAbortReason = reason;
+			requestAbortController.abort(reason);
+			return reason;
+		},
+		getLocalAbortReason() {
+			if (!localAbortReason || callerSignal?.aborted) return void 0;
+			return requestSignal.reason === localAbortReason ? localAbortReason : void 0;
+		},
+		wasCallerAbort() {
+			return callerSignal?.aborted === true;
+		}
+	};
+}
+/**
+* Race a shared promise against a caller's AbortSignal without coupling the
+* underlying work to that signal. The shared promise keeps running (and caches
+* its result) even when an individual caller bails out.
+*/
+function raceWithSignal(promise, signal) {
+	if (!signal) return promise;
+	if (signal.aborted) return Promise.reject(signal.reason ?? new AbortError());
+	const { promise: aborted, reject } = Promise.withResolvers();
+	const onAbort = () => reject(signal.reason ?? new AbortError());
+	signal.addEventListener("abort", onAbort, { once: true });
+	return Promise.race([promise, aborted]).finally(() => signal.removeEventListener("abort", onAbort));
+}
+//#endregion
+export { raceWithSignal as n, createAbortSourceTracker as t };

package/lib/abort-D1_Z5Ut5.mjs

@@ -0,0 +1,51 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { v as AbortError } from "./error-yCSG0mGC.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/abort.ts
+/**
+* Tracks whether a merged request signal was aborted by the caller or by provider-local logic.
+*
+* Caller aborts always take priority. When both the caller and a local watchdog fire near
+* each other, the merged `requestSignal.reason` reflects whichever AbortController called
+* `.abort()` first — but ordering is racy and not meaningful for upstream consumers. What
+* matters is intent: if the caller's signal aborted, the request was cancelled by the
+* caller, and any local watchdog reason is incidental and **MUST NOT** be surfaced as a
+* retryable transient error (which would cause auto-retry to re-enter streaming and leave
+* the UI showing a spinner the user already tried to cancel).
+*/
+function createAbortSourceTracker(callerSignal) {
+	const requestAbortController = new AbortController();
+	const requestSignal = callerSignal ? AbortSignal.any([callerSignal, requestAbortController.signal]) : requestAbortController.signal;
+	let localAbortReason;
+	return {
+		requestAbortController,
+		requestSignal,
+		abortLocally(reason) {
+			localAbortReason = reason;
+			requestAbortController.abort(reason);
+			return reason;
+		},
+		getLocalAbortReason() {
+			if (!localAbortReason || callerSignal?.aborted) return void 0;
+			return requestSignal.reason === localAbortReason ? localAbortReason : void 0;
+		},
+		wasCallerAbort() {
+			return callerSignal?.aborted === true;
+		}
+	};
+}
+/**
+* Race a shared promise against a caller's AbortSignal without coupling the
+* underlying work to that signal. The shared promise keeps running (and caches
+* its result) even when an individual caller bails out.
+*/
+function raceWithSignal(promise, signal) {
+	if (!signal) return promise;
+	if (signal.aborted) return Promise.reject(signal.reason ?? new AbortError());
+	const { promise: aborted, reject } = Promise.withResolvers();
+	const onAbort = () => reject(signal.reason ?? new AbortError());
+	signal.addEventListener("abort", onAbort, { once: true });
+	return Promise.race([promise, aborted]).finally(() => signal.removeEventListener("abort", onAbort));
+}
+//#endregion
+export { raceWithSignal as n, createAbortSourceTracker as t };

package/lib/abort-dIkZBV7Q.mjs

@@ -0,0 +1,51 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { v as AbortError } from "./error-Dd8DIqs-.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/abort.ts
+/**
+* Tracks whether a merged request signal was aborted by the caller or by provider-local logic.
+*
+* Caller aborts always take priority. When both the caller and a local watchdog fire near
+* each other, the merged `requestSignal.reason` reflects whichever AbortController called
+* `.abort()` first — but ordering is racy and not meaningful for upstream consumers. What
+* matters is intent: if the caller's signal aborted, the request was cancelled by the
+* caller, and any local watchdog reason is incidental and **MUST NOT** be surfaced as a
+* retryable transient error (which would cause auto-retry to re-enter streaming and leave
+* the UI showing a spinner the user already tried to cancel).
+*/
+function createAbortSourceTracker(callerSignal) {
+	const requestAbortController = new AbortController();
+	const requestSignal = callerSignal ? AbortSignal.any([callerSignal, requestAbortController.signal]) : requestAbortController.signal;
+	let localAbortReason;
+	return {
+		requestAbortController,
+		requestSignal,
+		abortLocally(reason) {
+			localAbortReason = reason;
+			requestAbortController.abort(reason);
+			return reason;
+		},
+		getLocalAbortReason() {
+			if (!localAbortReason || callerSignal?.aborted) return void 0;
+			return requestSignal.reason === localAbortReason ? localAbortReason : void 0;
+		},
+		wasCallerAbort() {
+			return callerSignal?.aborted === true;
+		}
+	};
+}
+/**
+* Race a shared promise against a caller's AbortSignal without coupling the
+* underlying work to that signal. The shared promise keeps running (and caches
+* its result) even when an individual caller bails out.
+*/
+function raceWithSignal(promise, signal) {
+	if (!signal) return promise;
+	if (signal.aborted) return Promise.reject(signal.reason ?? new AbortError());
+	const { promise: aborted, reject } = Promise.withResolvers();
+	const onAbort = () => reject(signal.reason ?? new AbortError());
+	signal.addEventListener("abort", onAbort, { once: true });
+	return Promise.race([promise, aborted]).finally(() => signal.removeEventListener("abort", onAbort));
+}
+//#endregion
+export { raceWithSignal as n, createAbortSourceTracker as t };