@tiwater/office-mcp 0.11.0 → 0.11.1

package/office/index.mjs

@@ -3,7 +3,6 @@ import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
 import { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
-import { spawn } from 'node:child_process';
 import { isDeepStrictEqual } from 'node:util';
 import { McpServer } from '@modelcontextprotocol/server';
 import { serveStdio } from '@modelcontextprotocol/server/stdio';
@@ -1058,7 +1057,7 @@ async function xlsxApply(args) {
 
 async function xlsxValidate(args) {
   const input = requireString(args.input, 'input');
-  const result = await runXlsxValidateCandidateChain(['validate', input]);
+  const result = await runJsonCandidateChain(xlsxCandidates, ['validate', input], { allowedExitCodes: [0, 1] });
   return { tool: 'xlsx_validate', runtime: commandRuntime(result), result: result.json };
 }
 
@@ -1125,59 +1124,3 @@ function commandRuntime(result) {
 }
 
 serveStdio(buildServer);
-
-async function runXlsxValidateCandidateChain(args) {
-  const errors = [];
-  for (const candidate of xlsxCandidates) {
-    try {
-      const result = await runValidationCommand(candidate, args);
-      const text = result.stdout.trim();
-      if (!text) return { ...result, json: null };
-      try {
-        return { ...result, json: JSON.parse(text) };
-      } catch {
-        if (result.code !== 0) {
-          errors.push(`${candidate.command}: validate did not return JSON`);
-          continue;
-        }
-        throw new Error(`Expected JSON output but received: ${text.slice(0, 300)}${text.length > 300 ? '…' : ''}`);
-      }
-    } catch (error) {
-      if (error?.code === 'ENOENT') {
-        errors.push(`${candidate.command}: not found`);
-        continue;
-      }
-      throw error;
-    }
-  }
-  throw new Error(`No runnable command candidate succeeded. ${errors.join('; ')}`);
-}
-
-async function runValidationCommand(candidate, args) {
-  const env = { ...process.env, ...(candidate.env || {}) };
-  const cwd = candidate.cwd || process.cwd();
-  const commandArgs = [...(candidate.argsPrefix || []), ...args];
-
-  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);
-    child.on('close', code => {
-      if (code === 0 || code === 1) {
-        resolve({ code, stdout, stderr, command: candidate.command, args: commandArgs, cwd });
-        return;
-      }
-      reject(new Error(`${candidate.command} ${commandArgs.join(' ')} failed with exit code ${code}\n${stderr || stdout}`));
-    });
-  });
-}

package/package.json

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