tesseract-agent 0.8.0 → 0.8.2

package/dist-bundle/cli.js

@@ -3805,7 +3805,7 @@ var init_permissions = __esm({
       {
         id: "full-disk-access",
         label: "Full Disk Access",
-        why: "Show the folders you pinned in Finder\u2019s sidebar.",
+        why: "Show the folders you pinned in Finder\u2019s sidebar, and import your Safari logins.",
         icon: "FolderLock",
         category: "system",
         applicablePlatforms: ["darwin"],
@@ -3849,7 +3849,7 @@ var init_permissions = __esm({
 });
 
 // ../../packages/shared/dist/ws-protocol.js
-var MIRRORED_AGENT_EVENTS;
+var MIRRORED_AGENT_EVENTS, OWN_STUN_HOST, OWN_STUN_PORT, OWN_STUN_URL, PUBLIC_STUN_URLS, DEFAULT_ICE_SERVERS;
 var init_ws_protocol = __esm({
   "../../packages/shared/dist/ws-protocol.js"() {
     "use strict";
@@ -3899,6 +3899,18 @@ var init_ws_protocol = __esm({
       // would stomp a co-viewer's own picker with the driver's host); session:forked
       // and agent:context_usage are driver-only correlation/host-local replies.
     ]);
+    OWN_STUN_HOST = "bridge.fineguide.ai";
+    OWN_STUN_PORT = 3478;
+    OWN_STUN_URL = `stun:${OWN_STUN_HOST}:${OWN_STUN_PORT}`;
+    PUBLIC_STUN_URLS = [
+      "stun:stun.l.google.com:19302",
+      "stun:stun1.l.google.com:19302",
+      "stun:stun.cloudflare.com:3478"
+    ];
+    DEFAULT_ICE_SERVERS = [
+      { urls: OWN_STUN_URL },
+      ...PUBLIC_STUN_URLS.map((urls) => ({ urls }))
+    ];
   }
 });
 
@@ -4545,17 +4557,17 @@ function tessExt(token2) {
 }
 function walkTokens(tree) {
   const out = [];
-  const rec = (node, path5) => {
+  const rec = (node, path6) => {
     if (!isObj(node))
       return;
     if (isToken(node)) {
-      out.push({ path: path5, token: node });
+      out.push({ path: path6, token: node });
       return;
     }
     for (const key2 of Object.keys(node)) {
       if (key2.startsWith("$"))
         continue;
-      rec(node[key2], [...path5, key2]);
+      rec(node[key2], [...path6, key2]);
     }
   };
   rec(tree, []);
@@ -4571,13 +4583,13 @@ function stringifyValue(v) {
   return String(v);
 }
 function flattenForDisplay(tree) {
-  return walkTokens(tree).map(({ path: path5, token: token2 }) => {
+  return walkTokens(tree).map(({ path: path6, token: token2 }) => {
     const dark = tessExt(token2)?.modes?.dark;
     return {
-      path: path5,
-      dotPath: path5.join("."),
-      group: path5.slice(0, -1).join(" \xB7 "),
-      label: path5[path5.length - 1] ?? "",
+      path: path6,
+      dotPath: path6.join("."),
+      group: path6.slice(0, -1).join(" \xB7 "),
+      label: path6[path6.length - 1] ?? "",
       type: token2.$type,
       value: stringifyValue(token2.$value),
       isColor: token2.$type === "color",
@@ -4588,7 +4600,7 @@ function flattenForDisplay(tree) {
 function kebab(s) {
   return s.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
 }
-function tokenCssVarName(path5, token2) {
+function tokenCssVarName(path6, token2) {
   const override = token2 ? tessExt(token2)?.cssVar : void 0;
   if (override) {
     const name = override.startsWith("--") ? override : `--${override}`;
@@ -4596,12 +4608,12 @@ function tokenCssVarName(path5, token2) {
       return name;
   }
   for (const { match, prefix } of VAR_ALIASES) {
-    if (match.length <= path5.length && match.every((seg, i) => path5[i] === seg)) {
-      const rest = path5.slice(match.length).map(kebab).filter(Boolean);
+    if (match.length <= path6.length && match.every((seg, i) => path6[i] === seg)) {
+      const rest = path6.slice(match.length).map(kebab).filter(Boolean);
       return ["--" + prefix, ...rest].join("-");
     }
   }
-  return ["--token", ...path5.map(kebab).filter(Boolean)].join("-");
+  return ["--token", ...path6.map(kebab).filter(Boolean)].join("-");
 }
 function categoryRank(top) {
   const i = CATEGORY_ORDER.indexOf(top ?? "");
@@ -4635,8 +4647,8 @@ function tokensToCss(input) {
   const ordered = rows.map((r, i) => ({ r, i })).sort((a, b) => categoryRank(a.r.path[0]) - categoryRank(b.r.path[0]) || a.i - b.i).map((x) => x.r);
   const root = [];
   const dark = [];
-  for (const { path: path5, token: token2 } of ordered) {
-    const name = tokenCssVarName(path5, token2);
+  for (const { path: path6, token: token2 } of ordered) {
+    const name = tokenCssVarName(path6, token2);
     root.push(`  ${name}: ${cssValue(token2.$type, token2.$value)};`);
     const d = tessExt(token2)?.modes?.dark;
     if (d !== void 0)
@@ -4890,10 +4902,10 @@ function applyDesignPack(current, packTokens, info, opts) {
   const { mode } = opts;
   const writeLeaves = (base, keep) => {
     let acc = base;
-    for (const { path: path5, token: token2 } of walkTokens(pack)) {
-      if (keep && !keep(path5))
+    for (const { path: path6, token: token2 } of walkTokens(pack)) {
+      if (keep && !keep(path6))
         continue;
-      acc = setTokenSegments(acc, path5, token2);
+      acc = setTokenSegments(acc, path6, token2);
     }
     return acc;
   };
@@ -4978,14 +4990,14 @@ function setNested(obj, segs, value) {
 function tokensToTailwindTheme(input) {
   const tokens = normalizeTokens(input);
   const extend2 = {};
-  for (const { path: path5, token: token2 } of walkTokens(tokens)) {
-    const bucket2 = TW_BUCKETS.find((b) => b.match.length <= path5.length && b.match.every((seg, i) => path5[i] === seg));
+  for (const { path: path6, token: token2 } of walkTokens(tokens)) {
+    const bucket2 = TW_BUCKETS.find((b) => b.match.length <= path6.length && b.match.every((seg, i) => path6[i] === seg));
     if (!bucket2)
       continue;
-    const rest = path5.slice(bucket2.match.length).map(kebab).filter(Boolean);
+    const rest = path6.slice(bucket2.match.length).map(kebab).filter(Boolean);
     if (rest.length === 0)
       continue;
-    const ref = `var(${tokenCssVarName(path5, token2)})`;
+    const ref = `var(${tokenCssVarName(path6, token2)})`;
     if (!extend2[bucket2.key])
       extend2[bucket2.key] = {};
     if (bucket2.flat)
@@ -5016,8 +5028,8 @@ function leafSignature(token2) {
 }
 function indexLeaves(t) {
   const m = /* @__PURE__ */ new Map();
-  for (const { path: path5, token: token2 } of walkTokens(t)) {
-    m.set(path5.join("."), { sig: leafSignature(token2), disp: stringifyValue(token2.$value) });
+  for (const { path: path6, token: token2 } of walkTokens(t)) {
+    m.set(path6.join("."), { sig: leafSignature(token2), disp: stringifyValue(token2.$value) });
   }
   return m;
 }
@@ -5266,6 +5278,7 @@ var init_dist = __esm({
     init_surface_merge();
     init_permissions();
     init_ws_protocol();
+    init_ws_protocol();
     init_frame();
     init_domain_id();
     init_plans();
@@ -6027,10 +6040,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path5) {
-  if (!path5)
+function getElementAtPath(obj, path6) {
+  if (!path6)
     return obj;
-  return path5.reduce((acc, key2) => acc?.[key2], obj);
+  return path6.reduce((acc, key2) => acc?.[key2], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -6358,11 +6371,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path5, issues) {
+function prefixIssues(path6, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path5);
+    iss.path.unshift(path6);
     return iss;
   });
 }
@@ -6579,16 +6592,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path5 = []) => {
+  const processError = (error52, path6 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path5, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else {
-        const fullpath = [...path5, ...issue2.path];
+        const fullpath = [...path6, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -6615,17 +6628,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path5 = []) => {
+  const processError = (error52, path6 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path5, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path5, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
       } else {
-        const fullpath = [...path5, ...issue2.path];
+        const fullpath = [...path6, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -6657,8 +6670,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path5 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path5) {
+  const path6 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path6) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -20088,13 +20101,13 @@ function resolveRef(ref, ctx2) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path5 = ref.slice(1).split("/").filter(Boolean);
-  if (path5.length === 0) {
+  const path6 = ref.slice(1).split("/").filter(Boolean);
+  if (path6.length === 0) {
     return ctx2.rootSchema;
   }
   const defsKey = ctx2.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path5[0] === defsKey) {
-    const key2 = path5[1];
+  if (path6[0] === defsKey) {
+    const key2 = path6[1];
     if (!key2 || !ctx2.defs[key2]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -21703,10 +21716,10 @@ function buildCanvasTools(deps) {
       const id = args.id ? slugify3(args.id) : `${slugify3(args.title ?? "canvas")}-${Math.random().toString(36).slice(2, 8)}`;
       const dir2 = await deps.canvasDir();
       mkdirSync2(dir2, { recursive: true });
-      const path5 = join5(dir2, `${id}.html`);
-      writeFileSync3(path5, args.html, "utf8");
-      deps.emitCanvasReady({ path: path5, title: args.title, id });
-      return { content: [{ type: "text", text: `Rendered canvas "${args.title ?? id}" in the side panel (${path5}). Call render_canvas again with id "${id}" to transform it.` }] };
+      const path6 = join5(dir2, `${id}.html`);
+      writeFileSync3(path6, args.html, "utf8");
+      deps.emitCanvasReady({ path: path6, title: args.title, id });
+      return { content: [{ type: "text", text: `Rendered canvas "${args.title ?? id}" in the side panel (${path6}). Call render_canvas again with id "${id}" to transform it.` }] };
     })
   ];
 }
@@ -23011,9 +23024,57 @@ var init_trace_store = __esm({
   }
 });
 
+// ../../packages/agent-core/dist/cost-ledger.js
+import { promises as fs2 } from "node:fs";
+import path2 from "node:path";
+var DIR2, CostLedger;
+var init_cost_ledger = __esm({
+  "../../packages/agent-core/dist/cost-ledger.js"() {
+    "use strict";
+    DIR2 = ".ccb-traces";
+    CostLedger = class {
+      fileFor(projectDir, sessionId) {
+        return path2.join(projectDir, DIR2, sessionId, "cost.jsonl");
+      }
+      /** Append one turn's cost. Creates the dir + a `.gitignore` (the traces dir is inside the
+       *  user's project, usually a git repo) on first write. */
+      async append(projectDir, sessionId, entry) {
+        try {
+          const file2 = this.fileFor(projectDir, sessionId);
+          await fs2.mkdir(path2.dirname(file2), { recursive: true });
+          await fs2.writeFile(path2.join(projectDir, DIR2, ".gitignore"), "*\n", "utf8").catch(() => {
+          });
+          await fs2.appendFile(file2, JSON.stringify(entry) + "\n", "utf8");
+        } catch {
+        }
+      }
+      /** Cumulative session cost = sum of every recorded turn. 0 if the ledger is missing. */
+      async total(projectDir, sessionId) {
+        try {
+          const raw = await fs2.readFile(this.fileFor(projectDir, sessionId), "utf8");
+          let sum = 0;
+          for (const line of raw.split("\n")) {
+            if (!line.trim())
+              continue;
+            try {
+              const e = JSON.parse(line);
+              if (typeof e.costUsd === "number" && Number.isFinite(e.costUsd))
+                sum += e.costUsd;
+            } catch {
+            }
+          }
+          return sum;
+        } catch {
+          return 0;
+        }
+      }
+    };
+  }
+});
+
 // ../../packages/agent-core/dist/session-store.js
 import { readFile as readFile4, stat } from "node:fs/promises";
-import { listSessions, getSessionMessages, forkSession } from "@anthropic-ai/claude-agent-sdk";
+import { listSessions, getSessionMessages, getSubagentMessages as sdkGetSubagentMessages, forkSession } from "@anthropic-ai/claude-agent-sdk";
 function toSessionInfo(s) {
   const fromFirst = stripPromptPrefix(s.firstPrompt ?? "").slice(0, 80);
   const fromSummary = stripPromptPrefix(s.summary ?? "").slice(0, 80);
@@ -23128,7 +23189,7 @@ ${input.command}
           }
         }
       }
-      blocks.push({ kind: "tool_use", content: detail });
+      blocks.push({ kind: "tool_use", content: detail, name });
     } else if (b.type === "advisor_tool_result") {
       const c = b.content;
       const text4 = c?.type === "advisor_result" ? (c.text ?? "").trim() : "";
@@ -23199,32 +23260,46 @@ var init_session_store = __esm({
       }
       async getSessionMessages(sessionId) {
         try {
-          const raw = await getSessionMessages(sessionId);
-          const messages = [];
-          for (const entry of raw) {
-            const blocks = extractBlocks(entry.message);
-            if (blocks.length === 0 && entry.type === "user")
-              continue;
-            let textContent = blocks.filter((b) => b.kind === "text").map((b) => b.content).join("\n");
-            if (entry.type === "user") {
-              textContent = stripPromptPrefix(textContent);
-            }
-            messages.push({
-              role: entry.type === "user" ? "user" : "assistant",
-              // Flat content feeds summaries/merge seeds — keep advisor reviews OUT of it
-              // (they're a side-channel review, rendered as their own card, like tool_use).
-              content: textContent || blocks.find((b) => b.kind !== "advisor")?.content || "",
-              blocks: entry.type === "assistant" ? blocks : void 0,
-              // Thread the per-message SDK uuid so the renderer can pass it as
-              // session:fork.upToMessageId ("fork from here").
-              uuid: typeof entry.uuid === "string" ? entry.uuid : void 0
-            });
-          }
-          return messages;
+          return this.rawToMessages(await getSessionMessages(sessionId));
+        } catch {
+          return [];
+        }
+      }
+      /** Read a SUBAGENT's (Task tool) transcript from its sidecar JSONL — the granular
+       *  activity that never streams to the client. `agentId` is the subagent's id (the app's
+       *  subagent-card `taskId`, which equals `task_started.task_id` and the sidecar filename);
+       *  `projectDir` scopes the lookup to the right project (required on a remote host). */
+      async getSubagentMessages(sessionId, agentId, projectDir) {
+        try {
+          return this.rawToMessages(await sdkGetSubagentMessages(sessionId, agentId, projectDir ? { dir: projectDir } : void 0));
         } catch {
           return [];
         }
       }
+      /** Shared normalization: raw SDK transcript entries → the app's SessionMessage shape. */
+      rawToMessages(raw) {
+        const messages = [];
+        for (const entry of raw) {
+          const blocks = extractBlocks(entry.message);
+          if (blocks.length === 0 && entry.type === "user")
+            continue;
+          let textContent = blocks.filter((b) => b.kind === "text").map((b) => b.content).join("\n");
+          if (entry.type === "user") {
+            textContent = stripPromptPrefix(textContent);
+          }
+          messages.push({
+            role: entry.type === "user" ? "user" : "assistant",
+            // Flat content feeds summaries/merge seeds — keep advisor reviews OUT of it
+            // (they're a side-channel review, rendered as their own card, like tool_use).
+            content: textContent || blocks.find((b) => b.kind !== "advisor")?.content || "",
+            blocks: entry.type === "assistant" ? blocks : void 0,
+            // Thread the per-message SDK uuid so the renderer can pass it as
+            // session:fork.upToMessageId ("fork from here").
+            uuid: typeof entry.uuid === "string" ? entry.uuid : void 0
+          });
+        }
+        return messages;
+      }
       /** Fork a session into a NEW session id (non-destructive — the source transcript
        *  is preserved). `upToMessageId` slices the fork at a message uuid; `title` names
        *  the fork; `projectDir` scopes the lookup to the right project's session store.
@@ -23670,14 +23745,14 @@ function newestVersionManagerNode() {
       continue;
     }
     for (const name of names) {
-      const path5 = bin(join9(dir2, name));
-      if (!existsSync2(path5))
+      const path6 = bin(join9(dir2, name));
+      if (!existsSync2(path6))
         continue;
       const parts = name.replace(/^v/, "").split(".").map((n) => Number.parseInt(n, 10) || 0);
       const ver = [parts[0] ?? 0, parts[1] ?? 0, parts[2] ?? 0];
       const gt = !best || ver[0] > best.ver[0] || ver[0] === best.ver[0] && (ver[1] > best.ver[1] || ver[1] === best.ver[1] && ver[2] > best.ver[2]);
       if (gt)
-        best = { ver, path: path5 };
+        best = { ver, path: path6 };
     }
   }
   return best?.path ?? null;
@@ -23690,8 +23765,8 @@ function loginShellNode() {
     return null;
   try {
     const out = execFileSync(shell, ["-lic", `printf '<<NODE:%s>>' "$(command -v node 2>/dev/null)"`], { encoding: "utf8", timeout: 4e3, stdio: ["ignore", "pipe", "ignore"] });
-    const path5 = out.match(/<<NODE:(.*?)>>/)?.[1]?.trim();
-    return path5 && existsSync2(path5) ? path5 : null;
+    const path6 = out.match(/<<NODE:(.*?)>>/)?.[1]?.trim();
+    return path6 && existsSync2(path6) ? path6 : null;
   } catch {
     return null;
   }
@@ -23743,6 +23818,29 @@ function traceFrame(message) {
   }
   const sub = typeof message.subtype === "string" ? `/${message.subtype}` : "";
   const parent = message.parent_tool_use_id ? " (subagent)" : "";
+  if (type === "system" && typeof message.subtype === "string" && message.subtype.startsWith("task_")) {
+    const m = message;
+    const u = m.usage ?? {};
+    let patch = "";
+    if (m.patch && typeof m.patch === "object") {
+      try {
+        patch = `patch=${JSON.stringify(m.patch).slice(0, 200)}`;
+      } catch {
+        patch = "patch=?";
+      }
+    }
+    const bits = [
+      typeof m.task_id === "string" ? `id=${m.task_id.slice(0, 8)}` : "",
+      typeof m.status === "string" ? `status=${m.status}` : "",
+      typeof m.subagent_type === "string" ? `agent=${m.subagent_type}` : "",
+      typeof m.last_tool_name === "string" ? `last=${m.last_tool_name}` : "",
+      typeof u.tool_uses === "number" ? `tools=${u.tool_uses}` : "",
+      typeof u.total_tokens === "number" ? `tok=${u.total_tokens}` : "",
+      patch
+    ].filter(Boolean).join(" ");
+    log(`frame ${type}${sub}${parent}${bits ? " \u2014 " + bits : ""}`);
+    return;
+  }
   log(`frame ${type}${sub}${parent}`);
 }
 function rawFramePreview(message, limit = 2e3) {
@@ -24100,9 +24198,9 @@ function editedPathOf(toolInput) {
   const p = i?.file_path ?? i?.notebook_path;
   return typeof p === "string" && p.length > 0 ? p : null;
 }
-async function snapshotFile(path5) {
+async function snapshotFile(path6) {
   try {
-    const buf = await readFile6(path5);
+    const buf = await readFile6(path6);
     if (buf.length > EDIT_PREVIEW_CAP)
       return { noPreview: true };
     if (buf.subarray(0, 8192).includes(0))
@@ -24150,7 +24248,7 @@ MOBILE (${fw}):
     return "";
   }
 }
-var cachedClaudeExe, cachedNodeExe, HUMAN_READABLE_FIELDS, THINKING_THROTTLE_MS, SYSTEM_EVENT_CATEGORY, TOOL_RESULT_CAP, MAX_RESULT_IMAGES, MAX_IMAGE_BASE64, PERMISSION_MODES, EDIT_PREVIEW_CAP, AsyncMessagePump, IDLE_REAP_MS, MODERATE_IDLE_MS, STEER_COALESCE_MS, STOP_HARD_KILL_AFTER_MS, AgentManager;
+var cachedClaudeExe, cachedNodeExe, HUMAN_READABLE_FIELDS, SYSTEM_EVENT_CATEGORY, TOOL_RESULT_CAP, MAX_RESULT_IMAGES, MAX_IMAGE_BASE64, PERMISSION_MODES, EDIT_PREVIEW_CAP, AsyncMessagePump, IDLE_REAP_MS, MODERATE_IDLE_MS, STEER_COALESCE_MS, STOP_HARD_KILL_AFTER_MS, AgentManager;
 var init_agent_manager = __esm({
   "../../packages/agent-core/dist/agent-manager.js"() {
     "use strict";
@@ -24173,13 +24271,13 @@ var init_agent_manager = __esm({
     init_narrator();
     init_plan_splitter();
     init_trace_store();
+    init_cost_ledger();
     init_session_store();
     init_session_usage();
     init_kill_tree();
     init_log();
     init_sources();
     HUMAN_READABLE_FIELDS = ["message", "text", "content", "summary", "description", "output", "stdout", "error", "reason", "name"];
-    THINKING_THROTTLE_MS = 2e3;
     SYSTEM_EVENT_CATEGORY = {
       hook_started: "hook",
       hook_progress: "hook",
@@ -24242,6 +24340,7 @@ var init_agent_manager = __esm({
       projectDir;
       /** Per-generation trace persistence (.ccb-traces on the agent's disk). */
       traceStore = new TraceStore();
+      costLedger = new CostLedger();
       /** On-disk session transcripts — used by mergeSessions to gather context. */
       sessionStore = new SessionStore();
       liveSessions = /* @__PURE__ */ new Map();
@@ -24942,6 +25041,21 @@ ${qText}`;
           return null;
         return this.traceStore.readTurn(dir2, sessionId, turnId);
       }
+      /** A subagent's activity transcript (from its sidecar JSONL) — the granular frames the
+       *  Task tool never streams to the client. `agentId` == the subagent-card taskId. Falls
+       *  back to the resident session's cwd / configured project for the file lookup. */
+      async getSubagentMessages(sessionId, agentId, projectDir) {
+        const dir2 = this.liveSessions.get(sessionId)?.cwd ?? projectDir ?? this.projectDir ?? void 0;
+        return this.sessionStore.getSubagentMessages(sessionId, agentId, dir2);
+      }
+      /** Authoritative cumulative cost (USD) for a session, summed from the durable per-turn cost
+       *  ledger — survives reload/resume (unlike a client-side sum of the text-only transcript). */
+      async getSessionCost(sessionId, projectDir) {
+        const dir2 = this.liveSessions.get(sessionId)?.cwd ?? projectDir ?? this.projectDir ?? void 0;
+        if (!dir2)
+          return 0;
+        return this.costLedger.total(dir2, sessionId);
+      }
       /** Merge sessions into a NEW one: gather each transcript, seed a fresh session with
        *  the combined context + an instruction to summarize-and-continue. The new session
        *  resolves via session:created (clientRequestId-keyed) exactly like a brand-new
@@ -25668,10 +25782,10 @@ CRITICAL RULES:
                 matcher: "Edit|Write|MultiEdit|NotebookEdit",
                 hooks: [async (input) => {
                   if (input.hook_event_name === "PreToolUse" && !input.agent_id) {
-                    const path5 = editedPathOf(input.tool_input);
-                    if (path5) {
-                      const snap = await snapshotFile(path5);
-                      pendingEdits.set(input.tool_use_id, { path: path5, before: snap.content, created: snap.created, noPreview: snap.noPreview });
+                    const path6 = editedPathOf(input.tool_input);
+                    if (path6) {
+                      const snap = await snapshotFile(path6);
+                      pendingEdits.set(input.tool_use_id, { path: path6, before: snap.content, created: snap.created, noPreview: snap.noPreview });
                     }
                   }
                   return {};
@@ -25683,14 +25797,14 @@ CRITICAL RULES:
                   if (input.hook_event_name === "PostToolUse" && !input.agent_id) {
                     const pre = pendingEdits.get(input.tool_use_id);
                     pendingEdits.delete(input.tool_use_id);
-                    const path5 = pre?.path ?? editedPathOf(input.tool_input);
-                    if (path5) {
-                      const post = await snapshotFile(path5);
+                    const path6 = pre?.path ?? editedPathOf(input.tool_input);
+                    if (path6) {
+                      const post = await snapshotFile(path6);
                       emitFileEdit({
                         type: "agent:file_edit",
                         sessionId: live.sessionId,
                         toolName: input.tool_name,
-                        path: path5,
+                        path: path6,
                         before: pre?.before,
                         after: post.content,
                         created: pre?.created || void 0,
@@ -25717,6 +25831,9 @@ CRITICAL RULES:
               const spawnEnv = {
                 ...process.env,
                 ...options.env,
+                // params.env carries CLAUDE_AUTOCOMPACT_PCT_OVERRIDE from the user's setting
+                // (getAgentSettings) — IF this CLI honours it, native mid-run compaction fires
+                // at the same threshold as our renderer-side proactive `/compact`.
                 ...params.env ?? {},
                 ...params.engineEnv ?? {},
                 CCB_IPC_PORT: String(live.ipcPort)
@@ -25840,17 +25957,8 @@ ${params.appendSystemPrompt}` : ""), live.sessionId) },
         };
         const emitEvent = (spec, parentId) => {
           const payload = { ...spec, ...parentId ? { parentToolUseId: parentId } : {} };
-          if (spec.updateKey === "thinking_tokens") {
-            const now2 = Date.now();
-            if (now2 - (live.lastThinkingEmitAt ?? 0) >= THINKING_THROTTLE_MS) {
-              live.lastThinkingEmitAt = now2;
-              live.pendingThinking = void 0;
-              sendEvent(payload);
-            } else {
-              live.pendingThinking = payload;
-            }
+          if (spec.updateKey === "thinking_tokens")
             return;
-          }
           flushPendingThinking();
           sendEvent(payload);
         };
@@ -26027,6 +26135,16 @@ ${params.appendSystemPrompt}` : ""), live.sessionId) },
                     frames: finishedTrace.frames
                   });
                 }
+                if (typeof r.total_cost_usd === "number" && r.total_cost_usd > 0 && live.cwd) {
+                  const uc = r.usage;
+                  void this.costLedger.append(live.cwd, turnSid, {
+                    ...traceTurnId ? { turnId: traceTurnId } : {},
+                    ts: Date.now(),
+                    costUsd: r.total_cost_usd,
+                    ...typeof uc?.input_tokens === "number" ? { inputTokens: uc.input_tokens } : {},
+                    ...typeof uc?.output_tokens === "number" ? { outputTokens: uc.output_tokens } : {}
+                  });
+                }
                 if (r.subtype === "success") {
                   if (!turnStreamed && Array.isArray(live.lastAssistantContent)) {
                     for (const blk of live.lastAssistantContent) {
@@ -26135,6 +26253,7 @@ ${params.appendSystemPrompt}` : ""), live.sessionId) },
                       ...sstr(m.tool_use_id) ? { toolUseId: sstr(m.tool_use_id) } : {},
                       ...parentToolUseId ? { parentToolUseId } : {},
                       description: sstr(m.description) || "subagent task",
+                      ...sstr(m.prompt) ? { prompt: sstr(m.prompt) } : {},
                       ...sstr(m.subagent_type) ? { subagentType: sstr(m.subagent_type) } : {},
                       ...sstr(m.workflow_name) ? { workflowName: sstr(m.workflow_name) } : {}
                     });
@@ -26409,7 +26528,7 @@ ${params.appendSystemPrompt}` : ""), live.sessionId) },
             const detail = err instanceof Error ? `${err.name}: ${err.message}${err.stack ? `
 ${err.stack}` : ""}` : String(err);
             log("Session iterator error:", sid, detail);
-            emit2({ type: "chat:error", sessionId: sid, error: detail });
+            emit2({ type: "chat:error", sessionId: sid, error: detail, transient: true });
             emit2({ type: "agent:status", sessionId: sid, status: "error" });
           }
         } finally {
@@ -28352,13 +28471,13 @@ function __disposeResources(env) {
   }
   return next();
 }
-function __rewriteRelativeImportExtension(path5, preserveJsx) {
-  if (typeof path5 === "string" && /^\.\.?\//.test(path5)) {
-    return path5.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
+function __rewriteRelativeImportExtension(path6, preserveJsx) {
+  if (typeof path6 === "string" && /^\.\.?\//.test(path6)) {
+    return path6.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
       return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
     });
   }
-  return path5;
+  return path6;
 }
 var extendStatics, __assign, __createBinding, __setModuleDefault, ownKeys, _SuppressedError, tslib_es6_default;
 var init_tslib_es6 = __esm({
@@ -39953,14 +40072,14 @@ var require_dependency_container = __commonJS({
           provider = providerOrConstructor;
         }
         if (providers_1.isTokenProvider(provider)) {
-          const path5 = [token2];
+          const path6 = [token2];
           let tokenProvider = provider;
           while (tokenProvider != null) {
             const currentToken = tokenProvider.useToken;
-            if (path5.includes(currentToken)) {
-              throw new Error(`Token registration cycle detected! ${[...path5, currentToken].join(" -> ")}`);
+            if (path6.includes(currentToken)) {
+              throw new Error(`Token registration cycle detected! ${[...path6, currentToken].join(" -> ")}`);
             }
-            path5.push(currentToken);
+            path6.push(currentToken);
             const registration = this._registry.get(currentToken);
             if (registration && providers_1.isTokenProvider(registration.provider)) {
               tokenProvider = registration.provider;
@@ -45305,7 +45424,7 @@ var init_framing = __esm({
 });
 
 // ../../packages/host-core/dist/peer-link/transport.js
-function socketPeerLink(socket2, peerHostId, path5, opts) {
+function socketPeerLink(socket2, peerHostId, path6, opts) {
   const dec = new FrameDecoder();
   const dataCbs = /* @__PURE__ */ new Set();
   const closeCbs = /* @__PURE__ */ new Set();
@@ -45379,7 +45498,7 @@ function socketPeerLink(socket2, peerHostId, path5, opts) {
   }
   const link = {
     peerHostId,
-    path: path5,
+    path: path6,
     send(chunk) {
       if (!closed)
         socket2.write(encodeFrame2(chunk));
@@ -47670,6 +47789,8 @@ async function createClaudeCodeBackend(send3, onBrowserRequest, loadPluginRuntim
     listSessions: (projectDir) => store.getSessions(projectDir),
     searchSessions: (query2, projectDir) => store.searchSessions(query2, projectDir),
     getMessages: (sessionId) => store.getSessionMessages(sessionId),
+    getSubagentMessages: (sessionId, agentId, projectDir) => manager2.getSubagentMessages(sessionId, agentId, projectDir),
+    getSessionCost: (sessionId, projectDir) => manager2.getSessionCost(sessionId, projectDir),
     getSessionArtifacts: (sessionId, projectDir) => readSessionArtifacts2(sessionId, projectDir),
     summarizeSession: async (sessionId) => manager2.summarizeSession(await store.getSessionMessages(sessionId)),
     setConfig: (projectDir) => {
@@ -48146,15 +48267,15 @@ import { homedir as homedir9 } from "node:os";
 init_dist();
 
 // ../../packages/plugin-host/dist/discovery.js
-import fs2 from "node:fs";
-import path2 from "node:path";
+import fs3 from "node:fs";
+import path3 from "node:path";
 var isWindows = process.platform === "win32";
 function checkTrust(rootDir, trusted, relaxHardlink = false) {
   if (trusted)
     return null;
   let st;
   try {
-    st = fs2.statSync(rootDir);
+    st = fs3.statSync(rootDir);
   } catch {
     return "unreadable";
   }
@@ -48168,7 +48289,7 @@ function checkTrust(rootDir, trusted, relaxHardlink = false) {
   if (!relaxHardlink) {
     for (const name of ["package.json"]) {
       try {
-        const f = fs2.statSync(path2.join(rootDir, name));
+        const f = fs3.statSync(path3.join(rootDir, name));
         if (f.nlink > 1)
           return `${name} is a hardlink`;
       } catch {
@@ -48183,20 +48304,20 @@ function discover(roots) {
   for (const root of roots) {
     let entries;
     try {
-      entries = fs2.readdirSync(root.dir, { withFileTypes: true });
+      entries = fs3.readdirSync(root.dir, { withFileTypes: true });
     } catch {
       continue;
     }
     for (const ent of entries) {
       if (!ent.isDirectory() && !ent.isSymbolicLink())
         continue;
-      const rootDir = path2.join(root.dir, ent.name);
-      if (!fs2.existsSync(path2.join(rootDir, "package.json"))) {
+      const rootDir = path3.join(root.dir, ent.name);
+      if (!fs3.existsSync(path3.join(rootDir, "package.json"))) {
         if (ent.name.startsWith("@")) {
           try {
-            for (const sub of fs2.readdirSync(rootDir, { withFileTypes: true })) {
-              const subDir = path2.join(rootDir, sub.name);
-              if (fs2.existsSync(path2.join(subDir, "package.json")))
+            for (const sub of fs3.readdirSync(rootDir, { withFileTypes: true })) {
+              const subDir = path3.join(rootDir, sub.name);
+              if (fs3.existsSync(path3.join(subDir, "package.json")))
                 pushCandidate(subDir, root, candidates, diagnostics);
             }
           } catch {
@@ -48218,13 +48339,13 @@ function pushCandidate(rootDir, root, candidates, diagnostics) {
 }
 
 // ../../packages/plugin-host/dist/manifest.js
-import fs3 from "node:fs";
-import path3 from "node:path";
+import fs4 from "node:fs";
+import path4 from "node:path";
 function resolveEntry(rootDir, rel, pkg) {
   const candidates = [rel, pkg.module, pkg.main, "index.js", "index.ts", "dist/index.js"].filter(Boolean);
   for (const c of candidates) {
-    const abs = path3.resolve(rootDir, c);
-    if (fs3.existsSync(abs))
+    const abs = path4.resolve(rootDir, c);
+    if (fs4.existsSync(abs))
       return abs;
   }
   return null;
@@ -48232,7 +48353,7 @@ function resolveEntry(rootDir, rel, pkg) {
 function readManifest2(rootDir) {
   let pkg;
   try {
-    pkg = JSON.parse(fs3.readFileSync(path3.join(rootDir, "package.json"), "utf8"));
+    pkg = JSON.parse(fs4.readFileSync(path4.join(rootDir, "package.json"), "utf8"));
   } catch {
     return { manifest: null, diagnostic: `${rootDir}: unreadable package.json` };
   }
@@ -48557,12 +48678,12 @@ function createOpenClawAdapter(pluginId, config2, secretResolver, registry2) {
 }
 
 // ../../packages/plugin-host/dist/openclaw-stub.js
-import fs4 from "node:fs";
-import path4 from "node:path";
+import fs5 from "node:fs";
+import path5 from "node:path";
 function writeOpenClawShim(pluginsDir) {
-  const stubDir = path4.join(pluginsDir, "node_modules", "openclaw");
-  fs4.mkdirSync(stubDir, { recursive: true });
-  fs4.writeFileSync(path4.join(stubDir, "package.json"), JSON.stringify({
+  const stubDir = path5.join(pluginsDir, "node_modules", "openclaw");
+  fs5.mkdirSync(stubDir, { recursive: true });
+  fs5.writeFileSync(path5.join(stubDir, "package.json"), JSON.stringify({
     name: "openclaw",
     version: "0.0.0-tesseract-compat",
     type: "module",
@@ -48579,8 +48700,8 @@ function writeOpenClawShim(pluginsDir) {
     "export default { definePluginEntry };",
     ""
   ].join("\n");
-  fs4.writeFileSync(path4.join(stubDir, "plugin-entry.mjs"), entrySrc);
-  fs4.writeFileSync(path4.join(stubDir, "plugin-sdk.mjs"), "export * from './plugin-entry.mjs';\nexport { default } from './plugin-entry.mjs';\n");
+  fs5.writeFileSync(path5.join(stubDir, "plugin-entry.mjs"), entrySrc);
+  fs5.writeFileSync(path5.join(stubDir, "plugin-sdk.mjs"), "export * from './plugin-entry.mjs';\nexport { default } from './plugin-entry.mjs';\n");
   return stubDir;
 }
 
@@ -49176,10 +49297,10 @@ function augmentedPath() {
   }
   return parts.join(sep8);
 }
-function which(bin, path5) {
+function which(bin, path6) {
   const tool12 = process.platform === "win32" ? "where" : "which";
   try {
-    const out = execFileSync2(tool12, [bin], { env: { ...process.env, PATH: path5 }, timeout: 4e3, encoding: "utf-8" });
+    const out = execFileSync2(tool12, [bin], { env: { ...process.env, PATH: path6 }, timeout: 4e3, encoding: "utf-8" });
     return out.split(/\r?\n/).map((l) => l.trim()).find(Boolean) || void 0;
   } catch {
     return void 0;
@@ -49191,12 +49312,12 @@ function compute(engineId) {
   const desc = engineById(engineId);
   if (!desc)
     return null;
-  const path5 = augmentedPath();
+  const path6 = augmentedPath();
   const explicit = process.env[`CCB_ENGINE_PATH_${envKey(engineId)}`]?.trim();
-  const command = explicit || which(desc.cliBinary, path5);
+  const command = explicit || which(desc.cliBinary, path6);
   if (!command)
     return null;
-  const env = { PATH: path5 };
+  const env = { PATH: path6 };
   const prefix = "CCB_ENGINE_ENV_";
   for (const [k, v] of Object.entries(process.env)) {
     if (v !== void 0 && k.startsWith(prefix))
@@ -51680,9 +51801,9 @@ function createDaemonImageGenRunner() {
         mkdirSync8(dir2, { recursive: true });
         const files = images.map((img, i) => {
           const ext = img.mime.split("/")[1]?.split("+")[0] || "png";
-          const path5 = join18(dir2, `${i + 1}.${ext}`);
-          writeFileSync9(path5, img.bytes);
-          return { path: path5, mime: img.mime };
+          const path6 = join18(dir2, `${i + 1}.${ext}`);
+          writeFileSync9(path6, img.bytes);
+          return { path: path6, mime: img.mime };
         });
         return { ok: true, files, usedProviderId: id };
       } catch (e) {
@@ -51730,10 +51851,10 @@ function dynamicMetrics() {
 
 // ../../packages/host-core/dist/support-submit.js
 var LOG_TAIL_BYTES = 64 * 1024;
-function tail2(path5, bytes = LOG_TAIL_BYTES) {
+function tail2(path6, bytes = LOG_TAIL_BYTES) {
   let fd = null;
   try {
-    fd = openSync2(path5, "r");
+    fd = openSync2(path6, "r");
     const size = fstatSync(fd).size;
     const len = Math.min(size, bytes);
     const start2 = Math.max(0, size - len);
@@ -52274,8 +52395,8 @@ function releaseFsClient(key2) {
 }
 var OUTSIDE = (verb) => ({ ok: false, error: `Refusing to ${verb} outside the shared root.` });
 var validName = (n) => !!n && !n.includes("/") && !n.includes("\\") && n !== "." && n !== "..";
-async function readRemoteBytes(root, path5) {
-  const real = safeContentPath(path5);
+async function readRemoteBytes(root, path6) {
+  const real = safeContentPath(path6);
   if (!real)
     return { error: "Path is outside the shared root." };
   try {
@@ -52865,8 +52986,8 @@ var CHUNK = 64 * 1024;
 var MAX_MSG = 256 * 1024;
 var HIGH_WATER = 8 * 1024 * 1024;
 var drainers = /* @__PURE__ */ new WeakMap();
-async function serveGet(dc, id, path5, root) {
-  const res = await readRemoteBytes(root, path5);
+async function serveGet(dc, id, path6, root) {
+  const res = await readRemoteBytes(root, path6);
   if (!dc.isOpen())
     return;
   if (res.error || !res.bytes) {
@@ -53490,12 +53611,17 @@ async function dialLadder(opts) {
 }
 
 // ../../packages/host-core/dist/peer-link/manager.js
+init_dist();
 var LISTEN_PORT = Number(process.env.CCB_P2P_PORT ?? 0);
 var UDP_PORT = Number(process.env.CCB_P2P_UDP_PORT ?? 0);
 var RENDEZVOUS_TIMEOUT_MS = 25e3;
 var INBOUND_WAIT_MS = 2e4;
-var DEFAULT_STUN_HOST = "stun.l.google.com";
-var DEFAULT_STUN_PORT = 19302;
+var DEFAULT_STUN_SERVERS = [
+  { host: OWN_STUN_HOST, port: OWN_STUN_PORT },
+  // our coturn first
+  { host: "stun.l.google.com", port: 19302 }
+  // public fallback
+];
 var provisionedStun = null;
 function provisionStun(host, port = 3478) {
   if (host)
@@ -53510,7 +53636,7 @@ function resolveStunServers() {
     list.push({ host: env, port: Number(process.env.CCB_STUN_PORT ?? 3478) });
   if (provisionedStun)
     list.push(provisionedStun);
-  list.push({ host: DEFAULT_STUN_HOST, port: DEFAULT_STUN_PORT });
+  list.push(...DEFAULT_STUN_SERVERS);
   const seen = /* @__PURE__ */ new Set();
   return list.filter((s) => {
     const k = `${s.host}:${s.port}`;
@@ -53679,9 +53805,9 @@ var PeerLinkManager = class {
    *  match, hand the authed link to its waiter. Shared by both transports so a
    *  listener doesn't care HOW the peer dialed in — the token in pendingInbound
    *  matches either. */
-  acceptInbound(sock, path5) {
+  acceptInbound(sock, path6) {
     let matchedHex;
-    const { link, ready } = socketPeerLink(sock, "", path5, {
+    const { link, ready } = socketPeerLink(sock, "", path6, {
       expectToken: (f) => {
         const hb = Buffer.from(toHex(f));
         for (const key2 of this.pendingInbound.keys()) {
@@ -54695,7 +54821,7 @@ var ReaddirpStream = class extends Readable {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? lstat5 : stat4;
     if (wantBigintFsStats) {
-      this._stat = (path5) => statMethod(path5, { bigint: true });
+      this._stat = (path6) => statMethod(path6, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -54720,8 +54846,8 @@ var ReaddirpStream = class extends Readable {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path5, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path5));
+          const { path: path6, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path6));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -54761,20 +54887,20 @@ var ReaddirpStream = class extends Readable {
       this.reading = false;
     }
   }
-  async _exploreDir(path5, depth) {
+  async _exploreDir(path6, depth) {
     let files;
     try {
-      files = await readdir6(path5, this._rdOptions);
+      files = await readdir6(path6, this._rdOptions);
     } catch (error51) {
       this._onError(error51);
     }
-    return { files, depth, path: path5 };
+    return { files, depth, path: path6 };
   }
-  async _formatEntry(dirent, path5) {
+  async _formatEntry(dirent, path6) {
     let entry;
     const basename7 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path5, basename7));
+      const fullPath = presolve(pjoin(path6, basename7));
       entry = { path: prelative(this._root, fullPath), fullPath, basename: basename7 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -55174,16 +55300,16 @@ var delFromSet = (main2, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = /* @__PURE__ */ new Map();
-function createFsWatchInstance(path5, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path6, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path5);
-    emitRaw(rawEvent, evPath, { watchedPath: path5 });
-    if (evPath && path5 !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path5, evPath), KEY_LISTENERS, sysPath.join(path5, evPath));
+    listener(path6);
+    emitRaw(rawEvent, evPath, { watchedPath: path6 });
+    if (evPath && path6 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path6, evPath), KEY_LISTENERS, sysPath.join(path6, evPath));
     }
   };
   try {
-    return fs_watch(path5, {
+    return fs_watch(path6, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error51) {
@@ -55199,12 +55325,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path5, fullPath, options, handlers) => {
+var setFsWatchListener = (path6, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path5, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path6, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -55215,7 +55341,7 @@ var setFsWatchListener = (path5, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
     watcher = createFsWatchInstance(
-      path5,
+      path6,
       options,
       fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
       errHandler,
@@ -55230,7 +55356,7 @@ var setFsWatchListener = (path5, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows2 && error51.code === "EPERM") {
         try {
-          const fd = await open3(path5, "r");
+          const fd = await open3(path6, "r");
           await fd.close();
           broadcastErr(error51);
         } catch (err) {
@@ -55261,7 +55387,7 @@ var setFsWatchListener = (path5, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = /* @__PURE__ */ new Map();
-var setFsWatchFileListener = (path5, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path6, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
@@ -55283,7 +55409,7 @@ var setFsWatchFileListener = (path5, fullPath, options, handlers) => {
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path5, curr));
+          foreach(cont.listeners, (listener2) => listener2(path6, curr));
         }
       })
     };
@@ -55311,13 +55437,13 @@ var NodeFsHandler = class {
    * @param listener on fs change
    * @returns closer for the watcher instance
    */
-  _watchWithNodeFs(path5, listener) {
+  _watchWithNodeFs(path6, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path5);
-    const basename7 = sysPath.basename(path5);
+    const directory = sysPath.dirname(path6);
+    const basename7 = sysPath.basename(path6);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename7);
-    const absolutePath = sysPath.resolve(path5);
+    const absolutePath = sysPath.resolve(path6);
     const options = {
       persistent: opts.persistent
     };
@@ -55327,12 +55453,12 @@ var NodeFsHandler = class {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename7) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path5, absolutePath, options, {
+      closer = setFsWatchFileListener(path6, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path5, absolutePath, options, {
+      closer = setFsWatchListener(path6, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -55354,7 +55480,7 @@ var NodeFsHandler = class {
     let prevStats = stats;
     if (parent.has(basename7))
       return;
-    const listener = async (path5, newStats) => {
+    const listener = async (path6, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -55368,11 +55494,11 @@ var NodeFsHandler = class {
             this.fsw._emit(EV.CHANGE, file2, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path5);
+            this.fsw._closeFile(path6);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file2, listener);
             if (closer2)
-              this.fsw._addPathCloser(path5, closer2);
+              this.fsw._addPathCloser(path6, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -55404,7 +55530,7 @@ var NodeFsHandler = class {
    * @param item basename of this item
    * @returns true if no more processing is needed for this entry.
    */
-  async _handleSymlink(entry, directory, path5, item) {
+  async _handleSymlink(entry, directory, path6, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -55414,7 +55540,7 @@ var NodeFsHandler = class {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await fsrealpath(path5);
+        linkPath = await fsrealpath(path6);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -55424,12 +55550,12 @@ var NodeFsHandler = class {
       if (dir2.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path5, entry.stats);
+          this.fsw._emit(EV.CHANGE, path6, entry.stats);
         }
       } else {
         dir2.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path5, entry.stats);
+        this.fsw._emit(EV.ADD, path6, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -55458,9 +55584,9 @@ var NodeFsHandler = class {
         return;
       }
       const item = entry.path;
-      let path5 = sysPath.join(directory, item);
+      let path6 = sysPath.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path5, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path6, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -55469,8 +55595,8 @@ var NodeFsHandler = class {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path5 = sysPath.join(dir2, sysPath.relative(dir2, path5));
-        this._addToNodeFs(path5, initialAdd, wh, depth + 1);
+        path6 = sysPath.join(dir2, sysPath.relative(dir2, path6));
+        this._addToNodeFs(path6, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve10, reject) => {
@@ -55539,13 +55665,13 @@ var NodeFsHandler = class {
    * @param depth Child path actually targeted for watch
    * @param target Child path actually targeted for watch
    */
-  async _addToNodeFs(path5, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path6, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path5) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path6) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path5);
+    const wh = this.fsw._getWatchHelpers(path6);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -55561,8 +55687,8 @@ var NodeFsHandler = class {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path5);
-        const targetPath = follow ? await fsrealpath(path5) : path5;
+        const absPath = sysPath.resolve(path6);
+        const targetPath = follow ? await fsrealpath(path6) : path6;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -55572,29 +55698,29 @@ var NodeFsHandler = class {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await fsrealpath(path5) : path5;
+        const targetPath = follow ? await fsrealpath(path6) : path6;
         if (this.fsw.closed)
           return;
         const parent = sysPath.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path5, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path6, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== void 0) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path5), targetPath);
+          this.fsw._symlinkPaths.set(sysPath.resolve(path6), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path5, closer);
+        this.fsw._addPathCloser(path6, closer);
       return false;
     } catch (error51) {
       if (this.fsw._handleError(error51)) {
         ready();
-        return path5;
+        return path6;
       }
     }
   }
@@ -55637,26 +55763,26 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path5) {
-  if (typeof path5 !== "string")
+function normalizePath(path6) {
+  if (typeof path6 !== "string")
     throw new Error("string expected");
-  path5 = sysPath2.normalize(path5);
-  path5 = path5.replace(/\\/g, "/");
+  path6 = sysPath2.normalize(path6);
+  path6 = path6.replace(/\\/g, "/");
   let prepend = false;
-  if (path5.startsWith("//"))
+  if (path6.startsWith("//"))
     prepend = true;
   const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path5.match(DOUBLE_SLASH_RE2))
-    path5 = path5.replace(DOUBLE_SLASH_RE2, "/");
+  while (path6.match(DOUBLE_SLASH_RE2))
+    path6 = path6.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path5 = "/" + path5;
-  return path5;
+    path6 = "/" + path6;
+  return path6;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path5 = normalizePath(testString);
+  const path6 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path5, stats)) {
+    if (pattern(path6, stats)) {
       return true;
     }
   }
@@ -55696,19 +55822,19 @@ var toUnix = (string4) => {
   }
   return str2;
 };
-var normalizePathToUnix = (path5) => toUnix(sysPath2.normalize(toUnix(path5)));
-var normalizeIgnored = (cwd = "") => (path5) => {
-  if (typeof path5 === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path5) ? path5 : sysPath2.join(cwd, path5));
+var normalizePathToUnix = (path6) => toUnix(sysPath2.normalize(toUnix(path6)));
+var normalizeIgnored = (cwd = "") => (path6) => {
+  if (typeof path6 === "string") {
+    return normalizePathToUnix(sysPath2.isAbsolute(path6) ? path6 : sysPath2.join(cwd, path6));
   } else {
-    return path5;
+    return path6;
   }
 };
-var getAbsolutePath = (path5, cwd) => {
-  if (sysPath2.isAbsolute(path5)) {
-    return path5;
+var getAbsolutePath = (path6, cwd) => {
+  if (sysPath2.isAbsolute(path6)) {
+    return path6;
   }
-  return sysPath2.join(cwd, path5);
+  return sysPath2.join(cwd, path6);
 };
 var EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
 var DirEntry = class {
@@ -55763,10 +55889,10 @@ var DirEntry = class {
 var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 var WatchHelper = class {
-  constructor(path5, follow, fsw) {
+  constructor(path6, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path5;
-    this.path = path5 = path5.replace(REPLACER_RE, "");
+    const watchPath = path6;
+    this.path = path6 = path6.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
@@ -55888,20 +56014,20 @@ var FSWatcher = class extends EventEmitter2 {
     this._closePromise = void 0;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path5) => {
-        const absPath = getAbsolutePath(path5, cwd);
+      paths = paths.map((path6) => {
+        const absPath = getAbsolutePath(path6, cwd);
         return absPath;
       });
     }
-    paths.forEach((path5) => {
-      this._removeIgnoredPath(path5);
+    paths.forEach((path6) => {
+      this._removeIgnoredPath(path6);
     });
     this._userIgnored = void 0;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path5) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path5, !_internal, void 0, 0, _origAdd);
+    Promise.all(paths.map(async (path6) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path6, !_internal, void 0, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -55923,17 +56049,17 @@ var FSWatcher = class extends EventEmitter2 {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path5) => {
-      if (!sysPath2.isAbsolute(path5) && !this._closers.has(path5)) {
+    paths.forEach((path6) => {
+      if (!sysPath2.isAbsolute(path6) && !this._closers.has(path6)) {
         if (cwd)
-          path5 = sysPath2.join(cwd, path5);
-        path5 = sysPath2.resolve(path5);
+          path6 = sysPath2.join(cwd, path6);
+        path6 = sysPath2.resolve(path6);
       }
-      this._closePath(path5);
-      this._addIgnoredPath(path5);
-      if (this._watched.has(path5)) {
+      this._closePath(path6);
+      this._addIgnoredPath(path6);
+      if (this._watched.has(path6)) {
         this._addIgnoredPath({
-          path: path5,
+          path: path6,
           recursive: true
         });
       }
@@ -55997,38 +56123,38 @@ var FSWatcher = class extends EventEmitter2 {
    * @param stats arguments to be passed with event
    * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
    */
-  async _emit(event, path5, stats) {
+  async _emit(event, path6, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows2)
-      path5 = sysPath2.normalize(path5);
+      path6 = sysPath2.normalize(path6);
     if (opts.cwd)
-      path5 = sysPath2.relative(opts.cwd, path5);
-    const args = [path5];
+      path6 = sysPath2.relative(opts.cwd, path6);
+    const args = [path6];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path5))) {
+    if (awf && (pw = this._pendingWrites.get(path6))) {
       pw.lastChange = /* @__PURE__ */ new Date();
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path5, [event, ...args]);
+        this._pendingUnlinks.set(path6, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path6) => {
+          this._pendingUnlinks.forEach((entry, path7) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path6);
+            this._pendingUnlinks.delete(path7);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path5)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path6)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path5);
+        this._pendingUnlinks.delete(path6);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -56046,16 +56172,16 @@ var FSWatcher = class extends EventEmitter2 {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path5, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path6, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path5, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path6, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path5) : path5;
+      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path6) : path6;
       let stats2;
       try {
         stats2 = await stat6(fullPath);
@@ -56086,23 +56212,23 @@ var FSWatcher = class extends EventEmitter2 {
    * @param timeout duration of time to suppress duplicate actions
    * @returns tracking object or false if action should be suppressed
    */
-  _throttle(actionType, path5, timeout) {
+  _throttle(actionType, path6, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, /* @__PURE__ */ new Map());
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path5);
+    const actionPath = action.get(path6);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path5);
+      const item = action.get(path6);
       const count = item ? item.count : 0;
-      action.delete(path5);
+      action.delete(path6);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -56110,7 +56236,7 @@ var FSWatcher = class extends EventEmitter2 {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path5, thr);
+    action.set(path6, thr);
     return thr;
   }
   _incrReadyCount() {
@@ -56124,44 +56250,44 @@ var FSWatcher = class extends EventEmitter2 {
    * @param event
    * @param awfEmit Callback to be called when ready for event to be emitted.
    */
-  _awaitWriteFinish(path5, threshold, event, awfEmit) {
+  _awaitWriteFinish(path6, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path5;
-    if (this.options.cwd && !sysPath2.isAbsolute(path5)) {
-      fullPath = sysPath2.join(this.options.cwd, path5);
+    let fullPath = path6;
+    if (this.options.cwd && !sysPath2.isAbsolute(path6)) {
+      fullPath = sysPath2.join(this.options.cwd, path6);
     }
     const now2 = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
       statcb(fullPath, (err, curStat) => {
-        if (err || !writes.has(path5)) {
+        if (err || !writes.has(path6)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now3 = Number(/* @__PURE__ */ new Date());
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path5).lastChange = now3;
+          writes.get(path6).lastChange = now3;
         }
-        const pw = writes.get(path5);
+        const pw = writes.get(path6);
         const df = now3 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path5);
+          writes.delete(path6);
           awfEmit(void 0, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path5)) {
-      writes.set(path5, {
+    if (!writes.has(path6)) {
+      writes.set(path6, {
         lastChange: now2,
         cancelWait: () => {
-          writes.delete(path5);
+          writes.delete(path6);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -56172,8 +56298,8 @@ var FSWatcher = class extends EventEmitter2 {
   /**
    * Determines whether user has asked to ignore this path.
    */
-  _isIgnored(path5, stats) {
-    if (this.options.atomic && DOT_RE.test(path5))
+  _isIgnored(path6, stats) {
+    if (this.options.atomic && DOT_RE.test(path6))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -56183,17 +56309,17 @@ var FSWatcher = class extends EventEmitter2 {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, void 0);
     }
-    return this._userIgnored(path5, stats);
+    return this._userIgnored(path6, stats);
   }
-  _isntIgnored(path5, stat7) {
-    return !this._isIgnored(path5, stat7);
+  _isntIgnored(path6, stat7) {
+    return !this._isIgnored(path6, stat7);
   }
   /**
    * Provides a set of common helpers and properties relating to symlink handling.
    * @param path file or directory pattern being watched
    */
-  _getWatchHelpers(path5) {
-    return new WatchHelper(path5, this.options.followSymlinks, this);
+  _getWatchHelpers(path6) {
+    return new WatchHelper(path6, this.options.followSymlinks, this);
   }
   // Directory helpers
   // -----------------
@@ -56225,63 +56351,63 @@ var FSWatcher = class extends EventEmitter2 {
    * @param item      base path of item/directory
    */
   _remove(directory, item, isDirectory) {
-    const path5 = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path5);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path5) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path5, 100))
+    const path6 = sysPath2.join(directory, item);
+    const fullPath = sysPath2.resolve(path6);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path6) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path6, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path5);
+    const wp = this._getWatchedDir(path6);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path5, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path6, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path5;
+    let relPath = path6;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path5);
+      relPath = sysPath2.relative(this.options.cwd, path6);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path5);
+    this._watched.delete(path6);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path5))
-      this._emit(eventName, path5);
-    this._closePath(path5);
+    if (wasTracked && !this._isIgnored(path6))
+      this._emit(eventName, path6);
+    this._closePath(path6);
   }
   /**
    * Closes all watchers for a path
    */
-  _closePath(path5) {
-    this._closeFile(path5);
-    const dir2 = sysPath2.dirname(path5);
-    this._getWatchedDir(dir2).remove(sysPath2.basename(path5));
+  _closePath(path6) {
+    this._closeFile(path6);
+    const dir2 = sysPath2.dirname(path6);
+    this._getWatchedDir(dir2).remove(sysPath2.basename(path6));
   }
   /**
    * Closes only file-specific watchers
    */
-  _closeFile(path5) {
-    const closers = this._closers.get(path5);
+  _closeFile(path6) {
+    const closers = this._closers.get(path6);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path5);
+    this._closers.delete(path6);
   }
-  _addPathCloser(path5, closer) {
+  _addPathCloser(path6, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path5);
+    let list = this._closers.get(path6);
     if (!list) {
       list = [];
-      this._closers.set(path5, list);
+      this._closers.set(path6, list);
     }
     list.push(closer);
   }
@@ -57446,9 +57572,9 @@ function friendlyLabel(id, label) {
       return `Command line (${label})`;
   }
 }
-function mk(id, path5, isDefault, label) {
+function mk(id, path6, isDefault, label) {
   const lbl = label ?? id;
-  return { id, label: lbl, friendly: friendlyLabel(id, lbl), path: path5, default: isDefault || void 0 };
+  return { id, label: lbl, friendly: friendlyLabel(id, lbl), path: path6, default: isDefault || void 0 };
 }
 function listInterpreters() {
   return process.platform === "win32" ? listWindows() : listUnix();
@@ -57457,11 +57583,11 @@ function listUnix() {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const loginShell = process.env.SHELL || "";
-  const add = (id, path5) => {
-    if (!path5 || seen.has(path5) || !existsSync14(path5))
+  const add = (id, path6) => {
+    if (!path6 || seen.has(path6) || !existsSync14(path6))
       return;
-    seen.add(path5);
-    out.push(mk(id, path5, path5 === loginShell));
+    seen.add(path6);
+    out.push(mk(id, path6, path6 === loginShell));
   };
   if (loginShell)
     add(idForPath(loginShell), loginShell);
@@ -57489,9 +57615,9 @@ function listWindows() {
   const pf = process.env.ProgramFiles || "C:\\Program Files";
   const gitBash = `${pf}\\Git\\bin\\bash.exe`;
   const pwsh7 = `${pf}\\PowerShell\\7\\pwsh.exe`;
-  const add = (id, path5, label, isDefault = false) => {
-    if (path5 && existsSync14(path5))
-      out.push(mk(id, path5, isDefault, label));
+  const add = (id, path6, label, isDefault = false) => {
+    if (path6 && existsSync14(path6))
+      out.push(mk(id, path6, isDefault, label));
   };
   add("powershell", winPwsh, "Windows PowerShell", true);
   add("pwsh", pwsh7, "pwsh");
@@ -57755,7 +57881,7 @@ function fetchIceServers() {
       const i = iceWaiters.indexOf(resolve10);
       if (i >= 0) {
         iceWaiters.splice(i, 1);
-        resolve10([{ urls: "stun:stun.l.google.com:19302" }]);
+        resolve10(DEFAULT_ICE_SERVERS);
       }
     }, 2500);
   });
@@ -58187,7 +58313,8 @@ async function handleInboundAgent(msg, driverClientId) {
         driverBySession.set(msg.sessionId, driverClientId);
       const messages = await b.getMessages(msg.sessionId).catch(() => []);
       const artifacts = await (b.getSessionArtifacts?.(msg.sessionId, msg.projectDir).catch(() => []) ?? Promise.resolve([]));
-      send2("agent", { type: "session:messages", sessionId: msg.sessionId, messages, artifacts }, route2);
+      const sessionCostUsd = await (b.getSessionCost?.(msg.sessionId, msg.projectDir).catch(() => 0) ?? Promise.resolve(0));
+      send2("agent", { type: "session:messages", sessionId: msg.sessionId, messages, artifacts, ...sessionCostUsd > 0 ? { sessionCostUsd } : {} }, route2);
       break;
     }
     case "session:summarize": {
@@ -58209,6 +58336,9 @@ async function handleInboundAgent(msg, driverClientId) {
     case "agent:trace":
       void Promise.resolve(b.getTrace?.(msg.sessionId, msg.turnId, msg.projectDir) ?? null).then((trace) => send2("agent", { type: "agent:trace", sessionId: msg.sessionId, turnId: msg.turnId, clientRequestId: msg.clientRequestId, trace: trace ?? null }, route2));
       break;
+    case "agent:subagentMessages":
+      void Promise.resolve(b.getSubagentMessages?.(msg.sessionId, msg.agentId, msg.projectDir) ?? []).then((messages) => send2("agent", { type: "agent:subagentMessages", sessionId: msg.sessionId, agentId: msg.agentId, clientRequestId: msg.clientRequestId, messages }, route2));
+      break;
     case "session:merge":
       void b.mergeSessions?.(msg.sessionIds, { projectDir: msg.projectDir, title: msg.title, clientRequestId: msg.clientRequestId, origin }).catch(() => {
       });
@@ -58961,7 +59091,8 @@ async function startLocalServer(opts) {
         case "session:resume": {
           const messages = await b.getMessages(msg.sessionId).catch(() => []);
           const artifacts = await (b.getSessionArtifacts?.(msg.sessionId, msg.projectDir).catch(() => []) ?? Promise.resolve([]));
-          send3("agent", { type: "session:messages", sessionId: msg.sessionId, messages, artifacts });
+          const sessionCostUsd = await (b.getSessionCost?.(msg.sessionId, msg.projectDir).catch(() => 0) ?? Promise.resolve(0));
+          send3("agent", { type: "session:messages", sessionId: msg.sessionId, messages, artifacts, ...sessionCostUsd > 0 ? { sessionCostUsd } : {} });
           break;
         }
         case "session:summarize": {
@@ -58983,6 +59114,9 @@ async function startLocalServer(opts) {
         case "agent:trace":
           void Promise.resolve(b.getTrace?.(msg.sessionId, msg.turnId, msg.projectDir) ?? null).then((trace) => send3("agent", { type: "agent:trace", sessionId: msg.sessionId, turnId: msg.turnId, clientRequestId: msg.clientRequestId, trace: trace ?? null }));
           break;
+        case "agent:subagentMessages":
+          void Promise.resolve(b.getSubagentMessages?.(msg.sessionId, msg.agentId, msg.projectDir) ?? []).then((messages) => send3("agent", { type: "agent:subagentMessages", sessionId: msg.sessionId, agentId: msg.agentId, clientRequestId: msg.clientRequestId, messages }));
+          break;
         case "session:merge":
           void b.mergeSessions?.(msg.sessionIds, { projectDir: msg.projectDir, title: msg.title, clientRequestId: msg.clientRequestId, origin: loopbackOrigin }).catch(() => {
           });