claude-teammate 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-teammate",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "CLI bootstrapper for Claude Teammate.",
   "license": "MIT",
   "type": "module",

package/src/commands/worker.js

@@ -32,6 +32,7 @@ import {
   listMissingRepoPaths,
   parseGitHubRepoUrl,
   prepareRepoForBranch,
+  RepoCheckoutNotReadyError,
   validateOrEnsureLocalRepo
 } from "../repo.js";
 import {
@@ -206,7 +207,18 @@ export async function runWorkerCommand({ projectRoot }) {
       let trackedIssueCount = 0;
 
       for (const repo of repos) {
-        repo.local_path = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+        try {
+          repo.local_path = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+        } catch (error) {
+          if (isRepoCheckoutNotReadyError(error)) {
+            await logger.info("Skipping GitHub repo until checkout is ready", {
+              repo: repo.url,
+              localPath: error.localPath || repo.local_path
+            });
+            continue;
+          }
+          throw error;
+        }
         const issues = await github.listIssues(repo.url);
         const botIssues = issues.filter((issue) => isGitHubBotAuthor(issue.author, githubBotUser));
         trackedIssueCount += botIssues.length;
@@ -258,7 +270,18 @@ export async function runWorkerCommand({ projectRoot }) {
       let trackedPrCount = 0;
 
       for (const repo of repos) {
-        repo.local_path = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+        try {
+          repo.local_path = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+        } catch (error) {
+          if (isRepoCheckoutNotReadyError(error)) {
+            await logger.info("Skipping draft PR repo until checkout is ready", {
+              repo: repo.url,
+              localPath: error.localPath || repo.local_path
+            });
+            continue;
+          }
+          throw error;
+        }
 
         const pullRequests = await github.listPullRequests(repo.url);
         const botPullRequests = pullRequests.filter(
@@ -403,7 +426,22 @@ async function processJiraIssue({ issue, jira, github, botUser, config, projectR
 
     let repoCheckoutUpdated = false;
     for (const repo of epicMemory.repos) {
-      const validatedLocalPath = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+      let validatedLocalPath;
+      try {
+        validatedLocalPath = await validateOrEnsureLocalRepo(repo.url, runtimePaths.reposDir, repo.local_path);
+      } catch (error) {
+        if (isRepoCheckoutNotReadyError(error)) {
+          issueMemory.last_error = `Repository checkout is not ready yet for ${repo.url}. The worker will retry automatically.`;
+          issueMemory = await saveIssueMemory(issueMemoryRecord.filePath, detail, issueMemory);
+          await logger.info("Skipping Jira issue until checkout is ready", {
+            issue: detail.key,
+            repo: repo.url,
+            localPath: error.localPath || repo.local_path
+          });
+          return buildIssueState(detail, epicMemory, issueMemory, null, issueMemory.last_error);
+        }
+        throw error;
+      }
       if (validatedLocalPath !== repo.local_path) {
         repo.local_path = validatedLocalPath;
         repoCheckoutUpdated = true;
@@ -2153,12 +2191,12 @@ export function collectRequiredRepoPathsForPullRequest(pullRequestBody, epicMemo
       continue;
     }
 
-    const copyFromMatch = /copy\s+`?([A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)*\/?)`?\s+from\s+`?([A-Za-z0-9_.-]+)`?/iu.exec(trimmedLine);
+    const copyFromMatch = /copy\s+`?([A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)*)\/?`?\s+from\s+`?([A-Za-z0-9_.-]+)`?/iu.exec(trimmedLine);
     if (copyFromMatch) {
       appendRequirement(copyFromMatch[2], copyFromMatch[1]);
     }
 
-    const copyPathMatch = /copy\s+`?([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)*\/?)`?/iu.exec(trimmedLine);
+    const copyPathMatch = /copy\s+`?([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)*)\/?`?/iu.exec(trimmedLine);
     if (copyPathMatch) {
       appendRequirement(copyPathMatch[1], copyPathMatch[2]);
     }
@@ -2169,14 +2207,17 @@ export function collectRequiredRepoPathsForPullRequest(pullRequestBody, epicMemo
     }
 
     const [, repoIdentifier, body] = labeledLineMatch;
-    for (const pathMatch of body.matchAll(/\b([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)*\/?)\b/gu)) {
-      appendRequirement(repoIdentifier, pathMatch[1]);
-    }
-
     const sourceModuleMatch = /\b([A-Za-z0-9_]+)\b(?=\s+is the source module\b)/iu.exec(body);
     if (sourceModuleMatch) {
       appendRequirement(repoIdentifier, sourceModuleMatch[1]);
     }
+
+    const templatePathMatch = /\b([A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+){2,})\/?\b/gu;
+    for (const match of body.matchAll(templatePathMatch)) {
+      if (looksLikeRepoRelativePath(match[1])) {
+        appendRequirement(repoIdentifier, match[1]);
+      }
+    }
   }
 
   return requirements;
@@ -2234,6 +2275,17 @@ function normalizeRepoAlias(value) {
   return String(value || "").trim().toLowerCase();
 }
 
+function isRepoCheckoutNotReadyError(error) {
+  return Boolean(
+    error &&
+    typeof error === "object" &&
+    (
+      error instanceof RepoCheckoutNotReadyError ||
+      error.code === "REPO_CHECKOUT_NOT_READY"
+    )
+  );
+}
+
 function normalizeRepoRelativePath(value) {
   const normalized = String(value || "").trim().replace(/^\/+/u, "").replace(/\/+$/u, "");
   if (!normalized || normalized.startsWith("http://") || normalized.startsWith("https://")) {
@@ -2242,6 +2294,20 @@ function normalizeRepoRelativePath(value) {
   return normalized;
 }
 
+function looksLikeRepoRelativePath(value) {
+  const normalized = normalizeRepoRelativePath(value);
+  if (!normalized) {
+    return false;
+  }
+
+  const segments = normalized.split("/");
+  if (segments.length < 2) {
+    return false;
+  }
+
+  return segments.length >= 3 || normalized.includes("_") || normalized.includes(".");
+}
+
 function formatRepoAccessBlocker({ repoEntry, repoUrl, reason, missingPaths = [] }) {
   const repoLabel = repoEntry?.local_path || repoEntry?.url || "unknown repo";
 

package/src/repo.js

@@ -1,4 +1,4 @@
-import { access, mkdir } from "node:fs/promises";
+import { access, mkdir, readdir } from "node:fs/promises";
 import path from "node:path";
 import { execFile } from "node:child_process";
 import process from "node:process";
@@ -6,6 +6,16 @@ import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
 
+export class RepoCheckoutNotReadyError extends Error {
+  constructor(message, details = {}) {
+    super(message);
+    this.name = "RepoCheckoutNotReadyError";
+    this.code = "REPO_CHECKOUT_NOT_READY";
+    this.repoUrl = details.repoUrl || "";
+    this.localPath = details.localPath || "";
+  }
+}
+
 export async function ensureLocalRepo(repoUrl, reposDir) {
   const repo = parseGitHubRepoUrl(repoUrl);
   const checkoutPath = path.join(reposDir, repo.owner, repo.name);
@@ -28,6 +38,19 @@ export async function validateOrEnsureLocalRepo(repoUrl, reposDir, localPath = "
     return candidatePath;
   }
 
+  if (candidatePath && await pathExists(candidatePath)) {
+    const entries = await safeReadDir(candidatePath);
+    if (entries.length > 0) {
+      throw new RepoCheckoutNotReadyError(
+        `Repository checkout is not ready yet at ${candidatePath}.`,
+        {
+          repoUrl,
+          localPath: candidatePath
+        }
+      );
+    }
+  }
+
   return ensureLocalRepo(repoUrl, reposDir);
 }
 
@@ -114,6 +137,14 @@ async function pathExists(targetPath) {
   }
 }
 
+async function safeReadDir(targetPath) {
+  try {
+    return await readdir(targetPath);
+  } catch {
+    return [];
+  }
+}
+
 async function isUsableGitCheckout(repoPath) {
   if (!repoPath) {
     return false;