@jsonstudio/rcc 0.89.942 → 0.89.1083

package/scripts/verify-apply-patch.mjs

@@ -7,6 +7,7 @@
  */
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import chalk from 'chalk';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(__dirname, '..');
@@ -14,6 +15,8 @@ const coreLoaderPath = path.join(repoRoot, 'dist', 'modules', 'llmswitch', 'core
 const coreLoaderUrl = pathToFileURL(coreLoaderPath).href;
 const { importCoreModule } = await import(coreLoaderUrl);
 
+const chalkError = typeof chalk?.redBright === 'function' ? chalk.redBright : (value) => value;
+
 async function loadCoreModule(subpath) {
   return importCoreModule(subpath);
 }
@@ -99,6 +102,47 @@ async function runApplyPatchTextCase(label, payloadText) {
   }
 }
 
+async function runApplyPatchArgsCase(label, argsString) {
+  const { validateToolCall } = await loadCoreModule('tools/tool-registry');
+  const validation = validateToolCall('apply_patch', argsString);
+  if (!validation?.ok) {
+    throw new Error(
+      `[verify-apply-patch] ${label}: validateToolCall failed with reason=${validation?.reason}`
+    );
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(validation.normalizedArgs || '{}');
+  } catch (error) {
+    throw new Error(
+      `[verify-apply-patch] ${label}: normalized arguments not valid JSON: ${(error && error.message) || String(error)}`
+    );
+  }
+  const normalizedPatchText =
+    typeof parsed?.patch === 'string'
+      ? parsed.patch
+      : typeof parsed?.input === 'string'
+        ? parsed.input
+        : '';
+  if (!normalizedPatchText) {
+    throw new Error(`[verify-apply-patch] ${label}: missing normalized patch text`);
+  }
+  if (!normalizedPatchText.startsWith('*** Begin Patch')) {
+    throw new Error(`[verify-apply-patch] ${label}: patch does not start with *** Begin Patch`);
+  }
+  if (!normalizedPatchText.includes('\n*** End Patch')) {
+    throw new Error(`[verify-apply-patch] ${label}: patch missing *** End Patch`);
+  }
+  if (
+    normalizedPatchText.includes('*** End Patch","input":"*** Begin Patch') ||
+    normalizedPatchText.includes('*** End Patch","patch":"*** Begin Patch') ||
+    normalizedPatchText.includes('*** End Patch\\",\\"input\\":\\"*** Begin Patch') ||
+    normalizedPatchText.includes('*** End Patch\\",\\"patch\\":\\"*** Begin Patch')
+  ) {
+    throw new Error(`[verify-apply-patch] ${label}: patch still contains stitched JSON keys`);
+  }
+}
+
 async function main() {
   if (String(process.env.ROUTECODEX_VERIFY_SKIP || '').trim() === '1') {
     console.log('[verify-apply-patch] 跳过（ROUTECODEX_VERIFY_SKIP=1）');
@@ -106,6 +150,294 @@ async function main() {
   }
 
   try {
+    const { validateToolCall } = await loadCoreModule('tools/tool-registry');
+    const escapeNewlines = (value) => String(value || '').replace(/\n/g, '\\n');
+
+    // Regression: tolerate newline-escaped patch text (e.g. "*** Begin Patch\\n...") and
+    // normalize into a real multi-line unified diff string.
+    {
+      const escapedPatch = '*** Begin Patch\\n*** End Patch';
+      const validation = validateToolCall('apply_patch', escapedPatch);
+      if (!validation?.ok) {
+        throw new Error(
+          `[verify-apply-patch] escaped_patch: validateToolCall failed with reason=${validation?.reason}`
+        );
+      }
+      let parsed;
+      try {
+        parsed = JSON.parse(validation.normalizedArgs);
+      } catch (error) {
+        throw new Error(
+          `[verify-apply-patch] escaped_patch: normalized arguments not valid JSON: ${(error && error.message) || String(error)}`
+        );
+      }
+      const patchText =
+        typeof parsed?.patch === 'string'
+          ? parsed.patch
+          : typeof parsed?.input === 'string'
+            ? parsed.input
+            : '';
+      if (!patchText || typeof patchText !== 'string') {
+        throw new Error('[verify-apply-patch] escaped_patch: missing patch text in normalized args');
+      }
+      if (patchText.includes('\\n') && !patchText.includes('\n')) {
+        throw new Error('[verify-apply-patch] escaped_patch: patch still contains literal \\\\n without real newlines');
+      }
+      if (patchText.split('\n')[0] !== '*** Begin Patch') {
+        throw new Error('[verify-apply-patch] escaped_patch: patch first line is not *** Begin Patch');
+      }
+    }
+
+    // Regression: validateToolCall should be idempotent for already-normalized JSON arguments.
+    // Previously we could mis-detect the whole JSON as patch text, producing a merged line like:
+    //   "*** End Patch\",\"input\":\"*** Begin Patch"
+    {
+      const patchText = '*** Begin Patch\n*** End Patch';
+      const alreadyNormalized = JSON.stringify({ patch: patchText, input: patchText });
+      const validation = validateToolCall('apply_patch', alreadyNormalized);
+      if (!validation?.ok) {
+        throw new Error(
+          `[verify-apply-patch] already_normalized: validateToolCall failed with reason=${validation?.reason}`
+        );
+      }
+      const parsed = JSON.parse(validation.normalizedArgs);
+      const normalizedPatchText =
+        typeof parsed?.patch === 'string'
+          ? parsed.patch
+          : typeof parsed?.input === 'string'
+            ? parsed.input
+            : '';
+      if (!normalizedPatchText) {
+        throw new Error('[verify-apply-patch] already_normalized: missing patch text in normalized args');
+      }
+      if (normalizedPatchText.includes('","input":"*** Begin Patch') || normalizedPatchText.includes('*** End Patch","input":"')) {
+        throw new Error('[verify-apply-patch] already_normalized: patch text incorrectly contains serialized JSON keys');
+      }
+      if (normalizedPatchText.split('\n')[0] !== '*** Begin Patch') {
+        throw new Error('[verify-apply-patch] already_normalized: patch first line is not *** Begin Patch');
+      }
+      if (!normalizedPatchText.includes('*** End Patch')) {
+        throw new Error('[verify-apply-patch] already_normalized: patch missing *** End Patch');
+      }
+    }
+
+    // Regression: accept a typical sequence of apply_patch calls (add/update/append/escape/multi-hunk/delete).
+    // Note: we only validate tool governance & patch text normalization, not filesystem application.
+    {
+      const addBasic = [
+        '*** Begin Patch',
+        '*** Add File: .apply_patch_basic_add.txt',
+        '+apply_patch basic add ok',
+        '+line2',
+        '*** End Patch'
+      ].join('\n');
+      const updateBasic = [
+        '*** Begin Patch',
+        '*** Update File: .apply_patch_basic_add.txt',
+        '@@',
+        '-apply_patch basic add ok',
+        '+apply_patch basic add+update ok',
+        ' line2',
+        '*** End Patch'
+      ].join('\n');
+      const appendBasic = [
+        '*** Begin Patch',
+        '*** Update File: .apply_patch_basic_add.txt',
+        '@@',
+        ' apply_patch basic add+update ok',
+        ' line2',
+        '+line3 (append)',
+        '*** End Patch'
+      ].join('\n');
+      const addEscapeChars = [
+        '*** Begin Patch',
+        '*** Add File: .apply_patch_escape_chars.txt',
+        '+quotes: "double" and \'single\'',
+        '+backslash: \\',
+        '+json: {"a":1,"b":"x"}',
+        '+template: ${notInterpolated}',
+        '*** End Patch'
+      ].join('\n');
+      const addMulti = [
+        '*** Begin Patch',
+        '*** Add File: .apply_patch_multi_hunk.txt',
+        '+Header',
+        '+Section A',
+        '+Section B',
+        '+Footer',
+        '*** End Patch'
+      ].join('\n');
+      const updateMulti = [
+        '*** Begin Patch',
+        '*** Update File: .apply_patch_multi_hunk.txt',
+        '@@',
+        ' Header',
+        '-Section A',
+        '+Section A (updated)',
+        ' Section B',
+        ' Footer',
+        '@@',
+        ' Header',
+        ' Section A (updated)',
+        '-Section B',
+        '+Section B (updated)',
+        ' Footer',
+        '*** End Patch'
+      ].join('\n');
+      const deleteBasic = [
+        '*** Begin Patch',
+        '*** Delete File: .apply_patch_basic_add.txt',
+        '*** End Patch'
+      ].join('\n');
+      const deleteEscapeChars = [
+        '*** Begin Patch',
+        '*** Delete File: .apply_patch_escape_chars.txt',
+        '*** End Patch'
+      ].join('\n');
+      const deleteMulti = [
+        '*** Begin Patch',
+        '*** Delete File: .apply_patch_multi_hunk.txt',
+        '*** End Patch'
+      ].join('\n');
+
+      const cases = [
+        ['seq_basic_add_text', addBasic],
+        ['seq_basic_update_text', updateBasic],
+        ['seq_basic_append_text', appendBasic],
+        ['seq_escape_chars_text', addEscapeChars],
+        ['seq_multi_add_text', addMulti],
+        ['seq_multi_update_text', updateMulti],
+        ['seq_basic_delete_text', deleteBasic],
+        ['seq_escape_chars_delete_text', deleteEscapeChars],
+        ['seq_multi_delete_text', deleteMulti]
+      ];
+
+      for (const [label, patchText] of cases) {
+        await runApplyPatchArgsCase(label, patchText);
+        await runApplyPatchArgsCase(
+          `${label}_json`,
+          JSON.stringify({ patch: patchText, input: patchText })
+        );
+        await runApplyPatchArgsCase(
+          `${label}_json_escaped_newlines`,
+          JSON.stringify({ patch: escapeNewlines(patchText), input: escapeNewlines(patchText) })
+        );
+      }
+    }
+
+    // Regression: tolerate <arg_key>/<arg_value> artifacts stitched into patch strings.
+    // Some upstream providers may leak XML-like markup into JSON string fields.
+    {
+      const patchText = [
+        '*** Begin Patch',
+        '*** Delete File: .apply_patch_escape_test.txt',
+        '*** End Patch'
+      ].join('\n');
+      const injected = `${patchText}</arg_key><arg_value>input</arg_key><arg_value>${patchText}`;
+      const argsString = JSON.stringify({ patch: injected });
+      const validation = validateToolCall('apply_patch', argsString);
+      if (!validation?.ok) {
+        throw new Error(
+          `[verify-apply-patch] arg_key_artifacts: validateToolCall failed with reason=${validation?.reason}`
+        );
+      }
+      const parsed = JSON.parse(validation.normalizedArgs);
+      const normalizedPatchText =
+        typeof parsed?.patch === 'string'
+          ? parsed.patch
+          : typeof parsed?.input === 'string'
+            ? parsed.input
+            : '';
+      if (normalizedPatchText.includes('</arg_key><arg_value>')) {
+        throw new Error('[verify-apply-patch] arg_key_artifacts: patch still contains arg_key artifacts');
+      }
+      if (parsed?.patch !== parsed?.input) {
+        throw new Error('[verify-apply-patch] arg_key_artifacts: patch/input mismatch after normalization');
+      }
+    }
+
+    // Regression: invalid JSON containers should be classified as invalid_json (not missing_changes).
+    {
+      const invalidJson = '{"file":"a.ts","changes":[{"kind":"create_file","lines":["x"],"file</arg_key><arg_value>a.ts"}]}';
+      const validation = validateToolCall('apply_patch', invalidJson);
+      if (validation?.ok || validation?.reason !== 'invalid_json') {
+        throw new Error(
+          `[verify-apply-patch] invalid_json: expected invalid_json reason, got ok=${validation?.ok} reason=${validation?.reason}`
+        );
+      }
+    }
+
+    // Regression: patches can contain ``` blocks inside file content; do not treat them as outer fences.
+    {
+      const patchText = [
+        '*** Begin Patch',
+        '*** Add File: src/demo-codefence.md',
+        '+```json',
+        '+{\"ok\":true}',
+        '+```',
+        '*** End Patch'
+      ].join('\n');
+      const validation = validateToolCall('apply_patch', patchText);
+      if (!validation?.ok) {
+        throw new Error(
+          `[verify-apply-patch] inner_codefence: validateToolCall failed with reason=${validation?.reason}`
+        );
+      }
+      const parsed = JSON.parse(validation.normalizedArgs);
+      const normalizedPatchText =
+        typeof parsed?.patch === 'string'
+          ? parsed.patch
+          : typeof parsed?.input === 'string'
+            ? parsed.input
+            : '';
+      if (!normalizedPatchText.startsWith('*** Begin Patch')) {
+        throw new Error('[verify-apply-patch] inner_codefence: patch lost *** Begin Patch header');
+      }
+      if (!normalizedPatchText.includes('*** Add File: src/demo-codefence.md')) {
+        throw new Error('[verify-apply-patch] inner_codefence: missing Add File header');
+      }
+      if (!normalizedPatchText.includes('+```json') || !normalizedPatchText.includes('+```')) {
+        throw new Error('[verify-apply-patch] inner_codefence: missing fenced lines inside patch');
+      }
+    }
+
+    // Regression: tolerate newline-escaped snippets inside structured payload fields.
+    // Some models/clients double-escape multi-line anchors/targets (e.g. "\\n  ").
+    {
+      const structuredArgs = JSON.stringify({
+        file: 'src/demo-escaped-snippet.ts',
+        changes: [
+          {
+            kind: 'replace',
+            target: 'const alpha = 1;\\n  const beta = 2;',
+            lines: ['const alpha = 1;', '  const beta = 3;']
+          }
+        ]
+      });
+      const validation = validateToolCall('apply_patch', structuredArgs);
+      if (!validation?.ok) {
+        throw new Error(
+          `[verify-apply-patch] escaped_structured_snippet: validateToolCall failed with reason=${validation?.reason}`
+        );
+      }
+      const parsed = JSON.parse(validation.normalizedArgs);
+      const patchText =
+        typeof parsed?.patch === 'string'
+          ? parsed.patch
+          : typeof parsed?.input === 'string'
+            ? parsed.input
+            : '';
+      if (!patchText) {
+        throw new Error('[verify-apply-patch] escaped_structured_snippet: missing patch text in normalized args');
+      }
+      if (patchText.includes('const alpha = 1;\\n') || patchText.includes('\\n  const beta = 2;')) {
+        throw new Error('[verify-apply-patch] escaped_structured_snippet: patch still contains literal \\\\n in target');
+      }
+      if (!patchText.includes('-const alpha = 1;') || !patchText.includes('-  const beta = 2;')) {
+        throw new Error('[verify-apply-patch] escaped_structured_snippet: expected multi-line "-" target not found');
+      }
+    }
+
     const plainJson = JSON.stringify({
       file: 'src/demo.ts',
       changes: [
@@ -136,11 +468,9 @@ async function main() {
 
     console.log('✅ verify-apply-patch: text→tool_calls pipeline passed');
   } catch (error) {
-    console.error(error);
-    console.error(
-      '❌ verify-apply-patch 失败:',
-      error instanceof Error ? error.message : String(error ?? 'Unknown error')
-    );
+    const msg = error instanceof Error ? (error.stack || error.message) : String(error ?? 'Unknown error');
+    console.error(chalkError(msg));
+    console.error(chalkError(`❌ verify-apply-patch 失败: ${error instanceof Error ? error.message : String(error ?? 'Unknown error')}`));
     process.exit(1);
   }
 }

package/scripts/verify-e2e-toolcall.mjs

@@ -29,6 +29,24 @@ const AGENTS_INSTRUCTIONS = (() => {
   }
 })();
 
+function readServerApiKeyFromConfig(configPath) {
+  try {
+    const raw = fs.readFileSync(configPath, 'utf8');
+    const json = raw && raw.trim() ? JSON.parse(raw) : {};
+    const apikey = json?.httpserver?.apikey;
+    return typeof apikey === 'string' && apikey.trim() ? apikey.trim() : '';
+  } catch {
+    return '';
+  }
+}
+
+function buildAuthHeaders(serverApiKey) {
+  if (!serverApiKey) {
+    return {};
+  }
+  return { 'x-api-key': serverApiKey };
+}
+
 async function main() {
   if (!VERIFY_CONFIG) {
     console.error('❌ ROUTECODEX_VERIFY_CONFIG 未设置，无法运行端到端校验');
@@ -36,6 +54,8 @@ async function main() {
   }
 
   console.log(`[verify:e2e-toolcall] 使用配置: ${VERIFY_CONFIG}`);
+  const serverApiKey = readServerApiKeyFromConfig(VERIFY_CONFIG);
+  const authHeaders = buildAuthHeaders(serverApiKey);
   const serverEnv = {
     ...process.env,
     ROUTECODEX_CONFIG_PATH: VERIFY_CONFIG,
@@ -61,11 +81,12 @@ async function main() {
   try {
     await waitForServer();
     await waitForRouterWarmup();
-    await runToolcallVerification();
+    await runModelsSmokeCheck(authHeaders);
+    await runToolcallVerification(authHeaders);
     console.log('✅ 端到端工具调用校验通过');
 
-    await runDaemonAdminSmokeCheck();
-    await runConfigV2ProvidersSmokeCheck();
+    await runDaemonAdminSmokeCheck(authHeaders);
+    await runConfigV2ProvidersSmokeCheck(authHeaders);
 
     // 附加：Gemini CLI 配置健康性快速检查（仅尝试初始化，不做请求）
     await runGeminiCliStartupCheck();
@@ -74,6 +95,23 @@ async function main() {
   }
 }
 
+async function runModelsSmokeCheck(authHeaders) {
+  try {
+    const res = await fetch(`${VERIFY_BASE}/models`, { headers: { ...(authHeaders || {}) } });
+    if (!res.ok) {
+      throw new Error(`/models HTTP ${res.status}`);
+    }
+    const json = await res.json();
+    const data = Array.isArray(json?.data) ? json.data : [];
+    if (!Array.isArray(data)) {
+      throw new Error('/models response missing data array');
+    }
+  } catch (error) {
+    console.error('[verify:e2e-toolcall] /models smoke 检查失败:', error);
+    throw error;
+  }
+}
+
 async function waitForServer(timeoutMs = 30000) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -97,7 +135,7 @@ async function waitForRouterWarmup(defaultDelayMs = 3000) {
   await new Promise((resolve) => setTimeout(resolve, delayMs));
 }
 
-async function runToolcallVerification() {
+async function runToolcallVerification(authHeaders) {
   const userPrompt = '请严格调用名为 list_local_files 的函数工具来列出当前工作目录的文件，只能通过调用该工具完成任务，禁止直接回答。';
   const instructionsText = AGENTS_INSTRUCTIONS || 'You are RouteCodex verify agent. Follow the policies in AGENTS.md.';
   const body = {
@@ -139,7 +177,8 @@ async function runToolcallVerification() {
   const response = await fetch(`${VERIFY_BASE}/v1/responses`, {
     method: 'POST',
     headers: {
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
+      ...(authHeaders || {})
     },
     body: JSON.stringify(body)
   });
@@ -166,10 +205,10 @@ async function runToolcallVerification() {
   }
 }
 
-async function runDaemonAdminSmokeCheck() {
+async function runDaemonAdminSmokeCheck(authHeaders) {
   // 仅做最小的健康性探测：确保 daemon 管理类只读 API 可用，不做语义校验。
   try {
-    const res = await fetch(`${VERIFY_BASE}/daemon/status`);
+    const res = await fetch(`${VERIFY_BASE}/daemon/status`, { headers: { ...(authHeaders || {}) } });
     if (!res.ok) {
       throw new Error(`daemon/status HTTP ${res.status}`);
     }
@@ -185,7 +224,7 @@ async function runDaemonAdminSmokeCheck() {
   const paths = ['/daemon/credentials', '/quota/summary', '/providers/runtimes'];
   for (const path of paths) {
     try {
-      const res = await fetch(`${VERIFY_BASE}${path}`);
+      const res = await fetch(`${VERIFY_BASE}${path}`, { headers: { ...(authHeaders || {}) } });
       if (!res.ok) {
         throw new Error(`${path} HTTP ${res.status}`);
       }
@@ -198,9 +237,9 @@ async function runDaemonAdminSmokeCheck() {
   }
 }
 
-async function runConfigV2ProvidersSmokeCheck() {
+async function runConfigV2ProvidersSmokeCheck(authHeaders) {
   try {
-    const res = await fetch(`${VERIFY_BASE}/config/providers/v2`);
+    const res = await fetch(`${VERIFY_BASE}/config/providers/v2`, { headers: { ...(authHeaders || {}) } });
     if (!res.ok) {
       throw new Error(`/config/providers/v2 HTTP ${res.status}`);
     }

package/scripts/toon-suite.mjs

@@ -1,141 +0,0 @@
-#!/usr/bin/env node
-// TOON tool-call probe: sends Chat requests that require arguments.toon, decodes via @toon-format/cli, and summarizes results.
-
-import fetch from 'node-fetch';
-import { spawnSync } from 'node:child_process';
-
-function arg(k, d){ const i=process.argv.indexOf(k); return (i>0 && process.argv[i+1]) ? process.argv[i+1] : d; }
-function flag(k){ return process.argv.includes(k); }
-
-const server = arg('--server', 'http://127.0.0.1:5520');
-const endpoint = arg('--endpoint', '/v1/chat/completions');
-const url = `${server.replace(/\/$/,'')}${endpoint}`;
-const model = arg('--model', 'glm.glm-4.6');
-const doExec = flag('--exec'); // optional local execution (unsafe; whitelist only)
-
-const systemMsg = (
-  '当你使用工具 (tool_calls) 时，将 function.arguments 设为 JSON 字符串，且只包含字段 toon（字符串，多行 TOON）。' +
-  '不要输出其它字段、不要解释。' +
-  '示例：{"toon": "command: bash -lc \'echo ok\'\\nworkdir: .\\n"}。' +
-  '务必返回 tool_calls，并仅填充 arguments.toon。'
-);
-
-const tools = [
-  {
-    type: 'function',
-    function: {
-      name: 'shell_toon',
-      description: 'TOON 参数承载：将所有参数用 TOON 字符串放入 arguments.toon',
-      parameters: {
-        type: 'object',
-        properties: { toon: { type: 'string', description: 'TOON-encoded arguments' } },
-        required: ['toon'],
-        additionalProperties: false
-      }
-    }
-  }
-];
-
-const cases = [
-  {
-    title: 'find_parens_exec',
-    user: "请使用 shell_toon：bash -lc 执行：find . -type f \\( -name '*.md' -o -name '*.txt' \\) -exec basename {} \\; | sort -u | head -n 5。只返回 tool_calls。"
-  },
-  {
-    title: 'awk_regex',
-    user: "请用 shell_toon：bash -lc 执行：printf 'alpha,error\\nbeta,ok\\n' | awk -F, '{ if (\\$2 ~ /error/) print \\$1 }'。只返回 tool_calls。"
-  },
-  {
-    title: 'sed_replace',
-    user: "请用 shell_toon：bash -lc 执行：printf 'a=1\\nb=2\\n' | sed -E 's/([ab])=(\\\\d+)/\\\\1: \\\\2/g'。只返回 tool_calls。"
-  },
-  {
-    title: 'python_heredoc',
-    user: `请用 shell_toon：构造“单行” bash -lc 命令来执行多行 Python。禁止在命令中出现真实换行符；改用 ANSI-C 风格 $'...' 在“一行内”嵌入换行(\\n)。示例（仅示意）：bash -lc $'python3 - <<\'PY\'\\nprint(1)\\nPY'。实际请输出：用 $'...' 方式在一行内执行 python3 - <<'PY' 的多行脚本：\nimport json\nprint(json.dumps({"ok": true, "sum": 1+2+3}))\n并保持整条命令为一行。只返回 tool_calls。`
-  },
-  {
-    title: 'xargs_space',
-    user: "请用 shell_toon：bash -lc 执行：printf 'A B.md\\nC D.md\\n' | xargs -I{} bash -lc 'echo \"{}\" | tr \" \" _'。只返回 tool_calls。"
-  },
-  {
-    title: 'grep_sort_uniq',
-    user: "请用 shell_toon：bash -lc 执行：printf 'a\\nb\\na\\nc\\n' | grep -E '[a-c]' | sort | uniq -c | sort -nr。只返回 tool_calls。"
-  }
-];
-
-function decodeToon(toonStr){
-  const res = spawnSync('npx', ['-y','@toon-format/cli','--decode'], { input: toonStr, encoding: 'utf-8' });
-  if ((res.status ?? 0) !== 0) return { ok: false, error: res.stderr || 'decode failed' };
-  try { const obj = JSON.parse(res.stdout || '{}'); return { ok: true, value: obj }; } catch (e){ return { ok: false, error: 'json parse failed', raw: res.stdout }; }
-}
-
-function safeExec(cmd){
-  const allow = /^(bash\s+-lc\s+).*/s.test(cmd) && /(find|printf|awk|sed|python3|ls|sort|head|uniq|tr)/.test(cmd);
-  if (!allow) return { ok: false, skipped: true };
-  const res = spawnSync('bash', ['-lc', cmd], { encoding: 'utf-8' });
-  return {
-    ok: true,
-    code: res.status ?? 0,
-    stdout: (res.stdout || '').split('\n').slice(0, 20).join('\n'),
-    stderr: (res.stderr || '').split('\n').slice(0, 20).join('\n')
-  };
-}
-
-async function runCase(c){
-  const payload = {
-    model,
-    stream: false,
-    tool_choice: { type: 'function', function: { name: 'shell_toon' } },
-    messages: [ { role: 'system', content: systemMsg }, { role: 'user', content: c.user } ],
-    tools
-  };
-  const res = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
-  let body; try { body = await res.json(); } catch { return { title: c.title, status: 'http_error', note: res.statusText }; }
-  const msg = body?.choices?.[0]?.message;
-  const argStr = msg?.tool_calls?.[0]?.function?.arguments;
-  if (typeof argStr !== 'string') return { title: c.title, status: 'no_arguments' };
-  let argumentsObj; try { argumentsObj = JSON.parse(argStr); } catch { return { title: c.title, status: 'arguments_not_json' }; }
-  const toon = argumentsObj?.toon;
-  if (typeof toon !== 'string' || !toon.trim()) return { title: c.title, status: 'no_toon' };
-  const decoded = decodeToon(toon);
-  if (!decoded.ok) return { title: c.title, status: 'toon_decode_fail', note: decoded.error };
-  const cmd = decoded.value?.command;
-  let execRes = undefined;
-  if (doExec && typeof cmd === 'string' && cmd.trim()) execRes = safeExec(cmd);
-  return { title: c.title, status: 'ok', toon, decoded: decoded.value, exec: execRes };
-}
-
-async function main(){
-  console.log(`TOON probe → ${url} model=${model} exec=${doExec?'on':'off'}`);
-  const results = [];
-  for (const c of cases) {
-    try {
-      const r = await runCase(c);
-      results.push(r);
-      console.log(`\n=== ${c.title} ===`);
-      console.log(`status: ${r.status}`);
-      if (r.status === 'ok') {
-        const preview = String(r.toon).split('\n').slice(0,4).join('\n');
-        console.log('toon:\n' + preview);
-        console.log('decoded:', JSON.stringify(r.decoded));
-        if (r.exec && r.exec.ok) {
-          console.log('exec code:', r.exec.code);
-          console.log('stdout:\n' + r.exec.stdout);
-          if (r.exec.stderr) console.log('stderr:\n' + r.exec.stderr);
-        }
-      } else if (r.note) {
-        console.log('note:', r.note);
-      }
-    } catch (e) {
-      results.push({ title: c.title, status: 'exception', note: e?.message || String(e) });
-      console.log(`\n=== ${c.title} ===`);
-      console.log('status: exception');
-      console.log('note:', e?.message || String(e));
-    }
-  }
-  const ok = results.filter(x=>x.status==='ok').length;
-  console.log('\nSUMMARY:', `${ok}/${results.length} ok`);
-  for (const r of results) console.log(`- ${r.title}: ${r.status}`);
-}
-
-main().catch(e=>{ console.error('fatal:', e?.message || e); process.exit(1); });