lazyclaw 6.6.0 → 6.7.0

package/cli.mjs

@@ -403,6 +403,11 @@ async function main() {
       await (await import('./commands/config.mjs')).cmdDoctor();
       break;
     }
+    case 'login': {
+      const code = await (await import('./commands/login.mjs')).cmdLogin(rest.positional, rest.flags);
+      if (code) process.exitCode = code;
+      break;
+    }
     case 'status': {
       await (await import('./commands/config.mjs')).cmdStatus();
       break;

package/commands/login.mjs

@@ -0,0 +1,108 @@
+// commands/login.mjs — `lazyclaw login [claude]`.
+//
+// lazyclaw is keyless: chatting via the claude-cli provider spawns the `claude`
+// binary, which carries its own login. But the model-LISTING path makes a
+// direct api.anthropic.com call that needs a bearer, and on macOS the `claude`
+// login lives in the Keychain (no credential file), so listing failed with
+// "set ANTHROPIC_API_KEY or CLAUDE_CODE_OAUTH_TOKEN". This command resolves the
+// credential across env / file / Keychain and, when none is present, mints a
+// long-lived token via `claude setup-token`. The minted token is stored in
+// <config>/.env (0600, gitignored) — the same env path model listing reads.
+
+import path from 'node:path';
+import { execFileSync, spawn } from 'node:child_process';
+import { _claudeCodeOAuthToken } from '../providers/model_catalogue.mjs';
+import { readClaudeKeychainToken } from '../providers/claude_keychain.mjs';
+import { writeDotenvMerge } from '../dotenv_min.mjs';
+import { configPath } from '../lib/config.mjs';
+
+// Where the claude-cli bearer comes from, in priority order. Pure + injectable.
+export function resolveClaudeAuth({ env = process.env, home, readFileSync, keychainReader } = {}) {
+  if (env.CLAUDE_CODE_OAUTH_TOKEN) return { authenticated: true, source: 'env' };
+  if (env.ANTHROPIC_API_KEY) return { authenticated: true, source: 'apiKey' };
+  // Credential file (Linux / non-keychain) — keychain disabled here so we can
+  // distinguish the two sources for the status message.
+  const fileTok = _claudeCodeOAuthToken({ home, readFileSync, keychainReader: () => null });
+  if (fileTok) return { authenticated: true, source: 'file' };
+  const kcTok = (keychainReader || readClaudeKeychainToken)();
+  if (kcTok) return { authenticated: true, source: 'keychain' };
+  return { authenticated: false, source: 'none' };
+}
+
+function _hasClaudeBinary() {
+  try { execFileSync('claude', ['--version'], { stdio: 'ignore', timeout: 4000 }); return true; }
+  catch { return false; }
+}
+
+function _runSetupToken() {
+  return new Promise((resolve) => {
+    try {
+      const p = spawn('claude', ['setup-token'], { stdio: 'inherit' });
+      p.on('exit', (code) => resolve(code ?? 1));
+      p.on('error', () => resolve(1));
+    } catch { resolve(1); }
+  });
+}
+
+const SOURCE_LABEL = {
+  env: 'CLAUDE_CODE_OAUTH_TOKEN env var',
+  apiKey: 'ANTHROPIC_API_KEY env var',
+  file: 'claude credential file (~/.claude)',
+  keychain: 'macOS Keychain (your `claude login`)',
+};
+
+export async function cmdLogin(positional = [], flags = {}, deps = {}) {
+  const log = deps.log || ((s) => process.stdout.write(s + '\n'));
+  const err = deps.err || ((s) => process.stderr.write(s + '\n'));
+  const provider = String(positional[0] || 'claude').toLowerCase();
+  if (provider !== 'claude' && provider !== 'claude-cli') {
+    err(`login: only 'claude' is supported right now (got "${provider}"). Other providers use their own CLI login.`);
+    return 2;
+  }
+  const cfgDir = deps.cfgDir || path.dirname(configPath());
+  const resolve = deps.resolve || resolveClaudeAuth;
+  const writeEnv = deps.writeEnv || ((vars) => writeDotenvMerge(cfgDir, vars));
+
+  // Save a token the user already minted (e.g. via `claude setup-token`).
+  if (flags.token) {
+    const tok = String(flags.token).trim();
+    if (!tok) { err('login: --token was empty'); return 2; }
+    writeEnv({ CLAUDE_CODE_OAUTH_TOKEN: tok });
+    log('✓ saved CLAUDE_CODE_OAUTH_TOKEN to <config>/.env (0600). claude-cli model listing + recall will use it.');
+    return 0;
+  }
+
+  const status = resolve();
+  if (status.authenticated) {
+    log(`✓ claude-cli is already authenticated — via ${SOURCE_LABEL[status.source] || status.source}.`);
+    log('  Model listing, recall, and the keyless trainer will work. Nothing to do.');
+    return 0;
+  }
+
+  if (flags.check) {
+    err('✗ no claude-cli credential found (no env token, ~/.claude credential file, or macOS Keychain login).');
+    return 1;
+  }
+
+  const hasClaude = deps.hasClaudeBinary ? deps.hasClaudeBinary() : _hasClaudeBinary();
+  if (!hasClaude) {
+    err('No claude-cli credential found, and no `claude` binary on PATH.');
+    log('Install the Claude CLI and log in:');
+    log('  npm i -g @anthropic-ai/claude-code');
+    log('  claude login');
+    log('Then re-run `lazyclaw login`. (Headless/CI: set CLAUDE_CODE_OAUTH_TOKEN, or `lazyclaw login --token <token>`.)');
+    return 1;
+  }
+
+  log('No usable credential found. Launching `claude setup-token` to mint a long-lived token…');
+  log('(A browser opens for OAuth; the token is printed when it finishes.)\n');
+  const code = deps.runSetupToken ? await deps.runSetupToken() : await _runSetupToken();
+  if (code !== 0) {
+    err('\n`claude setup-token` did not complete. Alternatively run `claude login`, then re-run `lazyclaw login`.');
+    return 1;
+  }
+  log('\nDone. Copy the token printed above, then save it with EITHER:');
+  log('  lazyclaw login --token <paste-token>      # writes <config>/.env (recommended)');
+  log('  export CLAUDE_CODE_OAUTH_TOKEN=<paste-token>');
+  return 0;
+}

package/lib/args.mjs

@@ -10,7 +10,7 @@ export const SUBCOMMANDS = [
   'run', 'resume', 'inspect', 'clear', 'validate', 'graph',
   'workflow',
   'config', 'chat', 'agent',
-  'doctor', 'status', 'onboard',
+  'doctor', 'status', 'onboard', 'login',
   'sessions', 'skills', 'providers',
   'daemon', 'version', 'completion', 'help',
   'export', 'import',

package/mas/index_db.mjs

@@ -42,6 +42,33 @@ function _logIndexFailure(configDir, scope, err) {
   } catch { /* swallow — surface only via console.warn below */ }
 }
 
+// The native better-sqlite3 addon fails to load when node_modules was built
+// against a different Node.js ABI than the one running lazyclaw (a Node switch
+// via nvm/brew, or copied node_modules). Every index op then throws the same
+// thing — so instead of dumping the raw stack on each write, recognise it and
+// print ONE actionable hint, then stay quiet. Chat is unaffected; only recall /
+// skill search degrade until the addon is rebuilt.
+let _nativeHintShown = false;
+export function _resetNativeHint() { _nativeHintShown = false; } // test seam
+export function _isNativeAbiError(e) {
+  return /NODE_MODULE_VERSION|was compiled against a different Node|better_sqlite3\.node|invalid ELF header|dlopen\(/i
+    .test(String(e?.message || e || ''));
+}
+export function _warnIndexFailure(label, e) {
+  if (_isNativeAbiError(e)) {
+    if (_nativeHintShown) return;
+    _nativeHintShown = true;
+    // eslint-disable-next-line no-console
+    console.warn(
+      '[index_db] recall index disabled — better-sqlite3 was built for a different Node.js version.\n' +
+      '           Re-enable it once with:  npm rebuild better-sqlite3   (in the lazyclaw install dir),\n' +
+      '           or reinstall deps with the Node you run lazyclaw with. Chat is unaffected.');
+    return;
+  }
+  // eslint-disable-next-line no-console
+  console.warn(`[index_db] ${label}:`, e.message);
+}
+
 function dbPath(configDir) {
   return path.join(configDir, 'index.db');
 }
@@ -180,8 +207,7 @@ export function indexSessionTurn(row, configDir = defaultConfigDir()) {
     );
   } catch (e) {
     _logIndexFailure(configDir, 'sessions', e);
-    // eslint-disable-next-line no-console
-    console.warn('[index_db] indexSessionTurn failed:', e.message);
+    _warnIndexFailure('indexSessionTurn failed', e);
   }
 }
 
@@ -196,8 +222,7 @@ export function indexSkill(row, configDir = defaultConfigDir()) {
     );
   } catch (e) {
     _logIndexFailure(configDir, 'skills', e);
-    // eslint-disable-next-line no-console
-    console.warn('[index_db] indexSkill failed:', e.message);
+    _warnIndexFailure('indexSkill failed', e);
   }
 }
 
@@ -212,8 +237,7 @@ export function deleteSkill(skillName, configDir = defaultConfigDir()) {
     s.deleteSkill.run(String(skillName || ''));
   } catch (e) {
     _logIndexFailure(configDir, 'skills', e);
-    // eslint-disable-next-line no-console
-    console.warn('[index_db] deleteSkill failed:', e.message);
+    _warnIndexFailure('deleteSkill failed', e);
   }
 }
 
@@ -228,8 +252,7 @@ export function indexTrajectory(row, configDir = defaultConfigDir()) {
     );
   } catch (e) {
     _logIndexFailure(configDir, 'trajectories', e);
-    // eslint-disable-next-line no-console
-    console.warn('[index_db] indexTrajectory failed:', e.message);
+    _warnIndexFailure('indexTrajectory failed', e);
   }
 }
 
@@ -243,8 +266,7 @@ export function indexMemory(row, configDir = defaultConfigDir()) {
     );
   } catch (e) {
     _logIndexFailure(configDir, 'memories', e);
-    // eslint-disable-next-line no-console
-    console.warn('[index_db] indexMemory failed:', e.message);
+    _warnIndexFailure('indexMemory failed', e);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lazyclaw",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "Lazy, elegant terminal CLI for chatting with Claude / OpenAI / Gemini / Ollama, orchestrating multi-step LLM workflows, and running multi-agent Slack teams with cross-task memory. Banner-on-launch, slash-command ghost autocomplete, persistent sessions, local HTTP gateway.",
   "keywords": [
     "claude",

package/providers/claude_keychain.mjs

@@ -0,0 +1,40 @@
+// claude_keychain.mjs — read the Claude Code OAuth token from the macOS login
+// Keychain.
+//
+// `claude login` on macOS stores its credential in the OS Keychain (there is no
+// ~/.claude/.credentials.json file like on Linux), so lazyclaw's keyless paths
+// (model listing, trainer detection) couldn't see an existing, working login
+// and fell back to an "authenticate first" error. This reads that Keychain item
+// — the same JSON blob the Linux file holds — and returns its accessToken.
+//
+// Read-only and macOS-only. The token is only ever sent to api.anthropic.com,
+// never logged. The first read may surface a one-time Keychain access prompt;
+// granting it ("Always Allow") makes subsequent reads silent.
+
+import { execFileSync } from 'node:child_process';
+
+// macOS stores the Claude Code credential under this generic-password service.
+const KEYCHAIN_SERVICE = 'Claude Code-credentials';
+
+// Pull the accessToken out of the credential blob (same shape as the Linux
+// ~/.claude/.credentials.json file). Returns a non-empty string or null.
+export function _extractAccessToken(raw) {
+  if (!raw || !String(raw).trim()) return null;
+  let j;
+  try { j = JSON.parse(raw); } catch { return null; }
+  const o = (j && j.claudeAiOauth) || j || {};
+  const tok = o.accessToken || o.access_token || (j && j.accessToken);
+  return (typeof tok === 'string' && tok) ? tok : null;
+}
+
+// Read the Claude Code OAuth access token from the macOS Keychain. Returns the
+// token string, or null on non-macOS, a missing item, denied access, or an
+// unparseable blob. `exec`/`platform` are injectable for tests.
+export function readClaudeKeychainToken({ platform = process.platform, exec } = {}) {
+  if (platform !== 'darwin') return null;
+  const run = exec || ((args) => execFileSync('security', args, { encoding: 'utf8', timeout: 8000 }));
+  let raw;
+  try { raw = run(['find-generic-password', '-s', KEYCHAIN_SERVICE, '-w']); }
+  catch { return null; }
+  return _extractAccessToken(raw);
+}

package/providers/model_catalogue.mjs

@@ -14,6 +14,7 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { readClaudeKeychainToken } from './claude_keychain.mjs';
 
 /**
  * Whether a provider exposes a model catalogue we can live-fetch. True for
@@ -146,7 +147,7 @@ export function modelCatalogueFor({ cfg, registryMod, resolveAuthKey, providerId
 // (no file), so this returns null there — the caller falls through to its
 // honest "set ANTHROPIC_API_KEY or CLAUDE_CODE_OAUTH_TOKEN" error. Read-only;
 // the token is only ever sent to api.anthropic.com, never logged.
-export function _claudeCodeOAuthToken({ home, readFileSync } = {}) {
+export function _claudeCodeOAuthToken({ home, readFileSync, keychainReader } = {}) {
   const h = home || os.homedir();
   const read = readFileSync || fs.readFileSync;
   for (const rel of ['.claude/.credentials.json', '.config/claude/.credentials.json']) {
@@ -156,7 +157,9 @@ export function _claudeCodeOAuthToken({ home, readFileSync } = {}) {
       if (typeof tok === 'string' && tok) return tok;
     } catch { /* missing / unreadable / not JSON — try the next location */ }
   }
-  return null;
+  // macOS keeps the login in the Keychain (no file) — read it there.
+  const fromKeychain = (keychainReader || readClaudeKeychainToken)();
+  return fromKeychain || null;
 }
 
 // A plain API key stored by `codex login --api-key` in ~/.codex/auth.json.