oh-my-codex 0.21.47 → 0.22.0

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.
Files changed (176) hide show
  1. package/Cargo.lock +6 -6
  2. package/Cargo.toml +1 -1
  3. package/README.md +15 -0
  4. package/crates/omx-mux/src/herdr.rs +481 -0
  5. package/crates/omx-mux/src/lib.rs +5 -0
  6. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js +707 -47
  7. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js.map +1 -1
  8. package/dist/cli/__tests__/session-compare.test.d.ts +2 -0
  9. package/dist/cli/__tests__/session-compare.test.d.ts.map +1 -0
  10. package/dist/cli/__tests__/session-compare.test.js +183 -0
  11. package/dist/cli/__tests__/session-compare.test.js.map +1 -0
  12. package/dist/cli/__tests__/setup-install-mode.test.js +7 -1
  13. package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
  14. package/dist/cli/__tests__/team.test.js +8 -0
  15. package/dist/cli/__tests__/team.test.js.map +1 -1
  16. package/dist/cli/plugin-marketplace.d.ts.map +1 -1
  17. package/dist/cli/plugin-marketplace.js +328 -142
  18. package/dist/cli/plugin-marketplace.js.map +1 -1
  19. package/dist/cli/session-compare.d.ts +11 -0
  20. package/dist/cli/session-compare.d.ts.map +1 -0
  21. package/dist/cli/session-compare.js +172 -0
  22. package/dist/cli/session-compare.js.map +1 -0
  23. package/dist/cli/session-search.d.ts.map +1 -1
  24. package/dist/cli/session-search.js +7 -0
  25. package/dist/cli/session-search.js.map +1 -1
  26. package/dist/cli/team.d.ts.map +1 -1
  27. package/dist/cli/team.js +2 -0
  28. package/dist/cli/team.js.map +1 -1
  29. package/dist/config/__tests__/multiplexer.test.d.ts +2 -0
  30. package/dist/config/__tests__/multiplexer.test.d.ts.map +1 -0
  31. package/dist/config/__tests__/multiplexer.test.js +118 -0
  32. package/dist/config/__tests__/multiplexer.test.js.map +1 -0
  33. package/dist/config/multiplexer.d.ts +29 -0
  34. package/dist/config/multiplexer.d.ts.map +1 -0
  35. package/dist/config/multiplexer.js +91 -0
  36. package/dist/config/multiplexer.js.map +1 -0
  37. package/dist/hooks/__tests__/sunset-routing-contract.test.js +4 -2
  38. package/dist/hooks/__tests__/sunset-routing-contract.test.js.map +1 -1
  39. package/dist/scripts/__tests__/codex-native-hook.test.js +281 -1
  40. package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
  41. package/dist/scripts/__tests__/generate-release-body.test.js +142 -5
  42. package/dist/scripts/__tests__/generate-release-body.test.js.map +1 -1
  43. package/dist/scripts/codex-native-hook.d.ts.map +1 -1
  44. package/dist/scripts/codex-native-hook.js +8 -2
  45. package/dist/scripts/codex-native-hook.js.map +1 -1
  46. package/dist/scripts/generate-release-body.d.ts.map +1 -1
  47. package/dist/scripts/generate-release-body.js +14 -0
  48. package/dist/scripts/generate-release-body.js.map +1 -1
  49. package/dist/scripts/notify-hook/team-worker-lease.d.ts +15 -0
  50. package/dist/scripts/notify-hook/team-worker-lease.d.ts.map +1 -0
  51. package/dist/scripts/notify-hook/team-worker-lease.js +63 -0
  52. package/dist/scripts/notify-hook/team-worker-lease.js.map +1 -0
  53. package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts +1 -0
  54. package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts.map +1 -1
  55. package/dist/scripts/notify-hook/team-worker-posttooluse.js +16 -5
  56. package/dist/scripts/notify-hook/team-worker-posttooluse.js.map +1 -1
  57. package/dist/scripts/notify-hook/team-worker.d.ts +12 -1
  58. package/dist/scripts/notify-hook/team-worker.d.ts.map +1 -1
  59. package/dist/scripts/notify-hook/team-worker.js +16 -4
  60. package/dist/scripts/notify-hook/team-worker.js.map +1 -1
  61. package/dist/session-history/__tests__/compare.test.d.ts +2 -0
  62. package/dist/session-history/__tests__/compare.test.d.ts.map +1 -0
  63. package/dist/session-history/__tests__/compare.test.js +257 -0
  64. package/dist/session-history/__tests__/compare.test.js.map +1 -0
  65. package/dist/session-history/compare.d.ts +74 -0
  66. package/dist/session-history/compare.d.ts.map +1 -0
  67. package/dist/session-history/compare.js +165 -0
  68. package/dist/session-history/compare.js.map +1 -0
  69. package/dist/team/__tests__/api-interop.test.js +3 -3
  70. package/dist/team/__tests__/cross-rebase-smoke.test.js +263 -31
  71. package/dist/team/__tests__/cross-rebase-smoke.test.js.map +1 -1
  72. package/dist/team/__tests__/herdr-session-realherdr.test.d.ts +2 -0
  73. package/dist/team/__tests__/herdr-session-realherdr.test.d.ts.map +1 -0
  74. package/dist/team/__tests__/herdr-session-realherdr.test.js +68 -0
  75. package/dist/team/__tests__/herdr-session-realherdr.test.js.map +1 -0
  76. package/dist/team/__tests__/herdr-session.test.d.ts +2 -0
  77. package/dist/team/__tests__/herdr-session.test.d.ts.map +1 -0
  78. package/dist/team/__tests__/herdr-session.test.js +228 -0
  79. package/dist/team/__tests__/herdr-session.test.js.map +1 -0
  80. package/dist/team/__tests__/idle-nudge.test.js +84 -0
  81. package/dist/team/__tests__/idle-nudge.test.js.map +1 -1
  82. package/dist/team/__tests__/rebalance-policy.test.js +27 -9
  83. package/dist/team/__tests__/rebalance-policy.test.js.map +1 -1
  84. package/dist/team/__tests__/runtime-delivery.test.d.ts +2 -0
  85. package/dist/team/__tests__/runtime-delivery.test.d.ts.map +1 -0
  86. package/dist/team/__tests__/runtime-delivery.test.js +570 -0
  87. package/dist/team/__tests__/runtime-delivery.test.js.map +1 -0
  88. package/dist/team/__tests__/runtime.test.js +332 -18
  89. package/dist/team/__tests__/runtime.test.js.map +1 -1
  90. package/dist/team/__tests__/scaling.test.js +293 -0
  91. package/dist/team/__tests__/scaling.test.js.map +1 -1
  92. package/dist/team/__tests__/state-renewal.test.d.ts +2 -0
  93. package/dist/team/__tests__/state-renewal.test.d.ts.map +1 -0
  94. package/dist/team/__tests__/state-renewal.test.js +555 -0
  95. package/dist/team/__tests__/state-renewal.test.js.map +1 -0
  96. package/dist/team/__tests__/task-lease.test.d.ts +2 -0
  97. package/dist/team/__tests__/task-lease.test.d.ts.map +1 -0
  98. package/dist/team/__tests__/task-lease.test.js +179 -0
  99. package/dist/team/__tests__/task-lease.test.js.map +1 -0
  100. package/dist/team/__tests__/team-ops-contract.test.js +1 -0
  101. package/dist/team/__tests__/team-ops-contract.test.js.map +1 -1
  102. package/dist/team/__tests__/worker-bootstrap.test.js +2 -0
  103. package/dist/team/__tests__/worker-bootstrap.test.js.map +1 -1
  104. package/dist/team/api-interop.d.ts +1 -1
  105. package/dist/team/api-interop.d.ts.map +1 -1
  106. package/dist/team/api-interop.js +13 -1
  107. package/dist/team/api-interop.js.map +1 -1
  108. package/dist/team/goal-workflow.js +1 -1
  109. package/dist/team/herdr-session.d.ts +234 -0
  110. package/dist/team/herdr-session.d.ts.map +1 -0
  111. package/dist/team/herdr-session.js +489 -0
  112. package/dist/team/herdr-session.js.map +1 -0
  113. package/dist/team/idle-nudge.d.ts +16 -4
  114. package/dist/team/idle-nudge.d.ts.map +1 -1
  115. package/dist/team/idle-nudge.js +51 -19
  116. package/dist/team/idle-nudge.js.map +1 -1
  117. package/dist/team/mcp-comm.d.ts +1 -1
  118. package/dist/team/mcp-comm.d.ts.map +1 -1
  119. package/dist/team/rebalance-policy.d.ts.map +1 -1
  120. package/dist/team/rebalance-policy.js +5 -2
  121. package/dist/team/rebalance-policy.js.map +1 -1
  122. package/dist/team/runtime.d.ts.map +1 -1
  123. package/dist/team/runtime.js +356 -81
  124. package/dist/team/runtime.js.map +1 -1
  125. package/dist/team/scaling.d.ts.map +1 -1
  126. package/dist/team/scaling.js +332 -143
  127. package/dist/team/scaling.js.map +1 -1
  128. package/dist/team/state/monitor.d.ts +3 -0
  129. package/dist/team/state/monitor.d.ts.map +1 -1
  130. package/dist/team/state/monitor.js +3 -0
  131. package/dist/team/state/monitor.js.map +1 -1
  132. package/dist/team/state/tasks.d.ts +2 -1
  133. package/dist/team/state/tasks.d.ts.map +1 -1
  134. package/dist/team/state/tasks.js +28 -0
  135. package/dist/team/state/tasks.js.map +1 -1
  136. package/dist/team/state/types.d.ts +8 -0
  137. package/dist/team/state/types.d.ts.map +1 -1
  138. package/dist/team/state/types.js.map +1 -1
  139. package/dist/team/state.d.ts +14 -2
  140. package/dist/team/state.d.ts.map +1 -1
  141. package/dist/team/state.js +29 -5
  142. package/dist/team/state.js.map +1 -1
  143. package/dist/team/task-lease.d.ts +4 -0
  144. package/dist/team/task-lease.d.ts.map +1 -0
  145. package/dist/team/task-lease.js +74 -0
  146. package/dist/team/task-lease.js.map +1 -0
  147. package/dist/team/team-ops.d.ts +2 -1
  148. package/dist/team/team-ops.d.ts.map +1 -1
  149. package/dist/team/team-ops.js +1 -0
  150. package/dist/team/team-ops.js.map +1 -1
  151. package/dist/team/tmux-session.d.ts +1 -1
  152. package/dist/team/tmux-session.d.ts.map +1 -1
  153. package/dist/team/tmux-session.js +10 -2
  154. package/dist/team/tmux-session.js.map +1 -1
  155. package/dist/team/worker-bootstrap.d.ts.map +1 -1
  156. package/dist/team/worker-bootstrap.js +14 -1
  157. package/dist/team/worker-bootstrap.js.map +1 -1
  158. package/package.json +1 -1
  159. package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
  160. package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +208 -25
  161. package/plugins/oh-my-codex/skills/worker/SKILL.md +7 -1
  162. package/prompts/build-fixer.md +2 -1
  163. package/prompts/debugger.md +2 -1
  164. package/prompts/git-master.md +2 -1
  165. package/prompts/style-reviewer.md +2 -1
  166. package/prompts/team-executor.md +3 -2
  167. package/prompts/vision.md +2 -1
  168. package/prompts/writer.md +2 -1
  169. package/skills/worker/SKILL.md +7 -1
  170. package/src/scripts/__tests__/codex-native-hook.test.ts +279 -0
  171. package/src/scripts/__tests__/generate-release-body.test.ts +151 -5
  172. package/src/scripts/codex-native-hook.ts +8 -2
  173. package/src/scripts/generate-release-body.ts +16 -0
  174. package/src/scripts/notify-hook/team-worker-lease.ts +69 -0
  175. package/src/scripts/notify-hook/team-worker-posttooluse.ts +16 -4
  176. package/src/scripts/notify-hook/team-worker.ts +15 -4
@@ -5,6 +5,7 @@ import { mkdir, readdir, readFile, rm, writeFile, lstat, link, rename } from 'fs
5
5
  import { performance } from 'perf_hooks';
6
6
  import { spawn, spawnSync } from 'child_process';
7
7
  import { sanitizeTeamName, isTmuxAvailable, hasCurrentTmuxClientContext, createTeamSession, CreateTeamSessionPartialError, buildWorkerProcessLaunchSpec, scrubTeamWorkerHudOwnershipEnv, resolveTeamWorkerCli, resolveTeamWorkerCliForResolvedLaunchArgs, assertTeamWorkerCliPolicyCompatibility, resolveTeamWorkerLaunchMode, waitForWorkerReady, waitForWorkerReadyAsync, waitForWorkerReadyDetailedAsync, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafety, sendToWorker, sendToWorkerStdin, isWorkerAlive, isWorkerPaneOpen, paneHasOmxInstanceTag, readPaneTeamOwnerTagResult, restoreStandaloneHudPane, finalizeRestoredHudCleanupDebtSync, reconcileRestoredHudCleanupDebtSync, teardownWorkerPanes, unregisterResizeHook, queryDetachedTeamSession, requestDetachedTeamSessionDestroy, queryDetachedSessionLeaderBinding, listPaneIds, listTeamSessions, resolveSharedSessionShutdownTopology, } from './tmux-session.js';
8
+ import { createHerdrTeam, destroyHerdrTeam, herdrWorkspaceIdFromPaneId, interruptHerdrWorker, isHerdrBinaryCallable, isHerdrWorkerAlive, submitToHerdrWorker, teardownHerdrWorker, } from './herdr-session.js';
8
9
  import { readExactPaneProofSync, readExactPaneProofsSync } from './exact-pane.js';
9
10
  import { reconcileScaleDownCleanupDebt } from './scaling.js';
10
11
  import { teamInit as initTeamState, DEFAULT_MAX_WORKERS, teamReadConfig as readTeamConfig, teamReadConfigSnapshot as readTeamConfigSnapshot, teamWriteWorkerIdentity as writeWorkerIdentity, teamReadWorkerHeartbeat as readWorkerHeartbeat, teamReadWorkerStatus as readWorkerStatus, teamWriteWorkerInbox as writeWorkerInbox, teamCreateTask as createStateTask, teamReadTask as readTask, teamListTasks as listTasks, teamListTasksSnapshot as listTasksSnapshot, teamUpdateTask as updateTask, teamReadManifest as readTeamManifestV2, teamReadManifestSnapshot as readTeamManifestV2Snapshot, teamNormalizeGovernance as normalizeTeamGovernance, teamNormalizePolicy as normalizeTeamPolicy, teamClaimTask as claimTask, teamReleaseTaskClaim as releaseTaskClaim, teamReclaimExpiredTaskClaim as reclaimExpiredTaskClaim, teamAppendEvent as appendTeamEvent, teamReadTaskApproval as readTaskApproval, teamListMailbox as listMailboxMessages, teamMarkMessageDelivered as markMessageDelivered, teamMarkMessageNotified as markMessageNotified, teamRetireMailboxMessages as retireTeamMailboxMessages, teamEnqueueDispatchRequest as enqueueDispatchRequest, teamMarkDispatchRequestNotified as markDispatchRequestNotified, teamTransitionDispatchRequest as transitionDispatchRequest, teamReadDispatchRequest as readDispatchRequest, teamListDispatchRequests as listDispatchRequests, teamRemoveDispatchRequestsForWorkers as removeDispatchRequestsForWorkers, teamCleanup as cleanupTeamState, teamSaveConfig as saveTeamConfig, teamWriteShutdownRequest as writeShutdownRequest, teamReadShutdownAck as readShutdownAck, teamReadMonitorSnapshot as readMonitorSnapshot, teamWriteMonitorSnapshot as writeMonitorSnapshot, teamReadPhase as readTeamPhaseState, teamWritePhase as writeTeamPhaseState, teamWriteWorkerStatus as writeWorkerStatus, writeAtomic, teamWithTaskMembershipBarrier as withTeamTaskMembershipBarrier, teamRemoveDurableFile as removeDurableFile, } from './team-ops.js';
@@ -42,8 +43,10 @@ function joinContextSections(...sections) {
42
43
  const present = sections.filter((section) => Boolean(section?.trim()));
43
44
  return present.length > 0 ? present.join('\n\n') : undefined;
44
45
  }
45
- async function syncRootTeamModeStateOnTerminalPhase(teamName, phase, cwd) {
46
- if (phase !== 'complete' && phase !== 'failed' && phase !== 'cancelled')
46
+ async function syncRootTeamModeStateForMonitor(teamName, phaseState, hasDeliveryDebt, cwd) {
47
+ const phase = phaseState.current_phase;
48
+ const terminal = isTerminalPhase(phase);
49
+ if (!terminal && (!hasDeliveryDebt || phaseState.terminal_epoch))
47
50
  return;
48
51
  try {
49
52
  const localStatePath = join(resolve(cwd), '.omx', 'state', 'team-state.json');
@@ -56,6 +59,19 @@ async function syncRootTeamModeStateOnTerminalPhase(teamName, phase, cwd) {
56
59
  const stateTeamName = typeof teamState.team_name === 'string' ? teamState.team_name.trim() : '';
57
60
  if (stateTeamName && stateTeamName !== teamName)
58
61
  return;
62
+ if (!terminal) {
63
+ if (stateTeamName !== teamName || teamState.active !== false
64
+ || teamState.current_phase !== 'complete' || teamState.terminal_epoch)
65
+ return;
66
+ const updates = { active: true, current_phase: phase, completed_at: undefined };
67
+ if (localTeamState) {
68
+ await writeFile(localStatePath, JSON.stringify({ ...localTeamState, ...updates }, null, 2), 'utf-8');
69
+ }
70
+ else {
71
+ await updateModeState('team', updates, cwd);
72
+ }
73
+ return;
74
+ }
59
75
  const alreadySynced = teamState.active === false
60
76
  && teamState.current_phase === phase
61
77
  && typeof teamState.completed_at === 'string'
@@ -545,6 +561,17 @@ async function reconcileDetachedSessionDestroyReceipt(teamName, cwd, config) {
545
561
  async function destroyConfiguredDetachedTeamSession(teamName, cwd, config) {
546
562
  if (!config.tmux_session)
547
563
  return;
564
+ if (config.worker_launch_mode === 'herdr') {
565
+ // Herdr teams have no tmux session authority to converge; the workspace
566
+ // itself is the session.
567
+ const firstHerdrPane = config.workers
568
+ .map((worker) => worker.pane_id)
569
+ .find((paneId) => typeof paneId === 'string' && paneId !== '');
570
+ if (firstHerdrPane) {
571
+ await destroyHerdrTeam(herdrWorkspaceIdFromPaneId(firstHerdrPane));
572
+ }
573
+ return;
574
+ }
548
575
  await withDetachedSessionDestroyLock(teamName, cwd, async () => {
549
576
  const canonical = await readTeamConfig(teamName, cwd);
550
577
  if (!canonical)
@@ -773,7 +800,6 @@ async function recordIntegrationFailure(teamName, worker, state, details, cwd) {
773
800
  appendIntegrationReport(teamName, {
774
801
  workerName: worker.name,
775
802
  operation: details.operation,
776
- strategy: details.strategy,
777
803
  files: [],
778
804
  detail: `${details.operation} reported success for ${sourceShort}, but leader HEAD did not advance from ${leaderShort}; not marking worker as integrated.`,
779
805
  }, cwd);
@@ -818,7 +844,7 @@ function appendIntegrationReport(teamName, entry, cwd) {
818
844
  if (!existsSync(dir))
819
845
  mkdirSync(dir, { recursive: true });
820
846
  const timestamp = new Date().toISOString();
821
- const line = `- [${timestamp}] ${entry.workerName}: ${entry.operation} conflict auto-resolved (${entry.strategy}) on files: ${entry.files.join(', ') || 'unknown'}. ${entry.detail}\n`;
847
+ const line = `- [${timestamp}] ${entry.workerName}: ${entry.operation} on files: ${entry.files.join(', ') || 'unknown'}. ${entry.detail}\n`;
822
848
  appendFileSync(reportPath, existsSync(reportPath) ? line : `# Integration Report\n\n${line}`);
823
849
  }
824
850
  function resolveWorkerMergeRef(branchResult, workerHead) {
@@ -830,6 +856,12 @@ function resolveWorkerMergeRef(branchResult, workerHead) {
830
856
  function leaderContainsCommit(repoRoot, cwd, commit) {
831
857
  return runGitCommand(repoRoot, ['merge-base', '--is-ancestor', commit, 'HEAD'], cwd).ok;
832
858
  }
859
+ function worktreeHasUnfinishedRebase(repoRoot, worktreePath) {
860
+ return ['rebase-merge', 'rebase-apply'].some((name) => {
861
+ const path = runGitCommand(repoRoot, ['rev-parse', '--git-path', name], worktreePath);
862
+ return !path.ok || existsSync(resolve(worktreePath, path.stdout.trim()));
863
+ });
864
+ }
833
865
  async function integrateWorkerCommitsIntoLeader(params) {
834
866
  const { teamName, config, previous, cwd } = params;
835
867
  const next = { ...(previous?.integrationByWorker ?? {}) };
@@ -841,6 +873,9 @@ async function integrateWorkerCommitsIntoLeader(params) {
841
873
  for (const worker of config.workers) {
842
874
  if (!worker.worktree_repo_root || !worker.worktree_path || !existsSync(worker.worktree_path))
843
875
  continue;
876
+ if (next[worker.name]?.pending_rebase_leader_head
877
+ || worktreeHasUnfinishedRebase(resolve(worker.worktree_repo_root), resolve(worker.worktree_path)))
878
+ continue;
844
879
  const { committed, commitHash } = autoCommitDirtyWorktree(worker);
845
880
  if (committed) {
846
881
  await appendIntegrationEvent(teamName, 'worker_auto_commit', worker, {
@@ -867,30 +902,61 @@ async function integrateWorkerCommitsIntoLeader(params) {
867
902
  continue;
868
903
  const repoRoot = resolve(worker.worktree_repo_root);
869
904
  const worktreePath = resolve(worker.worktree_path);
905
+ const previousState = next[worker.name] ?? {};
906
+ // Orig-head/onto do not prove ownership: a manual rebase can recreate the same operation.
907
+ if (worktreeHasUnfinishedRebase(repoRoot, worktreePath)) {
908
+ next[worker.name] = {
909
+ ...previousState, status: 'rebase_conflict',
910
+ rebase_error: 'Unfinished rebase preserved. Finish or abort it manually before retrying integration.',
911
+ };
912
+ continue;
913
+ }
914
+ if (previousState.pending_rebase_leader_head) {
915
+ if (previousState.delivery_leader_commit && leaderContainsCommit(repoRoot, cwd, previousState.delivery_leader_commit))
916
+ continue;
917
+ const workerStatus = await readWorkerStatus(teamName, worker.name, cwd);
918
+ if (workerStatus.state !== 'idle' && workerStatus.state !== 'done')
919
+ continue;
920
+ const status = runGitCommand(repoRoot, ['status', '--porcelain', '--untracked-files=all', '--ignore-submodules=none'], worktreePath);
921
+ if (!status.ok || status.stdout.trim()
922
+ || !previousState.last_integrated_head || resolveWorkerHead(worktreePath) !== previousState.last_integrated_head)
923
+ continue;
924
+ // Phase A already skipped this pending worker: redeliver the clean source normally, never checkpoint it here.
925
+ next[worker.name] = {
926
+ ...previousState, last_integrated_head: undefined, delivery_leader_commit: undefined,
927
+ pending_rebase_leader_head: undefined, rebase_error: undefined,
928
+ conflict_commit: undefined, conflict_files: undefined, status: 'idle',
929
+ };
930
+ }
870
931
  const leaderHead = resolveLeaderHead(repoRoot, cwd);
871
932
  const workerHead = resolveWorkerHead(worktreePath);
872
- const previousState = next[worker.name] ?? {};
873
- const state = { ...previousState, last_leader_head: leaderHead ?? previousState.last_leader_head };
933
+ const state = { ...next[worker.name], last_leader_head: leaderHead ?? previousState.last_leader_head };
874
934
  if (!workerHead || !leaderHead) {
875
935
  next[worker.name] = state;
876
936
  continue;
877
937
  }
938
+ // A source baseline is reusable only while its actual leader delivery survives.
939
+ if (!state.delivery_leader_commit || !leaderContainsCommit(repoRoot, cwd, state.delivery_leader_commit)) {
940
+ state.last_integrated_head = undefined;
941
+ state.delivery_leader_commit = undefined;
942
+ }
878
943
  state.last_seen_head = workerHead;
879
944
  const alreadyMerged = runGitCommand(repoRoot, ['merge-base', '--is-ancestor', workerHead, 'HEAD'], cwd).ok;
880
945
  if (alreadyMerged) {
881
- state.last_integrated_head = workerHead;
946
+ Object.assign(state, { last_integrated_head: workerHead, delivery_leader_commit: workerHead });
882
947
  state.status = 'idle';
883
948
  state.updated_at = new Date().toISOString();
949
+ integratedWorkerNames.add(worker.name);
884
950
  next[worker.name] = state;
885
951
  continue;
886
952
  }
887
953
  // Determine if worker is cleanly ahead of leader (merge) or diverged (cherry-pick)
888
954
  const workerIsAheadOfLeader = runGitCommand(repoRoot, ['merge-base', '--is-ancestor', leaderHead, workerHead], cwd).ok;
889
955
  if (workerIsAheadOfLeader) {
890
- // Worker is cleanly ahead → merge --no-ff -X theirs
956
+ // Worker is cleanly ahead → merge without choosing sides on conflicts
891
957
  const workerBranch = runGitCommand(repoRoot, ['rev-parse', '--abbrev-ref', 'HEAD'], worktreePath);
892
958
  const branchRef = resolveWorkerMergeRef(workerBranch, workerHead);
893
- const merge = runGitCommand(repoRoot, ['merge', '--no-ff', '-X', 'theirs', '-m', `omx(team): merge ${worker.name}`, branchRef], cwd);
959
+ const merge = runGitCommand(repoRoot, ['merge', '--no-ff', '-m', `omx(team): merge ${worker.name}`, branchRef], cwd);
894
960
  if (merge.ok) {
895
961
  const newLeaderHead = resolveLeaderHead(repoRoot, cwd) ?? leaderHead;
896
962
  const workerIntegrated = leaderContainsCommit(repoRoot, cwd, workerHead);
@@ -901,11 +967,11 @@ async function integrateWorkerCommitsIntoLeader(params) {
901
967
  leaderHeadBefore: leaderHead,
902
968
  leaderHeadAfter: newLeaderHead,
903
969
  worktreePath,
904
- strategy: '-X theirs',
905
970
  }, cwd);
906
971
  }
907
972
  else if (workerIntegrated) {
908
973
  state.last_integrated_head = workerHead;
974
+ state.delivery_leader_commit = newLeaderHead;
909
975
  state.last_leader_head = newLeaderHead;
910
976
  state.status = 'integrated';
911
977
  state.conflict_commit = undefined;
@@ -918,7 +984,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
918
984
  leader_head_before: leaderHead,
919
985
  leader_head_after: newLeaderHead,
920
986
  worktree_path: worktreePath,
921
- summary: `merged ${worker.name} into leader via --no-ff -X theirs`,
987
+ summary: `merged ${worker.name} into leader via --no-ff`,
922
988
  }, cwd);
923
989
  await sendIntegrationMessageToLeader(teamName, worker, `INTEGRATED: merged ${worker.name} (${workerHead.slice(0, 12)}) into leader HEAD ${newLeaderHead.slice(0, 12)} via merge --no-ff.`, cwd);
924
990
  commitHygieneEntries.push({
@@ -942,7 +1008,6 @@ async function integrateWorkerCommitsIntoLeader(params) {
942
1008
  appendIntegrationReport(teamName, {
943
1009
  workerName: worker.name,
944
1010
  operation: 'merge',
945
- strategy: '-X theirs',
946
1011
  files: [],
947
1012
  detail: `merge reported success but leader HEAD did not advance cleanly (leader_before=${leaderHead.slice(0, 12)}, leader_after=${newLeaderHead.slice(0, 12)}, worker_integrated=${workerIntegrated}, merge_ref=${branchRef}).`,
948
1013
  }, cwd);
@@ -963,7 +1028,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
963
1028
  }
964
1029
  }
965
1030
  else {
966
- // Merge failed even with -X theirs (e.g. binary conflict) — abort and log
1031
+ // Abort without changing either side; leave resolution to the leader.
967
1032
  const conflictFiles = listConflictFiles(repoRoot, cwd);
968
1033
  runGitCommand(repoRoot, ['merge', '--abort'], cwd);
969
1034
  state.status = 'cherry_pick_conflict';
@@ -977,25 +1042,26 @@ async function integrateWorkerCommitsIntoLeader(params) {
977
1042
  worktree_path: worktreePath,
978
1043
  conflict_files: conflictFiles,
979
1044
  stderr: merge.stderr || merge.stdout,
980
- summary: `merge conflict for ${worker.name} (auto-resolve failed)`,
1045
+ summary: `merge conflict for ${worker.name} (aborted; manual resolution required)`,
981
1046
  }, cwd);
982
1047
  appendIntegrationReport(teamName, {
983
1048
  workerName: worker.name,
984
1049
  operation: 'merge',
985
- strategy: '-X theirs',
986
1050
  files: conflictFiles,
987
- detail: `merge --no-ff -X theirs failed; aborted. stderr: ${(merge.stderr || '').slice(0, 200)}`,
1051
+ detail: `merge --no-ff failed; aborted; originals preserved. stderr: ${(merge.stderr || '').slice(0, 200)}`,
988
1052
  }, cwd);
989
- await sendIntegrationMessageToLeader(teamName, worker, `CONFLICT AUTO-RESOLVED FAILED: ${worker.name}'s merge resolved with -X theirs failed on files: ${conflictFiles.join(', ') || 'unknown'}. Consider steering ${worker.name} to review these areas.`, cwd);
1053
+ await sendIntegrationMessageToLeader(teamName, worker, `INTEGRATION CONFLICT: ${worker.name}'s merge was aborted on files: ${conflictFiles.join(', ') || 'unknown'}. Leader and worker originals are preserved. Resolve the conflict in ${worktreePath} before retrying integration.`, cwd);
990
1054
  }
991
1055
  }
992
1056
  else {
993
- // Diverged → cherry-pick individual commits with -X theirs
1057
+ // Diverged → cherry-pick individual commits without choosing conflict sides
994
1058
  const baseline = state.last_integrated_head && runGitCommand(repoRoot, ['rev-parse', '--verify', state.last_integrated_head], worktreePath).ok
995
1059
  ? state.last_integrated_head
996
1060
  : leaderHead;
997
1061
  const commits = listCommitRange(repoRoot, baseline, workerHead, worktreePath);
998
1062
  if (commits.length === 0) {
1063
+ if (state.last_integrated_head === workerHead)
1064
+ integratedWorkerNames.add(worker.name);
999
1065
  next[worker.name] = state;
1000
1066
  continue;
1001
1067
  }
@@ -1009,9 +1075,9 @@ async function integrateWorkerCommitsIntoLeader(params) {
1009
1075
  worktree_path: worktreePath,
1010
1076
  summary: `detected worker commit ${commit.slice(0, 12)}`,
1011
1077
  }, cwd);
1012
- const pick = runGitCommand(repoRoot, ['cherry-pick', '--allow-empty', '-X', 'theirs', commit], cwd);
1078
+ const pick = runGitCommand(repoRoot, ['cherry-pick', '--allow-empty', commit], cwd);
1013
1079
  if (!pick.ok) {
1014
- // Even -X theirs failed (binary conflict etc.) — abort this commit, log, continue
1080
+ // Abort this commit and stop; do not rebase unintegrated changes.
1015
1081
  const conflictFiles = listConflictFiles(repoRoot, cwd);
1016
1082
  runGitCommand(repoRoot, ['cherry-pick', '--abort'], cwd);
1017
1083
  state.status = 'cherry_pick_conflict';
@@ -1025,16 +1091,15 @@ async function integrateWorkerCommitsIntoLeader(params) {
1025
1091
  worktree_path: worktreePath,
1026
1092
  conflict_files: conflictFiles,
1027
1093
  stderr: pick.stderr || pick.stdout,
1028
- summary: `cherry-pick conflict for ${worker.name} at ${commit.slice(0, 12)} (auto-resolve failed)`,
1094
+ summary: `cherry-pick conflict for ${worker.name} at ${commit.slice(0, 12)} (aborted; manual resolution required)`,
1029
1095
  }, cwd);
1030
1096
  appendIntegrationReport(teamName, {
1031
1097
  workerName: worker.name,
1032
1098
  operation: 'cherry-pick',
1033
- strategy: '-X theirs',
1034
1099
  files: conflictFiles,
1035
- detail: `cherry-pick -X theirs ${commit.slice(0, 12)} failed; aborted. stderr: ${(pick.stderr || '').slice(0, 200)}`,
1100
+ detail: `cherry-pick ${commit.slice(0, 12)} failed; aborted; originals preserved. stderr: ${(pick.stderr || '').slice(0, 200)}`,
1036
1101
  }, cwd);
1037
- await sendIntegrationMessageToLeader(teamName, worker, `CONFLICT AUTO-RESOLVED FAILED: ${worker.name}'s cherry-pick ${commit.slice(0, 12)} with -X theirs failed on files: ${conflictFiles.join(', ') || 'unknown'}. Consider steering ${worker.name} to review these areas.`, cwd);
1102
+ await sendIntegrationMessageToLeader(teamName, worker, `INTEGRATION CONFLICT: ${worker.name}'s cherry-pick ${commit.slice(0, 12)} was aborted on files: ${conflictFiles.join(', ') || 'unknown'}. Leader and worker originals are preserved. Resolve the conflict in ${worktreePath} before retrying integration.`, cwd);
1038
1103
  allPicked = false;
1039
1104
  break;
1040
1105
  }
@@ -1046,12 +1111,12 @@ async function integrateWorkerCommitsIntoLeader(params) {
1046
1111
  leaderHeadBefore: leaderHead,
1047
1112
  leaderHeadAfter: newLeaderHead,
1048
1113
  worktreePath,
1049
- strategy: '-X theirs',
1050
1114
  }, cwd);
1051
1115
  allPicked = false;
1052
1116
  break;
1053
1117
  }
1054
1118
  state.last_integrated_head = commit;
1119
+ state.delivery_leader_commit = newLeaderHead;
1055
1120
  state.last_leader_head = newLeaderHead;
1056
1121
  state.status = 'integrated';
1057
1122
  state.conflict_commit = undefined;
@@ -1063,9 +1128,9 @@ async function integrateWorkerCommitsIntoLeader(params) {
1063
1128
  leader_head_before: leaderHead,
1064
1129
  leader_head_after: newLeaderHead,
1065
1130
  worktree_path: worktreePath,
1066
- summary: `cherry-picked ${commit.slice(0, 12)} from ${worker.name} with -X theirs`,
1131
+ summary: `cherry-picked ${commit.slice(0, 12)} from ${worker.name}`,
1067
1132
  }, cwd);
1068
- await sendIntegrationMessageToLeader(teamName, worker, `INTEGRATED: cherry-picked ${commit.slice(0, 12)} from ${worker.name} into leader HEAD ${newLeaderHead.slice(0, 12)} (-X theirs).`, cwd);
1133
+ await sendIntegrationMessageToLeader(teamName, worker, `INTEGRATED: cherry-picked ${commit.slice(0, 12)} from ${worker.name} into leader HEAD ${newLeaderHead.slice(0, 12)}.`, cwd);
1069
1134
  commitHygieneEntries.push({
1070
1135
  recorded_at: new Date().toISOString(),
1071
1136
  operation: 'integration_cherry_pick',
@@ -1088,14 +1153,34 @@ async function integrateWorkerCommitsIntoLeader(params) {
1088
1153
  }
1089
1154
  // ── Phase C: Cross-worker rebase (idle/done/failed workers onto new leader) ──
1090
1155
  const newLeaderHead = resolveLeaderHead(resolve(config.workers[0]?.worktree_repo_root ?? cwd), cwd);
1091
- if (newLeaderHead && leaderHeadAtCycleStart && newLeaderHead !== leaderHeadAtCycleStart) {
1156
+ if (newLeaderHead) {
1092
1157
  for (const worker of config.workers) {
1158
+ const state = next[worker.name] ?? {};
1159
+ const leaderAdvanced = leaderHeadAtCycleStart && newLeaderHead !== leaderHeadAtCycleStart;
1160
+ if (!leaderAdvanced && !state.pending_rebase_leader_head)
1161
+ continue;
1093
1162
  if (!worker.worktree_repo_root || !worker.worktree_path || !existsSync(worker.worktree_path))
1094
1163
  continue;
1095
- // Note: do NOT skip integratedWorkerNames here — cherry-picked workers need
1096
- // rebase to pick up other workers' changes that landed on leader in the same cycle.
1164
+ // Never rewrite worker history while its source delivery is unresolved.
1165
+ if (state.status === 'cherry_pick_conflict' || state.status === 'integration_failed'
1166
+ || (!integratedWorkerNames.has(worker.name) && !state.pending_rebase_leader_head)) {
1167
+ await appendIntegrationEvent(teamName, 'worker_cross_rebase_skipped', worker, {
1168
+ worker_name: worker.name,
1169
+ reason: 'unintegrated_changes',
1170
+ leader_head: newLeaderHead,
1171
+ worktree_path: resolve(worker.worktree_path),
1172
+ summary: `skipped cross-rebase for ${worker.name} (unintegrated changes; resolve integration first)`,
1173
+ }, cwd);
1174
+ continue;
1175
+ }
1097
1176
  const repoRoot = resolve(worker.worktree_repo_root);
1098
1177
  const worktreePath = resolve(worker.worktree_path);
1178
+ const sourceHead = resolveWorkerHead(worktreePath);
1179
+ const sourceDelivered = sourceHead && (leaderContainsCommit(repoRoot, cwd, sourceHead)
1180
+ || (state.last_integrated_head === sourceHead && state.delivery_leader_commit
1181
+ && leaderContainsCommit(repoRoot, cwd, state.delivery_leader_commit)));
1182
+ if (!sourceDelivered)
1183
+ continue;
1099
1184
  // Only rebase idle/done/failed workers to avoid race conditions
1100
1185
  const workerStatus = await readWorkerStatus(teamName, worker.name, cwd);
1101
1186
  const rebaseEligibleStates = new Set(['idle', 'done', 'failed']);
@@ -1109,9 +1194,15 @@ async function integrateWorkerCommitsIntoLeader(params) {
1109
1194
  }, cwd);
1110
1195
  continue;
1111
1196
  }
1112
- // Skip if worktree is dirty (will auto-commit next cycle, then rebase)
1113
- const statusCheck = runGitCommand(repoRoot, ['status', '--porcelain'], worktreePath);
1114
- if (statusCheck.ok && statusCheck.stdout.trim()) {
1197
+ if (worktreeHasUnfinishedRebase(repoRoot, worktreePath)) {
1198
+ next[worker.name] = {
1199
+ ...state, status: 'rebase_conflict',
1200
+ rebase_error: 'Unfinished rebase preserved. Finish or abort it manually before retrying integration.',
1201
+ };
1202
+ continue;
1203
+ }
1204
+ const statusCheck = runGitCommand(repoRoot, ['status', '--porcelain', '--untracked-files=all', '--ignore-submodules=none'], worktreePath);
1205
+ if (!statusCheck.ok || statusCheck.stdout.trim()) {
1115
1206
  await appendIntegrationEvent(teamName, 'worker_cross_rebase_skipped', worker, {
1116
1207
  worker_name: worker.name,
1117
1208
  reason: 'dirty_worktree',
@@ -1121,13 +1212,14 @@ async function integrateWorkerCommitsIntoLeader(params) {
1121
1212
  }, cwd);
1122
1213
  continue;
1123
1214
  }
1124
- // Rebase with -X ours (in rebase context, "ours" = upstream = leader wins)
1215
+ // Rebase without silently dropping conflicting worker changes.
1125
1216
  const workerHeadBeforeRebase = resolveWorkerHead(worktreePath);
1126
- const rebase = runGitCommand(repoRoot, ['rebase', '-X', 'ours', newLeaderHead], worktreePath);
1217
+ const rebase = runGitCommand(repoRoot, ['rebase', newLeaderHead], worktreePath);
1127
1218
  if (rebase.ok) {
1128
1219
  const workerHeadAfterRebase = resolveWorkerHead(worktreePath);
1129
- const state = next[worker.name] ?? {};
1130
1220
  state.last_rebased_leader_head = newLeaderHead;
1221
+ state.pending_rebase_leader_head = undefined;
1222
+ state.rebase_error = undefined;
1131
1223
  state.status = 'idle';
1132
1224
  state.conflict_commit = undefined;
1133
1225
  state.conflict_files = undefined;
@@ -1137,7 +1229,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
1137
1229
  worker_name: worker.name,
1138
1230
  leader_head: newLeaderHead,
1139
1231
  worktree_path: worktreePath,
1140
- summary: `cross-rebased ${worker.name} onto ${newLeaderHead.slice(0, 12)} (-X ours)`,
1232
+ summary: `cross-rebased ${worker.name} onto ${newLeaderHead.slice(0, 12)}`,
1141
1233
  }, cwd);
1142
1234
  commitHygieneEntries.push({
1143
1235
  recorded_at: new Date().toISOString(),
@@ -1156,23 +1248,31 @@ async function integrateWorkerCommitsIntoLeader(params) {
1156
1248
  else {
1157
1249
  // Rebase failed — abort to restore worktree, log for retry next cycle
1158
1250
  const conflictFiles = listConflictFiles(repoRoot, worktreePath);
1159
- runGitCommand(repoRoot, ['rebase', '--abort'], worktreePath);
1251
+ const abortResult = runGitCommand(repoRoot, ['rebase', '--abort'], worktreePath);
1252
+ state.status = 'rebase_conflict';
1253
+ state.pending_rebase_leader_head = newLeaderHead;
1254
+ state.rebase_error = `${rebase.stderr || rebase.stdout}; abort: ${abortResult.ok ? 'ok' : abortResult.stderr || abortResult.stdout}`;
1255
+ state.conflict_commit = workerHeadBeforeRebase ?? undefined;
1256
+ state.conflict_files = conflictFiles;
1257
+ state.updated_at = new Date().toISOString();
1258
+ next[worker.name] = state;
1160
1259
  await appendIntegrationEvent(teamName, 'worker_cross_rebase_conflict', worker, {
1161
1260
  worker_name: worker.name,
1162
1261
  leader_head: newLeaderHead,
1163
1262
  worktree_path: worktreePath,
1164
1263
  conflict_files: conflictFiles,
1165
1264
  stderr: rebase.stderr || rebase.stdout,
1166
- summary: `cross-rebase conflict for ${worker.name} onto ${newLeaderHead.slice(0, 12)} (aborted, will retry)`,
1265
+ abort_ok: abortResult.ok,
1266
+ abort_stderr: abortResult.stderr,
1267
+ summary: `cross-rebase conflict for ${worker.name} onto ${newLeaderHead.slice(0, 12)} (abort ${abortResult.ok ? 'succeeded' : 'failed'}, will retry)`,
1167
1268
  }, cwd);
1168
1269
  appendIntegrationReport(teamName, {
1169
1270
  workerName: worker.name,
1170
1271
  operation: 'rebase',
1171
- strategy: '-X ours',
1172
1272
  files: conflictFiles,
1173
- detail: `rebase -X ours onto ${newLeaderHead.slice(0, 12)} failed; aborted. Will retry next cycle.`,
1273
+ detail: `rebase onto ${newLeaderHead.slice(0, 12)} failed; abort ${abortResult.ok ? 'succeeded' : 'failed'}. Will retry next cycle. ${state.rebase_error}`,
1174
1274
  }, cwd);
1175
- await sendIntegrationMessageToLeader(teamName, worker, `CONFLICT AUTO-RESOLVED FAILED: ${worker.name}'s rebase onto ${newLeaderHead.slice(0, 12)} with -X ours failed on files: ${conflictFiles.join(', ') || 'unknown'}. Consider steering ${worker.name} to review these areas.`, cwd);
1275
+ await sendIntegrationMessageToLeader(teamName, worker, `REBASE CONFLICT: ${worker.name}'s rebase onto ${newLeaderHead.slice(0, 12)} was aborted on files: ${conflictFiles.join(', ') || 'unknown'}. Original worker HEAD is preserved. Resolve the conflict in ${worktreePath} before retrying.`, cwd);
1176
1276
  }
1177
1277
  }
1178
1278
  }
@@ -2779,7 +2879,12 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
2779
2879
  if (workerLaunchMode === 'prompt') {
2780
2880
  assertPromptModeWorkerCliSupported(workerLaunchPolicyPlan.map((workerLaunchPolicy) => workerLaunchPolicy.workerCli), launchEnv);
2781
2881
  }
2782
- if (workerLaunchMode === 'interactive') {
2882
+ if (workerLaunchMode === 'herdr') {
2883
+ if (!(await isHerdrBinaryCallable())) {
2884
+ throw new Error('Team mode herdr backend requires the herdr binary. Install from https://herdr.dev (curl -fsSL https://herdr.dev/install.sh | sh, or brew install herdr) and retry.');
2885
+ }
2886
+ }
2887
+ else if (workerLaunchMode === 'interactive') {
2783
2888
  if (!isTmuxAvailable()) {
2784
2889
  throw new Error('Team mode requires tmux. Install with: apt install tmux / brew install tmux');
2785
2890
  }
@@ -3099,6 +3204,8 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
3099
3204
  writeWarning: options.writeCleanupWarning,
3100
3205
  });
3101
3206
  const startupTiming = createStartupTimingRecorder(sanitized, leaderCwd);
3207
+ // Set by the interactive ready-wait or the herdr agent-start settle below.
3208
+ let startupReadyPromptObserved = false;
3102
3209
  let workerStartupArgs;
3103
3210
  if (workerLaunchMode === 'interactive') {
3104
3211
  const createdSession = createTeamSession(sanitized, workerCount, leaderCwd, Array.from(workerLaunchPolicyPlan[0]?.workerLaunchArgs ?? []), workerStartups, { ownerSessionId: leaderSessionId, teamPaneOwnerId: config.tmux_pane_owner_id });
@@ -3126,6 +3233,47 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
3126
3233
  startupTiming.mark('split_returned', { worker: `worker-${index + 1}`, pane_id: paneId });
3127
3234
  }
3128
3235
  }
3236
+ else if (workerLaunchMode === 'herdr') {
3237
+ const herdrPlans = [];
3238
+ for (let i = 1; i <= workerCount; i++) {
3239
+ const startup = workerStartups[i - 1];
3240
+ const workerLaunchPolicy = workerLaunchPolicyPlan[i - 1];
3241
+ if (!startup || !workerLaunchPolicy) {
3242
+ throw new Error(`missing worker launch plan for worker-${i}`);
3243
+ }
3244
+ const spec = buildWorkerProcessLaunchSpec(sanitized, i, startup.launchArgs, startup.cwd, startup.env, startup.workerCli, startup.initialPrompt, startup.workerRole);
3245
+ herdrPlans.push({
3246
+ kind: spec.workerCli,
3247
+ agentArgs: spec.args,
3248
+ env: spec.env,
3249
+ cwd: startup.cwd,
3250
+ initialPrompt: startup.initialPrompt,
3251
+ });
3252
+ }
3253
+ const herdrTeam = await createHerdrTeam(sanitized, leaderCwd, herdrPlans, { env: launchEnv });
3254
+ // createHerdrTeam returns only after every agent reached an idle,
3255
+ // promptable state (agent-start readiness + settle polling): that is
3256
+ // the herdr equivalent of observing a ready prompt in a tmux pane.
3257
+ startupReadyPromptObserved = true;
3258
+ sessionName = herdrTeam.name;
3259
+ sessionCreated = true;
3260
+ config.tmux_session = herdrTeam.name;
3261
+ config.leader_pane_id = null;
3262
+ config.hud_pane_id = null;
3263
+ config.leader_pane_pid = null;
3264
+ config.hud_pane_pid = null;
3265
+ config.resize_hook_name = null;
3266
+ config.resize_hook_target = null;
3267
+ for (const worker of herdrTeam.workers) {
3268
+ if (config.workers[worker.index - 1]) {
3269
+ config.workers[worker.index - 1].pane_id = worker.paneId;
3270
+ config.workers[worker.index - 1].pid = undefined;
3271
+ }
3272
+ workerPaneIds[worker.index - 1] = worker.paneId;
3273
+ createdWorkerPaneIds.push(worker.paneId);
3274
+ startupTiming.mark('split_returned', { worker: `worker-${worker.index}`, pane_id: worker.paneId });
3275
+ }
3276
+ }
3129
3277
  else {
3130
3278
  config.tmux_session = `prompt-${sanitized}`;
3131
3279
  config.leader_pane_id = null;
@@ -3217,7 +3365,6 @@ export async function startTeam(teamName, task, agentType, workerCount, tasks, c
3217
3365
  error: new Error(`worker_startup_incompatible:${workerName}:${startupDirectOutcome.reason}`),
3218
3366
  };
3219
3367
  }
3220
- let startupReadyPromptObserved = false;
3221
3368
  if (workerLaunchMode === 'interactive' && !skipWorkerReadyWait && !initialPrompt && !startupDirectOutcome?.ok) {
3222
3369
  startupTiming.mark('ready_wait_start', { worker: workerName, pane_id: paneId });
3223
3370
  let readinessIncompatibility = null;
@@ -3633,9 +3780,7 @@ export async function monitorTeam(teamName, cwd, options = {}) {
3633
3780
  const recommendations = [];
3634
3781
  const workerScanStartMs = performance.now();
3635
3782
  const workerSignals = await Promise.all(config.workers.map(async (worker) => {
3636
- const alive = config.worker_launch_mode === 'prompt'
3637
- ? isPromptWorkerAlive(config, worker)
3638
- : isWorkerAlive(sessionName, worker.index, worker.pane_id, worker.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined);
3783
+ const alive = await isTeamWorkerAliveForMode(config, sessionName, worker);
3639
3784
  const [status, heartbeat] = await Promise.all([
3640
3785
  readWorkerStatus(sanitized, worker.name, cwd),
3641
3786
  readWorkerHeartbeat(sanitized, worker.name, cwd),
@@ -3736,36 +3881,71 @@ export async function monitorTeam(teamName, cwd, options = {}) {
3736
3881
  }
3737
3882
  }
3738
3883
  const allTasksTerminal = taskCounts.pending === 0 && taskCounts.blocked === 0 && taskCounts.in_progress === 0;
3739
- const deadWorkerStall = config.worker_launch_mode === 'prompt'
3884
+ const deadWorkerStall = config.worker_launch_mode !== 'interactive'
3740
3885
  && config.workers.length > 0
3741
3886
  && deadWorkers.length >= config.workers.length
3742
3887
  && !allTasksTerminal;
3743
- const persistedPhase = await readTeamPhaseState(sanitized, cwd);
3888
+ const integrationByWorker = readOnly
3889
+ ? (previousSnapshot?.integrationByWorker ?? {})
3890
+ : await integrateWorkerCommitsIntoLeader({
3891
+ teamName: sanitized,
3892
+ config,
3893
+ previous: previousSnapshot,
3894
+ cwd,
3895
+ });
3896
+ const deliveryWorkers = config.workers.filter((worker) => worker.worktree_path && worker.worktree_repo_root);
3897
+ let integrationPending = false;
3898
+ let integrationFailed = false;
3899
+ for (const worker of deliveryWorkers) {
3900
+ const delivery = integrationByWorker[worker.name];
3901
+ if (delivery?.status === 'cherry_pick_conflict' || delivery?.status === 'integration_failed' || delivery?.status === 'rebase_conflict' || delivery?.pending_rebase_leader_head) {
3902
+ integrationFailed = true;
3903
+ recommendations.push(`Integration unresolved for ${worker.name}; resolve delivery failure before terminal success`);
3904
+ continue;
3905
+ }
3906
+ if (worktreeHasUnfinishedRebase(worker.worktree_repo_root, worker.worktree_path)) {
3907
+ integrationFailed = true;
3908
+ recommendations.push(`Integration unresolved for ${worker.name}; unfinished rebase preserved before terminal success`);
3909
+ continue;
3910
+ }
3911
+ const workerHead = resolveWorkerHead(worker.worktree_path);
3912
+ const status = runGitCommand(worker.worktree_repo_root, ['--no-optional-locks', 'status', '--porcelain', '--untracked-files=all', '--ignore-submodules=none'], worker.worktree_path);
3913
+ const contained = workerHead && leaderContainsCommit(worker.worktree_repo_root, cwd, workerHead);
3914
+ const delivered = workerHead && delivery?.last_integrated_head === workerHead
3915
+ && delivery.delivery_leader_commit && leaderContainsCommit(worker.worktree_repo_root, cwd, delivery.delivery_leader_commit);
3916
+ if (!workerHead || !status.ok || status.stdout.trim() || (!contained && !delivered)) {
3917
+ integrationPending = true;
3918
+ recommendations.push(`Integration pending for ${worker.name}; verify code delivery before terminal success`);
3919
+ }
3920
+ }
3744
3921
  const targetPhase = deadWorkerStall
3745
3922
  ? 'failed'
3746
3923
  : inferPhaseTargetFromTaskCounts(taskCounts, {
3747
- verificationPending: verificationPendingTasks.length > 0,
3924
+ verificationPending: verificationPendingTasks.length > 0 || integrationPending,
3748
3925
  });
3749
- const phaseState = reconcilePhaseStateForMonitor(persistedPhase, targetPhase);
3750
- if (!readOnly)
3751
- await writeTeamPhaseState(sanitized, phaseState, cwd);
3926
+ const deliveryGatedTarget = targetPhase === 'complete' || targetPhase === 'team-verify'
3927
+ ? integrationFailed ? 'team-fix' : targetPhase
3928
+ : targetPhase;
3929
+ const reconcileMonitorPhase = async () => {
3930
+ const persistedPhase = await readTeamPhaseState(sanitized, cwd);
3931
+ const next = reconcilePhaseStateForMonitor(persistedPhase, deliveryGatedTarget);
3932
+ if (!readOnly) {
3933
+ await writeTeamPhaseState(sanitized, next, cwd);
3934
+ await syncRootTeamModeStateForMonitor(sanitized, next, integrationPending || integrationFailed, cwd);
3935
+ }
3936
+ return next;
3937
+ };
3938
+ // Shutdown publishes its epoch under this barrier; never reopen root from a stale phase read.
3939
+ const phaseState = readOnly
3940
+ ? await reconcileMonitorPhase()
3941
+ : await withTeamTaskMembershipBarrier(sanitized, cwd, reconcileMonitorPhase);
3752
3942
  const phase = phaseState.current_phase;
3753
- if (!readOnly)
3754
- await syncRootTeamModeStateOnTerminalPhase(sanitized, phase, cwd);
3755
3943
  if (deadWorkerStall) {
3756
3944
  recommendations.push('All workers are dead while work remains; mark the team failed or restart with fresh workers.');
3757
3945
  }
3758
3946
  if (!readOnly) {
3759
3947
  await emitMonitorDerivedEvents(sanitized, taskView, workers, previousSnapshot, config.worker_launch_mode, cwd);
3760
3948
  }
3761
- const integrationByWorker = readOnly
3762
- ? (previousSnapshot?.integrationByWorker ?? {})
3763
- : await integrateWorkerCommitsIntoLeader({
3764
- teamName: sanitized,
3765
- config,
3766
- previous: previousSnapshot,
3767
- cwd,
3768
- });
3769
3949
  const mailboxDeliveryStartMs = performance.now();
3770
3950
  const mailboxNotifiedByMessageId = phaseState.terminal_epoch
3771
3951
  ? {}
@@ -3863,6 +4043,11 @@ export async function assignTask(teamName, workerName, taskId, cwd) {
3863
4043
  if (!workerInfo)
3864
4044
  throw new Error(`Worker ${workerName} not found in team`);
3865
4045
  const dispatchPolicy = resolveDispatchPolicy(manifest?.policy, config.worker_launch_mode);
4046
+ const outstandingTask = (await listTasks(sanitized, cwd)).find((current) => current.id !== taskId && current.owner === workerName
4047
+ && (current.status === 'pending' || current.status === 'in_progress'));
4048
+ if (outstandingTask) {
4049
+ throw new Error(`Worker ${workerName} already owns outstanding task ${outstandingTask.id}`);
4050
+ }
3866
4051
  const claim = await claimTask(sanitized, taskId, workerName, task.version ?? 1, cwd);
3867
4052
  if (!claim.ok) {
3868
4053
  if (claim.error === 'blocked_dependency') {
@@ -3883,11 +4068,11 @@ export async function assignTask(teamName, workerName, taskId, cwd) {
3883
4068
  : synthesizeCoordinationPlan(task);
3884
4069
  const hasCurrentCoordination = task.coordination?.source === 'explicit' || coordinationPlansEqual(task.coordination, currentCoordinationPlan);
3885
4070
  const taskForInbox = task.delegation && hasCurrentCoordination
3886
- ? task
4071
+ ? claim.task
3887
4072
  : (await updateTask(sanitized, taskId, {
3888
4073
  delegation: task.delegation ?? synthesizeDelegationPlan(task),
3889
4074
  coordination: task.coordination?.source === 'explicit' ? task.coordination : currentCoordinationPlan,
3890
- }, cwd)) ?? task;
4075
+ }, cwd)) ?? claim.task;
3891
4076
  const inbox = generateTaskAssignmentInbox(workerName, sanitized, taskForInbox, { approvedContextSection });
3892
4077
  const maxAssignRetries = 2;
3893
4078
  const assignRetryDelayS = 2;
@@ -4163,17 +4348,15 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
4163
4348
  const detail = rejected.map(r => `${r.worker}:${r.reason}`).join(',');
4164
4349
  throw new Error(`shutdown_rejected:${detail}`);
4165
4350
  }
4166
- const anyAlive = config.workers.some((w) => (config.worker_launch_mode === 'prompt'
4167
- ? isPromptWorkerAlive(config, w)
4168
- : isWorkerAlive(sessionName, w.index, w.pane_id, w.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined)));
4351
+ const anyAliveSignals = await Promise.all(config.workers.map((w) => isTeamWorkerAliveForMode(config, sessionName, w)));
4352
+ const anyAlive = anyAliveSignals.some(Boolean);
4169
4353
  if (!anyAlive)
4170
4354
  break;
4171
4355
  // Sleep 2s
4172
4356
  await new Promise(resolve => setTimeout(resolve, 2000));
4173
4357
  }
4174
- const anyAliveAfterWait = config.workers.some((w) => (config.worker_launch_mode === 'prompt'
4175
- ? isPromptWorkerAlive(config, w)
4176
- : isWorkerAlive(sessionName, w.index, w.pane_id, w.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined)));
4358
+ const anyAliveAfterWaitSignals = await Promise.all(config.workers.map((w) => isTeamWorkerAliveForMode(config, sessionName, w)));
4359
+ const anyAliveAfterWait = anyAliveAfterWaitSignals.some(Boolean);
4177
4360
  if (anyAliveAfterWait && !force) {
4178
4361
  // Workers may have accepted shutdown but not exited (Codex TUI requires explicit exit).
4179
4362
  // In this case, proceed to force kill panes (next step) rather than failing and leaving state around.
@@ -4541,6 +4724,41 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
4541
4724
  throw new Error(`shutdown_pane_teardown_failed:${workerTeardown.kill.failedPaneIds.join(',')}`);
4542
4725
  }
4543
4726
  }
4727
+ else if (config.worker_launch_mode === 'herdr') {
4728
+ const herdrTeardownFailures = [];
4729
+ let herdrWorkspaceClosed = false;
4730
+ for (const w of config.workers) {
4731
+ if (typeof w.pane_id !== 'string' || w.pane_id === '')
4732
+ continue;
4733
+ try {
4734
+ await interruptHerdrWorker(w.pane_id);
4735
+ }
4736
+ catch {
4737
+ // Best-effort interrupt: teardown below still removes the pane.
4738
+ }
4739
+ try {
4740
+ await teardownHerdrWorker(w.pane_id);
4741
+ }
4742
+ catch (error) {
4743
+ herdrTeardownFailures.push(`${w.name}:${error instanceof Error ? error.message : String(error)}`);
4744
+ }
4745
+ }
4746
+ const firstHerdrPane = config.workers
4747
+ .map((w) => w.pane_id)
4748
+ .find((paneId) => typeof paneId === 'string' && paneId !== '');
4749
+ if (firstHerdrPane) {
4750
+ try {
4751
+ await destroyHerdrTeam(herdrWorkspaceIdFromPaneId(firstHerdrPane));
4752
+ herdrWorkspaceClosed = true;
4753
+ }
4754
+ catch (error) {
4755
+ herdrTeardownFailures.push(`workspace:${error instanceof Error ? error.message : String(error)}`);
4756
+ }
4757
+ }
4758
+ if (herdrTeardownFailures.length > 0 && !herdrWorkspaceClosed) {
4759
+ console.warn(`[team shutdown] ${sanitized}: herdr teardown issues: ${herdrTeardownFailures.join(',')}`);
4760
+ }
4761
+ }
4544
4762
  else if (config.worker_launch_mode === 'prompt') {
4545
4763
  const promptTeardownFailures = [];
4546
4764
  const promptTeardownResults = new Map();
@@ -4731,7 +4949,14 @@ export async function resumeTeam(teamName, cwd) {
4731
4949
  if (approvedExecutionState.status === 'stale') {
4732
4950
  throw new Error(`approved_execution_binding_stale:${approvedExecutionState.binding.prd_path}:${approvedExecutionState.binding.task}`);
4733
4951
  }
4734
- if (config.worker_launch_mode === 'prompt') {
4952
+ if (config.worker_launch_mode === 'herdr') {
4953
+ const aliveSignals = await Promise.all(config.workers
4954
+ .filter((worker) => typeof worker.pane_id === 'string' && worker.pane_id !== '')
4955
+ .map((worker) => isHerdrWorkerAlive(worker.pane_id)));
4956
+ if (!aliveSignals.some(Boolean))
4957
+ return null;
4958
+ }
4959
+ else if (config.worker_launch_mode === 'prompt') {
4735
4960
  const handleTeamConfig = { ...config, name: sanitized };
4736
4961
  const hasLivePromptWorker = config.workers.some((worker) => isPromptWorkerAlive(handleTeamConfig, worker));
4737
4962
  if (!hasLivePromptWorker)
@@ -4773,9 +4998,7 @@ async function findActiveTeams(cwd, leaderSessionId) {
4773
4998
  if (!existsSync(root))
4774
4999
  return [];
4775
5000
  const listedSessions = listTeamSessions();
4776
- if (listedSessions === null)
4777
- throw new Error('tmux_session_query_unavailable');
4778
- const sessions = new Set(listedSessions);
5001
+ const sessions = listedSessions !== null ? new Set(listedSessions) : null;
4779
5002
  const entries = await readdir(root, { withFileTypes: true });
4780
5003
  const active = [];
4781
5004
  for (const e of entries) {
@@ -4802,6 +5025,19 @@ async function findActiveTeams(cwd, leaderSessionId) {
4802
5025
  }
4803
5026
  continue;
4804
5027
  }
5028
+ if (workerLaunchMode === 'herdr') {
5029
+ const herdrAlive = await Promise.all((cfg?.workers ?? [])
5030
+ .filter((worker) => typeof worker.pane_id === 'string' && worker.pane_id !== '')
5031
+ .map((worker) => isHerdrWorkerAlive(worker.pane_id)));
5032
+ if (herdrAlive.some(Boolean)) {
5033
+ active.push(teamName);
5034
+ }
5035
+ continue;
5036
+ }
5037
+ if (sessions === null) {
5038
+ // An interactive (tmux) team exists but tmux cannot be queried.
5039
+ throw new Error('tmux_session_query_unavailable');
5040
+ }
4805
5041
  if (sessions.has(tmuxSession))
4806
5042
  active.push(teamName);
4807
5043
  }
@@ -4811,12 +5047,23 @@ async function detectAndCleanStaleTeam(teamName, leaderCwd, workerCount, confirm
4811
5047
  const stateDir = teamRuntimeTeamRoot(teamName, leaderCwd);
4812
5048
  if (!existsSync(stateDir))
4813
5049
  return;
4814
- const listedSessions = listTeamSessions();
4815
- if (listedSessions === null)
4816
- return;
4817
- const sessions = new Set(listedSessions);
4818
- if (sessions.has(`omx-team-${teamName}`))
4819
- return;
5050
+ const existingConfig = await readTeamConfig(teamName, leaderCwd);
5051
+ if (existingConfig?.worker_launch_mode === 'herdr') {
5052
+ // Herdr teams have no tmux session; liveness comes from their panes.
5053
+ const herdrAlive = await Promise.all((existingConfig.workers ?? [])
5054
+ .filter((worker) => typeof worker.pane_id === 'string' && worker.pane_id !== '')
5055
+ .map((worker) => isHerdrWorkerAlive(worker.pane_id)));
5056
+ if (herdrAlive.some(Boolean))
5057
+ return;
5058
+ }
5059
+ else {
5060
+ const listedSessions = listTeamSessions();
5061
+ if (listedSessions === null)
5062
+ return;
5063
+ const sessions = new Set(listedSessions);
5064
+ if (sessions.has(`omx-team-${teamName}`))
5065
+ return;
5066
+ }
4820
5067
  const repoRootResult = spawnSync('git', ['rev-parse', '--show-toplevel'], {
4821
5068
  cwd: leaderCwd, encoding: 'utf-8', windowsHide: true,
4822
5069
  });
@@ -4948,10 +5195,38 @@ async function emitMonitorDerivedEvents(teamName, tasks, workers, previous, work
4948
5195
  }
4949
5196
  }
4950
5197
  }
5198
+ /** Backend-aware worker liveness: prompt children, herdr panes, or tmux panes. */
5199
+ async function isTeamWorkerAliveForMode(config, sessionName, worker) {
5200
+ if (config.worker_launch_mode === 'prompt') {
5201
+ return isPromptWorkerAlive(config, worker);
5202
+ }
5203
+ if (config.worker_launch_mode === 'herdr') {
5204
+ if (typeof worker.pane_id !== 'string' || worker.pane_id === '')
5205
+ return false;
5206
+ return isHerdrWorkerAlive(worker.pane_id);
5207
+ }
5208
+ return isWorkerAlive(sessionName, worker.index, worker.pane_id, worker.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined);
5209
+ }
4951
5210
  async function notifyWorkerOutcome(config, workerIndex, message, workerPaneId) {
4952
5211
  const worker = config.workers.find((candidate) => candidate.index === workerIndex);
4953
5212
  if (!worker)
4954
5213
  return { ok: false, transport: 'none', reason: 'worker_not_found' };
5214
+ if (config.worker_launch_mode === 'herdr') {
5215
+ if (typeof worker.pane_id !== 'string' || worker.pane_id === '') {
5216
+ return { ok: false, transport: 'herdr_prompt', reason: 'herdr_pane_id_missing' };
5217
+ }
5218
+ try {
5219
+ await submitToHerdrWorker(worker.pane_id, message);
5220
+ return { ok: true, transport: 'herdr_prompt', reason: 'herdr_prompt_sent' };
5221
+ }
5222
+ catch (error) {
5223
+ return {
5224
+ ok: false,
5225
+ transport: 'herdr_prompt',
5226
+ reason: `herdr_prompt_failed:${error instanceof Error ? error.message : String(error)}`,
5227
+ };
5228
+ }
5229
+ }
4955
5230
  if (config.worker_launch_mode === 'prompt') {
4956
5231
  const handle = getPromptWorkerHandle(config.name, worker.name);
4957
5232
  if (!handle)