dsh-diff-approval 0.37.3 → 0.37.4

package/lib/index.js

@@ -3,10 +3,64 @@ import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/p
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
-import { dshHomePath, expandHomePath } from "@deepseek-ai/dsh-home-paths";
+import { homedir } from "node:os";
 import "@deepseek-ai/cordis";
 import { spawn } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
+//#region lib/types/home-paths.js
+/**
+* The harness-home path helpers this plugin needs, kept LOCAL on purpose.
+*
+* They used to be imported from `@deepseek-ai/dsh-home-paths`, but that package is part of the HOST core, not a
+* library a plugin may ship: declaring it in `dependencies` makes pnpm hoist a second copy into the profile's
+* top-level `node_modules`, where the host's own row can resolve it instead of its matching copy — the host's
+* version gate then disables that row and every service injecting it (issue #10). These two helpers are a few
+* lines with a stable contract, so owning them here removes the shadowing risk entirely.
+*
+* Semantics mirror the host package (v0.1.0-rc):
+*  - the harness home is an explicit configured path, else a NON-EMPTY `$DSH_HOME`, else `~/.dsh`;
+*  - `~`, `~/…` and `~\…` expand against the operating-system home; any other path is returned untouched;
+*  - the result is normalized to an absolute path before joining.
+*
+* @module dsh-diff-approval/src/home-paths
+*/
+/** Directory name used for the default harness home under the OS home. */
+const DSH_HOME_DIR_NAME = ".dsh";
+/** Environment variable that overrides the default harness home. */
+const DSH_HOME_ENV = "DSH_HOME";
+/**
+* Expand the supported tilde prefixes against the operating-system home.
+* @param path - a configured path that may begin with `~`, `~/`, or `~\`.
+* @returns the expanded path, or the original value when no supported prefix is present.
+*/
+function expandHomePath(path) {
+	if (path === "~") return homedir();
+	if (path.startsWith("~/") || path.startsWith("~\\")) return join(homedir(), path.slice(2));
+	return path;
+}
+/**
+* Resolve the single-root harness home.
+*
+* Precedence, highest first: an explicit configured path, a non-empty `$DSH_HOME`, then `~/.dsh`. A blank or
+* whitespace-only `$DSH_HOME` is treated as unset, so it can never resolve the home to the current directory.
+* @param configured - explicit harness-home override with the highest precedence.
+* @param env - environment mapping used to read `$DSH_HOME` (test seam; defaults to the process environment).
+* @returns the normalized absolute harness home path.
+*/
+function resolveDshHome(configured, env = process.env) {
+	const fromEnv = env[DSH_HOME_ENV];
+	const candidate = configured ?? (fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join(homedir(), DSH_HOME_DIR_NAME));
+	return resolve(expandHomePath(candidate));
+}
+/**
+* Join path segments onto the resolved harness home.
+* @param segments - path segments appended to the harness home; an empty list returns the home itself.
+* @returns the normalized absolute joined path.
+*/
+function dshHomePath(...segments) {
+	return join(resolveDshHome(), ...segments);
+}
+//#endregion
 //#region node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.2/node_modules/@deepseek-ai/cosmokit/lib/index.js
 /** Return true when a value is `null` or `undefined`. */
 function isNullable(value) {

package/lib/types/home-paths.d.ts

@@ -0,0 +1,38 @@
+/**
+ * The harness-home path helpers this plugin needs, kept LOCAL on purpose.
+ *
+ * They used to be imported from `@deepseek-ai/dsh-home-paths`, but that package is part of the HOST core, not a
+ * library a plugin may ship: declaring it in `dependencies` makes pnpm hoist a second copy into the profile's
+ * top-level `node_modules`, where the host's own row can resolve it instead of its matching copy — the host's
+ * version gate then disables that row and every service injecting it (issue #10). These two helpers are a few
+ * lines with a stable contract, so owning them here removes the shadowing risk entirely.
+ *
+ * Semantics mirror the host package (v0.1.0-rc):
+ *  - the harness home is an explicit configured path, else a NON-EMPTY `$DSH_HOME`, else `~/.dsh`;
+ *  - `~`, `~/…` and `~\…` expand against the operating-system home; any other path is returned untouched;
+ *  - the result is normalized to an absolute path before joining.
+ *
+ * @module dsh-diff-approval/src/home-paths
+ */
+/**
+ * Expand the supported tilde prefixes against the operating-system home.
+ * @param path - a configured path that may begin with `~`, `~/`, or `~\`.
+ * @returns the expanded path, or the original value when no supported prefix is present.
+ */
+export declare function expandHomePath(path: string): string;
+/**
+ * Resolve the single-root harness home.
+ *
+ * Precedence, highest first: an explicit configured path, a non-empty `$DSH_HOME`, then `~/.dsh`. A blank or
+ * whitespace-only `$DSH_HOME` is treated as unset, so it can never resolve the home to the current directory.
+ * @param configured - explicit harness-home override with the highest precedence.
+ * @param env - environment mapping used to read `$DSH_HOME` (test seam; defaults to the process environment).
+ * @returns the normalized absolute harness home path.
+ */
+export declare function resolveDshHome(configured?: string, env?: NodeJS.ProcessEnv): string;
+/**
+ * Join path segments onto the resolved harness home.
+ * @param segments - path segments appended to the harness home; an empty list returns the home itself.
+ * @returns the normalized absolute joined path.
+ */
+export declare function dshHomePath(...segments: string[]): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-diff-approval",
-  "version": "0.37.3",
+  "version": "0.37.4",
   "description": "DeepSeek Harness plugin: pending-edit review with whole-file diff and Keep/Revert",
   "packageManager": "pnpm@11.21.0",
   "author": "Wu Zhiwei",
@@ -70,7 +70,6 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.5",
     "@shikijs/langs": "^4.4.3",
     "diff": "^9.0.0",
     "dompurify": "^3.4.15",