actoviq-agent-sdk 0.4.12 → 0.4.13
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/CHANGELOG.md +18 -0
- package/dist/src/config/agentDefinitionMigration.d.ts +125 -0
- package/dist/src/config/agentDefinitionMigration.d.ts.map +1 -0
- package/dist/src/config/agentDefinitionMigration.js +540 -0
- package/dist/src/config/agentDefinitionMigration.js.map +1 -0
- package/dist/src/config/agentProfiles.d.ts +19 -0
- package/dist/src/config/agentProfiles.d.ts.map +1 -1
- package/dist/src/config/agentProfiles.js +65 -13
- package/dist/src/config/agentProfiles.js.map +1 -1
- package/dist/src/config/modelConfigurationCatalog.d.ts +25 -0
- package/dist/src/config/modelConfigurationCatalog.d.ts.map +1 -0
- package/dist/src/config/modelConfigurationCatalog.js +50 -0
- package/dist/src/config/modelConfigurationCatalog.js.map +1 -0
- package/dist/src/gui/agentTargetPicker.d.ts +32 -0
- package/dist/src/gui/agentTargetPicker.d.ts.map +1 -0
- package/dist/src/gui/agentTargetPicker.js +99 -0
- package/dist/src/gui/agentTargetPicker.js.map +1 -0
- package/dist/src/gui/electronMain.js +1 -0
- package/dist/src/gui/electronMain.js.map +1 -1
- package/dist/src/gui/hadamardGui.d.ts +23 -0
- package/dist/src/gui/hadamardGui.d.ts.map +1 -1
- package/dist/src/gui/hadamardGui.js +4120 -931
- package/dist/src/gui/hadamardGui.js.map +1 -1
- package/dist/src/gui/projectWorkbench.d.ts +6 -2
- package/dist/src/gui/projectWorkbench.d.ts.map +1 -1
- package/dist/src/gui/projectWorkbench.js +76 -67
- package/dist/src/gui/projectWorkbench.js.map +1 -1
- package/dist/src/gui/promptTemplates.d.ts +0 -1
- package/dist/src/gui/promptTemplates.d.ts.map +1 -1
- package/dist/src/gui/promptTemplates.js +0 -3
- package/dist/src/gui/promptTemplates.js.map +1 -1
- package/dist/src/gui/transcript/clientBundle.d.ts +6 -1
- package/dist/src/gui/transcript/clientBundle.d.ts.map +1 -1
- package/dist/src/gui/transcript/clientBundle.js +6 -1
- package/dist/src/gui/transcript/clientBundle.js.map +1 -1
- package/dist/src/help/productCapabilities.d.ts +17 -0
- package/dist/src/help/productCapabilities.d.ts.map +1 -0
- package/dist/src/help/productCapabilities.js +146 -0
- package/dist/src/help/productCapabilities.js.map +1 -0
- package/dist/src/index.d.ts +15 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +9 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/issues/issueExecution.d.ts.map +1 -1
- package/dist/src/issues/issueExecution.js +29 -9
- package/dist/src/issues/issueExecution.js.map +1 -1
- package/dist/src/manager/assistantGlobalTools.d.ts +44 -0
- package/dist/src/manager/assistantGlobalTools.d.ts.map +1 -1
- package/dist/src/manager/assistantGlobalTools.js +565 -32
- package/dist/src/manager/assistantGlobalTools.js.map +1 -1
- package/dist/src/manager/assistantProposals.d.ts +87 -0
- package/dist/src/manager/assistantProposals.d.ts.map +1 -0
- package/dist/src/manager/assistantProposals.js +207 -0
- package/dist/src/manager/assistantProposals.js.map +1 -0
- package/dist/src/manager/referenceIndex.d.ts +82 -0
- package/dist/src/manager/referenceIndex.d.ts.map +1 -0
- package/dist/src/manager/referenceIndex.js +167 -0
- package/dist/src/manager/referenceIndex.js.map +1 -0
- package/dist/src/manager/referenceOperations.d.ts +108 -0
- package/dist/src/manager/referenceOperations.d.ts.map +1 -0
- package/dist/src/manager/referenceOperations.js +821 -0
- package/dist/src/manager/referenceOperations.js.map +1 -0
- package/dist/src/manager/resolveTargetRef.d.ts +67 -0
- package/dist/src/manager/resolveTargetRef.d.ts.map +1 -0
- package/dist/src/manager/resolveTargetRef.js +81 -0
- package/dist/src/manager/resolveTargetRef.js.map +1 -0
- package/dist/src/router/modelRouter.d.ts +22 -2
- package/dist/src/router/modelRouter.d.ts.map +1 -1
- package/dist/src/router/modelRouter.js +76 -9
- package/dist/src/router/modelRouter.js.map +1 -1
- package/dist/src/runtime/agentClient.d.ts +18 -0
- package/dist/src/runtime/agentClient.d.ts.map +1 -1
- package/dist/src/runtime/agentClient.js +209 -21
- package/dist/src/runtime/agentClient.js.map +1 -1
- package/dist/src/runtime/agentSession.d.ts +7 -0
- package/dist/src/runtime/agentSession.d.ts.map +1 -1
- package/dist/src/runtime/agentSession.js +10 -0
- package/dist/src/runtime/agentSession.js.map +1 -1
- package/dist/src/runtime/agentTemplates.d.ts +28 -0
- package/dist/src/runtime/agentTemplates.d.ts.map +1 -0
- package/dist/src/runtime/agentTemplates.js +73 -0
- package/dist/src/runtime/agentTemplates.js.map +1 -0
- package/dist/src/runtime/conversationEngine.d.ts +2 -0
- package/dist/src/runtime/conversationEngine.d.ts.map +1 -1
- package/dist/src/runtime/conversationEngine.js +10 -1
- package/dist/src/runtime/conversationEngine.js.map +1 -1
- package/dist/src/runtime/defaultHadamardAgents.d.ts.map +1 -1
- package/dist/src/runtime/defaultHadamardAgents.js +9 -47
- package/dist/src/runtime/defaultHadamardAgents.js.map +1 -1
- package/dist/src/runtime/effectiveAgentRunOptions.d.ts +49 -0
- package/dist/src/runtime/effectiveAgentRunOptions.d.ts.map +1 -0
- package/dist/src/runtime/effectiveAgentRunOptions.js +50 -0
- package/dist/src/runtime/effectiveAgentRunOptions.js.map +1 -0
- package/dist/src/runtime/externalAgentRunner.d.ts +25 -0
- package/dist/src/runtime/externalAgentRunner.d.ts.map +1 -0
- package/dist/src/runtime/externalAgentRunner.js +57 -0
- package/dist/src/runtime/externalAgentRunner.js.map +1 -0
- package/dist/src/runtime/hadamardAgentDefinitions.d.ts +15 -0
- package/dist/src/runtime/hadamardAgentDefinitions.d.ts.map +1 -1
- package/dist/src/runtime/hadamardAgentDefinitions.js +42 -2
- package/dist/src/runtime/hadamardAgentDefinitions.js.map +1 -1
- package/dist/src/runtime/hadamardAgents.d.ts +6 -0
- package/dist/src/runtime/hadamardAgents.d.ts.map +1 -1
- package/dist/src/runtime/hadamardAgents.js +52 -1
- package/dist/src/runtime/hadamardAgents.js.map +1 -1
- package/dist/src/runtime/hadamardPermissions.d.ts +1 -0
- package/dist/src/runtime/hadamardPermissions.d.ts.map +1 -1
- package/dist/src/runtime/hadamardPermissions.js +6 -0
- package/dist/src/runtime/hadamardPermissions.js.map +1 -1
- package/dist/src/runtime/tools.d.ts.map +1 -1
- package/dist/src/runtime/tools.js +2 -0
- package/dist/src/runtime/tools.js.map +1 -1
- package/dist/src/team/executorTarget.d.ts +26 -0
- package/dist/src/team/executorTarget.d.ts.map +1 -0
- package/dist/src/team/executorTarget.js +15 -0
- package/dist/src/team/executorTarget.js.map +1 -0
- package/dist/src/team/modelTeam.d.ts +5 -1
- package/dist/src/team/modelTeam.d.ts.map +1 -1
- package/dist/src/team/modelTeam.js +157 -41
- package/dist/src/team/modelTeam.js.map +1 -1
- package/dist/src/team/teamComposition.d.ts +20 -0
- package/dist/src/team/teamComposition.d.ts.map +1 -0
- package/dist/src/team/teamComposition.js +78 -0
- package/dist/src/team/teamComposition.js.map +1 -0
- package/dist/src/team/teamDefinitions.d.ts +10 -1
- package/dist/src/team/teamDefinitions.d.ts.map +1 -1
- package/dist/src/team/teamDefinitions.js +123 -16
- package/dist/src/team/teamDefinitions.js.map +1 -1
- package/dist/src/team/teamGraph.d.ts +1 -1
- package/dist/src/team/teamGraph.d.ts.map +1 -1
- package/dist/src/team/teamGraph.js +1 -1
- package/dist/src/team/teamGraph.js.map +1 -1
- package/dist/src/team/teamPrompts.d.ts.map +1 -1
- package/dist/src/team/teamPrompts.js +0 -4
- package/dist/src/team/teamPrompts.js.map +1 -1
- package/dist/src/team/teamProposalService.d.ts +9 -1
- package/dist/src/team/teamProposalService.d.ts.map +1 -1
- package/dist/src/team/teamProposalService.js +66 -6
- package/dist/src/team/teamProposalService.js.map +1 -1
- package/dist/src/team/teamPropose.d.ts +3 -1
- package/dist/src/team/teamPropose.d.ts.map +1 -1
- package/dist/src/team/teamPropose.js +16 -10
- package/dist/src/team/teamPropose.js.map +1 -1
- package/dist/src/team/teamRuntime.d.ts +5 -0
- package/dist/src/team/teamRuntime.d.ts.map +1 -1
- package/dist/src/team/teamRuntime.js +23 -5
- package/dist/src/team/teamRuntime.js.map +1 -1
- package/dist/src/team/workflowSquad.d.ts +10 -2
- package/dist/src/team/workflowSquad.d.ts.map +1 -1
- package/dist/src/team/workflowSquad.js +250 -12
- package/dist/src/team/workflowSquad.js.map +1 -1
- package/dist/src/tools/enterWorktree.d.ts.map +1 -1
- package/dist/src/tools/enterWorktree.js +3 -0
- package/dist/src/tools/enterWorktree.js.map +1 -1
- package/dist/src/tools/exaSearch.d.ts +2 -2
- package/dist/src/tools/exitWorktree.d.ts.map +1 -1
- package/dist/src/tools/exitWorktree.js +3 -1
- package/dist/src/tools/exitWorktree.js.map +1 -1
- package/dist/src/tools/hadamardCoreTools.d.ts +5 -14
- package/dist/src/tools/hadamardCoreTools.d.ts.map +1 -1
- package/dist/src/tools/hadamardCoreTools.js +31 -0
- package/dist/src/tools/hadamardCoreTools.js.map +1 -1
- package/dist/src/tools/hadamardFileTools.d.ts.map +1 -1
- package/dist/src/tools/hadamardFileTools.js +116 -38
- package/dist/src/tools/hadamardFileTools.js.map +1 -1
- package/dist/src/tools/planMode/PlanModeTools.js +2 -2
- package/dist/src/tools/planMode/PlanModeTools.js.map +1 -1
- package/dist/src/tui/hadamardTui.d.ts.map +1 -1
- package/dist/src/tui/hadamardTui.js +358 -69
- package/dist/src/tui/hadamardTui.js.map +1 -1
- package/dist/src/tui/pendingInput.d.ts +17 -0
- package/dist/src/tui/pendingInput.d.ts.map +1 -0
- package/dist/src/tui/pendingInput.js +23 -0
- package/dist/src/tui/pendingInput.js.map +1 -0
- package/dist/src/tui/reasoningDisplay.d.ts +13 -0
- package/dist/src/tui/reasoningDisplay.d.ts.map +1 -0
- package/dist/src/tui/reasoningDisplay.js +45 -0
- package/dist/src/tui/reasoningDisplay.js.map +1 -0
- package/dist/src/tui/screen.d.ts +11 -1
- package/dist/src/tui/screen.d.ts.map +1 -1
- package/dist/src/tui/screen.js +64 -34
- package/dist/src/tui/screen.js.map +1 -1
- package/dist/src/types.d.ts +171 -4
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/ui/commandSurface.d.ts +8 -0
- package/dist/src/ui/commandSurface.d.ts.map +1 -1
- package/dist/src/ui/commandSurface.js +71 -7
- package/dist/src/ui/commandSurface.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/gui/projectSettings.d.ts +0 -2
- package/dist/src/gui/projectSettings.d.ts.map +0 -1
- package/dist/src/gui/projectSettings.js +0 -2
- package/dist/src/gui/projectSettings.js.map +0 -1
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { AgentPool } from './agentPool.js';
|
|
2
|
-
import { runMemberAgent } from './teamRuntime.js';
|
|
2
|
+
import { memberSignal, runMemberAgent } from './teamRuntime.js';
|
|
3
|
+
import { buildGraphNodeTools } from './teamGraph.js';
|
|
4
|
+
import { resolveExecutorTarget } from './executorTarget.js';
|
|
5
|
+
import { resolveEffectiveAgentRunOptions, } from '../runtime/effectiveAgentRunOptions.js';
|
|
3
6
|
const MAX_WORKFLOW_NODES = 128;
|
|
4
7
|
const MAX_WORKFLOW_DEPTH = 32;
|
|
5
8
|
export function validateWorkflowSquad(definition) {
|
|
@@ -68,7 +71,34 @@ export async function executeWorkflowTree(root, input, runAgent) {
|
|
|
68
71
|
};
|
|
69
72
|
return execute(root, input);
|
|
70
73
|
}
|
|
71
|
-
|
|
74
|
+
function namespaceTeamEvent(event, prefix) {
|
|
75
|
+
switch (event.type) {
|
|
76
|
+
case 'team.started':
|
|
77
|
+
return { ...event, members: event.members.map(member => ({ ...member, id: `${prefix}/${member.id}` })) };
|
|
78
|
+
case 'team.member.started':
|
|
79
|
+
case 'team.member.tool':
|
|
80
|
+
case 'team.member.completed':
|
|
81
|
+
return { ...event, id: `${prefix}/${event.id}` };
|
|
82
|
+
case 'team.edge.triggered':
|
|
83
|
+
return { ...event, from: `${prefix}/${event.from}`, to: `${prefix}/${event.to}` };
|
|
84
|
+
case 'team.returned':
|
|
85
|
+
return { ...event, nodeId: `${prefix}/${event.nodeId}` };
|
|
86
|
+
default:
|
|
87
|
+
return event;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
function workflowAgentNodes(root) {
|
|
91
|
+
const result = [];
|
|
92
|
+
const visit = (node) => {
|
|
93
|
+
if (node.type === 'agent')
|
|
94
|
+
result.push(node);
|
|
95
|
+
for (const child of node.children ?? [])
|
|
96
|
+
visit(child);
|
|
97
|
+
};
|
|
98
|
+
visit(root);
|
|
99
|
+
return result;
|
|
100
|
+
}
|
|
101
|
+
export async function runWorkflowSquad(definition, prompt, signal, workDir, onEvent, options = {}, dependencies = {}) {
|
|
72
102
|
const problems = validateWorkflowSquad(definition);
|
|
73
103
|
if (problems.length > 0) {
|
|
74
104
|
throw new Error(`Invalid workflow "${definition.name}": ${problems.join('; ')}`);
|
|
@@ -76,19 +106,144 @@ export async function runWorkflowSquad(definition, prompt, signal, workDir, onEv
|
|
|
76
106
|
const pool = new AgentPool();
|
|
77
107
|
const startedAt = Date.now();
|
|
78
108
|
const statuses = [];
|
|
109
|
+
const reports = [];
|
|
79
110
|
let totalInput = 0;
|
|
80
111
|
let totalOutput = 0;
|
|
112
|
+
const agentNodes = workflowAgentNodes(definition.workflowTree);
|
|
113
|
+
onEvent?.({
|
|
114
|
+
type: 'team.started',
|
|
115
|
+
mode: 'workflow',
|
|
116
|
+
members: agentNodes.map(node => ({
|
|
117
|
+
id: node.id,
|
|
118
|
+
model: node.targetRef?.kind === 'model' ? node.targetRef.model : node.model || '',
|
|
119
|
+
role: node.label || 'agent',
|
|
120
|
+
})),
|
|
121
|
+
});
|
|
81
122
|
const answer = await executeWorkflowTree(definition.workflowTree, prompt, async (node, input) => {
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
123
|
+
const task = node.prompt ? node.prompt.replace(/\{\{input\}\}/gu, input) : input;
|
|
124
|
+
if (node.targetRef?.kind === 'team') {
|
|
125
|
+
const ref = node.targetRef.name.trim();
|
|
126
|
+
const prefix = `${node.id}/${ref}`;
|
|
127
|
+
const startedAt = Date.now();
|
|
128
|
+
if ((options.teamStack ?? []).includes(ref)) {
|
|
129
|
+
const cycle = [...(options.teamStack ?? []), ref].join(' -> ');
|
|
130
|
+
const error = `team recursion: ${cycle}`;
|
|
131
|
+
statuses.push({ id: node.id, model: '', role: node.label || 'agent', ok: false, error, toolCalls: 0, durationMs: 0 });
|
|
132
|
+
return `[team recursion detected: ${cycle}]`;
|
|
133
|
+
}
|
|
134
|
+
let nested;
|
|
135
|
+
try {
|
|
136
|
+
const resolved = resolveExecutorTarget(node.targetRef, {
|
|
137
|
+
projectDir: workDir,
|
|
138
|
+
homeDir: options.homeDir,
|
|
139
|
+
loadTeam: dependencies.loadTeam,
|
|
140
|
+
});
|
|
141
|
+
nested = resolved.definition;
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
const error = `team "${ref}" not found`;
|
|
145
|
+
statuses.push({ id: node.id, model: '', role: node.label || 'agent', ok: false, error, toolCalls: 0, durationMs: 0 });
|
|
146
|
+
return `[${error}]`;
|
|
147
|
+
}
|
|
148
|
+
try {
|
|
149
|
+
const askNested = dependencies.askTeam ?? (async (nestedDefinition, nestedPrompt, nestedSignal, nestedOptions) => {
|
|
150
|
+
const { askTeamDefinition } = await import('./modelTeam.js');
|
|
151
|
+
return askTeamDefinition(nestedDefinition, nestedPrompt, nestedSignal, nestedOptions);
|
|
152
|
+
});
|
|
153
|
+
const nestedSignal = memberSignal(signal, node.timeoutMs ?? definition.timeoutMs) ?? signal;
|
|
154
|
+
const result = await askNested(nested, task, nestedSignal, {
|
|
155
|
+
...options,
|
|
156
|
+
workDir,
|
|
157
|
+
teamStack: options.teamStack,
|
|
158
|
+
onEvent: onEvent ? event => onEvent(namespaceTeamEvent(event, prefix)) : undefined,
|
|
159
|
+
});
|
|
160
|
+
totalInput += result.cost.totalInputTokens;
|
|
161
|
+
totalOutput += result.cost.totalOutputTokens;
|
|
162
|
+
for (const status of result.memberStatuses ?? []) {
|
|
163
|
+
statuses.push({ ...status, id: `${prefix}/${status.id}` });
|
|
164
|
+
}
|
|
165
|
+
for (const report of result.reports ?? []) {
|
|
166
|
+
reports.push({ ...report, id: `${prefix}/${report.id ?? report.model}` });
|
|
167
|
+
}
|
|
168
|
+
statuses.push({
|
|
169
|
+
id: node.id,
|
|
170
|
+
model: '',
|
|
171
|
+
role: node.label || 'agent',
|
|
172
|
+
ok: !result.incompleteReason,
|
|
173
|
+
error: result.incompleteReason,
|
|
174
|
+
toolCalls: 0,
|
|
175
|
+
durationMs: Date.now() - startedAt,
|
|
176
|
+
});
|
|
177
|
+
return result.answer;
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
181
|
+
statuses.push({ id: node.id, model: '', role: node.label || 'agent', ok: false, error: message, toolCalls: 0, durationMs: Date.now() - startedAt });
|
|
182
|
+
return `[team "${ref}" failed: ${message}]`;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
// P2: per-node executor/targetRef + system prompt + tools + limits.
|
|
186
|
+
const member = {
|
|
187
|
+
model: node.model || options.model || '',
|
|
188
|
+
role: node.label || 'agent',
|
|
189
|
+
systemPrompt: node.systemPrompt || '',
|
|
190
|
+
};
|
|
191
|
+
let targetAgentSource;
|
|
192
|
+
let targetInheritsModel = false;
|
|
193
|
+
if (node.targetRef) {
|
|
194
|
+
try {
|
|
195
|
+
const resolved = resolveExecutorTarget(node.targetRef, {
|
|
196
|
+
projectDir: workDir,
|
|
197
|
+
homeDir: options.homeDir,
|
|
198
|
+
});
|
|
199
|
+
if (resolved.model)
|
|
200
|
+
member.model = resolved.model;
|
|
201
|
+
if (resolved.provider)
|
|
202
|
+
member.provider = resolved.provider;
|
|
203
|
+
if (resolved.baseURL)
|
|
204
|
+
member.baseURL = resolved.baseURL;
|
|
205
|
+
if (resolved.apiKey)
|
|
206
|
+
member.apiKey = resolved.apiKey;
|
|
207
|
+
targetAgentSource = resolved.agentDefinition ?? resolved.agentProfile;
|
|
208
|
+
targetInheritsModel = Boolean(targetAgentSource && !resolved.model);
|
|
209
|
+
}
|
|
210
|
+
catch (err) {
|
|
211
|
+
return `[unavailable: ${err instanceof Error ? err.message : String(err)}]`;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
let effectiveAgentOptions;
|
|
215
|
+
if (targetAgentSource) {
|
|
216
|
+
effectiveAgentOptions = resolveEffectiveAgentRunOptions(targetAgentSource, {
|
|
217
|
+
systemPrompt: node.systemPrompt || '',
|
|
218
|
+
permissionModeOverride: options.permissionMode,
|
|
219
|
+
});
|
|
220
|
+
if (typeof node.maxIterations === 'number') {
|
|
221
|
+
effectiveAgentOptions.maxToolIterations = node.maxIterations;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
const effectiveAllowedTools = effectiveAgentOptions?.allowedTools ?? node.allowedTools;
|
|
225
|
+
const tools = effectiveAllowedTools?.length
|
|
226
|
+
? await buildGraphNodeTools({ id: node.id, allowedTools: effectiveAllowedTools }, workDir)
|
|
227
|
+
: [];
|
|
228
|
+
const systemPrompt = effectiveAgentOptions?.systemPrompt ?? node.systemPrompt ?? '';
|
|
229
|
+
const run = await (dependencies.runMember ?? runMemberAgent)({
|
|
230
|
+
identity: { id: node.id, model: member.model, role: node.label || node.type },
|
|
231
|
+
member,
|
|
232
|
+
task,
|
|
233
|
+
systemPrompt,
|
|
87
234
|
cwd: workDir,
|
|
88
|
-
tools
|
|
89
|
-
maxIterations: Infinity,
|
|
90
|
-
timeoutMs: definition.timeoutMs ?? 300_000,
|
|
235
|
+
tools,
|
|
236
|
+
maxIterations: node.maxIterations ?? definition.maxIterations ?? Infinity,
|
|
237
|
+
timeoutMs: node.timeoutMs ?? effectiveAgentOptions?.timeoutMs ?? definition.timeoutMs ?? 300_000,
|
|
91
238
|
signal,
|
|
239
|
+
permissionMode: options.permissionMode,
|
|
240
|
+
permissions: options.permissions,
|
|
241
|
+
classifier: options.classifier,
|
|
242
|
+
approver: options.approver,
|
|
243
|
+
hooks: options.hooks,
|
|
244
|
+
effectiveAgentOptions,
|
|
245
|
+
workspaceAccess: node.workspaceAccess,
|
|
246
|
+
modelApi: targetInheritsModel ? options.modelApi : undefined,
|
|
92
247
|
pool,
|
|
93
248
|
round: 1,
|
|
94
249
|
onEvent,
|
|
@@ -98,9 +253,14 @@ export async function runWorkflowSquad(definition, prompt, signal, workDir, onEv
|
|
|
98
253
|
totalOutput += run.outputTokens;
|
|
99
254
|
return run.report;
|
|
100
255
|
});
|
|
256
|
+
const failed = statuses.filter(status => !status.ok);
|
|
257
|
+
const incompleteReason = failed.length > 0
|
|
258
|
+
? `${failed.length} of ${statuses.length} workflow node run(s) failed`
|
|
259
|
+
: undefined;
|
|
260
|
+
onEvent?.({ type: 'team.completed', mode: 'workflow', rounds: 1, incompleteReason });
|
|
101
261
|
return {
|
|
102
262
|
answer,
|
|
103
|
-
mode: '
|
|
263
|
+
mode: 'workflow',
|
|
104
264
|
cost: {
|
|
105
265
|
totalInputTokens: totalInput,
|
|
106
266
|
totalOutputTokens: totalOutput,
|
|
@@ -109,9 +269,87 @@ export async function runWorkflowSquad(definition, prompt, signal, workDir, onEv
|
|
|
109
269
|
},
|
|
110
270
|
durationMs: Date.now() - startedAt,
|
|
111
271
|
memberStatuses: statuses,
|
|
272
|
+
reports,
|
|
273
|
+
skippedNodes: [],
|
|
274
|
+
incompleteReason,
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
/** Run a single-agent squad (`squadType: agent` / legacy `subagent`). */
|
|
278
|
+
export async function runSingleAgentSquad(definition, prompt, signal, workDir, onEvent, opts) {
|
|
279
|
+
const member = definition.members?.[0];
|
|
280
|
+
if (!member)
|
|
281
|
+
throw new Error(`Agent squad "${definition.name}" has no member`);
|
|
282
|
+
// Unified reference model: a typed targetRef overrides the by-value fields.
|
|
283
|
+
const effectiveMember = { ...member, model: member.model || opts?.model || '' };
|
|
284
|
+
let targetAgentSource;
|
|
285
|
+
let targetInheritsModel = false;
|
|
286
|
+
if (member.targetRef && member.targetRef.kind !== 'team') {
|
|
287
|
+
const resolved = resolveExecutorTarget(member.targetRef, {
|
|
288
|
+
projectDir: workDir,
|
|
289
|
+
homeDir: opts?.homeDir,
|
|
290
|
+
});
|
|
291
|
+
if (resolved.model)
|
|
292
|
+
effectiveMember.model = resolved.model;
|
|
293
|
+
if (resolved.provider)
|
|
294
|
+
effectiveMember.provider = resolved.provider;
|
|
295
|
+
if (resolved.baseURL)
|
|
296
|
+
effectiveMember.baseURL = resolved.baseURL;
|
|
297
|
+
if (resolved.apiKey)
|
|
298
|
+
effectiveMember.apiKey = resolved.apiKey;
|
|
299
|
+
targetAgentSource = resolved.agentDefinition ?? resolved.agentProfile;
|
|
300
|
+
targetInheritsModel = Boolean(targetAgentSource && !resolved.model);
|
|
301
|
+
}
|
|
302
|
+
const pool = new AgentPool();
|
|
303
|
+
const identity = {
|
|
304
|
+
id: member.id || member.role || member.name || definition.name,
|
|
305
|
+
model: effectiveMember.model,
|
|
306
|
+
role: member.role || member.name || definition.name,
|
|
307
|
+
};
|
|
308
|
+
const startedAt = Date.now();
|
|
309
|
+
const baseSystemPrompt = [member.systemPrompt || '', opts?.context?.trim() || '']
|
|
310
|
+
.filter(Boolean)
|
|
311
|
+
.join('\n\n');
|
|
312
|
+
const effectiveAgentOptions = targetAgentSource
|
|
313
|
+
? resolveEffectiveAgentRunOptions(targetAgentSource, { systemPrompt: baseSystemPrompt })
|
|
314
|
+
: undefined;
|
|
315
|
+
const systemPrompt = effectiveAgentOptions?.systemPrompt ?? baseSystemPrompt;
|
|
316
|
+
const effectiveAllowedTools = effectiveAgentOptions?.allowedTools ?? member.allowedTools;
|
|
317
|
+
const tools = effectiveAllowedTools?.length
|
|
318
|
+
? await buildGraphNodeTools({ id: identity.id, allowedTools: effectiveAllowedTools }, workDir)
|
|
319
|
+
: [];
|
|
320
|
+
const run = await runMemberAgent({
|
|
321
|
+
identity,
|
|
322
|
+
member: effectiveMember,
|
|
323
|
+
task: prompt,
|
|
324
|
+
systemPrompt,
|
|
325
|
+
cwd: workDir,
|
|
326
|
+
tools,
|
|
327
|
+
maxIterations: member.maxIterations
|
|
328
|
+
?? definition.maxIterations
|
|
329
|
+
?? Infinity,
|
|
330
|
+
timeoutMs: effectiveAgentOptions?.timeoutMs ?? definition.timeoutMs ?? 300_000,
|
|
331
|
+
signal,
|
|
332
|
+
effectiveAgentOptions,
|
|
333
|
+
workspaceAccess: member.workspaceAccess,
|
|
334
|
+
modelApi: targetInheritsModel ? opts?.modelApi : undefined,
|
|
335
|
+
pool,
|
|
336
|
+
round: 1,
|
|
337
|
+
onEvent,
|
|
338
|
+
});
|
|
339
|
+
return {
|
|
340
|
+
answer: run.report,
|
|
341
|
+
mode: 'graph',
|
|
342
|
+
cost: {
|
|
343
|
+
totalInputTokens: run.inputTokens,
|
|
344
|
+
totalOutputTokens: run.outputTokens,
|
|
345
|
+
estimatedCost: null,
|
|
346
|
+
breakdown: [],
|
|
347
|
+
},
|
|
348
|
+
durationMs: Date.now() - startedAt,
|
|
349
|
+
memberStatuses: [run.status],
|
|
112
350
|
reports: [],
|
|
113
351
|
skippedNodes: [],
|
|
114
|
-
incompleteReason:
|
|
352
|
+
incompleteReason: run.status.error,
|
|
115
353
|
};
|
|
116
354
|
}
|
|
117
355
|
//# sourceMappingURL=workflowSquad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowSquad.js","sourceRoot":"","sources":["../../../src/team/workflowSquad.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workflowSquad.js","sourceRoot":"","sources":["../../../src/team/workflowSquad.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACL,+BAA+B,GAEhC,MAAM,wCAAwC,CAAC;AAEhD,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,UAAU,qBAAqB,CACnC,UAAgD;IAEhD,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,KAAK,GAAG,CAAC,IAAkB,EAAE,KAAa,EAAQ,EAAE;QACxD,SAAS,IAAI,CAAC,CAAC;QACf,IAAI,SAAS,GAAG,kBAAkB;YAAE,OAAO;QAC3C,IAAI,KAAK,GAAG,kBAAkB,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,yCAAyC,kBAAkB,EAAE,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;aACxD,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;;YACrE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEjB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,WAAW,6BAA6B,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,qCAAqC,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;gBAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;YACvF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,iCAAiC,CAAC,CAAC;QAChG,CAAC;aAAM,IAAI,IAAI,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,kCAAkC,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,2BAA2B,IAAI,GAAG,CAAC,CAAC;QACxE,CAAC;QACD,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACf,IAAI,SAAS,GAAG,kBAAkB,EAAE,CAAC;QACnC,QAAQ,CAAC,IAAI,CAAC,wCAAwC,kBAAkB,QAAQ,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAkB,EAClB,KAAa,EACb,QAAgE;IAEhE,MAAM,OAAO,GAAG,KAAK,EAAE,IAAkB,EAAE,SAAiB,EAAmB,EAAE;QAC/E,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;YACxC,OAAO,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/D,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACvF,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,EAAE,SAAS,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC;AAaD,SAAS,kBAAkB,CAAC,KAAgB,EAAE,MAAc;IAC1D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,cAAc;YACjB,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;QAC3G,KAAK,qBAAqB,CAAC;QAC3B,KAAK,kBAAkB,CAAC;QACxB,KAAK,uBAAuB;YAC1B,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;QACnD,KAAK,qBAAqB;YACxB,OAAO,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;QACpF,KAAK,eAAe;YAClB,OAAO,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3D;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAkB;IAC5C,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,IAAkB,EAAQ,EAAE;QACzC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE;YAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,CAAC;IACZ,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAA0B,EAC1B,MAAc,EACd,MAAmB,EACnB,OAAe,EACf,OAAoC,EACpC,UAA0B,EAAE,EAC5B,eAAwC,EAAE;IAE1C,MAAM,QAAQ,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,CAAC,IAAI,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAsC,EAAE,CAAC;IACvD,MAAM,OAAO,GAA+B,EAAE,CAAC;IAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,YAAa,CAAC,CAAC;IAEhE,OAAO,EAAE,CAAC;QACR,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACjF,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO;SAC5B,CAAC,CAAC;KACJ,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,YAAa,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC/F,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEjF,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/D,MAAM,KAAK,GAAG,mBAAmB,KAAK,EAAE,CAAC;gBACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;gBACtH,OAAO,6BAA6B,KAAK,GAAG,CAAC;YAC/C,CAAC;YACD,IAAI,MAAsB,CAAC;YAC3B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE;oBACrD,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,QAAQ,EAAE,YAAY,CAAC,QAAQ;iBAChC,CAAC,CAAC;gBACH,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,KAAK,GAAG,SAAS,GAAG,aAAa,CAAC;gBACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;gBACtH,OAAO,IAAI,KAAK,GAAG,CAAC;YACtB,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE;oBAC/G,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBAC7D,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;gBACxF,CAAC,CAAC,CAAC;gBACH,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;gBAC5F,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE;oBACzD,GAAG,OAAO;oBACV,OAAO;oBACP,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;iBACnF,CAAC,CAAC;gBACH,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAC3C,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBAC7C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;oBACjD,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7D,CAAC;gBACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;oBAC1C,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC5E,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC;oBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,EAAE;oBACT,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO;oBAC3B,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB;oBAC5B,KAAK,EAAE,MAAM,CAAC,gBAAgB;oBAC9B,SAAS,EAAE,CAAC;oBACZ,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBACnC,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,MAAM,CAAC;YACvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;gBACpJ,OAAO,UAAU,GAAG,aAAa,OAAO,GAAG,CAAC;YAC9C,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,MAAM,MAAM,GAAe;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;YACxC,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;SACtC,CAAC;QACF,IAAI,iBAEmD,CAAC;QACxD,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE;oBACrD,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;iBACzB,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,KAAK;oBAAE,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;gBAClD,IAAI,QAAQ,CAAC,QAAQ;oBAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBAC3D,IAAI,QAAQ,CAAC,OAAO;oBAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACxD,IAAI,QAAQ,CAAC,MAAM;oBAAE,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;gBACrD,iBAAiB,GAAG,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,YAAY,CAAC;gBACtE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,iBAAiB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;YAC9E,CAAC;QACH,CAAC;QACD,IAAI,qBAA2D,CAAC;QAChE,IAAI,iBAAiB,EAAE,CAAC;YACtB,qBAAqB,GAAG,+BAA+B,CAAC,iBAAiB,EAAE;gBACzE,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;gBACrC,sBAAsB,EAAE,OAAO,CAAC,cAAc;aAC/C,CAAC,CAAC;YACH,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;gBAC3C,qBAAqB,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC;YAC/D,CAAC;QACH,CAAC;QACD,MAAM,qBAAqB,GAAG,qBAAqB,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;QACvF,MAAM,KAAK,GAAG,qBAAqB,EAAE,MAAM;YACzC,CAAC,CAAC,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,qBAAqB,EAAE,EAAE,OAAO,CAAC;YAC1F,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,YAAY,GAAG,qBAAqB,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;QACpF,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,CAAC;YAC3D,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7E,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,GAAG,EAAE,OAAO;YACZ,KAAK;YACL,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,UAAU,CAAC,aAAa,IAAI,QAAQ;YACzE,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,qBAAqB,EAAE,SAAS,IAAI,UAAU,CAAC,SAAS,IAAI,OAAO;YAChG,MAAM;YACN,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,qBAAqB;YACrB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;YAC5D,IAAI;YACJ,KAAK,EAAE,CAAC;YACR,OAAO;SACR,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,UAAU,IAAI,GAAG,CAAC,WAAW,CAAC;QAC9B,WAAW,IAAI,GAAG,CAAC,YAAY,CAAC;QAChC,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,OAAO,QAAQ,CAAC,MAAM,8BAA8B;QACtE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAErF,OAAO;QACL,MAAM;QACN,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,gBAAgB,EAAE,UAAU;YAC5B,iBAAiB,EAAE,WAAW;YAC9B,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,EAAE;SACd;QACD,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAClC,cAAc,EAAE,QAAQ;QACxB,OAAO;QACP,YAAY,EAAE,EAAE;QAChB,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,UAA0B,EAC1B,MAAc,EACd,MAAmB,EACnB,OAAe,EACf,OAAoC,EACpC,IAAqB;IAErB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC;IAC/E,4EAA4E;IAC5E,MAAM,eAAe,GAAe,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;IAC5F,IAAI,iBAEmD,CAAC;IACxD,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE;YACvD,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,IAAI,EAAE,OAAO;SACvB,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,KAAK;YAAE,eAAe,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC3D,IAAI,QAAQ,CAAC,QAAQ;YAAE,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QACpE,IAAI,QAAQ,CAAC,OAAO;YAAE,eAAe,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjE,IAAI,QAAQ,CAAC,MAAM;YAAE,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9D,iBAAiB,GAAG,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,YAAY,CAAC;QACtE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI;QAC9D,KAAK,EAAE,eAAe,CAAC,KAAK;QAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI;KACpD,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SAC9E,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,MAAM,qBAAqB,GAAG,iBAAiB;QAC7C,CAAC,CAAC,+BAA+B,CAAC,iBAAiB,EAAE,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;QACxF,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,YAAY,GAAG,qBAAqB,EAAE,YAAY,IAAI,gBAAgB,CAAC;IAC7E,MAAM,qBAAqB,GAAG,qBAAqB,EAAE,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;IACzF,MAAM,KAAK,GAAG,qBAAqB,EAAE,MAAM;QACzC,CAAC,CAAC,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,YAAY,EAAE,qBAAqB,EAAE,EAAE,OAAO,CAAC;QAC9F,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC;QAC/B,QAAQ;QACR,MAAM,EAAE,eAAe;QACvB,IAAI,EAAE,MAAM;QACZ,YAAY;QACZ,GAAG,EAAE,OAAO;QACZ,KAAK;QACL,aAAa,EAAG,MAAqC,CAAC,aAAa;eAC9D,UAAU,CAAC,aAAa;eACxB,QAAQ;QACb,SAAS,EAAE,qBAAqB,EAAE,SAAS,IAAI,UAAU,CAAC,SAAS,IAAI,OAAO;QAC9E,MAAM;QACN,qBAAqB;QACrB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS;QAC1D,IAAI;QACJ,KAAK,EAAE,CAAC;QACR,OAAO;KACR,CAAC,CAAC;IACH,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE;YACJ,gBAAgB,EAAE,GAAG,CAAC,WAAW;YACjC,iBAAiB,EAAE,GAAG,CAAC,YAAY;YACnC,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,EAAE;SACd;QACD,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAClC,cAAc,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;QAC5B,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;KACnC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enterWorktree.d.ts","sourceRoot":"","sources":["../../../src/tools/enterWorktree.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAaxD,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,GAAG,SAAS;;;;;;;
|
|
1
|
+
{"version":3,"file":"enterWorktree.d.ts","sourceRoot":"","sources":["../../../src/tools/enterWorktree.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAaxD,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,GAAG,SAAS;;;;;;;WA2E5F"}
|
|
@@ -45,9 +45,11 @@ export function createEnterWorktreeTool(getWorktreeService) {
|
|
|
45
45
|
if (!service) {
|
|
46
46
|
return 'Worktree service is not available. Ensure the project is a git repository.';
|
|
47
47
|
}
|
|
48
|
+
await service.init();
|
|
48
49
|
// Enter existing worktree
|
|
49
50
|
if (input.path) {
|
|
50
51
|
const entry = await service.enterWorktree(input.path, input.branch);
|
|
52
|
+
context.metadata.__hadamardWorkDir = service.currentWorkDir;
|
|
51
53
|
return `Entered existing worktree at ${entry.workDir} (branch: ${entry.worktreeBranch ?? 'detached'}).\n\n` +
|
|
52
54
|
`Working directory is now: ${entry.workDir}\n` +
|
|
53
55
|
`Use ExitWorktree to return to the original directory.`;
|
|
@@ -63,6 +65,7 @@ export function createEnterWorktreeTool(getWorktreeService) {
|
|
|
63
65
|
detach: input.detach,
|
|
64
66
|
pr: input.pr,
|
|
65
67
|
});
|
|
68
|
+
context.metadata.__hadamardWorkDir = service.currentWorkDir;
|
|
66
69
|
const parts = [
|
|
67
70
|
`Created worktree at ${entry.workDir}`,
|
|
68
71
|
`Branch: ${entry.worktreeBranch ?? 'detached HEAD'}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enterWorktree.js","sourceRoot":"","sources":["../../../src/tools/enterWorktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAI3C,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC;AAExD,MAAM,mBAAmB,GAAG,CAAC,CAAC,YAAY,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;IAC7E,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8DAA8D,CAAC;IACpG,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iDAAiD,CAAC;IACzF,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gEAAgE,CAAC;IACrG,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,+BAA+B,CAAC;IACxE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,+CAA+C,CAAC;CACpF,CAAC,CAAC;AAIH,MAAM,UAAU,uBAAuB,CAAC,kBAAqD;IAC3F,OAAO,IAAI,CACT;QACE,IAAI,EAAE,wBAAwB;QAC9B,WAAW,EACT,wFAAwF;YACxF,mDAAmD;YACnD,4GAA4G;QAC9G,WAAW,EAAE,mBAAmB;QAChC,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;QAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,OAAO;gBACL,uBAAuB;gBACvB,+DAA+D;gBAC/D,oDAAoD;gBACpD,oEAAoE;gBACpE,sCAAsC;gBACtC,EAAE;gBACF,aAAa;gBACb,uEAAuE;gBACvE,6DAA6D;gBAC7D,0CAA0C;gBAC1C,6CAA6C;gBAC7C,uCAAuC;gBACvC,8CAA8C;gBAC9C,EAAE;gBACF,6FAA6F;aAC9F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;KACF,EACD,KAAK,EAAE,KAAyB,EAAE,OAA6B,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,4EAA4E,CAAC;QACtF,CAAC;
|
|
1
|
+
{"version":3,"file":"enterWorktree.js","sourceRoot":"","sources":["../../../src/tools/enterWorktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ declare const exaSearchSchema: z.ZodObject<{
|
|
|
11
11
|
query: z.ZodString;
|
|
12
12
|
type: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
|
|
13
13
|
auto: "auto";
|
|
14
|
+
deep: "deep";
|
|
14
15
|
fast: "fast";
|
|
15
16
|
instant: "instant";
|
|
16
17
|
"deep-lite": "deep-lite";
|
|
17
|
-
deep: "deep";
|
|
18
18
|
"deep-reasoning": "deep-reasoning";
|
|
19
19
|
}>>>;
|
|
20
20
|
num_results: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
@@ -44,7 +44,7 @@ export declare function resolveExaApiKey(explicit?: string): Promise<string | un
|
|
|
44
44
|
export declare function runExaSearch(input: ExaSearchInput, options?: CreateExaSearchToolOptions): Promise<string>;
|
|
45
45
|
export declare function createExaSearchTool(options?: CreateExaSearchToolOptions): import("../types.js").AgentToolDefinition<{
|
|
46
46
|
query: string;
|
|
47
|
-
type: "auto" | "
|
|
47
|
+
type: "auto" | "deep" | "fast" | "instant" | "deep-lite" | "deep-reasoning";
|
|
48
48
|
num_results: number;
|
|
49
49
|
include_text: boolean;
|
|
50
50
|
include_highlights: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exitWorktree.d.ts","sourceRoot":"","sources":["../../../src/tools/exitWorktree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"exitWorktree.d.ts","sourceRoot":"","sources":["../../../src/tools/exitWorktree.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAItD,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,eAAe,GAAG,SAAS,4EAyD3F"}
|
|
@@ -21,11 +21,12 @@ export function createExitWorktreeTool(getWorktreeService) {
|
|
|
21
21
|
'be prompted to keep or discard them.',
|
|
22
22
|
].join('\n');
|
|
23
23
|
},
|
|
24
|
-
}, async (_input) => {
|
|
24
|
+
}, async (_input, context) => {
|
|
25
25
|
const service = getWorktreeService();
|
|
26
26
|
if (!service) {
|
|
27
27
|
return 'Worktree service is not available.';
|
|
28
28
|
}
|
|
29
|
+
await service.init();
|
|
29
30
|
if (!service.isInWorktree) {
|
|
30
31
|
return 'Not currently in a worktree. Nothing to exit.';
|
|
31
32
|
}
|
|
@@ -34,6 +35,7 @@ export function createExitWorktreeTool(getWorktreeService) {
|
|
|
34
35
|
if (!popped) {
|
|
35
36
|
return 'Not currently in a worktree. Nothing to exit.';
|
|
36
37
|
}
|
|
38
|
+
context.metadata.__hadamardWorkDir = service.currentWorkDir;
|
|
37
39
|
const dirty = await service.isWorktreeDirty(prevWorkDir);
|
|
38
40
|
const parts = [
|
|
39
41
|
`Exited worktree at ${prevWorkDir}.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exitWorktree.js","sourceRoot":"","sources":["../../../src/tools/exitWorktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"exitWorktree.js","sourceRoot":"","sources":["../../../src/tools/exitWorktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAI3C,MAAM,CAAC,MAAM,uBAAuB,GAAG,cAAc,CAAC;AAEtD,MAAM,kBAAkB,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAE9C,MAAM,UAAU,sBAAsB,CAAC,kBAAqD;IAC1F,OAAO,IAAI,CACT;QACE,IAAI,EAAE,uBAAuB;QAC7B,WAAW,EACT,4EAA4E;YAC5E,mEAAmE;QACrE,WAAW,EAAE,kBAAkB;QAC/B,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;QAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,OAAO;gBACL,sBAAsB;gBACtB,2EAA2E;gBAC3E,4EAA4E;gBAC5E,sCAAsC;aACvC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;KACF,EACD,KAAK,EAAE,MAA6B,EAAE,OAA6B,EAAE,EAAE;QACrE,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,oCAAoC,CAAC;QAC9C,CAAC;QACD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAErB,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,+CAA+C,CAAC;QACzD,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;QAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,+CAA+C,CAAC;QACzD,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;QAE5D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAEzD,MAAM,KAAK,GAAa;YACtB,sBAAsB,WAAW,GAAG;YACpC,kCAAkC,OAAO,CAAC,cAAc,EAAE;SAC3D,CAAC;QAEF,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,IAAI,CACR,EAAE,EACF,qBAAqB,WAAW,2BAA2B,EAC3D,WAAW,MAAM,CAAC,cAAc,IAAI,UAAU,EAAE,EAChD,sFAAsF,EACtF,aAAa,OAAO,CAAC,YAAY,8BAA8B,WAAW,GAAG,CAC9E,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,18 +1,5 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Hadamard Core Tools — unified factory for all tools.
|
|
3
|
-
*
|
|
4
|
-
* Provides Read, Write, Edit, Glob, Grep, Bash, TodoWrite, AskUserQuestion,
|
|
5
|
-
* WebFetch, WebSearch, NotebookEdit, and PowerShell by default.
|
|
6
|
-
*
|
|
7
|
-
* The placeholder Task tools (TaskCreate/TaskUpdate/...) and misc tools
|
|
8
|
-
* (Config/ToolSearch/Skill/SendMessage/RemoteTrigger) are opt-in: the SDK
|
|
9
|
-
* client injects real Task, TaskList/TaskGet/TaskStop/TaskOutput, and Skill
|
|
10
|
-
* implementations at runtime, and exposing the no-op stubs alongside them
|
|
11
|
-
* confuses the model and wastes turns.
|
|
12
|
-
*
|
|
13
|
-
* All schemas, descriptions, and prompts match Claude Code exactly.
|
|
14
|
-
*/
|
|
15
1
|
import type { AgentToolDefinition } from '../types.js';
|
|
2
|
+
import { WorktreeService } from '../worktree/worktreeService.js';
|
|
16
3
|
import { type HadamardFileToolsOptions } from './hadamardFileTools.js';
|
|
17
4
|
import { type PlanModeToolContext } from './planMode/PlanModeTools.js';
|
|
18
5
|
export interface HadamardCoreToolsOptions extends HadamardFileToolsOptions, PlanModeToolContext {
|
|
@@ -25,6 +12,10 @@ export interface HadamardCoreToolsOptions extends HadamardFileToolsOptions, Plan
|
|
|
25
12
|
notebookEdit?: boolean;
|
|
26
13
|
powershell?: boolean;
|
|
27
14
|
miscTools?: boolean;
|
|
15
|
+
/** Register EnterWorktree / ExitWorktree (default true). */
|
|
16
|
+
worktree?: boolean;
|
|
17
|
+
/** Shared worktree stack for mid-session cwd switches. */
|
|
18
|
+
getWorktreeService?: () => WorktreeService | undefined;
|
|
28
19
|
}
|
|
29
20
|
export declare function createHadamardCoreTools(options?: HadamardCoreToolsOptions): AgentToolDefinition[];
|
|
30
21
|
//# sourceMappingURL=hadamardCoreTools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hadamardCoreTools.d.ts","sourceRoot":"","sources":["../../../src/tools/hadamardCoreTools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hadamardCoreTools.d.ts","sourceRoot":"","sources":["../../../src/tools/hadamardCoreTools.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAA2B,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAMhG,OAAO,EAAuB,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAQ5F,MAAM,WAAW,wBAAyB,SAAQ,wBAAwB,EAAE,mBAAmB;IAC7F,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,kBAAkB,CAAC,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;CACxD;AAED,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,wBAA6B,GACrC,mBAAmB,EAAE,CAsCvB"}
|
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Hadamard Core Tools — unified factory for all tools.
|
|
3
|
+
*
|
|
4
|
+
* Provides Read, Write, Edit, Glob, Grep, Bash, TodoWrite, AskUserQuestion,
|
|
5
|
+
* WebFetch, WebSearch, NotebookEdit, PowerShell, EnterWorktree, and ExitWorktree
|
|
6
|
+
* by default.
|
|
7
|
+
*
|
|
8
|
+
* The placeholder Task tools (TaskCreate/TaskUpdate/...) and misc tools
|
|
9
|
+
* (Config/ToolSearch/Skill/SendMessage/RemoteTrigger) are opt-in via
|
|
10
|
+
* `taskTools: true` / `miscTools: true`: the SDK client injects real Task,
|
|
11
|
+
* TaskList/TaskGet/TaskStop/TaskOutput, and Skill implementations at runtime,
|
|
12
|
+
* and exposing the no-op stubs alongside them confuses the model and wastes
|
|
13
|
+
* turns. ExaSearch is not registered here — enable the managed plugin "exa"
|
|
14
|
+
* (EXA_API_KEY or ~/.exa/config.json).
|
|
15
|
+
*
|
|
16
|
+
* All schemas, descriptions, and prompts match Claude Code exactly.
|
|
17
|
+
*/
|
|
18
|
+
import path from 'node:path';
|
|
19
|
+
import { WorktreeService } from '../worktree/worktreeService.js';
|
|
1
20
|
import { createHadamardFileTools } from './hadamardFileTools.js';
|
|
2
21
|
import { createHadamardWebTools } from './hadamardWebTools.js';
|
|
3
22
|
import { createTavilySearchTool } from './tavilySearch.js';
|
|
@@ -9,6 +28,8 @@ import { createHadamardTaskTools } from './hadamardTaskTools.js';
|
|
|
9
28
|
import { createNotebookEditTool } from './hadamardNotebookEdit.js';
|
|
10
29
|
import { createPowerShellTool } from './hadamardShellTools.js';
|
|
11
30
|
import { createHadamardMiscTools } from './hadamardMiscTools.js';
|
|
31
|
+
import { createEnterWorktreeTool } from './enterWorktree.js';
|
|
32
|
+
import { createExitWorktreeTool } from './exitWorktree.js';
|
|
12
33
|
export function createHadamardCoreTools(options = {}) {
|
|
13
34
|
const tools = [
|
|
14
35
|
...createHadamardFileTools({ cwd: options.cwd }),
|
|
@@ -42,6 +63,16 @@ export function createHadamardCoreTools(options = {}) {
|
|
|
42
63
|
tools.push(createPowerShellTool());
|
|
43
64
|
if (options.miscTools === true)
|
|
44
65
|
tools.push(...createHadamardMiscTools());
|
|
66
|
+
if (options.worktree !== false) {
|
|
67
|
+
let lazyService;
|
|
68
|
+
const getService = options.getWorktreeService ?? (() => {
|
|
69
|
+
if (!lazyService) {
|
|
70
|
+
lazyService = new WorktreeService(path.resolve(options.cwd ?? process.cwd()));
|
|
71
|
+
}
|
|
72
|
+
return lazyService;
|
|
73
|
+
});
|
|
74
|
+
tools.push(createEnterWorktreeTool(getService), createExitWorktreeTool(getService));
|
|
75
|
+
}
|
|
45
76
|
return tools;
|
|
46
77
|
}
|
|
47
78
|
//# sourceMappingURL=hadamardCoreTools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hadamardCoreTools.js","sourceRoot":"","sources":["../../../src/tools/hadamardCoreTools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hadamardCoreTools.js","sourceRoot":"","sources":["../../../src/tools/hadamardCoreTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hadamardFileTools.d.ts","sourceRoot":"","sources":["../../../src/tools/hadamardFileTools.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAwB,MAAM,aAAa,CAAC;AAM7E,MAAM,WAAW,wBAAwB;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"hadamardFileTools.d.ts","sourceRoot":"","sources":["../../../src/tools/hadamardFileTools.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAwB,MAAM,aAAa,CAAC;AAM7E,MAAM,WAAW,wBAAwB;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA0XD,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,wBAA6B,GACrC,mBAAmB,EAAE,CAcvB"}
|