runcastle 1.0.7 → 1.0.8

package/bin/runcastle.js

@@ -2116,11 +2116,14 @@ async function reattachWorktree(path, branch) {
     await git(path).checkout(branch);
   } catch {}
 }
+function tempBranchSlugSegment(slug) {
+  return slug.slice(0, TEMP_BRANCH_SLUG_MAX).replace(/-+$/, "");
+}
 function researchBranchName(slug, waypointSeq, unique) {
-  return `${RESEARCH_BRANCH_PREFIX}${slug}/${waypointSeq}-${unique}`;
+  return `${RESEARCH_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${waypointSeq}-${unique}`;
 }
 function ticketBranchName(slug, ticketSeq, unique) {
-  return `${TICKET_BRANCH_PREFIX}${slug}/${ticketSeq}-${unique}`;
+  return `${TICKET_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${ticketSeq}-${unique}`;
 }
 async function mergeTempBranch(repoPath, featureBranchName, tempBranch) {
   const g = git(repoPath);
@@ -2188,17 +2191,23 @@ async function cleanupTempBranches(repoPath) {
     const prefix = tempBranchPrefix(name);
     if (!prefix)
       continue;
-    const slug = name.slice(prefix.length).split("/")[0];
-    const target = featureBranch(slug);
+    const seg = name.slice(prefix.length).split("/")[0];
+    const targets = seg ? all.filter((b) => {
+      if (!b.startsWith("feature/"))
+        return false;
+      const featureSlug = b.slice("feature/".length);
+      return featureSlug === seg || tempBranchSlugSegment(featureSlug) === seg;
+    }) : [];
     let merged = false;
-    if (slug && all.includes(target)) {
+    for (const target of targets) {
       try {
         const tip = (await g.revparse([name])).trim();
         const base = (await g.raw(["merge-base", name, target])).trim();
-        merged = tip.length > 0 && tip === base;
-      } catch {
-        merged = false;
-      }
+        if (tip.length > 0 && tip === base) {
+          merged = true;
+          break;
+        }
+      } catch {}
     }
     if (merged && await deleteBranchDetachingWorktrees(g, repoPath, name)) {
       deleted.push(name);
@@ -2345,7 +2354,7 @@ async function mergeInProgress(g) {
     return false;
   }
 }
-var DOCS_PATHSPEC = "docs/features", DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", TEMP_BRANCH_PREFIXES, testDriveState;
+var DOCS_PATHSPEC = "docs/features", DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", TEMP_BRANCH_PREFIXES, TEMP_BRANCH_SLUG_MAX = 16, testDriveState;
 var init_git = __esm(() => {
   init_paths();
   init_errors();
@@ -2653,10 +2662,11 @@ function createSerialQueue() {
     return next;
   };
 }
-function firstLine(s) {
-  const i = s.indexOf(`
-`);
-  return (i === -1 ? s : s.slice(0, i)).trim();
+function errorHeadline(s) {
+  const lines = s.split(`
+`).map((l) => l.trim()).filter(Boolean);
+  const causes = lines.filter((l) => /^(fatal|error):/i.test(l));
+  return causes.at(-1) ?? lines[0] ?? "";
 }
 async function burnTickets(ctx, tickets2, execute, concurrency = 1) {
   const width = Math.max(1, Math.floor(concurrency));
@@ -2711,7 +2721,7 @@ async function burnTickets(ctx, tickets2, execute, concurrency = 1) {
       failTicket(seq, outcome.error, outcome.event);
       ctx.emitEvent({
         type: "ticket.failed",
-        message: `ticket ${t.seq} failed: ${firstLine(outcome.error)}`,
+        message: `ticket ${t.seq} failed: ${errorHeadline(outcome.error)}`,
         ticketId: t.id,
         data: { error: outcome.error }
       });
@@ -2919,7 +2929,7 @@ async function realExecuteTicketRun(ctx, ticket, config2, token, model, land) {
     }
     return {
       status: "failed",
-      error: `ticket ${ticket.seq} committed to ${tempBranch} but landing on ${feature.branch} failed: ${firstLine(detail)} \u2014 the branch is preserved for manual recovery`
+      error: `ticket ${ticket.seq} committed to ${tempBranch} but landing on ${feature.branch} failed: ${errorHeadline(detail)} \u2014 the branch is preserved for manual recovery`
     };
   }
   return outcome;
@@ -3004,15 +3014,16 @@ async function researchRun(ctx, deps) {
   }
   ctx.emitEvent({
     type: "research.failed",
-    message: `waypoint ${waypoint.seq} research failed: ${firstLine2(outcome.error)}`,
+    message: `waypoint ${waypoint.seq} research failed: ${errorHeadline2(outcome.error)}`,
     data: { waypointId: waypoint.id, error: outcome.error }
   });
   return { status: "failed", summary: outcome.error };
 }
-function firstLine2(s) {
-  const i = s.indexOf(`
-`);
-  return (i === -1 ? s : s.slice(0, i)).trim();
+function errorHeadline2(s) {
+  const lines = s.split(`
+`).map((l) => l.trim()).filter(Boolean);
+  const causes = lines.filter((l) => /^(fatal|error):/i.test(l));
+  return causes.at(-1) ?? lines[0] ?? "";
 }
 function createResearchStreamThrottle(emit2, opts = {}) {
   return createStreamThrottle((e) => emit2({ ...e, type: e.type.replace(/^burn\./, "research.") }), opts);
@@ -3089,7 +3100,7 @@ async function realExecuteResearchRun(ctx, waypoint, config2, token, model) {
     const detail = merge.error ?? "merge failed";
     ctx.emitEvent({
       type: merge.conflict ? "merge.conflict.needs-human" : "research.merge_failed",
-      message: merge.conflict ? `research branch ${tempBranch} conflicts with ${feature.branch} \u2014 merge it manually (git merge ${tempBranch}; resolve; git branch -D ${tempBranch}), then resolve the waypoint` : `could not land ${tempBranch} on ${feature.branch}: ${firstLine2(detail)} \u2014 the branch is preserved for manual recovery`,
+      message: merge.conflict ? `research branch ${tempBranch} conflicts with ${feature.branch} \u2014 merge it manually (git merge ${tempBranch}; resolve; git branch -D ${tempBranch}), then resolve the waypoint` : `could not land ${tempBranch} on ${feature.branch}: ${errorHeadline2(detail)} \u2014 the branch is preserved for manual recovery`,
       data: { tempBranch, featureBranch: feature.branch, conflict: merge.conflict ?? false, error: detail }
     });
     return {

package/index.js

@@ -2115,11 +2115,14 @@ async function reattachWorktree(path, branch) {
     await git(path).checkout(branch);
   } catch {}
 }
+function tempBranchSlugSegment(slug) {
+  return slug.slice(0, TEMP_BRANCH_SLUG_MAX).replace(/-+$/, "");
+}
 function researchBranchName(slug, waypointSeq, unique) {
-  return `${RESEARCH_BRANCH_PREFIX}${slug}/${waypointSeq}-${unique}`;
+  return `${RESEARCH_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${waypointSeq}-${unique}`;
 }
 function ticketBranchName(slug, ticketSeq, unique) {
-  return `${TICKET_BRANCH_PREFIX}${slug}/${ticketSeq}-${unique}`;
+  return `${TICKET_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${ticketSeq}-${unique}`;
 }
 async function mergeTempBranch(repoPath, featureBranchName, tempBranch) {
   const g = git(repoPath);
@@ -2187,17 +2190,23 @@ async function cleanupTempBranches(repoPath) {
     const prefix = tempBranchPrefix(name);
     if (!prefix)
       continue;
-    const slug = name.slice(prefix.length).split("/")[0];
-    const target = featureBranch(slug);
+    const seg = name.slice(prefix.length).split("/")[0];
+    const targets = seg ? all.filter((b) => {
+      if (!b.startsWith("feature/"))
+        return false;
+      const featureSlug = b.slice("feature/".length);
+      return featureSlug === seg || tempBranchSlugSegment(featureSlug) === seg;
+    }) : [];
     let merged = false;
-    if (slug && all.includes(target)) {
+    for (const target of targets) {
       try {
         const tip = (await g.revparse([name])).trim();
         const base = (await g.raw(["merge-base", name, target])).trim();
-        merged = tip.length > 0 && tip === base;
-      } catch {
-        merged = false;
-      }
+        if (tip.length > 0 && tip === base) {
+          merged = true;
+          break;
+        }
+      } catch {}
     }
     if (merged && await deleteBranchDetachingWorktrees(g, repoPath, name)) {
       deleted.push(name);
@@ -2344,7 +2353,7 @@ async function mergeInProgress(g) {
     return false;
   }
 }
-var DOCS_PATHSPEC = "docs/features", DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", TEMP_BRANCH_PREFIXES, testDriveState;
+var DOCS_PATHSPEC = "docs/features", DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", TEMP_BRANCH_PREFIXES, TEMP_BRANCH_SLUG_MAX = 16, testDriveState;
 var init_git = __esm(() => {
   init_paths();
   init_errors();
@@ -2652,10 +2661,11 @@ function createSerialQueue() {
     return next;
   };
 }
-function firstLine(s) {
-  const i = s.indexOf(`
-`);
-  return (i === -1 ? s : s.slice(0, i)).trim();
+function errorHeadline(s) {
+  const lines = s.split(`
+`).map((l) => l.trim()).filter(Boolean);
+  const causes = lines.filter((l) => /^(fatal|error):/i.test(l));
+  return causes.at(-1) ?? lines[0] ?? "";
 }
 async function burnTickets(ctx, tickets2, execute, concurrency = 1) {
   const width = Math.max(1, Math.floor(concurrency));
@@ -2710,7 +2720,7 @@ async function burnTickets(ctx, tickets2, execute, concurrency = 1) {
       failTicket(seq, outcome.error, outcome.event);
       ctx.emitEvent({
         type: "ticket.failed",
-        message: `ticket ${t.seq} failed: ${firstLine(outcome.error)}`,
+        message: `ticket ${t.seq} failed: ${errorHeadline(outcome.error)}`,
         ticketId: t.id,
         data: { error: outcome.error }
       });
@@ -2918,7 +2928,7 @@ async function realExecuteTicketRun(ctx, ticket, config2, token, model, land) {
     }
     return {
       status: "failed",
-      error: `ticket ${ticket.seq} committed to ${tempBranch} but landing on ${feature.branch} failed: ${firstLine(detail)} \u2014 the branch is preserved for manual recovery`
+      error: `ticket ${ticket.seq} committed to ${tempBranch} but landing on ${feature.branch} failed: ${errorHeadline(detail)} \u2014 the branch is preserved for manual recovery`
     };
   }
   return outcome;
@@ -3003,15 +3013,16 @@ async function researchRun(ctx, deps) {
   }
   ctx.emitEvent({
     type: "research.failed",
-    message: `waypoint ${waypoint.seq} research failed: ${firstLine2(outcome.error)}`,
+    message: `waypoint ${waypoint.seq} research failed: ${errorHeadline2(outcome.error)}`,
     data: { waypointId: waypoint.id, error: outcome.error }
   });
   return { status: "failed", summary: outcome.error };
 }
-function firstLine2(s) {
-  const i = s.indexOf(`
-`);
-  return (i === -1 ? s : s.slice(0, i)).trim();
+function errorHeadline2(s) {
+  const lines = s.split(`
+`).map((l) => l.trim()).filter(Boolean);
+  const causes = lines.filter((l) => /^(fatal|error):/i.test(l));
+  return causes.at(-1) ?? lines[0] ?? "";
 }
 function createResearchStreamThrottle(emit2, opts = {}) {
   return createStreamThrottle((e) => emit2({ ...e, type: e.type.replace(/^burn\./, "research.") }), opts);
@@ -3088,7 +3099,7 @@ async function realExecuteResearchRun(ctx, waypoint, config2, token, model) {
     const detail = merge.error ?? "merge failed";
     ctx.emitEvent({
       type: merge.conflict ? "merge.conflict.needs-human" : "research.merge_failed",
-      message: merge.conflict ? `research branch ${tempBranch} conflicts with ${feature.branch} \u2014 merge it manually (git merge ${tempBranch}; resolve; git branch -D ${tempBranch}), then resolve the waypoint` : `could not land ${tempBranch} on ${feature.branch}: ${firstLine2(detail)} \u2014 the branch is preserved for manual recovery`,
+      message: merge.conflict ? `research branch ${tempBranch} conflicts with ${feature.branch} \u2014 merge it manually (git merge ${tempBranch}; resolve; git branch -D ${tempBranch}), then resolve the waypoint` : `could not land ${tempBranch} on ${feature.branch}: ${errorHeadline2(detail)} \u2014 the branch is preserved for manual recovery`,
       data: { tempBranch, featureBranch: feature.branch, conflict: merge.conflict ?? false, error: detail }
     });
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcastle",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Burn tickets into shipped features with Claude Code.",
   "license": "MIT",
   "type": "module",