flavor-code 1.4.0-beta.1 → 1.4.0-beta.3

package/dist/{chunk-6MNOZ2TX.js → chunk-NIKCPCJG.js}

@@ -18,7 +18,7 @@ import {
   redactConfig,
   setProjectMcpServerDisabled,
   updateProtectedFile
-} from "./chunk-URUVFECH.js";
+} from "./chunk-KBHWS7M6.js";
 import {
   AuditLogger,
   appendUsageLog,
@@ -32,7 +32,7 @@ import {
   resolveLanguage,
   setUsageSession,
   usageLogPath
-} from "./chunk-3WCDZ6ZL.js";
+} from "./chunk-ZJCAQXA7.js";
 
 // src/models/types.ts
 function modelContentText(content) {
@@ -75,12 +75,12 @@ function normalizeProviderError(error) {
 
 // src/utils/async.ts
 function withTimeout(promise, ms) {
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve32, reject) => {
     let settled = false;
     const timer = setTimeout(() => {
       if (settled) return;
       settled = true;
-      resolve31({ timedOut: true, value: void 0 });
+      resolve32({ timedOut: true, value: void 0 });
     }, ms);
     timer.unref?.();
     promise.then(
@@ -88,7 +88,7 @@ function withTimeout(promise, ms) {
         if (!settled) {
           settled = true;
           clearTimeout(timer);
-          resolve31({ timedOut: false, value });
+          resolve32({ timedOut: false, value });
         }
       },
       (error) => {
@@ -103,13 +103,13 @@ function withTimeout(promise, ms) {
 }
 function awaitWithSignal(promise, signal) {
   signal.throwIfAborted();
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve32, reject) => {
     const onAbort = () => reject(signal.reason);
     signal.addEventListener("abort", onAbort, { once: true });
     promise.then(
       (value) => {
         signal.removeEventListener("abort", onAbort);
-        resolve31(value);
+        resolve32(value);
       },
       (error) => {
         signal.removeEventListener("abort", onAbort);
@@ -572,9 +572,7 @@ function redactSecrets(input, secrets) {
 
 // src/init/project.ts
 import { lstat, mkdir, readdir, readFile, realpath, writeFile } from "fs/promises";
-import { copyFileSync, mkdirSync, readdirSync } from "fs";
-import { basename, dirname as dirname2, isAbsolute as isAbsolute2, join, relative as relative2, sep as sep2 } from "path";
-import { fileURLToPath } from "url";
+import { basename, isAbsolute as isAbsolute2, join, relative as relative2, sep as sep2 } from "path";
 var GENERATED_START = "<!-- flavor-code:start -->";
 var GENERATED_END = "<!-- flavor-code:end -->";
 var MAX_MANIFEST_BYTES = 1e6;
@@ -1025,29 +1023,8 @@ async function createExampleFlavorConfig(cwd) {
   };
   await writeFile(configPath, JSON.stringify(example, null, 2) + "\n");
 }
-var ASTGRAPH_SRC_DIR = join(dirname2(fileURLToPath(import.meta.url)), "astgraph");
-async function copyAstgraphPlugin(cwd) {
-  const pluginDir = join(cwd, ".flavor", "plugins", "astgraph");
-  try {
-    await lstat(pluginDir);
-    return;
-  } catch (error) {
-    if (!isMissingPathError(error)) throw error;
-  }
-  copyDirectory(ASTGRAPH_SRC_DIR, pluginDir);
-}
-function copyDirectory(from, to) {
-  mkdirSync(to, { recursive: true, mode: 448 });
-  for (const entry2 of readdirSync(from, { withFileTypes: true })) {
-    const source = join(from, entry2.name);
-    const target = join(to, entry2.name);
-    if (entry2.isDirectory()) copyDirectory(source, target);
-    else if (entry2.isFile()) copyFileSync(source, target);
-  }
-}
 async function initializeFlavor(cwd) {
   await ensureFlavorDirectories(cwd);
-  await copyAstgraphPlugin(cwd);
   await createExampleFlavorConfig(cwd);
   const facts = await inspectProject(cwd);
   const path = join(cwd, "FLAVOR.md");
@@ -1069,12 +1046,12 @@ async function initializeFlavor(cwd) {
 
 // src/utils/version.ts
 import { readFileSync } from "fs";
-import { dirname as dirname3, join as join2 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { dirname as dirname2, join as join2 } from "path";
+import { fileURLToPath } from "url";
 var cached;
 function packageVersion() {
   if (cached !== void 0) return cached;
-  let directory = dirname3(fileURLToPath2(import.meta.url));
+  let directory = dirname2(fileURLToPath(import.meta.url));
   for (; ; ) {
     try {
       const manifest = JSON.parse(readFileSync(join2(directory, "package.json"), "utf8"));
@@ -1084,7 +1061,7 @@ function packageVersion() {
       }
     } catch {
     }
-    const parent = dirname3(directory);
+    const parent = dirname2(directory);
     if (parent === directory) break;
     directory = parent;
   }
@@ -1879,7 +1856,7 @@ function addText(turn, text, onNewLine = false) {
 import { createHash, randomUUID } from "crypto";
 import { execFile } from "child_process";
 import { lstat as lstat2, mkdir as mkdir2, open, readFile as readFile2, readdir as readdir2, rename, rm, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname4, join as join3, relative as relative3, resolve as resolve2, sep as sep3 } from "path";
+import { dirname as dirname3, join as join3, relative as relative3, resolve as resolve2, sep as sep3 } from "path";
 var EXCLUDED = /* @__PURE__ */ new Set([".git", ".flavor", "node_modules", "dist", "build", "release", ".worktrees"]);
 var MAX_FILE_BYTES = 16 * 1024 * 1024;
 var MAX_TOTAL_BYTES = 128 * 1024 * 1024;
@@ -1965,7 +1942,7 @@ var WorkspaceCheckpointStore = class {
     for (const file of checkpoint.files) {
       const target = contained(this.#workspace, file.path);
       const object = objects.get(file.digest);
-      await mkdir2(dirname4(target), { recursive: true });
+      await mkdir2(dirname3(target), { recursive: true });
       const temporary = `${target}.${process.pid}.${randomUUID()}.tmp`;
       await writeFile2(temporary, object, { mode: file.mode });
       await rename(temporary, target);
@@ -2037,7 +2014,7 @@ function contained(workspace, path) {
   return absolute;
 }
 async function atomicJson(path, value) {
-  await mkdir2(dirname4(path), { recursive: true });
+  await mkdir2(dirname3(path), { recursive: true });
   const temporary = `${path}.${process.pid}.${randomUUID()}.tmp`;
   await writeFile2(temporary, `${JSON.stringify(value)}
 `, { encoding: "utf8", mode: 384 });
@@ -2050,7 +2027,7 @@ function isCode(error, code) {
 // src/session/tree.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { mkdir as mkdir3, readFile as readFile3, rename as rename2, writeFile as writeFile3 } from "fs/promises";
-import { dirname as dirname5, join as join4, resolve as resolve3 } from "path";
+import { dirname as dirname4, join as join4, resolve as resolve3 } from "path";
 var MAX_SESSION_HISTORY_NODES = 100;
 var MAX_SESSION_HISTORY_CONTEXT_CHARS = 2e6;
 var SessionHistory = class _SessionHistory {
@@ -2155,7 +2132,7 @@ var SessionHistory = class _SessionHistory {
       leafId: this.#leafId,
       nodes: this.#nodes
     };
-    await mkdir3(dirname5(this.#path), { recursive: true });
+    await mkdir3(dirname4(this.#path), { recursive: true });
     const temporary = `${this.#path}.${process.pid}.${randomUUID2()}.tmp`;
     await writeFile3(temporary, `${JSON.stringify(document)}
 `, { encoding: "utf8", mode: 384 });
@@ -2201,7 +2178,7 @@ function isCode2(error, code) {
 // src/tools/search.ts
 import { spawn } from "child_process";
 import { open as open2, opendir, stat } from "fs/promises";
-import { dirname as dirname6, isAbsolute as isAbsolute3, relative as relative4, resolve as resolve4, sep as sep4 } from "path";
+import { isAbsolute as isAbsolute3, relative as relative4, resolve as resolve4, sep as sep4 } from "path";
 import { rgPath as bundledRgPath } from "@vscode/ripgrep";
 import createIgnore from "ignore";
 import { z } from "zod";
@@ -2292,8 +2269,9 @@ var GlobInput = z.object({
   limit: z.coerce.number().int().positive().max(1e5).nullable().optional()
 });
 var GrepInput = z.object({
-  pattern: z.string().min(1),
-  path: z.string().min(1).describe('Workspace-relative search path. Use JSON null, not the string "null", for the workspace root.').nullable().optional(),
+  pattern: z.string().min(1).describe("Regular expression without / delimiters, or literal text when fixedStrings=true."),
+  fixedStrings: BooleanInput.describe("Match literal text, useful for Markdown links and paths containing regex punctuation.").nullable().optional(),
+  path: z.string().min(1).describe("Workspace-relative file or directory. A file restricts the search to that file. Use glob for multiple filenames and JSON null for the workspace root.").nullable().optional(),
   glob: z.string().min(1).nullable().optional(),
   fileType: z.enum(FILE_TYPES).nullable().optional(),
   includeIgnored: BooleanInput.describe("Include files excluded by .gitignore or .ignore. Git metadata remains excluded.").nullable().optional(),
@@ -2342,7 +2320,7 @@ function createGrepTool(workspace, options = {}) {
   const resources = searchResources(options);
   return {
     name: "Grep",
-    description: `Search workspace text with a regular expression. fileType must be one of: ${FILE_TYPES.join(", ")}.`,
+    description: `Search workspace text with a regular expression or fixedStrings=true for literal text. Zero matches is a successful search, not a path error. fileType must be one of: ${FILE_TYPES.join(", ")}.`,
     inputSchema: GrepInput,
     paths: (input) => [scope(root, searchPath(input.path))],
     summarize: (input) => {
@@ -2350,10 +2328,10 @@ function createGrepTool(workspace, options = {}) {
       const where = path ? ` in ${path}` : "";
       const kind = input.fileType ? ` [${input.fileType}]` : "";
       const ignored2 = input.includeIgnored === true ? " (including ignored files)" : "";
-      return `pattern: /${input.pattern}/${kind}${where}${ignored2}`;
+      return `pattern: ${input.fixedStrings === true ? JSON.stringify(input.pattern) : `/${input.pattern}/`}${kind}${where}${ignored2}`;
     },
     execute: async (input, signal) => {
-      const expression = new RegExp(input.pattern);
+      const expression = new RegExp(input.fixedStrings === true ? input.pattern.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&") : input.pattern);
       const limit = input.limit ?? options.defaultLimit ?? DEFAULT_RESULT_LIMIT;
       const context = input.context ?? 0;
       const start = await resolveGrepPath(root, searchPath(input.path));
@@ -2404,10 +2382,12 @@ async function rgGrep(root, start, input, context, signal, executable, argsPrefi
   }
   const args = ["--json", "--line-number", "--column", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", "!.git/**", "--max-filesize", String(maxFileBytes), "--context", String(context)];
   if (input.includeIgnored === true) args.push("--no-ignore");
+  if (input.fixedStrings === true) args.push("--fixed-strings");
   if (input.glob !== void 0 && input.glob !== null) args.push("--glob", input.glob);
   else for (const extension of typeExtensions ?? []) args.push("--glob", `*${extension}`);
   args.push("--regexp", input.pattern, "--", relative4(root, start) || ".");
   const matches = [];
+  const matcher = input.glob == null ? void 0 : globRegex(input.glob);
   const ignoreLayers = input.includeIgnored === true ? [] : await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
   const parser = delimitedParser(10, (record) => {
     if (record.length === 0) return true;
@@ -2420,6 +2400,7 @@ async function rgGrep(root, start, input, context, signal, executable, argsPrefi
     const lineWithEnding = tryDecodeUtf8(lineValue);
     if (decodedPath === void 0 || lineWithEnding === void 0) return true;
     const path = normalizePath(decodedPath).replace(/^\.\//, "");
+    if (matcher !== void 0 && !matcher.test(path)) return true;
     if (typeExtensions !== void 0 && !typeExtensions.some((extension) => path.endsWith(extension))) return true;
     if (ignored(path, false, ignoreLayers)) return true;
     const text = lineWithEnding.replace(/\r?\n$/, "");
@@ -2544,7 +2525,12 @@ async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBu
     }
     ignores.length = ruleCount;
   }
-  await walk(start);
+  if ((await stat(start)).isFile()) {
+    const path = normalizedRelative(root, start);
+    if (!isGitMetadataPath(root, start) && (includeIgnored || !ignored(path, false, ignores)) && accept(path)) output.push(path);
+  } else {
+    await walk(start);
+  }
   return output;
 }
 async function collectIgnoreLayers(root, start, signal, resources, ignoreBudget) {
@@ -2574,7 +2560,7 @@ async function collectIgnoreLayers(root, start, signal, resources, ignoreBudget)
       if (!ignored(path, true, layers)) await walk(absolute);
     }
   }
-  await walk(start);
+  if (!(await stat(start)).isFile()) await walk(start);
   return layers;
 }
 async function loadIgnoreFiles(directory, base, rules, budget, signal) {
@@ -2694,8 +2680,12 @@ async function resolveGrepPath(root, path = ".") {
   const candidate = scope(root, path);
   try {
     const info = await stat(candidate);
-    if (info.isFile()) return dirname6(candidate);
-  } catch {
+    if (!info.isFile() && !info.isDirectory()) throw new Error("Search path must be a file or directory");
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      throw new Error(`Search path does not exist: ${path}. Use Glob to find the file; put filename patterns in glob, not path.`);
+    }
+    throw error;
   }
   return candidate;
 }
@@ -4200,9 +4190,9 @@ Address this now (for example run the required verification or fix), then finish
   }
   #waitForPlanningIdle(key) {
     if (!this.#activePlanning.has(key)) return Promise.resolve();
-    return new Promise((resolve31) => {
+    return new Promise((resolve32) => {
       const check = () => {
-        if (!this.#activePlanning.has(key)) resolve31();
+        if (!this.#activePlanning.has(key)) resolve32();
         else this.#planningIdleWaiters.add(check);
       };
       this.#planningIdleWaiters.add(check);
@@ -4321,8 +4311,8 @@ async function fetchLatestVersion(options = {}) {
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const fetchImpl = options.fetchImpl ?? ((url, init) => fetch(url, init));
   let timer;
-  const timeout = new Promise((resolve31) => {
-    timer = setTimeout(() => resolve31(void 0), timeoutMs);
+  const timeout = new Promise((resolve32) => {
+    timer = setTimeout(() => resolve32(void 0), timeoutMs);
     timer.unref?.();
   });
   try {
@@ -4447,7 +4437,7 @@ var PluginManifestSchema = z4.object({
 }).strict();
 
 // src/tools/shell.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { existsSync as existsSync3 } from "fs";
 import { basename as basename2, delimiter as delimiter2, isAbsolute as isAbsolute5, join as join5, relative as relative5, resolve as resolve6, sep as sep5 } from "path";
 import { z as z6 } from "zod";
@@ -4490,7 +4480,7 @@ function resolveWindowsCommand(command, cwd, env) {
     ...pathValue.split(";").filter(Boolean).map((entry2) => resolve5(unquote(entry2), command))
   ];
   for (const base of bases) {
-    const candidates = extname(base).length > 0 ? [base] : [base, ...pathExt.map((extension) => `${base}${extension}`)];
+    const candidates = extname(base).length > 0 ? [base] : [...pathExt.map((extension) => `${base}${extension}`), base];
     for (const candidate of candidates) {
       if (isRegularFile(candidate)) return resolve5(candidate);
     }
@@ -4568,7 +4558,7 @@ function createJobTools(registry) {
       inputSchema: IdInput,
       paths: () => [],
       execute: async (input, _signal, context) => {
-        registry.kill(input.id, owner(context));
+        await registry.kill(input.id, owner(context));
         return registry.read(input.id, owner(context));
       },
       presentResult: (output) => jobPresentation("kill", output)
@@ -4608,11 +4598,51 @@ function owner(context) {
   return context?.ownerId ?? context?.agent ?? "main";
 }
 
+// src/utils/process-tree.ts
+import { spawn as spawn2 } from "child_process";
+async function terminateProcessTree(pid) {
+  if (pid === void 0) return;
+  if (process.platform === "win32") {
+    await new Promise((resolve32) => {
+      const child = spawn2("taskkill", ["/pid", String(pid), "/T", "/F"], { shell: false, windowsHide: true });
+      const finish = () => {
+        clearTimeout(timer);
+        resolve32();
+      };
+      const timer = setTimeout(finish, 5e3);
+      timer.unref();
+      child.once("error", finish);
+      child.once("close", finish);
+    });
+    try {
+      process.kill(pid);
+    } catch {
+    }
+  } else {
+    try {
+      process.kill(-pid, "SIGTERM");
+    } catch {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+    }
+    await new Promise((resolve32) => setTimeout(resolve32, 250));
+    try {
+      process.kill(-pid, "SIGKILL");
+    } catch {
+      try {
+        process.kill(pid, "SIGKILL");
+      } catch {
+      }
+    }
+  }
+}
+
 // src/tools/shell.ts
 var DEFAULT_MAX_OUTPUT_BYTES = 1048576;
 var DEFAULT_SHELL_TIMEOUT_MS = 10 * 6e4;
 var ELLIPSIS = "\u2026";
-var TERMINATION_GRACE_MS = 250;
 var TERMINATION_FAILURE_MS = 5e3;
 var STREAM_CLOSE_GRACE_MS = 500;
 var ShellInput = z6.object({
@@ -4631,12 +4661,6 @@ function normalizeShellCommand(input) {
   if ((executable === "cmd" || executable === "cmd.exe") && /^\/[ck]$/iu.test(args[0] ?? "")) {
     return { command, args: [args[0], ...args.slice(1).map(unquoteToken)] };
   }
-  if ((executable === "pwsh" || executable === "pwsh.exe" || executable === "powershell" || executable === "powershell.exe") && /^(?:-c|-command)$/iu.test(args[0] ?? "") && args.length > 1) {
-    return { command, args: [args[0], ...args.slice(1).map(unquoteToken)] };
-  }
-  if (/^(?:sh|bash|zsh|fish)$/iu.test(executable) && args[0] === "-c" && args[1] !== void 0) {
-    return { command, args: [args[0], unquoteToken(args[1]), ...args.slice(2)] };
-  }
   if (!/\s/u.test(command) || containsShellSyntax(command)) return { command, args };
   const tokens = tokenizeCommandLine(command);
   if (tokens.length <= 1) return { command, args };
@@ -4754,7 +4778,8 @@ function shellInvocation(input, cwd, environment) {
         const payload = serializeCmdPayload(input.args.slice(commandFlag + 1));
         return {
           command: resolved,
-          args: [...input.args.slice(0, commandFlag + 1), `chcp 65001>nul & ${payload}`]
+          args: [...input.args.slice(0, commandFlag + 1), `chcp 65001>nul & ${payload}`],
+          windowsVerbatimArguments: true
         };
       }
     }
@@ -4770,7 +4795,8 @@ function shellInvocation(input, cwd, environment) {
   if (shell.kind === "posix") return { command: shell.command, args: ["-c", script] };
   if (shell.kind === "cmd") return {
     command: shell.command,
-    args: ["/d", "/s", "/c", `chcp 65001>nul & ${script}`]
+    args: ["/d", "/s", "/c", `chcp 65001>nul & ${script}`],
+    windowsVerbatimArguments: true
   };
   const encoded = Buffer.from(script, "utf16le").toString("base64");
   return {
@@ -4793,8 +4819,8 @@ function executionEnvironmentCommand(environment, command, args) {
 function structuredShellScript(shell, command, args) {
   if (shell.kind === "posix") return [command, ...args].map(posixQuote).join(" ");
   if (shell.kind === "cmd") return serializeCmdCommand([command, ...args]);
-  const invocation = `& ${psQuote(command)}${args.length > 0 ? ` ${args.map(psQuote).join(" ")}` : ""}`;
-  return `$ErrorActionPreference='Stop'; try { ${invocation}; if ($null -ne $LASTEXITCODE) { exit $LASTEXITCODE } else { exit 0 } } catch { [Console]::Error.WriteLine($_.Exception.Message); exit 127 }`;
+  const invocation = `& ${psQuote(command)}${args.length > 0 ? ` ${args.map((arg) => /^-[A-Za-z][A-Za-z0-9-]*$/u.test(arg) ? arg : psQuote(arg)).join(" ")}` : ""}`;
+  return `$ErrorActionPreference='Stop'; try { ${invocation}; if ($null -ne $LASTEXITCODE) { exit $LASTEXITCODE } else { exit 0 } } catch { [Console]::Error.WriteLine($_.Exception.Message); if ($_.Exception -is [System.Management.Automation.CommandNotFoundException]) { exit 127 } else { exit 1 } }`;
 }
 function posixQuote(value) {
   return `'${value.replace(/'/gu, `'"'"'`)}'`;
@@ -4827,7 +4853,7 @@ ${result.stderr}`;
     return {
       kind: "command-not-found",
       message: `Executable "${command}" was not found by the selected runtime shell.`,
-      hint: "Use a command available on PATH, or pass an existing executable path without surrounding quotes."
+      hint: "Use a command available on PATH, or pass an existing executable path without surrounding quotes. For an unavailable PowerShell cmdlet, check Get-Command and its module in the selected shell; do not keep retrying the same command."
     };
   }
   if (code === "EACCES" || /(?:permission denied|access is denied|拒绝访问)/iu.test(detail)) {
@@ -4836,11 +4862,11 @@ ${result.stderr}`;
   if (/(?:no such file or directory|cannot find (?:the )?path|system cannot find|系统找不到指定的路径)/iu.test(detail)) {
     return { kind: "path-not-found", message: "The command referenced a path that does not exist." };
   }
-  if (/(?:syntax error|unexpected token|parsererror|语法错误)/iu.test(detail)) {
+  if (/(?:syntax\s*error|unexpected token|parsererror|unterminated (?:regexp|string)|语法错误)/iu.test(detail)) {
     return {
       kind: "shell-syntax",
-      message: "The selected runtime shell rejected the command syntax.",
-      hint: "Pass normal arguments through args; reserve shell syntax for pipes, redirects, and operators."
+      message: "The command or interpreter rejected the syntax.",
+      hint: 'Pass normal arguments through args. For JavaScript use command="node", args=["-e", "<complete script>"] without an extra shell or surrounding quotes. Legacy Windows PowerShell can strip quotes when forwarding native arguments.'
     };
   }
   return {
@@ -4862,7 +4888,7 @@ function createShellTool(workspace, options = {}) {
   }
   return {
     name: "Shell",
-    description: "Run a bounded command reliably inside the workspace. Pass a bare executable in command and one unquoted logical value per args entry; shell syntax is supported only when command contains pipes, redirects, or operators. stdout/stderr are returned verbatim and failures include a structured diagnostic. background=true returns a managed job id.",
+    description: 'Run a bounded command reliably inside the workspace. Pass a bare executable in command and one logical value per args entry, without adding surrounding shell quotes. For Node scripts use command="node", args=["-e", "<complete JavaScript>"]; do not wrap native commands in cmd /c or PowerShell -Command unless shell syntax is needed, since legacy PowerShell can strip embedded quotes. Use Grep for text searches and Read/Edit for file changes. stdout/stderr are returned verbatim and failures include a structured diagnostic. background=true returns a managed job id.',
     inputSchema: ShellInput,
     paths: (input) => [workingDirectory(root, input.cwd ?? void 0)],
     summarize: (input) => [input.command, ...input.args].join(" "),
@@ -4962,7 +4988,7 @@ async function executeShell(root, input, cancellation, maxBytes, environment = p
       return;
     }
     const invocation = shellInvocation(input, cwd, environment);
-    const child = spawn2(invocation.command, invocation.args, {
+    const child = spawn3(invocation.command, invocation.args, {
       cwd,
       shell: false,
       windowsHide: true,
@@ -4989,7 +5015,7 @@ async function executeShell(root, input, cancellation, maxBytes, environment = p
         void finishResolve(observedExitCode ?? child.exitCode, observedSignal ?? child.signalCode);
         return;
       }
-      termination = terminateTree(child.pid);
+      termination = terminateProcessTree(child.pid);
       terminalTimer = setTimeout(() => finishReject(new Error(`Process did not close after ${reason} termination`)), TERMINATION_FAILURE_MS);
       terminalTimer.unref();
     };
@@ -5149,52 +5175,6 @@ function workingDirectory(root, cwd = ".") {
   if (delta === ".." || delta.startsWith(`..${sep5}`) || isAbsolute5(delta)) throw new Error("Working directory is outside the workspace");
   return candidate;
 }
-async function terminateTree(pid) {
-  if (pid === void 0) return;
-  if (process.platform === "win32") {
-    await waitForProcess(spawn2("taskkill", ["/pid", String(pid), "/T", "/F"], { shell: false, windowsHide: true }));
-    try {
-      process.kill(pid);
-    } catch {
-    }
-  } else {
-    try {
-      process.kill(-pid, "SIGTERM");
-    } catch {
-      try {
-        process.kill(pid, "SIGTERM");
-      } catch {
-      }
-    }
-    await delay(TERMINATION_GRACE_MS);
-    try {
-      process.kill(-pid, "SIGKILL");
-    } catch {
-      try {
-        process.kill(pid, "SIGKILL");
-      } catch {
-      }
-    }
-  }
-}
-function waitForProcess(child) {
-  return new Promise((resolvePromise) => {
-    let settled = false;
-    const finish = () => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolvePromise();
-    };
-    const timer = setTimeout(finish, TERMINATION_FAILURE_MS);
-    timer.unref();
-    child.once("error", finish);
-    child.once("close", finish);
-  });
-}
-function delay(milliseconds) {
-  return new Promise((resolvePromise) => setTimeout(resolvePromise, milliseconds));
-}
 function decodeOutput(buffer) {
   const encoding = outputEncoding(buffer);
   return new TextDecoder(encoding).decode(buffer);
@@ -5478,7 +5458,7 @@ function errorMessage(error) {
 }
 
 // src/utils/crash-guard.ts
-import { mkdirSync as mkdirSync2, writeFileSync } from "fs";
+import { mkdirSync, writeFileSync } from "fs";
 import { join as join7 } from "path";
 var installed = false;
 var crashing = false;
@@ -5518,7 +5498,7 @@ function installCrashGuard(options = {}) {
   const writeCrashLog = (kind, detail) => {
     try {
       const dir = crashLogDir();
-      mkdirSync2(dir, { recursive: true });
+      mkdirSync(dir, { recursive: true });
       const path = join7(dir, `crash-${(/* @__PURE__ */ new Date()).toISOString().replace(/[^0-9]/g, "")}-${process.pid}.log`);
       writeFileSync(path, [
         `kind: ${kind}`,
@@ -5573,7 +5553,7 @@ ${reason.stack ?? ""}`;
 }
 
 // src/execution/docker.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { relative as relative7, resolve as resolve8, sep as sep7, win32 } from "path";
 function buildDockerInvocation(options) {
   const workspace = options.workspace;
@@ -5632,7 +5612,7 @@ function runDockerInvocation(invocation, signal, timeoutMs, maxOutputBytes = DEF
       resolvePromise({ exitCode: null, signal: null, stdout: "", stderr: "", terminationReason: "cancelled" });
       return;
     }
-    const child = spawn3(invocation.command, invocation.args, { windowsHide: true, shell: false });
+    const child = spawn4(invocation.command, invocation.args, { windowsHide: true, shell: false });
     const stdout = new BoundedUtf8Output(maxOutputBytes);
     const stderr = new BoundedUtf8Output(maxOutputBytes);
     let reason = null;
@@ -5741,13 +5721,13 @@ import { createHash as createHash3 } from "crypto";
 import { Socket as Socket2 } from "net";
 import { tmpdir } from "os";
 import { join as join9 } from "path";
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 
 // src/pals/broker.ts
 import { createHash as createHash2, randomUUID as randomUUID5, timingSafeEqual } from "crypto";
 import { chmod as chmod2, lstat as lstat4, mkdir as mkdir6, unlink as unlink3 } from "fs/promises";
 import { createServer, Socket } from "net";
-import { dirname as dirname8 } from "path";
+import { dirname as dirname6 } from "path";
 
 // src/pals/auth.ts
 import { randomBytes, randomUUID as randomUUID3 } from "crypto";
@@ -5798,7 +5778,7 @@ function validatePalAuthToken(token) {
 // src/pals/lifecycle.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { mkdir as mkdir5, open as open4, readFile as readFile6, rename as rename3, stat as stat3, unlink as unlink2 } from "fs/promises";
-import { dirname as dirname7 } from "path";
+import { dirname as dirname5 } from "path";
 function defaultProcessAlive(pid) {
   if (!Number.isSafeInteger(pid) || pid <= 0) return true;
   try {
@@ -5819,7 +5799,7 @@ function parseMetadata(value) {
 }
 async function acquirePalFileLock(options) {
   if (await options.endpointLive()) return void 0;
-  await mkdir5(dirname7(options.path), { recursive: true, mode: 448 });
+  await mkdir5(dirname5(options.path), { recursive: true, mode: 448 });
   const pid = options.pid ?? process.pid;
   const now = options.now ?? Date.now;
   const nonce = randomUUID4();
@@ -5883,12 +5863,12 @@ var BrokerStateError = class extends Error {
 };
 var WINDOWS_PIPE_PREFIX = "\\\\.\\pipe\\";
 function canConnect(address) {
-  return new Promise((resolve31) => {
+  return new Promise((resolve32) => {
     const socket = new Socket();
     const finish = (connected) => {
       socket.removeAllListeners();
       socket.destroy();
-      resolve31(connected);
+      resolve32(connected);
     };
     socket.once("connect", () => finish(true));
     socket.once("error", () => finish(false));
@@ -5937,7 +5917,7 @@ var PalBrokerServer = class {
     this.authToken ??= await loadOrCreatePalAuthToken(this.authHome === void 0 ? {} : { home: this.authHome });
     try {
       await this.prepareAddress();
-      await new Promise((resolve31, reject) => {
+      await new Promise((resolve32, reject) => {
         const onError = (error) => {
           this.server.off("listening", onListening);
           reject(error);
@@ -5946,7 +5926,7 @@ var PalBrokerServer = class {
           this.server.off("error", onError);
           this.started = true;
           this.ownsAddress = true;
-          resolve31();
+          resolve32();
         };
         this.server.once("error", onError);
         this.server.once("listening", onListening);
@@ -5974,7 +5954,7 @@ var PalBrokerServer = class {
     const ownsAddress = this.ownsAddress;
     for (const connection of this.connections) connection.socket.destroy();
     if (this.started) {
-      await new Promise((resolve31) => this.server.close(() => resolve31()));
+      await new Promise((resolve32) => this.server.close(() => resolve32()));
       this.started = false;
     }
     this.ownsAddress = false;
@@ -5983,7 +5963,7 @@ var PalBrokerServer = class {
   }
   async prepareAddress() {
     if (isWindowsPipeAddress(this.address, this.platform)) return;
-    const parent = dirname8(this.address);
+    const parent = dirname6(this.address);
     await mkdir6(parent, { recursive: true, mode: 448 });
     await chmod2(parent, 448);
     this.endpointLock = await acquirePalFileLock({
@@ -6642,16 +6622,16 @@ var PalBrokerState = class {
 
 // src/pals/broker-cli.ts
 var startupAttempts = /* @__PURE__ */ new Map();
-function delay2(milliseconds) {
-  return new Promise((resolve31) => setTimeout(resolve31, milliseconds));
+function delay(milliseconds) {
+  return new Promise((resolve32) => setTimeout(resolve32, milliseconds));
 }
 function canConnect2(address) {
-  return new Promise((resolve31) => {
+  return new Promise((resolve32) => {
     const socket = new Socket2();
     const finish = (connected) => {
       socket.removeAllListeners();
       socket.destroy();
-      resolve31(connected);
+      resolve32(connected);
     };
     socket.once("connect", () => finish(true));
     socket.once("error", () => finish(false));
@@ -6674,7 +6654,7 @@ async function spawnPalBrokerProcess(options) {
   const lock = await acquirePalFileLock({ path: lockPath, endpointLive: () => canConnect2(address) });
   if (lock === void 0) return;
   try {
-    const child = spawn4(options.executable, [...options.args], {
+    const child = spawn5(options.executable, [...options.args], {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
@@ -6682,7 +6662,7 @@ async function spawnPalBrokerProcess(options) {
     });
     child.unref();
     const deadline = Date.now() + 5e3;
-    while (Date.now() < deadline && !await canConnect2(address)) await delay2(25);
+    while (Date.now() < deadline && !await canConnect2(address)) await delay(25);
     if (!await canConnect2(address)) throw new Error(`Pals broker process did not become ready at '${address}'`);
   } finally {
     await lock.release();
@@ -6694,8 +6674,8 @@ async function runPalBroker(options) {
   const sweepIntervalMs = options.sweepIntervalMs ?? 5e3;
   const idleShutdownMs = options.idleShutdownMs ?? 3e4;
   let resolveClosed;
-  const closed = new Promise((resolve31) => {
-    resolveClosed = resolve31;
+  const closed = new Promise((resolve32) => {
+    resolveClosed = resolve32;
   });
   let closing;
   const timer = setInterval(() => {
@@ -6729,17 +6709,17 @@ async function ensureOnce(options) {
   const deadline = Date.now() + timeoutMs;
   do {
     if (await canConnect2(options.address)) return;
-    await delay2(retryDelayMs);
+    await delay(retryDelayMs);
   } while (Date.now() < deadline);
   throw new Error(`Timed out waiting for pals broker at '${options.address}'`);
 }
 
 // src/production.ts
 import { readFile as readFile23 } from "fs/promises";
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import { createHash as createHash18, randomUUID as randomUUID20 } from "crypto";
 import { homedir as homedir3, release as osRelease, tmpdir as tmpdir4, version as osVersion } from "os";
-import { basename as basename7, dirname as dirname19, join as join29, relative as relative21, resolve as resolve30, sep as sep21 } from "path";
+import { basename as basename7, dirname as dirname17, join as join29, relative as relative22, resolve as resolve31, sep as sep22 } from "path";
 
 // src/agent/subagents.ts
 import { z as z9 } from "zod";
@@ -7159,7 +7139,7 @@ var TaskPlanSchema = z10.object({
       }
       dependencies.add(dependency);
     }
-    if (task.status === "completed") {
+    if (task.status === "completed" || task.status === "in_progress") {
       const incomplete = task.dependencies.find((dependency) => plan.tasks.find((candidate) => candidate.id === dependency)?.status !== "completed");
       if (incomplete !== void 0) {
         context.addIssue({
@@ -7188,7 +7168,7 @@ function updatePlanTask(plan, input) {
   if (!isValidTransition(previousStatus, update.status)) {
     throw new Error(`Invalid task transition for ${update.taskId}: ${previousStatus} -> ${update.status}`);
   }
-  if (update.status === "completed") {
+  if (update.status === "completed" || update.status === "in_progress") {
     const incomplete = current.tasks[index].dependencies.find((dependency) => current.tasks.find((task) => task.id === dependency)?.status !== "completed");
     if (incomplete !== void 0) throw new Error(`Task ${update.taskId} has an incomplete dependency: ${incomplete}`);
   }
@@ -7213,6 +7193,7 @@ function isValidTransition(from, to) {
   if (from === "in_progress") {
     return to === "completed" || to === "failed" || to === "blocked" || to === "cancelled";
   }
+  if (from === "blocked" || from === "failed") return to === "pending" || to === "in_progress" || to === "cancelled";
   return false;
 }
 function normalizeAbandonedPlan(plan) {
@@ -8085,7 +8066,7 @@ function providerValidMessages(input) {
 // src/context/workspace-instructions.ts
 import { createHash as createHash5 } from "crypto";
 import { lstat as lstat5, readFile as readFile7, realpath as realpath2 } from "fs/promises";
-import { dirname as dirname9, isAbsolute as isAbsolute7, relative as relative8, resolve as resolve9, sep as sep8 } from "path";
+import { dirname as dirname7, isAbsolute as isAbsolute7, relative as relative8, resolve as resolve9, sep as sep8 } from "path";
 var NAMES = ["AGENTS.md", "CLAUDE.md", "AGENTS.local.md", "CLAUDE.local.md"];
 var ROOT_NAMES = ["AGENTS.md", "CLAUDE.md", "AGENTS.local.md", "CLAUDE.local.md"];
 var WorkspaceInstructions = class {
@@ -8113,7 +8094,7 @@ var WorkspaceInstructions = class {
         const depth = depthOf(this.#root, current);
         directories.set(current, depth);
         if (current === this.#root) break;
-        current = dirname9(current);
+        current = dirname7(current);
       }
     }
     const ordered = [...directories].map(([path, depth]) => ({ path, depth })).sort((a, b) => a.depth - b.depth || a.path.localeCompare(b.path));
@@ -8187,9 +8168,9 @@ ${document.content}
 };
 async function directoryForPath(path) {
   try {
-    return (await lstat5(path)).isDirectory() ? path : dirname9(path);
+    return (await lstat5(path)).isDirectory() ? path : dirname7(path);
   } catch {
-    return dirname9(path);
+    return dirname7(path);
   }
 }
 function depthOf(root, path) {
@@ -8288,8 +8269,8 @@ function withStructuredOutput(options) {
   if (retry.backoffMs.length < retry.maxRetries) {
     throw new Error("Structured output backoffMs must provide one delay per retry");
   }
-  for (const delay3 of retry.backoffMs.slice(0, retry.maxRetries)) {
-    if (!Number.isSafeInteger(delay3) || delay3 < 0) {
+  for (const delay2 of retry.backoffMs.slice(0, retry.maxRetries)) {
+    if (!Number.isSafeInteger(delay2) || delay2 < 0) {
       throw new Error("Structured output retry delays must be non-negative integers");
     }
   }
@@ -8650,10 +8631,10 @@ function sanitize(message2, secrets) {
 }
 function waitForRetry(delayMs, signal) {
   if (signal?.aborted) return Promise.reject(signal.reason);
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve32, reject) => {
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve31();
+      resolve32();
     }, delayMs);
     const onAbort = () => {
       clearTimeout(timer);
@@ -8724,6 +8705,15 @@ var AgentLoop = class {
   get iterationLimitMode() {
     return this.#iterationLimitMode;
   }
+  get maxIterations() {
+    return this.#options.maxIterations;
+  }
+  get softLimitFactor() {
+    return this.#options.softLimitFactor;
+  }
+  get extendIterations() {
+    return this.#options.extendIterations;
+  }
   setModel(modelId) {
     this.#options.registry.get(modelId);
     this.#options.modelId = modelId;
@@ -9291,10 +9281,10 @@ function serializeToolInput(input) {
 }
 function waitForRetry2(delayMs, signal) {
   if (signal?.aborted) return Promise.reject(signal.reason);
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve32, reject) => {
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve31();
+      resolve32();
     }, delayMs);
     const onAbort = () => {
       clearTimeout(timer);
@@ -9504,8 +9494,9 @@ var ToolRuntime = class {
     }
   }
   async execute(call, context) {
+    if (this.#disposed) return { ok: false, error: { code: "runtime_disposed", message: "ToolRuntime is disposed" } };
     const definition = this.#tools.get(call.name);
-    const journalId = definition === void 0 || this.#journal === void 0 ? void 0 : this.#journal.start(call.name, call.input, definition.retrySafe === true || definition.readOnly === true);
+    const journalId = definition === void 0 || this.#journal === void 0 ? void 0 : this.#journal.start(call.name, call.input, definition.retrySafe === true || definition.readOnly === true || getToolCategory(call.name) === "read");
     try {
       const result = await this.#execute(call, context);
       if (journalId !== void 0) this.#journal?.complete(journalId, result);
@@ -9532,6 +9523,10 @@ var ToolRuntime = class {
     if (tool === void 0) return { ok: false, error: { code: "unknown_tool", message: `Unknown tool: ${call.name}` } };
     const signal = context.signal ?? new AbortController().signal;
     const toolCallId = call.id ?? randomUUID7();
+    if (tool.agents !== void 0 && !tool.agents.includes(context.agent)) {
+      return this.#fail(toolCallId, tool.name, call.input, context.agent, "permission_denied", `Tool ${tool.name} is not available to ${context.agent} agents`);
+    }
+    if (signal.aborted) return this.#fail(toolCallId, tool.name, call.input, context.agent, "cancelled", message(signal.reason));
     const validation = this.normalize(call);
     if (!validation.ok) {
       return this.#fail(toolCallId, call.name, call.input, context.agent, validation.error.code, validation.error.message);
@@ -9639,17 +9634,37 @@ var ToolRuntime = class {
       } catch (error) {
         return this.#fail(toolCallId, tool.name, input, context.agent, "invalid_output", message(error));
       }
-      const declaredPresentation = tool.presentResult?.(rawOutput, input);
-      const presentation = declaredPresentation ?? getToolPresentation(rawOutput);
-      const rendered = tool.renderForModel?.(rawOutput, input);
+      const warnings = [];
+      let presentation = getToolPresentation(rawOutput);
+      try {
+        presentation = tool.presentResult?.(rawOutput, input) ?? presentation;
+      } catch (error) {
+        warnings.push(`Tool succeeded; result presentation failed: ${message(error)}`);
+      }
+      let rendered;
+      try {
+        rendered = tool.renderForModel?.(rawOutput, input);
+      } catch (error) {
+        warnings.push(`Tool succeeded; result rendering failed: ${message(error)}`);
+      }
       const output = rendered === void 0 ? await this.#limitOutput(tool.name, rawOutput) : rawOutput;
       const content = rendered === void 0 ? void 0 : await this.#limitText(tool.name, rendered);
-      const additionalContext = await this.#afterSuccess?.(tool.name, tool.paths(input), input, rawOutput, context);
-      await this.#hooks.emit({
-        version: 1,
-        type: "PostToolUse",
-        payload: { toolCallId, tool: tool.name, input, agent: context.agent, output }
-      });
+      let additionalContext = [];
+      try {
+        additionalContext = await this.#afterSuccess?.(tool.name, tool.paths(input), input, rawOutput, context) ?? [];
+      } catch (error) {
+        warnings.push(`Tool succeeded; context update failed: ${message(error)}`);
+      }
+      try {
+        await this.#hooks.emit({
+          version: 1,
+          type: "PostToolUse",
+          payload: { toolCallId, tool: tool.name, input, agent: context.agent, output }
+        });
+      } catch (error) {
+        warnings.push(`Tool succeeded; PostToolUse hook failed: ${message(error)}`);
+      }
+      additionalContext = [...additionalContext, ...warnings];
       return {
         ok: true,
         output,
@@ -9680,17 +9695,23 @@ var ToolRuntime = class {
     const preview = headTailPreview(serialized, previewChars);
     this.#turnOutputChars += preview.length;
     const directory = join10(this.#workspace, ".flavor", "tool-results");
-    await mkdir7(directory, { recursive: true });
     const filename2 = `${(/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-")}-${randomUUID7()}-${safeFilename(tool)}.txt`;
     const savedTo = join10(directory, filename2);
-    await writeFile4(savedTo, serialized, "utf8");
+    let storage;
+    try {
+      await mkdir7(directory, { recursive: true });
+      await writeFile4(savedTo, serialized, "utf8");
+      storage = { savedTo };
+    } catch (error) {
+      storage = { storageError: `Tool succeeded, but the full output could not be saved: ${message(error)}` };
+    }
     return {
       truncated: true,
       reason,
       preview,
       originalChars: serialized.length,
       previewChars: preview.length,
-      savedTo
+      ...storage
     };
   }
   callPresentation(call) {
@@ -9891,6 +9912,8 @@ var LocalHarness = class {
         agent,
         ownerId,
         ...maxIterations === void 0 ? {} : { maxIterations },
+        ...this.#options.softLimitFactor === void 0 ? {} : { softLimitFactor: this.#options.softLimitFactor },
+        ...this.#options.extendIterations === void 0 ? {} : { extendIterations: this.#options.extendIterations },
         ...isMain && this.#options.hasActiveProgress !== void 0 ? { hasActiveProgress: this.#options.hasActiveProgress } : {},
         ...isMain && this.#options.hallucinationGuard !== void 0 ? { hallucinationGuard: this.#options.hallucinationGuard } : {},
         ...this.#options.modelJournal === void 0 ? {} : { modelJournal: this.#options.modelJournal }
@@ -9920,7 +9943,7 @@ function toModelTool(tool) {
 
 // src/harness/journal.ts
 import { createHash as createHash6, randomUUID as randomUUID8 } from "crypto";
-import { closeSync, constants as constants3, existsSync as existsSync4, fsyncSync, mkdirSync as mkdirSync3, openSync, readFileSync as readFileSync2, realpathSync as realpathSync2, renameSync, statSync as statSync2, truncateSync, unlinkSync, writeSync } from "fs";
+import { closeSync, constants as constants3, existsSync as existsSync4, fsyncSync, mkdirSync as mkdirSync2, openSync, readFileSync as readFileSync2, realpathSync as realpathSync2, renameSync, statSync as statSync2, truncateSync, unlinkSync, writeSync } from "fs";
 import { join as join11, relative as relative9, resolve as resolve11, sep as sep9 } from "path";
 import { z as z14 } from "zod";
 
@@ -10013,7 +10036,7 @@ var HarnessJournal = class {
     const workspace = resolve11(options.workspace);
     const directory = join11(workspace, ".flavor", "sessions");
     assertSessionId(options.sessionId);
-    mkdirSync3(directory, { recursive: true, mode: 448 });
+    mkdirSync2(directory, { recursive: true, mode: 448 });
     assertWithin(workspace, directory);
     const canonicalWorkspace = realpathSync2.native(workspace);
     const canonicalDirectory = realpathSync2.native(directory);
@@ -10332,7 +10355,7 @@ function isWithin2(root, target) {
 }
 
 // src/hooks/bus.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 import { randomUUID as randomUUID9 } from "crypto";
 var DEFAULT_TIMEOUT_MS2 = 1e4;
 var DEFAULT_MAX_OUTPUT_BYTES2 = 1048576;
@@ -10439,10 +10462,10 @@ function decoratePayload(payload, envelope) {
   return envelope === void 0 ? payload : { ...payload, ...envelope };
 }
 function runShellHandler(descriptor, event, signal) {
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve32, reject) => {
     const env = { ...process.env, ...descriptor.env };
     const invocation = prepareSpawnInvocation(descriptor.command, descriptor.args ?? [], { env });
-    const child = spawn5(invocation.command, invocation.args, {
+    const child = spawn6(invocation.command, invocation.args, {
       env,
       shell: false,
       detached: process.platform !== "win32",
@@ -10459,7 +10482,7 @@ function runShellHandler(descriptor, event, signal) {
       if (settled) return;
       settled = true;
       signal.removeEventListener("abort", onAbort);
-      terminateProcessTree(child);
+      terminateProcessTree2(child);
       reject(error);
     };
     const append = (stream, chunk) => {
@@ -10485,7 +10508,7 @@ function runShellHandler(descriptor, event, signal) {
         return;
       }
       try {
-        resolve31(HookDecisionSchema.parse(JSON.parse(stdout)));
+        resolve32(HookDecisionSchema.parse(JSON.parse(stdout)));
       } catch (error) {
         reject(error);
       }
@@ -10493,10 +10516,10 @@ function runShellHandler(descriptor, event, signal) {
     child.stdin.end(JSON.stringify(event));
   });
 }
-function terminateProcessTree(child) {
+function terminateProcessTree2(child) {
   if (child.pid === void 0) return;
   if (process.platform === "win32") {
-    const killer = spawn5("taskkill", ["/pid", String(child.pid), "/t", "/f"], {
+    const killer = spawn6("taskkill", ["/pid", String(child.pid), "/t", "/f"], {
       stdio: "ignore",
       windowsHide: true
     });
@@ -10682,14 +10705,14 @@ async function createIslandControlServer(options) {
       void dispatch(line, socket, options, token);
     });
   });
-  await new Promise((resolve31, reject) => {
+  await new Promise((resolve32, reject) => {
     const onError = (error) => {
       server.removeListener("listening", onListening);
       reject(error);
     };
     const onListening = () => {
       server.removeListener("error", onError);
-      resolve31();
+      resolve32();
     };
     server.once("error", onError);
     server.once("listening", onListening);
@@ -10760,17 +10783,17 @@ function write(socket, payload) {
   }
 }
 function closeServer(server) {
-  return new Promise((resolve31) => {
+  return new Promise((resolve32) => {
     try {
-      server.close(() => resolve31());
+      server.close(() => resolve32());
     } catch {
-      resolve31();
+      resolve32();
     }
   });
 }
 
 // src/evolve/service.ts
-import { spawn as spawn6 } from "child_process";
+import { spawn as spawn7 } from "child_process";
 import { writeFile as writeFile8 } from "fs/promises";
 import { join as join15 } from "path";
 import { z as z16 } from "zod";
@@ -10790,7 +10813,7 @@ import { z as z15 } from "zod";
 
 // src/plugins/worker-host.ts
 import { realpath as realpath3 } from "fs/promises";
-import { dirname as dirname10 } from "path";
+import { dirname as dirname8 } from "path";
 import { Worker } from "worker_threads";
 var DEFAULT_ACTIVATION_TIMEOUT_MS = 1e4;
 var DEFAULT_INVOCATION_TIMEOUT_MS = 3e4;
@@ -10798,7 +10821,7 @@ var DEFAULT_MAX_OLD_SPACE_MB = 128;
 var DEFAULT_SHUTDOWN_TIMEOUT_MS = 5e3;
 async function startPluginSandbox(options) {
   const entryPath = await realpath3(options.entryPath);
-  const pluginRoot = await realpath3(options.pluginRoot ?? dirname10(entryPath));
+  const pluginRoot = await realpath3(options.pluginRoot ?? dirname8(entryPath));
   const activationTimeoutMs = options.activationTimeoutMs ?? DEFAULT_ACTIVATION_TIMEOUT_MS;
   const invocationTimeoutMs = options.invocationTimeoutMs ?? DEFAULT_INVOCATION_TIMEOUT_MS;
   let configJson;
@@ -11618,7 +11641,7 @@ async function revertFixPlugin(workspace, name) {
 // src/evolve/store.ts
 import { createHash as createHash9 } from "crypto";
 import { appendFile, mkdir as mkdir9, readFile as readFile9, rm as rm3, writeFile as writeFile7 } from "fs/promises";
-import { dirname as dirname11, join as join14 } from "path";
+import { dirname as dirname9, join as join14 } from "path";
 function normalizeError(message2) {
   return String(message2 ?? "").replace(/\s+/g, " ").replace(/"[^"]*"/g, '"\u2026"').replace(/`[^`]*`/g, '"\u2026"').trim().slice(0, 160);
 }
@@ -11647,7 +11670,7 @@ async function readJsonLines(file) {
   }
 }
 async function writeJsonLines(file, records) {
-  await mkdir9(dirname11(file), { recursive: true, mode: 448 });
+  await mkdir9(dirname9(file), { recursive: true, mode: 448 });
   const body = records.map((record) => JSON.stringify(record)).join("\n");
   await writeFile7(file, body.length > 0 ? `${body}
 ` : "", { encoding: "utf8", mode: 384 });
@@ -11675,7 +11698,7 @@ async function readRules(file) {
   }
 }
 async function writeRules(file, rules) {
-  await mkdir9(dirname11(file), { recursive: true, mode: 448 });
+  await mkdir9(dirname9(file), { recursive: true, mode: 448 });
   await writeFile7(file, JSON.stringify(rules, null, 2), { encoding: "utf8", mode: 384 });
 }
 var EvolveStore = class {
@@ -11915,9 +11938,9 @@ var USAGE = [
   "  clear     reset signals, done markers, and verified markers"
 ].join("\n");
 function runCommand(command, cwd, timeoutMs) {
-  return new Promise((resolve31) => {
+  return new Promise((resolve32) => {
     const isWindows = process.platform === "win32";
-    const child = spawn6(isWindows ? "cmd.exe" : "/bin/sh", isWindows ? ["/d", "/s", "/c", command] : ["-c", command], {
+    const child = spawn7(isWindows ? "cmd.exe" : "/bin/sh", isWindows ? ["/d", "/s", "/c", command] : ["-c", command], {
       cwd,
       windowsHide: true
     });
@@ -11925,7 +11948,7 @@ function runCommand(command, cwd, timeoutMs) {
     let stderr = "";
     const timer = setTimeout(() => {
       child.kill();
-      resolve31({ ok: false, stdout, stderr: `${stderr}
+      resolve32({ ok: false, stdout, stderr: `${stderr}
 [killed: exceeded ${timeoutMs}ms]`, code: "timeout" });
     }, timeoutMs);
     child.stdout.on("data", (chunk) => {
@@ -11936,12 +11959,12 @@ function runCommand(command, cwd, timeoutMs) {
     });
     child.on("error", (error) => {
       clearTimeout(timer);
-      resolve31({ ok: false, stdout, stderr: `${stderr}
+      resolve32({ ok: false, stdout, stderr: `${stderr}
 ${error.message}`, code: "spawn" });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve31({ ok: code === 0, stdout, stderr, code: code ?? "unknown" });
+      resolve32({ ok: code === 0, stdout, stderr, code: code ?? "unknown" });
     });
   });
 }
@@ -12312,10 +12335,12 @@ ${result.stderr.slice(-4e3)}` : ""}`;
         name: "evolve_improve",
         description: "Implement a fix for one repeated tool failure. Default kind=plugin scaffolds the fix-<tool>/ plugin dir and writes PLAN.md with instructions for implementing, verifying, reloading, and testing it. kind=prompt_rule instead stores a concise guardrail rule (from `implementation`) that is injected into future system prompts and closes the suggestion. Use when the model proposes a concrete fix for a suggestion in the system prompt.",
         inputSchema,
-        paths: () => [],
-        execute: async (input) => {
+        paths: (input) => [join15(workspace, ".flavor", "evolve"), ...input.kind === "prompt_rule" ? [] : [join15(workspace, ".flavor", "plugins")]],
+        execute: async (input, signal) => {
+          signal.throwIfAborted();
           const { suggestionId, implementation, kind } = input;
           const suggestions = await openWithTrends(100);
+          signal.throwIfAborted();
           const suggestion = suggestions.find((item) => item.id === suggestionId);
           if (suggestion === void 0) throw new Error(`No open suggestion with id "${suggestionId}".`);
           if (kind === "prompt_rule") {
@@ -13427,7 +13452,7 @@ function formatPriorGaps(gaps) {
 import { constants as constants4 } from "fs";
 import { randomUUID as randomUUID11 } from "crypto";
 import { lstat as lstat7, mkdir as mkdir11, open as open6, rename as rename4, rm as rm4 } from "fs/promises";
-import { dirname as dirname12, join as join18, relative as relative11, resolve as resolve14, sep as sep11 } from "path";
+import { dirname as dirname10, join as join18, relative as relative11, resolve as resolve14, sep as sep11 } from "path";
 var DEFAULT_MAX_BYTES = 1024 * 1024;
 var GoalStore = class {
   #workspace;
@@ -13440,7 +13465,7 @@ var GoalStore = class {
   }
   async save(input) {
     const state = GoalStateSchema.parse(input);
-    await assertNoSymlink(this.#workspace, dirname12(this.#root));
+    await assertNoSymlink(this.#workspace, dirname10(this.#root));
     await mkdir11(this.#root, { recursive: true, mode: 448 });
     await assertNoSymlink(this.#workspace, this.#root);
     const target = join18(this.#root, `${state.id}.json`);
@@ -13474,7 +13499,7 @@ async function assertNoSymlink(root, target) {
   const chain = [];
   while (cursor !== stop) {
     chain.push(cursor);
-    cursor = dirname12(cursor);
+    cursor = dirname10(cursor);
   }
   for (const path of chain.reverse()) {
     try {
@@ -13561,7 +13586,7 @@ async function ensureWorktreeDirectoryIgnored(root) {
 // src/loop/store.ts
 import { constants as constants5 } from "fs";
 import { lstat as lstat8, mkdir as mkdir13, open as open7, readFile as readFile12, realpath as realpath5, rename as rename5, rm as rm5, stat as stat6 } from "fs/promises";
-import { dirname as dirname13, join as join20, relative as relative12, resolve as resolve16, sep as sep12 } from "path";
+import { dirname as dirname11, join as join20, relative as relative12, resolve as resolve16, sep as sep12 } from "path";
 import { randomUUID as randomUUID12 } from "crypto";
 var LOOP_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 var DEFAULT_MAX_BYTES2 = 5 * 1024 * 1024;
@@ -13643,7 +13668,7 @@ var LoopStore = class {
   }
   async #prepare(loopId) {
     validateId(loopId);
-    await assertNoSymlink2(this.#workspace, dirname13(this.#root));
+    await assertNoSymlink2(this.#workspace, dirname11(this.#root));
     await mkdir13(this.#root, { recursive: true, mode: 448 });
     await assertNoSymlink2(this.#workspace, this.#root);
     const directory = join20(this.#root, loopId);
@@ -13676,7 +13701,7 @@ async function assertNoSymlink2(root, target) {
   const chain = [];
   while (cursor !== stop) {
     chain.push(cursor);
-    cursor = dirname13(cursor);
+    cursor = dirname11(cursor);
   }
   for (const path of chain.reverse()) {
     try {
@@ -14908,8 +14933,8 @@ var OAuthCallbackAuthProvider = class {
   async #startCallbackServer(expectedState, signal) {
     let serverResolve;
     let serverReject;
-    const codePromise = new Promise((resolve31, reject) => {
-      serverResolve = resolve31;
+    const codePromise = new Promise((resolve32, reject) => {
+      serverResolve = resolve32;
       serverReject = reject;
     });
     const server = createServer3((req, res) => {
@@ -14943,7 +14968,7 @@ var OAuthCallbackAuthProvider = class {
       );
       serverResolve(code);
     });
-    return new Promise((resolve31, reject) => {
+    return new Promise((resolve32, reject) => {
       server.once("error", (error) => {
         reject(new Error(`OAuth callback server failed: ${error.message}`));
       });
@@ -14960,7 +14985,7 @@ var OAuthCallbackAuthProvider = class {
         signal.addEventListener("abort", () => {
           serverReject(new Error("OAuth flow aborted"));
         }, { once: true });
-        resolve31({ redirectUri, promise: codePromise });
+        resolve32({ redirectUri, promise: codePromise });
       });
     });
   }
@@ -15042,7 +15067,7 @@ function escapeHtml(text) {
 }
 
 // src/auth/store.ts
-import { dirname as dirname14 } from "path";
+import { dirname as dirname12 } from "path";
 async function retainOnlyCredentials(store, keepCredentialId) {
   const tokens = await store.load();
   const retained = Object.fromEntries(Object.entries(tokens).filter(([id]) => id === keepCredentialId));
@@ -15053,7 +15078,7 @@ function createFileTokenStore(filePath) {
   const store = {
     tokens: {},
     async load() {
-      const key = await loadOrCreateConfigKey(dirname14(filePath));
+      const key = await loadOrCreateConfigKey(dirname12(filePath));
       const result = await readRecoverableFile(filePath, (raw) => parseTokens(decryptDocument(raw, key)));
       const tokens = result?.value ?? {};
       baseline = { ...tokens };
@@ -15061,7 +15086,7 @@ function createFileTokenStore(filePath) {
       return tokens;
     },
     async save(tokens) {
-      const key = await loadOrCreateConfigKey(dirname14(filePath));
+      const key = await loadOrCreateConfigKey(dirname12(filePath));
       const removals = Object.keys(baseline).filter((providerId) => !(providerId in tokens));
       const upserts = Object.fromEntries(Object.entries(tokens).filter(
         ([providerId, token]) => !sameToken(baseline[providerId], token)
@@ -15890,10 +15915,14 @@ function createSkillResourceTool(registry) {
     name: "SkillResource",
     description: "Read a bounded resource explicitly referenced by a discovered skill; scripts are returned as data and never executed",
     inputSchema: SkillResourceInput,
+    readOnly: true,
     paths: () => [],
     execute: async (input, signal) => {
       signal.throwIfAborted();
-      const skill = (await registry.discover()).find((candidate) => candidate.name === input.skill);
+      const requested = input.skill.trim();
+      const alias = requested.includes(":") ? requested.slice(requested.lastIndexOf(":") + 1) : requested;
+      const discovered = await registry.discover();
+      const skill = discovered.find((candidate) => candidate.name === requested) ?? discovered.find((candidate) => candidate.name === alias);
       if (skill === void 0) throw new Error(`Unknown skill: ${input.skill}`);
       const capability = await registry.resolveResource(skill, input.reference);
       const content = await registry.readResource(capability);
@@ -15911,7 +15940,7 @@ function createSkillResourceTool(registry) {
 // src/session/store.ts
 import { constants as constants7 } from "fs";
 import { lstat as lstat10, mkdir as mkdir14, open as open8, readFile as readFile17, readdir as readdir7, realpath as realpath7, rename as rename6, rm as rm6, stat as stat7 } from "fs/promises";
-import { basename as basename4, dirname as dirname15, join as join23, relative as relative14, resolve as resolve20, sep as sep14 } from "path";
+import { basename as basename4, dirname as dirname13, join as join23, relative as relative14, resolve as resolve20, sep as sep14 } from "path";
 import { randomUUID as randomUUID13 } from "crypto";
 import { z as z22 } from "zod";
 var SESSION_VERSION = 4;
@@ -16265,7 +16294,7 @@ var SessionStore = class {
     }
   }
   async #prepareDirectory() {
-    await assertNoSymlink3(this.#workspace, dirname15(this.#sessions));
+    await assertNoSymlink3(this.#workspace, dirname13(this.#sessions));
     await mkdir14(this.#sessions, { recursive: true, mode: 448 });
     await this.#assertSafeExistingDirectory();
   }
@@ -16493,7 +16522,7 @@ async function assertNoSymlink3(root, target) {
   const chain = [];
   while (cursor !== stop) {
     chain.push(cursor);
-    cursor = dirname15(cursor);
+    cursor = dirname13(cursor);
   }
   for (const path of chain.reverse()) {
     try {
@@ -16767,14 +16796,14 @@ var ProjectSleepScheduler = class {
     const next = new Date(now);
     next.setDate(next.getDate() + 1);
     next.setHours(0, 0, 0, 0);
-    const delay3 = Math.max(1, next.getTime() - now.getTime());
+    const delay2 = Math.max(1, next.getTime() - now.getTime());
     const targetDate = localDateKey(now);
     this.#dailyTimer = setTimeout(() => {
       this.#dailyTimer = void 0;
       if (this.#disposed) return;
       this.#enqueue(targetDate);
       this.#scheduleNextMidnight();
-    }, delay3);
+    }, delay2);
     this.#dailyTimer.unref?.();
   }
   #enqueue(date) {
@@ -17069,7 +17098,7 @@ function computeSessionStats(documents) {
 // src/tools/files.ts
 import { constants as constants9 } from "fs";
 import { mkdir as mkdir16, open as open10, readFile as readFile18, realpath as realpath9, rename as rename8, rm as rm8, stat as stat8 } from "fs/promises";
-import { dirname as dirname16, isAbsolute as isAbsolute11, relative as relative16, resolve as resolve22, sep as sep16 } from "path";
+import { dirname as dirname14, isAbsolute as isAbsolute11, relative as relative16, resolve as resolve22, sep as sep16 } from "path";
 import { randomUUID as randomUUID15 } from "crypto";
 import { z as z24 } from "zod";
 
@@ -17187,8 +17216,12 @@ var ReadInput2 = z24.object({
   force: z24.union([z24.boolean(), z24.string().refine((value) => value === "true" || value === "false")]).nullable().optional()
 });
 var WriteInput = z24.object({ path: z24.string().min(1), content: z24.string() });
-var EditInput = z24.object({ path: z24.string().min(1), oldText: z24.string().min(1), newText: z24.string() });
-var ApplyPatchInput = z24.object({ patch: z24.string().min(1) });
+var EditInput = z24.object({
+  path: z24.string().min(1),
+  oldText: z24.string().min(1).describe("Copy exact current file text from Read, without displayed line numbers or diff prefixes. Include enough context for one unique match."),
+  newText: z24.string()
+});
+var ApplyPatchInput = z24.object({ patch: z24.string().min(1).describe("One-file unified diff with --- a/path, +++ b/path and @@ hunk headers. Use /dev/null as the old path to create a file.") });
 var FileObservationStore = class {
   #versions = /* @__PURE__ */ new Map();
   get(path) {
@@ -17231,9 +17264,9 @@ function createReadTool(workspace, options = {}) {
       const windowBytes = rangeRequested ? Math.max(maxBytes, Math.min(info.size, MAX_READ_BYTES)) : maxBytes;
       const contents = await readBounded2(path, windowBytes, signal, openFile2);
       if (isBinary(contents)) throw new Error("Cannot read binary file as text");
-      const textEnd = utf8SafeEnd(contents, windowBytes);
+      const textEnd = contents.length > windowBytes ? utf8SafeEnd(contents, windowBytes) : contents.length;
       const truncated = contents.length > windowBytes;
-      const text = contents.subarray(0, textEnd).toString("utf8").replaceAll("\r\n", "\n");
+      const text = decodeFileText(contents.subarray(0, textEnd)).replaceAll("\r\n", "\n");
       options.observations?.set(path, versionOfStat(info));
       const lines = text.split("\n");
       if (lines.at(-1) === "") lines.pop();
@@ -17309,7 +17342,7 @@ function createEditTool(workspace, options = {}) {
   const guard = createPathGuard(workspace);
   return {
     name: "Edit",
-    description: "Replace one unique exact text match",
+    description: "Replace one unique exact text match, accepting LF or CRLF input. Read the file before editing; after a mismatch, re-read with force=true and copy the current text instead of retrying the same oldText.",
     inputSchema: EditInput,
     paths: (input) => [guard.lexical(input.path)],
     execute: async (input, signal) => {
@@ -17319,14 +17352,14 @@ function createEditTool(workspace, options = {}) {
       const expected = await expectedMutationVersion(path, options.observations);
       const contents = await readText(path);
       const hasCRLF = contents.includes("\r\n");
-      const norm = (s) => hasCRLF ? s.replace(/\r\n/g, "\n") : s;
+      const norm = (s) => s.replace(/\r\n/g, "\n");
       const contentsLF = norm(contents);
       const oldTextLF = norm(input.oldText);
       const newTextLF = norm(input.newText);
       const first = contentsLF.indexOf(oldTextLF);
-      const second = first < 0 ? -1 : contentsLF.indexOf(oldTextLF, first + oldTextLF.length);
+      const second = first < 0 ? -1 : contentsLF.indexOf(oldTextLF, first + 1);
       if (first < 0 || second >= 0) {
-        const diagnosis = buildEditDiagnosis(contentsLF, oldTextLF, first, second);
+        const diagnosis = buildEditDiagnosis(contentsLF, oldTextLF, second);
         throw new Error(diagnosis);
       }
       const updatedLF = contentsLF.slice(0, first) + newTextLF + contentsLF.slice(first + oldTextLF.length);
@@ -17346,7 +17379,7 @@ function createApplyPatchTool(workspace, options = {}) {
   const guard = createPathGuard(workspace);
   return {
     name: "ApplyPatch",
-    description: "Apply a workspace-limited unified diff, relocating hunks only by unique exact context",
+    description: "Apply a single-file workspace-limited unified diff, relocating hunks only by unique exact context. Submit separate calls for multiple files.",
     inputSchema: ApplyPatchInput,
     paths: (input) => parsePatch(input.patch).map((file) => guard.lexical(file.path)),
     execute: async (input, signal) => {
@@ -17411,7 +17444,7 @@ function createPathGuard(workspace) {
           break;
         } catch (error) {
           if (!isMissing3(error)) throw error;
-          const parent = dirname16(ancestor);
+          const parent = dirname14(ancestor);
           if (parent === ancestor) throw error;
           ancestor = parent;
         }
@@ -17422,12 +17455,19 @@ function createPathGuard(workspace) {
 }
 async function atomicWrite(path, content, signal, expectedVersion) {
   abortIfNeeded(signal);
-  await mkdir16(dirname16(path), { recursive: true });
+  await mkdir16(dirname14(path), { recursive: true });
   const temporary = `${path}.${randomUUID15()}.tmp`;
+  let mode;
+  try {
+    mode = (await stat8(path)).mode & 511;
+  } catch (error) {
+    if (!isMissing3(error)) throw error;
+  }
   try {
     const handle = await open10(temporary, constants9.O_CREAT | constants9.O_EXCL | constants9.O_WRONLY, 384);
     try {
       await handle.writeFile(content, "utf8");
+      if (mode !== void 0) await handle.chmod(mode);
       await handle.sync();
     } finally {
       await handle.close();
@@ -17444,7 +17484,14 @@ async function atomicWrite(path, content, signal, expectedVersion) {
 async function readText(path) {
   const contents = await readFile18(path);
   if (isBinary(contents)) throw new Error("Cannot edit binary file as text");
-  return contents.toString("utf8");
+  return decodeFileText(contents);
+}
+function decodeFileText(contents) {
+  try {
+    return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(contents);
+  } catch {
+    throw new Error("File is not valid UTF-8 text. Convert its encoding before using Read/Edit/ApplyPatch to avoid corrupting its contents.");
+  }
 }
 var ABSENT_VERSION = "absent";
 async function expectedMutationVersion(path, observations) {
@@ -17654,11 +17701,12 @@ function patchPath(header) {
   const raw = header.split("	", 1)[0].trim();
   return raw.startsWith("a/") || raw.startsWith("b/") ? raw.slice(2) : raw;
 }
-function buildEditDiagnosis(contentsLF, oldTextLF, first, second) {
+function buildEditDiagnosis(contentsLF, oldTextLF, second) {
   let diagnosis = "oldText must match exactly once";
   if (second >= 0) {
-    const count = contentsLF.split(oldTextLF).length - 1;
-    diagnosis += ` \u2014 matched ${count} times in the file`;
+    let count = 0;
+    for (let index = contentsLF.indexOf(oldTextLF); index >= 0; index = contentsLF.indexOf(oldTextLF, index + 1)) count += 1;
+    diagnosis += ` \u2014 matched ${count} times in the file. No changes made. Include more surrounding text to select one occurrence.`;
     return diagnosis;
   }
   const oldLines = oldTextLF.split("\n");
@@ -17694,7 +17742,8 @@ ${snippet}
 First lines of file:
 ${fileSnippet}`;
   }
-  return diagnosis;
+  return `${diagnosis}
+No changes made. Use Read with force=true to retrieve current text, or Grep with fixedStrings=true to locate it. Copy oldText exactly without line-number prefixes; do not repeat the same failed edit.`;
 }
 function applyHunks(original, hunks) {
   const hasCRLF = original.includes("\r\n");
@@ -17785,6 +17834,19 @@ import { isIP } from "net";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
 import { z as z25 } from "zod";
+
+// src/utils/abort.ts
+function waitWithSignal(operation, signal) {
+  if (signal === void 0) return operation;
+  return new Promise((resolve32, reject) => {
+    const abort2 = () => reject(signal.reason);
+    if (signal.aborted) abort2();
+    else signal.addEventListener("abort", abort2, { once: true });
+    operation.then(resolve32, reject).finally(() => signal.removeEventListener("abort", abort2));
+  });
+}
+
+// src/tools/web.ts
 var WebFetchInput = z25.object({
   url: z25.string().url().max(8192),
   timeoutMs: z25.coerce.number().int().positive().max(12e4).optional(),
@@ -17830,7 +17892,12 @@ function createWebSearchTool(provider = createDefaultWebSearchProvider()) {
     summarize: (input) => input.query,
     presentCall: (input) => ({ kind: "web", title: `Searching: ${input.query}` }),
     permissions: () => ({ paths: [] }),
-    execute: async (input, signal) => ({ query: input.query, results: [...await provider.search(input.query, input.maxResults ?? 8, signal)] }),
+    execute: async (input, signal) => {
+      signal.throwIfAborted();
+      const maxResults = input.maxResults ?? 8;
+      const results = await waitWithSignal(provider.search(input.query, maxResults, signal), signal);
+      return { query: input.query, results: [...results].slice(0, maxResults) };
+    },
     renderForModel: (output) => output.results.length === 0 ? `No web results found for: ${output.query}` : output.results.map((item, index) => `${index + 1}. ${item.title}
 ${item.url}
 ${item.snippet}`).join("\n\n"),
@@ -17875,10 +17942,14 @@ var MultiSourceWebSearchProvider = class {
   }
 };
 async function fetchPublic(initialUrl, options) {
+  options.signal.throwIfAborted();
+  const deadline = AbortSignal.timeout(options.timeoutMs);
+  options = { ...options, signal: AbortSignal.any([options.signal, deadline]) };
   let current = new URL(initialUrl);
   for (let redirects = 0; redirects <= 5; redirects += 1) {
+    options.signal.throwIfAborted();
     validateUrl(current);
-    const addresses = await lookup(normalizedHostname(current.hostname), { all: true, verbatim: true });
+    const addresses = await waitWithSignal(lookup(normalizedHostname(current.hostname), { all: true, verbatim: true }), options.signal);
     if (addresses.length === 0) throw new Error("Host did not resolve");
     if (addresses.some((entry2) => isBlockedResolvedAddress(entry2.address, current.hostname))) {
       throw new Error("Blocked private or special network destination");
@@ -17890,7 +17961,13 @@ async function fetchPublic(initialUrl, options) {
       continue;
     }
     const contentType = response.contentType;
-    const decoded = new TextDecoder(charset(contentType), { fatal: false }).decode(response.body);
+    let decoder;
+    try {
+      decoder = new TextDecoder(charset(contentType), { fatal: false });
+    } catch {
+      decoder = new TextDecoder("utf-8");
+    }
+    const decoded = decoder.decode(response.body);
     const content = !options.rawHtml && /text\/html|application\/xhtml\+xml/i.test(contentType) ? htmlToText(decoded) : decoded;
     return { url: current.href, status: response.status, contentType, content, truncated: response.truncated };
   }
@@ -17925,8 +18002,8 @@ async function requestAddress(url, address, options) {
       const status = response.statusCode ?? 0;
       const location = response.headers.location;
       if (location !== void 0 && [301, 302, 303, 307, 308].includes(status)) {
-        response.resume();
         finish({ status, contentType: "", body: new Uint8Array(), truncated: false, redirect: location });
+        response.destroy();
         return;
       }
       const chunks = [];
@@ -17942,7 +18019,11 @@ async function requestAddress(url, address, options) {
         const accepted = chunk.subarray(0, options.maxBytes - bytes);
         chunks.push(accepted);
         bytes += accepted.length;
-        if (accepted.length < chunk.length) truncated = true;
+        if (accepted.length < chunk.length) {
+          truncated = true;
+          finish({ status, contentType: String(response.headers["content-type"] ?? "application/octet-stream"), body: Buffer.concat(chunks), truncated });
+          response.destroy();
+        }
       });
       response.once("end", () => finish({
         status,
@@ -18088,11 +18169,11 @@ function charset(contentType) {
 }
 
 // src/tools/lsp.ts
-import { spawn as spawn7 } from "child_process";
+import { spawn as spawn8 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
 import { access as access2, constants as constants10, readFile as readFile19 } from "fs/promises";
-import { basename as basename5, dirname as dirname17, extname as extname2, isAbsolute as isAbsolute12, relative as relative17, resolve as resolve23, sep as sep17 } from "path";
-import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL2 } from "url";
+import { basename as basename5, dirname as dirname15, extname as extname2, isAbsolute as isAbsolute12, relative as relative17, resolve as resolve23, sep as sep17 } from "path";
+import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "url";
 import { z as z26 } from "zod";
 var LSP_REQUEST_TIMEOUT_MS = 15e3;
 var LspConnection = class {
@@ -18104,12 +18185,14 @@ var LspConnection = class {
   #nextId = 1;
   #disposed = false;
   #initError;
+  #shutdownPromise;
   constructor(command, args, cwd) {
     const invocation = prepareSpawnInvocation(command, args, { cwd });
-    this.#process = spawn7(invocation.command, invocation.args, {
+    this.#process = spawn8(invocation.command, invocation.args, {
       cwd,
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true,
+      detached: process.platform !== "win32",
       ...invocation.windowsVerbatimArguments === void 0 ? {} : { windowsVerbatimArguments: invocation.windowsVerbatimArguments }
     });
     this.#process.on("error", (err) => {
@@ -18118,9 +18201,15 @@ var LspConnection = class {
     });
     this.#process.once("exit", (code, signal) => {
       const reason = signal !== null ? `LSP server "${command}" exited with signal ${signal}` : `LSP server "${command}" exited with code ${code}`;
-      this.#rejectAll(new Error(reason));
+      this.#initError = new Error(reason);
+      this.#rejectAll(this.#initError);
     });
     this.#process.stdout.on("data", (chunk) => this.#buffer.feed(chunk, this.#onMessage));
+    this.#process.stderr.resume();
+    this.#process.stdin.on("error", (error) => {
+      this.#initError = error;
+      this.#rejectAll(error);
+    });
   }
   async initialize(rootUri) {
     if (this.#initError !== void 0) throw this.#initError;
@@ -18142,67 +18231,84 @@ var LspConnection = class {
     if (initResult === void 0) throw new Error("LSP initialize returned no capabilities");
     this.#notify("initialized", {});
   }
-  async findReferences(uri, line, character) {
+  async findReferences(uri, line, character, signal) {
+    signal?.throwIfAborted();
     await this.#syncDocument(uri);
     const result = await this.#request("textDocument/references", {
       textDocument: { uri },
       position: { line, character },
       context: { includeDeclaration: false }
-    });
+    }, signal);
     if (result === null || result === void 0) return [];
     if (!Array.isArray(result)) return [];
     return result.filter(isLocation);
   }
-  async hover(uri, line, character) {
+  async hover(uri, line, character, signal) {
+    signal?.throwIfAborted();
     await this.#syncDocument(uri);
     const result = await this.#request("textDocument/hover", {
       textDocument: { uri },
       position: { line, character }
-    });
+    }, signal);
     if (result === null || result === void 0) return null;
     if (typeof result === "object" && "contents" in result) {
       return result;
     }
     return null;
   }
-  async diagnostics(uri) {
+  async diagnostics(uri, signal) {
+    signal?.throwIfAborted();
     await this.#syncDocument(uri);
     const result = await this.#request("textDocument/diagnostic", {
       textDocument: { uri }
-    });
+    }, signal);
     if (result === null || result === void 0) return [];
     const items = result?.items ?? result;
     if (!Array.isArray(items)) return [];
     return items.filter(isDiagnostic);
   }
-  async shutdown() {
-    if (this.#disposed) return;
+  shutdown() {
+    if (this.#shutdownPromise !== void 0) return this.#shutdownPromise;
     this.#disposed = true;
-    try {
-      await this.#request("shutdown", null);
-    } catch {
-    }
-    this.#notify("exit", null);
-    this.#process.kill();
     this.#rejectAll(new Error("LSP connection disposed"));
+    this.#shutdownPromise = (async () => {
+      await terminateProcessTree(this.#process.pid);
+      this.#process.stdin.destroy();
+      this.#process.stdout.destroy();
+      this.#process.stderr.destroy();
+    })();
+    return this.#shutdownPromise;
   }
   // -- JSON-RPC core -------------------------------------------------------
-  async #request(method, params) {
+  async #request(method, params, signal) {
     if (this.#disposed) throw new Error("LSP connection disposed");
+    if (this.#initError !== void 0) throw this.#initError;
+    signal?.throwIfAborted();
     const id = this.#nextId++;
     const request = { jsonrpc: "2.0", id, method, params };
-    const timeout = AbortSignal.timeout(LSP_REQUEST_TIMEOUT_MS);
-    const promise = new Promise((resolve31, reject) => {
-      this.#pending.set(id, { resolve: resolve31, reject });
-      timeout.addEventListener("abort", () => {
-        if (this.#pending.has(id)) {
-          this.#pending.delete(id);
-          reject(new Error(`LSP request "${method}" timed out after ${LSP_REQUEST_TIMEOUT_MS}ms`));
+    let timer;
+    let onAbort;
+    const promise = new Promise((resolve32, reject) => {
+      this.#pending.set(id, { resolve: resolve32, reject });
+      timer = setTimeout(() => reject(new Error(`LSP request "${method}" timed out after ${LSP_REQUEST_TIMEOUT_MS}ms`)), LSP_REQUEST_TIMEOUT_MS);
+      timer.unref();
+      onAbort = () => {
+        try {
+          this.#notify("$/cancelRequest", { id });
+        } catch {
         }
-      }, { once: true });
+        reject(signal?.reason);
+      };
+      signal?.addEventListener("abort", onAbort, { once: true });
     });
-    this.#send(request);
-    return promise;
+    try {
+      this.#send(request);
+      return await promise;
+    } finally {
+      if (timer !== void 0) clearTimeout(timer);
+      if (onAbort !== void 0) signal?.removeEventListener("abort", onAbort);
+      this.#pending.delete(id);
+    }
   }
   #notify(method, params) {
     const notification = { jsonrpc: "2.0", method, params };
@@ -18222,6 +18328,7 @@ var LspConnection = class {
     } catch {
       return;
     }
+    if (typeof parsed !== "object" || parsed === null) return;
     if ("method" in parsed) {
       if ("id" in parsed) this.#handleServerRequest(parsed);
       return;
@@ -18257,7 +18364,7 @@ var LspConnection = class {
   async #syncDocumentNow(uri) {
     const url = new URL(uri);
     if (url.protocol !== "file:") return;
-    const filePath = fileURLToPath3(url);
+    const filePath = fileURLToPath2(url);
     const text = await readFile19(filePath, "utf8");
     const current = this.#documents.get(uri);
     if (current === void 0) {
@@ -18310,7 +18417,7 @@ var LspBuffer = class {
   }
 };
 var TYPESCRIPT_CLI = resolve23(
-  dirname17(fileURLToPath3(import.meta.resolve("typescript/package.json"))),
+  dirname15(fileURLToPath2(import.meta.resolve("typescript/package.json"))),
   "lib",
   "tsc.js"
 );
@@ -18345,6 +18452,8 @@ var KNOWN_SERVERS = [
   }
 ];
 var RealLspManager = class {
+  #disposed = false;
+  #disposal;
   #workspace;
   #connections = /* @__PURE__ */ new Map();
   #pendingStarts = /* @__PURE__ */ new Map();
@@ -18356,27 +18465,32 @@ var RealLspManager = class {
     this.#onStatus = options.onStatus;
   }
   dispose() {
-    for (const [, connection] of this.#connections) {
-      connection.shutdown().catch(() => {
-      });
-    }
+    if (this.#disposal !== void 0) return this.#disposal;
+    this.#disposed = true;
+    const shutdowns = [...this.#connections.values()].map((connection) => connection.shutdown());
+    shutdowns.push(...[...this.#pendingStarts.values()].map(async (start) => {
+      const connection = await start;
+      await connection.shutdown();
+    }));
     this.#connections.clear();
     this.#pendingStarts.clear();
+    this.#disposal = Promise.allSettled(shutdowns).then(() => void 0);
+    return this.#disposal;
   }
-  async findReferences(uri, line, character) {
-    const connection = await this.#getConnection(uri);
-    if (connection === void 0) return [];
-    return connection.findReferences(uri, line, character);
+  async findReferences(uri, line, character, signal) {
+    signal?.throwIfAborted();
+    const connection = await waitWithSignal(this.#getConnection(uri), signal);
+    return connection.findReferences(uri, line, character, signal);
   }
-  async hover(uri, line, character) {
-    const connection = await this.#getConnection(uri);
-    if (connection === void 0) return null;
-    return connection.hover(uri, line, character);
+  async hover(uri, line, character, signal) {
+    signal?.throwIfAborted();
+    const connection = await waitWithSignal(this.#getConnection(uri), signal);
+    return connection.hover(uri, line, character, signal);
   }
-  async diagnostics(uri) {
-    const connection = await this.#getConnection(uri);
-    if (connection === void 0) return [];
-    return connection.diagnostics(uri);
+  async diagnostics(uri, signal) {
+    signal?.throwIfAborted();
+    const connection = await waitWithSignal(this.#getConnection(uri), signal);
+    return connection.diagnostics(uri, signal);
   }
   #languageForUri(uri) {
     try {
@@ -18392,20 +18506,25 @@ var RealLspManager = class {
     return void 0;
   }
   async #getConnection(uri) {
+    if (this.#disposed) throw new Error("LSP manager is disposed");
     const language = this.#languageForUri(uri);
-    if (language === void 0) return void 0;
+    if (language === void 0) throw new Error(`No language server configured for ${uri}; use Read/Grep or the project compiler`);
     const existing = this.#connections.get(language);
     if (existing !== void 0) return existing;
     const pending = this.#pendingStarts.get(language);
     if (pending !== void 0) return pending;
     const config = this.#serverConfigs.find((c) => c.language === language);
-    if (config === void 0) return void 0;
+    if (config === void 0) throw new Error(`No language server configured for ${language}`);
     const hasRoot = config.rootFiles.some((file) => existsSync5(resolve23(this.#workspace, file)));
-    if (!hasRoot) return void 0;
+    if (!hasRoot) throw new Error(`Cannot start ${language} language server: workspace needs ${config.rootFiles.join(" or ")}`);
     const startPromise = this.#startServer(config);
     this.#pendingStarts.set(language, startPromise);
     try {
       const connection = await startPromise;
+      if (this.#disposed) {
+        await connection.shutdown();
+        throw new Error("LSP manager is disposed");
+      }
       this.#connections.set(language, connection);
       return connection;
     } finally {
@@ -18423,6 +18542,7 @@ var RealLspManager = class {
       await connection.initialize(rootUri);
       this.#onStatus?.(`${config.language} Language Server ready (${config.command})`);
     } catch (error) {
+      await connection.shutdown();
       this.#onStatus?.(`${config.language} Language Server failed: ${error instanceof Error ? error.message : String(error)}`);
       throw error;
     }
@@ -18431,13 +18551,13 @@ var RealLspManager = class {
 };
 var LspFindRefsInput = z26.object({
   file: z26.string().min(1),
-  line: z26.coerce.number().int().nonnegative(),
-  character: z26.coerce.number().int().nonnegative()
+  line: z26.coerce.number().int().nonnegative().describe("Zero-based line number (first line is 0)."),
+  character: z26.coerce.number().int().nonnegative().describe("Zero-based UTF-16 character offset.")
 });
 var LspHoverInput = z26.object({
   file: z26.string().min(1),
-  line: z26.coerce.number().int().nonnegative(),
-  character: z26.coerce.number().int().nonnegative()
+  line: z26.coerce.number().int().nonnegative().describe("Zero-based line number (first line is 0)."),
+  character: z26.coerce.number().int().nonnegative().describe("Zero-based UTF-16 character offset.")
 });
 var LspDiagnosticsInput = z26.object({
   file: z26.string().min(1)
@@ -18463,10 +18583,11 @@ function createLspTools(workspace, options = {}) {
     inputSchema: LspFindRefsInput,
     paths: (input) => [guard(input.file)],
     summarize: (input) => `${basename5(input.file)}:${input.line}:${input.character}${langTag(input.file)}`,
-    execute: async (input, _signal) => {
+    execute: async (input, signal) => {
+      signal.throwIfAborted();
       const path = guard(input.file);
       const uri = toUri(path);
-      const refs = await manager.findReferences(uri, input.line, input.character);
+      const refs = await waitWithSignal(manager.findReferences(uri, input.line, input.character, signal), signal);
       if (refs.length === 0) return `No references found at ${input.file}:${input.line}:${input.character}`;
       return refs.map((loc) => {
         const filePath = uriToPath(loc.uri);
@@ -18480,12 +18601,14 @@ function createLspTools(workspace, options = {}) {
     inputSchema: LspHoverInput,
     paths: (input) => [guard(input.file)],
     summarize: (input) => `${basename5(input.file)}:${input.line}:${input.character}${langTag(input.file)}`,
-    execute: async (input, _signal) => {
+    execute: async (input, signal) => {
+      signal.throwIfAborted();
       const path = guard(input.file);
       const uri = toUri(path);
-      const info = await manager.hover(uri, input.line, input.character);
+      const info = await waitWithSignal(manager.hover(uri, input.line, input.character, signal), signal);
       if (info === null) return `No hover information at ${input.file}:${input.line}:${input.character}`;
-      const contents = typeof info.contents === "string" ? info.contents : info.contents.value;
+      const parts = Array.isArray(info.contents) ? info.contents : [info.contents];
+      const contents = parts.map((part) => typeof part === "string" ? part : part.value).join("\n\n");
       return contents;
     }
   };
@@ -18495,10 +18618,11 @@ function createLspTools(workspace, options = {}) {
     inputSchema: LspDiagnosticsInput,
     paths: (input) => [guard(input.file)],
     summarize: (input) => `${basename5(input.file)}${langTag(input.file)}`,
-    execute: async (input, _signal) => {
+    execute: async (input, signal) => {
+      signal.throwIfAborted();
       const path = guard(input.file);
       const uri = toUri(path);
-      const diags = await manager.diagnostics(uri);
+      const diags = await waitWithSignal(manager.diagnostics(uri, signal), signal);
       if (diags.length === 0) return `No diagnostics for ${input.file}`;
       return diags.map((d) => {
         const severity = severityLabel(d.severity);
@@ -18517,6 +18641,14 @@ function languageIdForPath(filePath) {
       return "typescript";
     case ".cts":
       return "typescript";
+    case ".py":
+    case ".pyi":
+    case ".pyx":
+      return "python";
+    case ".rs":
+      return "rust";
+    case ".go":
+      return "go";
     default:
       return "typescript";
   }
@@ -18528,7 +18660,7 @@ function isWithin7(root, candidate) {
 function uriToPath(uri) {
   try {
     const url = new URL(uri);
-    if (url.protocol === "file:") return decodeURIComponent(url.pathname);
+    if (url.protocol === "file:") return fileURLToPath2(url);
   } catch {
   }
   return uri;
@@ -18555,12 +18687,14 @@ function severityLabel(severity) {
 }
 
 // src/git/service.ts
-async function git2(workspace, args, timeoutMs = 3e4) {
-  const result = await execFileNoThrow("git", ["-C", workspace, ...args], { timeout: timeoutMs, useCwd: false });
+async function git2(workspace, args, timeoutMs = 3e4, signal) {
+  signal?.throwIfAborted();
+  const result = await execFileNoThrow("git", ["-C", workspace, ...args], { timeout: timeoutMs, useCwd: false, ...signal === void 0 ? {} : { signal } });
+  signal?.throwIfAborted();
   return { ok: result.code === 0, stdout: result.stdout, stderr: result.stderr, code: result.code };
 }
-async function isGitRepository(workspace) {
-  const result = await git2(workspace, ["rev-parse", "--is-inside-work-tree"], 2e3);
+async function isGitRepository(workspace, signal) {
+  const result = await git2(workspace, ["rev-parse", "--is-inside-work-tree"], 2e3, signal);
   return result.ok && result.stdout.trim() === "true";
 }
 function gitFailure(result, action) {
@@ -18638,16 +18772,21 @@ async function commit(workspace, commitMessage) {
   const head = await git2(workspace, ["log", "-1", "--pretty=%h %s"]);
   return head.stdout.trim() || "committed";
 }
-async function fileHistory(workspace, path, limit) {
+async function fileHistory(workspace, path, limit, signal) {
   const args = [
+    "--literal-pathspecs",
     "log",
     `--max-count=${limit}`,
     "--date=short",
     "--pretty=format:%h%x1f%ad%x1f%an%x1f%s",
     ...path === void 0 ? [] : ["--follow", "--", path]
   ];
-  const result = await git2(workspace, args, 15e3);
-  if (!result.ok) throw gitFailure(result, "log");
+  const result = await git2(workspace, args, 15e3, signal);
+  if (!result.ok) {
+    const head = await git2(workspace, ["rev-parse", "--verify", "HEAD"], 2e3, signal);
+    if (!head.ok && await isGitRepository(workspace, signal)) return [];
+    throw gitFailure(result, "log");
+  }
   return result.stdout.split("\n").filter((line) => line.trim().length > 0).map((line) => {
     const [hash = "", date = "", author = "", ...subject] = line.split("");
     return { hash, date, author, subject: subject.join("") };
@@ -18986,24 +19125,33 @@ function mapNode(value) {
 
 // src/git/tools.ts
 import { z as z28 } from "zod";
+import { isAbsolute as isAbsolute13, relative as relative18, resolve as resolve25, sep as sep18 } from "path";
 var GitHistoryInput = z28.object({
-  path: z28.string().describe("File to inspect; omit for the whole repository history").optional(),
-  limit: z28.number().int().min(1).max(50).describe("Maximum number of commits to return (default 20)").optional()
+  path: z28.string().min(1).describe("Workspace-relative or absolute file path; omit for the whole repository history").optional(),
+  limit: z28.coerce.number().int().min(1).max(50).describe("Maximum number of commits to return (default 20)").optional()
 });
 function createGitHistoryTool(workspace) {
+  const root = resolve25(workspace);
+  const file = (path) => {
+    const absolute = resolve25(root, path);
+    const delta = relative18(root, absolute);
+    if (delta === ".." || delta.startsWith(`..${sep18}`) || isAbsolute13(delta)) throw new Error("GitHistory path is outside the workspace");
+    return absolute;
+  };
   return {
     name: "GitHistory",
     description: "Show git commit history for the repository or for one file (follows renames). Use to understand when and why code changed.",
     inputSchema: GitHistoryInput,
     readOnly: true,
-    paths: (input) => input.path === void 0 ? [] : [input.path],
+    paths: (input) => input.path === void 0 ? [root] : [file(input.path)],
     summarize: (input) => input.path ?? "repository",
     renderForModel: (output) => output,
     async execute(input, signal) {
       signal.throwIfAborted();
-      if (!await isGitRepository(workspace)) throw new Error("Not a git repository");
+      const path = input.path === void 0 ? void 0 : relative18(root, file(input.path));
+      if (!await isGitRepository(root, signal)) throw new Error("Not a git repository");
       const limit = input.limit ?? 20;
-      const entries = await fileHistory(workspace, input.path, limit);
+      const entries = await fileHistory(root, path, limit, signal);
       if (entries.length === 0) {
         return input.path === void 0 ? "No commits found." : `No commits found for ${input.path} (the file may be untracked).`;
       }
@@ -19066,7 +19214,8 @@ var QuestionBridge = class {
   }
   async #askRelayed(questions, signal) {
     try {
-      const answers = await this.#relay(questions, signal);
+      const answers = await waitWithSignal(this.#relay(questions, signal), signal);
+      signal.throwIfAborted();
       if (answers !== void 0) {
         this.#active = false;
         return answers;
@@ -19078,10 +19227,15 @@ var QuestionBridge = class {
     }
   }
   #askLocally(questions, signal) {
-    return new Promise((resolve31, reject) => {
+    if (signal.aborted) {
+      this.#active = false;
+      return Promise.reject(signal.reason);
+    }
+    return new Promise((resolve32, reject) => {
       const onAbort = () => {
         this.#pending = void 0;
         this.#active = false;
+        this.#onChange?.();
         reject(signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason)));
       };
       signal.addEventListener("abort", onAbort, { once: true });
@@ -19092,7 +19246,7 @@ var QuestionBridge = class {
           this.#pending = void 0;
           this.#active = false;
           this.#onChange?.();
-          resolve31(answers);
+          resolve32(answers);
         },
         reject: (error) => {
           signal.removeEventListener("abort", onAbort);
@@ -19185,7 +19339,7 @@ function createTodoWriteTool() {
 // src/tools/managed.ts
 import { randomUUID as randomUUID16 } from "crypto";
 import { link as link2, lstat as lstat12, mkdir as mkdir17, readFile as readFile20, readdir as readdir9, unlink as unlink5, writeFile as writeFile10 } from "fs/promises";
-import { dirname as dirname18, join as join26, resolve as resolve25 } from "path";
+import { dirname as dirname16, join as join26, resolve as resolve26 } from "path";
 import { z as z31 } from "zod";
 var MANAGED_TOOL_VERSION = 1;
 var MAX_RECORD_BYTES = 256 * 1024;
@@ -19227,9 +19381,9 @@ var ManagedToolStore = class {
   #entries = /* @__PURE__ */ new Map();
   #diagnostics = [];
   constructor(options) {
-    this.#workspace = resolve25(options.workspace);
+    this.#workspace = resolve26(options.workspace);
     this.#projectRoot = join26(this.#workspace, ".flavor", "tools");
-    this.#globalRoot = join26(resolve25(options.home), ".flavor-code", "tools");
+    this.#globalRoot = join26(resolve26(options.home), ".flavor-code", "tools");
     this.#now = options.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
   }
   get diagnostics() {
@@ -19469,7 +19623,7 @@ ${sourceUrl}`
   }
 }
 async function writeExclusive(path, content) {
-  await mkdir17(dirname18(path), { recursive: true });
+  await mkdir17(dirname16(path), { recursive: true });
   const temporary = `${path}.${randomUUID16()}.tmp`;
   try {
     await writeFile10(temporary, content, { encoding: "utf8", flag: "wx", mode: 384 });
@@ -20233,7 +20387,7 @@ ${total}`;
 // src/memory/store.ts
 import { createHash as createHash16 } from "crypto";
 import { readFile as readFile21, rm as rm9 } from "fs/promises";
-import { resolve as resolve26, join as join27, relative as relative18, sep as sep18 } from "path";
+import { resolve as resolve27, join as join27, relative as relative19, sep as sep19 } from "path";
 
 // src/memory/similarity.ts
 function normalizeForSimilarity(value) {
@@ -20335,7 +20489,7 @@ var MemoryStore = class {
   constructor(options) {
     if (!Number.isSafeInteger(options.maxEntries) || options.maxEntries < 1) throw new Error("maxEntries must be an integer of at least 1");
     if (!Number.isSafeInteger(options.maxEntryChars) || options.maxEntryChars < 1) throw new Error("maxEntryChars must be an integer of at least 1");
-    this.workspace = resolve26(options.workspace);
+    this.workspace = resolve27(options.workspace);
     this.#memoryRoot = join27(this.workspace, ".flavor", "memory");
     this.path = join27(this.#memoryRoot, "MEMORY.md");
     this.#behaviorPath = join27(this.#memoryRoot, "behavior.json");
@@ -20561,9 +20715,9 @@ var MemoryStore = class {
   }
   #resolveContentPath(contentPath) {
     if (!/^tasks\/[A-Za-z0-9][A-Za-z0-9._-]{0,127}\.md$/.test(contentPath)) throw new Error("Invalid memory content path");
-    const path = resolve26(this.#memoryRoot, ...contentPath.split("/"));
-    const rel = relative18(this.#memoryRoot, path);
-    if (rel === ".." || rel.startsWith(`..${sep18}`)) throw new Error("Memory content path escapes the memory directory");
+    const path = resolve27(this.#memoryRoot, ...contentPath.split("/"));
+    const rel = relative19(this.#memoryRoot, path);
+    if (rel === ".." || rel.startsWith(`..${sep19}`)) throw new Error("Memory content path escapes the memory directory");
     return path;
   }
   async #updateIndex(update) {
@@ -21033,7 +21187,7 @@ function createExecutionEnvironment(workspace, config) {
 
 // src/ide/client.ts
 import { readFile as readFile22, readdir as readdir10, stat as stat10 } from "fs/promises";
-import { basename as basename6, join as join28, relative as relative19, resolve as resolve27, sep as sep19 } from "path";
+import { basename as basename6, join as join28, relative as relative20, resolve as resolve28, sep as sep20 } from "path";
 var FlavorIdeClient = class {
   #workspace;
   #home;
@@ -21044,8 +21198,8 @@ var FlavorIdeClient = class {
   #sessionId;
   #eventTail = Promise.resolve();
   constructor(options) {
-    this.#workspace = resolve27(options.workspace);
-    this.#home = resolve27(options.home);
+    this.#workspace = resolve28(options.workspace);
+    this.#home = resolve28(options.home);
     this.#environment = options.environment ?? process.env;
     this.#fetch = options.fetch ?? fetch;
   }
@@ -21243,16 +21397,16 @@ function parsePort(value) {
   return Number.isInteger(port) && port > 0 && port <= 65535 ? port : void 0;
 }
 function isWithin8(parent, child) {
-  const base = normalize(resolve27(parent));
-  const target = normalize(resolve27(child));
-  return target === base || target.startsWith(`${base}${sep19}`);
+  const base = normalize(resolve28(parent));
+  const target = normalize(resolve28(child));
+  return target === base || target.startsWith(`${base}${sep20}`);
 }
 function normalize(path) {
   const normalized = path.normalize("NFC");
   return process.platform === "win32" ? normalized.toLowerCase() : normalized;
 }
 function relativeDisplay(workspace, filePath) {
-  const path = relative19(workspace, filePath).replaceAll("\\", "/");
+  const path = relative20(workspace, filePath).replaceAll("\\", "/");
   return path && !path.startsWith("../") ? path : basename6(filePath);
 }
 
@@ -21271,11 +21425,12 @@ var JobRegistry = class {
   }
   create(input) {
     this.#pruneCompleted();
+    if (this.#jobs.size >= this.#maxJobs) throw new Error(`Background job limit (${this.#maxJobs}) reached; wait for or cancel an existing job first`);
     const id = `job-${randomUUID17().slice(0, 12)}`;
     const now = (/* @__PURE__ */ new Date()).toISOString();
     let settle;
-    const done = new Promise((resolve31) => {
-      settle = resolve31;
+    const done = new Promise((resolve32) => {
+      settle = resolve32;
     });
     const record = {
       id,
@@ -21309,7 +21464,7 @@ var JobRegistry = class {
       },
       complete: (result = {}) => this.#finish(
         record,
-        result.exitCode !== void 0 && result.exitCode !== null && result.exitCode !== 0 ? "failed" : "completed",
+        result.error !== void 0 || result.exitCode !== void 0 && result.exitCode !== null && result.exitCode !== 0 ? "failed" : "completed",
         result
       ),
       fail: (error) => this.#finish(record, "failed", { error: error instanceof Error ? error.message : String(error) }),
@@ -21325,21 +21480,24 @@ var JobRegistry = class {
     return { ...snapshot2(job), output: job.output.slice(effective - job.outputStart), cursor: job.outputStart + job.output.length };
   }
   async wait(id, owner2, signal) {
+    signal?.throwIfAborted();
     const job = this.#owned(id, owner2);
     if (job.state !== "running") return snapshot2(job);
-    if (signal === void 0) return job.done;
-    return Promise.race([job.done, new Promise((_resolve, reject) => {
-      if (signal.aborted) {
-        reject(signal.reason);
-        return;
-      }
-      signal.addEventListener("abort", () => reject(signal.reason), { once: true });
-    })]);
+    return waitWithSignal(job.done, signal);
   }
   kill(id, owner2) {
     const job = this.#owned(id, owner2);
     if (job.state !== "running") return;
-    void job.cancel?.();
+    try {
+      const cancellation = job.cancel?.();
+      if (cancellation !== void 0) return cancellation.then(
+        () => this.#finish(job, "cancelled", {}),
+        (error) => this.#finish(job, "failed", { error: `Cancellation failed: ${error instanceof Error ? error.message : String(error)}` })
+      );
+    } catch (error) {
+      this.#finish(job, "failed", { error: `Cancellation failed: ${error instanceof Error ? error.message : String(error)}` });
+      return;
+    }
     this.#finish(job, "cancelled", {});
   }
   subscribe(listener) {
@@ -21399,7 +21557,7 @@ function snapshot2(job) {
 // src/terminal/service.ts
 import { randomUUID as randomUUID18 } from "crypto";
 import { createRequire as nodeCreateRequire2 } from "module";
-import { isAbsolute as isAbsolute13, relative as relative20, resolve as resolve28, sep as sep20 } from "path";
+import { isAbsolute as isAbsolute14, relative as relative21, resolve as resolve29, sep as sep21 } from "path";
 var TerminalService = class {
   #root;
   #factory;
@@ -21407,10 +21565,11 @@ var TerminalService = class {
   #maxOutputChars;
   #sessions = /* @__PURE__ */ new Map();
   constructor(workspace, options = {}) {
-    this.#root = resolve28(workspace);
+    this.#root = resolve29(workspace);
     this.#factory = options.factory ?? defaultFactory;
     this.#jobs = options.jobs;
     this.#maxOutputChars = options.maxOutputChars ?? 2e5;
+    if (!Number.isSafeInteger(this.#maxOutputChars) || this.#maxOutputChars <= 0) throw new Error("maxOutputChars must be a positive integer");
   }
   open(input) {
     const cwd = workspacePath(this.#root, input.cwd ?? ".");
@@ -21437,7 +21596,13 @@ var TerminalService = class {
       truncated: false,
       disposables: []
     };
-    const job = this.#jobs?.create({ kind: "terminal", owner: input.owner, label: shell, cancel: () => this.close(id, input.owner) });
+    let job;
+    try {
+      job = this.#jobs?.create({ kind: "terminal", owner: input.owner, label: shell, cancel: () => this.close(id, input.owner) });
+    } catch (error) {
+      pty.kill();
+      throw error;
+    }
     if (job !== void 0) {
       jobId = job.id;
       record.jobId = job.id;
@@ -21463,10 +21628,10 @@ var TerminalService = class {
     return { ...snapshot3(record), ...jobId === void 0 ? {} : { jobId } };
   }
   write(id, owner2, data2) {
-    this.#owned(id, owner2).pty.write(data2);
+    this.#running(id, owner2).pty.write(data2);
   }
   resize(id, owner2, columns, rows) {
-    this.#owned(id, owner2).pty.resize(columns, rows);
+    this.#running(id, owner2).pty.resize(columns, rows);
   }
   read(id, owner2, cursor = 0) {
     const record = this.#owned(id, owner2);
@@ -21497,6 +21662,11 @@ var TerminalService = class {
     if (record.owner !== owner2) throw new Error("Terminal owner mismatch");
     return record;
   }
+  #running(id, owner2) {
+    const record = this.#owned(id, owner2);
+    if (record.state !== "running") throw new Error(`Terminal ${id} is ${record.state}; use TerminalOpen to start a new session`);
+    return record;
+  }
 };
 function snapshot3(record) {
   return {
@@ -21525,15 +21695,15 @@ function cleanEnvironment(environment) {
   return Object.fromEntries(Object.entries(environment).filter((entry2) => entry2[1] !== void 0));
 }
 function workspacePath(root, input) {
-  const path = resolve28(root, input);
-  const delta = relative20(root, path);
-  if (delta === ".." || delta.startsWith(`..${sep20}`) || isAbsolute13(delta)) throw new Error("Terminal cwd is outside the workspace");
+  const path = resolve29(root, input);
+  const delta = relative21(root, path);
+  if (delta === ".." || delta.startsWith(`..${sep21}`) || isAbsolute14(delta)) throw new Error("Terminal cwd is outside the workspace");
   return path;
 }
 
 // src/tools/terminal.ts
 import { z as z33 } from "zod";
-import { resolve as resolve29 } from "path";
+import { resolve as resolve30 } from "path";
 var Id = z33.string().regex(/^term-[a-f0-9-]+$/);
 var OpenInput = z33.object({ cwd: z33.string().optional(), shell: z33.string().optional(), args: z33.array(z33.string()).optional(), columns: z33.coerce.number().int().min(10).max(500).optional(), rows: z33.coerce.number().int().min(2).max(300).optional() });
 var OptionalBoolean = z33.union([z33.boolean(), z33.string().refine((value) => value === "true" || value === "false")]);
@@ -21547,8 +21717,8 @@ function createTerminalTools(terminals, workspace = process.cwd()) {
       name: "TerminalOpen",
       description: "Open a persistent interactive pseudo-terminal in the workspace",
       inputSchema: OpenInput,
-      paths: (input) => [resolve29(workspace, input.cwd ?? ".")],
-      permissions: (input) => ({ paths: [resolve29(workspace, input.cwd ?? ".")], command: input.shell ?? "system-shell", args: input.args ?? [], cwd: resolve29(workspace, input.cwd ?? ".") }),
+      paths: (input) => [resolve30(workspace, input.cwd ?? ".")],
+      permissions: (input) => ({ paths: [resolve30(workspace, input.cwd ?? ".")], command: input.shell ?? "system-shell", args: input.args ?? [], cwd: resolve30(workspace, input.cwd ?? ".") }),
       execute: async (input, _signal, context) => terminals.open({
         owner: owner(context),
         ...input.cwd === void 0 ? {} : { cwd: input.cwd },
@@ -21577,7 +21747,7 @@ function createTerminalTools(terminals, workspace = process.cwd()) {
       inputSchema: ReadInput3,
       paths: () => [],
       execute: async (input, _signal, context) => terminals.read(input.id, owner(context), input.cursor ?? 0),
-      renderForModel: (output) => output.output,
+      renderForModel: (output) => JSON.stringify(output),
       presentResult: (output) => {
         const result = output;
         return {
@@ -21774,8 +21944,8 @@ var PalClient = class {
       let disconnectTimer;
       await Promise.race([
         this.request({ version: 1, type: "disconnect", requestId: randomUUID19() }).catch(() => void 0),
-        new Promise((resolve31) => {
-          disconnectTimer = setTimeout(resolve31, Math.min(this.requestTimeoutMs, 250));
+        new Promise((resolve32) => {
+          disconnectTimer = setTimeout(resolve32, Math.min(this.requestTimeoutMs, 250));
         })
       ]);
       if (disconnectTimer !== void 0) clearTimeout(disconnectTimer);
@@ -21821,7 +21991,7 @@ var PalClient = class {
     return presence;
   }
   openSocket() {
-    return new Promise((resolve31, reject) => {
+    return new Promise((resolve32, reject) => {
       let settled = false;
       const rejectConnection = (error) => {
         if (settled) return;
@@ -21844,7 +22014,7 @@ var PalClient = class {
         settled = true;
         if (this.connectingReject === rejectConnection) this.connectingReject = void 0;
         socket.off("error", onInitialError);
-        resolve31();
+        resolve32();
       };
       const onInitialError = (error) => {
         socket.off("connect", onConnect);
@@ -21875,12 +22045,12 @@ var PalClient = class {
     if (this.closed || socket === void 0 || socket.destroyed || !socket.writable) {
       return Promise.reject(new Error(this.closed ? "Pal client is closed" : "Pal client is not connected"));
     }
-    return new Promise((resolve31, reject) => {
+    return new Promise((resolve32, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(request.requestId);
         reject(new Error(`Pal request '${request.type}' timed out`));
       }, this.requestTimeoutMs);
-      this.pending.set(request.requestId, { resolve: resolve31, reject, timer });
+      this.pending.set(request.requestId, { resolve: resolve32, reject, timer });
       let frame;
       try {
         frame = encodeControlFrame(BrokerRequestSchema.parse(request));
@@ -21984,12 +22154,12 @@ var PalClient = class {
   }
   scheduleReconnect() {
     if (this.reconnectTimer !== void 0 || this.closed) return;
-    const delay3 = this.reconnectDelayMs;
+    const delay2 = this.reconnectDelayMs;
     this.reconnectDelayMs = Math.min(this.reconnectDelayMs * 2, this.reconnectMaxDelayMs);
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = void 0;
       void this.start().catch(() => this.scheduleReconnect());
-    }, delay3);
+    }, delay2);
     this.reconnectTimer.unref?.();
   }
 };
@@ -22091,6 +22261,7 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         const recipientId = await assertSendTarget(client, input.target, input.coWorkId);
+        signal.throwIfAborted();
         return client.sendChat(recipientId, shareGuard.protect(input.message));
       }
     },
@@ -22114,6 +22285,7 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         assertRequiredParticipant(await client.coWorkStatus(input.plan.coWorkId), options.selfId);
+        signal.throwIfAborted();
         const plan = CoWorkPlanSchema.parse({
           ...input.plan,
           goal: shareGuard.protect(input.plan.goal),
@@ -22130,11 +22302,13 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         let state = await assertCurrentToken(client, input);
+        signal.throwIfAborted();
         assertRequiredParticipant(state, options.selfId);
         if (!state.planAcceptedParticipantIds.includes(options.selfId)) {
           state = await client.coWorkAction({ type: "cowork-plan-accept", ...input });
         }
         if (state.readyParticipantIds.includes(options.selfId) || state.phase === "running") return state;
+        signal.throwIfAborted();
         return client.coWorkAction({ type: "cowork-ready", ...input });
       }
     },
@@ -22148,6 +22322,7 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         const recipientId = await assertSendTarget(client, input.target, input.coWorkId);
+        signal.throwIfAborted();
         return client.sendChat(recipientId, `[co-work ${input.coWorkId} progress] ${shareGuard.protect(input.detail)}`);
       }
     },
@@ -22161,6 +22336,7 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         const state = await assertCurrentToken(client, input);
+        signal.throwIfAborted();
         assertRequiredParticipant(state, options.selfId);
         if (state.phase !== "running" || !state.acceptedParticipantIds.includes(options.selfId) || !state.readyParticipantIds.includes(options.selfId)) {
           throw new Error("A required participant must be accepted, ready, and running before reporting completion");
@@ -22178,6 +22354,7 @@ function createPalsTools(client, options) {
       execute: async (input, signal) => {
         signal.throwIfAborted();
         const state = await assertCurrentToken(client, input);
+        signal.throwIfAborted();
         assertRequiredParticipant(state, options.selfId);
         if (state.integrationOwnerId !== options.selfId) throw new Error("Only the broker-designated integration owner can finalize integration");
         if (state.phase !== "verifying") throw new Error("Co-work is not ready for integration verification");
@@ -22284,8 +22461,8 @@ var ApprovalBridge = class {
   }
 };
 async function createProductionRuntime(options) {
-  const workspace = resolve30(options.workspace ?? process.cwd());
-  const home = resolve30(options.home ?? homedir3());
+  const workspace = resolve31(options.workspace ?? process.cwd());
+  const home = resolve31(options.home ?? homedir3());
   const environment = options.environment ?? process.env;
   const ide = new FlavorIdeClient({ workspace, home, environment });
   const ideReady = ide.initialize();
@@ -22459,6 +22636,7 @@ async function createProductionRuntime(options) {
   const executionEnvironment = createExecutionEnvironment(workspace, config.execution);
   const jobs = new JobRegistry();
   const terminals = new TerminalService(workspace, { jobs });
+  const lspManager = new RealLspManager({ workspace, onStatus: (message2) => emitOutput({ type: "notice", message: message2 }) });
   const observations = new FileObservationStore();
   const workspaceInstructions = new WorkspaceInstructions(workspace);
   const fileMutationOptions = {
@@ -22482,9 +22660,7 @@ async function createProductionRuntime(options) {
     createWebSearchTool(),
     ...createJobTools(jobs),
     ...createTerminalTools(terminals, workspace),
-    ...createLspTools(workspace, {
-      onStatus: (message2) => emitOutput({ type: "notice", message: message2 })
-    }),
+    ...createLspTools(workspace, { manager: lspManager }),
     ...options.approvalPolicy === "deny" ? [] : [createAskUserQuestionTool(askUserQuestionHandler)],
     createTaskOutputTool(),
     createTodoWriteTool()
@@ -23021,6 +23197,8 @@ async function createProductionRuntime(options) {
       permissionPolicy,
       maxIterationsMain: config.maxIterations.main,
       maxIterationsSubagent: config.maxIterations.subagent,
+      softLimitFactor: config.maxIterations.softLimitFactor,
+      extendIterations: config.maxIterations.extendBy,
       hasActiveProgress,
       afterToolSuccess: async (_tool, paths, _input, _output, context) => workspaceInstructions.discover(paths, context.ownerId ?? context.agent),
       toolJournal: {
@@ -23412,6 +23590,8 @@ async function createProductionRuntime(options) {
         permissionPolicy,
         maxIterationsMain: config.maxIterations.main,
         maxIterationsSubagent: config.maxIterations.subagent,
+        softLimitFactor: config.maxIterations.softLimitFactor,
+        extendIterations: config.maxIterations.extendBy,
         loopMode: true,
         afterToolSuccess: async (_tool, paths, _input, _output, context) => loopInstructions.discover(paths, context.ownerId ?? context.agent),
         toolJournal: {
@@ -23701,9 +23881,9 @@ async function createProductionRuntime(options) {
       explain: (query, focus, signal, onText) => runExplain({
         graph: new DesktopAstGraphService(workspace),
         readFile: async (path) => {
-          const root = resolve30(workspace);
-          const abs = resolve30(root, path);
-          if (abs !== root && !abs.startsWith(root + sep21)) throw new Error(`path outside workspace: ${path}`);
+          const root = resolve31(workspace);
+          const abs = resolve31(root, path);
+          if (abs !== root && !abs.startsWith(root + sep22)) throw new Error(`path outside workspace: ${path}`);
           return readFile23(abs, "utf8");
         },
         history: async (path, limit) => fileHistory(workspace, path, limit),
@@ -24055,6 +24235,7 @@ ${renderMemoryDocument(entries)}`;
         if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
         if (islandControlServer !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "island-control", islandControlServer.close());
         terminals.dispose();
+        await boundedStep(stepTimeoutMs, diagnostics, "language-servers", lspManager.dispose());
         await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
         auditLogger.close();
         evolveService.dispose();
@@ -24095,6 +24276,7 @@ ${renderMemoryDocument(entries)}`;
       if (sleepScheduler !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "sleep-scheduler", sleepScheduler.dispose());
       if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
       terminals.dispose();
+      await boundedStep(stepTimeoutMs, diagnostics, "language-servers", lspManager.dispose());
       await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
       unsubscribeCollaboration?.();
       pendingCollaborationEvents.length = 0;
@@ -24248,9 +24430,9 @@ async function workspaceFingerprint(workspace) {
   let remaining = 5 * 1024 * 1024;
   for (const name of untracked.stdout.split("\0").filter(Boolean).sort()) {
     if (name === ".flavor/loops" || name.startsWith(".flavor/loops/")) continue;
-    const path = resolve30(workspace, name);
-    const relativePath = relative21(resolve30(workspace), path);
-    if (relativePath === ".." || relativePath.startsWith(`..${sep21}`)) continue;
+    const path = resolve31(workspace, name);
+    const relativePath = relative22(resolve31(workspace), path);
+    if (relativePath === ".." || relativePath.startsWith(`..${sep22}`)) continue;
     hash.update(name);
     if (remaining <= 0) continue;
     try {
@@ -24382,7 +24564,7 @@ function requestMemoryRestart(workspace, sessionId, emitOutput) {
       previous = parseMemoryRestartMarker(readFileSync3(markerPath, "utf8"));
     } catch {
     }
-    mkdirSync4(dirname19(markerPath), { recursive: true });
+    mkdirSync3(dirname17(markerPath), { recursive: true });
     writeFileSync2(markerPath, `${JSON.stringify(nextMemoryRestartMarker(previous, sessionId, /* @__PURE__ */ new Date()))}
 `, "utf8");
   } catch {