@autoclawd/autoclawd 1.1.2 → 1.1.4

package/dist/index.js

@@ -712,120 +712,16 @@ 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();
-function sleep2(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-async function tryStartDocker() {
-  const os = platform();
-  if (os === "darwin") {
-    if (existsSync3("/Applications/Docker.app")) {
-      log.info("Docker not running \u2014 starting Docker Desktop...");
-      try {
-        execSync2("open -a Docker", { stdio: "pipe" });
-      } catch {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  } else if (os === "linux") {
-    log.info("Docker not running \u2014 attempting to start...");
-    try {
-      execSync2("sudo systemctl start docker 2>/dev/null || sudo service docker start 2>/dev/null", {
-        stdio: "pipe",
-        timeout: 3e4
-      });
-    } catch {
-      return false;
-    }
-  } else {
-    return false;
-  }
-  for (let i = 0; i < 30; i++) {
-    await sleep2(1e3);
-    try {
-      await docker.ping();
-      log.success("Docker started");
-      return true;
-    } catch {
-    }
-    if (i > 0 && i % 5 === 0) {
-      log.info(`Waiting for Docker daemon... (${i}s)`);
-    }
-  }
-  return false;
-}
-async function tryInstallDocker() {
-  const os = platform();
-  if (os === "darwin") {
-    try {
-      execSync2("which brew", { stdio: "pipe" });
-    } catch {
-      log.warn("Docker not installed and Homebrew not found \u2014 cannot auto-install");
-      return false;
-    }
-    log.info("Docker not installed \u2014 installing via Homebrew (this may take a few minutes)...");
-    try {
-      execSync2("brew install --cask docker", { stdio: "inherit", timeout: 6e5 });
-      log.success("Docker Desktop installed");
-      return true;
-    } catch {
-      log.warn("Docker install via Homebrew failed");
-      return false;
-    }
-  } else if (os === "linux") {
-    const cmds = [
-      { check: "apt-get", install: "sudo apt-get update -qq && sudo apt-get install -y docker.io && sudo systemctl enable docker" },
-      { check: "dnf", install: "sudo dnf install -y docker && sudo systemctl enable docker" },
-      { check: "yum", install: "sudo yum install -y docker && sudo systemctl enable docker" },
-      { check: "pacman", install: "sudo pacman -Sy --noconfirm docker && sudo systemctl enable docker" }
-    ];
-    for (const { check, install } of cmds) {
-      try {
-        execSync2(`which ${check}`, { stdio: "pipe" });
-        log.info(`Docker not installed \u2014 installing via ${check}...`);
-        execSync2(install, { stdio: "inherit", timeout: 3e5 });
-        log.success("Docker installed");
-        return true;
-      } catch {
-      }
-    }
-    return false;
-  }
-  return false;
-}
 async function checkDockerAvailable() {
   try {
     await docker.ping();
-    return;
   } catch {
-  }
-  const started = await tryStartDocker();
-  if (started) return;
-  let installed = false;
-  try {
-    execSync2("which docker", { stdio: "pipe" });
-    installed = true;
-  } catch {
-  }
-  if (installed) {
+    const isMac = platform() === "darwin";
     throw new Error(
-      "Docker is installed but the daemon is not running and could not be started automatically.\nStart it manually:\n" + (platform() === "darwin" ? "  open -a Docker\n" : "  sudo systemctl start docker\n")
+      "Cannot connect to Docker daemon.\n\n" + (isMac ? "Install:  brew install --cask docker\nStart:    open -a Docker\n" : "Install:  https://docs.docker.com/get-docker/\nStart:    sudo systemctl start docker\n")
     );
   }
-  const didInstall = await tryInstallDocker();
-  if (didInstall) {
-    const started2 = await tryStartDocker();
-    if (started2) return;
-    throw new Error(
-      "Docker was installed but could not be started.\n" + (platform() === "darwin" ? "Open Docker Desktop from Applications and try again.\n" : "Run: sudo systemctl start docker\n")
-    );
-  }
-  throw new Error(
-    "Docker is not installed and could not be auto-installed.\n" + (platform() === "darwin" ? "Install manually: brew install --cask docker\n" : "Install manually: https://docs.docker.com/get-docker/\n")
-  );
 }
 async function ensureImage(image) {
   try {
@@ -1218,7 +1114,7 @@ async function runAgentLoop(opts) {
       }
       const waitMs = estimateResetMs(combined);
       log.ticket(ticketId, `Rate limited (${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES}) \u2014 pausing ${Math.round(waitMs / 1e3)}s`);
-      await sleep3(waitMs);
+      await sleep2(waitMs);
       i--;
       continue;
     }
@@ -1229,7 +1125,7 @@ async function runAgentLoop(opts) {
   log.ticket(ticketId, `Max iterations (${agentConfig.maxIterations}) reached`);
   return { iterations: agentConfig.maxIterations, success: false, lastOutput };
 }
-function sleep3(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -1303,7 +1199,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 execSync3 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 
 // src/db.ts
 import Database from "better-sqlite3";
@@ -1491,7 +1387,7 @@ function detectDefaultBranch2(repoUrl, githubToken) {
   const askpass = createAskpass2(githubToken);
   const authedUrl = repoUrl.replace("https://", "https://x-access-token@");
   try {
-    const output = execSync3(
+    const output = execSync2(
       `git ls-remote --symref -- ${authedUrl} HEAD`,
       { stdio: "pipe", timeout: 3e4, env: gitEnv2(askpass.path), encoding: "utf-8" }
     );
@@ -1515,14 +1411,14 @@ async function pushScaffold(opts) {
     }
     writeFileSync2(join6(scaffoldDir, "README.md"), readmeLines.join("\n") + "\n");
     writeFileSync2(join6(scaffoldDir, ".autoclawd.yaml"), "base: main\n");
-    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 });
+    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 });
   } finally {
     rmSync2(scaffoldDir, { recursive: true, force: true });
     rmSync2(askpass.dir, { recursive: true, force: true });
@@ -1535,7 +1431,7 @@ async function cloneToTemp(repoUrl, baseBranch, githubToken) {
     const askpass = createAskpass2(githubToken);
     const authedUrl = repoUrl.replace("https://", "https://x-access-token@");
     try {
-      execSync3(`git clone --depth=50 -b ${baseBranch} -- ${authedUrl} ${workDir}`, {
+      execSync2(`git clone --depth=50 -b ${baseBranch} -- ${authedUrl} ${workDir}`, {
         stdio: "pipe",
         timeout: 12e4,
         env: gitEnv2(askpass.path)
@@ -1712,7 +1608,7 @@ async function executeTicket(opts) {
         throw err;
       }
     }
-    execSync3(`git checkout -B ${branchName} --`, { cwd: workDir, stdio: "pipe" });
+    execSync2(`git checkout -B ${branchName} --`, { cwd: workDir, stdio: "pipe" });
     container = await createContainer({
       dockerConfig: docker2,
       workspacePath: workDir,
@@ -2501,131 +2397,51 @@ function printHistoryTable(records) {
 }
 
 // src/deps.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 import { join as join8 } from "path";
 import { homedir as homedir5 } from "os";
-function detectPackageManager() {
-  const checks = [
-    ["apt", "apt-get"],
-    ["dnf", "dnf"],
-    ["yum", "yum"],
-    ["pacman", "pacman"],
-    ["apk", "apk"],
-    ["brew", "brew"]
-  ];
-  for (const [name, cmd] of checks) {
-    try {
-      execSync4(`which ${cmd}`, { stdio: "pipe" });
-      return name;
-    } catch {
-    }
-  }
-  return "unknown";
-}
-var DOCKER_INSTALL = {
-  apt: [
-    "apt-get update -qq",
-    "apt-get install -y docker.io",
-    "systemctl enable docker",
-    "systemctl start docker"
-  ],
-  dnf: [
-    "dnf install -y docker",
-    "systemctl enable docker",
-    "systemctl start docker"
-  ],
-  yum: [
-    "yum install -y docker",
-    "systemctl enable docker",
-    "systemctl start docker"
-  ],
-  pacman: [
-    "pacman -Sy --noconfirm docker",
-    "systemctl enable docker",
-    "systemctl start docker"
-  ],
-  apk: [
-    "apk add docker",
-    "rc-update add docker boot",
-    "service docker start"
-  ],
-  brew: [
-    "brew install --cask docker"
-  ],
-  unknown: []
-};
-var CLOUDFLARED_INSTALL = {
-  apt: [
-    "apt-get update -qq",
-    'apt-get install -y cloudflared || (curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null && echo "deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflared.list && apt-get update -qq && apt-get install -y cloudflared)'
-  ],
-  dnf: ["dnf install -y cloudflared || npm install -g cloudflared"],
-  yum: ["yum install -y cloudflared || npm install -g cloudflared"],
-  pacman: ["pacman -Sy --noconfirm cloudflared"],
-  apk: ["apk add cloudflared"],
-  brew: ["brew install cloudflared"],
-  unknown: []
-};
 function checkDeps() {
-  const pm = detectPackageManager();
-  const needsSudo = pm !== "brew" && pm !== "unknown" && process.getuid?.() !== 0;
-  const sudo = needsSudo ? "sudo " : "";
   return [
     {
       name: "Docker",
       installed: commandExists("docker"),
       running: isDockerRunning(),
-      installable: pm !== "unknown",
-      installCommands: DOCKER_INSTALL[pm].map((c) => `${sudo}${c}`),
-      manualInstructions: "https://docs.docker.com/get-docker/"
+      instructions: process.platform === "darwin" ? "brew install --cask docker && open -a Docker" : "https://docs.docker.com/get-docker/"
     },
     {
       name: "Claude Code",
       installed: commandExists("claude"),
-      installable: true,
-      installCommands: ["curl -fsSL https://claude.ai/install.sh | bash"],
-      manualInstructions: "curl -fsSL https://claude.ai/install.sh | bash"
+      instructions: "curl -fsSL https://claude.ai/install.sh | bash\n    Then run: claude   (to log in)"
     },
     {
       name: "Claude credentials",
-      installed: existsSync6(join8(homedir5(), ".claude", ".credentials.json")),
-      installable: false,
-      installCommands: [],
-      manualInstructions: 'Run "claude" and complete the login flow'
+      installed: hasClaudeAuth(),
+      instructions: "Run: claude   (and complete the login flow)"
     },
     {
       name: "cloudflared",
       installed: commandExists("cloudflared"),
-      installable: pm !== "unknown",
-      installCommands: CLOUDFLARED_INSTALL[pm].map((c) => `${sudo}${c}`),
-      manualInstructions: "https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/"
+      instructions: process.platform === "darwin" ? "brew install cloudflared" : "https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/"
     }
   ];
 }
-function installDep(dep) {
-  if (dep.installCommands.length === 0) return false;
-  for (const cmd of dep.installCommands) {
-    try {
-      execSync4(cmd, { stdio: "inherit", timeout: 3e5 });
-    } catch {
-      return false;
-    }
-  }
-  return true;
-}
-function addUserToDockerGroup() {
-  if (process.platform !== "linux") return;
+function hasClaudeAuth() {
+  const credPaths = [
+    join8(homedir5(), ".claude", ".credentials.json"),
+    join8(homedir5(), ".claude", "credentials.json")
+  ];
+  if (credPaths.some((p) => existsSync6(p))) return true;
   try {
-    const user = execSync4("whoami", { encoding: "utf-8" }).trim();
-    execSync4(`sudo usermod -aG docker ${user}`, { stdio: "pipe" });
-    log.info(`Added ${user} to docker group \u2014 log out and back in to apply`);
+    execSync3("claude --version", { stdio: "pipe", timeout: 5e3 });
+    return existsSync6(join8(homedir5(), ".claude"));
   } catch {
+    return false;
   }
 }
 function commandExists(cmd) {
   try {
-    execSync4(`which ${cmd}`, { stdio: "pipe" });
+    execSync3(`which ${cmd}`, { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -2633,7 +2449,7 @@ function commandExists(cmd) {
 }
 function isDockerRunning() {
   try {
-    execSync4("docker info", { stdio: "pipe", timeout: 1e4 });
+    execSync3("docker info", { stdio: "pipe", timeout: 1e4 });
     return true;
   } catch {
     return false;
@@ -2642,7 +2458,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 execSync5, spawn as spawn2 } from "child_process";
+import { execSync as execSync4, spawn as spawn2 } from "child_process";
 import { createInterface } from "readline";
 import { join as join9 } from "path";
 import { homedir as homedir6 } from "os";
@@ -3045,7 +2861,19 @@ program.command("history").description("Show run history").option("-n, --limit <
   }
 });
 function checkClaudeCredentials() {
-  return existsSync7(join9(homedir6(), ".claude", ".credentials.json"));
+  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;
+  }
 }
 async function validateGitHubToken(token) {
   try {
@@ -3060,51 +2888,22 @@ program.command("init").description("Set up autoclawd interactively").action(asy
   console.log("\n  autoclawd setup\n");
   console.log("  Checking dependencies...\n");
   const deps = checkDeps();
-  const stillMissing = [];
+  const missing = [];
   for (const dep of deps) {
     if (dep.installed && dep.running !== false) {
       log.success(`${dep.name}`);
-      continue;
-    }
-    if (dep.installed && dep.running === false) {
+    } else if (dep.installed && dep.running === false) {
       log.warn(`${dep.name} \u2014 installed but not running`);
-      stillMissing.push(`${dep.name} (needs restart)`);
-      continue;
-    }
-    if (dep.installable && dep.installCommands.length > 0) {
-      const answer = await ask(`  ${dep.name} not found. Install? (Y/n)`, "Y");
-      if (answer.toLowerCase() !== "n") {
-        console.log(`
-  Installing ${dep.name} via system package manager...
-`);
-        const ok = installDep(dep);
-        if (ok) {
-          log.success(`${dep.name} installed`);
-          if (dep.name === "Docker") addUserToDockerGroup();
-          if (dep.name === "Claude Code") {
-            console.log('\n  Run "claude" in your terminal to log in, then re-run: autoclawd init\n');
-            stillMissing.push("Claude Code login");
-          }
-        } else {
-          log.error(`${dep.name} install failed`);
-          console.log(`    Install manually: ${dep.manualInstructions}`);
-          stillMissing.push(dep.name);
-        }
-      } else {
-        console.log(`    Install manually: ${dep.manualInstructions}`);
-        stillMissing.push(dep.name);
-      }
-    } else if (dep.name === "Claude credentials") {
-      log.warn(`${dep.name} \u2014 run "claude" to log in`);
-      stillMissing.push(dep.name);
+      missing.push(dep.name);
     } else {
-      log.warn(`${dep.name} \u2014 ${dep.manualInstructions}`);
-      stillMissing.push(dep.name);
+      log.error(`${dep.name} \u2014 not installed`);
+      console.log(`    ${dep.instructions}`);
+      missing.push(dep.name);
     }
   }
-  if (stillMissing.length > 0) {
+  if (missing.length > 0) {
     console.log(`
-  Continuing setup \u2014 install ${stillMissing.join(", ")} before running.
+  Install the above dependencies before running autoclawd.
 `);
   } else {
     console.log("");
@@ -3148,7 +2947,7 @@ program.command("init").description("Set up autoclawd interactively").action(asy
   }
   let ghToken = "";
   try {
-    ghToken = execSync5("gh auth token", { encoding: "utf-8" }).trim();
+    ghToken = execSync4("gh auth token", { encoding: "utf-8" }).trim();
     log.success(`GitHub token detected from gh CLI`);
   } catch {
     ghToken = await ask("GitHub personal access token");