@didim365/agent-cli-core 0.2.3 → 0.2.4

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

@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * @fileoverview LlmAgentChatSession — AgentChatSession implementation for non-Gemini providers.
+ *
+ * Bridges the provider-independent `llmGenerateContentStream()` API with the
+ * legacy `StreamEvent` protocol consumed by `local-executor.ts`.
+ *
+ * Key design decisions:
+ * - Dependency Injection: all external functions injected via constructor for testability
+ * - StreamEvent compatibility: constructs partial `GenerateContentResponse` objects
+ *   with the exact fields accessed by `callModel()` in local-executor.ts:
+ *   `chunk.candidates?.[0]?.content?.parts`, `chunk.functionCalls`,
+ *   `parts?.find(p => p.thought)?.text`
+ * - Error → throw: LlmEventType.Error throws immediately (not yielded as StreamEvent)
+ * - History management: Gemini Content[] format for compatibility with local-executor
+ */
+import type { Content, PartListUnion, Tool } from '@google/genai';
+import type { LlmEvent } from '../providers/events.js';
+import type { StreamEvent } from '../providers/gemini/chat.js';
+import type { LlmGenerateRequest, LlmMessage } from '../providers/types.js';
+import type { ModelConfigKey } from '../services/modelConfigService.js';
+import type { AgentChatSession } from './types.js';
+/**
+ * Converts a provider-independent LlmEvent into a legacy StreamEvent
+ * compatible with local-executor's `callModel()`.
+ *
+ * Returns null for events that don't map to StreamEvent
+ * (Finished, MessageEnd, Error — handled separately by the session).
+ */
+export declare function convertLlmEventToStreamEvent(event: LlmEvent): StreamEvent | null;
+/**
+ * Constructor options for LlmAgentChatSession.
+ * All external dependencies are injected for testability.
+ */
+/**
+ * Generation parameters resolved from model config aliases/overrides.
+ * Maps to GenerateContentConfig fields from @google/genai SDK.
+ */
+export interface ResolvedGenerateConfig {
+    temperature?: number;
+    topP?: number;
+    topK?: number;
+    maxOutputTokens?: number;
+    stopSequences?: string[];
+}
+export interface LlmAgentChatSessionOptions {
+    /** Content generator with llm* methods */
+    generator: {
+        llmGenerateContentStream: (request: LlmGenerateRequest, promptId: string, options?: {
+            signal?: AbortSignal;
+        }) => AsyncGenerator<LlmEvent>;
+    };
+    /** Provider name (e.g., 'claude', 'openai') */
+    providerName: string;
+    /** System instruction for the model */
+    systemInstruction: string | undefined;
+    /** Available tools */
+    tools: Tool[];
+    /** Initial conversation history in Gemini Content[] format */
+    initialHistory: Content[];
+    resolveProviderModelFn: (model: string, providerName: string) => string;
+    buildLlmRequestFn: (options: {
+        history: LlmMessage[];
+        systemInstruction: string | undefined;
+        tools: Tool[];
+    }) => LlmGenerateRequest;
+    fixToolResultRolesFn: (messages: LlmMessage[]) => LlmMessage[];
+    convertContentsToLlmMessagesFn: (contents: Content[]) => LlmMessage[];
+    /**
+     * Resolves generation parameters (temperature, topP, maxOutputTokens, etc.)
+     * from a ModelConfigKey. Used to propagate agent alias/override config
+     * to non-Gemini provider requests. [리뷰 #1]
+     */
+    resolveGenerateConfigFn?: (key: ModelConfigKey) => ResolvedGenerateConfig | undefined;
+}
+/**
+ * AgentChatSession implementation that uses provider-independent
+ * `llmGenerateContentStream()` and converts events to legacy StreamEvent.
+ *
+ * Used when a non-Gemini provider is selected (Claude, OpenAI, etc.)
+ * and injected into `LocalAgentExecutor.create()` via `ChatSessionFactory`.
+ */
+export declare class LlmAgentChatSession implements AgentChatSession {
+    private readonly generator;
+    private readonly providerName;
+    private readonly systemInstruction;
+    private readonly tools;
+    private history;
+    private lastPromptTokenCount;
+    private readonly resolveProviderModelFn;
+    private readonly buildLlmRequestFn;
+    private readonly fixToolResultRolesFn;
+    private readonly convertContentsToLlmMessagesFn;
+    private readonly resolveGenerateConfigFn;
+    constructor(options: LlmAgentChatSessionOptions);
+    sendMessageStream(modelConfigKey: ModelConfigKey, message: PartListUnion, promptId: string, signal: AbortSignal): Promise<AsyncGenerator<StreamEvent>>;
+    setHistory(history: Content[]): void;
+    getHistory(_curated?: boolean): Content[];
+    getLastPromptTokenCount(): number;
+    /**
+     * Processes the LlmEvent stream: yields StreamEvents, tracks usage,
+     * and adds model response to history after successful completion.
+     */
+    private processEventStream;
+    /**
+     * Updates last prompt token count from usage data.
+     */
+    private updateUsage;
+    /**
+     * Adds the accumulated model response to history in Gemini Content format.
+     */
+    private addModelResponseToHistory;
+}

package/dist/src/agents/llmAgentChatSession.js

@@ -0,0 +1,252 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { estimateTokenCountSync } from '../utils/tokenCalculation.js';
+import { LlmEventType } from '../providers/events.js';
+import { StreamEventType } from '../providers/gemini/chat.js';
+// ─── convertLlmEventToStreamEvent ────────────────────────────────
+/**
+ * Converts a provider-independent LlmEvent into a legacy StreamEvent
+ * compatible with local-executor's `callModel()`.
+ *
+ * Returns null for events that don't map to StreamEvent
+ * (Finished, MessageEnd, Error — handled separately by the session).
+ */
+export function convertLlmEventToStreamEvent(event) {
+    switch (event.type) {
+        case LlmEventType.TextDelta:
+            return {
+                type: StreamEventType.CHUNK,
+                value: {
+                    candidates: [
+                        {
+                            content: {
+                                parts: [{ text: event.text }],
+                            },
+                        },
+                    ],
+                },
+            };
+        case LlmEventType.ThoughtDelta:
+            return {
+                type: StreamEventType.CHUNK,
+                value: {
+                    candidates: [
+                        {
+                            content: {
+                                parts: [{ text: event.thought, thought: true }],
+                            },
+                        },
+                    ],
+                },
+            };
+        case LlmEventType.ToolCallRequest:
+            return {
+                type: StreamEventType.CHUNK,
+                value: {
+                    candidates: [
+                        {
+                            content: {
+                                parts: [
+                                    {
+                                        functionCall: {
+                                            id: event.callId,
+                                            name: event.name,
+                                            args: event.args,
+                                        },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    functionCalls: [
+                        {
+                            id: event.callId,
+                            name: event.name,
+                            args: event.args,
+                        },
+                    ],
+                },
+            };
+        case LlmEventType.Retry:
+            return { type: StreamEventType.RETRY };
+        case LlmEventType.AgentStopped:
+            return {
+                type: StreamEventType.AGENT_EXECUTION_STOPPED,
+                reason: event.reason ?? 'stopped',
+            };
+        case LlmEventType.AgentBlocked:
+            return {
+                type: StreamEventType.AGENT_EXECUTION_BLOCKED,
+                reason: event.reason ?? 'blocked',
+            };
+        default:
+            // Finished, MessageEnd, Error, and all other events → null
+            return null;
+    }
+}
+/**
+ * AgentChatSession implementation that uses provider-independent
+ * `llmGenerateContentStream()` and converts events to legacy StreamEvent.
+ *
+ * Used when a non-Gemini provider is selected (Claude, OpenAI, etc.)
+ * and injected into `LocalAgentExecutor.create()` via `ChatSessionFactory`.
+ */
+export class LlmAgentChatSession {
+    generator;
+    providerName;
+    systemInstruction;
+    tools;
+    history;
+    lastPromptTokenCount = 0;
+    // Injected dependencies
+    resolveProviderModelFn;
+    buildLlmRequestFn;
+    fixToolResultRolesFn;
+    convertContentsToLlmMessagesFn;
+    resolveGenerateConfigFn;
+    constructor(options) {
+        this.generator = options.generator;
+        this.providerName = options.providerName;
+        this.systemInstruction = options.systemInstruction;
+        this.tools = options.tools;
+        this.history = [...options.initialHistory];
+        this.resolveProviderModelFn = options.resolveProviderModelFn;
+        this.buildLlmRequestFn = options.buildLlmRequestFn;
+        this.fixToolResultRolesFn = options.fixToolResultRolesFn;
+        this.convertContentsToLlmMessagesFn =
+            options.convertContentsToLlmMessagesFn;
+        this.resolveGenerateConfigFn = options.resolveGenerateConfigFn;
+    }
+    // ─── AgentChatSession interface ──────────────────────────────────
+    async sendMessageStream(modelConfigKey, message, promptId, signal) {
+        // 1. Resolve provider model from config alias
+        const resolvedModel = this.resolveProviderModelFn(modelConfigKey.model, this.providerName);
+        // 2. Add user content to history BEFORE streaming (Gemini convention)
+        // PartListUnion = (Part | string)[] | Part | string → convert to Part[]
+        const rawParts = Array.isArray(message) ? message : [message];
+        const parts = rawParts.map((p) => typeof p === 'string' ? { text: p } : p);
+        const userContent = { role: 'user', parts };
+        this.history.push(userContent);
+        // 3. Build LLM request from current state
+        const llmMessages = this.convertContentsToLlmMessagesFn(this.history);
+        const request = this.buildLlmRequestFn({
+            history: llmMessages,
+            systemInstruction: this.systemInstruction,
+            tools: this.tools,
+        });
+        // 4. Apply fixToolResultRoles and override model
+        request.messages = this.fixToolResultRolesFn(request.messages);
+        request.model = resolvedModel;
+        // 4b. Apply generation config from model config aliases/overrides [리뷰 #1]
+        if (this.resolveGenerateConfigFn) {
+            const genConfig = this.resolveGenerateConfigFn(modelConfigKey);
+            if (genConfig) {
+                if (genConfig.temperature != null)
+                    request.temperature = genConfig.temperature;
+                if (genConfig.topP != null)
+                    request.topP = genConfig.topP;
+                if (genConfig.topK != null)
+                    request.topK = genConfig.topK;
+                if (genConfig.maxOutputTokens != null)
+                    request.maxTokens = genConfig.maxOutputTokens;
+                if (genConfig.stopSequences != null)
+                    request.stopSequences = genConfig.stopSequences;
+            }
+        }
+        // 5. Call provider stream (returns AsyncGenerator directly, not Promise)
+        const eventStream = this.generator.llmGenerateContentStream(request, promptId, { signal });
+        // 6. Return async generator that converts LlmEvent → StreamEvent
+        return this.processEventStream(eventStream);
+    }
+    setHistory(history) {
+        this.history = history;
+        // Recalculate token count to keep compression threshold accurate [리뷰 #5]
+        this.lastPromptTokenCount = estimateTokenCountSync(this.history.flatMap((c) => c.parts || []));
+    }
+    getHistory(_curated) {
+        // Return a deep copy to prevent external mutation of internal state [리뷰 #2]
+        return structuredClone(this.history);
+    }
+    getLastPromptTokenCount() {
+        return this.lastPromptTokenCount;
+    }
+    // ─── Internal ────────────────────────────────────────────────────
+    /**
+     * Processes the LlmEvent stream: yields StreamEvents, tracks usage,
+     * and adds model response to history after successful completion.
+     */
+    async *processEventStream(eventStream) {
+        let responseText = '';
+        const functionCalls = [];
+        let hasError = false;
+        for await (const event of eventStream) {
+            // Track usage from Finished and MessageEnd events
+            if (event.type === LlmEventType.Finished) {
+                this.updateUsage(event.usage);
+                continue;
+            }
+            if (event.type === LlmEventType.MessageEnd) {
+                this.updateUsage(event.usage);
+                continue;
+            }
+            // Error → throw (not yielded as StreamEvent)
+            if (event.type === LlmEventType.Error) {
+                hasError = true;
+                const err = event.error;
+                throw err instanceof Error ? err : new Error(String(err));
+            }
+            // Accumulate text and tool calls for history
+            if (event.type === LlmEventType.TextDelta) {
+                responseText += event.text;
+            }
+            if (event.type === LlmEventType.ToolCallRequest) {
+                functionCalls.push({
+                    id: event.callId,
+                    name: event.name,
+                    args: event.args,
+                });
+            }
+            // Convert to StreamEvent and yield if mappable
+            const streamEvent = convertLlmEventToStreamEvent(event);
+            if (streamEvent) {
+                yield streamEvent;
+            }
+        }
+        // Add model response to history after successful stream completion
+        if (!hasError) {
+            this.addModelResponseToHistory(responseText, functionCalls);
+        }
+    }
+    /**
+     * Updates last prompt token count from usage data.
+     */
+    updateUsage(usage) {
+        if (usage?.promptTokens != null) {
+            this.lastPromptTokenCount = usage.promptTokens;
+        }
+    }
+    /**
+     * Adds the accumulated model response to history in Gemini Content format.
+     */
+    addModelResponseToHistory(text, functionCalls) {
+        const parts = [];
+        if (text) {
+            parts.push({ text });
+        }
+        for (const fc of functionCalls) {
+            parts.push({
+                functionCall: { id: fc.id, name: fc.name, args: fc.args },
+            });
+        }
+        if (parts.length > 0) {
+            this.history.push({
+                role: 'model',
+                parts,
+            });
+        }
+    }
+}
+//# sourceMappingURL=llmAgentChatSession.js.map

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

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

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

@@ -42,4 +42,11 @@ export declare class LocalSubagentInvocation extends BaseToolInvocation<AgentInp
      * @returns A `Promise` that resolves with the final `ToolResult`.
      */
     execute(signal: AbortSignal, updateOutput?: (output: string | AnsiOutput) => void): Promise<ToolResult>;
+    /**
+     * Returns a ChatSessionFactory for non-Gemini providers with llm* methods,
+     * or undefined for Gemini (which uses the default GeminiChat factory).
+     *
+     * Throws eagerly for non-Gemini providers that lack llm* methods [리뷰 #3].
+     */
+    private buildChatFactoryIfNonGemini;
 }

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

@@ -6,6 +6,12 @@
 import { LocalAgentExecutor } from './local-executor.js';
 import { BaseToolInvocation } from '../tools/tools.js';
 import { ToolErrorType } from '../tools/tool-error.js';
+import { isProviderIndependentGenerator } from '../core/contentGenerator.js';
+import { resolveProviderModel } from '../providers/providerSelector.js';
+import { convertContentsToLlmMessages } from '../providers/gemini/typeConversion.js';
+import { convertGeminiToolsToLlm } from '../providers/gemini/requestBuilder.js';
+import { fixToolResultRoles } from '../core/llmMessageUtils.js';
+import { LlmAgentChatSession } from './llmAgentChatSession.js';
 const INPUT_PREVIEW_MAX_LENGTH = 50;
 const DESCRIPTION_MAX_LENGTH = 200;
 /**
@@ -66,7 +72,11 @@ export class LocalSubagentInvocation extends BaseToolInvocation {
                     updateOutput(`🤖💭 ${activity.data['text']}`);
                 }
             };
-            const executor = await LocalAgentExecutor.create(this.definition, this.config, onActivity);
+            // Detect non-Gemini provider and inject LlmAgentChatSession factory
+            const chatFactory = this.buildChatFactoryIfNonGemini();
+            const executor = chatFactory
+                ? await LocalAgentExecutor.create(this.definition, this.config, onActivity, chatFactory)
+                : await LocalAgentExecutor.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}
@@ -97,5 +107,65 @@ ${output.result}
             };
         }
     }
+    /**
+     * Returns a ChatSessionFactory for non-Gemini providers with llm* methods,
+     * or undefined for Gemini (which uses the default GeminiChat factory).
+     *
+     * Throws eagerly for non-Gemini providers that lack llm* methods [리뷰 #3].
+     */
+    buildChatFactoryIfNonGemini() {
+        let generator;
+        try {
+            generator = this.config.getContentGenerator();
+        }
+        catch {
+            return undefined;
+        }
+        if (!generator)
+            return undefined;
+        const providerName = generator.providerName;
+        // Gemini (or unknown) → use default GeminiChat factory
+        if (providerName == null || providerName === 'gemini') {
+            return undefined;
+        }
+        // Non-Gemini without llm* methods → fail fast [리뷰 #3]
+        if (!isProviderIndependentGenerator(generator)) {
+            throw new Error(`Provider "${providerName}" is non-Gemini but does not support ` +
+                `provider-independent API (llm* methods). Subagent execution cannot proceed.`);
+        }
+        return (config, systemInstruction, tools, history) => new LlmAgentChatSession({
+            generator,
+            providerName,
+            systemInstruction,
+            tools,
+            initialHistory: history,
+            resolveProviderModelFn: resolveProviderModel,
+            buildLlmRequestFn: ({ history: msgs, systemInstruction: si, tools: t, }) => {
+                const request = {
+                    model: 'placeholder', // overridden by LlmAgentChatSession
+                    messages: msgs,
+                };
+                if (si !== undefined) {
+                    request.systemInstruction = si;
+                }
+                if (t.length > 0) {
+                    request.tools = convertGeminiToolsToLlm(t);
+                }
+                return request;
+            },
+            fixToolResultRolesFn: fixToolResultRoles,
+            convertContentsToLlmMessagesFn: convertContentsToLlmMessages,
+            // Propagate generation config (temperature/topP/maxOutputTokens etc.) [리뷰 #1]
+            resolveGenerateConfigFn: (key) => {
+                try {
+                    const resolved = config.modelConfigService.getResolvedConfig(key);
+                    return resolved.generateContentConfig;
+                }
+                catch {
+                    return undefined;
+                }
+            },
+        });
+    }
 }
 //# sourceMappingURL=local-invocation.js.map

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

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

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

@@ -128,4 +128,20 @@ export declare class BaseLlmClient {
     private cleanJsonResponse;
     generateContent(options: GenerateContentOptions | LlmGenerateContentOptions): Promise<GenerateContentResponse>;
     private _generateWithRetry;
+    /**
+     * Non-Gemini variant of _generateWithRetry.
+     * Converts Content[] → LlmMessage[], calls llmGenerateContent(),
+     * and converts the response back to GenerateContentResponse.
+     */
+    private _generateWithRetryLlm;
+    /**
+     * Builds an LlmGenerateRequest from Gemini Content[] and calls llmGenerateContent().
+     * Returns GenerateContentResponse for compatibility with existing callers.
+     */
+    private _callLlmGenerateContent;
+    /**
+     * Normalizes various systemInstruction forms to a plain string.
+     * BaseLlmClient callers pass string | Part | Part[] | Content.
+     */
+    private _normalizeSystemInstruction;
 }