@wrongstack/tools 0.256.1 → 0.257.2

package/dist/pack.js

@@ -1,6 +1,6 @@
 import { spawn, execFileSync, spawnSync } from 'node:child_process';
 import * as Core from '@wrongstack/core';
-import { buildChildEnv, detectNewlineStyle, normalizeToLf, toStyle, atomicWrite, unifiedDiff, compileGlob, expectDefined, recordPackageAction, detectPackageEcosystem, mutatePlan, clearPlan, getPlanTemplate, addPlanItem, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, loadTasks, emptyTaskFile, saveTasks, formatTaskList, formatPlan, mutateTasks, loadPlan, emptyPlan, savePlan, computeTaskItemProgress, wstackGlobalRoot, resolveWstackPaths, truncate } from '@wrongstack/core';
+import { buildChildEnv, detectNewlineStyle, normalizeToLf, toStyle, atomicWrite, unifiedDiff, isPrivateIPv4, isPrivateIPv6, compileGlob, expectDefined, recordPackageAction, detectPackageEcosystem, mutatePlan, clearPlan, getPlanTemplate, addPlanItem, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, loadTasks, emptyTaskFile, saveTasks, formatTaskList, formatPlan, mutateTasks, loadPlan, emptyPlan, savePlan, computeTaskItemProgress, wstackGlobalRoot, resolveWstackPaths, truncate } from '@wrongstack/core';
 import * as fs from 'node:fs';
 import { statSync, mkdirSync, createWriteStream, writeFileSync } from 'node:fs';
 import * as fs14 from 'node:fs/promises';
@@ -14,6 +14,7 @@ import * as ts from 'typescript';
 import * as dns from 'node:dns/promises';
 import * as net from 'node:net';
 import { Agent } from 'undici';
+import TurndownService from 'turndown';
 import { randomUUID } from 'node:crypto';
 
 // src/_spawn-stream.ts
@@ -277,7 +278,7 @@ var SENSITIVE_FLAG_PATTERNS = [
   // --flag=value  or  --flag "value"  (value captured up to next space or comma)
   /--(?:token|password|passwd|pwd|secret|api[-_]?key|api[-_]?secret|auth|credential|private[-_]?key|access[-_]?key|github[-_]?token|gh[-_]?token|bearer|jwt|oauth|pin|pincode|passphrase|access[-_]?token)(?:[=\s,][^\s]*)?/gi,
   // -f "value" style short flags
-  /(?<!\w)-t(?:\s+|\s*=\s*)[^\s,]+/g,
+  /(?<!\w)-t(?:\s+|\s*=\s*)[^\s,]+/,
   /(?<!\w)-p(?:ssword)?(?:\s+|\s*=\s*)[^\s,]+/gi,
   // env var–style secrets: TOKEN=x, API_KEY=y, etc.
   /(?:TOKEN|API_KEY|API_SECRET|AUTH_TOKEN|GITHUB_TOKEN|GH_TOKEN|BEARER|JWT|OAUTH|CREDENTIAL|SECRET|PRIVATE_KEY|PASSWORD|PASSWD)\s*[=:]\s*[^\s,]+/gi,
@@ -413,8 +414,8 @@ var ProcessRegistryImpl = class {
     if (p.killed) return true;
     if (p.protected) return false;
     const { force = false, graceMs = DEFAULT_GRACE_MS } = opts;
-    const isWin = os.platform() === "win32";
-    if (isWin) {
+    const isWin3 = os.platform() === "win32";
+    if (isWin3) {
       const liveRealChild = p.child.exitCode === null && typeof p.child.pid === "number";
       if (liveRealChild && killWin32Tree(pid)) {
         const fallback = setTimeout(() => {
@@ -502,7 +503,7 @@ function getProcessRegistry() {
 }
 function resolveWin32Command(cmd) {
   if (process.platform !== "win32") return cmd;
-  if (cmd.includes("/") || cmd.includes("\\") || path3.extname(cmd)) {
+  if (cmd.includes("/") || cmd.includes("\\") || path3.extname(cmd.replace(/\//g, "\\"))) {
     return cmd;
   }
   const pathext = (process.env["PATHEXT"] ?? ".COM;.EXE;.BAT;.CMD;.VBS;.JS;.WS;.MSC").toLowerCase().split(";");
@@ -522,6 +523,7 @@ function resolveWin32Command(cmd) {
 }
 
 // src/_spawn-stream.ts
+var isWin = process.platform === "win32";
 async function* spawnStream(opts) {
   const max = opts.maxBytes ?? 2e5;
   const flushAt = opts.flushBytes ?? 4 * 1024;
@@ -532,7 +534,6 @@ async function* spawnStream(opts) {
   let error;
   const spool = createOutputSpool({ tool: opts.cmd, thresholdBytes: max });
   const cmd = resolveWin32Command(opts.cmd);
-  const isWin = process.platform === "win32";
   const needsShell = isWin && (cmd.endsWith(".cmd") || cmd.endsWith(".bat"));
   const child = spawn(cmd, opts.args, {
     cwd: opts.cwd,
@@ -909,7 +910,7 @@ function parseAuditOutput(json, exitCode) {
       total,
       summary,
       output: json,
-      truncated: json.length >= 1e5
+      truncated: json.length > 1e5
     };
   } catch {
     return {
@@ -1002,11 +1003,11 @@ var bashTool = {
       }));
     }
     const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT_MS, 6e5));
-    const isWin = os.platform() === "win32";
+    const isWin3 = os.platform() === "win32";
     const shell = (() => {
-      const explicit = process.env[isWin ? "WRONGSTACK_COMSPEC" : "WRONGSTACK_SHELL"];
+      const explicit = process.env[isWin3 ? "WRONGSTACK_COMSPEC" : "WRONGSTACK_SHELL"];
       if (explicit) return explicit;
-      if (isWin) return process.env["COMSPEC"] ?? "cmd.exe";
+      if (isWin3) return process.env["COMSPEC"] ?? "cmd.exe";
       const fromEnv = process.env["SHELL"];
       if (fromEnv) {
         const name = fromEnv.split("/").pop() ?? "";
@@ -1014,9 +1015,9 @@ var bashTool = {
       }
       return "/bin/bash";
     })();
-    const args = isWin ? ["/c", input.command] : ["-c", input.command];
+    const args = isWin3 ? ["/c", input.command] : ["-c", input.command];
     const env = buildChildEnv(ctx.session?.id);
-    const detached = !isWin;
+    const detached = !isWin3;
     const startedAt = Date.now();
     if (input.background) {
       let buf2 = "";
@@ -1032,7 +1033,7 @@ var bashTool = {
         // apply: the child gets a hidden console that grandchildren inherit.
         // Windows children survive parent exit either way. POSIX keeps
         // detached for the process-group kill semantics.
-        detached: !isWin,
+        detached: !isWin3,
         windowsHide: true,
         signal: opts.signal
       });
@@ -1062,8 +1063,6 @@ var bashTool = {
       };
       child2.stdout?.on("data", onBgData);
       child2.stderr?.on("data", onBgData);
-      child2.stdout?.unref?.();
-      child2.stderr?.unref?.();
       child2.on("close", () => {
         registry.afterCall(Date.now() - startedAt, false, bypassBreaker);
       });
@@ -1085,7 +1084,7 @@ var bashTool = {
       stdio: ["ignore", "pipe", "pipe"],
       detached,
       windowsHide: true,
-      ...isWin ? {} : { signal: opts.signal }
+      ...isWin3 ? {} : { signal: opts.signal }
     });
     const pid = child.pid;
     if (typeof pid === "number") {
@@ -1104,7 +1103,7 @@ var bashTool = {
     const timers = [];
     const spool = createOutputSpool({ tool: "bash", thresholdBytes: MAX_OUTPUT });
     function killWithTimeout(child2, timeoutMs2) {
-      if (isWin) {
+      if (isWin3) {
         if (typeof child2.pid === "number" && child2.exitCode === null && killWin32Tree(child2.pid)) {
           const fallback = setTimeout(() => {
             if (child2.exitCode === null) {
@@ -1160,7 +1159,7 @@ var bashTool = {
     timers.push(timer);
     timer.unref?.();
     const onAbort = () => killWithTimeout(child, 2e3);
-    if (isWin) {
+    if (isWin3) {
       if (opts.signal.aborted) onAbort();
       else opts.signal.addEventListener("abort", onAbort, { once: true });
     }
@@ -1256,7 +1255,7 @@ var bashTool = {
     } finally {
       for (const t of timers) clearTimeout(t);
       spool.finalize();
-      if (isWin) opts.signal.removeEventListener("abort", onAbort);
+      if (isWin3) opts.signal.removeEventListener("abort", onAbort);
       child.stdout?.off("data", onData);
       child.stderr?.off("data", onData);
       child.stdout?.destroy();
@@ -1326,7 +1325,7 @@ var batchToolUseTool = {
       failed = allResults.filter((r) => !r.success).length;
     } else {
       for (const call of input.calls) {
-        const result = await executeSingle(call, ctx, opts);
+        const result = await executeSingle(call, ctx, opts ?? { signal: void 0 });
         results.push(result);
         if (result.success) {
           succeeded++;
@@ -4272,10 +4271,6 @@ var documentTool = {
         enum: ["jsdoc", "tsdoc", "block"],
         description: "Documentation style (default: jsdoc)"
       },
-      overwrite: {
-        type: "boolean",
-        description: "Overwrite existing docstrings (default: false)"
-      },
       cwd: { type: "string", description: "Working directory (default: cwd)" }
     }
   },
@@ -4333,10 +4328,10 @@ async function resolveFiles(filesInput, cwd) {
 }
 function processFile(content, absPath, _style, _overwrite, target) {
   const results = [];
-  const functionRegex = /(?:async\s+)?function\s+(\w+)\s*\(([^)]*)\)/g;
-  const arrowRegex = /(?:const|let|var)\s+(\w+)\s*=\s*(?:async\s+)?\(([^)]*)\)\s*=>/g;
-  const classRegex = /class\s+(\w+)/g;
-  const typeRegex = /(?:type|interface)\s+(\w+)\s*[=<]/g;
+  const functionRegex = /(?:async\s+)?function\s+(\w+)\s*\(([^)]*)\)/;
+  const arrowRegex = /(?:const|let|var)\s+(\w+)\s*=\s*(?:async\s+)?\(([^)]*)\)\s*=>/;
+  const classRegex = /class\s+(\w+)/;
+  const typeRegex = /(?:type|interface)\s+(\w+)\s*[=<]/;
   const allMatches = [];
   if (target === "all" || target === "function") {
     for (const m of content.matchAll(functionRegex)) {
@@ -4510,6 +4505,7 @@ function findSimilarity(haystack, needle) {
   }
   return line;
 }
+var isWin2 = process.platform === "win32";
 var ALLOWED_COMMANDS = {
   node: ["--version", "-r", "--input-type=module"],
   npm: ["--version", "list", "pkg", "doctor", "view", "outdated", "audit"],
@@ -4718,14 +4714,13 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     const startedAt = Date.now();
     const spool = createOutputSpool({ tool: `exec-${cmd}`, thresholdBytes: MAX_OUTPUT2 });
     const resolved = resolveWin32Command(cmd);
-    const isWin = process.platform === "win32";
-    const needsShell = isWin && (resolved.endsWith(".cmd") || resolved.endsWith(".bat"));
+    const needsShell = isWin2 && (resolved.endsWith(".cmd") || resolved.endsWith(".bat"));
     const child = spawn(resolved, args, {
       cwd,
       env: buildChildEnv(sessionId),
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true,
-      ...isWin ? {} : { signal },
+      ...isWin2 ? {} : { signal },
       ...needsShell ? { shell: true, windowsVerbatimArguments: true } : {}
     });
     const registry = getProcessRegistry();
@@ -4744,7 +4739,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
       if (typeof pid === "number") registry.kill(pid, { force: true });
       else child.kill("SIGTERM");
     };
-    if (isWin) {
+    if (isWin2) {
       if (signal.aborted) onAbort();
       else signal.addEventListener("abort", onAbort, { once: true });
     }
@@ -4760,7 +4755,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      if (isWin) signal.removeEventListener("abort", onAbort);
+      if (isWin2) signal.removeEventListener("abort", onAbort);
       if (typeof pid === "number") registry.unregister(pid);
       const durationMs = Date.now() - startedAt;
       const exitCode = killed ? 124 : code ?? 1;
@@ -4778,7 +4773,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     });
     child.on("error", (err) => {
       clearTimeout(timer);
-      if (isWin) signal.removeEventListener("abort", onAbort);
+      if (isWin2) signal.removeEventListener("abort", onAbort);
       if (typeof pid === "number") registry.unregister(pid);
       registry.afterCall(Date.now() - startedAt, true);
       spool.finalize();
@@ -4794,6 +4789,16 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     });
   });
 }
+var TD = new TurndownService({
+  // Use `# Title` for headings, not setext underline style (`Title\n=====`).
+  headingStyle: "atx",
+  // Don't wrap code blocks in <pre> — render them as triple-backtick blocks.
+  codeBlockStyle: "fenced"
+});
+TD.addRule("stripDangerousElements", {
+  filter: ["script", "style", "noscript"],
+  replacement: () => ""
+});
 var MAX_BYTES = 131072;
 var TIMEOUT_MS = 2e4;
 var ALLOW_PRIVATE = process.env["WRONGSTACK_FETCH_ALLOW_PRIVATE"] === "1";
@@ -4828,7 +4833,7 @@ function guardedLookup(hostname, options, callback) {
       );
       return;
     }
-    const first = list[0];
+    const first = list.at(0);
     if (!first) {
       callback(
         Object.assign(new Error(`fetch: no address for ${hostname}`), { code: "ENOTFOUND" })
@@ -4968,7 +4973,7 @@ var fetchTool = {
           pendingBytes += value.byteLength;
           chunks.push(value);
           if (pendingBytes >= FLUSH_AT) {
-            const recent = Buffer.from(value).toString("utf8");
+            const recent = Buffer.from(value).toString("utf-8");
             yield {
               type: "partial_output",
               text: recent,
@@ -4983,7 +4988,7 @@ var fetchTool = {
       const format = input.format ?? (ct.includes("text/html") ? "markdown" : "text");
       let content;
       if (format === "raw") content = text;
-      else if (format === "markdown" && ct.includes("text/html")) content = htmlToMarkdown(text);
+      else if (format === "markdown" && ct.includes("text/html")) content = TD.turndown(text);
       else if (ct.includes("application/json")) content = prettyJson(text);
       else content = text;
       yield {
@@ -5029,67 +5034,6 @@ async function assertNotPrivate(hostname) {
     }
   }
 }
-function isPrivateIPv4(addr) {
-  const parts = addr.split(".").map((p) => Number.parseInt(p, 10));
-  if (parts.length !== 4 || parts.some((n) => Number.isNaN(n) || n < 0 || n > 255)) {
-    return true;
-  }
-  const [a, b, c] = parts;
-  if (a === 0) return true;
-  if (a === 10) return true;
-  if (a === 127) return true;
-  if (a === 169 && b === 254) return true;
-  if (a === 172 && b >= 16 && b <= 31) return true;
-  if (a === 192 && b === 168) return true;
-  if (a === 192 && b === 0 && c === 0) return true;
-  if (a === 100 && b >= 64 && b <= 127) return true;
-  if (a >= 224) return true;
-  return false;
-}
-function isPrivateIPv6(addr) {
-  const lower = addr.toLowerCase();
-  if (lower === "::" || lower === "::1") return true;
-  const groups = expandIPv6(lower);
-  if (!groups) return true;
-  if (groups[0] === 0 && groups[1] === 0 && groups[2] === 0 && groups[3] === 0 && groups[4] === 0 && groups[5] === 65535) {
-    const a = (groups[6] ?? 0) >> 8;
-    const b = (groups[6] ?? 0) & 255;
-    const c = (groups[7] ?? 0) >> 8;
-    const d = (groups[7] ?? 0) & 255;
-    return isPrivateIPv4(`${a}.${b}.${c}.${d}`);
-  }
-  const high = groups[0] ?? 0;
-  if ((high & 65024) === 64512) return true;
-  if ((high & 65472) === 65152) return true;
-  if ((high & 65280) === 65280) return true;
-  return false;
-}
-function expandIPv6(addr) {
-  const parts = addr.split("::");
-  if (parts.length > 2) return null;
-  const parseGroups = (s) => {
-    if (s === "") return [];
-    const out = [];
-    for (const g of s.split(":")) {
-      if (g.length === 0 || g.length > 4) return null;
-      const n = Number.parseInt(g, 16);
-      if (Number.isNaN(n) || n < 0 || n > 65535) return null;
-      out.push(n);
-    }
-    return out;
-  };
-  if (parts.length === 1) {
-    const groups = parseGroups(parts[0] ?? "");
-    if (!groups || groups.length !== 8) return null;
-    return groups;
-  }
-  const head = parseGroups(parts[0] ?? "");
-  const tail = parseGroups(parts[1] ?? "");
-  if (!head || !tail) return null;
-  const fill = 8 - head.length - tail.length;
-  if (fill < 0) return null;
-  return [...head, ...new Array(fill).fill(0), ...tail];
-}
 function prettyJson(s) {
   try {
     return JSON.stringify(JSON.parse(s), null, 2);
@@ -5097,32 +5041,6 @@ function prettyJson(s) {
     return s;
   }
 }
-function htmlToMarkdown(html) {
-  let s = html;
-  s = s.replace(/<script[\s\S]*?<\/script>/gi, "");
-  s = s.replace(/<style[\s\S]*?<\/style>/gi, "");
-  s = s.replace(/<noscript[\s\S]*?<\/noscript>/gi, "");
-  s = s.replace(/<h([1-6])[^>]*>([\s\S]*?)<\/h\1>/gi, (_m, n, c) => {
-    return "\n" + "#".repeat(Number(n)) + " " + stripTags(c).trim() + "\n";
-  });
-  s = s.replace(/<(strong|b)[^>]*>([\s\S]*?)<\/\1>/gi, "**$2**");
-  s = s.replace(/<(em|i)[^>]*>([\s\S]*?)<\/\1>/gi, "*$2*");
-  s = s.replace(/<a [^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/gi, (_m, href, text) => {
-    const safe = /^(https?|ftps?):\/\//i.test(href) && !/^(javascript|data|vbscript):/i.test(href);
-    return safe ? `[${text}](${href})` : text;
-  });
-  s = s.replace(/<pre[^>]*>([\s\S]*?)<\/pre>/gi, (_m, c) => "\n```\n" + stripTags(c) + "\n```\n");
-  s = s.replace(/<code[^>]*>([\s\S]*?)<\/code>/gi, "`$1`");
-  s = s.replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, "- $1\n");
-  s = s.replace(/<br\s*\/?>/gi, "\n");
-  s = s.replace(/<\/p>/gi, "\n\n");
-  s = stripTags(s);
-  s = s.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ");
-  return s.replace(/\n{3,}/g, "\n\n").trim();
-}
-function stripTags(s) {
-  return s.replace(/<[^>]+>/g, "");
-}
 
 // src/format.ts
 var formatTool = {
@@ -5198,7 +5116,7 @@ var formatTool = {
       signal: opts.signal,
       maxBytes: 1e5
     });
-    const changed = (result.stdout.match(/changed/g) || []).length;
+    const changed = [...result.stdout.matchAll(/\bchanged\b/gi)].length;
     yield {
       type: "final",
       output: {
@@ -5397,7 +5315,7 @@ function buildArgs(input) {
         ...files.length ? ["--", ...files] : []
       ];
     case "branch":
-      return input.branch ? ["branch", ...input.branch.startsWith("-") ? [] : [input.branch]] : ["branch"];
+      return input.branch ? ["branch", ...input.branch.startsWith("-") || input.branch.includes(" --") ? [] : [input.branch]] : ["branch"];
     case "checkout":
       return [
         "checkout",
@@ -5413,7 +5331,7 @@ function buildArgs(input) {
     case "fetch":
       return ["fetch", ...input.branch ? [input.branch] : ["--all"]];
     case "reset":
-      return ["reset"];
+      return ["reset", ...files.length ? ["--", ...files] : []];
     case "worktree":
       switch (input.worktreeAction) {
         case "list":
@@ -6225,8 +6143,8 @@ var lintTool = {
     }
     const cmd = detected === "biome" ? "biome" : detected;
     const result = yield* spawnStream({ cmd, args, cwd, signal: opts.signal, maxBytes: 1e5 });
-    const errors = (result.stdout.match(/error/g) || []).length;
-    const warnings = (result.stdout.match(/warning/g) || []).length;
+    const errors = [...result.stdout.matchAll(/\berror\b/gi)].length;
+    const warnings = [...result.stdout.matchAll(/\bwarning\b/gi)].length;
     yield {
       type: "final",
       output: {
@@ -6365,9 +6283,11 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
     child.stderr?.on("data", (c) => {
       if (stderr.length < MAX) stderr += c.toString();
     });
-    child.stdout?.on("error", () => {
+    child.stdout?.on("error", (e) => {
+      console.log(JSON.stringify({ level: "debug", event: "pipe_error", stream: "stdout", error: e.message }));
     });
-    child.stderr?.on("error", () => {
+    child.stderr?.on("error", (e) => {
+      console.log(JSON.stringify({ level: "debug", event: "pipe_error", stream: "stderr", error: e.message }));
     });
     child.on("close", () => {
       const output = stdout + stderr;
@@ -6645,14 +6565,16 @@ function extractDiffTargets(patch) {
   const out = [];
   const re = /^\+\+\+\s+([^\t\r\n]+)/gm;
   for (const m of patch.matchAll(re)) {
-    const target = m[1]?.trim();
+    const raw = m[1];
+    if (!raw) continue;
+    const target = raw.length > 4096 ? raw.slice(0, 4096).trim() : raw.trim();
     if (!target || target === "/dev/null") continue;
     out.push(target);
   }
   return out;
 }
 function stripPathComponents(p, strip) {
-  const parts = p.replace(/\\/g, "/").split("/");
+  const parts = p.replace(/\\/g, "/").split("/").filter((s) => s !== "" && s !== ".");
   if (parts.length <= strip) return void 0;
   return parts.slice(strip).join("/");
 }
@@ -7444,7 +7366,8 @@ async function duckduckgoSearch(query2, num, signal) {
       source: "duckduckgo",
       truncated: results.length >= num
     };
-  } catch {
+  } catch (err) {
+    console.log(JSON.stringify({ level: "debug", event: "search_failed", query: query2, error: err instanceof Error ? err.message : String(err) }));
     return {
       query: query2,
       results: [{ title: "Search unavailable", url: "", snippet: "Could not reach DuckDuckGo" }],
@@ -7466,11 +7389,11 @@ function parseDuckDuckGo(html, num) {
   const snippetRegex = /<a class="result-link"[^>]+href="([^"]+)"[^>]*>([^<]+)<\/a>/gi;
   const snippet2Regex = /<a class="result-snippet"[^>]*>([^<]+)<\/a>/gi;
   const linkMatches = takeFrom(
-    [...html.matchAll(snippetRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined(m[1]), title: stripTags2(expectDefined(m[2])) })),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined(m[1]), title: stripTags(expectDefined(m[2])) })),
     num
   );
   const snippetMatches = takeFrom(
-    [...html.matchAll(snippet2Regex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined(m[1]))),
+    [...html.matchAll(snippet2Regex)].filter((m) => m[1]).map((m) => stripTags(expectDefined(m[1]))),
     num
   );
   for (let i = 0; i < linkMatches.length && i < num; i++) {
@@ -7501,15 +7424,15 @@ function parseGoogleResults(html, num) {
   const urlRegex = /<cite[^>]*>([^<]+)<\/cite>/gi;
   const snippetRegex = /<span[^>]*class="[^"]*aXCZ0b[^>]*>([^<]+)<\/span>/gi;
   const titles = takeFrom(
-    [...html.matchAll(titleRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined(m[1]))),
+    [...html.matchAll(titleRegex)].filter((m) => m[1]).map((m) => stripTags(expectDefined(m[1]))),
     num
   );
   const urls = takeFrom(
-    [...html.matchAll(urlRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined(m[1])).replace(/^\*(https?:\/\/[^\s]+).*$/, "$1")).filter((u) => u.startsWith("http")),
+    [...html.matchAll(urlRegex)].filter((m) => m[1]).map((m) => stripTags(expectDefined(m[1])).replace(/^\*(https?:\/\/[^\s]+).*$/, "$1")).filter((u) => u.startsWith("http")),
     num
   );
   const snippets = takeFrom(
-    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined(m[1]))),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags(expectDefined(m[1]))),
     num
   );
   for (let i = 0; i < Math.min(titles.length, num); i++) {
@@ -7538,11 +7461,11 @@ function parseBingResults(html, num) {
   const titleRegex = /<h2[^>]*>\s*<a[^>]+href="([^"]+)"[^>]*>([^<]+)<\/a>\s*<\/h2>/gi;
   const snippetRegex = /<p[^>]*class="[^"]*b_paractl[^"]*"[^>]*>([^<]+)<\/p>/gi;
   const entries = takeFrom(
-    [...html.matchAll(titleRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined(m[1]), title: stripTags2(expectDefined(m[2])) })),
+    [...html.matchAll(titleRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined(m[1]), title: stripTags(expectDefined(m[2])) })),
     num
   );
   const snippets = takeFrom(
-    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined(m[1]))),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags(expectDefined(m[1]))),
     num
   );
   for (let i = 0; i < entries.length; i++) {
@@ -7572,7 +7495,7 @@ async function fetchWithTimeout(url, signal, timeoutMs) {
 function anySignal(...signals) {
   return AbortSignal.any(signals);
 }
-function stripTags2(html) {
+function stripTags(html) {
   return html.replace(/<[^>]+>/g, "").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
 }
 var setWorkingDirTool = {
@@ -7727,6 +7650,7 @@ var taskTool = {
     const promoteMeta = { count: 0, title: "" };
     const planifyMeta = { title: "", details: "" };
     let didPlanify = false;
+    let todosToReplace = null;
     const file = await mutateTasks(taskPath, sessionId, async (f) => {
       switch (input.action) {
         case "show":
@@ -7782,7 +7706,7 @@ var taskTool = {
           }
           const now = (/* @__PURE__ */ new Date()).toISOString();
           const newTask = {
-            id: `task_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+            id: `task_${Date.now()}_${randomUUID().slice(0, 8)}`,
             title: t.title,
             description: t.description,
             type: t.type || "feature",
@@ -7859,7 +7783,7 @@ var taskTool = {
               });
             }
           }
-          ctx.state.replaceTodos(todos);
+          todosToReplace = todos;
           promoteMeta.count = todos.length;
           promoteMeta.title = match.title;
           break;
@@ -7891,6 +7815,7 @@ var taskTool = {
       }
       return f;
     });
+    if (todosToReplace) ctx.state.replaceTodos(todosToReplace);
     if (early) return early;
     if (didPlanify) {
       const { title, details } = planifyMeta;
@@ -8655,6 +8580,10 @@ var typecheckTool = {
       all: {
         type: "boolean",
         description: "Type-check all projects (pnpm -r) (default: false)"
+      },
+      json: {
+        type: "boolean",
+        description: "Emit JSON output from tsc (default: false)"
       }
     }
   },
@@ -8682,6 +8611,7 @@ var typecheckTool = {
       if (tsconfig) args.push("--project", tsconfig);
       project = tsconfig ?? "default";
     }
+    if (input.json) args.push("--json");
     yield { type: "log", text: `tsc ${args.join(" ")}`, data: { project } };
     const result = yield* spawnStream({
       cmd: "npx",
@@ -8690,8 +8620,8 @@ var typecheckTool = {
       signal: opts.signal,
       maxBytes: 2e5
     });
-    const errors = (result.stdout.match(/error TS/g) || []).length;
-    const warnings = (result.stdout.match(/warning/g) || []).length;
+    const errors = [...result.stdout.matchAll(/\berror\b/gi)].length;
+    const warnings = [...result.stdout.matchAll(/\bwarning\b/gi)].length;
     yield {
       type: "final",
       output: {