pushary 1.9.52 → 1.9.53

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.53
+
+- `pushary codex --app-cards status --json` prints the switch's state as one line of JSON for a program to read: the state, the Codex app found on this Mac, whether the Mac app turned the switch on, and whether it was turned off on purpose. The Pushary Mac app uses it for its new Settings switch, which is on by default there.
+- `pushary codex --app-cards off` is remembered. The Pushary Mac app turns the switch on by itself, and it leaves alone a switch you turned off with this command until you turn it on again. `pushary clean` keeps that record while the Mac app stays installed.
+- The login item that keeps Codex app cards on after a restart now also checks that every file of Pushary's own program is still there. If Pushary was removed without turning the switch off, Codex starts the ordinary way from the next login. An existing login item gets the check the next time the switch is turned on.
+
 ## 1.9.52
 
 - `pushary upgrade` and the daily automatic update now refresh the Pushary instructions in each agent's instruction file: Codex, Gemini CLI, OpenCode, fx, Qwen Code, CodeBuddy and Grok. Before this release only `setup` wrote them, so a machine set up before 1.9.43 kept the old text after every update and its agents were never told about reminders. In fx a plain "remind me in 2 minutes" could fall back to a sleep timer that stops when fx closes.

package/dist/bin/pushary-clean.js

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 import {
   CODEX_APP_CARDS_DIRECTORY,
+  codexAppCardsFolderStaysOnThisMac,
   removeCodexAppCardsFromThisMac
-} from "../chunk-OHSHDQZF.js";
+} from "../chunk-SUIB4O3S.js";
 import {
   PUSHARY_SKILL_NAME,
   PUSHARY_SKILL_SOURCE,
   createGuards
 } from "../chunk-EUW7JL2K.js";
-import "../chunk-DMJFW4KL.js";
+import "../chunk-ABGN5RN2.js";
 import "../chunk-XCEN33UP.js";
 import {
   describeCliKeyRevocation,
@@ -997,10 +998,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: homedir5(), 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)")}`);

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

@@ -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-I2D6QATK.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-I2D6QATK.js");
     const desktop = await codexDesktopCommand(args, [process.execPath, ...process.execArgv, process.argv[1], "codex"], desktopAccount);
     if (desktop !== null) process.exitCode = desktop;
     else {

package/dist/bin/pushary-setup.js

@@ -55,7 +55,7 @@ import {
 } from "../chunk-EUW7JL2K.js";
 import {
   codexEngineBehindLauncher
-} from "../chunk-DMJFW4KL.js";
+} from "../chunk-ABGN5RN2.js";
 import "../chunk-XCEN33UP.js";
 import {
   CURSOR_PLUGIN_BACKUP_INFIX,

package/dist/{chunk-DMJFW4KL.js → chunk-ABGN5RN2.js}

@@ -670,7 +670,8 @@ var engineWhateverTheLayout = async (app) => {
     return { engine, layoutIsKnown: false };
   }
 };
-var installedCodexApp = (chosen) => resolve(chosen ?? INSTALLED_CODEX_APPS.find((candidate) => existsSync(join(candidate, CODEX_ENGINE_DIRECTORY, CODEX_ENGINE_MANIFEST))) ?? INSTALLED_CODEX_APPS[1]);
+var codexAppOnThisMac = () => INSTALLED_CODEX_APPS.find((candidate) => existsSync(join(candidate, CODEX_ENGINE_DIRECTORY, CODEX_ENGINE_MANIFEST))) ?? null;
+var installedCodexApp = (chosen) => resolve(chosen ?? codexAppOnThisMac() ?? INSTALLED_CODEX_APPS[1]);
 var desktopExecutable = (app) => {
   const plist = join(app, "Contents/Info.plist");
   const read = (key) => execFileSync("/usr/bin/plutil", ["-extract", key, "raw", plist], { encoding: "utf8" }).trim();
@@ -694,7 +695,7 @@ var codexDesktopCommand = async (args, entry, readAccount) => {
     return runCodexDesktopProxy(engine2, args.slice(3), readAccount, { watchesForCards: layoutIsKnown });
   }
   if (args[0] === APP_CARDS_FLAG) {
-    const { codexAppCardsCommandOnThisMac } = await import("./codex-app-cards-switch-OUQ3DUWF.js");
+    const { codexAppCardsCommandOnThisMac } = await import("./codex-app-cards-switch-RENOSSDD.js");
     return codexAppCardsCommandOnThisMac(args.slice(1), entry, readAccount);
   }
   if (args.length > 2) throw new Error("Usage: pushary codex --desktop [path/to/Codex.app]");
@@ -719,11 +720,13 @@ var codexDesktopCommand = async (args, entry, readAccount) => {
 export {
   shellQuoted,
   desktopEngineFromManifest,
+  everyProgramFileIsThere,
   desktopProxyScript,
   codexPassThroughScript,
   codexEngineBehindLauncher,
   writeDesktopProxy,
   desktopEngine,
+  codexAppOnThisMac,
   installedCodexApp,
   codexDesktopCommand
 };

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

@@ -1,10 +1,12 @@
 import {
+  codexAppOnThisMac,
   codexPassThroughScript,
   desktopEngine,
   desktopProxyScript,
+  everyProgramFileIsThere,
   installedCodexApp,
   shellQuoted
-} from "./chunk-DMJFW4KL.js";
+} from "./chunk-ABGN5RN2.js";
 import {
   writeHuman
 } from "./chunk-QCGNGEGE.js";
@@ -28,6 +30,7 @@ var CODEX_APP_CARDS_DIRECTORY = "codex-app";
 var LAUNCHCTL = "/bin/launchctl";
 var LAUNCHER_NAME = "codex";
 var RECEIPT_NAME = "turned-on.json";
+var TURNED_OFF_NAME = "turned-off";
 var PRIVATE_DIRECTORY_MODE = 448;
 var PRIVATE_PROGRAM_MODE = 448;
 var PRIVATE_FILE_MODE = 384;
@@ -42,17 +45,18 @@ var codexAppCardsPaths = (homeDir, uid) => {
     launcherDirectory,
     launcherPath: join(launcherDirectory, LAUNCHER_NAME),
     receiptPath: join(launcherDirectory, RECEIPT_NAME),
+    turnedOffPath: join(launcherDirectory, TURNED_OFF_NAME),
     loginItemDirectory,
     loginItemPath: join(loginItemDirectory, `${CODEX_APP_CARDS_LOGIN_ITEM}.plist`),
     loginItemTarget: `gui/${uid}/${CODEX_APP_CARDS_LOGIN_ITEM}`
   };
 };
-var codexAppCardsLoginScript = (launcherPath, engine) => [
-  `if [ -x ${shellQuoted(launcherPath)} ] && [ -x ${shellQuoted(engine)} ]`,
+var codexAppCardsLoginScript = (launcherPath, engine, entry) => [
+  `if [ -x ${shellQuoted(launcherPath)} ] && [ -x ${shellQuoted(engine)} ] && ${everyProgramFileIsThere(entry)}`,
   `&& [ -z "$(${LAUNCHCTL} getenv ${CODEX_APP_LAUNCH_VARIABLE})" ];`,
   `then ${LAUNCHCTL} setenv ${CODEX_APP_LAUNCH_VARIABLE} ${shellQuoted(launcherPath)}; fi`
 ].join(" ");
-var codexAppCardsLoginItem = (launcherPath, engine) => `<?xml version="1.0" encoding="UTF-8"?>
+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>
@@ -62,7 +66,7 @@ var codexAppCardsLoginItem = (launcherPath, engine) => `<?xml version="1.0" enco
   <array>
     <string>/bin/sh</string>
     <string>-c</string>
-    <string>${xml(codexAppCardsLoginScript(launcherPath, engine))}</string>
+    <string>${xml(codexAppCardsLoginScript(launcherPath, engine, entry))}</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
@@ -87,7 +91,7 @@ var codexAppCardsInstallation = (input) => {
   return {
     paths,
     launcherScript: desktopProxyScript(input.entry, input.app, input.engine, { turnsItselfOffWithoutTheEngine: true }),
-    loginItem: codexAppCardsLoginItem(paths.launcherPath, input.engine),
+    loginItem: codexAppCardsLoginItem(paths.launcherPath, input.engine, input.entry),
     receipt: { entry: input.entry, app: input.app, engine: input.engine }
   };
 };
@@ -118,6 +122,7 @@ var turnCodexAppCardsOn = (installation, machine) => {
   machine.writeFile(paths.launcherPath, installation.launcherScript, PRIVATE_PROGRAM_MODE);
   machine.writeFile(paths.receiptPath, `${JSON.stringify(installation.receipt, null, 2)}
 `, PRIVATE_FILE_MODE);
+  if (machine.exists(paths.turnedOffPath)) machine.remove(paths.turnedOffPath);
   machine.makeDirectory(paths.loginItemDirectory, LOGIN_ITEM_DIRECTORY_MODE);
   machine.writeFile(paths.loginItemPath, installation.loginItem, LOGIN_ITEM_MODE);
   machine.setLaunchVariable(paths.launcherPath);
@@ -142,15 +147,38 @@ var turnCodexAppCardsOff = (paths, machine) => {
   }
   return { wasOn: ours || loginItemIsThere, launchLeftToAnotherProgram: value.length > 0 && !ours ? value : null };
 };
-var turnedOnByTheMacApp = (receipt) => receipt !== null && receipt.entry[0].endsWith(MAC_APP_HELPER);
+var rememberCodexAppCardsWereTurnedOff = (paths, machine) => {
+  if (machine.exists(paths.turnedOffPath)) return;
+  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),
+  codexApp: machine.codexApp(),
+  turnedOnByTheMacApp: turnedOnByTheMacApp(codexAppCardsReceiptFrom(machine.readFile(paths.receiptPath))),
+  turnedOffOnPurpose: machine.exists(paths.turnedOffPath)
+});
+var isKeptOnForTheMacApp = (request, paths, machine) => request.keepWhatTheMacAppTurnedOn && turnedOnByTheMacApp(codexAppCardsReceiptFrom(machine.readFile(paths.receiptPath))) && codexAppCardsStatus(paths, machine).kind !== "off";
+var isKeptOffForTheMacApp = (request, paths, machine) => request.keepWhatTheMacAppTurnedOn && machine.exists(paths.turnedOffPath);
+var codexAppCardsFolderStays = (request, machine) => {
+  const paths = codexAppCardsPaths(request.homeDir, request.uid);
+  return isKeptOnForTheMacApp(request, paths, machine) || isKeptOffForTheMacApp(request, paths, machine);
+};
+var nothingIsTurnedOn = (paths, machine) => !machine.exists(paths.launcherPath) && !machine.exists(paths.loginItemPath) && machine.launchVariable() !== paths.launcherPath;
 var removeCodexAppCards = (request, machine) => {
   const paths = codexAppCardsPaths(request.homeDir, request.uid);
-  if (!machine.exists(paths.launcherDirectory) && !machine.exists(paths.loginItemPath)) return "absent";
-  const keptOnForTheMacApp = request.keepWhatTheMacAppTurnedOn && turnedOnByTheMacApp(codexAppCardsReceiptFrom(machine.readFile(paths.receiptPath))) && codexAppCardsStatus(paths, machine).kind !== "off";
-  if (keptOnForTheMacApp) return "kept_for_the_mac_app";
+  const keepsTheOff = isKeptOffForTheMacApp(request, paths, machine);
+  if (nothingIsTurnedOn(paths, machine)) {
+    if (!request.dryRun && !keepsTheOff && machine.exists(paths.launcherDirectory)) machine.remove(paths.launcherDirectory);
+    return "absent";
+  }
+  if (isKeptOnForTheMacApp(request, paths, machine)) return "kept_for_the_mac_app";
   if (request.dryRun) return "removed";
   turnCodexAppCardsOff(paths, machine);
   machine.remove(paths.launcherDirectory);
+  if (keepsTheOff) rememberCodexAppCardsWereTurnedOff(paths, machine);
   return "removed";
 };
 var launchctl = (args) => execFileSync(LAUNCHCTL, [...args], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
@@ -169,6 +197,7 @@ var fileContents = (path) => {
   }
 };
 var thisMacsCodexAppCardsMachine = () => ({
+  codexApp: codexAppOnThisMac,
   launchVariable: () => launchctlIgnoringFailure(["getenv", CODEX_APP_LAUNCH_VARIABLE]).trim(),
   setLaunchVariable: (value) => {
     launchctl(["setenv", CODEX_APP_LAUNCH_VARIABLE, value]);
@@ -192,7 +221,9 @@ var thisMacsCodexAppCardsMachine = () => ({
   }
 });
 var removeCodexAppCardsFromThisMac = (request) => removeCodexAppCards(request, thisMacsCodexAppCardsMachine());
-var USAGE = "Usage: pushary codex --app-cards on [path/to/Codex.app] | off | status";
+var codexAppCardsFolderStaysOnThisMac = (request) => codexAppCardsFolderStays(request, 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.";
 var TURN_THEM_ON_AGAIN = "Run the same command with on to repair it.";
 var runsFromATemporaryFolder = (entry) => entry.some((part) => part.includes(TEMPORARY_NPX_FOLDER));
@@ -220,17 +251,22 @@ var codexAppCardsCommand = async (args, entry, readAccount, machine, say) => {
   const uid = process.getuid?.();
   if (uid === void 0) throw new Error("Codex app cards need macOS");
   const paths = codexAppCardsPaths(homedir(), uid);
+  if (action === "status" && chosenApp === AS_JSON && rest.length === 0) {
+    say(JSON.stringify(codexAppCardsReport(paths, machine)));
+    return 0;
+  }
   if (action === "status" && chosenApp === void 0) {
     say(codexAppCardsStatusLine(codexAppCardsStatus(paths, machine)));
     return 0;
   }
   if (action === "off" && chosenApp === void 0) {
     const turnedOff = turnCodexAppCardsOff(paths, machine);
+    if (!isTheMacAppsHelper(entry)) rememberCodexAppCardsWereTurnedOff(paths, machine);
     say(turnedOff.wasOn ? `Codex app cards are off. ${TAKES_EFFECT_AFTER_REOPENING}` : "Codex app cards were already off.");
     if (turnedOff.launchLeftToAnotherProgram) say(ownedByAnotherProgram(turnedOff.launchLeftToAnotherProgram));
     return 0;
   }
-  if (action !== "on" || rest.length > 0) throw new Error(USAGE);
+  if (action !== "on" || rest.length > 0 || chosenApp?.startsWith("--")) throw new Error(USAGE);
   if (!await readAccount()) throw new Error("Connect Pushary before turning Codex app cards on");
   const app = installedCodexApp(chosenApp);
   const engine = await desktopEngine(app);
@@ -262,8 +298,12 @@ export {
   codexAppCardsStatus,
   turnCodexAppCardsOn,
   turnCodexAppCardsOff,
+  rememberCodexAppCardsWereTurnedOff,
+  codexAppCardsReport,
+  codexAppCardsFolderStays,
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
+  codexAppCardsFolderStaysOnThisMac,
   runsFromATemporaryFolder,
   codexAppCardsStatusLine,
   codexAppCardsCommand,

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

@@ -3,20 +3,24 @@ import {
   CODEX_APP_CARDS_LOGIN_ITEM,
   codexAppCardsCommand,
   codexAppCardsCommandOnThisMac,
+  codexAppCardsFolderStays,
+  codexAppCardsFolderStaysOnThisMac,
   codexAppCardsInstallation,
   codexAppCardsLoginItem,
   codexAppCardsLoginScript,
   codexAppCardsPaths,
   codexAppCardsReceiptFrom,
+  codexAppCardsReport,
   codexAppCardsStatus,
   codexAppCardsStatusLine,
+  rememberCodexAppCardsWereTurnedOff,
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
   runsFromATemporaryFolder,
   turnCodexAppCardsOff,
   turnCodexAppCardsOn
-} from "./chunk-OHSHDQZF.js";
-import "./chunk-DMJFW4KL.js";
+} from "./chunk-SUIB4O3S.js";
+import "./chunk-ABGN5RN2.js";
 import "./chunk-XCEN33UP.js";
 import "./chunk-QCGNGEGE.js";
 import "./chunk-BL3WAGIK.js";
@@ -37,13 +41,17 @@ export {
   CODEX_APP_CARDS_LOGIN_ITEM,
   codexAppCardsCommand,
   codexAppCardsCommandOnThisMac,
+  codexAppCardsFolderStays,
+  codexAppCardsFolderStaysOnThisMac,
   codexAppCardsInstallation,
   codexAppCardsLoginItem,
   codexAppCardsLoginScript,
   codexAppCardsPaths,
   codexAppCardsReceiptFrom,
+  codexAppCardsReport,
   codexAppCardsStatus,
   codexAppCardsStatusLine,
+  rememberCodexAppCardsWereTurnedOff,
   removeCodexAppCards,
   removeCodexAppCardsFromThisMac,
   runsFromATemporaryFolder,

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

@@ -1,26 +1,30 @@
 import {
+  codexAppOnThisMac,
   codexDesktopCommand,
   codexEngineBehindLauncher,
   codexPassThroughScript,
   desktopEngine,
   desktopEngineFromManifest,
   desktopProxyScript,
+  everyProgramFileIsThere,
   installedCodexApp,
   shellQuoted,
   writeDesktopProxy
-} from "./chunk-DMJFW4KL.js";
+} from "./chunk-ABGN5RN2.js";
 import "./chunk-XCEN33UP.js";
 import {
   CODEX_APP_LAUNCH_VARIABLE
 } from "./chunk-36NGFHE4.js";
 export {
   CODEX_APP_LAUNCH_VARIABLE,
+  codexAppOnThisMac,
   codexDesktopCommand,
   codexEngineBehindLauncher,
   codexPassThroughScript,
   desktopEngine,
   desktopEngineFromManifest,
   desktopProxyScript,
+  everyProgramFileIsThere,
   installedCodexApp,
   shellQuoted,
   writeDesktopProxy

package/package.json

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