@google/gemini-cli-core 0.24.0-nightly.20260103.30f5c4af4 → 0.24.0-preview.1

package/dist/src/agents/remote-invocation.js

@@ -4,6 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { BaseToolInvocation, } from '../tools/tools.js';
+import { A2AClientManager } from './a2a-client-manager.js';
+import { extractMessageText, extractTaskText, extractIdsFromResponse, } from './a2aUtils.js';
+import { GoogleAuth } from 'google-auth-library';
+import { debugLogger } from '../utils/debugLogger.js';
+/**
+ * Authentication handler implementation using Google Application Default Credentials (ADC).
+ */
+export class ADCHandler {
+    auth = new GoogleAuth({
+        scopes: ['https://www.googleapis.com/auth/cloud-platform'],
+    });
+    async headers() {
+        try {
+            const client = await this.auth.getClient();
+            const token = await client.getAccessToken();
+            if (token.token) {
+                return { Authorization: `Bearer ${token.token}` };
+            }
+            throw new Error('Failed to retrieve ADC access token.');
+        }
+        catch (e) {
+            const errorMessage = `Failed to get ADC token: ${e instanceof Error ? e.message : String(e)}`;
+            debugLogger.log('ERROR', errorMessage);
+            throw new Error(errorMessage);
+        }
+    }
+    async shouldRetryWithHeaders(_response) {
+        // For ADC, we usually just re-fetch the token if needed.
+        return this.headers();
+    }
+}
 /**
  * A tool invocation that proxies to a remote A2A agent.
  *
@@ -12,20 +43,87 @@ import { BaseToolInvocation, } from '../tools/tools.js';
  */
 export class RemoteAgentInvocation extends BaseToolInvocation {
     definition;
-    constructor(definition, params, messageBus) {
-        super(params, messageBus, definition.name, definition.displayName);
+    // Persist state across ephemeral invocation instances.
+    static sessionState = new Map();
+    // State for the ongoing conversation with the remote agent
+    contextId;
+    taskId;
+    // TODO: See if we can reuse the singleton from AppContainer or similar, but for now use getInstance directly
+    // as per the current pattern in the codebase.
+    clientManager = A2AClientManager.getInstance();
+    authHandler = new ADCHandler();
+    constructor(definition, params, messageBus, _toolName, _toolDisplayName) {
+        const query = params['query'];
+        if (typeof query !== 'string') {
+            throw new Error(`Remote agent '${definition.name}' requires a string 'query' input.`);
+        }
+        // Safe to pass strict object to super
+        super({ query }, messageBus, _toolName ?? definition.name, _toolDisplayName ?? definition.displayName);
         this.definition = definition;
     }
     getDescription() {
         return `Calling remote agent ${this.definition.displayName ?? this.definition.name}`;
     }
     async getConfirmationDetails(_abortSignal) {
-        // TODO: Implement confirmation logic for remote agents.
-        return false;
+        // For now, always require confirmation for remote agents until we have a policy system for them.
+        return {
+            type: 'info',
+            title: `Call Remote Agent: ${this.definition.displayName ?? this.definition.name}`,
+            prompt: `This will send a message to the external agent at ${this.definition.agentCardUrl}.`,
+            onConfirm: async () => { }, // No-op for now, just informational
+        };
     }
     async execute(_signal) {
-        // TODO: Implement remote agent invocation logic.
-        throw new Error(`Remote agent invocation not implemented.`);
+        // 1. Ensure the agent is loaded (cached by manager)
+        // We assume the user has provided an access token via some mechanism (TODO),
+        // or we rely on ADC.
+        try {
+            const priorState = RemoteAgentInvocation.sessionState.get(this.definition.name);
+            if (priorState) {
+                this.contextId = priorState.contextId;
+                this.taskId = priorState.taskId;
+            }
+            if (!this.clientManager.getClient(this.definition.name)) {
+                await this.clientManager.loadAgent(this.definition.name, this.definition.agentCardUrl, this.authHandler);
+            }
+            const message = this.params.query;
+            const response = await this.clientManager.sendMessage(this.definition.name, message, {
+                contextId: this.contextId,
+                taskId: this.taskId,
+            });
+            // Extracts IDs, taskID will be undefined if the task is completed/failed/canceled.
+            const { contextId, taskId } = extractIdsFromResponse(response);
+            this.contextId = contextId ?? this.contextId;
+            this.taskId = taskId;
+            RemoteAgentInvocation.sessionState.set(this.definition.name, {
+                contextId: this.contextId,
+                taskId: this.taskId,
+            });
+            // Extract the output text
+            const resultData = response;
+            let outputText = '';
+            if (resultData.kind === 'message') {
+                outputText = extractMessageText(resultData);
+            }
+            else if (resultData.kind === 'task') {
+                outputText = extractTaskText(resultData);
+            }
+            else {
+                outputText = JSON.stringify(resultData);
+            }
+            return {
+                llmContent: [{ text: outputText }],
+                returnDisplay: outputText,
+            };
+        }
+        catch (error) {
+            const errorMessage = `Error calling remote agent: ${error instanceof Error ? error.message : String(error)}`;
+            return {
+                llmContent: [{ text: errorMessage }],
+                returnDisplay: errorMessage,
+                error: { message: errorMessage },
+            };
+        }
     }
 }
 //# sourceMappingURL=remote-invocation.js.map

package/dist/src/agents/remote-invocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-invocation.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,kBAAkB,GAGnB,MAAM,mBAAmB,CAAC;AAI3B;;;;;GAKG;AACH,MAAM,OAAO,qBAAsB,SAAQ,kBAG1C;IAEoB;IADnB,YACmB,UAAiC,EAClD,MAAmB,EACnB,UAAuB;QAEvB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAJlD,eAAU,GAAV,UAAU,CAAuB;IAKpD,CAAC;IAED,cAAc;QACZ,OAAO,wBAAwB,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACvF,CAAC;IAEkB,KAAK,CAAC,sBAAsB,CAC7C,YAAyB;QAEzB,wDAAwD;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAoB;QAChC,iDAAiD;QACjD,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;CACF"}
+{"version":3,"file":"remote-invocation.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.ts"],"names":[],"mappings":"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"}

package/dist/src/agents/remote-invocation.test.js

@@ -3,33 +3,199 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
 import { RemoteAgentInvocation } from './remote-invocation.js';
-class TestableRemoteAgentInvocation extends RemoteAgentInvocation {
-    async getConfirmationDetails(abortSignal) {
-        return super.getConfirmationDetails(abortSignal);
-    }
-}
+import { A2AClientManager } from './a2a-client-manager.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+// Mock A2AClientManager
+vi.mock('./a2a-client-manager.js', () => {
+    const A2AClientManager = {
+        getInstance: vi.fn(),
+    };
+    return { A2AClientManager };
+});
 describe('RemoteAgentInvocation', () => {
     const mockDefinition = {
+        name: 'test-agent',
         kind: 'remote',
-        name: 'test-remote-agent',
-        description: 'A test remote agent',
-        displayName: 'Test Remote Agent',
-        agentCardUrl: 'https://example.com/agent-card',
+        agentCardUrl: 'http://test-agent/card',
+        displayName: 'Test Agent',
+        description: 'A test agent',
         inputConfig: {
             inputs: {},
         },
     };
-    it('should be instantiated with correct params', () => {
-        const invocation = new RemoteAgentInvocation(mockDefinition, {});
-        expect(invocation).toBeDefined();
-        expect(invocation.getDescription()).toBe('Calling remote agent Test Remote Agent');
+    const mockClientManager = {
+        getClient: vi.fn(),
+        loadAgent: vi.fn(),
+        sendMessage: vi.fn(),
+    };
+    const mockMessageBus = createMockMessageBus();
+    beforeEach(() => {
+        vi.clearAllMocks();
+        A2AClientManager.getInstance.mockReturnValue(mockClientManager);
+        RemoteAgentInvocation.sessionState?.clear();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('Constructor Validation', () => {
+        it('accepts valid input with string query', () => {
+            expect(() => {
+                new RemoteAgentInvocation(mockDefinition, { query: 'valid' }, mockMessageBus);
+            }).not.toThrow();
+        });
+        it('throws if query is missing', () => {
+            expect(() => {
+                new RemoteAgentInvocation(mockDefinition, {}, mockMessageBus);
+            }).toThrow("requires a string 'query' input");
+        });
+        it('throws if query is not a string', () => {
+            expect(() => {
+                new RemoteAgentInvocation(mockDefinition, { query: 123 }, mockMessageBus);
+            }).toThrow("requires a string 'query' input");
+        });
+    });
+    describe('Execution Logic', () => {
+        it('should lazy load the agent with ADCHandler if not present', async () => {
+            mockClientManager.getClient.mockReturnValue(undefined);
+            mockClientManager.sendMessage.mockResolvedValue({
+                kind: 'message',
+                messageId: 'msg-1',
+                role: 'agent',
+                parts: [{ kind: 'text', text: 'Hello' }],
+            });
+            const invocation = new RemoteAgentInvocation(mockDefinition, {
+                query: 'hi',
+            }, mockMessageBus);
+            await invocation.execute(new AbortController().signal);
+            expect(mockClientManager.loadAgent).toHaveBeenCalledWith('test-agent', 'http://test-agent/card', expect.objectContaining({
+                headers: expect.any(Function),
+                shouldRetryWithHeaders: expect.any(Function),
+            }));
+        });
+        it('should not load the agent if already present', async () => {
+            mockClientManager.getClient.mockReturnValue({});
+            mockClientManager.sendMessage.mockResolvedValue({
+                kind: 'message',
+                messageId: 'msg-1',
+                role: 'agent',
+                parts: [{ kind: 'text', text: 'Hello' }],
+            });
+            const invocation = new RemoteAgentInvocation(mockDefinition, {
+                query: 'hi',
+            }, mockMessageBus);
+            await invocation.execute(new AbortController().signal);
+            expect(mockClientManager.loadAgent).not.toHaveBeenCalled();
+        });
+        it('should persist contextId and taskId across invocations', async () => {
+            mockClientManager.getClient.mockReturnValue({});
+            // First call return values
+            mockClientManager.sendMessage.mockResolvedValueOnce({
+                kind: 'message',
+                messageId: 'msg-1',
+                role: 'agent',
+                parts: [{ kind: 'text', text: 'Response 1' }],
+                contextId: 'ctx-1',
+                taskId: 'task-1',
+            });
+            const invocation1 = new RemoteAgentInvocation(mockDefinition, {
+                query: 'first',
+            }, mockMessageBus);
+            // Execute first time
+            const result1 = await invocation1.execute(new AbortController().signal);
+            expect(result1.returnDisplay).toBe('Response 1');
+            expect(mockClientManager.sendMessage).toHaveBeenLastCalledWith('test-agent', 'first', { contextId: undefined, taskId: undefined });
+            // Prepare for second call with simulated state persistence
+            mockClientManager.sendMessage.mockResolvedValueOnce({
+                kind: 'message',
+                messageId: 'msg-2',
+                role: 'agent',
+                parts: [{ kind: 'text', text: 'Response 2' }],
+                contextId: 'ctx-1',
+                taskId: 'task-2',
+            });
+            const invocation2 = new RemoteAgentInvocation(mockDefinition, {
+                query: 'second',
+            }, mockMessageBus);
+            const result2 = await invocation2.execute(new AbortController().signal);
+            expect(result2.returnDisplay).toBe('Response 2');
+            expect(mockClientManager.sendMessage).toHaveBeenLastCalledWith('test-agent', 'second', { contextId: 'ctx-1', taskId: 'task-1' });
+            // Third call: Task completes
+            mockClientManager.sendMessage.mockResolvedValueOnce({
+                kind: 'task',
+                id: 'task-2',
+                contextId: 'ctx-1',
+                status: { state: 'completed', message: undefined },
+                artifacts: [],
+                history: [],
+            });
+            const invocation3 = new RemoteAgentInvocation(mockDefinition, {
+                query: 'third',
+            }, mockMessageBus);
+            await invocation3.execute(new AbortController().signal);
+            // Fourth call: Should start new task (taskId undefined)
+            mockClientManager.sendMessage.mockResolvedValueOnce({
+                kind: 'message',
+                messageId: 'msg-3',
+                role: 'agent',
+                parts: [{ kind: 'text', text: 'New Task' }],
+            });
+            const invocation4 = new RemoteAgentInvocation(mockDefinition, {
+                query: 'fourth',
+            }, mockMessageBus);
+            await invocation4.execute(new AbortController().signal);
+            expect(mockClientManager.sendMessage).toHaveBeenLastCalledWith('test-agent', 'fourth', { contextId: 'ctx-1', taskId: undefined });
+        });
+        it('should handle errors gracefully', async () => {
+            mockClientManager.getClient.mockReturnValue({});
+            mockClientManager.sendMessage.mockRejectedValue(new Error('Network error'));
+            const invocation = new RemoteAgentInvocation(mockDefinition, {
+                query: 'hi',
+            }, mockMessageBus);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error).toBeDefined();
+            expect(result.error?.message).toContain('Network error');
+            expect(result.returnDisplay).toContain('Network error');
+        });
+        it('should use a2a helpers for extracting text', async () => {
+            mockClientManager.getClient.mockReturnValue({});
+            // Mock a complex message part that needs extraction
+            mockClientManager.sendMessage.mockResolvedValue({
+                kind: 'message',
+                messageId: 'msg-1',
+                role: 'agent',
+                parts: [
+                    { kind: 'text', text: 'Extracted text' },
+                    { kind: 'data', data: { foo: 'bar' } },
+                ],
+            });
+            const invocation = new RemoteAgentInvocation(mockDefinition, {
+                query: 'hi',
+            }, mockMessageBus);
+            const result = await invocation.execute(new AbortController().signal);
+            // Just check that text is present, exact formatting depends on helper
+            expect(result.returnDisplay).toContain('Extracted text');
+        });
     });
-    it('should return false for confirmation details (not yet implemented)', async () => {
-        const invocation = new TestableRemoteAgentInvocation(mockDefinition, {});
-        const details = await invocation.getConfirmationDetails(new AbortController().signal);
-        expect(details).toBe(false);
+    describe('Confirmations', () => {
+        it('should return info confirmation details', async () => {
+            const invocation = new RemoteAgentInvocation(mockDefinition, {
+                query: 'hi',
+            }, mockMessageBus);
+            // @ts-expect-error - getConfirmationDetails is protected
+            const confirmation = await invocation.getConfirmationDetails(new AbortController().signal);
+            expect(confirmation).not.toBe(false);
+            if (confirmation &&
+                typeof confirmation === 'object' &&
+                confirmation.type === 'info') {
+                expect(confirmation.title).toContain('Test Agent');
+                expect(confirmation.prompt).toContain('http://test-agent/card');
+            }
+            else {
+                throw new Error('Expected confirmation to be of type info');
+            }
+        });
     });
 });
 //# sourceMappingURL=remote-invocation.test.js.map

package/dist/src/agents/remote-invocation.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-invocation.test.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,MAAM,6BAA8B,SAAQ,qBAAqB;IACtD,KAAK,CAAC,sBAAsB,CACnC,WAAwB;QAExB,OAAO,KAAK,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;CACF;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,cAAc,GAA0B;QAC5C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,qBAAqB;QAClC,WAAW,EAAE,mBAAmB;QAChC,YAAY,EAAE,gCAAgC;QAC9C,WAAW,EAAE;YACX,MAAM,EAAE,EAAE;SACX;KACF,CAAC;IAEF,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QACjC,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CACtC,wCAAwC,CACzC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,UAAU,GAAG,IAAI,6BAA6B,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,sBAAsB,CACrD,IAAI,eAAe,EAAE,CAAC,MAAM,CAC7B,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"remote-invocation.test.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.test.ts"],"names":[],"mappings":"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"}

package/dist/src/agents/subagent-tool-wrapper.d.ts

@@ -24,7 +24,7 @@ export declare class SubagentToolWrapper extends BaseDeclarativeTool<AgentInputs
      * @param config The runtime configuration, passed down to the subagent.
      * @param messageBus Optional message bus for policy enforcement.
      */
-    constructor(definition: AgentDefinition, config: Config, messageBus?: MessageBus);
+    constructor(definition: AgentDefinition, config: Config, messageBus: MessageBus);
     /**
      * Creates an invocation instance for executing the subagent.
      *
@@ -34,5 +34,5 @@ export declare class SubagentToolWrapper extends BaseDeclarativeTool<AgentInputs
      * @param params The validated input parameters from the parent agent's call.
      * @returns A `ToolInvocation` instance ready for execution.
      */
-    protected createInvocation(params: AgentInputs): ToolInvocation<AgentInputs, ToolResult>;
+    protected createInvocation(params: AgentInputs, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<AgentInputs, ToolResult>;
 }

package/dist/src/agents/subagent-tool-wrapper.js

@@ -26,9 +26,9 @@ export class SubagentToolWrapper extends BaseDeclarativeTool {
      */
     constructor(definition, config, messageBus) {
         const parameterSchema = convertInputConfigToJsonSchema(definition.inputConfig);
-        super(definition.name, definition.displayName ?? definition.name, definition.description, Kind.Think, parameterSchema, 
+        super(definition.name, definition.displayName ?? definition.name, definition.description, Kind.Think, parameterSchema, messageBus, 
         /* isOutputMarkdown */ true, 
-        /* canUpdateOutput */ true, messageBus);
+        /* canUpdateOutput */ true);
         this.definition = definition;
         this.config = config;
     }
@@ -41,12 +41,13 @@ export class SubagentToolWrapper extends BaseDeclarativeTool {
      * @param params The validated input parameters from the parent agent's call.
      * @returns A `ToolInvocation` instance ready for execution.
      */
-    createInvocation(params) {
+    createInvocation(params, messageBus, _toolName, _toolDisplayName) {
         const definition = this.definition;
+        const effectiveMessageBus = messageBus;
         if (definition.kind === 'remote') {
-            return new RemoteAgentInvocation(definition, params, this.messageBus);
+            return new RemoteAgentInvocation(definition, params, effectiveMessageBus, _toolName, _toolDisplayName);
         }
-        return new LocalSubagentInvocation(definition, this.config, params, this.messageBus);
+        return new LocalSubagentInvocation(definition, this.config, params, effectiveMessageBus, _toolName, _toolDisplayName);
     }
 }
 //# sourceMappingURL=subagent-tool-wrapper.js.map

package/dist/src/agents/subagent-tool-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-tool-wrapper.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,EACnB,IAAI,GAGL,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG/D;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAGxC;IAYoB;IACA;IAZnB;;;;;;;;;OASG;IACH,YACmB,UAA2B,EAC3B,MAAc,EAC/B,UAAuB;QAEvB,MAAM,eAAe,GAAG,8BAA8B,CACpD,UAAU,CAAC,WAAW,CACvB,CAAC;QAEF,KAAK,CACH,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,EACzC,UAAU,CAAC,WAAW,EACtB,IAAI,CAAC,KAAK,EACV,eAAe;QACf,sBAAsB,CAAC,IAAI;QAC3B,qBAAqB,CAAC,IAAI,EAC1B,UAAU,CACX,CAAC;QAjBe,eAAU,GAAV,UAAU,CAAiB;QAC3B,WAAM,GAAN,MAAM,CAAQ;IAiBjC,CAAC;IAED;;;;;;;;OAQG;IACO,gBAAgB,CACxB,MAAmB;QAEnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,uBAAuB,CAChC,UAAU,EACV,IAAI,CAAC,MAAM,EACX,MAAM,EACN,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"subagent-tool-wrapper.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,EACnB,IAAI,GAGL,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG/D;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAGxC;IAYoB;IACA;IAZnB;;;;;;;;;OASG;IACH,YACmB,UAA2B,EAC3B,MAAc,EAC/B,UAAsB;QAEtB,MAAM,eAAe,GAAG,8BAA8B,CACpD,UAAU,CAAC,WAAW,CACvB,CAAC;QAEF,KAAK,CACH,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,EACzC,UAAU,CAAC,WAAW,EACtB,IAAI,CAAC,KAAK,EACV,eAAe,EACf,UAAU;QACV,sBAAsB,CAAC,IAAI;QAC3B,qBAAqB,CAAC,IAAI,CAC3B,CAAC;QAjBe,eAAU,GAAV,UAAU,CAAiB;QAC3B,WAAM,GAAN,MAAM,CAAQ;IAiBjC,CAAC;IAED;;;;;;;;OAQG;IACO,gBAAgB,CACxB,MAAmB,EACnB,UAAsB,EACtB,SAAkB,EAClB,gBAAyB;QAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,mBAAmB,GAAG,UAAU,CAAC;QAEvC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,qBAAqB,CAC9B,UAAU,EACV,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,uBAAuB,CAChC,UAAU,EACV,IAAI,CAAC,MAAM,EACX,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC;CACF"}

package/dist/src/agents/subagent-tool-wrapper.test.js

@@ -9,6 +9,7 @@ import { LocalSubagentInvocation } from './local-invocation.js';
 import { convertInputConfigToJsonSchema } from './schema-utils.js';
 import { makeFakeConfig } from '../test-utils/config.js';
 import { Kind } from '../tools/tools.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
 // Mock dependencies to isolate the SubagentToolWrapper class
 vi.mock('./local-invocation.js');
 vi.mock('./schema-utils.js');
@@ -16,6 +17,7 @@ const MockedLocalSubagentInvocation = vi.mocked(LocalSubagentInvocation);
 const mockConvertInputConfigToJsonSchema = vi.mocked(convertInputConfigToJsonSchema);
 // Define reusable test data
 let mockConfig;
+let mockMessageBus;
 const mockDefinition = {
     kind: 'local',
     name: 'TestAgent',
@@ -47,17 +49,18 @@ describe('SubagentToolWrapper', () => {
     beforeEach(() => {
         vi.clearAllMocks();
         mockConfig = makeFakeConfig();
+        mockMessageBus = createMockMessageBus();
         // Provide a mock implementation for the schema conversion utility
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         mockConvertInputConfigToJsonSchema.mockReturnValue(mockSchema);
     });
     describe('constructor', () => {
         it('should call convertInputConfigToJsonSchema with the correct agent inputConfig', () => {
-            new SubagentToolWrapper(mockDefinition, mockConfig);
+            new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
             expect(convertInputConfigToJsonSchema).toHaveBeenCalledExactlyOnceWith(mockDefinition.inputConfig);
         });
         it('should correctly configure the tool properties from the agent definition', () => {
-            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
+            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
             expect(wrapper.name).toBe(mockDefinition.name);
             expect(wrapper.displayName).toBe(mockDefinition.displayName);
             expect(wrapper.description).toBe(mockDefinition.description);
@@ -70,11 +73,11 @@ describe('SubagentToolWrapper', () => {
                 ...mockDefinition,
                 displayName: undefined,
             };
-            const wrapper = new SubagentToolWrapper(definitionWithoutDisplayName, mockConfig);
+            const wrapper = new SubagentToolWrapper(definitionWithoutDisplayName, mockConfig, mockMessageBus);
             expect(wrapper.displayName).toBe(definitionWithoutDisplayName.name);
         });
         it('should generate a valid tool schema using the definition and converted schema', () => {
-            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
+            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
             const schema = wrapper.schema;
             expect(schema.name).toBe(mockDefinition.name);
             expect(schema.description).toBe(mockDefinition.description);
@@ -83,22 +86,26 @@ describe('SubagentToolWrapper', () => {
     });
     describe('createInvocation', () => {
         it('should create a LocalSubagentInvocation with the correct parameters', () => {
-            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
+            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
             const params = { goal: 'Test the invocation', priority: 1 };
             // The public `build` method calls the protected `createInvocation` after validation
             const invocation = wrapper.build(params);
             expect(invocation).toBeInstanceOf(LocalSubagentInvocation);
-            expect(MockedLocalSubagentInvocation).toHaveBeenCalledExactlyOnceWith(mockDefinition, mockConfig, params, undefined);
+            expect(MockedLocalSubagentInvocation).toHaveBeenCalledExactlyOnceWith(mockDefinition, mockConfig, params, mockMessageBus, mockDefinition.name, mockDefinition.displayName);
         });
         it('should pass the messageBus to the LocalSubagentInvocation constructor', () => {
-            const mockMessageBus = {};
-            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
+            const specificMessageBus = {
+                publish: vi.fn(),
+                subscribe: vi.fn(),
+                unsubscribe: vi.fn(),
+            };
+            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, specificMessageBus);
             const params = { goal: 'Test the invocation', priority: 1 };
             wrapper.build(params);
-            expect(MockedLocalSubagentInvocation).toHaveBeenCalledWith(mockDefinition, mockConfig, params, mockMessageBus);
+            expect(MockedLocalSubagentInvocation).toHaveBeenCalledWith(mockDefinition, mockConfig, params, specificMessageBus, mockDefinition.name, mockDefinition.displayName);
         });
         it('should throw a validation error for invalid parameters before creating an invocation', () => {
-            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
+            const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
             // Missing the required 'goal' parameter
             const invalidParams = { priority: 1 };
             // The `build` method in the base class performs JSON schema validation

package/dist/src/agents/subagent-tool-wrapper.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-tool-wrapper.test.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-tool-wrapper.test.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.test.ts"],"names":[],"mappings":"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"}

package/dist/src/agents/types.d.ts

@@ -32,6 +32,12 @@ export interface OutputObject {
  * Used primarily for templating the system prompt. (Replaces ContextState)
  */
 export type AgentInputs = Record<string, unknown>;
+/**
+ * Simplified input structure for Remote Agents, which consumes a single string query.
+ */
+export type RemoteAgentInputs = {
+    query: string;
+};
 /**
  * Structured events emitted during subagent execution for user observability.
  */

package/dist/src/code_assist/oauth2.js

@@ -232,7 +232,37 @@ async function initOauthClient(authType, config) {
                     'Please try again or use NO_BROWSER=true for manual authentication.'));
             }, authTimeout);
         });
-        await Promise.race([webLogin.loginCompletePromise, timeoutPromise]);
+        // Listen for SIGINT to stop waiting for auth so the terminal doesn't hang
+        // if the user chooses not to auth.
+        let sigIntHandler;
+        let stdinHandler;
+        const cancellationPromise = new Promise((_, reject) => {
+            sigIntHandler = () => reject(new FatalCancellationError('Authentication cancelled by user.'));
+            process.on('SIGINT', sigIntHandler);
+            // Note that SIGINT might not get raised on Ctrl+C in raw mode
+            // so we also need to look for Ctrl+C directly in stdin.
+            stdinHandler = (data) => {
+                if (data.includes(0x03)) {
+                    reject(new FatalCancellationError('Authentication cancelled by user.'));
+                }
+            };
+            process.stdin.on('data', stdinHandler);
+        });
+        try {
+            await Promise.race([
+                webLogin.loginCompletePromise,
+                timeoutPromise,
+                cancellationPromise,
+            ]);
+        }
+        finally {
+            if (sigIntHandler) {
+                process.removeListener('SIGINT', sigIntHandler);
+            }
+            if (stdinHandler) {
+                process.stdin.removeListener('data', stdinHandler);
+            }
+        }
         coreEvents.emit(CoreEvent.UserFeedback, {
             severity: 'info',
             message: 'Authentication succeeded\n',