pushary 1.9.53 → 1.9.55

package/dist/{chunk-SUIB4O3S.js → chunk-ZWOWEXCV.js}

@@ -6,7 +6,7 @@ import {
   everyProgramFileIsThere,
   installedCodexApp,
   shellQuoted
-} from "./chunk-ABGN5RN2.js";
+} from "./chunk-T5L5NWT3.js";
 import {
   writeHuman
 } from "./chunk-QCGNGEGE.js";
@@ -14,17 +14,200 @@ import {
   xml
 } from "./chunk-BL3WAGIK.js";
 import {
+  CODEX_APP_LAUNCH_AT_LOGIN_VERB,
   CODEX_APP_LAUNCH_VARIABLE
-} from "./chunk-36NGFHE4.js";
+} from "./chunk-E46NE7FB.js";
 import {
   writeFileAtomic
 } from "./chunk-AQFEP65J.js";
 
 // src/codex-app-cards-switch.ts
-import { execFileSync } from "child_process";
-import { existsSync, mkdirSync, readFileSync, rmSync } from "fs";
+import { execFileSync as execFileSync2 } from "child_process";
+import { existsSync as existsSync2, mkdirSync, readFileSync, rmSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+
+// src/cli/mac-leftovers.ts
+import { execSync, execFileSync } from "child_process";
+import { existsSync, readdirSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+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/codex-app-cards-switch.ts
 var CODEX_APP_CARDS_LOGIN_ITEM = "com.pushary.codex-app-cards";
 var CODEX_APP_CARDS_DIRECTORY = "codex-app";
 var LAUNCHCTL = "/bin/launchctl";
@@ -39,15 +222,15 @@ var LOGIN_ITEM_MODE = 420;
 var MAC_APP_HELPER = "/Contents/Helpers/pushary-native-transcripts";
 var TEMPORARY_NPX_FOLDER = "/_npx/";
 var codexAppCardsPaths = (homeDir, uid) => {
-  const launcherDirectory = join(homeDir, ".pushary", CODEX_APP_CARDS_DIRECTORY);
-  const loginItemDirectory = join(homeDir, "Library", "LaunchAgents");
+  const launcherDirectory = join2(homeDir, ".pushary", CODEX_APP_CARDS_DIRECTORY);
+  const loginItemDirectory = join2(homeDir, "Library", "LaunchAgents");
   return {
     launcherDirectory,
-    launcherPath: join(launcherDirectory, LAUNCHER_NAME),
-    receiptPath: join(launcherDirectory, RECEIPT_NAME),
-    turnedOffPath: join(launcherDirectory, TURNED_OFF_NAME),
+    launcherPath: join2(launcherDirectory, LAUNCHER_NAME),
+    receiptPath: join2(launcherDirectory, RECEIPT_NAME),
+    turnedOffPath: join2(launcherDirectory, TURNED_OFF_NAME),
     loginItemDirectory,
-    loginItemPath: join(loginItemDirectory, `${CODEX_APP_CARDS_LOGIN_ITEM}.plist`),
+    loginItemPath: join2(loginItemDirectory, `${CODEX_APP_CARDS_LOGIN_ITEM}.plist`),
     loginItemTarget: `gui/${uid}/${CODEX_APP_CARDS_LOGIN_ITEM}`
   };
 };
@@ -56,17 +239,23 @@ var codexAppCardsLoginScript = (launcherPath, engine, entry) => [
   `&& [ -z "$(${LAUNCHCTL} getenv ${CODEX_APP_LAUNCH_VARIABLE})" ];`,
   `then ${LAUNCHCTL} setenv ${CODEX_APP_LAUNCH_VARIABLE} ${shellQuoted(launcherPath)}; fi`
 ].join(" ");
+var isTheMacAppsHelper = (entry) => entry.length > 0 && entry[0].endsWith(MAC_APP_HELPER);
+var loginItemProgram = (launcherPath, engine, entry) => isTheMacAppsHelper(entry) ? [entry[0], CODEX_APP_LAUNCH_AT_LOGIN_VERB] : ["/bin/sh", "-c", codexAppCardsLoginScript(launcherPath, engine, entry)];
+var LISTED_UNDER_THE_MAC_APP = `  <key>AssociatedBundleIdentifiers</key>
+  <array>
+    <string>${MAC_APP_BUNDLE_ID}</string>
+  </array>
+`;
+var propertyListString = (value) => `    <string>${xml(value)}</string>`;
 var codexAppCardsLoginItem = (launcherPath, engine, entry) => `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
   <key>Label</key>
   <string>${CODEX_APP_CARDS_LOGIN_ITEM}</string>
-  <key>ProgramArguments</key>
+${isTheMacAppsHelper(entry) ? LISTED_UNDER_THE_MAC_APP : ""}  <key>ProgramArguments</key>
   <array>
-    <string>/bin/sh</string>
-    <string>-c</string>
-    <string>${xml(codexAppCardsLoginScript(launcherPath, engine, entry))}</string>
+${loginItemProgram(launcherPath, engine, entry).map(propertyListString).join("\n")}
   </array>
   <key>RunAtLoad</key>
   <true/>
@@ -128,6 +317,13 @@ var turnCodexAppCardsOn = (installation, machine) => {
   machine.setLaunchVariable(paths.launcherPath);
   return { kind: "on" };
 };
+var setCodexAppLaunchAtLogin = (paths, machine) => {
+  const isTurnedOn = machine.exists(paths.launcherPath) && machine.exists(paths.loginItemPath);
+  const cannotRun = whatTheLauncherCannotRun(codexAppCardsReceiptFrom(machine.readFile(paths.receiptPath)), machine);
+  if (!isTurnedOn || cannotRun !== null || machine.launchVariable().length > 0) return "left_as_it_is";
+  machine.setLaunchVariable(paths.launcherPath);
+  return "set";
+};
 var leaveOnlyThePathToTheEngine = (paths, machine) => {
   const receipt = codexAppCardsReceiptFrom(machine.readFile(paths.receiptPath));
   const launcher = machine.readFile(paths.launcherPath);
@@ -152,7 +348,6 @@ var rememberCodexAppCardsWereTurnedOff = (paths, machine) => {
   machine.makeDirectory(paths.launcherDirectory, PRIVATE_DIRECTORY_MODE);
   machine.writeFile(paths.turnedOffPath, "", PRIVATE_FILE_MODE);
 };
-var isTheMacAppsHelper = (entry) => entry.length > 0 && entry[0].endsWith(MAC_APP_HELPER);
 var turnedOnByTheMacApp = (receipt) => receipt !== null && isTheMacAppsHelper(receipt.entry);
 var codexAppCardsReport = (paths, machine) => ({
   status: codexAppCardsStatus(paths, machine),
@@ -181,7 +376,7 @@ var removeCodexAppCards = (request, machine) => {
   if (keepsTheOff) rememberCodexAppCardsWereTurnedOff(paths, machine);
   return "removed";
 };
-var launchctl = (args) => execFileSync(LAUNCHCTL, [...args], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+var launchctl = (args) => execFileSync2(LAUNCHCTL, [...args], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
 var launchctlIgnoringFailure = (args) => {
   try {
     return launchctl(args);
@@ -208,7 +403,7 @@ var thisMacsCodexAppCardsMachine = () => ({
   unloadLoginItem: (target) => {
     launchctlIgnoringFailure(["bootout", target]);
   },
-  exists: existsSync,
+  exists: existsSync2,
   readFile: fileContents,
   makeDirectory: (path, mode) => {
     mkdirSync(path, { recursive: true, mode });
@@ -222,6 +417,11 @@ var thisMacsCodexAppCardsMachine = () => ({
 });
 var removeCodexAppCardsFromThisMac = (request) => removeCodexAppCards(request, thisMacsCodexAppCardsMachine());
 var codexAppCardsFolderStaysOnThisMac = (request) => codexAppCardsFolderStays(request, thisMacsCodexAppCardsMachine());
+var setCodexAppLaunchAtLoginOnThisMac = () => {
+  const uid = process.getuid?.();
+  if (uid === void 0) return;
+  setCodexAppLaunchAtLogin(codexAppCardsPaths(homedir2(), uid), thisMacsCodexAppCardsMachine());
+};
 var USAGE = "Usage: pushary codex --app-cards on [path/to/Codex.app] | off | status [--json]";
 var AS_JSON = "--json";
 var TAKES_EFFECT_AFTER_REOPENING = "Quit Codex and open it again.";
@@ -250,7 +450,7 @@ var codexAppCardsCommand = async (args, entry, readAccount, machine, say) => {
   const [action, chosenApp, ...rest] = args;
   const uid = process.getuid?.();
   if (uid === void 0) throw new Error("Codex app cards need macOS");
-  const paths = codexAppCardsPaths(homedir(), uid);
+  const paths = codexAppCardsPaths(homedir2(), uid);
   if (action === "status" && chosenApp === AS_JSON && rest.length === 0) {
     say(JSON.stringify(codexAppCardsReport(paths, machine)));
     return 0;
@@ -270,7 +470,7 @@ var codexAppCardsCommand = async (args, entry, readAccount, machine, say) => {
   if (!await readAccount()) throw new Error("Connect Pushary before turning Codex app cards on");
   const app = installedCodexApp(chosenApp);
   const engine = await desktopEngine(app);
-  const turnedOn = turnCodexAppCardsOn(codexAppCardsInstallation({ homeDir: homedir(), uid, entry, app, engine }), machine);
+  const turnedOn = turnCodexAppCardsOn(codexAppCardsInstallation({ homeDir: homedir2(), uid, entry, app, engine }), machine);
   if (turnedOn.kind === "another_program_owns_the_launch") {
     say(ownedByAnotherProgram(turnedOn.value));
     return 1;
@@ -288,6 +488,18 @@ var sayToThePerson = (line) => {
 var codexAppCardsCommandOnThisMac = (args, entry, readAccount) => codexAppCardsCommand(args, entry, readAccount, thisMacsCodexAppCardsMachine(), sayToThePerson);
 
 export {
+  MAC_APP_BUNDLE_ID,
+  installedPusharyBundles,
+  LSREGISTER,
+  developerDefaults,
+  registeredPusharyBundles,
+  MAC_KEYCHAIN_ACCOUNTS,
+  MAC_DEFAULTS_DOMAINS,
+  liveMacStatePresence,
+  storedMacAppState,
+  storedPusharyKeychainServices,
+  runningMacAppPIDs,
+  waitForMacAppExit,
   CODEX_APP_CARDS_LOGIN_ITEM,
   CODEX_APP_CARDS_DIRECTORY,
   codexAppCardsPaths,
@@ -297,6 +509,7 @@ export {
   codexAppCardsInstallation,
   codexAppCardsStatus,
   turnCodexAppCardsOn,
+  setCodexAppLaunchAtLogin,
   turnCodexAppCardsOff,
   rememberCodexAppCardsWereTurnedOff,
   codexAppCardsReport,
@@ -304,6 +517,7 @@ export {
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
   codexAppCardsFolderStaysOnThisMac,
+  setCodexAppLaunchAtLoginOnThisMac,
   runsFromATemporaryFolder,
   codexAppCardsStatusLine,
   codexAppCardsCommand,

package/dist/{codex-app-cards-switch-RENOSSDD.js → codex-app-cards-switch-P4RVJNRV.js}

@@ -17,16 +17,18 @@ import {
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
   runsFromATemporaryFolder,
+  setCodexAppLaunchAtLogin,
+  setCodexAppLaunchAtLoginOnThisMac,
   turnCodexAppCardsOff,
   turnCodexAppCardsOn
-} from "./chunk-SUIB4O3S.js";
-import "./chunk-ABGN5RN2.js";
+} from "./chunk-ZWOWEXCV.js";
+import "./chunk-T5L5NWT3.js";
 import "./chunk-XCEN33UP.js";
 import "./chunk-QCGNGEGE.js";
 import "./chunk-BL3WAGIK.js";
 import "./chunk-XHKBHWLX.js";
 import "./chunk-VYBH6D4X.js";
-import "./chunk-36NGFHE4.js";
+import "./chunk-E46NE7FB.js";
 import "./chunk-T6RIKJUO.js";
 import "./chunk-4QQEUJL4.js";
 import "./chunk-OML4YFBN.js";
@@ -55,6 +57,8 @@ export {
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
   runsFromATemporaryFolder,
+  setCodexAppLaunchAtLogin,
+  setCodexAppLaunchAtLoginOnThisMac,
   turnCodexAppCardsOff,
   turnCodexAppCardsOn
 };

package/dist/{codex-desktop-launch-I2D6QATK.js → codex-desktop-launch-RIBIFXSF.js}

@@ -10,11 +10,11 @@ import {
   installedCodexApp,
   shellQuoted,
   writeDesktopProxy
-} from "./chunk-ABGN5RN2.js";
+} from "./chunk-T5L5NWT3.js";
 import "./chunk-XCEN33UP.js";
 import {
   CODEX_APP_LAUNCH_VARIABLE
-} from "./chunk-36NGFHE4.js";
+} from "./chunk-E46NE7FB.js";
 export {
   CODEX_APP_LAUNCH_VARIABLE,
   codexAppOnThisMac,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushary",
-  "version": "1.9.53",
+  "version": "1.9.55",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",