@jini-ai/daemon 0.3.1 → 0.3.2
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/agent-executor.d.ts +64 -22
- package/dist/agent-executor.d.ts.map +1 -1
- package/dist/agent-executor.js +125 -46
- package/dist/agent-executor.js.map +1 -1
- package/dist/run-lifecycle.d.ts +36 -1
- package/dist/run-lifecycle.d.ts.map +1 -1
- package/dist/run-lifecycle.js +89 -0
- package/dist/run-lifecycle.js.map +1 -1
- package/package.json +4 -4
- package/dist/artifacts/index.d.ts +0 -14
- package/dist/artifacts/index.d.ts.map +0 -1
- package/dist/artifacts/index.js +0 -14
- package/dist/artifacts/index.js.map +0 -1
- package/dist/artifacts/manifest.d.ts +0 -90
- package/dist/artifacts/manifest.d.ts.map +0 -1
- package/dist/artifacts/manifest.js +0 -229
- package/dist/artifacts/manifest.js.map +0 -1
- package/dist/artifacts/publication-guard.d.ts +0 -28
- package/dist/artifacts/publication-guard.d.ts.map +0 -1
- package/dist/artifacts/publication-guard.js +0 -77
- package/dist/artifacts/publication-guard.js.map +0 -1
- package/dist/artifacts/runtime-compat.d.ts +0 -37
- package/dist/artifacts/runtime-compat.d.ts.map +0 -1
- package/dist/artifacts/runtime-compat.js +0 -33
- package/dist/artifacts/runtime-compat.js.map +0 -1
- package/dist/artifacts/store.d.ts +0 -85
- package/dist/artifacts/store.d.ts.map +0 -1
- package/dist/artifacts/store.js +0 -92
- package/dist/artifacts/store.js.map +0 -1
- package/dist/artifacts/stub-guard.d.ts +0 -73
- package/dist/artifacts/stub-guard.d.ts.map +0 -1
- package/dist/artifacts/stub-guard.js +0 -198
- package/dist/artifacts/stub-guard.js.map +0 -1
- package/dist/artifacts/text-suppression.d.ts +0 -68
- package/dist/artifacts/text-suppression.d.ts.map +0 -1
- package/dist/artifacts/text-suppression.js +0 -184
- package/dist/artifacts/text-suppression.js.map +0 -1
package/dist/agent-executor.d.ts
CHANGED
|
@@ -624,26 +624,23 @@ export declare function mergeEnvContentInstructions(existingRaw: string | undefi
|
|
|
624
624
|
export declare function buildCodexMcpServerToml(entry: McpJsonServerEntry): string;
|
|
625
625
|
/**
|
|
626
626
|
* Builds the full `config.toml` a run's scratch `CODEX_HOME` gets: the real Codex home's own
|
|
627
|
-
* config,
|
|
627
|
+
* config, with any pre-existing `[mcp_servers.jini]` table removed (see
|
|
628
|
+
* {@link stripExistingJiniMcpServerTable}), then this run's own table appended.
|
|
628
629
|
*
|
|
629
|
-
* **Append-only by design, not a parse-and-merge.**
|
|
630
|
-
* above can safely parse-merge-reserialize because
|
|
631
|
-
* (`JSON.parse`); this driver has no TOML parser in
|
|
632
|
-
* `buildCodexMcpServerToml`'s doc), and every other setting a real Codex
|
|
633
|
-
* choice, sandbox policy, the trusted-project list, the operator's own
|
|
634
|
-
* survive a spawn byte-for-byte.
|
|
635
|
-
*
|
|
636
|
-
*
|
|
637
|
-
* is this integration's own reserved server name (see {@link JINI_MCP_SERVER_KEY}), never suggested
|
|
638
|
-
* to an operator for their own config — rather than solved with a full TOML parser for one
|
|
639
|
-
* collision case.
|
|
630
|
+
* **Append-only by design, not a parse-and-merge, for everything but the jini table itself.**
|
|
631
|
+
* `mergeMcpJsonContent`/`mergeEnvContentMcpConfig` above can safely parse-merge-reserialize because
|
|
632
|
+
* their formats have a JS-native parser (`JSON.parse`); this driver has no general TOML parser in
|
|
633
|
+
* its dependency graph (see `buildCodexMcpServerToml`'s doc), and every other setting a real Codex
|
|
634
|
+
* install carries — model choice, sandbox policy, the trusted-project list, the operator's own
|
|
635
|
+
* other MCP servers — must survive a spawn byte-for-byte. Only the one table this driver itself
|
|
636
|
+
* owns (`jini` is this integration's own reserved server name — see {@link JINI_MCP_SERVER_KEY}) is
|
|
637
|
+
* ever removed, via the narrow line-oriented scan above, never a full TOML parse.
|
|
640
638
|
* @param existingRaw - The real Codex home's `config.toml` content, or `undefined` when it does not
|
|
641
639
|
* exist (a fresh Codex install — degrades to "start from just this run's block", matching
|
|
642
640
|
* {@link mergeMcpJsonContent}'s own "missing file" handling).
|
|
643
641
|
* @param entry - The shared bridge entry.
|
|
644
642
|
* @returns The full text to write to the scratch `CODEX_HOME`'s `config.toml`.
|
|
645
643
|
* @complexity O(n) in the existing config's length.
|
|
646
|
-
* @overallScore 100/100
|
|
647
644
|
*/
|
|
648
645
|
export declare function buildCodexHomeConfigToml(existingRaw: string | undefined, entry: McpJsonServerEntry): string;
|
|
649
646
|
/**
|
|
@@ -1042,6 +1039,43 @@ export declare function computeChildEnv(spawnEnv: NodeJS.ProcessEnv, mcpBridge:
|
|
|
1042
1039
|
export declare function computeRuntimeContext(preparedPromptFile: PreparedPromptFile | null, preparedLogFile: PreparedAgentLogFile | null, mcpBridge: McpBridgeDelivery | null, resumeSessionId?: string | null, newSessionId?: string): RuntimeContext | undefined;
|
|
1043
1040
|
/** Phase 9a: the def's `buildArgs` 4th argument — `undefined` when the run selects no model/reasoning/permissionMode/overlay at all (byte-identical to omitting the argument). Pure. */
|
|
1044
1041
|
export declare function buildAgentBuildArgsOptions(input: Pick<AgentExecutorRunInput, 'model' | 'reasoning' | 'permissionMode'>, systemPromptOverlay: string | null | undefined): RuntimeBuildOptions | undefined;
|
|
1042
|
+
/**
|
|
1043
|
+
* {@link resolveSystemPromptOverlayDelivery}'s decision, threaded out of that one resolver to every
|
|
1044
|
+
* channel that can actually carry the overlay to the CLI.
|
|
1045
|
+
*
|
|
1046
|
+
* **Why `promptPrefix` exists alongside `prompt`.** `prompt` is the composed prompt with the
|
|
1047
|
+
* fallback prefix already applied, and is what `buildArgs`, the staged prompt file, and a
|
|
1048
|
+
* `promptViaStdin` def's stdin all receive. But the two RPC transports (`runAcpDispatch`,
|
|
1049
|
+
* `runPiRpcDispatch`) deliberately send `run()`'s *raw* `input.prompt`, not the image-delivery
|
|
1050
|
+
* rewrite this resolver was handed — those defs deliver images through their own native protocol
|
|
1051
|
+
* and must never also get `'prompt-path'`'s appended paths (see `resolveImageDeliveryAndArgvBudget`'s
|
|
1052
|
+
* call site in `run()` for that hazard). Handing them `prompt` would silently couple them to the
|
|
1053
|
+
* image rewrite; handing them `promptPrefix + input.prompt` applies exactly this resolver's overlay
|
|
1054
|
+
* decision to exactly the prompt text they were already sending.
|
|
1055
|
+
*
|
|
1056
|
+
* **The no-double-delivery invariant.** `promptPrefix` is a non-empty string on exactly one path —
|
|
1057
|
+
* the universal fallback, the only strategy that carries the overlay *in the prompt text*. Every
|
|
1058
|
+
* declared strategy (`'append-flag'`, `'env-var'`, `'config-instructions-file'`) and every
|
|
1059
|
+
* suppressed case (no overlay, continuing a session) returns `''`, so a def that receives the
|
|
1060
|
+
* overlay through argv, an env var, or a staged config file never also receives it inline. A
|
|
1061
|
+
* transport therefore does not need to know which strategy applies: applying `promptPrefix`
|
|
1062
|
+
* unconditionally is correct precisely because the resolver already zeroed it where it must not
|
|
1063
|
+
* apply.
|
|
1064
|
+
*/
|
|
1065
|
+
export interface SystemPromptOverlayDelivery {
|
|
1066
|
+
/**
|
|
1067
|
+
* The text to prepend to whatever prompt a transport is about to send — `''` for every def whose
|
|
1068
|
+
* overlay rides another channel, so it is always safe to apply unconditionally. See this
|
|
1069
|
+
* interface's own doc for why callers with their own prompt text use this rather than `prompt`.
|
|
1070
|
+
*/
|
|
1071
|
+
readonly promptPrefix: string;
|
|
1072
|
+
/** `promptPrefix` already applied to the prompt this resolver was handed. */
|
|
1073
|
+
readonly prompt: string;
|
|
1074
|
+
/** Extra argv to append to `buildArgs`' own result — non-empty only for `'append-flag'`. */
|
|
1075
|
+
readonly extraArgs: readonly string[];
|
|
1076
|
+
/** Env vars to merge into the spawn env — non-empty only for `'env-var'`. */
|
|
1077
|
+
readonly envOverrides: Readonly<Record<string, string>>;
|
|
1078
|
+
}
|
|
1045
1079
|
/**
|
|
1046
1080
|
* **The single dispatch point from a computed system-prompt overlay to its delivery mechanism** —
|
|
1047
1081
|
* see `RuntimeAgentDef.systemPromptDelivery`'s own doc for the declared shape. Pure and
|
|
@@ -1077,9 +1111,11 @@ export declare function buildAgentBuildArgsOptions(input: Pick<AgentExecutorRunI
|
|
|
1077
1111
|
* @param input.prompt - The composed prompt `buildArgs` would otherwise receive verbatim.
|
|
1078
1112
|
* @param input.resumeSessionId - This run's `RuntimeContext.resumeSessionId`; presence means an
|
|
1079
1113
|
* existing session is being continued, not created.
|
|
1080
|
-
* @returns
|
|
1081
|
-
*
|
|
1082
|
-
*
|
|
1114
|
+
* @returns A {@link SystemPromptOverlayDelivery}: the prefix this run's prompt text must carry
|
|
1115
|
+
* (`''` unless the fallback applies), that prefix already applied to `input.prompt`, any extra argv
|
|
1116
|
+
* to append to whatever `buildArgs` itself returns, and any env var overrides to merge into the
|
|
1117
|
+
* spawn env (`{}` for every strategy but `'env-var'`). Every one of `run()`'s four prompt
|
|
1118
|
+
* transports consumes this same result — see the interface's own no-double-delivery note.
|
|
1083
1119
|
* @complexity O(n) in the overlay/prompt lengths — string concatenation only, no I/O.
|
|
1084
1120
|
* @overallScore 100/100
|
|
1085
1121
|
*/
|
|
@@ -1091,12 +1127,17 @@ export declare function resolveSystemPromptOverlayDelivery(input: {
|
|
|
1091
1127
|
readonly overlay: string | null | undefined;
|
|
1092
1128
|
readonly prompt: string;
|
|
1093
1129
|
readonly resumeSessionId: string | null | undefined;
|
|
1094
|
-
}):
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1130
|
+
}): SystemPromptOverlayDelivery;
|
|
1131
|
+
/**
|
|
1132
|
+
* Phase 9b: calls the def's `buildArgs`, releasing staged resources and failing the run on a throw.
|
|
1133
|
+
*
|
|
1134
|
+
* @param input.overlayDelivery - This run's already-resolved overlay decision, computed once in
|
|
1135
|
+
* `run()` rather than here. It is resolved upstream because `buildArgs` is only ONE of the four
|
|
1136
|
+
* channels that can carry the prompt: the staged prompt file is written *before* this function
|
|
1137
|
+
* runs, and stdin/ACP/pi-rpc send theirs *after* spawn. A decision made inside this function could
|
|
1138
|
+
* therefore only ever reach the 7 defs whose `buildArgs` reads its first argument at all — the
|
|
1139
|
+
* other 17 declare it `_prompt` and discard it, which is exactly how the overlay used to go missing.
|
|
1140
|
+
*/
|
|
1100
1141
|
export declare function buildRunArgs(input: {
|
|
1101
1142
|
readonly runId: string;
|
|
1102
1143
|
readonly def: RuntimeAgentDef;
|
|
@@ -1104,6 +1145,7 @@ export declare function buildRunArgs(input: {
|
|
|
1104
1145
|
readonly imagePaths: readonly string[] | undefined;
|
|
1105
1146
|
readonly runInput: Pick<AgentExecutorRunInput, 'model' | 'reasoning' | 'permissionMode'>;
|
|
1106
1147
|
readonly systemPromptOverlay: string | null | undefined;
|
|
1148
|
+
readonly overlayDelivery: SystemPromptOverlayDelivery;
|
|
1107
1149
|
readonly runtimeContext: RuntimeContext | undefined;
|
|
1108
1150
|
}, deps: {
|
|
1109
1151
|
readonly releaseStagedResources: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-executor.d.ts","sourceRoot":"","sources":["../src/agent-executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-executor.d.ts","sourceRoot":"","sources":["../src/agent-executor.ts"],"names":[],"mappings":"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"}
|
package/dist/agent-executor.js
CHANGED
|
@@ -849,31 +849,61 @@ export function buildCodexMcpServerToml(entry) {
|
|
|
849
849
|
return serverTable;
|
|
850
850
|
return `${serverTable}\n[mcp_servers.${JINI_MCP_SERVER_KEY}.env]\n${envLines.join('\n')}\n`;
|
|
851
851
|
}
|
|
852
|
+
/**
|
|
853
|
+
* Removes any pre-existing `[mcp_servers.{@link JINI_MCP_SERVER_KEY}]` table — and its
|
|
854
|
+
* `[mcp_servers.{@link JINI_MCP_SERVER_KEY}.*]` subtables (e.g. `.env`) — from a real Codex
|
|
855
|
+
* `config.toml`'s raw text, so {@link buildCodexHomeConfigToml} can append this run's own table
|
|
856
|
+
* without producing the duplicate TOML key Codex's parser rejects at startup.
|
|
857
|
+
*
|
|
858
|
+
* Line-oriented, not a real TOML parser (matching {@link buildCodexMcpServerToml}'s own
|
|
859
|
+
* no-TOML-dependency constraint): a table header is any line that is, after trimming, exactly
|
|
860
|
+
* `[...]`. Once such a header's key matches the jini table or one of its subtables, every following
|
|
861
|
+
* line is dropped until the next table header (of any name) or EOF. Every other table, key, and
|
|
862
|
+
* blank line is passed through untouched.
|
|
863
|
+
* @param existingRaw - The real Codex home's `config.toml` content, already known to be defined
|
|
864
|
+
* (callers pass `''` for a missing file).
|
|
865
|
+
* @returns `existingRaw` with any jini table/subtable removed.
|
|
866
|
+
* @complexity O(n) in the number of lines.
|
|
867
|
+
*/
|
|
868
|
+
function stripExistingJiniMcpServerTable(existingRaw) {
|
|
869
|
+
const jiniTableKey = `mcp_servers.${JINI_MCP_SERVER_KEY}`;
|
|
870
|
+
const kept = [];
|
|
871
|
+
let skipping = false;
|
|
872
|
+
for (const line of existingRaw.split('\n')) {
|
|
873
|
+
const header = /^\s*\[([^[\]]+)\]\s*$/.exec(line);
|
|
874
|
+
if (header) {
|
|
875
|
+
const key = (header[1] ?? '').trim();
|
|
876
|
+
skipping = key === jiniTableKey || key.startsWith(`${jiniTableKey}.`);
|
|
877
|
+
if (skipping)
|
|
878
|
+
continue;
|
|
879
|
+
}
|
|
880
|
+
if (!skipping)
|
|
881
|
+
kept.push(line);
|
|
882
|
+
}
|
|
883
|
+
return kept.join('\n');
|
|
884
|
+
}
|
|
852
885
|
/**
|
|
853
886
|
* Builds the full `config.toml` a run's scratch `CODEX_HOME` gets: the real Codex home's own
|
|
854
|
-
* config,
|
|
887
|
+
* config, with any pre-existing `[mcp_servers.jini]` table removed (see
|
|
888
|
+
* {@link stripExistingJiniMcpServerTable}), then this run's own table appended.
|
|
855
889
|
*
|
|
856
|
-
* **Append-only by design, not a parse-and-merge.**
|
|
857
|
-
* above can safely parse-merge-reserialize because
|
|
858
|
-
* (`JSON.parse`); this driver has no TOML parser in
|
|
859
|
-
* `buildCodexMcpServerToml`'s doc), and every other setting a real Codex
|
|
860
|
-
* choice, sandbox policy, the trusted-project list, the operator's own
|
|
861
|
-
* survive a spawn byte-for-byte.
|
|
862
|
-
*
|
|
863
|
-
*
|
|
864
|
-
* is this integration's own reserved server name (see {@link JINI_MCP_SERVER_KEY}), never suggested
|
|
865
|
-
* to an operator for their own config — rather than solved with a full TOML parser for one
|
|
866
|
-
* collision case.
|
|
890
|
+
* **Append-only by design, not a parse-and-merge, for everything but the jini table itself.**
|
|
891
|
+
* `mergeMcpJsonContent`/`mergeEnvContentMcpConfig` above can safely parse-merge-reserialize because
|
|
892
|
+
* their formats have a JS-native parser (`JSON.parse`); this driver has no general TOML parser in
|
|
893
|
+
* its dependency graph (see `buildCodexMcpServerToml`'s doc), and every other setting a real Codex
|
|
894
|
+
* install carries — model choice, sandbox policy, the trusted-project list, the operator's own
|
|
895
|
+
* other MCP servers — must survive a spawn byte-for-byte. Only the one table this driver itself
|
|
896
|
+
* owns (`jini` is this integration's own reserved server name — see {@link JINI_MCP_SERVER_KEY}) is
|
|
897
|
+
* ever removed, via the narrow line-oriented scan above, never a full TOML parse.
|
|
867
898
|
* @param existingRaw - The real Codex home's `config.toml` content, or `undefined` when it does not
|
|
868
899
|
* exist (a fresh Codex install — degrades to "start from just this run's block", matching
|
|
869
900
|
* {@link mergeMcpJsonContent}'s own "missing file" handling).
|
|
870
901
|
* @param entry - The shared bridge entry.
|
|
871
902
|
* @returns The full text to write to the scratch `CODEX_HOME`'s `config.toml`.
|
|
872
903
|
* @complexity O(n) in the existing config's length.
|
|
873
|
-
* @overallScore 100/100
|
|
874
904
|
*/
|
|
875
905
|
export function buildCodexHomeConfigToml(existingRaw, entry) {
|
|
876
|
-
const base = existingRaw ?? '';
|
|
906
|
+
const base = stripExistingJiniMcpServerTable(existingRaw ?? '');
|
|
877
907
|
const separator = base.length === 0 ? '' : base.endsWith('\n') ? '\n' : '\n\n';
|
|
878
908
|
return `${base}${separator}${buildCodexMcpServerToml(entry)}`;
|
|
879
909
|
}
|
|
@@ -2008,16 +2038,18 @@ export function buildAgentBuildArgsOptions(input, systemPromptOverlay) {
|
|
|
2008
2038
|
* @param input.prompt - The composed prompt `buildArgs` would otherwise receive verbatim.
|
|
2009
2039
|
* @param input.resumeSessionId - This run's `RuntimeContext.resumeSessionId`; presence means an
|
|
2010
2040
|
* existing session is being continued, not created.
|
|
2011
|
-
* @returns
|
|
2012
|
-
*
|
|
2013
|
-
*
|
|
2041
|
+
* @returns A {@link SystemPromptOverlayDelivery}: the prefix this run's prompt text must carry
|
|
2042
|
+
* (`''` unless the fallback applies), that prefix already applied to `input.prompt`, any extra argv
|
|
2043
|
+
* to append to whatever `buildArgs` itself returns, and any env var overrides to merge into the
|
|
2044
|
+
* spawn env (`{}` for every strategy but `'env-var'`). Every one of `run()`'s four prompt
|
|
2045
|
+
* transports consumes this same result — see the interface's own no-double-delivery note.
|
|
2014
2046
|
* @complexity O(n) in the overlay/prompt lengths — string concatenation only, no I/O.
|
|
2015
2047
|
* @overallScore 100/100
|
|
2016
2048
|
*/
|
|
2017
2049
|
export function resolveSystemPromptOverlayDelivery(input) {
|
|
2018
2050
|
const { defId, systemPromptDelivery, resumesSessionViaCli, resumesSessionViaAcpLoad, overlay, prompt, resumeSessionId } = input;
|
|
2019
2051
|
if (typeof overlay !== 'string' || overlay.length === 0) {
|
|
2020
|
-
return { prompt, extraArgs: [], envOverrides: {} };
|
|
2052
|
+
return { promptPrefix: '', prompt, extraArgs: [], envOverrides: {} };
|
|
2021
2053
|
}
|
|
2022
2054
|
if (systemPromptDelivery?.strategy === 'append-flag') {
|
|
2023
2055
|
const capabilityKey = systemPromptDelivery.capabilityKey;
|
|
@@ -2028,14 +2060,14 @@ export function resolveSystemPromptOverlayDelivery(input) {
|
|
|
2028
2060
|
// (e.g. `pi`'s existing `--append-system-prompt`, trusted unconditionally) always passes, same
|
|
2029
2061
|
// as an absent key.
|
|
2030
2062
|
const capabilityOk = capabilityKey === undefined || agentCapabilities.get(defId)?.[capabilityKey] !== false;
|
|
2031
|
-
return { prompt, extraArgs: capabilityOk ? [systemPromptDelivery.flag, overlay] : [], envOverrides: {} };
|
|
2063
|
+
return { promptPrefix: '', prompt, extraArgs: capabilityOk ? [systemPromptDelivery.flag, overlay] : [], envOverrides: {} };
|
|
2032
2064
|
}
|
|
2033
2065
|
if (systemPromptDelivery?.strategy === 'env-var') {
|
|
2034
2066
|
// No capability gate, unlike `'append-flag'`: an unrecognized env var is inert to a CLI (it
|
|
2035
2067
|
// simply never reads it), never a fatal "unknown option" exit — there is no equivalent hazard
|
|
2036
2068
|
// to probe-gate against here. Set verbatim, not merged with any existing value — a dedicated
|
|
2037
2069
|
// single-purpose var, not a shared config channel (see this field's own `types.ts` doc).
|
|
2038
|
-
return { prompt, extraArgs: [], envOverrides: { [systemPromptDelivery.varName]: overlay } };
|
|
2070
|
+
return { promptPrefix: '', prompt, extraArgs: [], envOverrides: { [systemPromptDelivery.varName]: overlay } };
|
|
2039
2071
|
}
|
|
2040
2072
|
if (systemPromptDelivery?.strategy === 'config-instructions-file') {
|
|
2041
2073
|
// Delivered elsewhere, not here: unlike `'append-flag'`/`'env-var'`, this mechanism needs real
|
|
@@ -2047,13 +2079,13 @@ export function resolveSystemPromptOverlayDelivery(input) {
|
|
|
2047
2079
|
// This branch's only job is to make sure the universal prefix fallback below does NOT ALSO run
|
|
2048
2080
|
// for a def that already has this strategy declared — the same "no double delivery" concern
|
|
2049
2081
|
// `imageDelivery`'s doc calls out for its own native-vs-fallback split.
|
|
2050
|
-
return { prompt, extraArgs: [], envOverrides: {} };
|
|
2082
|
+
return { promptPrefix: '', prompt, extraArgs: [], envOverrides: {} };
|
|
2051
2083
|
}
|
|
2052
2084
|
const isContinuingExistingSession = (resumesSessionViaCli === true || resumesSessionViaAcpLoad === true) &&
|
|
2053
2085
|
typeof resumeSessionId === 'string' &&
|
|
2054
2086
|
resumeSessionId.length > 0;
|
|
2055
2087
|
if (isContinuingExistingSession) {
|
|
2056
|
-
return { prompt, extraArgs: [], envOverrides: {} };
|
|
2088
|
+
return { promptPrefix: '', prompt, extraArgs: [], envOverrides: {} };
|
|
2057
2089
|
}
|
|
2058
2090
|
// KNOWN TRADE-OFF, deliberate: for a resume-capable def with no `'append-flag'`/`'env-var'`
|
|
2059
2091
|
// mechanism yet (`codex`, `codebuddy`, `opencode`, `amr` — all four presently on this fallback),
|
|
@@ -2070,22 +2102,22 @@ export function resolveSystemPromptOverlayDelivery(input) {
|
|
|
2070
2102
|
// is part of what a resumed session replays), which removes this limitation entirely for that
|
|
2071
2103
|
// def. See `reasonix.ts`'s and `opencode.ts`'s module docs for the two already-identified,
|
|
2072
2104
|
// not-yet-wired native mechanisms.
|
|
2073
|
-
|
|
2105
|
+
const promptPrefix = `${overlay}\n\n---\n\n`;
|
|
2106
|
+
return { promptPrefix, prompt: `${promptPrefix}${prompt}`, extraArgs: [], envOverrides: {} };
|
|
2074
2107
|
}
|
|
2075
|
-
/**
|
|
2108
|
+
/**
|
|
2109
|
+
* Phase 9b: calls the def's `buildArgs`, releasing staged resources and failing the run on a throw.
|
|
2110
|
+
*
|
|
2111
|
+
* @param input.overlayDelivery - This run's already-resolved overlay decision, computed once in
|
|
2112
|
+
* `run()` rather than here. It is resolved upstream because `buildArgs` is only ONE of the four
|
|
2113
|
+
* channels that can carry the prompt: the staged prompt file is written *before* this function
|
|
2114
|
+
* runs, and stdin/ACP/pi-rpc send theirs *after* spawn. A decision made inside this function could
|
|
2115
|
+
* therefore only ever reach the 7 defs whose `buildArgs` reads its first argument at all — the
|
|
2116
|
+
* other 17 declare it `_prompt` and discard it, which is exactly how the overlay used to go missing.
|
|
2117
|
+
*/
|
|
2076
2118
|
export async function buildRunArgs(input, deps) {
|
|
2077
2119
|
try {
|
|
2078
|
-
|
|
2079
|
-
// overlay already prefixed into `prompt` — see `resolveSystemPromptOverlayDelivery`'s own doc.
|
|
2080
|
-
const delivery = resolveSystemPromptOverlayDelivery({
|
|
2081
|
-
defId: input.def.id,
|
|
2082
|
-
systemPromptDelivery: input.def.systemPromptDelivery,
|
|
2083
|
-
resumesSessionViaCli: input.def.resumesSessionViaCli,
|
|
2084
|
-
resumesSessionViaAcpLoad: input.def.resumesSessionViaAcpLoad,
|
|
2085
|
-
overlay: input.systemPromptOverlay,
|
|
2086
|
-
prompt: input.imageDelivery.prompt,
|
|
2087
|
-
resumeSessionId: input.runtimeContext?.resumeSessionId,
|
|
2088
|
-
});
|
|
2120
|
+
const delivery = input.overlayDelivery;
|
|
2089
2121
|
const args = input.def.buildArgs(delivery.prompt, [...(input.imagePaths ?? [])], input.imageDelivery.extraAllowedDirs === undefined ? undefined : [...input.imageDelivery.extraAllowedDirs], buildAgentBuildArgsOptions(input.runInput, input.systemPromptOverlay), input.runtimeContext);
|
|
2090
2122
|
// `'append-flag'` delivery's extra argv (empty for every other def/strategy) is appended after
|
|
2091
2123
|
// whatever the def's own `buildArgs` returned — safe because it is only ever non-empty for a
|
|
@@ -2359,13 +2391,46 @@ export function createAgentExecutor(options) {
|
|
|
2359
2391
|
// defs' own native protocol already delivers the image and must never also get this
|
|
2360
2392
|
// treatment (the double-delivery hazard this mechanism exists to avoid).
|
|
2361
2393
|
const imageDelivery = await resolveImageDeliveryAndArgvBudget({ runId: input.runId, def, prompt: input.prompt, imagePaths: input.imagePaths, extraAllowedDirs: input.extraAllowedDirs }, { failBeforeSpawn });
|
|
2394
|
+
// Phase 8, hoisted deliberately above EVERY step that writes or sends the prompt. Four
|
|
2395
|
+
// different channels carry a prompt in this driver, and they do not all run at the same point:
|
|
2396
|
+
// the `promptViaFile` staging below writes its file BEFORE `buildArgs`, `buildArgs` itself runs
|
|
2397
|
+
// mid-`run()`, and stdin/ACP/pi-rpc all send theirs AFTER spawn. Resolving the overlay once,
|
|
2398
|
+
// here, is what lets all four consume the same decision; resolving it later (as this used to,
|
|
2399
|
+
// inside `buildRunArgs`) could only ever reach `buildArgs`, so the 17 defs that discard that
|
|
2400
|
+
// argument, plus grok-build's staged file, silently received no overlay at all.
|
|
2401
|
+
//
|
|
2402
|
+
// `computeSystemPromptOverlay`'s third argument is the pre-staging `RuntimeContext`: it reads
|
|
2403
|
+
// only `hasPriorAssistantTurn`, which `computeRuntimeContext` never populates from any of the
|
|
2404
|
+
// staged-file/MCP inputs added to the fuller context built further down, so nothing between
|
|
2405
|
+
// here and there can change the overlay this returns. Passing the narrower context makes that
|
|
2406
|
+
// independence explicit rather than relying on the ordering staying lucky.
|
|
2407
|
+
//
|
|
2408
|
+
// `turnIndex` is a coarse 0/1 proxy (no exact turn counter exists on this driver) — sufficient
|
|
2409
|
+
// because every `PromptAugmenter.systemOverlay()` implementation this seam has today wants the
|
|
2410
|
+
// same overlay on every turn, not a first-turn-only one; a caller that needs finer-grained turn
|
|
2411
|
+
// numbering can track it itself and ignore this arg.
|
|
2412
|
+
const preStagingRuntimeContext = computeRuntimeContext(null, null, null, input.resumeSessionId, input.newSessionId);
|
|
2413
|
+
const systemPromptOverlay = computeSystemPromptOverlay(promptAugmenter, def.id, preStagingRuntimeContext);
|
|
2414
|
+
const overlayDelivery = resolveSystemPromptOverlayDelivery({
|
|
2415
|
+
defId: def.id,
|
|
2416
|
+
systemPromptDelivery: def.systemPromptDelivery,
|
|
2417
|
+
resumesSessionViaCli: def.resumesSessionViaCli,
|
|
2418
|
+
resumesSessionViaAcpLoad: def.resumesSessionViaAcpLoad,
|
|
2419
|
+
overlay: systemPromptOverlay,
|
|
2420
|
+
prompt: imageDelivery.prompt,
|
|
2421
|
+
resumeSessionId: preStagingRuntimeContext?.resumeSessionId,
|
|
2422
|
+
});
|
|
2362
2423
|
const resolvedEnv = resolveRunEnv(input, process.env);
|
|
2363
2424
|
const launch = await resolveLaunch({ runId: input.runId, def, resolvedEnv }, { resolveAgentLaunch: resolveAgentLaunchFn, failBeforeSpawn });
|
|
2364
2425
|
const spawnEnv = applyAgentLaunchEnvFn({ ...resolvedEnv }, launch);
|
|
2365
2426
|
// Stage a promptViaFile def's (grok-build) prompt to a temp file before buildArgs runs — its
|
|
2366
2427
|
// buildArgs throws without runtimeContext.promptFilePath. A no-op (returns null) for every
|
|
2367
2428
|
// def without promptViaFile: true (preparePromptFileForAgent's own guard).
|
|
2368
|
-
|
|
2429
|
+
//
|
|
2430
|
+
// `overlayDelivery.prompt`, not `imageDelivery.prompt`: for a `promptViaFile` def this file IS
|
|
2431
|
+
// the prompt transport — its `buildArgs` declares `_prompt` and passes only the path — so the
|
|
2432
|
+
// overlay has to be in the bytes written here or the CLI never sees it at all.
|
|
2433
|
+
const preparedPromptFile = await stagePromptFile({ runId: input.runId, def, prompt: overlayDelivery.prompt }, { preparePromptFileForAgent: preparePromptFileForAgentFn, failBeforeSpawn });
|
|
2369
2434
|
// Stage a needsAgentLogFile def's (antigravity) diagnostic-log path, on the same terms and at
|
|
2370
2435
|
// the same point as the prompt file above: before buildArgs, since buildArgs is what turns the
|
|
2371
2436
|
// path into a `--log-file <path>` argument. A no-op (returns null) for every def without
|
|
@@ -2452,12 +2517,6 @@ export function createAgentExecutor(options) {
|
|
|
2452
2517
|
releaseRuntimeLock();
|
|
2453
2518
|
await cleanupStagedFiles();
|
|
2454
2519
|
};
|
|
2455
|
-
// Computed once per `run()`, not per-token/per-event: a system-prompt overlay is a spawn-time
|
|
2456
|
-
// CLI arg, not something that varies mid-run. `turnIndex` is a coarse 0/1 proxy (no exact turn
|
|
2457
|
-
// counter exists on this driver) — sufficient because every `PromptAugmenter.systemOverlay()`
|
|
2458
|
-
// implementation this seam has today wants the same overlay on every turn, not a first-turn-only
|
|
2459
|
-
// one; a caller that needs finer-grained turn numbering can track it itself and ignore this arg.
|
|
2460
|
-
const systemPromptOverlay = computeSystemPromptOverlay(promptAugmenter, def.id, runtimeContext);
|
|
2461
2520
|
// Guarded, like every other step between staging and spawn: a `runtimeLock` def's `buildArgs` is
|
|
2462
2521
|
// guarded precisely *because* it performs real filesystem writes (antigravity writes its model
|
|
2463
2522
|
// choice into a shared settings file), so EACCES on a read-only home, ENOSPC, or a malformed
|
|
@@ -2465,7 +2524,7 @@ export function createAgentExecutor(options) {
|
|
|
2465
2524
|
// `Error` — breaking this driver's "never a bare throw, always an `AgentExecutorError`" contract
|
|
2466
2525
|
// — and left the run `'running'` forever while still holding the process-global mutex and both
|
|
2467
2526
|
// staged files, so no later run of that def could ever acquire the lock either.
|
|
2468
|
-
const { args, envOverrides: systemPromptEnvOverrides } = await buildRunArgs({ runId: input.runId, def, imageDelivery, imagePaths: input.imagePaths, runInput: input, systemPromptOverlay, runtimeContext }, { releaseStagedResources, failBeforeSpawn });
|
|
2527
|
+
const { args, envOverrides: systemPromptEnvOverrides } = await buildRunArgs({ runId: input.runId, def, imageDelivery, imagePaths: input.imagePaths, runInput: input, systemPromptOverlay, overlayDelivery, runtimeContext }, { releaseStagedResources, failBeforeSpawn });
|
|
2469
2528
|
// Mechanism 1 of 5's one effect — stage this run's own MCP config file (run-scoped, see
|
|
2470
2529
|
// `mcpJsonPathForRun`) before spawn so the `--mcp-config <path>` argv buildArgs just produced
|
|
2471
2530
|
// points at a real file. Skipped entirely for the other four mechanisms and whenever no bridge
|
|
@@ -2545,7 +2604,14 @@ export function createAgentExecutor(options) {
|
|
|
2545
2604
|
runId: input.runId,
|
|
2546
2605
|
agentId: def.id,
|
|
2547
2606
|
child,
|
|
2548
|
-
|
|
2607
|
+
// `overlayDelivery.promptPrefix` applied to `input.prompt`, NOT `overlayDelivery.prompt`:
|
|
2608
|
+
// this call site deliberately sends the raw input prompt rather than the image-delivery
|
|
2609
|
+
// rewrite (see `resolveImageDeliveryAndArgvBudget`'s call site above — an ACP def delivers
|
|
2610
|
+
// images natively and must never also get `'prompt-path'`'s appended paths), and the prefix
|
|
2611
|
+
// is the part of the overlay decision that applies to whatever prompt text a transport was
|
|
2612
|
+
// already sending. `''` for `reasonix` (env-var) and any resumed ACP session, so those keep
|
|
2613
|
+
// sending byte-identical text and never receive the overlay twice.
|
|
2614
|
+
prompt: `${overlayDelivery.promptPrefix}${input.prompt}`,
|
|
2549
2615
|
cwd: input.cwd,
|
|
2550
2616
|
model: input.model,
|
|
2551
2617
|
imagePaths: input.imagePaths ?? [],
|
|
@@ -2572,7 +2638,10 @@ export function createAgentExecutor(options) {
|
|
|
2572
2638
|
runId: input.runId,
|
|
2573
2639
|
agentId: def.id,
|
|
2574
2640
|
child,
|
|
2575
|
-
|
|
2641
|
+
// Same reasoning as the ACP call site above. `pi` declares an `'append-flag'` strategy,
|
|
2642
|
+
// so its prefix is `''` and this stays byte-identical to the raw prompt — the overlay
|
|
2643
|
+
// rides `--append-system-prompt` instead, exactly once.
|
|
2644
|
+
prompt: `${overlayDelivery.promptPrefix}${input.prompt}`,
|
|
2576
2645
|
cwd: input.cwd,
|
|
2577
2646
|
model: input.model,
|
|
2578
2647
|
imagePaths: input.imagePaths ?? [],
|
|
@@ -2592,7 +2661,17 @@ export function createAgentExecutor(options) {
|
|
|
2592
2661
|
});
|
|
2593
2662
|
return;
|
|
2594
2663
|
}
|
|
2595
|
-
|
|
2664
|
+
// The overlay reaches stdin only for a def that declares stdin as its prompt transport. The
|
|
2665
|
+
// four `plain`-format defs that do not (`aider`/`antigravity`/`deepseek` put the prompt in
|
|
2666
|
+
// argv, `grok-build` in a staged file) are still written to and closed here exactly as before,
|
|
2667
|
+
// because this driver always spawns with `stdio: ['pipe','pipe','pipe']` and their CLIs need
|
|
2668
|
+
// the EOF — but their prompt already carried the overlay through argv or the staged file, so
|
|
2669
|
+
// sending the overlaid text here too would deliver it twice. This is the one place the
|
|
2670
|
+
// resolver's own `''`-prefix rule is not sufficient on its own: those four defs are on the
|
|
2671
|
+
// fallback strategy, so their prefix is genuinely non-empty; what makes stdin the wrong
|
|
2672
|
+
// channel for them is the def's declared transport, not the strategy.
|
|
2673
|
+
const stdinPrompt = def.promptViaStdin === true ? overlayDelivery.prompt : imageDelivery.prompt;
|
|
2674
|
+
writePromptToStdin(def, child, stdinPrompt, stdinHandle);
|
|
2596
2675
|
}
|
|
2597
2676
|
return { run };
|
|
2598
2677
|
}
|