@deepseek-ai/dsh-tool-bash 0.2.1-alpha.1 → 0.2.1-alpha.2

package/README.i18n.yaml

@@ -15,8 +15,8 @@
   en: d152484eb41ac6b4
   zh: 09388d293f9be9cb
 /deepseek-ai-dsh-tool-bash/use-this-package:
-  en: e20abe0ff6964f16
-  zh: 143d7c17499b2247
+  en: b38c1a304e18185c
+  zh: 05275ff8d127c9c0
 /deepseek-ai-dsh-tool-bash/use-this-package/minimal-configuration:
   en: 9a16909fc013c6e5
   zh: ba740dbce3cd2e93
@@ -36,8 +36,8 @@
   en: cc9a6cc87468d73a
   zh: aaa94162ef9de2f0
 /deepseek-ai-dsh-tool-bash/understand-the-implementation:
-  en: 8d94a7381bca3fa9
-  zh: f4bd2866fff6fa8d
+  en: 165313776a851b51
+  zh: 828f48807036aff0
 /deepseek-ai-dsh-tool-bash/understand-the-implementation/design-philosophy:
   en: 9332353fda6ac7be
   zh: 45c17e5e83478032
@@ -45,8 +45,8 @@
   en: 0547d68864628d08
   zh: 5adb79f945b17a0d
 /deepseek-ai-dsh-tool-bash/understand-the-implementation/request-resolution:
-  en: b03c1d84aa4b5cd4
-  zh: 111eba387b7082ae
+  en: 56dae7757fab0a79
+  zh: 7930235dc0490c73
 /deepseek-ai-dsh-tool-bash/understand-the-implementation/rendering-story:
   en: 167c045d6a6278cc
   zh: 3f17ee8d31e0bbad

package/README.md

@@ -25,6 +25,8 @@ English | [中文](README.zh.md)
 <a id="use-this-package"></a>
 ## Use this package
 
+New commands start in the Session's current working directory. Relative `workdir` values resolve from that directory; per-call overrides and background jobs do not change it.
+
 Load this plugin in any composition where the agent should run bash commands: it registers the `bash` tool once an executor provider and the `dsh-shell-env` registry are mounted, and stays pending until the `tools`, `shell`, `systemPrompt`, and `shellEnv` services exist.
 
 ### Minimal configuration
@@ -79,6 +81,8 @@ A composition with no executor provider never activates the tool. Background cal
 <details>
 <summary>Implementation internals — click to expand</summary>
 
+Structured foreground and background results expose `cwd`, the executor-resolved launch directory. Persisted presentation metadata carries the same value so settled cards retain the directory used by that call. A command’s own `cd` does not change this launch value; native result text remains stdout, stderr, and status markers.
+
 This section explains the design decisions behind the tool and points at the code that realizes them; the observable behavior is fully covered in [Use this package](#use-this-package).
 
 ### Design philosophy
@@ -98,7 +102,7 @@ This section explains the design decisions behind the tool and points at the cod
 
 ### Request resolution
 
-The tool resolves the workdir before `ctx.shell.resolve()` runs: an explicit relative `workdir` is resolved against the session cwd, and a sandbox policy's canonical workspace root wins so confinement and launch use the same identity. Sandbox policy resolves per call through `ctx.sandboxPolicy`; an escalation request goes through `ctx.approval` before anything executes, and the tool fails at load if the executor confines but no policy service is mounted.
+The tool resolves the workdir before `ctx.shell.resolve()` runs: an explicit relative `workdir` is resolved against the Session's current directory, independently of the sandbox permission root. Sandbox policy resolves per call through `ctx.sandboxPolicy`; an escalation request goes through `ctx.approval` before anything executes, and the tool fails at load if the executor confines but no policy service is mounted.
 
 ### Rendering story
 

package/README.zh.md

@@ -25,6 +25,8 @@ kind: "package-reference"
 <a id="use-this-package"></a>
 ## 使用本包
 
+新命令从 Session 的当前工作目录启动。相对 `workdir` 从该目录解析；单次调用的覆盖值与后台任务不会改变该目录。
+
 在 agent 需要运行 bash 命令的任何组合中加载本插件：一旦挂载执行器提供方与 `dsh-shell-env` 注册表，它就注册 `bash` 工具，并在 `tools`、`shell`、`systemPrompt` 与 `shellEnv` 服务就绪之前保持等待。
 
 ### 最小配置
@@ -79,6 +81,8 @@ kind: "package-reference"
 <details>
 <summary>实现细节——点击展开</summary>
 
+前台与后台的结构化结果均包含 `cwd`，即执行器解析后的启动目录。持久化展示元数据携带同一值，使已结束的调用卡片保留该次调用使用的目录。命令内部的 `cd` 不会改变这个启动值；原生结果文本仍由 stdout、stderr 与状态标记组成。
+
 本节解释工具背后的设计决策，并指出实现它们的代码位置；可观察行为已在[使用本包](#use-this-package)中完整说明。
 
 ### 设计理念
@@ -98,7 +102,7 @@ kind: "package-reference"
 
 ### 请求解析
 
-工具在 `ctx.shell.resolve()` 运行前解析 workdir：显式的相对 `workdir` 相对会话 cwd 解析，沙箱策略的规范化 workspace root 优先，使约束与启动使用同一身份。沙箱策略通过 `ctx.sandboxPolicy` 按调用解析；升权请求在任何执行前经由 `ctx.approval`，若执行器会约束命令却没有挂载策略服务，工具在加载时失败。
+工具在 `ctx.shell.resolve()` 运行前解析 workdir：显式的相对 `workdir` 相对 Session 当前目录解析，与沙箱权限根目录独立。沙箱策略通过 `ctx.sandboxPolicy` 按调用解析；升权请求在任何执行前经由 `ctx.approval`，若执行器会约束命令却没有挂载策略服务，工具在加载时失败。
 
 ### 渲染故事
 

package/lib/index.js

@@ -224,7 +224,8 @@ const inject = [
 	"tools",
 	"shell",
 	"systemPrompt",
-	"shellEnv"
+	"shellEnv",
+	"workingDirectory"
 ];
 /** Runtime configuration schema for the bash tool plugin. */
 const Config = z.object({
@@ -284,27 +285,21 @@ function presentBashResult(args, result) {
 		...exit
 	};
 }
-/**
-* Resolve an explicit workdir first, making a relative one session-workspace-relative;
-* otherwise use the filesystem identity of the session cwd and leave executor
-* defaulting as the fallback. A resolved sandbox-policy root wins so workdir
-* and confinement use the exact same per-call identity.
-*/
-function resolveWorkdir(modelWorkdir, exec, policyWorkspaceRoot) {
-	const headerCwd = exec.agent?.session.header.cwd;
-	const sessionCwd = policyWorkspaceRoot ?? headerCwd;
+/** Resolve a relative per-call override against the Session's current directory. */
+function resolveWorkdir(modelWorkdir, sessionCwd) {
 	if (modelWorkdir === void 0) return sessionCwd;
 	if (sessionCwd !== void 0 && !isAbsolute(modelWorkdir)) return `${sessionCwd}${sep}${modelWorkdir}`;
 	return modelWorkdir;
 }
 /** Detach the executor DTO from readonly Service Definition types into plain JSON data. */
-function canonicalBashResult(result) {
+function canonicalBashResult(result, cwd) {
 	const output = (stream) => ({
 		text: stream.text,
 		truncated: stream.truncated,
 		...stream.spillPath !== void 0 ? { spillPath: stream.spillPath } : {}
 	});
 	return {
+		cwd,
 		exitCode: result.exitCode,
 		signal: result.signal,
 		timedOut: result.timedOut,
@@ -336,6 +331,10 @@ const BACKGROUND_OUTPUT_PROPERTIES = {
 	jobId: {
 		type: "string",
 		required: true
+	},
+	cwd: {
+		type: "string",
+		required: true
 	}
 };
 function apply(ctx, config = {}) {
@@ -445,6 +444,7 @@ function apply(ctx, config = {}) {
 				await stop("timed out during preparation");
 				return {
 					kind: "foreground",
+					cwd: spec.workdir,
 					exitCode: null,
 					signal: null,
 					timedOut: true,
@@ -468,6 +468,7 @@ function apply(ctx, config = {}) {
 				const read = registry.read(attached.id, owner);
 				return {
 					kind: "promoted",
+					cwd: spec.workdir,
 					jobId: attached.id,
 					timeoutMs,
 					output: renderJobRead(ringDelta(read.chunks), read.lossy, read.job.output.spillPaths ?? [], attached.process()?.sandbox, escalationModes)
@@ -480,7 +481,7 @@ function apply(ctx, config = {}) {
 			const stopped = attached.stopped();
 			return {
 				kind: "foreground",
-				...canonicalBashResult(result),
+				...canonicalBashResult(result, spec.workdir),
 				...stopped !== void 0 ? { stopped } : {}
 			};
 		};
@@ -538,6 +539,10 @@ function apply(ctx, config = {}) {
 								required: true,
 								const: "promoted"
 							},
+							cwd: {
+								type: "string",
+								required: true
+							},
 							jobId: {
 								type: "string",
 								required: true
@@ -561,6 +566,10 @@ function apply(ctx, config = {}) {
 								required: true,
 								const: "foreground"
 							},
+							cwd: {
+								type: "string",
+								required: true
+							},
 							exitCode: {
 								required: true,
 								oneOf: [{ type: "integer" }, { type: "null" }]
@@ -636,7 +645,8 @@ function apply(ctx, config = {}) {
 				render: (_args, value) => [{
 					type: "text",
 					text: value.kind === "background" ? `started background job ${value.jobId}` : value.kind === "promoted" ? renderPromoted(value) : renderResult(value, escalationModes)
-				}]
+				}],
+				presentationMeta: (_args, value) => ({ cwd: value.cwd })
 			},
 			async execute(args, exec) {
 				const standingPolicy = resolveSandboxPolicy(exec);
@@ -646,7 +656,8 @@ function apply(ctx, config = {}) {
 					...standingPolicy,
 					mode: approvedMode
 				};
-				const workdir = resolveWorkdir(args.workdir, exec, standingPolicy?.workspaceRoot);
+				const cwd = exec.agent === void 0 ? void 0 : await ctx.workingDirectory.ensure(exec.agent, exec.signal);
+				const workdir = resolveWorkdir(args.workdir, cwd);
 				const dshEnv = ctx.shellEnv.collect(exec);
 				const request = {
 					command: args.command,
@@ -659,12 +670,14 @@ function apply(ctx, config = {}) {
 					if (!backgroundEnabled) throw new Error("run_in_background is disabled for this deployment (enableRunInBackground: false)");
 					if (jobs === void 0) throw new Error("background jobs unavailable: load @deepseek-ai/dsh-jobs and @deepseek-ai/dsh-tool-jobs");
 					if (exec.signal.aborted) throw toolAborted();
+					const spec = ctx.shell.resolve({
+						...request,
+						onExpiry: "none"
+					});
 					return {
 						kind: "background",
-						jobId: startJob(jobs, args, exec, ctx.shell.resolve({
-							...request,
-							onExpiry: "none"
-						})).id
+						jobId: startJob(jobs, args, exec, spec).id,
+						cwd: spec.workdir
 					};
 				}
 				if (jobs !== void 0 && promote) {
@@ -680,14 +693,15 @@ function apply(ctx, config = {}) {
 					}
 					if (attached !== void 0) return waitOnJob(jobs, attached, exec, spec);
 				}
-				const result = await (await ctx.shell.execute(ctx.shell.resolve({
+				const spec = ctx.shell.resolve({
 					...request,
 					signal: exec.signal
-				}))).result();
+				});
+				const result = await (await ctx.shell.execute(spec)).result();
 				if (result.aborted) throw toolAborted();
 				return {
 					kind: "foreground",
-					...canonicalBashResult(result)
+					...canonicalBashResult(result, spec.workdir)
 				};
 			},
 			presentCall: presentBashCall,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-tool-bash",
   "description": "Model-facing bash tool with optional generic background-job and sandbox-escalation support",
-  "version": "0.2.1-alpha.1",
+  "version": "0.2.1-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -27,41 +27,44 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-shell": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-agent": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-shell-env": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-jobs": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-tools": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.1",
+    "@deepseek-ai/dsh-agent": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-shell": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-shell-env": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-jobs": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "0.2.1-alpha.2",
     "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-user-approval": "0.2.1-alpha.1"
+    "@deepseek-ai/dsh-working-directory": "0.2.1-alpha.2"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "~3.18.5-alpha.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-agent-loop": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-agent-loop-testkit": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-shell": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-shell-env": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-subprocess-local": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-jobs": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-bash-local": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-tool-jobs": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-tools": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-user-approval": "0.2.1-alpha.1",
+    "@deepseek-ai/dsh-ptc-runtime": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-agent": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-shell": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-shell-env": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-bash-local": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-subprocess-local": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-jobs": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-jobs-local": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-tool-jobs": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "0.2.1-alpha.2",
     "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-session-projection": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-jobs-local": "0.2.1-alpha.1"
+    "@deepseek-ai/dsh-session-projection": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-working-directory": "0.2.1-alpha.2"
   }
 }