claude-code-backup 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-backup",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Backup and auto-sync Claude Code memory, settings, and CLAUDE.md files to a private GitHub repo — with real-time file watching and macOS launchd auto-start",
   "type": "module",
   "bin": {

package/src/backends/github.js

@@ -1,18 +1,54 @@
 import { existsSync, mkdirSync, copyFileSync, writeFileSync, readFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
+import { promisify } from 'util';
+import { exec } from 'child_process';
 import simpleGit from 'simple-git';
 import { Octokit } from '@octokit/rest';
 import { REPO_DIR } from '../core/config.js';
 import { collectFiles, buildManifest } from '../core/collector.js';
 import { log, spinner } from '../utils/logger.js';
 
+const execAsync = promisify(exec);
+
 function remoteUrl(config) {
-  return `https://${config.github.pat}@github.com/${config.github.repo}.git`;
+  if (config.auth_method === 'ssh') {
+    return `git@github.com:${config.github.repo}.git`;
+  }
+  // Explicit PAT auth: embed as x-access-token:<PAT> (correct GitHub OAuth format,
+  // no credential prompt needed so it works in non-TTY/background service contexts)
+  if (config.auth_method === 'pat' && config.github?.pat) {
+    return `https://x-access-token:${config.github.pat}@github.com/${config.github.repo}.git`;
+  }
+  // System auth or legacy config: bare URL, credential helper (osxkeychain/gh) handles it
+  return `https://github.com/${config.github.repo}.git`;
+}
+
+async function getApiToken(config) {
+  if (config.github?.pat) return config.github.pat;
+
+  // Try git credential helper (osxkeychain, gh, gnome-keyring, etc.)
+  try {
+    const { stdout } = await execAsync(
+      'printf "protocol=https\\nhost=github.com\\n" | git credential fill'
+    );
+    const match = stdout.match(/^password=(.+)$/m);
+    if (match?.[1]?.trim()) return match[1].trim();
+  } catch {}
+
+  // Try gh CLI
+  try {
+    const { stdout } = await execAsync('gh auth token 2>/dev/null');
+    if (stdout.trim()) return stdout.trim();
+  } catch {}
+
+  return null;
 }
 
 function repoGit() {
-  return simpleGit(REPO_DIR);
+  return simpleGit(REPO_DIR, {
+    config: [],
+  }).env({ ...process.env, GIT_TERMINAL_PROMPT: '0' });
 }
 
 async function configureGit(g) {
@@ -438,29 +474,34 @@ Copy the files you need back from there manually.
 }
 
 export async function ensureRepo(config) {
-  const octokit = new Octokit({ auth: config.github.pat });
   const [owner, repo] = config.github.repo.split('/');
+  const token = await getApiToken(config);
 
-  // Check if repo exists, create it if not
-  let repoExists = false;
-  try {
-    await octokit.repos.get({ owner, repo });
-    repoExists = true;
-  } catch (err) {
-    if (err.status !== 404) throw err;
-  }
+  if (token) {
+    const octokit = new Octokit({ auth: token });
+    let repoExists = false;
+    try {
+      await octokit.repos.get({ owner, repo });
+      repoExists = true;
+    } catch (err) {
+      if (err.status !== 404) throw err;
+    }
 
-  if (!repoExists) {
-    const spin = spinner('Creating private GitHub repo...').start();
-    await octokit.repos.createForAuthenticatedUser({
-      name: repo,
-      private: true,
-      description: 'Claude Code backup — memory, settings, commands',
-      auto_init: true,
-    });
-    spin.succeed(`Created: github.com/${config.github.repo}`);
+    if (!repoExists) {
+      const spin = spinner('Creating private GitHub repo...').start();
+      await octokit.repos.createForAuthenticatedUser({
+        name: repo,
+        private: true,
+        description: 'Claude Code backup — memory, settings, commands',
+        auto_init: true,
+      });
+      spin.succeed(`Created: github.com/${config.github.repo}`);
+    } else {
+      log.info(`Repo exists: github.com/${config.github.repo}`);
+    }
   } else {
-    log.info(`Repo exists: github.com/${config.github.repo}`);
+    log.warn('No GitHub API token found — skipping repo creation check.');
+    log.dim('  Make sure the repo exists at github.com and your system git credentials are set up.');
   }
 
   // Clone locally if not already done

package/src/commands/init.js

@@ -2,39 +2,87 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { homedir } from 'os';
 import { join } from 'path';
+import { promisify } from 'util';
+import { exec } from 'child_process';
 import { loadConfig, saveConfig } from '../core/config.js';
 import { ensureRepo } from '../backends/github.js';
 import { log } from '../utils/logger.js';
 
+const execAsync = promisify(exec);
+
+async function detectAuth() {
+  // 1. SSH key present
+  try {
+    const { stdout } = await execAsync('ls ~/.ssh/id_*.pub 2>/dev/null | head -1');
+    if (stdout.trim()) {
+      return { method: 'ssh', label: `SSH key (${stdout.trim().split('/').pop()})` };
+    }
+  } catch {}
+
+  // 2. gh CLI authenticated
+  try {
+    const { stdout } = await execAsync('gh auth status 2>&1');
+    if (/Logged in/i.test(stdout)) {
+      return { method: 'system', label: 'GitHub CLI (gh auth)' };
+    }
+  } catch {}
+
+  // 3. git credential helper has a GitHub token
+  try {
+    const { stdout } = await execAsync(
+      'printf "protocol=https\\nhost=github.com\\n" | git credential fill 2>/dev/null'
+    );
+    const match = stdout.match(/^password=(.+)$/m);
+    if (match?.[1]?.trim()) {
+      const helper = await execAsync('git config --global credential.helper 2>/dev/null')
+        .then(r => r.stdout.trim() || 'system')
+        .catch(() => 'system');
+      return { method: 'system', label: `git credential helper (${helper})` };
+    }
+  } catch {}
+
+  return { method: 'pat', label: null };
+}
+
 export async function runInit() {
   log.header('Claude Backup — Setup Wizard');
 
   const existing = loadConfig();
 
-  // ── Step 1: GitHub PAT ───────────────────────────────────────────────────
-  console.log(chalk.bold.underline('Step 1 of 4 — GitHub Personal Access Token') + '\n');
-  console.log('claude-code-backup needs a PAT with ' + chalk.cyan('"repo"') + ' scope to create');
-  console.log('and push to a private GitHub repository on your behalf.\n');
-  console.log(chalk.bold('  Create your token here:'));
-  console.log('  ' + chalk.underline.blue('https://github.com/settings/tokens/new') + '\n');
-  console.log(chalk.dim('  Instructions:'));
-  console.log(chalk.dim('  1. Note name → e.g. "claude-code-backup"'));
-  console.log(chalk.dim('  2. Expiration → your preference (No expiration is fine)'));
-  console.log(chalk.dim('  3. Scopes → tick  ') + chalk.cyan('repo') + chalk.dim('  (the top-level checkbox covers everything needed)'));
-  console.log(chalk.dim('  4. Click "Generate token" and copy the value\n'));
-  console.log(chalk.dim('  Fine-grained token alternative:'));
-  console.log(chalk.dim('  ' + chalk.underline('https://github.com/settings/personal-access-tokens/new')));
-  console.log(chalk.dim('  → Repository permissions: Contents (Read & Write), Metadata (Read)\n'));
-
-  const { pat } = await inquirer.prompt([
-    {
-      type: 'password',
-      name: 'pat',
-      message: 'Paste your GitHub PAT:',
-      default: existing?.github?.pat || '',
-      validate: v => v.trim().length > 0 || 'PAT is required',
-    },
-  ]);
+  // ── Step 1: Auth detection ───────────────────────────────────────────────
+  console.log(chalk.bold.underline('Step 1 of 4 — GitHub Authentication') + '\n');
+  console.log(chalk.dim('  Checking for existing GitHub credentials...\n'));
+
+  const detected = await detectAuth();
+  let pat = '';
+  let authMethod = detected.method;
+
+  if (detected.method !== 'pat') {
+    console.log(chalk.green('  ✔') + ' Found: ' + chalk.cyan(detected.label));
+    console.log(chalk.dim('  Git will authenticate automatically — no token needed.\n'));
+  } else {
+    console.log(chalk.yellow('  ✗') + ' No system GitHub auth detected.\n');
+    console.log('claude-code-backup needs a PAT with ' + chalk.cyan('"repo"') + ' scope to create');
+    console.log('and push to a private GitHub repository on your behalf.\n');
+    console.log(chalk.bold('  Create your token here:'));
+    console.log('  ' + chalk.underline.blue('https://github.com/settings/tokens/new') + '\n');
+    console.log(chalk.dim('  Instructions:'));
+    console.log(chalk.dim('  1. Note name → e.g. "claude-code-backup"'));
+    console.log(chalk.dim('  2. Expiration → your preference (No expiration is fine)'));
+    console.log(chalk.dim('  3. Scopes → tick  ') + chalk.cyan('repo') + chalk.dim('  (the top-level checkbox)'));
+    console.log(chalk.dim('  4. Click "Generate token" and copy the value\n'));
+
+    const { patInput } = await inquirer.prompt([
+      {
+        type: 'password',
+        name: 'patInput',
+        message: 'Paste your GitHub PAT:',
+        default: existing?.github?.pat || '',
+        validate: v => v.trim().length > 0 || 'PAT is required',
+      },
+    ]);
+    pat = patInput.trim();
+  }
 
   // ── Step 2: Repo & branch ────────────────────────────────────────────────
   console.log('\n' + chalk.bold.underline('Step 2 of 4 — Repository & Branch') + '\n');
@@ -111,10 +159,11 @@ export async function runInit() {
   const config = {
     backend: 'github',
     github: {
-      pat: pat.trim(),
       repo: repo.trim(),
       branch: branch.trim(),
+      ...(pat ? { pat } : {}),
     },
+    auth_method: authMethod,
     watched_dirs,
     claude_md_dirs,
     exclude,

package/src/core/config.js

@@ -33,7 +33,8 @@ export function saveConfig(config) {
 
 export function requireConfig() {
   const config = loadConfig();
-  if (!config || !config.github?.pat || !config.github?.repo) {
+  // Require repo; require PAT only for legacy configs without auth_method
+  if (!config || !config.github?.repo || (!config.auth_method && !config.github?.pat)) {
     console.error('Not configured. Run: claude-code-backup init');
     process.exit(1);
   }