@usepowerplant/cli 0.4.13 → 0.4.15

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]="66f773d5-e0b2-5538-a184-3ee15c3a469a")}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]="bdd42bb0-e20a-5100-a257-b6dbb21d0f74")}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 path34 = "";
       var lastSegmentIndex = segments.length - 1;
       for (var i2 = index + offset; i2 <= lastSegmentIndex; i2++) {
         if (i2 === lastSegmentIndex) {
-          path32 += segments[i2];
+          path34 += segments[i2];
         } else {
-          path32 += segments[i2] + sep2;
+          path34 += segments[i2] + sep2;
         }
       }
       return {
         name,
         basedir,
-        path: path32
+        path: path34
       };
     };
   }
@@ -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 path34 = __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 = path34.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 + path34.sep + path34.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 = path34.sep !== "/" ? stat.path.split(path34.sep).join("/") : stat.path;
+      return path34.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 path34 = __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 path34.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path34.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 path34 = __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 + path34.sep + path34.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 path34 = __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)(path34.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 = path34.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 && path34.isAbsolute(name)) {
+              const parsedPath = path34.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 = path34.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 path34 of paths) {
         try {
-          const result = await fs_1.promises.readFile(path32, { encoding: "utf8" });
+          const result = await fs_1.promises.readFile(path34, { 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 path34 = 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 (path34 && path34[0] !== "/") {
+          path34 = `/${path34}`;
         }
-        return new URL(`${origin}${path32}`);
+        return new URL(`${origin}${path34}`);
       }
       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: path34, origin }
           } = evt;
-          debugLog3("sending request to %s %s%s", method, origin, path32);
+          debugLog3("sending request to %s %s%s", method, origin, path34);
         }
       );
     }
@@ -12691,14 +12691,14 @@ var require_diagnostics = __commonJS({
         "undici:request:headers",
         (evt) => {
           const {
-            request: { method, path: path32, origin },
+            request: { method, path: path34, origin },
             response: { statusCode }
           } = evt;
           debugLog3(
             "received response to %s %s%s - HTTP %d",
             method,
             origin,
-            path32,
+            path34,
             statusCode
           );
         }
@@ -12707,23 +12707,23 @@ var require_diagnostics = __commonJS({
         "undici:request:trailers",
         (evt) => {
           const {
-            request: { method, path: path32, origin }
+            request: { method, path: path34, origin }
           } = evt;
-          debugLog3("trailers received from %s %s%s", method, origin, path32);
+          debugLog3("trailers received from %s %s%s", method, origin, path34);
         }
       );
       diagnosticsChannel9.subscribe(
         "undici:request:error",
         (evt) => {
           const {
-            request: { method, path: path32, origin },
+            request: { method, path: path34, origin },
             error: error63
           } = evt;
           debugLog3(
             "request to %s %s%s errored - %s",
             method,
             origin,
-            path32,
+            path34,
             error63.message
           );
         }
@@ -12838,7 +12838,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request2 = class {
       constructor(origin, {
-        path: path32,
+        path: path34,
         method,
         body,
         headers,
@@ -12855,11 +12855,11 @@ var require_request = __commonJS({
         maxRedirections,
         typeOfService
       }, handler) {
-        if (typeof path32 !== "string") {
+        if (typeof path34 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path32[0] !== "/" && !(path32.startsWith("http://") || path32.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path34[0] !== "/" && !(path34.startsWith("http://") || path34.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(path34)) {
           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(path34, query) : path34;
         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: path34, 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} ${path34} 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: path34, 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] = path34;
           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] = path34;
       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: path34 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path32;
+        opts.path = origin + path34;
         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(path34) {
+      if (typeof path34 !== "string") {
+        return path34;
       }
-      const pathSegments = path32.split("?", 3);
+      const pathSegments = path34.split("?", 3);
       if (pathSegments.length !== 2) {
-        return path32;
+        return path34;
       }
       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: path34, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path34);
       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: path34, ignoreTrailingSlash }) => {
+        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path34)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path34), 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(path34) {
+      while (path34.endsWith("/")) {
+        path34 = path34.slice(0, -1);
       }
-      if (path32.length === 0) {
-        path32 = "/";
+      if (path34.length === 0) {
+        path34 = "/";
       }
-      return path32;
+      return path34;
     }
     function buildKey(opts) {
-      const { path: path32, method, body, headers, query } = opts;
+      const { path: path34, method, body, headers, query } = opts;
       return {
-        path: path32,
+        path: path34,
         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: path34, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path32,
+            Path: path34,
             "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 [path34, searchParams] = dispatchOpts.path.split("?");
           const normalizedSearchParams = normalizeSearchParams(searchParams, acceptNonStandardSearchParameters);
-          dispatchOpts.path = `${path32}?${normalizedSearchParams}`;
+          dispatchOpts.path = `${path34}?${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 path34 = filePath || this.#snapshotPath;
+        if (!path34) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve2(path32), "utf8");
+          const data = await readFile3(resolve2(path34), "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 ${path34}`, { 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 path34 = filePath || this.#snapshotPath;
+        if (!path34) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve2(path32);
+        const resolvedPath = resolve2(path34);
         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 path34 = search ? `${pathname}${search}` : pathname;
+        const redirectUrlString = `${origin}${path34}`;
         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 = path34;
         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, path34) {
       deleteCachedValue(store, {
         ...cacheKey,
-        path: path32
+        path: path34
       });
       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: path34
           });
         }
       }
@@ -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 path34 = getSameOriginPath(cacheKey, values[i]);
+        if (path34 !== void 0) {
+          deleteCachedUri(store, cacheKey, path34);
         }
       }
     }
@@ -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 path34 = 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 ? `${path34}?` : path34,
             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(path34) {
+      for (let i = 0; i < path34.length; ++i) {
+        const code = path34.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 path34 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path32 = `/${path32}`;
+            path34 = `/${path34}`;
           }
-          url2 = new URL(util2.parseOrigin(url2).origin + path32);
+          url2 = new URL(util2.parseOrigin(url2).origin + path34);
         } else {
           if (!opts) {
             opts = typeof url2 === "object" ? url2 : {};
@@ -36588,10 +36588,11 @@ ${captureLines}` : capture.stack;
   }
 });
 
-// src/clientFailure.ts
-import { constants } from "node:os";
+// src/hookPreferences.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
+// ../../apps/syncservice/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";
@@ -37412,10 +37413,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path32) {
-  if (!path32)
+function getElementAtPath(obj, path34) {
+  if (!path34)
     return obj;
-  return path32.reduce((acc, key) => acc?.[key], obj);
+  return path34.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -37755,11 +37756,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path32, issues) {
+function prefixIssues(path34, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path32);
+    iss.path.unshift(path34);
     return iss;
   });
 }
@@ -38209,16 +38210,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, path34 = []) => {
     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 }, [...path34, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
       } else {
-        const fullpath = [...path32, ...issue2.path];
+        const fullpath = [...path34, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -38257,17 +38258,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, path34 = []) => {
     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 }, [...path34, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
       } else {
-        const fullpath = [...path32, ...issue2.path];
+        const fullpath = [...path34, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -38306,8 +38307,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 path34 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path34) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -55409,13 +55410,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 path34 = ref.slice(1).split("/").filter(Boolean);
+  if (path34.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 (path34[0] === defsKey) {
+    const key = path34[1] === void 0 ? void 0 : decodeJSONPointerSegment(path34[1]);
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -56264,6 +56265,96 @@ 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/harnesses.ts
+var HARNESSES = [
+  "claude-local",
+  "claude-cloud",
+  "codex-local",
+  "codex-cloud",
+  "cursor-local",
+  "cursor-cloud"
+];
+var harnessSchema = external_exports.enum(HARNESSES);
+var SESSION_SOURCE_HARNESSES = {
+  "claude-code": "claude-local",
+  "claude-cloud": "claude-cloud",
+  codex: "codex-local",
+  cursor: "cursor-local",
+  "cursor-cloud": "cursor-cloud"
+};
+function harnessFromLegacySessionSource(source) {
+  if (source === "github-pr") return { kind: "not-harness", source };
+  return { kind: "harness", harness: SESSION_SOURCE_HARNESSES[source] };
+}
+var LEGACY_SESSION_SOURCE_BY_HARNESS = {
+  "claude-local": "claude-code",
+  "claude-cloud": "claude-cloud",
+  "codex-local": "codex",
+  "codex-cloud": null,
+  "cursor-local": "cursor",
+  "cursor-cloud": "cursor-cloud"
+};
+function legacySessionSourceFromHarness(harness) {
+  const source = LEGACY_SESSION_SOURCE_BY_HARNESS[harness];
+  return source === null ? { kind: "unsupported", harness } : { kind: "supported", source };
+}
+
+// ../core/src/sessionIngest.ts
+var LEGACY_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 isLegacySessionSource(source) {
+  return typeof source === "string" && LEGACY_SESSION_SOURCES.includes(source);
+}
+var SESSION_ACTIVE_WINDOW_MS = 30 * 60 * 1e3;
+var LEGACY_COLLECTOR_SESSION_SOURCES = ["claude-code", "codex", "cursor"];
+var LEGACY_PREVIEW_REGISTRABLE_SOURCES = [
+  ...LEGACY_COLLECTOR_SESSION_SOURCES,
+  "cursor-cloud"
+];
+var COLLECTOR_SESSION_HARNESSES = [
+  "claude-local",
+  "codex-local",
+  "cursor-local"
+];
+var PREVIEW_REGISTRABLE_HARNESSES = [
+  ...COLLECTOR_SESSION_HARNESSES,
+  "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([...LEGACY_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";
@@ -56273,7 +56364,7 @@ function claudeCodeMessageOrigin(facts, text) {
   if (facts.nativeOrigin !== null && CLAUDE_CODE_NATIVE_ORIGINS.has(facts.nativeOrigin)) {
     origin = facts.nativeOrigin;
   }
-  if (facts.nativeOrigin === CLAUDE_CODE_TASK_NOTIFICATION_ORIGIN || facts.isMeta === true || facts.isCompactSummary === true || facts.model === "<synthetic>") {
+  if (facts.nativeOrigin === CLAUDE_CODE_TASK_NOTIFICATION_ORIGIN || facts.commandMode === CLAUDE_CODE_TASK_NOTIFICATION_ORIGIN || facts.isMeta === true || facts.isCompactSummary === true || facts.model === "<synthetic>") {
     origin = "harness";
   }
   return origin === "human" && SYSTEM_REMINDER.test(text) ? "mixed" : origin;
@@ -56725,16 +56816,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 path34 = host.slice("github.com".length);
+  const port = hasScheme ? REMOTE_PORT.exec(path34) : null;
+  if (port !== null) path34 = path34.slice(port[0].length);
+  else if (path34.startsWith("/") || path34.startsWith(":")) path34 = path34.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 (path34.endsWith("/")) path34 = path34.slice(0, -1);
+  if (path34.endsWith(".git")) path34 = path34.slice(0, -".git".length);
+  const segments = path34.split("/");
   if (segments.length !== 2 || !segments.every((segment) => REMOTE_PATH_SEGMENT.test(segment))) return null;
-  return path32;
+  return path34;
 }
 var PUSH_DESTINATION = /\bTo\s+([^\s\\"]+)/g;
 function pushDestinationsInText(text) {
@@ -57394,7 +57485,8 @@ function originFacts(record2) {
     nativeOrigin: typeof origin?.kind === "string" ? origin.kind : null,
     isMeta: typeof record2.isMeta === "boolean" ? record2.isMeta : null,
     isCompactSummary: typeof record2.isCompactSummary === "boolean" ? record2.isCompactSummary : null,
-    model: typeof message2?.model === "string" ? message2.model : null
+    model: typeof message2?.model === "string" ? message2.model : null,
+    commandMode: null
   };
 }
 function recordTime(record2) {
@@ -57669,10 +57761,10 @@ function boundUnfamiliarPayload(record2) {
 }
 function excludeImageCarriers(record2) {
   const excludedKeys = [];
-  const withoutImages = (value, path32) => {
+  const withoutImages = (value, path34) => {
     if (Array.isArray(value)) {
       return value.map((item, index) => {
-        const itemPath = `${path32}[${index}]`;
+        const itemPath = `${path34}[${index}]`;
         if (typeof item === "string" && isImageCarrier(item)) {
           excludedKeys.push(itemPath);
           return null;
@@ -57683,7 +57775,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 = path34 === "" ? key : `${path34}.${key}`;
       if (isImageBase64Payload(value, key) || typeof item === "string" && isImageCarrier(item)) {
         excludedKeys.push(keyPath);
         continue;
@@ -58404,8 +58496,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 path34 = primary.startsWith("/workspace/") ? primary.slice("/workspace/".length) : primary;
+  return path34.length > 0 ? path34 : null;
 }
 function asRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -58738,33 +58830,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 +58902,19 @@ var recentSessionCursorSchema = external_exports.object({
   id: external_exports.uuid()
 });
 
+// ../core/src/codexClient.ts
+var codexClientSchema = external_exports.enum(["desktop", "tui", "unknown"]);
+var metadataSchema = external_exports.object({ originator: external_exports.unknown().optional(), source: external_exports.unknown().optional() });
+function classifyCodexClient(metadata) {
+  const parsed = metadataSchema.safeParse(metadata);
+  if (!parsed.success) return "unknown";
+  const { originator, source } = parsed.data;
+  if (source === "exec" || typeof source === "object" && source !== null) return "unknown";
+  if (originator === "Codex Desktop") return "desktop";
+  if (source === "cli") return "tui";
+  return "unknown";
+}
+
 // ../../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 +59095,8 @@ function getFunctionName(fn) {
     return defaultFunctionName;
   }
 }
-function normalizeStackTracePath(path32) {
-  let filename = path32?.startsWith("file://") ? path32.slice(7) : path32;
+function normalizeStackTracePath(path34) {
+  let filename = path34?.startsWith("file://") ? path34.slice(7) : path34;
   if (filename?.match(/\/[A-Z]:/)) {
     filename = filename.slice(1);
   }
@@ -60828,8 +60906,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: path34, pass, port, projectId, protocol, publicKey } = dsn;
+  return `${protocol}://${publicKey}${withPassword && pass ? `:${pass}` : ""}@${host}${port ? `:${port}` : ""}/${path34 ? `${path34}/` : path34}${projectId}`;
 }
 function dsnFromString(str) {
   const match = DSN_REGEX.exec(str);
@@ -60840,11 +60918,11 @@ function dsnFromString(str) {
     return void 0;
   }
   const [protocol, publicKey, pass = "", host = "", port = "", lastPath = ""] = match.slice(1);
-  let path32 = "";
+  let path34 = "";
   let projectId = lastPath;
   const split = projectId.split("/");
   if (split.length > 1) {
-    path32 = split.slice(0, -1).join("/");
+    path34 = split.slice(0, -1).join("/");
     projectId = split.pop();
   }
   if (projectId) {
@@ -60853,7 +60931,7 @@ function dsnFromString(str) {
       projectId = projectMatch[0];
     }
   }
-  return dsnFromComponents({ host, pass, path: path32, projectId, port, protocol, publicKey });
+  return dsnFromComponents({ host, pass, path: path34, projectId, port, protocol, publicKey });
 }
 function dsnFromComponents(components) {
   return {
@@ -65382,9 +65460,9 @@ function stripUrlQueryAndFragment(urlPath) {
   return urlPath.split(/[?#]/, 1)[0];
 }
 function getSanitizedUrlString(url2) {
-  const { protocol, host, path: path32 } = url2;
+  const { protocol, host, path: path34 } = url2;
   const filteredHost = host?.replace(/^.*@/, "[filtered]:[filtered]@").replace(/(:80)$/, "").replace(/(:443)$/, "") || "";
-  return `${protocol ? `${protocol}://` : ""}${filteredHost}${path32}`;
+  return `${protocol ? `${protocol}://` : ""}${filteredHost}${path34}`;
 }
 function stripDataUrlContent(url2, includeDataPrefix = true) {
   if (url2.startsWith("data:")) {
@@ -66329,8 +66407,8 @@ function splitPath(filename) {
   const parts = splitPathRe.exec(truncated);
   return parts ? parts.slice(1) : [];
 }
-function dirname(path32) {
-  const result = splitPath(path32);
+function dirname(path34) {
+  const result = splitPath(path34);
   const root = result[0] || "";
   let dir = result[1];
   if (!root && !dir) {
@@ -70173,15 +70251,15 @@ var getLayerMetadata = (route, layer, layerPath) => {
     };
   }
 };
-var getRouterPath = (path32, layer) => {
+var getRouterPath = (path34, layer) => {
   const stackLayer = Array.isArray(layer.handle?.stack) ? layer.handle?.stack?.[0] : void 0;
   if (stackLayer?.route?.path) {
-    return `${path32}${stackLayer.route.path}`;
+    return `${path34}${stackLayer.route.path}`;
   }
   if (stackLayer && Array.isArray(stackLayer?.handle?.stack)) {
-    return getRouterPath(path32, stackLayer);
+    return getRouterPath(path34, stackLayer);
   }
-  return path32;
+  return path34;
 };
 var isLayerIgnored = (name, type, config2) => {
   if (Array.isArray(config2?.ignoreLayersType) && config2?.ignoreLayersType?.includes(type)) {
@@ -70201,7 +70279,7 @@ function getActualMatchedRoute(req, constructedRoute) {
   if (layersStore.length === 0) {
     return void 0;
   }
-  if (layersStore.every((path32) => path32 === "/")) {
+  if (layersStore.every((path34) => path34 === "/")) {
     return req.originalUrl === "/" ? "/" : void 0;
   }
   if (constructedRoute === "*") {
@@ -70217,11 +70295,11 @@ function getActualMatchedRoute(req, constructedRoute) {
 function getConstructedRoute(req) {
   const layersStore = getStoredLayers(req);
   let constructedRoute = "";
-  for (const path32 of layersStore) {
-    if (path32 === "/" || path32 === "/*") {
+  for (const path34 of layersStore) {
+    if (path34 === "/" || path34 === "/*") {
       continue;
     }
-    constructedRoute += !constructedRoute || constructedRoute.endsWith("/") ? path32 : `/${path32}`;
+    constructedRoute += !constructedRoute || constructedRoute.endsWith("/") ? path34 : `/${path34}`;
   }
   return constructedRoute.replace(/\/{2,}/g, "/");
 }
@@ -70726,9 +70804,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 path34 = requestOptions.path ? requestOptions.path : "/";
   const base = `${protocol}//${hostname4}${port}`;
-  return new URL(path32.startsWith("//") ? `${base}${path32}` : path32, base);
+  return new URL(path34.startsWith("//") ? `${base}${path34}` : path34, base);
 }
 function getRequestUrlFromClientRequest(request2) {
   return String(getRequestUrl(getRequestOptions(request2)));
@@ -71401,11 +71479,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 path34 = stripUrlQueryAndFragment(urlPath);
+  if (path34.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 (path34.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
     return true;
   }
   return false;
@@ -71646,11 +71724,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 path34 = stripUrlQueryAndFragment(urlPath);
+  if (path34.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 (path34.match(/^\/(robots\.txt|sitemap\.xml|manifest\.json|browserconfig\.xml)$/)) {
     return true;
   }
   return false;
@@ -72010,19 +72088,19 @@ function getBreadcrumbData(request2) {
     return {};
   }
 }
-function getAbsoluteUrl2(origin, path32 = "/") {
+function getAbsoluteUrl2(origin, path34 = "/") {
   try {
-    const url2 = new URL(path32, origin);
+    const url2 = new URL(path34, origin);
     return url2.toString();
   } catch {
     const url2 = `${origin}`;
-    if (url2.endsWith("/") && path32.startsWith("/")) {
-      return `${url2}${path32.slice(1)}`;
+    if (url2.endsWith("/") && path34.startsWith("/")) {
+      return `${url2}${path34.slice(1)}`;
     }
-    if (!url2.endsWith("/") && !path32.startsWith("/")) {
-      return `${url2}/${path32}`;
+    if (!url2.endsWith("/") && !path34.startsWith("/")) {
+      return `${url2}/${path34}`;
     }
-    return `${url2}${path32}`;
+    return `${url2}${path34}`;
   }
 }
 
@@ -72267,15 +72345,15 @@ function getRequestMethod(original) {
   }
   return "_OTHER";
 }
-function getAbsoluteUrl3(origin, path32 = "/") {
+function getAbsoluteUrl3(origin, path34 = "/") {
   const url2 = `${origin}`;
-  if (url2.endsWith("/") && path32.startsWith("/")) {
-    return `${url2}${path32.slice(1)}`;
+  if (url2.endsWith("/") && path34.startsWith("/")) {
+    return `${url2}${path34.slice(1)}`;
   }
-  if (!url2.endsWith("/") && !path32.startsWith("/")) {
-    return `${url2}/${path32}`;
+  if (!url2.endsWith("/") && !path34.startsWith("/")) {
+    return `${url2}/${path34}`;
   }
-  return `${url2}${path32}`;
+  return `${url2}${path34}`;
 }
 
 // ../../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 +74846,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(path34) {
+  if (path34.startsWith("node:")) return true;
+  if (path34.endsWith(".min.js")) return true;
+  if (path34.endsWith(".min.cjs")) return true;
+  if (path34.endsWith(".min.mjs")) return true;
+  if (path34.startsWith("data:")) return true;
   return false;
 }
 function shouldSkipContextLinesForFrame(frame) {
@@ -74821,9 +74899,9 @@ function makeLineReaderRanges(lines, linecontext) {
   }
   return out;
 }
-function getContextLinesFromFile(path32, ranges, output2) {
+function getContextLinesFromFile(path34, ranges, output2) {
   return new Promise((resolve2, _reject) => {
-    const stream = createReadStream(path32);
+    const stream = createReadStream(path34);
     const lineReaded = createInterface({
       input: stream
     });
@@ -74841,8 +74919,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(path34, 1);
+      DEBUG_BUILD2 && debug.error(`Failed to read file: ${path34}. Error: ${e}`);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -76281,8 +76359,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(path34) {
+  return path34.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 +79245,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, path34) {
+  let field = getField(contextValue, path34);
   if (field) {
     return { field, spanAdded: false };
   }
-  const parentSpan = getParentFieldSpan(contextValue, path32);
+  const parentSpan = getParentFieldSpan(contextValue, path34);
   field = {
-    span: createResolverSpan(contextValue, info, path32, parentSpan)
+    span: createResolverSpan(contextValue, info, path34, parentSpan)
   };
-  addField(contextValue, path32, field);
+  addField(contextValue, path34, field);
   return { field, spanAdded: true };
 }
-function createResolverSpan(contextValue, info, path32, parentSpan) {
+function createResolverSpan(contextValue, info, path34, parentSpan) {
   const attributes = {
     [AttributeNames2.FIELD_NAME]: info.fieldName,
-    [AttributeNames2.FIELD_PATH]: path32.join("."),
+    [AttributeNames2.FIELD_PATH]: path34.join("."),
     [AttributeNames2.FIELD_TYPE]: info.returnType.toString(),
     [AttributeNames2.PARENT_NAME]: info.parentType.name
   };
@@ -79214,15 +79292,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, path34, field) {
+  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path34.join(".")] = field;
 }
-function getField(contextValue, path32) {
-  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path32.join(".")];
+function getField(contextValue, path34) {
+  return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].fields[path34.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, path34) {
+  for (let i = path34.length - 1; i > 0; i--) {
+    const field = getField(contextValue, path34.slice(0, i));
     if (field) {
       return field.span;
     }
@@ -79232,9 +79310,9 @@ function getParentFieldSpan(contextValue, path32) {
 function getRootSpan2(contextValue) {
   return contextValue[OTEL_GRAPHQL_DATA_SYMBOL].span;
 }
-function pathToArray(path32) {
+function pathToArray(path34) {
   const flattened = [];
-  let curr = path32;
+  let curr = path34;
   while (curr) {
     flattened.push(String(curr.key));
     curr = curr.prev;
@@ -79375,8 +79453,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 path34 = pathToArray(info?.path);
+    const { field, spanAdded } = createFieldIfNotExists(contextValue, info, path34);
     const span = field.span;
     const shouldEndSpan = spanAdded;
     return withActiveSpan(span, () => {
@@ -82359,10 +82437,10 @@ var PostgresJsInstrumentation = class extends import_instrumentation24.Instrumen
       },
       (exports) => exports
     );
-    ["src", "cf/src", "cjs/src"].forEach((path32) => {
+    ["src", "cf/src", "cjs/src"].forEach((path34) => {
       module2.files.push(
         new InstrumentationNodeModuleFile(
-          `postgres/${path32}/query.js`,
+          `postgres/${path34}/query.js`,
           SUPPORTED_VERSIONS4,
           this._patchQueryPrototype.bind(this),
           this._unpatchQueryPrototype.bind(this)
@@ -82993,13 +83071,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 path34 = args[0];
           if (args.length === 1) {
-            return original.apply(this, [path32]);
+            return original.apply(this, [path34]);
           }
           const handlers2 = args.slice(1);
           return original.apply(this, [
-            path32,
+            path34,
             ...handlers2.map((handler) => instrumentation._wrapHandler(handler))
           ]);
         }
@@ -83033,13 +83111,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 path34 = args[0];
           if (args.length === 1) {
-            return original.apply(this, [path32]);
+            return original.apply(this, [path34]);
           }
           const handlers2 = args.slice(1);
           return original.apply(this, [
-            path32,
+            path34,
             ...handlers2.map((handler) => instrumentation._wrapHandler(handler))
           ]);
         }
@@ -83059,8 +83137,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 path34 = c.req.path;
+      const span = instrumentation.tracer.startSpan(path34);
       return context.with(trace.setSpan(context.active(), span), () => {
         return instrumentation._safeExecute(
           () => {
@@ -83070,7 +83148,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 ? path34 : handler.name || "anonymous"
                 });
                 instrumentation.getConfig().responseHook?.(span);
                 return result2;
@@ -83079,7 +83157,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 ? path34 : handler.name || "anonymous"
               });
               instrumentation.getConfig().responseHook?.(span);
               return result;
@@ -83283,11 +83361,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 path34 = 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, path34);
       }
     }
     return dispatchLayer;
@@ -85534,7 +85612,7 @@ function _init2(options = {}, getDefaultIntegrationsImpl) {
   return client;
 }
 
-// ../../apps/collector/src/reporting.ts
+// ../../apps/syncservice/src/reporting.ts
 function initCollectorReporting(appEnv, release2) {
   const dsn = process.env.SENTRY_DSN;
   if (!dsn) return;
@@ -85604,7 +85682,7 @@ async function flushReporting() {
   await flush(2e3).catch(() => void 0);
 }
 
-// ../../apps/collector/src/macosCredentialStore.ts
+// ../../apps/syncservice/src/macosCredentialStore.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { createCipheriv, createDecipheriv, randomBytes, randomUUID as randomUUID2 } from "node:crypto";
 import {
@@ -85619,7 +85697,7 @@ import {
 import os11 from "node:os";
 import path13 from "node:path";
 
-// ../../apps/collector/src/readIfExists.ts
+// ../../apps/syncservice/src/readIfExists.ts
 import { readFileSync as readFileSync2 } from "node:fs";
 function readIfExists(file2) {
   try {
@@ -85630,7 +85708,7 @@ function readIfExists(file2) {
   }
 }
 
-// ../../apps/collector/src/childExitCodes.ts
+// ../../apps/syncservice/src/childExitCodes.ts
 var SECURITY_EXITS = {
   36: "user interaction is not allowed, Keychain needs a desktop session",
   44: "item not found",
@@ -85657,7 +85735,7 @@ function describeLaunchctlExit(status) {
   return `launchctl exited ${status}${meaning ? ` (${meaning})` : ""}`;
 }
 
-// ../../apps/collector/src/service.ts
+// ../../apps/syncservice/src/service.ts
 import { execFileSync } from "node:child_process";
 import { chmodSync, existsSync, mkdirSync, readFileSync as readFileSync3, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import os3 from "node:os";
@@ -85874,16 +85952,38 @@ function xmlEscape(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
 }
 
-// ../../apps/collector/src/status.ts
+// ../../apps/syncservice/src/status.ts
 import { mkdirSync as mkdirSync7, readFileSync as readFileSync7, renameSync as renameSync3, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import os10 from "node:os";
 import path12 from "node:path";
 
-// ../../apps/collector/src/hookHealth.ts
+// ../../apps/syncservice/src/hookHealth.ts
 import { existsSync as existsSync6, lstatSync as lstatSync4 } from "node:fs";
 import path11 from "node:path";
 
-// ../../apps/collector/src/codexTranscriptDiscovery.ts
+// ../../apps/syncservice/src/codexHookGuidance.ts
+var CODEX_ACTIVITY_WINDOW_MS = 7 * 24 * 60 * 6e4;
+function codexHookInstructions(client) {
+  switch (client) {
+    case "desktop":
+      return "Open Settings \u2192 Hooks in Codex to trust Powerplant. This makes sync more efficient.";
+    case "tui":
+      return "Run /hooks in Codex to trust Powerplant. This makes sync more efficient.";
+    case "unknown":
+      return "Open Settings \u2192 Hooks in the Codex app, or run /hooks in the Codex TUI, to trust Powerplant.";
+  }
+}
+function hookWarning(health, nowMs) {
+  const silence = health.silence;
+  if (health.harness !== "codex" || silence?.kind !== "not-firing") return silence;
+  const activity = health.codexActivity;
+  if (activity === void 0) return void 0;
+  const age = nowMs - Date.parse(activity.at);
+  if (!Number.isFinite(age) || age < 0 || age > CODEX_ACTIVITY_WINDOW_MS) return void 0;
+  return { ...silence, fix: codexHookInstructions(activity.client) };
+}
+
+// ../../apps/syncservice/src/codexTranscriptDiscovery.ts
 import { createHash } from "node:crypto";
 import { closeSync, lstatSync, openSync, readSync, readdirSync, realpathSync } from "node:fs";
 import path2 from "node:path";
@@ -85944,13 +86044,13 @@ function readCodexTranscriptDiscoveryRecords(home, roots) {
   return result;
 }
 
-// ../../apps/collector/src/diagnostics.ts
+// ../../apps/syncservice/src/diagnostics.ts
 import { createHmac } from "node:crypto";
 
-// ../../apps/collector/src/http.ts
+// ../../apps/syncservice/src/http.ts
 var import_undici = __toESM(require_undici(), 1);
 var CLI_VERSION_HEADER = "x-powerplant-cli-version";
-var cliVersion = true ? "0.4.13" : "0.0.0-checkout";
+var cliVersion = true ? "0.4.15" : "0.0.0-checkout";
 function cliVersionHeaders() {
   return { [CLI_VERSION_HEADER]: cliVersion, "user-agent": `powerplant-cli/${cliVersion}` };
 }
@@ -86022,7 +86122,7 @@ function isPoisonedHttp2Session(error63) {
   return false;
 }
 
-// ../../apps/collector/src/diagnostics.ts
+// ../../apps/syncservice/src/diagnostics.ts
 function observeFileDiagnostic(observer, file2) {
   try {
     observer?.(file2);
@@ -86074,8 +86174,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 path34 = observation.path.replace(/[^A-Za-z0-9_.$:/=[\]-]/g, "_").slice(0, 160) || "other";
+        const key = [source, path34, observation.reason, observation.valueType, formatVersion].join("\0");
         const count3 = observation.count ?? 1;
         const existing = groups.get(key);
         if (existing) {
@@ -86085,7 +86185,7 @@ function createStructureDiagnostics() {
         if (samples.length >= MAX_STRUCTURE_DIAGNOSTICS) return;
         const sample = {
           source,
-          path: path32,
+          path: path34,
           reason: observation.reason,
           valueType: observation.valueType,
           formatVersion,
@@ -86257,13 +86357,13 @@ function bindDiagnosticEnrollment(diagnostic, token) {
   passEnrollments.set(diagnostic, token);
 }
 
-// ../../apps/collector/src/codexSessions.ts
+// ../../apps/syncservice/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";
 import { setImmediate as yieldToEventLoop } from "node:timers/promises";
 
-// ../../apps/collector/src/gitOwner.ts
+// ../../apps/syncservice/src/gitOwner.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { readFileSync as readFileSync4, statSync } from "node:fs";
 import os4 from "node:os";
@@ -86463,7 +86563,7 @@ function isPermissionError(cause) {
   return typeof cause === "object" && cause !== null && "code" in cause && (cause.code === "EPERM" || cause.code === "EACCES");
 }
 
-// ../../apps/collector/src/scan.ts
+// ../../apps/syncservice/src/scan.ts
 import { closeSync as closeSync2, openSync as openSync2, readdirSync as readdirSync2, readSync as readSync2, statSync as statSync2 } from "node:fs";
 import { StringDecoder } from "node:string_decoder";
 var SESSION_UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -86548,7 +86648,7 @@ function describeReadError(error63) {
   return error63 instanceof Error ? error63.message : String(error63);
 }
 
-// ../../apps/collector/src/scope.ts
+// ../../apps/syncservice/src/scope.ts
 import os5 from "node:os";
 import path4 from "node:path";
 var captureEverythingUnresolved = {
@@ -86637,15 +86737,6 @@ function withWorkspaceRouting(policy, repoPart) {
   const severalWorkspaces = (policy.workspaceClaims?.length ?? 0) > 1;
   return severalWorkspaces && claiming.length > 0 ? `${repoPart}, routing each repo to the workspace that syncs it (${listSome(claiming.map((workspace) => workspace.name))})` : repoPart;
 }
-function describeEnrollmentCapture(policy) {
-  if (policy.mode === "org-repos") {
-    const boundary = orgRepoBoundary(policy);
-    if (boundary.kind === "repo-list") {
-      return `Set allowlist from this org: ${withWorkspaceRouting(policy, listSome(boundary.repos))}`;
-    }
-  }
-  return `Syncing: ${describeCapturePolicy(policy)}`;
-}
 function describeStoredCapture(credentials) {
   if (credentials.captureMode === "scope") {
     return describeCapturePolicy({
@@ -86697,12 +86788,14 @@ function isPathWithinScopes(resolved, scopePaths) {
   );
 }
 
-// ../../apps/collector/src/codexSessions.ts
+// ../../apps/syncservice/src/codexSessions.ts
 function parseCodexRollout(text, sharedUsage) {
   let meta3 = null;
   let initialEvent;
   let records = 0;
   let model;
+  let codexClient = "unknown";
+  let noninteractive;
   const timestamps = [];
   const usage = sharedUsage ?? createCodexUsageReader();
   for (const line of parseJsonl(text)) {
@@ -86715,6 +86808,8 @@ function parseCodexRollout(text, sharedUsage) {
     const record2 = payload;
     if (line.type === "session_meta") {
       meta3 ??= record2;
+      codexClient = classifyCodexClient(record2);
+      noninteractive = record2.source === "exec" ? true : void 0;
     } else if (line.type === "turn_context" && typeof record2.model === "string") {
       model = record2.model;
     }
@@ -86725,6 +86820,8 @@ function parseCodexRollout(text, sharedUsage) {
   const sessionId = meta3?.id ?? meta3?.session_id;
   const facts = meta3 === null ? {} : harnessSessionFacts("codex", { ...meta3, initialEvent });
   return {
+    codexClient,
+    ...noninteractive && { noninteractive },
     kind: facts.subagent ? "subagent" : "session",
     ...facts.standaloneReview && { standaloneReview: true },
     ...typeof sessionId === "string" && sessionId !== "" && { sessionId },
@@ -86762,6 +86859,8 @@ function foldRolloutPages(pages, usage) {
   const repoFullName = first("repoFullName");
   return {
     kind: pages[0].kind,
+    codexClient: pages.at(-1).codexClient,
+    ...pages.at(-1).noninteractive && { noninteractive: true },
     ...pages[0].standaloneReview && { standaloneReview: true },
     ...sessionId !== void 0 && { sessionId },
     ...startedAt !== void 0 && { startedAt },
@@ -86828,11 +86927,12 @@ var MergedTranscriptWriter = class {
 function rolloutLocation(rolloutPath) {
   const record2 = readFirstRecord(rolloutPath, (candidate) => candidate.type === "session_meta");
   const meta3 = record2?.payload;
-  if (!meta3 || typeof meta3 !== "object" || Array.isArray(meta3)) return { kind: "session", totals: null, fastTotals: null };
+  if (!meta3 || typeof meta3 !== "object" || Array.isArray(meta3)) return { kind: "session", codexClient: "unknown", totals: null, fastTotals: null };
   const { cwd, id, session_id: fallbackId } = meta3;
   const sessionId = id ?? fallbackId;
   const startedAt = record2?.timestamp;
   return {
+    codexClient: classifyCodexClient(meta3),
     kind: isSidecarThread(meta3) ? "subagent" : "session",
     ...typeof sessionId === "string" && { sessionId },
     ...typeof startedAt === "string" && { startedAt },
@@ -86891,7 +86991,7 @@ async function collectCodexSessions(options = {}) {
   let skippedTooLarge = 0;
   let mergedThreads = 0;
   let largestMergedBytes = 0;
-  const externalIdOf = (rolloutPath) => path5.basename(rolloutPath, ".jsonl");
+  const harnessSessionIdOf = (rolloutPath) => path5.basename(rolloutPath, ".jsonl");
   const files = /* @__PURE__ */ new Map();
   const observe = async (paths, archived, discoverySessionId) => {
     for (const rolloutPath of paths) {
@@ -86932,7 +87032,7 @@ async function collectCodexSessions(options = {}) {
   }
   for (const [threadId2, observed] of byThread) {
     const stored = dedupeStoreCopies(observed);
-    let externalId = externalIdOf((stored.find((file2) => !file2.identity.page) ?? stored[0]).rolloutPath);
+    let harnessSessionId = harnessSessionIdOf((stored.find((file2) => !file2.identity.page) ?? stored[0]).rolloutPath);
     try {
       const mergedTranscriptPath = stored.length > 1 ? path5.join(mergedTranscriptsDir, `${threadId2}.jsonl`) : void 0;
       const changedMs = Math.max(...stored.map((file2) => file2.changedMs));
@@ -86949,7 +87049,7 @@ async function collectCodexSessions(options = {}) {
       if (named.length === 0) continue;
       const threadFiles = named.length > 1 ? orderPages(named) : named;
       const base = threadFiles[0];
-      externalId = externalIdOf(base.rolloutPath);
+      harnessSessionId = harnessSessionIdOf(base.rolloutPath);
       const mtimeMs = Math.max(...threadFiles.map((file2) => file2.mtimeMs));
       const sizeBytes = threadFiles.reduce((sum2, file2) => sum2 + file2.sizeBytes, 0);
       if (sizeBytes > maxBytes) {
@@ -86972,7 +87072,7 @@ async function collectCodexSessions(options = {}) {
         continue;
       }
       const thread = {
-        externalId,
+        harnessSessionId,
         files: threadFiles,
         ...threadFiles.length > 1 && mergedTranscriptPath !== void 0 && { mergedTranscriptPath },
         mtimeMs,
@@ -86984,8 +87084,8 @@ async function collectCodexSessions(options = {}) {
           transcriptPath: base.rolloutPath,
           ...location.cwd && { cwd: location.cwd },
           item: {
-            source: "codex",
-            externalId,
+            harness: "codex-local",
+            harnessSessionId,
             status: now - mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
             archived: thread.archived,
             capturedVia: decision.via
@@ -86995,7 +87095,7 @@ async function collectCodexSessions(options = {}) {
       }
       candidates.push({ thread, ...location.cwd && { cwd: location.cwd }, decision });
     } catch (error63) {
-      unreadable.push(`${externalId}: ${describeReadError(error63)}`);
+      unreadable.push(`${harnessSessionId}: ${describeReadError(error63)}`);
       observeFileDiagnostic(options.onFileDiagnostic, {
         path: stored[0].rolloutPath,
         reason: "unreadable",
@@ -87059,11 +87159,13 @@ async function collectCodexSessions(options = {}) {
       const title = summary.sessionId ? threadNames.get(summary.sessionId) : void 0;
       items.push({
         mtimeMs: thread.mtimeMs,
+        codexClient: summary.codexClient,
+        ...summary.noninteractive && { codexNoninteractive: true },
         transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
-          source: "codex",
-          externalId: thread.externalId,
+          harness: "codex-local",
+          harnessSessionId: thread.harnessSessionId,
           status: now - thread.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
           archived: thread.archived,
           ...summary.standaloneReview && { automation: true },
@@ -87092,7 +87194,7 @@ async function collectCodexSessions(options = {}) {
       });
     } catch (error63) {
       writer?.abandon();
-      unreadable.push(`${thread.externalId}: ${describeReadError(error63)}`);
+      unreadable.push(`${thread.harnessSessionId}: ${describeReadError(error63)}`);
       observeFileDiagnostic(options.onFileDiagnostic, {
         path: thread.files[0].rolloutPath,
         reason: "unreadable",
@@ -87140,7 +87242,7 @@ function codexThreadCwd(threadId2, sessionsDir = path5.join(os6.homedir(), ".cod
   return void 0;
 }
 
-// ../../apps/collector/src/cursorTranscriptFile.ts
+// ../../apps/syncservice/src/cursorTranscriptFile.ts
 import { createHash as createHash3 } from "node:crypto";
 import {
   chmodSync as chmodSync3,
@@ -87158,7 +87260,7 @@ import {
 import os8 from "node:os";
 import path7 from "node:path";
 
-// ../../apps/collector/src/captureOmissions.ts
+// ../../apps/syncservice/src/captureOmissions.ts
 var REPORTED_REASONS = /* @__PURE__ */ new Set([
   "unsupported",
   "malformed",
@@ -87170,21 +87272,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, path34, valueType, formatVersion, by = 1) => {
     if (!REPORTED_REASONS.has(reason)) return;
-    const key = `${path32}\0${reason}\0${valueType}\0${formatVersion ?? ""}`;
+    const key = `${path34}\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: path34, reason, valueType, count: by, ...formatVersion !== void 0 && { formatVersion } });
     }
   };
   return {
     count: count3,
     shape,
-    note(reason, path32, valueType, formatVersion) {
+    note(reason, path34, valueType, formatVersion) {
       count3(reason);
-      shape(reason, path32, valueType, formatVersion);
+      shape(reason, path34, valueType, formatVersion);
     },
     absorb(other) {
       for (const [reason, by] of Object.entries(other.omissions())) {
@@ -87209,7 +87311,7 @@ function unhandledObservations(shapes, externalId) {
   return shapes.map(({ formatVersion, ...shape }) => ({ ...shape, formatVersion: formatVersion ?? null, externalId }));
 }
 
-// ../../apps/collector/src/cursorLocal.ts
+// ../../apps/syncservice/src/cursorLocal.ts
 import { createHash as createHash2 } from "node:crypto";
 import { chmodSync as chmodSync2, existsSync as existsSync2, mkdirSync as mkdirSync3, utimesSync as utimesSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import os7 from "node:os";
@@ -87424,8 +87526,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 path34 = prefix === "" ? key : `${prefix}.${key}`;
+    into.set(path34, value);
     recorder.shape("unsupported", `bubble.${prefix === "" ? "" : `${prefix}.`}${nativeTypeLabel(key) ?? "other"}`, jsonValueType(value), formatVersion);
   }
 }
@@ -87511,8 +87613,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 path34 = `bubble.type=${nativeType ?? "other"}`;
+    recorder.note("unsupported", path34, 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");
@@ -87729,8 +87831,8 @@ function collectFromStore(db, userDir, options, result, knownIds) {
           transcriptPath: path6.join(userDir, "globalStorage", "state.vscdb"),
           ...cwd && { cwd },
           item: {
-            source: "cursor",
-            externalId: raw.composerId,
+            harness: "cursor-local",
+            harnessSessionId: raw.composerId,
             status: now - lastUpdatedAt < ACTIVE_GRACE_MS ? "active" : "inactive",
             capturedVia: decision.via
           }
@@ -87808,8 +87910,8 @@ function collectFromStore(db, userDir, options, result, knownIds) {
         transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
-          source: "cursor",
-          externalId: raw.composerId,
+          harness: "cursor-local",
+          harnessSessionId: raw.composerId,
           status: now - lastUpdatedAt < ACTIVE_GRACE_MS ? "active" : "inactive",
           // The header's own archive evidence, both ways; omitted (nothing
           // claimed) when the column establishes neither.
@@ -87836,7 +87938,7 @@ function collectFromStore(db, userDir, options, result, knownIds) {
   }
 }
 
-// ../../apps/collector/src/cursorTranscriptFile.ts
+// ../../apps/syncservice/src/cursorTranscriptFile.ts
 var textBlock = external_exports.object({ type: external_exports.literal("text"), text: external_exports.string() });
 var toolUseBlock = external_exports.object({
   type: external_exports.literal("tool_use"),
@@ -87863,12 +87965,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, path34, 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", `${path34}=${nativeType ?? "other"}`, jsonValueType(discriminator));
+    if (bounded.payload === void 0) recorder.note("truncated", `${path34}=${nativeType ?? "other"}`, "object");
   };
   text.split("\n").forEach((row, recordIndex) => {
     if (!row.trim()) return;
@@ -87890,8 +87992,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 [path34, discriminator] = typeof value.type === "string" ? ["record.type", value.type] : typeof value.role === "string" ? ["message.role", value.role] : ["record", void 0];
+      retainUnsupported(value, { recordIndex }, path34, discriminator);
       return;
     }
     const role = record2.data.role;
@@ -88053,8 +88155,8 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
         continue;
       }
       const common = {
-        source: "cursor",
-        externalId: record2.sessionId,
+        harness: "cursor-local",
+        harnessSessionId: record2.sessionId,
         status: (options.now ?? Date.now()) - stat.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
         ...decision.repoFullName && { repoFullName: decision.repoFullName },
         capturedVia: decision.via
@@ -88144,7 +88246,7 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
   }
 }
 
-// ../../apps/collector/src/hookInstall.ts
+// ../../apps/syncservice/src/hookInstall.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync5, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import os9 from "node:os";
 import path8 from "node:path";
@@ -88266,7 +88368,7 @@ function installCollectorHooks(homeDir = os9.homedir()) {
   };
 }
 
-// ../../apps/collector/src/lifecycleJournal.ts
+// ../../apps/syncservice/src/lifecycleJournal.ts
 import path9 from "node:path";
 var LIFECYCLE_JOURNAL_FILENAME = "session-lifecycle.jsonl";
 function lifecycleJournalPath(home) {
@@ -88298,7 +88400,7 @@ function observedSessionEnd(entry, mtimeMs) {
   return entry.at;
 }
 
-// ../../apps/collector/src/harnessHooks.ts
+// ../../apps/syncservice/src/harnessHooks.ts
 import {
   existsSync as existsSync5,
   lstatSync as lstatSync3,
@@ -88463,10 +88565,12 @@ function installHarnessHooks(home) {
   });
 }
 
-// ../../apps/collector/src/hookHealth.ts
+// ../../apps/syncservice/src/hookHealth.ts
 var HOOK_OBSERVATION_GRACE_MS = 2 * 6e4;
 var hookHealthSchema = external_exports.object({
   harness: hookHarnessSchema,
+  /** Latest recorded interactive Codex activity, not file discovery time. */
+  codexActivity: external_exports.object({ client: codexClientSchema, at: external_exports.string() }).optional(),
   /** What this daemon's boot-time install did (installCollectorHooks / installHarnessHooks). */
   install: hookInstallOutcomeSchema,
   /** unverified: no in-scope session started since the install has been
@@ -88546,7 +88650,7 @@ function inspectHookConfig(harness, home) {
 var NOT_FIRING = {
   codex: () => ({
     problem: "Codex hooks are installed but not running",
-    fix: "In Codex, run /hooks and trust the Powerplant hooks."
+    fix: codexHookInstructions("unknown")
   }),
   claude: () => ({
     problem: "Claude Code hooks are installed but didn't run for a new session",
@@ -88588,10 +88692,10 @@ function describeHookSilence(harness, state, home) {
       return { kind: "not-firing", ...NOT_FIRING[harness](home) };
   }
 }
-var HARNESS_OF_SOURCE = {
-  "claude-code": "claude",
-  codex: "codex",
-  cursor: "cursor"
+var NATIVE_HOOK_NAME_BY_HARNESS = {
+  "claude-local": "claude",
+  "codex-local": "codex",
+  "cursor-local": "cursor"
 };
 function hookSessionId(harness, externalId) {
   if (harness !== "codex") return externalId;
@@ -88636,11 +88740,10 @@ function createHookHealthTracker(deps) {
     }
   };
   const admit = (session, nowMs) => {
-    const harness = HARNESS_OF_SOURCE[session.item.source];
-    if (harness === void 0) return;
+    const harness = NATIVE_HOOK_NAME_BY_HARNESS[session.item.harness];
     if (session.item.automation === true || session.item.startedAt === void 0) return;
     if (!(Date.parse(session.item.startedAt) > installedAtMs)) return;
-    const sessionId = hookSessionId(harness, session.item.externalId);
+    const sessionId = hookSessionId(harness, session.item.harnessSessionId);
     if (sessionId === null) return;
     const key = `${harness}:${sessionId}`;
     if (judged.has(key) || candidates.has(key)) return;
@@ -88652,7 +88755,7 @@ function createHookHealthTracker(deps) {
     const name = HARNESS_NAMES[harness];
     if (fired) {
       if (current.state === "firing") return false;
-      health[harness] = { harness, install: current.install, state: "firing" };
+      health[harness] = { ...current, state: "firing", silence: void 0 };
       log3(
         current.state === "silent" ? `${name} hooks are firing again (session ${candidate.sessionId} has a hook record)` : `${name} hooks verified firing (session ${candidate.sessionId} has a hook record)`
       );
@@ -88661,8 +88764,7 @@ function createHookHealthTracker(deps) {
     const silence = describeHookSilence(harness, inspect(harness), home);
     if (current.silence?.problem === silence.problem) return false;
     health[harness] = {
-      harness,
-      install: current.install,
+      ...current,
       state: "silent",
       silence: { ...silence, since: new Date(nowMs).toISOString() }
     };
@@ -88689,9 +88791,24 @@ function createHookHealthTracker(deps) {
   };
   return {
     observe(sessions, nowMs) {
-      for (const session of sessions) admit(session, nowMs);
+      let activityChanged = false;
+      for (const session of sessions) {
+        if (session.item.harness === "codex-local" && session.item.automation !== true && session.codexNoninteractive !== true) {
+          const at = session.item.endedAt ?? session.item.startedAt;
+          const timestamp = at === void 0 ? NaN : Date.parse(at);
+          const previous = health.codex.codexActivity;
+          if (Number.isFinite(timestamp) && timestamp <= nowMs && (previous === void 0 || timestamp > Date.parse(previous.at))) {
+            health.codex = { ...health.codex, codexActivity: {
+              client: session.codexClient ?? "unknown",
+              at: new Date(timestamp).toISOString()
+            } };
+            activityChanged = true;
+          }
+        }
+        admit(session, nowMs);
+      }
       let observed;
-      let changed = false;
+      let changed = activityChanged;
       let failure2;
       for (const [key, candidate] of candidates) {
         if (nowMs - candidate.firstSeenMs < HOOK_OBSERVATION_GRACE_MS) continue;
@@ -88721,7 +88838,7 @@ function createHookHealthTracker(deps) {
   };
 }
 
-// ../../apps/collector/src/status.ts
+// ../../apps/syncservice/src/status.ts
 var HEARTBEAT_INTERVAL_MS = 6e4;
 var STALLED_AFTER_MS = 5 * 6e4;
 var CONTROL_POLL_MS = 15e3;
@@ -88867,7 +88984,7 @@ function isPidAlive(pid) {
   }
 }
 
-// ../../apps/collector/src/credentialMigration.ts
+// ../../apps/syncservice/src/credentialMigration.ts
 function assertCredentialMigrationReady(appEnv) {
   const reason = credentialMigrationBlocker(appEnv);
   if (reason === null) return;
@@ -88898,7 +89015,7 @@ function credentialMigrationBlocker(appEnv) {
   return null;
 }
 
-// ../../apps/collector/src/macosCredentialStore.ts
+// ../../apps/syncservice/src/macosCredentialStore.ts
 var LEGACY_SERVICE = "powerplant-collector";
 var KEY_SERVICE = "powerplant-collector-encryption";
 var keySchema = external_exports.string().regex(/^[0-9a-f]{64}$/);
@@ -89098,7 +89215,7 @@ var MacosCredentialStore = class {
   }
 };
 
-// ../../apps/collector/src/credentials.ts
+// ../../apps/syncservice/src/credentials.ts
 var storedCredentialsSchema = external_exports.object({
   machineId: external_exports.string().min(1),
   machineName: external_exports.string().min(1),
@@ -89254,13 +89371,13 @@ function fallbackFile(appEnv) {
   return path14.join(os12.homedir(), ".config", "powerplant", `collector-${appEnv}.json`);
 }
 
-// ../../apps/collector/src/enroll.ts
+// ../../apps/syncservice/src/enroll.ts
 import { spawn } from "node:child_process";
 import { createHash as createHash4, randomBytes as randomBytes2 } from "node:crypto";
 import http5 from "node:http";
 import os13 from "node:os";
 
-// ../../apps/collector/src/upload.ts
+// ../../apps/syncservice/src/upload.ts
 import { readFileSync as readFileSync9 } from "node:fs";
 import { gzipSync } from "node:zlib";
 function parseApiResponse(schema, body, route) {
@@ -89379,7 +89496,7 @@ async function uploadSessions(apiUrl, machineToken, items) {
           unchanged: external_exports.number(),
           outOfPolicy: external_exports.number(),
           deferred: external_exports.number().optional(),
-          foreignOwned: external_exports.array(external_exports.object({ source: external_exports.string(), externalId: external_exports.string() })).optional()
+          foreignOwned: external_exports.array(external_exports.object({ source: external_exports.enum(LEGACY_COLLECTOR_SESSION_SOURCES), externalId: external_exports.string() })).optional()
         })
       }),
       await response.json().catch(() => null),
@@ -89389,7 +89506,16 @@ async function uploadSessions(apiUrl, machineToken, items) {
     unchanged += result.data.unchanged;
     outOfPolicy += result.data.outOfPolicy;
     deferred += result.data.deferred ?? 0;
-    foreignOwned.push(...result.data.foreignOwned ?? []);
+    for (const identity of result.data.foreignOwned ?? []) {
+      const harness = harnessFromLegacySessionSource(identity.source);
+      if (harness.kind !== "harness") {
+        throw new Error("sessions ingest returned an unsupported ownership identity");
+      }
+      foreignOwned.push({
+        harness: external_exports.enum(COLLECTOR_SESSION_HARNESSES).parse(harness.harness),
+        harnessSessionId: identity.externalId
+      });
+    }
   }
   return { upserted, unchanged, outOfPolicy, deferred, ...foreignOwned.length > 0 ? { foreignOwned } : {} };
 }
@@ -89462,7 +89588,7 @@ async function uploadRawSessions(apiUrl, machineToken, transcriptUploadSources,
         shipped?.set(transcriptUploadSourcePath, session.mtimeMs);
         continue;
       }
-      const query = `source=${session.item.source}&externalId=${encodeURIComponent(session.item.externalId)}`;
+      const query = `harness=${session.item.harness}&harnessSessionId=${encodeURIComponent(session.item.harnessSessionId)}`;
       const response = await fetchWithRetry(
         "uploading a raw transcript",
         `${apiUrl}/api/ingest/sessions/raw?${query}`,
@@ -89496,7 +89622,7 @@ async function uploadRawSessions(apiUrl, machineToken, transcriptUploadSources,
     } catch (error63) {
       if (error63 instanceof RateLimitedError) rateLimited ??= error63;
       summary.failed.push(
-        `${session.item.externalId}: ${error63 instanceof Error ? error63.message : String(error63)}`
+        `${session.item.harnessSessionId}: ${error63 instanceof Error ? error63.message : String(error63)}`
       );
     }
   }
@@ -89504,7 +89630,7 @@ async function uploadRawSessions(apiUrl, machineToken, transcriptUploadSources,
   return summary;
 }
 
-// ../../apps/collector/src/enroll.ts
+// ../../apps/syncservice/src/enroll.ts
 var APPROVAL_TIMEOUT_MS = 5 * 60 * 1e3;
 var gotrueTokenSchema = external_exports.object({ access_token: external_exports.string().min(1) });
 var gotrueErrorSchema = external_exports.object({
@@ -89562,7 +89688,7 @@ async function runEnrollment(config2, options) {
   let scopePaths = (options.scope ?? []).map(normalizeScopePath);
   let captureMode = scopePaths.length > 0 ? "scope" : "org-repos";
   if (captureMode === "scope") {
-    log3(`- Folders that will upload once approved: ${scopePaths.join(", ")}`);
+    log3(`Folders that will upload once approved: ${scopePaths.join(", ")}`);
   }
   const result = await enroll(config2, {
     name,
@@ -89577,7 +89703,7 @@ async function runEnrollment(config2, options) {
     if (config2.appEnv === "development") {
       const home = normalizeScopePath(os13.homedir());
       log3(
-        `- No GitHub integration on org "${result.org.name}", syncing sessions under ${home} (your home folder, local DB only). Re-enroll with --scope <path> to narrow.`
+        `No GitHub integration on org "${result.org.name}", syncing sessions under ${home} (your home folder, local DB only). Re-enroll with --scope <path> to narrow.`
       );
       captureMode = "scope";
       scopePaths = [home];
@@ -89614,14 +89740,6 @@ async function runEnrollment(config2, options) {
     // claims are unknown, and the first sweep must not stamp over them.
     ...workspace.integration === "linked" && workspace.owners.length === 0 && workspace.repos === null && { unresolved: true }
   }));
-  const policy = captureMode === "org-repos" ? {
-    mode: "org-repos",
-    allowedOwners: orgPolicy?.owners ?? [],
-    allowedRepos: orgPolicy?.repos ?? null,
-    ...workspacePolicies !== void 0 && { workspaceClaims: workspacePolicies },
-    memberFolders: [],
-    repoOf: () => null
-  } : { mode: "scope", scopePaths, repoOf: () => null };
   const credentials = {
     machineId: result.machine.id,
     machineName: result.machine.name,
@@ -89637,9 +89755,7 @@ async function runEnrollment(config2, options) {
     scopePaths
   };
   const location = saveCredentials(config2.appEnv, credentials);
-  log3(`- Enrolled "${result.machine.name}" (${result.machine.id}) into org "${result.org.name}".`);
-  log3(`- Machine token stored in ${location}.`);
-  log3(`- ${describeEnrollmentCapture(policy)}.`);
+  log3(`Machine token stored in ${location}`);
   return credentials;
 }
 async function enroll(config2, options, createAuthClient = gotrueAuthClient, listener = {}) {
@@ -89822,7 +89938,7 @@ function waitForApproval(approvalUrl, state, options) {
     server.listen(port, "127.0.0.1", () => {
       const address = server.address();
       if (onListening && address !== null && typeof address === "object") onListening(address.port);
-      log3(`- Opening approval page\u2026 ${approvalUrl}`);
+      log3(`Opening approval page\u2026 ${approvalUrl}`);
       open3(approvalUrl);
     });
   });
@@ -89837,7 +89953,7 @@ function openBrowser(url2) {
   spawn(command, [url2], { stdio: "ignore", detached: true }).unref();
 }
 
-// ../../apps/collector/src/folders.ts
+// ../../apps/syncservice/src/folders.ts
 var defaultDeps = { load: loadCredentials, persist: saveCredentials };
 function requireEnrolled(config2, enrollCommand, deps) {
   const credentials = deps.load(config2.appEnv);
@@ -89898,7 +90014,7 @@ function removeFolder(config2, rawPath, enrollCommand, log3, deps = defaultDeps)
   log3(`Removed ${folder}, sessions there stay local from the next sync pass.`);
 }
 
-// ../../apps/collector/src/claudeCode.ts
+// ../../apps/syncservice/src/claudeCode.ts
 import os14 from "node:os";
 import path15 from "node:path";
 import { setImmediate as yieldToEventLoop2 } from "node:timers/promises";
@@ -90024,7 +90140,7 @@ async function collectClaudeCodeSessions(options = {}) {
             mtimeMs: stat.mtimeMs,
             transcriptPath,
             ...cwd && { cwd },
-            item: { source: "claude-code", externalId: sessionId, status, capturedVia: decision.via }
+            item: { harness: "claude-local", harnessSessionId: sessionId, status, capturedVia: decision.via }
           });
           continue;
         }
@@ -90082,8 +90198,8 @@ async function collectClaudeCodeSessions(options = {}) {
         transcriptPath,
         ...cwd && { cwd },
         item: {
-          source: "claude-code",
-          externalId: sessionId,
+          harness: "claude-local",
+          harnessSessionId: sessionId,
           status,
           ...summary.startedAt && { startedAt: summary.startedAt },
           ...endedAt && { endedAt },
@@ -90207,11 +90323,11 @@ function claudeCodeSessionCwd(sessionId, claudeDir = path15.join(os14.homedir(),
   return void 0;
 }
 
-// ../../apps/collector/src/protectedRepoDiscovery.ts
+// ../../apps/syncservice/src/protectedRepoDiscovery.ts
 import os15 from "node:os";
 import path16 from "node:path";
 
-// ../../apps/collector/src/syncWindow.ts
+// ../../apps/syncservice/src/syncWindow.ts
 var STEADY_SYNC_WINDOW_DAYS = 3;
 var DEEP_FIRST_SYNC_DAYS = 90;
 var DEEP_FIRST_SYNC_MAX_SESSIONS = 100;
@@ -90242,7 +90358,7 @@ function describeScanReach(window2, narrowSinceMs) {
   return `changed since ${new Date(narrowSinceMs).toISOString()}`;
 }
 
-// ../../apps/collector/src/protectedRepoDiscovery.ts
+// ../../apps/syncservice/src/protectedRepoDiscovery.ts
 var defaultDiscoveryDeps = {
   collectClaude: collectClaudeCodeSessions,
   collectCodex: collectCodexSessions,
@@ -90438,7 +90554,7 @@ function sameList(a, b2) {
   return a.length === b2.length && a.every((root, index) => root === b2[index]);
 }
 
-// ../../apps/collector/src/recentCatchup.ts
+// ../../apps/syncservice/src/recentCatchup.ts
 function createRecentCatchup(run, now = Date.now) {
   let coveredSince = now();
   let nextCheck = coveredSince + 15e3;
@@ -90478,7 +90594,7 @@ function recentSyncOptions(shared, narrowSinceMs, selection) {
   };
 }
 
-// ../../apps/collector/src/branchFacts.ts
+// ../../apps/syncservice/src/branchFacts.ts
 import { readFileSync as readFileSync10 } from "node:fs";
 import path17 from "node:path";
 var SHA_SHAPE = /^[0-9a-f]{40}$/;
@@ -90512,13 +90628,13 @@ function branchFactsOf(sessions, observe) {
     if (!session.cwd) return [];
     const observed = observe(session.cwd);
     if (!observed) return [];
-    const key = `${session.item.source}
-${session.item.externalId}
+    const key = `${session.item.harness}
+${session.item.harnessSessionId}
 ${observed.repoFullName}
 ${observed.branch}`;
     if (seen.has(key)) return [];
     seen.add(key);
-    return [{ source: session.item.source, externalId: session.item.externalId, ...observed }];
+    return [{ harness: session.item.harness, harnessSessionId: session.item.harnessSessionId, ...observed }];
   });
 }
 function branchObserver(environment = {}) {
@@ -90556,7 +90672,7 @@ function readIfExists2(p) {
   }
 }
 
-// ../../apps/collector/src/previewRegistration.ts
+// ../../apps/syncservice/src/previewRegistration.ts
 async function registerAnnouncedPreviews(apiUrl, machineToken, collected, memo2, deps = {}) {
   const readTranscript = deps.readTranscript ?? readIfExists;
   const upload = deps.upload ?? uploadPreviewRegistration;
@@ -90574,7 +90690,11 @@ async function registerAnnouncedPreviews(apiUrl, machineToken, collected, memo2,
     try {
       const text = readTranscript(session.transcriptPath);
       if (text === null) continue;
-      const previews = announcedPreviewsFromTurns(parseSessionTurns(session.item.source, text)).filter(
+      const legacyIdentity = legacySessionSourceFromHarness(session.item.harness);
+      if (legacyIdentity.kind === "unsupported") {
+        throw new Error(`Transcript parsing does not support ${session.item.harness}`);
+      }
+      const previews = announcedPreviewsFromTurns(parseSessionTurns(legacyIdentity.source, text)).filter(
         (preview) => preview.url.length <= MAX_PREVIEW_URL_LENGTH && redactText(preview.url) === preview.url
       ).slice(-MAX_REGISTERED_PREVIEWS).map((preview) => ({
         ...preview,
@@ -90586,32 +90706,32 @@ async function registerAnnouncedPreviews(apiUrl, machineToken, collected, memo2,
         continue;
       }
       const outcome = await upload(apiUrl, machineToken, {
-        source: session.item.source,
-        externalId: session.item.externalId,
+        harness: session.item.harness,
+        harnessSessionId: session.item.harnessSessionId,
         previews
       });
       if (outcome === "foreign-owner") {
         memo2.set(session.transcriptPath, { examinedMtimeMs: session.mtimeMs, foreignOwner: true });
-        summary.foreignOwned.push(session.item.externalId);
+        summary.foreignOwned.push(session.item.harnessSessionId);
         continue;
       }
       if (outcome === "previews-off") {
         memo2.set(session.transcriptPath, { examinedMtimeMs: session.mtimeMs, previewsOff: true });
-        summary.previewsOff.push(session.item.externalId);
+        summary.previewsOff.push(session.item.harnessSessionId);
         continue;
       }
       memo2.set(session.transcriptPath, { examinedMtimeMs: session.mtimeMs, registeredJson });
       summary.registered += 1;
     } catch (error63) {
       summary.failed.push(
-        `${session.item.externalId}: ${error63 instanceof Error ? error63.message : String(error63)}`
+        `${session.item.harnessSessionId}: ${error63 instanceof Error ? error63.message : String(error63)}`
       );
     }
   }
   return summary;
 }
 
-// ../../apps/collector/src/sync.ts
+// ../../apps/syncservice/src/sync.ts
 var defaultPolicyDeps = {
   fetchPolicy: fetchCapturePolicy,
   load: loadCredentials,
@@ -90807,7 +90927,7 @@ async function runSyncPassInternal(config2, options, diagnostic) {
   for (const failure2 of codex.unreadable) log3(`  codex rollout skipped, ${failure2}`);
   if (options.dryRun) {
     for (const s of items.slice(0, 10)) {
-      log3(`  ${s.externalId}  ${s.model ?? "model unmeasured"}  ${s.title ?? "(untitled)"}`);
+      log3(`  ${s.harnessSessionId}  ${s.model ?? "model unmeasured"}  ${s.title ?? "(untitled)"}`);
     }
     if (items.length > 10) log3(`  ... and ${items.length - 10} more`);
     log3("Dry run, nothing uploaded.");
@@ -90847,13 +90967,13 @@ async function runSyncPassInternal(config2, options, diagnostic) {
     items
   );
   const foreignKeys = new Set(
-    foreignOwned.map(({ source, externalId }) => JSON.stringify([source, externalId]))
+    foreignOwned.map(({ harness, harnessSessionId }) => JSON.stringify([harness, harnessSessionId]))
   );
   const writable = collected.filter(
-    ({ item }) => !foreignKeys.has(JSON.stringify([item.source, item.externalId]))
+    ({ item }) => !foreignKeys.has(JSON.stringify([item.harness, item.harnessSessionId]))
   );
-  for (const { source, externalId } of foreignOwned) {
-    log3(`Skipped ${source} session ${externalId}: already synced from another machine.`);
+  for (const { harness, harnessSessionId } of foreignOwned) {
+    log3(`Skipped ${harness} session ${harnessSessionId}: already synced from another machine.`);
   }
   Object.assign(diagnostic, { upserted, unchanged, outOfPolicy, deferred });
   log3(
@@ -90996,7 +91116,7 @@ function failedPassDiagnostic(error63) {
   return error63 instanceof Error ? failedPasses.get(error63) : void 0;
 }
 
-// ../../apps/collector/src/versionSupport.ts
+// ../../apps/syncservice/src/versionSupport.ts
 var FETCH_TIMEOUT_MS = 3e3;
 var policyEnvelope = external_exports.object({
   data: external_exports.object({
@@ -91036,15 +91156,15 @@ function isUpdateAvailable(cliVersion2, latestVersion) {
 }
 function unsupportedVersionNotice(cliVersion2, oldestSupportedVersion) {
   if (!isUnsupportedVersion(cliVersion2, oldestSupportedVersion)) return null;
-  return `\u26A0 Powerplant CLI ${cliVersion2} is no longer supported (oldest supported: ${oldestSupportedVersion}). Update now: powerplant update (or npm install -g @usepowerplant/cli). Unsupported versions can stop working without further notice.`;
+  return `! Powerplant CLI ${cliVersion2} is no longer supported (oldest supported: ${oldestSupportedVersion}). Update now: powerplant update (or npm install -g @usepowerplant/cli). Unsupported versions can stop working without further notice.`;
 }
 
-// ../../apps/collector/src/watch.ts
+// ../../apps/syncservice/src/watch.ts
 import { existsSync as existsSync8, watch as fsWatch } from "node:fs";
 import os16 from "node:os";
 import path18 from "node:path";
 
-// ../../apps/collector/src/selfRestart.ts
+// ../../apps/syncservice/src/selfRestart.ts
 import { statSync as statSync3 } from "node:fs";
 var ENTRY_CHECK_INTERVAL_MS = 5 * 6e4;
 function watchEntryForUpdate(entryPath2, onChanged, options = {}) {
@@ -91073,7 +91193,7 @@ function defaultStat(file2) {
   }
 }
 
-// ../../apps/collector/src/watch.ts
+// ../../apps/syncservice/src/watch.ts
 var WATCH_DEBOUNCE_MS = 5e3;
 var WATCH_MAX_WAIT_MS = 3e4;
 var SAFETY_NET_INTERVAL_MS = 60 * 60 * 1e3;
@@ -91613,12 +91733,12 @@ function describeDelay(ms) {
   return seconds < 120 ? `${seconds}s` : `${Math.round(seconds / 60)} minutes`;
 }
 
-// ../../apps/collector/src/localSessionFacts.ts
+// ../../apps/syncservice/src/localSessionFacts.ts
 import { existsSync as existsSync9, readdirSync as readdirSync4, statSync as statSync4 } from "node:fs";
 import os17 from "node:os";
 import path20 from "node:path";
 
-// ../../apps/collector/src/codexReviewFacts.ts
+// ../../apps/syncservice/src/codexReviewFacts.ts
 import { closeSync as closeSync6, lstatSync as lstatSync5, openSync as openSync6, readSync as readSync4, realpathSync as realpathSync3 } from "node:fs";
 import path19 from "node:path";
 var pointerSchema = external_exports.object({
@@ -91688,7 +91808,7 @@ function readPrefix(file2) {
   }
 }
 
-// ../../apps/collector/src/localSessionFacts.ts
+// ../../apps/syncservice/src/localSessionFacts.ts
 var WORKING_FRESH_MS = 9e4;
 var STORES = [
   {
@@ -91749,6 +91869,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)
         );
@@ -91817,7 +91938,129 @@ function localSessionKey(session) {
   return JSON.stringify([session.source, session.externalId]);
 }
 
+// src/hookPreferences.ts
+var preferencesSchema = external_exports.object({
+  version: external_exports.literal(1),
+  codexNotFiringDismissed: external_exports.boolean()
+});
+function hookPreferencesPath(appEnv, home) {
+  return path21.join(collectorStateDir(home), `hook-preferences-${appEnv}.json`);
+}
+function readHookPreferences(appEnv, home) {
+  const file2 = hookPreferencesPath(appEnv, home);
+  try {
+    return preferencesSchema.parse(JSON.parse(readFileSync11(file2, "utf8")));
+  } catch (error63) {
+    if (error63 instanceof Error && "code" in error63 && error63.code === "ENOENT") {
+      return { version: 1, codexNotFiringDismissed: false };
+    }
+    throw new ExpectedCliError(`Cannot read hook preferences at ${file2}. Restore or remove that file, then retry.`, { cause: error63 });
+  }
+}
+function readHookPreferencesForMenu(appEnv, home) {
+  try {
+    return { codexHookWarningDismissed: readHookPreferences(appEnv, home).codexNotFiringDismissed };
+  } catch (error63) {
+    if (!(error63 instanceof ExpectedCliError)) throw error63;
+    return { hookPreferencesError: error63.message };
+  }
+}
+function dismissCodexHookWarning(appEnv, home) {
+  const preferences = readHookPreferences(appEnv, home);
+  if (preferences.codexNotFiringDismissed) return;
+  const file2 = hookPreferencesPath(appEnv, home);
+  mkdirSync10(path21.dirname(file2), { recursive: true });
+  const temporary = `${file2}.${process.pid}.tmp`;
+  writeFileSync9(temporary, JSON.stringify({ ...preferences, codexNotFiringDismissed: true }, null, 2), { mode: 384 });
+  renameSync5(temporary, file2);
+}
+
+// src/mcpPreferences.ts
+import { mkdirSync as mkdirSync11, readFileSync as readFileSync12, renameSync as renameSync6, writeFileSync as writeFileSync10 } from "node:fs";
+import path22 from "node:path";
+var preferenceSchema = external_exports.object({
+  optedIn: external_exports.boolean().optional(),
+  dismissedWarning: mcpWarningSchema.optional()
+});
+var preferencesSchema2 = 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 path22.join(collectorStateDir(home), `mcp-preferences-${appEnv}.json`);
+}
+function readMcpPreferences(appEnv, home) {
+  const file2 = mcpPreferencesPath(appEnv, home);
+  try {
+    return preferencesSchema2.parse(JSON.parse(readFileSync12(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);
+  mkdirSync11(path22.dirname(file2), { recursive: true });
+  const temporary = `${file2}.${process.pid}.tmp`;
+  writeFileSync10(temporary, JSON.stringify(preferencesSchema2.parse(preferences), null, 2), { mode: 384 });
+  renameSync6(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" };
@@ -91835,14 +92078,14 @@ function nativeFailureRecord(error63) {
 
 // src/desktopDiagnostics.ts
 import os19 from "node:os";
-import path22 from "node:path";
+import path24 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 path23 from "node:path";
 var memberSessionSchema = external_exports.object({
   id: external_exports.string().min(1),
   source: external_exports.string().min(1),
@@ -91959,10 +92202,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", path23.join(os18.homedir(), "Applications")];
   return roots.some(
     (root) => bundles.some((bundle) => {
-      const bundlePath = path21.join(root, bundle);
+      const bundlePath = path23.join(root, bundle);
       return probe.exists(bundlePath) && probe.readUrlSchemes(bundlePath).includes(scheme);
     })
   );
@@ -91972,7 +92215,7 @@ function realReadUrlSchemes(bundlePath) {
   try {
     const json2 = execFileSync4(
       "plutil",
-      ["-extract", "CFBundleURLTypes", "json", "-o", "-", path21.join(bundlePath, "Contents", "Info.plist")],
+      ["-extract", "CFBundleURLTypes", "json", "-o", "-", path23.join(bundlePath, "Contents", "Info.plist")],
       { stdio: ["ignore", "pipe", "ignore"] }
     ).toString();
     const parsed = urlSchemesSchema.safeParse(JSON.parse(json2));
@@ -91991,7 +92234,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 = path23.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;
@@ -92002,7 +92245,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 = path23.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)) {
@@ -92042,7 +92285,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 = path24.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" } };
   }
@@ -92059,24 +92302,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 mkdirSync16, openSync as openSync9, realpathSync as realpathSync5, rmSync as rmSync7 } from "node:fs";
+import path33 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 mkdirSync12,
   mkdtempSync,
   readdirSync as readdirSync5,
-  readFileSync as readFileSync11,
+  readFileSync as readFileSync13,
   realpathSync as realpathSync4,
   statSync as statSync5,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync11
 } from "node:fs";
 import os20 from "node:os";
-import path23 from "node:path";
+import path25 from "node:path";
 import { emitKeypressEvents } from "node:readline";
 
 // src/agentVersions.ts
@@ -92150,7 +92394,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", path25.join(homeDir, "Applications")] : [];
 }
 function detectClients(options = {}) {
   const homeDir = options.homeDir ?? os20.homedir();
@@ -92178,7 +92422,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 = path25.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);
@@ -92186,12 +92430,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 = path25.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 = path25.join(homeDir, ".cursor");
+  if (!options.requireCursorApp && existsSync11(cursorDir) || cursorAppInstalled(applicationsDirs, bundleSeams)) {
+    clients.push({ client: "cursor", bin: path25.join(cursorDir, "mcp.json") });
   }
   return clients;
 }
@@ -92199,7 +92443,7 @@ function claudeConfigHomes(homeDir, env) {
   const homes = [];
   const seen = /* @__PURE__ */ new Set();
   try {
-    seen.add(realpathSync4(path23.join(homeDir, ".claude")));
+    seen.add(realpathSync4(path25.join(homeDir, ".claude")));
   } catch {
   }
   const add = (configDir) => {
@@ -92211,7 +92455,7 @@ function claudeConfigHomes(homeDir, env) {
     }
     if (seen.has(real)) return;
     seen.add(real);
-    homes.push(path23.resolve(configDir));
+    homes.push(path25.resolve(configDir));
   };
   let entries = [];
   try {
@@ -92219,8 +92463,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(path25.join(homeDir, entry, ".claude.json"))) {
+      add(path25.join(homeDir, entry));
     }
   }
   if (env.CLAUDE_CONFIG_DIR) add(env.CLAUDE_CONFIG_DIR);
@@ -92248,7 +92492,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(path25.join(dir, entry));
     }
   }
   return bundles;
@@ -92268,7 +92512,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 = path25.join(appDir, "Contents", "Resources", "codex");
     if (!isExecutableFile(bin)) continue;
     if (!signedByTeam(bin, OPENAI_TEAM_ID, "OpenAI", appDir, seams)) continue;
     found.push(bin);
@@ -92280,7 +92524,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 = path25.join(appDir, "Contents", "MacOS", info.executable);
   if (!isExecutableFile(bin)) return null;
   if (!signedByTeam(bin, CURSOR_TEAM_ID, "Cursor", appDir, seams)) return null;
   return info;
@@ -92317,7 +92561,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", "-", path25.join(appDir, "Contents", "Info.plist")],
     { encoding: "utf8", timeout: timeoutMs }
   );
   if (result.status !== 0) return null;
@@ -92339,14 +92583,14 @@ function realVerifySignature(binPath, teamId, timeoutMs) {
   }).status === 0;
 }
 function desktopClaudeBinaries(homeDir) {
-  const root = path23.join(homeDir, "Library", "Application Support", "Claude", "claude-code");
+  const root = path25.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) => path25.join(root, version2, "claude.app", "Contents", "MacOS", "claude")).filter((bin) => existsSync11(bin));
 }
 function defaultWhichAll(name) {
   try {
@@ -92367,7 +92611,7 @@ function runConnect(clients, deps) {
     failed: 0
   };
   if (clients.length === 0) {
-    deps.log("No coding agents found (looked for `claude`, `codex`, and Cursor), nothing to connect.");
+    deps.log("No coding agents found (looked for claude, codex, and Cursor)");
     return outcome;
   }
   for (const [agent, candidates] of agents) {
@@ -92417,8 +92661,8 @@ function connectTarget(agent, candidates, all, deps) {
     }
     if (last.state !== "failed") return last;
     if (index < candidates.length - 1) {
-      deps.log(`${name} could not be used, ${last.detail}`);
-      deps.log(`\u2192 trying another ${AGENT_DISPLAY_NAMES[agent]} installation\u2026`);
+      deps.log(`! ${name}: could not be used, ${last.detail}`);
+      deps.log(`\u2192 ${AGENT_DISPLAY_NAMES[agent]}: trying another installation\u2026`);
     } else {
       deps.log(`\u2717 ${name}: ${last.detail}`);
     }
@@ -92468,22 +92712,25 @@ 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;
   const output2 = seams.output ?? process.stdout;
+  const indent = seams.indent ?? "";
   const raiseInterrupt = seams.raiseInterrupt ?? (() => process.kill(process.pid, "SIGINT"));
   const selected = new Set(choices.map((choice) => choice.value));
   let active = 0;
   let settled = false;
   const wasRaw = input2.isRaw === true;
   const render = () => [
-    `? ${question}`,
+    `${indent}? ${question}`,
     ...choices.map(
-      (choice, index) => `${index === active ? "\u276F" : " "} [${selected.has(choice.value) ? "x" : " "}] ${choice.label}`
+      (choice, index) => `${indent}${index === active ? "\u276F" : " "} [${selected.has(choice.value) ? "x" : " "}] ${choice.label}`
     ),
-    "  \u2191/\u2193 move \xB7 space toggle \xB7 enter confirm"
+    `${indent}  \u2191/\u2193 move \xB7 space toggle \xB7 enter confirm`
   ].join("\n");
   const redraw = () => {
     output2.write(`\r\x1B[${choices.length + 1}A\x1B[J${render()}`);
@@ -92577,26 +92824,22 @@ function connectClaude(client, name, deps) {
   const { missing, registeredUrl } = probe;
   if (missing || registeredUrl !== void 0 && registeredUrl !== deps.mcpUrl) {
     if (!missing) {
-      deps.log(`${name}: registered against ${registeredUrl}, re-registering for ${deps.mcpUrl}.`);
+      deps.log(`${name} was registered against ${registeredUrl}, re-registering for ${deps.mcpUrl}.`);
       deps.run(bin, ["mcp", "remove", "--scope", "user", deps.serverName], env);
     }
     const add = deps.run(bin, claudeAddArgs(deps), env);
     if (add.status !== 0) {
       return failed(`registering the Powerplant MCP failed, ${describeFailure(add)}`);
     }
-    deps.log(`${name}: Powerplant MCP registered (user scope).`);
   } else if (probe.authenticated) {
-    deps.log(`\u2713 ${name}  MCP already connected`);
+    deps.log(`\u2713 ${name}: MCP already connected`);
     return { state: "connected", unchanged: true };
   } else if (deps.officialClients?.["claude-code"]) {
-    deps.log(`${name}: re-registering with the pre-registered client before sign-in.`);
     deps.run(bin, ["mcp", "remove", "--scope", "user", deps.serverName], env);
     const add = deps.run(bin, claudeAddArgs(deps), env);
     if (add.status !== 0) {
       return failed(`registering the Powerplant MCP failed, ${describeFailure(add)}`);
     }
-  } else {
-    deps.log(`${name}: Powerplant MCP already registered.`);
   }
   return login(bin, name, ["mcp", "login", deps.serverName], deps, env);
 }
@@ -92815,9 +93058,7 @@ function healOrphanCodexOauthTable(name, deps) {
   const { content, changed } = unpatchCodexConfigToml(existing, deps.serverName);
   if (!changed) return;
   deps.writeTextFile(deps.codexConfigPath, content);
-  deps.log(
-    `${name}: removed leftover sign-in settings from an interrupted setup, codex can read its configuration again.`
-  );
+  deps.log(`Removed leftover ${name} sign-in settings from an interrupted setup.`);
 }
 function connectCodex(bin, name, deps) {
   healOrphanCodexOauthTable(name, deps);
@@ -92829,7 +93070,7 @@ function connectCodex(bin, name, deps) {
   const wrongUrl = registeredUrl !== void 0 && registeredUrl !== deps.mcpUrl;
   const alreadyConnected = !missing && !wrongUrl && probe.authenticated;
   if (missing || wrongUrl) {
-    if (wrongUrl) deps.log(`${name}: registered against ${registeredUrl}, re-registering for ${deps.mcpUrl}.`);
+    if (wrongUrl) deps.log(`${name} was registered against ${registeredUrl}, re-registering for ${deps.mcpUrl}.`);
     if (codexAddLogsIn(bin, deps)) {
       ensureCodexCallbackPort(name, deps);
       const outcome = login(bin, name, codexAddArgs(deps, { withOfficialClientId: true }), deps);
@@ -92840,27 +93081,21 @@ function connectCodex(bin, name, deps) {
     if (add.status !== 0) {
       return failed(`registering the Powerplant MCP failed, ${describeFailure(add)}`);
     }
-    deps.log(`${name}: Powerplant MCP registered.`);
   } else if (alreadyConnected) {
-    deps.log(`\u2713 ${name}  MCP already connected`);
-  } else {
-    deps.log(`${name}: Powerplant MCP already registered.`);
+    deps.log(`\u2713 ${name}: MCP already connected`);
   }
   ensureCodexOfficialClient(name, deps);
   if (alreadyConnected) return { state: "connected", unchanged: true };
   return login(bin, name, ["mcp", "login", deps.serverName], deps);
 }
-function applyCodexConfigPatch(name, deps, patch, successLine) {
+function applyCodexConfigPatch(name, deps, patch) {
   if (patch.conflict !== void 0) {
     deps.log(
-      `${name}: ${patch.conflict}, sign-in may fail until the port conflict is resolved; then re-run ${deps.connectCommand}.`
+      `! ${name}: ${patch.conflict}, sign-in may fail until the port conflict is resolved, then re-run ${deps.connectCommand}`
     );
     return;
   }
-  if (patch.changed) {
-    deps.writeTextFile(deps.codexConfigPath, patch.content);
-    deps.log(`${name}: ${successLine}`);
-  }
+  if (patch.changed) deps.writeTextFile(deps.codexConfigPath, patch.content);
 }
 function ensureCodexCallbackPort(name, deps) {
   const official = deps.officialClients?.codex;
@@ -92868,8 +93103,7 @@ function ensureCodexCallbackPort(name, deps) {
   applyCodexConfigPatch(
     name,
     deps,
-    patchCodexCallbackPort(deps.readTextFile(deps.codexConfigPath), official.callbackPort),
-    "OAuth callback port pinned in config.toml."
+    patchCodexCallbackPort(deps.readTextFile(deps.codexConfigPath), official.callbackPort)
   );
 }
 function ensureCodexOfficialClient(name, deps) {
@@ -92883,8 +93117,7 @@ function ensureCodexOfficialClient(name, deps) {
       deps.serverName,
       official.clientId,
       official.callbackPort
-    ),
-    "pre-registered Powerplant client configured in config.toml."
+    )
   );
 }
 function connectCursor(mcpJsonPath, name, deps) {
@@ -92901,24 +93134,23 @@ function connectCursor(mcpJsonPath, name, deps) {
     );
   }
   if (patch.changed) deps.writeTextFile(mcpJsonPath, patch.content);
-  const configured = patch.changed ? "configured" : "already configured";
   if (deps.openUrl(cursorInstallDeeplink(deps.serverName, patch.entry))) {
-    deps.log(`\u2192 ${name}  ${configured}, approve inside Cursor when it asks.`);
+    deps.log(`\u2192 ${name}: approve inside Cursor when it asks`);
     return { state: "configured", unchanged: !patch.changed };
   }
   deps.log(
-    `\u2192 ${name}  ${configured}, could not open Cursor; in Cursor's MCP settings, enable the ${deps.serverName} server and sign in.`
+    `! ${name}: could not open Cursor, enable the ${deps.serverName} server in Cursor's MCP settings and sign in`
   );
   return { state: "pending", unchanged: false };
 }
 function login(bin, name, args, deps, env) {
-  deps.log(`\u2192 ${name}  approve in your browser\u2026`);
+  deps.log(`\u2192 ${name}: approve in your browser\u2026`);
   const status = deps.runInteractive(bin, args, env);
   if (status === 0) {
-    deps.log(`\u2713 ${name}  MCP connected`);
+    deps.log(`\u2713 ${name}: MCP connected`);
     return { state: "connected", unchanged: false };
   }
-  deps.log(`\u2192 ${name}  MCP sign-in not completed, finish later with: ${deps.connectCommand}`);
+  deps.log(`! ${name}: sign-in not completed`);
   return { state: "pending", unchanged: false };
 }
 function runDisconnect(clients, deps) {
@@ -92939,7 +93171,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;
 }
@@ -92959,7 +93193,7 @@ function disconnectTarget(agent, candidates, deps) {
     }
     if (last !== "failed") return last;
     if (index < candidates.length - 1) {
-      deps.log(`\u2192 trying another ${AGENT_DISPLAY_NAMES[agent]} installation\u2026`);
+      deps.log(`\u2192 ${AGENT_DISPLAY_NAMES[agent]}: trying another installation\u2026`);
     }
   }
   return last;
@@ -93045,11 +93279,11 @@ function anyClientStillConnected(clients, deps) {
   });
 }
 function describeBinary(bin) {
-  return `${path23.basename(bin)} (${bin.replace(os20.homedir(), "~")})`;
+  return `${path25.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 `${path25.basename(client.bin)} (${client.configDir.replace(os20.homedir(), "~")})`;
 }
 var FAILURE_DETAIL_MAX_CHARS = 200;
 function describeFailure(result) {
@@ -93062,7 +93296,7 @@ function describeFailure(result) {
 }
 var neutralDirMemo;
 function neutralWorkdir() {
-  neutralDirMemo ??= mkdtempSync(path23.join(os20.tmpdir(), "powerplant-connect-"));
+  neutralDirMemo ??= mkdtempSync(path25.join(os20.tmpdir(), "powerplant-connect-"));
   return neutralDirMemo;
 }
 async function fetchOfficialClients(apiUrl, log3) {
@@ -93092,25 +93326,25 @@ async function fetchOfficialClients(apiUrl, log3) {
 }
 function realReadTextFile(filePath) {
   try {
-    return readFileSync11(filePath, "utf8");
+    return readFileSync13(filePath, "utf8");
   } catch {
     return null;
   }
 }
 function realReadTextFileStrict(filePath) {
   try {
-    return readFileSync11(filePath, "utf8");
+    return readFileSync13(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);
+  mkdirSync12(path25.dirname(filePath), { recursive: true });
+  writeFileSync11(filePath, content);
 }
 function codexConfigPath(homeDir = os20.homedir()) {
-  return path23.join(process.env.CODEX_HOME ?? path23.join(homeDir, ".codex"), "config.toml");
+  return path25.join(process.env.CODEX_HOME ?? path25.join(homeDir, ".codex"), "config.toml");
 }
 function realOpenUrl(url2) {
   const bin = process.platform === "darwin" ? "open" : process.platform === "linux" ? "xdg-open" : null;
@@ -93171,8 +93405,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 mkdirSync13, writeFileSync as writeFileSync12 } from "node:fs";
+import path26 from "node:path";
 function probeConnections(clients, deps) {
   const reports = [];
   for (const kind of ["claude", "codex", "cursor"]) {
@@ -93216,7 +93450,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" : path26.basename(worst.configDir)
   };
 }
 function probeClient(client, deps) {
@@ -93295,12 +93529,12 @@ var detectedClientsSchema = external_exports.object({
   )
 });
 function detectedClientsPath(homeDir) {
-  return path24.join(collectorStateDir(homeDir), "detected-clients.json");
+  return path26.join(collectorStateDir(homeDir), "detected-clients.json");
 }
 function saveDetectedClients(clients, pathValue, homeDir) {
   try {
     const file2 = detectedClientsPath(homeDir);
-    mkdirSync11(path24.dirname(file2), { recursive: true });
+    mkdirSync13(path26.dirname(file2), { recursive: true });
     const record2 = {
       detectedAt: (/* @__PURE__ */ new Date()).toISOString(),
       path: pathValue,
@@ -93310,7 +93544,7 @@ function saveDetectedClients(clients, pathValue, homeDir) {
         ...configDir !== void 0 && { configDir }
       }))
     };
-    writeFileSync10(file2, JSON.stringify(record2, null, 2));
+    writeFileSync12(file2, JSON.stringify(record2, null, 2));
   } catch {
   }
 }
@@ -93332,7 +93566,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);
@@ -93387,7 +93621,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 path28 from "node:path";
 
 // src/duration.ts
 function duration3(ms) {
@@ -93405,11 +93639,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 readFileSync14 } from "node:fs";
+import path27 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = true ? "0.4.13" : "0.0.0-checkout";
+var CLI_VERSION = true ? "0.4.15" : "0.0.0-checkout";
 var CLI_RELEASE_BUILD = true ? true : false;
 var CLI_PACKAGE_NAME = "@usepowerplant/cli";
 
@@ -93433,13 +93667,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 = path27.dirname(path27.dirname(packageDir));
+  const prefix = manager === "npm" ? path27.dirname(path27.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?.(path27.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 {
@@ -93466,7 +93700,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 path27.normalize(invokedEntryPath);
   const store = realEntryPath.lastIndexOf("/.pnpm/");
   if (store === -1) return realEntryPath;
   const at = realEntryPath.indexOf(PACKAGE_SEGMENT, store);
@@ -93493,7 +93727,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(path27.join(packageDir, "package.json"));
   if (raw === null) return null;
   try {
     const parsed = JSON.parse(raw);
@@ -93510,7 +93744,7 @@ function realInspectEnvironment() {
     pnpmHome: process.env.PNPM_HOME,
     readTextFile: (file2) => {
       try {
-        return readFileSync12(file2, "utf8");
+        return readFileSync14(file2, "utf8");
       } catch (error63) {
         if (error63 instanceof Error && "code" in error63 && error63.code === "ENOENT") return null;
         throw error63;
@@ -93559,10 +93793,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 path28.join(collectorStateDir(homeDir), "cli-update.json");
 }
 function updateLogPath(homeDir) {
-  return path26.join(collectorStateDir(homeDir), "cli-update.log");
+  return path28.join(collectorStateDir(homeDir), "cli-update.log");
 }
 function readUpdateProgress(readTextFile, file2 = updateProgressPath()) {
   const raw = readTextFile(file2);
@@ -93725,34 +93959,33 @@ function automaticUpdatesChoice(control) {
   return control.autoUpdate ? "on" : "off";
 }
 async function offerAutomaticUpdates(deps, options) {
-  const { log: log3, indent } = options;
+  const { output: output2 } = options;
   if (deps.readControl().autoUpdate !== void 0) return "already-chosen";
-  const offCommand = "powerplant update --automatic off";
   if (!options.promptAllowed) {
     deps.set(true);
-    log3(`${indent}\u2713 Automatic updates on (the default), turn off any time with \`${offCommand}\``);
+    output2.log("\u2713 Automatic updates on");
     return "on";
   }
   for (; ; ) {
     const answer = await deps.promptLine(
-      `${indent}Keep the Powerplant CLI up to date automatically? (recommended)  [Y/n] `
+      `${output2.indent}Keep the Powerplant CLI up to date automatically? (recommended)  [Y/n] `
     );
     if (answer === null) {
-      log3(`${indent}Automatic updates left off, turn on with \`powerplant update --automatic on\``);
+      output2.log(`Automatic updates left off, turn on with \`powerplant update --automatic on\``);
       return "left-unchosen";
     }
     const normalized = answer.trim().toLowerCase();
     if (normalized === "" || normalized === "y" || normalized === "yes") {
       deps.set(true);
-      log3(`${indent}\u2713 Automatic updates on, turn off any time with \`${offCommand}\``);
+      output2.log("\u2713 Automatic updates on");
       return "on";
     }
     if (normalized === "n" || normalized === "no") {
       deps.set(false);
-      log3(`${indent}Automatic updates off, turn on with \`powerplant update --automatic on\``);
+      output2.log(`Automatic updates off, turn on with \`powerplant update --automatic on\``);
       return "off";
     }
-    log3(`${indent}Please answer y or n.`);
+    output2.log("Please answer y or n.");
   }
 }
 function parseAutomaticFlag(value) {
@@ -93792,13 +94025,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(path34) {
   let fd;
   try {
-    fd = openSync7(path32, "r");
+    fd = openSync7(path34, "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: path34, lines: null };
+    return { path: path34, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
   }
   try {
     const size = fstatSync(fd).size;
@@ -93807,9 +94040,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: path34, lines: redactedLogTail(text) };
   } catch (error63) {
-    return { path: path32, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
+    return { path: path34, lines: null, readError: error63 instanceof Error ? error63.message : String(error63) };
   } finally {
     closeSync7(fd);
   }
@@ -93910,8 +94143,9 @@ function serviceLines(i) {
     }
   }
   for (const hook of status.hooks ?? []) {
+    const silence = hookWarning(hook, i.now);
     out.push(
-      hook.silence ? `Hooks (${hook.harness}): ${hook.silence.problem}. ${hook.silence.fix}` : `Hooks (${hook.harness}): ${hook.state}, install ${hook.install}`
+      silence ? `Hooks (${hook.harness}): ${silence.problem}. ${silence.fix}` : `Hooks (${hook.harness}): ${hook.state}, install ${hook.install}`
     );
   }
   return out;
@@ -93968,6 +94202,7 @@ function isCliEnv(value) {
   return value in CLI_ENVIRONMENTS;
 }
 function describeEnvironment(config2, env, explicitEnv) {
+  if (config2.appEnv === "production") return null;
   const steeredByEnvVar = explicitEnv === void 0 && env.POWERPLANT_ENV !== void 0;
   return `Environment: ${config2.appEnv} (API ${config2.apiUrl})${steeredByEnvVar ? ", set by POWERPLANT_ENV" : ""}`;
 }
@@ -94064,36 +94299,36 @@ function pausedSince(control, now) {
 }
 function pausedNotice(control, resumeCommand2, now) {
   if (!control.paused) return null;
-  return `\u23F8 ${pausedSince(control, now)}. Nothing uploads until you run \`${resumeCommand2}\`.`;
+  return `! ${pausedSince(control, now)}. Nothing uploads until you run \`${resumeCommand2}\`.`;
 }
 function pausedSyncNotice(control, resumeCommand2, now, dryRun) {
   if (!control.paused || dryRun) return pausedNotice(control, resumeCommand2, now);
-  return `\u23F8 ${pausedSince(control, now)}. This pass uploads because you asked for it. Background syncing stays paused until you run \`${resumeCommand2}\`.`;
+  return `! ${pausedSince(control, now)}. This pass uploads because you asked for it. Background syncing stays paused until you run \`${resumeCommand2}\`.`;
 }
 async function offerResume(deps, options) {
-  const { log: log3, indent } = options;
+  const { output: output2 } = options;
   const control = deps.readControl();
   if (!control.paused) return "not-paused";
   const now = deps.now();
   const age = pausedFor(control, now);
-  log3(`${indent}! ${pausedSince(control, now)}, the background sync is running but uploads nothing`);
-  if (options.promptAllowed && await confirmResume(deps, log3, indent)) {
+  output2.log(`! ${pausedSince(control, now)}, the background sync is running but uploads nothing`);
+  if (options.promptAllowed && await confirmResume(deps, output2)) {
     deps.resume();
-    log3(
-      `${indent}\u2713 Syncing resumed, the background sync is catching up on ${age === null ? "the pause" : `the paused ${age}`}`
+    output2.log(
+      `\u2713 Syncing resumed, the background sync is catching up on ${age === null ? "the pause" : `the paused ${age}`}`
     );
     return "resumed";
   }
-  log3(`${indent}Nothing uploads until you run \`${deps.resumeCommand}\``);
+  output2.log(`Nothing uploads until you run \`${deps.resumeCommand}\``);
   return "still-paused";
 }
-async function confirmResume(deps, log3, indent) {
+async function confirmResume(deps, output2) {
   for (; ; ) {
-    const answer = await deps.promptLine(`${indent}Resume syncing now?  [Y/n] `);
+    const answer = await deps.promptLine(`${output2.indent}Resume syncing now?  [Y/n] `);
     const normalized = answer?.trim().toLowerCase() ?? "";
     if (answer === null || normalized === "n" || normalized === "no") return false;
     if (normalized === "" || normalized === "y" || normalized === "yes") return true;
-    log3(`${indent}Please answer "y" or "n".`);
+    output2.log('Please answer "y" or "n".');
   }
 }
 
@@ -94121,39 +94356,43 @@ function syncNote(credentials) {
       return `Uploads nothing yet, ${org} has no GitHub integration.`;
   }
 }
+function initExitCode(summary) {
+  return summary === "ready" || summary === "already-set-up" ? 0 : 1;
+}
+function enrolledLine(credentials) {
+  return `\u2713 ${credentials.machineName} enrolled${credentials.orgName ? ` in ${credentials.orgName}` : ""}`;
+}
 async function runInit(deps) {
-  const { log: log3 } = deps;
+  const { command, stage } = deps.terminal;
   const existing = deps.loadCredentials();
-  log3("\u26A1 Powerplant");
-  log3(`  ${existing ? "Checking" : "Setting up"} this machine \xB7 ${deps.environmentName}`);
-  log3("");
+  command.log("\u26A1 Powerplant");
+  command.detail(`${existing ? "Checking" : "Setting up"} this machine \xB7 ${deps.environmentName}`);
+  command.log("");
+  command.log("1/3  Enroll this machine");
   let enrolled = false;
   let credentials;
   if (existing) {
-    log3(
-      `\u2713 Machine enrolled as ${existing.machineName}${existing.orgName ? ` in ${existing.orgName}` : ""}`
+    stage.log(
+      `\u2713 Already enrolled as ${existing.machineName}${existing.orgName ? ` in ${existing.orgName}` : ""}`
     );
     credentials = existing;
   } else {
-    log3("1/3  Enroll this machine");
-    credentials = await deps.activity("Waiting for approval in your browser\u2026", deps.enroll);
-    log3(
-      `     \u2713 ${credentials.machineName} enrolled${credentials.orgName ? ` in ${credentials.orgName}` : ""}`
-    );
+    credentials = await stage.activity("Waiting for approval in your browser\u2026", deps.enroll);
+    stage.log(enrolledLine(credentials));
     enrolled = true;
   }
-  log3("");
+  command.log("");
   const orgName = credentials.orgName;
   let repoDiscoveryDidWork = false;
   let protectedFoldersNeedAttention = false;
   let installed = false;
   let menubarDidWork = false;
   let pauseOffer = "not-paused";
-  log3("2/3  Start background sync");
-  log3("     When syncing is enabled, session transcripts upload to Powerplant for the team whose capture settings match the repository.");
-  log3(`     ${syncNote(credentials)}`);
+  command.log("2/3  Start background sync");
+  stage.log("When syncing is enabled, session transcripts upload to Powerplant for the team whose capture settings match the repository.");
+  stage.log(syncNote(credentials));
   if (deps.platform === "darwin") {
-    const protectedSessions = await deps.activity(
+    const protectedSessions = await stage.activity(
       "Checking recent session locations\u2026",
       deps.findProtectedSessions
     );
@@ -94166,54 +94405,54 @@ async function runInit(deps) {
       const toProbe = [];
       let needsAttention = false;
       if (fresh.length > 0) {
-        log3("     Coding agents recorded recent sessions in folders macOS is currently hiding from Powerplant:");
-        logProtectedFolders(log3, fresh);
+        stage.log("Coding agents recorded recent sessions in folders macOS is currently hiding from Powerplant:");
+        logProtectedFolders(stage, fresh);
         if (!deps.promptAllowed) {
           needsAttention = true;
-          logProtectedSessionsStayLocal(log3, fresh);
-          log3(`       Run \`powerplant init\` in a terminal to ${consented ? "scan" : "review"} them.`);
+          logProtectedSessionsStayLocal(stage, fresh);
+          stage.detail(`Run \`powerplant init\` in a terminal to ${consented ? "scan" : "review"} them.`);
         } else {
-          log3(
-            consented ? `     You already allowed Git metadata scans. Checking those folders for ${org}'s work repositories.` : `     If you allow it, Powerplant reads only Git metadata there, to find ${org}'s work repositories.`
+          stage.log(
+            consented ? `You already allowed Git metadata scans. Checking those folders for ${org}'s work repositories.` : `If you allow it, Powerplant reads only Git metadata there, to find ${org}'s work repositories.`
           );
-          if (consented || await confirmProtectedRepoDiscovery(deps)) toProbe.push(...fresh);
+          if (consented || await confirmProtectedRepoDiscovery(deps, stage)) toProbe.push(...fresh);
           else {
             needsAttention = true;
-            logProtectedSessionsStayLocal(log3, fresh);
+            logProtectedSessionsStayLocal(stage, fresh);
           }
         }
       }
       if (blocked.length > 0) {
         if (deps.promptAllowed) {
-          log3(`     Checking whether macOS still blocks ${displayRoots(blocked)}.`);
+          stage.log(`Checking whether macOS still blocks ${displayRoots(blocked)}.`);
           toProbe.push(...blocked);
         } else {
           needsAttention = true;
-          logBlockedByMacOS(log3, blocked);
+          logBlockedByMacOS(stage, blocked);
         }
       }
       if (toProbe.length > 0) {
-        log3('     macOS may label Powerplant as "node" because Powerplant runs on Node.js.');
+        stage.log('macOS may label Powerplant as "node" because Powerplant runs on Node.js.');
         const probe = async (roots) => {
-          const result2 = await deps.activity(
+          const result2 = await stage.activity(
             "Scanning recorded session folders for Git repositories\u2026",
             () => deps.allowProtectedRepoDiscovery(roots)
           );
-          needsAttention = reportProtectedRepoDiscovery(log3, result2) || needsAttention;
+          needsAttention = reportProtectedRepoDiscovery(stage, result2) || needsAttention;
           const unblocked = result2.unmatched.filter((entry) => reviewOf(entry) === "blocked");
           if (unblocked.length > 0) {
-            log3(`     \u2713 macOS now lets Powerplant read ${displayRoots(unblocked)}. No work repositories were found there.`);
+            stage.log(`\u2713 macOS now lets Powerplant read ${displayRoots(unblocked)}. No work repositories were found there.`);
           }
           if (result2.enabled.length > 0 || unblocked.length > 0) repoDiscoveryDidWork = true;
           return result2;
         };
         const result = await probe(toProbe);
         if (result.needsReview.length > 0) {
-          log3("     Some of those sessions use Git checkouts in other folders macOS is hiding from Powerplant:");
-          logProtectedFolders(log3, result.needsReview);
+          stage.log("Some of those sessions use Git checkouts in other folders macOS is hiding from Powerplant:");
+          logProtectedFolders(stage, result.needsReview);
           const second = await probe([...result.unreviewed, ...result.needsReview]);
           if (second.unreviewed.length > 0) {
-            logProtectedSessionsStayLocal(log3, second.unreviewed);
+            logProtectedSessionsStayLocal(stage, second.unreviewed);
             needsAttention = true;
           }
         }
@@ -94222,137 +94461,125 @@ async function runInit(deps) {
     }
   }
   if (deps.platform !== "darwin") {
-    log3(
-      "     Background sync is macOS-only for now. Run `powerplant sync` on a schedule of your choosing instead."
+    stage.log(
+      "Background sync is macOS-only for now. Run `powerplant sync` on a schedule of your choosing instead."
     );
   } else {
     const fresh = !deps.serviceUpToDate();
     if (fresh) {
-      await deps.activity("Installing background sync\u2026", deps.installService);
-      await deps.activity("Checking background sync version\u2026", () => deps.ensureServiceVersion(true));
+      await stage.activity("Installing background sync\u2026", deps.installService);
+      await stage.activity("Checking background sync version\u2026", () => deps.ensureServiceVersion(true));
       installed = true;
     } else {
-      installed = await deps.activity("Checking background sync version\u2026", () => deps.ensureServiceVersion(false));
+      installed = await stage.activity("Checking background sync version\u2026", () => deps.ensureServiceVersion(false));
     }
-    pauseOffer = await offerResume(deps.pause, { log: log3, indent: "     ", promptAllowed: deps.promptAllowed });
-    if (pauseOffer === "not-paused") log3(fresh ? "     \u2713 Background sync is running" : "\u2713 Background sync is running");
-    await offerAutomaticUpdates(deps.autoUpdate, { log: log3, indent: "     ", promptAllowed: deps.promptAllowed });
+    pauseOffer = await offerResume(deps.pause, { output: stage, promptAllowed: deps.promptAllowed });
+    if (pauseOffer === "not-paused") stage.log("\u2713 Background sync is running");
+    await offerAutomaticUpdates(deps.autoUpdate, { output: stage, promptAllowed: deps.promptAllowed });
     if (deps.menubarApp !== null) {
-      const app = await deps.activity("Setting up the menu bar app\u2026", deps.menubarApp);
-      menubarDidWork = narrateMenubarApp(log3, app);
+      const app = await stage.activity("Setting up the menu bar app\u2026", deps.menubarApp);
+      menubarDidWork = narrateMenubarApp(stage, app);
     }
   }
-  log3("");
-  log3("3/3  Give your agents Powerplant MCP access");
+  command.log("");
+  command.log("3/3  Give your agents Powerplant MCP access");
   let outcome = null;
   try {
     outcome = await deps.connect();
   } catch (error63) {
-    log3(`     \u2717 Could not give your agents Powerplant MCP access, ${error63 instanceof Error ? error63.message : String(error63)}`);
+    stage.log(`\u2717 Could not give your agents Powerplant MCP access, ${error63 instanceof Error ? error63.message : String(error63)}`);
   }
   if (outcome?.found === 0) {
-    log3(
-      deps.platform === "darwin" ? `     This machine still syncs once one is installed, then run: ${deps.connectCommand}` : `     Once one is installed, run: ${deps.connectCommand}`
-    );
+    stage.log(`Once one is installed, run \`${deps.connectCommand}\``);
   }
-  log3("");
+  command.log("");
   const connectDidWork = outcome !== null && outcome.connected + outcome.configured > outcome.unchanged;
   const connectSettled = outcome !== null && outcome.found > 0 && outcome.pending === 0 && outcome.failed === 0 && outcome.skipped === 0 && outcome.unchanged === outcome.found && !connectDidWork;
   if (!enrolled && !installed && !menubarDidWork && !repoDiscoveryDidWork && !protectedFoldersNeedAttention && pauseOffer === "not-paused" && connectSettled) {
-    log3("Everything is already set up.");
-    return;
+    command.log("\u2713 Everything is already set up");
+    return "already-set-up";
   }
   const connectedAny = outcome !== null && outcome.connected + outcome.configured > 0;
   const connectIncomplete = outcome === null || outcome.pending > 0 || outcome.failed > 0 || outcome.skipped > 0 && !connectedAny;
   if (pauseOffer === "still-paused") {
-    log3("! Syncing is paused");
-    log3("");
-    log3(`Nothing uploads until you run \`${deps.pause.resumeCommand}\``);
-    if (connectIncomplete) log3(`Finish MCP setup: ${deps.connectCommand}`);
-    return;
+    command.log("! Syncing is paused");
+    command.log("");
+    command.detail(`Nothing uploads until you run \`${deps.pause.resumeCommand}\``);
+    if (connectIncomplete) command.detail(`Finish MCP setup: \`${deps.connectCommand}\``);
+    return "paused";
   }
   if (connectIncomplete) {
     const onlySkipped = outcome !== null && outcome.skipped > 0 && outcome.pending === 0 && outcome.failed === 0;
-    log3(onlySkipped ? "! MCP setup was skipped" : "! Setup needs one more step");
-    log3("");
-    log3(
-      deps.platform === "darwin" ? "Your synced sessions will still appear in Powerplant." : "Your synced sessions will appear after `powerplant sync` runs."
-    );
-    log3("");
-    log3(`${onlySkipped ? "Add MCP later" : "Finish MCP setup"}: ${deps.connectCommand}`);
-    return;
-  }
-  log3("\u2713 Syncing is ready");
-  log3("");
-  log3(`  Success! See your team's activity: ${deps.webUrl}`);
-  log3("");
-  log3(
-    deps.platform === "darwin" ? "  As you code, try asking the Powerplant MCP about your sessions." : "  As you code, run `powerplant sync`, then try asking the Powerplant MCP about your sessions."
-  );
-  log3("");
-  log3(
-    "  Consider adding to your AGENTS file that the Powerplant MCP can be used to check for other team members' WIP, or for analyzing agent sessions that weren't following your docs and instructions."
+    command.log(onlySkipped ? "! MCP setup was skipped" : "! Setup needs one more step");
+    command.log("");
+    command.detail(`${onlySkipped ? "Add MCP later" : "Finish MCP setup"}: \`${deps.connectCommand}\``);
+    return onlySkipped ? "mcp-skipped" : "needs-step";
+  }
+  command.log("\u2713 Syncing is ready");
+  command.log("");
+  command.detail(
+    deps.platform === "darwin" ? `See your team's activity: ${deps.webUrl}` : `Run \`powerplant sync\` after coding, then see your team's activity: ${deps.webUrl}`
   );
   if (outcome !== null && outcome.skipped > 0) {
-    log3("");
-    log3(`  Add MCP to the agents you skipped any time: ${deps.connectCommand}`);
+    command.detail(`Add MCP to the agents you skipped any time: \`${deps.connectCommand}\``);
   }
+  return "ready";
 }
-function narrateMenubarApp(log3, outcome) {
+function narrateMenubarApp(stage, outcome) {
   switch (outcome.kind) {
     case "installed":
-      log3("     \u2713 Menu bar app installed, look for the bolt in your menu bar");
+      stage.log("\u2713 Menu bar app installed, look for the bolt in your menu bar");
       return true;
     case "updated":
-      log3("     \u2713 Menu bar app updated to match this CLI");
+      stage.log("\u2713 Menu bar app updated to match this CLI");
       return true;
     case "already-current":
-      log3("     \u2713 Menu bar app is installed");
+      stage.log("\u2713 Menu bar app is installed");
       return outcome.launched;
     case "skipped":
       return false;
     case "failed":
-      log3(`     ! Could not set up the menu bar app: ${outcome.detail}`);
-      log3("       Rerun `powerplant init` to try again.");
+      stage.log(`! Could not set up the menu bar app: ${outcome.detail}`);
+      stage.detail("Rerun `powerplant init` to try again.");
       return true;
   }
 }
-async function confirmProtectedRepoDiscovery(deps) {
+async function confirmProtectedRepoDiscovery(deps, stage) {
   for (; ; ) {
     const answer = await deps.promptLine(
-      "Scan Git metadata for your org's work repositories?  [y/N] "
+      `${stage.indent}Scan Git metadata for your org's work repositories?  [y/N] `
     );
     const normalized = answer?.trim().toLowerCase() ?? "";
     if (normalized === "" || normalized === "n" || normalized === "no") return false;
     if (normalized === "y" || normalized === "yes") return true;
-    deps.log('     Please answer "y" or "n".');
+    stage.log('Please answer "y" or "n".');
   }
 }
-function logProtectedFolders(log3, roots) {
+function logProtectedFolders(stage, roots) {
   for (const folder of roots.flatMap((entry) => entry.folders)) {
-    log3(`       ${folder.displayPath} (${folder.sessionCount} session${folder.sessionCount === 1 ? "" : "s"})`);
+    stage.detail(`${folder.displayPath} (${folder.sessionCount} session${folder.sessionCount === 1 ? "" : "s"})`);
   }
 }
-function reportProtectedRepoDiscovery(log3, result) {
+function reportProtectedRepoDiscovery(stage, result) {
   if (result.enabled.length > 0) {
-    log3(`     \u2713 Repository scanning enabled for ${displayRoots(result.enabled)}`);
+    stage.log(`\u2713 Repository scanning enabled for ${displayRoots(result.enabled)}`);
   }
-  if (result.blocked.length > 0) logBlockedByMacOS(log3, result.blocked);
+  if (result.blocked.length > 0) logBlockedByMacOS(stage, result.blocked);
   return result.blocked.length > 0;
 }
-function logBlockedByMacOS(log3, roots) {
-  log3(`     ! macOS blocked Powerplant from reading ${displayRoots(roots)}.`);
-  log3(`       Sessions there will stay local. ${MACOS_BLOCKED_FOLDER_REMEDY}`);
+function logBlockedByMacOS(stage, roots) {
+  stage.log(`! macOS blocked Powerplant from reading ${displayRoots(roots)}.`);
+  stage.detail(`Sessions there will stay local. ${MACOS_BLOCKED_FOLDER_REMEDY}`);
 }
 function displayRoots(roots) {
   return roots.map((entry) => entry.displayRoot).join(", ");
 }
-function logProtectedSessionsStayLocal(log3, found) {
+function logProtectedSessionsStayLocal(stage, found) {
   const total = found.reduce((sum2, entry) => sum2 + entry.sessionCount, 0);
-  log3(
-    `     ! Repository matching for ${total} recent session${total === 1 ? "" : "s"} under ${displayRoots(found)} was not enabled.`
+  stage.log(
+    `! Repository matching for ${total} recent session${total === 1 ? "" : "s"} under ${displayRoots(found)} was not enabled.`
   );
-  log3("       Sessions outside folders you explicitly added will stay local.");
+  stage.detail("Sessions outside folders you explicitly added will stay local.");
 }
 async function realPromptLine(question) {
   const prompt = createInterface2({ input: process.stdin, output: process.stdout });
@@ -94366,7 +94593,7 @@ async function realPromptLine(question) {
 }
 
 // src/menu.ts
-import path27 from "node:path";
+import path29 from "node:path";
 var MENU_CONTRACT = 1;
 var CLIENT_NAMES = { claude: "Claude Code", codex: "Codex", cursor: "Cursor" };
 function renderMenu(i) {
@@ -94382,13 +94609,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" });
   }
@@ -94414,6 +94650,16 @@ 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.hookPreferencesError !== void 0) {
+    items.push(problem("Hook warning preference can't be read", "Restore or remove the preferences file."));
+    items.push({ type: "action", title: "Copy hook preference repair details", copy: i.hookPreferencesError });
+    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] });
@@ -94428,7 +94674,10 @@ function renderMenu(i) {
       trailing: "Enrolled"
     });
     items.push({ type: "separator" });
-    items.push(...collectorBlock(i, envArgs, problem));
+    items.push(...collectorBlock(i, envArgs, problem, (title, subtitle, dismiss) => {
+      attention = true;
+      return { type: "status", mark: "warn", title, subtitle, ...dismiss && { dismiss } };
+    }, more));
   }
   const agents = recentAgentItems(i);
   if (agents !== null) {
@@ -94509,7 +94758,7 @@ function failedUpdateDetail(i, progress) {
   }
   return progress.detail;
 }
-function collectorBlock(i, envArgs, problem) {
+function collectorBlock(i, envArgs, problem, warning2, more) {
   const restart = {
     type: "action",
     title: "Restart background sync",
@@ -94578,9 +94827,26 @@ function collectorBlock(i, envArgs, problem) {
       break;
   }
   const status = i.daemon.status;
-  const silentHooks = (status.hooks ?? []).flatMap(
-    (hook) => hook.silence ? [problem(hook.silence.problem, hook.silence.fix)] : []
-  );
+  const silentHooks = (status.hooks ?? []).flatMap((hook) => {
+    const silence = hookWarning(hook, i.now);
+    if (!silence) return [];
+    if (hook.harness !== "codex" || silence.kind !== "not-firing") {
+      return [problem(silence.problem, silence.fix)];
+    }
+    const title = "Codex hook install incomplete";
+    const subtitle = silence.fix;
+    if (i.codexHookWarningDismissed) {
+      more.push({ type: "status", mark: "muted", title, subtitle });
+      return [];
+    }
+    const dismiss = i.hookPreferencesError === void 0 ? {
+      type: "action",
+      title: "Dismiss Codex hooks warning",
+      run: ["dismiss-codex-hook-warning", ...envArgs]
+    } : void 0;
+    if (dismiss) more.push(dismiss);
+    return [warning2(title, subtitle, dismiss)];
+  });
   if (i.control.paused) {
     return [
       {
@@ -94632,7 +94898,7 @@ function agentRow(session, i) {
   const when = ago(i.now - Date.parse(session.lastActivityAt));
   const localMachine = i.credentials !== null && session.machineId === i.credentials.machineId;
   const desktopSessionId = localMachine && session.source === "claude-code" ? i.claudeDesktopSessions?.get(session.externalId)?.sessionId : void 0;
-  const app = desktopSessionId !== void 0 ? "Claude desktop" : isSessionSource(session.source) ? describeSessionSource(session.source) : session.source;
+  const app = desktopSessionId !== void 0 ? "Claude desktop" : isLegacySessionSource(session.source) ? describeSessionSource(session.source) : session.source;
   const links = sessionLinks(session, i.config.webUrl, {
     codexDesktop: i.codexDesktop,
     localMachine,
@@ -94648,6 +94914,12 @@ function agentRow(session, i) {
     agent.harness = {
       type: "action",
       title: links.extra.label,
+      reportClick: [
+        "report-agent-click",
+        isLegacySessionSource(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]
@@ -94764,7 +95036,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 path29.join(collectorStateDir(homeDir), source === "npm" ? "version-check.json" : "version-check-promoted.json");
 }
 async function cachedLatestVersion(options) {
   const raw = options.readTextFile(options.cacheFile);
@@ -94796,7 +95068,7 @@ function writeVersionCache(options) {
 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 path30 from "node:path";
 var sessionFileAsObserved = external_exports.looseObject({
   pid: external_exports.number().int().positive(),
   sessionId: external_exports.string().min(1),
@@ -94805,7 +95077,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 path30.join(homeDir, ".claude", "sessions");
 }
 async function readLiveTerminalSessions(wanted, deps = {}) {
   const found = /* @__PURE__ */ new Map();
@@ -94830,7 +95102,7 @@ async function readLiveTerminalSessions(wanted, deps = {}) {
       }
       continue;
     }
-    const session = await readSessionFile(path28.join(sessionsDir, entry), report2);
+    const session = await readSessionFile(path30.join(sessionsDir, entry), report2);
     if (session === null) continue;
     if (session.pid !== Number(match[1])) {
       report2({
@@ -94868,7 +95140,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: path30.basename(file2), shape: describeShape(raw) }
   });
   return null;
 }
@@ -95009,14 +95281,9 @@ function automaticUpdatesLine(control) {
 }
 function renderStatus(i) {
   const lines = [];
-  lines.push(`Environment: ${i.config.appEnv} (API ${i.config.apiUrl})`);
-  lines.push(
-    `CLI: powerplant ${i.cliVersion}` + (isUpdateAvailable(i.cliVersion, i.latestVersion) ? `, ${i.latestVersion} is available: powerplant update` : "")
-  );
-  const unsupported = unsupportedVersionNotice(i.cliVersion, i.oldestSupportedVersion);
-  if (unsupported !== null) lines.push(unsupported);
+  if (i.config.appEnv !== "production") lines.push(`Environment: ${i.config.appEnv} (API ${i.config.apiUrl})`);
   if (i.credentialsError !== void 0) {
-    lines.push(`\u26A0 ${i.credentialsError}`);
+    lines.push(`\u2717 ${i.credentialsError}`);
   } else if (!i.credentials) {
     lines.push("Not enrolled, run: powerplant init");
   } else {
@@ -95028,7 +95295,7 @@ function renderStatus(i) {
     for (const entry of i.protectedSessions ?? []) {
       const sessions = `${entry.sessionCount} recent agent session${entry.sessionCount === 1 ? "" : "s"}`;
       lines.push(
-        protectedRootReview(i.credentials, entry.root) === "blocked" ? `\u26A0 macOS is blocking Powerplant from reading ${entry.displayRoot} (${sessions}). Those sessions are staying local. ${MACOS_BLOCKED_FOLDER_REMEDY}` : `\u26A0 Repository matching is not enabled for ${sessions} under ${entry.displayRoot}. Sessions outside folders you explicitly added are staying local, run \`powerplant init\` to review Git repository scanning.`
+        protectedRootReview(i.credentials, entry.root) === "blocked" ? `! macOS is blocking Powerplant from reading ${entry.displayRoot} (${sessions}). Those sessions are staying local. ${MACOS_BLOCKED_FOLDER_REMEDY}` : `! Repository matching is not enabled for ${sessions} under ${entry.displayRoot}. Sessions outside folders you explicitly added are staying local, run \`powerplant init\` to review Git repository scanning.`
       );
     }
   }
@@ -95054,6 +95321,11 @@ function renderStatus(i) {
       lines.push(...renderDaemon(i));
       break;
   }
+  lines.push(
+    `CLI: powerplant ${i.cliVersion}` + (isUpdateAvailable(i.cliVersion, i.latestVersion) ? `, ${i.latestVersion} is available: powerplant update` : "")
+  );
+  const unsupported = unsupportedVersionNotice(i.cliVersion, i.oldestSupportedVersion);
+  if (unsupported !== null) lines.push(unsupported);
   return lines;
 }
 function renderDaemon(i) {
@@ -95071,7 +95343,7 @@ function renderDaemon(i) {
   const lines = [];
   if (i.daemon.state === "stalled") {
     lines.push(
-      `\u26A0 Background sync stalled, no heartbeat for ${duration3(i.daemon.staleMs)} (pid ${status.pid}). Run: powerplant restart`
+      `\u2717 Background sync stalled, no heartbeat for ${duration3(i.daemon.staleMs)} (pid ${status.pid}). Run: powerplant restart`
     );
   } else {
     lines.push(
@@ -95096,11 +95368,12 @@ function renderDaemon(i) {
   lines.push(signals === null ? "  No pass has run yet in this run." : `  ${signals}`);
   if (status.lastPass && !status.lastPass.ok) {
     lines.push(
-      `  \u26A0 Last pass failed: ${status.lastPass.error ?? "unknown error"} (${status.consecutiveFailures} consecutive failure${status.consecutiveFailures === 1 ? "" : "s"}).`
+      `  \u2717 Last pass failed: ${status.lastPass.error ?? "unknown error"} (${status.consecutiveFailures} consecutive failure${status.consecutiveFailures === 1 ? "" : "s"}).`
     );
   }
   for (const hook of status.hooks ?? []) {
-    if (hook.silence) lines.push(`  \u26A0 ${hook.silence.problem}. ${hook.silence.fix}`);
+    const silence = hookWarning(hook, i.now);
+    if (silence) lines.push(`  ! ${silence.problem}. ${silence.fix}`);
   }
   return lines;
 }
@@ -95191,11 +95464,15 @@ var ANSI = {
   resetUnderline: "\x1B[24m"
 };
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var COLUMNS = {
+  command: { line: 0, detail: 2 },
+  stage: { line: 5, detail: 7 }
+};
 function terminalUsesEffects(interactive, env) {
   return interactive && !("NO_COLOR" in env);
 }
 function colorPrefix(line) {
-  const status = /^(\s*)([✓!✗→⏸⚠])/.exec(line);
+  const status = /^(\s*)([✓!✗→])/.exec(line);
   if (status) {
     const color = status[2] === "\u2713" ? ANSI.green : status[2] === "\u2717" ? ANSI.red : ANSI.yellow;
     return `${status[1]}${color}${status[2]}${ANSI.resetColor}${line.slice(status[0].length)}`;
@@ -95211,11 +95488,8 @@ function styleUrls(line) {
     (url2) => `${ANSI.cyan}${ANSI.underline}${url2}${ANSI.resetUnderline}${ANSI.resetColor}`
   );
 }
-function styleCommands(line, dimmed) {
-  return line.replace(
-    /`([^`]+)`/g,
-    (_, command) => `${ANSI.bold}${command}${ANSI.resetDim}${dimmed ? ANSI.dim : ""}`
-  );
+function styleCommands(line) {
+  return line.replace(/`([^`]+)`/g, (_, command) => `${ANSI.bold}${command}${ANSI.resetDim}`);
 }
 function dim(line) {
   return `${ANSI.dim}${line}${ANSI.resetDim}`;
@@ -95228,22 +95502,20 @@ function withDimTerminal(write, work) {
     write(ANSI.resetDim);
   }
 }
-function styleLine(line) {
-  if (/^\s*- Opening approval page… https:\/\//.test(line)) return dim(line);
-  if (/^\s*[✓!✗→⏸⚠]/.test(line)) return styleCommands(styleUrls(colorPrefix(line)), false);
-  if (line.startsWith("  ")) {
-    const urlStart = line.search(/https:\/\//);
-    if (urlStart >= 0) {
-      return `${ANSI.dim}${styleCommands(line.slice(0, urlStart), true)}${ANSI.resetDim}${styleUrls(line.slice(urlStart))}`;
-    }
-    return `${ANSI.dim}${styleCommands(line, true)}${ANSI.resetDim}`;
-  }
-  return styleCommands(styleUrls(colorPrefix(line)), false);
+function skippable(line, place) {
+  if (/^\s*[✓!✗→]/.test(line)) return false;
+  if (/`[^`]+`|https:\/\//.test(line)) return false;
+  return place.level === "stage" ? !place.detail : place.detail;
+}
+function styleLine(line, place) {
+  if (skippable(line, place)) return dim(line);
+  return styleCommands(styleUrls(colorPrefix(line)));
 }
 function createTerminalOutput(options) {
   const interactive = options.interactive;
   const color = interactive && options.color;
   let activityLabel = null;
+  let activityIndent = "";
   let frameIndex = 0;
   let timer = null;
   const renderActivity = () => {
@@ -95251,24 +95523,26 @@ function createTerminalOutput(options) {
     const frame = SPINNER_FRAMES[frameIndex % SPINNER_FRAMES.length];
     frameIndex += 1;
     const glyph = color ? `${ANSI.amber}${frame}${ANSI.resetColor}` : frame;
-    options.write(`${ANSI.clearLine}     ${glyph} ${activityLabel}`);
+    options.write(`${ANSI.clearLine}${activityIndent}${glyph} ${activityLabel}`);
   };
   const clearActivity = () => {
     if (activityLabel !== null) options.write(ANSI.clearLine);
   };
-  const log3 = (line) => {
+  const log3 = (line, place) => {
     const rerender = activityLabel !== null;
     if (rerender) clearActivity();
-    options.write(`${color ? styleLine(line) : line}
+    options.write(`${color ? styleLine(line, place) : line}
 `);
     if (rerender) renderActivity();
   };
-  const activity = async (label2, work) => {
+  const activity = async (place, label2, work) => {
+    const indent = " ".repeat(COLUMNS[place.level].line);
     if (!interactive) {
-      log3(`     \u2026 ${label2}`);
+      log3(`${indent}\u2026 ${label2}`, place);
       return await work();
     }
     activityLabel = label2;
+    activityIndent = indent;
     frameIndex = 0;
     renderActivity();
     timer = setInterval(renderActivity, 80);
@@ -95282,13 +95556,27 @@ function createTerminalOutput(options) {
       activityLabel = null;
     }
   };
-  return { log: log3, activity };
+  const writer = (level) => {
+    const columns = COLUMNS[level];
+    const indent = " ".repeat(columns.line);
+    const detailIndent = " ".repeat(columns.detail);
+    const line = { level, detail: false };
+    const detail = { level, detail: true };
+    return {
+      indent,
+      // A blank line separates stages; it carries no indentation.
+      log: (text) => log3(text === "" ? "" : `${indent}${text}`, line),
+      detail: (text) => log3(`${detailIndent}${text}`, detail),
+      activity: (label2, work) => activity(line, label2, work)
+    };
+  };
+  return { command: writer("command"), stage: writer("stage") };
 }
 
 // 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 mkdirSync14, openSync as openSync8 } from "node:fs";
+import path31 from "node:path";
 async function prepareCredentialUpgrade(deps) {
   if (!deps.needsMigration() || !deps.serviceExists() || deps.ready()) return "ready";
   if (deps.installing()) return "busy";
@@ -95321,7 +95609,7 @@ async function prepareCredentialUpgrade(deps) {
   }
 }
 async function tryCredentialUpgradeLock(file2) {
-  mkdirSync12(path29.dirname(file2), { recursive: true, mode: 448 });
+  mkdirSync14(path31.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,
@@ -95439,9 +95727,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 mkdirSync15, renameSync as renameSync7, rmSync as rmSync6 } from "node:fs";
 import os22 from "node:os";
-import path30 from "node:path";
+import path32 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";
@@ -95480,13 +95768,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 = path32.join(home, "Applications", MENUBAR_APP_NAME);
+  const candidates = [userAppPath, path32.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 = path32.join(input2.packageDir, MENUBAR_APP_ZIP);
       return existsSync13(zip) ? zip : null;
     },
     installedApp: () => {
@@ -95506,10 +95794,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 = path32.dirname(appPath);
+      mkdirSync15(parent, { recursive: true });
+      const staging = path32.join(parent, `.${MENUBAR_APP_NAME}.swap-${process.pid}`);
+      const retired = path32.join(parent, `.${MENUBAR_APP_NAME}.old-${process.pid}`);
       rmSync6(staging, { recursive: true, force: true });
       rmSync6(retired, { recursive: true, force: true });
       try {
@@ -95519,16 +95807,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 = path32.join(staging, MENUBAR_APP_NAME);
+        if (!existsSync13(path32.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) renameSync7(appPath, retired);
         try {
-          renameSync5(extracted, appPath);
+          renameSync7(extracted, appPath);
         } catch (error63) {
-          if (hadOld) renameSync5(retired, appPath);
+          if (hadOld) renameSync7(retired, appPath);
           throw error63;
         }
       } finally {
@@ -95548,7 +95836,7 @@ function realMenubarAppOps(input2) {
   };
 }
 function appProcessIds(appPath) {
-  const executable = path30.join(appPath, "Contents", "MacOS", "PowerplantMenubar");
+  const executable = path32.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}`})`);
@@ -95577,10 +95865,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, path34, init3, fetchImpl) {
   let response;
   try {
-    response = await fetchImpl(`${credentials.apiUrl}${path32}`, {
+    response = await fetchImpl(`${credentials.apiUrl}${path34}`, {
       ...init3,
       headers: {
         authorization: `Bearer ${credentials.token}`,
@@ -95599,7 +95887,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 ${path34}.`);
   }
   return response.json();
 }
@@ -95684,7 +95972,8 @@ Commands:
   update      Update this CLI to the latest published version, using the
               package manager that installed it, and restart background sync.
               --automatic on|off sets whether the background sync installs
-              new releases itself (on from the first install).
+              new releases itself. \`powerplant init\` asks once; a machine
+              that was never asked stays off.
   restart     Restart the background sync.
   pause       Pause background syncing: the service keeps running but
               uploads nothing. An explicit \`powerplant sync\` still runs.
@@ -95782,9 +96071,11 @@ ${USAGE}`);
   const chosenEnv = values.env;
   const config2 = resolveCliConfig(process.env, chosenEnv);
   const banner = describeEnvironment(config2, process.env, chosenEnv);
-  console.error(
-    terminalUsesEffects(process.stderr.isTTY === true, process.env) ? dim(banner) : banner
-  );
+  if (banner !== null) {
+    console.error(
+      terminalUsesEffects(process.stderr.isTTY === true, process.env) ? dim(banner) : banner
+    );
+  }
   const dsn = reportingDsn(process.env, config2, CLI_RELEASE_BUILD);
   if (dsn !== void 0) process.env.SENTRY_DSN = dsn;
   initCollectorReporting(config2.appEnv, CLI_VERSION);
@@ -95816,7 +96107,7 @@ ${USAGE}`);
       install: () => {
         installService(config2, watchCommand(config2));
       },
-      tryLock: () => tryCredentialUpgradeLock(path31.join(collectorStateDir(), `credential-upgrade-${config2.appEnv}.lock`)),
+      tryLock: () => tryCredentialUpgradeLock(path33.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}`}`,
@@ -95854,15 +96145,25 @@ ${USAGE}`);
     stdoutIsTty: process.stdout.isTTY === true
   });
   const pause = realPauseDeps(config2.appEnv, withEnv("powerplant resume"), realPromptLine);
+  const terminalEffects = terminalUsesEffects(process.stdout.isTTY === true, process.env);
+  const terminal = createTerminalOutput({
+    interactive: terminalEffects && !values.verbose,
+    color: terminalEffects,
+    write: (chunk) => process.stdout.write(chunk)
+  });
   if (!PAUSE_NOTICE_SKIPPED.has(command)) {
     const notice = pausedNotice(pause.readControl(), pause.resumeCommand, Date.now());
     if (notice !== null) console.error(styledFor(process.stderr)(notice));
   }
   const agentCount = (clients) => new Set(clients.map((client) => client.client)).size;
-  const connect3 = async (log3) => {
+  const connect3 = async (output2) => {
+    const log3 = output2.log;
     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.`
@@ -95879,7 +96180,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: (question, choices) => realCheckboxPrompt(question, choices, { indent: output2.indent }),
+        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}`);
@@ -95914,19 +96219,13 @@ ${USAGE}`);
   };
   switch (command) {
     case "init": {
-      const terminalEffects = terminalUsesEffects(process.stdout.isTTY === true, process.env);
-      const terminal = createTerminalOutput({
-        interactive: terminalEffects && !values.verbose,
-        color: terminalEffects,
-        write: (chunk) => process.stdout.write(chunk)
-      });
-      await runInit({
-        log: terminal.log,
-        activity: terminal.activity,
+      const summary = await runInit({
+        terminal,
         loadCredentials: () => loadCredentials(config2.appEnv),
-        // Enrollment's own narration (org, token location, capture boundary)
-        // indents under stage 1.
-        enroll: () => enroll2((line) => terminal.log(`     ${line}`)),
+        // Enrollment's own lines (approval URL, token location) are detail
+        // lines under stage 1's spinner; init prints the result line, and
+        // stage 2 states the capture boundary.
+        enroll: () => enroll2(terminal.stage.detail),
         // Discovery may read a worktree pointer under a root the store
         // already allows, so a revoked checkout root still surfaces.
         findProtectedSessions: () => findRecentProtectedSessions({
@@ -95959,16 +96258,17 @@ ${USAGE}`);
           set: (enabled) => setAutomaticUpdates(config2.appEnv, enabled),
           promptLine: realPromptLine
         },
-        connect: () => connect3((line) => terminal.log(`     ${line}`)),
+        connect: () => connect3(terminal.stage),
         menubarApp: managesMenubarApp(config2) ? () => syncMenubarApp(thisInstallMenubarAppOps(), "init") : null,
         connectCommand,
         environmentName: config2.appEnv,
         webUrl: config2.webUrl
       });
+      process.exitCode = initExitCode(summary);
       return;
     }
     case "connect": {
-      const outcome = await connect3(console.log);
+      const outcome = await connect3(terminal.command);
       if (outcome.pending > 0) {
         console.log(`Some logins are unfinished, re-run \`${connectCommand}\` any time.`);
       }
@@ -95983,6 +96283,7 @@ ${USAGE}`);
         return;
       }
       const outcome = runDisconnect(clients, {
+        onDisconnected: (client) => recordMcpChoices(config2.appEnv, [client], []),
         log: console.log,
         serverName: mcpServerNameFor(config2.appEnv),
         disconnectCommand,
@@ -96001,8 +96302,14 @@ The access you granted these agents stays on your Powerplant account until you r
       return;
     }
     case "enroll": {
-      await enroll2();
-      await offerResume(pause, { log: console.log, indent: "", promptAllowed: pickerOn });
+      const credentials = await terminal.command.activity(
+        "Waiting for approval in your browser\u2026",
+        () => enroll2(terminal.command.detail)
+      );
+      terminal.command.log(enrolledLine(credentials));
+      terminal.command.detail(`Syncing: ${describeStoredCapture(credentials)}`);
+      const offer = await offerResume(pause, { output: terminal.command, promptAllowed: pickerOn });
+      if (offer === "still-paused") process.exitCode = 1;
       return;
     }
     case "status": {
@@ -96069,8 +96376,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
       );
@@ -96116,6 +96424,8 @@ The access you granted these agents stays on your Powerplant account until you r
         control: readCollectorControl(config2.appEnv),
         latestVersion,
         oldestSupportedVersion,
+        ...readMcpPreferencesForMenu(config2.appEnv),
+        ...readHookPreferencesForMenu(config2.appEnv),
         connections: probeConnections(clients, {
           mcpUrl: `${config2.apiUrl}/mcp`,
           serverName: mcpServerNameFor(config2.appEnv),
@@ -96135,6 +96445,27 @@ 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-codex-hook-warning": {
+      dismissCodexHookWarning(config2.appEnv);
+      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": {
@@ -96291,7 +96622,8 @@ ${USAGE}`);
   }
 }
 function styledFor(stream) {
-  return terminalUsesEffects(stream.isTTY === true, process.env) ? styleLine : (line) => line;
+  if (!terminalUsesEffects(stream.isTTY === true, process.env)) return (line) => line;
+  return (line) => styleLine(line, { level: "command", detail: line.startsWith("  ") });
 }
 function oldestSupportedFor(credentials) {
   return credentials === null ? Promise.resolve(null) : fetchOldestSupportedVersion(credentials.apiUrl, credentials.token);
@@ -96353,7 +96685,7 @@ function startBackgroundUpdate(config2, target) {
     readProgress: updateProgress.read,
     writeProgress: updateProgress.write,
     spawnChild: () => {
-      mkdirSync14(path31.dirname(updateLogPath()), { recursive: true });
+      mkdirSync16(path33.dirname(updateLogPath()), { recursive: true });
       const log3 = openSync9(updateLogPath(), "a");
       const child = spawn3(process.execPath, [entryPath(), "update", ...envArgsFor(config2)], {
         detached: true,
@@ -96378,7 +96710,7 @@ function automaticUpdateCheck(config2) {
         "daemon"
       );
       if (app.kind === "updated") log3(`menu bar app updated to ${CLI_VERSION}`);
-      if (app.kind === "failed") log3(`\u26A0 menu bar app could not be updated: ${app.detail}`);
+      if (app.kind === "failed") log3(`! menu bar app could not be updated: ${app.detail}`);
     }
     const decision = autoUpdateDecision({
       control: readCollectorControl(config2.appEnv),
@@ -96443,7 +96775,7 @@ var cliCommand = "none";
 main().catch(async (error63) => {
   if (error63 instanceof ExpectedCliError) {
     console.error(
-      terminalUsesEffects(process.stderr.isTTY === true, process.env) ? styleLine(error63.message) : error63.message
+      terminalUsesEffects(process.stderr.isTTY === true, process.env) ? styleLine(error63.message, { level: "command", detail: false }) : error63.message
     );
   } else {
     console.error(error63);
@@ -96462,4 +96794,4 @@ undici/lib/web/websocket/frame.js:
   (*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> *)
 */
 
-//# debugId=66f773d5-e0b2-5538-a184-3ee15c3a469a
+//# debugId=bdd42bb0-e20a-5100-a257-b6dbb21d0f74