@claudexor/orchestrator 4.1.1 → 4.2.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/dist/account-pool.d.ts +11 -0
- package/dist/account-pool.d.ts.map +1 -1
- package/dist/account-pool.js +9 -0
- package/dist/account-pool.js.map +1 -1
- package/dist/account-resolution.d.ts +3 -0
- package/dist/account-resolution.d.ts.map +1 -1
- package/dist/account-resolution.js +1 -0
- package/dist/account-resolution.js.map +1 -1
- package/dist/attemptTelemetry.d.ts +4 -6
- package/dist/attemptTelemetry.d.ts.map +1 -1
- package/dist/attemptTelemetry.js +1 -1
- package/dist/attemptTelemetry.js.map +1 -1
- package/dist/budgetFailure.d.ts +4 -1
- package/dist/budgetFailure.d.ts.map +1 -1
- package/dist/budgetFailure.js +4 -2
- package/dist/budgetFailure.js.map +1 -1
- package/dist/candidateEvidence.d.ts.map +1 -1
- package/dist/candidateEvidence.js +7 -2
- package/dist/candidateEvidence.js.map +1 -1
- package/dist/candidateOutputs.d.ts.map +1 -1
- package/dist/candidateOutputs.js +6 -0
- package/dist/candidateOutputs.js.map +1 -1
- package/dist/candidateTerminals.d.ts +12 -1
- package/dist/candidateTerminals.d.ts.map +1 -1
- package/dist/candidateTerminals.js +51 -21
- package/dist/candidateTerminals.js.map +1 -1
- package/dist/captureRefusal.d.ts +28 -0
- package/dist/captureRefusal.d.ts.map +1 -0
- package/dist/captureRefusal.js +54 -0
- package/dist/captureRefusal.js.map +1 -0
- package/dist/continuity-terminal.d.ts +3 -1
- package/dist/continuity-terminal.d.ts.map +1 -1
- package/dist/continuity-terminal.js.map +1 -1
- package/dist/credential-profile-rotation.js +2 -3
- package/dist/credential-profile-rotation.js.map +1 -1
- package/dist/delegationFailure.d.ts +104 -7
- package/dist/delegationFailure.d.ts.map +1 -1
- package/dist/delegationFailure.js +47 -31
- package/dist/delegationFailure.js.map +1 -1
- package/dist/inrun-continuity-types.d.ts +13 -1
- package/dist/inrun-continuity-types.d.ts.map +1 -1
- package/dist/inrun-continuity.d.ts +9 -2
- package/dist/inrun-continuity.d.ts.map +1 -1
- package/dist/inrun-continuity.js +43 -23
- package/dist/inrun-continuity.js.map +1 -1
- package/dist/inrun-continuity.test-support.d.ts +6 -2
- package/dist/inrun-continuity.test-support.d.ts.map +1 -1
- package/dist/inrun-continuity.test-support.js +4 -1
- package/dist/inrun-continuity.test-support.js.map +1 -1
- package/dist/orchestrator-credentials.d.ts +5 -4
- package/dist/orchestrator-credentials.d.ts.map +1 -1
- package/dist/orchestrator-credentials.js +7 -4
- package/dist/orchestrator-credentials.js.map +1 -1
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +277 -335
- package/dist/orchestrator.js.map +1 -1
- package/dist/persistedPatch.js +2 -2
- package/dist/persistedPatch.js.map +1 -1
- package/dist/pool-attempt-evidence.d.ts +62 -0
- package/dist/pool-attempt-evidence.d.ts.map +1 -0
- package/dist/pool-attempt-evidence.js +153 -0
- package/dist/pool-attempt-evidence.js.map +1 -0
- package/dist/pre-progress-refusal.d.ts +43 -6
- package/dist/pre-progress-refusal.d.ts.map +1 -1
- package/dist/pre-progress-refusal.js +53 -8
- package/dist/pre-progress-refusal.js.map +1 -1
- package/dist/readonlyTerminals.d.ts +55 -0
- package/dist/readonlyTerminals.d.ts.map +1 -0
- package/dist/readonlyTerminals.js +205 -0
- package/dist/readonlyTerminals.js.map +1 -0
- package/dist/rotation-predicate.d.ts +7 -23
- package/dist/rotation-predicate.d.ts.map +1 -1
- package/dist/rotation-predicate.js +45 -0
- package/dist/rotation-predicate.js.map +1 -1
- package/dist/runEventLog.d.ts +1 -0
- package/dist/runEventLog.d.ts.map +1 -1
- package/dist/runEventLog.js +3 -2
- package/dist/runEventLog.js.map +1 -1
- package/dist/runTerminalContext.d.ts +4 -0
- package/dist/runTerminalContext.d.ts.map +1 -1
- package/dist/runTerminalContext.js.map +1 -1
- package/dist/runTerminalHelpers.d.ts +25 -1
- package/dist/runTerminalHelpers.d.ts.map +1 -1
- package/dist/runTerminalHelpers.js +69 -6
- package/dist/runTerminalHelpers.js.map +1 -1
- package/dist/runTerminalResults.d.ts +25 -3
- package/dist/runTerminalResults.d.ts.map +1 -1
- package/dist/runTerminalResults.js +61 -29
- package/dist/runTerminalResults.js.map +1 -1
- package/dist/runTerminals.d.ts +0 -1
- package/dist/runTerminals.d.ts.map +1 -1
- package/dist/runTerminals.js +47 -11
- package/dist/runTerminals.js.map +1 -1
- package/dist/secretDiff.d.ts +14 -11
- package/dist/secretDiff.d.ts.map +1 -1
- package/dist/secretDiff.js +21 -28
- package/dist/secretDiff.js.map +1 -1
- package/dist/terminalOutcome.d.ts +24 -4
- package/dist/terminalOutcome.d.ts.map +1 -1
- package/dist/terminalOutcome.js +32 -5
- package/dist/terminalOutcome.js.map +1 -1
- package/package.json +17 -17
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ArtifactStore } from "@claudexor/artifact-store";
|
|
2
2
|
import type { EventLog } from "@claudexor/event-log";
|
|
3
|
-
import { RunFailure, RunFailureCode, type ModeKind, type RunOutcomeFacts, type RunResumable, type VendorFailureEvidence, HarnessRequestRefusal } from "@claudexor/schema";
|
|
3
|
+
import { RunFailure, RunFailureCode, type ModeKind, type RunOutcomeFacts, type RunResumable, type VendorFailureEvidence, type PoolAttemptFailure, HarnessRequestRefusal } from "@claudexor/schema";
|
|
4
4
|
import type { OrchestratorResult } from "./orchestrator.js";
|
|
5
5
|
import { type ContinuityTerminalFacts } from "./continuity-terminal.js";
|
|
6
6
|
export declare function writeFailure(store: ArtifactStore, paths: ReturnType<ArtifactStore["runPaths"]>, failure: {
|
|
@@ -24,6 +24,9 @@ export declare function writeFailure(store: ArtifactStore, paths: ReturnType<Art
|
|
|
24
24
|
* null/omitted when no vendor-typed evidence exists. Opaque evidence. */
|
|
25
25
|
vendorFailure?: VendorFailureEvidence | null;
|
|
26
26
|
requestRefusal?: HarnessRequestRefusal;
|
|
27
|
+
captureFailure?: RunFailure["captureFailure"];
|
|
28
|
+
/** Every failed try with its own account, in order (empty = none). */
|
|
29
|
+
poolAttempts?: readonly PoolAttemptFailure[];
|
|
27
30
|
nextActions?: string[];
|
|
28
31
|
}): void;
|
|
29
32
|
/** The typed provenance an error declared about its own terminal. */
|
|
@@ -50,6 +53,17 @@ export declare function requestRefusalFailure(requestRefusal: HarnessRequestRefu
|
|
|
50
53
|
* reduces it to a message string.
|
|
51
54
|
*/
|
|
52
55
|
export declare function declaredFailure(err: unknown): DeclaredFailure;
|
|
56
|
+
/**
|
|
57
|
+
* The one statement of a cancellation, shared by every cancelled terminal: the
|
|
58
|
+
* cancel first (a STRING abort reason, e.g. the maxSeconds deadline, is named),
|
|
59
|
+
* then the run's earlier failed tries; `markdown` is its summary.md.
|
|
60
|
+
*/
|
|
61
|
+
export declare function cancellationStatement(runId: string, mode: ModeKind, cancelSignal: AbortSignal | undefined, attempts: readonly ContinuityTerminalFacts[]): {
|
|
62
|
+
cancelReason?: string;
|
|
63
|
+
summary: string;
|
|
64
|
+
markdown: string;
|
|
65
|
+
poolAttempts: PoolAttemptFailure[];
|
|
66
|
+
};
|
|
53
67
|
/**
|
|
54
68
|
* Terminal result for a cancelled run: emits run.failed with status
|
|
55
69
|
* "cancelled" so every mode ends consistently. `writeTelemetry` carries the
|
|
@@ -72,19 +86,27 @@ store?: ArtifactStore,
|
|
|
72
86
|
* when cancellation wins during the Delegate terminal barrier. */
|
|
73
87
|
priorFacts?: RunOutcomeFacts,
|
|
74
88
|
/** The attempt's continuation facts (cause wall_clock/cancelled, carriers), when any. */
|
|
75
|
-
resumable?: RunResumable | null
|
|
89
|
+
resumable?: RunResumable | null,
|
|
90
|
+
/** The run's attempts: their earlier failed tries stay diagnostic history
|
|
91
|
+
* beside the cancellation (a cancelled try has no row; no failure record). */
|
|
92
|
+
attempts?: readonly ContinuityTerminalFacts[]): OrchestratorResult;
|
|
76
93
|
/**
|
|
77
94
|
* Shared post-announce failure terminal. Unexpected throws use its internal
|
|
78
95
|
* defaults; known callers may supply narrow typed provenance. Every run ends
|
|
79
96
|
* with failure.yaml + summary + a terminal run.failed event.
|
|
80
97
|
*/
|
|
81
98
|
export declare function failTerminally(log: EventLog, store: ArtifactStore, paths: ReturnType<ArtifactStore["runPaths"]>, runId: string, taskId: string, mode: ModeKind, phase: string, err: unknown, spendUsd?: number | null, failureMeta?: {
|
|
82
|
-
category?: "harness_error" | "internal";
|
|
99
|
+
category?: "harness_error" | "internal" | "project";
|
|
100
|
+
captureFailure?: RunFailure["captureFailure"];
|
|
83
101
|
harnessId?: string;
|
|
84
102
|
attemptId?: string;
|
|
85
103
|
rawDetailRef?: string;
|
|
86
104
|
nextActions?: string[];
|
|
105
|
+
/** Actions that follow this terminal's own remedy (an earlier record's capture actions). */
|
|
106
|
+
followUps?: readonly string[];
|
|
87
107
|
priorFacts?: RunOutcomeFacts;
|
|
88
108
|
continuity?: readonly ContinuityTerminalFacts[];
|
|
109
|
+
/** Every attempt whose failed tries this terminal names (default: `continuity`). */
|
|
110
|
+
attempts?: readonly ContinuityTerminalFacts[];
|
|
89
111
|
}): OrchestratorResult;
|
|
90
112
|
//# sourceMappingURL=runTerminalResults.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminalResults.d.ts","sourceRoot":"","sources":["../src/runTerminalResults.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EACL,UAAU,EACV,cAAc,EACd,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"runTerminalResults.d.ts","sourceRoot":"","sources":["../src/runTerminalResults.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { join } from "node:path";
|
|
|
4
4
|
import { cancelReasonFromSignalToken } from "./runTerminals.js";
|
|
5
5
|
import { RunFailure, RunFailureCode, HarnessRequestRefusal, } from "@claudexor/schema";
|
|
6
6
|
import { redactSecrets } from "@claudexor/util";
|
|
7
|
+
import { poolFailure, redactVendorFailure } from "./pool-attempt-evidence.js";
|
|
7
8
|
import { resumableTerminal } from "./continuity-terminal.js";
|
|
8
9
|
import { terminalOutcomeFacts } from "./terminalOutcome.js";
|
|
9
10
|
export function writeFailure(store, paths, failure) {
|
|
@@ -28,24 +29,32 @@ export function writeFailure(store, paths, failure) {
|
|
|
28
29
|
runDir: failure.runDir ?? paths.root,
|
|
29
30
|
resetsAt: failure.resetsAt ?? null,
|
|
30
31
|
...(failure.requestRefusal ? { requestRefusal: failure.requestRefusal } : {}),
|
|
32
|
+
...(failure.captureFailure ? { captureFailure: failure.captureFailure } : {}),
|
|
31
33
|
// Vendor text was redacted at event ingress; redact again like safeMessage (INV-062).
|
|
32
|
-
vendorFailure: vendor &&
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
34
|
+
vendorFailure: vendor && redactVendorFailure(vendor),
|
|
35
|
+
poolAttempts: (failure.poolAttempts ?? []).map((row) => ({
|
|
36
|
+
...row,
|
|
37
|
+
profileDisplayName: row.profileDisplayName && redactSecrets(row.profileDisplayName),
|
|
38
|
+
error: redactSecrets(row.error),
|
|
39
|
+
vendorFailure: row.vendorFailure && redactVendorFailure(row.vendorFailure),
|
|
40
|
+
})),
|
|
41
|
+
nextActions: [
|
|
42
|
+
...new Set([
|
|
43
|
+
...(failure.code === "input_too_large"
|
|
44
|
+
? [
|
|
45
|
+
"Fit the input to the reported transport limit or supply source references",
|
|
46
|
+
"Choose another compatible harness if the complete input must remain inline",
|
|
47
|
+
]
|
|
48
|
+
: failure.code === "vendor_cli_too_old"
|
|
49
|
+
? [
|
|
50
|
+
`Update the Claude Code CLI${installation ? ` at ${installation}` : ""}`,
|
|
51
|
+
"Use the update method for that installation, then retry the requested model",
|
|
52
|
+
"Open diagnostics",
|
|
53
|
+
]
|
|
54
|
+
: (failure.nextActions ?? [])),
|
|
55
|
+
...(failure.captureFailure ? (failure.nextActions ?? []) : []),
|
|
56
|
+
]),
|
|
57
|
+
],
|
|
49
58
|
});
|
|
50
59
|
}
|
|
51
60
|
export function requestRefusalFailure(requestRefusal) {
|
|
@@ -86,6 +95,25 @@ export function declaredFailure(err) {
|
|
|
86
95
|
...(refusal.success ? { requestRefusal: refusal.data } : {}),
|
|
87
96
|
};
|
|
88
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* The one statement of a cancellation, shared by every cancelled terminal: the
|
|
100
|
+
* cancel first (a STRING abort reason, e.g. the maxSeconds deadline, is named),
|
|
101
|
+
* then the run's earlier failed tries; `markdown` is its summary.md.
|
|
102
|
+
*/
|
|
103
|
+
export function cancellationStatement(runId, mode, cancelSignal, attempts) {
|
|
104
|
+
const cancelReason = typeof cancelSignal?.reason === "string" && cancelSignal.reason
|
|
105
|
+
? cancelSignal.reason
|
|
106
|
+
: undefined;
|
|
107
|
+
const { message, poolAttempts } = poolFailure(cancelReason === "wall_clock_exceeded"
|
|
108
|
+
? "run cancelled: wall-clock deadline (maxSeconds) exceeded"
|
|
109
|
+
: "run cancelled", attempts);
|
|
110
|
+
return {
|
|
111
|
+
...(cancelReason ? { cancelReason } : {}),
|
|
112
|
+
summary: message,
|
|
113
|
+
markdown: `# Run ${runId} (${mode})\n\n- Lifecycle: cancelled\n${cancelReason ? `- Reason: ${cancelReason}\n` : ""}\n${message}\n`,
|
|
114
|
+
poolAttempts,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
89
117
|
/**
|
|
90
118
|
* Terminal result for a cancelled run: emits run.failed with status
|
|
91
119
|
* "cancelled" so every mode ends consistently. `writeTelemetry` carries the
|
|
@@ -104,7 +132,10 @@ store,
|
|
|
104
132
|
* when cancellation wins during the Delegate terminal barrier. */
|
|
105
133
|
priorFacts,
|
|
106
134
|
/** The attempt's continuation facts (cause wall_clock/cancelled, carriers), when any. */
|
|
107
|
-
resumable
|
|
135
|
+
resumable,
|
|
136
|
+
/** The run's attempts: their earlier failed tries stay diagnostic history
|
|
137
|
+
* beside the cancellation (a cancelled try has no row; no failure record). */
|
|
138
|
+
attempts) {
|
|
108
139
|
if (writeTelemetry) {
|
|
109
140
|
try {
|
|
110
141
|
writeTelemetry();
|
|
@@ -113,19 +144,14 @@ resumable) {
|
|
|
113
144
|
/* partial telemetry is best-effort on the cancel path */
|
|
114
145
|
}
|
|
115
146
|
}
|
|
116
|
-
const cancelReason =
|
|
117
|
-
? cancelSignal.reason
|
|
118
|
-
: undefined;
|
|
119
|
-
const summaryText = cancelReason === "wall_clock_exceeded"
|
|
120
|
-
? "run cancelled: wall-clock deadline (maxSeconds) exceeded"
|
|
121
|
-
: "run cancelled";
|
|
147
|
+
const { cancelReason, summary: summaryText, markdown, poolAttempts, } = cancellationStatement(runId, mode, cancelSignal, attempts ?? []);
|
|
122
148
|
// Materialize the diagnostic summary BEFORE announcing it — output.ready must
|
|
123
149
|
// point at a file that exists (partial-output honesty), and it must precede
|
|
124
150
|
// the terminal in every mode (INV-116).
|
|
125
151
|
let summaryWritten = false;
|
|
126
152
|
if (store) {
|
|
127
153
|
try {
|
|
128
|
-
store.writeText(join(runDir, "final", "summary.md"),
|
|
154
|
+
store.writeText(join(runDir, "final", "summary.md"), markdown);
|
|
129
155
|
summaryWritten = true;
|
|
130
156
|
}
|
|
131
157
|
catch {
|
|
@@ -146,6 +172,7 @@ resumable) {
|
|
|
146
172
|
facts: cancelFacts,
|
|
147
173
|
reason: cancelFacts.reason,
|
|
148
174
|
...(cancelReason ? { cancel_reason: cancelReason } : {}),
|
|
175
|
+
...(attempts ? { pool_attempts: poolAttempts } : {}),
|
|
149
176
|
...(resumable ? { resumable } : {}),
|
|
150
177
|
});
|
|
151
178
|
return {
|
|
@@ -173,9 +200,9 @@ export function failTerminally(log, store, paths, runId, taskId, mode, phase, er
|
|
|
173
200
|
: null;
|
|
174
201
|
if (budget)
|
|
175
202
|
phase = budget.phase;
|
|
176
|
-
const message = budget?.safeMessage ?? redactSecrets(err instanceof Error ? err.message : String(err));
|
|
203
|
+
const { message, poolAttempts } = poolFailure(budget?.safeMessage ?? redactSecrets(err instanceof Error ? err.message : String(err)), failureMeta.attempts ?? failureMeta.continuity ?? []);
|
|
177
204
|
const declared = declaredFailure(err);
|
|
178
|
-
const failFacts = terminalOutcomeFacts(failureMeta.priorFacts, "failed", budget?.reason ?? "harness_failed");
|
|
205
|
+
const failFacts = terminalOutcomeFacts(failureMeta.priorFacts, "failed", budget?.reason ?? (phase === "workspace" ? "workspace_unavailable" : "harness_failed"));
|
|
179
206
|
store.writeText(join(paths.finalDir, "summary.md"), `# Run ${runId} (${mode})\n\n- Lifecycle: failed\n- Phase: ${phase}\n\n${message}\n`);
|
|
180
207
|
writeFailure(store, paths, {
|
|
181
208
|
phase,
|
|
@@ -185,11 +212,15 @@ export function failTerminally(log, store, paths, runId, taskId, mode, phase, er
|
|
|
185
212
|
attemptId: budget?.attemptId ?? failureMeta.attemptId,
|
|
186
213
|
safeMessage: message,
|
|
187
214
|
rawDetailRef: failureMeta.rawDetailRef,
|
|
215
|
+
captureFailure: failureMeta.captureFailure,
|
|
188
216
|
runDir: paths.root,
|
|
189
217
|
resetsAt: declared.resetsAt,
|
|
190
218
|
requestRefusal: declared.requestRefusal,
|
|
191
|
-
|
|
192
|
-
|
|
219
|
+
poolAttempts,
|
|
220
|
+
nextActions: [
|
|
221
|
+
...(budget?.nextActions ?? failureMeta.nextActions ?? ["Open diagnostics", "Retry the run"]),
|
|
222
|
+
...(failureMeta.followUps ?? []),
|
|
223
|
+
],
|
|
193
224
|
});
|
|
194
225
|
log.emit("output.ready", { kind: "summary", path: "final/summary.md", state: "diagnostic" });
|
|
195
226
|
log.emit("run.failed", {
|
|
@@ -198,6 +229,7 @@ export function failTerminally(log, store, paths, runId, taskId, mode, phase, er
|
|
|
198
229
|
reason: failFacts.reason,
|
|
199
230
|
phase,
|
|
200
231
|
error: message,
|
|
232
|
+
pool_attempts: poolAttempts,
|
|
201
233
|
failure_ref: "final/failure.yaml",
|
|
202
234
|
...resumableTerminal(store, paths, failureMeta.continuity ?? [], true),
|
|
203
235
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminalResults.js","sourceRoot":"","sources":["../src/runTerminalResults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAGhE,OAAO,EACL,UAAU,EACV,cAAc,
|
|
1
|
+
{"version":3,"file":"runTerminalResults.js","sourceRoot":"","sources":["../src/runTerminalResults.ts"],"names":[],"mappings":"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"}
|
package/dist/runTerminals.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import type { AnnouncedRunContext } from "./runTerminalContext.js";
|
|
|
3
3
|
import { cancelledResult, declaredFailure, failTerminally, writeFailure } from "./runTerminalResults.js";
|
|
4
4
|
export type { AnnouncedRunContext } from "./runTerminalContext.js";
|
|
5
5
|
export { cancelledResult, declaredFailure, failTerminally, writeFailure };
|
|
6
|
-
export { attemptVendorFailure } from "./harnessFailure.js";
|
|
7
6
|
export { cancelReasonFromSignalToken } from "./runTerminalHelpers.js";
|
|
8
7
|
/**
|
|
9
8
|
* Whole-strategy terminal net: run `body`; if it throws AFTER announcing,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminals.d.ts","sourceRoot":"","sources":["../src/runTerminals.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runTerminals.d.ts","sourceRoot":"","sources":["../src/runTerminals.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAEL,eAAe,EACf,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,yBAAyB,CAAC;AAQjC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,mBAAmB,KAAK,IAAI,KAAK,OAAO,CAAC,kBAAkB,CAAC;AACjF;6EAC6E;AAC7E,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AACvE;;;;;GAKG;AACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClD,OAAO,CAAC,kBAAkB,CAAC,CA0d7B"}
|
package/dist/runTerminals.js
CHANGED
|
@@ -11,15 +11,14 @@ import { join } from "node:path";
|
|
|
11
11
|
import { makeOutcomeFacts, RunOutcomeFacts, } from "@claudexor/schema";
|
|
12
12
|
import { readTextSafe, redactSecrets } from "@claudexor/util";
|
|
13
13
|
import { reconcileDecisionBudget, settledBudgetSnapshot } from "./decisionBudget.js";
|
|
14
|
-
import { cancelReasonFromSignalToken, cancellationFacts, committedOutcome, committedResult, isTerminalRecoveryRequired, ownsDelegateDrain, postDrainBudgetFailure, settledSpend, terminalEventTypeFor, terminalOutcomeFromPayload, } from "./runTerminalHelpers.js";
|
|
14
|
+
import { cancelReasonFromSignalToken, cancellationFacts, commitCancellation, committedOutcome, committedResult, isTerminalRecoveryRequired, ownsDelegateDrain, postDrainBudgetFailure, settledSpend, terminalEventTypeFor, terminalFactsFailure, terminalOutcomeFromPayload, } from "./runTerminalHelpers.js";
|
|
15
15
|
import { reconcileDecisionTerminal } from "./decisionTerminalReconciliation.js";
|
|
16
16
|
import { prepareRunFactsFailureReceipt, prepareRunFactsReceipt } from "./runFacts.js";
|
|
17
17
|
import { flushContinuationTerminal } from "./continuation-custody.js";
|
|
18
18
|
import { publishRetainedOutput } from "./retainedOutput.js";
|
|
19
|
-
import { cancelledResult, declaredFailure, failTerminally, writeFailure, } from "./runTerminalResults.js";
|
|
20
|
-
import { clearFailureArtifact, reconcileWorkProductTerminal, terminalOutcomeFacts, } from "./terminalOutcome.js";
|
|
19
|
+
import { cancellationStatement, cancelledResult, declaredFailure, failTerminally, writeFailure, } from "./runTerminalResults.js";
|
|
20
|
+
import { clearFailureArtifact, preparedCaptureFacts, reconcileWorkProductTerminal, terminalOutcomeFacts, } from "./terminalOutcome.js";
|
|
21
21
|
export { cancelledResult, declaredFailure, failTerminally, writeFailure };
|
|
22
|
-
export { attemptVendorFailure } from "./harnessFailure.js";
|
|
23
22
|
export { cancelReasonFromSignalToken } from "./runTerminalHelpers.js";
|
|
24
23
|
/**
|
|
25
24
|
* Whole-strategy terminal net: run `body`; if it throws AFTER announcing,
|
|
@@ -42,6 +41,7 @@ onSettled) {
|
|
|
42
41
|
let announced = null;
|
|
43
42
|
let preparedResult = null;
|
|
44
43
|
let canonicalOutcome = null;
|
|
44
|
+
let committedCancel = null;
|
|
45
45
|
let terminalPreparationError = null;
|
|
46
46
|
let barrierAttempted = false;
|
|
47
47
|
let barrierFailed = false;
|
|
@@ -102,10 +102,18 @@ onSettled) {
|
|
|
102
102
|
: payloadOutcome;
|
|
103
103
|
const prepared = prepareRunFactsReceipt(a, terminalOutcome);
|
|
104
104
|
canonicalOutcome = prepared.facts.outcome;
|
|
105
|
+
// A cancellation chosen here replaces the strategy's own verdict,
|
|
106
|
+
// so the terminal states that cancellation instead.
|
|
107
|
+
committedCancel =
|
|
108
|
+
signal &&
|
|
109
|
+
payloadOutcome.lifecycle !== "cancelled" &&
|
|
110
|
+
prepared.facts.outcome.lifecycle === "cancelled"
|
|
111
|
+
? commitCancellation(a, signal, payload)
|
|
112
|
+
: null;
|
|
105
113
|
return {
|
|
106
114
|
type: terminalEventTypeFor(originalType, prepared.facts.outcome),
|
|
107
115
|
payload: {
|
|
108
|
-
...payload,
|
|
116
|
+
...(committedCancel?.payload ?? payload),
|
|
109
117
|
lifecycle: prepared.facts.outcome.lifecycle,
|
|
110
118
|
facts: prepared.facts.outcome,
|
|
111
119
|
reason: prepared.facts.outcome.reason,
|
|
@@ -116,14 +124,17 @@ onSettled) {
|
|
|
116
124
|
rollback: () => {
|
|
117
125
|
prepared.rollback();
|
|
118
126
|
canonicalOutcome = null;
|
|
127
|
+
committedCancel = null;
|
|
119
128
|
},
|
|
120
129
|
};
|
|
121
130
|
}
|
|
122
131
|
catch (error) {
|
|
132
|
+
committedCancel = null;
|
|
123
133
|
// A contradictory terminal projection must fail the run, not throw
|
|
124
134
|
// out of the hook and retry the same contradiction forever.
|
|
125
135
|
const detail = redactSecrets(error instanceof Error ? error.message : String(error));
|
|
126
|
-
|
|
136
|
+
const history = terminalFactsFailure(a, detail);
|
|
137
|
+
terminalPreparationError = history.message;
|
|
127
138
|
const failureOutcome = makeOutcomeFacts("failed", {
|
|
128
139
|
reason: "harness_failed",
|
|
129
140
|
});
|
|
@@ -134,6 +145,7 @@ onSettled) {
|
|
|
134
145
|
phase: "terminal_facts",
|
|
135
146
|
category: "internal",
|
|
136
147
|
safeMessage: terminalPreparationError,
|
|
148
|
+
poolAttempts: history.poolAttempts,
|
|
137
149
|
runDir: a.paths.root,
|
|
138
150
|
nextActions: [
|
|
139
151
|
"Open diagnostics",
|
|
@@ -158,6 +170,7 @@ onSettled) {
|
|
|
158
170
|
run_facts: prepared.facts,
|
|
159
171
|
phase: "terminal_facts",
|
|
160
172
|
error: terminalPreparationError,
|
|
173
|
+
pool_attempts: history.poolAttempts,
|
|
161
174
|
...(failureRefWritten ? { failure_ref: "final/failure.yaml" } : {}),
|
|
162
175
|
},
|
|
163
176
|
commit: prepared.commit,
|
|
@@ -180,6 +193,7 @@ onSettled) {
|
|
|
180
193
|
reason: failureOutcome.reason,
|
|
181
194
|
phase: "terminal_facts",
|
|
182
195
|
error: terminalPreparationError,
|
|
196
|
+
pool_attempts: history.poolAttempts,
|
|
183
197
|
...(failureRefWritten ? { failure_ref: "final/failure.yaml" } : {}),
|
|
184
198
|
},
|
|
185
199
|
};
|
|
@@ -206,6 +220,11 @@ onSettled) {
|
|
|
206
220
|
const cancelSummary = signal.reason === "wall_clock_exceeded"
|
|
207
221
|
? "run cancelled: wall-clock deadline (maxSeconds) exceeded"
|
|
208
222
|
: "run cancelled";
|
|
223
|
+
const attempts = context.attempts?.();
|
|
224
|
+
// A kept capture-bearing record is re-labelled with the same
|
|
225
|
+
// statement the cancelled terminal below makes (cancel, then the
|
|
226
|
+
// run's earlier failed tries).
|
|
227
|
+
const statement = cancellationStatement(context.runId, context.mode, signal, attempts ?? []);
|
|
209
228
|
let reconciledCancelFacts = cancelFacts;
|
|
210
229
|
try {
|
|
211
230
|
reconcileDecisionBudget(context, budget);
|
|
@@ -215,12 +234,12 @@ onSettled) {
|
|
|
215
234
|
preparedFacts: result.facts,
|
|
216
235
|
});
|
|
217
236
|
reconcileWorkProductTerminal(context, reconciledCancelFacts);
|
|
218
|
-
clearFailureArtifact(context);
|
|
237
|
+
clearFailureArtifact(context, { summary: statement.summary });
|
|
219
238
|
}
|
|
220
239
|
catch {
|
|
221
240
|
/* the cancellation terminal below remains authoritative */
|
|
222
241
|
}
|
|
223
|
-
const cancelled = cancelledResult(context.log, context.runId, context.taskId, context.mode, context.paths.root, result.candidates, undefined, budget.spendUsd, signal, context.store, reconciledCancelFacts);
|
|
242
|
+
const cancelled = cancelledResult(context.log, context.runId, context.taskId, context.mode, context.paths.root, result.candidates, undefined, budget.spendUsd, signal, context.store, reconciledCancelFacts, undefined, attempts);
|
|
224
243
|
await flushContinuationTerminal(context, cancelled.facts);
|
|
225
244
|
result = {
|
|
226
245
|
...result,
|
|
@@ -318,6 +337,10 @@ onSettled) {
|
|
|
318
337
|
const cancelSummary = signal.reason === "wall_clock_exceeded"
|
|
319
338
|
? "run cancelled: wall-clock deadline (maxSeconds) exceeded"
|
|
320
339
|
: "run cancelled";
|
|
340
|
+
const attempts = a.attempts?.();
|
|
341
|
+
// As above: a kept capture-bearing record carries the cancelled
|
|
342
|
+
// terminal's own statement.
|
|
343
|
+
const statement = cancellationStatement(a.runId, a.mode, signal, attempts ?? []);
|
|
321
344
|
let reconciledCancelFacts = cancelFacts;
|
|
322
345
|
try {
|
|
323
346
|
if (delegateBarrierArmed)
|
|
@@ -328,7 +351,7 @@ onSettled) {
|
|
|
328
351
|
...(preparedResult ? { preparedFacts: preparedResult.facts } : {}),
|
|
329
352
|
});
|
|
330
353
|
reconcileWorkProductTerminal(a, reconciledCancelFacts);
|
|
331
|
-
clearFailureArtifact(a);
|
|
354
|
+
clearFailureArtifact(a, { summary: statement.summary });
|
|
332
355
|
}
|
|
333
356
|
catch {
|
|
334
357
|
/* the cancellation terminal below remains authoritative */
|
|
@@ -336,7 +359,7 @@ onSettled) {
|
|
|
336
359
|
const cancelled = cancelledResult(a.log, a.runId, a.taskId, a.mode, a.paths.root, preparedResult?.candidates ?? [], undefined, spendUsd,
|
|
337
360
|
// A wall-clock abort surfaced as a throw must keep its reason and
|
|
338
361
|
// materialize the diagnostic summary, exactly like the checkpoint paths.
|
|
339
|
-
signal, a.store, reconciledCancelFacts);
|
|
362
|
+
signal, a.store, reconciledCancelFacts, undefined, attempts);
|
|
340
363
|
await flushContinuationTerminal(a, cancelled.facts);
|
|
341
364
|
result = preparedResult
|
|
342
365
|
? {
|
|
@@ -367,7 +390,13 @@ onSettled) {
|
|
|
367
390
|
catch {
|
|
368
391
|
/* the failure terminal below remains authoritative */
|
|
369
392
|
}
|
|
370
|
-
const failed = failTerminally(a.log, a.store, a.paths, a.runId, a.taskId, a.mode, barrierFailed ? "delegation_drain" : a.phase, terminalError, spendUsd,
|
|
393
|
+
const failed = failTerminally(a.log, a.store, a.paths, a.runId, a.taskId, a.mode, barrierFailed ? "delegation_drain" : a.phase, terminalError, spendUsd,
|
|
394
|
+
// Read before this terminal replaces the prepared record.
|
|
395
|
+
{
|
|
396
|
+
priorFacts: reconciledFailureFacts,
|
|
397
|
+
...preparedCaptureFacts(a),
|
|
398
|
+
attempts: a.attempts?.(),
|
|
399
|
+
});
|
|
371
400
|
await flushContinuationTerminal(a, failed.facts);
|
|
372
401
|
result = preparedResult
|
|
373
402
|
? {
|
|
@@ -415,12 +444,19 @@ onSettled) {
|
|
|
415
444
|
}
|
|
416
445
|
// TS cannot see assignments performed inside EventLog's hook closure.
|
|
417
446
|
const settledOutcome = canonicalOutcome;
|
|
447
|
+
const settledCancel = committedCancel;
|
|
418
448
|
if (settledOutcome) {
|
|
419
449
|
result = {
|
|
420
450
|
...result,
|
|
421
451
|
lifecycle: settledOutcome.lifecycle,
|
|
422
452
|
facts: settledOutcome,
|
|
423
453
|
...(terminalPreparationError ? { winner: null, summary: terminalPreparationError } : {}),
|
|
454
|
+
...(settledCancel
|
|
455
|
+
? {
|
|
456
|
+
summary: settledCancel.summary,
|
|
457
|
+
...(settledCancel.cancelReason ? { cancelReason: settledCancel.cancelReason } : {}),
|
|
458
|
+
}
|
|
459
|
+
: {}),
|
|
424
460
|
};
|
|
425
461
|
}
|
|
426
462
|
return result;
|
package/dist/runTerminals.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerminals.js","sourceRoot":"","sources":["../src/runTerminals.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,gBAAgB,EAChB,eAAe,GAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,0BAA0B,EAC1B,iBAAiB,EACjB,sBAAsB,EACtB,YAAY,EACZ,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACL,eAAe,EACf,eAAe,EACf,cAAc,EACd,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEtE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAA+B,EAC/B,IAAiF;AACjF;6EAC6E;AAC7E,cAAuE;AACvE;;;;;GAKG;AACH,SAAmD;IAEnD,IAAI,SAAS,GAA+B,IAAI,CAAC;IACjD,IAAI,cAAc,GAA8B,IAAI,CAAC;IACrD,IAAI,gBAAgB,GAA+B,IAAI,CAAC;IACxD,IAAI,wBAAwB,GAAkB,IAAI,CAAC;IACnD,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,4EAA4E;IAC5E,uEAAuE;IACvE,2EAA2E;IAC3E,yDAAyD;IACzD,IAAI,oBAAoB,GAAmB,IAAI,CAAC;IAChD,MAAM,mBAAmB,GAAG,GAAY,EAAE,CACxC,oBAAoB,KAAK,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAClF,MAAM,UAAU,GAAG,KAAK,EAAE,OAA4B,EAAiB,EAAE;QACvE,IAAI,gBAAgB;YAAE,OAAO;QAC7B,gBAAgB,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,aAAa,GAAG,IAAI,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,yEAAyE;IACzE,IAAI,gBAAgB,GAAY,IAAI,CAAC;IACrC,MAAM,WAAW,GAAG,KAAK,EAAE,OAA4B,EAAoB,EAAE;QAC3E,IAAI,CAAC;YACH,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gBAAgB,GAAG,KAAK,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC,CAAC;IACF;;;;;;OAMG;IACH,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA4B,EAAoB,EAAE;QAClF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAAE,oBAAoB,GAAG,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;QACjF,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,IAAI,CAAC;QACH,IAAI,MAA0B,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,SAAS,GAAG,CAAC,CAAC;gBACd,CAAC,CAAC,GAAG,CAAC,iBAAiB,CACrB,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE;oBACxB,IAAI,CAAC;wBACH,+DAA+D;wBAC/D,mEAAmE;wBACnE,MAAM,cAAc,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;wBAC3D,MAAM,eAAe,GACnB,mBAAmB,EAAE,IAAI,MAAM;4BAC7B,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc,CAAC;4BAC3C,CAAC,CAAC,cAAc,CAAC;wBACrB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;wBAC5D,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;wBAC1C,OAAO;4BACL,IAAI,EAAE,oBAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;4BAChE,OAAO,EAAE;gCACP,GAAG,OAAO;gCACV,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;gCAC3C,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO;gCAC7B,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM;gCACrC,SAAS,EAAE,QAAQ,CAAC,KAAK;6BAC1B;4BACD,MAAM,EAAE,QAAQ,CAAC,MAAM;4BACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;4BAC7B,QAAQ,EAAE,GAAG,EAAE;gCACb,QAAQ,CAAC,QAAQ,EAAE,CAAC;gCACpB,gBAAgB,GAAG,IAAI,CAAC;4BAC1B,CAAC;yBACF,CAAC;oBACJ,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,mEAAmE;wBACnE,4DAA4D;wBAC5D,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;wBACrF,wBAAwB,GAAG,sCAAsC,MAAM,EAAE,CAAC;wBAC1E,MAAM,cAAc,GAAG,gBAAgB,CAAC,QAAQ,EAAE;4BAChD,MAAM,EAAE,gBAAgB;yBACzB,CAAC,CAAC;wBACH,IAAI,iBAAiB,GAAG,KAAK,CAAC;wBAC9B,IAAI,CAAC;4BACH,CAAC,CAAC,KAAK,CAAC,SAAS,CACf,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,EACpC,SAAS,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,wDAAwD,wBAAwB,IAAI,CAChH,CAAC;4BACF,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gCAC7B,KAAK,EAAE,gBAAgB;gCACvB,QAAQ,EAAE,UAAU;gCACpB,WAAW,EAAE,wBAAwB;gCACrC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI;gCACpB,WAAW,EAAE;oCACX,kBAAkB;oCAClB,8BAA8B;oCAC9B,eAAe;iCAChB;6BACF,CAAC,CAAC;4BACH,iBAAiB,GAAG,IAAI,CAAC;wBAC3B,CAAC;wBAAC,MAAM,CAAC;4BACP,sDAAsD;wBACxD,CAAC;wBACD,IAAI,CAAC;4BACH,MAAM,QAAQ,GAAG,6BAA6B,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;4BAClE,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;4BAC1C,OAAO;gCACL,IAAI,EAAE,YAAY;gCAClB,OAAO,EAAE;oCACP,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;oCAC3C,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO;oCAC7B,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM;oCACrC,SAAS,EAAE,QAAQ,CAAC,KAAK;oCACzB,KAAK,EAAE,gBAAgB;oCACvB,KAAK,EAAE,wBAAwB;oCAC/B,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCACpE;gCACD,MAAM,EAAE,QAAQ,CAAC,MAAM;gCACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;gCAC7B,QAAQ,EAAE,GAAG,EAAE;oCACb,QAAQ,CAAC,QAAQ,EAAE,CAAC;oCACpB,gBAAgB,GAAG,IAAI,CAAC;gCAC1B,CAAC;6BACF,CAAC;wBACJ,CAAC;wBAAC,MAAM,CAAC;4BACP,iEAAiE;4BACjE,kEAAkE;4BAClE,gBAAgB,GAAG,cAAc,CAAC;4BAClC,OAAO;gCACL,IAAI,EAAE,YAAY;gCAClB,OAAO,EAAE;oCACP,SAAS,EAAE,cAAc,CAAC,SAAS;oCACnC,KAAK,EAAE,cAAc;oCACrB,MAAM,EAAE,cAAc,CAAC,MAAM;oCAC7B,KAAK,EAAE,gBAAgB;oCACvB,KAAK,EAAE,wBAAwB;oCAC/B,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCACpE;6BACF,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,EACD,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACjB,qBAAqB,CACnB,CAAC,EACD,CAAC,mBAAmB,EAAE;oBACpB,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS;wBAC1D,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,WAAW,CAC1C,CACJ,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,cAAc,GAAG,MAAM,CAAC;YACxB,oBAAoB,GAAG,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;YAChD,MAAM,OAAO,GAAG,SAAuC,CAAC;YACxD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACxD,iEAAiE;gBACjE,uEAAuE;gBACvE,oEAAoE;gBACpE,mDAAmD;gBACnD,IAAI,oBAAoB,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;oBAC5C,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;oBACpC,MAAM,WAAW,GAAG,oBAAoB,CACtC,MAAM,CAAC,KAAK,EACZ,WAAW,EACX,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAC3C,CAAC;oBACF,MAAM,aAAa,GACjB,MAAM,CAAC,MAAM,KAAK,qBAAqB;wBACrC,CAAC,CAAC,0DAA0D;wBAC5D,CAAC,CAAC,eAAe,CAAC;oBACtB,IAAI,qBAAqB,GAAG,WAAW,CAAC;oBACxC,IAAI,CAAC;wBACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;wBACzC,qBAAqB,GAAG,yBAAyB,CAAC,OAAO,EAAE;4BACzD,KAAK,EAAE,WAAW;4BAClB,GAAG,EAAE,aAAa;4BAClB,aAAa,EAAE,MAAM,CAAC,KAAK;yBAC5B,CAAC,CAAC;wBACH,4BAA4B,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;wBAC7D,oBAAoB,CAAC,OAAO,CAAC,CAAC;oBAChC,CAAC;oBAAC,MAAM,CAAC;wBACP,2DAA2D;oBAC7D,CAAC;oBACD,MAAM,SAAS,GAAG,eAAe,CAC/B,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,KAAK,CAAC,IAAI,EAClB,MAAM,CAAC,UAAU,EACjB,SAAS,EACT,MAAM,CAAC,QAAQ,EACf,MAAM,EACN,OAAO,CAAC,KAAK,EACb,qBAAqB,CACtB,CAAC;oBACF,MAAM,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;oBAC1D,MAAM,GAAG;wBACP,GAAG,MAAM;wBACT,SAAS,EAAE,WAAW;wBACtB,KAAK,EAAE,SAAS,CAAC,KAAK;wBACtB,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;wBAC5B,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC5E,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,cAAc,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC1F,IAAI,cAAc,IAAI,MAAM,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;wBACvD,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;wBACpC,MAAM,GAAG,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;wBACzE,MAAM,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,IAAI,oBAAoB;4BAAE,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;wBACnE,MAAM,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;wBACvD,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI;4BAAE,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAClF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,qEAAqE;YACrE,MAAM,CAAC,GAAG,SAAuC,CAAC;YAClD,IAAI,CAAC,CAAC;gBAAE,MAAM,GAAG,CAAC;YAClB,sEAAsE;YACtE,sEAAsE;YACtE,qEAAqE;YACrE,IAAI,0BAA0B,CAAC,GAAG,CAAC;gBAAE,MAAM,GAAG,CAAC;YAC/C,IAAI,CAAC,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBACxD,IAAI,CAAC,OAAO;oBAAE,MAAM,GAAG,CAAC;gBACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,GAAG,cAAc;oBACrB,CAAC,CAAC;wBACE,GAAG,cAAc;wBACjB,SAAS,EAAE,OAAO,CAAC,SAAS;wBAC5B,KAAK,EAAE,OAAO;wBACd,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC3C;oBACH,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC;iBAAM,IACL,CAAC,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBAC/B,CAAC,MAAM,EAAE,OAAO;gBAChB,CAAC,aAAa;gBACd,CAAC,MAAM,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAC7B,CAAC;gBACD,oEAAoE;gBACpE,oEAAoE;gBACpE,oEAAoE;gBACpE,mEAAmE;gBACnE,oEAAoE;gBACpE,uDAAuD;gBACvD,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,uBAAuB,EAAG,CAAC;gBACjD,MAAM,yBAAyB,CAAC,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChF,MAAM,OAAO,GAAG,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBACxD,IAAI,CAAC,OAAO;oBAAE,MAAM,GAAG,CAAC;gBACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,GAAG,cAAc;oBACrB,CAAC,CAAC;wBACE,GAAG,cAAc;wBACjB,SAAS,EAAE,OAAO,CAAC,SAAS;wBAC5B,KAAK,EAAE,OAAO;wBACd,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC3C;oBACH,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,CAAC,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;gBAC9B,IAAI,aAAa,GAAG,gBAAgB,IAAI,GAAG,CAAC;gBAC5C,IAAI,CAAC;oBACH,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;gBACtB,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,aAAa,GAAG,YAAY,CAAC;gBAC/B,CAAC;gBACD,qEAAqE;gBACrE,yEAAyE;gBACzE,2EAA2E;gBAC3E,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBACjC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,MAAM,EAAE,OAAO,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;oBAC7C,MAAM,UAAU,GAAG,cAAc,EAAE,KAAK,CAAC;oBACzC,MAAM,WAAW,GAAG,oBAAoB,CACtC,UAAU,EACV,WAAW,EACX,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAC3C,CAAC;oBACF,MAAM,aAAa,GACjB,MAAM,CAAC,MAAM,KAAK,qBAAqB;wBACrC,CAAC,CAAC,0DAA0D;wBAC5D,CAAC,CAAC,eAAe,CAAC;oBACtB,IAAI,qBAAqB,GAAG,WAAW,CAAC;oBACxC,IAAI,CAAC;wBACH,IAAI,oBAAoB;4BAAE,uBAAuB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;wBAC7D,qBAAqB,GAAG,yBAAyB,CAAC,CAAC,EAAE;4BACnD,KAAK,EAAE,WAAW;4BAClB,GAAG,EAAE,aAAa;4BAClB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;yBACnE,CAAC,CAAC;wBACH,4BAA4B,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;wBACvD,oBAAoB,CAAC,CAAC,CAAC,CAAC;oBAC1B,CAAC;oBAAC,MAAM,CAAC;wBACP,2DAA2D;oBAC7D,CAAC;oBACD,MAAM,SAAS,GAAG,eAAe,CAC/B,CAAC,CAAC,GAAG,EACL,CAAC,CAAC,KAAK,EACP,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,KAAK,CAAC,IAAI,EACZ,cAAc,EAAE,UAAU,IAAI,EAAE,EAChC,SAAS,EACT,QAAQ;oBACR,kEAAkE;oBAClE,yEAAyE;oBACzE,MAAM,EACN,CAAC,CAAC,KAAK,EACP,qBAAqB,CACtB,CAAC;oBACF,MAAM,yBAAyB,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;oBACpD,MAAM,GAAG,cAAc;wBACrB,CAAC,CAAC;4BACE,GAAG,cAAc;4BACjB,SAAS,EAAE,WAAW;4BACtB,KAAK,EAAE,SAAS,CAAC,KAAK;4BACtB,OAAO,EAAE,SAAS,CAAC,OAAO;4BAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;4BAC5B,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;yBAC5E;wBACH,CAAC,CAAC,SAAS,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,GAAG,cAAc,EAAE,KAAK,CAAC;oBACzC,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;oBAClF,MAAM,cAAc,GAAG,aAAa,CAClC,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAC/E,CAAC;oBACF,IAAI,sBAAsB,GAAG,YAAY,CAAC;oBAC1C,IAAI,CAAC;wBACH,IAAI,oBAAoB;4BAAE,uBAAuB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;wBAC7D,sBAAsB,GAAG,yBAAyB,CAAC,CAAC,EAAE;4BACpD,KAAK,EAAE,YAAY;4BACnB,GAAG,EAAE,cAAc;4BACnB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;yBACnE,CAAC,CAAC;wBACH,4BAA4B,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;oBAC1D,CAAC;oBAAC,MAAM,CAAC;wBACP,sDAAsD;oBACxD,CAAC;oBACD,MAAM,MAAM,GAAG,cAAc,CAC3B,CAAC,CAAC,GAAG,EACL,CAAC,CAAC,KAAK,EACP,CAAC,CAAC,KAAK,EACP,CAAC,CAAC,KAAK,EACP,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,IAAI,EACN,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAC5C,aAAa,EACb,QAAQ,EACR,EAAE,UAAU,EAAE,sBAAsB,EAAE,CACvC,CAAC;oBACF,MAAM,yBAAyB,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,GAAG,cAAc;wBACrB,CAAC,CAAC;4BACE,GAAG,cAAc;4BACjB,SAAS,EAAE,QAAQ;4BACnB,KAAK,EAAE,MAAM,CAAC,KAAK;4BACnB,OAAO,EAAE,MAAM,CAAC,OAAO;4BACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;yBAC1B;wBACH,CAAC,CAAC,MAAM,CAAC;gBACb,CAAC;YACH,CAAC;QACH,CAAC;QACD,2EAA2E;QAC3E,yEAAyE;QACzE,6DAA6D;QAC7D,MAAM,CAAC,GAAG,SAAuC,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,EAAE,CAAC;gBAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACzD,IAAI,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;gBACxD,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,IAAI,CAAC;wBACH,CAAC,CAAC,KAAK,CAAC,SAAS,CACf,WAAW,EACX,SAAS,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,QAAQ,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CACrE,CAAC;wBACF,cAAc,GAAG,IAAI,CAAC;oBACxB,CAAC;oBAAC,MAAM,CAAC;wBACP,iEAAiE;oBACnE,CAAC;gBACH,CAAC;gBACD,IAAI,cAAc,EAAE,CAAC;oBACnB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE;wBACzB,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,kBAAkB;wBACxB,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC9D,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS;gBACjC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,sEAAsE;QACtE,MAAM,cAAc,GAAG,gBAA8C,CAAC;QACtE,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,GAAG;gBACP,GAAG,MAAM;gBACT,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,KAAK,EAAE,cAAc;gBACrB,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzF,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,8EAA8E;QAC9E,oEAAoE;QACpE,MAAM,OAAO,GAAG,SAAuC,CAAC;QACxD,IAAI,OAAO;YAAE,MAAM,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"runTerminals.js","sourceRoot":"","sources":["../src/runTerminals.ts"],"names":[],"mappings":"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"}
|
package/dist/secretDiff.d.ts
CHANGED
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
import type { ArtifactStore } from "@claudexor/artifact-store";
|
|
2
2
|
import { AnswerAssembly } from "@claudexor/core";
|
|
3
3
|
import type { HarnessEvent, WorkspaceEnvelope } from "@claudexor/schema";
|
|
4
|
-
import { type WorkspaceManager } from "@claudexor/workspace";
|
|
4
|
+
import { type WorkspaceManager, type CapturedWorkspaceDiff } from "@claudexor/workspace";
|
|
5
5
|
import { secretLikeSummaryLine, type SecretLikeFinding } from "./persistedPatch.js";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
14
|
-
export declare function recordCaptureRefusal(refusal: CaptureRefusal | undefined, errors: string[], existingError: boolean): boolean;
|
|
15
|
-
export declare function captureRefusalNextActions(refusal: CaptureRefusal): string[];
|
|
6
|
+
import { type CaptureRefusal } from "./captureRefusal.js";
|
|
7
|
+
export { captureInspectionActions, captureRefusalNextActions, type CaptureRefusal, } from "./captureRefusal.js";
|
|
8
|
+
/** Shared by post-try attribution and final-only capture. Errors remain workspace
|
|
9
|
+
* evidence, allowing answer assembly and observed cost to finish normally. */
|
|
10
|
+
export declare function captureCandidateDiff(wsm: WorkspaceManager, envelope: WorkspaceEnvelope): Promise<CapturedWorkspaceDiff>;
|
|
11
|
+
/** An incomplete observation is unknown, never an empty exact patch. */
|
|
12
|
+
export declare function capturedDiff(capture: CapturedWorkspaceDiff | undefined): string | undefined;
|
|
16
13
|
/** Answer assembly that also counts secret-like matches in answer material
|
|
17
14
|
* BEFORE its first redaction. Harness events are redacted one by one on their
|
|
18
15
|
* way into the assembly, so a count taken on the assembled answer would
|
|
@@ -52,8 +49,14 @@ export declare function captureCandidateWorkspace(input: {
|
|
|
52
49
|
inPlace: boolean;
|
|
53
50
|
/** Project root owning the private exact patch object store. */
|
|
54
51
|
projectRoot: string;
|
|
52
|
+
holder: {
|
|
53
|
+
runId: string;
|
|
54
|
+
runDir: string;
|
|
55
|
+
};
|
|
55
56
|
answerText?: string;
|
|
56
57
|
answerMatches: number;
|
|
58
|
+
/** Reuse a post-try refusal instead of repeating the same oversized capture. */
|
|
59
|
+
incompleteCapture?: CapturedWorkspaceDiff;
|
|
57
60
|
}): Promise<CandidateCapture>;
|
|
58
61
|
/**
|
|
59
62
|
* Write a run's final patch: the saved copy to `final/patch.diff`, the exact
|
package/dist/secretDiff.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretDiff.d.ts","sourceRoot":"","sources":["../src/secretDiff.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"secretDiff.d.ts","sourceRoot":"","sources":["../src/secretDiff.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAIL,qBAAqB,EACrB,KAAK,iBAAiB,EACvB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,KAAK,cAAc,GACpB,MAAM,qBAAqB,CAAC;AAE7B;8EAC8E;AAC9E,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAMhC;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE3F;AAED;;;;gEAIgE;AAChE,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAqB;IAErC,cAAc,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAoB1D;IAED,iBAAiB,IAAI,MAAM,CAE1B;CACF;AAED;gFACgF;AAChF,wBAAgB,uBAAuB,CAAC,aAAa,SAAI,GAAG,iBAAiB,GAAG,SAAS,CAOxF;AAED,MAAM,WAAW,gBAAgB;IAC/B,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC;qFACiF;IACjF,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQpF;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,KAAK,EAAE;IACrD,GAAG,EAAE,gBAAgB,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,iBAAiB,CAAC,EAAE,qBAAqB,CAAC;CAC3C,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8C5B;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,eAAe,GAAG,YAAY,GAAG,sBAAsB,CAAC,GAC5F;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAgBxD;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAEjC,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAGhF"}
|