@deepseek-ai/dsh-tool-workspace-dependencies 0.2.1-alpha.2 → 0.2.1-alpha.4

package/README.i18n.yaml

@@ -21,8 +21,8 @@
   en: 97b1f99b4e9c2569
   zh: bf6c6ce74073413f
 /deepseek-ai-dsh-tool-workspace-dependencies/use-this-package/payload-layout:
-  en: 0ba9c7e3b9738e4d
-  zh: a98344644ac55182
+  en: 709eda9a01bc0a81
+  zh: bb4693ddd755866a
 /deepseek-ai-dsh-tool-workspace-dependencies/use-this-package/build-a-carrier-payload:
   en: 0f3e570525053f09
   zh: 1b0cd3b653e1bd5d

package/README.md

@@ -44,6 +44,8 @@ Mount the plugin beside the tool registry with the payload directory. Configurat
 
 `runtime.json` records `desktopVersion`, `platform` (`win32`, `darwin`, or `linux`), `arch`, optional `payloadDigest`, top-level `python`, optional `node`/`pnpm` versions, and the complete `pythonPackages` distribution-version map. A pnpm entry requires Node.js. Python libraries, including numpy and pandas, appear only in `pythonPackages`. Entries live under `dependencies/`: `python/bin/python3` (`python/python.exe` on Windows) with `site-packages` beneath it, and, when declared, `node/bin/node` with `node/node_modules` and `pnpm/bin/pnpm.mjs`. A manifest whose platform or architecture differs from the running process is rejected.
 
+On macOS and Linux, the builder retains `python` and `python3` as relative links to the sibling versioned interpreter (for example, `python3.12`). Installation preserves these two aliases and materializes other links. Alias validation requires the exact sibling filename and a regular target file; carriers that cannot preserve links, including Python wheels, retain supported regular command files. Windows keeps its ordinary `python.exe` file.
+
 The packaged `sdk` profile uses its bundled Python and Office skills by default; `DSH_PRIMARY_RUNTIME` overrides the resource location, and an empty value opts out. Source launches without a carrier default remain opt-in. See [runtime configuration](../../../python/sdk-runtime/README.md) for independent skill selection. Missing skill resources produce a startup warning; invalid or incomplete external runtime payloads fail the first tool call. Profile configuration changes require restarting the SDK process.
 
 ### Build a carrier payload

package/README.zh.md

@@ -44,6 +44,8 @@ kind: "package-reference"
 
 `runtime.json` 记录 `desktopVersion`、`platform`（`win32`、`darwin` 或 `linux`）、`arch`、可选的 `payloadDigest`、顶层 `python` 与可选的 `node`/`pnpm` 版本，以及完整的 `pythonPackages` 分发包版本表。声明 pnpm 时必须同时声明 Node.js。numpy、pandas 等 Python 库只出现在 `pythonPackages` 中。条目位于 `dependencies/`：`python/bin/python3`（Windows 为 `python/python.exe`）及其下的 `site-packages`；声明了才有的 `node/bin/node`、`node/node_modules` 与 `pnpm/bin/pnpm.mjs`。平台或架构与当前进程不符的清单被拒绝。
 
+在 macOS 和 Linux 上，构建器将 `python` 和 `python3` 保留为指向同目录版本化解释器（例如 `python3.12`）的相对链接。安装时保留这两个别名，其他链接展开为实际文件。别名校验要求目标名称与同目录解释器文件名完全一致，且目标为普通文件；Python wheel 等无法保留链接的载体使用普通命令文件，同样受支持。Windows 保留普通的 `python.exe` 文件。
+
 打包的 `sdk` profile 默认使用随包 Python 和 Office skills；`DSH_PRIMARY_RUNTIME` 覆盖资源位置，空值表示禁用。没有载体默认路径的源码启动仍需显式启用。独立选择 skills 的方式见[运行时配置](../../../python/sdk-runtime/README.zh.md)。缺少 skill 资源会产生启动警告；无效或不完整的外部运行时 payload 在首次工具调用时失败。profile 配置变更需要重启 SDK 进程。
 
 ### 构建载体 payload

package/lib/index.js

@@ -1,4 +1,4 @@
-import { cp, lstat, mkdir, mkdtemp, readFile, rename, rm, stat } from "node:fs/promises";
+import { cp, lstat, mkdir, mkdtemp, readFile, readlink, rename, rm, stat, symlink } from "node:fs/promises";
 import { dirname, isAbsolute, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -75,6 +75,49 @@ async function readPrimaryRuntime(root) {
 	return parsePrimaryRuntime(JSON.parse(await readFile(join(root, "runtime.json"), "utf8")));
 }
 /**
+* Identify POSIX interpreter aliases that can survive payload relocation.
+* @param root - Payload directory.
+* @param manifest - Validated payload metadata.
+* @returns Relative alias paths mapped to their sibling interpreter filename; regular command files are omitted.
+* @throws When an interpreter alias does not point directly to the versioned regular file.
+*/
+async function primaryRuntimePythonAliases(root, manifest) {
+	const aliases = /* @__PURE__ */ new Map();
+	if (manifest.platform === "win32") return aliases;
+	const interpreter = `python${manifest.python.split(".").slice(0, 2).join(".")}`;
+	for (const name of ["python", "python3"]) {
+		const path = `dependencies/python/bin/${name}`;
+		let entry;
+		try {
+			entry = await lstat(join(root, path));
+		} catch (error) {
+			if (error.code === "ENOENT") continue;
+			throw error;
+		}
+		if (!entry.isSymbolicLink()) continue;
+		if (await readlink(join(root, path)) !== interpreter || !(await lstat(join(root, "dependencies/python/bin", interpreter))).isFile()) throw new Error(`primary runtime: invalid Python alias ${path}`);
+		aliases.set(path, interpreter);
+	}
+	return aliases;
+}
+/**
+* Copy a payload, retaining only validated Python interpreter aliases as relative links.
+* @param source - Payload directory; all other links are materialized.
+* @param destination - Empty destination owned by the caller.
+* @param manifest - Validated source metadata.
+* @returns Resolves after every copied file and interpreter alias is available independently of the source.
+*/
+async function copyPrimaryRuntime(source, destination, manifest) {
+	const aliases = await primaryRuntimePythonAliases(source, manifest);
+	const excluded = new Set([...aliases.keys()].map((path) => join(source, path)));
+	await cp(source, destination, {
+		recursive: true,
+		dereference: true,
+		filter: (path) => !excluded.has(path)
+	});
+	for (const [path, target] of aliases) await symlink(target, join(destination, path));
+}
+/**
 * Resolve platform-specific interpreter and library locations without changing the environment.
 * @param root - Absolute payload or installation directory.
 * @param manifest - Validated runtime metadata.
@@ -129,7 +172,9 @@ async function compatibleManifest(source) {
 * @returns Paths into the payload itself.
 */
 async function resolvePrimaryRuntime(source) {
-	const paths = workspaceDependencyPaths(source, await compatibleManifest(source));
+	const manifest = await compatibleManifest(source);
+	await primaryRuntimePythonAliases(source, manifest);
+	const paths = workspaceDependencyPaths(source, manifest);
 	await validatePayloadEntries(paths);
 	return paths;
 }
@@ -146,16 +191,14 @@ async function installPrimaryRuntime(source, root) {
 	const previousExists = await exists(previous);
 	if (!await exists(root) && previousExists) await rename(previous, root);
 	if (await exists(join(root, "runtime.json")) && JSON.stringify(await readPrimaryRuntime(root)) === JSON.stringify(manifest)) {
+		await primaryRuntimePythonAliases(root, manifest);
 		const paths = workspaceDependencyPaths(root, manifest);
 		await validatePayloadEntries(paths);
 		return paths;
 	}
 	const staging = await mkdtemp(join(dirname(root), ".primary-runtime-"));
 	try {
-		await cp(source, staging, {
-			recursive: true,
-			dereference: true
-		});
+		await copyPrimaryRuntime(source, staging, manifest);
 		await validatePayloadEntries(workspaceDependencyPaths(staging, manifest));
 		await rm(previous, {
 			recursive: true,
@@ -249,4 +292,4 @@ function apply(ctx, config) {
 	}));
 }
 //#endregion
-export { Config, apply, inject, installPrimaryRuntime, name, parsePrimaryRuntime, readPrimaryRuntime, resolvePrimaryRuntime, workspaceDependencyPaths };
+export { Config, apply, copyPrimaryRuntime, inject, installPrimaryRuntime, name, parsePrimaryRuntime, primaryRuntimePythonAliases, readPrimaryRuntime, resolvePrimaryRuntime, workspaceDependencyPaths };

package/lib/types/index.d.ts

@@ -57,6 +57,22 @@ export declare function parsePrimaryRuntime(value: unknown): PrimaryRuntimeManif
  * @returns Validated top-level versions and target identifiers, including for legacy components manifests.
  */
 export declare function readPrimaryRuntime(root: string): Promise<PrimaryRuntimeManifest>;
+/**
+ * Identify POSIX interpreter aliases that can survive payload relocation.
+ * @param root - Payload directory.
+ * @param manifest - Validated payload metadata.
+ * @returns Relative alias paths mapped to their sibling interpreter filename; regular command files are omitted.
+ * @throws When an interpreter alias does not point directly to the versioned regular file.
+ */
+export declare function primaryRuntimePythonAliases(root: string, manifest: PrimaryRuntimeManifest): Promise<ReadonlyMap<string, string>>;
+/**
+ * Copy a payload, retaining only validated Python interpreter aliases as relative links.
+ * @param source - Payload directory; all other links are materialized.
+ * @param destination - Empty destination owned by the caller.
+ * @param manifest - Validated source metadata.
+ * @returns Resolves after every copied file and interpreter alias is available independently of the source.
+ */
+export declare function copyPrimaryRuntime(source: string, destination: string, manifest: PrimaryRuntimeManifest): Promise<void>;
 /**
  * Resolve platform-specific interpreter and library locations without changing the environment.
  * @param root - Absolute payload or installation directory.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-tool-workspace-dependencies",
   "description": "The load_workspace_dependencies tool: absolute paths into a bundled Python, Node.js, and pnpm payload",
-  "version": "0.2.1-alpha.2",
+  "version": "0.2.1-alpha.4",
   "publishConfig": {
     "access": "public"
   },
@@ -26,19 +26,19 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-tools": "0.2.1-alpha.2",
-    "@deepseek-ai/cordis": "~4.0.5-alpha.1"
+    "@deepseek-ai/dsh-tools": "0.2.1-alpha.4",
+    "@deepseek-ai/cordis": "~4.0.5-alpha.2"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-tools": "0.2.1-alpha.2",
-    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/cordis-plugin-loader": "~1.0.6-alpha.1",
-    "@deepseek-ai/cordis-plugin-include": "~1.0.10-alpha.1",
-    "@deepseek-ai/dsh-agent": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.2"
+    "@deepseek-ai/dsh-tools": "0.2.1-alpha.4",
+    "@deepseek-ai/cordis": "~4.0.5-alpha.2",
+    "@deepseek-ai/cordis-plugin-loader": "~1.0.6-alpha.2",
+    "@deepseek-ai/cordis-plugin-include": "~1.0.10-alpha.2",
+    "@deepseek-ai/dsh-agent": "0.2.1-alpha.4",
+    "@deepseek-ai/dsh-llm": "0.2.1-alpha.4",
+    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.4"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "~3.18.5-alpha.1"
+    "@deepseek-ai/schemastery": "~3.18.5-alpha.2"
   }
 }