@the-open-engine/zeroshot 6.39.1 → 6.40.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/README.md +45 -1
- package/cli/agent-provider-boundary.js +19 -0
- package/cli/agent-provider-boundary.ts +79 -0
- package/cli/export-stream.js +94 -0
- package/cli/export-stream.ts +118 -0
- package/cli/index.js +132 -61
- package/cli/json-export.js +2 -38
- package/cli/json-export.ts +2 -56
- package/cli/semantic-canonical.js +60 -0
- package/cli/semantic-canonical.ts +59 -0
- package/cli/semantic-contract.js +97 -0
- package/cli/semantic-contract.ts +153 -0
- package/cli/semantic-events.js +53 -0
- package/cli/semantic-events.ts +65 -0
- package/cli/semantic-evidence.js +63 -0
- package/cli/semantic-evidence.ts +65 -0
- package/cli/semantic-export.js +186 -0
- package/cli/semantic-export.ts +245 -0
- package/cli/semantic-json.js +69 -0
- package/cli/semantic-json.ts +69 -0
- package/cli/semantic-line-scanner.js +56 -0
- package/cli/semantic-line-scanner.ts +54 -0
- package/cli/semantic-parser.js +78 -0
- package/cli/semantic-parser.ts +95 -0
- package/cli/semantic-provider-line.js +91 -0
- package/cli/semantic-provider-line.ts +106 -0
- package/cli/trace-evidence.js +86 -0
- package/cli/trace-evidence.ts +115 -0
- package/cli/trace-export.js +120 -0
- package/cli/trace-export.ts +164 -0
- package/cli/trace-output-record.js +15 -0
- package/cli/trace-output-record.ts +18 -0
- package/cli/trace-output.js +98 -0
- package/cli/trace-output.ts +119 -0
- package/cluster-templates/conductor-bootstrap.json +1 -1
- package/lib/agent-cli-provider/adapters/claude.js +1 -1
- package/lib/agent-cli-provider/adapters/claude.js.map +1 -1
- package/lib/agent-cli-provider/adapters/codex.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/codex.js +26 -1
- package/lib/agent-cli-provider/adapters/codex.js.map +1 -1
- package/lib/agent-cli-provider/adapters/omp.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/omp.js +1 -1
- package/lib/agent-cli-provider/adapters/omp.js.map +1 -1
- package/lib/agent-cli-provider/log-prefix.d.ts.map +1 -1
- package/lib/agent-cli-provider/log-prefix.js +8 -6
- package/lib/agent-cli-provider/log-prefix.js.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-environment-policy.d.ts +4 -0
- package/lib/agent-cli-provider/omp/sdk-environment-policy.d.ts.map +1 -0
- package/lib/agent-cli-provider/omp/sdk-environment-policy.js +37 -0
- package/lib/agent-cli-provider/omp/sdk-environment-policy.js.map +1 -0
- package/lib/agent-cli-provider/omp/sdk-process-private-runtime.d.ts.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-process-private-runtime.js +4 -15
- package/lib/agent-cli-provider/omp/sdk-process-private-runtime.js.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-process-result.d.ts +2 -0
- package/lib/agent-cli-provider/omp/sdk-process-result.d.ts.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-process-result.js +2 -2
- package/lib/agent-cli-provider/omp/sdk-process-result.js.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-process-runner.d.ts.map +1 -1
- package/lib/agent-cli-provider/omp/sdk-process-runner.js +6 -1
- package/lib/agent-cli-provider/omp/sdk-process-runner.js.map +1 -1
- package/lib/agent-cli-provider/provider-registry.d.ts +3 -1
- package/lib/agent-cli-provider/provider-registry.d.ts.map +1 -1
- package/lib/agent-cli-provider/provider-registry.js +9 -2
- package/lib/agent-cli-provider/provider-registry.js.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.d.ts +4 -1
- package/lib/agent-cli-provider/single-agent-runtime.d.ts.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.js +18 -15
- package/lib/agent-cli-provider/single-agent-runtime.js.map +1 -1
- package/lib/agent-cli-provider/types.d.ts +3 -0
- package/lib/agent-cli-provider/types.d.ts.map +1 -1
- package/lib/agent-cli-provider/types.js.map +1 -1
- package/lib/cluster-worker/engine-adapter-common.js +18 -0
- package/lib/cluster-worker/engine-adapter.js +2 -1
- package/lib/git-remote-utils.js +22 -5
- package/lib/stream-json-parser.js +6 -5
- package/npm-shrinkwrap.json +2 -2
- package/package.json +7 -4
- package/scripts/omp/runtime-identities.js +31 -18
- package/scripts/omp/runtime.js +2 -0
- package/src/agent/agent-lifecycle.js +17 -1
- package/src/agent/agent-task-executor.js +36 -40
- package/src/agent/output-extraction-failures.js +73 -0
- package/src/agent/output-extraction-failures.ts +100 -0
- package/src/agent/output-extraction-json.js +5 -6
- package/src/agent/output-extraction-json.ts +4 -7
- package/src/agent/output-extraction-types.ts +5 -0
- package/src/agent/provider-terminal-failure.js +2 -2
- package/src/agent/provider-terminal-failure.ts +4 -2
- package/src/agent-cli-provider/adapters/claude.ts +1 -1
- package/src/agent-cli-provider/adapters/codex.ts +36 -1
- package/src/agent-cli-provider/adapters/omp.ts +2 -1
- package/src/agent-cli-provider/log-prefix.ts +12 -7
- package/src/agent-cli-provider/omp/sdk-environment-policy.ts +38 -0
- package/src/agent-cli-provider/omp/sdk-process-private-runtime.ts +4 -16
- package/src/agent-cli-provider/omp/sdk-process-result.ts +4 -2
- package/src/agent-cli-provider/omp/sdk-process-runner.ts +7 -1
- package/src/agent-cli-provider/provider-registry.ts +10 -2
- package/src/agent-cli-provider/single-agent-runtime.ts +24 -15
- package/src/agent-cli-provider/types.ts +3 -0
- package/src/agents/git-pusher-template.js +61 -71
- package/src/attach/socket-paths.js +1 -1
- package/src/attach/socket-paths.ts +1 -1
- package/src/claude-task-runner.js +9 -9
- package/src/foreground-benchmark-run.js +24 -12
- package/src/legacy-lib/git-remote-utils.ts +23 -5
- package/src/legacy-lib/stream-json-parser.ts +10 -5
- package/src/omp-session-verifier.js +8 -5
- package/src/orchestrator.js +42 -0
- package/src/preflight.js +31 -6
- package/src/providers/index.js +4 -22
- package/src/task-execution-context.js +22 -0
- package/src/task-log-line.d.ts +20 -0
- package/src/task-log-line.js +80 -0
- package/src/watcher-prompt-channel.js +1 -1
- package/src/worktree-claude-config.js +25 -0
- package/src/worktree-claude-config.ts +28 -0
- package/task-lib/commands/logs.js +5 -8
- package/task-lib/runner.js +57 -22
- package/task-lib/sdk-watcher-output.js +31 -0
- package/task-lib/sdk-watcher.js +4 -11
- package/task-lib/watcher-output-runtime.js +30 -16
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const export_stream_1 = require("./export-stream");
|
|
4
|
+
const trace_evidence_1 = require("./trace-evidence");
|
|
5
|
+
const trace_output_1 = require("./trace-output");
|
|
6
|
+
const TRACE_SCHEMA_VERSION = 'zeroshot.trace.v1';
|
|
7
|
+
const TRACE_MEDIA_TYPE = 'application/x-zeroshot-trace+jsonl';
|
|
8
|
+
function nullableInteger(value) {
|
|
9
|
+
return typeof value === 'number' && Number.isInteger(value) ? value : null;
|
|
10
|
+
}
|
|
11
|
+
function assertOutputDoesNotReplaceTaskLog(outputPath, allowedLogRoot, taskIds) {
|
|
12
|
+
if (!outputPath)
|
|
13
|
+
return;
|
|
14
|
+
const resolvedOutput = path.resolve(outputPath);
|
|
15
|
+
for (const taskId of taskIds) {
|
|
16
|
+
if ((0, trace_evidence_1.expectedLogPath)(allowedLogRoot, taskId) === resolvedOutput) {
|
|
17
|
+
throw new Error('Trace export output cannot replace a source task log');
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function taskPrompt(task) {
|
|
22
|
+
return (0, export_stream_1.nullableString)(task.fullPrompt) ?? (0, export_stream_1.nullableString)(task.prompt);
|
|
23
|
+
}
|
|
24
|
+
function streamTask(options) {
|
|
25
|
+
const { writer, taskId, cause, readTask, allowedLogRoot, issues } = options;
|
|
26
|
+
const agentIds = [...cause.agentIds].sort(export_stream_1.compareText);
|
|
27
|
+
if (agentIds.length > 1)
|
|
28
|
+
issues.push(`task:${taskId}:ambiguous_agent`);
|
|
29
|
+
const taskRead = (0, trace_evidence_1.readTraceTask)(taskId, readTask);
|
|
30
|
+
const task = taskRead.task;
|
|
31
|
+
if (taskRead.issue)
|
|
32
|
+
issues.push(taskRead.issue);
|
|
33
|
+
const taskTerminal = task !== null && (0, trace_evidence_1.hasTerminalTaskStatus)(task);
|
|
34
|
+
if (task && !taskTerminal)
|
|
35
|
+
issues.push(`task:${taskId}:task_not_terminal`);
|
|
36
|
+
const promptRef = (0, trace_evidence_1.logicalTaskRef)(taskId, 'prompt');
|
|
37
|
+
const rawOutputRef = (0, trace_evidence_1.logicalTaskRef)(taskId, 'output');
|
|
38
|
+
writer.write({
|
|
39
|
+
record_type: 'task',
|
|
40
|
+
task_id: taskId,
|
|
41
|
+
agent_id: agentIds.length === 1 ? agentIds[0] : null,
|
|
42
|
+
provider: (0, export_stream_1.nullableString)(task?.provider),
|
|
43
|
+
model: (0, export_stream_1.nullableString)(task?.model),
|
|
44
|
+
status: (0, export_stream_1.nullableString)(task?.status),
|
|
45
|
+
created_at: (0, export_stream_1.nullableString)(task?.createdAt),
|
|
46
|
+
updated_at: (0, export_stream_1.nullableString)(task?.updatedAt),
|
|
47
|
+
exit_code: nullableInteger(task?.exitCode),
|
|
48
|
+
prompt_ref: promptRef,
|
|
49
|
+
prompt: task ? taskPrompt(task) : null,
|
|
50
|
+
raw_output_ref: rawOutputRef,
|
|
51
|
+
});
|
|
52
|
+
if (!task) {
|
|
53
|
+
(0, trace_output_1.writeUnavailableOutput)(writer, taskId, rawOutputRef);
|
|
54
|
+
return { bytes: 0 };
|
|
55
|
+
}
|
|
56
|
+
return (0, trace_output_1.streamTaskOutput)({
|
|
57
|
+
writer,
|
|
58
|
+
taskId,
|
|
59
|
+
task,
|
|
60
|
+
allowedLogRoot,
|
|
61
|
+
rawOutputRef,
|
|
62
|
+
taskTerminal,
|
|
63
|
+
issues,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
function streamClusterTraceExport(options) {
|
|
67
|
+
const { ledger, clusterId, readTask, allowedLogRoot, outputPath = null } = options;
|
|
68
|
+
const causes = (0, trace_evidence_1.collectTaskCauses)(ledger, clusterId);
|
|
69
|
+
assertOutputDoesNotReplaceTaskLog(outputPath, allowedLogRoot, causes.keys());
|
|
70
|
+
const destination = (0, export_stream_1.createExclusiveDestination)(outputPath, options.stdout ?? process.stdout, 'Trace');
|
|
71
|
+
const writer = (0, export_stream_1.createRecordWriter)(destination);
|
|
72
|
+
let ledgerMessages = 0;
|
|
73
|
+
let taskOutputBytes = 0;
|
|
74
|
+
const issues = [];
|
|
75
|
+
try {
|
|
76
|
+
writer.write({
|
|
77
|
+
record_type: 'header',
|
|
78
|
+
schema_version: TRACE_SCHEMA_VERSION,
|
|
79
|
+
media_type: TRACE_MEDIA_TYPE,
|
|
80
|
+
cluster_id: clusterId,
|
|
81
|
+
chunk_bytes: trace_output_1.TRACE_OUTPUT_CHUNK_BYTES,
|
|
82
|
+
});
|
|
83
|
+
(0, trace_evidence_1.forEachLedgerMessage)(ledger, clusterId, (message) => {
|
|
84
|
+
writer.write({ record_type: 'ledger_message', message });
|
|
85
|
+
ledgerMessages += 1;
|
|
86
|
+
});
|
|
87
|
+
const ordered = [...causes.entries()].sort(([left], [right]) => (0, export_stream_1.compareText)(left, right));
|
|
88
|
+
for (const [taskId, cause] of ordered) {
|
|
89
|
+
taskOutputBytes += streamTask({
|
|
90
|
+
writer,
|
|
91
|
+
taskId,
|
|
92
|
+
cause,
|
|
93
|
+
readTask,
|
|
94
|
+
allowedLogRoot,
|
|
95
|
+
issues,
|
|
96
|
+
}).bytes;
|
|
97
|
+
}
|
|
98
|
+
issues.sort(export_stream_1.compareText);
|
|
99
|
+
writer.finish({
|
|
100
|
+
record_type: 'footer',
|
|
101
|
+
complete: issues.length === 0,
|
|
102
|
+
ledger_messages: ledgerMessages,
|
|
103
|
+
tasks: causes.size,
|
|
104
|
+
task_output_bytes: taskOutputBytes,
|
|
105
|
+
issues,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
finally {
|
|
109
|
+
destination.close();
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
module.exports = {
|
|
113
|
+
TRACE_OUTPUT_CHUNK_BYTES: trace_output_1.TRACE_OUTPUT_CHUNK_BYTES,
|
|
114
|
+
collectTaskCauses: trace_evidence_1.collectTaskCauses,
|
|
115
|
+
expectedLogPath: trace_evidence_1.expectedLogPath,
|
|
116
|
+
hasTerminalTaskStatus: trace_evidence_1.hasTerminalTaskStatus,
|
|
117
|
+
logicalTaskRef: trace_evidence_1.logicalTaskRef,
|
|
118
|
+
readTraceTask: trace_evidence_1.readTraceTask,
|
|
119
|
+
streamClusterTraceExport,
|
|
120
|
+
};
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import path = require('path');
|
|
2
|
+
import {
|
|
3
|
+
compareText,
|
|
4
|
+
createExclusiveDestination,
|
|
5
|
+
createRecordWriter,
|
|
6
|
+
nullableString,
|
|
7
|
+
type ExportStream,
|
|
8
|
+
type RecordWriter,
|
|
9
|
+
} from './export-stream';
|
|
10
|
+
import {
|
|
11
|
+
collectTaskCauses,
|
|
12
|
+
expectedLogPath,
|
|
13
|
+
forEachLedgerMessage,
|
|
14
|
+
hasTerminalTaskStatus,
|
|
15
|
+
logicalTaskRef,
|
|
16
|
+
readTraceTask,
|
|
17
|
+
type ClusterLedger,
|
|
18
|
+
type TaskCause,
|
|
19
|
+
type TraceTask,
|
|
20
|
+
} from './trace-evidence';
|
|
21
|
+
import { streamTaskOutput, TRACE_OUTPUT_CHUNK_BYTES, writeUnavailableOutput } from './trace-output';
|
|
22
|
+
|
|
23
|
+
const TRACE_SCHEMA_VERSION = 'zeroshot.trace.v1';
|
|
24
|
+
const TRACE_MEDIA_TYPE = 'application/x-zeroshot-trace+jsonl';
|
|
25
|
+
|
|
26
|
+
interface TraceExportOptions {
|
|
27
|
+
ledger: ClusterLedger;
|
|
28
|
+
clusterId: string;
|
|
29
|
+
readTask(taskId: string): TraceTask | null;
|
|
30
|
+
allowedLogRoot: string;
|
|
31
|
+
outputPath?: string | null;
|
|
32
|
+
stdout?: ExportStream;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
interface StreamTaskOptions {
|
|
36
|
+
writer: RecordWriter;
|
|
37
|
+
taskId: string;
|
|
38
|
+
cause: TaskCause;
|
|
39
|
+
readTask(taskId: string): TraceTask | null;
|
|
40
|
+
allowedLogRoot: string;
|
|
41
|
+
issues: string[];
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function nullableInteger(value: unknown): number | null {
|
|
45
|
+
return typeof value === 'number' && Number.isInteger(value) ? value : null;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function assertOutputDoesNotReplaceTaskLog(
|
|
49
|
+
outputPath: string | null | undefined,
|
|
50
|
+
allowedLogRoot: string,
|
|
51
|
+
taskIds: Iterable<string>
|
|
52
|
+
): void {
|
|
53
|
+
if (!outputPath) return;
|
|
54
|
+
const resolvedOutput = path.resolve(outputPath);
|
|
55
|
+
for (const taskId of taskIds) {
|
|
56
|
+
if (expectedLogPath(allowedLogRoot, taskId) === resolvedOutput) {
|
|
57
|
+
throw new Error('Trace export output cannot replace a source task log');
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function taskPrompt(task: TraceTask): string | null {
|
|
63
|
+
return nullableString(task.fullPrompt) ?? nullableString(task.prompt);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function streamTask(options: StreamTaskOptions): { bytes: number } {
|
|
67
|
+
const { writer, taskId, cause, readTask, allowedLogRoot, issues } = options;
|
|
68
|
+
const agentIds = [...cause.agentIds].sort(compareText);
|
|
69
|
+
if (agentIds.length > 1) issues.push(`task:${taskId}:ambiguous_agent`);
|
|
70
|
+
const taskRead = readTraceTask(taskId, readTask);
|
|
71
|
+
const task = taskRead.task;
|
|
72
|
+
if (taskRead.issue) issues.push(taskRead.issue);
|
|
73
|
+
const taskTerminal = task !== null && hasTerminalTaskStatus(task);
|
|
74
|
+
if (task && !taskTerminal) issues.push(`task:${taskId}:task_not_terminal`);
|
|
75
|
+
const promptRef = logicalTaskRef(taskId, 'prompt');
|
|
76
|
+
const rawOutputRef = logicalTaskRef(taskId, 'output');
|
|
77
|
+
writer.write({
|
|
78
|
+
record_type: 'task',
|
|
79
|
+
task_id: taskId,
|
|
80
|
+
agent_id: agentIds.length === 1 ? agentIds[0] : null,
|
|
81
|
+
provider: nullableString(task?.provider),
|
|
82
|
+
model: nullableString(task?.model),
|
|
83
|
+
status: nullableString(task?.status),
|
|
84
|
+
created_at: nullableString(task?.createdAt),
|
|
85
|
+
updated_at: nullableString(task?.updatedAt),
|
|
86
|
+
exit_code: nullableInteger(task?.exitCode),
|
|
87
|
+
prompt_ref: promptRef,
|
|
88
|
+
prompt: task ? taskPrompt(task) : null,
|
|
89
|
+
raw_output_ref: rawOutputRef,
|
|
90
|
+
});
|
|
91
|
+
if (!task) {
|
|
92
|
+
writeUnavailableOutput(writer, taskId, rawOutputRef);
|
|
93
|
+
return { bytes: 0 };
|
|
94
|
+
}
|
|
95
|
+
return streamTaskOutput({
|
|
96
|
+
writer,
|
|
97
|
+
taskId,
|
|
98
|
+
task,
|
|
99
|
+
allowedLogRoot,
|
|
100
|
+
rawOutputRef,
|
|
101
|
+
taskTerminal,
|
|
102
|
+
issues,
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
function streamClusterTraceExport(options: TraceExportOptions): void {
|
|
107
|
+
const { ledger, clusterId, readTask, allowedLogRoot, outputPath = null } = options;
|
|
108
|
+
const causes = collectTaskCauses(ledger, clusterId);
|
|
109
|
+
assertOutputDoesNotReplaceTaskLog(outputPath, allowedLogRoot, causes.keys());
|
|
110
|
+
const destination = createExclusiveDestination(
|
|
111
|
+
outputPath,
|
|
112
|
+
options.stdout ?? process.stdout,
|
|
113
|
+
'Trace'
|
|
114
|
+
);
|
|
115
|
+
const writer = createRecordWriter(destination);
|
|
116
|
+
let ledgerMessages = 0;
|
|
117
|
+
let taskOutputBytes = 0;
|
|
118
|
+
const issues: string[] = [];
|
|
119
|
+
try {
|
|
120
|
+
writer.write({
|
|
121
|
+
record_type: 'header',
|
|
122
|
+
schema_version: TRACE_SCHEMA_VERSION,
|
|
123
|
+
media_type: TRACE_MEDIA_TYPE,
|
|
124
|
+
cluster_id: clusterId,
|
|
125
|
+
chunk_bytes: TRACE_OUTPUT_CHUNK_BYTES,
|
|
126
|
+
});
|
|
127
|
+
forEachLedgerMessage(ledger, clusterId, (message) => {
|
|
128
|
+
writer.write({ record_type: 'ledger_message', message });
|
|
129
|
+
ledgerMessages += 1;
|
|
130
|
+
});
|
|
131
|
+
const ordered = [...causes.entries()].sort(([left], [right]) => compareText(left, right));
|
|
132
|
+
for (const [taskId, cause] of ordered) {
|
|
133
|
+
taskOutputBytes += streamTask({
|
|
134
|
+
writer,
|
|
135
|
+
taskId,
|
|
136
|
+
cause,
|
|
137
|
+
readTask,
|
|
138
|
+
allowedLogRoot,
|
|
139
|
+
issues,
|
|
140
|
+
}).bytes;
|
|
141
|
+
}
|
|
142
|
+
issues.sort(compareText);
|
|
143
|
+
writer.finish({
|
|
144
|
+
record_type: 'footer',
|
|
145
|
+
complete: issues.length === 0,
|
|
146
|
+
ledger_messages: ledgerMessages,
|
|
147
|
+
tasks: causes.size,
|
|
148
|
+
task_output_bytes: taskOutputBytes,
|
|
149
|
+
issues,
|
|
150
|
+
});
|
|
151
|
+
} finally {
|
|
152
|
+
destination.close();
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
export = {
|
|
157
|
+
TRACE_OUTPUT_CHUNK_BYTES,
|
|
158
|
+
collectTaskCauses,
|
|
159
|
+
expectedLogPath,
|
|
160
|
+
hasTerminalTaskStatus,
|
|
161
|
+
logicalTaskRef,
|
|
162
|
+
readTraceTask,
|
|
163
|
+
streamClusterTraceExport,
|
|
164
|
+
};
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.writeUnavailableOutput = writeUnavailableOutput;
|
|
4
|
+
function writeUnavailableOutput(writer, taskId, rawOutputRef) {
|
|
5
|
+
writer.write({
|
|
6
|
+
record_type: 'task_output_end',
|
|
7
|
+
task_id: taskId,
|
|
8
|
+
raw_output_ref: rawOutputRef,
|
|
9
|
+
available: false,
|
|
10
|
+
complete: false,
|
|
11
|
+
byte_length: null,
|
|
12
|
+
chunks: 0,
|
|
13
|
+
sha256: null,
|
|
14
|
+
});
|
|
15
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { RecordWriter } from './export-stream';
|
|
2
|
+
|
|
3
|
+
export function writeUnavailableOutput(
|
|
4
|
+
writer: RecordWriter,
|
|
5
|
+
taskId: string,
|
|
6
|
+
rawOutputRef: string
|
|
7
|
+
): void {
|
|
8
|
+
writer.write({
|
|
9
|
+
record_type: 'task_output_end',
|
|
10
|
+
task_id: taskId,
|
|
11
|
+
raw_output_ref: rawOutputRef,
|
|
12
|
+
available: false,
|
|
13
|
+
complete: false,
|
|
14
|
+
byte_length: null,
|
|
15
|
+
chunks: 0,
|
|
16
|
+
sha256: null,
|
|
17
|
+
});
|
|
18
|
+
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.writeUnavailableOutput = exports.TRACE_OUTPUT_CHUNK_BYTES = void 0;
|
|
4
|
+
exports.streamTaskOutput = streamTaskOutput;
|
|
5
|
+
const crypto = require("crypto");
|
|
6
|
+
const fs = require("fs");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const export_stream_1 = require("./export-stream");
|
|
9
|
+
const trace_evidence_1 = require("./trace-evidence");
|
|
10
|
+
const trace_output_record_1 = require("./trace-output-record");
|
|
11
|
+
Object.defineProperty(exports, "writeUnavailableOutput", { enumerable: true, get: function () { return trace_output_record_1.writeUnavailableOutput; } });
|
|
12
|
+
exports.TRACE_OUTPUT_CHUNK_BYTES = 48 * 1024;
|
|
13
|
+
function openTaskLog(expected, taskId, issues) {
|
|
14
|
+
try {
|
|
15
|
+
return fs.openSync(expected, fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW || 0));
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
issues.push(`task:${taskId}:${issueForOpenFailure(error)}`);
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function captureOpenedTaskLog(fd, options) {
|
|
23
|
+
const { writer, taskId, rawOutputRef, issues } = options;
|
|
24
|
+
let bytes = 0;
|
|
25
|
+
let chunks = 0;
|
|
26
|
+
const digest = crypto.createHash('sha256');
|
|
27
|
+
try {
|
|
28
|
+
const before = fs.fstatSync(fd, { bigint: true });
|
|
29
|
+
if (!before.isFile() || before.size > BigInt(Number.MAX_SAFE_INTEGER)) {
|
|
30
|
+
issues.push(`task:${taskId}:log_not_regular`);
|
|
31
|
+
return { available: false, complete: false, bytes, chunks, sha256: null };
|
|
32
|
+
}
|
|
33
|
+
const targetBytes = Number(before.size);
|
|
34
|
+
while (bytes < targetBytes) {
|
|
35
|
+
const buffer = Buffer.allocUnsafe(Math.min(exports.TRACE_OUTPUT_CHUNK_BYTES, targetBytes - bytes));
|
|
36
|
+
const read = fs.readSync(fd, buffer, 0, buffer.length, bytes);
|
|
37
|
+
if (read === 0)
|
|
38
|
+
break;
|
|
39
|
+
const chunk = read === buffer.length ? buffer : buffer.subarray(0, read);
|
|
40
|
+
digest.update(chunk);
|
|
41
|
+
writer.write({
|
|
42
|
+
record_type: 'task_output_chunk',
|
|
43
|
+
task_id: taskId,
|
|
44
|
+
raw_output_ref: rawOutputRef,
|
|
45
|
+
chunk_index: chunks,
|
|
46
|
+
encoding: 'base64',
|
|
47
|
+
data_base64: chunk.toString('base64'),
|
|
48
|
+
});
|
|
49
|
+
bytes += read;
|
|
50
|
+
chunks += 1;
|
|
51
|
+
}
|
|
52
|
+
const after = fs.fstatSync(fd, { bigint: true });
|
|
53
|
+
const complete = bytes === targetBytes && (0, export_stream_1.sameFileSnapshot)(before, after);
|
|
54
|
+
if (!complete)
|
|
55
|
+
issues.push(`task:${taskId}:log_changed_during_export`);
|
|
56
|
+
return { available: true, complete, bytes, chunks, sha256: digest.digest('hex') };
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
issues.push(`task:${taskId}:log_read_failed`);
|
|
60
|
+
return { available: true, complete: false, bytes, chunks, sha256: digest.digest('hex') };
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function streamTaskOutput(options) {
|
|
64
|
+
const { writer, taskId, task, allowedLogRoot, rawOutputRef, taskTerminal, issues } = options;
|
|
65
|
+
const expected = (0, trace_evidence_1.expectedLogPath)(allowedLogRoot, taskId);
|
|
66
|
+
const recorded = (0, export_stream_1.nullableString)(task.logFile);
|
|
67
|
+
if (!expected || !recorded || path.resolve(recorded) !== expected) {
|
|
68
|
+
issues.push(`task:${taskId}:log_reference_invalid`);
|
|
69
|
+
(0, trace_output_record_1.writeUnavailableOutput)(writer, taskId, rawOutputRef);
|
|
70
|
+
return { bytes: 0 };
|
|
71
|
+
}
|
|
72
|
+
const fd = openTaskLog(expected, taskId, issues);
|
|
73
|
+
if (fd === null) {
|
|
74
|
+
(0, trace_output_record_1.writeUnavailableOutput)(writer, taskId, rawOutputRef);
|
|
75
|
+
return { bytes: 0 };
|
|
76
|
+
}
|
|
77
|
+
let captured;
|
|
78
|
+
try {
|
|
79
|
+
captured = captureOpenedTaskLog(fd, { writer, taskId, rawOutputRef, issues });
|
|
80
|
+
}
|
|
81
|
+
finally {
|
|
82
|
+
fs.closeSync(fd);
|
|
83
|
+
}
|
|
84
|
+
writer.write({
|
|
85
|
+
record_type: 'task_output_end',
|
|
86
|
+
task_id: taskId,
|
|
87
|
+
raw_output_ref: rawOutputRef,
|
|
88
|
+
available: captured.available,
|
|
89
|
+
complete: captured.complete && taskTerminal,
|
|
90
|
+
byte_length: captured.available ? captured.bytes : null,
|
|
91
|
+
chunks: captured.chunks,
|
|
92
|
+
sha256: captured.sha256,
|
|
93
|
+
});
|
|
94
|
+
return { bytes: captured.bytes };
|
|
95
|
+
}
|
|
96
|
+
function issueForOpenFailure(error) {
|
|
97
|
+
return (0, export_stream_1.isRecord)(error) && error.code === 'ENOENT' ? 'log_missing' : 'log_unreadable';
|
|
98
|
+
}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import crypto = require('crypto');
|
|
2
|
+
import fs = require('fs');
|
|
3
|
+
import path = require('path');
|
|
4
|
+
import { isRecord, nullableString, type RecordWriter, sameFileSnapshot } from './export-stream';
|
|
5
|
+
import { expectedLogPath, type TraceTask } from './trace-evidence';
|
|
6
|
+
import { writeUnavailableOutput } from './trace-output-record';
|
|
7
|
+
|
|
8
|
+
export const TRACE_OUTPUT_CHUNK_BYTES = 48 * 1024;
|
|
9
|
+
|
|
10
|
+
interface OutputCapture {
|
|
11
|
+
bytes: number;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
interface CapturedTaskOutput extends OutputCapture {
|
|
15
|
+
available: boolean;
|
|
16
|
+
complete: boolean;
|
|
17
|
+
chunks: number;
|
|
18
|
+
sha256: string | null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
interface StreamTaskOutputOptions {
|
|
22
|
+
writer: RecordWriter;
|
|
23
|
+
taskId: string;
|
|
24
|
+
task: TraceTask;
|
|
25
|
+
allowedLogRoot: string;
|
|
26
|
+
rawOutputRef: string;
|
|
27
|
+
taskTerminal: boolean;
|
|
28
|
+
issues: string[];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function openTaskLog(expected: string, taskId: string, issues: string[]): number | null {
|
|
32
|
+
try {
|
|
33
|
+
return fs.openSync(expected, fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW || 0));
|
|
34
|
+
} catch (error) {
|
|
35
|
+
issues.push(`task:${taskId}:${issueForOpenFailure(error)}`);
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function captureOpenedTaskLog(
|
|
41
|
+
fd: number,
|
|
42
|
+
options: Pick<StreamTaskOutputOptions, 'writer' | 'taskId' | 'rawOutputRef' | 'issues'>
|
|
43
|
+
): CapturedTaskOutput {
|
|
44
|
+
const { writer, taskId, rawOutputRef, issues } = options;
|
|
45
|
+
let bytes = 0;
|
|
46
|
+
let chunks = 0;
|
|
47
|
+
const digest = crypto.createHash('sha256');
|
|
48
|
+
try {
|
|
49
|
+
const before = fs.fstatSync(fd, { bigint: true });
|
|
50
|
+
if (!before.isFile() || before.size > BigInt(Number.MAX_SAFE_INTEGER)) {
|
|
51
|
+
issues.push(`task:${taskId}:log_not_regular`);
|
|
52
|
+
return { available: false, complete: false, bytes, chunks, sha256: null };
|
|
53
|
+
}
|
|
54
|
+
const targetBytes = Number(before.size);
|
|
55
|
+
while (bytes < targetBytes) {
|
|
56
|
+
const buffer = Buffer.allocUnsafe(Math.min(TRACE_OUTPUT_CHUNK_BYTES, targetBytes - bytes));
|
|
57
|
+
const read = fs.readSync(fd, buffer, 0, buffer.length, bytes);
|
|
58
|
+
if (read === 0) break;
|
|
59
|
+
const chunk = read === buffer.length ? buffer : buffer.subarray(0, read);
|
|
60
|
+
digest.update(chunk);
|
|
61
|
+
writer.write({
|
|
62
|
+
record_type: 'task_output_chunk',
|
|
63
|
+
task_id: taskId,
|
|
64
|
+
raw_output_ref: rawOutputRef,
|
|
65
|
+
chunk_index: chunks,
|
|
66
|
+
encoding: 'base64',
|
|
67
|
+
data_base64: chunk.toString('base64'),
|
|
68
|
+
});
|
|
69
|
+
bytes += read;
|
|
70
|
+
chunks += 1;
|
|
71
|
+
}
|
|
72
|
+
const after = fs.fstatSync(fd, { bigint: true });
|
|
73
|
+
const complete = bytes === targetBytes && sameFileSnapshot(before, after);
|
|
74
|
+
if (!complete) issues.push(`task:${taskId}:log_changed_during_export`);
|
|
75
|
+
return { available: true, complete, bytes, chunks, sha256: digest.digest('hex') };
|
|
76
|
+
} catch {
|
|
77
|
+
issues.push(`task:${taskId}:log_read_failed`);
|
|
78
|
+
return { available: true, complete: false, bytes, chunks, sha256: digest.digest('hex') };
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
export function streamTaskOutput(options: StreamTaskOutputOptions): OutputCapture {
|
|
83
|
+
const { writer, taskId, task, allowedLogRoot, rawOutputRef, taskTerminal, issues } = options;
|
|
84
|
+
const expected = expectedLogPath(allowedLogRoot, taskId);
|
|
85
|
+
const recorded = nullableString(task.logFile);
|
|
86
|
+
if (!expected || !recorded || path.resolve(recorded) !== expected) {
|
|
87
|
+
issues.push(`task:${taskId}:log_reference_invalid`);
|
|
88
|
+
writeUnavailableOutput(writer, taskId, rawOutputRef);
|
|
89
|
+
return { bytes: 0 };
|
|
90
|
+
}
|
|
91
|
+
const fd = openTaskLog(expected, taskId, issues);
|
|
92
|
+
if (fd === null) {
|
|
93
|
+
writeUnavailableOutput(writer, taskId, rawOutputRef);
|
|
94
|
+
return { bytes: 0 };
|
|
95
|
+
}
|
|
96
|
+
let captured: CapturedTaskOutput;
|
|
97
|
+
try {
|
|
98
|
+
captured = captureOpenedTaskLog(fd, { writer, taskId, rawOutputRef, issues });
|
|
99
|
+
} finally {
|
|
100
|
+
fs.closeSync(fd);
|
|
101
|
+
}
|
|
102
|
+
writer.write({
|
|
103
|
+
record_type: 'task_output_end',
|
|
104
|
+
task_id: taskId,
|
|
105
|
+
raw_output_ref: rawOutputRef,
|
|
106
|
+
available: captured.available,
|
|
107
|
+
complete: captured.complete && taskTerminal,
|
|
108
|
+
byte_length: captured.available ? captured.bytes : null,
|
|
109
|
+
chunks: captured.chunks,
|
|
110
|
+
sha256: captured.sha256,
|
|
111
|
+
});
|
|
112
|
+
return { bytes: captured.bytes };
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function issueForOpenFailure(error: unknown): 'log_missing' | 'log_unreadable' {
|
|
116
|
+
return isRecord(error) && error.code === 'ENOENT' ? 'log_missing' : 'log_unreadable';
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
export { writeUnavailableOutput };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "Two-Tier Conductor (Complexity × TaskType)",
|
|
3
|
-
"description": "Cost-optimized conductor:
|
|
3
|
+
"description": "Cost-optimized conductor: level2 junior for 2D classification (complexity + taskType), level3 senior for UNCERTAIN tasks. Routes to appropriate cluster config via helpers.getConfig().",
|
|
4
4
|
"agents": [
|
|
5
5
|
{
|
|
6
6
|
"id": "junior-conductor",
|
|
@@ -233,7 +233,7 @@ exports.claudeAdapter = {
|
|
|
233
233
|
displayName: 'Claude',
|
|
234
234
|
binary: 'claude',
|
|
235
235
|
adapterVersion: '1',
|
|
236
|
-
credentialEnvKeys: ['ANTHROPIC_API_KEY', 'CLAUDE_API_KEY'],
|
|
236
|
+
credentialEnvKeys: ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'CLAUDE_API_KEY'],
|
|
237
237
|
modelCatalog: MODEL_CATALOG,
|
|
238
238
|
levelMapping: LEVEL_MAPPING,
|
|
239
239
|
defaultLevel: 'level2',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,KAAK,+BAA+B,EAGrC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,KAAK,+BAA+B,EAGrC,MAAM,UAAU,CAAC;AAyVlB,eAAO,MAAM,YAAY,EAAE,+BAoB1B,CAAC"}
|
|
@@ -46,6 +46,7 @@ function detectCliFeatures(helpText, versionText) {
|
|
|
46
46
|
supportsIgnoreUserConfig: !unknown && /--ignore-user-config\b/.test(help),
|
|
47
47
|
supportsIgnoreRules: !unknown && /--ignore-rules\b/.test(help),
|
|
48
48
|
supportsStrictConfig: !unknown && /--strict-config\b/.test(help),
|
|
49
|
+
supportsAddDir: !unknown && /--add-dir\b/.test(help),
|
|
49
50
|
unknown,
|
|
50
51
|
};
|
|
51
52
|
}
|
|
@@ -85,6 +86,14 @@ function addAutoApproveArgs(args, options) {
|
|
|
85
86
|
? 'danger-full-access'
|
|
86
87
|
: 'workspace-write';
|
|
87
88
|
args.push('--sandbox', sandboxMode, '--config', 'approval_policy="never"');
|
|
89
|
+
if (sandboxMode === 'workspace-write') {
|
|
90
|
+
args.push('--config', 'sandbox_workspace_write.network_access=true');
|
|
91
|
+
}
|
|
92
|
+
if (features.supportsAddDir) {
|
|
93
|
+
for (const directory of new Set(options.additionalWritableDirectories ?? [])) {
|
|
94
|
+
args.push('--add-dir', directory);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
88
97
|
}
|
|
89
98
|
}
|
|
90
99
|
function addSkipGitArgs(args, options) {
|
|
@@ -93,6 +102,16 @@ function addSkipGitArgs(args, options) {
|
|
|
93
102
|
args.push('--skip-git-repo-check');
|
|
94
103
|
}
|
|
95
104
|
}
|
|
105
|
+
function codexExecAuthEnv(authEnv) {
|
|
106
|
+
const openAiApiKey = authEnv.OPENAI_API_KEY;
|
|
107
|
+
if (openAiApiKey === undefined)
|
|
108
|
+
return authEnv;
|
|
109
|
+
const { OPENAI_API_KEY: _openAiApiKey, ...rest } = authEnv;
|
|
110
|
+
return {
|
|
111
|
+
...rest,
|
|
112
|
+
CODEX_API_KEY: rest.CODEX_API_KEY ?? openAiApiKey,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
96
115
|
function applySchemaArgs(args, cleanup, context, options) {
|
|
97
116
|
const features = (0, common_1.optionFeatures)(options);
|
|
98
117
|
if (options.jsonSchema && features.supportsOutputSchema) {
|
|
@@ -115,6 +134,11 @@ function collectWarnings(options) {
|
|
|
115
134
|
if (options.autoApprove && features.supportsAutoApprove === false) {
|
|
116
135
|
warnings.push((0, common_1.warning)('codex', 'codex-auto-approve', 'Codex CLI does not support unattended workspace-write mode; continuing without it.'));
|
|
117
136
|
}
|
|
137
|
+
if (options.autoApprove &&
|
|
138
|
+
(options.additionalWritableDirectories?.length ?? 0) > 0 &&
|
|
139
|
+
features.supportsAddDir === false) {
|
|
140
|
+
warnings.push((0, common_1.warning)('codex', 'codex-add-dir', 'Codex CLI does not support --add-dir; Git worktree metadata outside cwd may be read-only.'));
|
|
141
|
+
}
|
|
118
142
|
if (options.jsonSchema && features.supportsOutputSchema === false) {
|
|
119
143
|
warnings.push((0, common_1.warning)('codex', 'codex-jsonschema', 'Codex CLI does not support --output-schema; skipping schema flag.'));
|
|
120
144
|
}
|
|
@@ -137,6 +161,7 @@ function buildCommand(context, options = {}) {
|
|
|
137
161
|
}
|
|
138
162
|
const args = ['exec'];
|
|
139
163
|
const cleanup = [];
|
|
164
|
+
const authEnv = options.authEnv ?? {};
|
|
140
165
|
const resumeSessionId = options.resumeSessionId && (0, common_1.optionFeatures)(options).supportsResume !== false
|
|
141
166
|
? options.resumeSessionId
|
|
142
167
|
: null;
|
|
@@ -161,7 +186,7 @@ function buildCommand(context, options = {}) {
|
|
|
161
186
|
return (0, common_1.commandSpec)({
|
|
162
187
|
binary: 'codex',
|
|
163
188
|
args,
|
|
164
|
-
env:
|
|
189
|
+
env: codexExecAuthEnv(authEnv),
|
|
165
190
|
...(options.cwd === undefined ? {} : { cwd: options.cwd }),
|
|
166
191
|
cleanup,
|
|
167
192
|
cleanupMetadata: cleanup.map((schemaFile) => ({
|