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.
- package/Cargo.lock +6 -6
- package/Cargo.toml +1 -1
- package/README.md +15 -0
- package/crates/omx-mux/src/herdr.rs +481 -0
- package/crates/omx-mux/src/lib.rs +5 -0
- package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js +707 -47
- package/dist/cli/__tests__/plugin-cache-live-pin-3790.test.js.map +1 -1
- package/dist/cli/__tests__/session-compare.test.d.ts +2 -0
- package/dist/cli/__tests__/session-compare.test.d.ts.map +1 -0
- package/dist/cli/__tests__/session-compare.test.js +183 -0
- package/dist/cli/__tests__/session-compare.test.js.map +1 -0
- package/dist/cli/__tests__/setup-install-mode.test.js +7 -1
- package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
- package/dist/cli/__tests__/team.test.js +8 -0
- package/dist/cli/__tests__/team.test.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +328 -142
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/session-compare.d.ts +11 -0
- package/dist/cli/session-compare.d.ts.map +1 -0
- package/dist/cli/session-compare.js +172 -0
- package/dist/cli/session-compare.js.map +1 -0
- package/dist/cli/session-search.d.ts.map +1 -1
- package/dist/cli/session-search.js +7 -0
- package/dist/cli/session-search.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +2 -0
- package/dist/cli/team.js.map +1 -1
- package/dist/config/__tests__/multiplexer.test.d.ts +2 -0
- package/dist/config/__tests__/multiplexer.test.d.ts.map +1 -0
- package/dist/config/__tests__/multiplexer.test.js +118 -0
- package/dist/config/__tests__/multiplexer.test.js.map +1 -0
- package/dist/config/multiplexer.d.ts +29 -0
- package/dist/config/multiplexer.d.ts.map +1 -0
- package/dist/config/multiplexer.js +91 -0
- package/dist/config/multiplexer.js.map +1 -0
- package/dist/hooks/__tests__/sunset-routing-contract.test.js +4 -2
- package/dist/hooks/__tests__/sunset-routing-contract.test.js.map +1 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js +281 -1
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/generate-release-body.test.js +142 -5
- package/dist/scripts/__tests__/generate-release-body.test.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +8 -2
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/generate-release-body.d.ts.map +1 -1
- package/dist/scripts/generate-release-body.js +14 -0
- package/dist/scripts/generate-release-body.js.map +1 -1
- package/dist/scripts/notify-hook/team-worker-lease.d.ts +15 -0
- package/dist/scripts/notify-hook/team-worker-lease.d.ts.map +1 -0
- package/dist/scripts/notify-hook/team-worker-lease.js +63 -0
- package/dist/scripts/notify-hook/team-worker-lease.js.map +1 -0
- package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts +1 -0
- package/dist/scripts/notify-hook/team-worker-posttooluse.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-worker-posttooluse.js +16 -5
- package/dist/scripts/notify-hook/team-worker-posttooluse.js.map +1 -1
- package/dist/scripts/notify-hook/team-worker.d.ts +12 -1
- package/dist/scripts/notify-hook/team-worker.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-worker.js +16 -4
- package/dist/scripts/notify-hook/team-worker.js.map +1 -1
- package/dist/session-history/__tests__/compare.test.d.ts +2 -0
- package/dist/session-history/__tests__/compare.test.d.ts.map +1 -0
- package/dist/session-history/__tests__/compare.test.js +257 -0
- package/dist/session-history/__tests__/compare.test.js.map +1 -0
- package/dist/session-history/compare.d.ts +74 -0
- package/dist/session-history/compare.d.ts.map +1 -0
- package/dist/session-history/compare.js +165 -0
- package/dist/session-history/compare.js.map +1 -0
- package/dist/team/__tests__/api-interop.test.js +3 -3
- package/dist/team/__tests__/cross-rebase-smoke.test.js +263 -31
- package/dist/team/__tests__/cross-rebase-smoke.test.js.map +1 -1
- package/dist/team/__tests__/herdr-session-realherdr.test.d.ts +2 -0
- package/dist/team/__tests__/herdr-session-realherdr.test.d.ts.map +1 -0
- package/dist/team/__tests__/herdr-session-realherdr.test.js +68 -0
- package/dist/team/__tests__/herdr-session-realherdr.test.js.map +1 -0
- package/dist/team/__tests__/herdr-session.test.d.ts +2 -0
- package/dist/team/__tests__/herdr-session.test.d.ts.map +1 -0
- package/dist/team/__tests__/herdr-session.test.js +228 -0
- package/dist/team/__tests__/herdr-session.test.js.map +1 -0
- package/dist/team/__tests__/idle-nudge.test.js +84 -0
- package/dist/team/__tests__/idle-nudge.test.js.map +1 -1
- package/dist/team/__tests__/rebalance-policy.test.js +27 -9
- package/dist/team/__tests__/rebalance-policy.test.js.map +1 -1
- package/dist/team/__tests__/runtime-delivery.test.d.ts +2 -0
- package/dist/team/__tests__/runtime-delivery.test.d.ts.map +1 -0
- package/dist/team/__tests__/runtime-delivery.test.js +570 -0
- package/dist/team/__tests__/runtime-delivery.test.js.map +1 -0
- package/dist/team/__tests__/runtime.test.js +332 -18
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/scaling.test.js +293 -0
- package/dist/team/__tests__/scaling.test.js.map +1 -1
- package/dist/team/__tests__/state-renewal.test.d.ts +2 -0
- package/dist/team/__tests__/state-renewal.test.d.ts.map +1 -0
- package/dist/team/__tests__/state-renewal.test.js +555 -0
- package/dist/team/__tests__/state-renewal.test.js.map +1 -0
- package/dist/team/__tests__/task-lease.test.d.ts +2 -0
- package/dist/team/__tests__/task-lease.test.d.ts.map +1 -0
- package/dist/team/__tests__/task-lease.test.js +179 -0
- package/dist/team/__tests__/task-lease.test.js.map +1 -0
- package/dist/team/__tests__/team-ops-contract.test.js +1 -0
- package/dist/team/__tests__/team-ops-contract.test.js.map +1 -1
- package/dist/team/__tests__/worker-bootstrap.test.js +2 -0
- package/dist/team/__tests__/worker-bootstrap.test.js.map +1 -1
- package/dist/team/api-interop.d.ts +1 -1
- package/dist/team/api-interop.d.ts.map +1 -1
- package/dist/team/api-interop.js +13 -1
- package/dist/team/api-interop.js.map +1 -1
- package/dist/team/goal-workflow.js +1 -1
- package/dist/team/herdr-session.d.ts +234 -0
- package/dist/team/herdr-session.d.ts.map +1 -0
- package/dist/team/herdr-session.js +489 -0
- package/dist/team/herdr-session.js.map +1 -0
- package/dist/team/idle-nudge.d.ts +16 -4
- package/dist/team/idle-nudge.d.ts.map +1 -1
- package/dist/team/idle-nudge.js +51 -19
- package/dist/team/idle-nudge.js.map +1 -1
- package/dist/team/mcp-comm.d.ts +1 -1
- package/dist/team/mcp-comm.d.ts.map +1 -1
- package/dist/team/rebalance-policy.d.ts.map +1 -1
- package/dist/team/rebalance-policy.js +5 -2
- package/dist/team/rebalance-policy.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +356 -81
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +332 -143
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/state/monitor.d.ts +3 -0
- package/dist/team/state/monitor.d.ts.map +1 -1
- package/dist/team/state/monitor.js +3 -0
- package/dist/team/state/monitor.js.map +1 -1
- package/dist/team/state/tasks.d.ts +2 -1
- package/dist/team/state/tasks.d.ts.map +1 -1
- package/dist/team/state/tasks.js +28 -0
- package/dist/team/state/tasks.js.map +1 -1
- package/dist/team/state/types.d.ts +8 -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 +14 -2
- package/dist/team/state.d.ts.map +1 -1
- package/dist/team/state.js +29 -5
- package/dist/team/state.js.map +1 -1
- package/dist/team/task-lease.d.ts +4 -0
- package/dist/team/task-lease.d.ts.map +1 -0
- package/dist/team/task-lease.js +74 -0
- package/dist/team/task-lease.js.map +1 -0
- package/dist/team/team-ops.d.ts +2 -1
- package/dist/team/team-ops.d.ts.map +1 -1
- package/dist/team/team-ops.js +1 -0
- package/dist/team/team-ops.js.map +1 -1
- package/dist/team/tmux-session.d.ts +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +10 -2
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/team/worker-bootstrap.d.ts.map +1 -1
- package/dist/team/worker-bootstrap.js +14 -1
- package/dist/team/worker-bootstrap.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 +208 -25
- package/plugins/oh-my-codex/skills/worker/SKILL.md +7 -1
- package/prompts/build-fixer.md +2 -1
- package/prompts/debugger.md +2 -1
- package/prompts/git-master.md +2 -1
- package/prompts/style-reviewer.md +2 -1
- package/prompts/team-executor.md +3 -2
- package/prompts/vision.md +2 -1
- package/prompts/writer.md +2 -1
- package/skills/worker/SKILL.md +7 -1
- package/src/scripts/__tests__/codex-native-hook.test.ts +279 -0
- package/src/scripts/__tests__/generate-release-body.test.ts +151 -5
- package/src/scripts/codex-native-hook.ts +8 -2
- package/src/scripts/generate-release-body.ts +16 -0
- package/src/scripts/notify-hook/team-worker-lease.ts +69 -0
- package/src/scripts/notify-hook/team-worker-posttooluse.ts +16 -4
- package/src/scripts/notify-hook/team-worker.ts +15 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-delivery.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/runtime-delivery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ import { join, relative, dirname } from 'path';
|
|
|
7
7
|
import { tmpdir } from 'os';
|
|
8
8
|
import { existsSync } from 'fs';
|
|
9
9
|
import { HUD_TMUX_TEAM_HEIGHT_LINES } from '../../hud/constants.js';
|
|
10
|
-
import { DEFAULT_MAX_WORKERS, initTeamState, createTask, writeWorkerInbox, readTeamConfig, saveTeamConfig, listMailboxMessages, sendDirectMessage, listDispatchRequests, transitionDispatchRequest, updateWorkerHeartbeat, writeAtomic, readTask, readMonitorSnapshot, claimTask, transitionTaskStatus, readWorkerStatus, writeWorkerStatus, readTeamPhase, writeTeamPhase, } from '../state.js';
|
|
11
|
-
import { monitorTeam, shutdownTeam, resumeTeam, startTeam, assignTask, sendWorkerMessage, applyCreatedInteractiveSessionToConfig, reconcileStartupCleanupPanes, rethrowStartupRollbackProofDebt, resolveWorkerLaunchArgsFromEnv, resolveTeamWorkerCliForResolvedLaunchArgs, shouldPrekillInteractiveShutdownProcessTrees, waitForWorkerStartupEvidence, waitForClaudeStartupEvidence, cleanupTeamWorkerLaunchOrphanedMcpProcesses, settleStartupAttemptResults, setDetachedSessionDestroyAfterJournalHookForTest, setTerminalEpochStartedHookForTest, } from '../runtime.js';
|
|
10
|
+
import { DEFAULT_MAX_WORKERS, initTeamState, createTask, writeWorkerInbox, readTeamConfig, saveTeamConfig, listMailboxMessages, sendDirectMessage, listDispatchRequests, listTasks, transitionDispatchRequest, updateWorkerHeartbeat, writeAtomic, readTask, readMonitorSnapshot, claimTask, transitionTaskStatus, readWorkerStatus, writeWorkerStatus, readTeamPhase, writeTeamPhase, } from '../state.js';
|
|
11
|
+
import { monitorTeam, shutdownTeam, resumeTeam, startTeam, assignTask, reassignTask, sendWorkerMessage, applyCreatedInteractiveSessionToConfig, reconcileStartupCleanupPanes, rethrowStartupRollbackProofDebt, resolveWorkerLaunchArgsFromEnv, resolveTeamWorkerCliForResolvedLaunchArgs, shouldPrekillInteractiveShutdownProcessTrees, waitForWorkerStartupEvidence, waitForClaudeStartupEvidence, cleanupTeamWorkerLaunchOrphanedMcpProcesses, settleStartupAttemptResults, setDetachedSessionDestroyAfterJournalHookForTest, setTerminalEpochStartedHookForTest, } from '../runtime.js';
|
|
12
12
|
import { resolveAgentReasoningEffort, resolveTeamLowComplexityDefaultModel, TEAM_WORKER_INHERITED_MODEL_ENV, } from '../model-contract.js';
|
|
13
13
|
import { readTeamEvents } from '../state/events.js';
|
|
14
14
|
import { sanitizeTeamName } from '../tmux-session.js';
|
|
@@ -16,6 +16,7 @@ import { buildInternalTeamName, resolveTeamIdentityScope } from '../team-identit
|
|
|
16
16
|
import { writePersistedApprovedTeamExecutionBinding } from '../approved-execution.js';
|
|
17
17
|
import { planWorktreeTarget } from '../worktree.js';
|
|
18
18
|
import { scaleDown } from '../scaling.js';
|
|
19
|
+
import { buildRebalanceDecisions } from '../rebalance-policy.js';
|
|
19
20
|
import { registerTeamNotice, teamNoticeLedgerPath, teamNoticeTargetKey } from '../notice-ledger.js';
|
|
20
21
|
const coverageRun = process.env.NODE_V8_COVERAGE ? true : false;
|
|
21
22
|
const skipSlowLifecycleUnderCoverage = coverageRun
|
|
@@ -39,6 +40,7 @@ async function initRepo() {
|
|
|
39
40
|
execFileSync('git', ['init'], { cwd, stdio: 'ignore' });
|
|
40
41
|
execFileSync('git', ['config', 'user.email', 'test@example.com'], { cwd, stdio: 'ignore' });
|
|
41
42
|
execFileSync('git', ['config', 'user.name', 'Test User'], { cwd, stdio: 'ignore' });
|
|
43
|
+
await writeFile(join(cwd, '.git/info/exclude'), '.omx/\n');
|
|
42
44
|
await writeFile(join(cwd, 'README.md'), 'hello\n', 'utf-8');
|
|
43
45
|
execFileSync('git', ['add', 'README.md'], { cwd, stdio: 'ignore' });
|
|
44
46
|
execFileSync('git', ['commit', '-m', 'init'], { cwd, stdio: 'ignore' });
|
|
@@ -49,6 +51,30 @@ async function addWorktree(repo, branchName, pathPrefix) {
|
|
|
49
51
|
execFileSync('git', ['worktree', 'add', '-b', branchName, worktreePath, 'HEAD'], { cwd: repo, stdio: 'ignore' });
|
|
50
52
|
return worktreePath;
|
|
51
53
|
}
|
|
54
|
+
async function handOffVerifiedIntegrationTasks(teamName, cwd) {
|
|
55
|
+
const config = await readTeamConfig(teamName, cwd);
|
|
56
|
+
assert.ok(config);
|
|
57
|
+
for (const worker of config.workers) {
|
|
58
|
+
const task = await createTask(teamName, {
|
|
59
|
+
subject: `Verified output from ${worker.name}`, description: 'Ready for integration',
|
|
60
|
+
status: 'pending', owner: worker.name, requires_code_change: true,
|
|
61
|
+
}, cwd);
|
|
62
|
+
const claim = await claimTask(teamName, task.id, worker.name, null, cwd);
|
|
63
|
+
assert.ok(claim.ok);
|
|
64
|
+
const workerCwd = worker.worktree_path;
|
|
65
|
+
await mkdir(join(workerCwd, '.omx/evidence'), { recursive: true });
|
|
66
|
+
await writeFile(join(workerCwd, '.omx/evidence/handoff.json'), JSON.stringify({
|
|
67
|
+
teamName, taskId: task.id, claimTokenSha256: createHash('sha256').update(claim.claimToken).digest('hex'),
|
|
68
|
+
verifiedHead: execFileSync('git', ['rev-parse', 'HEAD'], { cwd: workerCwd, encoding: 'utf8' }).trim(),
|
|
69
|
+
summary: 'Verified worker output', verification: [{ command: 'npm test', result: 'passed', output: 'Tests passed' }], unverified: [],
|
|
70
|
+
}));
|
|
71
|
+
const completed = await transitionTaskStatus(teamName, task.id, 'in_progress', 'completed', claim.claimToken, cwd, {
|
|
72
|
+
result: 'Verification: PASS `npm test` for worker output.\nEVIDENCE_RECORDED: .omx/evidence/handoff.json',
|
|
73
|
+
}, workerCwd);
|
|
74
|
+
assert.ok(completed.ok, JSON.stringify(completed));
|
|
75
|
+
await writeWorkerStatus(teamName, worker.name, { state: 'done', updated_at: new Date().toISOString() }, cwd);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
52
78
|
function computeGitBlobSha1(content) {
|
|
53
79
|
const buffer = Buffer.from(content, 'utf-8');
|
|
54
80
|
const header = Buffer.from(`blob ${buffer.length}\0`, 'utf-8');
|
|
@@ -5982,6 +6008,82 @@ process.on('SIGTERM', () => process.exit(0));
|
|
|
5982
6008
|
await rm(cwd, { recursive: true, force: true });
|
|
5983
6009
|
}
|
|
5984
6010
|
});
|
|
6011
|
+
it('monitorTeam preserves an owned pending startup inbox before the first claim', async () => {
|
|
6012
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-pending-inbox-'));
|
|
6013
|
+
try {
|
|
6014
|
+
await withMockTmuxFixture({
|
|
6015
|
+
dirPrefix: 'omx-pending-inbox-tmux-',
|
|
6016
|
+
tmuxScript: () => `#!/bin/sh
|
|
6017
|
+
case "$1" in
|
|
6018
|
+
-V) echo 'tmux 3.4' ;;
|
|
6019
|
+
list-panes) echo '0 ${process.pid}' ;;
|
|
6020
|
+
capture-pane) echo 'working' ;;
|
|
6021
|
+
esac
|
|
6022
|
+
`,
|
|
6023
|
+
}, async () => {
|
|
6024
|
+
await initTeamState('pending-inbox', 'startup', 'executor', 1, cwd);
|
|
6025
|
+
const initial = await createTask('pending-inbox', { subject: 'startup', description: 'work', status: 'pending', owner: 'worker-1' }, cwd);
|
|
6026
|
+
const overflow = await createTask('pending-inbox', { subject: 'overflow', description: 'work', status: 'pending' }, cwd);
|
|
6027
|
+
await writeWorkerInbox('pending-inbox', 'worker-1', `Initial Task ${initial.id}`, cwd);
|
|
6028
|
+
await writeWorkerStatus('pending-inbox', 'worker-1', { state: 'idle', updated_at: new Date().toISOString() }, cwd);
|
|
6029
|
+
await monitorTeam('pending-inbox', cwd);
|
|
6030
|
+
assert.equal(await readFile(join(cwd, '.omx/state/team/pending-inbox/workers/worker-1/inbox.md'), 'utf8'), `Initial Task ${initial.id}`);
|
|
6031
|
+
assert.equal((await readTask('pending-inbox', overflow.id, cwd))?.owner, undefined);
|
|
6032
|
+
assert.equal((await readTask('pending-inbox', initial.id, cwd))?.status, 'pending');
|
|
6033
|
+
assert.equal((await listDispatchRequests('pending-inbox', cwd)).length, 0);
|
|
6034
|
+
});
|
|
6035
|
+
}
|
|
6036
|
+
finally {
|
|
6037
|
+
await rm(cwd, { recursive: true, force: true });
|
|
6038
|
+
}
|
|
6039
|
+
});
|
|
6040
|
+
it('monitorTeam leaves overflow pending and preserves the only inbox while its claim is outstanding', async () => {
|
|
6041
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-rebalance-inbox-'));
|
|
6042
|
+
try {
|
|
6043
|
+
await withMockTmuxFixture({
|
|
6044
|
+
dirPrefix: 'omx-rebalance-inbox-tmux-',
|
|
6045
|
+
tmuxScript: () => `#!/bin/sh
|
|
6046
|
+
case "$1" in
|
|
6047
|
+
-V) echo 'tmux 3.4' ;;
|
|
6048
|
+
list-panes) echo '0 ${process.pid}' ;;
|
|
6049
|
+
capture-pane) echo 'working' ;;
|
|
6050
|
+
esac
|
|
6051
|
+
`,
|
|
6052
|
+
}, async () => {
|
|
6053
|
+
await initTeamState('team-one-inbox', 'followups', 'executor', 1, cwd);
|
|
6054
|
+
const tasks = await Promise.all(Array.from({ length: 3 }, (_, i) => createTask('team-one-inbox', {
|
|
6055
|
+
subject: `followup ${i}`, description: 'work', status: 'pending',
|
|
6056
|
+
}, cwd)));
|
|
6057
|
+
const manifestPath = join(cwd, '.omx/state/team/team-one-inbox/manifest.v2.json');
|
|
6058
|
+
const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
|
|
6059
|
+
manifest.policy.dispatch_mode = 'transport_direct';
|
|
6060
|
+
manifest.tmux_session = 'omx-team-one-inbox';
|
|
6061
|
+
await writeAtomic(manifestPath, JSON.stringify(manifest));
|
|
6062
|
+
await writeWorkerStatus('team-one-inbox', 'worker-1', { state: 'idle', updated_at: new Date().toISOString() }, cwd);
|
|
6063
|
+
const first = await monitorTeam('team-one-inbox', cwd);
|
|
6064
|
+
assert.equal(first?.tasks.in_progress, 1, JSON.stringify(first?.recommendations));
|
|
6065
|
+
assert.equal(first?.tasks.pending, 2);
|
|
6066
|
+
const inboxPath = join(cwd, '.omx/state/team/team-one-inbox/workers/worker-1/inbox.md');
|
|
6067
|
+
const inbox = await readFile(inboxPath, 'utf8');
|
|
6068
|
+
const claimed = (await Promise.all(tasks.map((task) => readTask('team-one-inbox', task.id, cwd)))).find((task) => task?.status === 'in_progress');
|
|
6069
|
+
assert.match(inbox, new RegExp(`Task ${claimed.id}`));
|
|
6070
|
+
assert.equal((await listDispatchRequests('team-one-inbox', cwd)).filter((request) => request.kind === 'inbox').length, 1);
|
|
6071
|
+
// The worker has not updated its idle status yet; the live claim still excludes it.
|
|
6072
|
+
await monitorTeam('team-one-inbox', cwd);
|
|
6073
|
+
assert.equal(await readFile(inboxPath, 'utf8'), inbox);
|
|
6074
|
+
assert.equal((await listDispatchRequests('team-one-inbox', cwd)).filter((request) => request.kind === 'inbox').length, 1);
|
|
6075
|
+
assert.equal((await Promise.all(tasks.map((task) => readTask('team-one-inbox', task.id, cwd)))).filter((task) => task?.status === 'pending').length, 2);
|
|
6076
|
+
const done = await transitionTaskStatus('team-one-inbox', claimed.id, 'in_progress', 'completed', claimed.claim.token, cwd);
|
|
6077
|
+
assert.equal(done.ok, true);
|
|
6078
|
+
const next = await monitorTeam('team-one-inbox', cwd);
|
|
6079
|
+
assert.equal(next?.tasks.in_progress, 1);
|
|
6080
|
+
assert.equal(next?.tasks.pending, 1, 'overflow becomes available on a later monitor');
|
|
6081
|
+
});
|
|
6082
|
+
}
|
|
6083
|
+
finally {
|
|
6084
|
+
await rm(cwd, { recursive: true, force: true });
|
|
6085
|
+
}
|
|
6086
|
+
});
|
|
5985
6087
|
it('monitorTeam surfaces reclaimed work pickup attempts when an idle worker is available', async () => {
|
|
5986
6088
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-reassign-reclaimed-'));
|
|
5987
6089
|
const prevTeamStateRoot = process.env.OMX_TEAM_STATE_ROOT;
|
|
@@ -6104,6 +6206,32 @@ process.on('SIGTERM', () => process.exit(0));
|
|
|
6104
6206
|
await rm(cwd, { recursive: true, force: true });
|
|
6105
6207
|
}
|
|
6106
6208
|
});
|
|
6209
|
+
it('monitorTeam does not reactivate an ordinary completed root from pending task counts alone without worktrees', async () => {
|
|
6210
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-root-counts-only-'));
|
|
6211
|
+
const teamName = 'team-root-counts-only';
|
|
6212
|
+
try {
|
|
6213
|
+
await initTeamState(teamName, 'counts-only root sync', 'executor', 1, cwd);
|
|
6214
|
+
const config = await readTeamConfig(teamName, cwd);
|
|
6215
|
+
assert.ok(config?.workers.every((worker) => !worker.worktree_path && !worker.worktree_repo_root));
|
|
6216
|
+
const task = await createTask(teamName, { subject: 'initial work', description: 'pending', status: 'pending' }, cwd);
|
|
6217
|
+
const phase = await readTeamPhase(teamName, cwd);
|
|
6218
|
+
assert.ok(phase);
|
|
6219
|
+
await writeTeamPhase(teamName, { ...phase, current_phase: 'complete' }, cwd);
|
|
6220
|
+
const rootStatePath = join(cwd, '.omx/state/team-state.json');
|
|
6221
|
+
const rootBefore = JSON.stringify({
|
|
6222
|
+
active: false, current_phase: 'complete', team_name: teamName, completed_at: new Date().toISOString(),
|
|
6223
|
+
});
|
|
6224
|
+
await writeFile(rootStatePath, rootBefore);
|
|
6225
|
+
assert.equal((await monitorTeam(teamName, cwd, { readOnly: true }))?.phase, 'team-exec');
|
|
6226
|
+
assert.equal(await readFile(rootStatePath, 'utf8'), rootBefore);
|
|
6227
|
+
assert.equal((await monitorTeam(teamName, cwd))?.phase, 'team-exec');
|
|
6228
|
+
assert.equal(await readFile(rootStatePath, 'utf8'), rootBefore);
|
|
6229
|
+
assert.equal((await readTask(teamName, task.id, cwd))?.status, 'pending');
|
|
6230
|
+
}
|
|
6231
|
+
finally {
|
|
6232
|
+
await rm(cwd, { recursive: true, force: true });
|
|
6233
|
+
}
|
|
6234
|
+
});
|
|
6107
6235
|
it('monitorTeam deactivates root team-state.json when the local phase becomes terminal', async () => {
|
|
6108
6236
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-root-team-state-'));
|
|
6109
6237
|
try {
|
|
@@ -6590,7 +6718,7 @@ exec "${realGit}" "$@"
|
|
|
6590
6718
|
await rm(repo, { recursive: true, force: true });
|
|
6591
6719
|
}
|
|
6592
6720
|
});
|
|
6593
|
-
it('monitorTeam
|
|
6721
|
+
it('monitorTeam fails closed on same-line leader/worker conflicts', async () => {
|
|
6594
6722
|
const repo = await initRepo();
|
|
6595
6723
|
let workerPath = '';
|
|
6596
6724
|
try {
|
|
@@ -6619,16 +6747,20 @@ exec "${realGit}" "$@"
|
|
|
6619
6747
|
worktree_created: false,
|
|
6620
6748
|
};
|
|
6621
6749
|
await saveTeamConfig(cfg, repo);
|
|
6750
|
+
await handOffVerifiedIntegrationTasks('team-conflict-resolve', repo);
|
|
6622
6751
|
await monitorTeam('team-conflict-resolve', repo);
|
|
6623
|
-
|
|
6624
|
-
|
|
6625
|
-
assert.equal(
|
|
6626
|
-
// Verify integration was not blocked
|
|
6752
|
+
assert.equal(await readFile(join(repo, 'README.md'), 'utf-8'), 'leader version\n');
|
|
6753
|
+
assert.equal(await readFile(join(workerPath, 'README.md'), 'utf-8'), 'worker version\n');
|
|
6754
|
+
assert.equal(execFileSync('git', ['diff', '--name-only', '--diff-filter=U'], { cwd: repo, encoding: 'utf-8' }), '');
|
|
6627
6755
|
const snapshot = await readMonitorSnapshot('team-conflict-resolve', repo);
|
|
6628
|
-
assert.
|
|
6629
|
-
|
|
6630
|
-
|
|
6631
|
-
|
|
6756
|
+
assert.equal(snapshot?.integrationByWorker?.['worker-1']?.status, 'cherry_pick_conflict');
|
|
6757
|
+
assert.deepEqual(snapshot?.integrationByWorker?.['worker-1']?.conflict_files, ['README.md']);
|
|
6758
|
+
assert.equal(snapshot?.integrationByWorker?.['worker-1']?.last_integrated_head, undefined);
|
|
6759
|
+
const events = await readTeamEvents('team-conflict-resolve', repo, { wakeableOnly: true });
|
|
6760
|
+
assert.equal(events.some((event) => event.type === 'worker_cherry_pick_conflict'), true);
|
|
6761
|
+
const mailbox = await listMailboxMessages('team-conflict-resolve', 'leader-fixed', repo);
|
|
6762
|
+
assert.equal(mailbox.some((message) => /INTEGRATION CONFLICT:.*Resolve the conflict/.test(message.body)), true);
|
|
6763
|
+
assert.equal(mailbox.some((message) => /INTEGRATED:/.test(message.body)), false);
|
|
6632
6764
|
}
|
|
6633
6765
|
finally {
|
|
6634
6766
|
if (workerPath) {
|
|
@@ -6692,7 +6824,7 @@ exec "${realGit}" "$@"
|
|
|
6692
6824
|
await rm(repo, { recursive: true, force: true });
|
|
6693
6825
|
}
|
|
6694
6826
|
});
|
|
6695
|
-
it('monitorTeam
|
|
6827
|
+
it('monitorTeam skips cross-rebase after integration conflict and preserves the worker', async () => {
|
|
6696
6828
|
const repo = await initRepo();
|
|
6697
6829
|
let worker1Path = '';
|
|
6698
6830
|
let worker2Path = '';
|
|
@@ -6706,7 +6838,7 @@ exec "${realGit}" "$@"
|
|
|
6706
6838
|
// Worker-1 renames original.txt → renamed-by-w1.txt (will be integrated to leader)
|
|
6707
6839
|
execFileSync('git', ['mv', 'original.txt', 'renamed-by-w1.txt'], { cwd: worker1Path, stdio: 'ignore' });
|
|
6708
6840
|
execFileSync('git', ['commit', '-m', 'worker-1 renames original'], { cwd: worker1Path, stdio: 'ignore' });
|
|
6709
|
-
// Worker-2 renames original.txt → renamed-by-w2.txt (will conflict
|
|
6841
|
+
// Worker-2 renames original.txt → renamed-by-w2.txt (will conflict during integration)
|
|
6710
6842
|
execFileSync('git', ['mv', 'original.txt', 'renamed-by-w2.txt'], { cwd: worker2Path, stdio: 'ignore' });
|
|
6711
6843
|
execFileSync('git', ['commit', '-m', 'worker-2 renames original'], { cwd: worker2Path, stdio: 'ignore' });
|
|
6712
6844
|
const worker2HeadBefore = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim();
|
|
@@ -6737,20 +6869,26 @@ exec "${realGit}" "$@"
|
|
|
6737
6869
|
await saveTeamConfig(cfg, repo);
|
|
6738
6870
|
// Set worker-2 status to idle (eligible for rebase attempt)
|
|
6739
6871
|
await writeWorkerStatus('team-rebase-fail', 'worker-2', { state: 'idle', updated_at: new Date().toISOString() }, repo);
|
|
6872
|
+
await handOffVerifiedIntegrationTasks('team-rebase-fail', repo);
|
|
6740
6873
|
await monitorTeam('team-rebase-fail', repo);
|
|
6741
6874
|
// Verify worker-1's changes landed on leader
|
|
6742
6875
|
assert.equal(existsSync(join(repo, 'renamed-by-w1.txt')), true, 'leader should have worker-1 renamed file');
|
|
6743
|
-
//
|
|
6876
|
+
// Failed source integration must not be followed by a history rewrite.
|
|
6744
6877
|
const worker2HeadAfter = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worker2Path, encoding: 'utf-8' }).trim();
|
|
6745
|
-
assert.equal(worker2HeadAfter, worker2HeadBefore, 'worker-2 HEAD should
|
|
6878
|
+
assert.equal(worker2HeadAfter, worker2HeadBefore, 'worker-2 HEAD should remain unchanged after failed integration');
|
|
6746
6879
|
// Verify no rebase-in-progress markers
|
|
6747
6880
|
const gitStatusOutput = execFileSync('git', ['status'], { cwd: worker2Path, encoding: 'utf-8' });
|
|
6748
6881
|
assert.doesNotMatch(gitStatusOutput, /rebase in progress/, 'worktree should not have rebase in progress');
|
|
6749
|
-
|
|
6882
|
+
const integration = (await readMonitorSnapshot('team-rebase-fail', repo))?.integrationByWorker?.['worker-2'];
|
|
6883
|
+
assert.equal(integration?.status, 'cherry_pick_conflict');
|
|
6884
|
+
assert.equal(integration?.last_rebased_leader_head, undefined);
|
|
6750
6885
|
const reportPath = join(repo, '.omx', 'state', 'team', 'team-rebase-fail', 'integration-report.md');
|
|
6751
|
-
assert.equal(existsSync(reportPath), true, 'integration report should exist after rebase failure');
|
|
6752
6886
|
const report = await readFile(reportPath, 'utf-8');
|
|
6753
|
-
assert.match(report, /
|
|
6887
|
+
assert.match(report, /cherry-pick.*aborted/, 'report should mention the aborted integration');
|
|
6888
|
+
assert.doesNotMatch(report, /rebase -X/);
|
|
6889
|
+
const events = await readTeamEvents('team-rebase-fail', repo, { wakeableOnly: false });
|
|
6890
|
+
assert.equal(events.some((event) => event.type === 'worker_cross_rebase_skipped' && event.metadata?.reason === 'unintegrated_changes'), true);
|
|
6891
|
+
assert.equal(events.some((event) => event.type === 'worker_cross_rebase_applied' && event.worker === 'worker-2'), false);
|
|
6754
6892
|
}
|
|
6755
6893
|
finally {
|
|
6756
6894
|
if (worker1Path) {
|
|
@@ -11092,6 +11230,126 @@ esac
|
|
|
11092
11230
|
await rm(cwd, { recursive: true, force: true });
|
|
11093
11231
|
}
|
|
11094
11232
|
});
|
|
11233
|
+
it('assignTask rejects a stale rebalance plan without changing the outstanding claim or inbox', async () => {
|
|
11234
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-stale-assignment-'));
|
|
11235
|
+
const teamName = 'team-stale-assignment';
|
|
11236
|
+
try {
|
|
11237
|
+
await withMockTmuxFixture({
|
|
11238
|
+
dirPrefix: 'omx-stale-assignment-tmux-',
|
|
11239
|
+
tmuxScript: () => `#!/bin/sh
|
|
11240
|
+
case "$1" in
|
|
11241
|
+
-V) echo 'tmux 3.4' ;;
|
|
11242
|
+
list-panes) echo '0 ${process.pid}' ;;
|
|
11243
|
+
capture-pane) echo 'working' ;;
|
|
11244
|
+
esac
|
|
11245
|
+
`,
|
|
11246
|
+
}, async () => {
|
|
11247
|
+
await initTeamState(teamName, 'stale assignment', 'executor', 2, cwd);
|
|
11248
|
+
const dependency = await createTask(teamName, { subject: 'dependency', description: 'work', status: 'pending' }, cwd);
|
|
11249
|
+
const first = await createTask(teamName, { subject: 'blocked first', description: 'work', status: 'pending', depends_on: [dependency.id] }, cwd);
|
|
11250
|
+
const second = await createTask(teamName, { subject: 'ready second', description: 'work', status: 'pending' }, cwd);
|
|
11251
|
+
const dependencyClaim = await claimTask(teamName, dependency.id, 'worker-2', dependency.version, cwd);
|
|
11252
|
+
assert.ok(dependencyClaim.ok);
|
|
11253
|
+
const manifestPath = join(cwd, '.omx/state/team', teamName, 'manifest.v2.json');
|
|
11254
|
+
const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
|
|
11255
|
+
manifest.policy.dispatch_mode = 'transport_direct';
|
|
11256
|
+
await writeAtomic(manifestPath, JSON.stringify(manifest));
|
|
11257
|
+
const workers = [{ name: 'worker-1', role: 'executor', alive: true, status: { state: 'idle', updated_at: new Date().toISOString() } }];
|
|
11258
|
+
const stalePlan = buildRebalanceDecisions({ tasks: await listTasks(teamName, cwd), workers, reclaimedTaskIds: [] });
|
|
11259
|
+
assert.equal(stalePlan[0]?.taskId, second.id);
|
|
11260
|
+
assert.equal((await transitionTaskStatus(teamName, dependency.id, 'in_progress', 'completed', dependencyClaim.claimToken, cwd)).ok, true);
|
|
11261
|
+
const freshPlan = buildRebalanceDecisions({ tasks: await listTasks(teamName, cwd), workers, reclaimedTaskIds: [] });
|
|
11262
|
+
assert.equal(freshPlan[0]?.taskId, first.id);
|
|
11263
|
+
await assignTask(teamName, freshPlan[0].workerName, first.id, cwd);
|
|
11264
|
+
const claimed = await readTask(teamName, first.id, cwd);
|
|
11265
|
+
assert.equal(claimed?.status, 'in_progress');
|
|
11266
|
+
assert.equal(claimed?.owner, 'worker-1');
|
|
11267
|
+
assert.ok(claimed?.claim);
|
|
11268
|
+
const pending = await readTask(teamName, second.id, cwd);
|
|
11269
|
+
assert.equal(pending?.status, 'pending');
|
|
11270
|
+
assert.equal(pending?.version, second.version);
|
|
11271
|
+
assert.equal(pending?.owner, undefined);
|
|
11272
|
+
assert.equal(pending?.claim, undefined);
|
|
11273
|
+
const inboxPath = join(cwd, '.omx/state/team', teamName, 'workers/worker-1/inbox.md');
|
|
11274
|
+
const inbox = await readFile(inboxPath);
|
|
11275
|
+
assert.match(inbox.toString(), new RegExp(`Task ${first.id}`));
|
|
11276
|
+
const dispatches = await listDispatchRequests(teamName, cwd);
|
|
11277
|
+
assert.equal(dispatches.length, 1);
|
|
11278
|
+
await assert.rejects(() => assignTask(teamName, stalePlan[0].workerName, second.id, cwd), /already owns outstanding task/);
|
|
11279
|
+
assert.deepEqual(await readTask(teamName, first.id, cwd), claimed, 'first version, owner, token and lease stay unchanged');
|
|
11280
|
+
assert.deepEqual(await readTask(teamName, second.id, cwd), pending, 'second stays unclaimed at its original version');
|
|
11281
|
+
assert.deepEqual(await readFile(inboxPath), inbox, 'rejection must not write an assignment or cancellation');
|
|
11282
|
+
assert.deepEqual(await listDispatchRequests(teamName, cwd), dispatches, 'no second dispatch');
|
|
11283
|
+
});
|
|
11284
|
+
}
|
|
11285
|
+
finally {
|
|
11286
|
+
await rm(cwd, { recursive: true, force: true });
|
|
11287
|
+
}
|
|
11288
|
+
});
|
|
11289
|
+
it('assignTask and reassignTask preserve another owned pending startup reservation', async () => {
|
|
11290
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-assignment-reservation-'));
|
|
11291
|
+
const teamName = 'team-assignment-reservation';
|
|
11292
|
+
try {
|
|
11293
|
+
await initTeamState(teamName, 'pending reservation', 'executor', 1, cwd);
|
|
11294
|
+
const reserved = await createTask(teamName, { subject: 'startup', description: 'work', status: 'pending', owner: 'worker-1' }, cwd);
|
|
11295
|
+
const selected = await createTask(teamName, { subject: 'queued', description: 'work', status: 'pending', owner: 'worker-1' }, cwd);
|
|
11296
|
+
const reservedBefore = await readTask(teamName, reserved.id, cwd);
|
|
11297
|
+
const selectedBefore = await readTask(teamName, selected.id, cwd);
|
|
11298
|
+
assert.ok(reservedBefore);
|
|
11299
|
+
assert.ok(selectedBefore);
|
|
11300
|
+
await writeWorkerInbox(teamName, 'worker-1', 'Original startup handoff', cwd);
|
|
11301
|
+
const inboxPath = join(cwd, '.omx/state/team', teamName, 'workers/worker-1/inbox.md');
|
|
11302
|
+
const inbox = await readFile(inboxPath);
|
|
11303
|
+
await assert.rejects(() => assignTask(teamName, 'worker-1', selected.id, cwd), /already owns outstanding task/);
|
|
11304
|
+
await assert.rejects(() => reassignTask(teamName, selected.id, 'worker-2', 'worker-1', cwd), /already owns outstanding task/);
|
|
11305
|
+
assert.deepEqual(await readTask(teamName, reserved.id, cwd), reservedBefore);
|
|
11306
|
+
assert.deepEqual(await readTask(teamName, selected.id, cwd), selectedBefore);
|
|
11307
|
+
assert.deepEqual(await readFile(inboxPath), inbox);
|
|
11308
|
+
assert.equal((await listDispatchRequests(teamName, cwd)).length, 0);
|
|
11309
|
+
// Bootstrap may claim an owned queue directly; only assignment owns the fixed-inbox capacity rule.
|
|
11310
|
+
assert.equal((await claimTask(teamName, selected.id, 'worker-1', selected.version, cwd)).ok, true);
|
|
11311
|
+
assert.deepEqual(await readTask(teamName, reserved.id, cwd), reservedBefore);
|
|
11312
|
+
}
|
|
11313
|
+
finally {
|
|
11314
|
+
await rm(cwd, { recursive: true, force: true });
|
|
11315
|
+
}
|
|
11316
|
+
});
|
|
11317
|
+
it('assignTask permits the selected owned pending reservation when no other work is outstanding', async () => {
|
|
11318
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-assign-own-pending-'));
|
|
11319
|
+
const teamName = 'team-assign-own-pending';
|
|
11320
|
+
try {
|
|
11321
|
+
await withMockTmuxFixture({
|
|
11322
|
+
dirPrefix: 'omx-own-pending-tmux-',
|
|
11323
|
+
tmuxScript: () => `#!/bin/sh
|
|
11324
|
+
case "$1" in
|
|
11325
|
+
-V) echo 'tmux 3.4' ;;
|
|
11326
|
+
list-panes) echo '0 ${process.pid}' ;;
|
|
11327
|
+
capture-pane) echo 'working' ;;
|
|
11328
|
+
esac
|
|
11329
|
+
`,
|
|
11330
|
+
}, async () => {
|
|
11331
|
+
await initTeamState(teamName, 'own pending assignment', 'executor', 1, cwd);
|
|
11332
|
+
const task = await createTask(teamName, { subject: 'startup', description: 'work', status: 'pending', owner: 'worker-1' }, cwd);
|
|
11333
|
+
const finished = await createTask(teamName, { subject: 'finished', description: 'work', status: 'pending' }, cwd);
|
|
11334
|
+
const claim = await claimTask(teamName, finished.id, 'worker-1', finished.version, cwd);
|
|
11335
|
+
assert.ok(claim.ok);
|
|
11336
|
+
assert.equal((await transitionTaskStatus(teamName, finished.id, 'in_progress', 'completed', claim.claimToken, cwd)).ok, true);
|
|
11337
|
+
const manifestPath = join(cwd, '.omx/state/team', teamName, 'manifest.v2.json');
|
|
11338
|
+
const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
|
|
11339
|
+
manifest.policy.dispatch_mode = 'transport_direct';
|
|
11340
|
+
await writeAtomic(manifestPath, JSON.stringify(manifest));
|
|
11341
|
+
await assignTask(teamName, 'worker-1', task.id, cwd);
|
|
11342
|
+
const assigned = await readTask(teamName, task.id, cwd);
|
|
11343
|
+
assert.equal(assigned?.status, 'in_progress');
|
|
11344
|
+
assert.equal(assigned?.owner, 'worker-1');
|
|
11345
|
+
assert.ok(assigned?.claim);
|
|
11346
|
+
assert.equal((await listDispatchRequests(teamName, cwd)).length, 1);
|
|
11347
|
+
});
|
|
11348
|
+
}
|
|
11349
|
+
finally {
|
|
11350
|
+
await rm(cwd, { recursive: true, force: true });
|
|
11351
|
+
}
|
|
11352
|
+
});
|
|
11095
11353
|
it('assignTask enforces delegation_only policy for leader-fixed worker', async () => {
|
|
11096
11354
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-'));
|
|
11097
11355
|
try {
|
|
@@ -11627,6 +11885,62 @@ esac
|
|
|
11627
11885
|
await rm(cwd, { recursive: true, force: true });
|
|
11628
11886
|
}
|
|
11629
11887
|
});
|
|
11888
|
+
for (const existingPlans of [false, true]) {
|
|
11889
|
+
it(`assignTask hands off the current claim for lifecycle completion (existing plans: ${existingPlans})`, async () => {
|
|
11890
|
+
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-claim-handoff-'));
|
|
11891
|
+
const team = 'team-claim-handoff';
|
|
11892
|
+
try {
|
|
11893
|
+
await initTeamState(team, 'claim handoff', 'executor', 1, cwd);
|
|
11894
|
+
const manifestPath = teamStateTestPath(cwd, 'team', team, 'manifest.v2.json');
|
|
11895
|
+
const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
|
|
11896
|
+
manifest.policy = { ...(manifest.policy || {}), dispatch_ack_timeout_ms: 250 };
|
|
11897
|
+
await writeFile(manifestPath, JSON.stringify(manifest));
|
|
11898
|
+
const task = await createTask(team, {
|
|
11899
|
+
subject: 'Fix typo', description: 'Fix one typo', status: 'pending',
|
|
11900
|
+
...(existingPlans ? {
|
|
11901
|
+
delegation: { mode: 'none' },
|
|
11902
|
+
coordination: { mode: 'lightweight', source: 'explicit', activation_reasons: [] },
|
|
11903
|
+
} : {}),
|
|
11904
|
+
}, cwd);
|
|
11905
|
+
const assignment = assignTask(team, 'worker-1', task.id, cwd);
|
|
11906
|
+
const deadline = Date.now() + 2_000;
|
|
11907
|
+
let delivered = false;
|
|
11908
|
+
while (Date.now() < deadline && !delivered) {
|
|
11909
|
+
const requests = await listDispatchRequests(team, cwd, { kind: 'inbox', to_worker: 'worker-1' });
|
|
11910
|
+
if (requests.some((request) => request.status === 'pending')) {
|
|
11911
|
+
await markPendingInboxDispatchesDelivered(team, cwd, { toWorker: 'worker-1', lastReason: 'test_delivered_receipt' });
|
|
11912
|
+
delivered = true;
|
|
11913
|
+
}
|
|
11914
|
+
else {
|
|
11915
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
11916
|
+
}
|
|
11917
|
+
}
|
|
11918
|
+
await assignment;
|
|
11919
|
+
assert.ok(delivered);
|
|
11920
|
+
const current = await readTask(team, task.id, cwd);
|
|
11921
|
+
assert.ok(current?.claim);
|
|
11922
|
+
assert.equal(current.status, 'in_progress');
|
|
11923
|
+
const inbox = await readFile(join(cwd, '.omx', 'state', 'team', team, 'workers', 'worker-1', 'inbox.md'), 'utf-8');
|
|
11924
|
+
assert.match(inbox, /Do NOT re-claim/);
|
|
11925
|
+
assert.doesNotMatch(inbox, /Request a claim/);
|
|
11926
|
+
assert.match(inbox, /with_task_lease/);
|
|
11927
|
+
assert.match(inbox, /current_claim_token/);
|
|
11928
|
+
assert.ok(inbox.includes(`claim_token: "${current.claim.token}"`));
|
|
11929
|
+
assert.ok(inbox.includes(`version: ${current.version}`));
|
|
11930
|
+
assert.ok(inbox.includes(`leased_until: "${current.claim.leased_until}"`));
|
|
11931
|
+
const duplicate = await claimTask(team, task.id, 'worker-1', current.version ?? null, cwd);
|
|
11932
|
+
assert.deepEqual(duplicate, { ok: false, error: 'claim_conflict' });
|
|
11933
|
+
const handedOffToken = inbox.match(/claim_token: "([^"]+)"/)?.[1];
|
|
11934
|
+
assert.ok(handedOffToken);
|
|
11935
|
+
const completed = await transitionTaskStatus(team, task.id, 'in_progress', 'completed', handedOffToken, cwd, { result: 'PASS: findings reported' });
|
|
11936
|
+
assert.equal(completed.ok, true, JSON.stringify(completed));
|
|
11937
|
+
assert.equal((await readTask(team, task.id, cwd))?.status, 'completed');
|
|
11938
|
+
}
|
|
11939
|
+
finally {
|
|
11940
|
+
await rm(cwd, { recursive: true, force: true });
|
|
11941
|
+
}
|
|
11942
|
+
});
|
|
11943
|
+
}
|
|
11630
11944
|
it('assignTask injects approved handoff context when the persisted approved binding remains ready', async () => {
|
|
11631
11945
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-approved-followup-'));
|
|
11632
11946
|
const approvedTask = 'Execute approved issue 1320 plan';
|