@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/node-runtime/{direct-tool-executor-4D7UXYU4.js → direct-tool-executor-2QJXVQD2.js}

@@ -6,26 +6,21 @@ import {
   resolveMcpOutputGuardOptions,
   resolveMcpResultContent,
   transformMcpContent
-} from "./chunk-E75WFZ33.js";
+} from "./chunk-UNUZICC4.js";
 import {
   formatSchema,
   getFailureAgeSeconds,
-  lazyConnect
-} from "./chunk-4SBQAI4T.js";
-import "./chunk-LWJXTA6Z.js";
-import {
-  authenticate,
+  lazyConnect,
   supportsOAuth
-} from "./chunk-7IQGBKBJ.js";
+} from "./chunk-EBLAZVSA.js";
 import {
   UrlElicitationRequiredError
-} from "./chunk-2IDTZAG5.js";
+} from "./chunk-VSUEAI7O.js";
 import {
   abortable,
   formatAuthRequiredMessage,
   throwIfAborted
-} from "./chunk-LWYIVUGV.js";
-import "./chunk-4HXHDDCF.js";
+} from "./chunk-B2IBAXNX.js";
 import "./chunk-ARC4KOTI.js";
 import "./chunk-BI3DHYCN.js";
 import "./chunk-Q4Q6D4IY.js";
@@ -51,7 +46,7 @@ async function attemptDirectAutoAuth(state, serverName, signal) {
       message: getDirectAuthRequiredMessage(state, serverName, `MCP server "${serverName}" requires OAuth authentication. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`)
     };
   try {
-    return await abortable(authenticate(serverName, definition.url, definition), signal), throwIfAborted(signal), { status: "success" };
+    return await abortable(state.authFlow.authenticate(serverName, definition.url, definition), signal), throwIfAborted(signal), { status: "success" };
   } catch (error) {
     throwIfAborted(signal);
     let message = error instanceof Error ? error.message : String(error);

package/dist/node-runtime/{exa-LL64QZR2.js → exa-6VBZNPGE.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   activityMonitor
-} from "./chunk-DAPBPCBP.js";
+} from "./chunk-IPP5BIV5.js";
 import {
   getWebSearchConfigPath
 } from "./chunk-VRB2IYGG.js";

package/dist/node-runtime/{export-html-VM4J2MNR.js → export-html-DBQRRMAY.js}

@@ -1,19 +1,19 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   SessionManager
-} from "./chunk-2KIPT4HJ.js";
+} from "./chunk-PWHTSQC4.js";
 import "./chunk-FVDOXRUD.js";
-import "./chunk-UAEOTO52.js";
+import "./chunk-MNQXDFPV.js";
 import {
   getResolvedThemeColors,
   getThemeExportColors
-} from "./chunk-RDDAZOMU.js";
+} from "./chunk-JL4HYQXK.js";
 import {
   APP_NAME,
   getExportTemplateDir,
   normalizePath,
   resolvePath
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 

package/dist/node-runtime/{extension-input-E7BJZ35H.js → extension-input-VBBMX7YV.js}

@@ -1,12 +1,12 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   ExtensionInputComponent
-} from "./chunk-HMBGROQK.js";
+} from "./chunk-GLDXBBL6.js";
 import "./chunk-I6R76AG7.js";
-import "./chunk-6VYZ5UFP.js";
-import "./chunk-GS42T6MX.js";
-import "./chunk-RDDAZOMU.js";
-import "./chunk-FQMM2EZ2.js";
+import "./chunk-FLGEEH27.js";
+import "./chunk-QW3AAHWN.js";
+import "./chunk-JL4HYQXK.js";
+import "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 export {

package/dist/node-runtime/{extension-selector-WU42XDTU.js → extension-selector-T5AOG5XB.js}

@@ -1,12 +1,12 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   ExtensionSelectorComponent
-} from "./chunk-QH6YL7VK.js";
+} from "./chunk-252ZVPPF.js";
 import "./chunk-I6R76AG7.js";
-import "./chunk-6VYZ5UFP.js";
-import "./chunk-GS42T6MX.js";
-import "./chunk-RDDAZOMU.js";
-import "./chunk-FQMM2EZ2.js";
+import "./chunk-FLGEEH27.js";
+import "./chunk-QW3AAHWN.js";
+import "./chunk-JL4HYQXK.js";
+import "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 export {

package/dist/node-runtime/{extract-EQJE7FZZ.js → extract-BFX2N35A.js}

@@ -4,9 +4,9 @@ import {
   extractHeadingTitle,
   fetchAllContent,
   loadSsrfAllowRanges
-} from "./chunk-UQUCFAJ3.js";
-import "./chunk-NAY6UUQZ.js";
-import "./chunk-DAPBPCBP.js";
+} from "./chunk-2VIW3IMF.js";
+import "./chunk-WDIVLMOH.js";
+import "./chunk-IPP5BIV5.js";
 import "./chunk-VRB2IYGG.js";
 import "./chunk-BRJX2PRC.js";
 export {

package/dist/node-runtime/{gateway-DQM333YV.js → gateway-V6K2CDWN.js}

@@ -3,20 +3,18 @@ import {
   AgentBridge,
   QUEUED,
   startGatewayCron
-} from "./chunk-UVWCDQYF.js";
+} from "./chunk-E5DQGNJI.js";
 import {
   CHAT_COMMANDS,
   botCommandSpecs,
   runChatCommand,
   sendCommandReply
-} from "./chunk-P7XBVXGT.js";
-import {
-  resolveWithinRoots
-} from "./chunk-5B5QN3ZQ.js";
+} from "./chunk-U3YVZ6UC.js";
 import {
   acceptGatewayInput,
   addAllowedUser,
   bindConversation,
+  canDeliverGatewayText,
   conversationBinding,
   gatewayEpoch,
   getSession,
@@ -29,40 +27,43 @@ import {
   registerGatewayApprovalHandler,
   rememberGatewayRole,
   requireAuthorized,
+  resolveWithinRoots,
   runWithApprovalContext,
   splitMessage,
   startButtonSweeper,
   startGatewayPresenter,
   stopButtonSweeper,
   stopGatewayPresenter
-} from "./chunk-3MISGG4S.js";
+} from "./chunk-4QRUZ64T.js";
 import {
   createPairingStore
-} from "./chunk-RMQZU2YU.js";
+} from "./chunk-NNNR3QIY.js";
 import {
   claimGateway
-} from "./chunk-SLVOAQOY.js";
+} from "./chunk-WXYNALHD.js";
 import "./chunk-CJECDQKP.js";
-import "./chunk-CDVHZOOK.js";
-import "./chunk-XHIRAZ26.js";
-import "./chunk-5Q4A37RB.js";
+import "./chunk-RY3FJ6WI.js";
+import "./chunk-IAZSK7KK.js";
+import "./chunk-TCT6PCUR.js";
 import {
   isFeatureEnabled
-} from "./chunk-2HMIRK7W.js";
-import "./chunk-GYIXXQAO.js";
-import "./chunk-GJ2RDBRL.js";
+} from "./chunk-LHV3V67B.js";
+import "./chunk-URD2SLIT.js";
+import "./chunk-ICKGAKWX.js";
+import "./chunk-BYC6RKCN.js";
 import "./chunk-CGBXPL3E.js";
 import "./chunk-BBUVIEZB.js";
-import "./chunk-WIF24I7G.js";
-import "./chunk-M3LZLQW2.js";
+import "./chunk-APVM5NEU.js";
+import "./chunk-F2V2F4ZG.js";
+import "./chunk-BDRGN3L2.js";
 import "./chunk-FY4A63RK.js";
-import "./chunk-KKUTQQV7.js";
-import "./chunk-CSFI6YXL.js";
-import "./chunk-I54LGHWM.js";
-import "./chunk-2KIPT4HJ.js";
+import "./chunk-RYRGL7P4.js";
+import "./chunk-ES6PBSIE.js";
+import "./chunk-STMX7W5I.js";
+import "./chunk-PWHTSQC4.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-IMLCWLPI.js";
-import "./chunk-UAEOTO52.js";
+import "./chunk-MNQXDFPV.js";
 import "./chunk-RQ2Q5IYR.js";
 import {
   gatewayConfigPath,
@@ -70,10 +71,10 @@ import {
   platformConfigFor,
   resolvePlatformToken,
   saveGatewayConfig
-} from "./chunk-B4HP6ZWM.js";
-import "./chunk-E24EO34J.js";
-import "./chunk-RDDAZOMU.js";
-import "./chunk-FQMM2EZ2.js";
+} from "./chunk-RHCGYWO7.js";
+import "./chunk-WPXUR3HE.js";
+import "./chunk-JL4HYQXK.js";
+import "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 
@@ -369,7 +370,7 @@ var DiscordAdapter = class {
         return await interaction.respond([]), !0;
       let query = String(interaction.options.getFocused()).toLowerCase(), values = [];
       if (interaction.commandName === "mode" && (values = ["yolo", "auto", "read-only"]), this.commandSuggestions && ["thinking", "model"].includes(interaction.commandName) && (values = [...await this.commandSuggestions(source, interaction.commandName)]), interaction.commandName === "project" && (values = cfg.projectRoots ?? []), interaction.commandName === "sessions") {
-        let { SessionManager } = await import("./session-manager-JB5J6XBN.js");
+        let { SessionManager } = await import("./session-manager-ZJ3N5Q74.js");
         values = (await Promise.race([
           SessionManager.listAll(),
           new Promise((resolve) => setTimeout(() => resolve([]), 1500))
@@ -1184,7 +1185,7 @@ function createRouter(deps) {
       return !1;
     let firstToken = text.split(/\s+/, 1)[0].toLowerCase(), commandWord = firstToken.split("@")[0].slice(1), args = text.slice(firstToken.length).trim();
     if (deps.remoteControls) {
-      let { handleMobileCommand, cancelMobileTransfer } = await import("./mobile-commands-O5LCHL32.js");
+      let { handleMobileCommand, cancelMobileTransfer } = await import("./mobile-commands-ICUXFW5V.js");
       if (["stop", "stopall", "new", "cancel"].includes(commandWord) && cancelMobileTransfer(key), commandWord === "cancel")
         return invalidateGatewayDialogs(key), await adapter.send(event.source.chatId, "Cancelled the pending selection or transfer.", {
           threadId: event.source.threadId
@@ -1226,6 +1227,8 @@ function createRouter(deps) {
     return runWithApprovalContext({ key, adapter, source: event.source }, () => runChatCommand(cmd, ctx));
   }
   async function deliver(adapter, event, text, key, cfg, opts) {
+    if (opts.valid && !opts.valid() || !canDeliverGatewayText(key, event.source, cfg, pairing))
+      return;
     let filtered = applySilenceFilter(text);
     if (filtered !== null) {
       if (opts.editMessageId) {
@@ -1249,9 +1252,11 @@ function createRouter(deps) {
     }
   }
   async function runTurn(adapter, event, key, cfg) {
-    let epoch = gatewayEpoch(key), streaming = cfg.streaming.enabled && typeof adapter.editMessage == "function", consumer;
+    let epoch = gatewayEpoch(key), streaming = cfg.streaming.enabled && typeof adapter.editMessage == "function", denied = !1, valid = () => (denied || (denied = !canDeliverGatewayText(key, event.source, cfg, pairing)), !denied), consumer;
     streaming && (consumer = new StreamConsumer({
       sendInitial: async (text) => {
+        if (!valid() || gatewayEpoch(key) !== epoch)
+          return null;
         let result2 = await adapter.send(event.source.chatId, text, {
           replyTo: event.messageId,
           threadId: event.source.threadId
@@ -1259,6 +1264,8 @@ function createRouter(deps) {
         return result2.success ? result2.messageId ?? null : null;
       },
       edit: async (messageId, text) => {
+        if (!valid() || gatewayEpoch(key) !== epoch)
+          return;
         let result2 = await adapter.editMessage(event.source.chatId, messageId, text);
         if (!result2.success)
           throw new Error(result2.error ?? "Preview edit failed");
@@ -1279,7 +1286,8 @@ function createRouter(deps) {
     result !== QUEUED && (consumer && await consumer.finalize(), await deliver(adapter, event, result, key, cfg, {
       reply: !consumer,
       editMessageId: consumer?.sentMessageId ?? void 0,
-      previewTruncated: consumer?.truncated ?? !1
+      previewTruncated: consumer?.truncated ?? !1,
+      valid
     }));
   }
   return {
@@ -1408,19 +1416,20 @@ async function runDaemon() {
   let router = createRouter({ adapters, cfg, pairing, bridge, reloadConfig: !0, remoteControls: !0 }), finish, stopped = new Promise((resolve) => {
     finish = resolve;
   }), stopping = !1, cron, platformStatus = {}, retries = /* @__PURE__ */ new Set(), shutdown = () => {
-    if (!stopping) {
-      stopping = !0, owner.update(platformStatus, "stopping"), cron?.stop();
-      for (let timer of retries)
-        clearTimeout(timer);
-      stopButtonSweeper(), (async () => {
-        await bridge.shutdown(), await Promise.all([...adapters.values()].map((adapter) => adapter.disconnect().catch(() => {
-        }))), stopGatewayPresenter(), owner.release(), process.removeListener("SIGINT", shutdown), process.removeListener("SIGTERM", shutdown), finish();
-      })().catch((error) => {
-        console.error("Gateway shutdown failed:", error instanceof Error ? error.message : String(error)), stopping = !1, owner.update(platformStatus, Object.values(platformStatus).includes("connected") ? "ready" : "starting"), startButtonSweeper(), cron = startGatewayCron({ adapters, cfg });
-        for (let [platform, adapter] of adapters)
-          platformStatus[platform] !== "connected" && connect(platform, adapter);
-      });
-    }
+    if (stopping)
+      return;
+    stopping = !0, owner.update(platformStatus, "stopping");
+    let cronStopped = cron?.stop();
+    for (let timer of retries)
+      clearTimeout(timer);
+    stopButtonSweeper(), (async () => {
+      await cronStopped, await bridge.shutdown(), await Promise.all([...adapters.values()].map((adapter) => adapter.disconnect().catch(() => {
+      }))), stopGatewayPresenter(), owner.release(), process.removeListener("SIGINT", shutdown), process.removeListener("SIGTERM", shutdown), finish();
+    })().catch((error) => {
+      console.error("Gateway shutdown failed:", error instanceof Error ? error.message : String(error)), stopping = !1, owner.update(platformStatus, Object.values(platformStatus).includes("connected") ? "ready" : "starting"), startButtonSweeper(), cron = startGatewayCron({ adapters, cfg });
+      for (let [platform, adapter] of adapters)
+        platformStatus[platform] !== "connected" && connect(platform, adapter);
+    });
   }, owner = claimGateway(shutdown);
   process.on("SIGINT", shutdown), process.on("SIGTERM", shutdown), startGatewayPresenter(adapters), startButtonSweeper();
   let connect = async (platform, adapter) => {

package/dist/node-runtime/{gemini-search-35OCRFLN.js → gemini-search-C66QHDT6.js}

@@ -8,10 +8,10 @@ import {
   loadParallel,
   loadPerplexity,
   loadTavily
-} from "./chunk-NAY6UUQZ.js";
+} from "./chunk-WDIVLMOH.js";
 import {
   activityMonitor
-} from "./chunk-DAPBPCBP.js";
+} from "./chunk-IPP5BIV5.js";
 import {
   getWebSearchConfigPath
 } from "./chunk-VRB2IYGG.js";

package/dist/node-runtime/{gemini-url-context-UQY3PHHW.js → gemini-url-context-T7DEK73R.js}

@@ -14,11 +14,11 @@ import {
 } from "./chunk-3WFAEVKS.js";
 import {
   extractHeadingTitle
-} from "./chunk-UQUCFAJ3.js";
-import "./chunk-NAY6UUQZ.js";
+} from "./chunk-2VIW3IMF.js";
+import "./chunk-WDIVLMOH.js";
 import {
   activityMonitor
-} from "./chunk-DAPBPCBP.js";
+} from "./chunk-IPP5BIV5.js";
 import "./chunk-VRB2IYGG.js";
 import "./chunk-BRJX2PRC.js";
 

package/dist/node-runtime/{github-extract-F64RZOEA.js → github-extract-HOGE3D6F.js}

@@ -1,10 +1,10 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
-  registerSessionCleanup
-} from "./chunk-AUXVGBO4.js";
+  getWebSession
+} from "./chunk-YD3IZAZ7.js";
 import {
   activityMonitor
-} from "./chunk-DAPBPCBP.js";
+} from "./chunk-IPP5BIV5.js";
 import {
   getWebSearchConfigPath
 } from "./chunk-VRB2IYGG.js";
@@ -217,7 +217,47 @@ var CONFIG_PATH = getWebSearchConfigPath(), BINARY_EXTENSIONS = /* @__PURE__ */
   ".gradle",
   ".idea",
   ".vscode"
-]), MAX_INLINE_FILE_CHARS2 = 1e5, MAX_TREE_ENTRIES2 = 200, cloneCache = /* @__PURE__ */ new Map(), cachedConfig = null;
+]), MAX_INLINE_FILE_CHARS2 = 1e5, MAX_TREE_ENTRIES2 = 200, CLONE_TERMINATION_GRACE_MS = 1e3, CLONE_EXIT_CONFIRMATION_MS = 1e3, cloneCache = /* @__PURE__ */ new Map(), standaloneOwner = /* @__PURE__ */ Symbol("standalone clone caller");
+function removeClone(key, entry) {
+  if (cloneCache.get(key) === entry) {
+    try {
+      rmSync(entry.localPath, { recursive: !0, force: !0 });
+    } catch {
+    }
+    cloneCache.delete(key), cloneCache.size === 0 && (cachedConfig = null);
+  }
+}
+async function finishClone(key, entry) {
+  let deadline;
+  try {
+    await Promise.race([
+      entry.clonePromise.catch(() => {
+      }),
+      new Promise((_resolve, reject) => {
+        deadline = setTimeout(() => reject(new Error("GitHub clone cleanup could not confirm command completion after termination; clone retained until completion")), CLONE_TERMINATION_GRACE_MS + CLONE_EXIT_CONFIRMATION_MS);
+      })
+    ]);
+  } catch (error) {
+    throw entry.clonePromise.catch(() => {
+    }).then(() => removeClone(key, entry)), error;
+  } finally {
+    clearTimeout(deadline);
+  }
+  removeClone(key, entry);
+}
+function acquireClone(key, entry) {
+  let owner = getWebSession() ?? standaloneOwner;
+  if (typeof owner != "symbol" && owner.closed)
+    throw new Error("Web session closed");
+  entry.owners.has(owner) || (entry.owners.add(owner), typeof owner != "symbol" && owner.cleanups.add(async () => {
+    entry.owners.delete(owner), !(entry.owners.size > 0) && (entry.controller.abort(), entry.cleanup = finishClone(key, entry), await entry.cleanup);
+  }));
+}
+async function findClone(key) {
+  let entry = cloneCache.get(key);
+  return entry?.cleanup ? (await entry.cleanup, findClone(key)) : (entry && !getWebSession()?.closed && acquireClone(key, entry), entry);
+}
+var cachedConfig = null;
 function normalizeEnabled(value, fallback) {
   return typeof value == "boolean" ? value : fallback;
 }
@@ -332,22 +372,36 @@ function cloneDir(config, owner, repo, ref) {
   return join(config.clonePath, owner, dirName);
 }
 function execClone(args, localPath, timeoutMs, signal) {
-  return new Promise((resolve) => {
-    let child = execFile2(args[0], args.slice(1), { timeout: timeoutMs }, (err) => {
-      if (err) {
+  return signal?.aborted ? Promise.resolve(null) : new Promise((resolve) => {
+    let failed = !1, exited = !1, closed = !1, stopping = !1, escalation, child = execFile2(args[0], args.slice(1), {}, (err) => {
+      failed = !!err;
+    }), stop = () => {
+      if (!(stopping || closed)) {
+        stopping = !0, escalation = setTimeout(() => {
+          try {
+            child.kill("SIGKILL");
+          } catch {
+          }
+        }, CLONE_TERMINATION_GRACE_MS);
         try {
-          rmSync(localPath, { recursive: !0, force: !0 });
+          child.kill("SIGTERM");
         } catch {
         }
-        resolve(null);
-        return;
       }
-      resolve(localPath);
-    });
-    if (signal) {
-      let onAbort = () => child.kill();
-      signal.addEventListener("abort", onAbort, { once: !0 }), child.on("exit", () => signal.removeEventListener("abort", onAbort));
-    }
+    }, timeout = setTimeout(stop, timeoutMs);
+    child.once("exit", () => {
+      exited = !0;
+    }), child.once("close", () => {
+      if (!(child.pid && !exited))
+        if (closed = !0, clearTimeout(timeout), clearTimeout(escalation), signal?.removeEventListener("abort", stop), failed || stopping) {
+          try {
+            rmSync(localPath, { recursive: !0, force: !0 });
+          } catch {
+          }
+          resolve(null);
+        } else
+          resolve(localPath);
+    }), signal?.addEventListener("abort", stop, { once: !0 });
   });
 }
 async function cloneRepo(owner, repo, ref, config, signal) {
@@ -356,8 +410,10 @@ async function cloneRepo(owner, repo, ref, config, signal) {
     rmSync(localPath, { recursive: !0, force: !0 });
   } catch {
   }
-  let timeoutMs = config.cloneTimeoutSeconds * 1e3;
-  if (await checkGhAvailable()) {
+  let timeoutMs = config.cloneTimeoutSeconds * 1e3, hasGh = await checkGhAvailable();
+  if (signal?.aborted)
+    return null;
+  if (hasGh) {
     let args2 = ["gh", "repo", "clone", `${owner}/${repo}`, localPath, "--", "--depth", "1", "--single-branch"];
     return ref && args2.push("--branch", ref), execClone(args2, localPath, timeoutMs, signal);
   }
@@ -542,11 +598,26 @@ function generateContent(localPath, info) {
   return lines.join(`
 `);
 }
+async function waitForClone(clone, signal) {
+  if (!signal)
+    return clone;
+  if (signal.aborted)
+    return null;
+  let onAbort = () => {
+  }, cancelled = new Promise((resolve) => {
+    onAbort = () => resolve(null), signal.addEventListener("abort", onAbort, { once: !0 });
+  });
+  try {
+    return await Promise.race([clone, cancelled]);
+  } finally {
+    signal.removeEventListener("abort", onAbort);
+  }
+}
 async function awaitCachedClone(cached, url, owner, repo, info, signal) {
   if (signal?.aborted)
     return null;
-  let result = await cached.clonePromise;
-  if (signal?.aborted)
+  let result = await waitForClone(cached.clonePromise, signal);
+  if (signal?.aborted || getWebSession()?.closed)
     return null;
   if (result) {
     let content = generateContent(result, info), title = info.path ? `${owner}/${repo} - ${info.path}` : `${owner}/${repo}`;
@@ -561,7 +632,9 @@ async function extractGitHub(url, signal, forceClone) {
   let config = loadGitHubConfig();
   if (!config.enabled)
     return null;
-  let { owner, repo } = info, key = cacheKey(owner, repo, info.ref), cached = cloneCache.get(key);
+  let { owner, repo } = info, key = cacheKey(owner, repo, info.ref), cached = await findClone(key);
+  if (signal?.aborted || getWebSession()?.closed)
+    return null;
   if (cached)
     return awaitCachedClone(cached, url, owner, repo, info, signal);
   if (info.refIsFullSha)
@@ -583,18 +656,24 @@ async function extractGitHub(url, signal, forceClone) {
   }
   if (signal?.aborted)
     return activityMonitor.logComplete(activityId, 0), null;
-  let cachedAfterSizeCheck = cloneCache.get(key);
+  let cachedAfterSizeCheck = await findClone(key);
+  for (; !cachedAfterSizeCheck && cloneCache.has(key); )
+    cachedAfterSizeCheck = await findClone(key);
+  if (signal?.aborted || getWebSession()?.closed)
+    return null;
   if (cachedAfterSizeCheck) {
     let cachedResult = await awaitCachedClone(cachedAfterSizeCheck, url, owner, repo, info, signal);
     return signal?.aborted ? activityMonitor.logComplete(activityId, 0) : cachedResult ? activityMonitor.logComplete(activityId, 200) : activityMonitor.logError(activityId, "clone failed"), cachedResult;
   }
-  let clonePromise = cloneRepo(owner, repo, info.ref, config, signal), localPath = cloneDir(config, owner, repo, info.ref);
-  cloneCache.set(key, { localPath, clonePromise });
-  let result = await clonePromise;
-  if (signal?.aborted)
-    return result || cloneCache.delete(key), activityMonitor.logComplete(activityId, 0), null;
+  if (signal?.aborted || getWebSession()?.closed)
+    return null;
+  let controller = new AbortController(), clonePromise = cloneRepo(owner, repo, info.ref, config, controller.signal), entry = { localPath: cloneDir(config, owner, repo, info.ref), clonePromise, controller, owners: /* @__PURE__ */ new Set() };
+  cloneCache.set(key, entry), acquireClone(key, entry);
+  let result = await waitForClone(clonePromise, signal);
+  if (signal?.aborted || getWebSession()?.closed)
+    return activityMonitor.logComplete(activityId, 0), null;
   if (!result) {
-    if (cloneCache.delete(key), signal?.aborted)
+    if (cloneCache.get(key) === entry && cloneCache.delete(key), signal?.aborted)
       return activityMonitor.logComplete(activityId, 0), null;
     let apiFallback = await fetchViaApi(url, owner, repo, info);
     return apiFallback ? (activityMonitor.logComplete(activityId, 200), apiFallback) : (activityMonitor.logError(activityId, "clone and API fallback failed"), null);
@@ -603,17 +682,7 @@ async function extractGitHub(url, signal, forceClone) {
   let content = generateContent(result, info), title = info.path ? `${owner}/${repo} - ${info.path}` : `${owner}/${repo}`;
   return { url, title, content, error: null };
 }
-function clearCloneCache() {
-  for (let entry of cloneCache.values())
-    try {
-      rmSync(entry.localPath, { recursive: !0, force: !0 });
-    } catch {
-    }
-  cloneCache.clear(), cachedConfig = null;
-}
-registerSessionCleanup(clearCloneCache);
 export {
-  clearCloneCache,
   extractGitHub,
   parseGitHubUrl
 };

package/dist/node-runtime/{goal-NJEE5CTU.js → goal-J7TYMOBK.js}

@@ -7,9 +7,15 @@ import {
   leaveGoalAuto
 } from "./chunk-7N3YHTYF.js";
 import "./chunk-OR4L3IB2.js";
+import {
+  collectChildUsage,
+  collectUsageRequests,
+  totalChildUsage,
+  totalRequestUsage
+} from "./chunk-SWWHZ2RI.js";
 import {
   getAgentDir
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 
@@ -24,7 +30,7 @@ function checkpointGoalActiveTime(goal2, now, continueClock) {
 }
 function updateGoalUsage(goal2, ctx, continueClock = goal2.status === "active") {
   let now = Date.now(), baselineTokens = nonNegativeFiniteNumber(goal2.baselineTokens);
-  goal2.baselineTokens = baselineTokens, goal2.tokensUsed = Math.max(0, currentTokenTotal(ctx) - baselineTokens), checkpointGoalActiveTime(goal2, now, continueClock), goal2.updatedAt = now;
+  goal2.baselineTokens = baselineTokens, goal2.tokensUsed = Math.max(nonNegativeFiniteNumber(goal2.tokensUsed), currentTokenTotal(ctx) - baselineTokens), checkpointGoalActiveTime(goal2, now, continueClock), goal2.updatedAt = now;
 }
 function formatDuration(seconds) {
   let wholeSeconds = Math.max(0, Math.floor(nonNegativeFiniteNumber(seconds)));
@@ -63,8 +69,8 @@ function cumulativeAssistantTokens(entries) {
   return total;
 }
 function currentTokenTotal(ctx) {
-  let sessionManager = ctx.sessionManager;
-  return cumulativeAssistantTokens(sessionManager?.getBranch?.() ?? []);
+  let sessionManager = ctx.sessionManager, entries = sessionManager?.getEntries?.() ?? sessionManager?.getBranch?.() ?? [];
+  return totalRequestUsage(collectUsageRequests(entries)).total + totalChildUsage(collectChildUsage(entries)).total;
 }
 
 // packages/coding-agent/dist/builtin-extensions/narumiruna-pi-goal/src/command.js
@@ -774,7 +780,7 @@ var STATUS_KEY = "goal", GOAL_STATE_ENTRY_TYPE2 = "goal-state", GOAL_COMPLETE_TO
   prepareGoalToolsForActivation(ctx) {
     if (this.settings.toolVisibility === "after-first-goal") {
       if (!this.goalToolsAvailable() && ctx.isIdle?.() !== !0)
-        throw new Error("wait until Pi is idle before revealing the goal tools");
+        throw new Error("wait until lunR is idle before revealing the goal tools");
       this.revealGoalTools();
       return;
     }
@@ -1151,7 +1157,7 @@ New goal: ${objective}`)) {
       return;
     }
     if (this.runtime.cancelContinuationWork(), this.runtime.pendingQueueAction = { kind: "prioritize", objective, tokenBudget }, this.runtime.persistGoal(this.runtime.activeGoal), ctx.isIdle?.() !== !0 || hasPendingMessages(ctx)) {
-      ctx.ui.notify(`Priority goal queued until Pi settles: ${objective}`, "info");
+      ctx.ui.notify(`Priority goal queued until lunR settles: ${objective}`, "info");
       return;
     }
     await this.dispatchPendingQueueActionIfSettled(ctx);
@@ -1184,7 +1190,7 @@ New goal: ${objective}`)) {
       goalId: currentGoal.id,
       reason: "skip",
       completedText: currentGoal.text
-    }, this.runtime.persistGoal(currentGoal), ctx.ui.notify(`Goal skip queued until Pi settles: ${currentGoal.text}`, "info"), ctx.isIdle?.() === !0 && !hasPendingMessages(ctx) && await this.dispatchPendingQueueActionIfSettled(ctx);
+    }, this.runtime.persistGoal(currentGoal), ctx.ui.notify(`Goal skip queued until lunR settles: ${currentGoal.text}`, "info"), ctx.isIdle?.() === !0 && !hasPendingMessages(ctx) && await this.dispatchPendingQueueActionIfSettled(ctx);
   }
   async dispatchPendingQueueActionIfSettled(ctx) {
     let pending = this.runtime.pendingQueueAction;
@@ -1544,7 +1550,7 @@ Next goal queued: ${runtime.queuedGoals[0]?.text}`
         return;
       }
       if (runtime.pendingQueueAction && result.kind !== "show" && result.kind !== "clear") {
-        ctx.ui.notify("A queued goal change is waiting for Pi to settle. Retry after it finishes.", "warning");
+        ctx.ui.notify("A queued goal change is waiting for lunR to settle. Retry after it finishes.", "warning");
         return;
       }
       switch (result.kind) {