@tiwater/office-mcp 0.21.51 → 0.21.53

package/_shared/mcp-stdio.mjs

@@ -1,4 +1,5 @@
 import process from 'node:process';
+import { withCommandContext } from './tool-runtime.mjs';
 
 const JSONRPC_VERSION = '2.0';
 const SUPPORTED_PROTOCOL_VERSIONS = ['2025-06-18', '2025-03-26', '2024-11-05', '2024-10-07'];
@@ -30,11 +31,16 @@ export class McpStdioServer {
     this.lineBuffer = '';
     this.binaryBuffer = Buffer.alloc(0);
     this.initialized = false;
+    this.calls = new Map();
   }
 
   start() {
     process.stdin.on('data', chunk => this.#onData(chunk));
-    process.stdin.on('end', () => process.exit(0));
+    process.stdin.on('end', () => {
+      for (const call of this.calls.values()) call.controller.abort();
+      // Child cancellation must finish before the transport exits.
+      void Promise.allSettled([...this.calls.values()].map(call => call.promise)).then(() => process.exit(0));
+    });
   }
 
   #onData(chunk) {
@@ -122,6 +128,10 @@ export class McpStdioServer {
           this.initialized = true;
           return;
         }
+        case 'notifications/cancelled': {
+          this.calls.get(params.requestId)?.controller.abort();
+          return;
+        }
         case 'ping': {
           if (!isNotification) writeMessage({ jsonrpc: JSONRPC_VERSION, id, result: {} });
           return;
@@ -131,14 +141,21 @@ export class McpStdioServer {
           return;
         }
         case 'tools/call': {
+          if (isNotification) return;
+          if (this.calls.has(id)) throw Object.assign(new Error('Duplicate active request id'), { code: -32600 });
           const name = params?.name;
           const args = params?.arguments ?? {};
           if (typeof name !== 'string' || !name) {
             if (!isNotification) writeMessage({ jsonrpc: JSONRPC_VERSION, id, error: toError(-32602, 'Invalid params: missing tool name') });
             return;
           }
-          const result = await this.callTool(name, args);
-          if (!isNotification) writeMessage({ jsonrpc: JSONRPC_VERSION, id, result });
+          const controller = new AbortController();
+          const promise = Promise.resolve().then(() => withCommandContext({signal:controller.signal}, () => this.callTool(name, args)));
+          this.calls.set(id, {controller, promise});
+          try {
+            const result = await promise;
+            if (!controller.signal.aborted) writeMessage({ jsonrpc: JSONRPC_VERSION, id, result });
+          } finally { this.calls.delete(id); }
           return;
         }
         default: {

package/_shared/tool-runtime.mjs

@@ -4,6 +4,52 @@ import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+const invocation = new AsyncLocalStorage();
+// Capacity is deployment-specific. Unconfigured execution preserves the
+// pre-limiter concurrency; deadlines, cancellation and output caps still apply.
+const maxCommands = process.env.TIWATER_MCP_MAX_COMMANDS === undefined
+  ? Infinity : positiveInteger(process.env.TIWATER_MCP_MAX_COMMANDS, 'TIWATER_MCP_MAX_COMMANDS');
+const maxQueued = process.env.TIWATER_MCP_MAX_QUEUED === undefined
+  ? Infinity : positiveInteger(process.env.TIWATER_MCP_MAX_QUEUED, 'TIWATER_MCP_MAX_QUEUED');
+let activeCommands = 0;
+const commandQueue = [];
+
+export function withCommandContext(context, fn) { return invocation.run(context, fn); }
+
+function positiveInteger(value, name) {
+  const result = Number(value);
+  if (!Number.isSafeInteger(result) || result < 1 || result > 2_147_483_647) throw new Error(`${name} must be a positive bounded integer`);
+  return result;
+}
+
+function commandError(code, message, executionStarted = false) {
+  return Object.assign(new Error(message), { code, executionStarted });
+}
+
+function acquireCommand(signal) {
+  if (signal.aborted) return Promise.reject(signal.reason);
+  if (activeCommands < maxCommands) { activeCommands += 1; return Promise.resolve(releaseCommand); }
+  if (commandQueue.length >= maxQueued) return Promise.reject(commandError('EBUSY', 'Command queue is full; execution did not start'));
+  return new Promise((resolve, reject) => {
+    const entry = { resolve, signal, abort: () => {
+      const index = commandQueue.indexOf(entry);
+      if (index >= 0) commandQueue.splice(index, 1);
+      reject(signal.reason);
+    } };
+    commandQueue.push(entry);
+    signal.addEventListener('abort', entry.abort, { once: true });
+  });
+}
+
+function releaseCommand() {
+  const next = commandQueue.shift();
+  if (next) {
+    next.signal.removeEventListener('abort', next.abort);
+    next.resolve(releaseCommand);
+  } else activeCommands -= 1;
+}
 
 const sharedDir = path.dirname(fileURLToPath(import.meta.url));
 export const repoRoot = path.resolve(sharedDir, '..', '..');
@@ -27,6 +73,22 @@ export function commandCandidate(command, argsPrefix = [], options = {}) {
 }
 
 export async function runCandidateChain(candidates, args, options = {}) {
+  options = { ...invocation.getStore(), ...options };
+  const timeoutMs = positiveInteger(options.timeoutMs ?? process.env.TIWATER_MCP_COMMAND_TIMEOUT_MS ?? 1_800_000, 'timeoutMs');
+  const controller = new AbortController();
+  const cancel = () => controller.abort(commandError('ABORT_ERR', 'Command cancelled; reconcile any started side effect before retrying'));
+  if (options.signal?.aborted) cancel();
+  else options.signal?.addEventListener('abort', cancel, { once: true });
+  const deadline = setTimeout(() => controller.abort(commandError('ETIMEDOUT', 'Command deadline exceeded; reconcile any started side effect before retrying')), timeoutMs);
+  try {
+    return await runCandidates(candidates, args, { ...options, signal: controller.signal });
+  } finally {
+    clearTimeout(deadline);
+    options.signal?.removeEventListener('abort', cancel);
+  }
+}
+
+async function runCandidates(candidates, args, options) {
   const errors = [];
   for (const candidate of candidates) {
     try {
@@ -77,25 +139,49 @@ export function requireString(value, label) {
 }
 
 async function runCommand(candidate, args, options) {
+  const release = await acquireCommand(options.signal);
+  try {
+  options.signal.throwIfAborted();
   const env = await withDotnetRoot({ ...process.env, ...(candidate.env || {}), ...(options.env || {}) });
+  options.signal.throwIfAborted();
   const cwd = candidate.cwd || options.cwd || repoRoot;
   const commandArgs = [...(candidate.argsPrefix || []), ...args];
+  const maxOutputBytes = positiveInteger(options.maxOutputBytes ?? process.env.TIWATER_MCP_MAX_OUTPUT_BYTES ?? 67_108_864, 'maxOutputBytes');
+  const killGraceMs = positiveInteger(options.killGraceMs ?? 1000, 'killGraceMs');
 
   return await new Promise((resolve, reject) => {
-    const child = spawn(candidate.command, commandArgs, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout.on('data', chunk => {
-      stdout += chunk.toString();
-    });
-
-    child.stderr.on('data', chunk => {
-      stderr += chunk.toString();
-    });
-
-    child.on('error', reject);
+    const grouped = process.platform !== 'win32';
+    const child = spawn(candidate.command, commandArgs, { cwd, env, detached: grouped, stdio: ['ignore', 'pipe', 'pipe'] });
+    const stdoutChunks = [], stderrChunks = [];
+    let outputBytes = 0, failure = null, killTimer = null;
+    const kill = signal => {
+      try { if (grouped && child.pid) process.kill(-child.pid, signal); else child.kill(signal); }
+      catch (error) { if (error.code !== 'ESRCH') failure ||= error; }
+    };
+    const stop = error => {
+      if (failure) return;
+      failure = commandError(error.code || 'ABORT_ERR', error.message, Boolean(child.pid));
+      kill('SIGTERM');
+      killTimer = setTimeout(() => kill('SIGKILL'), killGraceMs);
+    };
+    const abort = () => stop(options.signal.reason);
+    options.signal.addEventListener('abort', abort, { once: true });
+    const collect = (chunks, chunk) => {
+      if (failure) return;
+      outputBytes += chunk.length;
+      if (outputBytes > maxOutputBytes) { stop(commandError('ENOBUFS', 'Command output limit exceeded; output is incomplete')); return; }
+      chunks.push(chunk);
+    };
+    child.stdout.on('data', chunk => collect(stdoutChunks, chunk));
+    child.stderr.on('data', chunk => collect(stderrChunks, chunk));
+    child.on('error', error => { failure ||= error; });
     child.on('close', code => {
+      clearTimeout(killTimer);
+      options.signal.removeEventListener('abort', abort);
+      // A descendant may outlive the leader after closing inherited pipes.
+      if (failure) { kill('SIGKILL'); reject(failure); return; }
+      const stdout = Buffer.concat(stdoutChunks).toString('utf8');
+      const stderr = Buffer.concat(stderrChunks).toString('utf8');
       const allowedExitCodes = options.allowedExitCodes ?? [0];
       if (allowedExitCodes.includes(code)) {
         resolve({ code, stdout, stderr, command: candidate.command, args: commandArgs, cwd });
@@ -104,6 +190,7 @@ async function runCommand(candidate, args, options) {
       reject(new Error(`${candidate.command} ${commandArgs.join(' ')} failed with exit code ${code}\n${stderr || stdout}`));
     });
   });
+  } finally { release(); }
 }
 
 async function withDotnetRoot(env) {

package/office/contracts/docx_set_text.schema.json

@@ -48,6 +48,12 @@
         "additionalProperties": false
       }
     },
+    "changesInput": {
+      "type": "string",
+      "minLength": 1,
+      "description": "Absolute path to a JSON file containing the same non-empty changes array accepted by changes. Use this for large batches so the array stays out of the tool call.",
+      "x-tiwater-file-role": "read"
+    },
     "output": {
       "type": "string",
       "minLength": 1,
@@ -63,7 +69,6 @@
   },
   "required": [
     "input",
-    "changes",
     "output",
     "receiptOutput"
   ],

package/office/contracts/tiwater-office-provider-contract-manifest-v1.json

@@ -2,7 +2,7 @@
   "schema": "tiwater.office-provider-contract-manifest/v1",
   "provider": {
     "id": "@tiwater/office-mcp",
-    "version": "0.21.51"
+    "version": "0.21.53"
   },
   "tools": [
     {
@@ -240,11 +240,11 @@
       "name": "docx_set_text",
       "providerContract": {
         "source": "packages/docx-cli/contracts/mcp-input/docx_set_text.schema.json",
-        "sha256": "45d8aa5d95402ac5b17fe07540355f81afa0804214ef319f33d7da11cf3c56cc"
+        "sha256": "6a69b2ba25551698b8cbc6040fda2c1d2b81afde4a9629a613ca37c9120bebe6"
       },
       "inputContract": {
         "path": "office/contracts/docx_set_text.schema.json",
-        "sha256": "45d8aa5d95402ac5b17fe07540355f81afa0804214ef319f33d7da11cf3c56cc"
+        "sha256": "6a69b2ba25551698b8cbc6040fda2c1d2b81afde4a9629a613ca37c9120bebe6"
       }
     },
     {

package/office/index.mjs

@@ -13,6 +13,7 @@ import {
   runCandidateChain,
   runJsonCandidateChain,
   withTempJsonFile,
+  withCommandContext,
 } from '../_shared/tool-runtime.mjs';
 import {
   deliverLargeJsonResult,
@@ -613,10 +614,10 @@ const tools = [
   {
     name: 'docx_set_text',
     effectKind: 'document-mutation',
-    description: 'Replace the whole text content of paragraph or cell objects observed from this exact input DOCX while retaining target formatting, bookmarks, spans, and vertical merges. A change may explicitly set the Latin and complex-script font family of its nonempty replacement run; East Asian font settings remain inherited from the target. For a vertically merged logical cell, write its visible text to the restart cell rather than a continue cell. Tabs and line breaks remain native document text controls; targets containing non-text objects are rejected. Use this only for newly derived text. Content copied or selected from a source DOCX uses docx_replace_content_from_source so native runs such as superscript and subscript are retained. This does not insert objects, change table structure, copy source formatting, or decide business wording.',
+    description: 'Replace the whole text content of paragraph or cell objects observed from this exact input DOCX while retaining target formatting, bookmarks, spans, and vertical merges. Pass small batches in changes or keep a large batch out of the tool call by putting the same changes array in changesInput; both may be combined in one atomic commit. A change may explicitly set the Latin and complex-script font family of its nonempty replacement run; East Asian font settings remain inherited from the target. For a vertically merged logical cell, write its visible text to the restart cell rather than a continue cell. Tabs and line breaks remain native document text controls; targets containing non-text objects are rejected. Use this only for newly derived text. Content copied or selected from a source DOCX uses docx_replace_content_from_source so native runs such as superscript and subscript are retained. This does not insert objects, change table structure, copy source formatting, or decide business wording.',
     inputSchema: inputContract('docx_set_text'),
     outputSchema: fixedEditOutput('docx_set_text'),
-    handler: (args, tool) => fixedEdit(tool, args, docxCandidates),
+    handler: async (args, tool) => fixedEdit(tool, await resolveFileBackedChanges(args), docxCandidates),
   },
   {
     name: 'docx_set_paragraph_pagination',
@@ -925,12 +926,12 @@ function buildServer() {
           },
         } : {}),
       },
-      async args => {
+      async (args, context) => withCommandContext({ signal: context.signal }, async () => {
         const payload = typeof args.output === 'string'
           ? await withOutputWriteLock(args.output, () => tool.handler(args, tool))
           : await tool.handler(args, tool);
         return createToolResult(payload, { isError: payload?.summary?.pass === false });
-      },
+      }),
     );
   }
   return server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiwater/office-mcp",
-  "version": "0.21.51",
+  "version": "0.21.53",
   "description": "Published MCP distribution for independent Tiwater Office, PDF, and Text document capabilities",
   "type": "module",
   "license": "MIT",

package/pdf/contracts/tiwater-pdf-provider-contract-manifest-v1.json

@@ -2,7 +2,7 @@
   "schema": "tiwater.pdf-provider-contract-manifest/v1",
   "provider": {
     "id": "@tiwater/office-mcp",
-    "version": "0.21.51"
+    "version": "0.21.53"
   },
   "runtime": {
     "command": "tiwater-pdf"

package/text/contracts/tiwater-text-provider-contract-manifest-v1.json

@@ -2,7 +2,7 @@
   "schema": "tiwater.text-provider-contract-manifest/v1",
   "provider": {
     "id": "@tiwater/office-mcp",
-    "version": "0.21.51"
+    "version": "0.21.53"
   },
   "tools": [
     {