@tiwater/office-mcp 0.21.4 → 0.21.6

package/_shared/large-json-result.mjs

@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
-import { mkdir, stat, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
 import { requireString } from './tool-runtime.mjs';
@@ -31,7 +31,7 @@ export async function deliverLargeJsonResult({ tool, args, runtime, payload, sou
     runtime,
     sources: await Promise.all(sourcePaths.map(fileArtifact)),
     returnContent: channels.returnContent,
-    artifact: channels.output === null ? null : await writeJsonArtifact(channels.output, payload),
+    artifact: channels.output === null ? null : await writeIdempotentJsonArtifact(channels.output, payload),
     receipt: {
       contentBytes,
       contentReturned,
@@ -47,6 +47,28 @@ export async function writeJsonArtifact(output, payload) {
   const bytes = Buffer.from(`${JSON.stringify(payload, null, 2)}\n`, 'utf8');
   await mkdir(path.dirname(fullPath), { recursive: true });
   await writeFile(fullPath, bytes, { flag: 'wx' });
+  return describeJsonArtifact(fullPath, bytes);
+}
+
+export async function writeIdempotentJsonArtifact(output, payload) {
+  const fullPath = path.resolve(output);
+  const bytes = Buffer.from(`${JSON.stringify(payload, null, 2)}\n`, 'utf8');
+  await mkdir(path.dirname(fullPath), { recursive: true });
+  try {
+    await writeFile(fullPath, bytes, { flag: 'wx' });
+  } catch (error) {
+    if (error?.code !== 'EEXIST') throw error;
+    const existing = await readFile(fullPath);
+    if (!existing.equals(bytes)) {
+      throw Object.assign(new Error(`artifact-path-already-exists-with-different-content:${fullPath}`), {
+        code: 'EEXIST',
+      });
+    }
+  }
+  return describeJsonArtifact(fullPath, bytes);
+}
+
+function describeJsonArtifact(fullPath, bytes) {
   return {
     path: fullPath,
     sha256: createHash('sha256').update(bytes).digest('hex'),

package/office/contracts/docx_set_table_body.schema.json

@@ -69,7 +69,7 @@
     "rows": {
       "type": "array",
       "minItems": 0,
-      "description": "Exact final rows; an empty array removes the declared range when at least one table row remains. Each final row names one current row in existingRows as its style prototype. Cells plus active row spans must cover the complete target grid exactly once.",
+      "description": "Exact final physical rows; an empty array removes the declared range when at least one table row remains. Each final row names one current row in existingRows as its style prototype, and its cells cover the complete target grid exactly once.",
       "items": {
         "type": "object",
         "properties": {
@@ -95,11 +95,10 @@
                   "items": { "type": "string", "minLength": 1, "maxLength": 80 }
                 },
                 "text": { "type": "string" },
-                "rowSpan": {
-                  "type": "integer",
-                  "minimum": 1,
-                  "maximum": 2147483647,
-                  "description": "Number of final rows occupied by this cell; omitted means one row."
+                "verticalMerge": {
+                  "type": "string",
+                  "enum": ["restart", "continue"],
+                  "description": "Native OpenXML vertical merge state. A restart cell owns the text; the same columns in the next physical row use continue with empty text. Omit for an unmerged cell."
                 }
               },
               "required": ["columns", "text"],

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.4"
+    "version": "0.21.6"
   },
   "tools": [
     {
@@ -185,11 +185,11 @@
       "name": "docx_set_table_body",
       "providerContract": {
         "source": "packages/docx-cli/contracts/mcp-input/docx_set_table_body.schema.json",
-        "sha256": "2270274f25154dc0573c972c8c71240636e29e7e23a1eacae616952cc600b1e0"
+        "sha256": "e1f6c96d71dc42904fb1d0c8b049c1398e1155d76db481b58064cede9e30fad6"
       },
       "inputContract": {
         "path": "office/contracts/docx_set_table_body.schema.json",
-        "sha256": "2270274f25154dc0573c972c8c71240636e29e7e23a1eacae616952cc600b1e0"
+        "sha256": "e1f6c96d71dc42904fb1d0c8b049c1398e1155d76db481b58064cede9e30fad6"
       }
     },
     {

package/office/index.mjs

@@ -19,6 +19,7 @@ import {
   fileArtifact,
   resultChannels,
   returnedContentBudgetBytes,
+  writeIdempotentJsonArtifact,
   writeJsonArtifact,
 } from '../_shared/large-json-result.mjs';
 import { withOutputWriteLock } from '../_shared/output-write-lock.mjs';
@@ -423,7 +424,7 @@ const tools = [
   },
   {
     name: 'docx_set_table_body',
-    description: 'Atomically replace one exact current target-table row range with final text rows while retaining the table, target styles, grid widths, and all rows and surrounding content outside the range. Name every target grid column in native order, choose one current row as the style prototype for each final row, and express horizontal spans with contiguous column IDs and vertical spans with rowSpan. An empty final row array removes the range when another table row remains. The provider commits once and returns structural readback. It does not read a source table, map source to target, derive text, choose business columns, identify headers, or accept non-text cell content.',
+    description: 'Atomically replace one exact current target-table row range with final physical text rows while retaining the table, target styles, grid widths, and all rows and surrounding content outside the range. Name every target grid column in native order, choose one current row as the style prototype for each final row, and cover every row completely with explicit cells. Horizontal spans use contiguous column IDs. Native vertical merges use a restart cell followed by continue cells on the same columns; continue cells have empty physical text. An empty final row array removes the range when another table row remains. The provider commits once and returns structural readback. It does not read a source table, map source to target, derive text, choose business columns, identify headers, or accept non-text cell content.',
     inputSchema: inputContract('docx_set_table_body'),
     outputSchema: fixedEditOutput('docx_set_table_body'),
     handler: args => fixedEdit('docx_set_table_body', args),
@@ -746,7 +747,7 @@ async function docxInspect(args) {
     returnContent: delivery.returnContent,
     artifact: delivery.output === null
       ? null
-      : await writeJsonArtifact(delivery.output, result.json),
+      : await writeIdempotentJsonArtifact(delivery.output, result.json),
     ...(delivery.returnContent ? compactDocxInspection(result.json) : {}),
   };
 }
@@ -770,7 +771,7 @@ async function docxObservation(tool, args) {
       const offset = Math.min(args.offset ?? 0, totalCount);
       const withArtifact = delivery.output === null ? retained : {
         ...retained,
-        artifact: await writeJsonArtifact(delivery.output, result.json),
+        artifact: await writeIdempotentJsonArtifact(delivery.output, result.json),
       };
       if (!delivery.returnContent) {
         return {
@@ -805,7 +806,7 @@ async function docxObservation(tool, args) {
       const totalCount = payload.tables.length;
       const withArtifact = delivery.output === null ? retained : {
         ...retained,
-        artifact: await writeJsonArtifact(delivery.output, result.json),
+        artifact: await writeIdempotentJsonArtifact(delivery.output, result.json),
       };
       if (!delivery.returnContent) {
         return {
@@ -872,7 +873,7 @@ async function docxObservation(tool, args) {
       };
       const withArtifact = delivery.output === null ? retained : {
         ...retained,
-        artifact: await writeJsonArtifact(delivery.output, detailPage),
+        artifact: await writeIdempotentJsonArtifact(delivery.output, detailPage),
       };
       if (!delivery.returnContent) {
         return {
@@ -964,7 +965,7 @@ async function docxReadObject(args) {
       returnContent: delivery.returnContent,
       artifact: delivery.output === null
         ? null
-        : await writeJsonArtifact(delivery.output, result.json),
+        : await writeIdempotentJsonArtifact(delivery.output, result.json),
       receipt: {
         schema: 'tiwater.docx-read-object-receipt/v1',
         observationCount: observations.length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiwater/office-mcp",
-  "version": "0.21.4",
+  "version": "0.21.6",
   "description": "Published MCP server for Tiwater Office document capabilities",
   "type": "module",
   "license": "MIT",