@xiaoso/dsh-tool-plus 0.1.0-beta.6 → 0.1.1

package/lib/trash-cli.mjs

@@ -0,0 +1,281 @@
+import * as fs from "node:fs";
+//#region src/tools/bash/trash-cli.ts
+const SHORT_OPTIONS = {
+	r: "recursive",
+	R: "recursive",
+	f: "force",
+	i: "interactive",
+	I: "interactive",
+	v: "verbose",
+	d: "dir"
+};
+const LONG_OPTIONS = {
+	"--recursive": {
+		field: "recursive",
+		value: true
+	},
+	"--force": {
+		field: "force",
+		value: true
+	},
+	"--interactive": {
+		field: "interactive",
+		value: true
+	},
+	"--verbose": {
+		field: "verbose",
+		value: true
+	},
+	"--dir": {
+		field: "dir",
+		value: true
+	},
+	"--preserve-root": {
+		field: "preserveRoot",
+		value: true
+	},
+	"--no-preserve-root": {
+		field: "preserveRoot",
+		value: false
+	},
+	"--one-file-system": {
+		field: "oneFileSystem",
+		value: true
+	}
+};
+/** --interactive=WHEN 的合法取值（GNU rm 语义）。 */
+const INTERACTIVE_WHEN = /* @__PURE__ */ new Set([
+	"once",
+	"always",
+	"never"
+]);
+/**
+* 解析 rm 风格参数（coreutils rm 语义）：
+* - 短选项支持组合（`-rf`），`-r`/`-R`/`--recursive` 等价，`-i`/`-I` 等价；
+* - `--` 结束符后全部视为路径（允许 `-` 开头的文件名）；
+* - `--interactive[=once|always|never]` 接受（回收站模式忽略交互）；
+* - 未知短选项 → invalid-option，未知长选项 → unrecognized-option；
+* - 无路径 → missing-operand。
+*/
+function parseRmArgs(argv) {
+	const parsed = {
+		recursive: false,
+		force: false,
+		interactive: false,
+		verbose: false,
+		dir: false,
+		preserveRoot: true,
+		oneFileSystem: false,
+		paths: []
+	};
+	let afterDoubleDash = false;
+	for (const arg of argv) {
+		if (afterDoubleDash) {
+			parsed.paths.push(arg);
+			continue;
+		}
+		if (arg === "--") {
+			afterDoubleDash = true;
+			continue;
+		}
+		if (arg.startsWith("--")) {
+			const eq = arg.indexOf("=");
+			const name = eq >= 0 ? arg.slice(0, eq) : arg;
+			const value = eq >= 0 ? arg.slice(eq + 1) : void 0;
+			if (name === "---presume-input-tty") continue;
+			const flag = LONG_OPTIONS[name];
+			if (flag === void 0) {
+				parsed.error = {
+					kind: "unrecognized-option",
+					option: name
+				};
+				return parsed;
+			}
+			if (value !== void 0) {
+				if (name === "--interactive") {
+					if (!INTERACTIVE_WHEN.has(value)) {
+						parsed.error = {
+							kind: "invalid-argument",
+							option: name,
+							value
+						};
+						return parsed;
+					}
+					parsed.interactive = true;
+				} else if (name === "--preserve-root") {
+					if (value === "all") parsed.preserveRoot = true;
+					else {
+						parsed.error = {
+							kind: "invalid-argument",
+							option: name,
+							value
+						};
+						return parsed;
+					}
+				} else {
+					parsed.error = {
+						kind: "option-argument",
+						option: name
+					};
+					return parsed;
+				}
+			} else parsed[flag.field] = flag.value;
+			continue;
+		}
+		if (arg.startsWith("-") && arg.length > 1) {
+			for (const ch of arg.slice(1)) {
+				const flag = SHORT_OPTIONS[ch];
+				if (flag === void 0) {
+					parsed.error = {
+						kind: "invalid-option",
+						option: ch
+					};
+					return parsed;
+				}
+				parsed[flag] = true;
+			}
+			continue;
+		}
+		parsed.paths.push(arg);
+	}
+	if (parsed.paths.length === 0 && parsed.error === void 0) parsed.error = { kind: "missing-operand" };
+	return parsed;
+}
+/** 规范化 verbose 输出的目录尾部斜杠（`a///` → `a/`，对齐 rm）。 */
+function normalizeTrailingSlash(p) {
+	return p.replace(/[\\/]+$/, "/");
+}
+function errorMessage(err) {
+	return err instanceof Error ? err.message : String(err);
+}
+/** 路径规范化后以 `.` 或 `..` 结尾（r-4 移植：拒绝删除）。 */
+function isDotOrDotDot(p) {
+	const last = p.replace(/[\\/]+$/, "").split(/[\\/]/).pop();
+	return last === "." || last === "..";
+}
+/**
+* 路径是 `/` 或其同义词（`//`、`///`、符号链接/junction 指向根目录）。
+* 根判定用 dev/ino 比较（GNU preserve-root 的精确语义）：字符串比较在
+* Windows 上会漏判（junction 指向 C:\ 时 realpath 是 "C:\\" 而非 "/"），
+* 而 dev/ino 在 Windows 与 POSIX 上都正确。空串不是根。
+*
+* Windows 语义说明：Node 的 `/` 解析为当前盘根（随 cwd 变化），而 Git
+* bash 的 `/` 是 MSYS 根——两者都只保护"字面 `/` 及其 dev/ino 等价物"，
+* 与 GNU rm 在 Git bash 的行为一致（GNU 同样不保护指向盘根的链接）。
+*/
+async function isRootPath(p, deps) {
+	if (p.length > 0 && p.replace(/[\\/]+$/, "") === "") return true;
+	const st = await deps.stat(p);
+	if (st === null) return false;
+	const root = await deps.stat("/");
+	return root !== null && st.dev === root.dev && st.ino === root.ino;
+}
+/**
+* 执行一次 rm 语义的回收站删除。
+*
+* 行为对齐 coreutils rm：
+* - 无 -r/-d 时目录报 `Is a directory` 并保留（rm4）；
+* - 不存在路径：-f 静默忽略（f-1），否则报 `No such file or directory`；
+* - `.`/`..` 结尾路径拒绝（r-4）；`/` 及同义词拒绝（r-root，preserve-root 默认开）；
+* - 符号链接按链接本身处理（lstat，dangling-symlink 移植）；
+* - trash 失败：-f 静默但退出 1，否则报 `cannot remove`；
+* - -v 输出 `removed 'x'` / `removed directory 'x'`（r-1/d-1/v-slash）；
+* - 退出码：全部成功 0，任一失败 1。
+*/
+async function runTrashCli(argv, deps) {
+	const parsed = parseRmArgs(argv);
+	if (parsed.error !== void 0) {
+		if (parsed.error.kind === "missing-operand") deps.stderr("rm: missing operand");
+		else if (parsed.error.kind === "invalid-option") deps.stderr(`rm: invalid option -- '${parsed.error.option}'`);
+		else if (parsed.error.kind === "unrecognized-option") deps.stderr(`rm: unrecognized option '${parsed.error.option}'`);
+		else if (parsed.error.kind === "invalid-argument") deps.stderr(`rm: invalid argument '${parsed.error.value}' for '${parsed.error.option}'`);
+		else deps.stderr(`rm: option '${parsed.error.option}' doesn't allow an argument`);
+		deps.exit(1);
+		return;
+	}
+	const { recursive, force, verbose, dir, preserveRoot, paths } = parsed;
+	const items = [];
+	let failed = false;
+	for (const p of paths) {
+		if (isDotOrDotDot(p)) {
+			deps.stderr(`rm: refusing to remove '.' or '..' directory: skipping '${p}'`);
+			failed = true;
+			continue;
+		}
+		if (preserveRoot && await isRootPath(p, deps)) {
+			deps.stderr("rm: it is dangerous to operate recursively on '/'");
+			deps.stderr("rm: use --no-preserve-root to override this failsafe");
+			failed = true;
+			continue;
+		}
+		const st = await deps.lstat(p);
+		if (st === null) {
+			if (!force) {
+				deps.stderr(`rm: cannot remove '${p}': No such file or directory`);
+				failed = true;
+			}
+			continue;
+		}
+		if (st.isDirectory && !recursive && !dir) {
+			deps.stderr(`rm: cannot remove '${p}': Is a directory`);
+			failed = true;
+			continue;
+		}
+		items.push({
+			path: p,
+			isDir: st.isDirectory
+		});
+	}
+	if (items.length > 0) try {
+		await deps.trash(items.map((item) => item.path));
+	} catch (err) {
+		deps.stderr(`rm: cannot remove '${items[0].path}': ${errorMessage(err)}`);
+		failed = true;
+	}
+	if (verbose && !failed) for (const { path: p, isDir } of items) deps.stdout(isDir ? `removed directory '${normalizeTrailingSlash(p)}'` : `removed '${p}'`);
+	deps.exit(failed ? 1 : 0);
+}
+//#endregion
+//#region src/tools/bash/trash-cli-main.ts
+/**
+* rmSafe CLI 入口（构建产物 lib/trash-cli.mjs，被注入的 bash `rm()` 函数调用）。
+*
+* trash 包在此动态加载：单测只 import trash-cli.ts（纯逻辑），
+* 不会触发 trash 依赖解析。
+* @module @xiaoso/dsh-tool-plus/bash/trash-cli-main
+*/
+async function main() {
+	const { default: trash } = await import("trash");
+	await runTrashCli(process.argv.slice(2), {
+		trash,
+		lstat: async (p) => {
+			try {
+				return { isDirectory: (await fs.promises.lstat(p)).isDirectory() };
+			} catch {
+				return null;
+			}
+		},
+		stat: async (p) => {
+			try {
+				const st = await fs.promises.stat(p);
+				return {
+					dev: st.dev,
+					ino: st.ino
+				};
+			} catch {
+				return null;
+			}
+		},
+		stdout: (s) => process.stdout.write(`${s}\n`),
+		stderr: (s) => process.stderr.write(`${s}\n`),
+		exit: (c) => {
+			process.exitCode = c;
+		}
+	});
+}
+main().catch((err) => {
+	process.stderr.write(`${err instanceof Error ? err.message : String(err)}\n`);
+	process.exitCode = 1;
+});
+//#endregion
+export {};

package/lib/{utils-D1QPFbRk.mjs → utils-D1p8-H8L.mjs}

@@ -7202,7 +7202,7 @@ const settings = {
 };
 //#endregion
 //#region package.json
-var version = "0.1.0-beta.6";
+var version = "0.1.1";
 /** `.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,147 +1,148 @@
-{
-  "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.0-beta.6",
-  "license": "MIT",
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "cli",
-    "coding-agent",
-    "agent-tools",
-    "bash",
-    "persistent-shell",
-    "file-tools",
-    "code-search",
-    "code-editing",
-    "ast-grep",
-    "tool-enhancement",
-    "oh-my-pi"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xiaoso456/dsh-tool-plus.git"
-  },
-  "homepage": "https://github.com/xiaoso456/dsh-tool-plus#readme",
-  "bugs": {
-    "url": "https://github.com/xiaoso456/dsh-tool-plus/issues"
-  },
-  "type": "module",
-  "publishConfig": {
-    "access": "public",
-    "tag": "beta"
-  },
-  "engines": {
-    "node": "^22.19.0 || >=24.0.0"
-  },
-  "main": "lib/index.mjs",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.mjs"
-    },
-    "./client": {
-      "types": "./lib/types/client/index.d.ts",
-      "default": "./lib/client.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "presets",
-    "scripts/patch-pi-natives.mjs",
-    "src/bash-runtime/shell-snapshot-fn-env.sh",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE",
-    "THIRD_PARTY_NOTICES.md"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-settings"
-      ],
-      "platform": "web"
-    }
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json && tsdown -c tsdown.config.ts && node scripts/copy-assets.mjs",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run --config vitest.config.ts",
-    "presets:install": "node presets/install-presets.mjs",
-    "presets:install:force": "node presets/install-presets.mjs --force",
-    "postinstall": "node scripts/patch-pi-natives.mjs"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-attachment": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-jobs": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-shell": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-shell-env": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2"
-  },
-  "optionalPeerDependencies": {
-    "sharp": ">=0.33"
-  },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@oh-my-pi/omptype": "17.3.5",
-    "@oh-my-pi/pi-agent-core": "17.3.5",
-    "@oh-my-pi/pi-ai": "17.3.5",
-    "@oh-my-pi/pi-catalog": "17.3.5",
-    "@oh-my-pi/pi-natives": "17.3.5",
-    "@oh-my-pi/pi-tui": "17.3.5",
-    "@oh-my-pi/pi-utils": "17.3.5",
-    "json5": "^2.2.3",
-    "puppeteer-core": "^25.3.0",
-    "yaml": "^2.9.0"
-  },
-  "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-jobs": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-jobs-local": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-shell": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-shell-env": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-jobs": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
-    "@types/node": "^22.19.0",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "sharp": "^0.35.4",
-    "tsdown": "^0.22.2",
-    "tsx": "^4.22.4",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
-  }
-}
+{
+  "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.1",
+  "license": "MIT",
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "cli",
+    "coding-agent",
+    "agent-tools",
+    "bash",
+    "persistent-shell",
+    "file-tools",
+    "code-search",
+    "code-editing",
+    "ast-grep",
+    "tool-enhancement",
+    "oh-my-pi"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/xiaoso456/dsh-tool-plus.git"
+  },
+  "homepage": "https://github.com/xiaoso456/dsh-tool-plus#readme",
+  "bugs": {
+    "url": "https://github.com/xiaoso456/dsh-tool-plus/issues"
+  },
+  "type": "module",
+  "publishConfig": {
+    "access": "public",
+    "tag": "beta"
+  },
+  "engines": {
+    "node": "^22.19.0 || >=24.0.0"
+  },
+  "main": "lib/index.mjs",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.mjs"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "presets",
+    "scripts/patch-pi-natives.mjs",
+    "src/bash-runtime/shell-snapshot-fn-env.sh",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE",
+    "THIRD_PARTY_NOTICES.md"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ],
+      "platform": "web"
+    }
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json && tsdown -c tsdown.config.ts && node scripts/copy-assets.mjs",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "vitest run --config vitest.config.ts",
+    "presets:install": "node presets/install-presets.mjs",
+    "presets:install:force": "node presets/install-presets.mjs --force",
+    "postinstall": "node scripts/patch-pi-natives.mjs"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-fs": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-jobs": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-sandbox": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-shell": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-shell-env": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2"
+  },
+  "optionalPeerDependencies": {
+    "sharp": ">=0.33"
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "@oh-my-pi/omptype": "17.3.5",
+    "@oh-my-pi/pi-agent-core": "17.3.5",
+    "@oh-my-pi/pi-ai": "17.3.5",
+    "@oh-my-pi/pi-catalog": "17.3.5",
+    "@oh-my-pi/pi-natives": "17.3.5",
+    "@oh-my-pi/pi-tui": "17.3.5",
+    "@oh-my-pi/pi-utils": "17.3.5",
+    "json5": "^2.2.3",
+    "puppeteer-core": "^25.3.0",
+    "trash": "^10.1.1",
+    "yaml": "^2.9.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-fs-local": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-jobs": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-jobs-local": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-shell": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-shell-env": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-tool-jobs": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
+    "@types/node": "^22.19.0",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "sharp": "^0.35.4",
+    "tsdown": "^0.22.2",
+    "tsx": "^4.22.4",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.8"
+  }
+}

package/presets/package.json

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