@deepseek-ai/dsh-tool-fs 0.1.5-rc.2 → 0.1.6-alpha.2

package/lib/index.js

@@ -1,10 +1,10 @@
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { FsError } from "@deepseek-ai/dsh-fs";
-import { ESCALATION_TARGETS, approveEscalation, canonicalPath, escalationHintMarker, sandboxDenialMarker, validateEscalationArgs } from "@deepseek-ai/dsh-sandbox";
 import { structuredPatch } from "diff";
 import { basename, extname } from "node:path";
 import { AttachmentError, AttachmentId } from "@deepseek-ai/dsh-attachment";
+import { ESCALATION_TARGETS, approveEscalation, escalationHintMarker, sandboxDenialMarker, validateEscalationArgs } from "@deepseek-ai/dsh-sandbox";
 //#region lib/types/read-render.js
 /**
 * Pure read presentation: turn provider-decoded text into a bounded, line-numbered window and
@@ -229,28 +229,22 @@ function readMetaFromMeta(meta) {
 * `process.cwd()` at the tool boundary.
 * @module @deepseek-ai/dsh-tool-fs/session-cwd
 */
-const PARENT_PATH_SEGMENT = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
 /**
 * The session workspace cwd for this call, or `undefined` when none applies.
 * @param exec - the tool-execution context; only its optional `agent` is read.
-* @param requestedPath - the path the provider will resolve; parent traversal
-*   makes a symlinked cwd's filesystem identity observable.
 * @returns the calling agent's session cwd, or undefined for a non-agent caller (the backend then applies its own default).
 */
-function sessionCwd(exec, requestedPath) {
-	const cwd = exec.agent?.session.header.cwd;
-	if (cwd === void 0 || !PARENT_PATH_SEGMENT.test(cwd) && !PARENT_PATH_SEGMENT.test(requestedPath)) return cwd;
-	return canonicalPath(cwd);
+function sessionCwd(exec) {
+	return exec.agent?.session.header.cwd;
 }
 /**
 * Resolution options shared by all model-facing filesystem tools.
 * @param exec - the tool-execution context supplying session cwd and cancellation.
-* @param requestedPath - the path the provider will resolve.
 * @param policyWorkspaceRoot - resolved per-call root, when a mutation carries sandbox policy.
 * @returns provider resolution options for the current tool call.
 */
-function sessionResolveOptions(exec, requestedPath, policyWorkspaceRoot) {
-	const cwd = policyWorkspaceRoot ?? sessionCwd(exec, requestedPath);
+function sessionResolveOptions(exec, policyWorkspaceRoot) {
+	const cwd = policyWorkspaceRoot ?? sessionCwd(exec);
 	return {
 		...cwd !== void 0 ? { cwd } : {},
 		signal: exec.signal
@@ -270,7 +264,7 @@ function sessionResolveOptions(exec, requestedPath, policyWorkspaceRoot) {
 * @returns the resolved target and its single stat result.
 */
 async function resolveRegularReadTarget(ctx, exec, requestedPath) {
-	const target = await ctx.fs.resolve(requestedPath, sessionResolveOptions(exec, requestedPath));
+	const target = await ctx.fs.resolve(requestedPath, sessionResolveOptions(exec));
 	const info = await ctx.fs.stat(target, exec.signal);
 	if (info === void 0) {
 		ctx.emit("fs/observed", target, { kind: "absent" }, exec);
@@ -637,16 +631,19 @@ function applyWriteTool(ctx, sandbox) {
 				type: "text",
 				text: formatWriteOutput(value.path, value)
 			}],
-			presentationMeta: (args, value) => ({ diffs: value.before === null ? [] : computeHunkDiffs(args.file_path, value.before, value.after).map(({ path, oldText, newText }) => ({
-				path,
-				oldText,
-				newText
-			})) })
+			presentationMeta: (args, value) => ({
+				operation: value.operation,
+				diffs: value.before === null ? [] : computeHunkDiffs(args.file_path, value.before, value.after).map(({ path, oldText, newText }) => ({
+					path,
+					oldText,
+					newText
+				}))
+			})
 		},
 		async execute(args, exec) {
 			const input = parseWriteArgs(args);
 			const sandboxPolicy = await sandbox.resolvePolicy("write", args, exec);
-			const target = await ctx.fs.resolve(input.filePath, sessionResolveOptions(exec, input.filePath, sandboxPolicy?.workspaceRoot));
+			const target = await ctx.fs.resolve(input.filePath, sessionResolveOptions(exec, sandboxPolicy?.workspaceRoot));
 			const intent = await ctx.waterfall("fs/write-intent", target, exec, () => void 0);
 			let outcome;
 			try {
@@ -795,7 +792,7 @@ function applyEditTool(ctx, sandbox) {
 		async execute(args, exec) {
 			const input = parseEditArgs(args);
 			const sandboxPolicy = await sandbox.resolvePolicy("edit", args, exec);
-			const target = await ctx.fs.resolve(input.filePath, sessionResolveOptions(exec, input.filePath, sandboxPolicy?.workspaceRoot));
+			const target = await ctx.fs.resolve(input.filePath, sessionResolveOptions(exec, sandboxPolicy?.workspaceRoot));
 			let outcome;
 			try {
 				const intent = await ctx.waterfall("fs/edit-intent", target, exec, () => void 0);
@@ -1176,7 +1173,8 @@ var FsSandboxController = class {
 	/**
 	* The policy to stamp onto this mutation: an approved escalation grant (a
 	* strictly wider retry resolved through `ctx.approval` before anything
-	* executes), else the session's standing mode. The calling session's cwd is
+	* executes), else the session's standing mode. Repeating the standing mode
+	* requires no approval. The calling session's cwd is
 	* always carried as the workspace root. Validates the escalation argument
 	* pairing first.
 	* @param toolName - the mutating tool's name, for the approval audit trail.

package/lib/types/diff.d.ts

@@ -8,13 +8,16 @@ import type { FileDiff } from '@deepseek-ai/dsh-tools';
 export declare const DIFF_CONTEXT = 3;
 /**
  * The `write`/`edit` tools' private `tool/result` `meta` payload: the applied
- * contextual-diff hunks. Attached opaquely (as `unknown`) on the tool result and
+ * contextual-diff hunks, and for `write` whether the call created or updated
+ * the file, which tells an empty hunk list of a create from one of an
+ * unchanged overwrite. Attached opaquely (as `unknown`) on the tool result and
  * persisted with the session log — it must be JSON-serializable (the session
  * validates this at `append`), so `presentResult` reproduces the diff card on
  * replay. The producing tool owns and narrows this opaque shape.
  */
 export type FsDiffMeta = {
     diffs: FileDiff[];
+    operation?: 'create' | 'update';
 };
 /**
  * Compute one {@link FileDiff} per hunk between `before` and `after`, each carrying the

package/lib/types/sandbox.d.ts

@@ -52,7 +52,8 @@ export declare class FsSandboxController {
     /**
      * The policy to stamp onto this mutation: an approved escalation grant (a
      * strictly wider retry resolved through `ctx.approval` before anything
-     * executes), else the session's standing mode. The calling session's cwd is
+     * executes), else the session's standing mode. Repeating the standing mode
+     * requires no approval. The calling session's cwd is
      * always carried as the workspace root. Validates the escalation argument
      * pairing first.
      * @param toolName - the mutating tool's name, for the approval audit trail.

package/lib/types/session-cwd.d.ts

@@ -10,19 +10,16 @@ import type { ToolExecution } from '@deepseek-ai/dsh-tools';
 /**
  * The session workspace cwd for this call, or `undefined` when none applies.
  * @param exec - the tool-execution context; only its optional `agent` is read.
- * @param requestedPath - the path the provider will resolve; parent traversal
- *   makes a symlinked cwd's filesystem identity observable.
  * @returns the calling agent's session cwd, or undefined for a non-agent caller (the backend then applies its own default).
  */
-export declare function sessionCwd(exec: ToolExecution, requestedPath: string): string | undefined;
+export declare function sessionCwd(exec: ToolExecution): string | undefined;
 /**
  * Resolution options shared by all model-facing filesystem tools.
  * @param exec - the tool-execution context supplying session cwd and cancellation.
- * @param requestedPath - the path the provider will resolve.
  * @param policyWorkspaceRoot - resolved per-call root, when a mutation carries sandbox policy.
  * @returns provider resolution options for the current tool call.
  */
-export declare function sessionResolveOptions(exec: ToolExecution, requestedPath: string, policyWorkspaceRoot?: string): {
+export declare function sessionResolveOptions(exec: ToolExecution, policyWorkspaceRoot?: string): {
     cwd?: string;
     signal?: AbortSignal;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-tool-fs",
   "description": "Model-facing filesystem tools (read, write, edit) over the DeepSeek Harness filesystem seam (ctx.fs)",
-  "version": "0.1.5-rc.2",
+  "version": "0.1.6-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -31,36 +31,36 @@
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-fs": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-sandbox": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-user-approval": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-fs": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-sandbox-policy": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.6-alpha.2",
     "@deepseek-ai/cordis": "^4.0.2"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-agent-loop": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-agent-loop-testkit": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-fs-local": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-fs-observation-policy": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-sandbox": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-fs": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-user-approval": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-fs": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-fs-observation-policy": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-fs-local": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-sandbox-policy": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-ptc-runtime": "^0.1.6-alpha.2",
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-session-projection": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-scope": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-code-runtime": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "^0.1.5-rc.2"
+    "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "^0.1.6-alpha.2"
   }
 }