fs write/edit now emit a result-time contextual-diff tool_call_update
(the applied hunk with ±3 context lines, one hunk per replace_all site),
matching what claude-agent-acp sends and what makes an editor render the
change in place. The call-time snippet diff stays; the result hunk
supersedes it (ACP content-replace).
Mechanism:
- A persisted tool-private `meta` channel: execute may return
`{ content, meta }`; `meta` (JsonValue) rides on the tool/result event
and is handed back to presentResult, so the diff reproduces on replay
(event-sourced). JsonValue is now exported from dsh-session.
- The backend returns raw before/after text (storage facts) on
FsWriteOutcome/FsEditOutcome; the tool computes the hunk via the npm
`diff` package's structuredPatch. A create has no before → no result
diff; a failed/aborted mutation carries no meta.
- ToolResultView gains a DiffResultView; the bridge's result-side switch
renders it as {type:'diff'} content blocks.
RFC: docs/rfc/implemented/architecture/2026-07-02-result-time-applied-hunk-diffs.md
(justifies the npm `diff` runtime dep over vendoring and the meta channel);
the render-intent-union RFC's Non-goal is updated to record this shipped.
All fs snapshot goldens re-recorded; edit/overwrite gain the contextual
result diff, create/read/policy-reject unchanged in structure.
50 lines
2.3 KiB
TypeScript
50 lines
2.3 KiB
TypeScript
/**
|
|
* The model-facing filesystem tool suite (`read`, `write`, `edit`) over the
|
|
* `ctx.fs` provider seam. This single plugin registers all three tools.
|
|
*
|
|
* ## The tool is the executor; policy is an event gate
|
|
*
|
|
* The tool reads/writes/edits through `ctx.fs` DIRECTLY and owns model-facing
|
|
* concerns only — tool names, JSON schemas, argument validation, prompt
|
|
* sections, read windowing, result formatting. It does NOT inject a policy
|
|
* service. Instead, on each write/edit it dispatches a single-slot waterfall
|
|
* (`fs/write-intent`/`fs/edit-intent`) to obtain the OPTIONAL version guard, and
|
|
* after every read/write/edit it emits `fs/observed` with a plain (unguarded)
|
|
* `ctx.emit`. A policy plugin (`@deepseek-ai/dsh-fs-policy`) occupies the
|
|
* decision slot and listens for `fs/observed` to add observed-state +
|
|
* read-before-edit + version-guarded write/edit; a deployment that loads these
|
|
* tools is expected to also load it. With no policy plugin the waterfalls fall
|
|
* through to their `undefined` default (the unconstrained bare provider) and
|
|
* `fs/observed` is unheard — the tool still functions. This package never
|
|
* imports `node:fs`, `node:path`, or an `@deepseek-ai/dsh-fs-local`
|
|
* implementation.
|
|
*
|
|
* @module @deepseek-ai/dsh-tool-fs
|
|
*/
|
|
|
|
import type { Context } from 'cordis'
|
|
import { applyReadTool } from './read.ts'
|
|
import { applyWriteTool } from './write.ts'
|
|
import { applyEditTool } from './edit.ts'
|
|
|
|
export { READ_LIMIT, STREAM_MIN_SIZE, applyReadTool, parseReadArgs } from './read.ts'
|
|
export { applyWriteTool, formatWriteOutput, parseWriteArgs } from './write.ts'
|
|
export { applyEditTool, formatEditOutput, parseEditArgs } from './edit.ts'
|
|
export { READ_MAX_BYTES, READ_MAX_LINE_LENGTH, buildWindow, formatReadOutput } from './read-render.ts'
|
|
export type { FileReadOutcome, FileTextLine, ReadWindow, WindowResult } from './read-render.ts'
|
|
export { DIFF_CONTEXT, computeHunkDiffs, diffsFromMeta } from './diff.ts'
|
|
export type { FsDiffMeta } from './diff.ts'
|
|
|
|
/** Cordis plugin name used by loader diagnostics. */
|
|
export const name = 'tool-fs'
|
|
|
|
/** Services required by the filesystem tool suite. */
|
|
export const inject = ['tools', 'fs', 'systemPrompt']
|
|
|
|
/** Register the full `read`/`write`/`edit` filesystem tool suite. */
|
|
export function apply(ctx: Context): void {
|
|
applyReadTool(ctx)
|
|
applyWriteTool(ctx)
|
|
applyEditTool(ctx)
|
|
}
|