ultraclaude-agent 0.0.19 → 0.0.21

package/src/cli.ts

@@ -23,6 +23,16 @@ import { startDaemon, forkDaemon, getDaemonStatus } from './daemon.js';
 import { installService, isServiceInstalled, getServiceType } from './service.js';
 import { initialSync, createSnapshot as createSnapshotOnServer } from './sync.js';
 import { startRepl } from './repl.js';
+import {
+  listProfiles,
+  switchProfile,
+  loginProfile,
+  saveCurrentAsProfile,
+  deleteProfileByName,
+  getClaudeStatus,
+  getExpiryStatus,
+  loadActiveProfile,
+} from './claude-profiles.js';
 import { logger, initMultistreamLogger } from './logger.js';
 import type { AgentCredentials } from '@ultra-claude/shared';
 
@@ -506,4 +516,111 @@ program
 
 // unlink removed — projects are auto-discovered from ~/.claude/projects/
 
+// --- claude-profile ---
+
+const claudeProfile = program
+  .command('claude-profile')
+  .description('Manage Claude Code credential profiles');
+
+claudeProfile
+  .command('list')
+  .description('List all saved Claude credential profiles')
+  .action(async () => {
+    const profiles = await listProfiles();
+    if (profiles.length === 0) {
+      console.log('No saved Claude profiles.');
+      return;
+    }
+
+    const active = await loadActiveProfile();
+
+    console.log('');
+    console.log(
+      '  ' +
+      'Name'.padEnd(16) +
+      'Email'.padEnd(30) +
+      'Org'.padEnd(16) +
+      'Subscription'.padEnd(14) +
+      'Active'.padEnd(8) +
+      'Token',
+    );
+    console.log('  ' + '-'.repeat(90));
+
+    for (const profile of profiles) {
+      const isActive = active?.profile === profile.name;
+      const expiry = getExpiryStatus(profile);
+      console.log(
+        '  ' +
+        profile.name.padEnd(16) +
+        profile.email.padEnd(30) +
+        (profile.orgName || '-').padEnd(16) +
+        (profile.subscriptionType || '-').padEnd(14) +
+        (isActive ? '*' : '').padEnd(8) +
+        expiry.label,
+      );
+    }
+    console.log('');
+  });
+
+claudeProfile
+  .command('switch')
+  .argument('<name>', 'Profile name to switch to')
+  .description('Switch to a saved Claude credential profile')
+  .action(async (name: string) => {
+    const result = await switchProfile(name);
+    console.log(result.message);
+    process.exitCode = result.success ? 0 : 1;
+  });
+
+claudeProfile
+  .command('login')
+  .argument('<name>', 'Profile name to save as')
+  .option('--email <email>', 'Pre-populate login email')
+  .description('Open browser login and save as named profile')
+  .action(async (name: string, options: { email?: string }) => {
+    const result = await loginProfile(name, options.email);
+    console.log(result.message);
+    process.exitCode = result.success ? 0 : 1;
+  });
+
+claudeProfile
+  .command('save')
+  .argument('<name>', 'Profile name')
+  .description('Save current credentials as a named profile')
+  .action(async (name: string) => {
+    const result = await saveCurrentAsProfile(name);
+    console.log(result.message);
+    process.exitCode = result.success ? 0 : 1;
+  });
+
+claudeProfile
+  .command('delete')
+  .argument('<name>', 'Profile name to delete')
+  .description('Delete a saved credential profile')
+  .action(async (name: string) => {
+    const result = await deleteProfileByName(name);
+    if (result.wasActive) {
+      console.log(`Warning: "${name}" was the active profile.`);
+    }
+    console.log(result.message);
+    process.exitCode = result.success ? 0 : 1;
+  });
+
+claudeProfile
+  .command('status')
+  .description('Show current Claude auth status')
+  .action(async () => {
+    const result = await getClaudeStatus();
+    if (!result.success) {
+      console.log(result.message);
+      process.exitCode = 1;
+      return;
+    }
+    const id = result.identity!;
+    console.log(`Email:        ${id.email}`);
+    console.log(`Org:          ${id.orgName || '-'}`);
+    console.log(`Subscription: ${id.subscriptionType || '-'}`);
+    console.log(`Logged in:    ${id.loggedIn ? 'yes' : 'no'}`);
+  });
+
 await program.parseAsync(process.argv);

package/src/daemon.ts

@@ -30,6 +30,7 @@ import { startUsageWatcher, type UsageWatcher } from './usage-sync.js';
 import { startStatusLoop, readStatusFile, removeStatusFile, type StatusLoop, type StatusFileData } from './status.js';
 import { isServiceActive } from './service.js';
 import * as socketClient from './socket-client.js';
+import { CREDENTIALS_FILE, handleCredentialChange, pruneBackups } from './claude-profiles.js';
 import { logger } from './logger.js';
 import { ok, err, type Result, type AgentCredentials } from '@ultra-claude/shared';
 import type { ProjectRegistryEntry } from '@ultra-claude/shared';
@@ -92,6 +93,11 @@ let registryWatcher: ReturnType<typeof chokidar.watch> | null = null;
 let discoveryTimer: ReturnType<typeof setInterval> | null = null;
 let versionWatcherTimer: ReturnType<typeof setInterval> | null = null;
 let usageWatcher: UsageWatcher | null = null;
+interface CredentialWatcher {
+  close(): Promise<void>;
+}
+let credentialWatcher: CredentialWatcher | null = null;
+let credentialPruneTimer: ReturnType<typeof setInterval> | null = null;
 let statusLoop: StatusLoop | null = null;
 let running = false;
 let daemonStartedAt: string | null = null;
@@ -193,6 +199,19 @@ export async function startDaemon(): Promise<Result<void, StartDaemonError>> {
   // Start global usage watcher (watches ~/.claude/ultra/ for usage-status.json and accounts/)
   usageWatcher = startUsageWatcher();
 
+  // Start credential watcher for Claude Code profiles
+  credentialWatcher = startCredentialWatcher();
+
+  // Prune old credential backups on startup, then daily
+  pruneBackups().catch((pruneErr: unknown) => {
+    log.error({ err: pruneErr }, 'Initial backup prune failed');
+  });
+  credentialPruneTimer = setInterval(() => {
+    pruneBackups().catch((pruneErr: unknown) => {
+      log.error({ err: pruneErr }, 'Daily backup prune failed');
+    });
+  }, 24 * 60 * 60 * 1000);
+
   // Load initial registry and start watchers
   const registry = await loadRegistry();
   log.info({ projectCount: registry.projects.length }, 'Registry loaded');
@@ -267,6 +286,16 @@ export async function stopDaemon(): Promise<void> {
     usageWatcher = null;
   }
 
+  // Close credential watcher and prune timer
+  if (credentialWatcher) {
+    await credentialWatcher.close();
+    credentialWatcher = null;
+  }
+  if (credentialPruneTimer) {
+    clearInterval(credentialPruneTimer);
+    credentialPruneTimer = null;
+  }
+
   // Close registry watcher
   if (registryWatcher) {
     await registryWatcher.close();
@@ -694,5 +723,56 @@ function startVersionWatcher(serverUrl: string): ReturnType<typeof setInterval>
   }, 60_000);
 }
 
+// --- Credential watcher ---
+
+/**
+ * Watch ~/.claude/.credentials.json for external changes.
+ * Creates timestamped backups, identifies the account, and updates matching profiles.
+ * Self-trigger detection skips processing for switch-initiated writes.
+ * Returns a lifecycle object with close() that cancels pending debounce timers.
+ */
+function startCredentialWatcher(): CredentialWatcher {
+  const log = logger.child({ op: 'credentialWatcher' });
+
+  let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+
+  const watcher = chokidar.watch(CREDENTIALS_FILE, {
+    persistent: true,
+    ignoreInitial: true,
+    awaitWriteFinish: {
+      stabilityThreshold: 300,
+      pollInterval: 100,
+    },
+  });
+
+  watcher
+    .on('change', () => {
+      // Debounce rapid changes
+      if (debounceTimer) clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(() => {
+        debounceTimer = null;
+        handleCredentialChange().catch((changeErr: unknown) => {
+          log.error({ err: changeErr }, 'Credential change handler failed');
+        });
+      }, 500);
+    })
+    .on('error', (watcherErr) => {
+      log.error({ err: watcherErr }, 'Credential watcher error');
+    });
+
+  log.info({ path: CREDENTIALS_FILE }, 'Credential watcher started');
+
+  return {
+    async close() {
+      if (debounceTimer) {
+        clearTimeout(debounceTimer);
+        debounceTimer = null;
+      }
+      await watcher.close();
+      log.info('Credential watcher stopped');
+    },
+  };
+}
+
 /** Expose LOADED_VERSION for use by other modules (e.g., status) */
 export { LOADED_VERSION };

package/src/repl.ts

@@ -23,6 +23,17 @@ import { login } from './auth.js';
 import { stopDaemon, getDaemonStatus, isRunningInProcess, forkDaemon } from './daemon.js';
 import { isServiceInstalled } from './service.js';
 import { initialSync, createSnapshot as createSnapshotOnServer } from './sync.js';
+import {
+  listProfiles,
+  switchProfile,
+  loginProfile,
+  saveCurrentAsProfile,
+  deleteProfileByName,
+  getClaudeStatus,
+  getExpiryStatus,
+  loadActiveProfile,
+  loadProfile,
+} from './claude-profiles.js';
 import { logger } from './logger.js';
 import type { AgentCredentials, ProjectRegistryEntry } from '@ultra-claude/shared';
 
@@ -516,6 +527,130 @@ async function cmdReset(_args: string[], ctx: ReplContext): Promise<void> {
   ctx.rl.close();
 }
 
+async function cmdClaude(args: string[], _ctx: ReplContext): Promise<void> {
+  const subcmd = args[0]?.toLowerCase();
+  const subArgs = args.slice(1);
+
+  switch (subcmd) {
+    case 'list': {
+      const profiles = await listProfiles();
+      if (profiles.length === 0) {
+        console.log('No saved Claude profiles. Run "claude save <name>" or "claude login <name>" to create one.');
+        return;
+      }
+
+      const active = await loadActiveProfile();
+
+      // Table header
+      console.log('');
+      console.log(
+        '  ' +
+        'Name'.padEnd(16) +
+        'Email'.padEnd(30) +
+        'Org'.padEnd(16) +
+        'Subscription'.padEnd(14) +
+        'Active'.padEnd(8) +
+        'Token',
+      );
+      console.log('  ' + '-'.repeat(90));
+
+      for (const profile of profiles) {
+        const isActive = active?.profile === profile.name;
+        const expiry = getExpiryStatus(profile);
+        console.log(
+          '  ' +
+          profile.name.padEnd(16) +
+          profile.email.padEnd(30) +
+          (profile.orgName || '-').padEnd(16) +
+          (profile.subscriptionType || '-').padEnd(14) +
+          (isActive ? '*' : '').padEnd(8) +
+          expiry.label,
+        );
+      }
+      console.log('');
+      break;
+    }
+
+    case 'switch': {
+      const name = subArgs[0];
+      if (!name) {
+        console.log('Usage: claude switch <name>');
+        return;
+      }
+      const result = await switchProfile(name);
+      console.log(result.message);
+      break;
+    }
+
+    case 'login': {
+      const name = subArgs[0];
+      if (!name) {
+        console.log('Usage: claude login <name> [--email <email>]');
+        return;
+      }
+      const emailIdx = subArgs.indexOf('--email');
+      const email = emailIdx >= 0 ? subArgs[emailIdx + 1] : undefined;
+      const result = await loginProfile(name, email);
+      console.log(result.message);
+      break;
+    }
+
+    case 'save': {
+      const name = subArgs[0];
+      if (!name) {
+        console.log('Usage: claude save <name>');
+        return;
+      }
+      const result = await saveCurrentAsProfile(name);
+      console.log(result.message);
+      break;
+    }
+
+    case 'delete': {
+      const name = subArgs[0];
+      if (!name) {
+        console.log('Usage: claude delete <name>');
+        return;
+      }
+      const result = await deleteProfileByName(name);
+      if (result.wasActive) {
+        console.log(`Warning: "${name}" was the active profile.`);
+      }
+      console.log(result.message);
+      break;
+    }
+
+    case 'status': {
+      const result = await getClaudeStatus();
+      if (!result.success) {
+        console.log(result.message);
+        return;
+      }
+      const id = result.identity!;
+      console.log('');
+      console.log(`  Email:        ${id.email}`);
+      console.log(`  Org:          ${id.orgName || '-'}`);
+      console.log(`  Subscription: ${id.subscriptionType || '-'}`);
+      console.log(`  Logged in:    ${id.loggedIn ? 'yes' : 'no'}`);
+      console.log('');
+      break;
+    }
+
+    default: {
+      console.log(`
+Claude profile commands:
+  claude list                    Show all saved credential profiles
+  claude switch <name>           Switch to a saved profile
+  claude login <name>            Login via browser and save as profile
+  claude save <name>             Save current credentials as a profile
+  claude delete <name>           Remove a saved profile
+  claude status                  Show current Claude auth status
+`);
+      break;
+    }
+  }
+}
+
 function cmdHelp(): void {
   console.log(`
 Available commands:
@@ -532,6 +667,14 @@ Available commands:
   snapshot <project> "label"  Create a named snapshot
   auto-assign on|off          Toggle automatic project assignment
   reset                       Wipe all accounts and project mappings
+
+  claude list                 Show Claude Code credential profiles
+  claude switch <name>        Switch to a saved Claude profile
+  claude login <name>         Login and save as Claude profile
+  claude save <name>          Save current Claude credentials as profile
+  claude delete <name>        Remove a Claude profile
+  claude status               Show current Claude auth status
+
   help                        Show this help
   quit / exit                 Exit
 
@@ -556,6 +699,7 @@ const COMMANDS: Record<string, CommandHandler> = {
   snapshot: cmdSnapshot,
   'auto-assign': cmdAutoAssign,
   reset: cmdReset,
+  claude: cmdClaude,
   help: async () => cmdHelp(),
   quit: async () => process.exit(0),
   exit: async () => process.exit(0),
@@ -574,12 +718,32 @@ export async function startRepl(serverUrl?: string): Promise<void> {
 
   const mappedCount = Object.keys(config.projectAccounts).length;
 
+  // Load active Claude profile for banner
+  let claudeBannerLine = '';
+  try {
+    const activeClaudeProfile = await loadActiveProfile();
+    if (activeClaudeProfile) {
+      const profile = await loadProfile(activeClaudeProfile.profile);
+      if (profile) {
+        const parts = [profile.email];
+        if (profile.orgName) parts.push(profile.orgName);
+        if (profile.subscriptionType) parts.push(profile.subscriptionType);
+        claudeBannerLine = `  Claude:   ${parts[0]}${parts.length > 1 ? ` (${parts.slice(1).join(', ')})` : ''}`;
+      }
+    }
+  } catch (profileErr: unknown) {
+    logger.debug({ err: profileErr }, 'Failed to load active Claude profile for banner');
+  }
+
   // Status banner
   console.log('');
   console.log('  Ultra Claude Agent — Interactive Mode');
   console.log(`  Server:   ${resolvedUrl}`);
   console.log(`  Accounts: ${accounts.size}`);
   console.log(`  Projects: ${registry.projects.length} discovered, ${mappedCount} mapped`);
+  if (claudeBannerLine) {
+    console.log(claudeBannerLine);
+  }
   console.log('');
   console.log('  Type "help" for available commands.');
   console.log('');