oh-my-codex 0.22.0 → 0.22.1

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 (59) hide show
  1. package/Cargo.lock +6 -6
  2. package/Cargo.toml +1 -1
  3. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js +104 -3
  4. package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js.map +1 -1
  5. package/dist/cli/__tests__/question.test.js +33 -0
  6. package/dist/cli/__tests__/question.test.js.map +1 -1
  7. package/dist/cli/plugin-marketplace.d.ts.map +1 -1
  8. package/dist/cli/plugin-marketplace.js +11 -4
  9. package/dist/cli/plugin-marketplace.js.map +1 -1
  10. package/dist/cli/question.d.ts.map +1 -1
  11. package/dist/cli/question.js +8 -1
  12. package/dist/cli/question.js.map +1 -1
  13. package/dist/question/__tests__/ui.test.js +40 -1
  14. package/dist/question/__tests__/ui.test.js.map +1 -1
  15. package/dist/question/ui.d.ts.map +1 -1
  16. package/dist/question/ui.js +37 -7
  17. package/dist/question/ui.js.map +1 -1
  18. package/dist/team/__tests__/completion-evidence.test.js +31 -1
  19. package/dist/team/__tests__/completion-evidence.test.js.map +1 -1
  20. package/dist/team/__tests__/hook-primary-e2e-contract.test.js +9 -3
  21. package/dist/team/__tests__/hook-primary-e2e-contract.test.js.map +1 -1
  22. package/dist/team/__tests__/mcp-comm.test.js +25 -1
  23. package/dist/team/__tests__/mcp-comm.test.js.map +1 -1
  24. package/dist/team/__tests__/runtime.test.js +607 -53
  25. package/dist/team/__tests__/runtime.test.js.map +1 -1
  26. package/dist/team/__tests__/scaling.test.js +355 -4
  27. package/dist/team/__tests__/scaling.test.js.map +1 -1
  28. package/dist/team/__tests__/state.test.js +121 -2
  29. package/dist/team/__tests__/state.test.js.map +1 -1
  30. package/dist/team/completion-evidence.d.ts +1 -1
  31. package/dist/team/completion-evidence.d.ts.map +1 -1
  32. package/dist/team/completion-evidence.js +9 -0
  33. package/dist/team/completion-evidence.js.map +1 -1
  34. package/dist/team/mcp-comm.d.ts +5 -3
  35. package/dist/team/mcp-comm.d.ts.map +1 -1
  36. package/dist/team/mcp-comm.js +4 -0
  37. package/dist/team/mcp-comm.js.map +1 -1
  38. package/dist/team/runtime.d.ts.map +1 -1
  39. package/dist/team/runtime.js +116 -94
  40. package/dist/team/runtime.js.map +1 -1
  41. package/dist/team/scaling.d.ts +3 -3
  42. package/dist/team/scaling.d.ts.map +1 -1
  43. package/dist/team/scaling.js +71 -66
  44. package/dist/team/scaling.js.map +1 -1
  45. package/dist/team/state/tasks.d.ts +2 -0
  46. package/dist/team/state/tasks.d.ts.map +1 -1
  47. package/dist/team/state/tasks.js +8 -5
  48. package/dist/team/state/tasks.js.map +1 -1
  49. package/dist/team/state/types.d.ts +1 -0
  50. package/dist/team/state/types.d.ts.map +1 -1
  51. package/dist/team/state/types.js.map +1 -1
  52. package/dist/team/state.d.ts +1 -0
  53. package/dist/team/state.d.ts.map +1 -1
  54. package/dist/team/state.js +44 -0
  55. package/dist/team/state.js.map +1 -1
  56. package/dist/team/worker-bootstrap.js +2 -2
  57. package/package.json +1 -1
  58. package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
  59. package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +4 -1
@@ -7,7 +7,7 @@
7
7
  * Key design decisions:
8
8
  * - Monotonic worker index counter (next_worker_index in config) ensures unique names
9
9
  * - File-based scaling lock prevents concurrent scale operations
10
- * - 'draining' worker status for graceful transitions during scale_down
10
+ * - Worker-published idle/done status for graceful scale_down
11
11
  */
12
12
  import { type TeamConfig, type WorkerInfo } from './team-ops.js';
13
13
  export declare function isScalingEnabled(env?: NodeJS.ProcessEnv): boolean;
@@ -65,8 +65,8 @@ export declare function reconcileScaleDownCleanupDebt(teamName: string, cwd: str
65
65
  /**
66
66
  * Remove workers from a running team.
67
67
  *
68
- * Sets targeted workers to 'draining' status, waits for them to finish
69
- * current work (or force kills), then removes tmux panes and updates config.
68
+ * Waits for targeted workers to publish idle/done (unless forced), then removes
69
+ * tmux panes and updates config without mutating worker-owned status files.
70
70
  */
71
71
  export declare function scaleDown(teamName: string, cwd: string, options?: ScaleDownOptions, env?: NodeJS.ProcessEnv): Promise<ScaleDownResult | ScaleError>;
72
72
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"scaling.d.ts","sourceRoot":"","sources":["../../src/team/scaling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAsCH,OAAO,EAuBL,KAAK,UAAU,EAEf,KAAK,UAAU,EAEhB,MAAM,eAAe,CAAC;AAyFvB,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAK9E;AAyID,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,IAAI,CAAC;IACT,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,IAAI,CAAC;IACT,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf;AAED,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAmQF;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,gBAAgB,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,aAAa,GAAG,UAAU,CAAC,CAygCrC;AAID,MAAM,WAAW,gBAAgB;IAC/B,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iFAAiF;IACjF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAgCD,UAAU,wBAAwB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,aAAa,GAAE,wBAAwD,GACtE,OAAO,CAMT;AAwND,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,UAAU,GACxB,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA6KtD;AAGD;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,gBAAqB,EAC9B,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,CA+YvC"}
1
+ {"version":3,"file":"scaling.d.ts","sourceRoot":"","sources":["../../src/team/scaling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAsCH,OAAO,EAsBL,KAAK,UAAU,EAEf,KAAK,UAAU,EAChB,MAAM,eAAe,CAAC;AAyFvB,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAK9E;AAyID,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,IAAI,CAAC;IACT,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,IAAI,CAAC;IACT,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf;AAED,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAmQF;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,gBAAgB,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,aAAa,GAAG,UAAU,CAAC,CA6gCrC;AAID,MAAM,WAAW,gBAAgB;IAC/B,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iFAAiF;IACjF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAiCD,UAAU,wBAAwB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,aAAa,GAAE,wBAAwD,GACtE,OAAO,CAMT;AAqPD,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,UAAU,GACxB,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA8KtD;AAGD;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,gBAAqB,EAC9B,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,CA4WvC"}
@@ -7,7 +7,7 @@
7
7
  * Key design decisions:
8
8
  * - Monotonic worker index counter (next_worker_index in config) ensures unique names
9
9
  * - File-based scaling lock prevents concurrent scale operations
10
- * - 'draining' worker status for graceful transitions during scale_down
10
+ * - Worker-published idle/done status for graceful scale_down
11
11
  */
12
12
  import { randomUUID } from 'crypto';
13
13
  import { dirname, isAbsolute, join, relative, resolve, sep } from 'path';
@@ -18,7 +18,7 @@ import { HerdrError, ensureHerdrServer, herdrWorkspaceIdFromPaneId, isHerdrBinar
18
18
  import { sanitizeTeamName, isTmuxAvailable, waitForWorkerReady, dismissTrustPromptIfPresent, isWorkerAlive, buildWorkerProcessLaunchSpec, buildWorkerStartupCommand, trustWorkerMiseConfigIfAvailable, writeWorkerStartupScriptCommand, resolveTeamWorkerCliForResolvedLaunchArgs, assertTeamWorkerCliPolicyCompatibility, readPaneTeamOwnerTagResult, teardownWorkerPanes, } from './tmux-session.js';
19
19
  import { readExactPaneProofSync } from './exact-pane.js';
20
20
  import { spawnSync } from 'child_process';
21
- import { teamReadConfig as readTeamConfig, teamSaveConfig as saveTeamConfig, teamWriteWorkerIdentity as writeWorkerIdentity, teamReadManifest as readTeamManifestV2, teamNormalizePolicy as normalizeTeamPolicy, teamReadWorkerStatus as readWorkerStatus, teamWriteWorkerStatus as writeWorkerStatus, teamWithScalingLock as withScalingLock, teamWithTaskMembershipBarrier as withTaskMembershipBarrier, recoverTeamMembershipTaskTransaction, commitTeamMembershipTaskTransaction, finalizeTeamMembershipTaskTransaction, writeAtomic, teamRemoveDurableFile as removeDurableFile, teamAppendEvent as appendTeamEvent, teamCreateTask as createStateTask, teamListTasks as listTasks, teamReadTask as readTask, teamMarkDispatchRequestNotified as markDispatchRequestNotified, teamReadDispatchRequest as readDispatchRequest, teamTransitionDispatchRequest as transitionDispatchRequest, teamRemoveDispatchRequestsForWorkers as removeDispatchRequestsForWorkers, } from './team-ops.js';
21
+ import { teamReadConfig as readTeamConfig, teamSaveConfig as saveTeamConfig, teamWriteWorkerIdentity as writeWorkerIdentity, teamReadManifest as readTeamManifestV2, teamNormalizePolicy as normalizeTeamPolicy, teamReadWorkerStatus as readWorkerStatus, teamWithScalingLock as withScalingLock, teamWithTaskMembershipBarrier as withTaskMembershipBarrier, recoverTeamMembershipTaskTransaction, commitTeamMembershipTaskTransaction, finalizeTeamMembershipTaskTransaction, writeAtomic, teamRemoveDurableFile as removeDurableFile, teamAppendEvent as appendTeamEvent, teamCreateTask as createStateTask, teamListTasks as listTasks, teamReadTask as readTask, teamMarkDispatchRequestNotified as markDispatchRequestNotified, teamReadDispatchRequest as readDispatchRequest, teamTransitionDispatchRequest as transitionDispatchRequest, teamRemoveDispatchRequestsForWorkers as removeDispatchRequestsForWorkers, } from './team-ops.js';
22
22
  import { queueInboxInstruction, waitForDispatchReceipt, } from './mcp-comm.js';
23
23
  import { generateInitialInbox, buildTriggerDirective, writeWorkerRoleInstructionsFile, writeWorkerWorktreeRootAgentsFile, removeWorkerWorktreeRootAgentsFile, } from './worker-bootstrap.js';
24
24
  import { buildTeamWorkerGoalInstruction } from './goal-workflow.js';
@@ -359,7 +359,13 @@ export async function scaleUp(teamName, count, agentType, tasks, cwd, env = proc
359
359
  if (!Number.isInteger(count) || count < 1) {
360
360
  return { ok: false, error: `count must be a positive integer (got ${count})` };
361
361
  }
362
- const backend = readMultiplexerConfig({ env }).backend;
362
+ const sanitized = sanitizeTeamName(teamName);
363
+ const leaderCwd = resolve(cwd);
364
+ // Try to read team config early to use its persisted backend instead of env backend.
365
+ // If team doesn't exist yet, we'll validate backends based on env and fail later with
366
+ // a clearer "Team not found" message in the locking phase.
367
+ const existingConfig = await readTeamConfig(sanitized, leaderCwd).catch(() => null);
368
+ const backend = existingConfig?.worker_launch_mode === 'herdr' ? 'herdr' : readMultiplexerConfig({ env }).backend;
363
369
  if (backend === 'herdr' && !(await isHerdrBinaryCallable(resolveHerdrBinary(env), env))) {
364
370
  return {
365
371
  ok: false,
@@ -369,8 +375,6 @@ export async function scaleUp(teamName, count, agentType, tasks, cwd, env = proc
369
375
  if (backend !== 'herdr' && !isTmuxAvailable()) {
370
376
  return { ok: false, error: 'tmux is not available' };
371
377
  }
372
- const sanitized = sanitizeTeamName(teamName);
373
- const leaderCwd = resolve(cwd);
374
378
  return await withScalingLock(sanitized, leaderCwd, async () => {
375
379
  return await withTaskMembershipBarrier(sanitized, leaderCwd, async () => {
376
380
  const config = await readTeamConfig(sanitized, leaderCwd);
@@ -1314,7 +1318,32 @@ async function validateScaleDownCleanupResources(teamName, leaderCwd, teamStateR
1314
1318
  }
1315
1319
  }
1316
1320
  }
1317
- async function cleanupScaleDownResources(teamName, teamStateRoot, workers) {
1321
+ function assertScaleDownWorktreesPreserved(workers, leaderCwd) {
1322
+ for (const worker of workers) {
1323
+ if (!worker.worktree_path || !existsSync(worker.worktree_path))
1324
+ continue;
1325
+ const git = (args, cwd = worker.worktree_path) => spawnSync('git', args, {
1326
+ cwd, encoding: 'utf8', windowsHide: true,
1327
+ });
1328
+ // ORIG_HEAD and COMMIT_EDITMSG survive completed operations; only active state vetoes removal.
1329
+ if (['rebase-merge', 'rebase-apply', 'MERGE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'sequencer', 'BISECT_START'].some((marker) => {
1330
+ const path = git(['rev-parse', '--git-path', marker]);
1331
+ return path.status !== 0 || !path.stdout.trim()
1332
+ || existsSync(resolve(worker.worktree_path, path.stdout.trim()));
1333
+ })) {
1334
+ throw new Error(`scale_down_worktree_not_preserved:${worker.name}`);
1335
+ }
1336
+ const head = git(['rev-parse', 'HEAD']);
1337
+ const status = git(['status', '--porcelain', '--untracked-files=all', '--ignored', '--ignore-submodules=none']);
1338
+ if (head.status !== 0 || status.status !== 0 || status.stdout.trim()
1339
+ || git(['merge-base', '--is-ancestor', head.stdout.trim(), 'HEAD'], leaderCwd).status !== 0) {
1340
+ throw new Error(`scale_down_worktree_not_preserved:${worker.name}`);
1341
+ }
1342
+ }
1343
+ }
1344
+ async function cleanupScaleDownResources(teamName, teamStateRoot, workers, leaderCwd, force) {
1345
+ if (!force)
1346
+ assertScaleDownWorktreesPreserved(workers, leaderCwd);
1318
1347
  for (const worker of workers) {
1319
1348
  // An absent exact worktree means a prior cleanup completed before crashing.
1320
1349
  // Do not replay a restoration or git removal against a replacement path.
@@ -1341,7 +1370,7 @@ async function cleanupScaleDownResources(teamName, teamStateRoot, workers) {
1341
1370
  createdBranch: false,
1342
1371
  }));
1343
1372
  if (worktrees.length > 0)
1344
- await rollbackProvisionedWorktrees(worktrees, { force: true });
1373
+ await rollbackProvisionedWorktrees(worktrees, { force });
1345
1374
  await Promise.all(workers.map(async (worker) => {
1346
1375
  await rm(join(teamStateRoot, 'team', teamName, 'workers', worker.name), { recursive: true, force: true });
1347
1376
  }));
@@ -1450,7 +1479,8 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
1450
1479
  catch (error) {
1451
1480
  return { ok: false, error: `scale_down_cleanup_debt_unreadable:${String(error)}` };
1452
1481
  }
1453
- if (debt.schema_version !== 1 || debt.operation !== 'scale_down') {
1482
+ if (debt.schema_version !== 1 || debt.operation !== 'scale_down'
1483
+ || (debt.force !== undefined && typeof debt.force !== 'boolean')) {
1454
1484
  return { ok: false, error: 'scale_down_cleanup_debt_malformed' };
1455
1485
  }
1456
1486
  const removedWorkerNames = Array.isArray(debt.removed_worker_names)
@@ -1588,7 +1618,7 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
1588
1618
  return { ok: false, error: `scale_down_cleanup_debt_unresolved:${unresolvedPanes.map((pane) => pane.pane_id).join(',')}` };
1589
1619
  }
1590
1620
  try {
1591
- await cleanupScaleDownResources(sanitized, teamStateRoot, resources);
1621
+ await cleanupScaleDownResources(sanitized, teamStateRoot, resources, leaderCwd, debt.force === true);
1592
1622
  }
1593
1623
  catch (error) {
1594
1624
  await writeAtomic(cleanupDebtPath, JSON.stringify({
@@ -1607,8 +1637,8 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
1607
1637
  /**
1608
1638
  * Remove workers from a running team.
1609
1639
  *
1610
- * Sets targeted workers to 'draining' status, waits for them to finish
1611
- * current work (or force kills), then removes tmux panes and updates config.
1640
+ * Waits for targeted workers to publish idle/done (unless forced), then removes
1641
+ * tmux panes and updates config without mutating worker-owned status files.
1612
1642
  */
1613
1643
  export async function scaleDown(teamName, cwd, options = {}, env = process.env) {
1614
1644
  assertScalingEnabled(env);
@@ -1616,6 +1646,9 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1616
1646
  const leaderCwd = resolve(cwd);
1617
1647
  const force = options.force === true;
1618
1648
  const drainTimeoutMs = options.drainTimeoutMs ?? 30_000;
1649
+ if (!Number.isFinite(drainTimeoutMs) || drainTimeoutMs < 0) {
1650
+ return { ok: false, error: 'drainTimeoutMs must be a non-negative finite number' };
1651
+ }
1619
1652
  return await withScalingLock(sanitized, leaderCwd, async () => {
1620
1653
  const config = await withTaskMembershipBarrier(sanitized, leaderCwd, async () => {
1621
1654
  await recoverTeamMembershipTaskTransaction(sanitized, leaderCwd);
@@ -1649,7 +1682,7 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1649
1682
  const idleWorkers = [];
1650
1683
  for (const w of config.workers) {
1651
1684
  const status = await readWorkerStatus(sanitized, w.name, leaderCwd);
1652
- if (status.state === 'idle' || status.state === 'done' || status.state === 'unknown') {
1685
+ if (status.state === 'idle' || status.state === 'done') {
1653
1686
  idleWorkers.push(w);
1654
1687
  }
1655
1688
  }
@@ -1675,63 +1708,25 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1675
1708
  if (config.workers.length - targetWorkers.length < 1) {
1676
1709
  return { ok: false, error: 'Cannot remove all workers — at least 1 must remain' };
1677
1710
  }
1678
- const sessionName = config.tmux_session;
1679
1711
  const removedNames = [];
1680
- const priorWorkerStatusArtifacts = new Map();
1681
- for (const worker of targetWorkers) {
1682
- const statusPath = join(teamStateRoot, 'team', sanitized, 'workers', worker.name, 'status.json');
1683
- try {
1684
- priorWorkerStatusArtifacts.set(worker.name, { exists: true, raw: await readFile(statusPath) });
1685
- }
1686
- catch (error) {
1687
- if (error.code === 'ENOENT') {
1688
- priorWorkerStatusArtifacts.set(worker.name, { exists: false });
1689
- }
1690
- else {
1691
- throw error;
1692
- }
1693
- }
1694
- }
1695
- const restorePriorWorkerStatuses = async (workers) => {
1696
- await Promise.all(workers.map(async (worker) => {
1697
- const statusPath = join(teamStateRoot, 'team', sanitized, 'workers', worker.name, 'status.json');
1698
- const priorArtifact = priorWorkerStatusArtifacts.get(worker.name);
1699
- if (priorArtifact?.exists) {
1700
- await writeFile(statusPath, priorArtifact.raw);
1701
- }
1702
- else {
1703
- await rm(statusPath, { force: true });
1704
- }
1705
- }));
1706
- };
1707
- // Phase 1: Set workers to 'draining' status
1708
- for (const w of targetWorkers) {
1709
- const drainingStatus = {
1710
- state: 'draining',
1711
- reason: 'scale_down requested by leader',
1712
- updated_at: new Date().toISOString(),
1713
- };
1714
- await writeWorkerStatus(sanitized, w.name, drainingStatus, leaderCwd);
1715
- }
1716
- // Phase 2: Wait for draining workers to finish or timeout
1717
1712
  if (!force) {
1718
1713
  const deadline = Date.now() + drainTimeoutMs;
1719
- while (Date.now() < deadline) {
1720
- const allDrained = await Promise.all(targetWorkers.map(async (w) => {
1721
- const status = await readWorkerStatus(sanitized, w.name, leaderCwd);
1722
- if (status.state === 'idle' || status.state === 'done' || status.state === 'draining') {
1714
+ while (true) {
1715
+ const statuses = await Promise.all(targetWorkers.map((w) => readWorkerStatus(sanitized, w.name, leaderCwd)));
1716
+ if (statuses.every((status) => status.state === 'idle' || status.state === 'done'))
1717
+ break;
1718
+ // A dead process cannot acknowledge a drain; liveness never authorizes removal.
1719
+ const alive = await Promise.all(targetWorkers.map((worker, index) => {
1720
+ if (statuses[index].state === 'idle' || statuses[index].state === 'done' || !worker.pane_id)
1723
1721
  return true;
1724
- }
1725
- // Herdr liveness is the live-agent inventory; tmux keeps the
1726
- // PID-pinned pane proof.
1727
- if (typeof w.pane_id === 'string' && isHerdrPaneId(w.pane_id)) {
1728
- return !(await isHerdrWorkerAlive(w.pane_id));
1729
- }
1730
- return !isWorkerAlive(sessionName, w.index, w.pane_id, w.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined);
1722
+ return isHerdrPaneId(worker.pane_id)
1723
+ ? isHerdrWorkerAlive(worker.pane_id, { env })
1724
+ : isWorkerAlive(config.tmux_session, worker.index, worker.pane_id, worker.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined);
1731
1725
  }));
1732
- if (allDrained.every(Boolean))
1733
- break;
1734
- await new Promise(r => setTimeout(r, 2_000));
1726
+ if (alive.some((value) => !value) || Date.now() >= deadline) {
1727
+ return { ok: false, error: 'scale_down_drain_timeout' };
1728
+ }
1729
+ await new Promise((resolve) => setTimeout(resolve, Math.min(100, Math.max(0, deadline - Date.now()))));
1735
1730
  }
1736
1731
  }
1737
1732
  // Phase 3: acquire the membership barrier and task claim locks before any
@@ -1761,6 +1756,17 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1761
1756
  .map((task) => task.id);
1762
1757
  await withTaskClaimLocks(sanitized, candidateTaskIds, leaderCwd, async () => {
1763
1758
  const lockedTasks = await listTasks(sanitized, leaderCwd);
1759
+ if (!force) {
1760
+ const statuses = await Promise.all(removableWorkers.map((w) => readWorkerStatus(sanitized, w.name, leaderCwd)));
1761
+ if (!statuses.every((status) => status.state === 'idle' || status.state === 'done')) {
1762
+ throw new Error('scale_down_worker_not_drained');
1763
+ }
1764
+ if (lockedTasks.some((task) => task.status !== 'completed' && task.status !== 'failed'
1765
+ && (removableWorkerNames.has(task.owner ?? '') || removableWorkerNames.has(task.claim?.owner ?? '')))) {
1766
+ throw new Error('scale_down_worker_has_active_tasks');
1767
+ }
1768
+ assertScaleDownWorktreesPreserved(removableWorkers, leaderCwd);
1769
+ }
1764
1770
  const configPath = join(teamStateRoot, 'team', sanitized, 'config.json');
1765
1771
  const configSnapshot = await readFile(configPath);
1766
1772
  const manifestPath = join(teamStateRoot, 'team', sanitized, 'manifest.v2.json');
@@ -1819,6 +1825,7 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1819
1825
  const cleanupDebtBase = {
1820
1826
  schema_version: 1,
1821
1827
  operation: 'scale_down',
1828
+ force,
1822
1829
  status: 'pending_teardown',
1823
1830
  created_at: new Date().toISOString(),
1824
1831
  removed_worker_names: removableWorkers.map((worker) => worker.name),
@@ -1922,7 +1929,6 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1922
1929
  ]);
1923
1930
  const unresolvedWorkers = removableWorkers.filter((worker) => (typeof worker.pane_id === 'string' && !resolvedPaneIds.has(worker.pane_id)));
1924
1931
  if (unresolvedWorkers.length > 0) {
1925
- await restorePriorWorkerStatuses(unresolvedWorkers);
1926
1932
  const proofDebt = [
1927
1933
  ...herdrProofDebt,
1928
1934
  ...unpinnedProofDebt,
@@ -1964,7 +1970,6 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
1964
1970
  });
1965
1971
  }
1966
1972
  catch (error) {
1967
- await restorePriorWorkerStatuses(removableWorkers);
1968
1973
  return { ok: false, error: `scale_down_task_reconciliation_failed:${String(error)}` };
1969
1974
  }
1970
1975
  if (teardownFailure)