@phnx-labs/agents-cli 1.14.6 → 1.15.0

package/dist/lib/usage.js

@@ -15,6 +15,7 @@ import * as readline from 'readline';
 import { promisify } from 'util';
 import chalk from 'chalk';
 import { walkForFiles } from './fs-walk.js';
+import { getKeychainToken, setKeychainToken, deleteKeychainToken, } from './secrets/index.js';
 import { getAgentsDir } from './state.js';
 const execFileAsync = promisify(execFile);
 const CLAUDE_USAGE_URL = 'https://api.anthropic.com/api/oauth/usage';
@@ -343,27 +344,15 @@ function normalizeClaudeWindow(window, key, label, shortLabel) {
         windowMinutes: inferWindowMinutes(key),
     };
 }
-let warnedNonDarwin = false;
-/** Load Claude OAuth credentials from the macOS Keychain. */
+/** Load Claude OAuth credentials from the system keychain/keyring. */
 export async function loadClaudeOauth(home) {
-    if (process.platform !== 'darwin') {
-        if (!warnedNonDarwin && process.stderr.isTTY) {
-            process.stderr.write('[agents] Usage tracking requires macOS Keychain. Skipped on this platform.\n');
-            warnedNonDarwin = true;
-        }
+    // Windows not yet supported
+    if (process.platform !== 'darwin' && process.platform !== 'linux') {
         return null;
     }
     try {
-        const account = os.userInfo().username;
-        const { stdout } = await execFileAsync('security', [
-            'find-generic-password',
-            '-a',
-            account,
-            '-s',
-            // Managed Claude homes must stay pinned to their own service name.
-            getClaudeKeychainService(home),
-            '-w',
-        ]);
+        const service = getClaudeKeychainService(home);
+        const stdout = getKeychainToken(service);
         const payload = JSON.parse(stdout.trim());
         if (typeof payload?.claudeAiOauth?.accessToken !== 'string')
             return null;
@@ -380,27 +369,20 @@ export async function loadClaudeOauth(home) {
     }
 }
 /**
- * Save Claude OAuth credentials to the macOS Keychain.
+ * Save Claude OAuth credentials to the system keychain/keyring.
  * Reads the existing payload, merges the new OAuth fields, and writes back.
  */
 async function saveClaudeOauth(home, credentials) {
-    if (process.platform !== 'darwin') {
+    // Windows not yet supported
+    if (process.platform !== 'darwin' && process.platform !== 'linux') {
         return false;
     }
     try {
-        const account = os.userInfo().username;
         const service = getClaudeKeychainService(home);
         // Read existing payload to preserve other fields
         let existingPayload = {};
         try {
-            const { stdout } = await execFileAsync('security', [
-                'find-generic-password',
-                '-a',
-                account,
-                '-s',
-                service,
-                '-w',
-            ]);
+            const stdout = getKeychainToken(service);
             existingPayload = JSON.parse(stdout.trim());
         }
         catch {
@@ -418,29 +400,14 @@ async function saveClaudeOauth(home, credentials) {
             },
         };
         const payloadJson = JSON.stringify(newPayload);
-        // Delete existing entry first (security add-generic-password -U can fail)
+        // Delete existing entry first, then add updated entry
         try {
-            await execFileAsync('security', [
-                'delete-generic-password',
-                '-a',
-                account,
-                '-s',
-                service,
-            ]);
+            deleteKeychainToken(service);
         }
         catch {
             // Entry might not exist, ignore
         }
-        // Add updated entry
-        await execFileAsync('security', [
-            'add-generic-password',
-            '-a',
-            account,
-            '-s',
-            service,
-            '-w',
-            payloadJson,
-        ]);
+        setKeychainToken(service, payloadJson);
         return true;
     }
     catch {

package/dist/lib/versions.js

@@ -37,6 +37,7 @@ import { discoverPlugins, syncPluginToVersion, isPluginSynced, pluginSupportsAge
 import { composeRulesFromState } from './rules/compose.js';
 import { loadSyncManifest, saveSyncManifest, buildManifest, isSyncStale } from './sync-manifest.js';
 import { PLUGINS_CAPABLE_AGENTS } from './agents.js';
+import { emit } from './events.js';
 import { safeJoin } from './paths.js';
 import { installCommandSkillToVersion, listCommandSkillsInVersion, shouldInstallCommandAsSkill } from './command-skills.js';
 /** Promisified exec for running shell commands. */
@@ -909,6 +910,7 @@ export function setGlobalDefault(agent, version) {
     }
     else {
         meta.agents[agent] = version;
+        emit('version.switch', { agent, version });
     }
     writeMeta(meta);
 }
@@ -943,6 +945,17 @@ export async function installVersion(agent, version, onProgress) {
         throw new Error(`Invalid version: ${JSON.stringify(version)}`);
     }
     try {
+        // Check npm is available
+        try {
+            await execFileAsync('which', ['npm']);
+        }
+        catch {
+            return {
+                success: false,
+                installedVersion: version,
+                error: 'npm is not installed. Install Node.js and npm first: https://nodejs.org/',
+            };
+        }
         onProgress?.(`Installing ${packageSpec}...`);
         const { stdout } = await execFileAsync('npm', ['install', packageSpec], { cwd: versionDir });
         // Determine the actual installed version
@@ -989,6 +1002,7 @@ export async function installVersion(agent, version, onProgress) {
                 /* non-fatal; the install itself succeeded */
             }
         }
+        emit('version.install', { agent, version: installedVersion });
         return { success: true, installedVersion };
     }
     catch (err) {
@@ -997,6 +1011,7 @@ export async function installVersion(agent, version, onProgress) {
         if (fs.existsSync(versionDir)) {
             removeInstallArtifacts(versionDir);
         }
+        emit('version.install', { agent, version, error: err.message });
         return { success: false, installedVersion: version, error: err.message };
     }
 }
@@ -1086,6 +1101,7 @@ export function removeVersion(agent, version) {
             // Ignore if already gone
         }
     }
+    emit('version.remove', { agent, version });
     return true;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.14.6",
+  "version": "1.15.0",
   "description": "One CLI for all your AI coding agents - versions, config, cloud dispatch, sessions, and teams",
   "type": "module",
   "main": "dist/index.js",

package/scripts/postinstall.js

@@ -13,8 +13,15 @@ const SHIMS_DIR = path.join(HOME, '.agents-system', 'shims');
 const SYSTEM_DIR = path.join(HOME, '.agents-system');
 const USER_DIR = path.join(HOME, '.agents');
 
-// Only run for global installs
-if (!process.env.npm_config_global && !process.argv.includes('-g')) {
+// For local installs, create directories and show a message
+const isGlobalInstall = process.env.npm_config_global || process.argv.includes('-g');
+if (!isGlobalInstall) {
+  // Still create user directories for local installs
+  fs.mkdirSync(USER_DIR, { recursive: true, mode: 0o700 });
+  console.log(`
+agents-cli installed locally.
+To complete setup, run: npx agents init
+`);
   process.exit(0);
 }
 
@@ -165,17 +172,38 @@ async function main() {
     return;
   }
 
-  // Default: print PATH instructions, then offer aliases interactively.
-  console.log(`
-agents-cli installed.
-To enable version-aware shims, add the following line to your shell config:
+  // Default: offer to auto-add shims to PATH (like homebrew does)
+  const rcFile = getShellRc();
+  let alreadyConfigured = false;
+  if (fs.existsSync(rcFile)) {
+    const content = fs.readFileSync(rcFile, 'utf-8');
+    alreadyConfigured = content.includes('.agents-system/shims');
+  }
 
-  ${exportLine}
+  console.log(`\nagents-cli installed.`);
 
-(zsh: ~/.zshrc, bash: ~/.bashrc, fish: ~/.config/fish/config.fish)
+  if (!alreadyConfigured && process.stdin.isTTY && process.stdout.isTTY) {
+    const answer = await ask(`\nAdd shims to PATH in ~/${path.basename(rcFile)}? [Y/n] `);
+    if (answer === '' || answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+      const addition = `\n# agents-cli: version switching for AI coding agents\n${exportLine}\n`;
+      fs.mkdirSync(path.dirname(rcFile), { recursive: true });
+      fs.appendFileSync(rcFile, addition);
+      console.log(`\n  Added ${SHIMS_DIR} to PATH in ${path.basename(rcFile)}`);
+      console.log(`  Restart your shell or run: source ~/${path.basename(rcFile)}\n`);
+    } else {
+      console.log(`
+To enable version-aware shims, add this to your shell config:
 
-Or re-run with AGENTS_INIT_SHELL=1 to have the installer add it for you.
+  ${exportLine}
 `);
+    }
+  } else if (!alreadyConfigured) {
+    console.log(`
+To enable version-aware shims, add this to your shell config:
+
+  ${exportLine}
+`);
+  }
 
   const choice = await promptForAliases();
   if (choice === 'install') {