oh-my-codex 0.22.0 → 0.22.2
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.
- package/Cargo.lock +6 -6
- package/Cargo.toml +1 -1
- package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js +104 -3
- package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js.map +1 -1
- package/dist/cli/__tests__/question.test.js +33 -0
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +11 -4
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/question.d.ts.map +1 -1
- package/dist/cli/question.js +8 -1
- package/dist/cli/question.js.map +1 -1
- package/dist/question/__tests__/ui.test.js +40 -1
- package/dist/question/__tests__/ui.test.js.map +1 -1
- package/dist/question/ui.d.ts.map +1 -1
- package/dist/question/ui.js +37 -7
- package/dist/question/ui.js.map +1 -1
- package/dist/team/__tests__/completion-evidence.test.js +31 -1
- package/dist/team/__tests__/completion-evidence.test.js.map +1 -1
- package/dist/team/__tests__/hook-primary-e2e-contract.test.js +9 -3
- package/dist/team/__tests__/hook-primary-e2e-contract.test.js.map +1 -1
- package/dist/team/__tests__/mcp-comm.test.js +25 -1
- package/dist/team/__tests__/mcp-comm.test.js.map +1 -1
- package/dist/team/__tests__/p1-safety.test.d.ts +2 -0
- package/dist/team/__tests__/p1-safety.test.d.ts.map +1 -0
- package/dist/team/__tests__/p1-safety.test.js +553 -0
- package/dist/team/__tests__/p1-safety.test.js.map +1 -0
- package/dist/team/__tests__/runtime.test.js +607 -53
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/scaling.test.js +355 -4
- package/dist/team/__tests__/scaling.test.js.map +1 -1
- package/dist/team/__tests__/state.test.js +127 -5
- package/dist/team/__tests__/state.test.js.map +1 -1
- package/dist/team/completion-evidence.d.ts +2 -1
- package/dist/team/completion-evidence.d.ts.map +1 -1
- package/dist/team/completion-evidence.js +30 -7
- package/dist/team/completion-evidence.js.map +1 -1
- package/dist/team/mcp-comm.d.ts +5 -3
- package/dist/team/mcp-comm.d.ts.map +1 -1
- package/dist/team/mcp-comm.js +4 -0
- package/dist/team/mcp-comm.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +244 -146
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts +3 -3
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +73 -67
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/state/tasks.d.ts +2 -0
- package/dist/team/state/tasks.d.ts.map +1 -1
- package/dist/team/state/tasks.js +28 -22
- package/dist/team/state/tasks.js.map +1 -1
- package/dist/team/state/types.d.ts +1 -0
- package/dist/team/state/types.d.ts.map +1 -1
- package/dist/team/state/types.js.map +1 -1
- package/dist/team/state.d.ts +1 -0
- package/dist/team/state.d.ts.map +1 -1
- package/dist/team/state.js +60 -11
- package/dist/team/state.js.map +1 -1
- package/dist/team/worker-bootstrap.js +2 -2
- package/dist/team/worktree.d.ts +1 -0
- package/dist/team/worktree.d.ts.map +1 -1
- package/dist/team/worktree.js +64 -11
- package/dist/team/worktree.js.map +1 -1
- package/package.json +1 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +1 -1
- package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +4 -1
package/dist/team/scaling.d.ts
CHANGED
|
@@ -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
|
-
* -
|
|
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
|
-
*
|
|
69
|
-
*
|
|
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,
|
|
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;AA0FvB,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;AAsPD,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"}
|
package/dist/team/scaling.js
CHANGED
|
@@ -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
|
-
* -
|
|
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,
|
|
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';
|
|
@@ -28,7 +28,7 @@ import { codexPromptsDir } from '../utils/paths.js';
|
|
|
28
28
|
import { resolveCodexHomeForChildExport, resolveCodexHomeForLaunch } from '../cli/codex-home.js';
|
|
29
29
|
import { parseTeamWorkerLaunchArgs, resolveTeamWorkerLaunchArgs, resolveAgentDefaultModel, resolveAgentReasoningEffort, shouldHonorAgentExactModel, TEAM_WORKER_INHERITED_MODEL_ENV, } from './model-contract.js';
|
|
30
30
|
import { resolveCanonicalTeamStateRoot } from './state-root.js';
|
|
31
|
-
import { ensureWorktree, planWorktreeTarget, rollbackProvisionedWorktrees, } from './worktree.js';
|
|
31
|
+
import { archiveIgnoredCompletionEvidence, ensureWorktree, planWorktreeTarget, rollbackProvisionedWorktrees, } from './worktree.js';
|
|
32
32
|
import { withTaskClaimLock } from './state/locks.js';
|
|
33
33
|
import { buildApprovedTeamHandoffSection, resolvePersistedApprovedTeamExecutionContinuityState, } from './approved-execution.js';
|
|
34
34
|
import { readPersistedTeamUltragoalContext, renderLeaderOwnedUltragoalContextSection, } from './ultragoal-context.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
|
|
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,33 @@ async function validateScaleDownCleanupResources(teamName, leaderCwd, teamStateR
|
|
|
1314
1318
|
}
|
|
1315
1319
|
}
|
|
1316
1320
|
}
|
|
1317
|
-
async function
|
|
1321
|
+
async 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
|
+
await archiveIgnoredCompletionEvidence(worker.worktree_path);
|
|
1337
|
+
const head = git(['rev-parse', 'HEAD']);
|
|
1338
|
+
const status = git(['status', '--porcelain', '--untracked-files=all', '--ignored', '--ignore-submodules=none']);
|
|
1339
|
+
if (head.status !== 0 || status.status !== 0 || status.stdout.trim()
|
|
1340
|
+
|| git(['merge-base', '--is-ancestor', head.stdout.trim(), 'HEAD'], leaderCwd).status !== 0) {
|
|
1341
|
+
throw new Error(`scale_down_worktree_not_preserved:${worker.name}`);
|
|
1342
|
+
}
|
|
1343
|
+
}
|
|
1344
|
+
}
|
|
1345
|
+
async function cleanupScaleDownResources(teamName, teamStateRoot, workers, leaderCwd, force) {
|
|
1346
|
+
if (!force)
|
|
1347
|
+
await assertScaleDownWorktreesPreserved(workers, leaderCwd);
|
|
1318
1348
|
for (const worker of workers) {
|
|
1319
1349
|
// An absent exact worktree means a prior cleanup completed before crashing.
|
|
1320
1350
|
// Do not replay a restoration or git removal against a replacement path.
|
|
@@ -1341,7 +1371,7 @@ async function cleanupScaleDownResources(teamName, teamStateRoot, workers) {
|
|
|
1341
1371
|
createdBranch: false,
|
|
1342
1372
|
}));
|
|
1343
1373
|
if (worktrees.length > 0)
|
|
1344
|
-
await rollbackProvisionedWorktrees(worktrees, { force
|
|
1374
|
+
await rollbackProvisionedWorktrees(worktrees, { force });
|
|
1345
1375
|
await Promise.all(workers.map(async (worker) => {
|
|
1346
1376
|
await rm(join(teamStateRoot, 'team', teamName, 'workers', worker.name), { recursive: true, force: true });
|
|
1347
1377
|
}));
|
|
@@ -1450,7 +1480,8 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
|
|
|
1450
1480
|
catch (error) {
|
|
1451
1481
|
return { ok: false, error: `scale_down_cleanup_debt_unreadable:${String(error)}` };
|
|
1452
1482
|
}
|
|
1453
|
-
if (debt.schema_version !== 1 || debt.operation !== 'scale_down'
|
|
1483
|
+
if (debt.schema_version !== 1 || debt.operation !== 'scale_down'
|
|
1484
|
+
|| (debt.force !== undefined && typeof debt.force !== 'boolean')) {
|
|
1454
1485
|
return { ok: false, error: 'scale_down_cleanup_debt_malformed' };
|
|
1455
1486
|
}
|
|
1456
1487
|
const removedWorkerNames = Array.isArray(debt.removed_worker_names)
|
|
@@ -1588,7 +1619,7 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
|
|
|
1588
1619
|
return { ok: false, error: `scale_down_cleanup_debt_unresolved:${unresolvedPanes.map((pane) => pane.pane_id).join(',')}` };
|
|
1589
1620
|
}
|
|
1590
1621
|
try {
|
|
1591
|
-
await cleanupScaleDownResources(sanitized, teamStateRoot, resources);
|
|
1622
|
+
await cleanupScaleDownResources(sanitized, teamStateRoot, resources, leaderCwd, debt.force === true);
|
|
1592
1623
|
}
|
|
1593
1624
|
catch (error) {
|
|
1594
1625
|
await writeAtomic(cleanupDebtPath, JSON.stringify({
|
|
@@ -1607,8 +1638,8 @@ export async function reconcileScaleDownCleanupDebt(teamName, cwd, _callerConfig
|
|
|
1607
1638
|
/**
|
|
1608
1639
|
* Remove workers from a running team.
|
|
1609
1640
|
*
|
|
1610
|
-
*
|
|
1611
|
-
*
|
|
1641
|
+
* Waits for targeted workers to publish idle/done (unless forced), then removes
|
|
1642
|
+
* tmux panes and updates config without mutating worker-owned status files.
|
|
1612
1643
|
*/
|
|
1613
1644
|
export async function scaleDown(teamName, cwd, options = {}, env = process.env) {
|
|
1614
1645
|
assertScalingEnabled(env);
|
|
@@ -1616,6 +1647,9 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1616
1647
|
const leaderCwd = resolve(cwd);
|
|
1617
1648
|
const force = options.force === true;
|
|
1618
1649
|
const drainTimeoutMs = options.drainTimeoutMs ?? 30_000;
|
|
1650
|
+
if (!Number.isFinite(drainTimeoutMs) || drainTimeoutMs < 0) {
|
|
1651
|
+
return { ok: false, error: 'drainTimeoutMs must be a non-negative finite number' };
|
|
1652
|
+
}
|
|
1619
1653
|
return await withScalingLock(sanitized, leaderCwd, async () => {
|
|
1620
1654
|
const config = await withTaskMembershipBarrier(sanitized, leaderCwd, async () => {
|
|
1621
1655
|
await recoverTeamMembershipTaskTransaction(sanitized, leaderCwd);
|
|
@@ -1649,7 +1683,7 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1649
1683
|
const idleWorkers = [];
|
|
1650
1684
|
for (const w of config.workers) {
|
|
1651
1685
|
const status = await readWorkerStatus(sanitized, w.name, leaderCwd);
|
|
1652
|
-
if (status.state === 'idle' || status.state === 'done'
|
|
1686
|
+
if (status.state === 'idle' || status.state === 'done') {
|
|
1653
1687
|
idleWorkers.push(w);
|
|
1654
1688
|
}
|
|
1655
1689
|
}
|
|
@@ -1675,63 +1709,25 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1675
1709
|
if (config.workers.length - targetWorkers.length < 1) {
|
|
1676
1710
|
return { ok: false, error: 'Cannot remove all workers — at least 1 must remain' };
|
|
1677
1711
|
}
|
|
1678
|
-
const sessionName = config.tmux_session;
|
|
1679
1712
|
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
1713
|
if (!force) {
|
|
1718
1714
|
const deadline = Date.now() + drainTimeoutMs;
|
|
1719
|
-
while (
|
|
1720
|
-
const
|
|
1721
|
-
|
|
1722
|
-
|
|
1715
|
+
while (true) {
|
|
1716
|
+
const statuses = await Promise.all(targetWorkers.map((w) => readWorkerStatus(sanitized, w.name, leaderCwd)));
|
|
1717
|
+
if (statuses.every((status) => status.state === 'idle' || status.state === 'done'))
|
|
1718
|
+
break;
|
|
1719
|
+
// A dead process cannot acknowledge a drain; liveness never authorizes removal.
|
|
1720
|
+
const alive = await Promise.all(targetWorkers.map((worker, index) => {
|
|
1721
|
+
if (statuses[index].state === 'idle' || statuses[index].state === 'done' || !worker.pane_id)
|
|
1723
1722
|
return true;
|
|
1724
|
-
|
|
1725
|
-
|
|
1726
|
-
|
|
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);
|
|
1723
|
+
return isHerdrPaneId(worker.pane_id)
|
|
1724
|
+
? isHerdrWorkerAlive(worker.pane_id, { env })
|
|
1725
|
+
: isWorkerAlive(config.tmux_session, worker.index, worker.pane_id, worker.pid, config.tmux_pane_owner_id ?? undefined, config.hud_pane_id ?? undefined);
|
|
1731
1726
|
}));
|
|
1732
|
-
if (
|
|
1733
|
-
|
|
1734
|
-
|
|
1727
|
+
if (alive.some((value) => !value) || Date.now() >= deadline) {
|
|
1728
|
+
return { ok: false, error: 'scale_down_drain_timeout' };
|
|
1729
|
+
}
|
|
1730
|
+
await new Promise((resolve) => setTimeout(resolve, Math.min(100, Math.max(0, deadline - Date.now()))));
|
|
1735
1731
|
}
|
|
1736
1732
|
}
|
|
1737
1733
|
// Phase 3: acquire the membership barrier and task claim locks before any
|
|
@@ -1761,6 +1757,17 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1761
1757
|
.map((task) => task.id);
|
|
1762
1758
|
await withTaskClaimLocks(sanitized, candidateTaskIds, leaderCwd, async () => {
|
|
1763
1759
|
const lockedTasks = await listTasks(sanitized, leaderCwd);
|
|
1760
|
+
if (!force) {
|
|
1761
|
+
const statuses = await Promise.all(removableWorkers.map((w) => readWorkerStatus(sanitized, w.name, leaderCwd)));
|
|
1762
|
+
if (!statuses.every((status) => status.state === 'idle' || status.state === 'done')) {
|
|
1763
|
+
throw new Error('scale_down_worker_not_drained');
|
|
1764
|
+
}
|
|
1765
|
+
if (lockedTasks.some((task) => task.status !== 'completed' && task.status !== 'failed'
|
|
1766
|
+
&& (removableWorkerNames.has(task.owner ?? '') || removableWorkerNames.has(task.claim?.owner ?? '')))) {
|
|
1767
|
+
throw new Error('scale_down_worker_has_active_tasks');
|
|
1768
|
+
}
|
|
1769
|
+
await assertScaleDownWorktreesPreserved(removableWorkers, leaderCwd);
|
|
1770
|
+
}
|
|
1764
1771
|
const configPath = join(teamStateRoot, 'team', sanitized, 'config.json');
|
|
1765
1772
|
const configSnapshot = await readFile(configPath);
|
|
1766
1773
|
const manifestPath = join(teamStateRoot, 'team', sanitized, 'manifest.v2.json');
|
|
@@ -1819,6 +1826,7 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1819
1826
|
const cleanupDebtBase = {
|
|
1820
1827
|
schema_version: 1,
|
|
1821
1828
|
operation: 'scale_down',
|
|
1829
|
+
force,
|
|
1822
1830
|
status: 'pending_teardown',
|
|
1823
1831
|
created_at: new Date().toISOString(),
|
|
1824
1832
|
removed_worker_names: removableWorkers.map((worker) => worker.name),
|
|
@@ -1922,7 +1930,6 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1922
1930
|
]);
|
|
1923
1931
|
const unresolvedWorkers = removableWorkers.filter((worker) => (typeof worker.pane_id === 'string' && !resolvedPaneIds.has(worker.pane_id)));
|
|
1924
1932
|
if (unresolvedWorkers.length > 0) {
|
|
1925
|
-
await restorePriorWorkerStatuses(unresolvedWorkers);
|
|
1926
1933
|
const proofDebt = [
|
|
1927
1934
|
...herdrProofDebt,
|
|
1928
1935
|
...unpinnedProofDebt,
|
|
@@ -1964,7 +1971,6 @@ export async function scaleDown(teamName, cwd, options = {}, env = process.env)
|
|
|
1964
1971
|
});
|
|
1965
1972
|
}
|
|
1966
1973
|
catch (error) {
|
|
1967
|
-
await restorePriorWorkerStatuses(removableWorkers);
|
|
1968
1974
|
return { ok: false, error: `scale_down_task_reconciliation_failed:${String(error)}` };
|
|
1969
1975
|
}
|
|
1970
1976
|
if (teardownFailure)
|