@assethub/cli 0.1.31 → 0.1.33

package/dist/setupCommand.js

@@ -4,7 +4,7 @@ import { access, copyFile, mkdir, readFile, stat, writeFile } from 'node:fs/prom
 import { homedir } from 'node:os';
 import { delimiter, dirname, join } from 'node:path';
 import { API_KEY_ENV, launchAgentPath, launchAgentPlist, loadKeyIntoLaunchd, readLaunchdKey } from './appEnv.js';
-import { SESSION_SAVE_DISCLOSURE } from './hooks/install.js';
+import { hookScopeError, sessionSaveDisclosure } from './hooks/install.js';
 import { mcpConfig } from './setup.js';
 export const redactKey = (key) => `ah_…${key.slice(-4)}`;
 const scrub = (text, key) => key ? text.split(key).join(redactKey(key)) : text;
@@ -116,6 +116,28 @@ export const runSetup = async (options, deps) => {
     const say = (line) => deps.log(line);
     const wantClaude = options.client !== 'codex';
     const wantCodex = options.client !== 'claude';
+    const hookClients = [...(wantClaude ? ['claude'] : []), ...(wantCodex ? ['codex'] : [])];
+    const hookNames = hookClients.map(client => (client === 'claude' ? 'Claude Code' : 'Codex')).join(' and ');
+    let hookRefusal;
+    for (const client of hookClients) {
+        const refused = await hookScopeError(deps.home, { projectDir: deps.cwd }, client, deps.codexHome);
+        if (refused) {
+            hookRefusal = `${client}: ${refused}`;
+            break;
+        }
+    }
+    // 0. --save-sessions asks for something the home folder cannot have, so stop
+    // before login, MCP or app-env changes rather than half-applying setup.
+    if (hookRefusal && options.saveSessions && !options.noHook) {
+        return {
+            ok: false,
+            dryRun: options.dryRun,
+            profile: '',
+            baseUrl: '',
+            steps: [{ name: 'hook', status: 'fail', detail: hookRefusal }],
+            nextStep: 'Run `assethub setup --save-sessions` inside the project folder whose sessions should be saved, or run it without --save-sessions.',
+        };
+    }
     // 1. Login (reuses the existing `auth login` path through deps.login)
     const explicitKey = options.apiKeySource === 'flag' ? options.apiKey : undefined;
     const hadKey = explicitKey ? false : await deps.hasWorkingKey();
@@ -300,51 +322,63 @@ export const runSetup = async (options, deps) => {
     else if (options.noHook) {
         steps.push({ name: 'hook', status: 'skip', detail: 'skipped (--no-hook)' });
     }
-    else if (!wantClaude) {
-        steps.push({ name: 'hook', status: 'skip', detail: 'Codex session saving is not supported yet' });
+    else if (hookRefusal) {
+        // Not offered: the dry run and the question would promise an install the guard refuses.
+        steps.push({ name: 'hook', status: 'skip', detail: hookRefusal });
     }
     else if (options.dryRun) {
         steps.push({
             name: 'hook',
             status: 'skip',
             detail: options.saveSessions
-                ? 'would install the session-saving hooks (dry run)'
+                ? `would install the ${hookNames} session-saving hooks for ${deps.cwd} only (dry run)`
                 : 'would leave session saving off (enable with --save-sessions)',
         });
     }
     else {
+        const hookScope = { projectDir: deps.cwd };
         let consent = options.saveSessions;
+        const disclose = () => {
+            for (const client of hookClients)
+                say(sessionSaveDisclosure(hookScope, client));
+        };
         if (!consent && deps.interactive && !options.yes) {
-            say(SESSION_SAVE_DISCLOSURE);
-            consent = await deps.confirmOptIn('Save and upload your Claude Code sessions?');
+            disclose();
+            consent = await deps.confirmOptIn(`Save and upload your ${hookNames} sessions?`);
         }
         if (!consent) {
             steps.push({
                 name: 'hook',
                 status: 'skip',
-                detail: 'session saving is off; enable it with `assethub setup --save-sessions` or `assethub hooks install --client claude`',
+                detail: `session saving is off; enable it with \`assethub setup --save-sessions\`, or ${hookClients.map(client => `\`assethub hooks install --client ${client}\``).join(' and ')} inside the project folder`,
             });
         }
         else {
             if (options.saveSessions)
-                say(SESSION_SAVE_DISCLOSURE);
+                disclose();
             const pathNote = (await deps.findBinary('assethub'))
                 ? ''
                 : ' Note: the hooks run `assethub`, which is not on PATH; install the CLI globally.';
-            try {
-                const result = await deps.installHooks({ client: 'claude' });
-                steps.push({
-                    name: 'hook',
-                    status: result.installed ? 'ok' : 'fail',
-                    detail: `claude: ${result.detail}${result.installed ? pathNote : ''}`,
-                });
-            }
-            catch (error) {
-                steps.push({
-                    name: 'hook',
-                    status: 'fail',
-                    detail: `claude: ${scrub(error instanceof Error ? error.message : String(error), key)}`,
-                });
+            for (const client of hookClients) {
+                try {
+                    const result = await deps.installHooks({
+                        client,
+                        ...hookScope,
+                        ...(client === 'codex' ? { codexHome: deps.codexHome } : {}),
+                    });
+                    steps.push({
+                        name: 'hook',
+                        status: result.installed ? 'ok' : 'fail',
+                        detail: `${client}: ${result.detail}${result.installed ? pathNote : ''}`,
+                    });
+                }
+                catch (error) {
+                    steps.push({
+                        name: 'hook',
+                        status: 'fail',
+                        detail: `${client}: ${scrub(error instanceof Error ? error.message : String(error), key)}`,
+                    });
+                }
             }
         }
     }
@@ -459,6 +493,7 @@ export const runProcess = (file, args) => new Promise(done => {
 export const defaultFileDeps = () => ({
     platform: process.platform,
     home: homedir(),
+    cwd: process.cwd(),
     codexHome: process.env.CODEX_HOME?.trim() || join(homedir(), '.codex'),
     now: () => new Date(),
     findBinary: (name) => findOnPath(name),

package/dist/setupHooksBridge.d.ts

@@ -1,5 +1,9 @@
 export type InstallHooks = (opts: {
     client: 'claude' | 'codex';
+    /** The project folder whose .claude/settings.local.json or .codex/hooks.json gets the hooks. */
+    projectDir?: string;
+    /** Codex's user folder ($CODEX_HOME), where Codex records which projects are trusted. */
+    codexHome?: string;
 }) => Promise<{
     installed: boolean;
     detail: string;

package/dist/setupHooksBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupHooksBridge.d.ts","sourceRoot":"","sources":["../src/setupHooksBridge.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE;IAChC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAA;CAC3B,KAAK,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAAA;AAEnD,eAAO,MAAM,mBAAmB,EAAE,YAGhC,CAAA"}
+{"version":3,"file":"setupHooksBridge.d.ts","sourceRoot":"","sources":["../src/setupHooksBridge.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE;IAChC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC1B,gGAAgG;IAChG,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,yFAAyF;IACzF,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,KAAK,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAAA;AAEnD,eAAO,MAAM,mBAAmB,EAAE,YAGhC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assethub/cli",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Command line interface for AssetHub.",
   "type": "module",
   "bin": {