@vybestack/llxprt-code-core 0.5.0 → 0.6.0-nightly.251128.1049d5f2b

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

@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config } from '../config/config.js';
+import { BaseToolInvocation, type ToolResult } from '../tools/tools.js';
+import type { AgentDefinition, AgentInputs } from './types.js';
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { type z } from 'zod';
+/**
+ * Represents a validated, executable instance of a subagent tool.
+ *
+ * This class orchestrates the execution of a defined agent by:
+ * 1. Initializing the {@link AgentExecutor}.
+ * 2. Running the agent's execution loop.
+ * 3. Bridging the agent's streaming activity (e.g., thoughts) to the tool's
+ * live output stream.
+ * 4. Formatting the final result into a {@link ToolResult}.
+ */
+export declare class SubagentInvocation<TOutput extends z.ZodTypeAny> extends BaseToolInvocation<AgentInputs, ToolResult> {
+    private readonly definition;
+    private readonly config;
+    /**
+     * @param params The validated input parameters for the agent.
+     * @param definition The definition object that configures the agent.
+     * @param config The global runtime configuration.
+     * @param messageBus Optional message bus for policy enforcement.
+     */
+    constructor(params: AgentInputs, definition: AgentDefinition<TOutput>, config: Config, messageBus?: MessageBus);
+    /**
+     * Returns a concise, human-readable description of the invocation.
+     * Used for logging and display purposes.
+     */
+    getDescription(): string;
+    /**
+     * Executes the subagent.
+     *
+     * @param signal An `AbortSignal` to cancel the agent's execution.
+     * @param updateOutput A callback to stream intermediate output, such as the
+     * agent's thoughts, to the user interface.
+     * @returns A `Promise` that resolves with the final `ToolResult`.
+     */
+    execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<ToolResult>;
+}

package/dist/src/agents/invocation.js

@@ -0,0 +1,114 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AgentExecutor } from './executor.js';
+import { BaseToolInvocation } from '../tools/tools.js';
+import { ToolErrorType } from '../tools/tool-error.js';
+const INPUT_PREVIEW_MAX_LENGTH = 50;
+const DESCRIPTION_MAX_LENGTH = 200;
+/**
+ * Represents a validated, executable instance of a subagent tool.
+ *
+ * This class orchestrates the execution of a defined agent by:
+ * 1. Initializing the {@link AgentExecutor}.
+ * 2. Running the agent's execution loop.
+ * 3. Bridging the agent's streaming activity (e.g., thoughts) to the tool's
+ * live output stream.
+ * 4. Formatting the final result into a {@link ToolResult}.
+ */
+export class SubagentInvocation extends BaseToolInvocation {
+    definition;
+    config;
+    /**
+     * @param params The validated input parameters for the agent.
+     * @param definition The definition object that configures the agent.
+     * @param config The global runtime configuration.
+     * @param messageBus Optional message bus for policy enforcement.
+     */
+    constructor(params, definition, config, messageBus) {
+        super(params, messageBus);
+        this.definition = definition;
+        this.config = config;
+    }
+    /**
+     * Returns a concise, human-readable description of the invocation.
+     * Used for logging and display purposes.
+     */
+    getDescription() {
+        const inputSummary = Object.entries(this.params)
+            .map(([key, value]) => {
+            let stringValue;
+            try {
+                stringValue =
+                    typeof value === 'object' && value !== null
+                        ? JSON.stringify(value)
+                        : String(value);
+            }
+            catch {
+                // Handle circular references/unsupported values gracefully
+                stringValue = Object.prototype.toString.call(value);
+            }
+            return `${key}: ${stringValue.slice(0, INPUT_PREVIEW_MAX_LENGTH)}`;
+        })
+            .join(', ');
+        const description = `Running subagent '${this.definition.name}' with inputs: { ${inputSummary} }`;
+        return description.slice(0, DESCRIPTION_MAX_LENGTH);
+    }
+    /**
+     * Executes the subagent.
+     *
+     * @param signal An `AbortSignal` to cancel the agent's execution.
+     * @param updateOutput A callback to stream intermediate output, such as the
+     * agent's thoughts, to the user interface.
+     * @returns A `Promise` that resolves with the final `ToolResult`.
+     */
+    async execute(signal, updateOutput) {
+        try {
+            if (updateOutput) {
+                updateOutput('Subagent starting...\n');
+            }
+            // Create an activity callback to bridge the executor's events to the
+            // tool's streaming output.
+            const onActivity = (activity) => {
+                if (!updateOutput)
+                    return;
+                if (activity.type === 'THOUGHT_CHUNK' &&
+                    typeof activity.data['text'] === 'string') {
+                    updateOutput(`🤖💭 ${activity.data['text']}`);
+                }
+            };
+            const executor = await AgentExecutor.create(this.definition, this.config, onActivity);
+            const output = await executor.run(this.params, signal);
+            const resultContent = `Subagent '${this.definition.name}' finished.
+Termination Reason: ${output.terminate_reason}
+Result:
+${output.result}`;
+            const displayContent = `
+Subagent ${this.definition.name} Finished
+
+Termination Reason:\n ${output.terminate_reason}
+
+Result:
+${output.result}
+`;
+            return {
+                llmContent: [{ text: resultContent }],
+                returnDisplay: displayContent,
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            return {
+                llmContent: `Subagent '${this.definition.name}' failed. Error: ${errorMessage}`,
+                returnDisplay: `Subagent Failed: ${this.definition.name}\nError: ${errorMessage}`,
+                error: {
+                    message: errorMessage,
+                    type: ToolErrorType.EXECUTION_FAILED,
+                },
+            };
+        }
+    }
+}
+//# sourceMappingURL=invocation.js.map

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

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

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

@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config } from '../config/config.js';
+import type { AgentDefinition } from './types.js';
+import type { z } from 'zod';
+/**
+ * Manages the discovery, loading, validation, and registration of
+ * AgentDefinitions.
+ */
+export declare class AgentRegistry {
+    private readonly config;
+    private readonly agents;
+    private readonly logger;
+    constructor(config: Config);
+    /**
+     * Discovers and loads agents.
+     */
+    initialize(): Promise<void>;
+    private loadBuiltInAgents;
+    /**
+     * Registers an agent definition. If an agent with the same name exists,
+     * it will be overwritten, respecting the precedence established by the
+     * initialization order.
+     */
+    protected registerAgent<TOutput extends z.ZodTypeAny>(definition: AgentDefinition<TOutput>): void;
+    /**
+     * Retrieves an agent definition by name.
+     * Callers should cast to their expected AgentDefinition<TOutput> shape before invoking typed callbacks.
+     */
+    getDefinition(name: string): AgentDefinition | undefined;
+    /**
+     * Returns all active agent definitions.
+     */
+    getAllDefinitions(): AgentDefinition[];
+}

package/dist/src/agents/registry.js

@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DebugLogger } from '../debug/DebugLogger.js';
+/**
+ * Manages the discovery, loading, validation, and registration of
+ * AgentDefinitions.
+ */
+export class AgentRegistry {
+    config;
+    // Using unknown output type for the internal map to handle generic variance correctly
+    // Callers will cast to specific types as needed
+    agents = new Map();
+    logger = new DebugLogger('llxprt:agents:registry');
+    constructor(config) {
+        this.config = config;
+        // Access config to satisfy lint and allow future conditional logging
+        void this.config;
+    }
+    /**
+     * Discovers and loads agents.
+     */
+    async initialize() {
+        this.loadBuiltInAgents();
+        this.logger.debug(() => `[AgentRegistry] Initialized with ${this.agents.size} agents.`);
+    }
+    loadBuiltInAgents() {
+        // No built-in agents registered - CodebaseInvestigatorAgent was removed
+        // because it hardcodes DEFAULT_GEMINI_MODEL, violating multi-provider support
+    }
+    /**
+     * Registers an agent definition. If an agent with the same name exists,
+     * it will be overwritten, respecting the precedence established by the
+     * initialization order.
+     */
+    registerAgent(definition) {
+        // Basic validation
+        if (!definition.name || !definition.description) {
+            this.logger.warn(`[AgentRegistry] Skipping invalid agent definition. Missing name or description.`);
+            return;
+        }
+        if (this.agents.has(definition.name)) {
+            this.logger.debug(`[AgentRegistry] Overriding agent '${definition.name}'`);
+        }
+        // Cast to default AgentDefinition type for storage - callers will cast back as needed
+        this.agents.set(definition.name, definition);
+    }
+    /**
+     * Retrieves an agent definition by name.
+     * Callers should cast to their expected AgentDefinition<TOutput> shape before invoking typed callbacks.
+     */
+    getDefinition(name) {
+        return this.agents.get(name);
+    }
+    /**
+     * Returns all active agent definitions.
+     */
+    getAllDefinitions() {
+        return Array.from(this.agents.values());
+    }
+}
+//# sourceMappingURL=registry.js.map

package/dist/src/agents/registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/agents/registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD;;;GAGG;AACH,MAAM,OAAO,aAAa;IAMK;IAL7B,sFAAsF;IACtF,gDAAgD;IAC/B,MAAM,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC5C,MAAM,GAAG,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IAEpE,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACzC,qEAAqE;QACrE,KAAK,IAAI,CAAC,MAAM,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,GAAG,EAAE,CAAC,oCAAoC,IAAI,CAAC,MAAM,CAAC,IAAI,UAAU,CACrE,CAAC;IACJ,CAAC;IAEO,iBAAiB;QACvB,wEAAwE;QACxE,8EAA8E;IAChF,CAAC;IAED;;;;OAIG;IACO,aAAa,CACrB,UAAoC;QAEpC,mBAAmB;QACnB,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iFAAiF,CAClF,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qCAAqC,UAAU,CAAC,IAAI,GAAG,CACxD,CAAC;QACJ,CAAC;QAED,sFAAsF;QACtF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,UAAwC,CAAC,CAAC;IAC7E,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;CACF"}

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

@@ -0,0 +1,145 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * @fileoverview Defines the core configuration interfaces and types for the agent architecture.
+ */
+import type { Content, FunctionDeclaration } from '@google/genai';
+import type { AnyDeclarativeTool } from '../tools/tools.js';
+import { type z } from 'zod';
+/**
+ * Describes the possible termination modes for an agent.
+ */
+export declare enum AgentTerminateMode {
+    ERROR = "ERROR",
+    TIMEOUT = "TIMEOUT",
+    GOAL = "GOAL",
+    MAX_TURNS = "MAX_TURNS",
+    ABORTED = "ABORTED"
+}
+/**
+ * Represents the output structure of an agent's execution.
+ */
+export interface OutputObject {
+    result: string;
+    terminate_reason: AgentTerminateMode;
+}
+/**
+ * Represents the validated input parameters passed to an agent upon invocation.
+ * Used primarily for templating the system prompt. (Replaces ContextState)
+ */
+export type AgentInputs = Record<string, unknown>;
+/**
+ * Structured events emitted during subagent execution for user observability.
+ */
+export interface SubagentActivityEvent {
+    isSubagentActivityEvent: true;
+    agentName: string;
+    type: 'TOOL_CALL_START' | 'TOOL_CALL_END' | 'THOUGHT_CHUNK' | 'ERROR';
+    data: Record<string, unknown>;
+}
+/**
+ * The definition for an agent.
+ * @template TOutput The specific Zod schema for the agent's final output object.
+ */
+export interface AgentDefinition<TOutput extends z.ZodTypeAny = z.ZodUnknown> {
+    /** Unique identifier for the agent. */
+    name: string;
+    displayName?: string;
+    description: string;
+    promptConfig: PromptConfig;
+    modelConfig: ModelConfig;
+    runConfig: RunConfig;
+    toolConfig?: ToolConfig;
+    outputConfig?: OutputConfig<TOutput>;
+    inputConfig: InputConfig;
+    /**
+     * An optional function to process the raw output from the agent's final tool
+     * call into a string format.
+     *
+     * @param output The raw output value from the `complete_task` tool, now strongly typed with TOutput.
+     * @returns A string representation of the final output.
+     */
+    processOutput?: (output: z.infer<TOutput>) => string;
+}
+/**
+ * Configures the initial prompt for the agent.
+ */
+export interface PromptConfig {
+    /**
+     * A single system prompt string. Supports templating using `${input_name}` syntax.
+     */
+    systemPrompt?: string;
+    /**
+     * An array of user/model content pairs for few-shot prompting.
+     */
+    initialMessages?: Content[];
+    /**
+     * The specific task or question to trigger the agent's execution loop.
+     * This is sent as the first user message, distinct from the systemPrompt (identity/rules)
+     * and initialMessages (history/few-shots). Supports templating.
+     * If not provided, a generic "Get Started!" message is used.
+     */
+    query?: string;
+}
+/**
+ * Configures the tools available to the agent during its execution.
+ */
+export interface ToolConfig {
+    tools: Array<string | FunctionDeclaration | AnyDeclarativeTool>;
+}
+/**
+ * Configures the expected inputs (parameters) for the agent.
+ */
+export interface InputConfig {
+    /**
+     * Defines the parameters the agent accepts.
+     * This is vital for generating the tool wrapper schema.
+     */
+    inputs: Record<string, {
+        description: string;
+        type: 'string' | 'number' | 'boolean' | 'integer' | 'string[]' | 'number[]';
+        required: boolean;
+    }>;
+}
+/**
+ * Configures the expected outputs for the agent.
+ */
+export interface OutputConfig<T extends z.ZodTypeAny> {
+    /**
+     * The name of the final result parameter. This will be the name of the
+     * argument in the `submit_final_output` tool (e.g., "report", "answer").
+     */
+    outputName: string;
+    /**
+     * A description of the expected output. This will be used as the description
+     * for the tool argument.
+     */
+    description: string;
+    /**
+     * Optional JSON schema for the output. If provided, it will be used as the
+     * schema for the tool's argument, allowing for structured output enforcement.
+     * Defaults to { type: 'string' }.
+     */
+    schema: T;
+}
+/**
+ * Configures the generative model parameters for the agent.
+ */
+export interface ModelConfig {
+    model: string;
+    temp: number;
+    top_p: number;
+    thinkingBudget?: number;
+}
+/**
+ * Configures the execution environment and constraints for the agent.
+ */
+export interface RunConfig {
+    /** The maximum execution time for the agent in minutes. */
+    max_time_minutes: number;
+    /** The maximum number of conversational turns. */
+    max_turns?: number;
+}

package/dist/src/agents/types.js

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Describes the possible termination modes for an agent.
+ */
+export var AgentTerminateMode;
+(function (AgentTerminateMode) {
+    AgentTerminateMode["ERROR"] = "ERROR";
+    AgentTerminateMode["TIMEOUT"] = "TIMEOUT";
+    AgentTerminateMode["GOAL"] = "GOAL";
+    AgentTerminateMode["MAX_TURNS"] = "MAX_TURNS";
+    AgentTerminateMode["ABORTED"] = "ABORTED";
+})(AgentTerminateMode || (AgentTerminateMode = {}));
+//# sourceMappingURL=types.js.map

package/dist/src/agents/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/agents/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH;;GAEG;AACH,MAAM,CAAN,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,qCAAe,CAAA;IACf,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,6CAAuB,CAAA;IACvB,yCAAmB,CAAA;AACrB,CAAC,EANW,kBAAkB,KAAlB,kBAAkB,QAM7B"}

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

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { AgentInputs } from './types.js';
+/**
+ * Simple template string replacement for agent prompts.
+ * Replaces ${key} placeholders with values from the inputs object.
+ *
+ * @param template The template string with ${key} placeholders
+ * @param inputs The input values to substitute
+ * @returns The template with placeholders replaced
+ */
+export declare function templateString(template: string, inputs: AgentInputs): string;

package/dist/src/agents/utils.js

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Simple template string replacement for agent prompts.
+ * Replaces ${key} placeholders with values from the inputs object.
+ *
+ * @param template The template string with ${key} placeholders
+ * @param inputs The input values to substitute
+ * @returns The template with placeholders replaced
+ */
+export function templateString(template, inputs) {
+    const placeholderRegex = /\$\{(\w+)\}/g;
+    // First, find all unique keys required by the template.
+    const requiredKeys = new Set(Array.from(template.matchAll(placeholderRegex), (match) => match[1]));
+    // Check if all required keys exist in the inputs.
+    const inputKeys = new Set(Object.keys(inputs));
+    const missingKeys = Array.from(requiredKeys).filter((key) => !inputKeys.has(key));
+    if (missingKeys.length > 0) {
+        throw new Error(`Missing input values for the following keys: ${missingKeys.join(', ')}`);
+    }
+    // Perform the replacement using a replacer function.
+    return template.replace(placeholderRegex, (_match, key) => String(inputs[key]));
+}
+//# sourceMappingURL=utils.js.map

package/dist/src/agents/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/agents/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB,EAAE,MAAmB;IAClE,MAAM,gBAAgB,GAAG,cAAc,CAAC;IAExC,wDAAwD;IACxD,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACrE,CAAC;IAEF,kDAAkD;IAClD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACjD,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAC7B,CAAC;IAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,gDAAgD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;IACJ,CAAC;IAED,qDAAqD;IACrD,OAAO,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CACxD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACpB,CAAC;AACJ,CAAC"}

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

@@ -40,13 +40,13 @@ export declare const ProviderOAuthConfigSchema: z.ZodObject<{
     scopes: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     clientId: string;
-    provider: "qwen" | "gemini";
+    provider: "gemini" | "qwen";
     scopes: string[];
     authorizationEndpoint: string;
     tokenEndpoint: string;
 }, {
     clientId: string;
-    provider: "qwen" | "gemini";
+    provider: "gemini" | "qwen";
     scopes: string[];
     authorizationEndpoint: string;
     tokenEndpoint: string;
@@ -111,14 +111,14 @@ export declare const AuthStatusSchema: z.ZodObject<{
     expiresIn: z.ZodOptional<z.ZodNumber>;
     oauthEnabled: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    provider: string;
     authType: "none" | "api-key" | "oauth";
+    provider: string;
     authenticated: boolean;
     expiresIn?: number | undefined;
     oauthEnabled?: boolean | undefined;
 }, {
-    provider: string;
     authType: "none" | "api-key" | "oauth";
+    provider: string;
     authenticated: boolean;
     expiresIn?: number | undefined;
     oauthEnabled?: boolean | undefined;

package/dist/src/code_assist/oauth-credential-storage.d.ts

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Credentials } from 'google-auth-library';
+import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
+export declare class OAuthCredentialStorage {
+    private readonly storage;
+    constructor(storage?: HybridTokenStorage);
+    /**
+     * Load cached OAuth credentials
+     */
+    loadCredentials(): Promise<Credentials | null>;
+    /**
+     * Save OAuth credentials
+     */
+    saveCredentials(credentials: Credentials): Promise<void>;
+    /**
+     * Clear cached OAuth credentials
+     */
+    clearCredentials(): Promise<void>;
+    /**
+     * Migrate credentials from old file-based storage to keychain
+     */
+    private migrateFromFileStorage;
+}

package/dist/src/code_assist/oauth-credential-storage.js

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
+import { OAUTH_FILE, Storage } from '../config/storage.js';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { promises as fs } from 'node:fs';
+const KEYCHAIN_SERVICE_NAME = 'llxprt-code-oauth';
+const MAIN_ACCOUNT_KEY = 'main-account';
+function getLegacyCredentialPaths() {
+    const legacyPaths = [Storage.getOAuthCredsPath()];
+    const homeDir = os.homedir();
+    if (homeDir) {
+        legacyPaths.push(path.join(homeDir, '.gemini', OAUTH_FILE));
+    }
+    return Array.from(new Set(legacyPaths));
+}
+export class OAuthCredentialStorage {
+    storage;
+    constructor(storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME)) {
+        this.storage = storage;
+    }
+    /**
+     * Load cached OAuth credentials
+     */
+    async loadCredentials() {
+        try {
+            const credentials = await this.storage.getCredentials(MAIN_ACCOUNT_KEY);
+            if (credentials?.token) {
+                const { accessToken, refreshToken, expiresAt, tokenType, scope } = credentials.token;
+                // Convert from OAuthCredentials format to Google Credentials format
+                const googleCreds = {
+                    access_token: accessToken,
+                    refresh_token: refreshToken || undefined,
+                    token_type: tokenType || undefined,
+                    scope: scope || undefined,
+                };
+                if (expiresAt) {
+                    googleCreds.expiry_date = expiresAt;
+                }
+                return googleCreds;
+            }
+            // Fallback: Try to migrate from old file-based storage
+            return await this.migrateFromFileStorage();
+        }
+        catch (error) {
+            console.error(error);
+            throw new Error('Failed to load OAuth credentials');
+        }
+    }
+    /**
+     * Save OAuth credentials
+     */
+    async saveCredentials(credentials) {
+        if (!credentials.access_token) {
+            throw new Error('Attempted to save credentials without an access token.');
+        }
+        // Convert Google Credentials to OAuthCredentials format
+        const mcpCredentials = {
+            serverName: MAIN_ACCOUNT_KEY,
+            token: {
+                accessToken: credentials.access_token,
+                refreshToken: credentials.refresh_token || undefined,
+                tokenType: credentials.token_type || 'Bearer',
+                scope: credentials.scope || undefined,
+                expiresAt: credentials.expiry_date || undefined,
+            },
+            updatedAt: Date.now(),
+        };
+        await this.storage.setCredentials(mcpCredentials);
+    }
+    /**
+     * Clear cached OAuth credentials
+     */
+    async clearCredentials() {
+        try {
+            await this.storage.deleteCredentials(MAIN_ACCOUNT_KEY);
+            // Also try to remove the old file if it exists
+            await Promise.all(getLegacyCredentialPaths().map((legacyPath) => fs.rm(legacyPath, { force: true }).catch(() => { })));
+        }
+        catch (error) {
+            console.error(error);
+            throw new Error('Failed to clear OAuth credentials');
+        }
+    }
+    /**
+     * Migrate credentials from old file-based storage to keychain
+     */
+    async migrateFromFileStorage() {
+        for (const legacyPath of getLegacyCredentialPaths()) {
+            let credsJson;
+            try {
+                credsJson = await fs.readFile(legacyPath, 'utf-8');
+            }
+            catch (error) {
+                if (typeof error === 'object' &&
+                    error !== null &&
+                    'code' in error &&
+                    error.code === 'ENOENT') {
+                    continue;
+                }
+                throw error;
+            }
+            const credentials = JSON.parse(credsJson);
+            await this.saveCredentials(credentials);
+            await fs.rm(legacyPath, { force: true }).catch(() => { });
+            return credentials;
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=oauth-credential-storage.js.map