pendingyou 0.12.0 → 0.14.0

package/dist/apps/claude-code.js

@@ -1,17 +1,4 @@
-// Claude Code (0.11.0's module of what claude.ts carries out): what `pendingyou init` decides before anyone signs in,
-// what it does after, `status`'s section and the lines init ends with.
-//
-// Its MCP server signs in through this computer's own connection ("Claude Code on devbox"), by the headers helper, on
-// every computer but Windows (where Claude Code runs a headersHelper through cmd) or with `--oauth`; the hooks use the
-// same connection, so one approval covers both. A pendingyou server that's there decides the rest, before signing in:
-// - ours, through the helper, at this Pending You: kept.
-// - one at this Pending You that signs in by itself (Claude Code's own /mcp → Authenticate), or no server beside an
-//   enabled Pending You plugin for it (whose server is OAuth): with no browser here it's switched without a word (as
-//   0.10.0 did: that sign-in can't finish here); at a terminal init asks, Yes by default; `--yes` switches; with nobody
-//   to ask it's kept, and init says how to switch. Kept, Claude Code signs in by itself and the hooks get a sign-in
-//   that only hears; kept beside the plugin, no skill is saved either: the plugin carries it.
-// - one at another Pending You: replaced once the person says so (or `--yes`), or else Claude Code is left alone.
-import { addCommand, claudeState, helperServer, installClaude, mcpFromClaude, mcpFromFile, PLUGIN_ORIGINS, pluginFor, readManifest, removeCommand, sameUrl, uninstallClaude, } from "../claude.js";
+import { addCommand, claudeState, helperServer, installClaude, mcpFromClaude, mcpFromFile, PLUGIN_ORIGINS, permissionBlocker, pluginFor, readManifest, removeCommand, sameUrl, uninstallClaude, } from "../claude.js";
 import { connectionMachine, readCredential } from "../credentials.js";
 import { differs, serverForFolder, siteOf } from "../environment.js";
 import { originArgs } from "../hooks.js";
@@ -21,12 +8,7 @@ import { connectionTitle, FINISH_SAY, setupOf, setupStatus } from "../setup.js";
 import { shimPath } from "../shim.js";
 import { APP_NAMES } from "./ids.js";
 const NAME = APP_NAMES['claude-code'];
-/** The sentence's lead-in, and what restarting means, in init's last lines. */
 const RESTART = 'restart Claude Code here (/exit, then claude --continue), or start it in the folder you work in';
-/**
- * Whether to move a server that signs in by itself to this computer's sign-in: without a word where there's no
- * browser, `--yes`, or Yes (the default) at a terminal; kept, with nobody to ask.
- */
 async function switches(io, ctx, what) {
     if (ctx.headless || ctx.yes)
         return true;
@@ -36,7 +18,6 @@ async function switches(io, ctx, what) {
     const answer = await io.ask('Switch Claude Code to this computer’s sign-in? [Y/n] ');
     return !/^\s*no?\s*$/i.test(answer);
 }
-/** The plan for a server at another Pending You: replaced once the person says so, or Claude Code left alone. */
 async function replaces(io, ctx, server, url) {
     ctx.progress(`Claude Code’s pendingyou MCP server points at ${server.url}, not ${url}.\n`);
     if (ctx.yes)
@@ -92,7 +73,6 @@ export const claudeCode = {
             };
         }
         else if (server?.url && !sameUrl(server.url, url)) {
-            // Another Pending You (staging, when production was asked for): asked before anyone signs in.
             if (!(await replaces(io, ctx, server, url))) {
                 const commands = `  ${removeCommand(server.scope)}\n    ${add}`;
                 return {
@@ -123,7 +103,6 @@ export const claudeCode = {
             else if (ours)
                 plan = { action: 'switch', server };
             else if (server.helper) {
-                // Someone else's headersHelper: theirs to change. The hooks hear through a sign-in of their own.
                 mode = 'oauth';
                 plan = helperMode
                     ? {
@@ -152,7 +131,6 @@ export const claudeCode = {
             }
         }
         else if (plugin) {
-            // No server added by hand, so the Pending You plugin's is Claude Code's: one added by hand would win over it.
             if (helperMode &&
                 (await switches(io, ctx, 'The Pending You plugin signs Claude Code in to Pending You by itself here.')))
                 plan = { action: 'add', plugin: true };
@@ -185,6 +163,7 @@ export const claudeCode = {
                 hookLine: ictx.hookLine,
                 report: ictx.report,
                 progress: ictx.progress,
+                ...(ctx.permissionCards === undefined ? {} : { permissionCards: ctx.permissionCards }),
             }),
             next: (ictx) => {
                 if (mode === 'oauth') {
@@ -223,7 +202,19 @@ export const claudeCode = {
         return claudeStatus(io, ctx);
     },
 };
-/** Claude Code's section of `pendingyou status`: what's set up and what's missing, each with the command that fixes it. */
+function permissionLine(io, claude, manifest, helper, flag) {
+    const label = 'Permission prompts:';
+    if (claude.permission)
+        return `  ok      ${label} a card when Claude Code waits for your OK`;
+    if (manifest?.permissionCards === false)
+        return `          ${label} off, as you chose; for a card when Claude Code waits for your OK, run npx pendingyou init --permission-cards${flag}`;
+    const blocker = claude.claude
+        ? permissionBlocker(io, claude.claude, helper ? 'helper' : 'oauth')
+        : null;
+    return blocker
+        ? `          ${label} no card when Claude Code waits for your OK: ${blocker}`
+        : `  missing ${label} no card when Claude Code waits for your OK; run npx pendingyou@latest init${flag}`;
+}
 async function claudeStatus(io, ctx) {
     const { origin, signIn } = ctx;
     const [claude, here, manifest] = await Promise.all([
@@ -234,8 +225,6 @@ async function claudeStatus(io, ctx) {
     const credential = await readCredential(io, origin);
     const flag = originArgs(origin);
     const mcp = claude.mcp;
-    // Through the helper (this computer's own sign-in): Claude Code's server runs ours, init set it up so, or nothing is
-    // set up yet and init would (everywhere but Windows).
     const helped = usesHelper(mcp, origin);
     const helper = io.platform !== 'win32' &&
         (helped ||
@@ -249,7 +238,6 @@ async function claudeStatus(io, ctx) {
     const url = `${origin}/mcp`;
     const plugin = claude.plugins.find((id) => siteOf(PLUGIN_ORIGINS[id] ?? '') === siteOf(origin));
     const sameServer = mcp !== false && mcp !== 'unknown' && (!mcp.url || mcp.url.replace(/\/+$/, '') === url);
-    // The plugin's server is Claude Code's when nobody added one by hand.
     const pluginServer = mcp === false && Boolean(plugin);
     const mcpOk = helper ? sameServer && helped : sameServer || pluginServer;
     const mcpText = mcp === 'unknown'
@@ -269,7 +257,6 @@ async function claudeStatus(io, ctx) {
                                 : `pendingyou (${mcp.url}) signs in through a browser${why ? ', which can’t finish on this computer' : ''}; run npx pendingyou init${flag}`;
     const form = claude.form;
     const hooksRun = form?.runs ?? true;
-    // The wake mod (0.10.0): Claude Code 2.1.287 or later loads it from the plugin or from CLAUDE_CODE_PLUGIN_DIRS.
     const mod = claude.mod;
     const modOk = mod.loads && (mod.plugin || mod.present);
     const modText = !claude.claude
@@ -293,9 +280,7 @@ async function claudeStatus(io, ctx) {
             : form.form === 'npx'
                 ? `they run through npx${via}, which is slower; run npx pendingyou@latest init${flag} to run them directly`
                 : 'they run pendingyou from PATH or a file of your own';
-    // login makes a connection only once Claude Code's server signs in through the helper; init does both.
     const fix = `npx pendingyou ${helped ? 'login' : 'init'}${flag}`;
-    // The connection's name as Pending You has it, so status never drifts from it; else this computer's own record.
     const title = signIn.state === 'ok' && signIn.for
         ? connectionTitle(signIn.for)
         : `${NAME} on ${(await connectionMachine(io, origin)) ?? (machineOf(io.host) || 'this computer')}`;
@@ -320,7 +305,6 @@ async function claudeStatus(io, ctx) {
                 : signIn.state === 'none'
                     ? `not signed in; run npx pendingyou login${flag}`
                     : 'Pending You couldn’t be reached';
-    // The helper as Claude Code runs it at its barest: found Node, and runs pendingyou's copy.
     const check = helper ? await checkHelper(io, origin) : null;
     const skillOk = claude.skill || Boolean(plugin);
     const skillText = claude.skill
@@ -338,18 +322,14 @@ async function claudeStatus(io, ctx) {
         ? [
             `  ok      Plugin: ${plugin} is enabled${pluginServer ? '' : mcp !== false && mcp !== 'unknown' ? '; Claude Code uses the server added by hand instead of its own' : ''}`,
         ]
-        : []), `  ${mark(skillOk)} Skill: ${skillText}`, `  ${mark(claude.hooks && hooksRun)} Hooks: ${claude.hooks ? `session-start pickup and next-message hand-off; ${formText}` : `not installed; run npx pendingyou init${flag}`}`, `  ${mark(claude.stopcheck)} Stop check: ${claude.stopcheck ? 'asks Claude Code to post what it leaves you in chat' : `not installed; run npx pendingyou init${flag}`}`, `  ${mark(modOk)} Wake mod: ${modText}`);
-    // How setup stands on Pending You (from servers that say): never a reason it isn't Ready.
+        : []), `  ${mark(skillOk)} Skill: ${skillText}`, `  ${mark(claude.hooks && hooksRun)} Hooks: ${claude.hooks ? `session-start pickup and next-message hand-off; ${formText}` : `not installed; run npx pendingyou init${flag}`}`, `  ${mark(claude.stopcheck)} Stop check: ${claude.stopcheck ? 'asks Claude Code to post what it leaves you in chat' : `not installed; run npx pendingyou init${flag}`}`, `  ${mark(modOk)} Wake mod: ${modText}`, permissionLine(io, claude, manifest, helper, flag));
     const setup = setupStatus(NAME, signIn.state === 'ok' ? setupOf(signIn.for) : null);
     if (setup)
         lines.push(`  ${setup === 'finished' ? 'ok     ' : '       '} Setup: ${setup}`);
-    // A folder's own server (local or project scope) wins over the user one in Claude Code: say when it's elsewhere. (The
-    // plugin's server counts only when no server was added by hand, and is production's.)
     if (here && (here.scope === 'local' || here.scope === 'project') && differs(here, origin))
         lines.push(`  ${mark(false)} This folder: its ${here.scope}-scope pendingyou MCP server (${here.url}) is another Pending You than ${origin}; Claude Code uses it here instead`);
     const user = mcp !== false && mcp !== 'unknown' && mcp.url ? { url: mcp.url, scope: 'user' } : null;
     const other = differs(here, origin) ? here : differs(user, origin) ? user : null;
-    // Through the helper, Claude Code reaches Pending You only with the helper, the connection and the server together.
     const reaches = !helper || (signOk && mcpOk && check?.ok === true);
     const ready = reaches && signIn.state === 'ok' && claude.hooks && hooksRun && !other;
     if (other)

package/dist/apps/codex-app.js

@@ -0,0 +1,26 @@
+import { stat } from 'node:fs/promises';
+import { join } from 'node:path';
+const APP_NAMES = ['ChatGPT.app', 'Codex.app'];
+export function appCodexPaths(home, system = '/Applications') {
+    return [system, join(home, 'Applications')].flatMap((root) => APP_NAMES.flatMap((name) => {
+        const cli = join(root, name, 'Contents', 'Resources', 'codex-cli');
+        return [join(cli, 'bin', 'codex'), join(cli, 'CodexCLI.app', 'Contents', 'MacOS', 'codex')];
+    }));
+}
+const versionOf = (stdout) => /(\d+\.\d+\.\d+)/.exec(stdout)?.[1] ?? 'installed';
+const executable = (path) => stat(path).then((info) => info.isFile() && (info.mode & 0o111) !== 0, () => false);
+export async function findCodex(io, paths = appCodexPaths(io.home, io.env.PENDINGYOU_APPLICATIONS_DIR || undefined)) {
+    const onPath = await io.run('codex', ['--version'], 20_000);
+    if (onPath.code === 0)
+        return { command: 'codex', version: versionOf(onPath.stdout), app: false };
+    if (io.platform !== 'darwin')
+        return null;
+    for (const path of paths) {
+        if (!(await executable(path)))
+            continue;
+        const result = await io.run(path, ['--version'], 20_000);
+        if (result.code === 0)
+            return { command: path, version: versionOf(result.stdout), app: true };
+    }
+    return null;
+}