oh-my-codex 0.22.1 → 0.22.3
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/hooks/__tests__/skill-guidance-contract.test.js +19 -0
- package/dist/hooks/__tests__/skill-guidance-contract.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__/state.test.js +6 -3
- package/dist/team/__tests__/state.test.js.map +1 -1
- package/dist/team/completion-evidence.d.ts +1 -0
- package/dist/team/completion-evidence.d.ts.map +1 -1
- package/dist/team/completion-evidence.js +21 -7
- package/dist/team/completion-evidence.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +130 -54
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/scaling.d.ts.map +1 -1
- package/dist/team/scaling.js +5 -4
- package/dist/team/scaling.js.map +1 -1
- package/dist/team/state/tasks.d.ts.map +1 -1
- package/dist/team/state/tasks.js +20 -17
- package/dist/team/state/tasks.js.map +1 -1
- package/dist/team/state.d.ts.map +1 -1
- package/dist/team/state.js +16 -11
- package/dist/team/state.js.map +1 -1
- 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/skills/plan/SKILL.md +7 -7
- package/plugins/oh-my-codex/skills/ralplan/SKILL.md +2 -2
- package/skills/plan/SKILL.md +7 -7
- package/skills/ralplan/SKILL.md +2 -2
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { TeamTask } from './state.js';
|
|
2
|
+
export declare function isCompletionEvidenceReport(value: unknown): boolean;
|
|
2
3
|
export declare function validateCompletionEvidence(cwd: string, teamName: string, task: TeamTask, result: string | undefined): Promise<string>;
|
|
3
4
|
//# sourceMappingURL=completion-evidence.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-evidence.d.ts","sourceRoot":"","sources":["../../src/team/completion-evidence.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"completion-evidence.d.ts","sourceRoot":"","sources":["../../src/team/completion-evidence.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkB3C,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQlE;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GACxE,OAAO,CAAC,MAAM,CAAC,CAoCjB"}
|
|
@@ -3,10 +3,30 @@ import { createHash } from 'node:crypto';
|
|
|
3
3
|
import { lstat, readFile, realpath } from 'node:fs/promises';
|
|
4
4
|
import { isAbsolute, join, relative, resolve, sep } from 'node:path';
|
|
5
5
|
import { hasStructuredVerificationEvidence } from '../verification/verifier.js';
|
|
6
|
+
import { TEAM_NAME_SAFE_PATTERN, TASK_ID_SAFE_PATTERN } from './contracts.js';
|
|
6
7
|
function text(value) {
|
|
7
8
|
return typeof value === 'string' && value.trim().length > 0
|
|
8
9
|
&& !/^(?:todo|tbd|placeholder|pending|not run)[.!]?$/i.test(value.trim());
|
|
9
10
|
}
|
|
11
|
+
function hasCompletionEvidenceContent(evidence) {
|
|
12
|
+
return text(evidence.summary) && Array.isArray(evidence.verification) && evidence.verification.length > 0
|
|
13
|
+
&& evidence.verification.every((check) => {
|
|
14
|
+
if (!check || typeof check !== 'object')
|
|
15
|
+
return false;
|
|
16
|
+
const value = check;
|
|
17
|
+
return text(value.command) && value.result === 'passed' && text(value.output);
|
|
18
|
+
}) && Array.isArray(evidence.unverified) && evidence.unverified.every(text);
|
|
19
|
+
}
|
|
20
|
+
export function isCompletionEvidenceReport(value) {
|
|
21
|
+
if (!value || typeof value !== 'object')
|
|
22
|
+
return false;
|
|
23
|
+
const evidence = value;
|
|
24
|
+
return typeof evidence.teamName === 'string' && TEAM_NAME_SAFE_PATTERN.test(evidence.teamName)
|
|
25
|
+
&& typeof evidence.taskId === 'string' && TASK_ID_SAFE_PATTERN.test(evidence.taskId)
|
|
26
|
+
&& typeof evidence.claimTokenSha256 === 'string' && /^[a-f0-9]{64}$/.test(evidence.claimTokenSha256)
|
|
27
|
+
&& typeof evidence.verifiedHead === 'string' && /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(evidence.verifiedHead)
|
|
28
|
+
&& hasCompletionEvidenceContent(evidence);
|
|
29
|
+
}
|
|
10
30
|
export async function validateCompletionEvidence(cwd, teamName, task, result) {
|
|
11
31
|
const path = /^\s*EVIDENCE_RECORDED:\s*(\S+)\s*$/m.exec(result ?? '')?.[1];
|
|
12
32
|
if (!path)
|
|
@@ -34,13 +54,7 @@ export async function validateCompletionEvidence(cwd, teamName, task, result) {
|
|
|
34
54
|
if (!evidence || evidence.teamName !== teamName || evidence.taskId !== task.id || evidence.claimTokenSha256 !== claimHash) {
|
|
35
55
|
throw new Error('Evidence must belong to this team, task, and current claim.');
|
|
36
56
|
}
|
|
37
|
-
if (!
|
|
38
|
-
|| evidence.verification.some((check) => {
|
|
39
|
-
if (!check || typeof check !== 'object')
|
|
40
|
-
return true;
|
|
41
|
-
const value = check;
|
|
42
|
-
return !text(value.command) || value.result !== 'passed' || !text(value.output);
|
|
43
|
-
}) || !Array.isArray(evidence.unverified) || evidence.unverified.some((item) => !text(item))) {
|
|
57
|
+
if (!hasCompletionEvidenceContent(evidence)) {
|
|
44
58
|
throw new Error('Evidence requires summary, passing verification checks (command/result/output), and an unverified array.');
|
|
45
59
|
}
|
|
46
60
|
const verificationSummary = (result ?? '').replace(/^\s*EVIDENCE_RECORDED:\s*\S+\s*$/gm, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-evidence.js","sourceRoot":"","sources":["../../src/team/completion-evidence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"completion-evidence.js","sourceRoot":"","sources":["../../src/team/completion-evidence.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/team/runtime.ts"],"names":[],"mappings":"AAUA,OAAO,EASL,yCAAyC,EAEzC,KAAK,aAAa,EAElB,KAAK,WAAW,EAuBjB,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EAAmD,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEvG,OAAO,EA6CL,KAAK,UAAU,EAEf,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EAEb,KAAK,cAAc,EAKpB,MAAM,eAAe,CAAC;AAOvB,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,+BAA+B,CAAC;AAqBvC,OAAO,EAAmB,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAEL,iCAAiC,EAMjC,KAAK,mBAAmB,EACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAUhE,OAAO,EAAE,yCAAyC,EAAE,CAAC;AACrD,OAAO,EAOL,KAAK,4BAA4B,EAClC,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAKL,KAAK,8BAA8B,EAEpC,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/team/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/team/runtime.js
CHANGED
|
@@ -37,7 +37,7 @@ import { buildApprovedTeamHandoffSection, buildApprovedTeamExecutionBinding, nor
|
|
|
37
37
|
import { readPersistedTeamUltragoalContext, renderLeaderOwnedUltragoalContextSection, resolveLeaderOwnedUltragoalContextOutcome, writePersistedTeamUltragoalContext, } from './ultragoal-context.js';
|
|
38
38
|
import { appendTeamCommitHygieneEntries, buildTeamCommitHygieneContext, resolveTeamCommitHygieneArtifactCwd, writeTeamCommitHygieneContext, } from './commit-hygiene.js';
|
|
39
39
|
import { classifyRecordedIdentity, defaultProcessInspectionProvider, } from '../hooks/session.js';
|
|
40
|
-
import { assertCleanLeaderWorkspaceForWorkerWorktrees, ensureWorktree, isGitRepository, isWorktreeDirty, planWorktreeTarget, removeWorktreeForce, rollbackProvisionedWorktrees, replaySubmoduleRecovery, } from './worktree.js';
|
|
40
|
+
import { archiveIgnoredCompletionEvidence, assertCleanLeaderWorkspaceForWorkerWorktrees, ensureWorktree, isGitRepository, isWorktreeDirty, planWorktreeTarget, removeWorktreeForce, rollbackProvisionedWorktrees, replaySubmoduleRecovery, } from './worktree.js';
|
|
41
41
|
import { cleanupOmxMcpProcesses, findLaunchSafeCleanupCandidates, } from '../cli/cleanup.js';
|
|
42
42
|
function joinContextSections(...sections) {
|
|
43
43
|
const present = sections.filter((section) => Boolean(section?.trim()));
|
|
@@ -833,11 +833,36 @@ function appendIntegrationReport(teamName, entry, cwd) {
|
|
|
833
833
|
function leaderContainsCommit(repoRoot, cwd, commit) {
|
|
834
834
|
return runGitCommand(repoRoot, ['merge-base', '--is-ancestor', commit, 'HEAD'], cwd).ok;
|
|
835
835
|
}
|
|
836
|
-
function
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
return
|
|
840
|
-
|
|
836
|
+
function gitOperationError(repoRoot, cwd) {
|
|
837
|
+
const gitDir = runGitCommand(repoRoot, ['rev-parse', '--absolute-git-dir'], cwd);
|
|
838
|
+
if (!gitDir.ok || !gitDir.stdout)
|
|
839
|
+
return new Error(`git_operation_state_unavailable:${cwd}`);
|
|
840
|
+
for (const marker of ['rebase-merge', 'rebase-apply', 'MERGE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'sequencer', 'BISECT_START']) {
|
|
841
|
+
if (existsSync(join(gitDir.stdout, marker)))
|
|
842
|
+
return new Error(`git_operation_in_progress:${cwd}:${marker}. Finish or abort it manually before retrying.`);
|
|
843
|
+
}
|
|
844
|
+
return null;
|
|
845
|
+
}
|
|
846
|
+
function assertNoActiveGitOperation(repoRoot, cwd) {
|
|
847
|
+
const error = gitOperationError(repoRoot, cwd);
|
|
848
|
+
if (error)
|
|
849
|
+
throw error;
|
|
850
|
+
}
|
|
851
|
+
function assertShutdownGitOperationsIdle(config, cwd) {
|
|
852
|
+
if (config.workers.some((worker) => worker.worktree_repo_root && worker.worktree_path) && isGitRepository(cwd)) {
|
|
853
|
+
assertNoActiveGitOperation(cwd, cwd);
|
|
854
|
+
}
|
|
855
|
+
for (const worker of config.workers) {
|
|
856
|
+
if (!worker.worktree_repo_root || !worker.worktree_path || !existsSync(worker.worktree_path))
|
|
857
|
+
continue;
|
|
858
|
+
assertNoActiveGitOperation(worker.worktree_repo_root, worker.worktree_path);
|
|
859
|
+
}
|
|
860
|
+
}
|
|
861
|
+
function abortOwnedIntegration(repoRoot, cwd, operation, sourceCommit) {
|
|
862
|
+
const marker = operation === 'merge' ? 'MERGE_HEAD' : 'CHERRY_PICK_HEAD';
|
|
863
|
+
const head = runGitCommand(repoRoot, ['rev-parse', '--verify', '--quiet', marker], cwd);
|
|
864
|
+
if (head.ok && head.stdout === sourceCommit)
|
|
865
|
+
runGitCommand(repoRoot, [operation, '--abort'], cwd);
|
|
841
866
|
}
|
|
842
867
|
async function readVerifiedWorkerHandoff(teamName, worker, cwd) {
|
|
843
868
|
const status = await readWorkerStatus(teamName, worker.name, cwd);
|
|
@@ -859,12 +884,40 @@ async function readVerifiedWorkerHandoff(teamName, worker, cwd) {
|
|
|
859
884
|
&& task.verified_head === workerHead && hasStructuredVerificationEvidence(task.result)) ? workerHead : null;
|
|
860
885
|
}
|
|
861
886
|
async function integrateWorkerCommitsIntoLeader(params) {
|
|
862
|
-
const { teamName,
|
|
887
|
+
const { teamName, previous, cwd } = params;
|
|
863
888
|
const next = { ...(previous?.integrationByWorker ?? {}) };
|
|
889
|
+
const entries = [];
|
|
890
|
+
let finished = false;
|
|
891
|
+
try {
|
|
892
|
+
try {
|
|
893
|
+
const result = await applyWorkerIntegrations(params, next, entries);
|
|
894
|
+
finished = true;
|
|
895
|
+
return result;
|
|
896
|
+
}
|
|
897
|
+
finally {
|
|
898
|
+
if (entries.length > 0)
|
|
899
|
+
await appendTeamCommitHygieneEntries(teamName, entries, resolveTeamCommitHygieneArtifactCwd(params.config, cwd));
|
|
900
|
+
}
|
|
901
|
+
}
|
|
902
|
+
finally {
|
|
903
|
+
// Commit receipts must survive failures in the rest of monitorTeam; idle polls need no extra write.
|
|
904
|
+
if (!finished || entries.length > 0) {
|
|
905
|
+
await withTeamTaskMembershipBarrier(teamName, cwd, async () => {
|
|
906
|
+
const latest = await readMonitorSnapshot(teamName, cwd) ?? previous ?? {
|
|
907
|
+
taskStatusById: {}, workerAliveByName: {}, workerStateByName: {}, workerTurnCountByName: {},
|
|
908
|
+
workerTaskIdByName: {}, mailboxNotifiedByMessageId: {}, completedEventTaskIds: {},
|
|
909
|
+
};
|
|
910
|
+
await writeMonitorSnapshot(teamName, {
|
|
911
|
+
...latest, integrationByWorker: { ...latest.integrationByWorker, ...next },
|
|
912
|
+
}, cwd);
|
|
913
|
+
});
|
|
914
|
+
}
|
|
915
|
+
}
|
|
916
|
+
}
|
|
917
|
+
async function applyWorkerIntegrations(params, next, commitHygieneEntries) {
|
|
918
|
+
const { teamName, config, cwd } = params;
|
|
864
919
|
const leaderHeadAtCycleStart = resolveLeaderHead(resolve(config.workers[0]?.worktree_repo_root ?? cwd), cwd);
|
|
865
920
|
const integratedWorkerNames = new Set();
|
|
866
|
-
const commitHygieneEntries = [];
|
|
867
|
-
const artifactCwd = resolveTeamCommitHygieneArtifactCwd(config, cwd);
|
|
868
921
|
// ── Phase B: Integrate worker commits to leader (hybrid strategy) ──
|
|
869
922
|
for (const worker of config.workers) {
|
|
870
923
|
if (!worker.worktree_repo_root || !worker.worktree_path || !existsSync(worker.worktree_path))
|
|
@@ -872,11 +925,11 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
872
925
|
const repoRoot = resolve(worker.worktree_repo_root);
|
|
873
926
|
const worktreePath = resolve(worker.worktree_path);
|
|
874
927
|
const previousState = next[worker.name] ?? {};
|
|
875
|
-
|
|
876
|
-
if (
|
|
928
|
+
const blocker = gitOperationError(repoRoot, worktreePath);
|
|
929
|
+
if (blocker) {
|
|
877
930
|
next[worker.name] = {
|
|
878
931
|
...previousState, status: 'rebase_conflict',
|
|
879
|
-
rebase_error:
|
|
932
|
+
rebase_error: blocker.message,
|
|
880
933
|
};
|
|
881
934
|
continue;
|
|
882
935
|
}
|
|
@@ -906,6 +959,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
906
959
|
const leaderHead = resolveLeaderHead(repoRoot, cwd);
|
|
907
960
|
const workerHead = resolveWorkerHead(worktreePath);
|
|
908
961
|
const state = { ...next[worker.name], last_leader_head: leaderHead ?? previousState.last_leader_head };
|
|
962
|
+
next[worker.name] = state;
|
|
909
963
|
if (!workerHead || workerHead !== verifiedHead || !leaderHead) {
|
|
910
964
|
next[worker.name] = state;
|
|
911
965
|
continue;
|
|
@@ -920,6 +974,9 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
920
974
|
if (alreadyMerged) {
|
|
921
975
|
Object.assign(state, { last_integrated_head: workerHead, delivery_leader_commit: workerHead });
|
|
922
976
|
state.status = 'idle';
|
|
977
|
+
state.rebase_error = undefined;
|
|
978
|
+
state.conflict_commit = undefined;
|
|
979
|
+
state.conflict_files = undefined;
|
|
923
980
|
state.updated_at = new Date().toISOString();
|
|
924
981
|
integratedWorkerNames.add(worker.name);
|
|
925
982
|
next[worker.name] = state;
|
|
@@ -930,6 +987,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
930
987
|
if (workerIsAheadOfLeader) {
|
|
931
988
|
// Publish the immutable verified commit without choosing sides on conflicts.
|
|
932
989
|
const branchRef = verifiedHead;
|
|
990
|
+
assertNoActiveGitOperation(repoRoot, cwd);
|
|
933
991
|
const merge = runGitCommand(repoRoot, ['merge', '--no-ff', '-m', `omx(team): merge ${worker.name}`, branchRef], cwd);
|
|
934
992
|
if (merge.ok) {
|
|
935
993
|
const newLeaderHead = resolveLeaderHead(repoRoot, cwd) ?? leaderHead;
|
|
@@ -1004,7 +1062,7 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
1004
1062
|
else {
|
|
1005
1063
|
// Abort without changing either side; leave resolution to the leader.
|
|
1006
1064
|
const conflictFiles = listConflictFiles(repoRoot, cwd);
|
|
1007
|
-
|
|
1065
|
+
abortOwnedIntegration(repoRoot, cwd, 'merge', branchRef);
|
|
1008
1066
|
state.status = 'cherry_pick_conflict';
|
|
1009
1067
|
state.conflict_commit = workerHead;
|
|
1010
1068
|
state.conflict_files = conflictFiles;
|
|
@@ -1049,11 +1107,12 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
1049
1107
|
worktree_path: worktreePath,
|
|
1050
1108
|
summary: `detected worker commit ${commit.slice(0, 12)}`,
|
|
1051
1109
|
}, cwd);
|
|
1110
|
+
assertNoActiveGitOperation(repoRoot, cwd);
|
|
1052
1111
|
const pick = runGitCommand(repoRoot, ['cherry-pick', '--allow-empty', commit], cwd);
|
|
1053
1112
|
if (!pick.ok) {
|
|
1054
1113
|
// Abort this commit and stop; do not rebase unintegrated changes.
|
|
1055
1114
|
const conflictFiles = listConflictFiles(repoRoot, cwd);
|
|
1056
|
-
|
|
1115
|
+
abortOwnedIntegration(repoRoot, cwd, 'cherry-pick', commit);
|
|
1057
1116
|
state.status = 'cherry_pick_conflict';
|
|
1058
1117
|
state.conflict_commit = commit;
|
|
1059
1118
|
state.conflict_files = conflictFiles;
|
|
@@ -1167,10 +1226,11 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
1167
1226
|
}, cwd);
|
|
1168
1227
|
continue;
|
|
1169
1228
|
}
|
|
1170
|
-
|
|
1229
|
+
const blocker = gitOperationError(repoRoot, worktreePath);
|
|
1230
|
+
if (blocker) {
|
|
1171
1231
|
next[worker.name] = {
|
|
1172
1232
|
...state, status: 'rebase_conflict',
|
|
1173
|
-
|
|
1233
|
+
pending_rebase_leader_head: newLeaderHead, rebase_error: blocker.message,
|
|
1174
1234
|
};
|
|
1175
1235
|
continue;
|
|
1176
1236
|
}
|
|
@@ -1252,9 +1312,6 @@ async function integrateWorkerCommitsIntoLeader(params) {
|
|
|
1252
1312
|
}
|
|
1253
1313
|
}
|
|
1254
1314
|
}
|
|
1255
|
-
if (commitHygieneEntries.length > 0) {
|
|
1256
|
-
await appendTeamCommitHygieneEntries(teamName, commitHygieneEntries, artifactCwd);
|
|
1257
|
-
}
|
|
1258
1315
|
return next;
|
|
1259
1316
|
}
|
|
1260
1317
|
function renderWorktreeMergeReport(report) {
|
|
@@ -1407,6 +1464,7 @@ async function prepareShutdownMergeReport(worker, leaderCwd) {
|
|
|
1407
1464
|
}
|
|
1408
1465
|
const worktreePath = resolve(worker.worktree_path);
|
|
1409
1466
|
const repoRoot = resolve(worker.worktree_repo_root);
|
|
1467
|
+
assertNoActiveGitOperation(repoRoot, worktreePath);
|
|
1410
1468
|
await removeGeneratedShutdownReport(repoRoot, worktreePath);
|
|
1411
1469
|
// Replay any pending submodule recovery journals before any git operations.
|
|
1412
1470
|
// If the process was killed after moving submodules but before creating placeholders,
|
|
@@ -1482,6 +1540,7 @@ async function prepareShutdownMergeReport(worker, leaderCwd) {
|
|
|
1482
1540
|
mergeDetail = 'source already reachable from leader HEAD';
|
|
1483
1541
|
}
|
|
1484
1542
|
else {
|
|
1543
|
+
assertNoActiveGitOperation(repoRoot, leaderCwd);
|
|
1485
1544
|
const mergeResult = runGitCommand(repoRoot, ['merge', '--no-ff', '--no-edit', sourceRef], leaderCwd);
|
|
1486
1545
|
if (mergeResult.ok) {
|
|
1487
1546
|
mergeOutcome = 'merged';
|
|
@@ -1491,7 +1550,7 @@ async function prepareShutdownMergeReport(worker, leaderCwd) {
|
|
|
1491
1550
|
else {
|
|
1492
1551
|
mergeOutcome = 'conflict';
|
|
1493
1552
|
mergeDetail = mergeResult.stderr || mergeResult.stdout || 'merge failed';
|
|
1494
|
-
|
|
1553
|
+
abortOwnedIntegration(repoRoot, leaderCwd, 'merge', sourceRef);
|
|
1495
1554
|
leaderHeadAfter = resolveLeaderHead(repoRoot, leaderCwd) ?? leaderHeadBefore;
|
|
1496
1555
|
}
|
|
1497
1556
|
}
|
|
@@ -3926,9 +3985,9 @@ export async function monitorTeam(teamName, cwd, options = {}) {
|
|
|
3926
3985
|
recommendations.push(`Integration unresolved for ${worker.name}; resolve delivery failure before terminal success`);
|
|
3927
3986
|
continue;
|
|
3928
3987
|
}
|
|
3929
|
-
if (
|
|
3988
|
+
if (gitOperationError(worker.worktree_repo_root, worker.worktree_path)) {
|
|
3930
3989
|
integrationFailed = true;
|
|
3931
|
-
recommendations.push(`Integration unresolved for ${worker.name}; unfinished
|
|
3990
|
+
recommendations.push(`Integration unresolved for ${worker.name}; unfinished Git operation or unavailable state preserved before terminal success`);
|
|
3932
3991
|
continue;
|
|
3933
3992
|
}
|
|
3934
3993
|
const workerHead = resolveWorkerHead(worker.worktree_path);
|
|
@@ -3997,23 +4056,26 @@ export async function monitorTeam(teamName, cwd, options = {}) {
|
|
|
3997
4056
|
const updatedAt = new Date().toISOString();
|
|
3998
4057
|
const totalMs = performance.now() - monitorStartMs;
|
|
3999
4058
|
if (!readOnly)
|
|
4000
|
-
await
|
|
4001
|
-
|
|
4002
|
-
|
|
4003
|
-
|
|
4004
|
-
|
|
4005
|
-
|
|
4006
|
-
|
|
4007
|
-
|
|
4008
|
-
|
|
4009
|
-
|
|
4010
|
-
|
|
4011
|
-
|
|
4012
|
-
|
|
4013
|
-
|
|
4014
|
-
|
|
4015
|
-
|
|
4016
|
-
|
|
4059
|
+
await withTeamTaskMembershipBarrier(sanitized, cwd, async () => {
|
|
4060
|
+
const latest = await readMonitorSnapshot(sanitized, cwd);
|
|
4061
|
+
await writeMonitorSnapshot(sanitized, {
|
|
4062
|
+
taskStatusById: Object.fromEntries(taskView.map((t) => [t.id, t.status])),
|
|
4063
|
+
workerAliveByName: Object.fromEntries(workers.map((w) => [w.name, w.alive])),
|
|
4064
|
+
workerStateByName: Object.fromEntries(workers.map((w) => [w.name, w.status.state])),
|
|
4065
|
+
workerTurnCountByName: Object.fromEntries(workers.map((w) => [w.name, w.heartbeat?.turn_count ?? 0])),
|
|
4066
|
+
workerTaskIdByName: Object.fromEntries(workers.map((w) => [w.name, w.status.current_task_id ?? ''])),
|
|
4067
|
+
mailboxNotifiedByMessageId,
|
|
4068
|
+
completedEventTaskIds: { ...previousSnapshot?.completedEventTaskIds, ...latest?.completedEventTaskIds },
|
|
4069
|
+
integrationByWorker,
|
|
4070
|
+
monitorTimings: {
|
|
4071
|
+
list_tasks_ms: Number(listTasksMs.toFixed(2)),
|
|
4072
|
+
worker_scan_ms: Number(workerScanMs.toFixed(2)),
|
|
4073
|
+
mailbox_delivery_ms: Number(mailboxDeliveryMs.toFixed(2)),
|
|
4074
|
+
total_ms: Number(totalMs.toFixed(2)),
|
|
4075
|
+
updated_at: updatedAt,
|
|
4076
|
+
},
|
|
4077
|
+
}, cwd);
|
|
4078
|
+
});
|
|
4017
4079
|
return {
|
|
4018
4080
|
teamName: sanitized,
|
|
4019
4081
|
phase,
|
|
@@ -4248,6 +4310,8 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
|
|
|
4248
4310
|
: '';
|
|
4249
4311
|
const governance = resolveGovernancePolicy(manifest?.governance, manifest?.policy);
|
|
4250
4312
|
const classification = await withTeamTaskMembershipBarrier(sanitized, cwd, async () => {
|
|
4313
|
+
if (!force)
|
|
4314
|
+
assertShutdownGitOperationsIdle(config, cwd);
|
|
4251
4315
|
const current = await classifyShutdown({
|
|
4252
4316
|
teamName: sanitized,
|
|
4253
4317
|
cwd,
|
|
@@ -4809,6 +4873,7 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
|
|
|
4809
4873
|
throw new Error(`shutdown_prompt_teardown_failed:${promptTeardownFailures.join(',')}`);
|
|
4810
4874
|
}
|
|
4811
4875
|
}
|
|
4876
|
+
assertShutdownGitOperationsIdle(config, cwd);
|
|
4812
4877
|
const shutdownReports = await prepareWorkerWorktreeShutdownReports(config, cwd);
|
|
4813
4878
|
const provisionedWorktrees = collectProvisionedShutdownWorktrees(config);
|
|
4814
4879
|
const commitHygieneEntries = [];
|
|
@@ -4846,7 +4911,7 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
|
|
|
4846
4911
|
}
|
|
4847
4912
|
}
|
|
4848
4913
|
const artifactCwd = resolveTeamCommitHygieneArtifactCwd(config, cwd);
|
|
4849
|
-
const taskView = await listTasks(sanitized, cwd)
|
|
4914
|
+
const taskView = await listTasks(sanitized, cwd);
|
|
4850
4915
|
const internalLedger = await appendTeamCommitHygieneEntries(sanitized, commitHygieneEntries, artifactCwd);
|
|
4851
4916
|
const commitHygieneArtifactTeamNames = resolveCommitHygieneArtifactTeamNames(config, sanitized);
|
|
4852
4917
|
let commitHygieneArtifacts = null;
|
|
@@ -4892,12 +4957,14 @@ export async function shutdownTeam(teamName, cwd, options = {}) {
|
|
|
4892
4957
|
const head = runGitCommand(worktree.repoRoot, ['rev-parse', 'HEAD'], worktree.worktreePath);
|
|
4893
4958
|
const saved = head.ok && runGitCommand(worktree.repoRoot, ['merge-base', '--is-ancestor', head.stdout, 'HEAD'], cwd).ok;
|
|
4894
4959
|
await removeGeneratedShutdownReport(worktree.repoRoot, worktree.worktreePath);
|
|
4960
|
+
await archiveIgnoredCompletionEvidence(worktree.worktreePath);
|
|
4895
4961
|
const status = runGitCommand(worktree.repoRoot, ['status', '--porcelain', '--untracked-files=all', '--ignored', '--ignore-submodules=none'], worktree.worktreePath);
|
|
4896
4962
|
if (!saved || !status.ok || status.stdout) {
|
|
4897
4963
|
throw new Error(`shutdown_worktree_preservation_failed:${worktree.worktreePath}:worktree changed or could not be verified; worktree and team state retained`);
|
|
4898
4964
|
}
|
|
4899
4965
|
}
|
|
4900
4966
|
if (provisionedWorktrees.length > 0) {
|
|
4967
|
+
assertShutdownGitOperationsIdle(config, cwd);
|
|
4901
4968
|
// Keep recovery state if removal itself fails, including after a partial cleanup.
|
|
4902
4969
|
await rollbackProvisionedWorktrees(provisionedWorktrees, {
|
|
4903
4970
|
force: false,
|
|
@@ -5153,21 +5220,30 @@ async function isTaskApprovedForExecution(teamName, taskId, cwd) {
|
|
|
5153
5220
|
return record?.status === 'approved';
|
|
5154
5221
|
}
|
|
5155
5222
|
async function emitMonitorDerivedEvents(teamName, tasks, workers, previous, workerLaunchMode, cwd) {
|
|
5156
|
-
|
|
5157
|
-
const
|
|
5158
|
-
|
|
5159
|
-
|
|
5160
|
-
|
|
5161
|
-
|
|
5162
|
-
|
|
5163
|
-
|
|
5164
|
-
|
|
5165
|
-
|
|
5166
|
-
|
|
5167
|
-
|
|
5168
|
-
|
|
5223
|
+
await withTeamTaskMembershipBarrier(teamName, cwd, async () => {
|
|
5224
|
+
const latest = await readMonitorSnapshot(teamName, cwd) ?? previous;
|
|
5225
|
+
const completedEventTaskIds = { ...previous?.completedEventTaskIds, ...latest?.completedEventTaskIds };
|
|
5226
|
+
let changed = false;
|
|
5227
|
+
for (const task of tasks) {
|
|
5228
|
+
const prevStatus = previous?.taskStatusById[task.id];
|
|
5229
|
+
if (prevStatus && prevStatus !== 'completed' && task.status === 'completed') {
|
|
5230
|
+
// Skip if a task_completed event was already emitted by transitionTaskStatus (issue #161).
|
|
5231
|
+
if (completedEventTaskIds[task.id])
|
|
5232
|
+
continue;
|
|
5233
|
+
await appendTeamEvent(teamName, {
|
|
5234
|
+
type: 'task_completed',
|
|
5235
|
+
worker: task.owner || 'unknown',
|
|
5236
|
+
task_id: task.id,
|
|
5237
|
+
message_id: null,
|
|
5238
|
+
reason: undefined,
|
|
5239
|
+
}, cwd);
|
|
5240
|
+
completedEventTaskIds[task.id] = true;
|
|
5241
|
+
changed = true;
|
|
5242
|
+
}
|
|
5169
5243
|
}
|
|
5170
|
-
|
|
5244
|
+
if (changed && latest)
|
|
5245
|
+
await writeMonitorSnapshot(teamName, { ...latest, completedEventTaskIds }, cwd);
|
|
5246
|
+
});
|
|
5171
5247
|
for (const worker of workers) {
|
|
5172
5248
|
const prevAlive = previous?.workerAliveByName[worker.name];
|
|
5173
5249
|
const shouldEmitInitialPromptWorkerStop = workerLaunchMode === 'prompt' && prevAlive === undefined;
|