patchrelay 0.23.3 → 0.23.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "service": "patchrelay",
3
- "version": "0.23.3",
4
- "commit": "1c8c52702f63",
5
- "builtAt": "2026-03-26T13:46:43.445Z"
3
+ "version": "0.23.5",
4
+ "commit": "65abb29863f7",
5
+ "builtAt": "2026-03-26T16:08:25.878Z"
6
6
  }
@@ -141,6 +141,9 @@ export function runPatchRelayMigrations(connection) {
141
141
  addColumnIfMissing(connection, "issues", "description", "TEXT");
142
142
  addColumnIfMissing(connection, "issues", "priority", "INTEGER");
143
143
  addColumnIfMissing(connection, "issues", "estimate", "REAL");
144
+ // Zombie/stale recovery backoff
145
+ addColumnIfMissing(connection, "issues", "zombie_recovery_attempts", "INTEGER NOT NULL DEFAULT 0");
146
+ addColumnIfMissing(connection, "issues", "last_zombie_recovery_at", "TEXT");
144
147
  }
145
148
  function addColumnIfMissing(connection, table, column, definition) {
146
149
  const cols = connection.prepare(`PRAGMA table_info(${table})`).all();
package/dist/db.js CHANGED
@@ -173,6 +173,14 @@ export class PatchRelayDatabase {
173
173
  sets.push("pending_merge_prep = @pendingMergePrep");
174
174
  values.pendingMergePrep = params.pendingMergePrep ? 1 : 0;
175
175
  }
176
+ if (params.zombieRecoveryAttempts !== undefined) {
177
+ sets.push("zombie_recovery_attempts = @zombieRecoveryAttempts");
178
+ values.zombieRecoveryAttempts = params.zombieRecoveryAttempts;
179
+ }
180
+ if (params.lastZombieRecoveryAt !== undefined) {
181
+ sets.push("last_zombie_recovery_at = @lastZombieRecoveryAt");
182
+ values.lastZombieRecoveryAt = params.lastZombieRecoveryAt;
183
+ }
176
184
  this.connection.prepare(`UPDATE issues SET ${sets.join(", ")} WHERE project_id = @projectId AND linear_issue_id = @linearIssueId`).run(values);
177
185
  }
178
186
  else {
@@ -424,6 +432,8 @@ function mapIssueRow(row) {
424
432
  reviewFixAttempts: Number(row.review_fix_attempts ?? 0),
425
433
  mergePrepAttempts: Number(row.merge_prep_attempts ?? 0),
426
434
  pendingMergePrep: Boolean(row.pending_merge_prep),
435
+ zombieRecoveryAttempts: Number(row.zombie_recovery_attempts ?? 0),
436
+ ...(row.last_zombie_recovery_at !== null && row.last_zombie_recovery_at !== undefined ? { lastZombieRecoveryAt: String(row.last_zombie_recovery_at) } : {}),
427
437
  };
428
438
  }
429
439
  function mapRunRow(row) {
@@ -20,8 +20,12 @@ export const TERMINAL_STATES = new Set([
20
20
  const isOpen = (s) => !TERMINAL_STATES.has(s);
21
21
  const TRANSITION_RULES = [
22
22
  // ── Terminal events ────────────────────────────────────────────
23
- // pr_merged is unconditional PR is merged, we're done.
23
+ // pr_merged transitions to done only when no agent run is active.
24
+ // If an active run exists, suppress the transition — the run's
25
+ // completion handler will detect the merged PR and advance to done.
26
+ // This prevents orphaning agent work (e.g. pending follow-up fixes).
24
27
  { event: "pr_merged",
28
+ guard: (_, ctx) => ctx.activeRunId === undefined,
25
29
  to: "done" },
26
30
  // pr_closed during an active run is suppressed — Codex may reopen.
27
31
  // Without a guard match, the event produces no transition (undefined).
@@ -1,4 +1,4 @@
1
- import { resolveFactoryStateFromGitHub } from "./factory-state.js";
1
+ import { resolveFactoryStateFromGitHub, TERMINAL_STATES } from "./factory-state.js";
2
2
  import { normalizeGitHubWebhook, verifyGitHubWebhookSignature } from "./github-webhooks.js";
3
3
  import { buildAgentSessionPlanForIssue } from "./agent-session-plan.js";
4
4
  import { buildAgentSessionExternalUrls } from "./agent-session-presentation.js";
@@ -163,6 +163,12 @@ export class GitHubWebhookHandler {
163
163
  this.mergeQueue.advanceQueue(issue.projectId);
164
164
  }
165
165
  }
166
+ // Advance the merge queue even when the state transition was suppressed
167
+ // (e.g., pr_merged during an active run). The PR is factually merged —
168
+ // the next queued issue should not wait for the active run to finish.
169
+ if (!newState && event.triggerEvent === "pr_merged") {
170
+ this.mergeQueue.advanceQueue(issue.projectId);
171
+ }
166
172
  }
167
173
  // Re-read issue after all upserts so reactive run logic sees current state
168
174
  const freshIssue = this.db.getIssue(issue.projectId, issue.linearIssueId) ?? issue;
@@ -196,6 +202,10 @@ export class GitHubWebhookHandler {
196
202
  // Don't trigger if there's already an active run
197
203
  if (issue.activeRunId !== undefined)
198
204
  return;
205
+ // Don't trigger on terminal issues — late-arriving webhooks (e.g.
206
+ // merge_group_failed after pr_merged) must not resurrect done issues.
207
+ if (TERMINAL_STATES.has(issue.factoryState))
208
+ return;
199
209
  if (event.triggerEvent === "check_failed" && issue.prState === "open") {
200
210
  this.db.upsertIssue({
201
211
  projectId: issue.projectId,
@@ -3,7 +3,8 @@ import { execCommand } from "./utils.js";
3
3
  const DEFAULT_MERGE_PREP_BUDGET = 3;
4
4
  /**
5
5
  * Merge queue steward — keeps PatchRelay-managed PR branches up to date
6
- * with the base branch and enables auto-merge so GitHub merges when CI passes.
6
+ * with the base branch via rebase and enables auto-merge so GitHub merges
7
+ * when CI passes. Uses rebase (not merge) to maintain linear history.
7
8
  *
8
9
  * Serialization: all calls are routed through the issue queue, and
9
10
  * prepareForMerge checks front-of-queue before acting. The issue processor
@@ -28,10 +29,10 @@ export class MergeQueue {
28
29
  /**
29
30
  * Prepare the front-of-queue issue for merge:
30
31
  * 1. Enable auto-merge
31
- * 2. Update the branch to latest base (git merge)
32
- * 3. Push (triggers CI; auto-merge fires when CI passes)
32
+ * 2. Rebase the branch onto latest base
33
+ * 3. Force-push (triggers CI; auto-merge fires when CI passes)
33
34
  *
34
- * On conflict: abort merge, transition to repairing_queue, enqueue queue_repair.
35
+ * On conflict: abort rebase, transition to repairing_queue, enqueue queue_repair.
35
36
  * On transient failure: leave pendingMergePrep set so the next event retries.
36
37
  */
37
38
  async prepareForMerge(issue, project) {
@@ -88,20 +89,41 @@ export class MergeQueue {
88
89
  this.onLinearActivity?.(issue, buildMergePrepActivity("fetch_retry"), { ephemeral: true });
89
90
  return;
90
91
  }
91
- // Merge base branch into the PR branch
92
- const mergeResult = await execCommand(gitBin, ["-C", issue.worktreePath, "merge", `origin/${baseBranch}`, "--no-edit"], {
93
- timeoutMs: 60_000,
92
+ // Check if rebase is needed: is HEAD already on top of origin/baseBranch?
93
+ const mergeBaseResult = await execCommand(gitBin, ["-C", issue.worktreePath, "merge-base", "--is-ancestor", `origin/${baseBranch}`, "HEAD"], {
94
+ timeoutMs: 10_000,
95
+ });
96
+ if (mergeBaseResult.exitCode === 0) {
97
+ this.logger.debug({ issueKey: issue.issueKey }, "Merge prep: branch already up to date");
98
+ this.db.upsertIssue({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, pendingMergePrep: false, mergePrepAttempts: 0 });
99
+ if (!autoMergeOk) {
100
+ this.feed?.publish({
101
+ level: "warn",
102
+ kind: "workflow",
103
+ issueKey: issue.issueKey,
104
+ projectId: issue.projectId,
105
+ stage: "awaiting_queue",
106
+ status: "blocked",
107
+ summary: "Branch up to date but auto-merge not enabled — check gh auth and repo settings",
108
+ });
109
+ this.onLinearActivity?.(issue, buildMergePrepActivity("blocked"));
110
+ }
111
+ return;
112
+ }
113
+ // Rebase onto latest base branch (clean linear history, no merge commits)
114
+ const rebaseResult = await execCommand(gitBin, ["-C", issue.worktreePath, "rebase", `origin/${baseBranch}`], {
115
+ timeoutMs: 120_000,
94
116
  });
95
- if (mergeResult.exitCode !== 0) {
117
+ if (rebaseResult.exitCode !== 0) {
96
118
  // Conflict — abort and trigger queue_repair
97
- await execCommand(gitBin, ["-C", issue.worktreePath, "merge", "--abort"], { timeoutMs: 10_000 });
98
- this.logger.info({ issueKey: issue.issueKey }, "Merge prep: conflict detected, triggering queue repair");
119
+ await execCommand(gitBin, ["-C", issue.worktreePath, "rebase", "--abort"], { timeoutMs: 10_000 });
120
+ this.logger.info({ issueKey: issue.issueKey }, "Merge prep: rebase conflict detected, triggering queue repair");
99
121
  this.db.upsertIssue({
100
122
  projectId: issue.projectId,
101
123
  linearIssueId: issue.linearIssueId,
102
124
  factoryState: "repairing_queue",
103
125
  pendingRunType: "queue_repair",
104
- pendingRunContextJson: JSON.stringify({ failureReason: "merge_conflict" }),
126
+ pendingRunContextJson: JSON.stringify({ failureReason: "rebase_conflict" }),
105
127
  pendingMergePrep: false,
106
128
  });
107
129
  this.enqueueIssue(issue.projectId, issue.linearIssueId);
@@ -112,31 +134,13 @@ export class MergeQueue {
112
134
  projectId: issue.projectId,
113
135
  stage: "repairing_queue",
114
136
  status: "conflict",
115
- summary: `Merge conflict with ${baseBranch} — queue repair enqueued`,
137
+ summary: `Rebase conflict with ${baseBranch} — queue repair enqueued`,
116
138
  });
117
139
  this.onLinearActivity?.(issue, buildMergePrepActivity("conflict"));
118
140
  return;
119
141
  }
120
- // Check if merge was a no-op (already up to date)
121
- if (mergeResult.stdout?.includes("Already up to date")) {
122
- this.logger.debug({ issueKey: issue.issueKey }, "Merge prep: branch already up to date");
123
- this.db.upsertIssue({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, pendingMergePrep: false, mergePrepAttempts: 0 });
124
- if (!autoMergeOk) {
125
- this.feed?.publish({
126
- level: "warn",
127
- kind: "workflow",
128
- issueKey: issue.issueKey,
129
- projectId: issue.projectId,
130
- stage: "awaiting_queue",
131
- status: "blocked",
132
- summary: "Branch up to date but auto-merge not enabled — check gh auth and repo settings",
133
- });
134
- this.onLinearActivity?.(issue, buildMergePrepActivity("blocked"));
135
- }
136
- return;
137
- }
138
- // Push the merged branch
139
- const pushResult = await execCommand(gitBin, ["-C", issue.worktreePath, "push"], {
142
+ // Push the rebased branch (force-with-lease to protect against concurrent changes)
143
+ const pushResult = await execCommand(gitBin, ["-C", issue.worktreePath, "push", "--force-with-lease"], {
140
144
  timeoutMs: 60_000,
141
145
  });
142
146
  if (pushResult.exitCode !== 0) {
@@ -145,7 +149,7 @@ export class MergeQueue {
145
149
  this.onLinearActivity?.(issue, buildMergePrepActivity("push_retry"), { ephemeral: true });
146
150
  return;
147
151
  }
148
- this.logger.info({ issueKey: issue.issueKey, baseBranch }, "Merge prep: branch updated and pushed");
152
+ this.logger.info({ issueKey: issue.issueKey, baseBranch }, "Merge prep: rebased and pushed");
149
153
  this.db.upsertIssue({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, pendingMergePrep: false, mergePrepAttempts: 0 });
150
154
  this.feed?.publish({
151
155
  level: "info",
@@ -154,7 +158,7 @@ export class MergeQueue {
154
158
  projectId: issue.projectId,
155
159
  stage: "awaiting_queue",
156
160
  status: "prepared",
157
- summary: `Branch updated to latest ${baseBranch} — CI will run`,
161
+ summary: `Branch rebased onto latest ${baseBranch} — CI will run`,
158
162
  });
159
163
  this.onLinearActivity?.(issue, buildMergePrepActivity("branch_update", baseBranch), { ephemeral: true });
160
164
  }
@@ -1,6 +1,6 @@
1
1
  import { existsSync, readFileSync } from "node:fs";
2
2
  import path from "node:path";
3
- import { ACTIVE_RUN_STATES } from "./factory-state.js";
3
+ import { ACTIVE_RUN_STATES, TERMINAL_STATES } from "./factory-state.js";
4
4
  import { buildHookEnv, runProjectHook } from "./hook-runner.js";
5
5
  import { buildAgentSessionPlanForIssue, } from "./agent-session-plan.js";
6
6
  import { buildStageReport, countEventMethods, extractTurnId, resolveRunCompletionStatus, summarizeCurrentThread, } from "./run-reporting.js";
@@ -12,6 +12,8 @@ import { execCommand } from "./utils.js";
12
12
  const DEFAULT_CI_REPAIR_BUDGET = 3;
13
13
  const DEFAULT_QUEUE_REPAIR_BUDGET = 3;
14
14
  const DEFAULT_REVIEW_FIX_BUDGET = 3;
15
+ const DEFAULT_ZOMBIE_RECOVERY_BUDGET = 5;
16
+ const ZOMBIE_RECOVERY_BASE_DELAY_MS = 15_000; // 15s, 30s, 60s, 120s, 240s
15
17
  function slugify(value) {
16
18
  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
17
19
  }
@@ -191,7 +193,10 @@ export class RunOrchestrator {
191
193
  // Freshen the worktree: fetch + rebase onto latest base branch.
192
194
  // This prevents branch contamination when local main has drifted
193
195
  // and avoids scope-bundling review rejections from stale commits.
194
- await this.freshenWorktree(worktreePath, project, issue);
196
+ // Skip for queue_repair — its entire purpose is to resolve rebase conflicts.
197
+ if (runType !== "queue_repair") {
198
+ await this.freshenWorktree(worktreePath, project, issue);
199
+ }
195
200
  // Run prepare-worktree hook
196
201
  const hookEnv = buildHookEnv(issue.issueKey ?? issue.linearIssueId, branchName, runType, worktreePath);
197
202
  const prepareResult = await runProjectHook(project.repoPath, "prepare-worktree", { cwd: worktreePath, env: hookEnv });
@@ -244,6 +249,15 @@ export class RunOrchestrator {
244
249
  throw error;
245
250
  }
246
251
  this.db.updateRunThread(run.id, { threadId, turnId });
252
+ // Reset zombie recovery counter — this run started successfully
253
+ if (issue.zombieRecoveryAttempts > 0) {
254
+ this.db.upsertIssue({
255
+ projectId: item.projectId,
256
+ linearIssueId: item.issueId,
257
+ zombieRecoveryAttempts: 0,
258
+ lastZombieRecoveryAt: null,
259
+ });
260
+ }
247
261
  this.logger.info({ issueKey: issue.issueKey, runType, threadId, turnId }, `Started ${runType} run`);
248
262
  // Emit Linear activity + plan
249
263
  const freshIssue = this.db.getIssue(item.projectId, item.issueId) ?? issue;
@@ -286,11 +300,14 @@ export class RunOrchestrator {
286
300
  // Rebase onto latest base
287
301
  const rebaseResult = await execCommand(gitBin, ["-C", worktreePath, "rebase", `origin/${baseBranch}`], { timeoutMs: 120_000 });
288
302
  if (rebaseResult.exitCode !== 0) {
289
- // Abort the failed rebase and restore state
303
+ // Abort the failed rebase and restore state — then let the agent run
304
+ // proceed. The agent can resolve the conflict itself (the workflow
305
+ // prompt tells it to rebase and handle conflicts).
290
306
  await execCommand(gitBin, ["-C", worktreePath, "rebase", "--abort"], { timeoutMs: 10_000 });
291
307
  if (didStash)
292
308
  await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
293
- throw new Error(`Pre-run rebase onto origin/${baseBranch} failed with conflicts escalate or resolve manually`);
309
+ this.logger.warn({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebase conflict, agent will resolve");
310
+ return;
294
311
  }
295
312
  // Push the rebased branch (force-with-lease to protect against concurrent pushes)
296
313
  const pushResult = await execCommand(gitBin, ["-C", worktreePath, "push", "--force-with-lease"], { timeoutMs: 60_000 });
@@ -563,26 +580,91 @@ export class RunOrchestrator {
563
580
  this.enqueueIssue(issue.projectId, issue.linearIssueId);
564
581
  }
565
582
  }
583
+ /**
584
+ * After a zombie/stale run is cleared, decide whether to re-enqueue
585
+ * or escalate. Checks: PR already merged → done; budget exhausted →
586
+ * escalate; backoff delay not elapsed → skip.
587
+ */
588
+ recoverOrEscalate(issue, runType, reason) {
589
+ // Re-read issue after the run was cleared (activeRunId is now null)
590
+ const fresh = this.db.getIssue(issue.projectId, issue.linearIssueId);
591
+ if (!fresh)
592
+ return;
593
+ // If PR already merged, transition to done — no retry needed
594
+ if (fresh.prState === "merged") {
595
+ this.db.upsertIssue({
596
+ projectId: fresh.projectId,
597
+ linearIssueId: fresh.linearIssueId,
598
+ factoryState: "done",
599
+ zombieRecoveryAttempts: 0,
600
+ lastZombieRecoveryAt: null,
601
+ });
602
+ this.logger.info({ issueKey: fresh.issueKey, reason }, "Recovery: PR already merged — transitioning to done");
603
+ return;
604
+ }
605
+ // Budget check
606
+ const attempts = fresh.zombieRecoveryAttempts + 1;
607
+ if (attempts > DEFAULT_ZOMBIE_RECOVERY_BUDGET) {
608
+ this.db.upsertIssue({
609
+ projectId: fresh.projectId,
610
+ linearIssueId: fresh.linearIssueId,
611
+ factoryState: "escalated",
612
+ });
613
+ this.logger.warn({ issueKey: fresh.issueKey, attempts, reason }, "Recovery: budget exhausted — escalating");
614
+ this.feed?.publish({
615
+ level: "error",
616
+ kind: "workflow",
617
+ issueKey: fresh.issueKey,
618
+ projectId: fresh.projectId,
619
+ stage: "escalated",
620
+ status: "budget_exhausted",
621
+ summary: `${reason} recovery failed after ${DEFAULT_ZOMBIE_RECOVERY_BUDGET} attempts`,
622
+ });
623
+ return;
624
+ }
625
+ // Exponential backoff — skip if delay hasn't elapsed
626
+ if (fresh.lastZombieRecoveryAt) {
627
+ const elapsed = Date.now() - new Date(fresh.lastZombieRecoveryAt).getTime();
628
+ const delay = ZOMBIE_RECOVERY_BASE_DELAY_MS * Math.pow(2, fresh.zombieRecoveryAttempts);
629
+ if (elapsed < delay) {
630
+ this.logger.debug({ issueKey: fresh.issueKey, attempts: fresh.zombieRecoveryAttempts, delay, elapsed }, "Recovery: backoff not elapsed, skipping");
631
+ return;
632
+ }
633
+ }
634
+ // Re-enqueue with backoff tracking
635
+ this.db.upsertIssue({
636
+ projectId: fresh.projectId,
637
+ linearIssueId: fresh.linearIssueId,
638
+ pendingRunType: runType,
639
+ pendingRunContextJson: null,
640
+ zombieRecoveryAttempts: attempts,
641
+ lastZombieRecoveryAt: new Date().toISOString(),
642
+ });
643
+ this.enqueueIssue(fresh.projectId, fresh.linearIssueId);
644
+ this.logger.info({ issueKey: fresh.issueKey, attempts, reason }, "Recovery: re-enqueued with backoff");
645
+ }
566
646
  async reconcileRun(run) {
567
647
  const issue = this.db.getIssue(run.projectId, run.linearIssueId);
568
648
  if (!issue)
569
649
  return;
650
+ // If the issue reached a terminal state while this run was active
651
+ // (e.g. pr_merged processed, DB manually edited), just release the run.
652
+ if (TERMINAL_STATES.has(issue.factoryState)) {
653
+ this.db.transaction(() => {
654
+ this.db.finishRun(run.id, { status: "released", failureReason: "Issue reached terminal state during active run" });
655
+ this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
656
+ });
657
+ this.logger.info({ issueKey: issue.issueKey, runId: run.id, factoryState: issue.factoryState }, "Reconciliation: released run on terminal issue");
658
+ return;
659
+ }
570
660
  // Zombie run: claimed in DB but Codex never started (no thread).
571
- // This happens when the service crashes between claiming the run
572
- // and starting the Codex turn. Re-enqueue instead of failing.
573
661
  if (!run.threadId) {
574
- this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType }, "Zombie run detected (no thread) — clearing and re-enqueueing");
662
+ this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType }, "Zombie run detected (no thread)");
575
663
  this.db.transaction(() => {
576
664
  this.db.finishRun(run.id, { status: "failed", failureReason: "Zombie: never started (no thread after restart)" });
577
- this.db.upsertIssue({
578
- projectId: run.projectId,
579
- linearIssueId: run.linearIssueId,
580
- activeRunId: null,
581
- pendingRunType: run.runType,
582
- pendingRunContextJson: null,
583
- });
665
+ this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
584
666
  });
585
- this.enqueueIssue(run.projectId, run.linearIssueId);
667
+ this.recoverOrEscalate(issue, run.runType, "zombie");
586
668
  return;
587
669
  }
588
670
  // Read Codex state — thread may not exist after app-server restart.
@@ -591,18 +673,12 @@ export class RunOrchestrator {
591
673
  thread = await this.readThreadWithRetry(run.threadId);
592
674
  }
593
675
  catch {
594
- this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType, threadId: run.threadId }, "Stale thread during reconciliation — clearing and re-enqueueing");
676
+ this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType, threadId: run.threadId }, "Stale thread during reconciliation");
595
677
  this.db.transaction(() => {
596
678
  this.db.finishRun(run.id, { status: "failed", failureReason: "Stale thread after restart" });
597
- this.db.upsertIssue({
598
- projectId: run.projectId,
599
- linearIssueId: run.linearIssueId,
600
- activeRunId: null,
601
- pendingRunType: run.runType,
602
- pendingRunContextJson: null,
603
- });
679
+ this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
604
680
  });
605
- this.enqueueIssue(run.projectId, run.linearIssueId);
681
+ this.recoverOrEscalate(issue, run.runType, "stale_thread");
606
682
  return;
607
683
  }
608
684
  // Check Linear state (non-fatal — token refresh may fail)
@@ -622,6 +698,15 @@ export class RunOrchestrator {
622
698
  factoryState: "done",
623
699
  });
624
700
  });
701
+ this.feed?.publish({
702
+ level: "info",
703
+ kind: "stage",
704
+ issueKey: issue.issueKey,
705
+ projectId: run.projectId,
706
+ stage: "done",
707
+ status: "reconciled",
708
+ summary: `Linear state ${stopState.stateName} \u2192 done`,
709
+ });
625
710
  return;
626
711
  }
627
712
  }
@@ -670,6 +755,17 @@ export class RunOrchestrator {
670
755
  ...(postRunState === "awaiting_queue" ? { pendingMergePrep: true } : {}),
671
756
  });
672
757
  });
758
+ if (postRunState) {
759
+ this.feed?.publish({
760
+ level: "info",
761
+ kind: "turn",
762
+ issueKey: issue.issueKey,
763
+ projectId: run.projectId,
764
+ stage: run.runType,
765
+ status: "completed",
766
+ summary: `Reconciliation: ${run.runType} completed \u2192 ${postRunState}`,
767
+ });
768
+ }
673
769
  if (postRunState === "awaiting_queue") {
674
770
  this.enqueueIssue(run.projectId, run.linearIssueId);
675
771
  }
package/dist/service.js CHANGED
@@ -342,6 +342,15 @@ export class PatchRelayService {
342
342
  pendingRunType: runType,
343
343
  factoryState: factoryState,
344
344
  });
345
+ this.feed.publish({
346
+ level: "info",
347
+ kind: "stage",
348
+ issueKey: issue.issueKey,
349
+ projectId: issue.projectId,
350
+ stage: factoryState,
351
+ status: "retry",
352
+ summary: `Retry queued: ${runType}`,
353
+ });
345
354
  this.runtime.enqueueIssue(issue.projectId, issue.linearIssueId);
346
355
  return { issueKey, runType };
347
356
  }
@@ -12,7 +12,13 @@ export class WorktreeManager {
12
12
  return;
13
13
  }
14
14
  await ensureDir(path.dirname(worktreePath));
15
- await execCommand(this.config.runner.gitBin, ["-C", repoPath, "worktree", "add", "--force", "-B", branchName, worktreePath, "HEAD"], {
15
+ // Fetch latest main so the branch forks from a clean, up-to-date base.
16
+ // This prevents branch contamination when local HEAD has drifted.
17
+ // freshenWorktree in run-orchestrator acts as a secondary safety net.
18
+ await execCommand(this.config.runner.gitBin, ["-C", repoPath, "fetch", "origin", "main"], {
19
+ timeoutMs: 60_000,
20
+ });
21
+ await execCommand(this.config.runner.gitBin, ["-C", repoPath, "worktree", "add", "--force", "-B", branchName, worktreePath, "origin/main"], {
16
22
  timeoutMs: 120_000,
17
23
  });
18
24
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "patchrelay",
3
- "version": "0.23.3",
3
+ "version": "0.23.5",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "repository": {