@slahon/lazykit 1.2.9 → 1.3.1

package/README.md

@@ -21,12 +21,14 @@ Run this from your **project's root directory** — the same folder that contain
 - Node.js 18+
 - A GitHub repository with a remote set up (`git remote -v` should show a GitHub URL)
 - A Claude Pro or Max subscription ([claude.ai](https://claude.ai))
-- Claude Code installed locally (`npm install -g @anthropic-ai/claude-code`)
-- GitHub CLI (`gh`) — required for full automation (`brew install gh` / [cli.github.com](https://cli.github.com))
+- **Claude Code CLI** — `npm install -g @anthropic-ai/claude-code`
+- **GitHub CLI (`gh`)** — `brew install gh` or [cli.github.com](https://cli.github.com), then `gh auth login`
 - **Claude Code GitHub App** installed on your repo — [github.com/apps/claude](https://github.com/apps/claude) *(required for the Actions workflow to run)*
 
 > **All `npx @slahon/lazykit` commands must be run from your project's root directory** — the folder where your `.git` directory lives and your GitHub remote is configured.
 
+`init` checks for `gh` and `claude` before proceeding. If either is missing or not authenticated, it will show you exactly what to install and wait for you to confirm before continuing — no need to restart.
+
 ## How it works
 
 ### 1. Open an issue using the LazyKit Task template
@@ -137,9 +139,18 @@ During `npx @slahon/lazykit@latest init` you will be asked:
 
 LazyKit uses your Claude Pro/Max subscription via an OAuth token — no pay-per-token API billing.
 
-`init` handles this automatically: it runs `claude setup-token`, captures the token, and stores it as `CLAUDE_CODE_OAUTH_TOKEN` in your repo secrets via `gh secret set`.
+During `init`, LazyKit runs `claude setup-token` and tries to capture the token automatically. On many systems a browser window opens, you approve access, and the token is stored as `CLAUDE_CODE_OAUTH_TOKEN` in your repo secrets without any extra steps.
+
+If the token can't be captured automatically (varies by system), LazyKit falls back and asks you to paste it:
+
+```
+⚠ Could not capture the token automatically.
+  If a browser opened, complete the auth and copy the token it shows.
+
+  Paste your token here (or press Enter to skip) ›
+```
 
-If the token can't be set automatically (Claude Code not installed or `gh` not available), you'll see step-by-step instructions to do it manually.
+Just paste the token from your terminal and LazyKit sets the secret for you. If you skip, you'll get step-by-step instructions to add it manually.
 
 **Token expiry:** OAuth tokens can expire. Run `lazykit status` to check the age of your token. If it's expired, re-run `npx @slahon/lazykit@latest init` to generate and store a fresh one.
 

package/git.js

@@ -91,6 +91,15 @@ function detectStack() {
   return stack.length > 0 ? stack.join(' + ') : null;
 }
 
+function isClaudeAvailable() {
+  try {
+    execSync('claude --version', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function hasBranchProtection({ owner, repo }) {
   try {
     execSync(`gh api repos/${owner}/${repo}/branches/main/protection`, { stdio: 'pipe' });
@@ -100,4 +109,4 @@ function hasBranchProtection({ owner, repo }) {
   }
 }
 
-module.exports = { getGitRemote, parseGitHubRepo, isGitRepo, isGhCliAvailable, isGhAuthenticated, detectStack, hasBranchProtection };
+module.exports = { getGitRemote, parseGitHubRepo, isGitRepo, isGhCliAvailable, isGhAuthenticated, isClaudeAvailable, detectStack, hasBranchProtection };

package/init.js

@@ -7,8 +7,8 @@ const chalk = require('chalk');
 const ora = require('ora');
 
 const { log } = require('./logger');
-const { confirm } = require('./prompt');
-const { isGitRepo, getGitRemote, parseGitHubRepo, isGhCliAvailable, isGhAuthenticated, detectStack, hasBranchProtection } = require('./git');
+const { ask, confirm } = require('./prompt');
+const { isGitRepo, getGitRemote, parseGitHubRepo, isGhCliAvailable, isGhAuthenticated, isClaudeAvailable, detectStack, hasBranchProtection } = require('./git');
 const { generateWorkflow } = require('./workflow');
 const { generateClaudeMd } = require('./claude-md');
 const { generateIssueTemplate } = require('./issue-template');
@@ -45,28 +45,38 @@ async function init({ dryRun = false } = {}) {
     process.exit(1);
   }
 
-  // ─── Step 2: Check gh CLI and auth ───────────────────────────────────────
-  const ghAvailable = isGhCliAvailable();
-  let ghReady = false;
-
-  if (!ghAvailable) {
-    log.warn('GitHub CLI (gh) not found.');
-    console.log(chalk.gray('\n  LazyKit uses gh to create labels, set secrets, and enable PR permissions.'));
-    console.log(chalk.gray('  Without it, those steps will be skipped and you will need to do them manually.\n'));
-    console.log(chalk.gray('  Install gh from: ') + chalk.cyan('https://cli.github.com'));
-    console.log(chalk.gray('  Then re-run:     ') + chalk.cyan('npx @slahon/lazykit@latest init\n'));
-    const cont = await confirm('Continue without gh? (some steps will be manual)', false);
-    if (!cont) process.exit(0);
-  } else if (!isGhAuthenticated()) {
-    log.warn('GitHub CLI is not authenticated.');
-    console.log(chalk.gray('\n  Run the following to log in, then re-run LazyKit:\n'));
-    console.log(chalk.cyan('    gh auth login'));
-    console.log(chalk.gray('\n  Then re-run: ') + chalk.cyan('npx @slahon/lazykit@latest init\n'));
-    const cont = await confirm('Continue without gh auth? (some steps will be manual)', false);
-    if (!cont) process.exit(0);
-  } else {
-    ghReady = true;
+  // ─── Step 2: Check dependencies (mandatory) ──────────────────────────────
+
+  // gh CLI
+  while (!isGhCliAvailable()) {
+    log.error('GitHub CLI (gh) is required but not found.');
+    console.log(chalk.gray('\n  LazyKit uses gh to create labels, set secrets, and enable PR permissions.\n'));
+    console.log(chalk.gray('  Install it from: ') + chalk.cyan('https://cli.github.com'));
+    console.log(chalk.gray('  macOS:           ') + chalk.cyan('brew install gh'));
+    console.log(chalk.gray('  Windows:         ') + chalk.cyan('winget install --id GitHub.cli\n'));
+    await confirm('Press Enter once gh is installed to check again', true);
+  }
+  log.success('GitHub CLI (gh) found');
+
+  // gh auth
+  while (!isGhAuthenticated()) {
+    log.error('GitHub CLI is not authenticated.');
+    console.log(chalk.gray('\n  Run this in your terminal, then come back:\n'));
+    console.log(chalk.cyan('    gh auth login\n'));
+    await confirm('Press Enter once you are logged in to check again', true);
   }
+  log.success('GitHub CLI authenticated');
+
+  // Claude Code CLI
+  while (!isClaudeAvailable()) {
+    log.error('Claude Code CLI is required but not found.');
+    console.log(chalk.gray('\n  Install it with:\n'));
+    console.log(chalk.cyan('    npm install -g @anthropic-ai/claude-code\n'));
+    await confirm('Press Enter once Claude Code is installed to check again', true);
+  }
+  log.success('Claude Code CLI found');
+
+  const ghReady = true;
 
   log.blank();
 
@@ -197,22 +207,32 @@ async function init({ dryRun = false } = {}) {
       if (result.stderr) process.stderr.write(result.stderr);
 
       const output = (result.stdout || '') + (result.stderr || '');
-      const tokenMatch = output.match(/sk-ant-oat[^\s]+/);
+      let token = (output.match(/sk-ant-oat[^\s]+/) || [])[0];
+
+      // Fallback: ask user to paste if auto-capture didn't work
+      if (!token) {
+        console.log();
+        log.warn('Could not capture the token automatically.');
+        console.log(chalk.gray('  If a browser opened, complete the auth and copy the token it shows.\n'));
+        const pasted = await ask('Paste your token here (or press Enter to skip)', '');
+        if (pasted && pasted.trim().startsWith('sk-ant-oat')) {
+          token = pasted.trim();
+        }
+      }
 
-      if (tokenMatch && ghReady) {
+      if (token && ghReady) {
         const secretSpinner = ora({ text: 'Adding CLAUDE_CODE_OAUTH_TOKEN to GitHub secrets...', color: 'cyan' }).start();
         execSync(
-          `gh secret set CLAUDE_CODE_OAUTH_TOKEN --body "${tokenMatch[0]}" --repo ${repoInfo.owner}/${repoInfo.repo}`,
+          `gh secret set CLAUDE_CODE_OAUTH_TOKEN --body "${token}" --repo ${repoInfo.owner}/${repoInfo.repo}`,
           { stdio: 'pipe' }
         );
         secretSpinner.succeed(chalk.green('CLAUDE_CODE_OAUTH_TOKEN added to GitHub secrets'));
-      } else if (tokenMatch && !ghReady) {
-        log.warn('Token generated but gh CLI not available — add it manually:');
-        console.log(chalk.gray('       Name:  ') + chalk.cyan('CLAUDE_CODE_OAUTH_TOKEN'));
-        console.log(chalk.gray('       Value: ') + chalk.cyan(tokenMatch[0]));
-        console.log(chalk.cyan(`       https://github.com/${repoInfo.owner}/${repoInfo.repo}/settings/secrets/actions`));
+      } else if (token && !ghReady) {
+        log.warn('gh CLI not available — add the secret manually:');
+        console.log(chalk.gray('    Go to:      ') + chalk.cyan(`https://github.com/${repoInfo.owner}/${repoInfo.repo}/settings/secrets/actions`));
+        console.log(chalk.gray('    Add secret: ') + chalk.cyan('CLAUDE_CODE_OAUTH_TOKEN') + chalk.gray(' = ') + chalk.cyan(token));
       } else {
-        throw new Error('Token not found in output');
+        throw new Error('No token');
       }
     } catch (err) {
       const isNotFound = (err.message || '').includes('ENOENT');
@@ -220,10 +240,9 @@ async function init({ dryRun = false } = {}) {
         log.warn('Claude Code CLI not found — install it first:');
         console.log(chalk.cyan('\n    npm install -g @anthropic-ai/claude-code'));
       } else {
-        log.warn('Could not set token automatically.');
+        log.warn('Token not set — add it manually:');
       }
-      console.log(chalk.gray('\n  Add it manually:'));
-      console.log(chalk.gray('    1. Run:        ') + chalk.cyan('claude setup-token'));
+      console.log(chalk.gray('\n    1. Run:        ') + chalk.cyan('claude setup-token'));
       console.log(chalk.gray('    2. Go to:      ') + chalk.cyan(`https://github.com/${repoInfo.owner}/${repoInfo.repo}/settings/secrets/actions`));
       console.log(chalk.gray('    3. Add secret: ') + chalk.cyan('CLAUDE_CODE_OAUTH_TOKEN') + chalk.gray(' = the token you copied\n'));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slahon/lazykit",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "description": "Drop an issue, get a PR. AI-powered issue-to-PR automation using Claude.",
   "bin": {
     "lazykit": "./index.js"