@xiaoso/dsh-tool-plus 0.1.3 → 0.1.5

package/lib/{stream-markup-healing-C9eC7Gf8.mjs → stream-markup-healing-DZ6bVDxH.mjs}

@@ -1,8 +1,8 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { D as partialSuffixOverlapAny, E as FencedThinkingScanner, T as createInbandScanner } from "./utils-fnV2zzp3.mjs";
-import { h as isDeepseekModelIdOrName } from "./models-Cp3PzU3l.mjs";
-import "./identity-C0SPVyIZ.mjs";
+import { D as partialSuffixOverlapAny, E as FencedThinkingScanner, T as createInbandScanner } from "./utils-Cp2Mxf_U.mjs";
+import { h as isDeepseekModelIdOrName } from "./models-DRA2c_8U.mjs";
+import "./identity-HNO1Oe9B.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/dialect/thinking.ts
 /**
 * Every dialect's in-band thinking section in its canonical `renderThinking`

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",
@@ -49,6 +64,31 @@ const INTERACTIVE_WHEN = /* @__PURE__ */ new Set([
 	"always",
 	"never"
 ]);
+function isAsciiDriveLetter(value) {
+	if (value.length !== 1) return false;
+	const code = value.charCodeAt(0);
+	return code >= 65 && code <= 90 || code >= 97 && code <= 122;
+}
+function windowsDriveAliasPath(filePath) {
+	if (!filePath.startsWith("/")) return void 0;
+	const parts = filePath.split("/");
+	if (parts[0] !== "") return void 0;
+	let drive;
+	let tailStart = 2;
+	if (parts.length >= 2 && isAsciiDriveLetter(parts[1] ?? "")) drive = parts[1].toUpperCase();
+	else if (parts.length >= 3 && (parts[1] ?? "").toLowerCase() === "mnt" && isAsciiDriveLetter(parts[2] ?? "")) {
+		drive = parts[2].toUpperCase();
+		tailStart = 3;
+	}
+	if (!drive) return void 0;
+	const tail = parts.slice(tailStart).filter(Boolean).join("\\");
+	return tail ? `${drive}:\\${tail}` : `${drive}:\\`;
+}
+/** MSYS 驱动器别名（`/d/…`、`/mnt/d/…`）转原生 Windows 路径；非 win32 原样返回。 */
+function normalizeWindowsDriveAliasPath(filePath, platform = process.platform) {
+	if (platform !== "win32") return filePath;
+	return windowsDriveAliasPath(filePath) ?? filePath;
+}
 /**
 * 解析 rm 风格参数（coreutils rm 语义）：
 * - 短选项支持组合（`-rf`），`-r`/`-R`/`--recursive` 等价，`-i`/`-I` 等价；
@@ -170,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 语义的回收站删除。
 *
@@ -196,9 +272,10 @@ async function runTrashCli(argv, deps) {
 	const { recursive, force, verbose, dir, preserveRoot, paths } = parsed;
 	const items = [];
 	let failed = false;
-	for (const p of paths) {
+	for (const authored of paths) {
+		const p = normalizeWindowsDriveAliasPath(authored);
 		if (isDotOrDotDot(p)) {
-			deps.stderr(`rm: refusing to remove '.' or '..' directory: skipping '${p}'`);
+			deps.stderr(`rm: refusing to remove '.' or '..' directory: skipping '${authored}'`);
 			failed = true;
 			continue;
 		}
@@ -211,17 +288,18 @@ async function runTrashCli(argv, deps) {
 		const st = await deps.lstat(p);
 		if (st === null) {
 			if (!force) {
-				deps.stderr(`rm: cannot remove '${p}': No such file or directory`);
+				deps.stderr(`rm: cannot remove '${authored}': No such file or directory`);
 				failed = true;
 			}
 			continue;
 		}
 		if (st.isDirectory && !recursive && !dir) {
-			deps.stderr(`rm: cannot remove '${p}': Is a directory`);
+			deps.stderr(`rm: cannot remove '${authored}': Is a directory`);
 			failed = true;
 			continue;
 		}
 		items.push({
+			authored,
 			path: p,
 			isDir: st.isDirectory
 		});
@@ -229,10 +307,20 @@ 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].path}': ${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 { path: p, isDir } of items) deps.stdout(isDir ? `removed directory '${normalizeTrailingSlash(p)}'` : `removed '${p}'`);
+	if (verbose && !failed) for (const { authored, isDir } of items) deps.stdout(isDir ? `removed directory '${normalizeTrailingSlash(authored)}'` : `removed '${authored}'`);
 	deps.exit(failed ? 1 : 0);
 }
 //#endregion

package/lib/{types-BUO0JXO-.mjs → types-DX_bvuus.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { c as combineSignals } from "./src-D_e1qMwi.mjs";
+import { c as combineSignals } from "./src-BcD0_rQR.mjs";
 import { t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
 import { scheduler } from "node:timers/promises";
 //#region src/tools/omp/web/scrapers/types.ts

package/lib/{utils-DEUxgLCs.mjs → utils-APrc-TBB.mjs}

@@ -1,34 +1,34 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import { B as USER_AGENT, I as $flag, K as getDocumentConversionCacheDir, P as $env, R as isBunTestRuntime, S as debug, T as warn, W as getDebugLogPath, Z as getToolsDir, c as combineSignals, d as $which, l as exec, r as TempDir, tt as untilAborted, y as isEnoent, z as isTerminalHeadless } from "./src-D_e1qMwi.mjs";
-import { V as ProviderHttpError, a as isTransientStatus } from "./error-DoHuatWw.mjs";
-import "./utils-fnV2zzp3.mjs";
+import { B as USER_AGENT, I as $flag, K as getDocumentConversionCacheDir, P as $env, R as isBunTestRuntime, S as debug, T as warn, W as getDebugLogPath, Z as getToolsDir, c as combineSignals, d as $which, l as exec, r as TempDir, tt as untilAborted, y as isEnoent, z as isTerminalHeadless } from "./src-BcD0_rQR.mjs";
+import { V as ProviderHttpError, a as isTransientStatus } from "./error-C-f_Wnw4.mjs";
+import "./utils-Cp2Mxf_U.mjs";
 import { n as isRecord } from "./type-guards-B9VVjRDK.mjs";
 import { t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
-import { n as extractArchive } from "./zip-CqKW2-TK.mjs";
-import { Et as parseAlibabaTokenPlanCredential, Tt as ALIBABA_TOKEN_PLAN_CN_BASE_URL, n as getEnvApiKey } from "./stream-DveNFWSN.mjs";
-import { a as toNumber, i as toBoolean$1 } from "./utils-B-mTYQBc.mjs";
-import "./identity-C0SPVyIZ.mjs";
-import { n as OPENCODE_HEADERS } from "./github-copilot-qETlj_bD.mjs";
-import "./vision-guard-BsvOWmfB.mjs";
-import "./event-stream-C-FmBYUt.mjs";
-import { i as claudeCodeVersion } from "./anthropic-DGXmmg43.mjs";
+import { n as extractArchive } from "./zip-BK7UHCwX.mjs";
+import { Et as parseAlibabaTokenPlanCredential, Tt as ALIBABA_TOKEN_PLAN_CN_BASE_URL, n as getEnvApiKey } from "./stream-Bjq8wjfr.mjs";
+import { a as toNumber, i as toBoolean$1 } from "./utils-CQHPEQ3W.mjs";
+import "./identity-HNO1Oe9B.mjs";
+import { n as OPENCODE_HEADERS } from "./github-copilot-B3kQl0g0.mjs";
+import "./vision-guard-mBmtAHx0.mjs";
+import "./event-stream-Dh2guZxS.mjs";
+import { i as claudeCodeVersion } from "./anthropic-CDmj476p.mjs";
 import { i as getGeminiCliHeaders, n as getAntigravityUserAgent } from "./gemini-headers-DKUShltF.mjs";
 import { t as CODEX_BASE_URL } from "./codex-P1dGpX7G.mjs";
-import { t as getKimiCommonHeaders } from "./kimi-DHDO6Fde.mjs";
-import "./anthropic-BVfZdnMp.mjs";
-import { n as extractCursorAccessTokenUserId } from "./cursor-CQQtygwl.mjs";
-import { i as getXAICliBillingHeaders, n as extractXAIAccessTokenSubject, r as fetchXAIOAuthIdentity, t as buildXAICliBillingUrl } from "./xai-oauth-BkPNQS-q.mjs";
-import "./openai-codex-responses-C4uMpWNy.mjs";
-import "./azure-openai-responses-C-5q-5K2.mjs";
-import "./ollama-TrkXTNqE.mjs";
-import "./openai-completions-1ydXm5vF.mjs";
-import "./openai-responses-CN79gRGQ.mjs";
-import { t as MAX_BYTES } from "./types-BUO0JXO-.mjs";
-import * as path from "node:path";
+import { t as getKimiCommonHeaders } from "./kimi-DgcUpPtK.mjs";
+import "./anthropic-BL6LFDQS.mjs";
+import { n as extractCursorAccessTokenUserId } from "./cursor-B6HcmplF.mjs";
+import { i as getXAICliBillingHeaders, n as extractXAIAccessTokenSubject, r as fetchXAIOAuthIdentity, t as buildXAICliBillingUrl } from "./xai-oauth-5pORHUrg.mjs";
+import "./openai-codex-responses-BcnOotRB.mjs";
+import "./azure-openai-responses-BkhsLmN3.mjs";
+import "./ollama-Df9ce-Cp.mjs";
+import "./openai-completions-Bq4WT47M.mjs";
+import "./openai-responses-Mq_-PjvE.mjs";
+import { t as MAX_BYTES } from "./types-DX_bvuus.mjs";
 import * as fs from "node:fs";
 import { Ellipsis, Ellipsis as Ellipsis$1, extractSegments, matchesKey, sliceWithWidth, truncateToWidth } from "@oh-my-pi/pi-natives";
+import * as path from "node:path";
 import * as os from "node:os";
 import { scheduler } from "node:timers/promises";
 import "node:crypto";
@@ -7202,7 +7202,7 @@ const settings = {
 };
 //#endregion
 //#region package.json
-var version = "0.1.3";
+var version = "0.1.5";
 /** `.tmp` files older than this are treated as orphaned writes and swept. */
 const TMP_ORPHAN_MAX_AGE_MS = 3e5;
 function markitConversionCacheKey(bytes, extension) {
@@ -7336,7 +7336,7 @@ const CONVERTIBLE_EXTENSIONS = /* @__PURE__ */ new Set([
 	".epub"
 ]);
 let markit = async () => {
-	const promise = import("./markit-B9exZ0ZV.mjs").then(({ Markit }) => {
+	const promise = import("./markit-DtGoRE6M.mjs").then(({ Markit }) => {
 		const instance = new Markit();
 		markit = () => instance;
 		return instance;

package/lib/{utils-B-mTYQBc.mjs → utils-CQHPEQ3W.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { n as wrapFetchForExtraCa } from "./src-D_e1qMwi.mjs";
+import { n as wrapFetchForExtraCa } from "./src-BcD0_rQR.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-catalog@17.3.5/node_modules/@oh-my-pi/pi-catalog/src/utils.ts
 /**
 * Fetch implementation for catalog discovery probes: the caller's override

package/lib/{utils-fnV2zzp3.mjs → utils-Cp2Mxf_U.mjs}

@@ -1,8 +1,8 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { I as $flag, P as $env, S as debug, g as parseStreamingJson, h as parseJsonWithRepair } from "./src-D_e1qMwi.mjs";
-import { r as ValidationError } from "./error-DoHuatWw.mjs";
-import { t as preferredDialect } from "./identity-C0SPVyIZ.mjs";
+import { I as $flag, P as $env, S as debug, g as parseStreamingJson, h as parseJsonWithRepair } from "./src-BcD0_rQR.mjs";
+import { r as ValidationError } from "./error-C-f_Wnw4.mjs";
+import { t as preferredDialect } from "./identity-HNO1Oe9B.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/json.ts
 /**
 * Try to parse JSON, returning null on failure.

package/lib/{vision-guard-BsvOWmfB.mjs → vision-guard-mBmtAHx0.mjs}

@@ -1,7 +1,7 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { M as isDashscopeCompatibleModeUrl, S as isQwenModelId, x as isOpenAIModelId } from "./models-Cp3PzU3l.mjs";
-import "./identity-C0SPVyIZ.mjs";
+import { M as isDashscopeCompatibleModeUrl, S as isQwenModelId, x as isOpenAIModelId } from "./models-DRA2c_8U.mjs";
+import "./identity-HNO1Oe9B.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/types.ts
 /**
 * Ceiling on the output-token count omp requests from any OpenAI-family endpoint

package/lib/{wafer-Dpy7tL3l.mjs → wafer-BlhWLweO.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { t as createApiKeyLogin } from "./api-key-login-BikQAfD-.mjs";
+import { t as createApiKeyLogin } from "./api-key-login-CIDnXeYd.mjs";
 const loginWaferServerless = createApiKeyLogin({
 	providerLabel: "Wafer Serverless",
 	authUrl: "https://app.wafer.ai/usage",

package/lib/{xai-oauth-BkPNQS-q.mjs → xai-oauth-5pORHUrg.mjs}

@@ -1,8 +1,8 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { r as __exportAll } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import { c as OAuthError, h as LoginCancelledError } from "./error-DoHuatWw.mjs";
-import { t as pollOAuthDeviceCodeFlow } from "./device-code-wZUbgPdB.mjs";
+import { c as OAuthError, h as LoginCancelledError } from "./error-C-f_Wnw4.mjs";
+import { t as pollOAuthDeviceCodeFlow } from "./device-code-CuXTWYwY.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/xai-oauth.ts
 /**
 * xAI Grok OAuth device authorization flow.

package/lib/{xiaomi-CG3TsYRz.mjs → xiaomi-7mE345KX.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { _ as OnPromptRequiredError, c as OAuthError, h as LoginCancelledError, m as ApiKeyRequiredError } from "./error-DoHuatWw.mjs";
+import { _ as OnPromptRequiredError, c as OAuthError, h as LoginCancelledError, m as ApiKeyRequiredError } from "./error-C-f_Wnw4.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/xiaomi.ts
 /**
 * Xiaomi MiMo login flow.

package/lib/{zai--cewobzN.mjs → zai-CeNpMV3W.mjs}

@@ -1,7 +1,7 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { V as ProviderHttpError, c as OAuthError, h as LoginCancelledError } from "./error-DoHuatWw.mjs";
-import { t as OAuthCallbackFlow } from "./callback-server-Di6C4RqI.mjs";
+import { V as ProviderHttpError, c as OAuthError, h as LoginCancelledError } from "./error-C-f_Wnw4.mjs";
+import { t as OAuthCallbackFlow } from "./callback-server-CFJK-jvK.mjs";
 //#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/zai.ts
 /**
 * Z.ai / GLM OAuth flow (GLM Coding Plan · Sign in)

package/lib/{zip-CqKW2-TK.mjs → zip-BK7UHCwX.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { j as formatBytes } from "./src-D_e1qMwi.mjs";
+import { j as formatBytes } from "./src-BcD0_rQR.mjs";
 import { n as ToolError } from "./tool-errors-DoyxivAR.mjs";
 import * as path from "node:path";
 import * as zlib from "node:zlib";

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.3",
+  "version": "0.1.5",
   "license": "MIT",
   "keywords": [
     "deepseek-harness",

package/presets/package.json

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

package/lib/{src-D_e1qMwi.mjs → src-BcD0_rQR.mjs}

@@ -1,9 +1,9 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import * as path from "node:path";
 import * as fs from "node:fs";
 import { Process } from "@oh-my-pi/pi-natives";
+import * as path from "node:path";
 import * as os from "node:os";
 import assert from "node:assert/strict";
 import { parse, stringify } from "yaml";