@autoclawd/autoclawd 1.1.24 → 1.1.26

package/README.md

@@ -37,7 +37,7 @@ autoclawd init
 autoclawd watch
 
 # Or run a single ticket
-autoclawd run RAH-123
+autoclawd run TEAM-123
 ```
 
 ## Commands
@@ -72,6 +72,7 @@ linear:
   statuses: [Todo]             # which statuses trigger execution
   assignToMe: false            # only process tickets assigned to you
   inProgressStatus: In Progress
+  inReviewStatus: In Review
   doneStatus: Done
 
 github:
@@ -100,6 +101,10 @@ safety:
   branchPrefix: "autoclawd/"   # all branches must start with this
   # maxFileChanges: 100        # fail if too many files changed
 
+integration:
+  crossBranchValidate: true    # trial-merge with sibling PRs (default: true)
+  maxCrossBranchIterations: 3  # fix attempts per sibling conflict (default: 3)
+
 # validate:                    # global validation commands
 #   - npm test
 #   - npm run lint
@@ -145,7 +150,7 @@ If the repo doesn't exist, autoclawd creates it automatically and pushes an init
 For dependent tasks where ticket B needs code from ticket A:
 
 1. **Ticket A** is processed normally (branches from main)
-2. After A completes, autoclawd adds a `base:autoclawd/RAH-100-...` label to it
+2. After A completes, autoclawd adds a `base:autoclawd/TEAM-100-...` label to it
 3. **Ticket B** gets that label → it branches from A's PR branch instead of main
 4. When A's PR merges, autoclawd auto-rebases B onto main and retargets the PR
 
@@ -157,7 +162,7 @@ autoclawd rebase owner/repo
 ### Setting up stacked diffs from the Claude app
 
 When using the Claude app with a Linear connector to create tickets, tell Claude:
-- "Task B depends on task A" → Claude adds the `base:autoclawd/RAH-{A}-...` label to B
+- "Task B depends on task A" → Claude adds the `base:autoclawd/TEAM-{A}-...` label to B
 
 ## Validation hooks
 
@@ -174,6 +179,7 @@ validate:
 - PRs start as **draft** while validation runs
 - If all pass → PR marked **ready** (+ auto-merge if enabled)
 - If still failing after max iterations → PR stays draft with failure details in the body
+- **Cross-branch validation**: after own validation passes, autoclawd trial-merges with sibling PRs on the same base branch and runs validation on the merged state — catching type conflicts and merge issues before review
 
 ## CI fix mode
 

package/dist/index.js

@@ -2080,7 +2080,7 @@ async function executeTicket(opts) {
         `| Model | ${agent.model} |`,
         "",
         "---",
-        "*Generated by [autoclawd](https://github.com/rahul-fnu/autoclawd)*"
+        "*Generated by [autoclawd](https://github.com/autoclawd/autoclawd)*"
       );
       return prBody.join("\n");
     };
@@ -3196,7 +3196,7 @@ program.command("stop").description("Stop the background watcher").action(() =>
     process.exit(1);
   }
 });
-program.command("run <ticket>").description("Run a single ticket (e.g. autoclawd run RAH-123)").option("-c, --config <path>", "Config file path").option("-v, --verbose", "Verbose logging").option("--dry-run", "Show what would happen without executing").option("--force", "Bypass completed-ticket check and re-run").action(async (ticketId, opts) => {
+program.command("run <ticket>").description("Run a single ticket (e.g. autoclawd run TEAM-123)").option("-c, --config <path>", "Config file path").option("-v, --verbose", "Verbose logging").option("--dry-run", "Show what would happen without executing").option("--force", "Bypass completed-ticket check and re-run").action(async (ticketId, opts) => {
   if (opts.verbose) setLogLevel("debug");
   enableFileLogging();
   const config = loadConfig(opts.config);
@@ -3268,12 +3268,12 @@ Expected: https://github.com/owner/repo/pull/123`);
     throw new Error(result.error ?? "Fix failed");
   }
 });
-program.command("retry [ticket]").description("Retry a failed ticket (e.g. autoclawd retry RAH-123)").option("-c, --config <path>", "Config file path").option("-v, --verbose", "Verbose logging").option("--last-failed", "Retry the most recent failed run").option("--all-failed", "Retry all failed runs (sequentially)").action(async (ticketArg, opts) => {
+program.command("retry [ticket]").description("Retry a failed ticket (e.g. autoclawd retry TEAM-123)").option("-c, --config <path>", "Config file path").option("-v, --verbose", "Verbose logging").option("--last-failed", "Retry the most recent failed run").option("--all-failed", "Retry all failed runs (sequentially)").action(async (ticketArg, opts) => {
   if (opts.verbose) setLogLevel("debug");
   enableFileLogging();
   if (!ticketArg && !opts.lastFailed && !opts.allFailed) {
     throw new Error(
-      "Provide a ticket ID, --last-failed, or --all-failed.\nUsage: autoclawd retry RAH-123 | --last-failed | --all-failed"
+      "Provide a ticket ID, --last-failed, or --all-failed.\nUsage: autoclawd retry TEAM-123 | --last-failed | --all-failed"
     );
   }
   const config = loadConfig(opts.config);