@xiaoso/dsh-tool-plus 0.1.4 → 0.1.6

package/README.md

@@ -106,7 +106,7 @@ npx @xiaoso/dsh-tool-plus-presets
 - **dsh CLI**：需全局安装，`npm i -g @deepseek-ai/dsh`
 - **Node.js** ≥ 22.19 或 ≥ 24
 - **Git Bash**（推荐）：Windows 上作为 bash 执行环境
-- 适用于 DeepSeek Harness `dsh` v0.1.2-rc.1（pre-release，接口可能变动）
+- 适用于 DeepSeek Harness `dsh` v0.1.5-rc.1（pre-release，接口可能变动）
 
 ## 注意事项
 

package/lib/index.mjs

@@ -3,7 +3,7 @@ __installBunShim();
 import { n as fs_promises_shim_exports, t as exists } from "./fs-promises-shim-Bx0fpxuk.mjs";
 import { i as setRuntimeLogger, n as systemChromiumCandidatesForTest, r as runtimeLogger } from "./launch-BmgEUycu.mjs";
 import { $ as peekFile, A as formatAge, C as error, F as $envpos, I as $flag, M as formatCount, P as $env, Q as isProbablyBinary, S as debug, T as warn, U as getAutoQaDbPath, V as VERSION, X as getRemoteDir, Y as getPuppeteerDir, b as isEnotdir, c as combineSignals, d as $which, j as formatBytes$1, k as installBunShim, l as exec, p as readImageMetadata, q as getInstallId, tt as untilAborted, u as render, v as hasFsCode, y as isEnoent } from "./src-BcD0_rQR.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-DeT1yYiQ.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-C-dSORPa.mjs";
 import { t as sanitizeText } from "./sanitize-text-CfcXzw5X.mjs";
 import { n as isRecord$2 } from "./type-guards-B9VVjRDK.mjs";
 import { n as ToolError, r as throwIfAborted, t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
@@ -14858,7 +14858,7 @@ let specialHandlersPromise;
 * requires a special handler, so we keep them out of the cold-startup graph.
 */
 function loadSpecialHandlers() {
-	specialHandlersPromise ??= import("./scrapers-D145Jmdq.mjs").then((m) => m.specialHandlers);
+	specialHandlersPromise ??= import("./scrapers-Cg5w77td.mjs").then((m) => m.specialHandlers);
 	return specialHandlersPromise;
 }
 /**

package/lib/{scrapers-D145Jmdq.mjs → scrapers-Cg5w77td.mjs}

@@ -3,7 +3,7 @@ __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
 import { B as USER_AGENT, G as getDocsRsCacheDir, N as formatNumber, P as $env, T as warn, c as combineSignals, j as formatBytes, l as exec, s as Snowflake, x as parseFrontmatter, y as isEnoent } from "./src-BcD0_rQR.mjs";
 import { V as tryParseJson } from "./utils-Cp2Mxf_U.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-DeT1yYiQ.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-C-dSORPa.mjs";
 import { n as isRecord } from "./type-guards-B9VVjRDK.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-DX_bvuus.mjs";

package/lib/trash-cli.mjs

@@ -1,5 +1,20 @@
 import * as fs from "node:fs";
 //#region src/tools/bash/trash-cli.ts
+/**
+* rmSafe: rm 命令的回收站重定义核心。
+*
+* 参数解析与行为语义对齐 GNU coreutils rm（tests/rm/ 用例移植），差异：
+* - 删除目标 = 系统回收站（trash 包），非永久删除；
+* - `-i`/`-I`/`--interactive[=WHEN]` 接受但忽略交互（直接进回收站）；
+* - verbose 只输出顶层项（trash 是原子移动，不递归输出子项）。
+*
+* 保护语义（r-root / r-4 移植）：默认 --preserve-root 拒绝 `/` 及其同义词
+* （`//`、`///`、realpath 后是根目录的路径）；拒绝 `.` / `..` 结尾的路径。
+*
+* 本模块零外部依赖（trash 包在 trash-cli-main.ts 入口动态加载），
+* 便于单测注入 fake trash。
+* @module @xiaoso/dsh-tool-plus/bash/trash-cli
+*/
 const SHORT_OPTIONS = {
 	r: "recursive",
 	R: "recursive",
@@ -195,6 +210,42 @@ async function isRootPath(p, deps) {
 	const root = await deps.stat("/");
 	return root !== null && st.dev === root.dev && st.ino === root.ino;
 }
+/** 探测目标名后缀（rename 探测临时名）。 */
+const PROBE_SUFFIX = ".dsh-trash-probe";
+/** 从 unknown 错误里取 errno 码（边界解析）。 */
+function errnoCode(err) {
+	if (typeof err !== "object" || err === null) return void 0;
+	const code = err.code;
+	return typeof code === "string" ? code : void 0;
+}
+/** rename 探测：移到同目录临时名再改回；不改内容，返回 errno 码或 null（可移动）。 */
+async function defaultProbeRename(from, to) {
+	try {
+		await fs.promises.rename(from, to);
+	} catch (err) {
+		return errnoCode(err) ?? "UNKNOWN";
+	}
+	try {
+		await fs.promises.rename(to, from);
+		return null;
+	} catch {
+		return "PROBE_STUCK";
+	}
+}
+/**
+* rename 探测结果 → 可读原因（null = 无结论）。
+*
+* trash 的 windows-trash.exe 失败时把原因吞成 0x8000FFFF、stderr 为空，
+* 所以这里靠 rename 探测拿文件系统的真实回答；不同 errno 必须分开报，
+* 权限不足不是“被占用”。
+*/
+function describeProbeCode(code) {
+	if (code === null) return null;
+	if (code === "ENOENT" || code === "ENOTDIR") return "no longer exists (removed by another process?)";
+	if (code === "EBUSY" || code === "ENOTEMPTY" || code === "PROBE_STUCK") return "file is locked or cannot be moved by this process (close programs using it and retry)";
+	if (code === "EPERM" || code === "EACCES") return "permission denied (read-only file or restricted directory)";
+	return null;
+}
 /**
 * 执行一次 rm 语义的回收站删除。
 *
@@ -256,8 +307,18 @@ async function runTrashCli(argv, deps) {
 	if (items.length > 0) try {
 		await deps.trash(items.map((item) => item.path));
 	} catch (err) {
-		deps.stderr(`rm: cannot remove '${items[0].authored}': ${errorMessage(err)}`);
-		failed = true;
+		if (process.platform !== "win32") {
+			deps.stderr(`rm: cannot remove '${items[0].authored}': ${errorMessage(err)}`);
+			failed = true;
+		} else {
+			const probe = deps.probeRename ?? defaultProbeRename;
+			for (const item of items) {
+				const code = await probe(item.path, `${item.path}${PROBE_SUFFIX}`);
+				if (code === "ENOENT" || code === "ENOTDIR") continue;
+				deps.stderr(`rm: cannot remove '${item.authored}': ${describeProbeCode(code) ?? errorMessage(err)}`);
+				failed = true;
+			}
+		}
 	}
 	if (verbose && !failed) for (const { authored, isDir } of items) deps.stdout(isDir ? `removed directory '${normalizeTrailingSlash(authored)}'` : `removed '${authored}'`);
 	deps.exit(failed ? 1 : 0);

package/lib/{utils-DeT1yYiQ.mjs → utils-C-dSORPa.mjs}

@@ -7202,7 +7202,7 @@ const settings = {
 };
 //#endregion
 //#region package.json
-var version = "0.1.4";
+var version = "0.1.6";
 /** `.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.4",
+  "version": "0.1.6",
   "license": "MIT",
   "keywords": [
     "deepseek-harness",
@@ -80,19 +80,19 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-jobs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-sandbox": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell-env": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1"
+    "@deepseek-ai/dsh-agent": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-fs": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-jobs": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-shell": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-shell-env": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.1"
   },
   "optionalPeerDependencies": {
     "sharp": ">=0.33"
@@ -109,30 +109,32 @@
     "json5": "^2.2.3",
     "puppeteer-core": "^25.3.0",
     "trash": "^10.1.1",
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.0",
+    "@deepseek-ai/dsh-brand": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.5-rc.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-jobs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-jobs-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell-env": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-jobs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-fs-local": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-jobs": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-jobs-local": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-shell": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-shell-env": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-tool-jobs": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.1",
     "@types/node": "^22.19.0",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",

package/presets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoso/dsh-tool-plus-presets",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Agent-preset installer for dsh-tool-plus: installs the standard / PTC enhanced preset templates into a DeepSeek Harness home.",
   "license": "MIT",
   "keywords": [

package/presets/tool-plus-ptc/agent.cordis.yml

@@ -50,8 +50,9 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: >-
-      You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}.
+    suffix: Your working directory is {{cwd}}.
+    prefix: >-
+      You are a coding agent powered by the {{model}} model.
 
 - id: agent-instructions
   name: '@deepseek-ai/dsh-agent-instructions'
@@ -108,6 +109,9 @@
 # resolves `goals` on the host and an entry-local realm here would hide it. The
 # registry is keyed by session anyway, so one host instance serves every
 # session. What a preset chooses is whether its agent can call the goal tool.
+- id: command-goal
+  name: '@deepseek-ai/dsh-command-goal'
+
 - id: tool-goal
   name: '@deepseek-ai/dsh-tool-goal'
 
@@ -202,6 +206,7 @@
       config:
         provider: spawn
         toolName: subagent
+        modelSelectionSettings: true
         backgroundMode: continuable
 
     - id: tool-subagent-fork
@@ -239,6 +244,7 @@
 
     - id: tool-workflow
       name: '@deepseek-ai/dsh-tool-workflow'
+      disabled: true
 
     - id: tool-ralph
       name: '@deepseek-ai/dsh-tool-ralph'
@@ -264,6 +270,9 @@
     fetch: false
     searchTimeoutMs: 60000
 
+- id: present
+  name: '@deepseek-ai/dsh-tool-present'
+
 # ── presentation ────────────────────────────────────────────────────────────
 
 # Code Mode for this agent alone. The row waits for the host's `codeRuntime`
@@ -272,4 +281,4 @@
 - id: tool-presentation
   name: '@deepseek-ai/dsh-agent-tool-presentation'
   config:
-    mode: code
+    mode: ptc

package/presets/tool-plus-standard/agent.cordis.yml

@@ -46,8 +46,9 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: >-
-      You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}.
+    suffix: Your working directory is {{cwd}}.
+    prefix: >-
+      You are a coding agent powered by the {{model}} model.
 
 - id: agent-instructions
   name: '@deepseek-ai/dsh-agent-instructions'
@@ -104,6 +105,9 @@
 # resolves `goals` on the host and an entry-local realm here would hide it. The
 # registry is keyed by session anyway, so one host instance serves every
 # session. What a preset chooses is whether its agent can call the goal tool.
+- id: command-goal
+  name: '@deepseek-ai/dsh-command-goal'
+
 - id: tool-goal
   name: '@deepseek-ai/dsh-tool-goal'
 
@@ -198,6 +202,7 @@
       config:
         provider: spawn
         toolName: subagent
+        modelSelectionSettings: true
         backgroundMode: continuable
 
     - id: tool-subagent-fork
@@ -259,3 +264,6 @@
   config:
     fetch: false
     searchTimeoutMs: 60000
+
+- id: present
+  name: '@deepseek-ai/dsh-tool-present'