@google/gemini-cli-core 0.24.0-nightly.20251231.05049b5ab → 0.24.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/cli/settings.md +1 -0
- package/dist/docs/cli/skills.md +156 -0
- package/dist/docs/cli/telemetry.md +3 -3
- package/dist/docs/cli/tutorials/skills-getting-started.md +124 -0
- package/dist/docs/cli/tutorials.md +4 -0
- package/dist/docs/get-started/configuration.md +32 -11
- package/dist/docs/hooks/best-practices.md +177 -127
- package/dist/docs/hooks/index.md +22 -0
- package/dist/docs/sidebar.json +4 -0
- package/dist/src/agents/a2a-client-manager.d.ts +5 -0
- package/dist/src/agents/a2a-client-manager.js +130 -0
- package/dist/src/agents/a2a-client-manager.js.map +1 -1
- package/dist/src/agents/a2a-client-manager.test.js +27 -1
- package/dist/src/agents/a2a-client-manager.test.js.map +1 -1
- package/dist/src/agents/a2aUtils.d.ts +28 -0
- package/dist/src/agents/a2aUtils.js +111 -0
- package/dist/src/agents/a2aUtils.js.map +1 -0
- package/dist/src/agents/a2aUtils.test.js +147 -0
- package/dist/src/agents/a2aUtils.test.js.map +1 -0
- package/dist/src/agents/delegate-to-agent-tool.d.ts +2 -2
- package/dist/src/agents/delegate-to-agent-tool.js +6 -6
- package/dist/src/agents/delegate-to-agent-tool.js.map +1 -1
- package/dist/src/agents/delegate-to-agent-tool.test.js +37 -7
- package/dist/src/agents/delegate-to-agent-tool.test.js.map +1 -1
- package/dist/src/agents/introspection-agent.js +2 -2
- package/dist/src/agents/introspection-agent.js.map +1 -1
- package/dist/src/agents/introspection-agent.test.js +2 -2
- package/dist/src/agents/introspection-agent.test.js.map +1 -1
- package/dist/src/agents/local-executor.js +1 -1
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +2 -2
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.d.ts +2 -2
- package/dist/src/agents/local-invocation.js +3 -3
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +7 -5
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.d.ts +17 -3
- package/dist/src/agents/remote-invocation.js +104 -6
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +184 -18
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.d.ts +2 -2
- package/dist/src/agents/subagent-tool-wrapper.js +6 -5
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +17 -10
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
- package/dist/src/agents/types.d.ts +6 -0
- package/dist/src/code_assist/oauth2.js +31 -1
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +75 -3
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +5 -0
- package/dist/src/code_assist/server.js +19 -4
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +19 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +6 -4
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +63 -0
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +18 -0
- package/dist/src/config/config.d.ts +20 -6
- package/dist/src/config/config.js +63 -37
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +81 -4
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/flashFallback.test.js +13 -0
- package/dist/src/config/flashFallback.test.js.map +1 -1
- package/dist/src/config/models.js +6 -4
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +21 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/client.js +39 -7
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +93 -1
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +1 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -1
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.test.js +11 -9
- package/dist/src/core/coreToolHookTriggers.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -0
- package/dist/src/core/coreToolScheduler.js +30 -106
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +21 -22
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.js +14 -2
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +0 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +29 -5
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +40 -1
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/sessionHookTriggers.d.ts +3 -2
- package/dist/src/core/sessionHookTriggers.js +8 -1
- package/dist/src/core/sessionHookTriggers.js.map +1 -1
- package/dist/src/core/turn.d.ts +16 -2
- package/dist/src/core/turn.js +2 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +3 -3
- package/dist/src/generated/git-commit.js +3 -3
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.d.ts +6 -2
- package/dist/src/hooks/hookEventHandler.js +24 -3
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +31 -8
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/hooks/hookRunner.d.ts +2 -2
- package/dist/src/hooks/hookRunner.js +12 -4
- package/dist/src/hooks/hookRunner.js.map +1 -1
- package/dist/src/hooks/hookRunner.test.js +33 -0
- package/dist/src/hooks/hookRunner.test.js.map +1 -1
- package/dist/src/index.d.ts +3 -1
- package/dist/src/index.js +3 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/policy/config.js +60 -22
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +21 -0
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/persistence.test.js +1 -1
- package/dist/src/policy/persistence.test.js.map +1 -1
- package/dist/src/policy/policies/write.toml +5 -0
- package/dist/src/policy/policy-engine.d.ts +4 -0
- package/dist/src/policy/policy-engine.js +75 -51
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +272 -1
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/policy-updater.test.js +2 -2
- package/dist/src/policy/policy-updater.test.js.map +1 -1
- package/dist/src/policy/toml-loader.d.ts +0 -8
- package/dist/src/policy/toml-loader.js +7 -70
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +16 -6
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/types.d.ts +6 -0
- package/dist/src/policy/utils.d.ts +21 -0
- package/dist/src/policy/utils.js +42 -0
- package/dist/src/policy/utils.js.map +1 -0
- package/dist/src/policy/utils.test.js +64 -0
- package/dist/src/policy/utils.test.js.map +1 -0
- package/dist/src/scheduler/tool-executor.d.ts +22 -0
- package/dist/src/scheduler/tool-executor.js +198 -0
- package/dist/src/scheduler/tool-executor.js.map +1 -0
- package/dist/src/scheduler/tool-executor.test.d.ts +6 -0
- package/dist/src/scheduler/tool-executor.test.js +231 -0
- package/dist/src/scheduler/tool-executor.test.js.map +1 -0
- package/dist/src/skills/skillLoader.d.ts +28 -0
- package/dist/src/skills/skillLoader.js +77 -0
- package/dist/src/skills/skillLoader.js.map +1 -0
- package/dist/src/skills/skillLoader.test.d.ts +6 -0
- package/dist/src/skills/skillLoader.test.js +73 -0
- package/dist/src/skills/skillLoader.test.js.map +1 -0
- package/dist/src/{services → skills}/skillManager.d.ts +10 -20
- package/dist/src/skills/skillManager.js +89 -0
- package/dist/src/skills/skillManager.js.map +1 -0
- package/dist/src/skills/skillManager.test.d.ts +6 -0
- package/dist/src/skills/skillManager.test.js +128 -0
- package/dist/src/skills/skillManager.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +5 -5
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +8 -8
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +2 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +4 -4
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +3 -3
- package/dist/src/telemetry/loggers.js +4 -4
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +6 -8
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +7 -7
- package/dist/src/telemetry/types.js +10 -10
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.d.ts +1 -0
- package/dist/src/test-utils/mock-message-bus.js +29 -0
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/test-utils/mock-tool.d.ts +5 -3
- package/dist/src/test-utils/mock-tool.js +11 -10
- package/dist/src/test-utils/mock-tool.js.map +1 -1
- package/dist/src/tools/activate-skill.d.ts +27 -0
- package/dist/src/tools/activate-skill.js +120 -0
- package/dist/src/tools/activate-skill.js.map +1 -0
- package/dist/src/tools/activate-skill.test.d.ts +6 -0
- package/dist/src/tools/activate-skill.test.js +95 -0
- package/dist/src/tools/activate-skill.test.js.map +1 -0
- package/dist/src/tools/confirmation-policy.test.js +2 -12
- package/dist/src/tools/confirmation-policy.test.js.map +1 -1
- package/dist/src/tools/edit.d.ts +27 -5
- package/dist/src/tools/edit.js +444 -137
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +257 -525
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/get-internal-docs.d.ts +2 -2
- package/dist/src/tools/get-internal-docs.js +6 -6
- package/dist/src/tools/get-internal-docs.js.map +1 -1
- package/dist/src/tools/get-internal-docs.test.js +2 -1
- package/dist/src/tools/get-internal-docs.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +2 -2
- package/dist/src/tools/glob.js +1 -1
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +2 -1
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +2 -2
- package/dist/src/tools/grep.js +1 -1
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +5 -4
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +2 -2
- package/dist/src/tools/ls.js +2 -2
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +2 -1
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.js +14 -7
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +28 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +2 -2
- package/dist/src/tools/mcp-client.js +2 -1
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +2 -2
- package/dist/src/tools/mcp-tool.js +7 -7
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +11 -6
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +3 -3
- package/dist/src/tools/memoryTool.js +2 -2
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +5 -2
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/message-bus-integration.test.js +10 -37
- package/dist/src/tools/message-bus-integration.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +2 -2
- package/dist/src/tools/read-file.js +1 -1
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +3 -2
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +2 -2
- package/dist/src/tools/read-many-files.js +2 -3
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +3 -2
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +2 -2
- package/dist/src/tools/ripGrep.js +3 -4
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +7 -6
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +3 -6
- package/dist/src/tools/shell.js +15 -48
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +35 -59
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +2 -1
- package/dist/src/tools/tool-names.js +2 -0
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +11 -6
- package/dist/src/tools/tool-registry.js +13 -8
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +14 -10
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +5 -5
- package/dist/src/tools/tools.js +15 -17
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.js +3 -1
- package/dist/src/tools/tools.test.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +2 -2
- package/dist/src/tools/web-fetch.js +4 -4
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +17 -19
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +2 -2
- package/dist/src/tools/web-search.js +3 -4
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/web-search.test.js +2 -1
- package/dist/src/tools/web-search.test.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +2 -2
- package/dist/src/tools/write-file.js +3 -3
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +4 -1
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +2 -2
- package/dist/src/tools/write-todos.js +5 -4
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/tools/write-todos.test.js +2 -1
- package/dist/src/tools/write-todos.test.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +1 -1
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +46 -1
- package/dist/src/utils/events.js +21 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/events.test.js +25 -0
- package/dist/src/utils/events.test.js.map +1 -1
- package/dist/src/utils/getFolderStructure.js +6 -1
- package/dist/src/utils/getFolderStructure.js.map +1 -1
- package/dist/src/utils/shell-permissions.test.js +27 -0
- package/dist/src/utils/shell-permissions.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +6 -0
- package/dist/src/utils/shell-utils.js +72 -8
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +99 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/terminal.d.ts +2 -0
- package/dist/src/utils/terminal.js +6 -0
- package/dist/src/utils/terminal.js.map +1 -1
- package/dist/src/utils/tokenCalculation.js +20 -5
- package/dist/src/utils/tokenCalculation.js.map +1 -1
- package/dist/src/utils/tokenCalculation.test.js +11 -2
- package/dist/src/utils/tokenCalculation.test.js.map +1 -1
- package/dist/src/utils/tool-utils.test.js +2 -1
- package/dist/src/utils/tool-utils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.24.0-nightly.20251227.37be16243.tgz +0 -0
- package/dist/src/services/skillManager.js +0 -157
- package/dist/src/services/skillManager.js.map +0 -1
- package/dist/src/services/skillManager.test.js +0 -169
- package/dist/src/services/skillManager.test.js.map +0 -1
- package/dist/src/tools/smart-edit.d.ts +0 -78
- package/dist/src/tools/smart-edit.js +0 -722
- package/dist/src/tools/smart-edit.js.map +0 -1
- package/dist/src/tools/smart-edit.test.js +0 -592
- package/dist/src/tools/smart-edit.test.js.map +0 -1
- /package/dist/src/{services/skillManager.test.d.ts → agents/a2aUtils.test.d.ts} +0 -0
- /package/dist/src/{tools/smart-edit.test.d.ts → policy/utils.test.d.ts} +0 -0
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import type { ModifiableDeclarativeTool, ModifyContext } from '../tools/modifiable-tool.js';
|
|
7
7
|
import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from '../tools/tools.js';
|
|
8
8
|
import { BaseDeclarativeTool, BaseToolInvocation } from '../tools/tools.js';
|
|
9
|
+
import type { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
9
10
|
interface MockToolOptions {
|
|
10
11
|
name: string;
|
|
11
12
|
displayName?: string;
|
|
@@ -19,6 +20,7 @@ interface MockToolOptions {
|
|
|
19
20
|
[key: string]: unknown;
|
|
20
21
|
}, signal?: AbortSignal, updateOutput?: (output: string) => void) => Promise<ToolResult>;
|
|
21
22
|
params?: object;
|
|
23
|
+
messageBus?: MessageBus;
|
|
22
24
|
}
|
|
23
25
|
/**
|
|
24
26
|
* A highly configurable mock tool for testing purposes.
|
|
@@ -35,7 +37,7 @@ export declare class MockTool extends BaseDeclarativeTool<{
|
|
|
35
37
|
constructor(options: MockToolOptions);
|
|
36
38
|
protected createInvocation(params: {
|
|
37
39
|
[key: string]: unknown;
|
|
38
|
-
}): ToolInvocation<{
|
|
40
|
+
}, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<{
|
|
39
41
|
[key: string]: unknown;
|
|
40
42
|
}, ToolResult>;
|
|
41
43
|
}
|
|
@@ -48,7 +50,7 @@ export declare const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE: () => Promise<{
|
|
|
48
50
|
}>;
|
|
49
51
|
export declare class MockModifiableToolInvocation extends BaseToolInvocation<Record<string, unknown>, ToolResult> {
|
|
50
52
|
private readonly tool;
|
|
51
|
-
constructor(tool: MockModifiableTool, params: Record<string, unknown
|
|
53
|
+
constructor(tool: MockModifiableTool, params: Record<string, unknown>, messageBus: MessageBus);
|
|
52
54
|
execute(_abortSignal: AbortSignal): Promise<ToolResult>;
|
|
53
55
|
shouldConfirmExecute(_abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
|
|
54
56
|
getDescription(): string;
|
|
@@ -61,6 +63,6 @@ export declare class MockModifiableTool extends BaseDeclarativeTool<Record<strin
|
|
|
61
63
|
shouldConfirm: boolean;
|
|
62
64
|
constructor(name?: string);
|
|
63
65
|
getModifyContext(_abortSignal: AbortSignal): ModifyContext<Record<string, unknown>>;
|
|
64
|
-
protected createInvocation(params: Record<string, unknown
|
|
66
|
+
protected createInvocation(params: Record<string, unknown>, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<Record<string, unknown>, ToolResult>;
|
|
65
67
|
}
|
|
66
68
|
export {};
|
|
@@ -4,10 +4,11 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { BaseDeclarativeTool, BaseToolInvocation, Kind, } from '../tools/tools.js';
|
|
7
|
+
import { createMockMessageBus } from './mock-message-bus.js';
|
|
7
8
|
class MockToolInvocation extends BaseToolInvocation {
|
|
8
9
|
tool;
|
|
9
|
-
constructor(tool, params) {
|
|
10
|
-
super(params);
|
|
10
|
+
constructor(tool, params, messageBus) {
|
|
11
|
+
super(params, messageBus, tool.name, tool.displayName);
|
|
11
12
|
this.tool = tool;
|
|
12
13
|
}
|
|
13
14
|
execute(signal, updateOutput) {
|
|
@@ -32,7 +33,7 @@ export class MockTool extends BaseDeclarativeTool {
|
|
|
32
33
|
shouldConfirmExecute;
|
|
33
34
|
execute;
|
|
34
35
|
constructor(options) {
|
|
35
|
-
super(options.name, options.displayName ?? options.name, options.description ?? options.name, Kind.Other, options.params, options.isOutputMarkdown ?? false, options.canUpdateOutput ?? false);
|
|
36
|
+
super(options.name, options.displayName ?? options.name, options.description ?? options.name, Kind.Other, options.params, options.messageBus ?? createMockMessageBus(), options.isOutputMarkdown ?? false, options.canUpdateOutput ?? false);
|
|
36
37
|
if (options.shouldConfirmExecute) {
|
|
37
38
|
this.shouldConfirmExecute = options.shouldConfirmExecute;
|
|
38
39
|
}
|
|
@@ -49,8 +50,8 @@ export class MockTool extends BaseDeclarativeTool {
|
|
|
49
50
|
});
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
|
-
createInvocation(params) {
|
|
53
|
-
return new MockToolInvocation(this, params);
|
|
53
|
+
createInvocation(params, messageBus, _toolName, _toolDisplayName) {
|
|
54
|
+
return new MockToolInvocation(this, params, messageBus);
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () => Promise.resolve({
|
|
@@ -62,8 +63,8 @@ export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () => Promise.resolve({
|
|
|
62
63
|
});
|
|
63
64
|
export class MockModifiableToolInvocation extends BaseToolInvocation {
|
|
64
65
|
tool;
|
|
65
|
-
constructor(tool, params) {
|
|
66
|
-
super(params);
|
|
66
|
+
constructor(tool, params, messageBus) {
|
|
67
|
+
super(params, messageBus, tool.name, tool.displayName);
|
|
67
68
|
this.tool = tool;
|
|
68
69
|
}
|
|
69
70
|
async execute(_abortSignal) {
|
|
@@ -104,7 +105,7 @@ export class MockModifiableTool extends BaseDeclarativeTool {
|
|
|
104
105
|
super(name, name, 'A mock modifiable tool for testing.', Kind.Other, {
|
|
105
106
|
type: 'object',
|
|
106
107
|
properties: { param: { type: 'string' } },
|
|
107
|
-
});
|
|
108
|
+
}, createMockMessageBus(), true, false);
|
|
108
109
|
}
|
|
109
110
|
getModifyContext(_abortSignal) {
|
|
110
111
|
return {
|
|
@@ -114,8 +115,8 @@ export class MockModifiableTool extends BaseDeclarativeTool {
|
|
|
114
115
|
createUpdatedParams: (_oldContent, modifiedProposedContent, _originalParams) => ({ newContent: modifiedProposedContent }),
|
|
115
116
|
};
|
|
116
117
|
}
|
|
117
|
-
createInvocation(params) {
|
|
118
|
-
return new MockModifiableToolInvocation(this, params);
|
|
118
|
+
createInvocation(params, messageBus, _toolName, _toolDisplayName) {
|
|
119
|
+
return new MockModifiableToolInvocation(this, params, messageBus);
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
122
|
//# sourceMappingURL=mock-tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-tool.js","sourceRoot":"","sources":["../../../src/test-utils/mock-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,IAAI,GACL,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"mock-tool.js","sourceRoot":"","sources":["../../../src/test-utils/mock-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
7
|
+
import type { ToolResult, ToolInvocation } from './tools.js';
|
|
8
|
+
import { BaseDeclarativeTool } from './tools.js';
|
|
9
|
+
import type { Config } from '../config/config.js';
|
|
10
|
+
/**
|
|
11
|
+
* Parameters for the ActivateSkill tool
|
|
12
|
+
*/
|
|
13
|
+
export interface ActivateSkillToolParams {
|
|
14
|
+
/**
|
|
15
|
+
* The name of the skill to activate
|
|
16
|
+
*/
|
|
17
|
+
name: string;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Implementation of the ActivateSkill tool logic
|
|
21
|
+
*/
|
|
22
|
+
export declare class ActivateSkillTool extends BaseDeclarativeTool<ActivateSkillToolParams, ToolResult> {
|
|
23
|
+
private config;
|
|
24
|
+
static readonly Name = "activate_skill";
|
|
25
|
+
constructor(config: Config, messageBus: MessageBus);
|
|
26
|
+
protected createInvocation(params: ActivateSkillToolParams, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<ActivateSkillToolParams, ToolResult>;
|
|
27
|
+
}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { z } from 'zod';
|
|
7
|
+
import { zodToJsonSchema } from 'zod-to-json-schema';
|
|
8
|
+
import * as path from 'node:path';
|
|
9
|
+
import { getFolderStructure } from '../utils/getFolderStructure.js';
|
|
10
|
+
import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
|
|
11
|
+
import { ACTIVATE_SKILL_TOOL_NAME } from './tool-names.js';
|
|
12
|
+
class ActivateSkillToolInvocation extends BaseToolInvocation {
|
|
13
|
+
config;
|
|
14
|
+
cachedFolderStructure;
|
|
15
|
+
constructor(config, params, messageBus, _toolName, _toolDisplayName) {
|
|
16
|
+
super(params, messageBus, _toolName, _toolDisplayName);
|
|
17
|
+
this.config = config;
|
|
18
|
+
}
|
|
19
|
+
getDescription() {
|
|
20
|
+
const skillName = this.params.name;
|
|
21
|
+
const skill = this.config.getSkillManager().getSkill(skillName);
|
|
22
|
+
if (skill) {
|
|
23
|
+
return `"${skillName}": ${skill.description}`;
|
|
24
|
+
}
|
|
25
|
+
return `"${skillName}" (⚠️ unknown skill)`;
|
|
26
|
+
}
|
|
27
|
+
async getOrFetchFolderStructure(skillLocation) {
|
|
28
|
+
if (this.cachedFolderStructure === undefined) {
|
|
29
|
+
this.cachedFolderStructure = await getFolderStructure(path.dirname(skillLocation));
|
|
30
|
+
}
|
|
31
|
+
return this.cachedFolderStructure;
|
|
32
|
+
}
|
|
33
|
+
async getConfirmationDetails(_abortSignal) {
|
|
34
|
+
if (!this.messageBus) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
const skillName = this.params.name;
|
|
38
|
+
const skill = this.config.getSkillManager().getSkill(skillName);
|
|
39
|
+
if (!skill) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
const folderStructure = await this.getOrFetchFolderStructure(skill.location);
|
|
43
|
+
const confirmationDetails = {
|
|
44
|
+
type: 'info',
|
|
45
|
+
title: `Activate Skill: ${skillName}`,
|
|
46
|
+
prompt: `You are about to enable the specialized agent skill **${skillName}**.
|
|
47
|
+
|
|
48
|
+
**Description:**
|
|
49
|
+
${skill.description}
|
|
50
|
+
|
|
51
|
+
**Resources to be shared with the model:**
|
|
52
|
+
${folderStructure}`,
|
|
53
|
+
onConfirm: async (outcome) => {
|
|
54
|
+
await this.publishPolicyUpdate(outcome);
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
return confirmationDetails;
|
|
58
|
+
}
|
|
59
|
+
async execute(_signal) {
|
|
60
|
+
const skillName = this.params.name;
|
|
61
|
+
const skillManager = this.config.getSkillManager();
|
|
62
|
+
const skill = skillManager.getSkill(skillName);
|
|
63
|
+
if (!skill) {
|
|
64
|
+
const skills = skillManager.getSkills();
|
|
65
|
+
return {
|
|
66
|
+
llmContent: `Error: Skill "${skillName}" not found. Available skills are: ${skills.map((s) => s.name).join(', ')}`,
|
|
67
|
+
returnDisplay: `Skill "${skillName}" not found.`,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
skillManager.activateSkill(skillName);
|
|
71
|
+
// Add the skill's directory to the workspace context so the agent has permission
|
|
72
|
+
// to read its bundled resources.
|
|
73
|
+
this.config
|
|
74
|
+
.getWorkspaceContext()
|
|
75
|
+
.addDirectory(path.dirname(skill.location));
|
|
76
|
+
const folderStructure = await this.getOrFetchFolderStructure(skill.location);
|
|
77
|
+
return {
|
|
78
|
+
llmContent: `<ACTIVATED_SKILL name="${skillName}">
|
|
79
|
+
<INSTRUCTIONS>
|
|
80
|
+
${skill.body}
|
|
81
|
+
</INSTRUCTIONS>
|
|
82
|
+
|
|
83
|
+
<AVAILABLE_RESOURCES>
|
|
84
|
+
${folderStructure}
|
|
85
|
+
</AVAILABLE_RESOURCES>
|
|
86
|
+
</ACTIVATED_SKILL>`,
|
|
87
|
+
returnDisplay: `Skill **${skillName}** activated. Resources loaded from \`${path.dirname(skill.location)}\`:\n\n${folderStructure}`,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Implementation of the ActivateSkill tool logic
|
|
93
|
+
*/
|
|
94
|
+
export class ActivateSkillTool extends BaseDeclarativeTool {
|
|
95
|
+
config;
|
|
96
|
+
static Name = ACTIVATE_SKILL_TOOL_NAME;
|
|
97
|
+
constructor(config, messageBus) {
|
|
98
|
+
const skills = config.getSkillManager().getSkills();
|
|
99
|
+
const skillNames = skills.map((s) => s.name);
|
|
100
|
+
let schema;
|
|
101
|
+
if (skillNames.length === 0) {
|
|
102
|
+
schema = z.object({
|
|
103
|
+
name: z.string().describe('No skills are currently available.'),
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
schema = z.object({
|
|
108
|
+
name: z
|
|
109
|
+
.enum(skillNames)
|
|
110
|
+
.describe('The name of the skill to activate.'),
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
super(ActivateSkillTool.Name, 'Activate Skill', "Activates a specialized agent skill by name. Returns the skill's instructions wrapped in `<ACTIVATED_SKILL>` tags. These provide specialized guidance for the current task. Use this when you identify a task that matches a skill's description.", Kind.Other, zodToJsonSchema(schema), messageBus, true, false);
|
|
114
|
+
this.config = config;
|
|
115
|
+
}
|
|
116
|
+
createInvocation(params, messageBus, _toolName, _toolDisplayName) {
|
|
117
|
+
return new ActivateSkillToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName ?? 'Activate Skill');
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=activate-skill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activate-skill.js","sourceRoot":"","sources":["../../../src/tools/activate-skill.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
+
import { ActivateSkillTool } from './activate-skill.js';
|
|
8
|
+
import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
|
|
9
|
+
vi.mock('../utils/getFolderStructure.js', () => ({
|
|
10
|
+
getFolderStructure: vi.fn().mockResolvedValue('Mock folder structure'),
|
|
11
|
+
}));
|
|
12
|
+
describe('ActivateSkillTool', () => {
|
|
13
|
+
let mockConfig;
|
|
14
|
+
let tool;
|
|
15
|
+
let mockMessageBus;
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
mockMessageBus = createMockMessageBus();
|
|
18
|
+
const skills = [
|
|
19
|
+
{
|
|
20
|
+
name: 'test-skill',
|
|
21
|
+
description: 'A test skill',
|
|
22
|
+
location: '/path/to/test-skill/SKILL.md',
|
|
23
|
+
},
|
|
24
|
+
];
|
|
25
|
+
mockConfig = {
|
|
26
|
+
getWorkspaceContext: vi.fn().mockReturnValue({
|
|
27
|
+
addDirectory: vi.fn(),
|
|
28
|
+
}),
|
|
29
|
+
getSkillManager: vi.fn().mockReturnValue({
|
|
30
|
+
getSkills: vi.fn().mockReturnValue(skills),
|
|
31
|
+
getAllSkills: vi.fn().mockReturnValue(skills),
|
|
32
|
+
getSkill: vi.fn().mockImplementation((name) => {
|
|
33
|
+
if (name === 'test-skill') {
|
|
34
|
+
return {
|
|
35
|
+
name: 'test-skill',
|
|
36
|
+
description: 'A test skill',
|
|
37
|
+
location: '/path/to/test-skill/SKILL.md',
|
|
38
|
+
body: 'Skill instructions content.',
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
return null;
|
|
42
|
+
}),
|
|
43
|
+
activateSkill: vi.fn(),
|
|
44
|
+
}),
|
|
45
|
+
};
|
|
46
|
+
tool = new ActivateSkillTool(mockConfig, mockMessageBus);
|
|
47
|
+
});
|
|
48
|
+
it('should return enhanced description', () => {
|
|
49
|
+
const params = { name: 'test-skill' };
|
|
50
|
+
const invocation = tool.build(params);
|
|
51
|
+
expect(invocation.getDescription()).toBe('"test-skill": A test skill');
|
|
52
|
+
});
|
|
53
|
+
it('should return enhanced confirmation details', async () => {
|
|
54
|
+
const params = { name: 'test-skill' };
|
|
55
|
+
const invocation = tool.build(params);
|
|
56
|
+
const details = await invocation.getConfirmationDetails(new AbortController().signal);
|
|
57
|
+
expect(details.title).toBe('Activate Skill: test-skill');
|
|
58
|
+
expect(details.prompt).toContain('enable the specialized agent skill');
|
|
59
|
+
expect(details.prompt).toContain('A test skill');
|
|
60
|
+
expect(details.prompt).toContain('Mock folder structure');
|
|
61
|
+
});
|
|
62
|
+
it('should activate a valid skill and return its content in XML tags', async () => {
|
|
63
|
+
const params = { name: 'test-skill' };
|
|
64
|
+
const invocation = tool.build(params);
|
|
65
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
66
|
+
expect(mockConfig.getSkillManager().activateSkill).toHaveBeenCalledWith('test-skill');
|
|
67
|
+
expect(mockConfig.getWorkspaceContext().addDirectory).toHaveBeenCalledWith('/path/to/test-skill');
|
|
68
|
+
expect(result.llmContent).toContain('<ACTIVATED_SKILL name="test-skill">');
|
|
69
|
+
expect(result.llmContent).toContain('<INSTRUCTIONS>');
|
|
70
|
+
expect(result.llmContent).toContain('Skill instructions content.');
|
|
71
|
+
expect(result.llmContent).toContain('</INSTRUCTIONS>');
|
|
72
|
+
expect(result.llmContent).toContain('<AVAILABLE_RESOURCES>');
|
|
73
|
+
expect(result.llmContent).toContain('Mock folder structure');
|
|
74
|
+
expect(result.llmContent).toContain('</AVAILABLE_RESOURCES>');
|
|
75
|
+
expect(result.llmContent).toContain('</ACTIVATED_SKILL>');
|
|
76
|
+
expect(result.returnDisplay).toContain('Skill **test-skill** activated');
|
|
77
|
+
expect(result.returnDisplay).toContain('Mock folder structure');
|
|
78
|
+
});
|
|
79
|
+
it('should throw error if skill is not in enum', async () => {
|
|
80
|
+
const params = { name: 'non-existent' };
|
|
81
|
+
expect(() => tool.build(params)).toThrow();
|
|
82
|
+
});
|
|
83
|
+
it('should return an error if skill content cannot be read', async () => {
|
|
84
|
+
vi.mocked(mockConfig.getSkillManager().getSkill).mockReturnValue(null);
|
|
85
|
+
const params = { name: 'test-skill' };
|
|
86
|
+
const invocation = tool.build(params);
|
|
87
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
88
|
+
expect(result.llmContent).toContain('Error: Skill "test-skill" not found.');
|
|
89
|
+
expect(mockConfig.getSkillManager().activateSkill).not.toHaveBeenCalled();
|
|
90
|
+
});
|
|
91
|
+
it('should validate that name is provided', () => {
|
|
92
|
+
expect(() => tool.build({ name: '' })).toThrow();
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
//# sourceMappingURL=activate-skill.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activate-skill.test.js","sourceRoot":"","sources":["../../../src/tools/activate-skill.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
7
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
8
8
|
import { EditTool } from './edit.js';
|
|
9
|
-
import { SmartEditTool } from './smart-edit.js';
|
|
10
9
|
import { WriteFileTool } from './write-file.js';
|
|
11
10
|
import { WebFetchTool } from './web-fetch.js';
|
|
12
11
|
import { ToolConfirmationOutcome } from './tools.js';
|
|
@@ -17,8 +16,8 @@ import fs from 'node:fs';
|
|
|
17
16
|
import os from 'node:os';
|
|
18
17
|
// Mock telemetry loggers to avoid failures
|
|
19
18
|
vi.mock('../telemetry/loggers.js', () => ({
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
logEditStrategy: vi.fn(),
|
|
20
|
+
logEditCorrectionEvent: vi.fn(),
|
|
22
21
|
logFileOperation: vi.fn(),
|
|
23
22
|
}));
|
|
24
23
|
describe('Tool Confirmation Policy Updates', () => {
|
|
@@ -70,15 +69,6 @@ describe('Tool Confirmation Policy Updates', () => {
|
|
|
70
69
|
{
|
|
71
70
|
name: 'EditTool',
|
|
72
71
|
create: (config, bus) => new EditTool(config, bus),
|
|
73
|
-
params: {
|
|
74
|
-
file_path: 'test.txt',
|
|
75
|
-
old_string: 'existing',
|
|
76
|
-
new_string: 'new',
|
|
77
|
-
},
|
|
78
|
-
},
|
|
79
|
-
{
|
|
80
|
-
name: 'SmartEditTool',
|
|
81
|
-
create: (config, bus) => new SmartEditTool(config, bus),
|
|
82
72
|
params: {
|
|
83
73
|
file_path: 'test.txt',
|
|
84
74
|
instruction: 'change content',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirmation-policy.test.js","sourceRoot":"","sources":["../../../src/tools/confirmation-policy.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,uDAAuD;AAEvD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"confirmation-policy.test.js","sourceRoot":"","sources":["../../../src/tools/confirmation-policy.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tools/edit.d.ts
CHANGED
|
@@ -3,12 +3,29 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import type
|
|
7
|
-
import { BaseDeclarativeTool } from './tools.js';
|
|
6
|
+
import { BaseDeclarativeTool, type ToolInvocation, type ToolResult } from './tools.js';
|
|
8
7
|
import type { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
8
|
+
import { ToolErrorType } from './tool-error.js';
|
|
9
9
|
import type { Config } from '../config/config.js';
|
|
10
|
-
import type
|
|
10
|
+
import { type ModifiableDeclarativeTool, type ModifyContext } from './modifiable-tool.js';
|
|
11
|
+
interface ReplacementContext {
|
|
12
|
+
params: EditToolParams;
|
|
13
|
+
currentContent: string;
|
|
14
|
+
abortSignal: AbortSignal;
|
|
15
|
+
}
|
|
16
|
+
interface ReplacementResult {
|
|
17
|
+
newContent: string;
|
|
18
|
+
occurrences: number;
|
|
19
|
+
finalOldString: string;
|
|
20
|
+
finalNewString: string;
|
|
21
|
+
}
|
|
11
22
|
export declare function applyReplacement(currentContent: string | null, oldString: string, newString: string, isNewFile: boolean): string;
|
|
23
|
+
export declare function calculateReplacement(config: Config, context: ReplacementContext): Promise<ReplacementResult>;
|
|
24
|
+
export declare function getErrorReplaceResult(params: EditToolParams, occurrences: number, expectedReplacements: number, finalOldString: string, finalNewString: string): {
|
|
25
|
+
display: string;
|
|
26
|
+
raw: string;
|
|
27
|
+
type: ToolErrorType;
|
|
28
|
+
} | undefined;
|
|
12
29
|
/**
|
|
13
30
|
* Parameters for the Edit tool
|
|
14
31
|
*/
|
|
@@ -30,6 +47,10 @@ export interface EditToolParams {
|
|
|
30
47
|
* Use when you want to replace multiple occurrences.
|
|
31
48
|
*/
|
|
32
49
|
expected_replacements?: number;
|
|
50
|
+
/**
|
|
51
|
+
* The instruction for what needs to be done.
|
|
52
|
+
*/
|
|
53
|
+
instruction?: string;
|
|
33
54
|
/**
|
|
34
55
|
* Whether the edit was modified manually by the user.
|
|
35
56
|
*/
|
|
@@ -45,13 +66,14 @@ export interface EditToolParams {
|
|
|
45
66
|
export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
|
|
46
67
|
private readonly config;
|
|
47
68
|
static readonly Name = "replace";
|
|
48
|
-
constructor(config: Config, messageBus
|
|
69
|
+
constructor(config: Config, messageBus: MessageBus);
|
|
49
70
|
/**
|
|
50
71
|
* Validates the parameters for the Edit tool
|
|
51
72
|
* @param params Parameters to validate
|
|
52
73
|
* @returns Error message string or null if valid
|
|
53
74
|
*/
|
|
54
75
|
protected validateToolParamValues(params: EditToolParams): string | null;
|
|
55
|
-
protected createInvocation(params: EditToolParams, messageBus
|
|
76
|
+
protected createInvocation(params: EditToolParams, messageBus: MessageBus): ToolInvocation<EditToolParams, ToolResult>;
|
|
56
77
|
getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
|
|
57
78
|
}
|
|
79
|
+
export {};
|