@vybestack/llxprt-code-core 0.4.7 → 0.5.0-nightly.251102.6bb3db7a
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/prompt-config/defaults/default-prompts.json +4 -17
- package/dist/src/auth/precedence.d.ts +69 -9
- package/dist/src/auth/precedence.js +467 -69
- package/dist/src/auth/precedence.js.map +1 -1
- package/dist/src/auth/types.d.ts +2 -2
- package/dist/src/config/config.d.ts +18 -1
- package/dist/src/config/config.js +123 -6
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/index.d.ts +6 -0
- package/dist/src/config/index.js +5 -0
- package/dist/src/config/index.js.map +1 -1
- package/dist/src/config/profileManager.d.ts +23 -3
- package/dist/src/config/profileManager.js +54 -7
- package/dist/src/config/profileManager.js.map +1 -1
- package/dist/src/config/subagentManager.d.ts +96 -0
- package/dist/src/config/subagentManager.js +371 -0
- package/dist/src/config/subagentManager.js.map +1 -0
- package/dist/src/config/types.d.ts +18 -0
- package/dist/src/config/types.js +3 -0
- package/dist/src/config/types.js.map +1 -0
- package/dist/src/core/client.d.ts +27 -7
- package/dist/src/core/client.js +235 -56
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +3 -1
- package/dist/src/core/contentGenerator.js +3 -0
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -5
- package/dist/src/core/coreToolScheduler.js +95 -23
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +42 -12
- package/dist/src/core/geminiChat.js +413 -207
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.d.ts +3 -2
- package/dist/src/core/nonInteractiveToolExecutor.js +94 -10
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/subagent.d.ts +86 -7
- package/dist/src/core/subagent.js +809 -79
- package/dist/src/core/subagent.js.map +1 -1
- package/dist/src/core/subagentOrchestrator.d.ts +73 -0
- package/dist/src/core/subagentOrchestrator.js +383 -0
- package/dist/src/core/subagentOrchestrator.js.map +1 -0
- package/dist/src/core/subagentScheduler.d.ts +16 -0
- package/dist/src/core/subagentScheduler.js +7 -0
- package/dist/src/core/subagentScheduler.js.map +1 -0
- package/dist/src/core/turn.d.ts +5 -1
- package/dist/src/core/turn.js +5 -1
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/hooks/tool-render-suppression-hook.js +6 -1
- package/dist/src/hooks/tool-render-suppression-hook.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +32 -32
- package/dist/src/index.d.ts +19 -1
- package/dist/src/index.js +15 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/interfaces/index.d.ts +1 -0
- package/dist/src/interfaces/index.js +4 -0
- package/dist/src/interfaces/index.js.map +1 -0
- package/dist/src/interfaces/nodejs-error.interface.d.ts +4 -0
- package/dist/src/interfaces/nodejs-error.interface.js +2 -0
- package/dist/src/interfaces/nodejs-error.interface.js.map +1 -0
- package/dist/src/parsers/TextToolCallParser.d.ts +17 -1
- package/dist/src/parsers/TextToolCallParser.js +542 -148
- package/dist/src/parsers/TextToolCallParser.js.map +1 -1
- package/dist/src/prompt-config/defaults/core.md +15 -0
- package/dist/src/prompt-config/defaults/providers/gemini/core.md +203 -119
- package/dist/src/prompt-config/defaults/tool-defaults.js +2 -0
- package/dist/src/prompt-config/defaults/tool-defaults.js.map +1 -1
- package/dist/src/prompt-config/defaults/tools/list-subagents.md +7 -0
- package/dist/src/prompt-config/defaults/tools/task.md +8 -0
- package/dist/src/providers/BaseProvider.d.ts +115 -30
- package/dist/src/providers/BaseProvider.js +445 -109
- package/dist/src/providers/BaseProvider.js.map +1 -1
- package/dist/src/providers/IProvider.d.ts +50 -18
- package/dist/src/providers/LoggingProviderWrapper.d.ts +60 -16
- package/dist/src/providers/LoggingProviderWrapper.js +213 -60
- package/dist/src/providers/LoggingProviderWrapper.js.map +1 -1
- package/dist/src/providers/ProviderManager.d.ts +73 -2
- package/dist/src/providers/ProviderManager.js +492 -40
- package/dist/src/providers/ProviderManager.js.map +1 -1
- package/dist/src/providers/anthropic/AnthropicProvider.d.ts +35 -38
- package/dist/src/providers/anthropic/AnthropicProvider.js +222 -227
- package/dist/src/providers/anthropic/AnthropicProvider.js.map +1 -1
- package/dist/src/providers/errors.d.ts +86 -0
- package/dist/src/providers/errors.js +89 -0
- package/dist/src/providers/errors.js.map +1 -1
- package/dist/src/providers/gemini/GeminiProvider.d.ts +101 -41
- package/dist/src/providers/gemini/GeminiProvider.js +386 -311
- package/dist/src/providers/gemini/GeminiProvider.js.map +1 -1
- package/dist/src/providers/openai/ConversationCache.d.ts +5 -3
- package/dist/src/providers/openai/ConversationCache.js +93 -32
- package/dist/src/providers/openai/ConversationCache.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.d.ts +82 -42
- package/dist/src/providers/openai/OpenAIProvider.js +392 -457
- package/dist/src/providers/openai/OpenAIProvider.js.map +1 -1
- package/dist/src/providers/openai/getOpenAIProviderInfo.d.ts +1 -1
- package/dist/src/providers/openai/getOpenAIProviderInfo.js +52 -22
- package/dist/src/providers/openai/getOpenAIProviderInfo.js.map +1 -1
- package/dist/src/providers/openai/openaiRequestParams.d.ts +7 -0
- package/dist/src/providers/openai/openaiRequestParams.js +66 -0
- package/dist/src/providers/openai/openaiRequestParams.js.map +1 -0
- package/dist/src/providers/openai-responses/OpenAIResponsesProvider.d.ts +6 -33
- package/dist/src/providers/openai-responses/OpenAIResponsesProvider.js +84 -183
- package/dist/src/providers/openai-responses/OpenAIResponsesProvider.js.map +1 -1
- package/dist/src/providers/types/providerRuntime.d.ts +17 -0
- package/dist/src/providers/types/providerRuntime.js +7 -0
- package/dist/src/providers/types/providerRuntime.js.map +1 -0
- package/dist/src/providers/utils/authToken.d.ts +12 -0
- package/dist/src/providers/utils/authToken.js +17 -0
- package/dist/src/providers/utils/authToken.js.map +1 -0
- package/dist/src/providers/utils/userMemory.d.ts +8 -0
- package/dist/src/providers/utils/userMemory.js +34 -0
- package/dist/src/providers/utils/userMemory.js.map +1 -0
- package/dist/src/runtime/AgentRuntimeContext.d.ts +213 -0
- package/dist/src/runtime/AgentRuntimeContext.js +17 -0
- package/dist/src/runtime/AgentRuntimeContext.js.map +1 -0
- package/dist/src/runtime/AgentRuntimeLoader.d.ts +47 -0
- package/dist/src/runtime/AgentRuntimeLoader.js +122 -0
- package/dist/src/runtime/AgentRuntimeLoader.js.map +1 -0
- package/dist/src/runtime/AgentRuntimeState.d.ts +232 -0
- package/dist/src/runtime/AgentRuntimeState.js +439 -0
- package/dist/src/runtime/AgentRuntimeState.js.map +1 -0
- package/dist/src/runtime/RuntimeInvocationContext.d.ts +51 -0
- package/dist/src/runtime/RuntimeInvocationContext.js +52 -0
- package/dist/src/runtime/RuntimeInvocationContext.js.map +1 -0
- package/dist/src/runtime/createAgentRuntimeContext.d.ts +7 -0
- package/dist/src/runtime/createAgentRuntimeContext.js +65 -0
- package/dist/src/runtime/createAgentRuntimeContext.js.map +1 -0
- package/dist/src/runtime/index.d.ts +13 -0
- package/dist/src/runtime/index.js +14 -0
- package/dist/src/runtime/index.js.map +1 -0
- package/dist/src/runtime/providerRuntimeContext.d.ts +30 -0
- package/dist/src/runtime/providerRuntimeContext.js +70 -0
- package/dist/src/runtime/providerRuntimeContext.js.map +1 -0
- package/dist/src/runtime/runtimeAdapters.d.ts +22 -0
- package/dist/src/runtime/runtimeAdapters.js +81 -0
- package/dist/src/runtime/runtimeAdapters.js.map +1 -0
- package/dist/src/runtime/runtimeStateFactory.d.ts +21 -0
- package/dist/src/runtime/runtimeStateFactory.js +104 -0
- package/dist/src/runtime/runtimeStateFactory.js.map +1 -0
- package/dist/src/services/history/ContentConverters.js +3 -5
- package/dist/src/services/history/ContentConverters.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +2 -2
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/todo-context-tracker.d.ts +10 -8
- package/dist/src/services/todo-context-tracker.js +26 -10
- package/dist/src/services/todo-context-tracker.js.map +1 -1
- package/dist/src/services/tool-call-tracker-service.d.ts +11 -7
- package/dist/src/services/tool-call-tracker-service.js +89 -29
- package/dist/src/services/tool-call-tracker-service.js.map +1 -1
- package/dist/src/settings/SettingsService.d.ts +4 -0
- package/dist/src/settings/SettingsService.js +65 -2
- package/dist/src/settings/SettingsService.js.map +1 -1
- package/dist/src/settings/settingsServiceInstance.d.ts +6 -1
- package/dist/src/settings/settingsServiceInstance.js +28 -8
- package/dist/src/settings/settingsServiceInstance.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +5 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +4 -0
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +3 -1
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +1 -0
- package/dist/src/telemetry/types.js +3 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/index.d.ts +2 -0
- package/dist/src/test-utils/index.js +2 -0
- package/dist/src/test-utils/index.js.map +1 -1
- package/dist/src/test-utils/mockWorkspaceContext.d.ts +0 -3
- package/dist/src/test-utils/mockWorkspaceContext.js +3 -4
- package/dist/src/test-utils/mockWorkspaceContext.js.map +1 -1
- package/dist/src/test-utils/providerCallOptions.d.ts +43 -0
- package/dist/src/test-utils/providerCallOptions.js +137 -0
- package/dist/src/test-utils/providerCallOptions.js.map +1 -0
- package/dist/src/test-utils/runtime.d.ts +92 -0
- package/dist/src/test-utils/runtime.js +226 -0
- package/dist/src/test-utils/runtime.js.map +1 -0
- package/dist/src/test-utils/tools.d.ts +4 -4
- package/dist/src/test-utils/tools.js +20 -10
- package/dist/src/test-utils/tools.js.map +1 -1
- package/dist/src/tools/list-subagents.d.ts +31 -0
- package/dist/src/tools/list-subagents.js +109 -0
- package/dist/src/tools/list-subagents.js.map +1 -0
- package/dist/src/tools/task.d.ts +87 -0
- package/dist/src/tools/task.js +427 -0
- package/dist/src/tools/task.js.map +1 -0
- package/dist/src/tools/todo-read.js +1 -1
- package/dist/src/tools/todo-read.js.map +1 -1
- package/dist/src/tools/todo-store.js +4 -2
- package/dist/src/tools/todo-store.js.map +1 -1
- package/dist/src/tools/todo-write.js +4 -2
- package/dist/src/tools/todo-write.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +1 -0
- package/dist/src/tools/tool-error.js +1 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +2 -0
- package/dist/src/tools/tool-registry.js +46 -21
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/types/modelParams.d.ts +4 -0
- package/dist/src/utils/editor.js +10 -8
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +15 -3
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +22 -3
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/prompt-config/defaults/providers/anthropic/core.md +0 -97
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/glob.md +0 -34
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/list-directory.md +0 -11
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/read-file.md +0 -14
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/read-many-files.md +0 -31
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/replace.md +0 -41
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/run-shell-command.md +0 -32
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/save-memory.md +0 -35
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/search-file-content.md +0 -44
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/todo-write.md +0 -45
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/write-file.md +0 -11
- package/dist/src/prompt-config/defaults/providers/openai/core.md +0 -97
- package/dist/src/prompt-config/defaults/providers/openai/tools/todo-pause.md +0 -28
- package/dist/src/prompt-config/defaults/providers/openai/tools/todo-read.md +0 -5
- package/dist/src/prompt-config/defaults/providers/openai/tools/todo-write.md +0 -45
package/dist/src/core/turn.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { Part, PartListUnion, GenerateContentResponse, FunctionDeclaration, Fini
|
|
|
7
7
|
import { ToolCallConfirmationDetails, ToolResult, ToolResultDisplay } from '../tools/tools.js';
|
|
8
8
|
import { ToolErrorType } from '../tools/tool-error.js';
|
|
9
9
|
import { GeminiChat } from './geminiChat.js';
|
|
10
|
+
export declare const DEFAULT_AGENT_ID = "primary";
|
|
10
11
|
export interface ServerTool {
|
|
11
12
|
name: string;
|
|
12
13
|
schema: FunctionDeclaration;
|
|
@@ -46,6 +47,7 @@ export interface ToolCallRequestInfo {
|
|
|
46
47
|
args: Record<string, unknown>;
|
|
47
48
|
isClientInitiated: boolean;
|
|
48
49
|
prompt_id: string;
|
|
50
|
+
agentId?: string;
|
|
49
51
|
}
|
|
50
52
|
export interface ToolCallResponseInfo {
|
|
51
53
|
callId: string;
|
|
@@ -53,6 +55,7 @@ export interface ToolCallResponseInfo {
|
|
|
53
55
|
resultDisplay: ToolResultDisplay | undefined;
|
|
54
56
|
error: Error | undefined;
|
|
55
57
|
errorType: ToolErrorType | undefined;
|
|
58
|
+
agentId?: string;
|
|
56
59
|
}
|
|
57
60
|
export interface ServerToolCallConfirmationDetails {
|
|
58
61
|
request: ToolCallRequestInfo;
|
|
@@ -142,12 +145,13 @@ export type ServerGeminiStreamEvent = ServerGeminiContentEvent | ServerGeminiSys
|
|
|
142
145
|
export declare class Turn {
|
|
143
146
|
private readonly chat;
|
|
144
147
|
private readonly prompt_id;
|
|
148
|
+
private readonly agentId;
|
|
145
149
|
private readonly providerName;
|
|
146
150
|
readonly pendingToolCalls: ToolCallRequestInfo[];
|
|
147
151
|
private debugResponses;
|
|
148
152
|
finishReason: FinishReason | undefined;
|
|
149
153
|
private logger;
|
|
150
|
-
constructor(chat: GeminiChat, prompt_id: string, providerName?: string);
|
|
154
|
+
constructor(chat: GeminiChat, prompt_id: string, agentId?: string, providerName?: string);
|
|
151
155
|
/**
|
|
152
156
|
* Check if citations should be shown for the current user/settings.
|
|
153
157
|
* Based on the upstream implementation from commit 997136ae.
|
package/dist/src/core/turn.js
CHANGED
|
@@ -9,6 +9,7 @@ import { getErrorMessage, UnauthorizedError, toFriendlyError, } from '../utils/e
|
|
|
9
9
|
import { DebugLogger } from '../debug/index.js';
|
|
10
10
|
import { getCodeAssistServer } from '../code_assist/codeAssist.js';
|
|
11
11
|
import { UserTierId } from '../code_assist/types.js';
|
|
12
|
+
export const DEFAULT_AGENT_ID = 'primary';
|
|
12
13
|
export var GeminiEventType;
|
|
13
14
|
(function (GeminiEventType) {
|
|
14
15
|
GeminiEventType["Content"] = "content";
|
|
@@ -42,14 +43,16 @@ export var CompressionStatus;
|
|
|
42
43
|
export class Turn {
|
|
43
44
|
chat;
|
|
44
45
|
prompt_id;
|
|
46
|
+
agentId;
|
|
45
47
|
providerName;
|
|
46
48
|
pendingToolCalls;
|
|
47
49
|
debugResponses;
|
|
48
50
|
finishReason;
|
|
49
51
|
logger;
|
|
50
|
-
constructor(chat, prompt_id, providerName = 'backend') {
|
|
52
|
+
constructor(chat, prompt_id, agentId = DEFAULT_AGENT_ID, providerName = 'backend') {
|
|
51
53
|
this.chat = chat;
|
|
52
54
|
this.prompt_id = prompt_id;
|
|
55
|
+
this.agentId = agentId;
|
|
53
56
|
this.providerName = providerName;
|
|
54
57
|
this.pendingToolCalls = [];
|
|
55
58
|
this.debugResponses = [];
|
|
@@ -214,6 +217,7 @@ export class Turn {
|
|
|
214
217
|
args,
|
|
215
218
|
isClientInitiated: false,
|
|
216
219
|
prompt_id: this.prompt_id,
|
|
220
|
+
agentId: this.agentId ?? DEFAULT_AGENT_ID,
|
|
217
221
|
};
|
|
218
222
|
this.pendingToolCalls.push(toolCallRequest);
|
|
219
223
|
// Yield a request for the tool call, not the pending/confirming status
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn.js","sourceRoot":"","sources":["../../../src/core/turn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiBH,OAAO,EACL,eAAe,EACf,gBAAgB,GACjB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"turn.js","sourceRoot":"","sources":["../../../src/core/turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { TodoContextTracker } from '../services/todo-context-tracker.js';
|
|
7
|
+
import { DEFAULT_AGENT_ID } from '../core/turn.js';
|
|
7
8
|
/**
|
|
8
9
|
* Hook to determine if tool call rendering should be suppressed
|
|
9
10
|
*/
|
|
@@ -17,9 +18,13 @@ export class ToolRenderSuppressionHook {
|
|
|
17
18
|
const sessionId = typeof config.getSessionId === 'function'
|
|
18
19
|
? config.getSessionId()
|
|
19
20
|
: 'default';
|
|
21
|
+
const agentAwareConfig = config;
|
|
22
|
+
const agentId = typeof agentAwareConfig.getAgentId === 'function'
|
|
23
|
+
? agentAwareConfig.getAgentId()
|
|
24
|
+
: DEFAULT_AGENT_ID;
|
|
20
25
|
// Check if there's an active todo - if yes, suppress tool rendering
|
|
21
26
|
// as it will be shown in the todo display instead
|
|
22
|
-
const contextTracker = TodoContextTracker.
|
|
27
|
+
const contextTracker = TodoContextTracker.forAgent(sessionId, agentId);
|
|
23
28
|
return contextTracker.getActiveTodoId() !== null;
|
|
24
29
|
}
|
|
25
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-render-suppression-hook.js","sourceRoot":"","sources":["../../../src/hooks/tool-render-suppression-hook.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-render-suppression-hook.js","sourceRoot":"","sources":["../../../src/hooks/tool-render-suppression-hook.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,OAAO,yBAAyB;IACpC;;;OAGG;IACH,MAAM,CAAC,4BAA4B,CAAC,MAAc;QAChD,qBAAqB;QACrB,MAAM,SAAS,GACb,OAAO,MAAM,CAAC,YAAY,KAAK,UAAU;YACvC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE;YACvB,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,gBAAgB,GAAG,MAAuC,CAAC;QACjE,MAAM,OAAO,GACX,OAAO,gBAAgB,CAAC,UAAU,KAAK,UAAU;YAC/C,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE;YAC/B,CAAC,CAAC,gBAAgB,CAAC;QAEvB,oEAAoE;QACpE,kDAAkD;QAClD,MAAM,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvE,OAAO,cAAc,CAAC,eAAe,EAAE,KAAK,IAAI,CAAC;IACnD,CAAC;CACF"}
|
|
@@ -25,21 +25,21 @@ export declare const FileSchema: z.ZodObject<{
|
|
|
25
25
|
}, "strip", z.ZodTypeAny, {
|
|
26
26
|
path: string;
|
|
27
27
|
timestamp: number;
|
|
28
|
+
isActive?: boolean | undefined;
|
|
29
|
+
selectedText?: string | undefined;
|
|
28
30
|
cursor?: {
|
|
29
31
|
line: number;
|
|
30
32
|
character: number;
|
|
31
33
|
} | undefined;
|
|
32
|
-
isActive?: boolean | undefined;
|
|
33
|
-
selectedText?: string | undefined;
|
|
34
34
|
}, {
|
|
35
35
|
path: string;
|
|
36
36
|
timestamp: number;
|
|
37
|
+
isActive?: boolean | undefined;
|
|
38
|
+
selectedText?: string | undefined;
|
|
37
39
|
cursor?: {
|
|
38
40
|
line: number;
|
|
39
41
|
character: number;
|
|
40
42
|
} | undefined;
|
|
41
|
-
isActive?: boolean | undefined;
|
|
42
|
-
selectedText?: string | undefined;
|
|
43
43
|
}>;
|
|
44
44
|
export type File = z.infer<typeof FileSchema>;
|
|
45
45
|
export declare const IdeContextSchema: z.ZodObject<{
|
|
@@ -62,45 +62,45 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
62
62
|
}, "strip", z.ZodTypeAny, {
|
|
63
63
|
path: string;
|
|
64
64
|
timestamp: number;
|
|
65
|
+
isActive?: boolean | undefined;
|
|
66
|
+
selectedText?: string | undefined;
|
|
65
67
|
cursor?: {
|
|
66
68
|
line: number;
|
|
67
69
|
character: number;
|
|
68
70
|
} | undefined;
|
|
69
|
-
isActive?: boolean | undefined;
|
|
70
|
-
selectedText?: string | undefined;
|
|
71
71
|
}, {
|
|
72
72
|
path: string;
|
|
73
73
|
timestamp: number;
|
|
74
|
+
isActive?: boolean | undefined;
|
|
75
|
+
selectedText?: string | undefined;
|
|
74
76
|
cursor?: {
|
|
75
77
|
line: number;
|
|
76
78
|
character: number;
|
|
77
79
|
} | undefined;
|
|
78
|
-
isActive?: boolean | undefined;
|
|
79
|
-
selectedText?: string | undefined;
|
|
80
80
|
}>, "many">>;
|
|
81
81
|
isTrusted: z.ZodOptional<z.ZodBoolean>;
|
|
82
82
|
}, "strip", z.ZodTypeAny, {
|
|
83
83
|
openFiles?: {
|
|
84
84
|
path: string;
|
|
85
85
|
timestamp: number;
|
|
86
|
+
isActive?: boolean | undefined;
|
|
87
|
+
selectedText?: string | undefined;
|
|
86
88
|
cursor?: {
|
|
87
89
|
line: number;
|
|
88
90
|
character: number;
|
|
89
91
|
} | undefined;
|
|
90
|
-
isActive?: boolean | undefined;
|
|
91
|
-
selectedText?: string | undefined;
|
|
92
92
|
}[] | undefined;
|
|
93
93
|
isTrusted?: boolean | undefined;
|
|
94
94
|
}, {
|
|
95
95
|
openFiles?: {
|
|
96
96
|
path: string;
|
|
97
97
|
timestamp: number;
|
|
98
|
+
isActive?: boolean | undefined;
|
|
99
|
+
selectedText?: string | undefined;
|
|
98
100
|
cursor?: {
|
|
99
101
|
line: number;
|
|
100
102
|
character: number;
|
|
101
103
|
} | undefined;
|
|
102
|
-
isActive?: boolean | undefined;
|
|
103
|
-
selectedText?: string | undefined;
|
|
104
104
|
}[] | undefined;
|
|
105
105
|
isTrusted?: boolean | undefined;
|
|
106
106
|
}>>;
|
|
@@ -109,12 +109,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
109
109
|
openFiles?: {
|
|
110
110
|
path: string;
|
|
111
111
|
timestamp: number;
|
|
112
|
+
isActive?: boolean | undefined;
|
|
113
|
+
selectedText?: string | undefined;
|
|
112
114
|
cursor?: {
|
|
113
115
|
line: number;
|
|
114
116
|
character: number;
|
|
115
117
|
} | undefined;
|
|
116
|
-
isActive?: boolean | undefined;
|
|
117
|
-
selectedText?: string | undefined;
|
|
118
118
|
}[] | undefined;
|
|
119
119
|
isTrusted?: boolean | undefined;
|
|
120
120
|
} | undefined;
|
|
@@ -123,12 +123,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
123
123
|
openFiles?: {
|
|
124
124
|
path: string;
|
|
125
125
|
timestamp: number;
|
|
126
|
+
isActive?: boolean | undefined;
|
|
127
|
+
selectedText?: string | undefined;
|
|
126
128
|
cursor?: {
|
|
127
129
|
line: number;
|
|
128
130
|
character: number;
|
|
129
131
|
} | undefined;
|
|
130
|
-
isActive?: boolean | undefined;
|
|
131
|
-
selectedText?: string | undefined;
|
|
132
132
|
}[] | undefined;
|
|
133
133
|
isTrusted?: boolean | undefined;
|
|
134
134
|
} | undefined;
|
|
@@ -160,45 +160,45 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
160
160
|
}, "strip", z.ZodTypeAny, {
|
|
161
161
|
path: string;
|
|
162
162
|
timestamp: number;
|
|
163
|
+
isActive?: boolean | undefined;
|
|
164
|
+
selectedText?: string | undefined;
|
|
163
165
|
cursor?: {
|
|
164
166
|
line: number;
|
|
165
167
|
character: number;
|
|
166
168
|
} | undefined;
|
|
167
|
-
isActive?: boolean | undefined;
|
|
168
|
-
selectedText?: string | undefined;
|
|
169
169
|
}, {
|
|
170
170
|
path: string;
|
|
171
171
|
timestamp: number;
|
|
172
|
+
isActive?: boolean | undefined;
|
|
173
|
+
selectedText?: string | undefined;
|
|
172
174
|
cursor?: {
|
|
173
175
|
line: number;
|
|
174
176
|
character: number;
|
|
175
177
|
} | undefined;
|
|
176
|
-
isActive?: boolean | undefined;
|
|
177
|
-
selectedText?: string | undefined;
|
|
178
178
|
}>, "many">>;
|
|
179
179
|
isTrusted: z.ZodOptional<z.ZodBoolean>;
|
|
180
180
|
}, "strip", z.ZodTypeAny, {
|
|
181
181
|
openFiles?: {
|
|
182
182
|
path: string;
|
|
183
183
|
timestamp: number;
|
|
184
|
+
isActive?: boolean | undefined;
|
|
185
|
+
selectedText?: string | undefined;
|
|
184
186
|
cursor?: {
|
|
185
187
|
line: number;
|
|
186
188
|
character: number;
|
|
187
189
|
} | undefined;
|
|
188
|
-
isActive?: boolean | undefined;
|
|
189
|
-
selectedText?: string | undefined;
|
|
190
190
|
}[] | undefined;
|
|
191
191
|
isTrusted?: boolean | undefined;
|
|
192
192
|
}, {
|
|
193
193
|
openFiles?: {
|
|
194
194
|
path: string;
|
|
195
195
|
timestamp: number;
|
|
196
|
+
isActive?: boolean | undefined;
|
|
197
|
+
selectedText?: string | undefined;
|
|
196
198
|
cursor?: {
|
|
197
199
|
line: number;
|
|
198
200
|
character: number;
|
|
199
201
|
} | undefined;
|
|
200
|
-
isActive?: boolean | undefined;
|
|
201
|
-
selectedText?: string | undefined;
|
|
202
202
|
}[] | undefined;
|
|
203
203
|
isTrusted?: boolean | undefined;
|
|
204
204
|
}>>;
|
|
@@ -207,12 +207,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
207
207
|
openFiles?: {
|
|
208
208
|
path: string;
|
|
209
209
|
timestamp: number;
|
|
210
|
+
isActive?: boolean | undefined;
|
|
211
|
+
selectedText?: string | undefined;
|
|
210
212
|
cursor?: {
|
|
211
213
|
line: number;
|
|
212
214
|
character: number;
|
|
213
215
|
} | undefined;
|
|
214
|
-
isActive?: boolean | undefined;
|
|
215
|
-
selectedText?: string | undefined;
|
|
216
216
|
}[] | undefined;
|
|
217
217
|
isTrusted?: boolean | undefined;
|
|
218
218
|
} | undefined;
|
|
@@ -221,12 +221,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
221
221
|
openFiles?: {
|
|
222
222
|
path: string;
|
|
223
223
|
timestamp: number;
|
|
224
|
+
isActive?: boolean | undefined;
|
|
225
|
+
selectedText?: string | undefined;
|
|
224
226
|
cursor?: {
|
|
225
227
|
line: number;
|
|
226
228
|
character: number;
|
|
227
229
|
} | undefined;
|
|
228
|
-
isActive?: boolean | undefined;
|
|
229
|
-
selectedText?: string | undefined;
|
|
230
230
|
}[] | undefined;
|
|
231
231
|
isTrusted?: boolean | undefined;
|
|
232
232
|
} | undefined;
|
|
@@ -237,12 +237,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
237
237
|
openFiles?: {
|
|
238
238
|
path: string;
|
|
239
239
|
timestamp: number;
|
|
240
|
+
isActive?: boolean | undefined;
|
|
241
|
+
selectedText?: string | undefined;
|
|
240
242
|
cursor?: {
|
|
241
243
|
line: number;
|
|
242
244
|
character: number;
|
|
243
245
|
} | undefined;
|
|
244
|
-
isActive?: boolean | undefined;
|
|
245
|
-
selectedText?: string | undefined;
|
|
246
246
|
}[] | undefined;
|
|
247
247
|
isTrusted?: boolean | undefined;
|
|
248
248
|
} | undefined;
|
|
@@ -255,12 +255,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
255
255
|
openFiles?: {
|
|
256
256
|
path: string;
|
|
257
257
|
timestamp: number;
|
|
258
|
+
isActive?: boolean | undefined;
|
|
259
|
+
selectedText?: string | undefined;
|
|
258
260
|
cursor?: {
|
|
259
261
|
line: number;
|
|
260
262
|
character: number;
|
|
261
263
|
} | undefined;
|
|
262
|
-
isActive?: boolean | undefined;
|
|
263
|
-
selectedText?: string | undefined;
|
|
264
264
|
}[] | undefined;
|
|
265
265
|
isTrusted?: boolean | undefined;
|
|
266
266
|
} | undefined;
|
package/dist/src/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export * from './config/config.js';
|
|
7
7
|
export * from './config/profileManager.js';
|
|
8
|
+
export * from './config/subagentManager.js';
|
|
8
9
|
export * from './services/git-stats-service.js';
|
|
9
10
|
export * from './types/modelParams.js';
|
|
10
11
|
export * from './core/client.js';
|
|
@@ -18,6 +19,7 @@ export * from './core/turn.js';
|
|
|
18
19
|
export * from './core/geminiRequest.js';
|
|
19
20
|
export * from './core/coreToolScheduler.js';
|
|
20
21
|
export * from './core/nonInteractiveToolExecutor.js';
|
|
22
|
+
export type { SubagentSchedulerFactory } from './core/subagentScheduler.js';
|
|
21
23
|
export * from './code_assist/codeAssist.js';
|
|
22
24
|
export * from './code_assist/oauth2.js';
|
|
23
25
|
export * from './code_assist/server.js';
|
|
@@ -46,6 +48,7 @@ export * from './utils/errorParsing.js';
|
|
|
46
48
|
export * from './utils/ignorePatterns.js';
|
|
47
49
|
export * from './utils/partUtils.js';
|
|
48
50
|
export * from './utils/ide-trust.js';
|
|
51
|
+
export { AuthPrecedenceResolver, type AuthPrecedenceConfig, type OAuthManager, flushRuntimeAuthScope, type RuntimeAuthScopeFlushResult, type RuntimeAuthScopeCacheEntrySummary, type OAuthTokenRequestMetadata, } from './auth/precedence.js';
|
|
49
52
|
export * from './auth/token-store.js';
|
|
50
53
|
export * from './auth/types.js';
|
|
51
54
|
export * from './auth/qwen-device-flow.js';
|
|
@@ -89,6 +92,8 @@ export * from './tools/todo-pause.js';
|
|
|
89
92
|
export * from './tools/todo-schemas.js';
|
|
90
93
|
export * from './tools/todo-store.js';
|
|
91
94
|
export * from './tools/todo-events.js';
|
|
95
|
+
export * from './tools/list-subagents.js';
|
|
96
|
+
export * from './tools/task.js';
|
|
92
97
|
export * from './todo/todoFormatter.js';
|
|
93
98
|
export { MCPOAuthProvider } from './mcp/oauth-provider.js';
|
|
94
99
|
export { MCPOAuthToken, MCPOAuthCredentials, MCPOAuthTokenStorage, } from './mcp/oauth-token-storage.js';
|
|
@@ -102,6 +107,7 @@ export * from './telemetry/uiTelemetry.js';
|
|
|
102
107
|
export { sessionId } from './utils/session.js';
|
|
103
108
|
export type { Provider, ProviderMessage, ProviderTool, ProviderToolCall, } from './providers/types.js';
|
|
104
109
|
export * from './providers/IProvider.js';
|
|
110
|
+
export type { GenerateChatOptions, ProviderToolset, } from './providers/IProvider.js';
|
|
105
111
|
export * from './providers/ITool.js';
|
|
106
112
|
export * from './providers/IModel.js';
|
|
107
113
|
export * from './providers/IProviderManager.js';
|
|
@@ -127,9 +133,18 @@ export * from './parsers/TextToolCallParser.js';
|
|
|
127
133
|
export * from './tools/IToolFormatter.js';
|
|
128
134
|
export * from './tools/ToolFormatter.js';
|
|
129
135
|
export { SettingsService } from './settings/SettingsService.js';
|
|
130
|
-
export { getSettingsService, resetSettingsService, } from './settings/settingsServiceInstance.js';
|
|
136
|
+
export { getSettingsService, resetSettingsService, registerSettingsService, } from './settings/settingsServiceInstance.js';
|
|
131
137
|
export type { ISettingsService, GlobalSettings, SettingsChangeEvent, ProviderSettings, UISettings, AdvancedSettings, EventListener, EventUnsubscribe, } from './settings/types.js';
|
|
132
138
|
export type { TelemetrySettings as SettingsTelemetrySettings } from './settings/types.js';
|
|
139
|
+
export { createProviderRuntimeContext, getActiveProviderRuntimeContext, setActiveProviderRuntimeContext, clearActiveProviderRuntimeContext, peekActiveProviderRuntimeContext, setProviderRuntimeContextFallback, } from './runtime/providerRuntimeContext.js';
|
|
140
|
+
export type { ProviderRuntimeContext } from './runtime/providerRuntimeContext.js';
|
|
141
|
+
export type { AgentRuntimeState, RuntimeStateParams, RuntimeStateSnapshot, RuntimeStateChangedEvent, RuntimeStateChangeCallback, UnsubscribeFunction, AuthPayload, ModelParams, SanitizedAuthPayload, RuntimeStateErrorCode, } from './runtime/AgentRuntimeState.js';
|
|
142
|
+
export { createAgentRuntimeState, updateAgentRuntimeState, updateAgentRuntimeStateBatch, getAgentRuntimeStateSnapshot, subscribeToAgentRuntimeState, RuntimeStateError, getProvider, getModel, getAuthType, getAuthPayload, getBaseUrl, getSessionId, getModelParams, } from './runtime/AgentRuntimeState.js';
|
|
143
|
+
export type { RuntimeStateFromConfigOptions } from './runtime/runtimeStateFactory.js';
|
|
144
|
+
export { createAgentRuntimeStateFromConfig as createRuntimeStateFromConfig } from './runtime/runtimeStateFactory.js';
|
|
145
|
+
export type { AgentRuntimeContext, AgentRuntimeContextFactoryOptions, ReadonlySettingsSnapshot, ToolRegistryView, ToolMetadata, ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, TelemetryRedactionConfig, AgentRuntimeProviderAdapter, AgentRuntimeTelemetryAdapter, } from './runtime/AgentRuntimeContext.js';
|
|
146
|
+
export { TelemetryTarget } from './runtime/AgentRuntimeContext.js';
|
|
147
|
+
export { createAgentRuntimeContext } from './runtime/createAgentRuntimeContext.js';
|
|
133
148
|
export { EmojiFilter } from './filters/EmojiFilter.js';
|
|
134
149
|
export type { FilterConfiguration, FilterResult, EmojiFilterMode, } from './filters/EmojiFilter.js';
|
|
135
150
|
export { ConfigurationManager, DebugLogger, FileOutput, } from './debug/index.js';
|
|
@@ -138,3 +153,6 @@ export type { LogEntry as DebugLogEntry } from './debug/index.js';
|
|
|
138
153
|
export { Storage } from './config/storage.js';
|
|
139
154
|
export * from './config/models.js';
|
|
140
155
|
export * from './test-utils/index.js';
|
|
156
|
+
export { SubagentManager } from './config/subagentManager.js';
|
|
157
|
+
export { SubagentOrchestrator } from './core/subagentOrchestrator.js';
|
|
158
|
+
export type { SubagentConfig } from './config/types.js';
|
package/dist/src/index.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
// Export config
|
|
7
7
|
export * from './config/config.js';
|
|
8
8
|
export * from './config/profileManager.js';
|
|
9
|
+
export * from './config/subagentManager.js';
|
|
9
10
|
// Export services
|
|
10
11
|
export * from './services/git-stats-service.js';
|
|
11
12
|
// Export types
|
|
@@ -52,6 +53,7 @@ export * from './utils/ignorePatterns.js';
|
|
|
52
53
|
export * from './utils/partUtils.js';
|
|
53
54
|
export * from './utils/ide-trust.js';
|
|
54
55
|
// Export auth system
|
|
56
|
+
export { AuthPrecedenceResolver, flushRuntimeAuthScope, } from './auth/precedence.js';
|
|
55
57
|
export * from './auth/token-store.js';
|
|
56
58
|
export * from './auth/types.js';
|
|
57
59
|
export * from './auth/qwen-device-flow.js';
|
|
@@ -102,6 +104,8 @@ export * from './tools/todo-pause.js';
|
|
|
102
104
|
export * from './tools/todo-schemas.js';
|
|
103
105
|
export * from './tools/todo-store.js';
|
|
104
106
|
export * from './tools/todo-events.js';
|
|
107
|
+
export * from './tools/list-subagents.js';
|
|
108
|
+
export * from './tools/task.js';
|
|
105
109
|
export * from './todo/todoFormatter.js';
|
|
106
110
|
// MCP OAuth
|
|
107
111
|
export { MCPOAuthProvider } from './mcp/oauth-provider.js';
|
|
@@ -147,7 +151,12 @@ export * from './tools/IToolFormatter.js';
|
|
|
147
151
|
export * from './tools/ToolFormatter.js';
|
|
148
152
|
// Export settings system
|
|
149
153
|
export { SettingsService } from './settings/SettingsService.js';
|
|
150
|
-
export { getSettingsService, resetSettingsService, } from './settings/settingsServiceInstance.js';
|
|
154
|
+
export { getSettingsService, resetSettingsService, registerSettingsService, } from './settings/settingsServiceInstance.js';
|
|
155
|
+
export { createProviderRuntimeContext, getActiveProviderRuntimeContext, setActiveProviderRuntimeContext, clearActiveProviderRuntimeContext, peekActiveProviderRuntimeContext, setProviderRuntimeContextFallback, } from './runtime/providerRuntimeContext.js';
|
|
156
|
+
export { createAgentRuntimeState, updateAgentRuntimeState, updateAgentRuntimeStateBatch, getAgentRuntimeStateSnapshot, subscribeToAgentRuntimeState, RuntimeStateError, getProvider, getModel, getAuthType, getAuthPayload, getBaseUrl, getSessionId, getModelParams, } from './runtime/AgentRuntimeState.js';
|
|
157
|
+
export { createAgentRuntimeStateFromConfig as createRuntimeStateFromConfig } from './runtime/runtimeStateFactory.js';
|
|
158
|
+
export { TelemetryTarget } from './runtime/AgentRuntimeContext.js';
|
|
159
|
+
export { createAgentRuntimeContext } from './runtime/createAgentRuntimeContext.js';
|
|
151
160
|
// Export emoji filter system
|
|
152
161
|
export { EmojiFilter } from './filters/EmojiFilter.js';
|
|
153
162
|
// Export debug system
|
|
@@ -156,6 +165,10 @@ export { ConfigurationManager, DebugLogger, FileOutput, } from './debug/index.js
|
|
|
156
165
|
export { Storage } from './config/storage.js';
|
|
157
166
|
// Export models
|
|
158
167
|
export * from './config/models.js';
|
|
159
|
-
// Export test utils
|
|
168
|
+
// Export test utils (note: vi globals accessed lazily inside helpers)
|
|
160
169
|
export * from './test-utils/index.js';
|
|
170
|
+
// --- Subagent Feature: PLAN-20250117-SUBAGENTCONFIG ---
|
|
171
|
+
export { SubagentManager } from './config/subagentManager.js';
|
|
172
|
+
export { SubagentOrchestrator } from './core/subagentOrchestrator.js';
|
|
173
|
+
// --- End of Subagent Feature ---
|
|
161
174
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,4DAA4D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodejs-error.interface.js","sourceRoot":"","sources":["../../../src/interfaces/nodejs-error.interface.ts"],"names":[],"mappings":""}
|
|
@@ -29,13 +29,29 @@ export interface ITextToolCallParser {
|
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
export declare class GemmaToolCallParser implements ITextToolCallParser {
|
|
32
|
-
private readonly
|
|
32
|
+
private readonly keyValuePattern;
|
|
33
33
|
parse(content: string): {
|
|
34
34
|
cleanedContent: string;
|
|
35
35
|
toolCalls: TextToolCall[];
|
|
36
36
|
};
|
|
37
|
+
private collectMatches;
|
|
38
|
+
private findBracketToolRequests;
|
|
39
|
+
private findJsonToolRequests;
|
|
40
|
+
private findHermesToolRequests;
|
|
41
|
+
private findInvokeToolRequests;
|
|
42
|
+
private findGenericXmlToolRequests;
|
|
43
|
+
private findUseToolRequests;
|
|
44
|
+
private findUseUnderscoreToolRequests;
|
|
45
|
+
private findKeyValueToolRequests;
|
|
46
|
+
private removeMatchedRanges;
|
|
47
|
+
private postProcessCleanedContent;
|
|
48
|
+
private normalizeArguments;
|
|
49
|
+
private extractBalancedSegment;
|
|
37
50
|
private tryRepairJson;
|
|
38
51
|
private parseKeyValuePairs;
|
|
52
|
+
private parseAttributeArguments;
|
|
39
53
|
private parseXMLParameters;
|
|
40
54
|
private parseValue;
|
|
55
|
+
private findTagClose;
|
|
56
|
+
private extractToolNameAndAttributes;
|
|
41
57
|
}
|