@autoclawd/autoclawd 1.1.5 → 1.1.7

package/dist/index.js

@@ -31,7 +31,8 @@ var LinearConfigSchema = z.object({
   statuses: z.array(z.string()).default(["Todo"]),
   assignToMe: z.boolean().default(true),
   doneStatus: z.string().default("Done"),
-  inProgressStatus: z.string().default("In Progress")
+  inProgressStatus: z.string().default("In Progress"),
+  inReviewStatus: z.string().default("In Review")
 });
 var GitHubConfigSchema = z.object({
   token: z.string(),
@@ -328,6 +329,20 @@ async function fetchTicket(client, identifier) {
     url: issue.url
   };
 }
+async function fetchTicketStatus(client, identifier) {
+  const match = identifier.match(/^([A-Za-z]+)-(\d+)$/);
+  if (!match) return void 0;
+  const [, teamKey, numStr] = match;
+  const team = await client.team(teamKey.toUpperCase());
+  const result = await team.issues({
+    filter: { number: { eq: parseInt(numStr) } },
+    first: 1
+  });
+  const issue = result.nodes[0];
+  if (!issue) return void 0;
+  const state = await issue.state;
+  return state?.name;
+}
 async function claimTicket(client, config, ticketId) {
   log.info(`Claiming ticket, moving to "${config.linear.inProgressStatus}"`);
   await retry(async () => {
@@ -342,17 +357,23 @@ async function claimTicket(client, config, ticketId) {
     await client.updateIssue(ticketId, { stateId: inProgress.id });
   }, { label: "Linear claim", retryIf: isTransientError });
 }
-async function completeTicket(client, config, ticketId, comment) {
+async function reviewTicket(client, config, ticketId, comment) {
   await retry(async () => {
     await client.createComment({ issueId: ticketId, body: comment });
     const team = await client.team(config.linear.teamId);
     const states = await team.states();
-    const doneTarget = config.linear.doneStatus.toLowerCase();
-    const done = states.nodes.find((s) => s.name.toLowerCase() === doneTarget);
-    if (done) {
-      await client.updateIssue(ticketId, { stateId: done.id });
+    const target = config.linear.inReviewStatus.toLowerCase();
+    const review = states.nodes.find((s) => s.name.toLowerCase() === target);
+    if (review) {
+      await client.updateIssue(ticketId, { stateId: review.id });
+    } else {
+      const doneTarget = config.linear.doneStatus.toLowerCase();
+      const done = states.nodes.find((s) => s.name.toLowerCase() === doneTarget);
+      if (done) {
+        await client.updateIssue(ticketId, { stateId: done.id });
+      }
     }
-  }, { label: "Linear complete", retryIf: isTransientError });
+  }, { label: "Linear review", retryIf: isTransientError });
 }
 async function addBranchLabel(client, ticketId, branchName) {
   try {
@@ -482,20 +503,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 };
 }
@@ -1581,8 +1611,28 @@ async function executeTicket(opts) {
   let workDir;
   let container;
   try {
-    await claimTicket(linearClient, config, ticket.id);
-    log.ticket(ticket.identifier, `Claimed \u2014 ${ticket.repoUrl}`);
+    if (ticket.baseBranch) {
+      const parentMatch = ticket.baseBranch.match(/^autoclawd\/([A-Z]+-\d+)/i);
+      if (parentMatch) {
+        const parentId = parentMatch[1].toUpperCase();
+        const parentStatus = await fetchTicketStatus(linearClient, parentId);
+        if (parentStatus) {
+          const statusLower = parentStatus.toLowerCase();
+          const reviewTarget = config.linear.inReviewStatus.toLowerCase();
+          const doneTarget = config.linear.doneStatus.toLowerCase();
+          if (statusLower !== reviewTarget && statusLower !== doneTarget) {
+            log.ticket(ticket.identifier, `Parent ${parentId} is "${parentStatus}" \u2014 waiting for "${config.linear.inReviewStatus}" or "${config.linear.doneStatus}"`);
+            return {
+              ticketId: ticket.identifier,
+              success: false,
+              error: `REQUEUE: parent ${parentId} is "${parentStatus}", not yet in review or done`,
+              iterations: 0
+            };
+          }
+          log.ticket(ticket.identifier, `Parent ${parentId} is "${parentStatus}" \u2014 proceeding`);
+        }
+      }
+    }
     const { owner: repoOwner, repo: repoName } = parseRepoUrl(ticket.repoUrl);
     const { created: repoCreated } = await ensureRepoExists(octokit, {
       owner: repoOwner,
@@ -1600,7 +1650,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;
@@ -1630,6 +1694,8 @@ async function executeTicket(opts) {
       }
     }
     execSync3(`git checkout -B ${branchName} --`, { cwd: workDir, stdio: "pipe" });
+    await claimTicket(linearClient, config, ticket.id);
+    log.ticket(ticket.identifier, `Claimed \u2014 ${ticket.repoUrl}`);
     container = await createContainer({
       dockerConfig: docker2,
       workspacePath: workDir,
@@ -1769,7 +1835,7 @@ async function executeTicket(opts) {
         }
       }
     }
-    await completeTicket(linearClient, config, ticket.id, `PR opened: ${pr.url}`);
+    await reviewTicket(linearClient, config, ticket.id, `PR opened: ${pr.url}`);
     await addBranchLabel(linearClient, ticket.id, branchName);
     log.success(`${ticket.identifier} done \u2014 ${pr.url}`);
     const result = {