@wrongstack/tools 0.77.0 → 0.84.1

package/dist/pack.js

@@ -19,6 +19,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function* spawnStream(opts) {
   const max = opts.maxBytes ?? 2e5;
   const flushAt = opts.flushBytes ?? 4 * 1024;
@@ -70,7 +76,7 @@ async function* spawnStream(opts) {
         waiter = resolve7;
       });
     }
-    const chunk = queue.shift();
+    const chunk = expectDefined(queue.shift());
     if (chunk.kind === "close") {
       if (!spawnFailed) exitCode = chunk.code ?? 0;
       break;
@@ -97,6 +103,12 @@ async function* spawnStream(opts) {
     error
   };
 }
+function expectDefined2(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function detectPackageManager(cwd) {
   const { stat: stat10 } = await import('node:fs/promises');
   try {
@@ -186,9 +198,9 @@ function collapseConsecutiveDuplicates(text, minRun = REPEAT_RUN_THRESHOLD) {
     while (j < lines.length && lines[j] === lines[i]) j++;
     const run = j - i;
     if (run >= minRun) {
-      out.push(lines[i], `\u2026 \u27E8repeated ${run}\xD7\u27E9`);
+      out.push(expectDefined2(lines[i]), `\u2026 \u27E8repeated ${run}\xD7\u27E9`);
     } else {
-      for (let k = i; k < j; k++) out.push(lines[k]);
+      for (let k = i; k < j; k++) out.push(expectDefined2(lines[k]));
     }
     i = j;
   }
@@ -265,7 +277,9 @@ var auditTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of auditTool.executeStream(input, ctx, opts)) {
+    const executeStream = auditTool.executeStream;
+    if (!executeStream) throw new Error("auditTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("audit: stream ended without final event");
@@ -482,6 +496,12 @@ var CircuitBreaker = class {
 };
 
 // src/process-registry.ts
+function expectDefined3(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 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,
@@ -502,7 +522,7 @@ function redactCommand(cmd) {
       const sp = match.search(/\s/);
       const delim = eq !== -1 ? "=" : sp !== -1 ? match[sp] : null;
       if (delim !== null) {
-        const flag = match.slice(0, match.indexOf(delim) + 1);
+        const flag = match.slice(0, match.indexOf(expectDefined3(delim)) + 1);
         return `${flag}[REDACTED]`;
       }
       const flagEnd = match.match(/^--?[a-zA-Z][a-zA-Z0-9_-]*/)?.[0] ?? match;
@@ -682,7 +702,7 @@ function getProcessRegistry() {
 
 // src/bash.ts
 var MAX_OUTPUT = 32768;
-var DEFAULT_TIMEOUT = 3e4;
+var DEFAULT_TIMEOUT_MS = 3e4;
 var STREAM_FLUSH_INTERVAL_MS = 200;
 var STREAM_FLUSH_BYTES = 4 * 1024;
 var bashTool = {
@@ -721,7 +741,9 @@ var bashTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of bashTool.executeStream(input, ctx, opts)) {
+    const executeStream = bashTool.executeStream;
+    if (!executeStream) throw new Error("bashTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("bash: stream ended without final event");
@@ -743,9 +765,19 @@ var bashTool = {
       };
       return;
     }
-    const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT, 6e5));
+    const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT_MS, 6e5));
     const isWin = os.platform() === "win32";
-    const shell = isWin ? process.env["COMSPEC"] ?? "cmd.exe" : process.env["SHELL"] ?? "/bin/bash";
+    const shell = (() => {
+      const explicit = process.env[isWin ? "WRONGSTACK_COMSPEC" : "WRONGSTACK_SHELL"];
+      if (explicit) return explicit;
+      if (isWin) return process.env["COMSPEC"] ?? "cmd.exe";
+      const fromEnv = process.env["SHELL"];
+      if (fromEnv) {
+        const name = fromEnv.split("/").pop() ?? "";
+        if (["bash", "zsh", "sh", "dash", "fish"].includes(name)) return fromEnv;
+      }
+      return "/bin/bash";
+    })();
     const args = isWin ? ["/c", input.command] : ["-c", input.command];
     const env = buildChildEnv(ctx.session?.id);
     const detached = isWin ? !!input.background : true;
@@ -1087,6 +1119,12 @@ function lspKindToInternalKind(k) {
 }
 
 // src/codebase-index/writer.ts
+function expectDefined4(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DB_FILE = "index.db";
 function resolveIndexDir(projectRoot, override) {
   return override ?? resolveWstackPaths({ projectRoot }).projectCodebaseIndex;
@@ -1231,7 +1269,7 @@ var IndexStore = class {
       "SELECT file, lang, mtime_ms, symbol_count, last_indexed FROM files WHERE file = ?"
     ).all(file);
     if (!rows.length) return null;
-    const r = rows[0];
+    const r = expectDefined4(rows[0]);
     return { file: r.file, lang: r.lang, mtimeMs: r.mtime_ms, symbolCount: r.symbol_count, lastIndexed: r.last_indexed };
   }
   getAllFileMetas() {
@@ -1313,7 +1351,7 @@ var IndexStore = class {
     const lastRows = this.db.prepare(
       "SELECT value FROM metadata WHERE key = 'last_indexed'"
     ).all();
-    const lastIndexed = lastRows.length ? Number(lastRows[0].value) : null;
+    const lastIndexed = lastRows.length ? Number(lastRows[0]?.value) : null;
     const totalRows = this.db.prepare("SELECT COUNT(*) FROM symbols").all();
     const totalSymbols = totalRows[0] ? Number(totalRows[0]["COUNT(*)"]) : 0;
     const fileRows = this.db.prepare("SELECT COUNT(*) FROM files").all();
@@ -1388,8 +1426,9 @@ var IndexStore = class {
     let resolved = 0;
     for (const row of unresolved) {
       const target = this.db.prepare("SELECT id FROM symbols WHERE name = ? LIMIT 1").all(row.to_name);
-      if (target.length) {
-        this.db.prepare("UPDATE refs SET to_id = ? WHERE id = ?").run(target[0].id, row.id);
+      const first = target[0];
+      if (first) {
+        this.db.prepare("UPDATE refs SET to_id = ? WHERE id = ?").run(first.id, row.id);
         resolved++;
       }
     }
@@ -2143,6 +2182,12 @@ function syncPyParse(filePath, lang) {
     return { file: filePath, lang, symbols: [], mtimeMs: Date.now() };
   }
 }
+function expectDefined5(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseSymbols4(opts) {
   const { file, content, lang } = opts;
   const nativeAvailable = checkNativeParser();
@@ -2224,14 +2269,14 @@ function regexParse(opts) {
   const lines = content.split("\n");
   const lineOffsets = [0];
   for (let i = 0; i < lines.length; i++) {
-    lineOffsets.push(lineOffsets[i] + lines[i].length + 1);
+    lineOffsets.push((lineOffsets[i] ?? 0) + (lines[i]?.length ?? 0) + 1);
   }
   function lineFromOffset(offset) {
     let lo = 0;
     let hi = lineOffsets.length - 1;
     while (lo < hi) {
       const mid = lo + hi + 1 >>> 1;
-      if (lineOffsets[mid] <= offset) lo = mid;
+      if (expectDefined5(lineOffsets[mid]) <= offset) lo = mid;
       else hi = mid - 1;
     }
     return lo + 1;
@@ -2243,8 +2288,8 @@ function regexParse(opts) {
   for (const pattern of RS_PATTERNS) {
     pattern.regex.lastIndex = 0;
     for (let match = pattern.regex.exec(content); match !== null; match = pattern.regex.exec(content)) {
-      const name = match[1];
-      const offset = match.index;
+      const name = expectDefined5(match[1]);
+      const offset = match.index ?? 0;
       const line = lineFromOffset(offset);
       const col = offset - (lineOffsets[line - 1] ?? 0);
       const lineIdx = line - 1;
@@ -2273,6 +2318,12 @@ function regexParse(opts) {
   });
   return { file, lang, symbols: deduped, mtimeMs: Date.now() };
 }
+function expectDefined6(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseSymbols5(opts) {
   const { file, content, lang } = opts;
   try {
@@ -2292,21 +2343,21 @@ function regexParse2(opts) {
   const lines = content.split("\n");
   const lineOffsets = [0];
   for (let i = 0; i < lines.length; i++) {
-    lineOffsets.push(lineOffsets[i] + lines[i].length + 1);
+    lineOffsets.push((lineOffsets[i] ?? 0) + (lines[i]?.length ?? 0) + 1);
   }
   function lineFromOffset(offset) {
     let lo = 0;
     let hi = lineOffsets.length - 1;
     while (lo < hi) {
       const mid = lo + hi + 1 >>> 1;
-      if (lineOffsets[mid] <= offset) lo = mid;
+      if (expectDefined6(lineOffsets[mid]) <= offset) lo = mid;
       else hi = mid - 1;
     }
     return lo + 1;
   }
   const rootMatch = content.match(/^\s*\{/m);
   if (rootMatch) {
-    const offset = rootMatch.index;
+    const offset = expectDefined6(rootMatch.index);
     const line = lineFromOffset(offset);
     symbols.push(
       makeSymbol({
@@ -2322,8 +2373,8 @@ function regexParse2(opts) {
   }
   const topLevelKeyRegex = /^\s*"([^"]+)"\s*:/gm;
   for (let match = topLevelKeyRegex.exec(content); match !== null; match = topLevelKeyRegex.exec(content)) {
-    const key = match[1];
-    const offset = match.index;
+    const key = expectDefined6(match[1]);
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     let kind = "property";
@@ -2369,7 +2420,7 @@ function regexParse2(opts) {
   const defsRegex = /"\$defs"\s*:|"\$defs"\s*:/g;
   const defsMatch = defsRegex.exec(content);
   if (defsMatch !== null) {
-    const offset = defsMatch.index;
+    const offset = expectDefined6(defsMatch.index);
     const line = lineFromOffset(offset);
     symbols.push(
       makeSymbol({
@@ -2392,9 +2443,9 @@ function regexParse2(opts) {
   for (const pat of defsPatterns) {
     pat.lastIndex = 0;
     for (let match = pat.exec(content); match !== null; match = pat.exec(content)) {
-      const offset = match.index;
+      const offset = match.index ?? 0;
       const line = lineFromOffset(offset);
-      const key = match[0].match(/"([^"]+)"/)?.[1] ?? match[0];
+      const key = match[0]?.match(/"([^"]+)"/)?.[1] ?? expectDefined6(match[0]);
       symbols.push(
         makeSymbol({
           name: key,
@@ -2413,12 +2464,12 @@ function regexParse2(opts) {
 function extractPackageScripts(content, symbols, file, lang, lineOffsets, lineFromOffset) {
   const scriptsBlockRegex = /"scripts"\s*:\s*\{([^}]+)\}/g;
   for (let match = scriptsBlockRegex.exec(content); match !== null; match = scriptsBlockRegex.exec(content)) {
-    const blockContent = match[0];
-    const blockOffset = match.index;
+    const blockContent = expectDefined6(match[0]);
+    const blockOffset = match.index ?? 0;
     const scriptKeyRegex = /"(\w[\w-]*)"\s*:/g;
     for (let scriptMatch = scriptKeyRegex.exec(blockContent); scriptMatch !== null; scriptMatch = scriptKeyRegex.exec(blockContent)) {
-      const key = scriptMatch[1];
-      const keyOffset = blockOffset + scriptMatch.index;
+      const key = expectDefined6(scriptMatch[1]);
+      const keyOffset = blockOffset + expectDefined6(scriptMatch.index);
       const line = lineFromOffset(keyOffset);
       symbols.push(
         makeSymbol({
@@ -2437,12 +2488,12 @@ function extractPackageScripts(content, symbols, file, lang, lineOffsets, lineFr
 function extractCompilerOptions(content, symbols, file, lang, lineOffsets, parentLine, lineFromOffset) {
   const optsBlockRegex = /"compilerOptions"\s*:\s*\{([^}]+)\}/g;
   for (let match = optsBlockRegex.exec(content); match !== null; match = optsBlockRegex.exec(content)) {
-    const blockContent = match[0];
-    const blockOffset = match.index;
+    const blockContent = expectDefined6(match[0]);
+    const blockOffset = match.index ?? 0;
     const optKeyRegex = /"(\w[\w]*)"\s*:/g;
     for (let optMatch = optKeyRegex.exec(blockContent); optMatch !== null; optMatch = optKeyRegex.exec(blockContent)) {
-      const key = optMatch[1];
-      const keyOffset = blockOffset + optMatch.index;
+      const key = expectDefined6(optMatch[1]);
+      const keyOffset = blockOffset + expectDefined6(optMatch.index);
       const line = lineFromOffset(keyOffset);
       if (line <= parentLine) continue;
       symbols.push(
@@ -2476,6 +2527,12 @@ function makeSymbol(opts) {
 }
 
 // src/codebase-index/yaml-parser.ts
+function expectDefined7(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseSymbols6(opts) {
   const { file, content, lang } = opts;
   try {
@@ -2490,22 +2547,22 @@ function regexParse3(opts) {
   const lines = content.split("\n");
   const lineOffsets = [0];
   for (let i = 0; i < lines.length; i++) {
-    lineOffsets.push(lineOffsets[i] + lines[i].length + 1);
+    lineOffsets.push((lineOffsets[i] ?? 0) + (lines[i]?.length ?? 0) + 1);
   }
   function lineFromOffset(offset) {
     let lo = 0;
     let hi = lineOffsets.length - 1;
     while (lo < hi) {
       const mid = lo + hi + 1 >>> 1;
-      if (lineOffsets[mid] <= offset) lo = mid;
+      if (expectDefined7(lineOffsets[mid]) <= offset) lo = mid;
       else hi = mid - 1;
     }
     return lo + 1;
   }
   const anchorRegex = /&(\w[\w-]*)/g;
   for (let match = anchorRegex.exec(content); match !== null; match = anchorRegex.exec(content)) {
-    const name = match[1];
-    const offset = match.index;
+    const name = expectDefined7(match[1]);
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -2522,8 +2579,8 @@ function regexParse3(opts) {
   }
   const aliasRegex = /\*(\w[\w-]*)/g;
   for (let match = aliasRegex.exec(content); match !== null; match = aliasRegex.exec(content)) {
-    const name = match[1];
-    const offset = match.index;
+    const name = expectDefined7(match[1]);
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -2540,27 +2597,28 @@ function regexParse3(opts) {
   }
   const kvRegex = /^(\s*)([^:#\s][^:#\s]*)\s*:/gm;
   for (let match = kvRegex.exec(content); match !== null; match = kvRegex.exec(content)) {
-    const indent = match[1].length;
+    const indent = match[1]?.length ?? 0;
     const key = match[2];
-    const offset = match.index;
+    if (!key) continue;
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     const lineContent = lines[line - 1] ?? "";
     if (/^[|&>]/.test(lineContent.trim())) continue;
     if (key === "---" || key === "...") continue;
     if (indent > 12) continue;
-    const value = extractValue(content, match.index);
+    const value = extractValue(content, match.index ?? 0);
     const kind = isScalar(value) ? "literal" : "property";
     const signature = `${key}: ${truncate(value, 60)}`;
     symbols.push(makeSymbol2({ name: key, kind, line, col, signature, file, lang }));
   }
   const listItemRegex = /^-(\s+)([^:#\s][^:#\s]*)\s*:/gm;
   for (let match = listItemRegex.exec(content); match !== null; match = listItemRegex.exec(content)) {
-    const key = match[2];
-    const offset = match.index;
+    const key = expectDefined7(match[2]);
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
-    const value = extractValue(content, offset + match[0].length);
+    const value = extractValue(content, offset + match[0]?.length);
     const kind = isScalar(value) ? "literal" : "property";
     symbols.push(
       makeSymbol2({
@@ -2576,8 +2634,8 @@ function regexParse3(opts) {
   }
   const blockScalarRegex = /^(\s*)([^:#\s][^:#\s]*)\s*:\s*[|>](\s|$)/gm;
   for (let match = blockScalarRegex.exec(content); match !== null; match = blockScalarRegex.exec(content)) {
-    const key = match[2];
-    const offset = match.index;
+    const key = expectDefined7(match[2]);
+    const offset = match.index ?? 0;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -2707,6 +2765,12 @@ function _setIndexProgress(current, total) {
 Promise.resolve();
 
 // src/codebase-index/indexer.ts
+function expectDefined8(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var YIELD_EVERY_N = 50;
 function yieldEventLoop() {
   return new Promise((resolve7) => setImmediate(resolve7));
@@ -2815,7 +2879,7 @@ async function runIndexer(_ctx, opts) {
     for (const meta of store.getAllFileMetas()) existingMeta.set(meta.file, meta);
   }
   for (let fi = 0; fi < files.length; fi++) {
-    const file = files[fi];
+    const file = expectDefined8(files[fi]);
     _setIndexProgress(fi + 1, files.length);
     if (fi > 0 && fi % YIELD_EVERY_N === 0) {
       await yieldEventLoop();
@@ -2872,7 +2936,7 @@ async function runIndexer(_ctx, opts) {
     langStats[lang] = (langStats[lang] ?? 0) + count;
     if (parsed.refs && parsed.refs.length > 0) {
       for (let i = 0; i < symbolsWithIds.length; i++) {
-        const sym = symbolsWithIds[i];
+        const sym = expectDefined8(symbolsWithIds[i]);
         const symRefs = parsed.refs.filter((r) => r.line === sym.line);
         if (symRefs.length > 0) {
           const refsWithFromId = symRefs.map((r) => ({ ...r, fromId: sym.id }));
@@ -3033,6 +3097,12 @@ var Bm25Index = class {
 };
 
 // src/codebase-index/codebase-search-tool.ts
+function expectDefined9(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var codebaseSearchTool = {
   name: "codebase-search",
   category: "Project",
@@ -3122,7 +3192,7 @@ var codebaseSearchTool = {
       const top = scored.slice(0, limit);
       const qTokens = tokenise(input.query);
       const results = top.map(({ id, score }) => {
-        const c = candidates.find((c2) => c2.id === id);
+        const c = expectDefined9(candidates.find((c2) => c2.id === id));
         const snippet = bm25.extractSnippet(id, qTokens);
         return {
           ...c,
@@ -3657,7 +3727,7 @@ var ALLOWED_COMMANDS = {
 };
 var MAX_ARGS = 20;
 var MAX_OUTPUT2 = 2e5;
-var TIMEOUT_MS = 3e4;
+var DEFAULT_TIMEOUT_MS2 = 3e4;
 var BLOCKED_ARG_PATTERNS = {
   // python -c/--command executes arbitrary code; python -m runs modules
   python: [/-c$/, /^--command$/, /^-m$/, /^--module$/],
@@ -3720,7 +3790,7 @@ var execTool = {
   permission: "confirm",
   mutating: true,
   riskTier: "standard",
-  timeoutMs: TIMEOUT_MS,
+  timeoutMs: DEFAULT_TIMEOUT_MS2,
   capabilities: ["shell.restricted"],
   inputSchema: {
     type: "object",
@@ -3781,7 +3851,7 @@ var execTool = {
       };
     }
     const args = (input.args ?? []).slice(0, MAX_ARGS);
-    const timeout = Math.max(1, Math.min(input.timeout ?? TIMEOUT_MS, TIMEOUT_MS));
+    const timeout = Math.max(1, Math.min(input.timeout ?? DEFAULT_TIMEOUT_MS2, DEFAULT_TIMEOUT_MS2));
     const argError = validateArgs(cmd, args);
     if (argError) {
       return {
@@ -3874,8 +3944,21 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
   });
 }
 var MAX_BYTES = 131072;
-var TIMEOUT_MS2 = 2e4;
+var TIMEOUT_MS = 2e4;
 var ALLOW_PRIVATE = process.env["WRONGSTACK_FETCH_ALLOW_PRIVATE"] === "1";
+function combineSignals(signals) {
+  const anyFn = AbortSignal.any;
+  if (typeof anyFn === "function") return anyFn(signals);
+  const ctrl = new AbortController();
+  for (const sig of signals) {
+    if (sig.aborted) {
+      ctrl.abort(sig.reason);
+      return ctrl.signal;
+    }
+    sig.addEventListener("abort", () => ctrl.abort(sig.reason), { once: true });
+  }
+  return ctrl.signal;
+}
 function guardedLookup(hostname, options, callback) {
   dns.lookup(hostname, { all: true }).then((records) => {
     const family = options?.family;
@@ -3918,6 +4001,10 @@ function getPinnedDispatcher() {
   }
   return pinnedAgent;
 }
+process.on("beforeExit", () => {
+  pinnedAgent?.destroy();
+  pinnedAgent = void 0;
+});
 async function guardedFetch(url, maxRedirects, signal, headers = {
   "user-agent": "WrongStack/1.0 (+https://wrongstack.com)",
   accept: "text/html,application/json;q=0.9,text/plain;q=0.8,*/*;q=0.1"
@@ -3967,7 +4054,7 @@ var fetchTool = {
   // matching that pattern on any other tool that happens to have a `url`
   // input field.
   subjectKey: "url",
-  timeoutMs: TIMEOUT_MS2,
+  timeoutMs: TIMEOUT_MS,
   maxOutputBytes: MAX_BYTES,
   inputSchema: {
     type: "object",
@@ -3986,7 +4073,9 @@ var fetchTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of fetchTool.executeStream(input, ctx, opts)) {
+    const executeStream = fetchTool.executeStream;
+    if (!executeStream) throw new Error("fetchTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("fetch: stream ended without final event");
@@ -4004,8 +4093,8 @@ var fetchTool = {
     await assertNotPrivate(u.hostname);
     yield { type: "log", text: `GET ${input.url}` };
     const ctrl = new AbortController();
-    const timer = setTimeout(() => ctrl.abort(new Error("fetch timeout")), TIMEOUT_MS2);
-    const combined = combineSignals(opts.signal, ctrl.signal);
+    const timer = setTimeout(() => ctrl.abort(new Error("fetch timeout")), TIMEOUT_MS);
+    const combined = combineSignals([opts.signal, ctrl.signal]);
     try {
       const res = await guardedFetch(input.url, 5, combined);
       const ct = res.headers.get("content-type") ?? "application/octet-stream";
@@ -4153,33 +4242,6 @@ function expandIPv6(addr) {
   if (fill < 0) return null;
   return [...head, ...new Array(fill).fill(0), ...tail];
 }
-function combineSignals(...sigs) {
-  const anyFn = AbortSignal.any;
-  if (typeof anyFn === "function") {
-    return anyFn(sigs);
-  }
-  const ctrl = new AbortController();
-  const cleanups = [];
-  const detach = () => {
-    for (const fn of cleanups) fn();
-    cleanups.length = 0;
-  };
-  for (const s of sigs) {
-    if (s.aborted) {
-      detach();
-      ctrl.abort(s.reason);
-      return ctrl.signal;
-    }
-    const onAbort = () => {
-      detach();
-      ctrl.abort(s.reason);
-    };
-    s.addEventListener("abort", onAbort, { once: true });
-    cleanups.push(() => s.removeEventListener("abort", onAbort));
-  }
-  ctrl.signal.addEventListener("abort", detach, { once: true });
-  return ctrl.signal;
-}
 function prettyJson(s) {
   try {
     return JSON.stringify(JSON.parse(s), null, 2);
@@ -4245,7 +4307,9 @@ var formatTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of formatTool.executeStream(input, ctx, opts)) {
+    const executeStream = formatTool.executeStream;
+    if (!executeStream) throw new Error("formatTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("format: stream ended without final event");
@@ -4313,7 +4377,7 @@ async function detectFixer(cwd) {
     }
   }
 }
-var TIMEOUT_MS3 = 3e4;
+var TIMEOUT_MS2 = 3e4;
 var MAX_OUTPUT3 = 1e5;
 var gitTool = {
   name: "git",
@@ -4326,7 +4390,7 @@ var gitTool = {
   // and `MUTATING_SUBCOMMANDS` is consulted at runtime for per-call checks.
   mutating: true,
   capabilities: ["fs.write", "shell.restricted"],
-  timeoutMs: TIMEOUT_MS3,
+  timeoutMs: TIMEOUT_MS2,
   inputSchema: {
     type: "object",
     properties: {
@@ -4689,6 +4753,12 @@ function capSubject(line) {
 }
 
 // src/grep.ts
+function expectDefined10(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_IGNORE3 = ["node_modules", ".git", "dist", "build", ".next", "coverage"];
 var grepTool = {
   name: "grep",
@@ -4737,7 +4807,9 @@ var grepTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of grepTool.executeStream(input, ctx, opts)) {
+    const executeStream = grepTool.executeStream;
+    if (!executeStream) throw new Error("grepTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("grep: stream ended without final event");
@@ -4828,7 +4900,7 @@ async function* runRgStream(input, base, mode, limit, signal) {
         waiter = r;
       });
     }
-    const c = queue.shift();
+    const c = expectDefined10(queue.shift());
     if (c.kind === "error") {
       errored = true;
       continue;
@@ -5014,7 +5086,9 @@ var installTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of installTool.executeStream(input, ctx, opts)) {
+    const executeStream = installTool.executeStream;
+    if (!executeStream) throw new Error("installTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("install: stream ended without final event");
@@ -5229,7 +5303,9 @@ var lintTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of lintTool.executeStream(input, ctx, opts)) {
+    const executeStream = lintTool.executeStream;
+    if (!executeStream) throw new Error("lintTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("lint: stream ended without final event");
@@ -5856,14 +5932,15 @@ var planTool = {
 };
 function mkResult(plan, ok, message, todos) {
   const open = plan.items.filter((i) => i.status !== "done").length;
-  return {
+  const result = {
     ok,
     message,
     plan: formatPlan(plan),
     count: plan.items.length,
-    open,
-    todos
+    open
   };
+  if (todos !== void 0) result.todos = todos;
+  return result;
 }
 var MAX_BYTES2 = 5 * 1024 * 1024;
 var readTool = {
@@ -5937,6 +6014,12 @@ var readTool = {
     };
   }
 };
+function expectDefined11(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_IGNORE4 = ["node_modules", ".git", "dist", "build", ".next", "coverage"];
 var replaceTool = {
   name: "replace",
@@ -6016,8 +6099,8 @@ var replaceTool = {
       const count = matches.length;
       let newContentLf = contentLf;
       for (let i = matches.length - 1; i >= 0; i--) {
-        const m = matches[i];
-        newContentLf = newContentLf.slice(0, m.index) + input.replacement + newContentLf.slice(m.index + m[0].length);
+        const m = expectDefined11(matches[i]);
+        newContentLf = newContentLf.slice(0, m.index) + input.replacement + newContentLf.slice(expectDefined11(m.index) + m[0].length);
       }
       re.lastIndex = 0;
       totalReplacements += count;
@@ -6318,9 +6401,15 @@ function substituteVars(content, name, vars) {
 }
 
 // src/search.ts
+function expectDefined12(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_NUM = 10;
 var MAX_RESULTS = 50;
-var TIMEOUT_MS4 = 15e3;
+var TIMEOUT_MS3 = 15e3;
 var searchTool = {
   name: "search",
   category: "Search",
@@ -6329,7 +6418,7 @@ var searchTool = {
   permission: "confirm",
   mutating: false,
   capabilities: ["net.outbound"],
-  timeoutMs: TIMEOUT_MS4,
+  timeoutMs: TIMEOUT_MS3,
   inputSchema: {
     type: "object",
     properties: {
@@ -6350,7 +6439,9 @@ var searchTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of searchTool.executeStream(input, ctx, opts)) {
+    const executeStream = searchTool.executeStream;
+    if (!executeStream) throw new Error("searchTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("search: stream ended without final event");
@@ -6390,7 +6481,7 @@ var searchTool = {
 async function duckduckgoSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://lite.duckduckgo.com/lite/?q=${encoded}&kd=-1&kl=wt-wt`;
-  const results = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).then((html) => parseDuckDuckGo(html, num)).catch(() => [{ title: "Search unavailable", url: "", snippet: "Could not reach DuckDuckGo" }]);
+  const results = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).then((html) => parseDuckDuckGo(html, num)).catch(() => [{ title: "Search unavailable", url: "", snippet: "Could not reach DuckDuckGo" }]);
   return {
     query: query2,
     results,
@@ -6411,11 +6502,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: m[1], title: stripTags2(m[2]) })),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined12(m[1]), title: stripTags2(expectDefined12(m[2])) })),
     num
   );
   const snippetMatches = takeFrom(
-    [...html.matchAll(snippet2Regex)].filter((m) => m[1]).map((m) => stripTags2(m[1])),
+    [...html.matchAll(snippet2Regex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined12(m[1]))),
     num
   );
   for (let i = 0; i < linkMatches.length && i < num; i++) {
@@ -6431,7 +6522,7 @@ function parseDuckDuckGo(html, num) {
 async function googleSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://www.google.com/search?q=${encoded}&hl=en`;
-  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).catch(() => "");
+  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).catch(() => "");
   const results = parseGoogleResults(html, num);
   return {
     query: query2,
@@ -6446,15 +6537,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(m[1])),
+    [...html.matchAll(titleRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined12(m[1]))),
     num
   );
   const urls = takeFrom(
-    [...html.matchAll(urlRegex)].filter((m) => m[1]).map((m) => stripTags2(m[1]).replace(/^\*(https?:\/\/[^\s]+).*$/, "$1")).filter((u) => u.startsWith("http")),
+    [...html.matchAll(urlRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined12(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(m[1])),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined12(m[1]))),
     num
   );
   for (let i = 0; i < Math.min(titles.length, num); i++) {
@@ -6469,7 +6560,7 @@ function parseGoogleResults(html, num) {
 async function bingSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://www.bing.com/search?q=${encoded}`;
-  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).catch(() => "");
+  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).catch(() => "");
   const results = parseBingResults(html, num);
   return {
     query: query2,
@@ -6483,11 +6574,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: m[1], title: stripTags2(m[2]) })),
+    [...html.matchAll(titleRegex)].filter((m) => m[1] && m[2]).map((m) => ({ url: expectDefined12(m[1]), title: stripTags2(expectDefined12(m[2])) })),
     num
   );
   const snippets = takeFrom(
-    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags2(m[1])),
+    [...html.matchAll(snippetRegex)].filter((m) => m[1]).map((m) => stripTags2(expectDefined12(m[1]))),
     num
   );
   for (let i = 0; i < entries.length; i++) {
@@ -6557,7 +6648,9 @@ var testTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of testTool.executeStream(input, ctx, opts)) {
+    const executeStream = testTool.executeStream;
+    if (!executeStream) throw new Error("testTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("test: stream ended without final event");
@@ -7009,6 +7102,12 @@ var toolUseTool = {
     }
   }
 };
+function expectDefined13(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_IGNORE5 = [
   "node_modules",
   ".git",
@@ -7069,7 +7168,9 @@ var treeTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of treeTool.executeStream(input, ctx, opts)) {
+    const executeStream = treeTool.executeStream;
+    if (!executeStream) throw new Error("treeTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("tree: stream ended without final event");
@@ -7119,7 +7220,7 @@ var treeTool = {
     });
     while (!walkDone || queue.length > 0) {
       if (queue.length > 0) {
-        yield queue.shift();
+        yield expectDefined13(queue.shift());
       } else {
         let pollTimer;
         const poll = new Promise((r) => {
@@ -7209,7 +7310,9 @@ var typecheckTool = {
   },
   async execute(input, ctx, opts) {
     let final;
-    for await (const ev of typecheckTool.executeStream(input, ctx, opts)) {
+    const executeStream = typecheckTool.executeStream;
+    if (!executeStream) throw new Error("typecheckTool: stream execution unavailable");
+    for await (const ev of executeStream(input, ctx, opts)) {
       if (ev.type === "final") final = ev.output;
     }
     if (!final) throw new Error("typecheck: stream ended without final event");