@google/gemini-cli-a2a-server 0.41.0-preview.0 → 0.41.0-preview.2
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/a2a-server.mjs +90 -45
- package/dist/src/agent/task-event-driven.test.js +46 -8
- package/dist/src/agent/task-event-driven.test.js.map +1 -1
- package/dist/src/agent/task.d.ts +1 -0
- package/dist/src/agent/task.js +21 -8
- package/dist/src/agent/task.js.map +1 -1
- package/dist/src/agent/task.test.js +123 -1
- package/dist/src/agent/task.test.js.map +1 -1
- package/dist/src/http/app.test.js +76 -37
- package/dist/src/http/app.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/a2a-server.mjs
CHANGED
|
@@ -131410,7 +131410,7 @@ function makeChatCompressionEvent({ tokens_before, tokens_after }) {
|
|
|
131410
131410
|
}
|
|
131411
131411
|
};
|
|
131412
131412
|
}
|
|
131413
|
-
var EVENT_TOOL_CALL, ToolCallEvent, EVENT_API_REQUEST, ApiRequestEvent, EVENT_API_ERROR, ApiErrorEvent, EVENT_API_RESPONSE, EVENT_GEN_AI_OPERATION_DETAILS, ApiResponseEvent, EVENT_FLASH_FALLBACK, FlashFallbackEvent, EVENT_RIPGREP_FALLBACK, RipgrepFallbackEvent, LoopType, LoopDetectedEvent, LoopDetectionDisabledEvent, EVENT_NEXT_SPEAKER_CHECK, NextSpeakerCheckEvent, EVENT_CONSECA_POLICY_GENERATION, ConsecaPolicyGenerationEvent, EVENT_CONSECA_VERDICT, ConsecaVerdictEvent, SlashCommandStatus, EVENT_CHAT_COMPRESSION2, EVENT_MALFORMED_JSON_RESPONSE, MalformedJsonResponseEvent, IdeConnectionType, EVENT_FILE_OPERATION, FileOperationEvent, EVENT_INVALID_CHUNK, InvalidChunkEvent, EVENT_CONTENT_RETRY, ContentRetryEvent, EVENT_CONTENT_RETRY_FAILURE, EVENT_NETWORK_RETRY_ATTEMPT, NetworkRetryAttemptEvent, ContentRetryFailureEvent, EVENT_MODEL_ROUTING, ModelRoutingEvent, EVENT_TOOL_OUTPUT_TRUNCATED, ToolOutputTruncatedEvent, EVENT_TOOL_OUTPUT_MASKING, ToolOutputMaskingEvent, EVENT_LLM_LOOP_CHECK, LlmLoopCheckEvent, EVENT_EDIT_STRATEGY, EditStrategyEvent, EVENT_EDIT_CORRECTION, EditCorrectionEvent, EVENT_STARTUP_STATS, StartupStatsEvent, BaseAgentEvent, EVENT_AGENT_START, AgentStartEvent, EVENT_AGENT_FINISH, AgentFinishEvent, EVENT_AGENT_RECOVERY_ATTEMPT, RecoveryAttemptEvent, EVENT_WEB_FETCH_FALLBACK_ATTEMPT, WebFetchFallbackAttemptEvent, EVENT_HOOK_CALL, EVENT_APPROVAL_MODE_SWITCH, ApprovalModeSwitchEvent, EVENT_APPROVAL_MODE_DURATION, ApprovalModeDurationEvent, EVENT_PLAN_EXECUTION, PlanExecutionEvent, HookCallEvent, EVENT_KEYCHAIN_AVAILABILITY, KeychainAvailabilityEvent, EVENT_ONBOARDING_START2, OnboardingStartEvent, EVENT_ONBOARDING_SUCCESS2, OnboardingSuccessEvent, EVENT_TOKEN_STORAGE_INITIALIZATION, TokenStorageInitializationEvent;
|
|
131413
|
+
var EVENT_TOOL_CALL, TOOL_CALL_METADATA_SAFE_KEYS, ToolCallEvent, EVENT_API_REQUEST, ApiRequestEvent, EVENT_API_ERROR, ApiErrorEvent, EVENT_API_RESPONSE, EVENT_GEN_AI_OPERATION_DETAILS, ApiResponseEvent, EVENT_FLASH_FALLBACK, FlashFallbackEvent, EVENT_RIPGREP_FALLBACK, RipgrepFallbackEvent, LoopType, LoopDetectedEvent, LoopDetectionDisabledEvent, EVENT_NEXT_SPEAKER_CHECK, NextSpeakerCheckEvent, EVENT_CONSECA_POLICY_GENERATION, ConsecaPolicyGenerationEvent, EVENT_CONSECA_VERDICT, ConsecaVerdictEvent, SlashCommandStatus, EVENT_CHAT_COMPRESSION2, EVENT_MALFORMED_JSON_RESPONSE, MalformedJsonResponseEvent, IdeConnectionType, EVENT_FILE_OPERATION, FileOperationEvent, EVENT_INVALID_CHUNK, InvalidChunkEvent, EVENT_CONTENT_RETRY, ContentRetryEvent, EVENT_CONTENT_RETRY_FAILURE, EVENT_NETWORK_RETRY_ATTEMPT, NetworkRetryAttemptEvent, ContentRetryFailureEvent, EVENT_MODEL_ROUTING, ModelRoutingEvent, EVENT_TOOL_OUTPUT_TRUNCATED, ToolOutputTruncatedEvent, EVENT_TOOL_OUTPUT_MASKING, ToolOutputMaskingEvent, EVENT_LLM_LOOP_CHECK, LlmLoopCheckEvent, EVENT_EDIT_STRATEGY, EditStrategyEvent, EVENT_EDIT_CORRECTION, EditCorrectionEvent, EVENT_STARTUP_STATS, StartupStatsEvent, BaseAgentEvent, EVENT_AGENT_START, AgentStartEvent, EVENT_AGENT_FINISH, AgentFinishEvent, EVENT_AGENT_RECOVERY_ATTEMPT, RecoveryAttemptEvent, EVENT_WEB_FETCH_FALLBACK_ATTEMPT, WebFetchFallbackAttemptEvent, EVENT_HOOK_CALL, EVENT_APPROVAL_MODE_SWITCH, ApprovalModeSwitchEvent, EVENT_APPROVAL_MODE_DURATION, ApprovalModeDurationEvent, EVENT_PLAN_EXECUTION, PlanExecutionEvent, HookCallEvent, EVENT_KEYCHAIN_AVAILABILITY, KeychainAvailabilityEvent, EVENT_ONBOARDING_START2, OnboardingStartEvent, EVENT_ONBOARDING_SUCCESS2, OnboardingSuccessEvent, EVENT_TOKEN_STORAGE_INITIALIZATION, TokenStorageInitializationEvent;
|
|
131414
131414
|
var init_types7 = __esm({
|
|
131415
131415
|
"packages/core/dist/src/telemetry/types.js"() {
|
|
131416
131416
|
"use strict";
|
|
@@ -131427,6 +131427,16 @@ var init_types7 = __esm({
|
|
|
131427
131427
|
init_fileDiffUtils();
|
|
131428
131428
|
init_llmRole();
|
|
131429
131429
|
EVENT_TOOL_CALL = "gemini_cli.tool_call";
|
|
131430
|
+
TOOL_CALL_METADATA_SAFE_KEYS = [
|
|
131431
|
+
"model_added_lines",
|
|
131432
|
+
"model_removed_lines",
|
|
131433
|
+
"model_added_chars",
|
|
131434
|
+
"model_removed_chars",
|
|
131435
|
+
"user_added_lines",
|
|
131436
|
+
"user_removed_lines",
|
|
131437
|
+
"user_added_chars",
|
|
131438
|
+
"user_removed_chars"
|
|
131439
|
+
];
|
|
131430
131440
|
ToolCallEvent = class {
|
|
131431
131441
|
"event.name";
|
|
131432
131442
|
"event.timestamp";
|
|
@@ -131508,7 +131518,6 @@ var init_types7 = __esm({
|
|
|
131508
131518
|
"event.name": EVENT_TOOL_CALL,
|
|
131509
131519
|
"event.timestamp": this["event.timestamp"],
|
|
131510
131520
|
function_name: this.function_name,
|
|
131511
|
-
function_args: safeJsonStringify(this.function_args, 2),
|
|
131512
131521
|
duration_ms: this.duration_ms,
|
|
131513
131522
|
success: this.success,
|
|
131514
131523
|
decision: this.decision,
|
|
@@ -131519,9 +131528,17 @@ var init_types7 = __esm({
|
|
|
131519
131528
|
extension_name: this.extension_name,
|
|
131520
131529
|
extension_id: this.extension_id,
|
|
131521
131530
|
start_time: this.start_time,
|
|
131522
|
-
end_time: this.end_time
|
|
131523
|
-
metadata: this.metadata
|
|
131531
|
+
end_time: this.end_time
|
|
131524
131532
|
};
|
|
131533
|
+
if (config3.getTelemetryLogPromptsEnabled() && this.function_args) {
|
|
131534
|
+
attributes["function_args"] = safeJsonStringify(this.function_args, 2);
|
|
131535
|
+
}
|
|
131536
|
+
if (this.metadata) {
|
|
131537
|
+
const metadata2 = config3.getTelemetryLogPromptsEnabled() ? this.metadata : Object.fromEntries(Object.entries(this.metadata).filter(([k2]) => TOOL_CALL_METADATA_SAFE_KEYS.includes(k2)));
|
|
131538
|
+
if (Object.keys(metadata2).length > 0) {
|
|
131539
|
+
attributes["metadata"] = safeJsonStringify(metadata2, 2);
|
|
131540
|
+
}
|
|
131541
|
+
}
|
|
131525
131542
|
if (this.error) {
|
|
131526
131543
|
attributes[CoreToolCallStatus.Error] = this.error;
|
|
131527
131544
|
attributes["error.message"] = this.error;
|
|
@@ -131558,9 +131575,11 @@ var init_types7 = __esm({
|
|
|
131558
131575
|
"event.name": EVENT_API_REQUEST,
|
|
131559
131576
|
"event.timestamp": this["event.timestamp"],
|
|
131560
131577
|
model: this.model,
|
|
131561
|
-
prompt_id: this.prompt.prompt_id
|
|
131562
|
-
request_text: this.request_text
|
|
131578
|
+
prompt_id: this.prompt.prompt_id
|
|
131563
131579
|
};
|
|
131580
|
+
if (config3.getTelemetryLogPromptsEnabled() && this.request_text) {
|
|
131581
|
+
attributes["request_text"] = this.request_text;
|
|
131582
|
+
}
|
|
131564
131583
|
if (this.role) {
|
|
131565
131584
|
attributes["role"] = this.role;
|
|
131566
131585
|
}
|
|
@@ -131725,7 +131744,7 @@ var init_types7 = __esm({
|
|
|
131725
131744
|
if (this.role) {
|
|
131726
131745
|
attributes["role"] = this.role;
|
|
131727
131746
|
}
|
|
131728
|
-
if (this.response_text) {
|
|
131747
|
+
if (config3.getTelemetryLogPromptsEnabled() && this.response_text) {
|
|
131729
131748
|
attributes["response_text"] = this.response_text;
|
|
131730
131749
|
}
|
|
131731
131750
|
if (this.status_code) {
|
|
@@ -131934,11 +131953,19 @@ var init_types7 = __esm({
|
|
|
131934
131953
|
const attributes = {
|
|
131935
131954
|
...getCommonAttributes(config3),
|
|
131936
131955
|
"event.name": EVENT_CONSECA_POLICY_GENERATION,
|
|
131937
|
-
"event.timestamp": this["event.timestamp"]
|
|
131938
|
-
user_prompt: this.user_prompt,
|
|
131939
|
-
trusted_content: this.trusted_content,
|
|
131940
|
-
policy: this.policy
|
|
131956
|
+
"event.timestamp": this["event.timestamp"]
|
|
131941
131957
|
};
|
|
131958
|
+
if (config3.getTelemetryLogPromptsEnabled()) {
|
|
131959
|
+
if (this.user_prompt) {
|
|
131960
|
+
attributes["user_prompt"] = this.user_prompt;
|
|
131961
|
+
}
|
|
131962
|
+
if (this.trusted_content) {
|
|
131963
|
+
attributes["trusted_content"] = this.trusted_content;
|
|
131964
|
+
}
|
|
131965
|
+
if (this.policy) {
|
|
131966
|
+
attributes["policy"] = this.policy;
|
|
131967
|
+
}
|
|
131968
|
+
}
|
|
131942
131969
|
if (this.error) {
|
|
131943
131970
|
attributes["error"] = this.error;
|
|
131944
131971
|
}
|
|
@@ -131973,12 +132000,22 @@ var init_types7 = __esm({
|
|
|
131973
132000
|
...getCommonAttributes(config3),
|
|
131974
132001
|
"event.name": EVENT_CONSECA_VERDICT,
|
|
131975
132002
|
"event.timestamp": this["event.timestamp"],
|
|
131976
|
-
|
|
131977
|
-
policy: this.policy,
|
|
131978
|
-
tool_call: this.tool_call,
|
|
131979
|
-
verdict: this.verdict,
|
|
131980
|
-
verdict_rationale: this.verdict_rationale
|
|
132003
|
+
verdict: this.verdict
|
|
131981
132004
|
};
|
|
132005
|
+
if (config3.getTelemetryLogPromptsEnabled()) {
|
|
132006
|
+
if (this.user_prompt) {
|
|
132007
|
+
attributes["user_prompt"] = this.user_prompt;
|
|
132008
|
+
}
|
|
132009
|
+
if (this.policy) {
|
|
132010
|
+
attributes["policy"] = this.policy;
|
|
132011
|
+
}
|
|
132012
|
+
if (this.tool_call) {
|
|
132013
|
+
attributes["tool_call"] = this.tool_call;
|
|
132014
|
+
}
|
|
132015
|
+
if (this.verdict_rationale) {
|
|
132016
|
+
attributes["verdict_rationale"] = this.verdict_rationale;
|
|
132017
|
+
}
|
|
132018
|
+
}
|
|
131982
132019
|
if (this.error) {
|
|
131983
132020
|
attributes["error"] = this.error;
|
|
131984
132021
|
}
|
|
@@ -209385,8 +209422,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
|
|
|
209385
209422
|
var init_git_commit = __esm({
|
|
209386
209423
|
"packages/core/dist/src/generated/git-commit.js"() {
|
|
209387
209424
|
"use strict";
|
|
209388
|
-
GIT_COMMIT_INFO = "
|
|
209389
|
-
CLI_VERSION = "0.41.0-preview.
|
|
209425
|
+
GIT_COMMIT_INFO = "c6a695d1b";
|
|
209426
|
+
CLI_VERSION = "0.41.0-preview.2";
|
|
209390
209427
|
}
|
|
209391
209428
|
});
|
|
209392
209429
|
|
|
@@ -279569,20 +279606,19 @@ function logConsecaPolicyGeneration(config3, event) {
|
|
|
279569
279606
|
debugLogger.debug("Conseca Policy Generation Event:", event);
|
|
279570
279607
|
const clearcutLogger = ClearcutLogger.getInstance(config3);
|
|
279571
279608
|
if (clearcutLogger) {
|
|
279572
|
-
const data = [
|
|
279573
|
-
|
|
279609
|
+
const data = [];
|
|
279610
|
+
if (config3.getTelemetryLogPromptsEnabled()) {
|
|
279611
|
+
data.push({
|
|
279574
279612
|
gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
|
|
279575
279613
|
value: safeJsonStringify(event.user_prompt)
|
|
279576
|
-
},
|
|
279577
|
-
{
|
|
279614
|
+
}, {
|
|
279578
279615
|
gemini_cli_key: EventMetadataKey.CONSECA_TRUSTED_CONTENT,
|
|
279579
279616
|
value: safeJsonStringify(event.trusted_content)
|
|
279580
|
-
},
|
|
279581
|
-
{
|
|
279617
|
+
}, {
|
|
279582
279618
|
gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
|
|
279583
279619
|
value: safeJsonStringify(event.policy)
|
|
279584
|
-
}
|
|
279585
|
-
|
|
279620
|
+
});
|
|
279621
|
+
}
|
|
279586
279622
|
if (event.error) {
|
|
279587
279623
|
data.push({
|
|
279588
279624
|
gemini_cli_key: EventMetadataKey.CONSECA_ERROR,
|
|
@@ -279606,26 +279642,25 @@ function logConsecaVerdict(config3, event) {
|
|
|
279606
279642
|
if (clearcutLogger) {
|
|
279607
279643
|
const data = [
|
|
279608
279644
|
{
|
|
279645
|
+
gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RESULT,
|
|
279646
|
+
value: safeJsonStringify(event.verdict)
|
|
279647
|
+
}
|
|
279648
|
+
];
|
|
279649
|
+
if (config3.getTelemetryLogPromptsEnabled()) {
|
|
279650
|
+
data.push({
|
|
279609
279651
|
gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
|
|
279610
279652
|
value: safeJsonStringify(event.user_prompt)
|
|
279611
|
-
},
|
|
279612
|
-
{
|
|
279653
|
+
}, {
|
|
279613
279654
|
gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
|
|
279614
279655
|
value: safeJsonStringify(event.policy)
|
|
279615
|
-
},
|
|
279616
|
-
{
|
|
279656
|
+
}, {
|
|
279617
279657
|
gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
|
|
279618
279658
|
value: safeJsonStringify(event.tool_call)
|
|
279619
|
-
},
|
|
279620
|
-
{
|
|
279621
|
-
gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RESULT,
|
|
279622
|
-
value: safeJsonStringify(event.verdict)
|
|
279623
|
-
},
|
|
279624
|
-
{
|
|
279659
|
+
}, {
|
|
279625
279660
|
gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RATIONALE,
|
|
279626
279661
|
value: event.verdict_rationale
|
|
279627
|
-
}
|
|
279628
|
-
|
|
279662
|
+
});
|
|
279663
|
+
}
|
|
279629
279664
|
if (event.error) {
|
|
279630
279665
|
data.push({
|
|
279631
279666
|
gemini_cli_key: EventMetadataKey.CONSECA_ERROR,
|
|
@@ -329349,7 +329384,7 @@ function getVersion() {
|
|
|
329349
329384
|
}
|
|
329350
329385
|
versionPromise = (async () => {
|
|
329351
329386
|
const pkgJson = await getPackageJson(__dirname4);
|
|
329352
|
-
return "0.41.0-preview.
|
|
329387
|
+
return "0.41.0-preview.2";
|
|
329353
329388
|
})();
|
|
329354
329389
|
return versionPromise;
|
|
329355
329390
|
}
|
|
@@ -445924,6 +445959,8 @@ var Task4 = class _Task {
|
|
|
445924
445959
|
// For tool waiting logic
|
|
445925
445960
|
pendingToolCalls = /* @__PURE__ */ new Map();
|
|
445926
445961
|
//toolCallId --> status
|
|
445962
|
+
pendingOutcomes = /* @__PURE__ */ new Map();
|
|
445963
|
+
// toolCallId --> outcome
|
|
445927
445964
|
toolsAlreadyConfirmed = /* @__PURE__ */ new Set();
|
|
445928
445965
|
toolCompletionPromise;
|
|
445929
445966
|
toolCompletionNotifier;
|
|
@@ -446161,7 +446198,7 @@ var Task4 = class _Task {
|
|
|
446161
446198
|
this.scheduler.dispose();
|
|
446162
446199
|
}
|
|
446163
446200
|
handleEventDrivenToolCallsUpdate(event) {
|
|
446164
|
-
if (event.type !== MessageBusType.TOOL_CALLS_UPDATE) {
|
|
446201
|
+
if (event.type !== MessageBusType.TOOL_CALLS_UPDATE || event.schedulerId !== this.id) {
|
|
446165
446202
|
return;
|
|
446166
446203
|
}
|
|
446167
446204
|
const toolCalls = event.toolCalls;
|
|
@@ -446173,15 +446210,18 @@ var Task4 = class _Task {
|
|
|
446173
446210
|
handleEventDrivenToolCall(tc) {
|
|
446174
446211
|
const callId = tc.request.callId;
|
|
446175
446212
|
if (this.processedToolCallIds.has(callId) || this.completedToolCalls.some((c2) => c2.request.callId === callId)) {
|
|
446176
|
-
return;
|
|
446213
|
+
return false;
|
|
446177
446214
|
}
|
|
446178
446215
|
const previousStatus = this.pendingToolCalls.get(callId);
|
|
446179
|
-
const
|
|
446216
|
+
const previousOutcome = this.pendingOutcomes.get(callId);
|
|
446217
|
+
const hasChanged = previousStatus !== tc.status || previousOutcome !== tc.outcome;
|
|
446218
|
+
this.pendingOutcomes.set(callId, tc.outcome);
|
|
446180
446219
|
if (tc.status === "executing" && tc.liveOutput) {
|
|
446181
446220
|
this._schedulerOutputUpdate(callId, tc.liveOutput);
|
|
446182
446221
|
}
|
|
446183
446222
|
if (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") {
|
|
446184
446223
|
this.toolsAlreadyConfirmed.delete(callId);
|
|
446224
|
+
this.pendingOutcomes.delete(callId);
|
|
446185
446225
|
if (hasChanged) {
|
|
446186
446226
|
logger.info(
|
|
446187
446227
|
`[Task] Tool call ${callId} completed with status: ${tc.status}`
|
|
@@ -446214,6 +446254,7 @@ var Task4 = class _Task {
|
|
|
446214
446254
|
);
|
|
446215
446255
|
this.eventBus?.publish(statusUpdate);
|
|
446216
446256
|
}
|
|
446257
|
+
return hasChanged;
|
|
446217
446258
|
}
|
|
446218
446259
|
checkInputRequiredState() {
|
|
446219
446260
|
if (this.isYoloMatch) {
|
|
@@ -446222,9 +446263,9 @@ var Task4 = class _Task {
|
|
|
446222
446263
|
let isAwaitingApproval = false;
|
|
446223
446264
|
let isExecuting = false;
|
|
446224
446265
|
for (const [callId, status2] of this.pendingToolCalls.entries()) {
|
|
446225
|
-
if (status2 ===
|
|
446266
|
+
if (status2 === CoreToolCallStatus.Executing || status2 === CoreToolCallStatus.Scheduled || status2 === CoreToolCallStatus.Validating || this.toolsAlreadyConfirmed.has(callId)) {
|
|
446226
446267
|
isExecuting = true;
|
|
446227
|
-
} else if (status2 ===
|
|
446268
|
+
} else if (status2 === CoreToolCallStatus.AwaitingApproval) {
|
|
446228
446269
|
isAwaitingApproval = true;
|
|
446229
446270
|
}
|
|
446230
446271
|
}
|
|
@@ -446261,8 +446302,12 @@ var Task4 = class _Task {
|
|
|
446261
446302
|
"status",
|
|
446262
446303
|
"confirmationDetails",
|
|
446263
446304
|
"liveOutput",
|
|
446264
|
-
"response"
|
|
446305
|
+
"response",
|
|
446306
|
+
"outcome"
|
|
446265
446307
|
);
|
|
446308
|
+
if (serializableToolCall.status === CoreToolCallStatus.Validating) {
|
|
446309
|
+
serializableToolCall.status = CoreToolCallStatus.Scheduled;
|
|
446310
|
+
}
|
|
446266
446311
|
if (tc.tool) {
|
|
446267
446312
|
const toolFields = this._pickFields(
|
|
446268
446313
|
tc.tool,
|
|
@@ -48,6 +48,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
48
48
|
handler({
|
|
49
49
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
50
50
|
toolCalls: [toolCall],
|
|
51
|
+
schedulerId: 'task-id',
|
|
51
52
|
});
|
|
52
53
|
expect(mockEventBus.publish).toHaveBeenCalledWith(expect.objectContaining({
|
|
53
54
|
status: expect.objectContaining({
|
|
@@ -78,6 +79,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
78
79
|
handler({
|
|
79
80
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
80
81
|
toolCalls: [toolCall],
|
|
82
|
+
schedulerId: 'task-id',
|
|
81
83
|
});
|
|
82
84
|
// Simulate A2A client confirmation
|
|
83
85
|
const part = {
|
|
@@ -106,7 +108,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
106
108
|
confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
|
|
107
109
|
};
|
|
108
110
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
109
|
-
handler({
|
|
111
|
+
handler({
|
|
112
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
113
|
+
toolCalls: [toolCall],
|
|
114
|
+
schedulerId: 'task-id',
|
|
115
|
+
});
|
|
110
116
|
// Simulate Rejection (Cancel)
|
|
111
117
|
const handled = await task._handleToolConfirmationPart({
|
|
112
118
|
kind: 'data',
|
|
@@ -124,7 +130,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
124
130
|
correlationId: 'corr-2',
|
|
125
131
|
confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
|
|
126
132
|
};
|
|
127
|
-
handler({
|
|
133
|
+
handler({
|
|
134
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
135
|
+
toolCalls: [toolCall2],
|
|
136
|
+
schedulerId: 'task-id',
|
|
137
|
+
});
|
|
128
138
|
// Simulate ModifyWithEditor
|
|
129
139
|
const handled2 = await task._handleToolConfirmationPart({
|
|
130
140
|
kind: 'data',
|
|
@@ -153,7 +163,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
153
163
|
},
|
|
154
164
|
};
|
|
155
165
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
156
|
-
handler({
|
|
166
|
+
handler({
|
|
167
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
168
|
+
toolCalls: [toolCall],
|
|
169
|
+
schedulerId: 'task-id',
|
|
170
|
+
});
|
|
157
171
|
// Simulate ProceedOnce for MCP
|
|
158
172
|
const handled = await task._handleToolConfirmationPart({
|
|
159
173
|
kind: 'data',
|
|
@@ -181,7 +195,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
181
195
|
},
|
|
182
196
|
};
|
|
183
197
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
184
|
-
handler({
|
|
198
|
+
handler({
|
|
199
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
200
|
+
toolCalls: [toolCall],
|
|
201
|
+
schedulerId: 'task-id',
|
|
202
|
+
});
|
|
185
203
|
const handled = await task._handleToolConfirmationPart({
|
|
186
204
|
kind: 'data',
|
|
187
205
|
data: { callId: '1', outcome: 'proceed_always_server' },
|
|
@@ -208,7 +226,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
208
226
|
},
|
|
209
227
|
};
|
|
210
228
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
211
|
-
handler({
|
|
229
|
+
handler({
|
|
230
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
231
|
+
toolCalls: [toolCall],
|
|
232
|
+
schedulerId: 'task-id',
|
|
233
|
+
});
|
|
212
234
|
const handled = await task._handleToolConfirmationPart({
|
|
213
235
|
kind: 'data',
|
|
214
236
|
data: { callId: '1', outcome: 'proceed_always_tool' },
|
|
@@ -235,7 +257,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
235
257
|
},
|
|
236
258
|
};
|
|
237
259
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
238
|
-
handler({
|
|
260
|
+
handler({
|
|
261
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
262
|
+
toolCalls: [toolCall],
|
|
263
|
+
schedulerId: 'task-id',
|
|
264
|
+
});
|
|
239
265
|
const handled = await task._handleToolConfirmationPart({
|
|
240
266
|
kind: 'data',
|
|
241
267
|
data: { callId: '1', outcome: 'proceed_always_and_save' },
|
|
@@ -265,7 +291,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
265
291
|
confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
|
|
266
292
|
};
|
|
267
293
|
const handler = yoloMessageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
268
|
-
handler({
|
|
294
|
+
handler({
|
|
295
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
296
|
+
toolCalls: [toolCall],
|
|
297
|
+
schedulerId: 'task-id',
|
|
298
|
+
});
|
|
269
299
|
// Should NOT auto-publish ProceedOnce anymore, because PolicyEngine handles it directly
|
|
270
300
|
expect(yoloMessageBus.publish).not.toHaveBeenCalledWith(expect.objectContaining({
|
|
271
301
|
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
@@ -291,6 +321,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
291
321
|
handler({
|
|
292
322
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
293
323
|
toolCalls: [toolCall],
|
|
324
|
+
schedulerId: 'task-id',
|
|
294
325
|
});
|
|
295
326
|
// Should publish artifact update for output
|
|
296
327
|
expect(mockEventBus.publish).toHaveBeenCalledWith(expect.objectContaining({
|
|
@@ -316,7 +347,11 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
316
347
|
result: { ok: true },
|
|
317
348
|
};
|
|
318
349
|
const handler = messageBus.subscribe.mock.calls.find((call) => call[0] === MessageBusType.TOOL_CALLS_UPDATE)?.[1];
|
|
319
|
-
handler({
|
|
350
|
+
handler({
|
|
351
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
352
|
+
toolCalls: [toolCall],
|
|
353
|
+
schedulerId: 'task-id',
|
|
354
|
+
});
|
|
320
355
|
// The tool should be complete and registered appropriately, eventually
|
|
321
356
|
// triggering the toolCompletionPromise resolution when all clear.
|
|
322
357
|
const internalTask = task;
|
|
@@ -370,6 +405,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
370
405
|
handler({
|
|
371
406
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
372
407
|
toolCalls: [toolCall1, toolCall2],
|
|
408
|
+
schedulerId: 'task-id',
|
|
373
409
|
});
|
|
374
410
|
// Confirm first tool call
|
|
375
411
|
const handled1 = await task._handleToolConfirmationPart({
|
|
@@ -414,6 +450,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
414
450
|
handler({
|
|
415
451
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
416
452
|
toolCalls: [toolCall1, toolCall2],
|
|
453
|
+
schedulerId: 'task-id',
|
|
417
454
|
});
|
|
418
455
|
// Should NOT transition to input-required yet
|
|
419
456
|
expect(task.setTaskStateAndPublishUpdate).not.toHaveBeenCalledWith('input-required', expect.anything(), undefined, undefined, true);
|
|
@@ -426,6 +463,7 @@ describe('Task Event-Driven Scheduler', () => {
|
|
|
426
463
|
handler({
|
|
427
464
|
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
428
465
|
toolCalls: [toolCall1Complete, toolCall2],
|
|
466
|
+
schedulerId: 'task-id',
|
|
429
467
|
});
|
|
430
468
|
// Now it should transition
|
|
431
469
|
expect(task.setTaskStateAndPublishUpdate).toHaveBeenCalledWith('input-required', expect.anything(), undefined, undefined, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-event-driven.test.js","sourceRoot":"","sources":["../../../src/agent/task-event-driven.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-event-driven.test.js","sourceRoot":"","sources":["../../../src/agent/task-event-driven.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/agent/task.d.ts
CHANGED
package/dist/src/agent/task.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Scheduler, GeminiEventType, ToolConfirmationOutcome, ApprovalMode, getAllMCPServerStatuses, MCPServerStatus, isNodeError, getErrorMessage, parseAndFormatApiError, safeLiteralReplace, DEFAULT_GUI_EDITOR, isSubagentProgress, EDIT_TOOL_NAMES, processRestorableToolCalls, MessageBusType, } from '@google/gemini-cli-core';
|
|
6
|
+
import { Scheduler, GeminiEventType, ToolConfirmationOutcome, ApprovalMode, CoreToolCallStatus, getAllMCPServerStatuses, MCPServerStatus, isNodeError, getErrorMessage, parseAndFormatApiError, safeLiteralReplace, DEFAULT_GUI_EDITOR, isSubagentProgress, EDIT_TOOL_NAMES, processRestorableToolCalls, MessageBusType, } from '@google/gemini-cli-core';
|
|
7
7
|
import {} from '@a2a-js/sdk/server';
|
|
8
8
|
import { v4 as uuidv4 } from 'uuid';
|
|
9
9
|
import { logger } from '../utils/logger.js';
|
|
@@ -33,6 +33,7 @@ export class Task {
|
|
|
33
33
|
}
|
|
34
34
|
// For tool waiting logic
|
|
35
35
|
pendingToolCalls = new Map(); //toolCallId --> status
|
|
36
|
+
pendingOutcomes = new Map(); // toolCallId --> outcome
|
|
36
37
|
toolsAlreadyConfirmed = new Set();
|
|
37
38
|
toolCompletionPromise;
|
|
38
39
|
toolCompletionNotifier;
|
|
@@ -254,7 +255,8 @@ export class Task {
|
|
|
254
255
|
this.scheduler.dispose();
|
|
255
256
|
}
|
|
256
257
|
handleEventDrivenToolCallsUpdate(event) {
|
|
257
|
-
if (event.type !== MessageBusType.TOOL_CALLS_UPDATE
|
|
258
|
+
if (event.type !== MessageBusType.TOOL_CALLS_UPDATE ||
|
|
259
|
+
event.schedulerId !== this.id) {
|
|
258
260
|
return;
|
|
259
261
|
}
|
|
260
262
|
const toolCalls = event.toolCalls;
|
|
@@ -270,10 +272,13 @@ export class Task {
|
|
|
270
272
|
// already resolved tools whose IDs were removed from pendingToolCalls.
|
|
271
273
|
if (this.processedToolCallIds.has(callId) ||
|
|
272
274
|
this.completedToolCalls.some((c) => c.request.callId === callId)) {
|
|
273
|
-
return;
|
|
275
|
+
return false;
|
|
274
276
|
}
|
|
275
277
|
const previousStatus = this.pendingToolCalls.get(callId);
|
|
276
|
-
const
|
|
278
|
+
const previousOutcome = this.pendingOutcomes.get(callId);
|
|
279
|
+
const hasChanged = previousStatus !== tc.status || previousOutcome !== tc.outcome;
|
|
280
|
+
// Update outcome tracking
|
|
281
|
+
this.pendingOutcomes.set(callId, tc.outcome);
|
|
277
282
|
// 1. Handle Output
|
|
278
283
|
if (tc.status === 'executing' && tc.liveOutput) {
|
|
279
284
|
this._schedulerOutputUpdate(callId, tc.liveOutput);
|
|
@@ -283,6 +288,7 @@ export class Task {
|
|
|
283
288
|
tc.status === 'error' ||
|
|
284
289
|
tc.status === 'cancelled') {
|
|
285
290
|
this.toolsAlreadyConfirmed.delete(callId);
|
|
291
|
+
this.pendingOutcomes.delete(callId);
|
|
286
292
|
if (hasChanged) {
|
|
287
293
|
logger.info(`[Task] Tool call ${callId} completed with status: ${tc.status}`);
|
|
288
294
|
this.completedToolCalls.push(tc);
|
|
@@ -313,6 +319,7 @@ export class Task {
|
|
|
313
319
|
const statusUpdate = this._createStatusUpdateEvent(this.taskState, coderAgentMessage, message, false);
|
|
314
320
|
this.eventBus?.publish(statusUpdate);
|
|
315
321
|
}
|
|
322
|
+
return hasChanged;
|
|
316
323
|
}
|
|
317
324
|
checkInputRequiredState() {
|
|
318
325
|
if (this.isYoloMatch) {
|
|
@@ -322,11 +329,13 @@ export class Task {
|
|
|
322
329
|
let isAwaitingApproval = false;
|
|
323
330
|
let isExecuting = false;
|
|
324
331
|
for (const [callId, status] of this.pendingToolCalls.entries()) {
|
|
325
|
-
if (status ===
|
|
332
|
+
if (status === CoreToolCallStatus.Executing ||
|
|
333
|
+
status === CoreToolCallStatus.Scheduled ||
|
|
334
|
+
status === CoreToolCallStatus.Validating ||
|
|
335
|
+
this.toolsAlreadyConfirmed.has(callId)) {
|
|
326
336
|
isExecuting = true;
|
|
327
337
|
}
|
|
328
|
-
else if (status ===
|
|
329
|
-
!this.toolsAlreadyConfirmed.has(callId)) {
|
|
338
|
+
else if (status === CoreToolCallStatus.AwaitingApproval) {
|
|
330
339
|
isAwaitingApproval = true;
|
|
331
340
|
}
|
|
332
341
|
}
|
|
@@ -358,7 +367,11 @@ export class Task {
|
|
|
358
367
|
// Create a serializable version of the ToolCall (pick necessary
|
|
359
368
|
// properties/avoid methods causing circular reference errors).
|
|
360
369
|
// Type allows tool to be Partial<AnyDeclarativeTool> for serialization.
|
|
361
|
-
const serializableToolCall = this._pickFields(tc, 'request', 'status', 'confirmationDetails', 'liveOutput', 'response');
|
|
370
|
+
const serializableToolCall = this._pickFields(tc, 'request', 'status', 'confirmationDetails', 'liveOutput', 'response', 'outcome');
|
|
371
|
+
// Map internal 'validating' status to 'scheduled' for the client
|
|
372
|
+
if (serializableToolCall.status === CoreToolCallStatus.Validating) {
|
|
373
|
+
serializableToolCall.status = CoreToolCallStatus.Scheduled;
|
|
374
|
+
}
|
|
362
375
|
if (tc.tool) {
|
|
363
376
|
const toolFields = this._pickFields(tc.tool, 'name', 'displayName', 'description', 'kind', 'isOutputMarkdown', 'canUpdateOutput', 'schema', 'parameterSchema');
|
|
364
377
|
serializableToolCall.tool = toolFields;
|