veryfront 0.1.788 → 0.1.790
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/esm/deno.js +1 -1
- package/esm/src/agent/hosted/child-fork-execution-runner.d.ts.map +1 -1
- package/esm/src/agent/hosted/child-fork-execution-runner.js +7 -2
- package/esm/src/agent/hosted/child-tool-input.d.ts +13 -0
- package/esm/src/agent/hosted/child-tool-input.d.ts.map +1 -1
- package/esm/src/agent/hosted/child-tool-input.js +66 -6
- package/esm/src/agent/hosted/default-invoke-agent-tool.d.ts.map +1 -1
- package/esm/src/agent/hosted/default-invoke-agent-tool.js +9 -4
- package/esm/src/agent/hosted/durable-child-fork-execution.d.ts +1 -1
- package/esm/src/agent/hosted/durable-child-fork-execution.d.ts.map +1 -1
- package/esm/src/agent/hosted/durable-child-fork-execution.js +13 -2
- package/esm/src/release-assets/manifest-cache.d.ts.map +1 -1
- package/esm/src/release-assets/manifest-cache.js +13 -2
- package/esm/src/utils/version-constant.d.ts +1 -1
- package/esm/src/utils/version-constant.js +1 -1
- package/package.json +1 -1
package/esm/deno.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-fork-execution-runner.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-execution-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAKL,KAAK,gCAAgC,EACtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,wCAAwC,EAAE,MAAM,4BAA4B,CAAC;AAK3F,OAAO,EAEL,KAAK,kCAAkC,EACxC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,KAAK,wCAAwC,EAE9C,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,KAAK,6BAA6B,EAElC,KAAK,6CAA6C,EACnD,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAEV,+CAA+C,EAChD,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,KAAK,EACV,2BAA2B,EAC3B,+BAA+B,EAChC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,wBAAwB,EAE7B,KAAK,wCAAwC,
|
|
1
|
+
{"version":3,"file":"child-fork-execution-runner.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-execution-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { prepareHostedChildForkRuntimeStepMessages, } from "./child-fork-step-me
|
|
|
6
6
|
import { startHostedChildForkRuntimeWithHostTools, } from "./child-fork-runtime-start.js";
|
|
7
7
|
import { runAgentRuntimeForkStep, } from "../streaming/fork-runtime-stream.js";
|
|
8
8
|
import { throwIfChildRunAborted } from "../child-run/execution-support.js";
|
|
9
|
-
import { resolveHostedChildForkRuntimeConfig, } from "./child-tool-input.js";
|
|
9
|
+
import { resolveHostedChildForkRuntimeConfig, withHostedChildInvocationContext, } from "./child-tool-input.js";
|
|
10
10
|
/** Default value for hosted child fork stream idle timeout ms. */
|
|
11
11
|
export const DEFAULT_HOSTED_CHILD_FORK_STREAM_IDLE_TIMEOUT_MS = 45_000;
|
|
12
12
|
/** Default value for hosted child fork stream active tool timeout ms. */
|
|
@@ -56,8 +56,13 @@ export async function executeHostedChildForkToolInput(input) {
|
|
|
56
56
|
if (input.forkInput.project_id) {
|
|
57
57
|
await input.onRequestedProjectId?.(input.forkInput.project_id);
|
|
58
58
|
}
|
|
59
|
+
const forkInput = withHostedChildInvocationContext(input.forkInput, {
|
|
60
|
+
conversationId: input.conversationId,
|
|
61
|
+
parentRunId: input.parentRunId,
|
|
62
|
+
toolCallId: input.toolCallId,
|
|
63
|
+
});
|
|
59
64
|
const runtimeConfig = resolveHostedChildForkRuntimeConfig({
|
|
60
|
-
forkInput
|
|
65
|
+
forkInput,
|
|
61
66
|
contextModel: input.contextModel,
|
|
62
67
|
defaultModel: input.defaultModel,
|
|
63
68
|
defaultMaxSteps: input.defaultMaxSteps,
|
|
@@ -37,6 +37,12 @@ export type HostedChildForkRuntimeConfig = {
|
|
|
37
37
|
maxSteps: number;
|
|
38
38
|
thinkingConfig: RuntimeAgentThinkingConfig | undefined;
|
|
39
39
|
};
|
|
40
|
+
/** Adds Veryfront invocation metadata to hosted child fork input. */
|
|
41
|
+
export declare function withHostedChildInvocationContext(forkInput: HostedChildForkToolInput, input: {
|
|
42
|
+
conversationId?: string;
|
|
43
|
+
parentRunId?: string;
|
|
44
|
+
toolCallId: string;
|
|
45
|
+
}): HostedChildForkToolInput;
|
|
40
46
|
/** Input payload for resolve hosted child fork runtime config. */
|
|
41
47
|
export type ResolveHostedChildForkRuntimeConfigInput = {
|
|
42
48
|
forkInput: Pick<HostedChildForkToolInput, "description" | "prompt" | "context" | "tools" | "model" | "thinking" | "max_steps">;
|
|
@@ -49,6 +55,13 @@ export type ResolveHostedChildForkRuntimeConfigInput = {
|
|
|
49
55
|
};
|
|
50
56
|
/** Resolves hosted child fork thinking override. */
|
|
51
57
|
export declare function resolveHostedChildForkThinkingOverride(thinking: HostedChildForkToolInput["thinking"]): RuntimeAgentThinkingConfig | undefined;
|
|
58
|
+
/** Builds the effective hosted child fork prompt. */
|
|
59
|
+
export declare function buildHostedChildForkEffectivePrompt(input: {
|
|
60
|
+
description: string;
|
|
61
|
+
prompt: string;
|
|
62
|
+
context: HostedChildForkToolInput["context"];
|
|
63
|
+
runId: string;
|
|
64
|
+
}): string;
|
|
52
65
|
/** Configuration used by resolve hosted child fork runtime. */
|
|
53
66
|
export declare function resolveHostedChildForkRuntimeConfig(input: ResolveHostedChildForkRuntimeConfigInput): HostedChildForkRuntimeConfig;
|
|
54
67
|
//# sourceMappingURL=child-tool-input.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-tool-input.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-tool-input.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,+CAA+C;AAC/C,eAAO,MAAM,6BAA6B,uBAAuB,CAAC;AAElE,eAAO,MAAM,iCAAiC;;;;;;;;;GAuB7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B;;;;;;;;;GAAgD,CAAC;AAE5F,gDAAgD;AAChD,MAAM,MAAM,wBAAwB,GAAG,WAAW,CAChD,UAAU,CAAC,OAAO,iCAAiC,CAAC,CACrD,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,0BAA0B,GAAG,SAAS,CAAC;CACxD,CAAC;
|
|
1
|
+
{"version":3,"file":"child-tool-input.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-tool-input.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,+CAA+C;AAC/C,eAAO,MAAM,6BAA6B,uBAAuB,CAAC;AAElE,eAAO,MAAM,iCAAiC;;;;;;;;;GAuB7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B;;;;;;;;;GAAgD,CAAC;AAE5F,gDAAgD;AAChD,MAAM,MAAM,wBAAwB,GAAG,WAAW,CAChD,UAAU,CAAC,OAAO,iCAAiC,CAAC,CACrD,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,0BAA0B,GAAG,SAAS,CAAC;CACxD,CAAC;AAuDF,qEAAqE;AACrE,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,wBAAwB,EACnC,KAAK,EAAE;IACL,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,GACA,wBAAwB,CAQ1B;AAED,kEAAkE;AAClE,MAAM,MAAM,wCAAwC,GAAG;IACrD,SAAS,EAAE,IAAI,CACb,wBAAwB,EACtB,aAAa,GACb,QAAQ,GACR,SAAS,GACT,OAAO,GACP,OAAO,GACP,UAAU,GACV,WAAW,CACd,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C,CAAC;AAEF,oDAAoD;AACpD,wBAAgB,sCAAsC,CACpD,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,GAC7C,0BAA0B,GAAG,SAAS,CAUxC;AAWD,qDAAqD;AACrD,wBAAgB,mCAAmC,CAAC,KAAK,EAAE;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC7C,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,MAAM,CAQT;AAED,+DAA+D;AAC/D,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,wCAAwC,GAC9C,4BAA4B,CAmB9B"}
|
|
@@ -20,6 +20,57 @@ export const getHostedChildForkToolInputSchema = defineSchema((v) => v.object({
|
|
|
20
20
|
* @deprecated Use getHostedChildForkToolInputSchema()
|
|
21
21
|
*/
|
|
22
22
|
export const hostedChildForkToolInputSchema = lazySchema(getHostedChildForkToolInputSchema);
|
|
23
|
+
function getStringRecord(value) {
|
|
24
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
25
|
+
return {};
|
|
26
|
+
}
|
|
27
|
+
const record = {};
|
|
28
|
+
for (const [key, property] of Object.entries(value)) {
|
|
29
|
+
if (typeof property === "string") {
|
|
30
|
+
record[key] = property;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return record;
|
|
34
|
+
}
|
|
35
|
+
function buildHostedChildInvocationContext(forkInput, input) {
|
|
36
|
+
const existing = getStringRecord(forkInput.context?.veryfront_invocation_context);
|
|
37
|
+
const rootConversationId = existing.root_conversation_id || input.conversationId;
|
|
38
|
+
const rootRunId = existing.root_run_id || input.parentRunId;
|
|
39
|
+
return {
|
|
40
|
+
...existing,
|
|
41
|
+
...(rootConversationId
|
|
42
|
+
? {
|
|
43
|
+
root_conversation_id: rootConversationId,
|
|
44
|
+
}
|
|
45
|
+
: {}),
|
|
46
|
+
...(input.conversationId
|
|
47
|
+
? {
|
|
48
|
+
parent_conversation_id: input.conversationId,
|
|
49
|
+
}
|
|
50
|
+
: {}),
|
|
51
|
+
...(rootRunId
|
|
52
|
+
? {
|
|
53
|
+
root_run_id: rootRunId,
|
|
54
|
+
}
|
|
55
|
+
: {}),
|
|
56
|
+
...(input.parentRunId
|
|
57
|
+
? {
|
|
58
|
+
parent_run_id: input.parentRunId,
|
|
59
|
+
}
|
|
60
|
+
: {}),
|
|
61
|
+
tool_call_id: input.toolCallId,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
/** Adds Veryfront invocation metadata to hosted child fork input. */
|
|
65
|
+
export function withHostedChildInvocationContext(forkInput, input) {
|
|
66
|
+
return {
|
|
67
|
+
...forkInput,
|
|
68
|
+
context: {
|
|
69
|
+
...(forkInput.context ?? {}),
|
|
70
|
+
veryfront_invocation_context: buildHostedChildInvocationContext(forkInput, input),
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
23
74
|
/** Resolves hosted child fork thinking override. */
|
|
24
75
|
export function resolveHostedChildForkThinkingOverride(thinking) {
|
|
25
76
|
if (thinking === 0) {
|
|
@@ -33,19 +84,28 @@ export function resolveHostedChildForkThinkingOverride(thinking) {
|
|
|
33
84
|
function appendStructuredContextToPrompt(prompt, context) {
|
|
34
85
|
return `${prompt}\n\n<structured_context>\n${JSON.stringify(context)}\n</structured_context>\nTreat structured_context as the authoritative data payload for the child task. If prose conflicts with structured_context, use structured_context and say what conflicted.`;
|
|
35
86
|
}
|
|
87
|
+
/** Builds the effective hosted child fork prompt. */
|
|
88
|
+
export function buildHostedChildForkEffectivePrompt(input) {
|
|
89
|
+
const promptWithArtifactPath = withDefaultResearchArtifactPath({
|
|
90
|
+
description: input.description,
|
|
91
|
+
prompt: input.prompt,
|
|
92
|
+
runId: input.runId,
|
|
93
|
+
});
|
|
94
|
+
return appendStructuredContextToPrompt(promptWithArtifactPath, input.context);
|
|
95
|
+
}
|
|
36
96
|
/** Configuration used by resolve hosted child fork runtime. */
|
|
37
97
|
export function resolveHostedChildForkRuntimeConfig(input) {
|
|
38
98
|
const { description, prompt, context, tools, model, thinking, max_steps } = input.forkInput;
|
|
39
99
|
const forkModel = input.resolveModelId(model || input.contextModel || input.defaultModel);
|
|
40
100
|
const requestedMaxSteps = typeof max_steps === "number" ? max_steps : undefined;
|
|
41
|
-
const promptWithArtifactPath = withDefaultResearchArtifactPath({
|
|
42
|
-
description,
|
|
43
|
-
prompt,
|
|
44
|
-
runId: input.runId,
|
|
45
|
-
});
|
|
46
101
|
return {
|
|
47
102
|
description,
|
|
48
|
-
effectivePrompt:
|
|
103
|
+
effectivePrompt: buildHostedChildForkEffectivePrompt({
|
|
104
|
+
description,
|
|
105
|
+
prompt,
|
|
106
|
+
context,
|
|
107
|
+
runId: input.runId,
|
|
108
|
+
}),
|
|
49
109
|
requestedTools: tools,
|
|
50
110
|
forkModel,
|
|
51
111
|
provider: input.resolveProvider(forkModel),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-invoke-agent-tool.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/default-invoke-agent-tool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAEL,gCAAgC,EAChC,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EAErB,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,kCAAkC,CAAC;AAErF,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAK1E,OAAO,EAAE,+CAA+C,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAQnF,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAML,KAAK,8BAA8B,EACpC,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAEL,KAAK,4BAA4B,
|
|
1
|
+
{"version":3,"file":"default-invoke-agent-tool.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/default-invoke-agent-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ import { runHostedChildExecutionLifecycle, shouldSkipHostedChildTerminalPersiste
|
|
|
15
15
|
import { createLiveStudioMcpTools } from "../project/live-studio-mcp-tools.js";
|
|
16
16
|
import { applyAgentProjectContextChange, } from "../project/context.js";
|
|
17
17
|
import { buildHostedDurableChildInvokeFailureResult, createHostedDurableChildInvokeTraceRecorder, executeHostedDurableChildFork, executeHostedLocalChildInvoke, } from "./durable-child-fork-execution.js";
|
|
18
|
-
import { getHostedChildForkToolInputSchema, } from "./child-tool-input.js";
|
|
18
|
+
import { getHostedChildForkToolInputSchema, withHostedChildInvocationContext, } from "./child-tool-input.js";
|
|
19
19
|
import { prepareDefaultHostedChildForkToolAssembly } from "./child-requested-tools.js";
|
|
20
20
|
import { withRootOwnedChildResultHint } from "../conversation/delegation-policy.js";
|
|
21
21
|
const defaultHostedInvokeAgentSelectionFields = (v) => ({
|
|
@@ -194,6 +194,11 @@ export async function executeDefaultHostedInvokeAgentTool(options, input, childA
|
|
|
194
194
|
const config = options.getConfig();
|
|
195
195
|
const toolCallId = getToolCallId(executionContext);
|
|
196
196
|
const abortSignal = getAbortSignal(executionContext);
|
|
197
|
+
const forkInput = withHostedChildInvocationContext(input, {
|
|
198
|
+
conversationId: options.context.conversationId,
|
|
199
|
+
parentRunId: options.context.parentRunId,
|
|
200
|
+
toolCallId,
|
|
201
|
+
});
|
|
197
202
|
const durableInvokeRecorder = createHostedDurableChildInvokeTraceRecorder({
|
|
198
203
|
traceBase: {
|
|
199
204
|
conversationId: options.context.conversationId,
|
|
@@ -205,7 +210,7 @@ export async function executeDefaultHostedInvokeAgentTool(options, input, childA
|
|
|
205
210
|
executionFailedCode: "INVOKE_AGENT_FAILED",
|
|
206
211
|
setTraceAttributes: options.setTraceAttributes,
|
|
207
212
|
});
|
|
208
|
-
const executeLocalInvoke = (runtimeOptions = {}) => executeForkTask(options,
|
|
213
|
+
const executeLocalInvoke = (runtimeOptions = {}) => executeForkTask(options, forkInput, {
|
|
209
214
|
toolCallId,
|
|
210
215
|
abortSignal,
|
|
211
216
|
}, {
|
|
@@ -217,7 +222,7 @@ export async function executeDefaultHostedInvokeAgentTool(options, input, childA
|
|
|
217
222
|
durableInvokeRecorder.annotate();
|
|
218
223
|
if (!config.enableDurableInvokeAgent) {
|
|
219
224
|
return executeHostedLocalChildInvoke({
|
|
220
|
-
forkInput
|
|
225
|
+
forkInput,
|
|
221
226
|
abortSignal,
|
|
222
227
|
traceRecorder: durableInvokeRecorder,
|
|
223
228
|
execute: executeLocalInvoke,
|
|
@@ -228,7 +233,7 @@ export async function executeDefaultHostedInvokeAgentTool(options, input, childA
|
|
|
228
233
|
return await executeHostedDurableChildFork({
|
|
229
234
|
authToken: options.context.authToken,
|
|
230
235
|
apiUrl: config.apiUrl,
|
|
231
|
-
forkInput
|
|
236
|
+
forkInput,
|
|
232
237
|
executionOptions: {
|
|
233
238
|
toolCallId,
|
|
234
239
|
abortSignal,
|
|
@@ -6,7 +6,7 @@ import type { InvokeAgentChildRunProgressEvent } from "../child-run/invoke-agent
|
|
|
6
6
|
import { bootstrapHostedChildRun } from "./child-bootstrap.js";
|
|
7
7
|
import { runHostedChildExecutionLifecycle, shouldSkipHostedChildTerminalPersistence } from "./child-lifecycle.js";
|
|
8
8
|
import { type HostedChildRunIdentifiers, type HostedChildTerminalStatus } from "./child-status.js";
|
|
9
|
-
import type
|
|
9
|
+
import { type HostedChildForkToolInput } from "./child-tool-input.js";
|
|
10
10
|
/** Options accepted by hosted durable child execution. */
|
|
11
11
|
export type HostedDurableChildExecutionOptions = {
|
|
12
12
|
durableChildRun?: HostedChildRunIdentifiers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"durable-child-fork-execution.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/durable-child-fork-execution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EACL,KAAK,sBAAsB,EAE5B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,KAAK,oBAAoB,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,uCAAuC,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EACL,gCAAgC,EAChC,wCAAwC,EACzC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,yBAAyB,EAE9B,KAAK,yBAAyB,EAC/B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"durable-child-fork-execution.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/durable-child-fork-execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { createConversationChildLifecycleAdapter } from "../conversation/hosted-
|
|
|
6
6
|
import { bootstrapHostedChildRun } from "./child-bootstrap.js";
|
|
7
7
|
import { runHostedChildExecutionLifecycle, shouldSkipHostedChildTerminalPersistence, } from "./child-lifecycle.js";
|
|
8
8
|
import { HostedChildTerminalStateError, } from "./child-status.js";
|
|
9
|
+
import { buildHostedChildForkEffectivePrompt, withHostedChildInvocationContext, } from "./child-tool-input.js";
|
|
9
10
|
import { isChildRunAbortError, throwIfChildRunAborted } from "../child-run/execution-support.js";
|
|
10
11
|
/** Result returned from build hosted durable child invoke failure. */
|
|
11
12
|
export function buildHostedDurableChildInvokeFailureResult(input) {
|
|
@@ -214,6 +215,11 @@ async function bootstrapHostedDurableChildFork(input) {
|
|
|
214
215
|
const runBootstrap = input.bootstrap?.runBootstrap ?? defaultRunBootstrap;
|
|
215
216
|
return runBootstrap(async () => {
|
|
216
217
|
await input.bootstrap?.onBootstrapStart?.(input.bootstrapContext);
|
|
218
|
+
const forkInput = withHostedChildInvocationContext(input.forkInput, {
|
|
219
|
+
conversationId: input.bootstrapContext.parentConversationId,
|
|
220
|
+
parentRunId: input.bootstrapContext.parentRunId,
|
|
221
|
+
toolCallId: input.executionOptions.toolCallId,
|
|
222
|
+
});
|
|
217
223
|
const bootstrapChildRun = input.runtime?.bootstrapChildRun ?? bootstrapHostedChildRun;
|
|
218
224
|
const run = await bootstrapChildRun({
|
|
219
225
|
authToken: input.authToken,
|
|
@@ -224,8 +230,13 @@ async function bootstrapHostedDurableChildFork(input) {
|
|
|
224
230
|
parentRunId: input.bootstrapContext.parentRunId,
|
|
225
231
|
parentMessageId: input.bootstrapContext.parentMessageId,
|
|
226
232
|
spawnedFromToolCallId: input.executionOptions.toolCallId,
|
|
227
|
-
description:
|
|
228
|
-
prompt:
|
|
233
|
+
description: forkInput.description,
|
|
234
|
+
prompt: buildHostedChildForkEffectivePrompt({
|
|
235
|
+
description: forkInput.description,
|
|
236
|
+
prompt: forkInput.prompt,
|
|
237
|
+
context: forkInput.context,
|
|
238
|
+
runId: input.executionOptions.toolCallId,
|
|
239
|
+
}),
|
|
229
240
|
agentId: input.childAgentId,
|
|
230
241
|
branchId: getBranchId(input),
|
|
231
242
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-cache.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/manifest-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest-cache.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/manifest-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAkC5F;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAC1B;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAChE,CAAC;CACH;AAKD;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,2BAA2B,GACnC,IAAI,CAEN;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE3E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,2BAA2B,GAAG,SAAS,GAC/C,IAAI,CAMN;AASD,yEAAyE;AACzE,wBAAgB,6BAA6B,IAAI,OAAO,CAKvD;AAOD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACnC,oBAAoB,GAAG,IAAI,CAoC7B;AA2DD,6EAA6E;AAC7E,wBAAgB,gCAAgC,IAAI,IAAI,CAIvD;AAED,uEAAuE;AACvE,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}
|
|
@@ -35,6 +35,8 @@ const MAX_CACHED_MANIFESTS = 500;
|
|
|
35
35
|
const NON_READY_TTL_MS = 30_000;
|
|
36
36
|
/** TTL for ready manifests — long but finite so superseded entries are picked up (15 min). */
|
|
37
37
|
const READY_TTL_MS = 15 * 60 * 1000;
|
|
38
|
+
/** Background revalidation interval for ready manifests (1 min). */
|
|
39
|
+
const READY_REVALIDATE_MS = 60_000;
|
|
38
40
|
const manifestCache = new LRUCache({ maxEntries: MAX_CACHED_MANIFESTS });
|
|
39
41
|
registerLRUCache("release-asset-manifest-cache", manifestCache);
|
|
40
42
|
/** In-flight fetches, deduped per releaseId. */
|
|
@@ -119,8 +121,12 @@ export function getReadyManifestForRender(releaseId) {
|
|
|
119
121
|
}
|
|
120
122
|
}
|
|
121
123
|
}
|
|
122
|
-
if (best)
|
|
124
|
+
if (best) {
|
|
125
|
+
if ((best.refreshAfter ?? best.expiresAt) <= Date.now()) {
|
|
126
|
+
scheduleFetch(releaseId);
|
|
127
|
+
}
|
|
123
128
|
return best.manifest;
|
|
129
|
+
}
|
|
124
130
|
// Also check the plain releaseId slot (non-ready / null entry).
|
|
125
131
|
const plain = manifestCache.get(releaseId);
|
|
126
132
|
if (plain && plain.expiresAt > Date.now()) {
|
|
@@ -153,11 +159,16 @@ function scheduleFetch(releaseId) {
|
|
|
153
159
|
: null;
|
|
154
160
|
if (manifest) {
|
|
155
161
|
const key = cacheKey(releaseId, manifest.manifestVersion);
|
|
156
|
-
manifestCache.set(key, {
|
|
162
|
+
manifestCache.set(key, {
|
|
163
|
+
manifest,
|
|
164
|
+
expiresAt: Date.now() + READY_TTL_MS,
|
|
165
|
+
refreshAfter: Date.now() + READY_REVALIDATE_MS,
|
|
166
|
+
});
|
|
157
167
|
logger.debug("Cached ready manifest", {
|
|
158
168
|
releaseId,
|
|
159
169
|
manifestVersion: manifest.manifestVersion,
|
|
160
170
|
ttlMs: READY_TTL_MS,
|
|
171
|
+
refreshMs: READY_REVALIDATE_MS,
|
|
161
172
|
});
|
|
162
173
|
}
|
|
163
174
|
else {
|