@usepowerplant/cli 0.4.12 → 0.4.14

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7d73a97a-938c-5f0f-8b6b-c4076b82abad")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="81d65aee-a279-58bd-9476-cc1269e40adf")}catch(e){}}();
 const __cliNodeMajor = Number(process.versions.node.split('.')[0]);
 if (__cliNodeMajor < 20) {
   console.error(`powerplant needs Node 20 or newer — this is Node ${process.versions.node}.`);
@@ -6879,19 +6879,19 @@ var require_module_details_from_path = __commonJS({
           basedir += segments[i] + sep2;
         }
       }
-      var path32 = "";
+      var path33 = "";
       var lastSegmentIndex = segments.length - 1;
       for (var i2 = index + offset; i2 <= lastSegmentIndex; i2++) {
         if (i2 === lastSegmentIndex) {
-          path32 += segments[i2];
+          path33 += segments[i2];
         } else {
-          path32 += segments[i2] + sep2;
+          path33 += segments[i2] + sep2;
         }
       }
       return {
         name,
         basedir,
-        path: path32
+        path: path33
       };
     };
   }
@@ -6901,7 +6901,7 @@ var require_module_details_from_path = __commonJS({
 var require_require_in_the_middle = __commonJS({
   "../../node_modules/.pnpm/require-in-the-middle@8.0.1/node_modules/require-in-the-middle/index.js"(exports, module2) {
     "use strict";
-    var path32 = __require("path");
+    var path33 = __require("path");
     var Module = __require("module");
     var debug2 = require_src3()("require-in-the-middle");
     var moduleDetailsFromPath = require_module_details_from_path();
@@ -7046,7 +7046,7 @@ var require_require_in_the_middle = __commonJS({
           }
           moduleName = filename;
         } else if (hasWhitelist === true && modules.includes(filename)) {
-          const parsedPath = path32.parse(filename);
+          const parsedPath = path33.parse(filename);
           moduleName = parsedPath.name;
           basedir = parsedPath.dir;
         } else {
@@ -7084,7 +7084,7 @@ var require_require_in_the_middle = __commonJS({
             }
             if (res !== filename) {
               if (internals === true) {
-                moduleName = moduleName + path32.sep + path32.relative(basedir, filename);
+                moduleName = moduleName + path33.sep + path33.relative(basedir, filename);
                 debug2("preparing to process require of internal file: %s", moduleName);
               } else {
                 debug2("ignoring require of non-main module file: %s", res);
@@ -7120,8 +7120,8 @@ var require_require_in_the_middle = __commonJS({
       }
     };
     function resolveModuleName(stat) {
-      const normalizedPath = path32.sep !== "/" ? stat.path.split(path32.sep).join("/") : stat.path;
-      return path32.posix.join(stat.name, normalizedPath).replace(normalize3, "");
+      const normalizedPath = path33.sep !== "/" ? stat.path.split(path33.sep).join("/") : stat.path;
+      return path33.posix.join(stat.name, normalizedPath).replace(normalize3, "");
     }
   }
 });
@@ -7206,7 +7206,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.RequireInTheMiddleSingleton = void 0;
     var require_in_the_middle_1 = require_require_in_the_middle();
-    var path32 = __require("path");
+    var path33 = __require("path");
     var ModuleNameTrie_1 = require_ModuleNameTrie();
     var isMocha = [
       "afterEach",
@@ -7270,7 +7270,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
     };
     exports.RequireInTheMiddleSingleton = RequireInTheMiddleSingleton;
     function normalizePathSeparators(moduleNameOrPath) {
-      return path32.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path32.sep).join(ModuleNameTrie_1.ModuleNameSeparator) : moduleNameOrPath;
+      return path33.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path33.sep).join(ModuleNameTrie_1.ModuleNameSeparator) : moduleNameOrPath;
     }
   }
 });
@@ -7480,7 +7480,7 @@ var require_register = __commonJS({
 // ../../node_modules/.pnpm/import-in-the-middle@3.5.1/node_modules/import-in-the-middle/index.js
 var require_import_in_the_middle = __commonJS({
   "../../node_modules/.pnpm/import-in-the-middle@3.5.1/node_modules/import-in-the-middle/index.js"(exports, module2) {
-    var path32 = __require("path");
+    var path33 = __require("path");
     var moduleDetailsFromPath = require_module_details_from_path();
     var { fileURLToPath: fileURLToPath3 } = __require("url");
     var { MessageChannel } = __require("worker_threads");
@@ -7599,7 +7599,7 @@ var require_import_in_the_middle = __commonJS({
               } else if (baseDir.endsWith(specifiers.get(loadUrl)) || isTurbopackSpecifier(specifiers.get(loadUrl), baseDir)) {
                 callHookFn(hookFn, namespace, name, baseDir);
               } else if (internals) {
-                const internalPath = name + path32.sep + path32.relative(baseDir, filePath);
+                const internalPath = name + path33.sep + path33.relative(baseDir, filePath);
                 callHookFn(hookFn, namespace, internalPath, baseDir);
               }
             } else if (matchArg === specifier) {
@@ -7674,7 +7674,7 @@ var require_instrumentation2 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.InstrumentationBase = void 0;
-    var path32 = __require("path");
+    var path33 = __require("path");
     var util_1 = __require("util");
     var semver_1 = require_semver();
     var shimmer_1 = require_shimmer();
@@ -7775,7 +7775,7 @@ var require_instrumentation2 = __commonJS({
       }
       _extractPackageVersion(baseDir) {
         try {
-          const json2 = (0, fs_1.readFileSync)(path32.join(baseDir, "package.json"), {
+          const json2 = (0, fs_1.readFileSync)(path33.join(baseDir, "package.json"), {
             encoding: "utf8"
           });
           const version2 = JSON.parse(json2).version;
@@ -7817,7 +7817,7 @@ var require_instrumentation2 = __commonJS({
           return exports2;
         }
         const files = module3.files ?? [];
-        const normalizedName = path32.normalize(name);
+        const normalizedName = path33.normalize(name);
         const supportedFileInstrumentations = files.filter((f) => f.name === normalizedName && isSupported(f.supportedVersions, version2, module3.includePrerelease));
         return supportedFileInstrumentations.reduce((patchedExports, file2) => {
           file2.moduleExports = patchedExports;
@@ -7863,8 +7863,8 @@ var require_instrumentation2 = __commonJS({
         this._warnOnPreloadedModules();
         for (const module3 of this._modules) {
           const hookFn = (exports2, name, baseDir) => {
-            if (!baseDir && path32.isAbsolute(name)) {
-              const parsedPath = path32.parse(name);
+            if (!baseDir && path33.isAbsolute(name)) {
+              const parsedPath = path33.parse(name);
               name = parsedPath.name;
               baseDir = parsedPath.dir;
             }
@@ -7873,7 +7873,7 @@ var require_instrumentation2 = __commonJS({
           const onRequire = (exports2, name, baseDir) => {
             return this._onRequire(module3, exports2, name, baseDir);
           };
-          const hook = path32.isAbsolute(module3.name) ? new require_in_the_middle_1.Hook([module3.name], { internals: true }, onRequire) : this._requireInTheMiddleSingleton.register(module3.name, onRequire);
+          const hook = path33.isAbsolute(module3.name) ? new require_in_the_middle_1.Hook([module3.name], { internals: true }, onRequire) : this._requireInTheMiddleSingleton.register(module3.name, onRequire);
           this._hooks.push(hook);
           const esmHook = new import_in_the_middle_1.Hook([module3.name], { internals: true }, hookFn);
           this._hooks.push(esmHook);
@@ -8481,9 +8481,9 @@ var require_getMachineId_linux = __commonJS({
     var api_1 = (init_esm(), __toCommonJS(esm_exports));
     async function getMachineId() {
       const paths = ["/etc/machine-id", "/var/lib/dbus/machine-id"];
-      for (const path32 of paths) {
+      for (const path33 of paths) {
         try {
-          const result = await fs_1.promises.readFile(path32, { encoding: "utf8" });
+          const result = await fs_1.promises.readFile(path33, { encoding: "utf8" });
           return result.trim();
         } catch (e) {
           api_1.diag.debug(`error reading machine id: ${e}`);
@@ -11843,14 +11843,14 @@ var require_util = __commonJS({
         }
         const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80;
         let origin = url2.origin != null ? url2.origin : `${url2.protocol || ""}//${url2.hostname || ""}:${port}`;
-        let path32 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
+        let path33 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path32 && path32[0] !== "/") {
-          path32 = `/${path32}`;
+        if (path33 && path33[0] !== "/") {
+          path33 = `/${path33}`;
         }
-        return new URL(`${origin}${path32}`);
+        return new URL(`${origin}${path33}`);
       }
       if (!isHttpOrHttpsPrefixed(url2.origin || url2.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -12671,9 +12671,9 @@ var require_diagnostics = __commonJS({
         "undici:client:sendHeaders",
         (evt) => {
           const {
-            request: { method, path: path32, origin }
+            request: { method, path: path33, origin }
           } = evt;
-          debugLog3("sending request to %s %s%s", method, origin, path32);
+          debugLog3("sending request to %s %s%s", method, origin, path33);
         }
       );
     }
@@ -12691,14 +12691,14 @@ var require_diagnostics = __commonJS({
         "undici:request:headers",
         (evt) => {
           const {
-            request: { method, path: path32, origin },
+            request: { method, path: path33, origin },
             response: { statusCode }
           } = evt;
           debugLog3(
             "received response to %s %s%s - HTTP %d",
             method,
             origin,
-            path32,
+            path33,
             statusCode
           );
         }
@@ -12707,23 +12707,23 @@ var require_diagnostics = __commonJS({
         "undici:request:trailers",
         (evt) => {
           const {
-            request: { method, path: path32, origin }
+            request: { method, path: path33, origin }
           } = evt;
-          debugLog3("trailers received from %s %s%s", method, origin, path32);
+          debugLog3("trailers received from %s %s%s", method, origin, path33);
         }
       );
       diagnosticsChannel9.subscribe(
         "undici:request:error",
         (evt) => {
           const {
-            request: { method, path: path32, origin },
+            request: { method, path: path33, origin },
             error: error63
           } = evt;
           debugLog3(
             "request to %s %s%s errored - %s",
             method,
             origin,
-            path32,
+            path33,
             error63.message
           );
         }
@@ -12838,7 +12838,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request2 = class {
       constructor(origin, {
-        path: path32,
+        path: path33,
         method,
         body,
         headers,
@@ -12855,11 +12855,11 @@ var require_request = __commonJS({
         maxRedirections,
         typeOfService
       }, handler) {
-        if (typeof path32 !== "string") {
+        if (typeof path33 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path32[0] !== "/" && !(path32.startsWith("http://") || path32.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path33[0] !== "/" && !(path33.startsWith("http://") || path33.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path32)) {
+        } else if (invalidPathRegex.test(path33)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -12934,7 +12934,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? serializePathWithQuery(path32, query) : path32;
+        this.path = query ? serializePathWithQuery(path33, query) : path33;
         this.origin = origin;
         this.protocol = getProtocolFromUrlString(origin);
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
@@ -18116,7 +18116,7 @@ var require_client_h1 = __commonJS({
       return method !== "GET" && method !== "HEAD" && method !== "OPTIONS" && method !== "TRACE" && method !== "CONNECT";
     }
     function writeH1(client, request2) {
-      const { method, path: path32, host, upgrade, blocking, reset } = request2;
+      const { method, path: path33, host, upgrade, blocking, reset } = request2;
       let { body, headers, contentLength } = request2;
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
       if (util2.isFormDataLike(body)) {
@@ -18194,7 +18194,7 @@ var require_client_h1 = __commonJS({
       if (socket.setTypeOfService) {
         socket.setTypeOfService(request2.typeOfService);
       }
-      let header = `${method} ${path32} HTTP/1.1\r
+      let header = `${method} ${path33} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -18873,7 +18873,7 @@ var require_client_h2 = __commonJS({
       const headersTimeout = request2.headersTimeout ?? client[kHeadersTimeout];
       const bodyTimeout = request2.bodyTimeout ?? client[kBodyTimeout];
       const session = client[kHTTP2Session];
-      const { method, path: path32, host, upgrade, expectContinue, signal, protocol, headers: reqHeaders } = request2;
+      const { method, path: path33, host, upgrade, expectContinue, signal, protocol, headers: reqHeaders } = request2;
       let { body } = request2;
       if (upgrade != null && upgrade !== "websocket") {
         util2.errorRequest(client, request2, new InvalidArgumentError(`Custom upgrade "${upgrade}" not supported over HTTP/2`));
@@ -18942,7 +18942,7 @@ var require_client_h2 = __commonJS({
           }
           headers[HTTP2_HEADER_METHOD] = "CONNECT";
           headers[HTTP2_HEADER_PROTOCOL] = "websocket";
-          headers[HTTP2_HEADER_PATH] = path32;
+          headers[HTTP2_HEADER_PATH] = path33;
           if (protocol === "ws:" || protocol === "wss:") {
             headers[HTTP2_HEADER_SCHEME] = protocol === "ws:" ? "http" : "https";
           } else {
@@ -18984,7 +18984,7 @@ var require_client_h2 = __commonJS({
         stream.setTimeout(headersTimeout);
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path32;
+      headers[HTTP2_HEADER_PATH] = path33;
       headers[HTTP2_HEADER_SCHEME] = protocol === "http:" ? "http" : "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -21336,10 +21336,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path32 = "/",
+          path: path33 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path32;
+        opts.path = origin + path33;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL(origin);
           headers.host = host;
@@ -23448,20 +23448,20 @@ var require_mock_utils = __commonJS({
       }
       return normalizedQp;
     }
-    function safeUrl(path32) {
-      if (typeof path32 !== "string") {
-        return path32;
+    function safeUrl(path33) {
+      if (typeof path33 !== "string") {
+        return path33;
       }
-      const pathSegments = path32.split("?", 3);
+      const pathSegments = path33.split("?", 3);
       if (pathSegments.length !== 2) {
-        return path32;
+        return path33;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path32, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path32);
+    function matchKey(mockDispatch2, { path: path33, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path33);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -23486,8 +23486,8 @@ var require_mock_utils = __commonJS({
       const basePath = key.query ? serializePathWithQuery(key.path, key.query) : key.path;
       const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
       const resolvedPathWithoutTrailingSlash = removeTrailingSlash(resolvedPath);
-      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path32, ignoreTrailingSlash }) => {
-        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path32)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path32), resolvedPath);
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path33, ignoreTrailingSlash }) => {
+        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path33)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path33), resolvedPath);
       });
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
@@ -23526,19 +23526,19 @@ var require_mock_utils = __commonJS({
         mockDispatches.splice(index, 1);
       }
     }
-    function removeTrailingSlash(path32) {
-      while (path32.endsWith("/")) {
-        path32 = path32.slice(0, -1);
+    function removeTrailingSlash(path33) {
+      while (path33.endsWith("/")) {
+        path33 = path33.slice(0, -1);
       }
-      if (path32.length === 0) {
-        path32 = "/";
+      if (path33.length === 0) {
+        path33 = "/";
       }
-      return path32;
+      return path33;
     }
     function buildKey(opts) {
-      const { path: path32, method, body, headers, query } = opts;
+      const { path: path33, method, body, headers, query } = opts;
       return {
-        path: path32,
+        path: path33,
         method,
         body,
         headers,
@@ -24228,10 +24228,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path32, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path33, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path32,
+            Path: path33,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -24313,9 +24313,9 @@ var require_mock_agent = __commonJS({
         const acceptNonStandardSearchParameters = this[kMockAgentAcceptsNonStandardSearchParameters];
         const dispatchOpts = { ...opts };
         if (acceptNonStandardSearchParameters && dispatchOpts.path) {
-          const [path32, searchParams] = dispatchOpts.path.split("?");
+          const [path33, searchParams] = dispatchOpts.path.split("?");
           const normalizedSearchParams = normalizeSearchParams(searchParams, acceptNonStandardSearchParameters);
-          dispatchOpts.path = `${path32}?${normalizedSearchParams}`;
+          dispatchOpts.path = `${path33}?${normalizedSearchParams}`;
         }
         return this[kAgent].dispatch(dispatchOpts, handler);
       }
@@ -24716,12 +24716,12 @@ var require_snapshot_recorder = __commonJS({
        * @return {Promise<void>} - Resolves when snapshots are loaded
        */
       async loadSnapshots(filePath) {
-        const path32 = filePath || this.#snapshotPath;
-        if (!path32) {
+        const path33 = filePath || this.#snapshotPath;
+        if (!path33) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve2(path32), "utf8");
+          const data = await readFile3(resolve2(path33), "utf8");
           const parsed = JSON.parse(data);
           if (Array.isArray(parsed)) {
             this.#snapshots.clear();
@@ -24735,7 +24735,7 @@ var require_snapshot_recorder = __commonJS({
           if (error63.code === "ENOENT") {
             this.#snapshots.clear();
           } else {
-            throw new UndiciError(`Failed to load snapshots from ${path32}`, { cause: error63 });
+            throw new UndiciError(`Failed to load snapshots from ${path33}`, { cause: error63 });
           }
         }
       }
@@ -24746,11 +24746,11 @@ var require_snapshot_recorder = __commonJS({
        * @returns {Promise<void>} - Resolves when snapshots are saved
        */
       async saveSnapshots(filePath) {
-        const path32 = filePath || this.#snapshotPath;
-        if (!path32) {
+        const path33 = filePath || this.#snapshotPath;
+        if (!path33) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve2(path32);
+        const resolvedPath = resolve2(path33);
         await mkdir(dirname2(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash2, snapshot]) => ({
           hash: hash2,
@@ -25382,15 +25382,15 @@ var require_redirect_handler = __commonJS({
           return;
         }
         const { origin, pathname, search } = util2.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-        const path32 = search ? `${pathname}${search}` : pathname;
-        const redirectUrlString = `${origin}${path32}`;
+        const path33 = search ? `${pathname}${search}` : pathname;
+        const redirectUrlString = `${origin}${path33}`;
         for (const historyUrl of this.history) {
           if (historyUrl.toString() === redirectUrlString) {
             throw new InvalidArgumentError(`Redirect loop detected. Cannot redirect to ${origin}. This typically happens when using a Client or Pool with cross-origin redirects. Use an Agent for cross-origin redirects.`);
           }
         }
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path32;
+        this.opts.path = path33;
         this.opts.origin = origin;
         this.opts.query = null;
       }
@@ -27150,10 +27150,10 @@ var require_cache_handler = __commonJS({
       }
       return locationUrl.pathname + locationUrl.search;
     }
-    function deleteCachedUri(store, cacheKey, path32) {
+    function deleteCachedUri(store, cacheKey, path33) {
       deleteCachedValue(store, {
         ...cacheKey,
-        path: path32
+        path: path33
       });
       for (let i = 0; i < util2.safeHTTPMethods.length; i++) {
         const method = util2.safeHTTPMethods[i];
@@ -27161,7 +27161,7 @@ var require_cache_handler = __commonJS({
           deleteCachedValue(store, {
             ...cacheKey,
             method,
-            path: path32
+            path: path33
           });
         }
       }
@@ -27172,9 +27172,9 @@ var require_cache_handler = __commonJS({
       }
       const values = Array.isArray(headerValue) ? headerValue : [headerValue];
       for (let i = 0; i < values.length; i++) {
-        const path32 = getSameOriginPath(cacheKey, values[i]);
-        if (path32 !== void 0) {
-          deleteCachedUri(store, cacheKey, path32);
+        const path33 = getSameOriginPath(cacheKey, values[i]);
+        if (path33 !== void 0) {
+          deleteCachedUri(store, cacheKey, path33);
         }
       }
     }
@@ -32174,11 +32174,11 @@ var require_fetch = __commonJS({
       function dispatch({ body }) {
         const url2 = requestCurrentURL(request2);
         const agent = fetchParams.controller.dispatcher;
-        const path32 = url2.pathname + url2.search;
+        const path33 = url2.pathname + url2.search;
         const hasTrailingQuestionMark = url2.search.length === 0 && url2.href[url2.href.length - url2.hash.length - 1] === "?";
         return new Promise((resolve2, reject) => agent.dispatch(
           {
-            path: hasTrailingQuestionMark ? `${path32}?` : path32,
+            path: hasTrailingQuestionMark ? `${path33}?` : path33,
             origin: url2.origin,
             method: request2.method,
             body: agent.isMockActive ? request2.body && (request2.body.source || request2.body.stream) : body,
@@ -33125,9 +33125,9 @@ var require_util4 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path32) {
-      for (let i = 0; i < path32.length; ++i) {
-        const code = path32.charCodeAt(i);
+    function validateCookiePath(path33) {
+      for (let i = 0; i < path33.length; ++i) {
+        const code = path33.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
         code > 126 || // exclude DEL and non-ascii
         code === 59) {
@@ -36475,11 +36475,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path32 = opts.path;
+          let path33 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path32 = `/${path32}`;
+            path33 = `/${path33}`;
           }
-          url2 = new URL(util2.parseOrigin(url2).origin + path32);
+          url2 = new URL(util2.parseOrigin(url2).origin + path33);
         } else {
           if (!opts) {
             opts = typeof url2 === "object" ? url2 : {};
@@ -36588,14 +36588,6 @@ ${captureLines}` : capture.stack;
   }
 });
 
-// src/clientFailure.ts
-import { constants } from "node:os";
-
-// ../../apps/collector/src/credentials.ts
-import { chmodSync as chmodSync4, existsSync as existsSync7, mkdirSync as mkdirSync9, readFileSync as readFileSync8, unlinkSync as unlinkSync3, writeFileSync as writeFileSync8 } from "node:fs";
-import os12 from "node:os";
-import path14 from "node:path";
-
 // ../../node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -37412,10 +37404,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path32) {
-  if (!path32)
+function getElementAtPath(obj, path33) {
+  if (!path33)
     return obj;
-  return path32.reduce((acc, key) => acc?.[key], obj);
+  return path33.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -37755,11 +37747,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path32, issues) {
+function prefixIssues(path33, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path32);
+    iss.path.unshift(path33);
     return iss;
   });
 }
@@ -38209,16 +38201,16 @@ function flattenError(error63, mapper = (issue2) => issue2.message) {
 }
 function formatError(error63, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error64, path32 = []) => {
+  const processError = (error64, path33 = []) => {
     for (const issue2 of error64.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path33, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path33, ...issue2.path]);
       } else {
-        const fullpath = [...path32, ...issue2.path];
+        const fullpath = [...path33, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -38257,17 +38249,17 @@ function formatError(error63, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error63, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error64, path32 = []) => {
+  const processError = (error64, path33 = []) => {
     var _a4;
     for (const issue2 of error64.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path33, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path33, ...issue2.path]);
       } else {
-        const fullpath = [...path32, ...issue2.path];
+        const fullpath = [...path33, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -38306,8 +38298,8 @@ function treeifyError(error63, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path32 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path32) {
+  const path33 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path33) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -55409,13 +55401,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path32 = ref.slice(1).split("/").filter(Boolean);
-  if (path32.length === 0) {
+  const path33 = ref.slice(1).split("/").filter(Boolean);
+  if (path33.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path32[0] === defsKey) {
-    const key = path32[1] === void 0 ? void 0 : decodeJSONPointerSegment(path32[1]);
+  if (path33[0] === defsKey) {
+    const key = path33[1] === void 0 ? void 0 : decodeJSONPointerSegment(path33[1]);
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -56264,6 +56256,53 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
+// ../core/src/mcpWarning.ts
+var mcpClientSchema = external_exports.enum(["claude", "codex", "cursor"]);
+var mcpWarningSchema = external_exports.enum(["not-connected", "sign-in-needed", "different-url"]);
+var mcpWarningDismissalSchema = external_exports.object({
+  client: mcpClientSchema,
+  warning: mcpWarningSchema
+}).strict();
+
+// ../core/src/sessionIngest.ts
+var SESSION_SOURCES = [
+  "claude-code",
+  "claude-cloud",
+  "codex",
+  "cursor",
+  "cursor-cloud",
+  "github-pr"
+];
+var SESSION_SPEED_MODES = ["standard", "fast"];
+var SESSION_SPEED_OBSERVATIONS = [...SESSION_SPEED_MODES, "unknown"];
+function isSessionSource(source) {
+  return typeof source === "string" && SESSION_SOURCES.includes(source);
+}
+var SESSION_ACTIVE_WINDOW_MS = 30 * 60 * 1e3;
+var COLLECTOR_SESSION_SOURCES = ["claude-code", "codex", "cursor"];
+var PREVIEW_REGISTRABLE_SOURCES = [
+  ...COLLECTOR_SESSION_SOURCES,
+  "cursor-cloud"
+];
+var MAX_INGEST_BATCH = 500;
+var MAX_RAW_UPLOAD_BYTES = 256 * 1024 * 1024;
+var MAX_PREVIEW_URL_LENGTH = 2e3;
+var MAX_REGISTERED_PREVIEWS = 10;
+var MAX_PREVIEW_LABEL_LENGTH = 60;
+var MAX_BRANCH_FACTS = 50;
+
+// ../core/src/menubarAnalytics.ts
+var MENUBAR_AGENT_CLICK = "menubar:agent_click";
+var MENUBAR_MCP_WARNING_REMOVE = "menubar:mcp_warning_remove";
+var menubarAgentClickSchema = external_exports.object({
+  source: external_exports.enum([...SESSION_SOURCES, "unknown"]),
+  destination: external_exports.enum(["focus", "resume", "desktop", "web"])
+}).strict();
+var menubarEventSchema = external_exports.discriminatedUnion("event", [
+  menubarAgentClickSchema.extend({ event: external_exports.literal(MENUBAR_AGENT_CLICK) }),
+  mcpWarningDismissalSchema.extend({ event: external_exports.literal(MENUBAR_MCP_WARNING_REMOVE) })
+]);
+
 // ../core/src/messageOrigin.ts
 var CLAUDE_CODE_NATIVE_ORIGINS = /* @__PURE__ */ new Set(["human", "agent", "harness", "tool"]);
 var CLAUDE_CODE_TASK_NOTIFICATION_ORIGIN = "task-notification";
@@ -56725,16 +56764,16 @@ function githubRepositoryOfRemote(url2) {
   const afterUser = url2.replace(REMOTE_SCHEME, "").replace(REMOTE_USER, "");
   const host = afterUser.startsWith("ssh.") ? afterUser.slice("ssh.".length) : afterUser;
   if (!host.startsWith("github.com")) return null;
-  let path32 = host.slice("github.com".length);
-  const port = hasScheme ? REMOTE_PORT.exec(path32) : null;
-  if (port !== null) path32 = path32.slice(port[0].length);
-  else if (path32.startsWith("/") || path32.startsWith(":")) path32 = path32.slice(1);
+  let path33 = host.slice("github.com".length);
+  const port = hasScheme ? REMOTE_PORT.exec(path33) : null;
+  if (port !== null) path33 = path33.slice(port[0].length);
+  else if (path33.startsWith("/") || path33.startsWith(":")) path33 = path33.slice(1);
   else return null;
-  if (path32.endsWith("/")) path32 = path32.slice(0, -1);
-  if (path32.endsWith(".git")) path32 = path32.slice(0, -".git".length);
-  const segments = path32.split("/");
+  if (path33.endsWith("/")) path33 = path33.slice(0, -1);
+  if (path33.endsWith(".git")) path33 = path33.slice(0, -".git".length);
+  const segments = path33.split("/");
   if (segments.length !== 2 || !segments.every((segment) => REMOTE_PATH_SEGMENT.test(segment))) return null;
-  return path32;
+  return path33;
 }
 var PUSH_DESTINATION = /\bTo\s+([^\s\\"]+)/g;
 function pushDestinationsInText(text) {
@@ -57669,10 +57708,10 @@ function boundUnfamiliarPayload(record2) {
 }
 function excludeImageCarriers(record2) {
   const excludedKeys = [];
-  const withoutImages = (value, path32) => {
+  const withoutImages = (value, path33) => {
     if (Array.isArray(value)) {
       return value.map((item, index) => {
-        const itemPath = `${path32}[${index}]`;
+        const itemPath = `${path33}[${index}]`;
         if (typeof item === "string" && isImageCarrier(item)) {
           excludedKeys.push(itemPath);
           return null;
@@ -57683,7 +57722,7 @@ function excludeImageCarriers(record2) {
     if (!isRecord2(value)) return value;
     const kept = [];
     for (const [key, item] of Object.entries(value)) {
-      const keyPath = path32 === "" ? key : `${path32}.${key}`;
+      const keyPath = path33 === "" ? key : `${path33}.${key}`;
       if (isImageBase64Payload(value, key) || typeof item === "string" && isImageCarrier(item)) {
         excludedKeys.push(keyPath);
         continue;
@@ -58404,8 +58443,8 @@ function primaryArg(args) {
 function readFilePath(name, primary) {
   if (!primary || !READ_TOOLS.has(name)) return null;
   if (ARTIFACT_PATH_RE.test(primary)) return null;
-  const path32 = primary.startsWith("/workspace/") ? primary.slice("/workspace/".length) : primary;
-  return path32.length > 0 ? path32 : null;
+  const path33 = primary.startsWith("/workspace/") ? primary.slice("/workspace/".length) : primary;
+  return path33.length > 0 ? path33 : null;
 }
 function asRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -58738,33 +58777,6 @@ function describeSyncSignals(member, now, noUpload = "no sessions uploaded yet")
   return `${line.charAt(0).toUpperCase()}${line.slice(1)}.`;
 }
 
-// ../core/src/sessionIngest.ts
-var SESSION_SOURCES = [
-  "claude-code",
-  "claude-cloud",
-  "codex",
-  "cursor",
-  "cursor-cloud",
-  "github-pr"
-];
-var SESSION_SPEED_MODES = ["standard", "fast"];
-var SESSION_SPEED_OBSERVATIONS = [...SESSION_SPEED_MODES, "unknown"];
-function isSessionSource(source) {
-  return typeof source === "string" && SESSION_SOURCES.includes(source);
-}
-var SESSION_ACTIVE_WINDOW_MS = 30 * 60 * 1e3;
-var COLLECTOR_SESSION_SOURCES = ["claude-code", "codex", "cursor"];
-var PREVIEW_REGISTRABLE_SOURCES = [
-  ...COLLECTOR_SESSION_SOURCES,
-  "cursor-cloud"
-];
-var MAX_INGEST_BATCH = 500;
-var MAX_RAW_UPLOAD_BYTES = 256 * 1024 * 1024;
-var MAX_PREVIEW_URL_LENGTH = 2e3;
-var MAX_REGISTERED_PREVIEWS = 10;
-var MAX_PREVIEW_LABEL_LENGTH = 60;
-var MAX_BRANCH_FACTS = 50;
-
 // ../core/src/version.ts
 function parseReleaseVersion(version2) {
   const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version2);
@@ -58837,6 +58849,15 @@ var recentSessionCursorSchema = external_exports.object({
   id: external_exports.uuid()
 });
 
+// src/mcpPreferences.ts
+import { mkdirSync as mkdirSync10, readFileSync as readFileSync11, renameSync as renameSync5, writeFileSync as writeFileSync9 } from "node:fs";
+import path21 from "node:path";
+
+// ../../apps/collector/src/credentials.ts
+import { chmodSync as chmodSync4, existsSync as existsSync7, mkdirSync as mkdirSync9, readFileSync as readFileSync8, unlinkSync as unlinkSync3, writeFileSync as writeFileSync8 } from "node:fs";
+import os12 from "node:os";
+import path14 from "node:path";
+
 // ../../node_modules/.pnpm/@sentry+core@10.74.0/node_modules/@sentry/core/build/esm/debug-build.js
 var DEBUG_BUILD = typeof __SENTRY_DEBUG__ === "undefined" || __SENTRY_DEBUG__;
 
@@ -59017,8 +59038,8 @@ function getFunctionName(fn) {
     return defaultFunctionName;
   }
 }
-function normalizeStackTracePath(path32) {
-  let filename = path32?.startsWith("file://") ? path32.slice(7) : path32;
+function normalizeStackTracePath(path33) {
+  let filename = path33?.startsWith("file://") ? path33.slice(7) : path33;
   if (filename?.match(/\/[A-Z]:/)) {
     filename = filename.slice(1);
   }
@@ -60828,8 +60849,8 @@ function isValidProtocol(protocol) {
   return protocol === "http" || protocol === "https";
 }
 function dsnToString(dsn, withPassword = false) {
-  const { host, path: path32, pass, port, projectId, protocol, publicKey } = dsn;
-  return `${protocol}://${publicKey}${withPassword && pass ? `:${pass}` : ""}@${host}${port ? `:${port}` : ""}/${path32 ? `${path32}/` : path32}${projectId}`;
+  const { host, path: path33, pass, port, projectId, protocol, publicKey } = dsn;
+  return `${protocol}://${publicKey}${withPassword && pass ? `:${pass}` : ""}@${host}${port ? `:${port}` : ""}/${path33 ? `${path33}/` : path33}${projectId}`;
 }
 function dsnFromString(str) {
   const match = DSN_REGEX.exec(str);
@@ -60840,11 +60861,11 @@ function dsnFromString(str) {
     return void 0;
   }
   const [protocol, publicKey, pass = "", host = "", port = "", lastPath = ""] = match.slice(1);
-  let path32 = "";
+  let path33 = "";
   let projectId = lastPath;
   const split = projectId.split("/");
   if (split.length > 1) {
-    path32 = split.slice(0, -1).join("/");
+    path33 = split.slice(0, -1).join("/");
     projectId = split.pop();
   }
   if (projectId) {
@@ -60853,7 +60874,7 @@ function dsnFromString(str) {
       projectId = projectMatch[0];
     }
   }
-  return dsnFromComponents({ host, pass, path: path32, projectId, port, protocol, publicKey });
+  return dsnFromComponents({ host, pass, path: path33, projectId, port, protocol, publicKey });
 }
 function dsnFromComponents(components) {
   return {
@@ -65382,9 +65403,9 @@ function stripUrlQueryAndFragment(urlPath) {
   return urlPath.split(/[?#]/, 1)[0];
 }
 function getSanitizedUrlString(url2) {
-  const { protocol, host, path: path32 } = url2;
+  const { protocol, host, path: path33 } = url2;
   const filteredHost = host?.replace(/^.*@/, "[filtered]:[filtered]@").replace(/(:80)$/, "").replace(/(:443)$/, "") || "";
-  return `${protocol ? `${protocol}://` : ""}${filteredHost}${path32}`;
+  return `${protocol ? `${protocol}://` : ""}${filteredHost}${path33}`;
 }
 function stripDataUrlContent(url2, includeDataPrefix = true) {
   if (url2.startsWith("data:")) {
@@ -66329,8 +66350,8 @@ function splitPath(filename) {
   const parts = splitPathRe.exec(truncated);
   return parts ? parts.slice(1) : [];
 }
-function dirname(path32) {
-  const result = splitPath(path32);
+function dirname(path33) {
+  const result = splitPath(path33);
   const root = result[0] || "";
   let dir = result[1];
   if (!root && !dir) {
@@ -70173,15 +70194,15 @@ var getLayerMetadata = (route, layer, layerPath) => {
     };
   }
 };
-var getRouterPath = (path32, layer) => {
+var getRouterPath = (path33, layer) => {
   const stackLayer = Array.isArray(layer.handle?.stack) ? layer.handle?.stack?.[0] : void 0;
   if (stackLayer?.route?.path) {
-    return `${path32}${stackLayer.route.path}`;
+    return `${path33}${stackLayer.route.path}`;
   }
   if (stackLayer && Array.isArray(stackLayer?.handle?.stack)) {
-    return getRouterPath(path32, stackLayer);
+    return getRouterPath(path33, stackLayer);
   }
-  return path32;
+  return path33;
 };
 var isLayerIgnored = (name, type, config2) => {
   if (Array.isArray(config2?.ignoreLayersType) && config2?.ignoreLayersType?.includes(type)) {
@@ -70201,7 +70222,7 @@ function getActualMatchedRoute(req, constructedRoute) {
   if (layersStore.length === 0) {
     return void 0;
   }
-  if (layersStore.every((path32) => path32 === "/")) {
+  if (layersStore.every((path33) => path33 === "/")) {
     return req.originalUrl === "/" ? "/" : void 0;
   }
   if (constructedRoute === "*") {
@@ -70217,11 +70238,11 @@ function getActualMatchedRoute(req, constructedRoute) {
 function getConstructedRoute(req) {
   const layersStore = getStoredLayers(req);
   let constructedRoute = "";
-  for (const path32 of layersStore) {
-    if (path32 === "/" || path32 === "/*") {
+  for (const path33 of layersStore) {
+    if (path33 === "/" || path33 === "/*") {
       continue;
     }
-    constructedRoute += !constructedRoute || constructedRoute.endsWith("/") ? path32 : `/${path32}`;
+    constructedRoute += !constructedRoute || constructedRoute.endsWith("/") ? path33 : `/${path33}`;
   }
   return constructedRoute.replace(/\/{2,}/g, "/");
 }
@@ -70726,9 +70747,9 @@ function getRequestUrlObject(requestOptions) {
   const hostHeader = requestOptions.headers?.host && String(requestOptions.headers?.host);
   const hostname4 = hostHeader || requestOptions.hostname || requestOptions.host || "";
   const port = !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 || /^(.*):(\d+)$/.test(hostname4) ? "" : `:${requestOptions.port}`;
-  const path32 = requestOptions.path ? requestOptions.path : "/";
+  const path33 = requestOptions.path ? requestOptions.path : "/";
   const base = `${protocol}//${hostname4}${port}`;
-  return new URL(path32.startsWith("//") ? `${base}${path32}` : path32, base);
+  return new URL(path33.startsWith("//") ? `${base}${path33}` : path33, base);
 }
 function getRequestUrlFromClientRequest(request2) {
   return String(getRequestUrl(getRequestOptions(request2)));
@@ -71401,11 +71422,11 @@ function shouldIgnoreSpansForIncomingRequest(request2, {
   return false;
 }
 function isStaticAssetRequest(urlPath) {
-  const path32 = stripUrlQueryAndFragment(urlPath);
-  if (path32.match(/\.(ico|png|jpg|jpeg|gif|svg|css|js|woff|woff2|ttf|eot|webp|avif)$/)) {
+  const path33 = stripUrlQueryAndFragment(urlPath);
+  if (path33.match(/\.(ico|png|jpg|jpeg|gif|svg|css|js|woff|woff2|ttf|eot|webp|avif)$/)) {
     return true;
   }
-  if (path32.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
+  if (path33.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
     return true;
   }
   return false;
@@ -71646,11 +71667,11 @@ function isKnownPrefetchRequest2(req) {
   return req.headers["next-router-prefetch"] === "1";
 }
 function isStaticAssetRequest2(urlPath) {
-  const path32 = stripUrlQueryAndFragment(urlPath);
-  if (path32.match(/\.(ico|png|jpg|jpeg|gif|svg|css|js|woff|woff2|ttf|eot|webp|avif)$/)) {
+  const path33 = stripUrlQueryAndFragment(urlPath);
+  if (path33.match(/\.(ico|png|jpg|jpeg|gif|svg|css|js|woff|woff2|ttf|eot|webp|avif)$/)) {
     return true;
   }
-  if (path32.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
+  if (path33.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
     return true;
   }
   return false;
@@ -72010,19 +72031,19 @@ function getBreadcrumbData(request2) {
     return {};
   }
 }
-function getAbsoluteUrl2(origin, path32 = "/") {
+function getAbsoluteUrl2(origin, path33 = "/") {
   try {
-    const url2 = new URL(path32, origin);
+    const url2 = new URL(path33, origin);
     return url2.toString();
   } catch {
     const url2 = `${origin}`;
-    if (url2.endsWith("/") && path32.startsWith("/")) {
-      return `${url2}${path32.slice(1)}`;
+    if (url2.endsWith("/") && path33.startsWith("/")) {
+      return `${url2}${path33.slice(1)}`;
     }
-    if (!url2.endsWith("/") && !path32.startsWith("/")) {
-      return `${url2}/${path32}`;
+    if (!url2.endsWith("/") && !path33.startsWith("/")) {
+      return `${url2}/${path33}`;
     }
-    return `${url2}${path32}`;
+    return `${url2}${path33}`;
   }
 }
 
@@ -72267,15 +72288,15 @@ function getRequestMethod(original) {
   }
   return "_OTHER";
 }
-function getAbsoluteUrl3(origin, path32 = "/") {
+function getAbsoluteUrl3(origin, path33 = "/") {
   const url2 = `${origin}`;
-  if (url2.endsWith("/") && path32.startsWith("/")) {
-    return `${url2}${path32.slice(1)}`;
+  if (url2.endsWith("/") && path33.startsWith("/")) {
+    return `${url2}${path33.slice(1)}`;
   }
-  if (!url2.endsWith("/") && !path32.startsWith("/")) {
-    return `${url2}/${path32}`;
+  if (!url2.endsWith("/") && !path33.startsWith("/")) {
+    return `${url2}/${path33}`;
   }
-  return `${url2}${path32}`;
+  return `${url2}${path33}`;
 }
 
 // ../../node_modules/.pnpm/@sentry+node-core@10.74.0_@opentelemetry+api@1.9.1_@opentelemetry+core@2.11.0_@opentele_b542b1cf9336850aabd631474d797bed/node_modules/@sentry/node-core/build/esm/integrations/node-fetch/index.js
@@ -74768,12 +74789,12 @@ function emplace(map2, key, contents) {
   }
   return value;
 }
-function shouldSkipContextLinesForFile(path32) {
-  if (path32.startsWith("node:")) return true;
-  if (path32.endsWith(".min.js")) return true;
-  if (path32.endsWith(".min.cjs")) return true;
-  if (path32.endsWith(".min.mjs")) return true;
-  if (path32.startsWith("data:")) return true;
+function shouldSkipContextLinesForFile(path33) {
+  if (path33.startsWith("node:")) return true;
+  if (path33.endsWith(".min.js")) return true;
+  if (path33.endsWith(".min.cjs")) return true;
+  if (path33.endsWith(".min.mjs")) return true;
+  if (path33.startsWith("data:")) return true;
   return false;
 }
 function shouldSkipContextLinesForFrame(frame) {
@@ -74821,9 +74842,9 @@ function makeLineReaderRanges(lines, linecontext) {
   }
   return out;
 }
-function getContextLinesFromFile(path32, ranges, output2) {
+function getContextLinesFromFile(path33, ranges, output2) {
   return new Promise((resolve2, _reject) => {
-    const stream = createReadStream(path32);
+    const stream = createReadStream(path33);
     const lineReaded = createInterface({
       input: stream
     });
@@ -74841,8 +74862,8 @@ function getContextLinesFromFile(path32, ranges, output2) {
     let rangeStart = range[0];
     let rangeEnd = range[1];
     function onStreamError(e) {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path32, 1);
-      DEBUG_BUILD2 && debug.error(`Failed to read file: ${path32}. Error: ${e}`);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path33, 1);
+      DEBUG_BUILD2 && debug.error(`Failed to read file: ${path33}. Error: ${e}`);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -76281,8 +76302,8 @@ function getSpotlightConfig(optionsSpotlight) {
 
 // ../../node_modules/.pnpm/@sentry+node-core@10.74.0_@opentelemetry+api@1.9.1_@opentelemetry+core@2.11.0_@opentele_b542b1cf9336850aabd631474d797bed/node_modules/@sentry/node-core/build/esm/utils/module.js
 import { posix, sep } from "node:path";
-function normalizeWindowsPath(path32) {
-  return path32.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path33) {
+  return path33.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 function createGetModuleFromFilename(basePath = process.argv[1] ? dirname(process.argv[1]) : process.cwd(), isWindows = sep === "\\") {
   const normalizedBase = isWindows ? normalizeWindowsPath(basePath) : basePath;
@@ -79167,22 +79188,22 @@ function addSpanSource(span, loc, start, end) {
     span.setAttribute(AttributeNames2.SOURCE, source);
   }
 }
-function createFieldIfNotExists(contextValue, info, path32) {
-  let field = getField(contextValue, path32);
+function createFieldIfNotExists(contextValue, info, path33) {
+  let field = getField(contextValue, path33);
   if (field) {
     return { field, spanAdded: false };
   }
-  const parentSpan = getParentFieldSpan(contextValue, path32);
+  const parentSpan = getParentFieldSpan(contextValue, path33);
   field = {
-    span: createResolverSpan(contextValue, info, path32, parentSpan)
+    span: createResolverSpan(contextValue, info, path33, parentSpan)
   };
-  addField(contextValue, path32, field);
+  addField(contextValue, path33, field);
   return { field, spanAdded: true };
 }
-function createResolverSpan(contextValue, info, path32, parentSpan) {
+function createResolverSpan(contextValue, info, path33, parentSpan) {
   const attributes = {
     [AttributeNames2.FIELD_NAME]: info.fieldName,
-    [AttributeNames2.FIELD_PATH]: path32.join("."),
+    [AttributeNames2.FIELD_PATH]: path33.join("."),
     [AttributeNames2.FIELD_TYPE]: info.returnType.toString(),
     [AttributeNames2.PARENT_NAME]: info.parentType.name
   };
@@ -79214,15 +79235,15 @@ function getOperation(document2, operationName) {
     return document2.definitions.find((definition) => OPERATION_VALUES.indexOf(definition?.operation) !== -1);
   }
 }
-function addField(contextValue, path32, field) {
-  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path32.join(".")] = field;
+function addField(contextValue, path33, field) {
+  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path33.join(".")] = field;
 }
-function getField(contextValue, path32) {
-  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path32.join(".")];
+function getField(contextValue, path33) {
+  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path33.join(".")];
 }
-function getParentFieldSpan(contextValue, path32) {
-  for (let i = path32.length - 1; i > 0; i--) {
-    const field = getField(contextValue, path32.slice(0, i));
+function getParentFieldSpan(contextValue, path33) {
+  for (let i = path33.length - 1; i > 0; i--) {
+    const field = getField(contextValue, path33.slice(0, i));
     if (field) {
       return field.span;
     }
@@ -79232,9 +79253,9 @@ function getParentFieldSpan(contextValue, path32) {
 function getRootSpan2(contextValue) {
   return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].span;
 }
-function pathToArray(path32) {
+function pathToArray(path33) {
   const flattened = [];
-  let curr = path32;
+  let curr = path33;
   while (curr) {
     flattened.push(String(curr.key));
     curr = curr.prev;
@@ -79375,8 +79396,8 @@ function wrapFieldResolver(getConfig3, fieldResolver, isDefaultResolver = false)
     if (!contextValue[OTEL_GRAPHQL_DATA_SYMBOL]) {
       return fieldResolver.call(this, source, args, contextValue, info);
     }
-    const path32 = pathToArray(info?.path);
-    const { field, spanAdded } = createFieldIfNotExists(contextValue, info, path32);
+    const path33 = pathToArray(info?.path);
+    const { field, spanAdded } = createFieldIfNotExists(contextValue, info, path33);
     const span = field.span;
     const shouldEndSpan = spanAdded;
     return withActiveSpan(span, () => {
@@ -82359,10 +82380,10 @@ var PostgresJsInstrumentation = class extends import_instrumentation24.Instrumen
       },
       (exports) => exports
     );
-    ["src", "cf/src", "cjs/src"].forEach((path32) => {
+    ["src", "cf/src", "cjs/src"].forEach((path33) => {
       module2.files.push(
         new InstrumentationNodeModuleFile(
-          `postgres/${path32}/query.js`,
+          `postgres/${path33}/query.js`,
           SUPPORTED_VERSIONS4,
           this._patchQueryPrototype.bind(this),
           this._unpatchQueryPrototype.bind(this)
@@ -82993,13 +83014,13 @@ var HonoInstrumentation = class extends import_instrumentation27.Instrumentation
     return function(original) {
       return function wrappedHandler(...args) {
         if (typeof args[0] === "string") {
-          const path32 = args[0];
+          const path33 = args[0];
           if (args.length === 1) {
-            return original.apply(this, [path32]);
+            return original.apply(this, [path33]);
           }
           const handlers2 = args.slice(1);
           return original.apply(this, [
-            path32,
+            path33,
             ...handlers2.map((handler) => instrumentation._wrapHandler(handler))
           ]);
         }
@@ -83033,13 +83054,13 @@ var HonoInstrumentation = class extends import_instrumentation27.Instrumentation
     return function(original) {
       return function wrappedHandler(...args) {
         if (typeof args[0] === "string") {
-          const path32 = args[0];
+          const path33 = args[0];
           if (args.length === 1) {
-            return original.apply(this, [path32]);
+            return original.apply(this, [path33]);
           }
           const handlers2 = args.slice(1);
           return original.apply(this, [
-            path32,
+            path33,
             ...handlers2.map((handler) => instrumentation._wrapHandler(handler))
           ]);
         }
@@ -83059,8 +83080,8 @@ var HonoInstrumentation = class extends import_instrumentation27.Instrumentation
       if (!instrumentation.isEnabled()) {
         return handler.apply(this, [c, next]);
       }
-      const path32 = c.req.path;
-      const span = instrumentation.tracer.startSpan(path32);
+      const path33 = c.req.path;
+      const span = instrumentation.tracer.startSpan(path33);
       return context.with(trace.setSpan(context.active(), span), () => {
         return instrumentation._safeExecute(
           () => {
@@ -83070,7 +83091,7 @@ var HonoInstrumentation = class extends import_instrumentation27.Instrumentation
                 const type = instrumentation._determineHandlerType(result2);
                 span.setAttributes({
                   [AttributeNames5.HONO_TYPE]: type,
-                  [AttributeNames5.HONO_NAME]: type === HonoTypes.REQUEST_HANDLER ? path32 : handler.name || "anonymous"
+                  [AttributeNames5.HONO_NAME]: type === HonoTypes.REQUEST_HANDLER ? path33 : handler.name || "anonymous"
                 });
                 instrumentation.getConfig().responseHook?.(span);
                 return result2;
@@ -83079,7 +83100,7 @@ var HonoInstrumentation = class extends import_instrumentation27.Instrumentation
               const type = instrumentation._determineHandlerType(result);
               span.setAttributes({
                 [AttributeNames5.HONO_TYPE]: type,
-                [AttributeNames5.HONO_NAME]: type === HonoTypes.REQUEST_HANDLER ? path32 : handler.name || "anonymous"
+                [AttributeNames5.HONO_NAME]: type === HonoTypes.REQUEST_HANDLER ? path33 : handler.name || "anonymous"
               });
               instrumentation.getConfig().responseHook?.(span);
               return result;
@@ -83283,11 +83304,11 @@ var KoaInstrumentation = class extends import_instrumentation29.InstrumentationB
     const router = dispatchLayer.router;
     const routesStack = router?.stack ?? [];
     for (const pathLayer of routesStack) {
-      const path32 = pathLayer.path;
+      const path33 = pathLayer.path;
       const pathStack = pathLayer.stack;
       for (let j = 0; j < pathStack.length; j++) {
         const routedMiddleware = pathStack[j];
-        pathStack[j] = this._patchLayer(routedMiddleware, true, path32);
+        pathStack[j] = this._patchLayer(routedMiddleware, true, path33);
       }
     }
     return dispatchLayer;
@@ -85883,11 +85904,11 @@ import path12 from "node:path";
 import { existsSync as existsSync6, lstatSync as lstatSync4 } from "node:fs";
 import path11 from "node:path";
 
-// ../../apps/collector/src/codexTranscriptHints.ts
+// ../../apps/collector/src/codexTranscriptDiscovery.ts
 import { createHash } from "node:crypto";
 import { closeSync, lstatSync, openSync, readSync, readdirSync, realpathSync } from "node:fs";
 import path2 from "node:path";
-var hintSchema = external_exports.object({
+var transcriptDiscoveryRecordSchema = external_exports.object({
   sessionId: external_exports.string().regex(/^[a-zA-Z0-9_-]{1,200}$/),
   transcriptPath: external_exports.string().max(4096).nullable()
 });
@@ -85900,7 +85921,7 @@ function codexTranscriptRecordPath(home, sessionId) {
     `${createHash("sha256").update(sessionId).digest("hex")}.json`
   );
 }
-function readCodexTranscriptHints(home, roots) {
+function readCodexTranscriptDiscoveryRecords(home, roots) {
   const dir = codexTranscriptRecordsDir(home);
   let files;
   try {
@@ -85912,9 +85933,9 @@ function readCodexTranscriptHints(home, roots) {
   for (const file2 of files) {
     if (!/^[a-f0-9]{64}\.json$/.test(file2)) continue;
     try {
-      const hintPath = path2.join(dir, file2);
-      if (!lstatSync(hintPath).isFile()) continue;
-      const fd = openSync(hintPath, "r");
+      const recordPath = path2.join(dir, file2);
+      if (!lstatSync(recordPath).isFile()) continue;
+      const fd = openSync(recordPath, "r");
       let text;
       try {
         const buffer = Buffer.alloc(32 * 1024 + 1);
@@ -85924,10 +85945,10 @@ function readCodexTranscriptHints(home, roots) {
       } finally {
         closeSync(fd);
       }
-      const hint = hintSchema.parse(JSON.parse(text));
-      if (file2 !== `${createHash("sha256").update(hint.sessionId).digest("hex")}.json`) continue;
-      if (hint.transcriptPath === null || !path2.isAbsolute(hint.transcriptPath)) continue;
-      const rolloutPath = path2.normalize(hint.transcriptPath);
+      const record2 = transcriptDiscoveryRecordSchema.parse(JSON.parse(text));
+      if (file2 !== `${createHash("sha256").update(record2.sessionId).digest("hex")}.json`) continue;
+      if (record2.transcriptPath === null || !path2.isAbsolute(record2.transcriptPath)) continue;
+      const rolloutPath = path2.normalize(record2.transcriptPath);
       if (path2.extname(rolloutPath) !== ".jsonl") continue;
       const rootIndex = roots.findIndex((root2) => {
         const relative2 = path2.relative(root2, rolloutPath);
@@ -85937,7 +85958,7 @@ function readCodexTranscriptHints(home, roots) {
       const root = roots[rootIndex];
       if (realpathSync(rolloutPath) !== path2.join(realpathSync(root), path2.relative(root, rolloutPath)))
         continue;
-      result.push({ rolloutPath, sessionId: hint.sessionId, archived: rootIndex === 1 });
+      result.push({ rolloutPath, sessionId: record2.sessionId, archived: rootIndex === 1 });
     } catch {
     }
   }
@@ -85950,7 +85971,7 @@ import { createHmac } from "node:crypto";
 // ../../apps/collector/src/http.ts
 var import_undici = __toESM(require_undici(), 1);
 var CLI_VERSION_HEADER = "x-powerplant-cli-version";
-var cliVersion = true ? "0.4.12" : "0.0.0-checkout";
+var cliVersion = true ? "0.4.14" : "0.0.0-checkout";
 function cliVersionHeaders() {
   return { [CLI_VERSION_HEADER]: cliVersion, "user-agent": `powerplant-cli/${cliVersion}` };
 }
@@ -86074,8 +86095,8 @@ function createStructureDiagnostics() {
     observe: (source) => (observation) => {
       try {
         const formatVersion = admitted("formatVersion", observation.formatVersion ?? null);
-        const path32 = observation.path.replace(/[^A-Za-z0-9_.$:/=[\]-]/g, "_").slice(0, 160) || "other";
-        const key = [source, path32, observation.reason, observation.valueType, formatVersion].join("\0");
+        const path33 = observation.path.replace(/[^A-Za-z0-9_.$:/=[\]-]/g, "_").slice(0, 160) || "other";
+        const key = [source, path33, observation.reason, observation.valueType, formatVersion].join("\0");
         const count3 = observation.count ?? 1;
         const existing = groups.get(key);
         if (existing) {
@@ -86085,7 +86106,7 @@ function createStructureDiagnostics() {
         if (samples.length >= MAX_STRUCTURE_DIAGNOSTICS) return;
         const sample = {
           source,
-          path: path32,
+          path: path33,
           reason: observation.reason,
           valueType: observation.valueType,
           formatVersion,
@@ -86257,7 +86278,7 @@ function bindDiagnosticEnrollment(diagnostic, token) {
   passEnrollments.set(diagnostic, token);
 }
 
-// ../../apps/collector/src/codexCli.ts
+// ../../apps/collector/src/codexSessions.ts
 import { closeSync as closeSync3, mkdirSync as mkdirSync2, openSync as openSync3, renameSync, rmSync as rmSync2, utimesSync, writeSync } from "node:fs";
 import os6 from "node:os";
 import path5 from "node:path";
@@ -86697,13 +86718,17 @@ function isPathWithinScopes(resolved, scopePaths) {
   );
 }
 
-// ../../apps/collector/src/codexCli.ts
+// ../../apps/collector/src/codexSessions.ts
 function parseCodexRollout(text, sharedUsage) {
   let meta3 = null;
+  let initialEvent;
+  let records = 0;
   let model;
   const timestamps = [];
   const usage = sharedUsage ?? createCodexUsageReader();
   for (const line of parseJsonl(text)) {
+    records += 1;
+    if (records === 2 && meta3 !== null) initialEvent = line;
     if (typeof line.timestamp === "string") timestamps.push(line.timestamp);
     usage.pushRecord(line);
     const payload = line.payload;
@@ -86719,8 +86744,10 @@ function parseCodexRollout(text, sharedUsage) {
   if (meta3 === null && timestamps.length === 0) return null;
   const git = meta3?.git ?? null;
   const sessionId = meta3?.id ?? meta3?.session_id;
+  const facts = meta3 === null ? {} : harnessSessionFacts("codex", { ...meta3, initialEvent });
   return {
-    kind: meta3 !== null && isSidecarThread(meta3) ? "subagent" : "session",
+    kind: facts.subagent ? "subagent" : "session",
+    ...facts.standaloneReview && { standaloneReview: true },
     ...typeof sessionId === "string" && sessionId !== "" && { sessionId },
     startedAt: timestamps[0],
     endedAt: timestamps[timestamps.length - 1],
@@ -86756,6 +86783,7 @@ function foldRolloutPages(pages, usage) {
   const repoFullName = first("repoFullName");
   return {
     kind: pages[0].kind,
+    ...pages[0].standaloneReview && { standaloneReview: true },
     ...sessionId !== void 0 && { sessionId },
     ...startedAt !== void 0 && { startedAt },
     ...endedAt !== void 0 && { endedAt },
@@ -86777,21 +86805,21 @@ function rolloutIdentity(rolloutPath) {
   if (!conventional) return { threadId: name, page: false };
   return { threadId: threadId2.toLowerCase(), page: pageId !== void 0 };
 }
-function codexSpoolDir(home) {
+function codexMergedTranscriptsDir(home) {
   return path5.join(home, ".config", "powerplant", "codex");
 }
-function mergedSpoolIsFresh(spoolPath, mtimeMs) {
-  const existing = statIfExists(spoolPath);
+function mergedTranscriptIsFresh(mergedTranscriptPath, mtimeMs) {
+  const existing = statIfExists(mergedTranscriptPath);
   return existing !== null && Math.abs(existing.mtimeMs - mtimeMs) < 1;
 }
-var MergedSpoolWriter = class {
-  constructor(spoolPath) {
-    this.spoolPath = spoolPath;
-    mkdirSync2(path5.dirname(spoolPath), { recursive: true, mode: 448 });
-    this.tmpPath = `${spoolPath}.${process.pid}.tmp`;
+var MergedTranscriptWriter = class {
+  constructor(mergedTranscriptPath) {
+    this.mergedTranscriptPath = mergedTranscriptPath;
+    mkdirSync2(path5.dirname(mergedTranscriptPath), { recursive: true, mode: 448 });
+    this.tmpPath = `${mergedTranscriptPath}.${process.pid}.tmp`;
     this.fd = openSync3(this.tmpPath, "w", 384);
   }
-  spoolPath;
+  mergedTranscriptPath;
   tmpPath;
   fd;
   bytes = 0;
@@ -86805,7 +86833,7 @@ var MergedSpoolWriter = class {
   finish(mtimeMs) {
     this.close();
     utimesSync(this.tmpPath, mtimeMs / 1e3, mtimeMs / 1e3);
-    renameSync(this.tmpPath, this.spoolPath);
+    renameSync(this.tmpPath, this.mergedTranscriptPath);
     return this.bytes;
   }
   abandon() {
@@ -86875,7 +86903,7 @@ async function collectCodexSessions(options = {}) {
   const now = options.now ?? Date.now();
   const capture = options.capture ?? captureEverythingUnresolved;
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  const spoolDir = options.spoolDir ?? codexSpoolDir(options.homeDir ?? os6.homedir());
+  const mergedTranscriptsDir = options.mergedTranscriptsDir ?? codexMergedTranscriptsDir(options.homeDir ?? os6.homedir());
   const items = [];
   const candidates = [];
   const unreadable = [];
@@ -86886,12 +86914,12 @@ async function collectCodexSessions(options = {}) {
   let largestMergedBytes = 0;
   const externalIdOf = (rolloutPath) => path5.basename(rolloutPath, ".jsonl");
   const files = /* @__PURE__ */ new Map();
-  const observe = async (paths, archived, hintSessionId) => {
+  const observe = async (paths, archived, discoverySessionId) => {
     for (const rolloutPath of paths) {
       const known = files.get(rolloutPath);
       if (known !== void 0) {
-        if (hintSessionId === void 0) delete known.hintSessionIds;
-        else known.hintSessionIds?.push(hintSessionId);
+        if (discoverySessionId === void 0) delete known.discoverySessionIds;
+        else known.discoverySessionIds?.push(discoverySessionId);
         continue;
       }
       await yieldToEventLoop();
@@ -86904,15 +86932,15 @@ async function collectCodexSessions(options = {}) {
         mtimeMs: stat.mtimeMs,
         changedMs: Math.max(stat.mtimeMs, stat.ctimeMs),
         sizeBytes: stat.size,
-        ...hintSessionId !== void 0 && { hintSessionIds: [hintSessionId] }
+        ...discoverySessionId !== void 0 && { discoverySessionIds: [discoverySessionId] }
       });
     }
   };
   const archiveDir = codexArchivedSessionsDir(sessionsDir);
-  const hintHome = options.homeDir ?? (options.codexDir === void 0 ? os6.homedir() : void 0);
-  if (hintHome !== void 0) {
-    for (const hint of readCodexTranscriptHints(hintHome, [sessionsDir, archiveDir])) {
-      await observe([hint.rolloutPath], hint.archived, hint.sessionId);
+  const discoveryHome = options.homeDir ?? (options.codexDir === void 0 ? os6.homedir() : void 0);
+  if (discoveryHome !== void 0) {
+    for (const record2 of readCodexTranscriptDiscoveryRecords(discoveryHome, [sessionsDir, archiveDir])) {
+      await observe([record2.rolloutPath], record2.archived, record2.sessionId);
     }
   }
   await observe(rolloutFiles(sessionsDir), false);
@@ -86927,17 +86955,17 @@ async function collectCodexSessions(options = {}) {
     const stored = dedupeStoreCopies(observed);
     let externalId = externalIdOf((stored.find((file2) => !file2.identity.page) ?? stored[0]).rolloutPath);
     try {
-      const spoolPath = stored.length > 1 ? path5.join(spoolDir, `${threadId2}.jsonl`) : void 0;
+      const mergedTranscriptPath = stored.length > 1 ? path5.join(mergedTranscriptsDir, `${threadId2}.jsonl`) : void 0;
       const changedMs = Math.max(...stored.map((file2) => file2.changedMs));
       if (options.sinceMs !== void 0 && changedMs < options.sinceMs) {
-        const neverMerged = spoolPath !== void 0 && !options.locationsOnly && statIfExists(spoolPath) === null;
+        const neverMerged = mergedTranscriptPath !== void 0 && !options.locationsOnly && statIfExists(mergedTranscriptPath) === null;
         if (!neverMerged) continue;
       }
       await yieldToEventLoop();
       const named = stored.filter((file2) => {
-        if (file2.hintSessionIds === void 0) return true;
+        if (file2.discoverySessionIds === void 0) return true;
         const { sessionId } = rolloutLocation(file2.rolloutPath);
-        return sessionId !== void 0 && file2.hintSessionIds.includes(sessionId);
+        return sessionId !== void 0 && file2.discoverySessionIds.includes(sessionId);
       });
       if (named.length === 0) continue;
       const threadFiles = named.length > 1 ? orderPages(named) : named;
@@ -86967,7 +86995,7 @@ async function collectCodexSessions(options = {}) {
       const thread = {
         externalId,
         files: threadFiles,
-        ...threadFiles.length > 1 && spoolPath !== void 0 && { spoolPath },
+        ...threadFiles.length > 1 && mergedTranscriptPath !== void 0 && { mergedTranscriptPath },
         mtimeMs,
         archived: threadFiles.every((file2) => file2.archived)
       };
@@ -87017,8 +87045,8 @@ async function collectCodexSessions(options = {}) {
     const { thread, cwd, decision } = candidate;
     let writer;
     try {
-      const rewrite = thread.spoolPath !== void 0 && !mergedSpoolIsFresh(thread.spoolPath, thread.mtimeMs);
-      if (thread.spoolPath !== void 0 && rewrite) writer = new MergedSpoolWriter(thread.spoolPath);
+      const rewrite = thread.mergedTranscriptPath !== void 0 && !mergedTranscriptIsFresh(thread.mergedTranscriptPath, thread.mtimeMs);
+      if (thread.mergedTranscriptPath !== void 0 && rewrite) writer = new MergedTranscriptWriter(thread.mergedTranscriptPath);
       const pages = [];
       const usage = createCodexUsageReader();
       let vanished = false;
@@ -87039,11 +87067,11 @@ async function collectCodexSessions(options = {}) {
         continue;
       }
       const summary = foldRolloutPages(pages, usage.finish());
-      let transcriptPath = thread.files[0].rolloutPath;
-      if (thread.spoolPath !== void 0) {
-        const mergedBytes = writer ? writer.finish(thread.mtimeMs) : statIfExists(thread.spoolPath)?.size ?? 0;
+      let transcriptUploadSourcePath = thread.files[0].rolloutPath;
+      if (thread.mergedTranscriptPath !== void 0) {
+        const mergedBytes = writer ? writer.finish(thread.mtimeMs) : statIfExists(thread.mergedTranscriptPath)?.size ?? 0;
         writer = void 0;
-        transcriptPath = thread.spoolPath;
+        transcriptUploadSourcePath = thread.mergedTranscriptPath;
         mergedThreads += 1;
         largestMergedBytes = Math.max(largestMergedBytes, mergedBytes);
       }
@@ -87052,13 +87080,14 @@ async function collectCodexSessions(options = {}) {
       const title = summary.sessionId ? threadNames.get(summary.sessionId) : void 0;
       items.push({
         mtimeMs: thread.mtimeMs,
-        transcriptPath,
+        transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
           source: "codex",
           externalId: thread.externalId,
           status: now - thread.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
           archived: thread.archived,
+          ...summary.standaloneReview && { automation: true },
           ...summary.startedAt && { startedAt: summary.startedAt },
           ...summary.endedAt && { endedAt: summary.endedAt },
           ...summary.model && { model: summary.model },
@@ -87162,21 +87191,21 @@ function createOmissionRecorder() {
   const count3 = (reason, by = 1) => {
     if (by > 0) counts[reason] = (counts[reason] ?? 0) + by;
   };
-  const shape = (reason, path32, valueType, formatVersion, by = 1) => {
+  const shape = (reason, path33, valueType, formatVersion, by = 1) => {
     if (!REPORTED_REASONS.has(reason)) return;
-    const key = `${path32}\0${reason}\0${valueType}\0${formatVersion ?? ""}`;
+    const key = `${path33}\0${reason}\0${valueType}\0${formatVersion ?? ""}`;
     const group = groups.get(key);
     if (group) group.count += by;
     else if (groups.size < MAX_STRUCTURE_DIAGNOSTICS) {
-      groups.set(key, { path: path32, reason, valueType, count: by, ...formatVersion !== void 0 && { formatVersion } });
+      groups.set(key, { path: path33, reason, valueType, count: by, ...formatVersion !== void 0 && { formatVersion } });
     }
   };
   return {
     count: count3,
     shape,
-    note(reason, path32, valueType, formatVersion) {
+    note(reason, path33, valueType, formatVersion) {
       count3(reason);
-      shape(reason, path32, valueType, formatVersion);
+      shape(reason, path33, valueType, formatVersion);
     },
     absorb(other) {
       for (const [reason, by] of Object.entries(other.omissions())) {
@@ -87219,7 +87248,7 @@ function defaultCursorUserDir(home) {
 function cursorGlobalStorageDir(home) {
   return path6.join(defaultCursorUserDir(home), "globalStorage");
 }
-function cursorSpoolDir(home) {
+function cursorExtractedTranscriptsDir(home) {
   return path6.join(home, ".config", "powerplant", "cursor");
 }
 var emptyResult = () => ({
@@ -87275,7 +87304,7 @@ var cachedMetaSchema = external_exports.object({
   model: external_exports.string().optional(),
   ...cursorTranscriptMetaDisclosureSchema.shape
 });
-function spoolFileName(composerId) {
+function extractedTranscriptFileName(composerId) {
   const sanitized = composerId.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 80);
   const hash2 = createHash2("sha256").update(composerId).digest("hex").slice(0, 8);
   return `${sanitized}-${hash2}.jsonl`;
@@ -87338,7 +87367,7 @@ function toolFilePathOf(args) {
   }
   return void 0;
 }
-var SPOOL_META_RESERVE_BYTES = 64 * 1024;
+var EXTRACTED_TRANSCRIPT_META_RESERVE_BYTES = 64 * 1024;
 var BUBBLE_FIELDS_SHARED = ["_v", "type", "bubbleId", "serverBubbleId", "text", "createdAt"];
 var USER_BUBBLE_FIELDS = /* @__PURE__ */ new Set([...BUBBLE_FIELDS_SHARED, "context"]);
 var ASSISTANT_BUBBLE_FIELDS = /* @__PURE__ */ new Set([
@@ -87416,8 +87445,8 @@ var MODEL_INFO_FIELDS_INTERPRETED = /* @__PURE__ */ new Set(["modelName"]);
 function collectUnfamiliar(record2, interpreted, excluded, prefix, into, recorder, formatVersion) {
   for (const [key, value] of Object.entries(record2)) {
     if (interpreted.has(key) || excluded.has(key)) continue;
-    const path32 = prefix === "" ? key : `${prefix}.${key}`;
-    into.set(path32, value);
+    const path33 = prefix === "" ? key : `${prefix}.${key}`;
+    into.set(path33, value);
     recorder.shape("unsupported", `bubble.${prefix === "" ? "" : `${prefix}.`}${nativeTypeLabel(key) ?? "other"}`, jsonValueType(value), formatVersion);
   }
 }
@@ -87503,8 +87532,8 @@ function bubbleLines(bubble, at, recorder) {
   const formatVersion = typeof bubble._v === "number" || typeof bubble._v === "string" ? String(bubble._v) : void 0;
   if (bubble.type !== 1 && bubble.type !== 2) {
     const nativeType = nativeTypeLabel(String(bubble.type));
-    const path32 = `bubble.type=${nativeType ?? "other"}`;
-    recorder.note("unsupported", path32, jsonValueType(bubble.type), formatVersion);
+    const path33 = `bubble.type=${nativeType ?? "other"}`;
+    recorder.note("unsupported", path33, jsonValueType(bubble.type), formatVersion);
     const retained = Object.fromEntries(Object.entries(bubble).filter(([key]) => !BUBBLE_FIELDS_EXCLUDED.has(key)));
     const bounded = boundUnfamiliarPayload(retained);
     if (bounded.payload === void 0) recorder.count("truncated");
@@ -87582,7 +87611,7 @@ function extractTranscript(db, composerId, maxBytes) {
   const spine = Array.isArray(data?.fullConversationHeadersOnly) ? data.fullConversationHeadersOnly : [];
   if (spine.length === 0) return null;
   const recorder = createOmissionRecorder();
-  const budget = maxBytes - SPOOL_META_RESERVE_BYTES;
+  const budget = maxBytes - EXTRACTED_TRANSCRIPT_META_RESERVE_BYTES;
   const serialized = [];
   const modelCounts = /* @__PURE__ */ new Map();
   let bytes = 0;
@@ -87663,7 +87692,7 @@ async function collectCursorSessions(options = {}) {
       collectCursorTranscriptFiles(options, (id) => {
         if (knownIds.has(id)) return true;
         return db?.prepare("select composerId from composerHeaders where composerId = ?").get(id) != null;
-      }, result, options.spoolDir ?? cursorSpoolDir(options.homeDir ?? os7.homedir()), spoolFileName);
+      }, result, options.extractedTranscriptsDir ?? cursorExtractedTranscriptsDir(options.homeDir ?? os7.homedir()), extractedTranscriptFileName);
     }
   } finally {
     try {
@@ -87677,9 +87706,9 @@ async function collectCursorSessions(options = {}) {
 function collectFromStore(db, userDir, options, result, knownIds) {
   const now = options.now ?? Date.now();
   const capture = options.capture ?? captureEverythingUnresolved;
-  const spoolDir = options.spoolDir ?? cursorSpoolDir(options.homeDir ?? os7.homedir());
+  const extractedTranscriptsDir = options.extractedTranscriptsDir ?? cursorExtractedTranscriptsDir(options.homeDir ?? os7.homedir());
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  let spoolDirReady = false;
+  let extractedTranscriptsDirReady = false;
   const columns = new Set(
     db.prepare("pragma table_info(composerHeaders)").all().map((row) => isRecord2(row) ? row.name : void 0)
   );
@@ -87729,15 +87758,15 @@ function collectFromStore(db, userDir, options, result, knownIds) {
         });
         continue;
       }
-      const spoolPath = path6.join(spoolDir, spoolFileName(raw.composerId));
-      const spoolStat = statIfExists(spoolPath);
+      const transcriptUploadSourcePath = path6.join(extractedTranscriptsDir, extractedTranscriptFileName(raw.composerId));
+      const extractedTranscriptStat = statIfExists(transcriptUploadSourcePath);
       let model;
-      const sourceUnchanged = spoolStat !== null && Math.abs(spoolStat.mtimeMs - lastUpdatedAt) < 1;
-      if (sourceUnchanged && spoolStat.size > maxBytes) {
+      const sourceUnchanged = extractedTranscriptStat !== null && Math.abs(extractedTranscriptStat.mtimeMs - lastUpdatedAt) < 1;
+      if (sourceUnchanged && extractedTranscriptStat.size > maxBytes) {
         result.skippedTooLarge += 1;
         continue;
       }
-      const cached3 = sourceUnchanged ? readFirstRecord(spoolPath, () => true) : null;
+      const cached3 = sourceUnchanged ? readFirstRecord(transcriptUploadSourcePath, () => true) : null;
       const cachedMeta = cachedMetaSchema.safeParse(cached3);
       const preparationCurrent = cachedMeta.success && cachedMeta.data.composerId === raw.composerId;
       let omissions;
@@ -87770,15 +87799,15 @@ function collectFromStore(db, userDir, options, result, knownIds) {
           ...counted && { omissions: transcript.omissions },
           ...unhandled.length > 0 && { unhandled }
         };
-        if (!spoolDirReady) {
-          mkdirSync3(spoolDir, { recursive: true, mode: 448 });
-          chmodSync2(spoolDir, 448);
-          spoolDirReady = true;
+        if (!extractedTranscriptsDirReady) {
+          mkdirSync3(extractedTranscriptsDir, { recursive: true, mode: 448 });
+          chmodSync2(extractedTranscriptsDir, 448);
+          extractedTranscriptsDirReady = true;
         }
         const body = [JSON.stringify(meta3), ...transcript.serialized, ""].join("\n");
-        if (spoolStat !== null) chmodSync2(spoolPath, 384);
-        writeFileSync2(spoolPath, body, { encoding: "utf8", mode: 384 });
-        utimesSync2(spoolPath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
+        if (extractedTranscriptStat !== null) chmodSync2(transcriptUploadSourcePath, 384);
+        writeFileSync2(transcriptUploadSourcePath, body, { encoding: "utf8", mode: 384 });
+        utimesSync2(transcriptUploadSourcePath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
       }
       if (hasCaptureGaps(omissions)) result.partiallyInterpreted += 1;
       for (const observation of unhandledObservations(unhandled, raw.composerId)) {
@@ -87797,7 +87826,7 @@ function collectFromStore(db, userDir, options, result, knownIds) {
       const startBranch = facts.branches[0];
       result.sessions.push({
         mtimeMs: lastUpdatedAt,
-        transcriptPath: spoolPath,
+        transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
           source: "cursor",
@@ -87855,12 +87884,12 @@ var CONTENT_LINE_TYPES2 = /* @__PURE__ */ new Set([
 function parseCursorTranscriptFile(text) {
   const lines = [];
   const recorder = createOmissionRecorder();
-  const retainUnsupported = (record2, at, path32, discriminator) => {
+  const retainUnsupported = (record2, at, path33, discriminator) => {
     const nativeType = nativeTypeLabel(discriminator);
     const bounded = boundUnfamiliarPayload(record2);
     lines.push({ type: "unsupported", ...nativeType !== void 0 && { nativeType }, ...at, ...bounded });
-    recorder.note("unsupported", `${path32}=${nativeType ?? "other"}`, jsonValueType(discriminator));
-    if (bounded.payload === void 0) recorder.note("truncated", `${path32}=${nativeType ?? "other"}`, "object");
+    recorder.note("unsupported", `${path33}=${nativeType ?? "other"}`, jsonValueType(discriminator));
+    if (bounded.payload === void 0) recorder.note("truncated", `${path33}=${nativeType ?? "other"}`, "object");
   };
   text.split("\n").forEach((row, recordIndex) => {
     if (!row.trim()) return;
@@ -87882,8 +87911,8 @@ function parseCursorTranscriptFile(text) {
     }
     const record2 = message.safeParse(value);
     if (!record2.success) {
-      const [path32, discriminator] = typeof value.type === "string" ? ["record.type", value.type] : typeof value.role === "string" ? ["message.role", value.role] : ["record", void 0];
-      retainUnsupported(value, { recordIndex }, path32, discriminator);
+      const [path33, discriminator] = typeof value.type === "string" ? ["record.type", value.type] : typeof value.role === "string" ? ["message.role", value.role] : ["record", void 0];
+      retainUnsupported(value, { recordIndex }, path33, discriminator);
       return;
     }
     const role = record2.data.role;
@@ -87931,7 +87960,7 @@ function parseCursorTranscriptFile(text) {
   if (!lines.some((line) => CONTENT_LINE_TYPES2.has(line.type))) return null;
   return { lines, omissions: recorder.omissions(), unhandled: recorder.unhandled() };
 }
-function spoolBody(metaFor, lines, maxBytes) {
+function extractedTranscriptBody(metaFor, lines, maxBytes) {
   for (const keepPayloads of [true, false]) {
     const payloadsDropped = keepPayloads ? 0 : lines.filter((line) => line.type === "unsupported" && line.payload !== void 0).length;
     const records = [
@@ -87950,7 +87979,7 @@ function spoolBody(metaFor, lines, maxBytes) {
   }
   return null;
 }
-var spoolMetaSchema = external_exports.object({
+var extractedTranscriptMetaSchema = external_exports.object({
   type: external_exports.literal("meta"),
   format: external_exports.literal("cursor-local-transcript"),
   version: external_exports.literal(1),
@@ -87962,7 +87991,7 @@ var spoolMetaSchema = external_exports.object({
   model: external_exports.string().optional(),
   ...cursorTranscriptMetaDisclosureSchema.shape
 });
-var hintSchema2 = external_exports.object({
+var transcriptDiscoveryRecordSchema2 = external_exports.object({
   sessionId: external_exports.string().regex(/^[a-zA-Z0-9_-]{1,200}$/),
   transcriptPath: external_exports.string().max(4096).nullable(),
   workspaceRoots: external_exports.array(external_exports.string().max(4096)).max(8),
@@ -87994,15 +88023,15 @@ function cursorTranscriptRecordPath(home, sessionId) {
     `${createHash3("sha256").update(sessionId).digest("hex")}.json`
   );
 }
-function collectCursorTranscriptFiles(options, isDatabaseSession, result, databaseSpoolDir, spoolName) {
+function collectCursorTranscriptFiles(options, isDatabaseSession, result, databaseExtractedTranscriptsDir, extractedTranscriptFileName2) {
   const home = options.homeDir ?? os8.homedir();
-  const hintsDir = cursorTranscriptRecordsDir(home);
-  if (!existsSync3(hintsDir)) return;
+  const recordsDir = cursorTranscriptRecordsDir(home);
+  if (!existsSync3(recordsDir)) return;
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  const spoolDir = path7.join(databaseSpoolDir, "native");
+  const nativeExtractedTranscriptsDir = path7.join(databaseExtractedTranscriptsDir, "native");
   let files;
   try {
-    files = readdirSync3(hintsDir);
+    files = readdirSync3(recordsDir);
   } catch {
     result.skippedUnreadable++;
     return;
@@ -88010,15 +88039,15 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
   for (const file2 of files) {
     if (!/^[a-f0-9]{64}\.json$/.test(file2)) continue;
     try {
-      const hintPath = path7.join(hintsDir, file2);
-      if (!lstatSync2(hintPath).isFile()) continue;
-      const text = readBounded(hintPath, 40 * 1024);
-      const hint = hintSchema2.parse(text === null ? null : JSON.parse(text));
-      if (file2 !== `${createHash3("sha256").update(hint.sessionId).digest("hex")}.json`) continue;
-      if (isDatabaseSession(hint.sessionId) || existsSync3(path7.join(databaseSpoolDir, spoolName(hint.sessionId))))
+      const recordPath = path7.join(recordsDir, file2);
+      if (!lstatSync2(recordPath).isFile()) continue;
+      const text = readBounded(recordPath, 40 * 1024);
+      const record2 = transcriptDiscoveryRecordSchema2.parse(text === null ? null : JSON.parse(text));
+      if (file2 !== `${createHash3("sha256").update(record2.sessionId).digest("hex")}.json`) continue;
+      if (isDatabaseSession(record2.sessionId) || existsSync3(path7.join(databaseExtractedTranscriptsDir, extractedTranscriptFileName2(record2.sessionId))))
         continue;
-      if (hint.transcriptPath === null || hint.workspaceRoots.length !== 1) continue;
-      const cwd = hint.workspaceRoots[0];
+      if (record2.transcriptPath === null || record2.workspaceRoots.length !== 1) continue;
+      const cwd = record2.workspaceRoots[0];
       if (!path7.isAbsolute(cwd)) continue;
       const decision = captureDecision(cwd, options.capture ?? captureEverythingUnresolved);
       if (!decision.capture) {
@@ -88028,14 +88057,14 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
       const projects = path7.join(home, ".cursor", "projects");
       const project = cwd.replace(/[^a-zA-Z0-9]/g, "-").replace(/^-+/, "");
       const base = path7.join(projects, project, "agent-transcripts");
-      const basename2 = `${hint.sessionId}.jsonl`;
-      const allowed = [path7.join(base, basename2), path7.join(base, hint.sessionId, basename2)];
-      if (!allowed.includes(hint.transcriptPath)) {
+      const basename2 = `${record2.sessionId}.jsonl`;
+      const allowed = [path7.join(base, basename2), path7.join(base, record2.sessionId, basename2)];
+      if (!allowed.includes(record2.transcriptPath)) {
         result.skippedUnreadable++;
         continue;
       }
-      const stat = lstatSync2(hint.transcriptPath);
-      if (!stat.isFile() || realpathSync2(hint.transcriptPath) !== path7.join(realpathSync2(projects), path7.relative(projects, hint.transcriptPath))) {
+      const stat = lstatSync2(record2.transcriptPath);
+      if (!stat.isFile() || realpathSync2(record2.transcriptPath) !== path7.join(realpathSync2(projects), path7.relative(projects, record2.transcriptPath))) {
         result.skippedUnreadable++;
         continue;
       }
@@ -88046,7 +88075,7 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
       }
       const common = {
         source: "cursor",
-        externalId: hint.sessionId,
+        externalId: record2.sessionId,
         status: (options.now ?? Date.now()) - stat.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
         ...decision.repoFullName && { repoFullName: decision.repoFullName },
         capturedVia: decision.via
@@ -88055,15 +88084,15 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
         result.sessions.push({
           cwd,
           mtimeMs: stat.mtimeMs,
-          transcriptPath: hint.transcriptPath,
+          transcriptPath: record2.transcriptPath,
           item: common
         });
         continue;
       }
-      const spool = path7.join(spoolDir, spoolName(hint.sessionId));
-      const spoolStat = statIfExists(spool);
-      const cached3 = spoolStat !== null && spoolStat.size <= maxBytes && Math.abs(spoolStat.mtimeMs - stat.mtimeMs) < 1 ? spoolMetaSchema.safeParse(readFirstRecord(spool, () => true)) : null;
-      const fresh = cached3?.success && cached3.data.composerId === hint.sessionId && cached3.data.workspacePath === cwd && cached3.data.nativeSourceSize === stat.size && cached3.data.model === hint.model;
+      const transcriptUploadSourcePath = path7.join(nativeExtractedTranscriptsDir, extractedTranscriptFileName2(record2.sessionId));
+      const extractedTranscriptStat = statIfExists(transcriptUploadSourcePath);
+      const cached3 = extractedTranscriptStat !== null && extractedTranscriptStat.size <= maxBytes && Math.abs(extractedTranscriptStat.mtimeMs - stat.mtimeMs) < 1 ? extractedTranscriptMetaSchema.safeParse(readFirstRecord(transcriptUploadSourcePath, () => true)) : null;
+      const fresh = cached3?.success && cached3.data.composerId === record2.sessionId && cached3.data.workspacePath === cwd && cached3.data.nativeSourceSize === stat.size && cached3.data.model === record2.model;
       let title;
       let omissions;
       let unhandled = [];
@@ -88072,7 +88101,7 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
         omissions = cached3.data.omissions;
         unhandled = cached3.data.unhandled ?? [];
       } else {
-        const raw = readBounded(hint.transcriptPath, maxBytes);
+        const raw = readBounded(record2.transcriptPath, maxBytes);
         if (raw === null) {
           result.skippedTooLarge++;
           continue;
@@ -88093,40 +88122,40 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
             format: "cursor-local-transcript",
             version: 1,
             preparationVersion: CURSOR_TRANSCRIPT_PREPARATION_VERSION,
-            composerId: hint.sessionId,
+            composerId: record2.sessionId,
             workspacePath: cwd,
             nativeSourceSize: stat.size,
             ...title !== void 0 && { name: title },
-            ...hint.model && { model: hint.model },
+            ...record2.model && { model: record2.model },
             ...Object.keys(written).length > 0 && { omissions: written },
             ...prepared.unhandled.length > 0 && { unhandled: prepared.unhandled }
           };
         };
-        const body = spoolBody(metaFor, prepared.lines, maxBytes);
+        const body = extractedTranscriptBody(metaFor, prepared.lines, maxBytes);
         if (body === null) {
           result.skippedTooLarge++;
           continue;
         }
-        mkdirSync4(spoolDir, { recursive: true, mode: 448 });
-        if (spoolStat !== null) chmodSync3(spool, 384);
-        writeFileSync3(spool, body, { mode: 384 });
-        utimesSync3(spool, stat.atime, stat.mtime);
+        mkdirSync4(nativeExtractedTranscriptsDir, { recursive: true, mode: 448 });
+        if (extractedTranscriptStat !== null) chmodSync3(transcriptUploadSourcePath, 384);
+        writeFileSync3(transcriptUploadSourcePath, body, { mode: 384 });
+        utimesSync3(transcriptUploadSourcePath, stat.atime, stat.mtime);
         omissions = Object.keys(written).length > 0 ? written : void 0;
         unhandled = prepared.unhandled;
       }
       if (hasCaptureGaps(omissions)) result.partiallyInterpreted++;
-      for (const observation of unhandledObservations(unhandled, hint.sessionId)) {
+      for (const observation of unhandledObservations(unhandled, record2.sessionId)) {
         observeStructure(options.onStructureDiagnostic, observation);
       }
       result.sessions.push({
         cwd,
         mtimeMs: stat.mtimeMs,
-        transcriptPath: spool,
+        transcriptPath: transcriptUploadSourcePath,
         item: {
           ...common,
           endedAt: stat.mtime.toISOString(),
           repoDir: path7.basename(cwd),
-          ...hint.model && { model: hint.model },
+          ...record2.model && { model: record2.model },
           ...title !== void 0 && { title }
         }
       });
@@ -88290,7 +88319,7 @@ function observedSessionEnd(entry, mtimeMs) {
   return entry.at;
 }
 
-// ../../apps/collector/src/providerHooks.ts
+// ../../apps/collector/src/harnessHooks.ts
 import {
   existsSync as existsSync5,
   lstatSync as lstatSync3,
@@ -88306,26 +88335,39 @@ var SESSION_CHANGE_HOOK = "powerplant-session-change.mjs";
 var CODEX_TRANSCRIPT_HOOK = "powerplant-codex-transcript.mjs";
 var CURSOR_TRANSCRIPT_HOOK = "powerplant-cursor-transcript.mjs";
 var SESSION_CHANGE_FILENAME = "session-change";
+var SUPPORTED_HOOK_HARNESSES = ["codex-local", "cursor-local"];
 var jsonObject = external_exports.record(external_exports.string(), external_exports.json());
-function providerEvents(provider) {
-  return provider === "cursor" ? ["sessionStart", "sessionEnd", "stop"] : ["SessionStart", "SessionEnd", "Stop"];
+function nativeHarnessName(harness) {
+  switch (harness) {
+    case "codex-local":
+      return "codex";
+    case "cursor-local":
+      return "cursor";
+    default:
+      throw new Error(`unsupported hook harness: ${String(harness)}`);
+  }
+}
+function harnessEvents(harness) {
+  return nativeHarnessName(harness) === "cursor" ? ["sessionStart", "sessionEnd", "stop"] : ["SessionStart", "SessionEnd", "Stop"];
 }
-function providerConfigPath(provider, home) {
-  return path10.join(home, `.${provider}`, "hooks.json");
+function harnessHookConfigPath(harness, home) {
+  const nativeName = nativeHarnessName(harness);
+  return path10.join(home, `.${nativeName}`, "hooks.json");
 }
 var UNUSABLE_CONFIG = "hooks.json contains invalid JSON or an unsupported hook structure";
 var NON_REGULAR_CONFIG = "hooks.json is not a regular file; configure the hook manually";
-function providerHookCommands(provider, text) {
+function harnessHookCommands(harness, text) {
   try {
+    const nativeName = nativeHarnessName(harness);
     const settings = jsonObject.parse(text === null ? {} : JSON.parse(text));
-    if (provider === "cursor" && settings.version !== void 0 && settings.version !== 1) {
+    if (nativeName === "cursor" && settings.version !== void 0 && settings.version !== 1) {
       return { kind: "unusable", reason: "Unsupported Cursor hooks version" };
     }
     const hooks = jsonObject.parse(settings.hooks === void 0 ? {} : settings.hooks);
     const commands = [];
-    for (const event of providerEvents(provider)) {
+    for (const event of harnessEvents(harness)) {
       const entries = external_exports.array(jsonObject).parse(hooks[event] === void 0 ? [] : hooks[event]);
-      const handlers2 = provider === "cursor" ? entries : entries.flatMap((entry) => external_exports.array(jsonObject).parse(entry.hooks));
+      const handlers2 = nativeName === "cursor" ? entries : entries.flatMap((entry) => external_exports.array(jsonObject).parse(entry.hooks));
       const ours = handlers2.filter(isOurHook);
       if (ours.length === 0) return { kind: "missing" };
       for (const hook of ours) {
@@ -88341,20 +88383,21 @@ function isOurHook(hook) {
   const command = hook.command;
   return typeof command === "string" && [SESSION_CHANGE_HOOK, CODEX_TRANSCRIPT_HOOK, CURSOR_TRANSCRIPT_HOOK].some((script) => command.endsWith(`/${script}'`) || command.endsWith(`/${script}"`));
 }
-function mergeProviderHooks(provider, text, command) {
+function mergeHarnessHooks(harness, text, command) {
   try {
+    const nativeName = nativeHarnessName(harness);
     const settings = jsonObject.parse(text === null ? {} : JSON.parse(text));
-    if (provider === "cursor" && settings.version !== void 0 && settings.version !== 1) {
+    if (nativeName === "cursor" && settings.version !== void 0 && settings.version !== 1) {
       return { action: "skip", reason: "Unsupported Cursor hooks version" };
     }
     const hooks = jsonObject.parse(settings.hooks === void 0 ? {} : settings.hooks);
-    for (const event of providerEvents(provider)) {
+    for (const event of harnessEvents(harness)) {
       const entries = external_exports.array(jsonObject).parse(hooks[event] === void 0 ? [] : hooks[event]);
-      const handler = provider === "cursor" ? { command, timeout: 2 } : { type: "command", command, timeout: 2 };
-      const ours = provider === "cursor" ? handler : { hooks: [handler] };
+      const handler = nativeName === "cursor" ? { command, timeout: 2 } : { type: "command", command, timeout: 2 };
+      const ours = nativeName === "cursor" ? handler : { hooks: [handler] };
       const kept = [];
       for (const entry of entries) {
-        if (provider === "cursor") {
+        if (nativeName === "cursor") {
           if (!isOurHook(entry)) kept.push(entry);
           continue;
         }
@@ -88365,7 +88408,7 @@ function mergeProviderHooks(provider, text, command) {
       }
       hooks[event] = [...kept, ours];
     }
-    const next = { ...settings, ...provider === "cursor" ? { version: 1 } : {}, hooks };
+    const next = { ...settings, ...nativeName === "cursor" ? { version: 1 } : {}, hooks };
     if (JSON.stringify(next) === JSON.stringify(settings)) return { action: "unchanged" };
     return { action: "write", text: `${JSON.stringify(next, null, 2)}
 ` };
@@ -88376,42 +88419,47 @@ function mergeProviderHooks(provider, text, command) {
 function shellQuote2(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
-function installProviderHook(provider, home) {
-  const configDir = path10.join(home, `.${provider}`);
-  if (!existsSync5(configDir)) return { provider, settings: "absent" };
-  const configPath = providerConfigPath(provider, home);
+function installHarnessHook(harness, home) {
+  const nativeName = nativeHarnessName(harness);
+  const configDir = path10.join(home, `.${nativeName}`);
+  if (!existsSync5(configDir)) return { provider: nativeName, settings: "absent" };
+  const configPath = harnessHookConfigPath(harness, home);
   let original = null;
   let mode = 384;
   try {
     const stat = lstatSync3(configPath);
-    if (!stat.isFile()) return { provider, settings: "skip", detail: NON_REGULAR_CONFIG };
+    if (!stat.isFile()) {
+      return { provider: nativeName, settings: "skip", detail: NON_REGULAR_CONFIG };
+    }
     mode = stat.mode & 511;
     original = readFileSync6(configPath, "utf8");
   } catch (error63) {
     if (!(error63 instanceof Error && "code" in error63 && error63.code === "ENOENT")) throw error63;
   }
   const hookDir = path10.join(home, ".config", "powerplant", "hooks");
-  const script = provider === "cursor" ? CURSOR_TRANSCRIPT_HOOK : CODEX_TRANSCRIPT_HOOK;
+  const script = nativeName === "cursor" ? CURSOR_TRANSCRIPT_HOOK : CODEX_TRANSCRIPT_HOOK;
   const scriptPath = path10.join(hookDir, script);
-  const merged = mergeProviderHooks(
-    provider,
+  const merged = mergeHarnessHooks(
+    harness,
     original,
     `${shellQuote2(process.execPath)} ${shellQuote2(scriptPath)}`
   );
-  if (merged.action === "skip") return { provider, settings: "skip", detail: merged.reason };
+  if (merged.action === "skip") {
+    return { provider: nativeName, settings: "skip", detail: merged.reason };
+  }
   mkdirSync6(hookDir, { recursive: true });
   writeAtomic(scriptPath, readFileSync6(hookSourcePath(script), "utf8"), 448);
   if (merged.action === "write") {
     const current = existsSync5(configPath) ? readFileSync6(configPath, "utf8") : null;
     if (current !== original)
       return {
-        provider,
+        provider: nativeName,
         settings: "skip",
         detail: "hooks.json changed during installation; restart the collector to retry"
       };
     writeAtomic(configPath, merged.text, mode);
   }
-  return { provider, settings: merged.action };
+  return { provider: nativeName, settings: merged.action };
 }
 function writeAtomic(file2, text, mode) {
   const temporary = `${file2}.${randomUUID()}.tmp`;
@@ -88422,13 +88470,13 @@ function writeAtomic(file2, text, mode) {
     rmSync4(temporary, { force: true });
   }
 }
-function installProviderHooks(home) {
-  return ["codex", "cursor"].map((provider) => {
+function installHarnessHooks(home) {
+  return SUPPORTED_HOOK_HARNESSES.map((harness) => {
     try {
-      return installProviderHook(provider, home);
+      return installHarnessHook(harness, home);
     } catch (error63) {
       return {
-        provider,
+        provider: nativeHarnessName(harness),
         settings: "skip",
         detail: error63 instanceof Error ? error63.message : String(error63)
       };
@@ -88440,7 +88488,7 @@ function installProviderHooks(home) {
 var HOOK_OBSERVATION_GRACE_MS = 2 * 6e4;
 var hookHealthSchema = external_exports.object({
   harness: hookHarnessSchema,
-  /** What this daemon's boot-time install did (installCollectorHooks / installProviderHooks). */
+  /** What this daemon's boot-time install did (installCollectorHooks / installHarnessHooks). */
   install: hookInstallOutcomeSchema,
   /** unverified: no in-scope session started since the install has been
    * judged yet. firing: one carried a hook record. silent: one had none. */
@@ -88469,7 +88517,10 @@ var HARNESS_NAMES = {
   cursor: "Cursor"
 };
 function configPathOf(harness, home) {
-  return harness === "claude" ? claudeSettingsPath(home) : providerConfigPath(harness, home);
+  return harness === "claude" ? claudeSettingsPath(home) : harnessHookConfigPath(localHookHarness(harness), home);
+}
+function localHookHarness(harness) {
+  return harness === "codex" ? "codex-local" : "cursor-local";
 }
 function commandPaths(command) {
   const paths = [];
@@ -88504,7 +88555,7 @@ function inspectHookConfig(harness, home) {
       detail: error63 instanceof Error ? error63.message : String(error63)
     };
   }
-  const read = harness === "claude" ? collectorHookCommands(text) : providerHookCommands(harness, text);
+  const read = harness === "claude" ? collectorHookCommands(text) : harnessHookCommands(localHookHarness(harness), text);
   if (read.kind === "unusable") return { kind: "config-unusable", configPath, detail: read.reason };
   if (read.kind === "missing") return { kind: "entries-missing", configPath };
   for (const command of read.commands) {
@@ -89406,7 +89457,7 @@ async function uploadPreviewRegistration(apiUrl, machineToken, registration) {
 function encodeRawTranscript(text) {
   return gzipSync(redactJsonl(text));
 }
-async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript = (p) => readFileSync9(p, "utf8"), shipped, progress) {
+async function uploadRawSessions(apiUrl, machineToken, transcriptUploadSources, readTranscript = (p) => readFileSync9(p, "utf8"), shipped, progress) {
   const summary = {
     uploaded: 0,
     skippedTooLarge: 0,
@@ -89417,18 +89468,19 @@ async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript
   };
   const initiallyShipped = new Map(shipped);
   let rateLimited;
-  for (const session of collected) {
+  for (const session of transcriptUploadSources) {
     summary.uploaded += await progress?.beforeUpload?.() ?? 0;
-    const acknowledged = shipped?.get(session.transcriptPath);
-    if (acknowledged === session.mtimeMs || acknowledged !== void 0 && acknowledged !== initiallyShipped.get(session.transcriptPath)) {
+    const transcriptUploadSourcePath = session.transcriptPath;
+    const acknowledged = shipped?.get(transcriptUploadSourcePath);
+    if (acknowledged === session.mtimeMs || acknowledged !== void 0 && acknowledged !== initiallyShipped.get(transcriptUploadSourcePath)) {
       summary.skippedUnchanged += 1;
       continue;
     }
     try {
-      const body = encodeRawTranscript(readTranscript(session.transcriptPath));
+      const body = encodeRawTranscript(readTranscript(transcriptUploadSourcePath));
       if (body.byteLength > MAX_RAW_UPLOAD_BYTES) {
         summary.skippedTooLarge += 1;
-        shipped?.set(session.transcriptPath, session.mtimeMs);
+        shipped?.set(transcriptUploadSourcePath, session.mtimeMs);
         continue;
       }
       const query = `source=${session.item.source}&externalId=${encodeURIComponent(session.item.externalId)}`;
@@ -89461,7 +89513,7 @@ async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript
       }
       summary.uploaded += 1;
       progress?.onUploaded?.();
-      shipped?.set(session.transcriptPath, session.mtimeMs);
+      shipped?.set(transcriptUploadSourcePath, session.mtimeMs);
     } catch (error63) {
       if (error63 instanceof RateLimitedError) rateLimited ??= error63;
       summary.failed.push(
@@ -91332,7 +91384,7 @@ function startWatch(config2, homeDir, runtime = { version: "checkout" }) {
     );
     reportCollectorError(error63, "watch-hook-install");
   }
-  for (const hook of installProviderHooks(home)) {
+  for (const hook of installHarnessHooks(home)) {
     hookInstalls[hook.provider] = hook.settings;
     if (hook.settings === "absent") continue;
     if (hook.settings === "skip") {
@@ -91718,6 +91770,7 @@ async function readLocalSessionFacts(sessions, onError2, home = os17.homedir(),
       if (file2 === null || !existsSync9(file2)) continue;
       const db = await openLocalDatabase(file2);
       try {
+        db.prepare("pragma busy_timeout = 250").get();
         const columns = new Set(
           external_exports.array(external_exports.object({ name: external_exports.string() })).parse(db.prepare(`pragma table_info(${store.table})`).all()).map((column) => column.name)
         );
@@ -91786,7 +91839,90 @@ function localSessionKey(session) {
   return JSON.stringify([session.source, session.externalId]);
 }
 
+// src/mcpPreferences.ts
+var preferenceSchema = external_exports.object({
+  optedIn: external_exports.boolean().optional(),
+  dismissedWarning: mcpWarningSchema.optional()
+});
+var preferencesSchema = external_exports.object({
+  version: external_exports.literal(1),
+  clients: external_exports.object({
+    claude: preferenceSchema.optional(),
+    codex: preferenceSchema.optional(),
+    cursor: preferenceSchema.optional()
+  })
+});
+var emptyMcpPreferences = () => ({ version: 1, clients: {} });
+function mcpPreferencesPath(appEnv, home) {
+  return path21.join(collectorStateDir(home), `mcp-preferences-${appEnv}.json`);
+}
+function readMcpPreferences(appEnv, home) {
+  const file2 = mcpPreferencesPath(appEnv, home);
+  try {
+    return preferencesSchema.parse(JSON.parse(readFileSync11(file2, "utf8")));
+  } catch (error63) {
+    if (error63 instanceof Error && "code" in error63 && error63.code === "ENOENT") return emptyMcpPreferences();
+    throw new ExpectedCliError(`Cannot read MCP preferences at ${file2}. Restore or remove that file, then retry.`, { cause: error63 });
+  }
+}
+function writeMcpPreferences(appEnv, preferences, home) {
+  const file2 = mcpPreferencesPath(appEnv, home);
+  mkdirSync10(path21.dirname(file2), { recursive: true });
+  const temporary = `${file2}.${process.pid}.tmp`;
+  writeFileSync9(temporary, JSON.stringify(preferencesSchema.parse(preferences), null, 2), { mode: 384 });
+  renameSync5(temporary, file2);
+}
+function recordMcpChoices(appEnv, offered, selected, home) {
+  const preferences = readMcpPreferences(appEnv, home);
+  for (const client of offered) {
+    preferences.clients[client] = { optedIn: selected.includes(client) };
+  }
+  writeMcpPreferences(appEnv, preferences, home);
+}
+function recordMcpConnectChoices(appEnv, detected, requested, home) {
+  const chosen = requested === void 0 ? detected : detected.filter((client) => requested.has(client));
+  recordMcpChoices(appEnv, chosen, chosen, home);
+}
+function readMcpPreferencesForMenu(appEnv, home) {
+  try {
+    return { mcpPreferences: readMcpPreferences(appEnv, home) };
+  } catch (error63) {
+    if (!(error63 instanceof ExpectedCliError)) throw error63;
+    return { mcpPreferencesError: error63.message };
+  }
+}
+function dismissMcpWarning(appEnv, event, home) {
+  const preferences = readMcpPreferences(appEnv, home);
+  const previous = preferences.clients[event.client];
+  if (previous?.dismissedWarning === event.warning) return false;
+  preferences.clients[event.client] = { ...previous, dismissedWarning: event.warning };
+  writeMcpPreferences(appEnv, preferences, home);
+  return true;
+}
+
+// src/menubarAnalytics.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
+async function reportMenubarEvent(event, credentials, warn2, fetchImpl = fetch) {
+  if (credentials === null) return false;
+  const runId = randomUUID3();
+  let status;
+  try {
+    const response = await fetchImpl(`${credentials.apiUrl}/api/collector/menubar-events`, {
+      method: "POST",
+      headers: { authorization: `Bearer ${credentials.token}`, "content-type": "application/json", ...cliVersionHeaders() },
+      body: JSON.stringify(event),
+      signal: AbortSignal.timeout(3e3)
+    });
+    if (response.ok) return true;
+    status = response.status;
+  } catch {
+  }
+  warn2(JSON.stringify({ level: "warn", runId, operation: "menubar-analytics", outcome: status === void 0 ? "unavailable" : "refused", ...status === void 0 ? {} : { status } }));
+  return false;
+}
+
 // src/clientFailure.ts
+import { constants } from "node:os";
 function clientFailure(error63) {
   if (error63 instanceof ExpectedCliError) {
     return { outcome: "failed", domain: "Powerplant", code: "EXPECTED_CLI_OUTCOME" };
@@ -91804,14 +91940,14 @@ function nativeFailureRecord(error63) {
 
 // src/desktopDiagnostics.ts
 import os19 from "node:os";
-import path22 from "node:path";
+import path23 from "node:path";
 
 // src/memberSessions.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { existsSync as existsSync10 } from "node:fs";
 import { open as open2, readdir as readdir2 } from "node:fs/promises";
 import os18 from "node:os";
-import path21 from "node:path";
+import path22 from "node:path";
 var memberSessionSchema = external_exports.object({
   id: external_exports.string().min(1),
   source: external_exports.string().min(1),
@@ -91928,10 +92064,10 @@ function detectClaudeDesktop(probe) {
   return detectDesktopScheme(["Claude.app"], "claude", probe);
 }
 function detectDesktopScheme(bundles, scheme, probe = { exists: existsSync10, readUrlSchemes: realReadUrlSchemes }) {
-  const roots = ["/Applications", path21.join(os18.homedir(), "Applications")];
+  const roots = ["/Applications", path22.join(os18.homedir(), "Applications")];
   return roots.some(
     (root) => bundles.some((bundle) => {
-      const bundlePath = path21.join(root, bundle);
+      const bundlePath = path22.join(root, bundle);
       return probe.exists(bundlePath) && probe.readUrlSchemes(bundlePath).includes(scheme);
     })
   );
@@ -91941,7 +92077,7 @@ function realReadUrlSchemes(bundlePath) {
   try {
     const json2 = execFileSync4(
       "plutil",
-      ["-extract", "CFBundleURLTypes", "json", "-o", "-", path21.join(bundlePath, "Contents", "Info.plist")],
+      ["-extract", "CFBundleURLTypes", "json", "-o", "-", path22.join(bundlePath, "Contents", "Info.plist")],
       { stdio: ["ignore", "pipe", "ignore"] }
     ).toString();
     const parsed = urlSchemesSchema.safeParse(JSON.parse(json2));
@@ -91960,7 +92096,7 @@ var claudeDesktopSessionSchema = external_exports.object({
    * and still links: the flag must never cost the row its desktop link. */
   isArchived: external_exports.unknown().optional()
 });
-async function readClaudeDesktopSessions(wanted, root = path21.join(os18.homedir(), "Library/Application Support/Claude/claude-code-sessions")) {
+async function readClaudeDesktopSessions(wanted, root = path22.join(os18.homedir(), "Library/Application Support/Claude/claude-code-sessions")) {
   const sessions = /* @__PURE__ */ new Map();
   const ambiguous = /* @__PURE__ */ new Set();
   if (wanted.size === 0) return sessions;
@@ -91971,7 +92107,7 @@ async function readClaudeDesktopSessions(wanted, root = path21.join(os18.homedir
       throw error63;
     });
     for (const entry of entries) {
-      const file2 = path21.join(directory, entry.name);
+      const file2 = path22.join(directory, entry.name);
       if (entry.isDirectory() && depth < 2) {
         await visit3(file2, depth + 1);
       } else if (depth === 2 && entry.isFile() && /^local_.*\.json$/.test(entry.name)) {
@@ -92011,7 +92147,7 @@ function isMissingFile(error63) {
 }
 
 // src/desktopDiagnostics.ts
-async function probeClaudeDesktopSessions(wanted, installed, reportFault, root = path22.join(os19.homedir(), "Library/Application Support/Claude/claude-code-sessions"), read = readClaudeDesktopSessions) {
+async function probeClaudeDesktopSessions(wanted, installed, reportFault, root = path23.join(os19.homedir(), "Library/Application Support/Claude/claude-code-sessions"), read = readClaudeDesktopSessions) {
   if (!installed || wanted.size === 0) {
     return { sessions: /* @__PURE__ */ new Map(), diagnostic: { outcome: "not-needed" } };
   }
@@ -92028,24 +92164,25 @@ async function probeClaudeDesktopSessions(wanted, installed, reportFault, root =
 
 // src/cli.ts
 import { spawn as spawn3 } from "node:child_process";
-import { existsSync as existsSync14, mkdirSync as mkdirSync14, openSync as openSync9, realpathSync as realpathSync5, rmSync as rmSync7 } from "node:fs";
-import path31 from "node:path";
+import { randomUUID as randomUUID4 } from "node:crypto";
+import { existsSync as existsSync14, mkdirSync as mkdirSync15, openSync as openSync9, realpathSync as realpathSync5, rmSync as rmSync7 } from "node:fs";
+import path32 from "node:path";
 import { parseArgs } from "node:util";
 
 // src/connect.ts
 import { execFileSync as execFileSync5, spawnSync } from "node:child_process";
 import {
   existsSync as existsSync11,
-  mkdirSync as mkdirSync10,
+  mkdirSync as mkdirSync11,
   mkdtempSync,
   readdirSync as readdirSync5,
-  readFileSync as readFileSync11,
+  readFileSync as readFileSync12,
   realpathSync as realpathSync4,
   statSync as statSync5,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync10
 } from "node:fs";
 import os20 from "node:os";
-import path23 from "node:path";
+import path24 from "node:path";
 import { emitKeypressEvents } from "node:readline";
 
 // src/agentVersions.ts
@@ -92119,7 +92256,7 @@ function startTimeBudget(totalMs, now = Date.now) {
   return { remainingMs: () => Math.max(0, deadline - now()) };
 }
 function defaultApplicationsDirs(homeDir) {
-  return process.platform === "darwin" ? ["/Applications", path23.join(homeDir, "Applications")] : [];
+  return process.platform === "darwin" ? ["/Applications", path24.join(homeDir, "Applications")] : [];
 }
 function detectClients(options = {}) {
   const homeDir = options.homeDir ?? os20.homedir();
@@ -92147,7 +92284,7 @@ function detectClients(options = {}) {
     clients.push({ client, bin, ...configDir !== void 0 && { configDir } });
   };
   for (const bin of whichAll("claude")) add("claude", bin);
-  const localClaude = path23.join(homeDir, ".local", "bin", "claude");
+  const localClaude = path24.join(homeDir, ".local", "bin", "claude");
   if (existsSync11(localClaude)) add("claude", localClaude);
   for (const bin of desktopClaudeBinaries(homeDir)) add("claude", bin);
   const claudeBins = clients.filter((client) => client.client === "claude" && client.configDir === void 0).map((client) => client.bin);
@@ -92155,12 +92292,12 @@ function detectClients(options = {}) {
     for (const bin of claudeBins) add("claude", bin, configDir);
   }
   for (const bin of whichAll("codex")) add("codex", bin);
-  const localCodex = path23.join(homeDir, ".local", "bin", "codex");
+  const localCodex = path24.join(homeDir, ".local", "bin", "codex");
   if (existsSync11(localCodex)) add("codex", localCodex);
   for (const bin of codexBundleBinaries(applicationsDirs, bundleSeams)) add("codex", bin);
-  const cursorDir = path23.join(homeDir, ".cursor");
-  if (existsSync11(cursorDir) || cursorAppInstalled(applicationsDirs, bundleSeams)) {
-    clients.push({ client: "cursor", bin: path23.join(cursorDir, "mcp.json") });
+  const cursorDir = path24.join(homeDir, ".cursor");
+  if (!options.requireCursorApp && existsSync11(cursorDir) || cursorAppInstalled(applicationsDirs, bundleSeams)) {
+    clients.push({ client: "cursor", bin: path24.join(cursorDir, "mcp.json") });
   }
   return clients;
 }
@@ -92168,7 +92305,7 @@ function claudeConfigHomes(homeDir, env) {
   const homes = [];
   const seen = /* @__PURE__ */ new Set();
   try {
-    seen.add(realpathSync4(path23.join(homeDir, ".claude")));
+    seen.add(realpathSync4(path24.join(homeDir, ".claude")));
   } catch {
   }
   const add = (configDir) => {
@@ -92180,7 +92317,7 @@ function claudeConfigHomes(homeDir, env) {
     }
     if (seen.has(real)) return;
     seen.add(real);
-    homes.push(path23.resolve(configDir));
+    homes.push(path24.resolve(configDir));
   };
   let entries = [];
   try {
@@ -92188,8 +92325,8 @@ function claudeConfigHomes(homeDir, env) {
   } catch {
   }
   for (const entry of entries.sort()) {
-    if (entry.startsWith(".claude-") && existsSync11(path23.join(homeDir, entry, ".claude.json"))) {
-      add(path23.join(homeDir, entry));
+    if (entry.startsWith(".claude-") && existsSync11(path24.join(homeDir, entry, ".claude.json"))) {
+      add(path24.join(homeDir, entry));
     }
   }
   if (env.CLAUDE_CONFIG_DIR) add(env.CLAUDE_CONFIG_DIR);
@@ -92217,7 +92354,7 @@ function appBundles(applicationsDirs, namePrefixes) {
     for (const entry of entries) {
       if (!entry.endsWith(".app")) continue;
       if (!namePrefixes.some((prefix) => entry.startsWith(prefix))) continue;
-      bundles.push(path23.join(dir, entry));
+      bundles.push(path24.join(dir, entry));
     }
   }
   return bundles;
@@ -92237,7 +92374,7 @@ function codexBundleBinaries(applicationsDirs, seams) {
     const infoTimeoutMs = budgetedTimeout(BUNDLE_INFO_TIMEOUT_MS, appDir, seams);
     if (infoTimeoutMs === null) continue;
     if (seams.readBundleInfo(appDir, infoTimeoutMs)?.bundleId !== CODEX_BUNDLE_ID) continue;
-    const bin = path23.join(appDir, "Contents", "Resources", "codex");
+    const bin = path24.join(appDir, "Contents", "Resources", "codex");
     if (!isExecutableFile(bin)) continue;
     if (!signedByTeam(bin, OPENAI_TEAM_ID, "OpenAI", appDir, seams)) continue;
     found.push(bin);
@@ -92249,7 +92386,7 @@ function trustedCursorBundle(appDir, seams) {
   if (infoTimeoutMs === null) return null;
   const info = seams.readBundleInfo(appDir, infoTimeoutMs);
   if (info?.executable === void 0) return null;
-  const bin = path23.join(appDir, "Contents", "MacOS", info.executable);
+  const bin = path24.join(appDir, "Contents", "MacOS", info.executable);
   if (!isExecutableFile(bin)) return null;
   if (!signedByTeam(bin, CURSOR_TEAM_ID, "Cursor", appDir, seams)) return null;
   return info;
@@ -92286,7 +92423,7 @@ var bundleInfoSchema = external_exports.object({
 function realReadBundleInfo(appDir, timeoutMs) {
   const result = spawnSync(
     "plutil",
-    ["-convert", "json", "-o", "-", path23.join(appDir, "Contents", "Info.plist")],
+    ["-convert", "json", "-o", "-", path24.join(appDir, "Contents", "Info.plist")],
     { encoding: "utf8", timeout: timeoutMs }
   );
   if (result.status !== 0) return null;
@@ -92308,14 +92445,14 @@ function realVerifySignature(binPath, teamId, timeoutMs) {
   }).status === 0;
 }
 function desktopClaudeBinaries(homeDir) {
-  const root = path23.join(homeDir, "Library", "Application Support", "Claude", "claude-code");
+  const root = path24.join(homeDir, "Library", "Application Support", "Claude", "claude-code");
   let versions;
   try {
     versions = readdirSync5(root);
   } catch {
     return [];
   }
-  return versions.map((version2) => path23.join(root, version2, "claude.app", "Contents", "MacOS", "claude")).filter((bin) => existsSync11(bin));
+  return versions.map((version2) => path24.join(root, version2, "claude.app", "Contents", "MacOS", "claude")).filter((bin) => existsSync11(bin));
 }
 function defaultWhichAll(name) {
   try {
@@ -92437,7 +92574,9 @@ async function pickAgents(clients, deps) {
   const kept = new Set(selected);
   const skippedNames = products.filter((product) => !kept.has(product)).map((product) => AGENT_DISPLAY_NAMES[product]);
   if (skippedNames.length > 0) deps.log(`Skipping ${skippedNames.join(" and ")}.`);
-  return clients.filter((client) => kept.has(client.client));
+  const chosen = clients.filter((client) => kept.has(client.client));
+  deps.onChoice?.(chosen);
+  return chosen;
 }
 function realCheckboxPrompt(question, choices, seams = {}) {
   const input2 = seams.input ?? process.stdin;
@@ -92908,7 +93047,9 @@ function runDisconnect(clients, deps) {
     const results = [...groupByConnectionTarget(candidates).values()].map(
       (targetCandidates) => disconnectTarget(agent, targetCandidates, deps)
     );
-    outcome[aggregateDisconnectTargets(results)] += 1;
+    const state = aggregateDisconnectTargets(results);
+    outcome[state] += 1;
+    if (state !== "failed") deps.onDisconnected?.(agent);
   }
   return outcome;
 }
@@ -93014,11 +93155,11 @@ function anyClientStillConnected(clients, deps) {
   });
 }
 function describeBinary(bin) {
-  return `${path23.basename(bin)} (${bin.replace(os20.homedir(), "~")})`;
+  return `${path24.basename(bin)} (${bin.replace(os20.homedir(), "~")})`;
 }
 function describeClaudeTarget(client) {
   if (client.configDir === void 0) return describeBinary(client.bin);
-  return `${path23.basename(client.bin)} (${client.configDir.replace(os20.homedir(), "~")})`;
+  return `${path24.basename(client.bin)} (${client.configDir.replace(os20.homedir(), "~")})`;
 }
 var FAILURE_DETAIL_MAX_CHARS = 200;
 function describeFailure(result) {
@@ -93031,7 +93172,7 @@ function describeFailure(result) {
 }
 var neutralDirMemo;
 function neutralWorkdir() {
-  neutralDirMemo ??= mkdtempSync(path23.join(os20.tmpdir(), "powerplant-connect-"));
+  neutralDirMemo ??= mkdtempSync(path24.join(os20.tmpdir(), "powerplant-connect-"));
   return neutralDirMemo;
 }
 async function fetchOfficialClients(apiUrl, log3) {
@@ -93061,25 +93202,25 @@ async function fetchOfficialClients(apiUrl, log3) {
 }
 function realReadTextFile(filePath) {
   try {
-    return readFileSync11(filePath, "utf8");
+    return readFileSync12(filePath, "utf8");
   } catch {
     return null;
   }
 }
 function realReadTextFileStrict(filePath) {
   try {
-    return readFileSync11(filePath, "utf8");
+    return readFileSync12(filePath, "utf8");
   } catch (error63) {
     if (error63 instanceof Error && error63.code === "ENOENT") return null;
     throw error63;
   }
 }
 function realWriteTextFile(filePath, content) {
-  mkdirSync10(path23.dirname(filePath), { recursive: true });
-  writeFileSync9(filePath, content);
+  mkdirSync11(path24.dirname(filePath), { recursive: true });
+  writeFileSync10(filePath, content);
 }
 function codexConfigPath(homeDir = os20.homedir()) {
-  return path23.join(process.env.CODEX_HOME ?? path23.join(homeDir, ".codex"), "config.toml");
+  return path24.join(process.env.CODEX_HOME ?? path24.join(homeDir, ".codex"), "config.toml");
 }
 function realOpenUrl(url2) {
   const bin = process.platform === "darwin" ? "open" : process.platform === "linux" ? "xdg-open" : null;
@@ -93140,8 +93281,8 @@ function realRunInteractive(bin, args, env) {
 
 // src/connections.ts
 import { execFileSync as execFileSync6, spawnSync as spawnSync2 } from "node:child_process";
-import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync10 } from "node:fs";
-import path24 from "node:path";
+import { mkdirSync as mkdirSync12, writeFileSync as writeFileSync11 } from "node:fs";
+import path25 from "node:path";
 function probeConnections(clients, deps) {
   const reports = [];
   for (const kind of ["claude", "codex", "cursor"]) {
@@ -93185,7 +93326,7 @@ function aggregateClaudeTargets(targets) {
   if (targets.length === 1 || worst.report.state === "signed-in") return worst.report;
   return {
     ...worst.report,
-    target: worst.configDir === void 0 ? "default profile" : path24.basename(worst.configDir)
+    target: worst.configDir === void 0 ? "default profile" : path25.basename(worst.configDir)
   };
 }
 function probeClient(client, deps) {
@@ -93264,12 +93405,12 @@ var detectedClientsSchema = external_exports.object({
   )
 });
 function detectedClientsPath(homeDir) {
-  return path24.join(collectorStateDir(homeDir), "detected-clients.json");
+  return path25.join(collectorStateDir(homeDir), "detected-clients.json");
 }
 function saveDetectedClients(clients, pathValue, homeDir) {
   try {
     const file2 = detectedClientsPath(homeDir);
-    mkdirSync11(path24.dirname(file2), { recursive: true });
+    mkdirSync12(path25.dirname(file2), { recursive: true });
     const record2 = {
       detectedAt: (/* @__PURE__ */ new Date()).toISOString(),
       path: pathValue,
@@ -93279,7 +93420,7 @@ function saveDetectedClients(clients, pathValue, homeDir) {
         ...configDir !== void 0 && { configDir }
       }))
     };
-    writeFileSync10(file2, JSON.stringify(record2, null, 2));
+    writeFileSync11(file2, JSON.stringify(record2, null, 2));
   } catch {
   }
 }
@@ -93301,7 +93442,7 @@ function mergeDetectedClients(detected, saved, exists) {
   const known = new Set(detected.map(key));
   const revived = saved.clients.filter((client) => {
     const clientKey = key(client);
-    if (known.has(clientKey) || client.bin.includes(".app/") || !exists(client.bin) || client.configDir !== void 0 && !exists(client.configDir)) {
+    if (known.has(clientKey) || client.client === "cursor" || client.bin.includes(".app/") || !exists(client.bin) || client.configDir !== void 0 && !exists(client.configDir)) {
       return false;
     }
     known.add(clientKey);
@@ -93356,7 +93497,7 @@ function whichAllWith(pathValue) {
 import { closeSync as closeSync7, fstatSync, openSync as openSync7, readSync as readSync5 } from "node:fs";
 
 // src/update.ts
-import path26 from "node:path";
+import path27 from "node:path";
 
 // src/duration.ts
 function duration3(ms) {
@@ -93374,11 +93515,11 @@ function ago(ms) {
 }
 
 // src/installOwner.ts
-import { accessSync, constants as constants2, readFileSync as readFileSync12 } from "node:fs";
-import path25 from "node:path";
+import { accessSync, constants as constants2, readFileSync as readFileSync13 } from "node:fs";
+import path26 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = true ? "0.4.12" : "0.0.0-checkout";
+var CLI_VERSION = true ? "0.4.14" : "0.0.0-checkout";
 var CLI_RELEASE_BUILD = true ? true : false;
 var CLI_PACKAGE_NAME = "@usepowerplant/cli";
 
@@ -93402,13 +93543,13 @@ function inspectInstall(entryPath2, env) {
       inPlace: { ok: false, reason: `the install at ${packageDir} isn't a layout this CLI recognises` }
     };
   }
-  const modulesDir = path25.dirname(path25.dirname(packageDir));
-  const prefix = manager === "npm" ? path25.dirname(path25.dirname(modulesDir)) : null;
+  const modulesDir = path26.dirname(path26.dirname(packageDir));
+  const prefix = manager === "npm" ? path26.dirname(path26.dirname(modulesDir)) : null;
   const group = /^(.*\/global\/v11\/[^/]+)\/node_modules\//.exec(packageDir)?.[1];
   if (manager === "pnpm" && group !== void 0) {
     let dependencies = [];
     try {
-      const raw = env.readTextFile?.(path25.join(group, "package.json"));
+      const raw = env.readTextFile?.(path26.join(group, "package.json"));
       const manifest = external_exports.object({ dependencies: external_exports.record(external_exports.string(), external_exports.string()) }).parse(JSON.parse(raw ?? "null"));
       dependencies = Object.keys(manifest.dependencies);
     } catch {
@@ -93435,7 +93576,7 @@ function detectManager(packageDir, pnpmHome) {
   return null;
 }
 function linkedEntryPath(realEntryPath, invokedEntryPath) {
-  if (invokedEntryPath !== void 0 && /\/global\/v11\/[^/]+\/node_modules\//.test(invokedEntryPath) && invokedEntryPath.endsWith(`${PACKAGE_SEGMENT}dist/cli.js`)) return path25.normalize(invokedEntryPath);
+  if (invokedEntryPath !== void 0 && /\/global\/v11\/[^/]+\/node_modules\//.test(invokedEntryPath) && invokedEntryPath.endsWith(`${PACKAGE_SEGMENT}dist/cli.js`)) return path26.normalize(invokedEntryPath);
   const store = realEntryPath.lastIndexOf("/.pnpm/");
   if (store === -1) return realEntryPath;
   const at = realEntryPath.indexOf(PACKAGE_SEGMENT, store);
@@ -93462,7 +93603,7 @@ function manualUpdateCommand(manager, version2, prefix = null, channel3 = "lates
   return [bin, ...args].join(" ");
 }
 function installedVersion(packageDir, readTextFile) {
-  const raw = readTextFile(path25.join(packageDir, "package.json"));
+  const raw = readTextFile(path26.join(packageDir, "package.json"));
   if (raw === null) return null;
   try {
     const parsed = JSON.parse(raw);
@@ -93479,7 +93620,7 @@ function realInspectEnvironment() {
     pnpmHome: process.env.PNPM_HOME,
     readTextFile: (file2) => {
       try {
-        return readFileSync12(file2, "utf8");
+        return readFileSync13(file2, "utf8");
       } catch (error63) {
         if (error63 instanceof Error && "code" in error63 && error63.code === "ENOENT") return null;
         throw error63;
@@ -93498,7 +93639,13 @@ function realInspectEnvironment() {
 
 // src/update.ts
 var updateProgressSchema = external_exports.object({
-  state: external_exports.enum(["installing", "failed"]),
+  /** "up-to-date": the last run installed nothing, because this build is
+   * already at or past the release. That record is kept only so the menu
+   * bar app that started the run can stop showing "Updating CLI…"
+   * (menu.ts cliUpToDateAt); to every other reader it is no update at all.
+   * A CLI from before this state rejects the record, which it reads as no
+   * record. */
+  state: external_exports.enum(["installing", "failed", "up-to-date"]),
   /** The release aimed at; null when the registry couldn't be asked (its latest). */
   target: external_exports.string().nullable(),
   startedAt: external_exports.string(),
@@ -93522,10 +93669,10 @@ function releaseNotServed(managerOutput) {
   return /\bETARGET\b|\bnotarget\b|ERR_PNPM_NO_MATCHING_VERSION/.test(managerOutput);
 }
 function updateProgressPath(homeDir) {
-  return path26.join(collectorStateDir(homeDir), "cli-update.json");
+  return path27.join(collectorStateDir(homeDir), "cli-update.json");
 }
 function updateLogPath(homeDir) {
-  return path26.join(collectorStateDir(homeDir), "cli-update.log");
+  return path27.join(collectorStateDir(homeDir), "cli-update.log");
 }
 function readUpdateProgress(readTextFile, file2 = updateProgressPath()) {
   const raw = readTextFile(file2);
@@ -93538,7 +93685,7 @@ function readUpdateProgress(readTextFile, file2 = updateProgressPath()) {
   }
 }
 function updateProgressView(progress, cliVersion2, now) {
-  if (progress === null) return { kind: "none" };
+  if (progress === null || progress.state === "up-to-date") return { kind: "none" };
   const reached = progress.target === null ? null : compareReleaseVersions(cliVersion2, progress.target);
   if (reached === 0 || reached === 1) return { kind: "none" };
   if (progress.state === "failed") {
@@ -93571,13 +93718,29 @@ async function runUpdate(deps) {
   const reserved = running?.state === "installing" ? running.target : null;
   const attempts = (release2) => running?.target === release2 && running.attempts !== void 0 ? { attempts: running.attempts } : {};
   deps.writeProgress({ state: "installing", target: reserved, startedAt, pid: deps.pid, ...attempts(reserved) });
-  const target = await deps.resolveTarget() ?? reserved;
+  const resolved = await deps.resolveTarget();
+  if (resolved !== null) deps.recordAvailableVersion(resolved);
+  const target = resolved ?? reserved;
   if (target === null && deps.targetRequired) {
     deps.clearProgress();
     throw new ExpectedCliError(
       "No release is promoted for production right now (or the API couldn't be reached), so there is nothing to update to. Production machines only install the promoted release."
     );
   }
+  const reached = target === null ? null : compareReleaseVersions(deps.cliVersion, target);
+  if (reached === 0 || reached === 1) {
+    deps.writeProgress({
+      state: "up-to-date",
+      target,
+      startedAt,
+      pid: deps.pid,
+      finishedAt: new Date(deps.now()).toISOString()
+    });
+    deps.log(
+      reached === 0 ? `Already up to date (v${deps.cliVersion}).` : `Already on v${deps.cliVersion}, newer than the available release (v${target}). Nothing was installed.`
+    );
+    return;
+  }
   deps.writeProgress({ state: "installing", target, startedAt, pid: deps.pid, ...attempts(target) });
   const { bin, args } = updateCommand(manager, target, inspection.prefix, deps.channel);
   deps.log(`Updating ${CLI_PACKAGE_NAME}${target === null ? "" : ` to ${target}`} via ${manager}\u2026`);
@@ -93739,13 +93902,13 @@ function redactedLogTail(raw) {
   while (lines.length > 0 && lines[lines.length - 1]?.trim() === "") lines.pop();
   return lines.slice(-DOCTOR_LOG_TAIL_LINES);
 }
-function readDoctorLogTail(path32) {
+function readDoctorLogTail(path33) {
   let fd;
   try {
-    fd = openSync7(path32, "r");
+    fd = openSync7(path33, "r");
   } catch (error63) {
-    if (error63.code === "ENOENT") return { path: path32, lines: null };
-    return { path: path32, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
+    if (error63.code === "ENOENT") return { path: path33, lines: null };
+    return { path: path33, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
   }
   try {
     const size = fstatSync(fd).size;
@@ -93754,9 +93917,9 @@ function readDoctorLogTail(path32) {
     readSync5(fd, buffer, 0, buffer.length, offset);
     let text = buffer.toString("utf8");
     if (offset > 0) text = text.slice(text.indexOf("\n") + 1);
-    return { path: path32, lines: redactedLogTail(text) };
+    return { path: path33, lines: redactedLogTail(text) };
   } catch (error63) {
-    return { path: path32, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
+    return { path: path33, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
   } finally {
     closeSync7(fd);
   }
@@ -94313,7 +94476,7 @@ async function realPromptLine(question) {
 }
 
 // src/menu.ts
-import path27 from "node:path";
+import path28 from "node:path";
 var MENU_CONTRACT = 1;
 var CLIENT_NAMES = { claude: "Claude Code", codex: "Codex", cursor: "Cursor" };
 function renderMenu(i) {
@@ -94329,13 +94492,22 @@ function renderMenu(i) {
     more.push({ type: "section", title: "Agents authorized for MCP" });
     for (const connection of i.connections) {
       const { row, action, warns } = connectionRow(connection, envArgs);
-      if (warns) {
+      const preference = i.mcpPreferences?.clients[connection.client];
+      const eligible = warns && (connection.state !== "not-connected" || preference?.optedIn === true);
+      const visible = eligible && preference?.dismissedWarning !== connection.state;
+      const dismiss = i.mcpPreferencesError === void 0 ? {
+        type: "action",
+        title: `Dismiss ${CLIENT_NAMES[connection.client]} warning`,
+        run: ["dismiss-mcp-warning", connection.client, connection.state, ...envArgs]
+      } : void 0;
+      if (visible) {
         attention = true;
-        items.push(row);
+        items.push({ ...row, ...dismiss && { dismiss } });
         if (action) items.push(action);
       }
-      more.push(row);
+      more.push(warns && !visible ? { ...row, mark: "muted" } : row);
       if (action) more.push(action);
+      if (visible && dismiss) more.push(dismiss);
     }
     more.push({ type: "separator" });
   }
@@ -94361,6 +94533,11 @@ function renderMenu(i) {
     items.push({ type: "action", title: "Restart background sync\u2026", terminal: ["restart", ...envArgs] });
     items.push({ type: "separator" });
   }
+  if (i.mcpPreferencesError !== void 0) {
+    items.push(problem("MCP choices can't be read", "Restore or remove the preferences file."));
+    items.push({ type: "action", title: "Copy MCP repair details", copy: i.mcpPreferencesError });
+    items.push({ type: "separator" });
+  }
   if (i.credentialsError !== void 0) {
     items.push(problem("Stored enrollment can't be read", i.credentialsError));
     items.push({ type: "action", title: "Enroll Again\u2026", terminal: ["init", ...envArgs] });
@@ -94422,6 +94599,7 @@ function renderMenu(i) {
         logPath: updateLogPath()
       }
     },
+    ...i.update.progress?.state === "up-to-date" && { cliUpToDateAt: i.update.progress.finishedAt },
     ...i.desktopDiagnostic && { desktopDiagnostic: i.desktopDiagnostic },
     appEnv: i.config.appEnv,
     cliVersion: i.cliVersion,
@@ -94594,6 +94772,12 @@ function agentRow(session, i) {
     agent.harness = {
       type: "action",
       title: links.extra.label,
+      reportClick: [
+        "report-agent-click",
+        isSessionSource(session.source) ? session.source : "unknown",
+        "focus" in links.extra ? "focus" : "terminal" in links.extra ? "resume" : /^(codex|claude):/.test(links.extra.url) ? "desktop" : "web",
+        ...envArgs
+      ],
       ..."url" in links.extra ? { url: links.extra.url } : {
         ..."focus" in links.extra && { focus: links.extra.focus },
         terminal: [...links.extra.terminal, ...envArgs]
@@ -94710,7 +94894,7 @@ function daemonVersionNote(i) {
 }
 var VERSION_CACHE_TTL_MS = 60 * 6e4;
 function versionCachePath(homeDir, source = "npm") {
-  return path27.join(collectorStateDir(homeDir), source === "npm" ? "version-check.json" : "version-check-promoted.json");
+  return path28.join(collectorStateDir(homeDir), source === "npm" ? "version-check.json" : "version-check-promoted.json");
 }
 async function cachedLatestVersion(options) {
   const raw = options.readTextFile(options.cacheFile);
@@ -94725,21 +94909,24 @@ async function cachedLatestVersion(options) {
     }
   }
   const version2 = await options.fetchLatest();
+  writeVersionCache({ ...options, version: version2 });
+  return version2;
+}
+function writeVersionCache(options) {
   try {
     options.writeTextFile(
       options.cacheFile,
-      JSON.stringify({ checkedAt: new Date(options.now).toISOString(), version: version2 })
+      JSON.stringify({ checkedAt: new Date(options.now).toISOString(), version: options.version })
     );
   } catch {
   }
-  return version2;
 }
 
 // src/liveTerminalSessions.ts
 import { execFileSync as execFileSync7 } from "node:child_process";
 import { readdir as readdir3, readFile as readFile2 } from "node:fs/promises";
 import os21 from "node:os";
-import path28 from "node:path";
+import path29 from "node:path";
 var sessionFileAsObserved = external_exports.looseObject({
   pid: external_exports.number().int().positive(),
   sessionId: external_exports.string().min(1),
@@ -94748,7 +94935,7 @@ var sessionFileAsObserved = external_exports.looseObject({
 var START_TIME_TOLERANCE_MS = 3e4;
 var SESSION_FILE = /^(\d+)\.json$/;
 function claudeSessionsDir(homeDir = os21.homedir()) {
-  return path28.join(homeDir, ".claude", "sessions");
+  return path29.join(homeDir, ".claude", "sessions");
 }
 async function readLiveTerminalSessions(wanted, deps = {}) {
   const found = /* @__PURE__ */ new Map();
@@ -94773,7 +94960,7 @@ async function readLiveTerminalSessions(wanted, deps = {}) {
       }
       continue;
     }
-    const session = await readSessionFile(path28.join(sessionsDir, entry), report2);
+    const session = await readSessionFile(path29.join(sessionsDir, entry), report2);
     if (session === null) continue;
     if (session.pid !== Number(match[1])) {
       report2({
@@ -94811,7 +94998,7 @@ async function readSessionFile(file2, report2) {
   report2({
     operation: "claude-session-registry-shape",
     message: "A Claude Code session file has a shape this CLI can't read",
-    context: { file: path28.basename(file2), shape: describeShape(raw) }
+    context: { file: path29.basename(file2), shape: describeShape(raw) }
   });
   return null;
 }
@@ -95230,8 +95417,8 @@ function createTerminalOutput(options) {
 
 // src/credentialUpgrade.ts
 import { spawn as spawn2 } from "node:child_process";
-import { closeSync as closeSync8, mkdirSync as mkdirSync12, openSync as openSync8 } from "node:fs";
-import path29 from "node:path";
+import { closeSync as closeSync8, mkdirSync as mkdirSync13, openSync as openSync8 } from "node:fs";
+import path30 from "node:path";
 async function prepareCredentialUpgrade(deps) {
   if (!deps.needsMigration() || !deps.serviceExists() || deps.ready()) return "ready";
   if (deps.installing()) return "busy";
@@ -95264,7 +95451,7 @@ async function prepareCredentialUpgrade(deps) {
   }
 }
 async function tryCredentialUpgradeLock(file2) {
-  mkdirSync12(path29.dirname(file2), { recursive: true, mode: 448 });
+  mkdirSync13(path30.dirname(file2), { recursive: true, mode: 448 });
   closeSync8(openSync8(file2, "a", 384));
   const child = spawn2("/usr/bin/lockf", ["-k", "-s", "-t", "0", file2, "/bin/sh", "-c", "printf 'ready\\n'; exec /bin/cat >/dev/null"], {
     detached: true,
@@ -95382,9 +95569,9 @@ async function tryCredentialUpgradeLock(file2) {
 }
 
 // src/menubarApp.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync13, renameSync as renameSync5, rmSync as rmSync6 } from "node:fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync14, renameSync as renameSync6, rmSync as rmSync6 } from "node:fs";
 import os22 from "node:os";
-import path30 from "node:path";
+import path31 from "node:path";
 import { spawnSync as spawnSync4 } from "node:child_process";
 var MENUBAR_APP_ZIP = "dist/menubar/Powerplant.app.zip";
 var MENUBAR_APP_NAME = "Powerplant.app";
@@ -95423,13 +95610,13 @@ async function syncMenubarApp(ops, context2) {
 }
 function realMenubarAppOps(input2) {
   const home = input2.homeDir ?? os22.homedir();
-  const userAppPath = path30.join(home, "Applications", MENUBAR_APP_NAME);
-  const candidates = [userAppPath, path30.join("/Applications", MENUBAR_APP_NAME)];
+  const userAppPath = path31.join(home, "Applications", MENUBAR_APP_NAME);
+  const candidates = [userAppPath, path31.join("/Applications", MENUBAR_APP_NAME)];
   return {
     cliVersion: input2.cliVersion,
     packagedZip: () => {
       if (input2.packageDir === null) return null;
-      const zip = path30.join(input2.packageDir, MENUBAR_APP_ZIP);
+      const zip = path31.join(input2.packageDir, MENUBAR_APP_ZIP);
       return existsSync13(zip) ? zip : null;
     },
     installedApp: () => {
@@ -95449,10 +95636,10 @@ function realMenubarAppOps(input2) {
       throw new Error(`the running app at ${appPath} did not quit`);
     },
     replace: (zip, appPath) => {
-      const parent = path30.dirname(appPath);
-      mkdirSync13(parent, { recursive: true });
-      const staging = path30.join(parent, `.${MENUBAR_APP_NAME}.swap-${process.pid}`);
-      const retired = path30.join(parent, `.${MENUBAR_APP_NAME}.old-${process.pid}`);
+      const parent = path31.dirname(appPath);
+      mkdirSync14(parent, { recursive: true });
+      const staging = path31.join(parent, `.${MENUBAR_APP_NAME}.swap-${process.pid}`);
+      const retired = path31.join(parent, `.${MENUBAR_APP_NAME}.old-${process.pid}`);
       rmSync6(staging, { recursive: true, force: true });
       rmSync6(retired, { recursive: true, force: true });
       try {
@@ -95462,16 +95649,16 @@ function realMenubarAppOps(input2) {
             `ditto could not extract ${zip} (${extract.stderr?.toString().trim() || `exit ${extract.status}`})`
           );
         }
-        const extracted = path30.join(staging, MENUBAR_APP_NAME);
-        if (!existsSync13(path30.join(extracted, "Contents", "Info.plist"))) {
+        const extracted = path31.join(staging, MENUBAR_APP_NAME);
+        if (!existsSync13(path31.join(extracted, "Contents", "Info.plist"))) {
           throw new Error(`${zip} does not contain ${MENUBAR_APP_NAME}`);
         }
         const hadOld = existsSync13(appPath);
-        if (hadOld) renameSync5(appPath, retired);
+        if (hadOld) renameSync6(appPath, retired);
         try {
-          renameSync5(extracted, appPath);
+          renameSync6(extracted, appPath);
         } catch (error63) {
-          if (hadOld) renameSync5(retired, appPath);
+          if (hadOld) renameSync6(retired, appPath);
           throw error63;
         }
       } finally {
@@ -95491,7 +95678,7 @@ function realMenubarAppOps(input2) {
   };
 }
 function appProcessIds(appPath) {
-  const executable = path30.join(appPath, "Contents", "MacOS", "PowerplantMenubar");
+  const executable = path31.join(appPath, "Contents", "MacOS", "PowerplantMenubar");
   const result = spawnSync4("ps", ["-axo", "pid=,comm="], { encoding: "utf8" });
   if (result.status !== 0) {
     throw new Error(`ps could not list processes (${result.error?.message ?? `exit ${result.status}`})`);
@@ -95520,10 +95707,10 @@ var workspaceSchema = external_exports.object({
   active: external_exports.boolean()
 });
 var FETCH_TIMEOUT_MS2 = 1e4;
-async function callApi(credentials, path32, init3, fetchImpl) {
+async function callApi(credentials, path33, init3, fetchImpl) {
   let response;
   try {
-    response = await fetchImpl(`${credentials.apiUrl}${path32}`, {
+    response = await fetchImpl(`${credentials.apiUrl}${path33}`, {
       ...init3,
       headers: {
         authorization: `Bearer ${credentials.token}`,
@@ -95542,7 +95729,7 @@ async function callApi(credentials, path32, init3, fetchImpl) {
     );
   }
   if (!response.ok) {
-    throw new ExpectedCliError(`Powerplant answered ${response.status} for ${path32}.`);
+    throw new ExpectedCliError(`Powerplant answered ${response.status} for ${path33}.`);
   }
   return response.json();
 }
@@ -95759,7 +95946,7 @@ ${USAGE}`);
       install: () => {
         installService(config2, watchCommand(config2));
       },
-      tryLock: () => tryCredentialUpgradeLock(path31.join(collectorStateDir(), `credential-upgrade-${config2.appEnv}.lock`)),
+      tryLock: () => tryCredentialUpgradeLock(path32.join(collectorStateDir(), `credential-upgrade-${config2.appEnv}.lock`)),
       now: Date.now,
       sleep: () => new Promise((resolve2) => setTimeout(resolve2, 250)),
       restartCommand: `powerplant restart${config2.appEnv === "production" ? "" : ` --env ${config2.appEnv}`}`,
@@ -95806,6 +95993,9 @@ ${USAGE}`);
     const detected = detectClients({ warn: log3 });
     saveDetectedClients(detected, process.env.PATH ?? "");
     let clients = clientFilter === void 0 ? detected : detected.filter((client) => clientFilter.has(client.client));
+    if (!pickerOn || clientFilter !== void 0) {
+      recordMcpConnectChoices(config2.appEnv, detected.map((client) => client.client), clientFilter);
+    }
     if (clientFilter !== void 0 && clients.length === 0) {
       log3(
         `No ${[...clientFilter].join(" or ")} installation found on this machine, nothing to connect.`
@@ -95822,7 +96012,11 @@ ${USAGE}`);
     }
     let skipped = 0;
     if (pickerOn && clientFilter === void 0 && clients.length > 0) {
-      clients = await pickAgents(clients, { log: log3, promptCheckboxes: realCheckboxPrompt });
+      clients = await pickAgents(clients, {
+        log: log3,
+        promptCheckboxes: realCheckboxPrompt,
+        onChoice: (selected) => recordMcpChoices(config2.appEnv, detected.map((client) => client.client), selected.map((client) => client.client))
+      });
       skipped = agentCount(detected) - agentCount(clients);
       if (clients.length === 0) {
         log3(`Powerplant MCP wasn't added to any agents. Run any time: ${connectCommand}`);
@@ -95926,6 +96120,7 @@ ${USAGE}`);
         return;
       }
       const outcome = runDisconnect(clients, {
+        onDisconnected: (client) => recordMcpChoices(config2.appEnv, [client], []),
         log: console.log,
         serverName: mcpServerNameFor(config2.appEnv),
         disconnectCommand,
@@ -96012,8 +96207,9 @@ The access you granted these agents stays on your Powerplant account until you r
       const budget = menuBudget;
       const saved = loadDetectedClients(realReadTextFile);
       const probePath = mergedPath(process.env.PATH, saved);
+      const detected = detectClients({ whichAll: whichAllWith(probePath), budget, requireCursorApp: process.platform === "darwin" });
       const clients = mergeDetectedClients(
-        detectClients({ whichAll: whichAllWith(probePath), budget }),
+        detected,
         saved,
         existsSync14
       );
@@ -96059,6 +96255,7 @@ The access you granted these agents stays on your Powerplant account until you r
         control: readCollectorControl(config2.appEnv),
         latestVersion,
         oldestSupportedVersion,
+        ...readMcpPreferencesForMenu(config2.appEnv),
         connections: probeConnections(clients, {
           mcpUrl: `${config2.apiUrl}/mcp`,
           serverName: mcpServerNameFor(config2.appEnv),
@@ -96078,6 +96275,23 @@ The access you granted these agents stays on your Powerplant account until you r
       console.log(JSON.stringify(payload));
       return;
     }
+    case "report-agent-click": {
+      const parsed2 = menubarAgentClickSchema.safeParse({ source: positionals[1], destination: positionals[2] });
+      if (!parsed2.success) throw new ExpectedCliError("Expected an agent source and menu destination.");
+      const stored = loadCredentialsSafely(config2);
+      if (!await reportMenubarEvent({ event: MENUBAR_AGENT_CLICK, ...parsed2.data }, stored.credentials, console.error)) process.exitCode = 1;
+      return;
+    }
+    case "dismiss-mcp-warning": {
+      const parsed2 = mcpWarningDismissalSchema.safeParse({ client: positionals[1], warning: positionals[2] });
+      if (!parsed2.success) throw new ExpectedCliError("Expected a client and MCP warning type to dismiss.");
+      if (dismissMcpWarning(config2.appEnv, parsed2.data)) {
+        const stored = loadCredentialsSafely(config2);
+        if (stored.credentialsError) console.error(JSON.stringify({ level: "warn", runId: randomUUID4(), operation: "menubar-analytics", outcome: "credentials-unavailable" }));
+        await reportMenubarEvent({ event: MENUBAR_MCP_WARNING_REMOVE, ...parsed2.data }, stored.credentials, console.error);
+      }
+      return;
+    }
     // Which workspace this account resolves to — the web app and the MCP
     // follow it. Needs the machine credential only to name the member.
     case "workspace": {
@@ -96111,7 +96325,14 @@ The access you granted these agents stays on your Powerplant account until you r
       }
       await runUpdate({
         inspection,
+        cliVersion: CLI_VERSION,
         resolveTarget: () => fetchAvailableVersion(config2, loadCredentialsSafely(config2).credentials),
+        recordAvailableVersion: (version2) => writeVersionCache({
+          now: Date.now(),
+          cacheFile: versionCachePath(void 0, releaseSource(config2.appEnv)),
+          writeTextFile: realWriteTextFile,
+          version: version2
+        }),
         channel: releaseSource(config2.appEnv) === "npm" ? "next" : "latest",
         targetRequired: releaseSource(config2.appEnv) === "promoted",
         claimsReservation: process.env[UPDATE_CHILD_ENV] === "1",
@@ -96289,7 +96510,7 @@ function startBackgroundUpdate(config2, target) {
     readProgress: updateProgress.read,
     writeProgress: updateProgress.write,
     spawnChild: () => {
-      mkdirSync14(path31.dirname(updateLogPath()), { recursive: true });
+      mkdirSync15(path32.dirname(updateLogPath()), { recursive: true });
       const log3 = openSync9(updateLogPath(), "a");
       const child = spawn3(process.execPath, [entryPath(), "update", ...envArgsFor(config2)], {
         detached: true,
@@ -96398,4 +96619,4 @@ undici/lib/web/websocket/frame.js:
   (*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> *)
 */
 
-//# debugId=7d73a97a-938c-5f0f-8b6b-c4076b82abad
+//# debugId=81d65aee-a279-58bd-9476-cc1269e40adf