@j0hanz/filesystem-mcp 2.6.3 → 2.7.1

package/dist/tools/move.js

@@ -1,44 +1,26 @@
 import { isInputRequiredResult } from '@modelcontextprotocol/server';
-import { basename, dirname, resolve } from 'node:path';
+import { stat } from 'node:fs/promises';
+import { basename, dirname, relative, resolve } from 'node:path';
 import * as z from 'zod/v4';
 import { processInParallel } from "../core/concurrency.js";
 import { ErrorCode, FsError, isFsError, isNodeError, Problem, rethrowIfAborted, } from "../core/errors.js";
 import { joinRoster, pathLabel } from "../core/fmt.js";
 import { destExists } from "../core/fs.js";
+import { globEntries } from "../core/glob.js";
 import { confirmKey, describeRefusal, pendingRoundTrip, readAcceptedChoice, } from "../core/input-required.js";
 import { isPathInsideDirectory, isSamePath, normalizeCaseForComparison, respellCaseOnlyTarget, } from "../core/path-utils.js";
-import { defaultFalseBoolean, PerFileErrorSchema, RequiredPath } from "../core/schema.js";
+import { defaultFalseBoolean, RequiredPath } from "../core/schema.js";
 import { PARALLEL_CONCURRENCY } from "../core/util.js";
 import { defineTool } from "./define.js";
 const MoveItemSchema = z.strictObject({
     source: RequiredPath.describe('Path of the file or directory to move or copy'),
     destination: RequiredPath.describe('Destination path'),
 });
-const MoveItemResultSchema = z.strictObject({
-    from: z.string().describe('Resolved absolute source path'),
-    to: z.string().describe('Resolved absolute destination path'),
-});
 const MoveInputSchema = z.strictObject({
     moves: z.array(MoveItemSchema).min(1).max(100).describe('Operations to perform (max 100)'),
     copy: defaultFalseBoolean('Copy instead of move; sources are left in place'),
     overwrite: defaultFalseBoolean('Copy mode only: overwrite existing destinations without confirmation'),
 });
-const MoveFailureItemSchema = z.strictObject({
-    source: z.string().describe('Source path that could not be moved'),
-    destination: z.string().describe('Intended destination path for the failed move'),
-    error: PerFileErrorSchema,
-});
-const MoveOutputSchema = z.strictObject({
-    moves: z.array(MoveItemResultSchema).describe('Successfully completed operations'),
-    failures: z
-        .array(MoveFailureItemSchema)
-        .optional()
-        .describe('Operations that failed with per-item error details'),
-    skipped: z
-        .array(z.string())
-        .optional()
-        .describe('Destinations skipped because the user chose Skip'),
-});
 const VERB = { move: 'Move', copy: 'Copy' };
 /**
  * Phase 1 (no mutation): validate source and destination, reject self-targets
@@ -50,13 +32,16 @@ const VERB = { move: 'Move', copy: 'Copy' };
  * `overwrite` is copy-only — move has no confirmation bypass — so a move always
  * passes false.
  */
-async function planTransfer(op, pair, fs, overwrite) {
+async function planTransfer(op, pair, fs, overwrite, signal) {
     let realSource;
     let opSource;
     let validDest;
     try {
         ({ realSource, opSource } = await validateTransferSource(op, pair.source, fs));
         validDest = await fs.pathGuard.validatePathForWrite(pair.destination);
+        if (!(op === 'move' && opSource !== realSource) && (await stat(realSource)).isDirectory()) {
+            await assertTreeHasNoProtectedEntries(op, realSource, pair.source, validDest, fs, signal);
+        }
     }
     catch (error) {
         return { status: 'fail', failure: pairFailure(pair, error) };
@@ -108,7 +93,7 @@ async function executeTransfer(op, plan, ctx, pendingSorted) {
             return { skipped: plan.pair.destination };
         }
         if (choice !== 'overwrite') {
-            throw new FsError(ErrorCode.CANCELLED, `${VERB[op]} cancelled: overwrite of "${plan.pair.destination}" was ${describeRefusal(ctx.inputResponses, key)}`, plan.pair.destination);
+            throw new FsError(ErrorCode.CANCELLED, `${VERB[op]} cancelled: overwrite of "${plan.pair.destination}" was ${describeRefusal(ctx, key)}`, plan.pair.destination);
         }
     }
     // TOCTOU check before any mutation: a destination that did not exist when
@@ -121,7 +106,7 @@ async function executeTransfer(op, plan, ctx, pendingSorted) {
     await ctx.fs.mkdir(dirname(plan.validDest), { recursive: true });
     if (op === 'move') {
         await performRenameWithFallback(plan.opSource, plan.validDest, ctx.fs, plan.pair.source);
-        ctx.log?.('info', `move: ${plan.pair.source} -> ${plan.pair.destination}`, 'move');
+        ctx.log('info', `move: ${plan.pair.source} -> ${plan.pair.destination}`, 'move');
     }
     else {
         await ctx.fs.cp(plan.opSource, plan.validDest, {
@@ -147,7 +132,7 @@ function pairFailure(pair, error) {
  * their `plan` and `execute` callbacks.
  */
 async function runTransfers(items, ctx, op, overwrite) {
-    const { results: planned, errors: planErrors } = await processInParallel(items, (pair) => planTransfer(op, pair, ctx.fs, overwrite), PARALLEL_CONCURRENCY, ctx.signal);
+    const { results: planned, errors: planErrors } = await processInParallel(items, (pair) => planTransfer(op, pair, ctx.fs, overwrite, ctx.signal), PARALLEL_CONCURRENCY, ctx.signal);
     // plan callbacks are fail-closed (they return { status: 'fail' }, never
     // throw), so planErrors should always be empty. Surface the first rather
     // than silently dropping the item if a future plan callback violates that.
@@ -186,12 +171,9 @@ async function runTransfers(items, ctx, op, overwrite) {
     if (pendingSorted.length > 0) {
         // Round 1 returns input_required; a retry whose verified state does not
         // bind this overwrite set throws (R9) via `pendingRoundTrip`.
-        const round = await pendingRoundTrip({
+        const round = await pendingRoundTrip(ctx, {
             op,
             pending: pendingSorted,
-            requestState: ctx.requestState,
-            clientCapabilities: ctx.clientCapabilities,
-            serverCtx: ctx.serverCtx,
             buildInputs: (dests) => dests.map((dest, i) => ({
                 key: confirmKey(i),
                 message: op === 'move'
@@ -207,7 +189,7 @@ async function runTransfers(items, ctx, op, overwrite) {
     let completed = 0;
     const tick = () => {
         completed += 1;
-        ctx.onProgress?.({ current: completed, total });
+        ctx.onProgress({ current: completed, total });
     };
     const { results: execResults, errors: execErrors } = await processInParallel(ready, async (readyPlan) => {
         try {
@@ -268,6 +250,46 @@ async function validateTransferSource(op, source, fs) {
         throw new FsError(ErrorCode.ACCESS_DENIED, `${VERB[op]} failed for ${source}`, source);
     }
 }
+/**
+ * A directory transfer may proceed only when every entry keeps the same
+ * sensitive-file status before and after relocation. Path-based rules
+ * (`secrets/**`, `.aws/credentials`) follow the path, not the file, so refuse
+ * any entry that would leave or enter the protected set. Walk the tree once
+ * before any mutation and fail the pair closed if anything changes status.
+ * Name-based rules need no help — they match after the move too.
+ */
+async function assertTreeHasNoProtectedEntries(op, realSource, requestedSource, validDest, fs, signal) {
+    let protectedCount = 0;
+    const entries = globEntries({
+        cwd: realSource,
+        pattern: '**/*',
+        includeHidden: true,
+        skipIgnored: false,
+        onlyFiles: false,
+        ...(signal ? { signal } : {}),
+    });
+    try {
+        for await (const entry of entries) {
+            signal?.throwIfAborted();
+            const entryRelativePath = relative(realSource, entry.path);
+            const requestedSourcePath = resolve(requestedSource, entryRelativePath);
+            const destinationPath = resolve(validDest, entryRelativePath);
+            const protectedBefore = fs.pathGuard.isSensitive(entry.path) || fs.pathGuard.isSensitive(requestedSourcePath);
+            const protectedAfter = fs.pathGuard.isSensitive(destinationPath);
+            if (protectedBefore !== protectedAfter) {
+                protectedCount++;
+                break;
+            }
+        }
+    }
+    catch (error) {
+        rethrowIfAborted(error);
+        throw new FsError(ErrorCode.ACCESS_DENIED, `${VERB[op]} refused: the directory could not be fully inspected for protected entries`, requestedSource, error);
+    }
+    if (protectedCount > 0) {
+        throw new FsError(ErrorCode.ACCESS_DENIED, `${VERB[op]} refused: the directory contains protected entries matching the sensitive-file policy; move or copy individual files instead`, requestedSource);
+    }
+}
 export async function performRenameWithFallback(validSource, validDest, fsOps, originalSource) {
     try {
         await fsOps.rename(validSource, validDest);
@@ -309,12 +331,7 @@ export const MOVE = defineTool({
     description: 'Move, rename, or copy files and directories, like mv or cp -r. ' +
         'Each destination is the full new path, not a folder to move into; missing parent directories are created.',
     input: MoveInputSchema,
-    output: MoveOutputSchema,
-    annotations: {
-        readOnlyHint: false,
-        destructiveHint: true,
-        openWorldHint: false,
-    },
+    readOnlyHint: false,
     progress: (args) => {
         const label = args.copy ? 'Copy' : 'Move';
         if (args.moves.length === 1) {

package/dist/tools/move.js.map

@@ -1 +1 @@
-{"version":3,"file":"move.js","sourceRoot":"","sources":["../../src/tools/move.ts"],"names":[],"mappings":"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","sourcesContent":["import type { InputRequiredResult } from '@modelcontextprotocol/server';\nimport { isInputRequiredResult } from '@modelcontextprotocol/server';\n\nimport { basename, dirname, resolve } from 'node:path';\n\nimport * as z from 'zod/v4';\n\nimport { processInParallel } from '../core/concurrency.ts';\nimport {\n  ErrorCode,\n  FsError,\n  isFsError,\n  isNodeError,\n  Problem,\n  rethrowIfAborted,\n} from '../core/errors.ts';\nimport { joinRoster, pathLabel } from '../core/fmt.ts';\nimport { destExists } from '../core/fs.ts';\nimport type { GuardedFileSystem } from '../core/fs.ts';\nimport {\n  confirmKey,\n  describeRefusal,\n  pendingRoundTrip,\n  readAcceptedChoice,\n} from '../core/input-required.ts';\nimport {\n  isPathInsideDirectory,\n  isSamePath,\n  normalizeCaseForComparison,\n  respellCaseOnlyTarget,\n} from '../core/path-utils.ts';\nimport { defaultFalseBoolean, PerFileErrorSchema, RequiredPath } from '../core/schema.ts';\nimport { PARALLEL_CONCURRENCY } from '../core/util.ts';\nimport type { ToolCtx } from './define.ts';\nimport { defineTool } from './define.ts';\n\nconst MoveItemSchema = z.strictObject({\n  source: RequiredPath.describe('Path of the file or directory to move or copy'),\n  destination: RequiredPath.describe('Destination path'),\n});\n\nconst MoveItemResultSchema = z.strictObject({\n  from: z.string().describe('Resolved absolute source path'),\n  to: z.string().describe('Resolved absolute destination path'),\n});\n\nconst MoveInputSchema = z.strictObject({\n  moves: z.array(MoveItemSchema).min(1).max(100).describe('Operations to perform (max 100)'),\n  copy: defaultFalseBoolean('Copy instead of move; sources are left in place'),\n  overwrite: defaultFalseBoolean(\n    'Copy mode only: overwrite existing destinations without confirmation',\n  ),\n});\n\nconst MoveFailureItemSchema = z.strictObject({\n  source: z.string().describe('Source path that could not be moved'),\n  destination: z.string().describe('Intended destination path for the failed move'),\n  error: PerFileErrorSchema,\n});\n\ntype MoveFailureItem = z.infer<typeof MoveFailureItemSchema>;\n\nconst MoveOutputSchema = z.strictObject({\n  moves: z.array(MoveItemResultSchema).describe('Successfully completed operations'),\n  failures: z\n    .array(MoveFailureItemSchema)\n    .optional()\n    .describe('Operations that failed with per-item error details'),\n  skipped: z\n    .array(z.string())\n    .optional()\n    .describe('Destinations skipped because the user chose Skip'),\n});\n\ntype MoveItemResult = z.infer<typeof MoveItemResultSchema>;\n\ntype PairOp = 'move' | 'copy';\n\nconst VERB: Readonly<Record<PairOp, string>> = { move: 'Move', copy: 'Copy' };\n\n/** A move or copy pre-checked up to the point a confirmation decision is needed. */\ninterface TransferPlan {\n  pair: { source: string; destination: string };\n  /**\n   * The path the mutation runs on: the link itself for a move, the resolved\n   * target for a copy. Every collision check uses the resolved source instead\n   * — see {@link validateTransferSource}.\n   */\n  opSource: string;\n  validDest: string;\n  /**\n   * A rename that only changes the destination's case. Move must perform it —\n   * it is real work — so it is exempt from the destination-exists checks that\n   * would otherwise read the source itself as an existing destination. Never\n   * true for a copy, which treats a case-only target as a self-copy and skips.\n   */\n  isCaseOnlyRename: boolean;\n  /** Whether the destination existed when planned (drives the TOCTOU guard). */\n  destExistedOriginally: boolean;\n  /** Destination exists and is not a self/case-only target → needs overwrite confirmation. */\n  pending: boolean;\n}\n\n/**\n * Phase 1 (no mutation): validate source and destination, reject self-targets\n * and transfers into a subdirectory of the source, and stat the destination to\n * decide whether this pair needs an overwrite confirmation. No `mkdir` happens\n * here — the old flow created the destination's parent before asking, which\n * mutated the filesystem before a confirmation; that now waits for phase 2 (R14).\n *\n * `overwrite` is copy-only — move has no confirmation bypass — so a move always\n * passes false.\n */\nasync function planTransfer(\n  op: PairOp,\n  pair: { source: string; destination: string },\n  fs: ToolCtx['fs'],\n  overwrite: boolean,\n): Promise<TransferPlanResult> {\n  let realSource: string;\n  let opSource: string;\n  let validDest: string;\n  try {\n    ({ realSource, opSource } = await validateTransferSource(op, pair.source, fs));\n    validDest = await fs.pathGuard.validatePathForWrite(pair.destination);\n  } catch (error) {\n    return { status: 'fail', failure: pairFailure(pair, error) };\n  }\n\n  // Comparisons run on the resolved source; only the fs call in phase 2 uses\n  // opSource. validatePathForWrite resolves the destination through a symlink\n  // too, so both sides of every check must be resolved to match.\n  const resolvedSource = resolve(realSource);\n  let resolvedDest = resolve(validDest);\n\n  // validatePathForWrite realpaths an existing destination to its on-disk\n  // spelling, so a case-only rename resolves to the source itself; re-spell\n  // it with the requested basename before deciding self vs. rename.\n  if (resolvedSource === resolvedDest) {\n    validDest = respellCaseOnlyTarget(pair.destination, validDest);\n    resolvedDest = resolve(validDest);\n  }\n\n  const isSelf = resolvedSource === resolvedDest;\n  const isCaseOnlyRename = !isSelf && isSamePath(resolvedSource, resolvedDest);\n\n  // A copy onto a case-only variant of its own source is the same file, so it\n  // is a no-op; the same rename is real work for move and proceeds.\n  if (isSelf || (isCaseOnlyRename && op === 'copy')) {\n    return { status: 'noop' };\n  }\n\n  if (!isCaseOnlyRename && isPathInsideDirectory(resolvedSource, resolvedDest)) {\n    return {\n      status: 'fail',\n      failure: pairFailure(\n        pair,\n        new FsError(\n          ErrorCode.INVALID_INPUT,\n          `Cannot ${op} a directory into its own subdirectory`,\n          pair.source,\n        ),\n      ),\n    };\n  }\n\n  const destExistedOriginally = !isCaseOnlyRename && (await destExists(fs, validDest, op));\n  const pending = destExistedOriginally && !overwrite;\n\n  return {\n    status: 'plan',\n    plan: { pair, opSource, validDest, isCaseOnlyRename, destExistedOriginally, pending },\n  };\n}\n\n/**\n * Phase 2 (mutation): confirm an overwrite if needed, TOCTOU-check the\n * destination, create its parent, then rename (with cross-device fallback) or\n * copy. A declined/missing confirmation throws `CANCELLED`, collected as a\n * per-pair failure by the caller. A destination that appeared between plan and\n * mutation (created during the confirmation gap) also fails closed.\n */\nasync function executeTransfer(\n  op: PairOp,\n  plan: TransferPlan,\n  ctx: Pick<ToolCtx, 'fs' | 'signal' | 'inputResponses' | 'log'>,\n  pendingSorted: readonly string[],\n): Promise<TransferExecResult> {\n  if (plan.pending) {\n    const key = confirmKey(pendingSorted.indexOf(plan.validDest));\n    const choice = readAcceptedChoice(ctx.inputResponses, key);\n    if (choice === 'skip') {\n      return { skipped: plan.pair.destination };\n    }\n    if (choice !== 'overwrite') {\n      throw new FsError(\n        ErrorCode.CANCELLED,\n        `${VERB[op]} cancelled: overwrite of \"${plan.pair.destination}\" was ${describeRefusal(ctx.inputResponses, key)}`,\n        plan.pair.destination,\n      );\n    }\n  }\n\n  // TOCTOU check before any mutation: a destination that did not exist when\n  // planned but exists now was created during the confirmation gap.\n  if (\n    !plan.isCaseOnlyRename &&\n    !plan.destExistedOriginally &&\n    (await destExists(ctx.fs, plan.validDest, op))\n  ) {\n    throw new FsError(\n      ErrorCode.CANCELLED,\n      `${VERB[op]} cancelled: destination \"${plan.pair.destination}\" was created during confirmation.`,\n      plan.pair.destination,\n    );\n  }\n\n  await ctx.fs.mkdir(dirname(plan.validDest), { recursive: true });\n\n  if (op === 'move') {\n    await performRenameWithFallback(plan.opSource, plan.validDest, ctx.fs, plan.pair.source);\n    ctx.log?.('info', `move: ${plan.pair.source} -> ${plan.pair.destination}`, 'move');\n  } else {\n    await ctx.fs.cp(plan.opSource, plan.validDest, {\n      recursive: true,\n      verbatimSymlinks: true,\n      preserveTimestamps: true,\n      force: true,\n    });\n  }\n  return { value: { from: plan.opSource, to: plan.validDest } };\n}\n\ntype TransferPlanResult =\n  | { status: 'fail'; failure: MoveFailureItem }\n  | { status: 'noop' }\n  | { status: 'plan'; plan: TransferPlan };\n\n/** A discriminated union, so the fold below narrows without a generic cast. */\ntype TransferExecResult = { readonly skipped: string } | { readonly value: MoveItemResult };\n\nfunction pairFailure(\n  pair: { source: string; destination: string },\n  error: unknown,\n): MoveFailureItem {\n  return {\n    source: pair.source,\n    destination: pair.destination,\n    error: Problem.fromUnknown(error, ErrorCode.UNKNOWN, pair.source),\n  };\n}\n\n/**\n * The source→destination sibling of `runOverPaths`: plan every pair, fail closed\n * on a duplicated destination, round-trip the overwrite confirmations as one\n * set, then execute what survived in parallel. `copy` and `move` differ only in\n * their `plan` and `execute` callbacks.\n */\nasync function runTransfers(\n  items: readonly z.infer<typeof MoveItemSchema>[],\n  ctx: ToolCtx,\n  op: PairOp,\n  overwrite: boolean,\n): Promise<\n  | { results: MoveItemResult[]; skipped: string[]; failures: MoveFailureItem[] }\n  | InputRequiredResult\n> {\n  const { results: planned, errors: planErrors } = await processInParallel(\n    items,\n    (pair) => planTransfer(op, pair, ctx.fs, overwrite),\n    PARALLEL_CONCURRENCY,\n    ctx.signal,\n  );\n  // plan callbacks are fail-closed (they return { status: 'fail' }, never\n  // throw), so planErrors should always be empty. Surface the first rather\n  // than silently dropping the item if a future plan callback violates that.\n  const firstPlanError = planErrors[0];\n  if (firstPlanError) throw firstPlanError.error;\n\n  const failures: MoveFailureItem[] = [];\n  const candidates: TransferPlan[] = [];\n  for (const { value } of planned) {\n    if (value.status === 'fail') failures.push(value.failure);\n    else if (value.status === 'plan') candidates.push(value.plan);\n    // 'noop' (self-copy / self-move) is silently skipped.\n  }\n\n  // Two sources targeting the same destination in one batch would otherwise\n  // collapse to a single shared overwrite confirmation and let the second\n  // one silently clobber the first's freshly-written content. Fail closed:\n  // only the first plan per destination proceeds; later ones targeting the\n  // same destination are reported as a per-item failure.\n  const seenDest = new Set<string>();\n  const ready: TransferPlan[] = [];\n  for (const candidate of candidates) {\n    const destKey = normalizeCaseForComparison(candidate.validDest);\n    if (seenDest.has(destKey)) {\n      failures.push(\n        pairFailure(\n          candidate.pair,\n          new FsError(\n            ErrorCode.INVALID_INPUT,\n            `${VERB[op]} cancelled: another entry in this batch already targets destination \"${candidate.pair.destination}\"`,\n            candidate.pair.destination,\n          ),\n        ),\n      );\n      continue;\n    }\n    seenDest.add(destKey);\n    ready.push(candidate);\n  }\n\n  const pendingSorted = ready\n    .filter((p) => p.pending)\n    .map((p) => p.validDest)\n    .sort();\n  if (pendingSorted.length > 0) {\n    // Round 1 returns input_required; a retry whose verified state does not\n    // bind this overwrite set throws (R9) via `pendingRoundTrip`.\n    const round = await pendingRoundTrip({\n      op,\n      pending: pendingSorted,\n      requestState: ctx.requestState,\n      clientCapabilities: ctx.clientCapabilities,\n      serverCtx: ctx.serverCtx,\n      buildInputs: (dests) =>\n        dests.map((dest, i) => ({\n          key: confirmKey(i),\n          message:\n            op === 'move'\n              ? `\"${dest}\" already exists. Overwrite it?`\n              : `Destination \"${dest}\" already exists. Overwrite it?`,\n          choices: ['overwrite', 'skip'],\n        })),\n    });\n    if (round !== undefined) return round;\n  }\n\n  const total = ready.length;\n  let completed = 0;\n  const tick = (): void => {\n    completed += 1;\n    ctx.onProgress?.({ current: completed, total });\n  };\n  const { results: execResults, errors: execErrors } = await processInParallel(\n    ready,\n    async (readyPlan) => {\n      try {\n        return await executeTransfer(op, readyPlan, ctx, pendingSorted);\n      } finally {\n        tick();\n      }\n    },\n    PARALLEL_CONCURRENCY,\n    ctx.signal,\n  );\n\n  for (const { error, index } of execErrors) {\n    rethrowIfAborted(error);\n    const failed = ready[index];\n    if (failed) failures.push(pairFailure(failed.pair, error));\n  }\n\n  const results: MoveItemResult[] = [];\n  const skipped: string[] = [];\n  for (const { value } of execResults) {\n    if ('skipped' in value) skipped.push(value.skipped);\n    else results.push(value.value);\n  }\n\n  return { results, skipped, failures };\n}\n\nfunction buildSummary(\n  verb: 'move' | 'copy',\n  results: readonly MoveItemResult[],\n  failures: readonly MoveFailureItem[],\n  skipped: readonly string[],\n): string {\n  const failCount = failures.length;\n  // Name each pair. \"move: 2 items\" left the caller to open structuredContent\n  // to learn which two, and a partial failure was unreadable without it.\n  // Skipped destinations are an outcome the user chose, not a failure — name\n  // them, or an all-skipped call reads as \"copy: nothing\".\n  const tokens = [\n    ...results.map((r) => `${pathLabel(r.from)} → ${pathLabel(r.to)}`),\n    ...skipped.map((dest) => `${pathLabel(dest)} SKIPPED`),\n  ];\n  const parts = [`${verb}: ${joinRoster(tokens) || 'nothing'}`];\n  if (failCount > 0) parts.push(`${String(failCount)} failed`);\n  return parts.join(' · ');\n}\n\ninterface TransferSource {\n  /** Symlink resolved — the identity used for every same-target comparison. */\n  realSource: string;\n  /** The path the mutation runs on: symlink preserved for move, resolved for copy. */\n  opSource: string;\n}\n\n/**\n * A move needs two views of its source. Renaming must operate on the link\n * itself, or moving a symlink would rename the file it points at and leave the\n * link dangling. Every collision check must instead compare the resolved\n * target, or a link moved onto itself (or onto its own target) reads as a real\n * move and renames the link over that target, destroying it. A copy reads\n * through the link, so both views are the resolved one.\n */\nasync function validateTransferSource(\n  op: PairOp,\n  source: string,\n  fs: ToolCtx['fs'],\n): Promise<TransferSource> {\n  try {\n    const realSource = await fs.pathGuard.validateExistingPath(source);\n    const opSource = op === 'move' ? await fs.pathGuard.validatePathForDelete(source) : realSource;\n    return { realSource, opSource };\n  } catch (error) {\n    if (isFsError(error)) throw error;\n    throw new FsError(ErrorCode.ACCESS_DENIED, `${VERB[op]} failed for ${source}`, source);\n  }\n}\n\nexport async function performRenameWithFallback(\n  validSource: string,\n  validDest: string,\n  fsOps: Pick<GuardedFileSystem, 'rename' | 'cp' | 'rm'>,\n  originalSource: string,\n): Promise<void> {\n  try {\n    await fsOps.rename(validSource, validDest);\n  } catch (error: unknown) {\n    rethrowIfAborted(error);\n\n    if (!isNodeError(error) || error.code !== 'EXDEV') {\n      throw error;\n    }\n\n    // EXDEV: cross-device rename. Copy then remove, preserving symlinks and\n    // timestamps so link semantics survive the move.\n    let copied = false;\n    try {\n      await fsOps.cp(validSource, validDest, {\n        recursive: true,\n        verbatimSymlinks: true,\n        preserveTimestamps: true,\n      });\n      copied = true;\n      await fsOps.rm(validSource, { recursive: true, force: true });\n    } catch (copyOrRemoveError) {\n      rethrowIfAborted(copyOrRemoveError);\n      if (copied) {\n        // cp succeeded but rm failed: the destination already holds a complete\n        // copy and the source remains. Surface the rm error as the cause so the\n        // caller can recover (clean up the duplicate) instead of a silent generic\n        // failure that hides the partial completion.\n        const baseProblem = Problem.fromUnknown(\n          copyOrRemoveError,\n          ErrorCode.UNKNOWN,\n          originalSource,\n        );\n        throw new FsError(\n          baseProblem.code,\n          `Cross-device move of ${originalSource}: copy succeeded but source removal failed (destination holds a copy): ${baseProblem.message}`,\n          originalSource,\n          copyOrRemoveError,\n        );\n      }\n      throw copyOrRemoveError;\n    }\n  }\n}\n\nexport const MOVE = defineTool({\n  name: 'move',\n  title: 'Move or Copy Files',\n  description:\n    'Move, rename, or copy files and directories, like mv or cp -r. ' +\n    'Each destination is the full new path, not a folder to move into; missing parent directories are created.',\n  input: MoveInputSchema,\n  output: MoveOutputSchema,\n  annotations: {\n    readOnlyHint: false,\n    destructiveHint: true,\n    openWorldHint: false,\n  },\n  progress: (args) => {\n    const label = args.copy ? 'Copy' : 'Move';\n    if (args.moves.length === 1) {\n      const move = args.moves[0];\n      return {\n        label,\n        subject: `${basename(move?.source ?? '')} → ${basename(move?.destination ?? '')}`,\n      };\n    }\n    return { label, subject: `${String(args.moves.length)} files` };\n  },\n  accessPaths: (args) => args.moves.flatMap((m) => [m.source, m.destination]),\n  run: async (args, ctx) => {\n    const op: PairOp = args.copy ? 'copy' : 'move';\n    // `overwrite` is copy-only; move has no confirmation bypass.\n    const outcome = await runTransfers(args.moves, ctx, op, args.copy && args.overwrite);\n    // input_required is a return value, not a completed call: surface it\n    // verbatim so the executor short-circuits before building a CallToolResult.\n    if (isInputRequiredResult(outcome)) return outcome;\n    const { results, skipped, failures } = outcome;\n    return {\n      structured: {\n        moves: results,\n        ...(failures.length > 0 ? { failures } : {}),\n        ...(skipped.length > 0 ? { skipped } : {}),\n      },\n      text: buildSummary(op, results, failures, skipped),\n      // Every requested pair failed: no move, no copy, no user-chosen skip - the\n      // call did nothing. A skip is work the caller asked for, so it counts.\n      isError: failures.length > 0 && results.length + skipped.length === 0,\n    };\n  },\n});\n"]}
+{"version":3,"file":"move.js","sourceRoot":"","sources":["../../src/tools/move.ts"],"names":[],"mappings":"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","sourcesContent":["import type { InputRequiredResult } from '@modelcontextprotocol/server';\nimport { isInputRequiredResult } from '@modelcontextprotocol/server';\n\nimport { stat } from 'node:fs/promises';\nimport { basename, dirname, relative, resolve } from 'node:path';\n\nimport * as z from 'zod/v4';\n\nimport { processInParallel } from '../core/concurrency.ts';\nimport {\n  ErrorCode,\n  FsError,\n  isFsError,\n  isNodeError,\n  Problem,\n  rethrowIfAborted,\n} from '../core/errors.ts';\nimport { joinRoster, pathLabel } from '../core/fmt.ts';\nimport { destExists } from '../core/fs.ts';\nimport type { GuardedFileSystem } from '../core/fs.ts';\nimport { globEntries } from '../core/glob.ts';\nimport {\n  confirmKey,\n  describeRefusal,\n  pendingRoundTrip,\n  readAcceptedChoice,\n} from '../core/input-required.ts';\nimport {\n  isPathInsideDirectory,\n  isSamePath,\n  normalizeCaseForComparison,\n  respellCaseOnlyTarget,\n} from '../core/path-utils.ts';\nimport { defaultFalseBoolean, RequiredPath } from '../core/schema.ts';\nimport { PARALLEL_CONCURRENCY } from '../core/util.ts';\nimport type { ToolCtx } from './define.ts';\nimport { defineTool } from './define.ts';\n\nconst MoveItemSchema = z.strictObject({\n  source: RequiredPath.describe('Path of the file or directory to move or copy'),\n  destination: RequiredPath.describe('Destination path'),\n});\n\ninterface MoveItemResult {\n  from: string;\n  to: string;\n}\n\nconst MoveInputSchema = z.strictObject({\n  moves: z.array(MoveItemSchema).min(1).max(100).describe('Operations to perform (max 100)'),\n  copy: defaultFalseBoolean('Copy instead of move; sources are left in place'),\n  overwrite: defaultFalseBoolean(\n    'Copy mode only: overwrite existing destinations without confirmation',\n  ),\n});\n\ninterface MoveFailureItem {\n  source: string;\n  destination: string;\n  error: Problem;\n}\n\ninterface MoveOutput {\n  moves: MoveItemResult[];\n  failures?: MoveFailureItem[];\n  skipped?: string[];\n}\n\ntype PairOp = 'move' | 'copy';\n\nconst VERB: Readonly<Record<PairOp, string>> = { move: 'Move', copy: 'Copy' };\n\n/** A move or copy pre-checked up to the point a confirmation decision is needed. */\ninterface TransferPlan {\n  pair: { source: string; destination: string };\n  /**\n   * The path the mutation runs on: the link itself for a move, the resolved\n   * target for a copy. Every collision check uses the resolved source instead\n   * — see {@link validateTransferSource}.\n   */\n  opSource: string;\n  validDest: string;\n  /**\n   * A rename that only changes the destination's case. Move must perform it —\n   * it is real work — so it is exempt from the destination-exists checks that\n   * would otherwise read the source itself as an existing destination. Never\n   * true for a copy, which treats a case-only target as a self-copy and skips.\n   */\n  isCaseOnlyRename: boolean;\n  /** Whether the destination existed when planned (drives the TOCTOU guard). */\n  destExistedOriginally: boolean;\n  /** Destination exists and is not a self/case-only target → needs overwrite confirmation. */\n  pending: boolean;\n}\n\n/**\n * Phase 1 (no mutation): validate source and destination, reject self-targets\n * and transfers into a subdirectory of the source, and stat the destination to\n * decide whether this pair needs an overwrite confirmation. No `mkdir` happens\n * here — the old flow created the destination's parent before asking, which\n * mutated the filesystem before a confirmation; that now waits for phase 2 (R14).\n *\n * `overwrite` is copy-only — move has no confirmation bypass — so a move always\n * passes false.\n */\nasync function planTransfer(\n  op: PairOp,\n  pair: { source: string; destination: string },\n  fs: ToolCtx['fs'],\n  overwrite: boolean,\n  signal: AbortSignal | undefined,\n): Promise<TransferPlanResult> {\n  let realSource: string;\n  let opSource: string;\n  let validDest: string;\n  try {\n    ({ realSource, opSource } = await validateTransferSource(op, pair.source, fs));\n    validDest = await fs.pathGuard.validatePathForWrite(pair.destination);\n    if (!(op === 'move' && opSource !== realSource) && (await stat(realSource)).isDirectory()) {\n      await assertTreeHasNoProtectedEntries(op, realSource, pair.source, validDest, fs, signal);\n    }\n  } catch (error) {\n    return { status: 'fail', failure: pairFailure(pair, error) };\n  }\n\n  // Comparisons run on the resolved source; only the fs call in phase 2 uses\n  // opSource. validatePathForWrite resolves the destination through a symlink\n  // too, so both sides of every check must be resolved to match.\n  const resolvedSource = resolve(realSource);\n  let resolvedDest = resolve(validDest);\n\n  // validatePathForWrite realpaths an existing destination to its on-disk\n  // spelling, so a case-only rename resolves to the source itself; re-spell\n  // it with the requested basename before deciding self vs. rename.\n  if (resolvedSource === resolvedDest) {\n    validDest = respellCaseOnlyTarget(pair.destination, validDest);\n    resolvedDest = resolve(validDest);\n  }\n\n  const isSelf = resolvedSource === resolvedDest;\n  const isCaseOnlyRename = !isSelf && isSamePath(resolvedSource, resolvedDest);\n\n  // A copy onto a case-only variant of its own source is the same file, so it\n  // is a no-op; the same rename is real work for move and proceeds.\n  if (isSelf || (isCaseOnlyRename && op === 'copy')) {\n    return { status: 'noop' };\n  }\n\n  if (!isCaseOnlyRename && isPathInsideDirectory(resolvedSource, resolvedDest)) {\n    return {\n      status: 'fail',\n      failure: pairFailure(\n        pair,\n        new FsError(\n          ErrorCode.INVALID_INPUT,\n          `Cannot ${op} a directory into its own subdirectory`,\n          pair.source,\n        ),\n      ),\n    };\n  }\n\n  const destExistedOriginally = !isCaseOnlyRename && (await destExists(fs, validDest, op));\n  const pending = destExistedOriginally && !overwrite;\n\n  return {\n    status: 'plan',\n    plan: { pair, opSource, validDest, isCaseOnlyRename, destExistedOriginally, pending },\n  };\n}\n\n/**\n * Phase 2 (mutation): confirm an overwrite if needed, TOCTOU-check the\n * destination, create its parent, then rename (with cross-device fallback) or\n * copy. A declined/missing confirmation throws `CANCELLED`, collected as a\n * per-pair failure by the caller. A destination that appeared between plan and\n * mutation (created during the confirmation gap) also fails closed.\n */\nasync function executeTransfer(\n  op: PairOp,\n  plan: TransferPlan,\n  ctx: Pick<ToolCtx, 'fs' | 'signal' | 'inputResponses' | 'droppedInputResponseKeys' | 'log'>,\n  pendingSorted: readonly string[],\n): Promise<TransferExecResult> {\n  if (plan.pending) {\n    const key = confirmKey(pendingSorted.indexOf(plan.validDest));\n    const choice = readAcceptedChoice(ctx.inputResponses, key);\n    if (choice === 'skip') {\n      return { skipped: plan.pair.destination };\n    }\n    if (choice !== 'overwrite') {\n      throw new FsError(\n        ErrorCode.CANCELLED,\n        `${VERB[op]} cancelled: overwrite of \"${plan.pair.destination}\" was ${describeRefusal(ctx, key)}`,\n        plan.pair.destination,\n      );\n    }\n  }\n\n  // TOCTOU check before any mutation: a destination that did not exist when\n  // planned but exists now was created during the confirmation gap.\n  if (\n    !plan.isCaseOnlyRename &&\n    !plan.destExistedOriginally &&\n    (await destExists(ctx.fs, plan.validDest, op))\n  ) {\n    throw new FsError(\n      ErrorCode.CANCELLED,\n      `${VERB[op]} cancelled: destination \"${plan.pair.destination}\" was created during confirmation.`,\n      plan.pair.destination,\n    );\n  }\n\n  await ctx.fs.mkdir(dirname(plan.validDest), { recursive: true });\n\n  if (op === 'move') {\n    await performRenameWithFallback(plan.opSource, plan.validDest, ctx.fs, plan.pair.source);\n    ctx.log('info', `move: ${plan.pair.source} -> ${plan.pair.destination}`, 'move');\n  } else {\n    await ctx.fs.cp(plan.opSource, plan.validDest, {\n      recursive: true,\n      verbatimSymlinks: true,\n      preserveTimestamps: true,\n      force: true,\n    });\n  }\n  return { value: { from: plan.opSource, to: plan.validDest } };\n}\n\ntype TransferPlanResult =\n  | { status: 'fail'; failure: MoveFailureItem }\n  | { status: 'noop' }\n  | { status: 'plan'; plan: TransferPlan };\n\n/** A discriminated union, so the fold below narrows without a generic cast. */\ntype TransferExecResult = { readonly skipped: string } | { readonly value: MoveItemResult };\n\nfunction pairFailure(\n  pair: { source: string; destination: string },\n  error: unknown,\n): MoveFailureItem {\n  return {\n    source: pair.source,\n    destination: pair.destination,\n    error: Problem.fromUnknown(error, ErrorCode.UNKNOWN, pair.source),\n  };\n}\n\n/**\n * The source→destination sibling of `runOverPaths`: plan every pair, fail closed\n * on a duplicated destination, round-trip the overwrite confirmations as one\n * set, then execute what survived in parallel. `copy` and `move` differ only in\n * their `plan` and `execute` callbacks.\n */\nasync function runTransfers(\n  items: readonly z.infer<typeof MoveItemSchema>[],\n  ctx: ToolCtx,\n  op: PairOp,\n  overwrite: boolean,\n): Promise<\n  | { results: MoveItemResult[]; skipped: string[]; failures: MoveFailureItem[] }\n  | InputRequiredResult\n> {\n  const { results: planned, errors: planErrors } = await processInParallel(\n    items,\n    (pair) => planTransfer(op, pair, ctx.fs, overwrite, ctx.signal),\n    PARALLEL_CONCURRENCY,\n    ctx.signal,\n  );\n  // plan callbacks are fail-closed (they return { status: 'fail' }, never\n  // throw), so planErrors should always be empty. Surface the first rather\n  // than silently dropping the item if a future plan callback violates that.\n  const firstPlanError = planErrors[0];\n  if (firstPlanError) throw firstPlanError.error;\n\n  const failures: MoveFailureItem[] = [];\n  const candidates: TransferPlan[] = [];\n  for (const { value } of planned) {\n    if (value.status === 'fail') failures.push(value.failure);\n    else if (value.status === 'plan') candidates.push(value.plan);\n    // 'noop' (self-copy / self-move) is silently skipped.\n  }\n\n  // Two sources targeting the same destination in one batch would otherwise\n  // collapse to a single shared overwrite confirmation and let the second\n  // one silently clobber the first's freshly-written content. Fail closed:\n  // only the first plan per destination proceeds; later ones targeting the\n  // same destination are reported as a per-item failure.\n  const seenDest = new Set<string>();\n  const ready: TransferPlan[] = [];\n  for (const candidate of candidates) {\n    const destKey = normalizeCaseForComparison(candidate.validDest);\n    if (seenDest.has(destKey)) {\n      failures.push(\n        pairFailure(\n          candidate.pair,\n          new FsError(\n            ErrorCode.INVALID_INPUT,\n            `${VERB[op]} cancelled: another entry in this batch already targets destination \"${candidate.pair.destination}\"`,\n            candidate.pair.destination,\n          ),\n        ),\n      );\n      continue;\n    }\n    seenDest.add(destKey);\n    ready.push(candidate);\n  }\n\n  const pendingSorted = ready\n    .filter((p) => p.pending)\n    .map((p) => p.validDest)\n    .sort();\n  if (pendingSorted.length > 0) {\n    // Round 1 returns input_required; a retry whose verified state does not\n    // bind this overwrite set throws (R9) via `pendingRoundTrip`.\n    const round = await pendingRoundTrip(ctx, {\n      op,\n      pending: pendingSorted,\n      buildInputs: (dests) =>\n        dests.map((dest, i) => ({\n          key: confirmKey(i),\n          message:\n            op === 'move'\n              ? `\"${dest}\" already exists. Overwrite it?`\n              : `Destination \"${dest}\" already exists. Overwrite it?`,\n          choices: ['overwrite', 'skip'],\n        })),\n    });\n    if (round !== undefined) return round;\n  }\n\n  const total = ready.length;\n  let completed = 0;\n  const tick = (): void => {\n    completed += 1;\n    ctx.onProgress({ current: completed, total });\n  };\n  const { results: execResults, errors: execErrors } = await processInParallel(\n    ready,\n    async (readyPlan) => {\n      try {\n        return await executeTransfer(op, readyPlan, ctx, pendingSorted);\n      } finally {\n        tick();\n      }\n    },\n    PARALLEL_CONCURRENCY,\n    ctx.signal,\n  );\n\n  for (const { error, index } of execErrors) {\n    rethrowIfAborted(error);\n    const failed = ready[index];\n    if (failed) failures.push(pairFailure(failed.pair, error));\n  }\n\n  const results: MoveItemResult[] = [];\n  const skipped: string[] = [];\n  for (const { value } of execResults) {\n    if ('skipped' in value) skipped.push(value.skipped);\n    else results.push(value.value);\n  }\n\n  return { results, skipped, failures };\n}\n\nfunction buildSummary(\n  verb: 'move' | 'copy',\n  results: readonly MoveItemResult[],\n  failures: readonly MoveFailureItem[],\n  skipped: readonly string[],\n): string {\n  const failCount = failures.length;\n  // Name each pair. \"move: 2 items\" left the caller to open structuredContent\n  // to learn which two, and a partial failure was unreadable without it.\n  // Skipped destinations are an outcome the user chose, not a failure — name\n  // them, or an all-skipped call reads as \"copy: nothing\".\n  const tokens = [\n    ...results.map((r) => `${pathLabel(r.from)} → ${pathLabel(r.to)}`),\n    ...skipped.map((dest) => `${pathLabel(dest)} SKIPPED`),\n  ];\n  const parts = [`${verb}: ${joinRoster(tokens) || 'nothing'}`];\n  if (failCount > 0) parts.push(`${String(failCount)} failed`);\n  return parts.join(' · ');\n}\n\ninterface TransferSource {\n  /** Symlink resolved — the identity used for every same-target comparison. */\n  realSource: string;\n  /** The path the mutation runs on: symlink preserved for move, resolved for copy. */\n  opSource: string;\n}\n\n/**\n * A move needs two views of its source. Renaming must operate on the link\n * itself, or moving a symlink would rename the file it points at and leave the\n * link dangling. Every collision check must instead compare the resolved\n * target, or a link moved onto itself (or onto its own target) reads as a real\n * move and renames the link over that target, destroying it. A copy reads\n * through the link, so both views are the resolved one.\n */\nasync function validateTransferSource(\n  op: PairOp,\n  source: string,\n  fs: ToolCtx['fs'],\n): Promise<TransferSource> {\n  try {\n    const realSource = await fs.pathGuard.validateExistingPath(source);\n    const opSource = op === 'move' ? await fs.pathGuard.validatePathForDelete(source) : realSource;\n    return { realSource, opSource };\n  } catch (error) {\n    if (isFsError(error)) throw error;\n    throw new FsError(ErrorCode.ACCESS_DENIED, `${VERB[op]} failed for ${source}`, source);\n  }\n}\n\n/**\n * A directory transfer may proceed only when every entry keeps the same\n * sensitive-file status before and after relocation. Path-based rules\n * (`secrets/**`, `.aws/credentials`) follow the path, not the file, so refuse\n * any entry that would leave or enter the protected set. Walk the tree once\n * before any mutation and fail the pair closed if anything changes status.\n * Name-based rules need no help — they match after the move too.\n */\nasync function assertTreeHasNoProtectedEntries(\n  op: PairOp,\n  realSource: string,\n  requestedSource: string,\n  validDest: string,\n  fs: ToolCtx['fs'],\n  signal: AbortSignal | undefined,\n): Promise<void> {\n  let protectedCount = 0;\n  const entries = globEntries({\n    cwd: realSource,\n    pattern: '**/*',\n    includeHidden: true,\n    skipIgnored: false,\n    onlyFiles: false,\n    ...(signal ? { signal } : {}),\n  });\n  try {\n    for await (const entry of entries) {\n      signal?.throwIfAborted();\n      const entryRelativePath = relative(realSource, entry.path);\n      const requestedSourcePath = resolve(requestedSource, entryRelativePath);\n      const destinationPath = resolve(validDest, entryRelativePath);\n      const protectedBefore =\n        fs.pathGuard.isSensitive(entry.path) || fs.pathGuard.isSensitive(requestedSourcePath);\n      const protectedAfter = fs.pathGuard.isSensitive(destinationPath);\n      if (protectedBefore !== protectedAfter) {\n        protectedCount++;\n        break;\n      }\n    }\n  } catch (error) {\n    rethrowIfAborted(error);\n    throw new FsError(\n      ErrorCode.ACCESS_DENIED,\n      `${VERB[op]} refused: the directory could not be fully inspected for protected entries`,\n      requestedSource,\n      error,\n    );\n  }\n  if (protectedCount > 0) {\n    throw new FsError(\n      ErrorCode.ACCESS_DENIED,\n      `${VERB[op]} refused: the directory contains protected entries matching the sensitive-file policy; move or copy individual files instead`,\n      requestedSource,\n    );\n  }\n}\n\nexport async function performRenameWithFallback(\n  validSource: string,\n  validDest: string,\n  fsOps: Pick<GuardedFileSystem, 'rename' | 'cp' | 'rm'>,\n  originalSource: string,\n): Promise<void> {\n  try {\n    await fsOps.rename(validSource, validDest);\n  } catch (error: unknown) {\n    rethrowIfAborted(error);\n\n    if (!isNodeError(error) || error.code !== 'EXDEV') {\n      throw error;\n    }\n\n    // EXDEV: cross-device rename. Copy then remove, preserving symlinks and\n    // timestamps so link semantics survive the move.\n    let copied = false;\n    try {\n      await fsOps.cp(validSource, validDest, {\n        recursive: true,\n        verbatimSymlinks: true,\n        preserveTimestamps: true,\n      });\n      copied = true;\n      await fsOps.rm(validSource, { recursive: true, force: true });\n    } catch (copyOrRemoveError) {\n      rethrowIfAborted(copyOrRemoveError);\n      if (copied) {\n        // cp succeeded but rm failed: the destination already holds a complete\n        // copy and the source remains. Surface the rm error as the cause so the\n        // caller can recover (clean up the duplicate) instead of a silent generic\n        // failure that hides the partial completion.\n        const baseProblem = Problem.fromUnknown(\n          copyOrRemoveError,\n          ErrorCode.UNKNOWN,\n          originalSource,\n        );\n        throw new FsError(\n          baseProblem.code,\n          `Cross-device move of ${originalSource}: copy succeeded but source removal failed (destination holds a copy): ${baseProblem.message}`,\n          originalSource,\n          copyOrRemoveError,\n        );\n      }\n      throw copyOrRemoveError;\n    }\n  }\n}\n\nexport const MOVE = defineTool<typeof MoveInputSchema, MoveOutput>({\n  name: 'move',\n  title: 'Move or Copy Files',\n  description:\n    'Move, rename, or copy files and directories, like mv or cp -r. ' +\n    'Each destination is the full new path, not a folder to move into; missing parent directories are created.',\n  input: MoveInputSchema,\n  readOnlyHint: false,\n  progress: (args) => {\n    const label = args.copy ? 'Copy' : 'Move';\n    if (args.moves.length === 1) {\n      const move = args.moves[0];\n      return {\n        label,\n        subject: `${basename(move?.source ?? '')} → ${basename(move?.destination ?? '')}`,\n      };\n    }\n    return { label, subject: `${String(args.moves.length)} files` };\n  },\n  accessPaths: (args) => args.moves.flatMap((m) => [m.source, m.destination]),\n  run: async (args, ctx) => {\n    const op: PairOp = args.copy ? 'copy' : 'move';\n    // `overwrite` is copy-only; move has no confirmation bypass.\n    const outcome = await runTransfers(args.moves, ctx, op, args.copy && args.overwrite);\n    // input_required is a return value, not a completed call: surface it\n    // verbatim so the executor short-circuits before building a CallToolResult.\n    if (isInputRequiredResult(outcome)) return outcome;\n    const { results, skipped, failures } = outcome;\n    return {\n      structured: {\n        moves: results,\n        ...(failures.length > 0 ? { failures } : {}),\n        ...(skipped.length > 0 ? { skipped } : {}),\n      },\n      text: buildSummary(op, results, failures, skipped),\n      // Every requested pair failed: no move, no copy, no user-chosen skip - the\n      // call did nothing. A skip is work the caller asked for, so it counts.\n      isError: failures.length > 0 && results.length + skipped.length === 0,\n    };\n  },\n});\n"]}

package/dist/tools/patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../src/tools/patch.ts"],"names":[],"mappings":"AA6DA,eAAO,MAAM,KAAK,mCA2HhB,CAAC"}
+{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../src/tools/patch.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,KAAK,mCAsHhB,CAAC"}

package/dist/tools/patch.js

@@ -4,7 +4,7 @@ import { applyPatch, parsePatch } from 'diff';
 import { ErrorCode, FsError } from "../core/errors.js";
 import { buildWrittenFileMeta } from "../core/file-uri.js";
 import { countLines } from "../core/read.js";
-import { defaultFalseBoolean, FileKind, IsoDateTime, NonNegInt, RequiredPath, } from "../core/schema.js";
+import { defaultFalseBoolean, RequiredPath } from "../core/schema.js";
 import { defineTool } from "./define.js";
 const PatchInputSchema = z.strictObject({
     path: RequiredPath.describe('File to apply the diff to'),
@@ -14,21 +14,6 @@ const PatchInputSchema = z.strictObject({
         .describe('Single-file unified diff to apply (as produced by the diff tool or edit dry-run)'),
     dryRun: defaultFalseBoolean('Preview the result without writing (default: false)'),
 });
-const PatchOutputSchema = z.strictObject({
-    path: z.string().describe('Resolved absolute path of the patched file'),
-    size: NonNegInt.describe('File size in bytes after patching'),
-    lineCount: NonNegInt.describe('Number of lines in the file after patching'),
-    mimeType: z.string().describe('Detected MIME type of the file'),
-    kind: FileKind.describe('Broad file kind: text, binary, image, audio, or pdf'),
-    resourceUri: z
-        .string()
-        .optional()
-        .describe('Resource URI pointing to the patched file content; omitted on dryRun or when the resulting file exceeds the text-size cap, which the store would reject'),
-    modified: IsoDateTime.describe('Last modification timestamp after patching (ISO 8601 UTC)'),
-    linesAdded: NonNegInt.describe('Number of lines added by the patch'),
-    linesRemoved: NonNegInt.describe('Number of lines removed by the patch'),
-    diff: z.string().optional().describe('Unified diff preview (present only in dryRun mode)'),
-});
 // Hunk lines are the raw unified lines with their +/-/ leading prefix (no
 // +++/--- file headers inside hunks), so the first char is a reliable marker.
 function countAddedRemoved(parsedPatch) {
@@ -51,12 +36,7 @@ export const PATCH = defineTool({
         'Nothing is written unless every hunk applies in file order with exactly matching context; ' +
         'hunks are found by their context, so start line numbers may be off.',
     input: PatchInputSchema,
-    output: PatchOutputSchema,
-    annotations: {
-        readOnlyHint: false,
-        destructiveHint: true,
-        openWorldHint: false,
-    },
+    readOnlyHint: false,
     progress: (args) => ({
         label: args.dryRun ? 'Patch [dry run]' : 'Patch',
         subject: basename(args.path),
@@ -115,7 +95,7 @@ export const PATCH = defineTool({
         const summaryText = `patch: ${basename(args.path)} +${String(linesAdded)} -${String(linesRemoved)}`;
         if (!args.dryRun) {
             await ctx.fs.writeFile(args.path, patched, { signal: ctx.signal });
-            ctx.log?.('info', `patch: ${args.path} (+${linesAdded}/-${linesRemoved})`, 'patch');
+            ctx.log('info', `patch: ${args.path} (+${linesAdded}/-${linesRemoved})`, 'patch');
         }
         // `modified` is read from a post-write stat and is advisory: under a concurrent
         // writer it may reflect that writer's mtime while `size`/content come from this
@@ -126,8 +106,8 @@ export const PATCH = defineTool({
         const meta = buildWrittenFileMeta({
             validPath,
             content: patched,
-            resourceStore: ctx.resourceStore,
             dryRun: args.dryRun,
+            lastModified: fileStats.mtime.toISOString(),
         });
         return {
             structured: {

package/dist/tools/patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/tools/patch.ts"],"names":[],"mappings":"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","sourcesContent":["import { basename } from 'node:path';\n\nimport * as z from 'zod/v4';\nimport { applyPatch, parsePatch } from 'diff';\n\nimport { ErrorCode, FsError } from '../core/errors.ts';\nimport { buildWrittenFileMeta } from '../core/file-uri.ts';\nimport { countLines } from '../core/read.ts';\nimport {\n  defaultFalseBoolean,\n  FileKind,\n  IsoDateTime,\n  NonNegInt,\n  RequiredPath,\n} from '../core/schema.ts';\nimport { defineTool } from './define.ts';\n\nconst PatchInputSchema = z.strictObject({\n  path: RequiredPath.describe('File to apply the diff to'),\n  diff: z\n    .string()\n    .min(1)\n    .describe('Single-file unified diff to apply (as produced by the diff tool or edit dry-run)'),\n  dryRun: defaultFalseBoolean('Preview the result without writing (default: false)'),\n});\n\nconst PatchOutputSchema = z.strictObject({\n  path: z.string().describe('Resolved absolute path of the patched file'),\n  size: NonNegInt.describe('File size in bytes after patching'),\n  lineCount: NonNegInt.describe('Number of lines in the file after patching'),\n  mimeType: z.string().describe('Detected MIME type of the file'),\n  kind: FileKind.describe('Broad file kind: text, binary, image, audio, or pdf'),\n  resourceUri: z\n    .string()\n    .optional()\n    .describe(\n      'Resource URI pointing to the patched file content; omitted on dryRun or when the resulting file exceeds the text-size cap, which the store would reject',\n    ),\n  modified: IsoDateTime.describe('Last modification timestamp after patching (ISO 8601 UTC)'),\n  linesAdded: NonNegInt.describe('Number of lines added by the patch'),\n  linesRemoved: NonNegInt.describe('Number of lines removed by the patch'),\n  diff: z.string().optional().describe('Unified diff preview (present only in dryRun mode)'),\n});\n\n// Hunk lines are the raw unified lines with their +/-/ leading prefix (no\n// +++/--- file headers inside hunks), so the first char is a reliable marker.\nfunction countAddedRemoved(parsedPatch: ReturnType<typeof parsePatch>[number]): {\n  linesAdded: number;\n  linesRemoved: number;\n} {\n  let linesAdded = 0;\n  let linesRemoved = 0;\n  for (const hunk of parsedPatch.hunks) {\n    for (const line of hunk.lines) {\n      if (line.startsWith('+')) linesAdded += 1;\n      else if (line.startsWith('-')) linesRemoved += 1;\n    }\n  }\n  return { linesAdded, linesRemoved };\n}\n\nexport const PATCH = defineTool({\n  name: 'patch',\n  title: 'Patch',\n  description:\n    'Apply a single-file unified diff to one existing text file, like git apply. ' +\n    'Nothing is written unless every hunk applies in file order with exactly matching context; ' +\n    'hunks are found by their context, so start line numbers may be off.',\n  input: PatchInputSchema,\n  output: PatchOutputSchema,\n  annotations: {\n    readOnlyHint: false,\n    destructiveHint: true,\n    openWorldHint: false,\n  },\n  progress: (args) => ({\n    label: args.dryRun ? 'Patch [dry run]' : 'Patch',\n    subject: basename(args.path),\n  }),\n  accessPaths: (args) => [args.path],\n  run: async (args, ctx) => {\n    const { validPath, content, stats } = await ctx.fs.readEditableText(args.path, {\n      signal: ctx.signal,\n      tool: 'patch',\n    });\n\n    // patch is single-file only: a multi-file unified diff (parsePatch length > 1)\n    // is rejected. Multi-file application needs per-file PathGuard-resolved loaders\n    // and is deferred (out of scope).\n    const parsed = parsePatch(args.diff);\n    if (parsed.length !== 1) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        `patch accepts a single-file unified diff; received ${parsed.length} file(s)`,\n        args.path,\n      );\n    }\n    const parsedPatch = parsed[0];\n    if (!parsedPatch || parsedPatch.hunks.length === 0) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch accepts a single-file unified diff with at least one hunk; received an empty patch',\n        args.path,\n      );\n    }\n    // jsdiff tries each hunk at its header line before bounding the search by\n    // the previous hunk, so a header pointing back into text an earlier hunk\n    // already consumed applies there and emits that region twice. Start each\n    // hunk no earlier than where the previous hunk's changes end; its trailing\n    // context may still overlap, as jsdiff allows.\n    let floor = 0;\n    const hunks = parsedPatch.hunks.map((hunk) => {\n      const oldStart = Math.max(hunk.oldStart, floor);\n      let trailingContext = 0;\n      for (const line of hunk.lines) {\n        if (line === '' || line.startsWith(' ')) trailingContext++;\n        else if (line.startsWith('+') || line.startsWith('-')) trailingContext = 0;\n      }\n      floor = oldStart + hunk.oldLines - trailingContext;\n      return { ...hunk, oldStart };\n    });\n    // applyPatch returns false (strict) on hunk mismatch — not a falsy empty string,\n    // so `=== false` distinguishes a no-op patch ('') from a failed one.\n    const patched = applyPatch(content, { ...parsedPatch, hunks });\n    if (patched === false) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch did not apply cleanly: hunk context does not match file content (hunks must be in file order)',\n        args.path,\n      );\n    }\n\n    const { linesAdded, linesRemoved } = countAddedRemoved(parsedPatch);\n    // Backstop for placements the clamp cannot see, such as zero-context hunks\n    // whose headers point past the end of the file: refuse rather than write.\n    if (countLines(patched) !== countLines(content) + linesAdded - linesRemoved) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch would duplicate or drop lines: a hunk overlaps an earlier one or starts past the end of the file',\n        args.path,\n      );\n    }\n    // The patched file used to come back whole in the text block, so a one-line\n    // hunk against a 5000-line file returned 5000 lines. Every other write tool\n    // answers with a summary; the result is reachable via `resourceUri` or a\n    // follow-up `read` when the caller actually wants the bytes.\n    const summaryText = `patch: ${basename(args.path)} +${String(linesAdded)} -${String(linesRemoved)}`;\n\n    if (!args.dryRun) {\n      await ctx.fs.writeFile(args.path, patched, { signal: ctx.signal });\n      ctx.log?.('info', `patch: ${args.path} (+${linesAdded}/-${linesRemoved})`, 'patch');\n    }\n\n    // `modified` is read from a post-write stat and is advisory: under a concurrent\n    // writer it may reflect that writer's mtime while `size`/content come from this\n    // patch's atomic write. The file content itself is always consistent.\n    const fileStats = args.dryRun\n      ? stats\n      : (await ctx.fs.stat(args.path, { signal: ctx.signal })).stats;\n    const meta = buildWrittenFileMeta({\n      validPath,\n      content: patched,\n      resourceStore: ctx.resourceStore,\n      dryRun: args.dryRun,\n    });\n    return {\n      structured: {\n        path: validPath,\n        size: meta.size,\n        lineCount: meta.lineCount,\n        mimeType: meta.mimeType,\n        kind: meta.kind,\n        modified: fileStats.mtime.toISOString(),\n        linesAdded,\n        linesRemoved,\n        ...(meta.resourceUri !== undefined ? { resourceUri: meta.resourceUri } : {}),\n        ...(args.dryRun ? { diff: args.diff } : {}),\n      },\n      // A dry run exists to be previewed, so it keeps returning the patched\n      // text; only the write path summarizes, where the bytes are on disk.\n      text: args.dryRun ? patched : summaryText,\n      ...(meta.resourceLink !== undefined ? { resources: [meta.resourceLink] } : {}),\n    };\n  },\n});\n"]}
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/tools/patch.ts"],"names":[],"mappings":"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","sourcesContent":["import { basename } from 'node:path';\n\nimport * as z from 'zod/v4';\nimport { applyPatch, parsePatch } from 'diff';\n\nimport { ErrorCode, FsError } from '../core/errors.ts';\nimport { buildWrittenFileMeta, type WrittenFileMeta } from '../core/file-uri.ts';\nimport { countLines } from '../core/read.ts';\nimport { defaultFalseBoolean, RequiredPath } from '../core/schema.ts';\nimport { defineTool } from './define.ts';\n\nconst PatchInputSchema = z.strictObject({\n  path: RequiredPath.describe('File to apply the diff to'),\n  diff: z\n    .string()\n    .min(1)\n    .describe('Single-file unified diff to apply (as produced by the diff tool or edit dry-run)'),\n  dryRun: defaultFalseBoolean('Preview the result without writing (default: false)'),\n});\n\ntype PatchOutput = Omit<WrittenFileMeta, 'resourceUri' | 'resourceLink'> & {\n  path: string;\n  resourceUri?: string;\n  modified: string;\n  linesAdded: number;\n  linesRemoved: number;\n  diff?: string;\n};\n\n// Hunk lines are the raw unified lines with their +/-/ leading prefix (no\n// +++/--- file headers inside hunks), so the first char is a reliable marker.\nfunction countAddedRemoved(parsedPatch: ReturnType<typeof parsePatch>[number]): {\n  linesAdded: number;\n  linesRemoved: number;\n} {\n  let linesAdded = 0;\n  let linesRemoved = 0;\n  for (const hunk of parsedPatch.hunks) {\n    for (const line of hunk.lines) {\n      if (line.startsWith('+')) linesAdded += 1;\n      else if (line.startsWith('-')) linesRemoved += 1;\n    }\n  }\n  return { linesAdded, linesRemoved };\n}\n\nexport const PATCH = defineTool<typeof PatchInputSchema, PatchOutput>({\n  name: 'patch',\n  title: 'Patch',\n  description:\n    'Apply a single-file unified diff to one existing text file, like git apply. ' +\n    'Nothing is written unless every hunk applies in file order with exactly matching context; ' +\n    'hunks are found by their context, so start line numbers may be off.',\n  input: PatchInputSchema,\n  readOnlyHint: false,\n  progress: (args) => ({\n    label: args.dryRun ? 'Patch [dry run]' : 'Patch',\n    subject: basename(args.path),\n  }),\n  accessPaths: (args) => [args.path],\n  run: async (args, ctx) => {\n    const { validPath, content, stats } = await ctx.fs.readEditableText(args.path, {\n      signal: ctx.signal,\n      tool: 'patch',\n    });\n\n    // patch is single-file only: a multi-file unified diff (parsePatch length > 1)\n    // is rejected. Multi-file application needs per-file PathGuard-resolved loaders\n    // and is deferred (out of scope).\n    const parsed = parsePatch(args.diff);\n    if (parsed.length !== 1) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        `patch accepts a single-file unified diff; received ${parsed.length} file(s)`,\n        args.path,\n      );\n    }\n    const parsedPatch = parsed[0];\n    if (!parsedPatch || parsedPatch.hunks.length === 0) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch accepts a single-file unified diff with at least one hunk; received an empty patch',\n        args.path,\n      );\n    }\n    // jsdiff tries each hunk at its header line before bounding the search by\n    // the previous hunk, so a header pointing back into text an earlier hunk\n    // already consumed applies there and emits that region twice. Start each\n    // hunk no earlier than where the previous hunk's changes end; its trailing\n    // context may still overlap, as jsdiff allows.\n    let floor = 0;\n    const hunks = parsedPatch.hunks.map((hunk) => {\n      const oldStart = Math.max(hunk.oldStart, floor);\n      let trailingContext = 0;\n      for (const line of hunk.lines) {\n        if (line === '' || line.startsWith(' ')) trailingContext++;\n        else if (line.startsWith('+') || line.startsWith('-')) trailingContext = 0;\n      }\n      floor = oldStart + hunk.oldLines - trailingContext;\n      return { ...hunk, oldStart };\n    });\n    // applyPatch returns false (strict) on hunk mismatch — not a falsy empty string,\n    // so `=== false` distinguishes a no-op patch ('') from a failed one.\n    const patched = applyPatch(content, { ...parsedPatch, hunks });\n    if (patched === false) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch did not apply cleanly: hunk context does not match file content (hunks must be in file order)',\n        args.path,\n      );\n    }\n\n    const { linesAdded, linesRemoved } = countAddedRemoved(parsedPatch);\n    // Backstop for placements the clamp cannot see, such as zero-context hunks\n    // whose headers point past the end of the file: refuse rather than write.\n    if (countLines(patched) !== countLines(content) + linesAdded - linesRemoved) {\n      throw new FsError(\n        ErrorCode.INVALID_INPUT,\n        'patch would duplicate or drop lines: a hunk overlaps an earlier one or starts past the end of the file',\n        args.path,\n      );\n    }\n    // The patched file used to come back whole in the text block, so a one-line\n    // hunk against a 5000-line file returned 5000 lines. Every other write tool\n    // answers with a summary; the result is reachable via `resourceUri` or a\n    // follow-up `read` when the caller actually wants the bytes.\n    const summaryText = `patch: ${basename(args.path)} +${String(linesAdded)} -${String(linesRemoved)}`;\n\n    if (!args.dryRun) {\n      await ctx.fs.writeFile(args.path, patched, { signal: ctx.signal });\n      ctx.log('info', `patch: ${args.path} (+${linesAdded}/-${linesRemoved})`, 'patch');\n    }\n\n    // `modified` is read from a post-write stat and is advisory: under a concurrent\n    // writer it may reflect that writer's mtime while `size`/content come from this\n    // patch's atomic write. The file content itself is always consistent.\n    const fileStats = args.dryRun\n      ? stats\n      : (await ctx.fs.stat(args.path, { signal: ctx.signal })).stats;\n    const meta = buildWrittenFileMeta({\n      validPath,\n      content: patched,\n      dryRun: args.dryRun,\n      lastModified: fileStats.mtime.toISOString(),\n    });\n    return {\n      structured: {\n        path: validPath,\n        size: meta.size,\n        lineCount: meta.lineCount,\n        mimeType: meta.mimeType,\n        kind: meta.kind,\n        modified: fileStats.mtime.toISOString(),\n        linesAdded,\n        linesRemoved,\n        ...(meta.resourceUri !== undefined ? { resourceUri: meta.resourceUri } : {}),\n        ...(args.dryRun ? { diff: args.diff } : {}),\n      },\n      // A dry run exists to be previewed, so it keeps returning the patched\n      // text; only the write path summarizes, where the bytes are on disk.\n      text: args.dryRun ? patched : summaryText,\n      ...(meta.resourceLink !== undefined ? { resources: [meta.resourceLink] } : {}),\n    };\n  },\n});\n"]}

package/dist/tools/progress.d.ts

@@ -9,8 +9,6 @@ interface ProgressSessionOptions {
     label: string;
     /** Absent when the client sent no `progressToken`; the session then only tracks state. */
     sink?: ProgressSink;
-    /** Override the tick rate-limit window. Default: 50ms. */
-    rateLimitMs?: number;
 }
 /**
  * One tool call's progress stream: a monotonic cursor, a tick rate limit, and

package/dist/tools/progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/tools/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,8BAA8B,CAAC;AAK7F,2FAA2F;AAC3F,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,0FAA0F;IAC1F,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAID;;;;;GAKG;AACH,qBAAa,eAAe;;gBAYd,IAAI,EAAE,sBAAsB;IAUxC,GAAG,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAQvE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM/B,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAM5B,iFAAiF;IAC3E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAoD7B"}
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/tools/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,8BAA8B,CAAC;AAK7F,2FAA2F;AAC3F,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,0FAA0F;IAC1F,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB;AAKD;;;;;GAKG;AACH,qBAAa,eAAe;;gBAYd,IAAI,EAAE,sBAAsB;IAOxC,GAAG,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IASvE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAO/B,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAO5B,iFAAiF;IAC3E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAyD7B"}

package/dist/tools/progress.js

@@ -1,6 +1,7 @@
 import { formatUnknownErrorMessage } from "../core/errors.js";
 import { Logger } from "../core/observability.js";
-const DEFAULT_RATE_LIMIT_MS = 50;
+/** Minimum gap between two tick frames on the wire. */
+const RATE_LIMIT_MS = 50;
 /**
  * One tool call's progress stream: a monotonic cursor, a tick rate limit, and
  * the wire guard the spec requires (`progress` strictly increases per token).
@@ -10,21 +11,18 @@ const DEFAULT_RATE_LIMIT_MS = 50;
 export class ProgressSession {
     #label;
     #sink;
-    #rateLimitMs;
     #startTime;
     #pending = new Set();
     #cursor = 0;
-    #lastSentMs = 0;
+    #lastSentMs;
     #lastProgress = -1;
+    #started = false;
     #done = false;
     constructor(opts) {
         this.#label = opts.label;
         this.#sink = opts.sink;
-        this.#rateLimitMs = opts.rateLimitMs ?? DEFAULT_RATE_LIMIT_MS;
         this.#startTime = Date.now();
-        this.#lastSentMs = this.#startTime - this.#rateLimitMs;
-        // Synthetic start tick: the wire sees 0 at session creation.
-        this.#emit('tick', 0, undefined, this.#label);
+        this.#lastSentMs = this.#startTime - RATE_LIMIT_MS;
     }
     set(input) {
         if (this.#done)
@@ -32,18 +30,21 @@ export class ProgressSession {
         // A repeated or backward tick would put a duplicate value on the wire — drop it.
         if (input.current <= this.#cursor)
             return;
+        this.#start();
         this.#cursor = input.current;
         this.#emit('tick', this.#cursor, input.total, input.message ?? this.#label);
     }
     complete(message) {
         if (this.#done)
             return;
+        this.#start();
         this.#done = true;
         this.#emit('complete', this.#cursor, undefined, message);
     }
     fail(message) {
         if (this.#done)
             return;
+        this.#start();
         this.#done = true;
         this.#emit('fail', this.#cursor, undefined, message ?? this.#label);
     }
@@ -52,23 +53,30 @@ export class ProgressSession {
         if (this.#pending.size > 0)
             await Promise.allSettled([...this.#pending]);
     }
+    #start() {
+        if (this.#started)
+            return;
+        this.#started = true;
+        // Input-only rounds must not restart the originating token's progress.
+        this.#emit('start', 0, undefined, this.#label);
+    }
     #emit(kind, current, total, message) {
         const now = Date.now();
         if (kind === 'tick') {
-            // Widen the window after 5s of execution; a rateLimitMs of 0 (tests)
-            // stays 0 only inside the first 5s, which every test run fits in.
-            const window = now - this.#startTime > 5000 ? Math.max(this.#rateLimitMs, 250) : this.#rateLimitMs;
+            // Widen the window after 5s of execution.
+            const window = now - this.#startTime > 5000 ? 250 : RATE_LIMIT_MS;
             if (now - this.#lastSentMs < window)
                 return;
         }
-        this.#lastSentMs = now;
+        if (kind !== 'start')
+            this.#lastSentMs = now;
         if (!this.#sink)
             return;
         if (kind === 'complete') {
             current = total ?? current;
             total = current;
         }
-        if (kind !== 'tick') {
+        if (kind === 'complete' || kind === 'fail') {
             current = Math.max(current, this.#lastProgress + 1);
             if (total !== undefined && total < current)
                 total = current;

package/dist/tools/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/tools/progress.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Notification, ProgressNotificationParams } from '@modelcontextprotocol/server';\n\nimport { formatUnknownErrorMessage } from '../core/errors.ts';\nimport { Logger } from '../core/observability.ts';\n\n/** Where progress frames go: the `notifications/progress` sink for one `progressToken`. */\nexport interface ProgressSink {\n  toolName: string;\n  token: string | number;\n  notify: (n: Notification) => Promise<void>;\n}\n\ninterface ProgressSessionOptions {\n  label: string;\n  /** Absent when the client sent no `progressToken`; the session then only tracks state. */\n  sink?: ProgressSink;\n  /** Override the tick rate-limit window. Default: 50ms. */\n  rateLimitMs?: number;\n}\n\nconst DEFAULT_RATE_LIMIT_MS = 50;\n\n/**\n * One tool call's progress stream: a monotonic cursor, a tick rate limit, and\n * the wire guard the spec requires (`progress` strictly increases per token).\n * Terminal frames (`complete`, `fail`) always reach the wire — they carry the\n * outcome message — so they advance past the last value instead of dropping.\n */\nexport class ProgressSession {\n  readonly #label: string;\n  readonly #sink: ProgressSink | undefined;\n  readonly #rateLimitMs: number;\n  readonly #startTime: number;\n  readonly #pending = new Set<Promise<void>>();\n\n  #cursor = 0;\n  #lastSentMs = 0;\n  #lastProgress = -1;\n  #done = false;\n\n  constructor(opts: ProgressSessionOptions) {\n    this.#label = opts.label;\n    this.#sink = opts.sink;\n    this.#rateLimitMs = opts.rateLimitMs ?? DEFAULT_RATE_LIMIT_MS;\n    this.#startTime = Date.now();\n    this.#lastSentMs = this.#startTime - this.#rateLimitMs;\n    // Synthetic start tick: the wire sees 0 at session creation.\n    this.#emit('tick', 0, undefined, this.#label);\n  }\n\n  set(input: { current: number; total?: number; message?: string }): void {\n    if (this.#done) return;\n    // A repeated or backward tick would put a duplicate value on the wire — drop it.\n    if (input.current <= this.#cursor) return;\n    this.#cursor = input.current;\n    this.#emit('tick', this.#cursor, input.total, input.message ?? this.#label);\n  }\n\n  complete(message: string): void {\n    if (this.#done) return;\n    this.#done = true;\n    this.#emit('complete', this.#cursor, undefined, message);\n  }\n\n  fail(message?: string): void {\n    if (this.#done) return;\n    this.#done = true;\n    this.#emit('fail', this.#cursor, undefined, message ?? this.#label);\n  }\n\n  /** Await every notification in flight; a failed send is logged, never thrown. */\n  async flush(): Promise<void> {\n    if (this.#pending.size > 0) await Promise.allSettled([...this.#pending]);\n  }\n\n  #emit(\n    kind: 'tick' | 'complete' | 'fail',\n    current: number,\n    total: number | undefined,\n    message: string,\n  ): void {\n    const now = Date.now();\n    if (kind === 'tick') {\n      // Widen the window after 5s of execution; a rateLimitMs of 0 (tests)\n      // stays 0 only inside the first 5s, which every test run fits in.\n      const window =\n        now - this.#startTime > 5000 ? Math.max(this.#rateLimitMs, 250) : this.#rateLimitMs;\n      if (now - this.#lastSentMs < window) return;\n    }\n    this.#lastSentMs = now;\n    if (!this.#sink) return;\n\n    if (kind === 'complete') {\n      current = total ?? current;\n      total = current;\n    }\n    if (kind !== 'tick') {\n      current = Math.max(current, this.#lastProgress + 1);\n      if (total !== undefined && total < current) total = current;\n    }\n    // Spec: progress must increase on every notification for the same token.\n    if (current <= this.#lastProgress) return;\n    this.#lastProgress = current;\n\n    const { toolName, token, notify } = this.#sink;\n    const params: ProgressNotificationParams = {\n      progressToken: token,\n      progress: current,\n      ...(total !== undefined ? { total } : {}),\n      message,\n    };\n    const promise = notify({ method: 'notifications/progress', params })\n      .catch((error: unknown) => {\n        // A sink failure must never fail the tool call it is reporting on.\n        Logger.warn(\n          `${toolName}: progressNotification failed: ${formatUnknownErrorMessage(error)}`,\n        );\n      })\n      .finally(() => {\n        this.#pending.delete(promise);\n      });\n    this.#pending.add(promise);\n  }\n}\n"]}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/tools/progress.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Notification, ProgressNotificationParams } from '@modelcontextprotocol/server';\n\nimport { formatUnknownErrorMessage } from '../core/errors.ts';\nimport { Logger } from '../core/observability.ts';\n\n/** Where progress frames go: the `notifications/progress` sink for one `progressToken`. */\nexport interface ProgressSink {\n  toolName: string;\n  token: string | number;\n  notify: (n: Notification) => Promise<void>;\n}\n\ninterface ProgressSessionOptions {\n  label: string;\n  /** Absent when the client sent no `progressToken`; the session then only tracks state. */\n  sink?: ProgressSink;\n}\n\n/** Minimum gap between two tick frames on the wire. */\nconst RATE_LIMIT_MS = 50;\n\n/**\n * One tool call's progress stream: a monotonic cursor, a tick rate limit, and\n * the wire guard the spec requires (`progress` strictly increases per token).\n * Terminal frames (`complete`, `fail`) always reach the wire — they carry the\n * outcome message — so they advance past the last value instead of dropping.\n */\nexport class ProgressSession {\n  readonly #label: string;\n  readonly #sink: ProgressSink | undefined;\n  readonly #startTime: number;\n  readonly #pending = new Set<Promise<void>>();\n\n  #cursor = 0;\n  #lastSentMs: number;\n  #lastProgress = -1;\n  #started = false;\n  #done = false;\n\n  constructor(opts: ProgressSessionOptions) {\n    this.#label = opts.label;\n    this.#sink = opts.sink;\n    this.#startTime = Date.now();\n    this.#lastSentMs = this.#startTime - RATE_LIMIT_MS;\n  }\n\n  set(input: { current: number; total?: number; message?: string }): void {\n    if (this.#done) return;\n    // A repeated or backward tick would put a duplicate value on the wire — drop it.\n    if (input.current <= this.#cursor) return;\n    this.#start();\n    this.#cursor = input.current;\n    this.#emit('tick', this.#cursor, input.total, input.message ?? this.#label);\n  }\n\n  complete(message: string): void {\n    if (this.#done) return;\n    this.#start();\n    this.#done = true;\n    this.#emit('complete', this.#cursor, undefined, message);\n  }\n\n  fail(message?: string): void {\n    if (this.#done) return;\n    this.#start();\n    this.#done = true;\n    this.#emit('fail', this.#cursor, undefined, message ?? this.#label);\n  }\n\n  /** Await every notification in flight; a failed send is logged, never thrown. */\n  async flush(): Promise<void> {\n    if (this.#pending.size > 0) await Promise.allSettled([...this.#pending]);\n  }\n\n  #start(): void {\n    if (this.#started) return;\n    this.#started = true;\n    // Input-only rounds must not restart the originating token's progress.\n    this.#emit('start', 0, undefined, this.#label);\n  }\n\n  #emit(\n    kind: 'start' | 'tick' | 'complete' | 'fail',\n    current: number,\n    total: number | undefined,\n    message: string,\n  ): void {\n    const now = Date.now();\n    if (kind === 'tick') {\n      // Widen the window after 5s of execution.\n      const window = now - this.#startTime > 5000 ? 250 : RATE_LIMIT_MS;\n      if (now - this.#lastSentMs < window) return;\n    }\n    if (kind !== 'start') this.#lastSentMs = now;\n    if (!this.#sink) return;\n\n    if (kind === 'complete') {\n      current = total ?? current;\n      total = current;\n    }\n    if (kind === 'complete' || kind === 'fail') {\n      current = Math.max(current, this.#lastProgress + 1);\n      if (total !== undefined && total < current) total = current;\n    }\n    // Spec: progress must increase on every notification for the same token.\n    if (current <= this.#lastProgress) return;\n    this.#lastProgress = current;\n\n    const { toolName, token, notify } = this.#sink;\n    const params: ProgressNotificationParams = {\n      progressToken: token,\n      progress: current,\n      ...(total !== undefined ? { total } : {}),\n      message,\n    };\n    const promise = notify({ method: 'notifications/progress', params })\n      .catch((error: unknown) => {\n        // A sink failure must never fail the tool call it is reporting on.\n        Logger.warn(\n          `${toolName}: progressNotification failed: ${formatUnknownErrorMessage(error)}`,\n        );\n      })\n      .finally(() => {\n        this.#pending.delete(promise);\n      });\n    this.#pending.add(promise);\n  }\n}\n"]}

package/dist/tools/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/tools/read.ts"],"names":[],"mappings":"AAgXA,eAAO,MAAM,IAAI,mCA+Jf,CAAC"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/tools/read.ts"],"names":[],"mappings":"AAsUA,eAAO,MAAM,IAAI,mCAkHf,CAAC"}