actoviq-agent-sdk 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README-zh.md +37 -2
- package/README.md +37 -2
- package/bin/actoviq-tui.js +5 -0
- package/dist/src/cli/actoviq-react.js +93 -13
- package/dist/src/cli/actoviq-react.js.map +1 -1
- package/dist/src/cli/actoviq-tui.d.ts +3 -0
- package/dist/src/cli/actoviq-tui.d.ts.map +1 -0
- package/dist/src/cli/actoviq-tui.js +76 -0
- package/dist/src/cli/actoviq-tui.js.map +1 -0
- package/dist/src/config/actoviqSettingsStore.d.ts.map +1 -1
- package/dist/src/config/actoviqSettingsStore.js +8 -2
- package/dist/src/config/actoviqSettingsStore.js.map +1 -1
- package/dist/src/config/anthropicEnvMapping.d.ts +18 -0
- package/dist/src/config/anthropicEnvMapping.d.ts.map +1 -0
- package/dist/src/config/anthropicEnvMapping.js +49 -0
- package/dist/src/config/anthropicEnvMapping.js.map +1 -0
- package/dist/src/config/modelTiers.d.ts +12 -0
- package/dist/src/config/modelTiers.d.ts.map +1 -0
- package/dist/src/config/modelTiers.js +31 -0
- package/dist/src/config/modelTiers.js.map +1 -0
- package/dist/src/config/projectSessionDirectory.d.ts +8 -0
- package/dist/src/config/projectSessionDirectory.d.ts.map +1 -0
- package/dist/src/config/projectSessionDirectory.js +83 -0
- package/dist/src/config/projectSessionDirectory.js.map +1 -0
- package/dist/src/config/resolveRuntimeConfig.d.ts.map +1 -1
- package/dist/src/config/resolveRuntimeConfig.js +73 -21
- package/dist/src/config/resolveRuntimeConfig.js.map +1 -1
- package/dist/src/index.d.ts +7 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +7 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/connectionManager.d.ts.map +1 -1
- package/dist/src/mcp/connectionManager.js +10 -1
- package/dist/src/mcp/connectionManager.js.map +1 -1
- package/dist/src/memory/actoviqMemory.d.ts.map +1 -1
- package/dist/src/memory/actoviqMemory.js +10 -6
- package/dist/src/memory/actoviqMemory.js.map +1 -1
- package/dist/src/memory/actoviqTranscriptLogger.d.ts.map +1 -1
- package/dist/src/memory/actoviqTranscriptLogger.js +2 -2
- package/dist/src/memory/actoviqTranscriptLogger.js.map +1 -1
- package/dist/src/parity/actoviqBridgeEvents.d.ts.map +1 -1
- package/dist/src/parity/actoviqBridgeEvents.js +4 -2
- package/dist/src/parity/actoviqBridgeEvents.js.map +1 -1
- package/dist/src/parity/actoviqBridgeSdk.d.ts.map +1 -1
- package/dist/src/parity/actoviqBridgeSdk.js +9 -1
- package/dist/src/parity/actoviqBridgeSdk.js.map +1 -1
- package/dist/src/parity/actoviqCleanBridgeCompatSdk.d.ts +277 -0
- package/dist/src/parity/actoviqCleanBridgeCompatSdk.d.ts.map +1 -0
- package/dist/src/parity/actoviqCleanBridgeCompatSdk.js +1395 -0
- package/dist/src/parity/actoviqCleanBridgeCompatSdk.js.map +1 -0
- package/dist/src/parity/portableSessions.d.ts.map +1 -1
- package/dist/src/parity/portableSessions.js +6 -2
- package/dist/src/parity/portableSessions.js.map +1 -1
- package/dist/src/provider/client.d.ts +5 -0
- package/dist/src/provider/client.d.ts.map +1 -1
- package/dist/src/provider/client.js +82 -8
- package/dist/src/provider/client.js.map +1 -1
- package/dist/src/provider/openai-client.d.ts.map +1 -1
- package/dist/src/provider/openai-client.js +43 -4
- package/dist/src/provider/openai-client.js.map +1 -1
- package/dist/src/provider/openai-model-api.d.ts.map +1 -1
- package/dist/src/provider/openai-model-api.js +3 -0
- package/dist/src/provider/openai-model-api.js.map +1 -1
- package/dist/src/provider/openai-types.d.ts +1 -0
- package/dist/src/provider/openai-types.d.ts.map +1 -1
- package/dist/src/runtime/actoviqAgentDefinitions.d.ts +8 -0
- package/dist/src/runtime/actoviqAgentDefinitions.d.ts.map +1 -0
- package/dist/src/runtime/actoviqAgentDefinitions.js +165 -0
- package/dist/src/runtime/actoviqAgentDefinitions.js.map +1 -0
- package/dist/src/runtime/actoviqAgents.d.ts +26 -2
- package/dist/src/runtime/actoviqAgents.d.ts.map +1 -1
- package/dist/src/runtime/actoviqAgents.js +237 -26
- package/dist/src/runtime/actoviqAgents.js.map +1 -1
- package/dist/src/runtime/actoviqApiMicrocompact.d.ts +14 -0
- package/dist/src/runtime/actoviqApiMicrocompact.d.ts.map +1 -1
- package/dist/src/runtime/actoviqApiMicrocompact.js +102 -0
- package/dist/src/runtime/actoviqApiMicrocompact.js.map +1 -1
- package/dist/src/runtime/actoviqBackgroundTasks.d.ts +15 -1
- package/dist/src/runtime/actoviqBackgroundTasks.d.ts.map +1 -1
- package/dist/src/runtime/actoviqBackgroundTasks.js +72 -10
- package/dist/src/runtime/actoviqBackgroundTasks.js.map +1 -1
- package/dist/src/runtime/actoviqCompact.d.ts +59 -0
- package/dist/src/runtime/actoviqCompact.d.ts.map +1 -1
- package/dist/src/runtime/actoviqCompact.js +344 -15
- package/dist/src/runtime/actoviqCompact.js.map +1 -1
- package/dist/src/runtime/actoviqModelApi.d.ts.map +1 -1
- package/dist/src/runtime/actoviqModelApi.js +20 -4
- package/dist/src/runtime/actoviqModelApi.js.map +1 -1
- package/dist/src/runtime/actoviqPermissions.d.ts +5 -2
- package/dist/src/runtime/actoviqPermissions.d.ts.map +1 -1
- package/dist/src/runtime/actoviqPermissions.js +91 -202
- package/dist/src/runtime/actoviqPermissions.js.map +1 -1
- package/dist/src/runtime/actoviqSessionPermissions.d.ts +5 -0
- package/dist/src/runtime/actoviqSessionPermissions.d.ts.map +1 -0
- package/dist/src/runtime/actoviqSessionPermissions.js +44 -0
- package/dist/src/runtime/actoviqSessionPermissions.js.map +1 -0
- package/dist/src/runtime/agentClient.d.ts +37 -3
- package/dist/src/runtime/agentClient.d.ts.map +1 -1
- package/dist/src/runtime/agentClient.js +1112 -100
- package/dist/src/runtime/agentClient.js.map +1 -1
- package/dist/src/runtime/agentSession.d.ts +8 -5
- package/dist/src/runtime/agentSession.d.ts.map +1 -1
- package/dist/src/runtime/agentSession.js +11 -4
- package/dist/src/runtime/agentSession.js.map +1 -1
- 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 +575 -36
- package/dist/src/runtime/conversationEngine.js.map +1 -1
- package/dist/src/runtime/defaultActoviqAgents.d.ts +3 -0
- package/dist/src/runtime/defaultActoviqAgents.d.ts.map +1 -0
- package/dist/src/runtime/defaultActoviqAgents.js +85 -0
- package/dist/src/runtime/defaultActoviqAgents.js.map +1 -0
- package/dist/src/runtime/safetyChecks.d.ts.map +1 -1
- package/dist/src/runtime/safetyChecks.js +15 -9
- package/dist/src/runtime/safetyChecks.js.map +1 -1
- package/dist/src/runtime/sessionManager.d.ts.map +1 -1
- package/dist/src/runtime/sessionManager.js +10 -5
- package/dist/src/runtime/sessionManager.js.map +1 -1
- package/dist/src/runtime/tools.d.ts.map +1 -1
- package/dist/src/runtime/tools.js +1 -0
- package/dist/src/runtime/tools.js.map +1 -1
- package/dist/src/scheduling/cron.d.ts.map +1 -1
- package/dist/src/scheduling/cron.js +3 -1
- package/dist/src/scheduling/cron.js.map +1 -1
- package/dist/src/storage/backgroundTaskStore.d.ts.map +1 -1
- package/dist/src/storage/backgroundTaskStore.js +3 -2
- package/dist/src/storage/backgroundTaskStore.js.map +1 -1
- package/dist/src/storage/mailboxStore.d.ts.map +1 -1
- package/dist/src/storage/mailboxStore.js +3 -3
- package/dist/src/storage/mailboxStore.js.map +1 -1
- package/dist/src/storage/pathSafety.d.ts +4 -0
- package/dist/src/storage/pathSafety.d.ts.map +1 -0
- package/dist/src/storage/pathSafety.js +28 -0
- package/dist/src/storage/pathSafety.js.map +1 -0
- package/dist/src/storage/sessionStore.d.ts +2 -2
- package/dist/src/storage/sessionStore.d.ts.map +1 -1
- package/dist/src/storage/sessionStore.js +23 -8
- package/dist/src/storage/sessionStore.js.map +1 -1
- package/dist/src/storage/teammateStore.d.ts.map +1 -1
- package/dist/src/storage/teammateStore.js +3 -2
- package/dist/src/storage/teammateStore.js.map +1 -1
- package/dist/src/swarm/actoviqSwarm.d.ts.map +1 -1
- package/dist/src/swarm/actoviqSwarm.js +6 -6
- package/dist/src/swarm/actoviqSwarm.js.map +1 -1
- package/dist/src/tools/actoviqCoreTools.d.ts +7 -2
- package/dist/src/tools/actoviqCoreTools.d.ts.map +1 -1
- package/dist/src/tools/actoviqCoreTools.js +2 -2
- package/dist/src/tools/actoviqCoreTools.js.map +1 -1
- package/dist/src/tools/actoviqFileTools.d.ts.map +1 -1
- package/dist/src/tools/actoviqFileTools.js +16 -5
- package/dist/src/tools/actoviqFileTools.js.map +1 -1
- package/dist/src/tools/actoviqNotebookEdit.d.ts.map +1 -1
- package/dist/src/tools/actoviqNotebookEdit.js +121 -4
- package/dist/src/tools/actoviqNotebookEdit.js.map +1 -1
- package/dist/src/tools/actoviqShellTools.d.ts.map +1 -1
- package/dist/src/tools/actoviqShellTools.js +38 -9
- package/dist/src/tools/actoviqShellTools.js.map +1 -1
- package/dist/src/tools/actoviqWebTools.d.ts.map +1 -1
- package/dist/src/tools/actoviqWebTools.js +50 -18
- package/dist/src/tools/actoviqWebTools.js.map +1 -1
- package/dist/src/tools/bash/BashTool.d.ts.map +1 -1
- package/dist/src/tools/bash/BashTool.js +47 -14
- package/dist/src/tools/bash/BashTool.js.map +1 -1
- package/dist/src/tools/todo/TodoWriteTool.d.ts +14 -0
- package/dist/src/tools/todo/TodoWriteTool.d.ts.map +1 -1
- package/dist/src/tools/todo/TodoWriteTool.js +45 -2
- package/dist/src/tools/todo/TodoWriteTool.js.map +1 -1
- package/dist/src/tui/actoviqTui.d.ts +13 -0
- package/dist/src/tui/actoviqTui.d.ts.map +1 -0
- package/dist/src/tui/actoviqTui.js +1594 -0
- package/dist/src/tui/actoviqTui.js.map +1 -0
- package/dist/src/tui/ansi.d.ts +33 -0
- package/dist/src/tui/ansi.d.ts.map +1 -0
- package/dist/src/tui/ansi.js +127 -0
- package/dist/src/tui/ansi.js.map +1 -0
- package/dist/src/tui/editor.d.ts +56 -0
- package/dist/src/tui/editor.d.ts.map +1 -0
- package/dist/src/tui/editor.js +253 -0
- package/dist/src/tui/editor.js.map +1 -0
- package/dist/src/tui/pluginCatalog.d.ts +13 -0
- package/dist/src/tui/pluginCatalog.d.ts.map +1 -0
- package/dist/src/tui/pluginCatalog.js +78 -0
- package/dist/src/tui/pluginCatalog.js.map +1 -0
- package/dist/src/tui/screen.d.ts +28 -0
- package/dist/src/tui/screen.d.ts.map +1 -0
- package/dist/src/tui/screen.js +119 -0
- package/dist/src/tui/screen.js.map +1 -0
- package/dist/src/tui/selection.d.ts +9 -0
- package/dist/src/tui/selection.d.ts.map +1 -0
- package/dist/src/tui/selection.js +16 -0
- package/dist/src/tui/selection.js.map +1 -0
- package/dist/src/tui/transcript.d.ts +41 -0
- package/dist/src/tui/transcript.d.ts.map +1 -0
- package/dist/src/tui/transcript.js +147 -0
- package/dist/src/tui/transcript.js.map +1 -0
- package/dist/src/types.d.ts +233 -2
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/workflow/workflowEngine.js +26 -3
- package/dist/src/workflow/workflowEngine.js.map +1 -1
- package/dist/src/workspace/actoviqWorkspace.d.ts.map +1 -1
- package/dist/src/workspace/actoviqWorkspace.js +25 -2
- package/dist/src/workspace/actoviqWorkspace.js.map +1 -1
- package/package.json +26 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { readFile, writeFile } from 'node:fs/promises';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
4
5
|
import { z } from 'zod';
|
|
6
|
+
import { ToolExecutionError } from '../errors.js';
|
|
5
7
|
import { tool } from '../runtime/tools.js';
|
|
6
8
|
export const NOTEBOOK_EDIT_TOOL_NAME = 'NotebookEdit';
|
|
7
9
|
export function createNotebookEditTool() {
|
|
@@ -16,8 +18,123 @@ export function createNotebookEditTool() {
|
|
|
16
18
|
cell_type: z.enum(['code', 'markdown']).optional().describe('The type of the cell (code or markdown). If not specified, defaults to current cell type. If using edit_mode=insert, this is required.'),
|
|
17
19
|
edit_mode: z.enum(['replace', 'insert']).optional().default('replace').describe('replace: modify an existing cell. insert: add a new cell after cell_id.'),
|
|
18
20
|
}),
|
|
21
|
+
isDestructive: () => true,
|
|
19
22
|
}, async (input) => {
|
|
20
|
-
|
|
23
|
+
const notebookPath = resolveNotebookPath(input.notebook_path);
|
|
24
|
+
const notebook = await readNotebook(notebookPath);
|
|
25
|
+
const mode = input.edit_mode ?? 'replace';
|
|
26
|
+
if (!Array.isArray(notebook.cells)) {
|
|
27
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `Notebook does not contain a cells array: ${notebookPath}`);
|
|
28
|
+
}
|
|
29
|
+
if (mode === 'insert') {
|
|
30
|
+
if (!input.cell_type) {
|
|
31
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, 'cell_type is required when edit_mode is "insert".');
|
|
32
|
+
}
|
|
33
|
+
const insertIndex = input.cell_id
|
|
34
|
+
? findCellIndex(notebook.cells, input.cell_id, notebookPath) + 1
|
|
35
|
+
: 0;
|
|
36
|
+
const cell = createNotebookCell(input.cell_type, input.new_source);
|
|
37
|
+
notebook.cells.splice(insertIndex, 0, cell);
|
|
38
|
+
await writeNotebook(notebookPath, notebook);
|
|
39
|
+
return {
|
|
40
|
+
notebook_path: notebookPath,
|
|
41
|
+
edit_mode: mode,
|
|
42
|
+
cell_id: cell.id,
|
|
43
|
+
cell_type: cell.cell_type,
|
|
44
|
+
index: insertIndex,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
if (!input.cell_id) {
|
|
48
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, 'cell_id is required when edit_mode is "replace".');
|
|
49
|
+
}
|
|
50
|
+
const index = findCellIndex(notebook.cells, input.cell_id, notebookPath);
|
|
51
|
+
const existing = notebook.cells[index];
|
|
52
|
+
const nextType = input.cell_type ?? normalizeCellType(existing.cell_type);
|
|
53
|
+
notebook.cells[index] = normalizeCellForType({
|
|
54
|
+
...existing,
|
|
55
|
+
cell_type: nextType,
|
|
56
|
+
source: input.new_source,
|
|
57
|
+
}, nextType);
|
|
58
|
+
await writeNotebook(notebookPath, notebook);
|
|
59
|
+
return {
|
|
60
|
+
notebook_path: notebookPath,
|
|
61
|
+
edit_mode: mode,
|
|
62
|
+
cell_id: input.cell_id,
|
|
63
|
+
cell_type: nextType,
|
|
64
|
+
index,
|
|
65
|
+
};
|
|
21
66
|
});
|
|
22
67
|
}
|
|
68
|
+
function resolveNotebookPath(rawPath) {
|
|
69
|
+
if (!path.isAbsolute(rawPath) && !rawPath.startsWith('~')) {
|
|
70
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `Expected an absolute notebook_path, received "${rawPath}".`);
|
|
71
|
+
}
|
|
72
|
+
const resolved = rawPath === '~'
|
|
73
|
+
? os.homedir()
|
|
74
|
+
: rawPath.startsWith('~/') || rawPath.startsWith('~\\')
|
|
75
|
+
? path.resolve(os.homedir(), rawPath.slice(2))
|
|
76
|
+
: path.resolve(rawPath);
|
|
77
|
+
if (!resolved.toLowerCase().endsWith('.ipynb')) {
|
|
78
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `NotebookEdit only supports .ipynb files: ${resolved}`);
|
|
79
|
+
}
|
|
80
|
+
return resolved;
|
|
81
|
+
}
|
|
82
|
+
async function readNotebook(notebookPath) {
|
|
83
|
+
let raw;
|
|
84
|
+
try {
|
|
85
|
+
raw = await readFile(notebookPath, 'utf8');
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `Notebook not found: ${notebookPath}`);
|
|
89
|
+
}
|
|
90
|
+
try {
|
|
91
|
+
const parsed = JSON.parse(raw);
|
|
92
|
+
if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
|
|
93
|
+
throw new Error('Notebook root must be a JSON object.');
|
|
94
|
+
}
|
|
95
|
+
return parsed;
|
|
96
|
+
}
|
|
97
|
+
catch (error) {
|
|
98
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
99
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `Failed to parse notebook JSON at ${notebookPath}: ${message}`);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
async function writeNotebook(notebookPath, notebook) {
|
|
103
|
+
await writeFile(notebookPath, `${JSON.stringify(notebook, null, 2)}\n`, 'utf8');
|
|
104
|
+
}
|
|
105
|
+
function findCellIndex(cells, cellId, notebookPath) {
|
|
106
|
+
const index = cells.findIndex(cell => cell.id === cellId);
|
|
107
|
+
if (index < 0) {
|
|
108
|
+
throw new ToolExecutionError(NOTEBOOK_EDIT_TOOL_NAME, `Cell "${cellId}" was not found in ${notebookPath}.`);
|
|
109
|
+
}
|
|
110
|
+
return index;
|
|
111
|
+
}
|
|
112
|
+
function createNotebookCell(cellType, source) {
|
|
113
|
+
return normalizeCellForType({
|
|
114
|
+
id: randomUUID().replace(/-/gu, '').slice(0, 16),
|
|
115
|
+
cell_type: cellType,
|
|
116
|
+
metadata: {},
|
|
117
|
+
source,
|
|
118
|
+
}, cellType);
|
|
119
|
+
}
|
|
120
|
+
function normalizeCellType(value) {
|
|
121
|
+
return value === 'markdown' ? 'markdown' : 'code';
|
|
122
|
+
}
|
|
123
|
+
function normalizeCellForType(cell, cellType) {
|
|
124
|
+
if (cellType === 'code') {
|
|
125
|
+
return {
|
|
126
|
+
...cell,
|
|
127
|
+
cell_type: 'code',
|
|
128
|
+
outputs: Array.isArray(cell.outputs) ? cell.outputs : [],
|
|
129
|
+
execution_count: typeof cell.execution_count === 'number' || cell.execution_count === null
|
|
130
|
+
? cell.execution_count
|
|
131
|
+
: null,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
const { outputs: _outputs, execution_count: _executionCount, ...rest } = cell;
|
|
135
|
+
return {
|
|
136
|
+
...rest,
|
|
137
|
+
cell_type: 'markdown',
|
|
138
|
+
};
|
|
139
|
+
}
|
|
23
140
|
//# sourceMappingURL=actoviqNotebookEdit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actoviqNotebookEdit.js","sourceRoot":"","sources":["../../../src/tools/actoviqNotebookEdit.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"actoviqNotebookEdit.js","sourceRoot":"","sources":["../../../src/tools/actoviqNotebookEdit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actoviqShellTools.d.ts","sourceRoot":"","sources":["../../../src/tools/actoviqShellTools.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD,eAAO,MAAM,oBAAoB,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"actoviqShellTools.d.ts","sourceRoot":"","sources":["../../../src/tools/actoviqShellTools.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD,eAAO,MAAM,oBAAoB,eAAe,CAAC;AAKjD,eAAO,MAAM,sBAAsB,QAYqD,CAAC;AAEzF,wBAAgB,oBAAoB,IAAI,mBAAmB,CA4D1D"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* Bash is in ./bash/BashTool.ts
|
|
4
|
-
*/
|
|
1
|
+
import { execFile as execFileCallback } from 'node:child_process';
|
|
2
|
+
import { promisify } from 'node:util';
|
|
5
3
|
import { z } from 'zod';
|
|
4
|
+
import { ToolExecutionError } from '../errors.js';
|
|
6
5
|
import { tool } from '../runtime/tools.js';
|
|
7
6
|
export const POWERSHELL_TOOL_NAME = 'PowerShell';
|
|
7
|
+
const execFile = promisify(execFileCallback);
|
|
8
|
+
const DEFAULT_TIMEOUT_MS = 120_000;
|
|
9
|
+
const MAX_TIMEOUT_MS = 600_000;
|
|
8
10
|
export const POWERSHELL_DESCRIPTION = 'Executes a given PowerShell command and returns its output.\n\n' +
|
|
9
11
|
'IMPORTANT: This tool is for terminal operations via PowerShell: git, npm, docker, and PS cmdlets.\n' +
|
|
10
|
-
'DO NOT use it for file operations (reading, writing, editing, searching, finding files)
|
|
12
|
+
'DO NOT use it for file operations (reading, writing, editing, searching, finding files) - use the dedicated tools instead.\n\n' +
|
|
11
13
|
'PowerShell edition: Windows PowerShell 5.1 (powershell.exe)\n' +
|
|
12
|
-
' - Pipeline chain operators `&&` and `||` are NOT available
|
|
14
|
+
' - Pipeline chain operators `&&` and `||` are NOT available - they cause a parser error.\n' +
|
|
13
15
|
' - Ternary (`?:`), null-coalescing (`??`), and null-conditional (`?.`) operators are NOT available.\n' +
|
|
14
16
|
' - Avoid `2>&1` on native executables.\n' +
|
|
15
17
|
' - Default file encoding is UTF-16 LE (with BOM).\n\n' +
|
|
@@ -27,9 +29,36 @@ export function createPowerShellTool() {
|
|
|
27
29
|
timeout: z.number().optional().describe('Optional timeout in milliseconds (max 600000).'),
|
|
28
30
|
}),
|
|
29
31
|
isDestructive: () => true,
|
|
30
|
-
}, async ({ command }) => {
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
}, async ({ command, timeout }, context) => {
|
|
33
|
+
if (process.platform !== 'win32') {
|
|
34
|
+
throw new ToolExecutionError(POWERSHELL_TOOL_NAME, 'PowerShell execution requires Windows.');
|
|
35
|
+
}
|
|
36
|
+
const timeoutMs = Math.min(Math.max(1, timeout ?? DEFAULT_TIMEOUT_MS), MAX_TIMEOUT_MS);
|
|
37
|
+
try {
|
|
38
|
+
const result = await execFile('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', command], {
|
|
39
|
+
cwd: context.cwd,
|
|
40
|
+
encoding: 'utf8',
|
|
41
|
+
timeout: timeoutMs,
|
|
42
|
+
windowsHide: true,
|
|
43
|
+
maxBuffer: 10 * 1024 * 1024,
|
|
44
|
+
});
|
|
45
|
+
return {
|
|
46
|
+
command,
|
|
47
|
+
stdout: result.stdout.trim(),
|
|
48
|
+
stderr: result.stderr.trim(),
|
|
49
|
+
exitCode: 0,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
const execError = error;
|
|
54
|
+
return {
|
|
55
|
+
command,
|
|
56
|
+
stdout: String(execError.stdout ?? '').trim(),
|
|
57
|
+
stderr: String(execError.stderr ?? execError.message).trim(),
|
|
58
|
+
exitCode: typeof execError.code === 'number' ? execError.code : 1,
|
|
59
|
+
signal: execError.signal,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
33
62
|
});
|
|
34
63
|
}
|
|
35
64
|
//# sourceMappingURL=actoviqShellTools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actoviqShellTools.js","sourceRoot":"","sources":["../../../src/tools/actoviqShellTools.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"actoviqShellTools.js","sourceRoot":"","sources":["../../../src/tools/actoviqShellTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actoviqWebTools.d.ts","sourceRoot":"","sources":["../../../src/tools/actoviqWebTools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EAKpB,MAAM,aAAa,CAAC;AAMrB,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"actoviqWebTools.d.ts","sourceRoot":"","sources":["../../../src/tools/actoviqWebTools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EAKpB,MAAM,aAAa,CAAC;AAMrB,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAqJD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAsRD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B;AAED,wBAAgB,qBAAqB,CACnC,OAAO,GAAE,sBAA2B,GACnC,mBAAmB,EAAE,CAEvB"}
|
|
@@ -4,6 +4,32 @@ import { webFetchPrompt } from './prompts/webFetchPrompt.js';
|
|
|
4
4
|
import { webSearchPrompt } from './prompts/webSearchPrompt.js';
|
|
5
5
|
const DEFAULT_FETCH_TIMEOUT = 15000;
|
|
6
6
|
const DEFAULT_MAX_CONTENT = 50000;
|
|
7
|
+
function createToolAbortSignal(timeoutMs, parentSignal) {
|
|
8
|
+
const controller = new AbortController();
|
|
9
|
+
let didTimeOut = false;
|
|
10
|
+
const timeout = setTimeout(() => {
|
|
11
|
+
didTimeOut = true;
|
|
12
|
+
controller.abort();
|
|
13
|
+
}, timeoutMs);
|
|
14
|
+
if (typeof timeout === 'object') {
|
|
15
|
+
timeout.unref?.();
|
|
16
|
+
}
|
|
17
|
+
const abortFromParent = () => controller.abort();
|
|
18
|
+
if (parentSignal?.aborted) {
|
|
19
|
+
abortFromParent();
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
parentSignal?.addEventListener('abort', abortFromParent, { once: true });
|
|
23
|
+
}
|
|
24
|
+
return {
|
|
25
|
+
signal: controller.signal,
|
|
26
|
+
timedOut: () => didTimeOut,
|
|
27
|
+
cleanup: () => {
|
|
28
|
+
clearTimeout(timeout);
|
|
29
|
+
parentSignal?.removeEventListener('abort', abortFromParent);
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
7
33
|
function createWebFetch(options = {}) {
|
|
8
34
|
const timeoutMs = options.timeoutMs ?? DEFAULT_FETCH_TIMEOUT;
|
|
9
35
|
const maxContentLength = options.maxContentLength ?? DEFAULT_MAX_CONTENT;
|
|
@@ -26,24 +52,23 @@ function createWebFetch(options = {}) {
|
|
|
26
52
|
? `Error fetching ${output.url}: ${output.error}`
|
|
27
53
|
: `Fetched ${output.url} (${output.contentLength} chars)`,
|
|
28
54
|
prompt: webFetchPrompt,
|
|
29
|
-
}, async (input,
|
|
55
|
+
}, async (input, context, onProgress) => {
|
|
30
56
|
const url = normalizeUrl(input.url);
|
|
31
57
|
onProgress?.({
|
|
32
58
|
toolUseID: '',
|
|
33
59
|
data: { type: 'fetching', message: `Fetching ${url}`, url },
|
|
34
60
|
});
|
|
61
|
+
let abortSignal;
|
|
35
62
|
try {
|
|
36
|
-
|
|
37
|
-
const timer = setTimeout(() => controller.abort(), timeoutMs);
|
|
63
|
+
abortSignal = createToolAbortSignal(timeoutMs, context.signal);
|
|
38
64
|
const response = await fetch(url, {
|
|
39
|
-
signal:
|
|
65
|
+
signal: abortSignal.signal,
|
|
40
66
|
headers: {
|
|
41
67
|
'User-Agent': 'ActoviqAgent/1.0',
|
|
42
68
|
Accept: 'text/html, text/plain, */*',
|
|
43
69
|
},
|
|
44
70
|
redirect: 'follow',
|
|
45
71
|
});
|
|
46
|
-
clearTimeout(timer);
|
|
47
72
|
if (!response.ok) {
|
|
48
73
|
return {
|
|
49
74
|
url,
|
|
@@ -77,7 +102,7 @@ function createWebFetch(options = {}) {
|
|
|
77
102
|
}
|
|
78
103
|
catch (err) {
|
|
79
104
|
const message = err instanceof Error ? err.message : String(err);
|
|
80
|
-
const isTimeout =
|
|
105
|
+
const isTimeout = abortSignal?.timedOut() ?? false;
|
|
81
106
|
return {
|
|
82
107
|
url,
|
|
83
108
|
content: '',
|
|
@@ -88,6 +113,9 @@ function createWebFetch(options = {}) {
|
|
|
88
113
|
: `Fetch failed: ${message}`,
|
|
89
114
|
};
|
|
90
115
|
}
|
|
116
|
+
finally {
|
|
117
|
+
abortSignal?.cleanup();
|
|
118
|
+
}
|
|
91
119
|
});
|
|
92
120
|
}
|
|
93
121
|
const DEFAULT_SEARCH_TIMEOUT = 20000;
|
|
@@ -140,11 +168,11 @@ function createWebSearch(options = {}) {
|
|
|
140
168
|
}
|
|
141
169
|
}
|
|
142
170
|
// ── Local search (DuckDuckGo) ──
|
|
143
|
-
const jsonResults = await tryJsonApi(query, limit, timeoutMs);
|
|
171
|
+
const jsonResults = await tryJsonApi(query, limit, timeoutMs, context.signal);
|
|
144
172
|
if (jsonResults.results.length > 0) {
|
|
145
173
|
return jsonResults;
|
|
146
174
|
}
|
|
147
|
-
const htmlResults = await tryHtmlSearch(query, limit, timeoutMs);
|
|
175
|
+
const htmlResults = await tryHtmlSearch(query, limit, timeoutMs, context.signal);
|
|
148
176
|
if (htmlResults.results.length > 0) {
|
|
149
177
|
return htmlResults;
|
|
150
178
|
}
|
|
@@ -219,16 +247,15 @@ async function tryServerSearch(query, limit, context) {
|
|
|
219
247
|
return { query, results: [], isError: true, error: `Server search failed: ${message}` };
|
|
220
248
|
}
|
|
221
249
|
}
|
|
222
|
-
async function tryJsonApi(query, limit, timeoutMs) {
|
|
250
|
+
async function tryJsonApi(query, limit, timeoutMs, parentSignal) {
|
|
251
|
+
let abortSignal;
|
|
223
252
|
try {
|
|
224
|
-
|
|
225
|
-
const timer = setTimeout(() => controller.abort(), timeoutMs);
|
|
253
|
+
abortSignal = createToolAbortSignal(timeoutMs, parentSignal);
|
|
226
254
|
const url = `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}&format=json&no_html=1&skip_disambig=1`;
|
|
227
255
|
const response = await fetch(url, {
|
|
228
|
-
signal:
|
|
256
|
+
signal: abortSignal.signal,
|
|
229
257
|
headers: { 'User-Agent': 'ActoviqAgent/1.0' },
|
|
230
258
|
});
|
|
231
|
-
clearTimeout(timer);
|
|
232
259
|
if (!response.ok) {
|
|
233
260
|
return { query, results: [], isError: true, error: `HTTP ${response.status}` };
|
|
234
261
|
}
|
|
@@ -280,17 +307,19 @@ async function tryJsonApi(query, limit, timeoutMs) {
|
|
|
280
307
|
const message = err instanceof Error ? err.message : String(err);
|
|
281
308
|
return { query, results: [], isError: true, error: `Search API failed: ${message}` };
|
|
282
309
|
}
|
|
310
|
+
finally {
|
|
311
|
+
abortSignal?.cleanup();
|
|
312
|
+
}
|
|
283
313
|
}
|
|
284
|
-
async function tryHtmlSearch(query, limit, timeoutMs) {
|
|
314
|
+
async function tryHtmlSearch(query, limit, timeoutMs, parentSignal) {
|
|
315
|
+
let abortSignal;
|
|
285
316
|
try {
|
|
286
|
-
|
|
287
|
-
const timer = setTimeout(() => controller.abort(), timeoutMs);
|
|
317
|
+
abortSignal = createToolAbortSignal(timeoutMs, parentSignal);
|
|
288
318
|
const url = `https://html.duckduckgo.com/html/?q=${encodeURIComponent(query)}`;
|
|
289
319
|
const response = await fetch(url, {
|
|
290
|
-
signal:
|
|
320
|
+
signal: abortSignal.signal,
|
|
291
321
|
headers: { 'User-Agent': 'ActoviqAgent/1.0' },
|
|
292
322
|
});
|
|
293
|
-
clearTimeout(timer);
|
|
294
323
|
if (!response.ok) {
|
|
295
324
|
return { query, results: [], isError: true, error: `HTTP ${response.status}` };
|
|
296
325
|
}
|
|
@@ -305,6 +334,9 @@ async function tryHtmlSearch(query, limit, timeoutMs) {
|
|
|
305
334
|
const message = err instanceof Error ? err.message : String(err);
|
|
306
335
|
return { query, results: [], isError: true, error: `HTML search failed: ${message}` };
|
|
307
336
|
}
|
|
337
|
+
finally {
|
|
338
|
+
abortSignal?.cleanup();
|
|
339
|
+
}
|
|
308
340
|
}
|
|
309
341
|
export function createActoviqWebTools(options = {}) {
|
|
310
342
|
return [createWebFetch(options.webFetch), createWebSearch(options.webSearch)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actoviqWebTools.js","sourceRoot":"","sources":["../../../src/tools/actoviqWebTools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actoviqWebTools.js","sourceRoot":"","sources":["../../../src/tools/actoviqWebTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAQ3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAS/D,MAAM,qBAAqB,GAAG,KAAK,CAAC;AACpC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAElC,SAAS,qBAAqB,CAC5B,SAAiB,EACjB,YAA0B;IAE1B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,UAAU,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC,EAAE,SAAS,CAAC,CAAC;IACd,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAEjD,IAAI,YAAY,EAAE,OAAO,EAAE,CAAC;QAC1B,eAAe,EAAE,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,YAAY,EAAE,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;QAC1B,OAAO,EAAE,GAAG,EAAE;YACZ,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,YAAY,EAAE,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,UAA2B,EAAE;IACnD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,qBAAqB,CAAC;IAC7D,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,mBAAmB,CAAC;IAEzE,OAAO,IAAI,CACT;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EACT,+CAA+C;YAC/C,6EAA6E;YAC7E,kEAAkE;YAClE,oDAAoD;YACpD,uEAAuE;QACzE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;YACpB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,+BAA+B,CAAC;YACzD,MAAM,EAAE,CAAC;iBACN,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,CACP,uFAAuF,CACxF;SACJ,CAAC;QACF,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,SAAS,EAAE,CAAC,MAAsB,EAAE,EAAE,CACpC,MAAM,CAAC,OAAO;YACZ,CAAC,CAAC,kBAAkB,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,EAAE;YACjD,CAAC,CAAC,WAAW,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,aAAa,SAAS;QAC7D,MAAM,EAAE,cAAc;KACvB,EACD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;QACnC,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEpC,UAAU,EAAE,CAAC;YACX,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,EAAE;SAC5D,CAAC,CAAC;QAEH,IAAI,WAAiE,CAAC;QACtE,IAAI,CAAC;YACH,WAAW,GAAG,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE/D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,OAAO,EAAE;oBACP,YAAY,EAAE,kBAAkB;oBAChC,MAAM,EAAE,4BAA4B;iBACrC;gBACD,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO;oBACL,GAAG;oBACH,OAAO,EAAE,EAAE;oBACX,aAAa,EAAE,CAAC;oBAChB,OAAO,EAAE,IAAI;oBACb,KAAK,EAAE,QAAQ,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,uDAAuD;iBACpF,CAAC;YAC7B,CAAC;YAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAC/D,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAElC,IAAI,OAAe,CAAC;YACpB,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,GAAG,CAAC;YAChB,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,GAAG,gBAAgB,EAAE,CAAC;gBACtC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,mBAAmB,CAAC;YACrE,CAAC;YAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM;gBAC7B,CAAC,CAAC,QAAQ,GAAG,iBAAiB,OAAO,EAAE;gBACvC,CAAC,CAAC,OAAO,CAAC;YAEZ,OAAO;gBACL,GAAG;gBACH,OAAO,EAAE,UAAU;gBACnB,aAAa,EAAE,UAAU,CAAC,MAAM;gBAChC,OAAO,EAAE,KAAK;aACU,CAAC;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,MAAM,SAAS,GAAG,WAAW,EAAE,QAAQ,EAAE,IAAI,KAAK,CAAC;YACnD,OAAO;gBACL,GAAG;gBACH,OAAO,EAAE,EAAE;gBACX,aAAa,EAAE,CAAC;gBAChB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,SAAS;oBACd,CAAC,CAAC,2BAA2B,SAAS,sDAAsD;oBAC5F,CAAC,CAAC,iBAAiB,OAAO,EAAE;aACN,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,WAAW,EAAE,OAAO,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAiBD,MAAM,sBAAsB,GAAG,KAAK,CAAC;AACrC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,SAAS,eAAe,CAAC,UAA4B,EAAE;IACrD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,sBAAsB,CAAC;IAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,mBAAmB,CAAC;IAE7D,OAAO,IAAI,CACT;QACE,IAAI,EAAE,WAAW;QACjB,WAAW,EACT,qEAAqE;YACrE,+EAA+E;YAC/E,2EAA2E;QAC7E,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;YACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YACrD,KAAK,EAAE,CAAC;iBACL,MAAM,EAAE;iBACR,GAAG,EAAE;iBACL,QAAQ,EAAE;iBACV,QAAQ,EAAE;iBACV,QAAQ,CAAC,0CAA0C,UAAU,GAAG,CAAC;SACrE,CAAC;QACF,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,SAAS,EAAE,CAAC,MAAuB,EAAE,EAAE,CACrC,MAAM,CAAC,OAAO;YACZ,CAAC,CAAC,iBAAiB,MAAM,CAAC,KAAK,EAAE;YACjC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;gBAC3B,CAAC,CAAC,yBAAyB,MAAM,CAAC,KAAK,4CAA4C;gBACnF,CAAC,CAAC,MAAM,CAAC,OAAO;qBACX,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;qBACnE,IAAI,CAAC,MAAM,CAAC;QACvB,MAAM,EAAE,eAAe;KACxB,EACD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,UAAU,CAAC;QACxC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAE1B,UAAU,EAAE,CAAC;YACX,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,KAAK,GAAG,EAAE,KAAK,EAAE;SACxE,CAAC,CAAC;QAEH,4DAA4D;QAC5D,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACtD,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAClE,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpD,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,qEAAqE;YACrE,IAAI,YAAY,EAAE,OAAO,EAAE,CAAC;gBAC1B,+BAA+B;YACjC,CAAC;iBAAM,IAAI,YAAY,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBACjD,OAAO,YAAY,CAAC;YACtB,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9E,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACjF,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO;YAC/B,CAAC,CAAC,WAAW,CAAC,KAAK;YACnB,CAAC,CAAC,WAAW,CAAC,OAAO;gBACnB,CAAC,CAAC,WAAW,CAAC,KAAK;gBACnB,CAAC,CAAC,yBAAyB,KAAK,GAAG,CAAC;QACxC,OAAO;YACL,KAAK;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,IAAI;YACb,KAAK;SACoB,CAAC;IAC9B,CAAC,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,KAAa,EACb,KAAa,EACb,OAA6B;IAE7B,IAAI,CAAC;QACH,MAAM,OAAO,GAAiB;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,uCAAuC,KAAK,EAAE;iBACxD;aACF;YACD,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,4DAA4D;YACpE,kBAAkB,EAAE;gBAClB,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE;aACjE;YACD,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE;YACjD,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE/D,0DAA0D;QAC1D,MAAM,OAAO,GAAsB,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,IAAI,KAAK,CAAC,OAAO,CAAE,KAAiC,CAAC,OAAO,CAAC,EAAE,CAAC;oBACzG,KAAK,MAAM,GAAG,IAAK,KAAiC,CAAC,OAAoE,EAAE,CAAC;wBAC1H,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK;4BAAE,MAAM;wBACnC,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;4BACZ,OAAO,CAAC,IAAI,CAAC;gCACX,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG;gCAC3B,GAAG,EAAE,GAAG,CAAC,GAAG;gCACZ,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;6BAC3B,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,0EAA0E;YAC1E,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO;iBACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAQ,CAA6B,CAAC,IAAI,KAAK,QAAQ,CAAC;iBAC3F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAA6B,CAAC,IAAc,CAAC;iBACzD,IAAI,CAAC,IAAI,CAAC;iBACV,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAClB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,4CAA4C,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QACxH,CAAC;QAED,OAAO;YACL,KAAK;YACL,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;YAChC,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,yBAAyB,OAAO,EAAE,EAAE,CAAC;IAC1F,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,KAAa,EACb,KAAa,EACb,SAAiB,EACjB,YAA0B;IAE1B,IAAI,WAAiE,CAAC;IACtE,IAAI,CAAC;QACH,WAAW,GAAG,qBAAqB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAE7D,MAAM,GAAG,GAAG,iCAAiC,kBAAkB,CAAC,KAAK,CAAC,wCAAwC,CAAC;QAC/G,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE,EAAE,YAAY,EAAE,kBAAkB,EAAE;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QACjF,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA2B,CAAC;QAC/D,MAAM,OAAO,GAAsB,EAAE,CAAC;QAEtC,4BAA4B;QAC5B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ;gBACtD,GAAG,EAAE,IAAI,CAAC,WAAW;gBACrB,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QAED,iBAAiB;QACjB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;YAC7C,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK;gBAAE,MAAM;YACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI;gBAAE,SAAS;YAC7C,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC1E,GAAG,EAAE,KAAK,CAAC,QAAQ;gBACnB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;aAClC,CAAC,CAAC;QACL,CAAC;QAED,gBAAgB;QAChB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK;oBAAE,MAAM;gBACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI;oBAAE,SAAS;gBAC3C,QAAQ;gBACR,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBAC3D,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;oBACxE,GAAG,EAAE,IAAI,CAAC,QAAQ;oBAClB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;iBACjC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,mCAAmC,EAAE,CAAC;QAC3F,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACrE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,sBAAsB,OAAO,EAAE,EAAE,CAAC;IACvF,CAAC;YAAS,CAAC;QACT,WAAW,EAAE,OAAO,EAAE,CAAC;IACzB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,KAAa,EACb,KAAa,EACb,SAAiB,EACjB,YAA0B;IAE1B,IAAI,WAAiE,CAAC;IACtE,IAAI,CAAC;QACH,WAAW,GAAG,qBAAqB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAE7D,MAAM,GAAG,GAAG,uCAAuC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE,EAAE,YAAY,EAAE,kBAAkB,EAAE;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QACjF,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEpD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;QAC7F,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,uBAAuB,OAAO,EAAE,EAAE,CAAC;IACxF,CAAC;YAAS,CAAC;QACT,WAAW,EAAE,OAAO,EAAE,CAAC;IACzB,CAAC;AACH,CAAC;AA4BD,MAAM,UAAU,qBAAqB,CACnC,UAAkC,EAAE;IAEpC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,qEAAqE;AAErE,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI;SACR,OAAO,CAAC,mCAAmC,EAAE,EAAE,CAAC;SAChD,OAAO,CAAC,iCAAiC,EAAE,EAAE,CAAC;SAC9C,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC;SACxB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;SACzB,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAY,EACZ,KAAa;IAEb,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,0CAA0C;IAC1C,2DAA2D;IAC3D,yCAAyC;IACzC,MAAM,WAAW,GAAG,8EAA8E,CAAC;IACnG,MAAM,cAAc,GAAG,iEAAiE,CAAC;IAEzF,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAE1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAAE,SAAS;QAEzB,MAAM,GAAG,GAAG,kBAAkB,CAC5B,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,6BAA6B,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CACpF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,SAAS;QAEtC,MAAM,KAAK,GAAG,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAEzC,OAAO,CAAC,IAAI,CAAC;YACX,KAAK;YACL,GAAG;YACH,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;gBACnB,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChE,CAAC,CAAC,GAAG;SACR,CAAC,CAAC;IACL,CAAC;IAED,oCAAoC;IACpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,IAAI,EAAE,CAAC;QACtF,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;YACnC,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK;gBAAE,MAAM;YACnC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;gBAAE,SAAS;YAE7B,MAAM,GAAG,GAAG,kBAAkB,CAC5B,IAAI,GAAG,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAC9E,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;gBAAE,SAAS;YAEtC,MAAM,SAAS,GAAG,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,SAAS;YAEnC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAI;SACR,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,YAAY,CAAC,MAAc;IAClC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,GAAG,EAAE,CAAC;IAChD,OAAO,WAAW,GAAG,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BashTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/bash/BashTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"BashTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/bash/BashTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG1D,eAAO,MAAM,cAAc,SAAS,CAAC;AAGrC,QAAA,MAAM,WAAW;;;;;;kBAgBf,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,wBAAgB,cAAc,IAAI,mBAAmB,CA6CpD"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import {
|
|
2
|
+
import { execFile as execFileCallback, spawn } from 'node:child_process';
|
|
3
|
+
import { existsSync } from 'node:fs';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { promisify } from 'node:util';
|
|
3
6
|
import { tool } from '../../runtime/tools.js';
|
|
4
7
|
import { BASH_DESCRIPTION } from './prompt.js';
|
|
5
8
|
export const BASH_TOOL_NAME = 'Bash';
|
|
9
|
+
const execFile = promisify(execFileCallback);
|
|
6
10
|
const inputSchema = z.strictObject({
|
|
7
11
|
command: z.string().describe('The command to execute'),
|
|
8
12
|
timeout: z.number().optional().describe('Optional timeout in milliseconds (max 600000)'),
|
|
@@ -25,36 +29,65 @@ export function createBashTool() {
|
|
|
25
29
|
inputSchema,
|
|
26
30
|
isDestructive: () => true,
|
|
27
31
|
prompt: () => BASH_DESCRIPTION,
|
|
28
|
-
}, async (input) => {
|
|
29
|
-
const timeoutMs = input.timeout ?? 120_000;
|
|
32
|
+
}, async (input, context) => {
|
|
33
|
+
const timeoutMs = Math.min(Math.max(1, input.timeout ?? 120_000), 600_000);
|
|
34
|
+
const shell = resolveBashShell();
|
|
30
35
|
try {
|
|
31
36
|
if (input.run_in_background) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
cwd: process.cwd(),
|
|
35
|
-
shell: true,
|
|
37
|
+
const child = spawn(shell.executable, [...shell.args, input.command], {
|
|
38
|
+
cwd: context.cwd,
|
|
36
39
|
stdio: 'ignore',
|
|
37
40
|
detached: true,
|
|
41
|
+
windowsHide: true,
|
|
38
42
|
});
|
|
39
43
|
child.unref();
|
|
40
44
|
return { stdout: '', stderr: '', exitCode: 0, backgroundTaskId: child.pid?.toString() };
|
|
41
45
|
}
|
|
42
|
-
const output =
|
|
43
|
-
cwd:
|
|
46
|
+
const output = await execFile(shell.executable, [...shell.args, input.command], {
|
|
47
|
+
cwd: context.cwd,
|
|
44
48
|
encoding: 'utf-8',
|
|
45
49
|
timeout: timeoutMs,
|
|
46
50
|
maxBuffer: 10 * 1024 * 1024, // 10MB
|
|
47
|
-
|
|
51
|
+
windowsHide: true,
|
|
48
52
|
});
|
|
49
|
-
return {
|
|
53
|
+
return {
|
|
54
|
+
stdout: output.stdout.trim(),
|
|
55
|
+
stderr: output.stderr.trim(),
|
|
56
|
+
exitCode: 0,
|
|
57
|
+
};
|
|
50
58
|
}
|
|
51
59
|
catch (e) {
|
|
52
60
|
return {
|
|
53
|
-
stdout: (e.stdout ?? '').trim(),
|
|
54
|
-
stderr: (e.stderr ?? e.message ??
|
|
55
|
-
exitCode: e.
|
|
61
|
+
stdout: String(e.stdout ?? '').trim(),
|
|
62
|
+
stderr: String(e.stderr ?? e.message ?? e).trim(),
|
|
63
|
+
exitCode: typeof e.code === 'number' ? e.code : 1,
|
|
56
64
|
};
|
|
57
65
|
}
|
|
58
66
|
});
|
|
59
67
|
}
|
|
68
|
+
function resolveBashShell() {
|
|
69
|
+
if (process.platform !== 'win32') {
|
|
70
|
+
return {
|
|
71
|
+
executable: process.env.SHELL || '/bin/bash',
|
|
72
|
+
args: ['-lc'],
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
const candidates = [
|
|
76
|
+
process.env.ACTOVIQ_BASH_PATH,
|
|
77
|
+
process.env.ProgramFiles
|
|
78
|
+
? path.join(process.env.ProgramFiles, 'Git', 'bin', 'bash.exe')
|
|
79
|
+
: undefined,
|
|
80
|
+
process.env['ProgramFiles(x86)']
|
|
81
|
+
? path.join(process.env['ProgramFiles(x86)'], 'Git', 'bin', 'bash.exe')
|
|
82
|
+
: undefined,
|
|
83
|
+
process.env.LOCALAPPDATA
|
|
84
|
+
? path.join(process.env.LOCALAPPDATA, 'Programs', 'Git', 'bin', 'bash.exe')
|
|
85
|
+
: undefined,
|
|
86
|
+
].filter((candidate) => Boolean(candidate));
|
|
87
|
+
const executable = candidates.find(candidate => existsSync(candidate));
|
|
88
|
+
if (!executable) {
|
|
89
|
+
throw new Error('Bash requires Git for Windows. Install Git Bash or set ACTOVIQ_BASH_PATH.');
|
|
90
|
+
}
|
|
91
|
+
return { executable, args: ['-lc'] };
|
|
92
|
+
}
|
|
60
93
|
//# sourceMappingURL=BashTool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BashTool.js","sourceRoot":"","sources":["../../../../src/tools/bash/BashTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"BashTool.js","sourceRoot":"","sources":["../../../../src/tools/bash/BashTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,20 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
1
2
|
import type { AgentToolDefinition } from '../../types.js';
|
|
2
3
|
export declare const TODO_WRITE_TOOL_NAME = "TodoWrite";
|
|
4
|
+
declare const TodoItemSchema: z.ZodObject<{
|
|
5
|
+
content: z.ZodString;
|
|
6
|
+
status: z.ZodEnum<{
|
|
7
|
+
completed: "completed";
|
|
8
|
+
pending: "pending";
|
|
9
|
+
in_progress: "in_progress";
|
|
10
|
+
}>;
|
|
11
|
+
activeForm: z.ZodString;
|
|
12
|
+
}, z.core.$strip>;
|
|
3
13
|
export declare const TODO_PROMPT = "Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.\n\n## When to Use This Tool\nUse proactively in these scenarios:\n\n1. Complex multi-step tasks - 3 or more distinct steps\n2. Non-trivial tasks requiring careful planning\n3. User explicitly requests todo list\n4. User provides multiple tasks (numbered or comma-separated)\n5. After receiving new instructions - capture requirements as todos\n6. When starting a task - mark it in_progress BEFORE beginning (limit ONE at a time)\n7. After completing a task - mark completed, add follow-up tasks discovered\n\n## When NOT to Use\nSkip when: single straightforward task, trivial task, purely conversational/informational request.\n\n## Task States and Management\n\n1. Task States: pending, in_progress, completed\n - content: imperative form describing what to do (e.g., \"Run tests\")\n - activeForm: present continuous form shown during execution (e.g., \"Running tests\")\n\n2. Task Management:\n - Update status in real-time, mark complete IMMEDIATELY after finishing\n - Exactly ONE task in_progress at any time\n - Complete current tasks before starting new ones\n - Remove irrelevant tasks from the list\n\n3. Task Completion Requirements:\n - ONLY mark completed when FULLY accomplished\n - If you encounter errors or cannot finish, keep in_progress\n - When blocked, create a new task describing the issue\n\nWhen in doubt, use this tool. Proactive task management demonstrates attentiveness.";
|
|
4
14
|
export declare const TODO_DESCRIPTION = "Update the todo list for the current session. To be used proactively to track progress and pending tasks. At least one task should be in_progress at all times. Always provide both content (imperative) and activeForm (present continuous) for each task.";
|
|
15
|
+
type TodoItem = z.infer<typeof TodoItemSchema>;
|
|
16
|
+
export declare function getActoviqTodoSnapshot(scopeKey: string): TodoItem[];
|
|
17
|
+
export declare function formatActoviqTodoListLines(todos: TodoItem[]): string;
|
|
5
18
|
export declare function createTodoWriteTool(): AgentToolDefinition;
|
|
19
|
+
export {};
|
|
6
20
|
//# sourceMappingURL=TodoWriteTool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TodoWriteTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/todo/TodoWriteTool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TodoWriteTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/todo/TodoWriteTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,eAAO,MAAM,oBAAoB,cAAc,CAAC;AAIhD,QAAA,MAAM,cAAc;;;;;;;;iBAIlB,CAAC;AAIH,eAAO,MAAM,WAAW,2kDAiC4D,CAAC;AAErF,eAAO,MAAM,gBAAgB,gQACkO,CAAC;AAEhQ,KAAK,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAqB/C,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,CAEnE;AAQD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAEpE;AAeD,wBAAgB,mBAAmB,IAAI,mBAAmB,CAqBzD"}
|