@ashx-j/lunr 0.2.25 → 0.2.27

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-AIHEDUYA.js}

@@ -9,7 +9,7 @@ import {
 import "./chunk-OR4L3IB2.js";
 import {
   getAgentDir
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 
@@ -774,7 +774,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 +1151,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 +1184,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 +1544,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) {

package/dist/node-runtime/index.js

@@ -19,34 +19,34 @@ import {
   TreeSelectorComponent,
   UserMessageComponent,
   UserMessageSelectorComponent
-} from "./chunk-RC7DMV45.js";
+} from "./chunk-AYHH7YSD.js";
 import {
   attachJsonlLineReader,
   runRpcMode,
   serializeJsonLine
-} from "./chunk-IF24A3FH.js";
+} from "./chunk-EVM653DD.js";
 import {
   runPrintMode
-} from "./chunk-OCVIXVTZ.js";
-import "./chunk-KWA4OC2J.js";
+} from "./chunk-UBWW2PID.js";
+import "./chunk-H6YBCWKG.js";
+import "./chunk-U5F4IC7R.js";
 import "./chunk-US544NN6.js";
-import "./chunk-CDVHZOOK.js";
+import "./chunk-JQYNHAKX.js";
 import {
   copyToClipboard
 } from "./chunk-Q5ZU2VRT.js";
 import "./chunk-NUIFPZWX.js";
-import "./chunk-RWTKOC3B.js";
+import "./chunk-QBTJG3UM.js";
 import "./chunk-7N3YHTYF.js";
 import {
   main
-} from "./chunk-IJIFHRTB.js";
-import "./chunk-WF7PGWRZ.js";
-import "./chunk-7S3T6YEA.js";
-import "./chunk-2HHLJWGD.js";
+} from "./chunk-MQPKUHRN.js";
+import "./chunk-R4WSB2MQ.js";
+import "./chunk-JWEVT363.js";
+import "./chunk-IHHTWSXN.js";
 import "./chunk-YPHAIRZT.js";
 import "./chunk-PL6JKXWI.js";
 import "./chunk-5ZH3ZFIZ.js";
-import "./chunk-OVX6X377.js";
 import {
   AgentSession,
   AgentSessionRuntime,
@@ -58,8 +58,7 @@ import {
   parseSkillBlock,
   wrapRegisteredTool,
   wrapRegisteredTools
-} from "./chunk-VQFSUJJG.js";
-import "./chunk-CCCN2UCX.js";
+} from "./chunk-ZDJUR45D.js";
 import {
   DefaultResourceLoader,
   createEventBus,
@@ -70,16 +69,17 @@ import {
   loadProjectContextFiles,
   loadSkills,
   loadSkillsFromDir
-} from "./chunk-YCUZEGJG.js";
+} from "./chunk-DQSCFU7R.js";
+import "./chunk-CCCN2UCX.js";
 import {
   DefaultPackageManager
-} from "./chunk-LQP3RB67.js";
+} from "./chunk-UYRKUKFE.js";
 import "./chunk-OBMWP3I5.js";
 import "./chunk-DVGWF6A2.js";
 import {
   parseFrontmatter,
   stripFrontmatter
-} from "./chunk-QFWG2RVL.js";
+} from "./chunk-IXG6F4NT.js";
 import {
   createBashTool,
   createBashToolDefinition,
@@ -101,9 +101,12 @@ import {
   generateDiffString,
   generateUnifiedPatch,
   renderDiff,
-  truncateToVisualLines,
+  truncateToVisualLines
+} from "./chunk-ZEVFBFNF.js";
+import {
   withFileMutationQueue
-} from "./chunk-YDO2F2IA.js";
+} from "./chunk-YSB6URMT.js";
+import "./chunk-6ZZHGUSA.js";
 import {
   DEFAULT_MAX_BYTES,
   DEFAULT_MAX_LINES,
@@ -112,27 +115,28 @@ import {
   truncateLine,
   truncateTail
 } from "./chunk-53YJI7JU.js";
-import "./chunk-5ZQXRPMC.js";
 import {
-  convertToPng,
+  convertToPng
+} from "./chunk-IAZSK7KK.js";
+import {
   formatDimensionNote,
   resizeImage
-} from "./chunk-AD6VXAO7.js";
+} from "./chunk-TCT6PCUR.js";
 import {
   AuthStorage,
   ModelRuntime,
   readStoredCredential
-} from "./chunk-KJ6DWS3K.js";
-import "./chunk-NRKGMJYU.js";
+} from "./chunk-XEOCUEUJ.js";
+import "./chunk-6O3IW3IA.js";
 import {
   SettingsManager
-} from "./chunk-6XL67VVY.js";
-import "./chunk-UOEDI7RP.js";
-import "./chunk-2HMIRK7W.js";
+} from "./chunk-HUD2RFJW.js";
+import "./chunk-4KNKQGHM.js";
+import "./chunk-LHV3V67B.js";
 import {
   ProjectTrustStore,
   hasTrustRequiringProjectResources
-} from "./chunk-HTFRRDSF.js";
+} from "./chunk-F2SMQ6ES.js";
 import "./chunk-URD2SLIT.js";
 import {
   DEFAULT_COMPACTION_SETTINGS,
@@ -150,18 +154,20 @@ import {
   resolveModelScopeWithDiagnostics,
   serializeConversation,
   shouldCompact
-} from "./chunk-GYIXXQAO.js";
+} from "./chunk-FIRA54AC.js";
 import {
   ExtensionRunner
-} from "./chunk-GJ2RDBRL.js";
+} from "./chunk-BYC6RKCN.js";
 import "./chunk-CGBXPL3E.js";
 import "./chunk-BBUVIEZB.js";
-import "./chunk-ZXSGTGJ6.js";
-import "./chunk-M3LZLQW2.js";
-import "./chunk-KKUTQQV7.js";
+import "./chunk-APVM5NEU.js";
+import "./chunk-F2V2F4ZG.js";
+import "./chunk-BDRGN3L2.js";
+import "./chunk-FY4A63RK.js";
+import "./chunk-RYRGL7P4.js";
 import {
   getShellConfig
-} from "./chunk-CSFI6YXL.js";
+} from "./chunk-ES6PBSIE.js";
 import {
   HANDOFF_DURATION_MS,
   SessionTransferError,
@@ -173,7 +179,7 @@ import {
   recordTuiActivity,
   registerTransferHandler,
   requestSessionTransfer
-} from "./chunk-I54LGHWM.js";
+} from "./chunk-I2H5QMWW.js";
 import {
   CURRENT_SESSION_VERSION,
   SessionManager,
@@ -183,27 +189,27 @@ import {
   migrateSessionEntries,
   parseSessionEntries,
   sessionEntryToContextMessages
-} from "./chunk-2KIPT4HJ.js";
+} from "./chunk-EPR2F3GU.js";
 import {
   convertToLlm
 } from "./chunk-FVDOXRUD.js";
 import "./chunk-4EULYYR4.js";
 import "./chunk-UJOCPOMX.js";
 import "./chunk-2TKODGBZ.js";
-import "./chunk-2MI5OPMN.js";
+import "./chunk-HNNHHJAB.js";
 import "./chunk-IMLCWLPI.js";
 import {
   SessionSelectorComponent
-} from "./chunk-PCEW76PM.js";
+} from "./chunk-2OIPYKLZ.js";
 import {
   SessionOwnershipError
-} from "./chunk-UAEOTO52.js";
+} from "./chunk-MNQXDFPV.js";
 import "./chunk-RQ2Q5IYR.js";
-import "./chunk-MPKSOJBT.js";
+import "./chunk-NHATCSOI.js";
 import {
   CustomEditor
 } from "./chunk-H2EOZYMP.js";
-import "./chunk-5EFIU3OM.js";
+import "./chunk-FTKEZL27.js";
 import "./chunk-PVCDKGR6.js";
 import {
   defineTool,
@@ -216,26 +222,26 @@ import {
   isToolCallEventType,
   isWriteToolResult
 } from "./chunk-OR4L3IB2.js";
-import "./chunk-B4HP6ZWM.js";
+import "./chunk-RHCGYWO7.js";
 import {
   parseArgs
-} from "./chunk-E24EO34J.js";
+} from "./chunk-WPXUR3HE.js";
 import "./chunk-CCZJ3PYY.js";
 import {
   ExtensionSelectorComponent
-} from "./chunk-QH6YL7VK.js";
+} from "./chunk-252ZVPPF.js";
 import {
   ExtensionInputComponent
-} from "./chunk-HMBGROQK.js";
+} from "./chunk-GLDXBBL6.js";
 import "./chunk-I6R76AG7.js";
 import {
   DynamicBorder
-} from "./chunk-6VYZ5UFP.js";
+} from "./chunk-FLGEEH27.js";
 import {
   keyHint,
   keyText,
   rawKeyHint
-} from "./chunk-GS42T6MX.js";
+} from "./chunk-QW3AAHWN.js";
 import {
   Theme,
   getAvailableThemes,
@@ -245,7 +251,7 @@ import {
   getSettingsListTheme,
   highlightCode,
   initTheme
-} from "./chunk-RDDAZOMU.js";
+} from "./chunk-JL4HYQXK.js";
 import {
   CONFIG_DIR_NAME,
   VERSION,
@@ -254,7 +260,7 @@ import {
   getExamplesPath,
   getPackageDir,
   getReadmePath
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 

package/dist/node-runtime/{init-HS6NQXSK.js → init-JBQJIPYI.js}

@@ -8,10 +8,9 @@ import {
   updateMetadataCache,
   updateServerMetadata,
   updateStatusBar
-} from "./chunk-DSIKTUPW.js";
-import "./chunk-4TLO4PO2.js";
-import "./chunk-LWYIVUGV.js";
-import "./chunk-4HXHDDCF.js";
+} from "./chunk-EBLAZVSA.js";
+import "./chunk-VSUEAI7O.js";
+import "./chunk-B2IBAXNX.js";
 import "./chunk-ARC4KOTI.js";
 import "./chunk-BI3DHYCN.js";
 import "./chunk-Q4Q6D4IY.js";

package/dist/node-runtime/{install-cli-KL4UDDAD.js → install-cli-INGHIVBY.js}

@@ -12,21 +12,21 @@ import {
   loadInstallFeatures,
   parseFeatureFlags,
   saveInstallFeatures
-} from "./chunk-2HMIRK7W.js";
+} from "./chunk-LHV3V67B.js";
 import {
   loadGatewayConfig
-} from "./chunk-B4HP6ZWM.js";
+} from "./chunk-RHCGYWO7.js";
 import {
   APP_NAME,
   NPM_CLI_PACKAGE,
   VERSION,
   getAgentDir
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 
 // packages/coding-agent/dist/cli/install-cli.js
-import { existsSync as existsSync2, rmSync } from "node:fs";
+import { existsSync as existsSync2, rmdirSync, rmSync } from "node:fs";
 import { join as join2 } from "node:path";
 import { createInterface } from "node:readline";
 
@@ -114,27 +114,31 @@ async function runSetup(argv) {
     return console.error(parsed.error), printSetupHelp(), 2;
   if (!parsed.yes && !process.stdin.isTTY)
     return console.error("non-interactive setup requires --yes"), printSetupHelp(), 2;
-  let current = loadInstallFeatures(), next = current;
-  if (parsed.yes) {
-    let applied = applyFeatureFlags(current, parsed);
-    if (!applied.ok)
-      return console.error(applied.error), applied.exitCode;
-    next = applied.next;
-    for (let id of applied.enabledIds) {
-      let prev = current.features[id], state = next.features[id];
-      state && await FEATURE_HANDLERS[id].apply({
-        previous: prev,
+  let current = loadInstallFeatures(), applied = applyFeatureFlags(current, parsed);
+  if (!applied.ok)
+    return console.error(applied.error), applied.exitCode;
+  let explicitFeatures = parsed.features.length > 0 || parsed.noFeatures.length > 0 || parsed.sets.length > 0, { installBrowser } = await import("./setup-H7CCELIL.js");
+  await installBrowser(!1);
+  let next = applied.next;
+  if (!parsed.yes && !explicitFeatures)
+    await (await import("./setup-OLQ4GXWS.js")).setupGateway(), next = loadInstallFeatures();
+  else {
+    let enabled = /* @__PURE__ */ new Set([...applied.enabledIds, ...parsed.sets.map((set) => getFeatureSpec(set.id)?.id)]);
+    for (let id of enabled) {
+      if (!id)
+        continue;
+      let state = next.features[id];
+      state && (parsed.yes || await collectSecretsForFeature(id, applied.secrets), await FEATURE_HANDLERS[id].apply({
+        previous: current.features[id],
         next: state,
         secrets: applied.secrets,
-        nonInteractive: !0
-      });
+        nonInteractive: parsed.yes
+      }));
     }
     for (let id of applied.disabledIds)
       await FEATURE_HANDLERS[id].disable({ purgeSecrets: !1 });
-  } else
-    return await (await import("./setup-CQ2NLVK5.js")).setupGateway(), 0;
-  let { installBrowser } = await import("./setup-JBKOLJ6F.js");
-  return await installBrowser(!1), saveInstallFeatures(next), appendInstallLog(`setup installerVersion=${VERSION}`), console.log(`Writing ${getAgentDir()}/install-features.json`), console.log(`
+  }
+  return saveInstallFeatures(next), appendInstallLog(`setup installerVersion=${VERSION}`), console.log(`Writing ${getAgentDir()}/install-features.json`), console.log(`
 Next:`), console.log(`  1. Restart this shell (or add ${resolveInstallPrefix()}/bin to PATH)`), console.log(`  2. Run:  ${APP_NAME}`), console.log("  3. In the TUI:  /login"), 0;
 }
 async function runFeatures(argv) {
@@ -205,10 +209,10 @@ async function runProductUninstall(argv) {
         return console.error("non-interactive --purge requires --yes"), 2;
       if (!yes && !await askYesNo(`Also delete ${agentDir}? This cannot be undone.`, !1))
         return console.log("aborted"), 1;
-      existsSync2(agentDir) && rmSync(agentDir, { recursive: !0, force: !0 }), console.log(`purged ${agentDir}`);
+      await (await import("./service-IHLGFLBT.js")).teardownGatewayService(), existsSync2(agentDir) && rmSync(agentDir, { recursive: !0, force: !0 }), console.log(`purged ${agentDir}`);
     } else
       console.log(`sessions, auth, and gateway config kept in ${agentDir}`), console.log("Add --purge to delete that directory.");
-    return appendInstallLog(`uninstall npm purge=${purge}`), 0;
+    return purge || appendInstallLog("uninstall npm purge=false"), 0;
   }
   let prefix = resolveInstallPrefix();
   if (purge && !yes) {
@@ -217,17 +221,18 @@ async function runProductUninstall(argv) {
     if (!await askYesNo(`Delete ${prefix} and ${agentDir}? This cannot be undone.`, !1))
       return console.log("aborted"), 1;
   }
+  await (await import("./service-IHLGFLBT.js")).teardownGatewayService();
   let versions = join2(prefix, "versions"), bin = join2(prefix, "bin");
   if (existsSync2(versions) && rmSync(versions, { recursive: !0, force: !0 }), existsSync2(bin) && rmSync(bin, { recursive: !0, force: !0 }), console.log(`removed ${versions} and ${bin}`), purge) {
     if (existsSync2(agentDir) && rmSync(agentDir, { recursive: !0, force: !0 }), existsSync2(prefix))
       try {
-        rmSync(prefix, { recursive: !0, force: !0 });
+        rmdirSync(prefix);
       } catch {
       }
     console.log(`purged ${agentDir}`);
   } else
     console.log(`sessions, auth, and gateway config kept in ${agentDir}`);
-  return console.log("Remove the PATH line from your shell profile if you added one."), appendInstallLog(`uninstall purge=${purge}`), 0;
+  return console.log("Remove the PATH line from your shell profile if you added one."), purge || appendInstallLog("uninstall purge=false"), 0;
 }
 async function handleInstallCli(args) {
   let [verb, ...rest] = args;
@@ -235,7 +240,7 @@ async function handleInstallCli(args) {
     if (rest.length !== 1 || rest[0] !== "install")
       console.error("Usage: lunr browser install. Browser on/off is in /settings."), process.exitCode = 2;
     else {
-      let { installBrowser } = await import("./setup-JBKOLJ6F.js");
+      let { installBrowser } = await import("./setup-H7CCELIL.js");
       await installBrowser();
     }
     return !0;