@volter-ai-dev/supercode-ui 0.1.15 → 0.1.16

package/components.mjs

@@ -113,18 +113,116 @@ function decodedLiteral(value) {
 function sourceString(source, keys) {
   if (!source) return "";
   const names = keys.join("|");
-  const match = new RegExp(`\\b(?:${names})\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
+  const match = new RegExp(`(?:^|[,{\\s])["']?(?:${names})["']?\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
   return decodedLiteral(match?.[1]);
 }
+function callArgumentSource(source, open) {
+  let depth = 1;
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = open + 1; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "(") depth += 1;
+    else if (char === ")" && (depth -= 1) === 0) return source.slice(open + 1, index);
+  }
+  return source.slice(open + 1);
+}
+function toolCalls(source) {
+  const calls = [];
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = 0; index < source.length && calls.length < 8; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (!source.startsWith("tools.", index) || /[A-Za-z0-9_$]/.test(source[index - 1] ?? "")) continue;
+    const nameStart = index + 6;
+    let nameEnd = nameStart;
+    while (/[A-Za-z0-9_$]/.test(source[nameEnd] ?? "")) nameEnd += 1;
+    let open = nameEnd;
+    while (/\s/.test(source[open] ?? "")) open += 1;
+    if (nameEnd === nameStart || source[open] !== "(") continue;
+    calls.push({ name: source.slice(nameStart, nameEnd), arguments: callArgumentSource(source, open) });
+    index = open;
+  }
+  return calls;
+}
 function toolEnvelope(entry) {
   const value = argumentValue(entry.arguments);
-  const source = typeof value === "string" ? value : "";
-  const tools = source ? [...new Set([...source.matchAll(/\btools\.([A-Za-z0-9_]+)/g)].map((match) => match[1]))].slice(0, 8) : [];
+  const source = typeof value === "string" ? value : value === null ? entry.arguments ?? "" : "";
+  const calls = source ? toolCalls(source) : [];
+  const tools = [...new Set(calls.map((call) => call.name))];
   const name = tools.length === 1 ? tools[0] : entry.label ?? "tool";
-  return { args: record(value), source, tools, name };
+  return { args: record(value), source, callSource: calls[0]?.arguments ?? "", tools, name };
 }
 function patchPath(source) {
-  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]+)/.exec(source)?.[1]?.trim() ?? "";
+  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]*?)(?=\\[nr]|[\r\n]|$)/.exec(source)?.[1]?.trim() ?? "";
 }
 function explicitNumber(sources, keys) {
   for (const source of sources) {
@@ -174,6 +272,35 @@ function editPreview(args, resultText, source) {
   if (patch) return patch;
   return /^(?:diff --git|@@ |--- |\+\+\+ )/m.test(resultText ?? "") ? resultText : "";
 }
+function verificationCommand(command) {
+  let shell = "";
+  let quote = "";
+  let escaped = false;
+  for (const char of command) {
+    if (escaped) {
+      escaped = false;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (quote) {
+      if (char === quote) quote = "";
+      shell += " ";
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      shell += " ";
+      continue;
+    }
+    shell += char;
+  }
+  return /(?:^|[;&|]\s*)(?:(?:npm|pnpm|yarn|bun)\s+(?:run\s+)?(?:test|typecheck|lint|build)|cargo\s+(?:test|clippy|build|check|fmt)|npx\s+(?:vitest|tsc|eslint|playwright)|pytest\b|go\s+test\b)/i.test(shell);
+}
 function classifyTool(name, command) {
   const normalized = name.toLocaleLowerCase();
   if (/write_stdin|^wait$/.test(normalized)) return "command";
@@ -184,7 +311,7 @@ function classifyTool(name, command) {
   if (/browser|web|fetch|url/.test(normalized)) return "web";
   if (/agent|subagent|sendmessage|delegate|^task$/.test(normalized)) return "agent";
   if (/test|typecheck|lint|build/.test(normalized)) return "test";
-  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return /\b(test|typecheck|lint|build)\b/i.test(command) ? "test" : "command";
+  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return verificationCommand(command) ? "test" : "command";
   return "other";
 }
 function toolAction(status, category, name, tools) {
@@ -209,12 +336,12 @@ function toolAction(status, category, name, tools) {
 function createToolPresentation(entry) {
   const envelope = toolEnvelope(entry);
   const args = envelope.args;
-  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.source, ["command", "cmd"]);
+  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.callSource, ["command", "cmd"]);
   const category = classifyTool(envelope.name, command || envelope.source || entry.arguments || "");
-  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.source, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
-  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.source, ["query", "pattern", "q"]);
-  const url = firstString(args, ["url"]) || sourceString(envelope.source, ["url", "ref_id"]);
-  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.source, ["subject", "description", "summary", "task", "prompt"]);
+  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.callSource, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
+  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.callSource, ["query", "pattern", "q"]);
+  const url = firstString(args, ["url"]) || sourceString(envelope.callSource, ["url", "ref_id"]);
+  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.callSource, ["subject", "description", "summary", "task", "prompt"]);
   const background = /get_command_or_subagent_output|kill_command_or_subagent/i.test(envelope.name) ? "background task" : /write_stdin|^wait$/i.test(envelope.name) ? "background command" : "";
   const items = planItems(args);
   const taskId = firstString(args, ["taskId", "task_id"]);

package/conversation.mjs

@@ -99,18 +99,116 @@ function decodedLiteral(value) {
 function sourceString(source, keys) {
   if (!source) return "";
   const names = keys.join("|");
-  const match = new RegExp(`\\b(?:${names})\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
+  const match = new RegExp(`(?:^|[,{\\s])["']?(?:${names})["']?\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
   return decodedLiteral(match?.[1]);
 }
+function callArgumentSource(source, open) {
+  let depth = 1;
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = open + 1; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "(") depth += 1;
+    else if (char === ")" && (depth -= 1) === 0) return source.slice(open + 1, index);
+  }
+  return source.slice(open + 1);
+}
+function toolCalls(source) {
+  const calls = [];
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = 0; index < source.length && calls.length < 8; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (!source.startsWith("tools.", index) || /[A-Za-z0-9_$]/.test(source[index - 1] ?? "")) continue;
+    const nameStart = index + 6;
+    let nameEnd = nameStart;
+    while (/[A-Za-z0-9_$]/.test(source[nameEnd] ?? "")) nameEnd += 1;
+    let open = nameEnd;
+    while (/\s/.test(source[open] ?? "")) open += 1;
+    if (nameEnd === nameStart || source[open] !== "(") continue;
+    calls.push({ name: source.slice(nameStart, nameEnd), arguments: callArgumentSource(source, open) });
+    index = open;
+  }
+  return calls;
+}
 function toolEnvelope(entry) {
   const value = argumentValue(entry.arguments);
-  const source = typeof value === "string" ? value : "";
-  const tools = source ? [...new Set([...source.matchAll(/\btools\.([A-Za-z0-9_]+)/g)].map((match) => match[1]))].slice(0, 8) : [];
+  const source = typeof value === "string" ? value : value === null ? entry.arguments ?? "" : "";
+  const calls = source ? toolCalls(source) : [];
+  const tools = [...new Set(calls.map((call) => call.name))];
   const name = tools.length === 1 ? tools[0] : entry.label ?? "tool";
-  return { args: record(value), source, tools, name };
+  return { args: record(value), source, callSource: calls[0]?.arguments ?? "", tools, name };
 }
 function patchPath(source) {
-  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]+)/.exec(source)?.[1]?.trim() ?? "";
+  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]*?)(?=\\[nr]|[\r\n]|$)/.exec(source)?.[1]?.trim() ?? "";
 }
 function explicitNumber(sources, keys) {
   for (const source of sources) {
@@ -160,6 +258,35 @@ function editPreview(args, resultText, source) {
   if (patch) return patch;
   return /^(?:diff --git|@@ |--- |\+\+\+ )/m.test(resultText ?? "") ? resultText : "";
 }
+function verificationCommand(command) {
+  let shell = "";
+  let quote = "";
+  let escaped = false;
+  for (const char of command) {
+    if (escaped) {
+      escaped = false;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (quote) {
+      if (char === quote) quote = "";
+      shell += " ";
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      shell += " ";
+      continue;
+    }
+    shell += char;
+  }
+  return /(?:^|[;&|]\s*)(?:(?:npm|pnpm|yarn|bun)\s+(?:run\s+)?(?:test|typecheck|lint|build)|cargo\s+(?:test|clippy|build|check|fmt)|npx\s+(?:vitest|tsc|eslint|playwright)|pytest\b|go\s+test\b)/i.test(shell);
+}
 function classifyTool(name, command) {
   const normalized = name.toLocaleLowerCase();
   if (/write_stdin|^wait$/.test(normalized)) return "command";
@@ -170,7 +297,7 @@ function classifyTool(name, command) {
   if (/browser|web|fetch|url/.test(normalized)) return "web";
   if (/agent|subagent|sendmessage|delegate|^task$/.test(normalized)) return "agent";
   if (/test|typecheck|lint|build/.test(normalized)) return "test";
-  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return /\b(test|typecheck|lint|build)\b/i.test(command) ? "test" : "command";
+  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return verificationCommand(command) ? "test" : "command";
   return "other";
 }
 function toolAction(status, category, name, tools) {
@@ -195,12 +322,12 @@ function toolAction(status, category, name, tools) {
 function createToolPresentation(entry) {
   const envelope = toolEnvelope(entry);
   const args = envelope.args;
-  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.source, ["command", "cmd"]);
+  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.callSource, ["command", "cmd"]);
   const category = classifyTool(envelope.name, command || envelope.source || entry.arguments || "");
-  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.source, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
-  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.source, ["query", "pattern", "q"]);
-  const url = firstString(args, ["url"]) || sourceString(envelope.source, ["url", "ref_id"]);
-  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.source, ["subject", "description", "summary", "task", "prompt"]);
+  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.callSource, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
+  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.callSource, ["query", "pattern", "q"]);
+  const url = firstString(args, ["url"]) || sourceString(envelope.callSource, ["url", "ref_id"]);
+  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.callSource, ["subject", "description", "summary", "task", "prompt"]);
   const background = /get_command_or_subagent_output|kill_command_or_subagent/i.test(envelope.name) ? "background task" : /write_stdin|^wait$/i.test(envelope.name) ? "background command" : "";
   const items = planItems(args);
   const taskId = firstString(args, ["taskId", "task_id"]);

package/core.mjs

@@ -127,22 +127,83 @@ function decodedLiteral(value) {
 function sourceString(source, keys) {
   if (!source) return '';
   const names = keys.join('|');
-  const match = new RegExp(`\\b(?:${names})\\s*:\\s*(\"(?:\\\\.|[^\"\\\\])*\"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
+  const match = new RegExp(`(?:^|[,{\\s])[\"']?(?:${names})[\"']?\\s*:\\s*(\"(?:\\\\.|[^\"\\\\])*\"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
   return decodedLiteral(match?.[1]);
 }
 
+function callArgumentSource(source, open) {
+  let depth = 1;
+  let quote = '';
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = open + 1; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) { if (char === '\n') lineComment = false; continue; }
+    if (blockComment) { if (char === '*' && next === '/') { blockComment = false; index += 1; } continue; }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === '\\') escaped = true;
+      else if (char === quote) quote = '';
+      continue;
+    }
+    if (char === '/' && next === '/') { lineComment = true; index += 1; continue; }
+    if (char === '/' && next === '*') { blockComment = true; index += 1; continue; }
+    if (char === '"' || char === "'" || char === '`') { quote = char; continue; }
+    if (char === '(') depth += 1;
+    else if (char === ')' && (depth -= 1) === 0) return source.slice(open + 1, index);
+  }
+  return source.slice(open + 1);
+}
+
+function toolCalls(source) {
+  const calls = [];
+  let quote = '';
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = 0; index < source.length && calls.length < 8; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) { if (char === '\n') lineComment = false; continue; }
+    if (blockComment) { if (char === '*' && next === '/') { blockComment = false; index += 1; } continue; }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === '\\') escaped = true;
+      else if (char === quote) quote = '';
+      continue;
+    }
+    if (char === '/' && next === '/') { lineComment = true; index += 1; continue; }
+    if (char === '/' && next === '*') { blockComment = true; index += 1; continue; }
+    if (char === '"' || char === "'" || char === '`') { quote = char; continue; }
+    if (!source.startsWith('tools.', index) || /[A-Za-z0-9_$]/.test(source[index - 1] ?? '')) continue;
+    const nameStart = index + 6;
+    let nameEnd = nameStart;
+    while (/[A-Za-z0-9_$]/.test(source[nameEnd] ?? '')) nameEnd += 1;
+    let open = nameEnd;
+    while (/\s/.test(source[open] ?? '')) open += 1;
+    if (nameEnd === nameStart || source[open] !== '(') continue;
+    calls.push({ name: source.slice(nameStart, nameEnd), arguments: callArgumentSource(source, open) });
+    index = open;
+  }
+  return calls;
+}
+
 function toolEnvelope(entry) {
   const value = argumentValue(entry.arguments);
-  const source = typeof value === 'string' ? value : '';
-  const tools = source
-    ? [...new Set([...source.matchAll(/\btools\.([A-Za-z0-9_]+)/g)].map((match) => match[1]))].slice(0, 8)
-    : [];
+  // Codex custom tools retain their safe JavaScript wrapper directly, while function-call
+  // envelopes usually retain JSON. Parse the latter, but treat unparsed text only as source for
+  // bounded literal extraction—never evaluate it and never surface the wrapper as primary UI.
+  const source = typeof value === 'string' ? value : value === null ? entry.arguments ?? '' : '';
+  const calls = source ? toolCalls(source) : [];
+  const tools = [...new Set(calls.map((call) => call.name))];
   const name = tools.length === 1 ? tools[0] : entry.label ?? 'tool';
-  return { args: record(value), source, tools, name };
+  return { args: record(value), source, callSource: calls[0]?.arguments ?? '', tools, name };
 }
 
 function patchPath(source) {
-  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]+)/.exec(source)?.[1]?.trim() ?? '';
+  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]*?)(?=\\[nr]|[\r\n]|$)/.exec(source)?.[1]?.trim() ?? '';
 }
 
 function explicitNumber(sources, keys) {
@@ -198,6 +259,20 @@ function editPreview(args, resultText, source) {
   return /^(?:diff --git|@@ |--- |\+\+\+ )/m.test(resultText ?? '') ? resultText : '';
 }
 
+function verificationCommand(command) {
+  let shell = '';
+  let quote = '';
+  let escaped = false;
+  for (const char of command) {
+    if (escaped) { escaped = false; shell += quote ? ' ' : char; continue; }
+    if (char === '\\') { escaped = true; shell += quote ? ' ' : char; continue; }
+    if (quote) { if (char === quote) quote = ''; shell += ' '; continue; }
+    if (char === '"' || char === "'" || char === '`') { quote = char; shell += ' '; continue; }
+    shell += char;
+  }
+  return /(?:^|[;&|]\s*)(?:(?:npm|pnpm|yarn|bun)\s+(?:run\s+)?(?:test|typecheck|lint|build)|cargo\s+(?:test|clippy|build|check|fmt)|npx\s+(?:vitest|tsc|eslint|playwright)|pytest\b|go\s+test\b)/i.test(shell);
+}
+
 function classifyTool(name, command) {
   const normalized = name.toLocaleLowerCase();
   if (/write_stdin|^wait$/.test(normalized)) return 'command';
@@ -208,7 +283,7 @@ function classifyTool(name, command) {
   if (/browser|web|fetch|url/.test(normalized)) return 'web';
   if (/agent|subagent|sendmessage|delegate|^task$/.test(normalized)) return 'agent';
   if (/test|typecheck|lint|build/.test(normalized)) return 'test';
-  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return /\b(test|typecheck|lint|build)\b/i.test(command) ? 'test' : 'command';
+  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return verificationCommand(command) ? 'test' : 'command';
   return 'other';
 }
 
@@ -235,12 +310,12 @@ function toolAction(status, category, name, tools) {
 export function createToolPresentation(entry) {
   const envelope = toolEnvelope(entry);
   const args = envelope.args;
-  const command = firstString(args, ['command', 'cmd']) || sourceString(envelope.source, ['command', 'cmd']);
+  const command = firstString(args, ['command', 'cmd']) || sourceString(envelope.callSource, ['command', 'cmd']);
   const category = classifyTool(envelope.name, command || envelope.source || entry.arguments || '');
-  const path = firstString(args, ['file_path', 'target_file', 'target_directory', 'path']) || sourceString(envelope.source, ['file_path', 'target_file', 'target_directory', 'path']) || patchPath(envelope.source);
-  const query = firstString(args, ['query', 'pattern']) || sourceString(envelope.source, ['query', 'pattern', 'q']);
-  const url = firstString(args, ['url']) || sourceString(envelope.source, ['url', 'ref_id']);
-  const subject = firstString(args, ['subject', 'description', 'summary', 'task', 'prompt']) || sourceString(envelope.source, ['subject', 'description', 'summary', 'task', 'prompt']);
+  const path = firstString(args, ['file_path', 'target_file', 'target_directory', 'path']) || sourceString(envelope.callSource, ['file_path', 'target_file', 'target_directory', 'path']) || patchPath(envelope.source);
+  const query = firstString(args, ['query', 'pattern']) || sourceString(envelope.callSource, ['query', 'pattern', 'q']);
+  const url = firstString(args, ['url']) || sourceString(envelope.callSource, ['url', 'ref_id']);
+  const subject = firstString(args, ['subject', 'description', 'summary', 'task', 'prompt']) || sourceString(envelope.callSource, ['subject', 'description', 'summary', 'task', 'prompt']);
   const background = /get_command_or_subagent_output|kill_command_or_subagent/i.test(envelope.name) ? 'background task' : /write_stdin|^wait$/i.test(envelope.name) ? 'background command' : '';
   const items = planItems(args);
   const taskId = firstString(args, ['taskId', 'task_id']);

package/embed.mjs

@@ -116,18 +116,116 @@ function decodedLiteral(value) {
 function sourceString(source, keys) {
   if (!source) return "";
   const names = keys.join("|");
-  const match = new RegExp(`\\b(?:${names})\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
+  const match = new RegExp(`(?:^|[,{\\s])["']?(?:${names})["']?\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
   return decodedLiteral(match?.[1]);
 }
+function callArgumentSource(source, open) {
+  let depth = 1;
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = open + 1; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "(") depth += 1;
+    else if (char === ")" && (depth -= 1) === 0) return source.slice(open + 1, index);
+  }
+  return source.slice(open + 1);
+}
+function toolCalls(source) {
+  const calls = [];
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = 0; index < source.length && calls.length < 8; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (!source.startsWith("tools.", index) || /[A-Za-z0-9_$]/.test(source[index - 1] ?? "")) continue;
+    const nameStart = index + 6;
+    let nameEnd = nameStart;
+    while (/[A-Za-z0-9_$]/.test(source[nameEnd] ?? "")) nameEnd += 1;
+    let open = nameEnd;
+    while (/\s/.test(source[open] ?? "")) open += 1;
+    if (nameEnd === nameStart || source[open] !== "(") continue;
+    calls.push({ name: source.slice(nameStart, nameEnd), arguments: callArgumentSource(source, open) });
+    index = open;
+  }
+  return calls;
+}
 function toolEnvelope(entry) {
   const value = argumentValue(entry.arguments);
-  const source = typeof value === "string" ? value : "";
-  const tools = source ? [...new Set([...source.matchAll(/\btools\.([A-Za-z0-9_]+)/g)].map((match) => match[1]))].slice(0, 8) : [];
+  const source = typeof value === "string" ? value : value === null ? entry.arguments ?? "" : "";
+  const calls = source ? toolCalls(source) : [];
+  const tools = [...new Set(calls.map((call) => call.name))];
   const name = tools.length === 1 ? tools[0] : entry.label ?? "tool";
-  return { args: record(value), source, tools, name };
+  return { args: record(value), source, callSource: calls[0]?.arguments ?? "", tools, name };
 }
 function patchPath(source) {
-  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]+)/.exec(source)?.[1]?.trim() ?? "";
+  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]*?)(?=\\[nr]|[\r\n]|$)/.exec(source)?.[1]?.trim() ?? "";
 }
 function explicitNumber(sources, keys) {
   for (const source of sources) {
@@ -177,6 +275,35 @@ function editPreview(args, resultText, source) {
   if (patch) return patch;
   return /^(?:diff --git|@@ |--- |\+\+\+ )/m.test(resultText ?? "") ? resultText : "";
 }
+function verificationCommand(command) {
+  let shell = "";
+  let quote = "";
+  let escaped = false;
+  for (const char of command) {
+    if (escaped) {
+      escaped = false;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (quote) {
+      if (char === quote) quote = "";
+      shell += " ";
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      shell += " ";
+      continue;
+    }
+    shell += char;
+  }
+  return /(?:^|[;&|]\s*)(?:(?:npm|pnpm|yarn|bun)\s+(?:run\s+)?(?:test|typecheck|lint|build)|cargo\s+(?:test|clippy|build|check|fmt)|npx\s+(?:vitest|tsc|eslint|playwright)|pytest\b|go\s+test\b)/i.test(shell);
+}
 function classifyTool(name, command) {
   const normalized = name.toLocaleLowerCase();
   if (/write_stdin|^wait$/.test(normalized)) return "command";
@@ -187,7 +314,7 @@ function classifyTool(name, command) {
   if (/browser|web|fetch|url/.test(normalized)) return "web";
   if (/agent|subagent|sendmessage|delegate|^task$/.test(normalized)) return "agent";
   if (/test|typecheck|lint|build/.test(normalized)) return "test";
-  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return /\b(test|typecheck|lint|build)\b/i.test(command) ? "test" : "command";
+  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return verificationCommand(command) ? "test" : "command";
   return "other";
 }
 function toolAction(status, category, name, tools) {
@@ -212,12 +339,12 @@ function toolAction(status, category, name, tools) {
 function createToolPresentation(entry) {
   const envelope = toolEnvelope(entry);
   const args = envelope.args;
-  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.source, ["command", "cmd"]);
+  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.callSource, ["command", "cmd"]);
   const category = classifyTool(envelope.name, command || envelope.source || entry.arguments || "");
-  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.source, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
-  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.source, ["query", "pattern", "q"]);
-  const url = firstString(args, ["url"]) || sourceString(envelope.source, ["url", "ref_id"]);
-  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.source, ["subject", "description", "summary", "task", "prompt"]);
+  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.callSource, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
+  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.callSource, ["query", "pattern", "q"]);
+  const url = firstString(args, ["url"]) || sourceString(envelope.callSource, ["url", "ref_id"]);
+  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.callSource, ["subject", "description", "summary", "task", "prompt"]);
   const background = /get_command_or_subagent_output|kill_command_or_subagent/i.test(envelope.name) ? "background task" : /write_stdin|^wait$/i.test(envelope.name) ? "background command" : "";
   const items = planItems(args);
   const taskId = firstString(args, ["taskId", "task_id"]);

package/messenger.mjs

@@ -113,18 +113,116 @@ function decodedLiteral(value) {
 function sourceString(source, keys) {
   if (!source) return "";
   const names = keys.join("|");
-  const match = new RegExp(`\\b(?:${names})\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
+  const match = new RegExp(`(?:^|[,{\\s])["']?(?:${names})["']?\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|'(?:\\\\.|[^'\\\\])*'|\`(?:\\\\.|[^\`\\\\])*\`)`).exec(source);
   return decodedLiteral(match?.[1]);
 }
+function callArgumentSource(source, open) {
+  let depth = 1;
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = open + 1; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "(") depth += 1;
+    else if (char === ")" && (depth -= 1) === 0) return source.slice(open + 1, index);
+  }
+  return source.slice(open + 1);
+}
+function toolCalls(source) {
+  const calls = [];
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+  for (let index = 0; index < source.length && calls.length < 8; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === quote) quote = "";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (!source.startsWith("tools.", index) || /[A-Za-z0-9_$]/.test(source[index - 1] ?? "")) continue;
+    const nameStart = index + 6;
+    let nameEnd = nameStart;
+    while (/[A-Za-z0-9_$]/.test(source[nameEnd] ?? "")) nameEnd += 1;
+    let open = nameEnd;
+    while (/\s/.test(source[open] ?? "")) open += 1;
+    if (nameEnd === nameStart || source[open] !== "(") continue;
+    calls.push({ name: source.slice(nameStart, nameEnd), arguments: callArgumentSource(source, open) });
+    index = open;
+  }
+  return calls;
+}
 function toolEnvelope(entry) {
   const value = argumentValue(entry.arguments);
-  const source = typeof value === "string" ? value : "";
-  const tools = source ? [...new Set([...source.matchAll(/\btools\.([A-Za-z0-9_]+)/g)].map((match) => match[1]))].slice(0, 8) : [];
+  const source = typeof value === "string" ? value : value === null ? entry.arguments ?? "" : "";
+  const calls = source ? toolCalls(source) : [];
+  const tools = [...new Set(calls.map((call) => call.name))];
   const name = tools.length === 1 ? tools[0] : entry.label ?? "tool";
-  return { args: record(value), source, tools, name };
+  return { args: record(value), source, callSource: calls[0]?.arguments ?? "", tools, name };
 }
 function patchPath(source) {
-  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]+)/.exec(source)?.[1]?.trim() ?? "";
+  return /\*\*\* (?:Update|Add|Delete) File:\s*([^\r\n]*?)(?=\\[nr]|[\r\n]|$)/.exec(source)?.[1]?.trim() ?? "";
 }
 function explicitNumber(sources, keys) {
   for (const source of sources) {
@@ -174,6 +272,35 @@ function editPreview(args, resultText, source) {
   if (patch) return patch;
   return /^(?:diff --git|@@ |--- |\+\+\+ )/m.test(resultText ?? "") ? resultText : "";
 }
+function verificationCommand(command) {
+  let shell = "";
+  let quote = "";
+  let escaped = false;
+  for (const char of command) {
+    if (escaped) {
+      escaped = false;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      shell += quote ? " " : char;
+      continue;
+    }
+    if (quote) {
+      if (char === quote) quote = "";
+      shell += " ";
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      shell += " ";
+      continue;
+    }
+    shell += char;
+  }
+  return /(?:^|[;&|]\s*)(?:(?:npm|pnpm|yarn|bun)\s+(?:run\s+)?(?:test|typecheck|lint|build)|cargo\s+(?:test|clippy|build|check|fmt)|npx\s+(?:vitest|tsc|eslint|playwright)|pytest\b|go\s+test\b)/i.test(shell);
+}
 function classifyTool(name, command) {
   const normalized = name.toLocaleLowerCase();
   if (/write_stdin|^wait$/.test(normalized)) return "command";
@@ -184,7 +311,7 @@ function classifyTool(name, command) {
   if (/browser|web|fetch|url/.test(normalized)) return "web";
   if (/agent|subagent|sendmessage|delegate|^task$/.test(normalized)) return "agent";
   if (/test|typecheck|lint|build/.test(normalized)) return "test";
-  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return /\b(test|typecheck|lint|build)\b/i.test(command) ? "test" : "command";
+  if (/terminal|bash|shell|command|exec|write_stdin|^wait$/.test(normalized)) return verificationCommand(command) ? "test" : "command";
   return "other";
 }
 function toolAction(status, category, name, tools) {
@@ -209,12 +336,12 @@ function toolAction(status, category, name, tools) {
 function createToolPresentation(entry) {
   const envelope = toolEnvelope(entry);
   const args = envelope.args;
-  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.source, ["command", "cmd"]);
+  const command = firstString(args, ["command", "cmd"]) || sourceString(envelope.callSource, ["command", "cmd"]);
   const category = classifyTool(envelope.name, command || envelope.source || entry.arguments || "");
-  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.source, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
-  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.source, ["query", "pattern", "q"]);
-  const url = firstString(args, ["url"]) || sourceString(envelope.source, ["url", "ref_id"]);
-  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.source, ["subject", "description", "summary", "task", "prompt"]);
+  const path = firstString(args, ["file_path", "target_file", "target_directory", "path"]) || sourceString(envelope.callSource, ["file_path", "target_file", "target_directory", "path"]) || patchPath(envelope.source);
+  const query = firstString(args, ["query", "pattern"]) || sourceString(envelope.callSource, ["query", "pattern", "q"]);
+  const url = firstString(args, ["url"]) || sourceString(envelope.callSource, ["url", "ref_id"]);
+  const subject = firstString(args, ["subject", "description", "summary", "task", "prompt"]) || sourceString(envelope.callSource, ["subject", "description", "summary", "task", "prompt"]);
   const background = /get_command_or_subagent_output|kill_command_or_subagent/i.test(envelope.name) ? "background task" : /write_stdin|^wait$/i.test(envelope.name) ? "background command" : "";
   const items = planItems(args);
   const taskId = firstString(args, ["taskId", "task_id"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter-ai-dev/supercode-ui",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "description": "Composable default UI kit for Supercode-powered coding-agent experiences",
   "exports": {