pushary 1.9.52 → 1.9.54

package/dist/bin/pushary-clean.js

@@ -1,14 +1,27 @@
 #!/usr/bin/env node
 import {
   CODEX_APP_CARDS_DIRECTORY,
-  removeCodexAppCardsFromThisMac
-} from "../chunk-OHSHDQZF.js";
+  LSREGISTER,
+  MAC_APP_BUNDLE_ID,
+  MAC_DEFAULTS_DOMAINS,
+  MAC_KEYCHAIN_ACCOUNTS,
+  codexAppCardsFolderStaysOnThisMac,
+  developerDefaults,
+  installedPusharyBundles,
+  liveMacStatePresence,
+  registeredPusharyBundles,
+  removeCodexAppCardsFromThisMac,
+  runningMacAppPIDs,
+  storedMacAppState,
+  storedPusharyKeychainServices,
+  waitForMacAppExit
+} from "../chunk-ZWOWEXCV.js";
 import {
   PUSHARY_SKILL_NAME,
   PUSHARY_SKILL_SOURCE,
   createGuards
 } from "../chunk-EUW7JL2K.js";
-import "../chunk-DMJFW4KL.js";
+import "../chunk-T5L5NWT3.js";
 import "../chunk-XCEN33UP.js";
 import {
   describeCliKeyRevocation,
@@ -108,7 +121,7 @@ import {
   removeClaudeAlias,
   shellProfileCandidates
 } from "../chunk-VYBH6D4X.js";
-import "../chunk-36NGFHE4.js";
+import "../chunk-E46NE7FB.js";
 import "../chunk-U2L42GVI.js";
 import "../chunk-3RPN7AAT.js";
 import "../chunk-JBT3ZSJS.js";
@@ -185,194 +198,14 @@ import {
 } from "../chunk-LF3TLC7B.js";
 
 // bin/pushary-clean.ts
-import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync5 } from "fs";
-import { dirname, join as join6 } from "path";
-import { homedir as homedir5, tmpdir } from "os";
+import { existsSync as existsSync5, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";
+import { dirname, join as join5 } from "path";
+import { homedir as homedir4, tmpdir } from "os";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 
-// src/cli/mac-leftovers.ts
-import { execSync, execFileSync } from "child_process";
-import { existsSync, readdirSync } from "fs";
-import { homedir } from "os";
-import { isAbsolute, join } from "path";
-var MAC_APP_BUNDLE = "/Applications/Pushary.app";
-var MAC_APP_BUNDLE_ID = "com.pushary.app";
-var installedPusharyBundles = (home = homedir()) => [MAC_APP_BUNDLE, join(home, "Applications", "Pushary.app")];
-var LSREGISTER = "/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister";
-var TEST_DEFAULTS_PREFIXES = [
-  "com.pushary.mac.tests.",
-  "com.pushary.tests.",
-  "pushary.tests.",
-  "pushary.quiet-mode-test.",
-  "pushary.drafts.test.",
-  "pushary-optin-",
-  "pushary-completion-test-",
-  "pushary-updates-only-"
-];
-var UUID = "[0-9A-Fa-f]{8}(?:-[0-9A-Fa-f]{4}){3}-[0-9A-Fa-f]{12}";
-var UNPREFIXED_TEST_DEFAULTS_DOMAIN = new RegExp(`^(?:owner-mode|fx-model)-${UUID}$`);
-var DEVELOPER_BUILD_DEFAULTS_DOMAIN = "PusharyMac";
-var isDeveloperDefaultsDomain = (domain) => domain === DEVELOPER_BUILD_DEFAULTS_DOMAIN || UNPREFIXED_TEST_DEFAULTS_DOMAIN.test(domain) || TEST_DEFAULTS_PREFIXES.some((prefix) => domain.startsWith(prefix));
-var PREFERENCES_FILE_EXTENSION = ".plist";
-var preferencesDirectory = (home) => join(home, "Library", "Preferences");
-var preferencesFile = (home, domain) => join(preferencesDirectory(home), `${domain}${PREFERENCES_FILE_EXTENSION}`);
-var namesIn = (directory) => {
-  try {
-    return readdirSync(directory);
-  } catch {
-    return [];
-  }
-};
-var developerDefaults = (home = homedir()) => namesIn(preferencesDirectory(home)).filter((name) => name.endsWith(PREFERENCES_FILE_EXTENSION)).map((name) => name.slice(0, -PREFERENCES_FILE_EXTENSION.length)).filter(isDeveloperDefaultsDomain).map((domain) => ({ domain, file: preferencesFile(home, domain) }));
-var BUNDLE_NAME = "Pushary.app";
-var DUMP_RECORD_SEPARATOR = /^-{20,}$/m;
-var DUMP_PATH_LINES = /^[ \t]*path:[ \t]+(.+?)(?: \(0x[0-9a-f]+\))?[ \t]*$/gm;
-var DUMP_IDENTIFIER_LINES = /^[ \t]*identifier:[ \t]+(\S+)/gm;
-var capturedIn = (text, lines) => [...text.matchAll(lines)].flatMap((match) => match[1] === void 0 ? [] : [match[1]]);
-var appCopyNamedByRecord = (record) => {
-  const paths = capturedIn(record, DUMP_PATH_LINES);
-  const identifiers = capturedIn(record, DUMP_IDENTIFIER_LINES);
-  const namesOneAppCopy = paths.length === 1 && identifiers.length === 1 && identifiers[0] === MAC_APP_BUNDLE_ID;
-  return namesOneAppCopy ? paths : [];
-};
-var isAtOrInside = (path, bundle) => path === bundle || path.startsWith(`${bundle}/`);
-var isUnderBundleNamedPushary = (path) => path.split("/").includes(BUNDLE_NAME);
-var bundlesInLaunchServicesDump = (dump) => {
-  const appCopies = dump.split(DUMP_RECORD_SEPARATOR).flatMap(appCopyNamedByRecord);
-  const isOurs = (path) => isUnderBundleNamedPushary(path) || appCopies.some((copy) => isAtOrInside(path, copy));
-  return [...new Set(capturedIn(dump, DUMP_PATH_LINES).filter(isOurs))];
-};
-var outsideInstalledBundles = (registered, installed) => registered.filter((path) => !installed.some((bundle) => isAtOrInside(path, bundle)));
-var registeredPusharyBundles = (installed = installedPusharyBundles()) => {
-  if (!existsSync(LSREGISTER)) return [];
-  try {
-    const dump = execSync(`${LSREGISTER} -dump`, {
-      encoding: "utf-8",
-      timeout: 6e4,
-      maxBuffer: 256 * 1024 * 1024
-    });
-    return outsideInstalledBundles(bundlesInLaunchServicesDump(dump), installed);
-  } catch {
-    return [];
-  }
-};
-var MAC_KEYCHAIN_SERVICE = "com.pushary.app.mac";
-var MAC_KEYCHAIN_ACCOUNTS = [
-  "pushary.site-api-key",
-  "pushary.site-id",
-  "pushary.partner-enrollments",
-  "pushary.partner-device-key",
-  "clerk.device-token",
-  "clerk.session-id",
-  "clerkDeviceToken",
-  "cachedClient",
-  "cachedClientServerDate",
-  "cachedEnvironment"
-];
-var MAC_DEFAULTS_DOMAINS = ["com.pushary.app", "pushary-bridge", "pushary.render"];
-var PRESENCE_PROBE_TIMEOUT_MS = 1e4;
-var commandSucceeds = (file, args) => {
-  try {
-    execFileSync(file, args, { stdio: "ignore", timeout: PRESENCE_PROBE_TIMEOUT_MS });
-    return true;
-  } catch {
-    return false;
-  }
-};
-var KEYCHAIN_ITEM_NOT_FOUND = 44;
-var keychainItemMayExist = (service, account) => {
-  try {
-    execFileSync("security", ["find-generic-password", "-s", service, "-a", account], { stdio: "ignore" });
-    return true;
-  } catch (error) {
-    return !(error instanceof Error && "status" in error && error.status === KEYCHAIN_ITEM_NOT_FOUND);
-  }
-};
-var liveMacStatePresence = {
-  keychainItem: keychainItemMayExist,
-  defaultsDomain: (domain) => commandSucceeds("defaults", ["read", domain])
-};
-var macLibraryState = (home = homedir()) => [
-  join(home, "Library", "Application Support", "Pushary"),
-  join(home, "Library", "Caches", "com.pushary.app"),
-  join(home, "Library", "Caches", "com.pushary.app.sparkle"),
-  join(home, "Library", "Saved Application State", "com.pushary.app.savedState"),
-  join(home, "Library", "Caches", "pushary-bridge"),
-  join(home, "Library", "HTTPStorages", "com.pushary.app"),
-  join(home, "Library", "HTTPStorages", "com.pushary.app.binarycookies"),
-  join(home, "Library", "HTTPStorages", "pushary-bridge"),
-  ...MAC_DEFAULTS_DOMAINS.map((domain) => preferencesFile(home, domain))
-];
-var USER_CACHE_ENTRIES = [MAC_APP_BUNDLE_ID, "pushary-bridge", "PusharyBridge"];
-var macUserCacheState = (reportedUserCacheDirectory) => {
-  const directory = reportedUserCacheDirectory.trim();
-  return isAbsolute(directory) ? USER_CACHE_ENTRIES.map((entry) => join(directory, entry)) : [];
-};
-var UNKNOWN_USER_CACHE_DIRECTORY = "";
-var reportedDarwinUserCacheDirectory = () => {
-  try {
-    return execFileSync("getconf", ["DARWIN_USER_CACHE_DIR"], {
-      encoding: "utf-8",
-      timeout: PRESENCE_PROBE_TIMEOUT_MS,
-      stdio: ["ignore", "pipe", "ignore"]
-    });
-  } catch {
-    return UNKNOWN_USER_CACHE_DIRECTORY;
-  }
-};
-var CRASH_REPORTER_ENTRY = new RegExp(`^(?:Pushary|PusharyMac|pushary-bridge)_${UUID}\\.plist$`);
-var crashReporterEntries = (home = homedir()) => {
-  const directory = join(home, "Library", "Application Support", "CrashReporter");
-  return namesIn(directory).filter((name) => CRASH_REPORTER_ENTRY.test(name)).map((name) => join(directory, name));
-};
-var storedMacAppState = (home = homedir()) => [
-  ...macLibraryState(home),
-  ...macUserCacheState(reportedDarwinUserCacheDirectory()),
-  ...crashReporterEntries(home)
-];
-var DUMP_SERVICE_LINE = /^\s*"svce"<blob>="(.+)"\s*$/;
-var pusharyKeychainServices = (dump) => {
-  const found = /* @__PURE__ */ new Set();
-  for (const line of dump.split("\n")) {
-    const service = DUMP_SERVICE_LINE.exec(line)?.[1];
-    if (service?.startsWith(MAC_KEYCHAIN_SERVICE)) found.add(service);
-  }
-  return [...found];
-};
-var storedPusharyKeychainServices = () => {
-  const dump = execFileSync("security", ["dump-keychain"], {
-    encoding: "utf-8",
-    timeout: 3e4,
-    maxBuffer: 64 * 1024 * 1024,
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-  const stored = pusharyKeychainServices(dump);
-  return stored.includes(MAC_KEYCHAIN_SERVICE) ? stored : [MAC_KEYCHAIN_SERVICE, ...stored];
-};
-var runningMacAppPIDs = () => {
-  if (process.platform !== "darwin") return [];
-  try {
-    return execSync('pgrep -f "Pushary.app/Contents/MacOS/Pushary"', {
-      encoding: "utf-8",
-      timeout: 1e4,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).split("\n").map((line) => Number(line.trim())).filter((pid) => Number.isInteger(pid) && pid > 0);
-  } catch {
-    return [];
-  }
-};
-var waitForMacAppExit = (attempts = 20, everyMs = 250) => {
-  const idle = new Int32Array(new SharedArrayBuffer(4));
-  for (let attempt = 0; attempt < attempts; attempt++) {
-    if (runningMacAppPIDs().length === 0) return true;
-    Atomics.wait(idle, 0, 0, everyMs);
-  }
-  return runningMacAppPIDs().length === 0;
-};
-
 // src/cli/clean-mac.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync } from "fs";
 var deleteDefaultsDomain = (guards2, domain) => {
   try {
     guards2.execFile("defaults", ["delete", domain], { stdio: "ignore", timeout: 1e4 }, `delete preferences ${domain}`);
@@ -432,7 +265,7 @@ var removeMacAppState = (guards2, readServices, statePaths, present) => {
     if (deleteDefaultsDomain(guards2, domain)) removed++;
   }
   for (const path of statePaths) {
-    if (!existsSync2(path)) continue;
+    if (!existsSync(path)) continue;
     try {
       guards2.remove(path, { force: true });
       removed++;
@@ -457,13 +290,13 @@ var quitMacApp = (guards2, state) => {
 };
 
 // src/cli/editor-extension.ts
-import { existsSync as existsSync3, readFileSync, readdirSync as readdirSync2 } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import { existsSync as existsSync2, readFileSync, readdirSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
 var EDITOR_EXTENSION_ID = "pushary.pushary";
 var EDITOR_EXTENSION_DIRS = [
-  join2(".cursor", "extensions"),
-  join2(".vscode", "extensions")
+  join(".cursor", "extensions"),
+  join(".vscode", "extensions")
 ];
 var EXTENSIONS_JSON = "extensions.json";
 var isOurEntry = (entry) => {
@@ -474,7 +307,7 @@ var isOurEntry = (entry) => {
   return typeof id === "string" && id.toLowerCase() === EDITOR_EXTENSION_ID;
 };
 var recordWithoutUs = (directory) => {
-  const path = join2(directory, EXTENSIONS_JSON);
+  const path = join(directory, EXTENSIONS_JSON);
   try {
     const entries = JSON.parse(readFileSync(path, "utf-8"));
     if (!Array.isArray(entries)) return void 0;
@@ -484,15 +317,15 @@ var recordWithoutUs = (directory) => {
     return void 0;
   }
 };
-var editorExtensionRemovals = (home = homedir2()) => EDITOR_EXTENSION_DIRS.map((relative) => join2(home, relative)).filter(existsSync3).map((directory) => {
-  const folders = readdirSync2(directory).filter((name) => name.startsWith(`${EDITOR_EXTENSION_ID}-`)).map((name) => join2(directory, name));
+var editorExtensionRemovals = (home = homedir()) => EDITOR_EXTENSION_DIRS.map((relative) => join(home, relative)).filter(existsSync2).map((directory) => {
+  const folders = readdirSync(directory).filter((name) => name.startsWith(`${EDITOR_EXTENSION_ID}-`)).map((name) => join(directory, name));
   return { directory, folders, record: recordWithoutUs(directory) };
 }).filter((removal) => removal.folders.length > 0 || removal.record !== void 0);
 
 // src/cli/skills-store.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
 var SKILLS_STORE_DIR = ".agents";
 var LOCK_FILE = ".skill-lock.json";
 var lockWithoutUs = (path) => {
@@ -510,26 +343,26 @@ var lockWithoutUs = (path) => {
     return void 0;
   }
 };
-var skillsStoreRemoval = (home = homedir3()) => {
-  const store = join3(home, SKILLS_STORE_DIR);
-  const skillDir = join3(store, "skills", PUSHARY_SKILL_NAME);
-  const lock = lockWithoutUs(join3(store, LOCK_FILE));
+var skillsStoreRemoval = (home = homedir2()) => {
+  const store = join2(home, SKILLS_STORE_DIR);
+  const skillDir = join2(store, "skills", PUSHARY_SKILL_NAME);
+  const lock = lockWithoutUs(join2(store, LOCK_FILE));
   return {
-    skillDir: lock && existsSync4(skillDir) ? skillDir : void 0,
+    skillDir: lock && existsSync3(skillDir) ? skillDir : void 0,
     lock
   };
 };
 
 // src/cli/claude-backups.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3, readdirSync as readdirSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
 var BACKUP_PREFIX = ".claude.json.backup";
-var claudeJsonBackups = (home = homedir4()) => {
-  const rollingDir = join4(home, ".claude", "backups");
-  const legacy = join4(home, BACKUP_PREFIX);
-  const rolling = existsSync5(rollingDir) ? readdirSync3(rollingDir).filter((name) => name.startsWith(BACKUP_PREFIX)).sort().map((name) => join4(rollingDir, name)) : [];
-  return existsSync5(legacy) ? [...rolling, legacy] : rolling;
+var claudeJsonBackups = (home = homedir3()) => {
+  const rollingDir = join3(home, ".claude", "backups");
+  const legacy = join3(home, BACKUP_PREFIX);
+  const rolling = existsSync4(rollingDir) ? readdirSync2(rollingDir).filter((name) => name.startsWith(BACKUP_PREFIX)).sort().map((name) => join3(rollingDir, name)) : [];
+  return existsSync4(legacy) ? [...rolling, legacy] : rolling;
 };
 var parsed = (path) => {
   try {
@@ -539,7 +372,7 @@ var parsed = (path) => {
     return null;
   }
 };
-var claudeBackupRewrites = (receipt, home = homedir4()) => claudeJsonBackups(home).flatMap((path) => {
+var claudeBackupRewrites = (receipt, home = homedir3()) => claudeJsonBackups(home).flatMap((path) => {
   const backup = parsed(path);
   if (!backup) return [];
   const changed = receipt ? restoreClaudeMcpServer(backup, receipt) : removeClaudeMcpServers(backup);
@@ -585,8 +418,8 @@ var removeGlobalCliPackages = (guards2, request) => {
 };
 
 // src/cli/config-temp-leftovers.ts
-import { lstatSync, readdirSync as readdirSync4 } from "fs";
-import { join as join5 } from "path";
+import { lstatSync, readdirSync as readdirSync3 } from "fs";
+import { join as join4 } from "path";
 var MAC_APP_WRITE_TEMP = /^\..+\.pushary-[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/;
 var PID_STAMPED_WRITE_TEMP = /^\.\d+-[^/]+\.pushary-tmp$/;
 var CONFIG_TEMP_MIN_AGE_MS = 6e4;
@@ -594,15 +427,15 @@ var isLeakedConfigTempName = (name) => MAC_APP_WRITE_TEMP.test(name) || PID_STAM
 var leakedConfigTemps = (entries, nowMs) => entries.filter((entry) => entry.isFile && isLeakedConfigTempName(entry.name) && nowMs - entry.modifiedAtMs >= CONFIG_TEMP_MIN_AGE_MS).map((entry) => entry.name);
 var directoryEntries = (directory) => {
   try {
-    return readdirSync4(directory).flatMap((name) => {
-      const stats = lstatSync(join5(directory, name), { throwIfNoEntry: false });
+    return readdirSync3(directory).flatMap((name) => {
+      const stats = lstatSync(join4(directory, name), { throwIfNoEntry: false });
       return stats ? [{ name, isFile: stats.isFile(), modifiedAtMs: stats.mtimeMs }] : [];
     });
   } catch {
     return [];
   }
 };
-var configTempLeftovers = (directories, nowMs) => [...new Set(directories)].flatMap((directory) => leakedConfigTemps(directoryEntries(directory), nowMs).map((name) => join5(directory, name)));
+var configTempLeftovers = (directories, nowMs) => [...new Set(directories)].flatMap((directory) => leakedConfigTemps(directoryEntries(directory), nowMs).map((name) => join4(directory, name)));
 
 // src/app-owned-paths.ts
 var APP_OWNED_ENTRIES = [
@@ -699,13 +532,13 @@ var CURSOR_PLUGIN_DIR = cursorPluginDir();
 var CURSOR_USER_HOOKS = cursorUserHooks();
 var VSCODE_PLUGIN_DIR = vscodePluginDir();
 var PUSHARY_DIR = pusharyDir();
-var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join6(homedir5(), f));
+var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join5(homedir4(), f));
 var PRESENCE_BY_RESOLUTION = {
   bundle: "present",
   missing: "gone",
   "no-stub": "absent"
 };
-var macAppPresence = () => PRESENCE_BY_RESOLUTION[resolveBridgeStub(join6(PUSHARY_DIR, "bin", HOOK_LOCATOR_BINARY), liveBridgeProbe()).kind];
+var macAppPresence = () => PRESENCE_BY_RESOLUTION[resolveBridgeStub(join5(PUSHARY_DIR, "bin", HOOK_LOCATOR_BINARY), liveBridgeProbe()).kind];
 var removalScope = (keepMcpServer, keepAppWiring) => ({
   keepAppWiring,
   keepMcpServer
@@ -740,7 +573,7 @@ var guardedRemove = (path, options) => guards.remove(path, options);
 var cursorPluginLeftovers = () => {
   const parent = dirname(CURSOR_PLUGIN_DIR);
   try {
-    return readdirSync5(parent).filter(isCursorPluginLeftover).map((name) => join6(parent, name));
+    return readdirSync4(parent).filter(isCursorPluginLeftover).map((name) => join5(parent, name));
   } catch {
     return [];
   }
@@ -754,14 +587,14 @@ var guardedDaemonRemoval = async () => {
 };
 var guardedInstructionBlockRemoval = (path) => {
   if (!dryRun) return removeInstructionBlock(path);
-  if (!existsSync6(path)) return false;
+  if (!existsSync5(path)) return false;
   const hasBlock = readFileSync4(path, "utf-8").includes("pushary");
   if (hasBlock) wouldNote("rewrite", path);
   return hasBlock;
 };
 var guardedAliasRemoval = () => {
   if (!dryRun) return removeClaudeAlias();
-  const shells = CANDIDATE_RCS.map((name) => join6(homedir5(), name)).filter((path) => existsSync6(path) && readFileSync4(path, "utf-8").includes("pushary claude"));
+  const shells = CANDIDATE_RCS.map((name) => join5(homedir4(), name)).filter((path) => existsSync5(path) && readFileSync4(path, "utf-8").includes("pushary claude"));
   for (const path of shells) wouldNote("rewrite", path);
   return shells;
 };
@@ -786,7 +619,7 @@ var removeFxInstructions = () => {
   }
 };
 var removeCursorUserHook = (scope) => {
-  if (!existsSync6(CURSOR_USER_HOOKS)) return "absent";
+  if (!existsSync5(CURSOR_USER_HOOKS)) return "absent";
   let parsed2;
   try {
     parsed2 = JSON.parse(readFileSync4(CURSOR_USER_HOOKS, "utf-8"));
@@ -831,14 +664,14 @@ var cleanSettingsFile = (path, label, scope) => {
   );
 };
 var agentConfigDirectories = () => [
-  homedir5(),
+  homedir4(),
   dirname(CLAUDE_SETTINGS),
   dirname(codexConfigToml()),
   dirname(geminiSettings()),
   dirname(CURSOR_USER_HOOKS),
   openCodeConfigDir(),
   fxConfigDir(),
-  ...vscodeSettingsTargets(existsSync6).map((settings) => dirname(settings))
+  ...vscodeSettingsTargets(existsSync5).map((settings) => dirname(settings))
 ];
 var restoreTakeoverReceipts = () => {
   const targets = [
@@ -846,15 +679,15 @@ var restoreTakeoverReceipts = () => {
     ["codex", codexHooksJson(), codexConfigToml(), "mcp_servers", "toml"],
     ["gemini_cli", geminiSettings(), geminiSettings(), "mcpServers", "json"],
     ["cursor", CURSOR_USER_HOOKS, null, null, null],
-    ["vscode", join6(VSCODE_PLUGIN_DIR, "hooks", "hooks.json"), vscodePluginMcp(), "mcpServers", "json"]
+    ["vscode", join5(VSCODE_PLUGIN_DIR, "hooks", "hooks.json"), vscodePluginMcp(), "mcpServers", "json"]
   ];
   for (const [agent, hookFile, mcpFile, mcpKey, mcpFormat] of targets) {
     const receiptPath = hookTakeoverReceipt(agent);
-    if (!existsSync6(receiptPath)) continue;
+    if (!existsSync5(receiptPath)) continue;
     try {
       const receipt = readJson(receiptPath);
       if (!isHookTakeoverReceipt(receipt) || receipt.agent !== agent) throw new Error("invalid receipt");
-      const document = existsSync6(hookFile) ? JSON.parse(readFileSync4(hookFile, "utf-8")) : {};
+      const document = existsSync5(hookFile) ? JSON.parse(readFileSync4(hookFile, "utf-8")) : {};
       if (!document || typeof document !== "object" || Array.isArray(document)) throw new Error("invalid hooks file");
       const appAlreadyOwns = hookOwnerOf(document) === "app";
       const cliPositions = agent === "codex" ? codexHookPositions(document) : {};
@@ -865,7 +698,7 @@ var restoreTakeoverReceipts = () => {
         if (mcpFile === hookFile) {
           mcpDocument = document;
         } else {
-          const raw = existsSync6(mcpFile) ? readFileSync4(mcpFile, "utf-8") : "";
+          const raw = existsSync5(mcpFile) ? readFileSync4(mcpFile, "utf-8") : "";
           mcpDocument = raw.trim() ? mcpFormat === "toml" ? parseTOML(raw) : JSON.parse(raw) : {};
         }
         mcpChanged = restoreMcpServer(mcpDocument, mcpKey, receipt.mcpServer);
@@ -875,7 +708,7 @@ var restoreTakeoverReceipts = () => {
       if (!appAlreadyOwns && agent === "codex") {
         if (!mcpDocument) {
           const configPath = codexConfigToml();
-          const raw = existsSync6(configPath) ? readFileSync4(configPath, "utf-8") : "";
+          const raw = existsSync5(configPath) ? readFileSync4(configPath, "utf-8") : "";
           mcpDocument = raw.trim() ? parseTOML(raw) : {};
         }
         codexConfig = mcpDocument;
@@ -971,7 +804,7 @@ var main = async () => {
   }
   if (presence !== "absent") console.log();
   const restoredByTakeover = new Set(
-    ["claude_code", "codex", "gemini_cli"].filter((agent) => existsSync6(hookTakeoverReceipt(agent)))
+    ["claude_code", "codex", "gemini_cli"].filter((agent) => existsSync5(hookTakeoverReceipt(agent)))
   );
   if (keepShared) restoreTakeoverReceipts();
   const sharedMcpKeys = {
@@ -997,10 +830,11 @@ var main = async () => {
   let macAppKeepsCodexAppCards = false;
   if (uid !== void 0) {
     try {
-      const appCards = removeCodexAppCardsFromThisMac({ homeDir: homedir5(), uid, keepWhatTheMacAppTurnedOn: keepShared, dryRun });
-      macAppKeepsCodexAppCards = appCards === "kept_for_the_mac_app";
+      const removal = { homeDir: homedir4(), uid, keepWhatTheMacAppTurnedOn: keepShared, dryRun };
+      const appCards = removeCodexAppCardsFromThisMac(removal);
+      macAppKeepsCodexAppCards = codexAppCardsFolderStaysOnThisMac(removal);
       if (appCards === "removed") console.log(`  ${check} Codex app cards ${dim(did("removed"))} ${dim("(quit Codex and open it again)")}`);
-      if (macAppKeepsCodexAppCards) console.log(`  ${skip} Codex app cards ${dim("(turned on by the Mac app; left on)")}`);
+      if (appCards === "kept_for_the_mac_app") console.log(`  ${skip} Codex app cards ${dim("(turned on by the Mac app; left on)")}`);
     } catch {
       incompleteClean = true;
       console.log(`  ${cross} Codex app cards ${dim("(could not turn off; run pushary codex --app-cards off)")}`);
@@ -1013,7 +847,7 @@ var main = async () => {
   const claudeHadPusharyEntry = claudeHasPusharyEntry();
   const rawReceipt = readJson(CLAUDE_MCP_RECEIPT);
   const receipt = isClaudeMcpSnapshot(rawReceipt) ? rawReceipt : null;
-  const receiptUnreadable = existsSync6(CLAUDE_MCP_RECEIPT) && !receipt;
+  const receiptUnreadable = existsSync5(CLAUDE_MCP_RECEIPT) && !receipt;
   if (keepClaudeMcp) {
     console.log(`  ${skip} Claude Code MCP servers ${dim("(kept: the Mac app uses it)")}`);
   } else if (claudeJson2) {
@@ -1028,7 +862,7 @@ var main = async () => {
       if (receipt && !keepShared) incompleteClean = true;
       console.log(`  ${skip} Claude Code MCP servers ${dim(receipt ? "(changed after setup; left unchanged)" : "(no pushary entries)")}`);
     }
-  } else if (existsSync6(CLAUDE_MCP_RECEIPT)) {
+  } else if (existsSync5(CLAUDE_MCP_RECEIPT)) {
     incompleteClean = true;
     console.log(`  ${skip} Claude Code MCP servers ${dim("(config missing; setup receipt kept for retry)")}`);
   } else {
@@ -1072,7 +906,7 @@ var main = async () => {
   }
   if (cursorGate === "failed") {
     console.log(`  ${skip} Cursor plugin ${dim("(kept: removing it now would block matched commands)")}`);
-  } else if (existsSync6(CURSOR_PLUGIN_DIR)) {
+  } else if (existsSync5(CURSOR_PLUGIN_DIR)) {
     guardedRemove(CURSOR_PLUGIN_DIR);
     console.log(`  ${check} Cursor plugin ${dim("(removed from ~/.cursor/plugins/local)")}`);
   } else {
@@ -1088,9 +922,9 @@ var main = async () => {
   if (keepShared) {
     console.log(`  ${skip} VS Code plugin ${dim("(kept: the Mac app writes the same plugin directory)")}`);
   }
-  for (const settingsPath of keepShared ? [] : vscodeSettingsTargets(existsSync6)) {
+  for (const settingsPath of keepShared ? [] : vscodeSettingsTargets(existsSync5)) {
     const label = `VS Code plugin ${dim(`(${shortenHome(settingsPath)})`)}`;
-    if (!existsSync6(settingsPath)) {
+    if (!existsSync5(settingsPath)) {
       console.log(`  ${skip} ${label} ${dim("(no settings.json)")}`);
       continue;
     }
@@ -1104,7 +938,7 @@ var main = async () => {
       console.log(`  ${skip} ${label} ${dim("(no pushary entry)")}`);
     }
   }
-  if (!keepShared && existsSync6(VSCODE_PLUGIN_DIR)) {
+  if (!keepShared && existsSync5(VSCODE_PLUGIN_DIR)) {
     guardedRemove(VSCODE_PLUGIN_DIR);
     console.log(`  ${check} VS Code plugin files ${dim(did("removed"))}`);
   }
@@ -1123,7 +957,7 @@ var main = async () => {
   }
   if (keepShared) {
     console.log(`  ${skip} Skill directory ${dim("(kept: the Mac app uses it)")}`);
-  } else if (existsSync6(SKILL_DIR)) {
+  } else if (existsSync5(SKILL_DIR)) {
     guardedRemove(SKILL_DIR);
     console.log(`  ${check} Skill directory ${dim(did("removed"))}`);
   } else {
@@ -1183,7 +1017,7 @@ var main = async () => {
   const codexSkillDir2 = codexSkillDir();
   if (keepShared) {
     console.log(`  ${skip} Codex skill directory ${dim("(kept: the Mac app uses it)")}`);
-  } else if (existsSync6(codexSkillDir2)) {
+  } else if (existsSync5(codexSkillDir2)) {
     guardedRemove(codexSkillDir2);
     console.log(`  ${check} Codex skill directory ${dim(did("removed"))}`);
   } else {
@@ -1236,7 +1070,7 @@ var main = async () => {
     console.log(`  ${skip} Gemini GEMINI.md ${dim("(no pushary block)")}`);
   }
   const openCodePlugin = openCodePluginFile();
-  const openCodePluginContents = existsSync6(openCodePlugin) ? readFileSync4(openCodePlugin, "utf-8") : null;
+  const openCodePluginContents = existsSync5(openCodePlugin) ? readFileSync4(openCodePlugin, "utf-8") : null;
   if (openCodePluginContents === null) {
     console.log(`  ${skip} OpenCode plugin ${dim("(not installed)")}`);
   } else if (!isOpenCodePluginOurs(openCodePluginContents)) {
@@ -1246,15 +1080,15 @@ var main = async () => {
   } else {
     guardedRemove(openCodePlugin, { force: true });
     console.log(`  ${check} OpenCode plugin ${dim(did("removed"))}`);
-    const sibling = join6(openCodePluginDir(), OPENCODE_PLUGIN_SIBLING);
+    const sibling = join5(openCodePluginDir(), OPENCODE_PLUGIN_SIBLING);
     const remaining = (() => {
       try {
-        return readdirSync5(openCodePluginDir()).filter((name) => name !== OPENCODE_PLUGIN_SIBLING);
+        return readdirSync4(openCodePluginDir()).filter((name) => name !== OPENCODE_PLUGIN_SIBLING);
       } catch {
         return [];
       }
     })();
-    const siblingIsOurs = existsSync6(sibling) && readFileSync4(sibling, "utf-8") === OPENCODE_PLUGIN_SIBLING_CONTENTS;
+    const siblingIsOurs = existsSync5(sibling) && readFileSync4(sibling, "utf-8") === OPENCODE_PLUGIN_SIBLING_CONTENTS;
     if (siblingIsOurs && !hasForeignPlugins(remaining)) {
       guardedRemove(sibling, { force: true });
       console.log(`  ${check} OpenCode plugin sibling ${dim(did("removed"))}`);
@@ -1307,7 +1141,7 @@ var main = async () => {
         }
       }
     }
-  } else if (existsSync6(HERMES_CONFIG_RECEIPT)) {
+  } else if (existsSync5(HERMES_CONFIG_RECEIPT)) {
     incompleteClean = true;
     console.log(`  ${skip} Hermes ${dim("(runtime not found; setup receipt kept for retry)")}`);
   } else {
@@ -1356,15 +1190,15 @@ var main = async () => {
   if (leakedTemps.length > 0) {
     console.log(`  ${check} Leftover temp files ${dim(`(${dryRun ? "would remove" : "removed"} ${leakedTemps.length} left by an interrupted config write)`)}`);
   }
-  if (existsSync6(PUSHARY_DIR)) {
+  if (existsSync5(PUSHARY_DIR)) {
     let removed = 0;
     const kept = [];
-    for (const entry of readdirSync5(PUSHARY_DIR)) {
+    for (const entry of readdirSync4(PUSHARY_DIR)) {
       if (keepShared && isAppOwned(entry) || entry === "setup" && (keepShared || incompleteClean) || entry === CODEX_APP_CARDS_DIRECTORY && macAppKeepsCodexAppCards) {
         kept.push(entry);
         continue;
       }
-      guardedRemove(join6(PUSHARY_DIR, entry), { force: true });
+      guardedRemove(join5(PUSHARY_DIR, entry), { force: true });
       removed++;
     }
     if (removed > 0) {
@@ -1381,10 +1215,10 @@ var main = async () => {
   }
   try {
     let swept = 0;
-    for (const f of readdirSync5(tmpdir())) {
+    for (const f of readdirSync4(tmpdir())) {
       if (!f.startsWith("pushary-")) continue;
       try {
-        guardedRemove(join6(tmpdir(), f), { force: true });
+        guardedRemove(join5(tmpdir(), f), { force: true });
         swept++;
       } catch {
       }
@@ -1438,7 +1272,7 @@ var main = async () => {
     console.log(`  ${dim("Still stuck? Send this output to")} ${SUPPORT_EMAIL} ${dim("or")} ${SUPPORT_DISCORD}`);
   } else if (everything) {
     console.log(`  ${green(bold("Clean complete. Nothing of ours is left in any agent config."))}`);
-    const bundle = installedPusharyBundles().find(existsSync6);
+    const bundle = installedPusharyBundles().find(existsSync5);
     if (bundle) {
       console.log(`  ${dim("The app itself is still installed. Drag")} ${bundle} ${dim("to the Trash to finish.")}`);
     }

package/dist/bin/pushary-codex-session.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   letCodexRunWithoutPushary
-} from "../chunk-36NGFHE4.js";
+} from "../chunk-E46NE7FB.js";
 
 // bin/pushary-codex-session.ts
 var args = process.argv.slice(2);
@@ -16,7 +16,7 @@ var desktopAccount = async () => {
     return null;
   }
 };
-var desktopLaunch = await import("../codex-desktop-launch-EIFLPLB7.js").catch(() => null);
+var desktopLaunch = await import("../codex-desktop-launch-RIBIFXSF.js").catch(() => null);
 if (desktopLaunch === null && appBehindTheProxy !== void 0) {
   process.exitCode = await letCodexRunWithoutPushary(appBehindTheProxy, args.slice(3));
 } else {
@@ -24,7 +24,7 @@ if (desktopLaunch === null && appBehindTheProxy !== void 0) {
   const stop = () => abort.abort();
   if (!args[0]?.startsWith("--desktop")) for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) process.on(signal, stop);
   try {
-    const { codexDesktopCommand } = desktopLaunch ?? await import("../codex-desktop-launch-EIFLPLB7.js");
+    const { codexDesktopCommand } = desktopLaunch ?? await import("../codex-desktop-launch-RIBIFXSF.js");
     const desktop = await codexDesktopCommand(args, [process.execPath, ...process.execArgv, process.argv[1], "codex"], desktopAccount);
     if (desktop !== null) process.exitCode = desktop;
     else {