@autoclawd/autoclawd 1.1.4 → 1.1.6

package/dist/index.js

@@ -482,20 +482,29 @@ async function ensureRepoExists(octokit, opts) {
     if (status !== 404) throw err;
   }
   log.info(`Repo ${opts.owner}/${opts.repo} does not exist, creating...`);
-  const { data: authUser } = await octokit.rest.users.getAuthenticated();
-  if (authUser.login === opts.owner) {
-    await octokit.rest.repos.createForAuthenticatedUser({
-      name: opts.repo,
-      description: opts.description,
-      auto_init: false
-    });
-  } else {
-    await octokit.rest.repos.createInOrg({
-      org: opts.owner,
-      name: opts.repo,
-      description: opts.description,
-      auto_init: false
-    });
+  try {
+    const { data: authUser } = await octokit.rest.users.getAuthenticated();
+    if (authUser.login === opts.owner) {
+      await octokit.rest.repos.createForAuthenticatedUser({
+        name: opts.repo,
+        description: opts.description,
+        auto_init: false
+      });
+    } else {
+      await octokit.rest.repos.createInOrg({
+        org: opts.owner,
+        name: opts.repo,
+        description: opts.description,
+        auto_init: false
+      });
+    }
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("name already exists")) {
+      log.info(`Repo ${opts.owner}/${opts.repo} was created by another ticket, continuing`);
+      return { created: false };
+    }
+    throw err;
   }
   return { created: true };
 }
@@ -712,6 +721,7 @@ import { PassThrough } from "stream";
 import { homedir as homedir3, platform } from "os";
 import { join as join4 } from "path";
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { execSync as execSync2 } from "child_process";
 var docker = new Docker();
 async function checkDockerAvailable() {
   try {
@@ -770,7 +780,10 @@ async function createContainer(opts) {
       NanoCpus: dockerConfig.cpus ? dockerConfig.cpus * 1e9 : void 0,
       NetworkMode: dockerConfig.network ?? "bridge"
     },
-    Env: ["HOME=/root"]
+    Env: [
+      "HOME=/root",
+      ...process.env.ANTHROPIC_API_KEY ? [`ANTHROPIC_API_KEY=${process.env.ANTHROPIC_API_KEY}`] : []
+    ]
   });
   await container.start();
   log.info(`Container ${name} started (${container.id.slice(0, 12)})`);
@@ -911,16 +924,33 @@ async function copyClaudeCredentials(container) {
     "-c",
     "mkdir -p /home/autoclawd/.claude && chown autoclawd /home/autoclawd/.claude"
   ]);
+  let credJson;
   const credFile = join4(home, ".claude", ".credentials.json");
   if (existsSync3(credFile)) {
-    const content = readFileSync2(credFile, "utf-8");
-    const b64 = Buffer.from(content).toString("base64");
+    credJson = readFileSync2(credFile, "utf-8");
+    log.debug("Read credentials from file");
+  } else if (platform() === "darwin") {
+    try {
+      credJson = execSync2('security find-generic-password -s "Claude Code-credentials" -w', {
+        stdio: "pipe",
+        encoding: "utf-8",
+        timeout: 5e3
+      }).trim();
+      log.debug("Read credentials from macOS Keychain");
+    } catch {
+    }
+  }
+  if (credJson) {
+    const b64 = Buffer.from(credJson).toString("base64");
     await exec(container, [
       "sh",
       "-c",
       `echo '${b64}' | base64 -d > /home/autoclawd/.claude/.credentials.json && chown autoclawd /home/autoclawd/.claude/.credentials.json`
     ]);
-    log.debug("Copied .credentials.json");
+  } else if (process.env.ANTHROPIC_API_KEY) {
+    log.debug("Using ANTHROPIC_API_KEY env var for container auth");
+  } else {
+    log.warn("No Claude credentials found. Run: claude (to log in)");
   }
   const settingsFile = join4(home, ".claude", "settings.json");
   if (existsSync3(settingsFile)) {
@@ -1199,7 +1229,7 @@ async function commitAndPush(container, opts) {
 import { mkdtempSync as mkdtempSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
 import { join as join6 } from "path";
 import { tmpdir as tmpdir2 } from "os";
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 
 // src/db.ts
 import Database from "better-sqlite3";
@@ -1387,7 +1417,7 @@ function detectDefaultBranch2(repoUrl, githubToken) {
   const askpass = createAskpass2(githubToken);
   const authedUrl = repoUrl.replace("https://", "https://x-access-token@");
   try {
-    const output = execSync2(
+    const output = execSync3(
       `git ls-remote --symref -- ${authedUrl} HEAD`,
       { stdio: "pipe", timeout: 3e4, env: gitEnv2(askpass.path), encoding: "utf-8" }
     );
@@ -1411,14 +1441,14 @@ async function pushScaffold(opts) {
     }
     writeFileSync2(join6(scaffoldDir, "README.md"), readmeLines.join("\n") + "\n");
     writeFileSync2(join6(scaffoldDir, ".autoclawd.yaml"), "base: main\n");
-    execSync2("git init", { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2("git checkout -b main", { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2('git config user.email "autoclawd@users.noreply.github.com"', { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2('git config user.name "autoclawd"', { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2("git add .", { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2('git commit -m "chore: initial scaffold"', { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2(`git remote add origin ${authedUrl}`, { cwd: scaffoldDir, stdio: "pipe", env });
-    execSync2("git push -u origin main", { cwd: scaffoldDir, stdio: "pipe", timeout: 6e4, env });
+    execSync3("git init", { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3("git checkout -b main", { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3('git config user.email "autoclawd@users.noreply.github.com"', { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3('git config user.name "autoclawd"', { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3("git add .", { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3('git commit -m "chore: initial scaffold"', { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3(`git remote add origin ${authedUrl}`, { cwd: scaffoldDir, stdio: "pipe", env });
+    execSync3("git push -u origin main", { cwd: scaffoldDir, stdio: "pipe", timeout: 6e4, env });
   } finally {
     rmSync2(scaffoldDir, { recursive: true, force: true });
     rmSync2(askpass.dir, { recursive: true, force: true });
@@ -1431,7 +1461,7 @@ async function cloneToTemp(repoUrl, baseBranch, githubToken) {
     const askpass = createAskpass2(githubToken);
     const authedUrl = repoUrl.replace("https://", "https://x-access-token@");
     try {
-      execSync2(`git clone --depth=50 -b ${baseBranch} -- ${authedUrl} ${workDir}`, {
+      execSync3(`git clone --depth=50 -b ${baseBranch} -- ${authedUrl} ${workDir}`, {
         stdio: "pipe",
         timeout: 12e4,
         env: gitEnv2(askpass.path)
@@ -1579,7 +1609,21 @@ async function executeTicket(opts) {
     }
     const detectedBase = repoCreated ? "main" : detectDefaultBranch2(ticket.repoUrl, config.github.token);
     log.ticket(ticket.identifier, `Default branch: ${detectedBase}`);
-    workDir = await cloneToTemp(ticket.repoUrl, detectedBase, config.github.token);
+    try {
+      workDir = await cloneToTemp(ticket.repoUrl, detectedBase, config.github.token);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("not found in upstream") || msg.includes("Could not find remote branch") || msg.includes("Remote branch")) {
+        log.ticket(ticket.identifier, `Branch "${detectedBase}" not ready \u2014 will retry later`);
+        return {
+          ticketId: ticket.identifier,
+          success: false,
+          error: `REQUEUE: branch "${detectedBase}" does not exist yet`,
+          iterations: 0
+        };
+      }
+      throw err;
+    }
     log.ticket(ticket.identifier, "Cloned repo");
     const repoLocal = loadRepoLocalConfig(workDir);
     const actualBase = ticket.baseBranch ?? repoLocal?.base ?? detectedBase;
@@ -1608,7 +1652,7 @@ async function executeTicket(opts) {
         throw err;
       }
     }
-    execSync2(`git checkout -B ${branchName} --`, { cwd: workDir, stdio: "pipe" });
+    execSync3(`git checkout -B ${branchName} --`, { cwd: workDir, stdio: "pipe" });
     container = await createContainer({
       dockerConfig: docker2,
       workspacePath: workDir,
@@ -2397,7 +2441,7 @@ function printHistoryTable(records) {
 }
 
 // src/deps.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 import { join as join8 } from "path";
 import { homedir as homedir5 } from "os";
@@ -2417,7 +2461,7 @@ function checkDeps() {
     {
       name: "Claude credentials",
       installed: hasClaudeAuth(),
-      instructions: "Run: claude   (and complete the login flow)"
+      instructions: 'export ANTHROPIC_API_KEY="sk-ant-..."  (from console.anthropic.com)\n    Or run: claude   (and complete the login flow)'
     },
     {
       name: "cloudflared",
@@ -2427,21 +2471,26 @@ function checkDeps() {
   ];
 }
 function hasClaudeAuth() {
-  const credPaths = [
-    join8(homedir5(), ".claude", ".credentials.json"),
-    join8(homedir5(), ".claude", "credentials.json")
-  ];
-  if (credPaths.some((p) => existsSync6(p))) return true;
-  try {
-    execSync3("claude --version", { stdio: "pipe", timeout: 5e3 });
-    return existsSync6(join8(homedir5(), ".claude"));
-  } catch {
-    return false;
+  if (process.env.ANTHROPIC_API_KEY) return true;
+  const home = homedir5();
+  if (existsSync6(join8(home, ".claude", ".credentials.json"))) return true;
+  if (existsSync6(join8(home, ".claude", "credentials.json"))) return true;
+  if (process.platform === "darwin") {
+    try {
+      const result = execSync4('security find-generic-password -s "Claude Code-credentials" -w', {
+        stdio: "pipe",
+        encoding: "utf-8",
+        timeout: 5e3
+      });
+      if (result.trim()) return true;
+    } catch {
+    }
   }
+  return false;
 }
 function commandExists(cmd) {
   try {
-    execSync3(`which ${cmd}`, { stdio: "pipe" });
+    execSync4(`which ${cmd}`, { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -2449,7 +2498,7 @@ function commandExists(cmd) {
 }
 function isDockerRunning() {
   try {
-    execSync3("docker info", { stdio: "pipe", timeout: 1e4 });
+    execSync4("docker info", { stdio: "pipe", timeout: 1e4 });
     return true;
   } catch {
     return false;
@@ -2458,7 +2507,7 @@ function isDockerRunning() {
 
 // src/index.ts
 import { existsSync as existsSync7, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, readFileSync as readFileSync4, unlinkSync } from "fs";
-import { execSync as execSync4, spawn as spawn2 } from "child_process";
+import { execSync as execSync5, spawn as spawn2 } from "child_process";
 import { createInterface } from "readline";
 import { join as join9 } from "path";
 import { homedir as homedir6 } from "os";
@@ -2516,7 +2565,7 @@ program.command("serve").description("Start webhook server with auto-tunnel").op
   await checkDockerAvailable();
   if (!checkClaudeCredentials()) {
     throw new Error(
-      "Claude Code credentials not found (~/.claude/.credentials.json)\nRun: claude (and complete login) to create credentials"
+      'Claude Code credentials not found.\nEither: export ANTHROPIC_API_KEY="sk-ant-..." (recommended for macOS)\nOr: run claude (and complete login) to create ~/.claude/.credentials.json'
     );
   }
   const orphans = await cleanupOrphanedContainers();
@@ -2582,7 +2631,7 @@ program.command("watch").description("Poll Linear for tickets (no webhook/tunnel
   await checkDockerAvailable();
   if (!checkClaudeCredentials()) {
     throw new Error(
-      "Claude Code credentials not found (~/.claude/.credentials.json)\nRun: claude (and complete login) to create credentials"
+      'Claude Code credentials not found.\nEither: export ANTHROPIC_API_KEY="sk-ant-..." (recommended for macOS)\nOr: run claude (and complete login) to create ~/.claude/.credentials.json'
     );
   }
   const orphans = await cleanupOrphanedContainers();
@@ -2655,7 +2704,7 @@ program.command("run <ticket>").description("Run a single ticket (e.g. autoclawd
   await checkDockerAvailable();
   if (!checkClaudeCredentials()) {
     throw new Error(
-      "Claude Code credentials not found (~/.claude/.credentials.json)\nRun: claude (and complete login) to create credentials"
+      'Claude Code credentials not found.\nEither: export ANTHROPIC_API_KEY="sk-ant-..." (recommended for macOS)\nOr: run claude (and complete login) to create ~/.claude/.credentials.json'
     );
   }
   const octokit = createOctokit(config);
@@ -2689,7 +2738,7 @@ Expected: https://github.com/owner/repo/pull/123`);
   await checkDockerAvailable();
   if (!checkClaudeCredentials()) {
     throw new Error(
-      "Claude Code credentials not found (~/.claude/.credentials.json)\nRun: claude (and complete login) to create credentials"
+      'Claude Code credentials not found.\nEither: export ANTHROPIC_API_KEY="sk-ant-..." (recommended for macOS)\nOr: run claude (and complete login) to create ~/.claude/.credentials.json'
     );
   }
   const octokit = createOctokit(config);
@@ -2710,7 +2759,7 @@ program.command("retry [ticket]").description("Retry a failed ticket (e.g. autoc
   await checkDockerAvailable();
   if (!checkClaudeCredentials()) {
     throw new Error(
-      "Claude Code credentials not found (~/.claude/.credentials.json)\nRun: claude (and complete login) to create credentials"
+      'Claude Code credentials not found.\nEither: export ANTHROPIC_API_KEY="sk-ant-..." (recommended for macOS)\nOr: run claude (and complete login) to create ~/.claude/.credentials.json'
     );
   }
   const linearClient = createLinearClient(config);
@@ -2861,19 +2910,22 @@ program.command("history").description("Show run history").option("-n, --limit <
   }
 });
 function checkClaudeCredentials() {
+  if (process.env.ANTHROPIC_API_KEY) return true;
   const home = homedir6();
   if (existsSync7(join9(home, ".claude", ".credentials.json"))) return true;
   if (existsSync7(join9(home, ".claude", "credentials.json"))) return true;
-  if (existsSync7(join9(home, ".claude")) && commandExistsSync("claude")) return true;
-  return false;
-}
-function commandExistsSync(cmd) {
-  try {
-    execSync4(`which ${cmd}`, { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
+  if (process.platform === "darwin") {
+    try {
+      const result = execSync5('security find-generic-password -s "Claude Code-credentials" -w', {
+        stdio: "pipe",
+        encoding: "utf-8",
+        timeout: 5e3
+      });
+      if (result.trim()) return true;
+    } catch {
+    }
   }
+  return false;
 }
 async function validateGitHubToken(token) {
   try {
@@ -2947,7 +2999,7 @@ program.command("init").description("Set up autoclawd interactively").action(asy
   }
   let ghToken = "";
   try {
-    ghToken = execSync4("gh auth token", { encoding: "utf-8" }).trim();
+    ghToken = execSync5("gh auth token", { encoding: "utf-8" }).trim();
     log.success(`GitHub token detected from gh CLI`);
   } catch {
     ghToken = await ask("GitHub personal access token");