@qduc/term2 0.29.1 → 0.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.d.ts +13 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +73 -2
- package/dist/agent.js.map +1 -1
- package/dist/build-info.json +2 -2
- package/dist/cli.js +17 -0
- package/dist/cli.js.map +1 -1
- package/dist/components/message/SubagentActivityMessage.d.ts +2 -2
- package/dist/components/message/SubagentActivityMessage.d.ts.map +1 -1
- package/dist/components/message/SubagentActivityMessage.js +2 -13
- package/dist/components/message/SubagentActivityMessage.js.map +1 -1
- package/dist/components/message/command-message-helpers.d.ts +2 -2
- package/dist/components/message/command-message-helpers.d.ts.map +1 -1
- package/dist/core/index.d.ts +2 -3
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +1 -7
- package/dist/core/index.js.map +1 -1
- package/dist/core/session-runtime.d.ts +72 -0
- package/dist/core/session-runtime.d.ts.map +1 -1
- package/dist/gateway/contracts.d.ts +1 -1
- package/dist/gateway/contracts.d.ts.map +1 -1
- package/dist/gateway/gateway.d.ts +32 -0
- package/dist/gateway/gateway.d.ts.map +1 -1
- package/dist/gateway/gateway.js +36 -1
- package/dist/gateway/gateway.js.map +1 -1
- package/dist/gateway/persistence/contracts.d.ts +3 -10
- package/dist/gateway/persistence/contracts.d.ts.map +1 -1
- package/dist/gateway/persistence/contracts.js +2 -31
- package/dist/gateway/persistence/contracts.js.map +1 -1
- package/dist/gateway/runtime-factory.d.ts.map +1 -1
- package/dist/gateway/runtime-factory.js +4 -0
- package/dist/gateway/runtime-factory.js.map +1 -1
- package/dist/gateway/server-session.d.ts +3 -0
- package/dist/gateway/server-session.d.ts.map +1 -1
- package/dist/gateway/server-session.js +17 -20
- package/dist/gateway/server-session.js.map +1 -1
- package/dist/gateway/settings-rpc.d.ts +1 -1
- package/dist/gateway/settings-rpc.d.ts.map +1 -1
- package/dist/gateway/settings-rpc.js +4 -1
- package/dist/gateway/settings-rpc.js.map +1 -1
- package/dist/lib/agent-client.d.ts +8 -0
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +5 -1
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +9 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +14 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +25 -4
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +6 -0
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/subagent-bridge.d.ts +47 -5
- package/dist/lib/subagent-bridge.d.ts.map +1 -1
- package/dist/lib/subagent-bridge.js +112 -4
- package/dist/lib/subagent-bridge.js.map +1 -1
- package/dist/node_modules/@qduc/agent-wire/index.d.ts +73 -0
- package/dist/node_modules/@qduc/agent-wire/index.js +212 -0
- package/dist/node_modules/@qduc/agent-wire/package.json +1 -0
- package/dist/prompts/orchestrator-prompt.test.ts +9 -0
- package/dist/prompts/orchestrator.md +2 -0
- package/dist/prompts/subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/subagent-delegation.js +3 -2
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.test.ts +1 -0
- package/dist/prompts/subagent-delegation.ts +6 -2
- package/dist/providers/codex.provider.d.ts +3 -0
- package/dist/providers/codex.provider.d.ts.map +1 -1
- package/dist/providers/codex.provider.js +6 -4
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/grok-auth.d.ts +3 -0
- package/dist/providers/grok-auth.d.ts.map +1 -1
- package/dist/providers/grok-auth.js +3 -1
- package/dist/providers/grok-auth.js.map +1 -1
- package/dist/providers/grok.provider.js +3 -3
- package/dist/providers/grok.provider.js.map +1 -1
- package/dist/providers/index.d.ts +1 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +1 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/oauth-session-account.d.ts +16 -2
- package/dist/providers/oauth-session-account.d.ts.map +1 -1
- package/dist/providers/oauth-session-account.js +8 -17
- package/dist/providers/oauth-session-account.js.map +1 -1
- package/dist/providers/openai.provider.js +1 -1
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/openrouter.provider.js +1 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/registry.d.ts +20 -1
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +33 -16
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/web-search/exa.provider.d.ts.map +1 -1
- package/dist/providers/web-search/exa.provider.js +6 -3
- package/dist/providers/web-search/exa.provider.js.map +1 -1
- package/dist/providers/web-search/firecrawl.provider.d.ts +8 -0
- package/dist/providers/web-search/firecrawl.provider.d.ts.map +1 -0
- package/dist/providers/web-search/firecrawl.provider.js +59 -0
- package/dist/providers/web-search/firecrawl.provider.js.map +1 -0
- package/dist/providers/web-search/index.d.ts +5 -2
- package/dist/providers/web-search/index.d.ts.map +1 -1
- package/dist/providers/web-search/index.js +3 -1
- package/dist/providers/web-search/index.js.map +1 -1
- package/dist/providers/web-search/registry.d.ts +14 -0
- package/dist/providers/web-search/registry.d.ts.map +1 -1
- package/dist/providers/web-search/registry.js +45 -15
- package/dist/providers/web-search/registry.js.map +1 -1
- package/dist/providers/web-search/searxng.provider.d.ts +8 -0
- package/dist/providers/web-search/searxng.provider.d.ts.map +1 -0
- package/dist/providers/web-search/searxng.provider.js +56 -0
- package/dist/providers/web-search/searxng.provider.js.map +1 -0
- package/dist/providers/web-search/tavily.provider.d.ts.map +1 -1
- package/dist/providers/web-search/tavily.provider.js +8 -3
- package/dist/providers/web-search/tavily.provider.js.map +1 -1
- package/dist/providers/web-search/types.d.ts +14 -1
- package/dist/providers/web-search/types.d.ts.map +1 -1
- package/dist/services/agent-runtime/agent-resolver.d.ts.map +1 -1
- package/dist/services/agent-runtime/agent-resolver.js +1 -0
- package/dist/services/agent-runtime/agent-resolver.js.map +1 -1
- package/dist/services/agent-runtime/agent-runtime.d.ts +6 -1
- package/dist/services/agent-runtime/agent-runtime.d.ts.map +1 -1
- package/dist/services/agent-runtime/agent-runtime.js +11 -2
- package/dist/services/agent-runtime/agent-runtime.js.map +1 -1
- package/dist/services/agent-runtime/agent-spec.d.ts +14 -0
- package/dist/services/agent-runtime/agent-spec.d.ts.map +1 -0
- package/dist/services/agent-runtime/agent-spec.js +49 -0
- package/dist/services/agent-runtime/agent-spec.js.map +1 -0
- package/dist/services/agent-runtime/index.d.ts +3 -1
- package/dist/services/agent-runtime/index.d.ts.map +1 -1
- package/dist/services/agent-runtime/index.js +2 -0
- package/dist/services/agent-runtime/index.js.map +1 -1
- package/dist/services/agent-runtime/legacy-adapter.d.ts.map +1 -1
- package/dist/services/agent-runtime/legacy-adapter.js +5 -1
- package/dist/services/agent-runtime/legacy-adapter.js.map +1 -1
- package/dist/services/agent-runtime/permission-boundary.d.ts +95 -0
- package/dist/services/agent-runtime/permission-boundary.d.ts.map +1 -0
- package/dist/services/agent-runtime/permission-boundary.js +538 -0
- package/dist/services/agent-runtime/permission-boundary.js.map +1 -0
- package/dist/services/agent-runtime/resolved-agent.d.ts +2 -0
- package/dist/services/agent-runtime/resolved-agent.d.ts.map +1 -1
- package/dist/services/agent-runtime/types.d.ts +22 -1
- package/dist/services/agent-runtime/types.d.ts.map +1 -1
- package/dist/services/approval/non-interactive-approval-policy.d.ts.map +1 -1
- package/dist/services/approval/non-interactive-approval-policy.js +10 -0
- package/dist/services/approval/non-interactive-approval-policy.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +2 -0
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +4 -2
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/conversation/conversation-adapter-factory.d.ts +1 -1
- package/dist/services/conversation/conversation-adapter-factory.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-runtime-factory.d.ts +1 -1
- package/dist/services/conversation/conversation-runtime-factory.d.ts.map +1 -1
- package/dist/services/conversation/conversation-runtime-factory.js +1 -1
- package/dist/services/conversation/conversation-runtime-factory.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +4 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +25 -0
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/session-index/session-index-service.d.ts +1 -1
- package/dist/services/conversation/session-index/session-index-service.d.ts.map +1 -1
- package/dist/services/conversation/session-index/session-index-service.js +1 -1
- package/dist/services/conversation/session-index/session-index-service.js.map +1 -1
- package/dist/services/retry/provider-failure-classification.d.ts +2 -0
- package/dist/services/retry/provider-failure-classification.d.ts.map +1 -1
- package/dist/services/retry/provider-failure-classification.js +43 -0
- package/dist/services/retry/provider-failure-classification.js.map +1 -1
- package/dist/services/sandboxed-code-host/host-worker.d.ts.map +1 -1
- package/dist/services/sandboxed-code-host/host-worker.js +3 -1
- package/dist/services/sandboxed-code-host/host-worker.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +3 -0
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +2 -1
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +2 -0
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +4 -6
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/settings/settings-env.d.ts.map +1 -1
- package/dist/services/settings/settings-env.js +9 -0
- package/dist/services/settings/settings-env.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +24 -0
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +16 -0
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts +2 -0
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +2 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/settings-ui-metadata.d.ts.map +1 -1
- package/dist/services/settings/settings-ui-metadata.js +4 -1
- package/dist/services/settings/settings-ui-metadata.js.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js +3 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/subagents/execution-runner.d.ts.map +1 -1
- package/dist/services/subagents/execution-runner.js +2 -1
- package/dist/services/subagents/execution-runner.js.map +1 -1
- package/dist/services/subagents/foreground-subagent-lease.d.ts +15 -0
- package/dist/services/subagents/foreground-subagent-lease.d.ts.map +1 -1
- package/dist/services/subagents/foreground-subagent-lease.js +42 -2
- package/dist/services/subagents/foreground-subagent-lease.js.map +1 -1
- package/dist/services/subagents/nested-runner.d.ts +1 -1
- package/dist/services/subagents/nested-runner.d.ts.map +1 -1
- package/dist/services/subagents/nested-runner.js +89 -22
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/runtime.d.ts.map +1 -1
- package/dist/services/subagents/runtime.js +30 -4
- package/dist/services/subagents/runtime.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.d.ts +3 -0
- package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +53 -8
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js +65 -3
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-role-pool-selector.d.ts +5 -1
- package/dist/services/subagents/subagent-role-pool-selector.d.ts.map +1 -1
- package/dist/services/subagents/subagent-role-pool-selector.js +24 -5
- package/dist/services/subagents/subagent-role-pool-selector.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts +2 -2
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +8 -2
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +15 -2
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/subagents/types.js.map +1 -1
- package/dist/services/subagents/worker-worktree.d.ts +19 -1
- package/dist/services/subagents/worker-worktree.d.ts.map +1 -1
- package/dist/services/subagents/worker-worktree.js +128 -4
- package/dist/services/subagents/worker-worktree.js.map +1 -1
- package/dist/services/workspace/worktree-inventory.d.ts +6 -0
- package/dist/services/workspace/worktree-inventory.d.ts.map +1 -1
- package/dist/services/workspace/worktree-inventory.js +29 -1
- package/dist/services/workspace/worktree-inventory.js.map +1 -1
- package/dist/tools/agent/propose-goal.d.ts +17 -0
- package/dist/tools/agent/propose-goal.d.ts.map +1 -0
- package/dist/tools/agent/propose-goal.js +64 -0
- package/dist/tools/agent/propose-goal.js.map +1 -0
- package/dist/tools/agent/run-subagent-async.d.ts +61 -3
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +13 -4
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/agent/run-subagent.d.ts +73 -7
- package/dist/tools/agent/run-subagent.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent.js +84 -22
- package/dist/tools/agent/run-subagent.js.map +1 -1
- package/dist/tools/system/run-code/index.d.ts +1 -1
- package/dist/tools/system/run-code/index.d.ts.map +1 -1
- package/dist/tools/system/run-code/index.js +1 -1
- package/dist/tools/system/run-code/index.js.map +1 -1
- package/dist/tools/system/run-code/run-code-agent-capability.d.ts +99 -0
- package/dist/tools/system/run-code/run-code-agent-capability.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code-agent-capability.js +384 -0
- package/dist/tools/system/run-code/run-code-agent-capability.js.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime.d.ts +9 -0
- package/dist/tools/system/run-code/run-code-runtime.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.js +54 -1
- package/dist/tools/system/run-code/run-code-runtime.js.map +1 -1
- package/dist/tools/system/run-code/run-code.d.ts +12 -1
- package/dist/tools/system/run-code/run-code.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code.js +48 -1
- package/dist/tools/system/run-code/run-code.js.map +1 -1
- package/dist/tools/tool-names.d.ts +1 -0
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/tools/tool-names.js +1 -0
- package/dist/tools/tool-names.js.map +1 -1
- package/dist/tools/web/web-search.d.ts +18 -0
- package/dist/tools/web/web-search.d.ts.map +1 -1
- package/dist/tools/web/web-search.js +29 -4
- package/dist/tools/web/web-search.js.map +1 -1
- package/dist/types/message.d.ts +1 -0
- package/dist/types/message.d.ts.map +1 -1
- package/dist/types/message.js +13 -0
- package/dist/types/message.js.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js +1 -1
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +2 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +4 -2
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { TOOL_NAME_PROPOSE_GOAL } from '../tool-names.js';
|
|
3
|
+
import { createDurableGoal } from '../../services/conversation/durable-goal.js';
|
|
4
|
+
import { getOutputText, isSuccessOutput, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from '../format-helpers.js';
|
|
5
|
+
const PROPOSE_GOAL_DESCRIPTION = 'Propose a durable session goal for the user to approve. Propose ONLY when the session has no durable goal yet ' +
|
|
6
|
+
'and the user transitions from discussing or designing to actually implementing work — not during early ' +
|
|
7
|
+
'discussion. At most once per session: if the user rejected an earlier proposal or one was already made, do not ' +
|
|
8
|
+
'propose again. The user must explicitly approve; approval persists the goal, rejection changes nothing. ' +
|
|
9
|
+
'The outcome must state what must become true, not a plan or step list.';
|
|
10
|
+
const proposeGoalSchema = z.object({
|
|
11
|
+
outcome: z.string().trim().min(1).max(2000).describe('The outcome that must become true, in one or two sentences.'),
|
|
12
|
+
successCriteria: z
|
|
13
|
+
.string()
|
|
14
|
+
.trim()
|
|
15
|
+
.max(2000)
|
|
16
|
+
.optional()
|
|
17
|
+
.describe('A short, observable condition that shows the outcome holds.'),
|
|
18
|
+
});
|
|
19
|
+
export const formatProposeGoalCommandMessage = (item, index, toolCallArgumentsById) => {
|
|
20
|
+
const callId = getCallIdFromItem(item);
|
|
21
|
+
const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
|
|
22
|
+
const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
|
|
23
|
+
const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
|
|
24
|
+
const outcome = args?.outcome ?? 'Unknown outcome';
|
|
25
|
+
const command = `propose_goal: ${outcome}`;
|
|
26
|
+
const output = getOutputText(item) || 'No response';
|
|
27
|
+
const success = isSuccessOutput(output);
|
|
28
|
+
return [
|
|
29
|
+
createBaseMessage(item, index, 0, false, {
|
|
30
|
+
command,
|
|
31
|
+
output,
|
|
32
|
+
success,
|
|
33
|
+
toolName: TOOL_NAME_PROPOSE_GOAL,
|
|
34
|
+
toolArgs: args,
|
|
35
|
+
}),
|
|
36
|
+
];
|
|
37
|
+
};
|
|
38
|
+
export function createProposeGoalToolDefinition(deps) {
|
|
39
|
+
const isEligible = () => deps.getGoal() === undefined && !deps.hasPriorProposal();
|
|
40
|
+
return {
|
|
41
|
+
name: TOOL_NAME_PROPOSE_GOAL,
|
|
42
|
+
description: PROPOSE_GOAL_DESCRIPTION,
|
|
43
|
+
parameters: proposeGoalSchema,
|
|
44
|
+
// Eligibility is checked before prompting: an ineligible proposal must not
|
|
45
|
+
// reach the user's approval surface at all.
|
|
46
|
+
needsApproval: () => isEligible(),
|
|
47
|
+
execute: async (params) => {
|
|
48
|
+
if (!isEligible()) {
|
|
49
|
+
const reason = deps.getGoal() !== undefined ? 'a durable goal is already set' : 'a proposal was already made this session';
|
|
50
|
+
return `Error: propose_goal refused because ${reason}. Use /goal set to replace an existing goal.`;
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
const goal = createDurableGoal(params.outcome, params.successCriteria);
|
|
54
|
+
deps.appendGoal(goal);
|
|
55
|
+
return `Goal proposed and persisted with the user's approval: ${goal.outcome}`;
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
return `Error: ${error instanceof Error ? error.message : String(error)}`;
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
formatCommandMessage: formatProposeGoalCommandMessage,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=propose-goal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"propose-goal.js","sourceRoot":"","sources":["../../../source/tools/agent/propose-goal.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,72 @@ import { z } from 'zod';
|
|
|
2
2
|
import type { ToolDefinition, FormatCommandMessage } from '../types.js';
|
|
3
3
|
import type { SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSteerAcknowledgement } from '../../services/subagents/types.js';
|
|
4
4
|
declare const runSubagentAsyncSchema: z.ZodObject<{
|
|
5
|
-
role: z.ZodEnum<{
|
|
5
|
+
role: z.ZodOptional<z.ZodEnum<{
|
|
6
|
+
agent: "agent";
|
|
6
7
|
explorer: "explorer";
|
|
7
8
|
librarian: "librarian";
|
|
8
9
|
mentor: "mentor";
|
|
9
10
|
reviewer: "reviewer";
|
|
10
11
|
worker: "worker";
|
|
11
|
-
}
|
|
12
|
-
task: z.ZodString
|
|
12
|
+
}>>;
|
|
13
|
+
task: z.ZodOptional<z.ZodString>;
|
|
14
|
+
agent_spec: z.ZodOptional<z.ZodObject<{
|
|
15
|
+
goal: z.ZodString;
|
|
16
|
+
context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
17
|
+
tools: z.ZodOptional<z.ZodReadonly<z.ZodArray<z.ZodEnum<{
|
|
18
|
+
apply_patch: "apply_patch";
|
|
19
|
+
code_context_search: "code_context_search";
|
|
20
|
+
create_file: "create_file";
|
|
21
|
+
glob: "glob";
|
|
22
|
+
grep: "grep";
|
|
23
|
+
read_code_outline: "read_code_outline";
|
|
24
|
+
read_file: "read_file";
|
|
25
|
+
search_replace: "search_replace";
|
|
26
|
+
shell: "shell";
|
|
27
|
+
web_fetch: "web_fetch";
|
|
28
|
+
web_search: "web_search";
|
|
29
|
+
}>>>>;
|
|
30
|
+
permissions: z.ZodOptional<z.ZodObject<{
|
|
31
|
+
tools: z.ZodOptional<z.ZodReadonly<z.ZodArray<z.ZodEnum<{
|
|
32
|
+
apply_patch: "apply_patch";
|
|
33
|
+
code_context_search: "code_context_search";
|
|
34
|
+
create_file: "create_file";
|
|
35
|
+
glob: "glob";
|
|
36
|
+
grep: "grep";
|
|
37
|
+
read_code_outline: "read_code_outline";
|
|
38
|
+
read_file: "read_file";
|
|
39
|
+
search_replace: "search_replace";
|
|
40
|
+
shell: "shell";
|
|
41
|
+
web_fetch: "web_fetch";
|
|
42
|
+
web_search: "web_search";
|
|
43
|
+
}>>>>;
|
|
44
|
+
filesystem: z.ZodOptional<z.ZodObject<{
|
|
45
|
+
read: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
46
|
+
write: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
47
|
+
}, z.core.$strip>>;
|
|
48
|
+
network: z.ZodOptional<z.ZodObject<{
|
|
49
|
+
hosts: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
50
|
+
}, z.core.$strip>>;
|
|
51
|
+
agents: z.ZodOptional<z.ZodObject<{
|
|
52
|
+
create: z.ZodOptional<z.ZodBoolean>;
|
|
53
|
+
maxDepth: z.ZodOptional<z.ZodNumber>;
|
|
54
|
+
}, z.core.$strip>>;
|
|
55
|
+
}, z.core.$strip>>;
|
|
56
|
+
constraints: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
57
|
+
doneWhen: z.ZodOptional<z.ZodString>;
|
|
58
|
+
model: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
|
|
59
|
+
balanced: "balanced";
|
|
60
|
+
capable: "capable";
|
|
61
|
+
efficient: "efficient";
|
|
62
|
+
}>, z.ZodObject<{
|
|
63
|
+
provider: z.ZodString;
|
|
64
|
+
model: z.ZodString;
|
|
65
|
+
}, z.core.$strip>]>>;
|
|
66
|
+
budget: z.ZodOptional<z.ZodObject<{
|
|
67
|
+
maxTurns: z.ZodOptional<z.ZodNumber>;
|
|
68
|
+
maxTokens: z.ZodOptional<z.ZodNumber>;
|
|
69
|
+
}, z.core.$strict>>;
|
|
70
|
+
}, z.core.$strict>>;
|
|
13
71
|
name: z.ZodOptional<z.ZodString>;
|
|
14
72
|
continue_run_id: z.ZodOptional<z.ZodString>;
|
|
15
73
|
check_in: z.ZodOptional<z.ZodObject<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-subagent-async.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxE,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,4BAA4B,EAC7B,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"run-subagent-async.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,16 @@ import { SUBAGENT_RUN_NAME_PATTERN, SubagentRegistryError } from '../../services
|
|
|
4
4
|
import { isAbortLike, truncatePreview, formatSubagentResult } from '../../services/subagents/utils.js';
|
|
5
5
|
import { BACKGROUND_SUBAGENT_QUIET_AFTER_MS, formatBackgroundTaskLiveness, normalizeBackgroundTaskActivity, } from '../../services/background-task-activity.js';
|
|
6
6
|
import { relaxedNumber } from '../utils.js';
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
|
|
7
|
+
import { agentSpecSchema } from './run-subagent.js';
|
|
8
|
+
const ASYNC_ROLES = ['agent', 'explorer', 'worker', 'mentor', 'reviewer', 'librarian'];
|
|
9
|
+
const runSubagentAsyncSchema = z
|
|
10
|
+
.object({
|
|
11
|
+
role: z.enum(ASYNC_ROLES).optional().describe('Optional legacy role preset.'),
|
|
10
12
|
task: z
|
|
11
13
|
.string()
|
|
14
|
+
.optional()
|
|
12
15
|
.describe('One bounded task with one objective, ownership boundary, and done condition. Explorer tasks must choose breadth or depth, never both.'),
|
|
16
|
+
agent_spec: agentSpecSchema.optional().describe('Dynamic task configuration; omits the need for a named role.'),
|
|
13
17
|
name: z
|
|
14
18
|
.string()
|
|
15
19
|
.regex(SUBAGENT_RUN_NAME_PATTERN)
|
|
@@ -33,6 +37,11 @@ const runSubagentAsyncSchema = z.object({
|
|
|
33
37
|
})
|
|
34
38
|
.optional()
|
|
35
39
|
.describe('Optional check-in configuration for this background subagent.'),
|
|
40
|
+
})
|
|
41
|
+
.refine((value) => value.agent_spec
|
|
42
|
+
? value.role === undefined && value.task === undefined
|
|
43
|
+
: value.role !== 'agent' && Boolean(value.role) && Boolean(value.task), {
|
|
44
|
+
message: 'Provide agent_spec, or both role and task.',
|
|
36
45
|
});
|
|
37
46
|
const getSubagentResultSchema = z.object({
|
|
38
47
|
runId: z.string().describe('The runId returned by run_subagent with execution: "background".'),
|
|
@@ -142,7 +151,7 @@ export function createRunSubagentAsyncToolDefinition(runSubagentAsync, configure
|
|
|
142
151
|
'A returned handle with status: "running" means the launch succeeded; do not duplicate the delegated task. ' +
|
|
143
152
|
'Only call tools.get_subagent_result(...) inside run_code if, after honest assessment, you truly cannot take any other useful action or reply to the user without the result at all. ' +
|
|
144
153
|
'Fresh runs support explorer, worker, mentor, reviewer, and librarian. ' +
|
|
145
|
-
'
|
|
154
|
+
'Completed read-only generic and supported read-only role runs can be continued across turns; writable generic runs and workers cannot continue.',
|
|
146
155
|
parameters: runSubagentAsyncSchema,
|
|
147
156
|
needsApproval: () => false,
|
|
148
157
|
execute: async (params, context, details) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-subagent-async.js","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACvG,OAAO,EACL,kCAAkC,EAClC,4BAA4B,EAC5B,+BAA+B,GAChC,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAU,CAAC;AAEvF,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,6EAA6E,CAAC;IACjH,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,CACP,uIAAuI,CACxI;IACH,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,KAAK,CAAC,yBAAyB,CAAC;SAChC,QAAQ,EAAE;SACV,QAAQ,CACP,sHAAsH,CACvH;IACH,eAAe,EAAE,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gFAAgF,CAAC;IAC7F,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,OAAO,EAAE,CAAC;aACP,OAAO,EAAE;aACT,QAAQ,EAAE;aACV,QAAQ,CAAC,uFAAuF,CAAC;QACpG,gBAAgB,EAAE,aAAa;aAC5B,GAAG,EAAE;aACL,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,yDAAyD,CAAC;KACvE,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,+DAA+D,CAAC;CAC7E,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kEAAkE,CAAC;CAC/F,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4EAA4E,CAAC;CACpH,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,4DAA4D,CAAC;IAChH,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,KAAK,CAAC;SACV,QAAQ,CAAC,uFAAuF,CAAC;IACpG,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,kGAAkG,CAAC;CAChH,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACxG,CAAC,CAAC;AAeH,MAAM,CAAC,MAAM,oCAAoC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC;IACtC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,uBAAuB,IAAI,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,uBAAuB,IAAI,GAAG,CAAC;IAE3G,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAA6C,CAAC;IAC1F,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,SAAS,CAAC;IAE/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,OAAO,IAAI,aAAa,KAAK,EAAE,CAAC;IAClC,CAAC;IACD,IAAI,YAAY,EAAE,IAAI;QAAE,OAAO,IAAI,YAAY,YAAY,CAAC,IAAI,EAAE,CAAC;IAEnE,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,SAAS,IAAI,aAAa;YAClC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAA0B,CAAC;IAEjE,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,SAAS,CAAC;IACvC,IAAI,OAAO,GAAG,wBAAwB,KAAK,GAAG,CAAC;IAC/C,IAAI,MAAM,GAAG,SAAS,IAAI,aAAa,CAAC;IACxC,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC;QACxC,OAAO;YACL,MAAM,CAAC,MAAM,KAAK,WAAW;gBAC3B,CAAC,CAAC,wBAAwB,KAAK,eAAe;gBAC9C,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ;oBAC5B,CAAC,CAAC,wBAAwB,KAAK,YAAY;oBAC3C,CAAC,CAAC,wBAAwB,KAAK,GAAG,CAAC;QAEvC,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,YAAY,CAAC;IACtD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACpD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,eAAe,CAAC;IACzD,CAAC;IAED,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO;YACP,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,oGAAoG;AACpG,MAAM,UAAU,oCAAoC,CAClD,gBAI+B,EAC/B,gBAGS;IAET,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EACT,yHAAyH;YACzH,oLAAoL;YACpL,yJAAyJ;YACzJ,4GAA4G;YAC5G,sLAAsL;YACtL,wEAAwE;YACxE,+FAA+F;QACjG,UAAU,EAAE,sBAAsB;QAClC,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChE,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;oBACtD,gBAAgB,CACd,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,EACtC;wBACE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO;wBAChC,UAAU,EACR,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;qBACvG,CACF,CAAC;gBACJ,CAAC;gBACD,MAAM,YAAY,GAA2B,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC5F,IAAI,MAAM,CAAC,IAAI;oBAAE,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;gBACjD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAChC,YAAY,CAAC,IAAI;wBACf,mKAAmK,CAAC;gBACxK,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACnG,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC9E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,oCAAoC;KAC3D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qCAAqC,CACnD,iBAAqH,EACrH,iBAI4C;IAE5C,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,mBAAmB,EACjB,oOAAoO;QACtO,WAAW,EACT,kHAAkH;YAClH,gHAAgH;YAChH,gIAAgI;YAChI,4KAA4K;QAC9K,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC5E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBACrE,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,mCAAmC;wBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,OAAO,EACL,gLAAgL;qBACnL,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,EAAE,CAAC;oBAC9F,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,uBAAuB;wBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,OAAO,EACL,uLAAuL;qBAC1L,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBACjE,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;wBACnD,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,WAAW,GAAmB;oBAClC,OAAO,EAAE,MAAM,CAAC,KAAK;oBACrB,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;gBACF,OAAO,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,qCAAqC;KAC5D,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,MAA+C,EAAE,GAAW;IACxF,MAAM,SAAS,GAAG,CAAC,CAAoB,EAAU,EAAE;QACjD,MAAM,KAAK,GAAG;YACZ,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,EAAE;YACxE,SAAS,CAAC,CAAC,WAAW,IAAI,QAAQ,EAAE;YACpC,YAAY,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG;SAC9C,CAAC;QACF,IAAI,CAAC,CAAC,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtE,MAAM,QAAQ,GAAG,+BAA+B,CAAC;gBAC/C,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,aAAa,EACX,CAAC,CAAC,MAAM,KAAK,mBAAmB,IAAI,CAAC,CAAC,MAAM,KAAK,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa;gBACrG,aAAa,EACX,CAAC,CAAC,MAAM,KAAK,mBAAmB;oBAC9B,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,oBAAoB;wBACnC,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,CAAC,CAAC,aAAa;gBACrB,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS;oBACjC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,cAAc,EAAE;oBACtC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;gBAC3C,GAAG;gBACH,YAAY,EAAE,kCAAkC;aACjD,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,aAAa,4BAA4B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,CAAC,YAAY;YAAE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,CAAC,aAAa,CAAC,iBAAiB,kBAAkB,CAAC,CAAC;QAC7G,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;aAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,WAAW;YAAE,KAAK,CAAC,IAAI,CAAC,UAAU,WAAW,EAAE,CAAC,CAAC;QACrD,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC;iBAClE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;iBAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC,CAAC,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3G,CAAC;QACD,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC;aACjE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;aAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,kBAAkB;YAAE,KAAK,CAAC,IAAI,CAAC,YAAY,kBAAkB,EAAE,CAAC,CAAC;QACrE,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,mBAAmB,CAAC;QACpD,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,OAAO,MAAM,CAAC,KAAK,4CAA4C,CAAC;IACzE,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QAC5G,OAAO,GAAG,SAAS,CACjB,MAAM,CACP,6GAA6G,CAAC;IACjH,CAAC;IACD,OAAO,GAAG,SAAS,CACjB,MAAM,CACP,2JAA2J,CAAC;AAC/J,CAAC;AAED,MAAM,CAAC,MAAM,qCAAqC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC;IACnC,MAAM,OAAO,GAAG,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC;QAC9C,CAAC,CAAC,wBAAwB,KAAK,eAAe;QAC9C,CAAC,CAAC,wBAAwB,KAAK,GAAG,CAAC;IAErC,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,SAAS,IAAI,WAAW;YAChC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,qCAAqC,CACnD,iBAI4C,EAC5C,GAAG,GAAiB,IAAI,CAAC,GAAG;IAE5B,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,mBAAmB,EACjB,uJAAuJ;QACzJ,WAAW,EACT,8FAA8F;YAC9F,uFAAuF;YACvF,yHAAyH;YACzH,gLAAgL;YAChL,gDAAgD;QAClD,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC3D,OAAO,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,SAAS,CAAC;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC9E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,qCAAqC;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAC1G,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,IAAI,GACR,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACpH,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAsC,CAAC;IACtF,MAAM,yBAAyB,GAAG,eAAe,KAAK,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC;IACjF,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,yBAAyB;QACvC,CAAC,CAAC,iBAAiB,MAAM,OAAO,eAAe,CAAC,QAAQ,EAAE;QAC1D,CAAC,CAAC,iBAAiB,MAAM,OAAO,WAAW,IAAI,QAAQ,EAAE,CAAC;IAC5D,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,eAAe,CAAC,IAAI,KAAK,cAAc,CAAC;IAC/G,MAAM,MAAM,GAAG,yBAAyB;QACtC,CAAC,CAAC,WAAW,eAAe,CAAC,QAAQ,QAAQ,eAAe,CAAC,KAAK,iBAAiB,eAAe,CAAC,MAAM,GAAG;QAC5G,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,4CAA4C,eAAe,CAAC,SAAS,CAAC,QAAQ,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,cAAc,eAAe,CAAC,SAAS,CAAC,UAAU,IAAI,eAAe,CAAC,MAAM,CAAC,UAAU,eAAe;YACzN,CAAC,CAAC,8BAA8B,WAAW,IAAI,SAAS,IAAI,eAAe,GAAG,CAAC;IAEjF,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO,EAAE,yBAAyB;YAClC,QAAQ,EAAE,cAAc;YACxB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IACxG,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,IAAI,GACR,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACpH,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAoC,CAAC;IACpF,MAAM,yBAAyB,GAAG,eAAe,KAAK,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC;IACjF,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,yBAAyB;QACvC,CAAC,CAAC,eAAe,MAAM,gBAAgB;QACvC,CAAC,CAAC,eAAe,MAAM,OAAO,WAAW,IAAI,QAAQ,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,yBAAyB;QACtC,CAAC,CAAC,8BAA8B,eAAe,CAAC,KAAK,+BAA+B;QACpF,CAAC,CAAC,sBAAsB,MAAM,GAAG,CAAC;IAEpC,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO,EAAE,yBAAyB;YAClC,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,mFAAmF;AACnF,MAAM,UAAU,+BAA+B,CAC7C,WAAsE;IAEtE,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,mBAAmB,EACjB,4IAA4I;QAC9I,WAAW,EACT,kJAAkJ;YAClJ,wKAAwK;YACxK,4JAA4J;YAC5J,8NAA8N;YAC9N,8JAA8J;YAC9J,0OAA0O;YAC1O,6JAA6J;QAC/J,UAAU,EAAE,iBAAiB;QAC7B,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACxD,oBAAoB,EAAE,+BAA+B;KACtD,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,6BAA6B,CAC3C,SAAgE;IAEhE,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,mBAAmB,EACjB,uHAAuH;QACzH,WAAW,EACT,2IAA2I;YAC3I,kKAAkK;YAClK,0JAA0J;YAC1J,iIAAiI;QACnI,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtD,oBAAoB,EAAE,6BAA6B;KACpD,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"run-subagent-async.js","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACvG,OAAO,EACL,kCAAkC,EAClC,4BAA4B,EAC5B,+BAA+B,GAChC,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAU,CAAC;AAEhG,MAAM,sBAAsB,GAAG,CAAC;KAC7B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;IAC7E,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,uIAAuI,CACxI;IACH,UAAU,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8DAA8D,CAAC;IAC/G,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,KAAK,CAAC,yBAAyB,CAAC;SAChC,QAAQ,EAAE;SACV,QAAQ,CACP,sHAAsH,CACvH;IACH,eAAe,EAAE,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gFAAgF,CAAC;IAC7F,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,OAAO,EAAE,CAAC;aACP,OAAO,EAAE;aACT,QAAQ,EAAE;aACV,QAAQ,CAAC,uFAAuF,CAAC;QACpG,gBAAgB,EAAE,aAAa;aAC5B,GAAG,EAAE;aACL,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,yDAAyD,CAAC;KACvE,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,+DAA+D,CAAC;CAC7E,CAAC;KACD,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,UAAU;IACd,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;IACtD,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAC1E;IACE,OAAO,EAAE,4CAA4C;CACtD,CACF,CAAC;AAEJ,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kEAAkE,CAAC;CAC/F,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4EAA4E,CAAC;CACpH,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,4DAA4D,CAAC;IAChH,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,KAAK,CAAC;SACV,QAAQ,CAAC,uFAAuF,CAAC;IACpG,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,kGAAkG,CAAC;CAChH,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACxG,CAAC,CAAC;AAeH,MAAM,CAAC,MAAM,oCAAoC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC;IACtC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,uBAAuB,IAAI,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,uBAAuB,IAAI,GAAG,CAAC;IAE3G,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAA6C,CAAC;IAC1F,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,SAAS,CAAC;IAE/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,OAAO,IAAI,aAAa,KAAK,EAAE,CAAC;IAClC,CAAC;IACD,IAAI,YAAY,EAAE,IAAI;QAAE,OAAO,IAAI,YAAY,YAAY,CAAC,IAAI,EAAE,CAAC;IAEnE,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,SAAS,IAAI,aAAa;YAClC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAA0B,CAAC;IAEjE,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,SAAS,CAAC;IACvC,IAAI,OAAO,GAAG,wBAAwB,KAAK,GAAG,CAAC;IAC/C,IAAI,MAAM,GAAG,SAAS,IAAI,aAAa,CAAC;IACxC,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC;QACxC,OAAO;YACL,MAAM,CAAC,MAAM,KAAK,WAAW;gBAC3B,CAAC,CAAC,wBAAwB,KAAK,eAAe;gBAC9C,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ;oBAC5B,CAAC,CAAC,wBAAwB,KAAK,YAAY;oBAC3C,CAAC,CAAC,wBAAwB,KAAK,GAAG,CAAC;QAEvC,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,YAAY,CAAC;IACtD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACpD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,eAAe,CAAC;IACzD,CAAC;IAED,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO;YACP,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,oGAAoG;AACpG,MAAM,UAAU,oCAAoC,CAClD,gBAI+B,EAC/B,gBAGS;IAET,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EACT,yHAAyH;YACzH,oLAAoL;YACpL,yJAAyJ;YACzJ,4GAA4G;YAC5G,sLAAsL;YACtL,wEAAwE;YACxE,iJAAiJ;QACnJ,UAAU,EAAE,sBAAsB;QAClC,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChE,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;oBACtD,gBAAgB,CACd,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,EACtC;wBACE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO;wBAChC,UAAU,EACR,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;qBACvG,CACF,CAAC;gBACJ,CAAC;gBACD,MAAM,YAAY,GAA2B,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC5F,IAAI,MAAM,CAAC,IAAI;oBAAE,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;gBACjD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAChC,YAAY,CAAC,IAAI;wBACf,mKAAmK,CAAC;gBACxK,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACnG,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC9E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,oCAAoC;KAC3D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qCAAqC,CACnD,iBAAqH,EACrH,iBAI4C;IAE5C,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,mBAAmB,EACjB,oOAAoO;QACtO,WAAW,EACT,kHAAkH;YAClH,gHAAgH;YAChH,gIAAgI;YAChI,4KAA4K;QAC9K,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC5E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBACrE,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,mCAAmC;wBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,OAAO,EACL,gLAAgL;qBACnL,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,EAAE,CAAC;oBAC9F,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,uBAAuB;wBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,OAAO,EACL,uLAAuL;qBAC1L,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBACjE,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;wBACnD,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,WAAW,GAAmB;oBAClC,OAAO,EAAE,MAAM,CAAC,KAAK;oBACrB,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;gBACF,OAAO,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,qCAAqC;KAC5D,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,MAA+C,EAAE,GAAW;IACxF,MAAM,SAAS,GAAG,CAAC,CAAoB,EAAU,EAAE;QACjD,MAAM,KAAK,GAAG;YACZ,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,EAAE;YACxE,SAAS,CAAC,CAAC,WAAW,IAAI,QAAQ,EAAE;YACpC,YAAY,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG;SAC9C,CAAC;QACF,IAAI,CAAC,CAAC,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtE,MAAM,QAAQ,GAAG,+BAA+B,CAAC;gBAC/C,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,aAAa,EACX,CAAC,CAAC,MAAM,KAAK,mBAAmB,IAAI,CAAC,CAAC,MAAM,KAAK,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa;gBACrG,aAAa,EACX,CAAC,CAAC,MAAM,KAAK,mBAAmB;oBAC9B,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,oBAAoB;wBACnC,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,CAAC,CAAC,aAAa;gBACrB,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS;oBACjC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,cAAc,EAAE;oBACtC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;gBAC3C,GAAG;gBACH,YAAY,EAAE,kCAAkC;aACjD,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,aAAa,4BAA4B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,CAAC,YAAY;YAAE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,CAAC,aAAa,CAAC,iBAAiB,kBAAkB,CAAC,CAAC;QAC7G,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;aAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,WAAW;YAAE,KAAK,CAAC,IAAI,CAAC,UAAU,WAAW,EAAE,CAAC,CAAC;QACrD,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC;iBAClE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;iBAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC,CAAC,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3G,CAAC;QACD,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC;aACjE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;aAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,kBAAkB;YAAE,KAAK,CAAC,IAAI,CAAC,YAAY,kBAAkB,EAAE,CAAC,CAAC;QACrE,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,mBAAmB,CAAC;QACpD,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,OAAO,MAAM,CAAC,KAAK,4CAA4C,CAAC;IACzE,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QAC5G,OAAO,GAAG,SAAS,CACjB,MAAM,CACP,6GAA6G,CAAC;IACjH,CAAC;IACD,OAAO,GAAG,SAAS,CACjB,MAAM,CACP,2JAA2J,CAAC;AAC/J,CAAC;AAED,MAAM,CAAC,MAAM,qCAAqC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC;IACnC,MAAM,OAAO,GAAG,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC;QAC9C,CAAC,CAAC,wBAAwB,KAAK,eAAe;QAC9C,CAAC,CAAC,wBAAwB,KAAK,GAAG,CAAC;IAErC,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,SAAS,IAAI,WAAW;YAChC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,qCAAqC,CACnD,iBAI4C,EAC5C,GAAG,GAAiB,IAAI,CAAC,GAAG;IAE5B,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,mBAAmB,EACjB,uJAAuJ;QACzJ,WAAW,EACT,8FAA8F;YAC9F,uFAAuF;YACvF,yHAAyH;YACzH,gLAAgL;YAChL,gDAAgD;QAClD,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC3D,OAAO,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,SAAS,CAAC;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC9E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,qCAAqC;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAC1G,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,IAAI,GACR,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACpH,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAsC,CAAC;IACtF,MAAM,yBAAyB,GAAG,eAAe,KAAK,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC;IACjF,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,yBAAyB;QACvC,CAAC,CAAC,iBAAiB,MAAM,OAAO,eAAe,CAAC,QAAQ,EAAE;QAC1D,CAAC,CAAC,iBAAiB,MAAM,OAAO,WAAW,IAAI,QAAQ,EAAE,CAAC;IAC5D,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,eAAe,CAAC,IAAI,KAAK,cAAc,CAAC;IAC/G,MAAM,MAAM,GAAG,yBAAyB;QACtC,CAAC,CAAC,WAAW,eAAe,CAAC,QAAQ,QAAQ,eAAe,CAAC,KAAK,iBAAiB,eAAe,CAAC,MAAM,GAAG;QAC5G,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,4CAA4C,eAAe,CAAC,SAAS,CAAC,QAAQ,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,cAAc,eAAe,CAAC,SAAS,CAAC,UAAU,IAAI,eAAe,CAAC,MAAM,CAAC,UAAU,eAAe;YACzN,CAAC,CAAC,8BAA8B,WAAW,IAAI,SAAS,IAAI,eAAe,GAAG,CAAC;IAEjF,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO,EAAE,yBAAyB;YAClC,QAAQ,EAAE,cAAc;YACxB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IACxG,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,IAAI,GACR,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACpH,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAoC,CAAC;IACpF,MAAM,yBAAyB,GAAG,eAAe,KAAK,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC;IACjF,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,yBAAyB;QACvC,CAAC,CAAC,eAAe,MAAM,gBAAgB;QACvC,CAAC,CAAC,eAAe,MAAM,OAAO,WAAW,IAAI,QAAQ,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,yBAAyB;QACtC,CAAC,CAAC,8BAA8B,eAAe,CAAC,KAAK,+BAA+B;QACpF,CAAC,CAAC,sBAAsB,MAAM,GAAG,CAAC;IAEpC,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO,EAAE,yBAAyB;YAClC,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,mFAAmF;AACnF,MAAM,UAAU,+BAA+B,CAC7C,WAAsE;IAEtE,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,mBAAmB,EACjB,4IAA4I;QAC9I,WAAW,EACT,kJAAkJ;YAClJ,wKAAwK;YACxK,4JAA4J;YAC5J,8NAA8N;YAC9N,8JAA8J;YAC9J,0OAA0O;YAC1O,6JAA6J;QAC/J,UAAU,EAAE,iBAAiB;QAC7B,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACxD,oBAAoB,EAAE,+BAA+B;KACtD,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,6BAA6B,CAC3C,SAAgE;IAEhE,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,mBAAmB,EACjB,uHAAuH;QACzH,WAAW,EACT,2IAA2I;YAC3I,kKAAkK;YAClK,0JAA0J;YAC1J,iIAAiI;QACnI,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtD,oBAAoB,EAAE,6BAA6B;KACpD,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,70 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
1
2
|
import type { ToolDefinition, FormatCommandMessage } from '../types.js';
|
|
2
3
|
import type { NestedSubagentResult, SubagentRunHandle } from '../../services/subagents/types.js';
|
|
4
|
+
import type { AgentSpec } from '../../services/agent-runtime/types.js';
|
|
3
5
|
declare const FOREGROUND_ROLES: readonly ['explorer', 'worker', 'reviewer', 'librarian'];
|
|
4
6
|
declare const BACKGROUND_ROLES: readonly ['explorer', 'worker', 'mentor', 'reviewer', 'librarian'];
|
|
7
|
+
export declare const agentSpecSchema: z.ZodObject<{
|
|
8
|
+
goal: z.ZodString;
|
|
9
|
+
context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
10
|
+
tools: z.ZodOptional<z.ZodReadonly<z.ZodArray<z.ZodEnum<{
|
|
11
|
+
apply_patch: "apply_patch";
|
|
12
|
+
code_context_search: "code_context_search";
|
|
13
|
+
create_file: "create_file";
|
|
14
|
+
glob: "glob";
|
|
15
|
+
grep: "grep";
|
|
16
|
+
read_code_outline: "read_code_outline";
|
|
17
|
+
read_file: "read_file";
|
|
18
|
+
search_replace: "search_replace";
|
|
19
|
+
shell: "shell";
|
|
20
|
+
web_fetch: "web_fetch";
|
|
21
|
+
web_search: "web_search";
|
|
22
|
+
}>>>>;
|
|
23
|
+
permissions: z.ZodOptional<z.ZodObject<{
|
|
24
|
+
tools: z.ZodOptional<z.ZodReadonly<z.ZodArray<z.ZodEnum<{
|
|
25
|
+
apply_patch: "apply_patch";
|
|
26
|
+
code_context_search: "code_context_search";
|
|
27
|
+
create_file: "create_file";
|
|
28
|
+
glob: "glob";
|
|
29
|
+
grep: "grep";
|
|
30
|
+
read_code_outline: "read_code_outline";
|
|
31
|
+
read_file: "read_file";
|
|
32
|
+
search_replace: "search_replace";
|
|
33
|
+
shell: "shell";
|
|
34
|
+
web_fetch: "web_fetch";
|
|
35
|
+
web_search: "web_search";
|
|
36
|
+
}>>>>;
|
|
37
|
+
filesystem: z.ZodOptional<z.ZodObject<{
|
|
38
|
+
read: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
39
|
+
write: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
40
|
+
}, z.core.$strip>>;
|
|
41
|
+
network: z.ZodOptional<z.ZodObject<{
|
|
42
|
+
hosts: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
43
|
+
}, z.core.$strip>>;
|
|
44
|
+
agents: z.ZodOptional<z.ZodObject<{
|
|
45
|
+
create: z.ZodOptional<z.ZodBoolean>;
|
|
46
|
+
maxDepth: z.ZodOptional<z.ZodNumber>;
|
|
47
|
+
}, z.core.$strip>>;
|
|
48
|
+
}, z.core.$strip>>;
|
|
49
|
+
constraints: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
50
|
+
doneWhen: z.ZodOptional<z.ZodString>;
|
|
51
|
+
model: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
|
|
52
|
+
balanced: "balanced";
|
|
53
|
+
capable: "capable";
|
|
54
|
+
efficient: "efficient";
|
|
55
|
+
}>, z.ZodObject<{
|
|
56
|
+
provider: z.ZodString;
|
|
57
|
+
model: z.ZodString;
|
|
58
|
+
}, z.core.$strip>]>>;
|
|
59
|
+
budget: z.ZodOptional<z.ZodObject<{
|
|
60
|
+
maxTurns: z.ZodOptional<z.ZodNumber>;
|
|
61
|
+
maxTokens: z.ZodOptional<z.ZodNumber>;
|
|
62
|
+
}, z.core.$strict>>;
|
|
63
|
+
}, z.core.$strict>;
|
|
5
64
|
export type ForegroundRunSubagentParams = {
|
|
6
|
-
role
|
|
7
|
-
task
|
|
65
|
+
role?: (typeof FOREGROUND_ROLES)[number] | 'agent';
|
|
66
|
+
task?: string;
|
|
67
|
+
agent_spec?: AgentSpec;
|
|
8
68
|
worktree?: string;
|
|
9
69
|
};
|
|
10
70
|
export type RunSubagentParams = ({
|
|
@@ -18,8 +78,9 @@ export type RunSubagentParams = ({
|
|
|
18
78
|
};
|
|
19
79
|
}) | {
|
|
20
80
|
execution: 'background';
|
|
21
|
-
role
|
|
22
|
-
task
|
|
81
|
+
role?: (typeof BACKGROUND_ROLES)[number] | 'agent';
|
|
82
|
+
task?: string;
|
|
83
|
+
agent_spec?: AgentSpec;
|
|
23
84
|
name?: string;
|
|
24
85
|
continue_run_id?: string;
|
|
25
86
|
worktree?: string;
|
|
@@ -30,9 +91,14 @@ export type RunSubagentParams = ({
|
|
|
30
91
|
};
|
|
31
92
|
export type RunSubagentToolCallbacks = {
|
|
32
93
|
runSubagent?: (params: ForegroundRunSubagentParams, context?: unknown, details?: unknown) => Promise<NestedSubagentResult>;
|
|
33
|
-
runSubagentAsync?: (params:
|
|
34
|
-
|
|
35
|
-
|
|
94
|
+
runSubagentAsync?: (params: {
|
|
95
|
+
role?: (typeof BACKGROUND_ROLES)[number] | 'agent';
|
|
96
|
+
task?: string;
|
|
97
|
+
agent_spec?: AgentSpec;
|
|
98
|
+
name?: string;
|
|
99
|
+
continue_run_id?: string;
|
|
100
|
+
worktree?: string;
|
|
101
|
+
}, context?: unknown, details?: unknown) => Promise<SubagentRunHandle>;
|
|
36
102
|
configureCheckIn?: (target: {
|
|
37
103
|
kind: 'shell' | 'subagent';
|
|
38
104
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-subagent.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-subagent.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,9 @@ import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFrom
|
|
|
5
5
|
import { SUBAGENT_RUN_NAME_PATTERN, SubagentRegistryError } from '../../services/subagents/subagent-async-registry.js';
|
|
6
6
|
import { isAbortLike, formatSubagentResult } from '../../services/subagents/utils.js';
|
|
7
7
|
import { relaxedNumber } from '../utils.js';
|
|
8
|
+
import { AGENT_SPEC_TOOL_NAMES } from '../../services/agent-runtime/agent-spec.js';
|
|
8
9
|
function getRunSubagentDescription(backgroundEnabled) {
|
|
9
|
-
return ('Delegate a bounded task to
|
|
10
|
+
return ('Delegate a bounded task to the general agent runtime. Use agent_spec for dynamic goal/context/tools/constraints/model/budget; legacy named roles are compatibility presets. ' +
|
|
10
11
|
(backgroundEnabled
|
|
11
12
|
? 'This session requires background execution: the tool returns a running handle immediately and a later completion notification. '
|
|
12
13
|
: 'This session uses foreground execution and returns the structured result in this turn. ') +
|
|
@@ -25,7 +26,7 @@ function getRunSubagentDescription(backgroundEnabled) {
|
|
|
25
26
|
'For librarian, assign one history question to answer from memory and prior sessions, or one memory-maintenance topic boundary.\n\n' +
|
|
26
27
|
'For isolated worker edits, create a git worktree under the workspace root first ' +
|
|
27
28
|
'(`git worktree add .worktrees/<slug> -b <slug>`), then pass `worktree` as that directory basename or branch name. ' +
|
|
28
|
-
'`worktree`
|
|
29
|
+
'`worktree` pins the child into that existing tree without re-rooting this session; generic writable agents may use it too.\n\n' +
|
|
29
30
|
(backgroundEnabled
|
|
30
31
|
? 'A background status of "running" means launch succeeded: end the turn and wait for the completion notification.'
|
|
31
32
|
: 'Foreground returns a summary with status (completed, failed, cancelled, or interrupted), any final text, a list of tools used, and files changed.'));
|
|
@@ -34,6 +35,45 @@ const FOREGROUND_ROLES = ['explorer', 'worker', 'reviewer', 'librarian'];
|
|
|
34
35
|
const BACKGROUND_ROLES = ['explorer', 'worker', 'mentor', 'reviewer', 'librarian'];
|
|
35
36
|
const ALL_ROLES = ['explorer', 'worker', 'mentor', 'reviewer', 'librarian'];
|
|
36
37
|
const SUBAGENT_TASK_DESCRIPTION = 'Complete description of one bounded delegated unit with one objective, ownership boundary, and done condition. For explorer, specify concrete evidence to collect and choose breadth or depth, never both; do not delegate diagnosis, recommendations, or the parent task itself.';
|
|
38
|
+
export const agentSpecSchema = z
|
|
39
|
+
.object({
|
|
40
|
+
goal: z.string().describe('The goal for this general-purpose agent invocation.'),
|
|
41
|
+
context: z.record(z.string(), z.unknown()).optional(),
|
|
42
|
+
tools: z
|
|
43
|
+
.array(z.enum(AGENT_SPEC_TOOL_NAMES))
|
|
44
|
+
.readonly()
|
|
45
|
+
.optional()
|
|
46
|
+
.describe('Optional allowlist of child-buildable tools; omitted defaults to read-only workspace tools.'),
|
|
47
|
+
permissions: z
|
|
48
|
+
.object({
|
|
49
|
+
tools: z.array(z.enum(AGENT_SPEC_TOOL_NAMES)).readonly().optional(),
|
|
50
|
+
filesystem: z
|
|
51
|
+
.object({ read: z.array(z.string()).optional(), write: z.array(z.string()).optional() })
|
|
52
|
+
.optional(),
|
|
53
|
+
network: z.object({ hosts: z.array(z.string()).optional() }).optional(),
|
|
54
|
+
agents: z.object({ create: z.boolean().optional(), maxDepth: z.number().optional() }).optional(),
|
|
55
|
+
})
|
|
56
|
+
.optional(),
|
|
57
|
+
constraints: z.array(z.string()).optional(),
|
|
58
|
+
doneWhen: z.string().optional(),
|
|
59
|
+
model: z
|
|
60
|
+
.union([z.enum(['efficient', 'balanced', 'capable']), z.object({ provider: z.string(), model: z.string() })])
|
|
61
|
+
.optional(),
|
|
62
|
+
budget: z
|
|
63
|
+
.object({
|
|
64
|
+
maxTurns: z.number().int().positive().optional().describe('Maximum model turns; defaults to 200.'),
|
|
65
|
+
maxTokens: z
|
|
66
|
+
.number()
|
|
67
|
+
.int()
|
|
68
|
+
.positive()
|
|
69
|
+
.optional()
|
|
70
|
+
.describe('Provider output-token cap per model response, not an aggregate run token budget.'),
|
|
71
|
+
})
|
|
72
|
+
.strict()
|
|
73
|
+
.optional()
|
|
74
|
+
.describe('Only enforced per-invocation budgets are accepted.'),
|
|
75
|
+
})
|
|
76
|
+
.strict();
|
|
37
77
|
const backgroundFields = {
|
|
38
78
|
name: z
|
|
39
79
|
.string()
|
|
@@ -43,7 +83,7 @@ const backgroundFields = {
|
|
|
43
83
|
continue_run_id: z
|
|
44
84
|
.string()
|
|
45
85
|
.optional()
|
|
46
|
-
.describe('Continue a completed background run using its runId. Background only;
|
|
86
|
+
.describe('Continue a completed background run using its runId. Background only; writable generic runs and workers cannot continue.'),
|
|
47
87
|
check_in: z
|
|
48
88
|
.object({
|
|
49
89
|
enabled: z
|
|
@@ -63,7 +103,7 @@ const worktreeField = {
|
|
|
63
103
|
worktree: z
|
|
64
104
|
.string()
|
|
65
105
|
.optional()
|
|
66
|
-
.describe('
|
|
106
|
+
.describe('For write-capable workers or generic agent specs. Directory basename or branch of an existing git worktree to pin the child into. ' +
|
|
67
107
|
'Create the worktree first under the workspace root; this does not re-root the parent session.'),
|
|
68
108
|
};
|
|
69
109
|
const runSubagentSchema = z
|
|
@@ -71,33 +111,53 @@ const runSubagentSchema = z
|
|
|
71
111
|
execution: z
|
|
72
112
|
.enum(['foreground', 'background'])
|
|
73
113
|
.describe('"foreground" returns the result in this turn; "background" returns a running handle immediately.'),
|
|
74
|
-
role: z.enum(ALL_ROLES).describe('
|
|
75
|
-
task: z.string().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
114
|
+
role: z.enum(ALL_ROLES).optional().describe('Optional legacy role preset. Omit when supplying agent_spec.'),
|
|
115
|
+
task: z.string().optional().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
116
|
+
agent_spec: agentSpecSchema
|
|
117
|
+
.optional()
|
|
118
|
+
.describe('Dynamic goal/context/tools/constraints/model/budget; no named role required.'),
|
|
76
119
|
...worktreeField,
|
|
77
120
|
...backgroundFields,
|
|
78
121
|
})
|
|
79
|
-
.strict()
|
|
122
|
+
.strict()
|
|
123
|
+
.refine((value) => value.agent_spec
|
|
124
|
+
? value.role === undefined && value.task === undefined
|
|
125
|
+
: Boolean(value.role) && Boolean(value.task), {
|
|
126
|
+
message: 'Provide agent_spec, or both role and task.',
|
|
127
|
+
});
|
|
80
128
|
function createRunSubagentSchema({ runSubagent, runSubagentAsync }) {
|
|
81
129
|
if (runSubagentAsync) {
|
|
82
130
|
return z
|
|
83
131
|
.object({
|
|
84
132
|
execution: z.literal('background').describe('Only background execution is available in this session.'),
|
|
85
|
-
role: z.enum(BACKGROUND_ROLES).describe('
|
|
86
|
-
task: z.string().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
133
|
+
role: z.enum(BACKGROUND_ROLES).optional().describe('Optional legacy role preset.'),
|
|
134
|
+
task: z.string().optional().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
135
|
+
agent_spec: runSubagentSchema.shape.agent_spec,
|
|
87
136
|
...worktreeField,
|
|
88
137
|
...backgroundFields,
|
|
89
138
|
})
|
|
90
|
-
.strict()
|
|
139
|
+
.strict()
|
|
140
|
+
.refine((value) => value.agent_spec
|
|
141
|
+
? value.role === undefined && value.task === undefined
|
|
142
|
+
: Boolean(value.role) && Boolean(value.task), {
|
|
143
|
+
message: 'Provide agent_spec, or both role and task.',
|
|
144
|
+
});
|
|
91
145
|
}
|
|
92
146
|
if (runSubagent && !runSubagentAsync) {
|
|
93
147
|
return z
|
|
94
148
|
.object({
|
|
95
149
|
execution: z.literal('foreground').describe('Only foreground execution is available in this session.'),
|
|
96
|
-
role: z.enum(FOREGROUND_ROLES).describe('
|
|
97
|
-
task: z.string().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
150
|
+
role: z.enum(FOREGROUND_ROLES).optional().describe('Optional legacy role preset.'),
|
|
151
|
+
task: z.string().optional().describe(SUBAGENT_TASK_DESCRIPTION),
|
|
152
|
+
agent_spec: runSubagentSchema.shape.agent_spec,
|
|
98
153
|
...worktreeField,
|
|
99
154
|
})
|
|
100
|
-
.strict()
|
|
155
|
+
.strict()
|
|
156
|
+
.refine((value) => value.agent_spec
|
|
157
|
+
? value.role === undefined && value.task === undefined
|
|
158
|
+
: Boolean(value.role) && Boolean(value.task), {
|
|
159
|
+
message: 'Provide agent_spec, or both role and task.',
|
|
160
|
+
});
|
|
101
161
|
}
|
|
102
162
|
return runSubagentSchema;
|
|
103
163
|
}
|
|
@@ -313,18 +373,19 @@ export function createRunSubagentToolDefinition(callbacks) {
|
|
|
313
373
|
}
|
|
314
374
|
if (params.execution === 'foreground' || (legacyForegroundOnly && params.execution === undefined)) {
|
|
315
375
|
if (params.name != null || params.continue_run_id != null) {
|
|
316
|
-
return failedForegroundResult(params.role, 'Background-only inputs name and continue_run_id cannot be used with execution: "foreground".');
|
|
376
|
+
return failedForegroundResult(params.role ?? 'agent', 'Background-only inputs name and continue_run_id cannot be used with execution: "foreground".');
|
|
317
377
|
}
|
|
318
378
|
if (!resolvedCallbacks.runSubagent) {
|
|
319
|
-
return failedForegroundResult(params.role, 'Foreground execution is unavailable in this session.');
|
|
379
|
+
return failedForegroundResult(params.role ?? 'agent', 'Foreground execution is unavailable in this session.');
|
|
320
380
|
}
|
|
321
|
-
if (!FOREGROUND_ROLES.includes(params.role)) {
|
|
322
|
-
return failedForegroundResult(params.role, `Role "${params.role}" is unavailable for foreground execution.`);
|
|
381
|
+
if (!params.agent_spec && !FOREGROUND_ROLES.includes(params.role)) {
|
|
382
|
+
return failedForegroundResult(params.role ?? 'agent', `Role "${params.role}" is unavailable for foreground execution.`);
|
|
323
383
|
}
|
|
324
384
|
try {
|
|
325
385
|
const result = await resolvedCallbacks.runSubagent({
|
|
326
|
-
role: params.role,
|
|
327
|
-
task: params.task,
|
|
386
|
+
role: params.agent_spec ? 'agent' : params.role,
|
|
387
|
+
task: params.agent_spec?.goal ?? params.task,
|
|
388
|
+
...(params.agent_spec ? { agent_spec: params.agent_spec } : {}),
|
|
328
389
|
...(params.worktree ? { worktree: params.worktree } : {}),
|
|
329
390
|
}, context, details);
|
|
330
391
|
return formatSubagentResult(result);
|
|
@@ -333,7 +394,7 @@ export function createRunSubagentToolDefinition(callbacks) {
|
|
|
333
394
|
if (isAbortLike(error instanceof Error ? error.message : undefined, error)) {
|
|
334
395
|
throw error;
|
|
335
396
|
}
|
|
336
|
-
return failedForegroundResult(params.role, error);
|
|
397
|
+
return failedForegroundResult(params.role ?? 'agent', error);
|
|
337
398
|
}
|
|
338
399
|
}
|
|
339
400
|
if (!resolvedCallbacks.runSubagentAsync) {
|
|
@@ -344,8 +405,9 @@ export function createRunSubagentToolDefinition(callbacks) {
|
|
|
344
405
|
}
|
|
345
406
|
try {
|
|
346
407
|
const handle = await resolvedCallbacks.runSubagentAsync({
|
|
347
|
-
role: params.role,
|
|
348
|
-
task: params.task,
|
|
408
|
+
role: params.agent_spec ? 'agent' : params.role,
|
|
409
|
+
task: params.agent_spec?.goal ?? params.task,
|
|
410
|
+
...(params.agent_spec ? { agent_spec: params.agent_spec } : {}),
|
|
349
411
|
name: params.name ?? undefined,
|
|
350
412
|
continue_run_id: params.continue_run_id ?? undefined,
|
|
351
413
|
...(params.worktree ? { worktree: params.worktree } : {}),
|