audit-tools 0.32.44 → 0.32.46
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/dist/audit/cli/args.d.ts.map +1 -1
- package/dist/audit/cli/args.js +2 -4
- package/dist/audit/cli/args.js.map +1 -1
- package/dist/audit/cli/auditStep.d.ts +1 -1
- package/dist/audit/cli/dispatch.d.ts +1 -0
- package/dist/audit/cli/dispatch.d.ts.map +1 -1
- package/dist/audit/cli/dispatch.js +39 -18
- package/dist/audit/cli/dispatch.js.map +1 -1
- package/dist/audit/cli/mergeAndIngestCommand.d.ts +41 -0
- package/dist/audit/cli/mergeAndIngestCommand.d.ts.map +1 -1
- package/dist/audit/cli/mergeAndIngestCommand.js +105 -18
- package/dist/audit/cli/mergeAndIngestCommand.js.map +1 -1
- package/dist/audit/cli/nextStepCommand.d.ts.map +1 -1
- package/dist/audit/cli/nextStepCommand.js +3 -3
- package/dist/audit/cli/nextStepCommand.js.map +1 -1
- package/dist/audit/cli/nextStepHelpers.d.ts +23 -38
- package/dist/audit/cli/nextStepHelpers.d.ts.map +1 -1
- package/dist/audit/cli/nextStepHelpers.js +130 -89
- package/dist/audit/cli/nextStepHelpers.js.map +1 -1
- package/dist/audit/cli/ownerTokens.d.ts +21 -0
- package/dist/audit/cli/ownerTokens.d.ts.map +1 -0
- package/dist/audit/cli/ownerTokens.js +86 -0
- package/dist/audit/cli/ownerTokens.js.map +1 -0
- package/dist/audit/cli/resynthesizeCommand.d.ts.map +1 -1
- package/dist/audit/cli/resynthesizeCommand.js +8 -10
- package/dist/audit/cli/resynthesizeCommand.js.map +1 -1
- package/dist/audit/cli/rollingAuditDispatch.d.ts.map +1 -1
- package/dist/audit/cli/rollingAuditDispatch.js +9 -22
- package/dist/audit/cli/rollingAuditDispatch.js.map +1 -1
- package/dist/audit/contracts/wrapperResponse.d.ts +6 -6
- package/dist/audit/extractors/gitHistory.d.ts.map +1 -1
- package/dist/audit/extractors/gitHistory.js +3 -0
- package/dist/audit/extractors/gitHistory.js.map +1 -1
- package/dist/audit/orchestrator/advance.d.ts +4 -1
- package/dist/audit/orchestrator/advance.d.ts.map +1 -1
- package/dist/audit/orchestrator/advance.js +185 -36
- package/dist/audit/orchestrator/advance.js.map +1 -1
- package/dist/audit/orchestrator/fileIntegrity.d.ts.map +1 -1
- package/dist/audit/orchestrator/fileIntegrity.js +21 -32
- package/dist/audit/orchestrator/fileIntegrity.js.map +1 -1
- package/dist/audit/orchestrator/reviewPackets.d.ts.map +1 -1
- package/dist/audit/orchestrator/reviewPackets.js +31 -36
- package/dist/audit/orchestrator/reviewPackets.js.map +1 -1
- package/dist/audit/orchestrator/taskBuilder.d.ts.map +1 -1
- package/dist/audit/orchestrator/taskBuilder.js +12 -24
- package/dist/audit/orchestrator/taskBuilder.js.map +1 -1
- package/dist/audit/providers/opencodeProvider.d.ts +1 -4
- package/dist/audit/providers/opencodeProvider.d.ts.map +1 -1
- package/dist/audit/providers/opencodeProvider.js +6 -9
- package/dist/audit/providers/opencodeProvider.js.map +1 -1
- package/dist/audit/reporting/mergeFindings.d.ts.map +1 -1
- package/dist/audit/reporting/mergeFindings.js +1 -32
- package/dist/audit/reporting/mergeFindings.js.map +1 -1
- package/dist/audit/reporting/synthesis.d.ts.map +1 -1
- package/dist/audit/reporting/synthesis.js +1 -12
- package/dist/audit/reporting/synthesis.js.map +1 -1
- package/dist/audit/supervisor/operatorHandoff.d.ts.map +1 -1
- package/dist/audit/supervisor/operatorHandoff.js +9 -12
- package/dist/audit/supervisor/operatorHandoff.js.map +1 -1
- package/dist/audit/supervisor/sessionConfig.d.ts.map +1 -1
- package/dist/audit/supervisor/sessionConfig.js +25 -35
- package/dist/audit/supervisor/sessionConfig.js.map +1 -1
- package/dist/audit/types/auditState.d.ts +6 -6
- package/dist/remediate/dedup/crossLensDedup.d.ts +2 -1
- package/dist/remediate/dedup/crossLensDedup.d.ts.map +1 -1
- package/dist/remediate/dedup/crossLensDedup.js +4 -33
- package/dist/remediate/dedup/crossLensDedup.js.map +1 -1
- package/dist/remediate/index.d.ts +2 -2
- package/dist/remediate/index.d.ts.map +1 -1
- package/dist/remediate/index.js +5 -8
- package/dist/remediate/index.js.map +1 -1
- package/dist/remediate/intake.d.ts.map +1 -1
- package/dist/remediate/intake.js +9 -5
- package/dist/remediate/intake.js.map +1 -1
- package/dist/remediate/phases/close.d.ts +59 -1
- package/dist/remediate/phases/close.d.ts.map +1 -1
- package/dist/remediate/phases/close.js +294 -29
- package/dist/remediate/phases/close.js.map +1 -1
- package/dist/remediate/phases/plan.d.ts +2 -2
- package/dist/remediate/phases/plan.d.ts.map +1 -1
- package/dist/remediate/phases/plan.js +31 -23
- package/dist/remediate/phases/plan.js.map +1 -1
- package/dist/remediate/providers/opencodeProvider.d.ts +1 -4
- package/dist/remediate/providers/opencodeProvider.d.ts.map +1 -1
- package/dist/remediate/providers/opencodeProvider.js +6 -9
- package/dist/remediate/providers/opencodeProvider.js.map +1 -1
- package/dist/remediate/state/store.d.ts +54 -11
- package/dist/remediate/state/store.d.ts.map +1 -1
- package/dist/remediate/state/store.js +37 -64
- package/dist/remediate/state/store.js.map +1 -1
- package/dist/remediate/state/types.d.ts +22 -0
- package/dist/remediate/state/types.d.ts.map +1 -1
- package/dist/remediate/state/types.js +8 -0
- package/dist/remediate/state/types.js.map +1 -1
- package/dist/remediate/steps/dispatch/acceptNode.d.ts +38 -0
- package/dist/remediate/steps/dispatch/acceptNode.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch/acceptNode.js +70 -24
- package/dist/remediate/steps/dispatch/acceptNode.js.map +1 -1
- package/dist/remediate/steps/dispatch/marshal.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch/marshal.js +30 -0
- package/dist/remediate/steps/dispatch/marshal.js.map +1 -1
- package/dist/remediate/steps/dispatch/worktreeLifecycle.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch/worktreeLifecycle.js +42 -8
- package/dist/remediate/steps/dispatch/worktreeLifecycle.js.map +1 -1
- package/dist/remediate/steps/finalGate.d.ts +2 -2
- package/dist/remediate/steps/finalGate.d.ts.map +1 -1
- package/dist/remediate/steps/finalGate.js +8 -9
- package/dist/remediate/steps/finalGate.js.map +1 -1
- package/dist/remediate/steps/nextStep.d.ts +12 -0
- package/dist/remediate/steps/nextStep.d.ts.map +1 -1
- package/dist/remediate/steps/nextStep.js +57 -35
- package/dist/remediate/steps/nextStep.js.map +1 -1
- package/dist/remediate/steps/rollingSession.d.ts.map +1 -1
- package/dist/remediate/steps/rollingSession.js +27 -1
- package/dist/remediate/steps/rollingSession.js.map +1 -1
- package/dist/remediate/utils/fileIntegrity.d.ts.map +1 -1
- package/dist/remediate/utils/fileIntegrity.js +29 -33
- package/dist/remediate/utils/fileIntegrity.js.map +1 -1
- package/dist/remediate/utils/hostAssets.d.ts +4 -1
- package/dist/remediate/utils/hostAssets.d.ts.map +1 -1
- package/dist/remediate/utils/hostAssets.js +4 -1
- package/dist/remediate/utils/hostAssets.js.map +1 -1
- package/dist/remediate/validation/artifacts.d.ts.map +1 -1
- package/dist/remediate/validation/artifacts.js +3 -2
- package/dist/remediate/validation/artifacts.js.map +1 -1
- package/dist/remediate/validation/contractPipeline.d.ts.map +1 -1
- package/dist/remediate/validation/contractPipeline.js +3 -1
- package/dist/remediate/validation/contractPipeline.js.map +1 -1
- package/dist/shared/chunkByBudget.d.ts +58 -0
- package/dist/shared/chunkByBudget.d.ts.map +1 -0
- package/dist/shared/chunkByBudget.js +31 -0
- package/dist/shared/chunkByBudget.js.map +1 -0
- package/dist/shared/countBy.d.ts +19 -0
- package/dist/shared/countBy.d.ts.map +1 -0
- package/dist/shared/countBy.js +29 -0
- package/dist/shared/countBy.js.map +1 -0
- package/dist/shared/engine/obligationEngine.d.ts +2 -2
- package/dist/shared/fileIntegrity.d.ts +55 -0
- package/dist/shared/fileIntegrity.d.ts.map +1 -0
- package/dist/shared/fileIntegrity.js +50 -0
- package/dist/shared/fileIntegrity.js.map +1 -0
- package/dist/shared/findingSimilarity.d.ts +26 -0
- package/dist/shared/findingSimilarity.d.ts.map +1 -0
- package/dist/shared/findingSimilarity.js +54 -0
- package/dist/shared/findingSimilarity.js.map +1 -0
- package/dist/shared/friction/stepBoundaryCapture.d.ts +17 -0
- package/dist/shared/friction/stepBoundaryCapture.d.ts.map +1 -1
- package/dist/shared/friction/stepBoundaryCapture.js +21 -0
- package/dist/shared/friction/stepBoundaryCapture.js.map +1 -1
- package/dist/shared/git.d.ts +23 -0
- package/dist/shared/git.d.ts.map +1 -1
- package/dist/shared/git.js +26 -0
- package/dist/shared/git.js.map +1 -1
- package/dist/shared/index.d.ts +11 -4
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +22 -3
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/io/auditToolsPaths.d.ts +7 -0
- package/dist/shared/io/auditToolsPaths.d.ts.map +1 -1
- package/dist/shared/io/auditToolsPaths.js +10 -0
- package/dist/shared/io/auditToolsPaths.js.map +1 -1
- package/dist/shared/io/lockedJsonStore.d.ts +66 -0
- package/dist/shared/io/lockedJsonStore.d.ts.map +1 -0
- package/dist/shared/io/lockedJsonStore.js +59 -0
- package/dist/shared/io/lockedJsonStore.js.map +1 -0
- package/dist/shared/loopCorePaths.d.ts.map +1 -1
- package/dist/shared/loopCorePaths.js +2 -0
- package/dist/shared/loopCorePaths.js.map +1 -1
- package/dist/shared/providers/openAiCompatibleProvider.d.ts.map +1 -1
- package/dist/shared/providers/openAiCompatibleProvider.js +2 -1
- package/dist/shared/providers/openAiCompatibleProvider.js.map +1 -1
- package/dist/shared/providers/opencodeProvider.d.ts +8 -0
- package/dist/shared/providers/opencodeProvider.d.ts.map +1 -1
- package/dist/shared/providers/opencodeProvider.js +10 -0
- package/dist/shared/providers/opencodeProvider.js.map +1 -1
- package/dist/shared/quota/claimRegistry.d.ts +9 -0
- package/dist/shared/quota/claimRegistry.d.ts.map +1 -1
- package/dist/shared/quota/claimRegistry.js +20 -0
- package/dist/shared/quota/claimRegistry.js.map +1 -1
- package/dist/shared/reporting/auditDeliverable.d.ts.map +1 -1
- package/dist/shared/reporting/auditDeliverable.js +14 -9
- package/dist/shared/reporting/auditDeliverable.js.map +1 -1
- package/dist/shared/tooling/exec.d.ts +42 -4
- package/dist/shared/tooling/exec.d.ts.map +1 -1
- package/dist/shared/tooling/exec.js +90 -12
- package/dist/shared/tooling/exec.js.map +1 -1
- package/dist/shared/types/contractPipeline/verification.d.ts +17 -3
- package/dist/shared/types/contractPipeline/verification.d.ts.map +1 -1
- package/dist/shared/types/sessionConfig.d.ts +28 -0
- package/dist/shared/types/sessionConfig.d.ts.map +1 -1
- package/dist/shared/types/sessionConfig.js +35 -0
- package/dist/shared/types/sessionConfig.js.map +1 -1
- package/opencode.json +2 -11
- package/package.json +2 -1
- package/scripts/audit/postinstall.mjs +57 -137
- package/scripts/remediate/postinstall.mjs +41 -169
- package/scripts/shared/install-host-assets.mjs +188 -0
- package/wrapper/audit-code-wrapper-lib.mjs +32 -4
- package/wrapper/audit-code-wrapper-opencode.mjs +41 -25
- package/wrapper/remediate-code-wrapper-opencode.mjs +43 -21
- package/dist/remediate/utils/commands.d.ts +0 -17
- package/dist/remediate/utils/commands.d.ts.map +0 -1
- package/dist/remediate/utils/commands.js +0 -29
- package/dist/remediate/utils/commands.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/args.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,iBAAiB,EACjB,qBAAqB,EAMrB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAG5B,eAAO,MAAM,mBAAmB;;;;CAQ/B,CAAC;AAMF,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,SAAS,CAYrB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAIjF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,aAAa,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,OAAO,CASV;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMtD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,eAAO,MAAM,eAAe,8BAAwB,CAAC;AAErD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,0BAAoB,CAAC;AAErD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAEpD;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7E;AAUD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAarD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAK3E;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAKjD;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAMtD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAOnD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAGrE;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,aAAa,GAAG,MAAM,CAMjF;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAEtE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/args.ts"],"names":[],"mappings":"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"}
|
package/dist/audit/cli/args.js
CHANGED
|
@@ -3,7 +3,7 @@ import { readdir } from "node:fs/promises";
|
|
|
3
3
|
import { Buffer } from "node:buffer";
|
|
4
4
|
import { createHash } from "node:crypto";
|
|
5
5
|
import { join, resolve } from "node:path";
|
|
6
|
-
import { renderPromptCommand, toPromptPathToken, quotePromptCommandArg, parseHostModelRoster, auditArtifactsDir, resolveRepoRoot, resolveHostDispatchCapability as sharedResolveHostDispatchCapability,
|
|
6
|
+
import { renderPromptCommand, toPromptPathToken, quotePromptCommandArg, parseHostModelRoster, auditArtifactsDir, resolveRepoRoot, resolveHostDispatchCapability as sharedResolveHostDispatchCapability, assertHostProviderName, } from "audit-tools/shared";
|
|
7
7
|
import { resolveFreshSessionProviderName } from "../providers/index.js";
|
|
8
8
|
export const DIRECT_CLI_DEFAULTS = {
|
|
9
9
|
rootDir: ".",
|
|
@@ -184,9 +184,7 @@ export function getHostProvider(argv) {
|
|
|
184
184
|
const value = getFlag(argv, "--host-provider");
|
|
185
185
|
if (value === undefined)
|
|
186
186
|
return null;
|
|
187
|
-
|
|
188
|
-
throw new Error(`--host-provider must be one of: ${PROVIDER_NAMES.join(", ")} (got "${value}")`);
|
|
189
|
-
}
|
|
187
|
+
assertHostProviderName(value);
|
|
190
188
|
return value;
|
|
191
189
|
}
|
|
192
190
|
export function getHostModel(argv) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../src/audit/cli/args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAY,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,eAAe,EACf,6BAA6B,IAAI,mCAAmC,EACpE,
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../src/audit/cli/args.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export declare function ingestBatchAuditResults(options: {
|
|
|
35
35
|
status: "blocked" | "complete" | "not_started" | "active";
|
|
36
36
|
obligations: {
|
|
37
37
|
id: string;
|
|
38
|
-
state: "blocked" | "
|
|
38
|
+
state: "blocked" | "missing" | "satisfied" | "present" | "stale";
|
|
39
39
|
reason?: string | undefined;
|
|
40
40
|
}[];
|
|
41
41
|
last_executor?: string | undefined;
|
|
@@ -10,6 +10,7 @@ import { buildTaskSections, buildPacketPrompt } from "./dispatch/packetPrompt.js
|
|
|
10
10
|
import { withinRoot, dispatchResultMapPath, loadDispatchResultMap, entriesByTaskId, resolveRunScopedArg } from "./dispatch/paths.js";
|
|
11
11
|
export type { ActiveDispatchState, DispatchResultMapEntry, DispatchResultMap, DispatchComplexity, DispatchFanout, PrepareDispatchResult, DispatchPlanEntry, };
|
|
12
12
|
export { DISPATCH_RESULT_MAP_FILENAME, ACTIVE_DISPATCH_FILENAME, LARGE_FILE_PACKET_TARGET_LINES, DEFAULT_DEEP_ROUTING_RISK, DEFAULT_STANDARD_ROUTING_RISK, DEFAULT_DISPATCH_CONFIRM_THRESHOLD, DEEP_MODEL_HINT_MIN_ESTIMATED_TOKENS, resolveDispatchTier, resolveTierBudgets, computeDispatchFanout, TIER_RANK, isIsolatedLargeFilePacket, buildDispatchComplexity, buildPendingAuditTasks, filterPackets, fitPacketsToTierBudgets, collectOversizedWarnings, buildTaskSections, buildPacketPrompt, withinRoot, dispatchResultMapPath, loadDispatchResultMap, entriesByTaskId, resolveRunScopedArg, };
|
|
13
|
+
export declare const AUDIT_TASK_CLAIM_LEASE_MS: number;
|
|
13
14
|
export declare function prepareDispatchArtifacts(params: {
|
|
14
15
|
packageRoot: string;
|
|
15
16
|
runId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/dispatch.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { mkdir, writeFile } from "node:fs/promises";
|
|
|
12
12
|
import { join } from "node:path";
|
|
13
13
|
import { readJsonFile, writeJsonFile, computeDispatchCapacity } from "audit-tools/shared";
|
|
14
14
|
import { isFileMissingError, ClaimRegistry, taskClaimsPath, readConfirmedCostPositions, readConfirmedDispatchBias } from "audit-tools/shared";
|
|
15
|
+
import { mergeOwnerTokens } from "./ownerTokens.js";
|
|
15
16
|
import { loadArtifactBundle } from "../io/artifacts.js";
|
|
16
17
|
import { writePacketSchemaFiles } from "../io/runArtifacts.js";
|
|
17
18
|
import { sizeIndexFromManifest, orderTasksForPacketReview, buildReviewPacketsFromPartition } from "../orchestrator/reviewPackets.js";
|
|
@@ -35,8 +36,10 @@ export { DISPATCH_RESULT_MAP_FILENAME, ACTIVE_DISPATCH_FILENAME, LARGE_FILE_PACK
|
|
|
35
36
|
// claim is held across an OUT-OF-PROCESS host worker run with no live heartbeat,
|
|
36
37
|
// so it must bound a worker's whole runtime; a genuinely-crashed peer's claim is
|
|
37
38
|
// reclaimed after this window. Correctness for the rare legitimate overrun rests
|
|
38
|
-
// on dedup-by-task_id at ingest, not on this value being exact.
|
|
39
|
-
|
|
39
|
+
// on dedup-by-task_id at ingest, not on this value being exact. Exported so the
|
|
40
|
+
// merge-side ownership gate (mergeAndIngestCommand.ts) constructs its registry
|
|
41
|
+
// with the SAME lease — liveness must be judged against one window, never two.
|
|
42
|
+
export const AUDIT_TASK_CLAIM_LEASE_MS = 20 * 60_000;
|
|
40
43
|
export async function prepareDispatchArtifacts(params) {
|
|
41
44
|
const runId = params.runId;
|
|
42
45
|
const artifactsDir = params.artifactsDir;
|
|
@@ -97,21 +100,39 @@ export async function prepareDispatchArtifacts(params) {
|
|
|
97
100
|
// here — its result will arrive via the shared ledger, and a crashed peer's
|
|
98
101
|
// claim goes stale (long lease) for reclaim. Claims for tasks we end up NOT
|
|
99
102
|
// emitting (deferred by the top-K budget cap) are released below so peers can
|
|
100
|
-
// take them. The A-8 hybrid in-process driver
|
|
101
|
-
//
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
103
|
+
// take them. The A-8 hybrid in-process driver (`tasksOverride`) is claimed
|
|
104
|
+
// here too (D-66/67 slice-1, Part A: uniform ownership-gate coverage) — it is
|
|
105
|
+
// a DIFFERENT registry from the coordinator's pre-assignment claim on
|
|
106
|
+
// `runs/audit-node-claims.json` (see hybridDispatch.ts), so this is not a
|
|
107
|
+
// double-claim hazard, and same-pool re-grant is idempotent-but-token-rotating
|
|
108
|
+
// even if a peer momentarily held the same task_id here too.
|
|
109
|
+
const taskClaims = new ClaimRegistry(taskClaimsPath(artifactsDir), undefined, AUDIT_TASK_CLAIM_LEASE_MS);
|
|
110
|
+
// poolId = runId so THIS run's repeated dispatch re-grants its own in-flight
|
|
111
|
+
// tasks (idempotent), while a different IDE's run (distinct runId) is
|
|
112
|
+
// partitioned off. See ClaimRegistry.claimMany.
|
|
113
|
+
const { granted: grantedTaskIds, ownerTokenByNode } = await taskClaims.claimMany(candidateTasks.map((task) => task.task_id), runId);
|
|
114
|
+
const grantedSet = new Set(grantedTaskIds);
|
|
115
|
+
const dispatchTasks = candidateTasks.filter((task) => grantedSet.has(task.task_id));
|
|
116
|
+
// A coordinator-assigned override task a live peer holds on task-claims.json is
|
|
117
|
+
// skipped by the uniform claiming above — surface it (mirror of the merge-side
|
|
118
|
+
// gate's warn) so the drop is never silent: the driver believed it owned this
|
|
119
|
+
// partition, and the skipped task's result will arrive via the peer's ledger.
|
|
120
|
+
if (params.tasksOverride) {
|
|
121
|
+
const skippedOverride = candidateTasks
|
|
122
|
+
.map((task) => task.task_id)
|
|
123
|
+
.filter((taskId) => !grantedSet.has(taskId));
|
|
124
|
+
if (skippedOverride.length > 0) {
|
|
125
|
+
process.stderr.write(`[prepare-dispatch] Warning: ${skippedOverride.length} override task(s) skipped — task ` +
|
|
126
|
+
`claim held live by a peer: ${skippedOverride.join(", ")}\n`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
// Part A (D-66/67 slice-1): persist the freshly-minted owner tokens into the
|
|
130
|
+
// run-scoped sidecar (see ownerTokens.ts for why NOT active-dispatch.json) so
|
|
131
|
+
// mergeAndIngest's ownership gate can verify each terminal task's claim is
|
|
132
|
+
// still ours at merge time.
|
|
133
|
+
if (grantedTaskIds.length > 0) {
|
|
134
|
+
await mergeOwnerTokens(runDir, ownerTokenByNode);
|
|
135
|
+
}
|
|
115
136
|
const lineIndex = Object.fromEntries(dispatchTasks.flatMap((task) => Object.entries(task.file_line_counts ?? {})));
|
|
116
137
|
const sizeIndex = sizeIndexFromManifest(bundle.repo_manifest);
|
|
117
138
|
// Access-memory continuity bias (increment 2b): score files by how connected
|
|
@@ -215,7 +236,7 @@ export async function prepareDispatchArtifacts(params) {
|
|
|
215
236
|
// Release claims we took on tasks that were NOT emitted this round (deferred by
|
|
216
237
|
// the top-K budget cap): holding them would hoard deferred work a peer could
|
|
217
238
|
// otherwise pick up. Only the emitted subset stays claimed (in-flight to us).
|
|
218
|
-
|
|
239
|
+
{
|
|
219
240
|
const emittedTaskIds = new Set(emitPackets.flatMap((packet) => packet.task_ids));
|
|
220
241
|
const deferredClaimed = dispatchTasks
|
|
221
242
|
.map((task) => task.task_id)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/audit/cli/dispatch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/audit/cli/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ClaimRegistry } from "audit-tools/shared";
|
|
1
2
|
import type { AuditResult, AuditTask } from "../types.js";
|
|
2
3
|
/**
|
|
3
4
|
* Validate each pending task's result, classifying into passing/failing/notDispatched.
|
|
@@ -14,6 +15,46 @@ export declare function packetMembersByPacketId(entries: Array<{
|
|
|
14
15
|
task_id: string;
|
|
15
16
|
packet_id: string;
|
|
16
17
|
}>): Map<string, string[]>;
|
|
18
|
+
/** A terminal task excluded from ingest by the ownership gate (`partitionByOwnership`). */
|
|
19
|
+
export interface UnownedTask {
|
|
20
|
+
task_id: string;
|
|
21
|
+
reason: string;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* OD3 merge-time ownership gate (D-66/67 slice-1, Part A). Splits a terminal
|
|
25
|
+
* (passing or failing) result set into `owned` (proceeds to ingest/claim-clear
|
|
26
|
+
* as today) and `unowned` (excluded — a LIVE peer claim under a DIFFERENT
|
|
27
|
+
* token was observed for a task whose token WE persisted at dispatch time).
|
|
28
|
+
*
|
|
29
|
+
* A task with NO persisted token (`ownerTokens[task_id] === undefined` —
|
|
30
|
+
* recovery paths, results recovered from disk, pre-slice manifests) fails
|
|
31
|
+
* OPEN: it is treated as owned, exactly the pre-gate behavior.
|
|
32
|
+
*
|
|
33
|
+
* Deliberately checks `listLiveClaims()` rather than `heartbeat(task_id,
|
|
34
|
+
* token)`: an ABSENT-OR-STALE claim is NOT treated as peer possession, only a
|
|
35
|
+
* LIVE claim held under a DIFFERENT token is. `heartbeat` collapses
|
|
36
|
+
* "unclaimed" and "claimed by someone else" into the same `false` — but
|
|
37
|
+
* "unclaimed" is exactly what a terminal task looks like the round AFTER we
|
|
38
|
+
* ourselves ingested it and cleared its claim (the merge-complete self-heal
|
|
39
|
+
* path re-lists an already-answered task_id as pending with its ORIGINAL
|
|
40
|
+
* round's now-orphaned sidecar token still on record). And a STALE
|
|
41
|
+
* different-token claim is an abandoned one — the next `claim()` would grant
|
|
42
|
+
* over it — so treating it as a live peer would drop OUR valid result for a
|
|
43
|
+
* crashed peer's ghost (e.g. A crashes past the lease, B reclaims then also
|
|
44
|
+
* crashes past the lease, A resurrects and merges: A's result is still the
|
|
45
|
+
* only live work). Only a claim actively held (non-stale, per the SAME
|
|
46
|
+
* 20-min task lease the dispatch side claims under) beneath a token that is
|
|
47
|
+
* NOT ours is unambiguous evidence of a peer's reclaim.
|
|
48
|
+
*
|
|
49
|
+
* `registry` is narrowed to `listLiveClaims` alone so callers can inject a
|
|
50
|
+
* fake in tests without standing up a real file-backed `ClaimRegistry`.
|
|
51
|
+
*/
|
|
52
|
+
export declare function partitionByOwnership<T extends {
|
|
53
|
+
task_id: string;
|
|
54
|
+
}>(items: readonly T[], ownerTokens: Readonly<Record<string, string>>, registry: Pick<ClaimRegistry, "listLiveClaims">): Promise<{
|
|
55
|
+
owned: T[];
|
|
56
|
+
unowned: UnownedTask[];
|
|
57
|
+
}>;
|
|
17
58
|
export declare function validateAndCollectResults(allTasks: AuditTask[], entryByTaskId: Map<string, {
|
|
18
59
|
result_path: string;
|
|
19
60
|
task_id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeAndIngestCommand.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/mergeAndIngestCommand.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mergeAndIngestCommand.d.ts","sourceRoot":"","sources":["../../../src/audit/cli/mergeAndIngestCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6F,aAAa,EAA2C,MAAM,oBAAoB,CAAC;AAEvL,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAsO1D;;;;GAIG;AACH;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,GACrD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CASvB;AAED,2FAA2F;AAC3F,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EACtE,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC7C,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAC9C,OAAO,CAAC;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAsBjD;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,SAAS,EAAE,EACrB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,EACvF,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACpC,eAAe,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC;IACT,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC,CAsKD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CA2CvE;AAED,qFAAqF;AACrF,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,4EAA4E;IAC5E,YAAY,EAAE,OAAO,CAAC;CACvB;AAqCD,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwShC;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAUrE"}
|
|
@@ -5,11 +5,12 @@ import { validateAuditResults, defaultFindingLensFromResult, emitCoverageLineCou
|
|
|
5
5
|
import { verifyFindingGrounding } from "../validation/quoteGrounding.js";
|
|
6
6
|
import { ANCHOR_GROUNDING_CONCURRENCY, anchorEvidenceLine, combineGroundingWithAnchor, verifyFindingAnchor, } from "../validation/anchorGrounding.js";
|
|
7
7
|
import { runAuditStep } from "./auditStep.js";
|
|
8
|
-
import { DISPATCH_RESULT_MAP_FILENAME, ACTIVE_DISPATCH_FILENAME, loadDispatchResultMap, entriesByTaskId, buildPendingAuditTasks, } from "./dispatch.js";
|
|
8
|
+
import { DISPATCH_RESULT_MAP_FILENAME, ACTIVE_DISPATCH_FILENAME, AUDIT_TASK_CLAIM_LEASE_MS, loadDispatchResultMap, entriesByTaskId, buildPendingAuditTasks, } from "./dispatch.js";
|
|
9
9
|
import { addFileLineCountHints } from "./lineIndex.js";
|
|
10
10
|
import { artifactNameForId, isCanonicalResultFilename, getArtifactsDir, getFlag } from "./args.js";
|
|
11
11
|
import { buildWorkerResult } from "./workerResult.js";
|
|
12
12
|
import { PACKET_SCHEMA_FILENAMES } from "../io/runArtifacts.js";
|
|
13
|
+
import { readOwnerTokens } from "./ownerTokens.js";
|
|
13
14
|
// Schema pointer files prepare-dispatch copies into task-results/ for optional
|
|
14
15
|
// worker self-validation. They are expected, not stray — skip them when
|
|
15
16
|
// scanning for spurious files.
|
|
@@ -228,6 +229,59 @@ export function packetMembersByPacketId(entries) {
|
|
|
228
229
|
}
|
|
229
230
|
return byPacket;
|
|
230
231
|
}
|
|
232
|
+
/**
|
|
233
|
+
* OD3 merge-time ownership gate (D-66/67 slice-1, Part A). Splits a terminal
|
|
234
|
+
* (passing or failing) result set into `owned` (proceeds to ingest/claim-clear
|
|
235
|
+
* as today) and `unowned` (excluded — a LIVE peer claim under a DIFFERENT
|
|
236
|
+
* token was observed for a task whose token WE persisted at dispatch time).
|
|
237
|
+
*
|
|
238
|
+
* A task with NO persisted token (`ownerTokens[task_id] === undefined` —
|
|
239
|
+
* recovery paths, results recovered from disk, pre-slice manifests) fails
|
|
240
|
+
* OPEN: it is treated as owned, exactly the pre-gate behavior.
|
|
241
|
+
*
|
|
242
|
+
* Deliberately checks `listLiveClaims()` rather than `heartbeat(task_id,
|
|
243
|
+
* token)`: an ABSENT-OR-STALE claim is NOT treated as peer possession, only a
|
|
244
|
+
* LIVE claim held under a DIFFERENT token is. `heartbeat` collapses
|
|
245
|
+
* "unclaimed" and "claimed by someone else" into the same `false` — but
|
|
246
|
+
* "unclaimed" is exactly what a terminal task looks like the round AFTER we
|
|
247
|
+
* ourselves ingested it and cleared its claim (the merge-complete self-heal
|
|
248
|
+
* path re-lists an already-answered task_id as pending with its ORIGINAL
|
|
249
|
+
* round's now-orphaned sidecar token still on record). And a STALE
|
|
250
|
+
* different-token claim is an abandoned one — the next `claim()` would grant
|
|
251
|
+
* over it — so treating it as a live peer would drop OUR valid result for a
|
|
252
|
+
* crashed peer's ghost (e.g. A crashes past the lease, B reclaims then also
|
|
253
|
+
* crashes past the lease, A resurrects and merges: A's result is still the
|
|
254
|
+
* only live work). Only a claim actively held (non-stale, per the SAME
|
|
255
|
+
* 20-min task lease the dispatch side claims under) beneath a token that is
|
|
256
|
+
* NOT ours is unambiguous evidence of a peer's reclaim.
|
|
257
|
+
*
|
|
258
|
+
* `registry` is narrowed to `listLiveClaims` alone so callers can inject a
|
|
259
|
+
* fake in tests without standing up a real file-backed `ClaimRegistry`.
|
|
260
|
+
*/
|
|
261
|
+
export async function partitionByOwnership(items, ownerTokens, registry) {
|
|
262
|
+
const owned = [];
|
|
263
|
+
const unowned = [];
|
|
264
|
+
const anyTokenPersisted = items.some((item) => ownerTokens[item.task_id] !== undefined);
|
|
265
|
+
const claims = anyTokenPersisted ? await registry.listLiveClaims() : {};
|
|
266
|
+
for (const item of items) {
|
|
267
|
+
const token = ownerTokens[item.task_id];
|
|
268
|
+
if (token === undefined) {
|
|
269
|
+
owned.push(item);
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
const current = claims[item.task_id];
|
|
273
|
+
if (current === undefined || current.ownerToken === token) {
|
|
274
|
+
owned.push(item);
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
unowned.push({
|
|
278
|
+
task_id: item.task_id,
|
|
279
|
+
reason: "claim lease reclaimed by a peer since dispatch",
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
return { owned, unowned };
|
|
284
|
+
}
|
|
231
285
|
export async function validateAndCollectResults(allTasks, entryByTaskId, fallbackByTaskId, packetMembers, frictionContext) {
|
|
232
286
|
const passing = [];
|
|
233
287
|
const failing = [];
|
|
@@ -520,10 +574,32 @@ export async function mergeAndIngest(params) {
|
|
|
520
574
|
`task-results/ ignored: ${spuriousFiles.join(", ")}\n`);
|
|
521
575
|
}
|
|
522
576
|
// Phase 3: validate each task's result and classify into passing/failing/notDispatched.
|
|
523
|
-
const { passing, failing, notDispatched, recoveredCount } = await validateAndCollectResults(allTasks, entryByTaskId, fallbackByTaskId, packetMembersByPacketId(resultMap.entries), { runId, artifactsDir });
|
|
577
|
+
const { passing: allPassing, failing: allFailing, notDispatched, recoveredCount } = await validateAndCollectResults(allTasks, entryByTaskId, fallbackByTaskId, packetMembersByPacketId(resultMap.entries), { runId, artifactsDir });
|
|
524
578
|
if (recoveredCount > 0) {
|
|
525
579
|
process.stderr.write(`[merge-and-ingest] Recovered ${recoveredCount} result(s) by task_id from packet result files.\n`);
|
|
526
580
|
}
|
|
581
|
+
// Phase 3-gate: OD3 merge-time ownership gate (D-66/67 slice-1, Part A). A
|
|
582
|
+
// terminal task (passing or failing) whose claim is LIVE under a peer's
|
|
583
|
+
// token since OUR dispatch persisted ours must not be ingested or have its
|
|
584
|
+
// claim cleared below — it is the peer's now. Runs BEFORE
|
|
585
|
+
// grounding/duplicate-warn/ingest so excluded results never reach any of
|
|
586
|
+
// that downstream work. See `partitionByOwnership` for the fail-open (no
|
|
587
|
+
// persisted token, or claim absent-or-stale) rule. The registry MUST carry
|
|
588
|
+
// the same 20-min task lease the dispatch side claims under — the default
|
|
589
|
+
// 30s window would judge liveness against the wrong horizon.
|
|
590
|
+
const ownerTokens = await readOwnerTokens(runDir);
|
|
591
|
+
const claimRegistry = new ClaimRegistry(taskClaimsPath(artifactsDir), undefined, AUDIT_TASK_CLAIM_LEASE_MS);
|
|
592
|
+
const passingOwnership = await partitionByOwnership(allPassing, ownerTokens, claimRegistry);
|
|
593
|
+
const failingOwnership = await partitionByOwnership(allFailing, ownerTokens, claimRegistry);
|
|
594
|
+
const passing = passingOwnership.owned;
|
|
595
|
+
const failing = failingOwnership.owned;
|
|
596
|
+
const unowned = [...passingOwnership.unowned, ...failingOwnership.unowned].sort((a, b) => a.task_id.localeCompare(b.task_id));
|
|
597
|
+
const unownedTasksPath = join(runDir, "unowned-tasks.json");
|
|
598
|
+
if (unowned.length > 0) {
|
|
599
|
+
await writeJsonFile(unownedTasksPath, unowned);
|
|
600
|
+
process.stderr.write(`[merge-and-ingest] Warning: ${unowned.length} task(s) excluded from ingest — claim ` +
|
|
601
|
+
`reclaimed by a peer since dispatch: ${unowned.map((u) => u.task_id).join(", ")}\n`);
|
|
602
|
+
}
|
|
527
603
|
// Phase 3.5: quote-and-verify grounding (S7). Re-read each finding's cited
|
|
528
604
|
// verbatim span from disk and content-match it; annotate the finding and
|
|
529
605
|
// surface ungrounded findings (hallucinated or stale quotes) without dropping
|
|
@@ -578,22 +654,28 @@ export async function mergeAndIngest(params) {
|
|
|
578
654
|
// `notDispatched` (budget-capped) is deliberately left claimed/unclaimed as-is:
|
|
579
655
|
// it may be a live peer's in-flight work, never ours to clear here. Cleared
|
|
580
656
|
// unconditionally (no token) since an ingested/terminal result is authoritative.
|
|
657
|
+
// `passing`/`failing` are already the OWNERSHIP-GATED (owned + tokenless) sets
|
|
658
|
+
// — an `unowned` task's claim is deliberately excluded here: it is the peer's
|
|
659
|
+
// claim now, not ours to clear (Part A, D-66/67 slice-1).
|
|
581
660
|
const terminalTaskIds = [
|
|
582
661
|
...passing.map((r) => r.task_id),
|
|
583
662
|
...failing.map((f) => f.task_id),
|
|
584
663
|
];
|
|
585
664
|
if (terminalTaskIds.length > 0) {
|
|
586
|
-
await
|
|
665
|
+
await claimRegistry.clear(terminalTaskIds);
|
|
587
666
|
}
|
|
588
667
|
const activeDispatchPath = join(artifactsDir, ACTIVE_DISPATCH_FILENAME);
|
|
589
668
|
try {
|
|
590
669
|
const dispatch = await readJsonFile(activeDispatchPath);
|
|
591
670
|
if (dispatch.run_id === runId) {
|
|
592
671
|
// "merged" only when this round is fully drained: every dispatched task
|
|
593
|
-
// accepted AND nothing held back (budget-capped notDispatched > 0
|
|
594
|
-
// "active"
|
|
672
|
+
// accepted AND nothing held back (budget-capped notDispatched > 0, or
|
|
673
|
+
// peer-reclaimed unowned > 0, stay "active" — a follow-up round on the
|
|
674
|
+
// same run-id still has to merge the rest).
|
|
595
675
|
dispatch.status =
|
|
596
|
-
failing.length > 0 || notDispatched.length > 0
|
|
676
|
+
failing.length > 0 || notDispatched.length > 0 || unowned.length > 0
|
|
677
|
+
? "active"
|
|
678
|
+
: "merged";
|
|
597
679
|
await writeJsonFile(activeDispatchPath, dispatch);
|
|
598
680
|
}
|
|
599
681
|
}
|
|
@@ -618,17 +700,19 @@ export async function mergeAndIngest(params) {
|
|
|
618
700
|
`Retry packets: ${failedPacketIds.join(", ")}\n`);
|
|
619
701
|
}
|
|
620
702
|
// "partial" whenever work remains for this run — either genuine dispatched
|
|
621
|
-
// failures (failing)
|
|
622
|
-
//
|
|
623
|
-
//
|
|
624
|
-
|
|
703
|
+
// failures (failing), tasks held back this round (notDispatched), or tasks a
|
|
704
|
+
// peer reclaimed since our dispatch (unowned). The exit code below
|
|
705
|
+
// distinguishes the two: only genuine failures exit non-zero, so a
|
|
706
|
+
// budget-capped or ownership-gated round reports status "partial" but exits
|
|
707
|
+
// 0 (progressing, not an error).
|
|
708
|
+
const status = failing.length > 0 || notDispatched.length > 0 || unowned.length > 0
|
|
625
709
|
? "partial"
|
|
626
710
|
: (result?.progress_made ? "completed" : "no_progress");
|
|
627
711
|
// WorkerResultStatus does not have "partial"; use "blocked" when tasks failed
|
|
628
|
-
// but progress was also made (passing.length >
|
|
629
|
-
// failures (COR-48c05a13: was always
|
|
630
|
-
// and result.progress_made is true).
|
|
631
|
-
const workerResultStatus = failing.length === 0
|
|
712
|
+
// (or were reclaimed by a peer) but progress was also made (passing.length >
|
|
713
|
+
// 0), else "no_progress" for all failures (COR-48c05a13: was always
|
|
714
|
+
// "no_progress" even when passing.length > 0 and result.progress_made is true).
|
|
715
|
+
const workerResultStatus = failing.length === 0 && unowned.length === 0
|
|
632
716
|
? (result?.progress_made ? "completed" : "no_progress")
|
|
633
717
|
: passing.length > 0 || result?.progress_made
|
|
634
718
|
? "blocked"
|
|
@@ -651,10 +735,12 @@ export async function mergeAndIngest(params) {
|
|
|
651
735
|
accepted_count: passing.length,
|
|
652
736
|
rejected_count: failing.length,
|
|
653
737
|
not_dispatched_count: notDispatched.length,
|
|
738
|
+
unowned_count: unowned.length,
|
|
654
739
|
spurious_file_count: spuriousFiles.length,
|
|
655
740
|
finding_count: findingCount,
|
|
656
741
|
audit_results_path: auditResultsPath,
|
|
657
742
|
...(retryDispatchPath ? { retry_dispatch_path: retryDispatchPath } : {}),
|
|
743
|
+
...(unowned.length > 0 ? { unowned_tasks_path: unownedTasksPath } : {}),
|
|
658
744
|
...(result ? {
|
|
659
745
|
selected_executor: workerResult.selected_executor,
|
|
660
746
|
progress_made: workerResult.progress_made,
|
|
@@ -665,16 +751,17 @@ export async function mergeAndIngest(params) {
|
|
|
665
751
|
// Record a completion marker for a fully-merged run so a stray re-invocation
|
|
666
752
|
// replays this summary (above) instead of re-processing — and possibly
|
|
667
753
|
// clobbering — terminal state. Only when this round is fully drained: genuine
|
|
668
|
-
// failures stay replayable for retry,
|
|
669
|
-
// must NOT be marked complete or a
|
|
670
|
-
//
|
|
754
|
+
// failures stay replayable for retry, budget-capped rounds (notDispatched > 0)
|
|
755
|
+
// and ownership-gated rounds (unowned > 0) must NOT be marked complete or a
|
|
756
|
+
// follow-up merge on the same run-id would short-circuit to an idempotent
|
|
757
|
+
// replay and silently drop deferred (or peer-reclaimed) results.
|
|
671
758
|
//
|
|
672
759
|
// Selective deepening appends new pending tasks to the SAME run-id; this marker
|
|
673
760
|
// can therefore go stale once those tasks are later dispatched and answered. The
|
|
674
761
|
// replay guard at the top detects that (a pending task with an on-disk result)
|
|
675
762
|
// and re-processes, so a premature marker self-heals instead of stranding the
|
|
676
763
|
// deepening answers behind an idempotent replay (the no-progress loop).
|
|
677
|
-
if (failing.length === 0 && notDispatched.length === 0) {
|
|
764
|
+
if (failing.length === 0 && notDispatched.length === 0 && unowned.length === 0) {
|
|
678
765
|
await writeJsonFile(mergeCompletePath, summaryPayload);
|
|
679
766
|
}
|
|
680
767
|
return { summary: summaryPayload, has_failures: failing.length > 0 };
|