@vybestack/llxprt-code-agents 0.10.0-nightly.260613.1adad3b34

package/dist/src/core/ChatSessionFactory.js

@@ -0,0 +1,216 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getEnvironmentContext } from '@vybestack/llxprt-code-core/utils/environmentContext.js';
+import { getCoreSystemPromptAsync } from '@vybestack/llxprt-code-core/core/prompts.js';
+import { getToolGovernanceEphemerals, buildToolDeclarationsFromView, getEnabledToolNamesForPrompt, shouldIncludeSubagentDelegationForConfig, } from './clientToolGovernance.js';
+import { reportError } from '@vybestack/llxprt-code-core/utils/errorReporting.js';
+import { ChatSession } from './chatSession.js';
+import { DebugLogger } from '@vybestack/llxprt-code-core/debug/index.js';
+import { HistoryService } from '@vybestack/llxprt-code-core/services/history/HistoryService.js';
+import { ContentConverters } from '@vybestack/llxprt-code-core/services/history/ContentConverters.js';
+import { createSettingsProviderRuntimeContext } from '@vybestack/llxprt-code-core/runtime/settingsRuntimeAdapter.js';
+import { loadAgentRuntime } from '@vybestack/llxprt-code-core/runtime/AgentRuntimeLoader.js';
+import { getErrorMessage } from '@vybestack/llxprt-code-core/utils/errors.js';
+import { isThinkingSupported } from './clientHelpers.js';
+import { estimateTokens as estimateTextTokens } from '@vybestack/llxprt-code-core/utils/toolOutputLimiter.js';
+/**
+ * Assembles ephemeral settings into an immutable snapshot for the runtime.
+ * Pure function — reads config, no side effects.
+ */
+export function buildSettingsSnapshot(config) {
+    const rawCompressionThreshold = config.getEphemeralSetting('compression-threshold');
+    const compressionThreshold = typeof rawCompressionThreshold === 'number' &&
+        Number.isFinite(rawCompressionThreshold)
+        ? rawCompressionThreshold
+        : undefined;
+    const rawContextLimit = config.getEphemeralSetting('context-limit');
+    const contextLimit = typeof rawContextLimit === 'number' &&
+        Number.isFinite(rawContextLimit) &&
+        rawContextLimit > 0
+        ? rawContextLimit
+        : undefined;
+    const rawPreserveThreshold = config.getEphemeralSetting('compression-preserve-threshold');
+    const preserveThreshold = typeof rawPreserveThreshold === 'number' &&
+        Number.isFinite(rawPreserveThreshold)
+        ? rawPreserveThreshold
+        : undefined;
+    return {
+        compressionThreshold: compressionThreshold ?? 0.85,
+        contextLimit,
+        preserveThreshold: preserveThreshold ?? 0.2,
+        telemetry: { enabled: true, target: null },
+        tools: getToolGovernanceEphemerals(config),
+        'reasoning.enabled': config.getEphemeralSetting('reasoning.enabled'),
+        'reasoning.includeInContext': config.getEphemeralSetting('reasoning.includeInContext'),
+        'reasoning.includeInResponse': config.getEphemeralSetting('reasoning.includeInResponse'),
+        'reasoning.format': config.getEphemeralSetting('reasoning.format'),
+        'reasoning.stripFromContext': config.getEphemeralSetting('reasoning.stripFromContext'),
+        'reasoning.effort': config.getEphemeralSetting('reasoning.effort'),
+        'reasoning.maxTokens': config.getEphemeralSetting('reasoning.maxTokens'),
+    };
+}
+/**
+ * Builds the full system instruction: env context, core memory, JIT memory,
+ * user memory, MCP instructions, subagent delegation.
+ *
+ * This is the FULL path used by startChat — differs from the lightweight path
+ * in clientLlmUtilities which skips env context, core memory, and JIT memory.
+ */
+export async function buildSystemInstruction(config, enabledToolNames, envParts, model) {
+    let userMemory = config.isJitContextEnabled()
+        ? config.getGlobalMemory()
+        : config.getUserMemory();
+    const coreMemory = config.getCoreMemory();
+    const jitMemory = await config.getJitMemoryForPath(config.getWorkingDir());
+    if (jitMemory) {
+        userMemory = userMemory ? `${userMemory}\n\n${jitMemory}` : jitMemory;
+    }
+    const mcpInstructions = config.getMcpClientManager()?.getMcpInstructions();
+    const includeSubagentDelegation = await shouldIncludeSubagentDelegationForConfig(config, enabledToolNames);
+    const interactionMode = config.isInteractive()
+        ? 'interactive'
+        : 'non-interactive';
+    let systemInstruction = await getCoreSystemPromptAsync({
+        userMemory,
+        coreMemory,
+        mcpInstructions,
+        model,
+        tools: enabledToolNames,
+        includeSubagentDelegation,
+        interactionMode,
+    });
+    const envContextText = envParts
+        .map((part) => ('text' in part && part.text ? part.text : ''))
+        .join('\n');
+    if (envContextText) {
+        systemInstruction = envContextText + '\n\n' + systemInstruction;
+    }
+    return systemInstruction;
+}
+/**
+ * Resolves (or creates) the HistoryService and optionally loads extra history.
+ */
+function setupHistoryService(storedHistoryService, extraHistory, runtimeState) {
+    const logger = new DebugLogger('llxprt:client:start');
+    if (storedHistoryService) {
+        logger.debug('Reusing stored HistoryService to preserve UI conversation');
+        return { historyService: storedHistoryService, reused: true };
+    }
+    const historyService = new HistoryService();
+    if (extraHistory && extraHistory.length > 0) {
+        const currentModel = runtimeState.model;
+        for (const content of extraHistory) {
+            const turnKey = historyService.generateTurnKey();
+            historyService.add(ContentConverters.toIContent(content, undefined, undefined, turnKey), currentModel);
+        }
+    }
+    return { historyService, reused: false };
+}
+/**
+ * Estimates and sets the system prompt token offset on the history service.
+ */
+async function applySystemPromptTokenOffset(historyService, systemInstruction, model, logger) {
+    try {
+        const tokens = await historyService.estimateTokensForText(systemInstruction, model);
+        historyService.setBaseTokenOffset(tokens);
+    }
+    catch {
+        // Token estimation failed - use fallback estimation
+        logger.debug(() => `Failed to count system instruction tokens for model ${model}, using fallback`);
+        historyService.setBaseTokenOffset(estimateTextTokens(systemInstruction));
+    }
+}
+/**
+ * Builds the GenerateContentConfig with thinking support if applicable.
+ */
+function buildGenerateContentConfig(baseConfig, model) {
+    return isThinkingSupported(model)
+        ? {
+            ...baseConfig,
+            thinkingConfig: { thinkingBudget: -1, includeThoughts: true },
+        }
+        : baseConfig;
+}
+/**
+ * Builds the runtime bundle, tool declarations, and ChatSession instance.
+ */
+async function buildChatFromRuntime(config, runtimeState, contentGenerator, historyService, generateContentConfig, todoContinuationService, toolRegistry, systemInstruction) {
+    const model = runtimeState.model;
+    const generationConfigWithThinking = buildGenerateContentConfig(generateContentConfig, model);
+    const settings = buildSettingsSnapshot(config);
+    const providerRuntime = createSettingsProviderRuntimeContext({
+        settingsService: config.getSettingsService(),
+        config,
+        runtimeId: runtimeState.runtimeId,
+        metadata: { source: 'AgentClient.startChat' },
+    });
+    const runtimeBundle = await loadAgentRuntime({
+        profile: {
+            config,
+            state: runtimeState,
+            settings,
+            providerRuntime,
+            contentGeneratorConfig: config.getContentGeneratorConfig(),
+            toolRegistry,
+            providerManager: config.getProviderManager(),
+        },
+        overrides: { historyService, contentGenerator },
+    });
+    const filteredDeclarations = buildToolDeclarationsFromView(toolRegistry, runtimeBundle.toolsView);
+    todoContinuationService.updateTodoToolAvailabilityFromDeclarations(filteredDeclarations);
+    const tools = [{ functionDeclarations: filteredDeclarations }];
+    const chat = new ChatSession(runtimeBundle.runtimeContext, runtimeBundle.contentGenerator, { systemInstruction, ...generationConfigWithThinking, tools }, []);
+    chat.setActiveTodosProvider(async () => {
+        const todos = await todoContinuationService.readTodoSnapshot();
+        const active = todoContinuationService.getActiveTodos(todos);
+        if (active.length === 0)
+            return undefined;
+        return active.map((t) => `- [${t.status}] ${t.content}`).join('\n');
+    });
+    return chat;
+}
+/**
+ * Stateful factory: creates a ChatSession session.
+ * Reuses stored HistoryService when available, creates a new one otherwise.
+ * Configures thinking, loads the agent runtime, builds tool declarations.
+ */
+export async function createChatSession(deps) {
+    const { config, runtimeState, contentGenerator, storedHistoryService, clearStoredHistoryService, extraHistory, generateContentConfig, todoContinuationService, toolRegistry, } = deps;
+    const logger = new DebugLogger('llxprt:client:start');
+    const { historyService, reused } = setupHistoryService(storedHistoryService, extraHistory, runtimeState);
+    const getTokenizerFactory = config['getTokenizerFactory'];
+    if (typeof getTokenizerFactory === 'function') {
+        const tokenizerFactory = getTokenizerFactory.call(config);
+        if (tokenizerFactory) {
+            historyService.setTokenizerFactory(tokenizerFactory);
+        }
+    }
+    const enabledToolNames = getEnabledToolNamesForPrompt(config);
+    const envParts = await getEnvironmentContext(config);
+    const model = runtimeState.model;
+    logger.debug(() => `DEBUG [client.startChat]: Model from config: ${model}`);
+    const systemInstruction = await buildSystemInstruction(config, enabledToolNames, envParts, model);
+    await applySystemPromptTokenOffset(historyService, systemInstruction, model, logger);
+    logger.debug(() => `DEBUG [client.startChat]: System instruction includes Flash instructions: ${systemInstruction.includes('IMPORTANT: You MUST use the provided tools')}`);
+    const chat = await buildChatFromRuntime(config, runtimeState, contentGenerator, historyService, generateContentConfig, todoContinuationService, toolRegistry, systemInstruction);
+    if (reused) {
+        clearStoredHistoryService();
+    }
+    return chat;
+}
+/**
+ * Wraps createChatSession with error reporting for the startChat call site.
+ */
+export async function createChatSessionSafe(deps) {
+    try {
+        return await createChatSession(deps);
+    }
+    catch (error) {
+        await reportError(error, 'Error initializing chat session.', deps.extraHistory ?? [], 'startChat');
+        throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
+    }
+}
+//# sourceMappingURL=ChatSessionFactory.js.map

package/dist/src/core/ChatSessionFactory.js.map

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

package/dist/src/core/ConversationManager.d.ts

@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * ConversationManager - Gemini-specific conversation/history recording layer.
+ *
+ * This class wraps HistoryService with chatSession-specific recording logic,
+ * handling Content→IContent conversion, thinking block attachment, usage
+ * metadata injection, and model output consolidation.
+ */
+import type { Content } from '@google/genai';
+import type { AgentRuntimeContext } from '@vybestack/llxprt-code-core/runtime/AgentRuntimeContext.js';
+import type { HistoryService } from '@vybestack/llxprt-code-core/services/history/HistoryService.js';
+import type { IContent, UsageStats } from '@vybestack/llxprt-code-core/services/history/IContent.js';
+import type { CompletedToolCall } from './coreToolScheduler.js';
+/**
+ * ConversationManager handles conversation history management for ChatSession.
+ * It provides methods for recording turns, converting Content to IContent,
+ * and managing conversation state.
+ */
+export declare class ConversationManager {
+    private readonly historyService;
+    private readonly runtimeContext;
+    private readonly model;
+    constructor(historyService: HistoryService, runtimeContext: AgentRuntimeContext, model: string);
+    /**
+     * Get the underlying HistoryService instance
+     */
+    getHistoryService(): HistoryService;
+    /**
+     * Creates a position-based matcher for Gemini tool responses.
+     * Returns a function that matches tool responses to their calls, or undefined
+     * if there are no unmatched tool calls.
+     */
+    makePositionMatcher(): (() => {
+        historyId: string;
+        toolName?: string;
+    }) | undefined;
+    /**
+     * Converts user input (Content or Content[]) to IContent[] for history.
+     * This consolidates the Content→IContent conversion pattern used in:
+     * - Constructor initial history import
+     * - sendMessage pre-send
+     * - sendMessageStream pre-send
+     *
+     * These all share the same semantics: model + matcher/idGen.
+     */
+    convertUserInputToIContents(userContent: Content | Content[]): IContent[];
+    /**
+     * Imports initial history during ChatSession construction.
+     * Validates the history and converts each Content to IContent before adding.
+     * Called from ChatSession constructor after ConversationManager is created.
+     */
+    importInitialHistory(initialHistory: Content[], model: string): void;
+    /**
+     * Records a completed conversation turn to history.
+     * This is the main orchestrator that handles both user and model turns.
+     *
+     * @param userInput - User's input (Content or Content[] for paired tool call/response)
+     * @param modelOutput - Model's output Content array
+     * @param automaticFunctionCallingHistory - Optional AFC history from Gemini SDK
+     * @param usageMetadata - Optional usage statistics
+     */
+    recordHistory(userInput: Content | Content[], modelOutput: Content[], automaticFunctionCallingHistory?: Content[], usageMetadata?: UsageStats | null): void;
+    /**
+     * Handles user Content → IContent conversion, including AFC and paired
+     * tool call/response scenarios.
+     *
+     * Mutates newHistoryEntries by appending user turn entries.
+     */
+    private _recordUserTurn;
+    /**
+     * Handles model output filtering, thinking block attachment, consolidation,
+     * and usage metadata injection.
+     *
+     * Mutates newHistoryEntries by appending model turn entries.
+     */
+    private _recordModelTurn;
+    /**
+     * Consolidates the parts of a model's turn response.
+     * Merges adjacent text content to avoid fragmentation.
+     */
+    private _consolidateModelOutput;
+    /**
+     * Adds consolidated model output to history with thinking blocks and usage metadata.
+     * Attaches thinking blocks to the first model entry and ensures proper metadata.
+     */
+    private _addModelOutputToHistory;
+    /**
+     * Gets the conversation history in Gemini Content format.
+     * @param curated - If true, returns curated history; otherwise returns all history
+     */
+    getHistory(curated?: boolean): Content[];
+    /**
+     * Clears the chat history.
+     */
+    clearHistory(): void;
+    /**
+     * Adds a new entry to the chat history.
+     */
+    addHistory(content: Content): void;
+    /**
+     * Sets the full chat history, replacing any existing history.
+     */
+    setHistory(history: Content[]): void;
+    /**
+     * Compatibility stub for tool call recording.
+     * This is a no-op maintained for backward compatibility.
+     */
+    recordCompletedToolCalls(_model: string, _toolCalls: CompletedToolCall[]): void;
+}

package/dist/src/core/ConversationManager.js

@@ -0,0 +1,311 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ContentConverters } from '@vybestack/llxprt-code-core/services/history/ContentConverters.js';
+import { isFunctionResponse } from '@vybestack/llxprt-code-core/utils/messageInspectors.js';
+import { isThoughtPart } from '@vybestack/llxprt-code-core/core/chatSessionTypes.js';
+import { extractCuratedHistory, hasTextContent, validateHistory, } from './MessageConverter.js';
+function appendTextContentParts(lastContent, content) {
+    const lastParts = lastContent.parts ?? [];
+    const contentParts = content.parts ?? [];
+    lastParts[0].text += contentParts[0].text ?? '';
+    if (contentParts.length > 1) {
+        lastParts.push(...contentParts.slice(1));
+    }
+}
+/**
+ * ConversationManager handles conversation history management for ChatSession.
+ * It provides methods for recording turns, converting Content to IContent,
+ * and managing conversation state.
+ */
+export class ConversationManager {
+    historyService;
+    runtimeContext;
+    model;
+    constructor(historyService, runtimeContext, model) {
+        this.historyService = historyService;
+        this.runtimeContext = runtimeContext;
+        this.model = model;
+    }
+    /**
+     * Get the underlying HistoryService instance
+     */
+    getHistoryService() {
+        return this.historyService;
+    }
+    /**
+     * Creates a position-based matcher for Gemini tool responses.
+     * Returns a function that matches tool responses to their calls, or undefined
+     * if there are no unmatched tool calls.
+     */
+    makePositionMatcher() {
+        const queue = this.historyService
+            .findUnmatchedToolCalls()
+            .map((b) => ({ historyId: b.id, toolName: b.name }));
+        // Return undefined if there are no unmatched tool calls
+        if (queue.length === 0) {
+            return undefined;
+        }
+        // Return a function that always returns a valid value (never undefined)
+        return () => {
+            const result = queue.shift();
+            // If queue is empty, return a fallback value
+            return result ?? { historyId: '', toolName: undefined };
+        };
+    }
+    /**
+     * Converts user input (Content or Content[]) to IContent[] for history.
+     * This consolidates the Content→IContent conversion pattern used in:
+     * - Constructor initial history import
+     * - sendMessage pre-send
+     * - sendMessageStream pre-send
+     *
+     * These all share the same semantics: model + matcher/idGen.
+     */
+    convertUserInputToIContents(userContent) {
+        const contents = Array.isArray(userContent) ? userContent : [userContent];
+        const matcher = this.makePositionMatcher();
+        return contents.map((content) => {
+            const turnKey = this.historyService.generateTurnKey();
+            const idGen = this.historyService.getIdGeneratorCallback(turnKey);
+            return ContentConverters.toIContent(content, idGen, matcher, turnKey);
+        });
+    }
+    /**
+     * Imports initial history during ChatSession construction.
+     * Validates the history and converts each Content to IContent before adding.
+     * Called from ChatSession constructor after ConversationManager is created.
+     */
+    importInitialHistory(initialHistory, model) {
+        if (initialHistory.length === 0) {
+            return;
+        }
+        // Validate before importing
+        validateHistory(initialHistory);
+        // Convert and add each entry
+        const matcher = this.makePositionMatcher();
+        for (const content of initialHistory) {
+            const turnKey = this.historyService.generateTurnKey();
+            const idGen = this.historyService.getIdGeneratorCallback(turnKey);
+            this.historyService.add(ContentConverters.toIContent(content, idGen, matcher, turnKey), model);
+        }
+    }
+    /**
+     * Records a completed conversation turn to history.
+     * This is the main orchestrator that handles both user and model turns.
+     *
+     * @param userInput - User's input (Content or Content[] for paired tool call/response)
+     * @param modelOutput - Model's output Content array
+     * @param automaticFunctionCallingHistory - Optional AFC history from Gemini SDK
+     * @param usageMetadata - Optional usage statistics
+     */
+    recordHistory(userInput, modelOutput, automaticFunctionCallingHistory, usageMetadata) {
+        const newHistoryEntries = [];
+        // Capture user input characteristics for model turn logic
+        const userInputWasArray = Array.isArray(userInput);
+        const userInputWasFunctionResponse = !userInputWasArray && isFunctionResponse(userInput);
+        const hasAfc = !!(automaticFunctionCallingHistory &&
+            automaticFunctionCallingHistory.length > 0);
+        // Record user turn
+        this._recordUserTurn(userInput, automaticFunctionCallingHistory, newHistoryEntries);
+        // Record model turn
+        this._recordModelTurn(modelOutput, usageMetadata, newHistoryEntries, userInputWasArray, userInputWasFunctionResponse, hasAfc);
+        // Add all entries to history service
+        for (const entry of newHistoryEntries) {
+            this.historyService.add(entry, this.model);
+        }
+    }
+    /**
+     * Handles user Content → IContent conversion, including AFC and paired
+     * tool call/response scenarios.
+     *
+     * Mutates newHistoryEntries by appending user turn entries.
+     */
+    _recordUserTurn(userInput, automaticFunctionCallingHistory, newHistoryEntries) {
+        if (automaticFunctionCallingHistory &&
+            automaticFunctionCallingHistory.length > 0) {
+            // AFC branch: extract curated history
+            const curatedAfc = extractCuratedHistory(automaticFunctionCallingHistory);
+            for (const content of curatedAfc) {
+                const turnKey = this.historyService.generateTurnKey();
+                newHistoryEntries.push(ContentConverters.toIContent(content, undefined, undefined, turnKey));
+            }
+        }
+        else {
+            const matcher = this.makePositionMatcher();
+            // Handle both single Content and Content[] (for paired tool call/response)
+            if (Array.isArray(userInput)) {
+                // This is a paired tool call/response from the executor
+                // Add each part to history
+                for (const content of userInput) {
+                    const turnKey = this.historyService.generateTurnKey();
+                    const idGen = this.historyService.getIdGeneratorCallback(turnKey);
+                    const userIContent = ContentConverters.toIContent(content, idGen, matcher, turnKey);
+                    newHistoryEntries.push(userIContent);
+                }
+            }
+            else {
+                // Normal user message
+                const turnKey = this.historyService.generateTurnKey();
+                const idGen = this.historyService.getIdGeneratorCallback(turnKey);
+                const userIContent = ContentConverters.toIContent(userInput, idGen, matcher, turnKey);
+                newHistoryEntries.push(userIContent);
+            }
+        }
+    }
+    /**
+     * Handles model output filtering, thinking block attachment, consolidation,
+     * and usage metadata injection.
+     *
+     * Mutates newHistoryEntries by appending model turn entries.
+     */
+    _recordModelTurn(modelOutput, usageMetadata, newHistoryEntries, userInputWasArray, userInputWasFunctionResponse, hasAfc) {
+        // Filter out thoughts based on reasoning configuration
+        const includeThoughtsInHistory = this.runtimeContext.ephemerals.reasoning.includeInContext();
+        const nonThoughtModelOutput = modelOutput
+            .map((content) => ({
+            ...content,
+            parts: (content.parts ?? []).filter((part) => !isThoughtPart(part)),
+        }))
+            .filter((content) => content.parts.length > 0);
+        // Extract thinking blocks if needed
+        const thoughtBlocks = includeThoughtsInHistory
+            ? modelOutput
+                .flatMap((content) => content.parts ?? [])
+                .filter(isThoughtPart)
+                .map((part) => ({
+                type: 'thinking',
+                thought: (part.text ?? '').trim(),
+                sourceField: part.llxprtSourceField ?? 'thought',
+                signature: part.thoughtSignature,
+            }))
+                .filter((block) => block.thought.length > 0)
+            : [];
+        // Determine output contents
+        let outputContents = [];
+        if (nonThoughtModelOutput.length > 0) {
+            outputContents = nonThoughtModelOutput;
+        }
+        else if (modelOutput.length === 0 &&
+            !userInputWasArray &&
+            !userInputWasFunctionResponse &&
+            !hasAfc) {
+            // Add an empty model response if the model truly returned nothing
+            outputContents.push({ role: 'model', parts: [] });
+        }
+        if (outputContents.length === 0 && thoughtBlocks.length > 0) {
+            outputContents = [{ role: 'model', parts: [] }];
+        }
+        // Consolidate model response parts
+        const consolidatedOutputContents = this._consolidateModelOutput(outputContents);
+        // Add consolidated output to new history with thinking blocks
+        this._addModelOutputToHistory(consolidatedOutputContents, thoughtBlocks, usageMetadata, newHistoryEntries);
+    }
+    /**
+     * Consolidates the parts of a model's turn response.
+     * Merges adjacent text content to avoid fragmentation.
+     */
+    _consolidateModelOutput(outputContents) {
+        const consolidatedOutputContents = [];
+        if (outputContents.length > 0) {
+            for (const content of outputContents) {
+                const lastContent = consolidatedOutputContents[consolidatedOutputContents.length - 1];
+                if (hasTextContent(lastContent) && hasTextContent(content)) {
+                    appendTextContentParts(lastContent, content);
+                }
+                else {
+                    consolidatedOutputContents.push(content);
+                }
+            }
+        }
+        return consolidatedOutputContents;
+    }
+    /**
+     * Adds consolidated model output to history with thinking blocks and usage metadata.
+     * Attaches thinking blocks to the first model entry and ensures proper metadata.
+     */
+    _addModelOutputToHistory(consolidatedOutputContents, thoughtBlocks, usageMetadata, newHistoryEntries) {
+        let didAttachThoughtBlocks = false;
+        for (const content of consolidatedOutputContents) {
+            const turnKey = this.historyService.generateTurnKey();
+            const iContent = ContentConverters.toIContent(content, undefined, undefined, turnKey);
+            // Attach thinking blocks to first model entry
+            if (thoughtBlocks.length > 0 && !didAttachThoughtBlocks) {
+                iContent.blocks = [...thoughtBlocks, ...iContent.blocks];
+                didAttachThoughtBlocks = true;
+            }
+            // Add usage metadata if available
+            if (usageMetadata !== undefined && usageMetadata !== null) {
+                iContent.metadata = {
+                    ...iContent.metadata,
+                    usage: usageMetadata,
+                };
+            }
+            newHistoryEntries.push(iContent);
+        }
+        // If we have thinking blocks but nowhere to attach them, create standalone entry
+        if (thoughtBlocks.length > 0 && !didAttachThoughtBlocks) {
+            const turnKey = this.historyService.generateTurnKey();
+            const iContent = {
+                speaker: 'ai',
+                blocks: thoughtBlocks,
+                metadata: { turnId: turnKey },
+            };
+            if (usageMetadata !== undefined && usageMetadata !== null) {
+                iContent.metadata = {
+                    ...iContent.metadata,
+                    usage: usageMetadata,
+                };
+            }
+            newHistoryEntries.push(iContent);
+        }
+    }
+    /**
+     * Gets the conversation history in Gemini Content format.
+     * @param curated - If true, returns curated history; otherwise returns all history
+     */
+    getHistory(curated = false) {
+        // Get history from HistoryService in IContent format
+        const iContents = curated
+            ? this.historyService.getCurated()
+            : this.historyService.getAll();
+        // Convert to Gemini Content format
+        const contents = ContentConverters.toGeminiContents(iContents);
+        // Deep copy the history to avoid mutating the history outside of the
+        // chat session.
+        return structuredClone(contents);
+    }
+    /**
+     * Clears the chat history.
+     */
+    clearHistory() {
+        this.historyService.clear();
+    }
+    /**
+     * Adds a new entry to the chat history.
+     */
+    addHistory(content) {
+        const turnKey = this.historyService.generateTurnKey();
+        this.historyService.add(ContentConverters.toIContent(content, undefined, undefined, turnKey), this.model);
+    }
+    /**
+     * Sets the full chat history, replacing any existing history.
+     */
+    setHistory(history) {
+        this.historyService.clear();
+        for (const content of history) {
+            const turnKey = this.historyService.generateTurnKey();
+            this.historyService.add(ContentConverters.toIContent(content, undefined, undefined, turnKey), this.model);
+        }
+    }
+    /**
+     * Compatibility stub for tool call recording.
+     * This is a no-op maintained for backward compatibility.
+     */
+    recordCompletedToolCalls(_model, _toolCalls) {
+        // No-op stub for compatibility
+    }
+}
+//# sourceMappingURL=ConversationManager.js.map