@xiaoso/dsh-tool-plus 0.1.2-beta.0 → 0.1.2-beta.1

package/lib/client.js

@@ -2077,7 +2077,6 @@ window.__ModuleLoader__.load({
 			switch (reason) {
 				case "snapshot-unavailable": return "rmSafeReasonSnapshotUnavailable";
 				case "cli-missing": return "rmSafeReasonCliMissing";
-				case "script-write-failed": return "rmSafeReasonScriptWriteFailed";
 				case "snapshot-write-failed": return "rmSafeReasonSnapshotWriteFailed";
 				case "runtime-not-effective": return "rmSafeReasonRuntimeNotEffective";
 			}
@@ -2771,7 +2770,6 @@ window.__ModuleLoader__.load({
 			rmSafeStatusFailed: "安全 rm 注入失败：{reason}，rm 将永久删除",
 			rmSafeReasonSnapshotUnavailable: "快照不可用",
 			rmSafeReasonCliMissing: "trash-cli 产物缺失",
-			rmSafeReasonScriptWriteFailed: "脚本写入失败",
 			rmSafeReasonSnapshotWriteFailed: "快照不可写",
 			rmSafeReasonRuntimeNotEffective: "运行时未生效",
 			useShellCommandWrapper: "用 bash -c 包裹命令",
@@ -2962,7 +2960,6 @@ window.__ModuleLoader__.load({
 			rmSafeStatusFailed: "Safe rm injection failed: {reason}, rm deletes permanently",
 			rmSafeReasonSnapshotUnavailable: "snapshot unavailable",
 			rmSafeReasonCliMissing: "trash-cli binary missing",
-			rmSafeReasonScriptWriteFailed: "script write failed",
 			rmSafeReasonSnapshotWriteFailed: "snapshot not writable",
 			rmSafeReasonRuntimeNotEffective: "not effective at runtime",
 			useShellCommandWrapper: "Wrap commands in bash -c",

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-DwpE70Pv.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-D_e1qMwi.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-DvRrWOyM.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-BSVzHGnp.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";
@@ -811,20 +811,21 @@ function cleanupSnapshots() {
 /**
 * rmSafe: rm 重定义脚本的生成与快照注入。
 *
-* 生成一个 bash 函数定义脚本（rm → `node <trash-cli.mjs> "$@"`），
-* 通过快照文件（会话 shell 创建时 source 一次）注入：
+* 生成 bash 函数定义（rm → `node <trash-cli.mjs> "$@"`），直接内联进
+* 快照文件（会话 shell 创建时 source 一次）：
 * - POSIX：追加到用户环境快照末尾（幂等，带标记行）；
 * - Windows：getOrCreateSnapshot 生成"仅注入"快照文件后同样追加。
 *
+* 内联而非独立脚本文件：快照随进程重建（重启后重新生成），node/trash-cli
+* 路径在进程内是常量，不存在"路径漂移"；独立脚本文件反而引入跨进程共享
+* 缓存（不同安装路径的实例、测试进程互相覆盖，测试进程的 import.meta.url
+* 指向 src 会把共享缓存重写成不存在的路径）。
+*
 * rmSafe 关闭时调用方不注入，快照保持原样，系统 rm 生效。
 * @module @xiaoso/dsh-tool-plus/bash/rm-safe
 */
 /** 注入标记行：injectRmSafe 以此判断是否已注入（幂等）。 */
 const RM_SAFE_MARKER = "# dsh-tool-plus rmSafe";
-/** rm-safe 脚本缓存目录（tmpdir 下，跨会话复用）。 */
-function rmSafeScriptDir() {
-	return path.join(os.tmpdir(), "dsh-bash-plus");
-}
 /** trash-cli 构建产物路径（lib/trash-cli.mjs，与主 bundle 同目录）。 */
 function rmSafeCliPath() {
 	return fileURLToPath(new URL("./trash-cli.mjs", import.meta.url));
@@ -849,28 +850,10 @@ function rmSafeScript(nodePath, cliPath) {
 	].join("\n");
 }
 /**
-* 确保 rm-safe 脚本存在（内容不变时幂等，不重写文件）。
-* 返回脚本路径；目录/写入失败时返回 null（不抛异常，调用方降级并告警）。
-*/
-function ensureRmSafeScript(dir, nodePath, cliPath) {
-	const target = path.join(dir, "rm-safe.sh");
-	const content = rmSafeScript(nodePath, cliPath);
-	try {
-		if (fs.readFileSync(target, "utf8") === content) return target;
-	} catch {}
-	try {
-		fs.mkdirSync(dir, { recursive: true });
-		fs.writeFileSync(target, content, { mode: 384 });
-		return target;
-	} catch {
-		return null;
-	}
-}
-/**
-* 向快照文件追加 `source <rm-safe.sh>`（幂等：已有标记则跳过）。
+* 向快照文件内联追加 rm 重定义（幂等：已有标记则跳过）。
 * 返回是否注入成功；快照文件不可读/不可写时返回 false（不抛异常）。
 */
-function injectRmSafe(snapshotPath, scriptPath) {
+function injectRmSafe(snapshotPath, nodePath, cliPath) {
 	let content;
 	try {
 		content = fs.readFileSync(snapshotPath, "utf8");
@@ -879,7 +862,7 @@ function injectRmSafe(snapshotPath, scriptPath) {
 	}
 	if (content.includes("# dsh-tool-plus rmSafe")) return true;
 	try {
-		fs.appendFileSync(snapshotPath, `\n${RM_SAFE_MARKER}\nsource ${quote(scriptPath)}\n`);
+		fs.appendFileSync(snapshotPath, `\n${rmSafeScript(nodePath, cliPath)}`);
 		return true;
 	} catch {
 		return false;
@@ -2426,13 +2409,9 @@ async function executeBash(command, options) {
 	let snapshotPath = bashShell && options?.snapshotEnabled !== false ? await getOrCreateSnapshot(shell, shellEnv) : null;
 	let rmSafeInjectionFailed = false;
 	if (snapshotPath !== null && options?.rmSafe === true) {
-		const scriptPath = ensureRmSafeScript(rmSafeScriptDir(), process.execPath, rmSafeCliPath());
-		if (scriptPath === null || !injectRmSafe(snapshotPath, scriptPath)) {
+		if (!injectRmSafe(snapshotPath, process.execPath, rmSafeCliPath())) {
 			rmSafeInjectionFailed = true;
-			runtimeLogger().warn("rmSafe: injection failed, rm will delete permanently", {
-				scriptPath: scriptPath ?? null,
-				snapshotPath
-			});
+			runtimeLogger().warn("rmSafe: injection failed, rm will delete permanently", { snapshotPath });
 		}
 	}
 	const injectionFailedMarker = rmSafeInjectionFailed ? { rmSafeInjectionFailed: true } : {};
@@ -4458,12 +4437,7 @@ async function queryRmSafeStatus(deps) {
 		status: "failed",
 		reason: "cli-missing"
 	};
-	const scriptPath = deps.ensureScript();
-	if (scriptPath === null) return {
-		status: "failed",
-		reason: "script-write-failed"
-	};
-	if (!deps.inject(snapshotPath, scriptPath)) return {
+	if (!deps.inject(snapshotPath, deps.nodePath(), deps.cliPath())) return {
 		status: "failed",
 		reason: "snapshot-write-failed"
 	};
@@ -4533,8 +4507,9 @@ function installBrowserProbeRpc(ctx, deps) {
 							value: await queryRmSafeStatus({
 								getOrCreateSnapshot: () => getOrCreateSnapshot(shell, env),
 								cliExists: () => fs.existsSync(rmSafeCliPath()),
-								ensureScript: () => ensureRmSafeScript(rmSafeScriptDir(), process.execPath, rmSafeCliPath()),
-								inject: (snapshotPath, scriptPath) => injectRmSafe(snapshotPath, scriptPath),
+								nodePath: () => process.execPath,
+								cliPath: () => rmSafeCliPath(),
+								inject: (snapshotPath, nodePath, cliPath) => injectRmSafe(snapshotPath, nodePath, cliPath),
 								probe: (snapshotPath) => probeRmSafeRuntime(shell, snapshotPath)
 							})
 						};
@@ -14881,7 +14856,7 @@ let specialHandlersPromise;
 * requires a special handler, so we keep them out of the cold-startup graph.
 */
 function loadSpecialHandlers() {
-	specialHandlersPromise ??= import("./scrapers-B3AO6nqq.mjs").then((m) => m.specialHandlers);
+	specialHandlersPromise ??= import("./scrapers-B06jrsU7.mjs").then((m) => m.specialHandlers);
 	return specialHandlersPromise;
 }
 /**

package/lib/{scrapers-B3AO6nqq.mjs → scrapers-B06jrsU7.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-D_e1qMwi.mjs";
 import { V as tryParseJson } from "./utils-fnV2zzp3.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-DvRrWOyM.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-BSVzHGnp.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-BUO0JXO-.mjs";

package/lib/{utils-DvRrWOyM.mjs → utils-BSVzHGnp.mjs}

@@ -7202,7 +7202,7 @@ const settings = {
 };
 //#endregion
 //#region package.json
-var version = "0.1.2-beta.0";
+var version = "0.1.2-beta.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,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.2-beta.0",
+  "version": "0.1.2-beta.1",
   "license": "MIT",
   "keywords": [
     "deepseek-harness",

package/presets/package.json

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