@ketd/gemini-cli-sdk 0.3.8 → 0.4.0

package/dist/index.d.cts

@@ -545,7 +545,7 @@ interface UserInputMessage {
 /**
  * Control subtypes for control messages
  */
-type ControlSubtype = 'interrupt' | 'cancel' | 'shutdown' | 'truncate_history' | 'resume_session' | 'replace_history';
+type ControlSubtype = 'interrupt' | 'cancel' | 'shutdown' | 'truncate_history' | 'resume_session' | 'replace_history' | 'set_model';
 /**
  * Interrupt control - stop current processing
  */
@@ -590,12 +590,21 @@ interface ReplaceHistoryControl {
         parts: unknown[];
     }>;
 }
+/**
+ * Set model control - switch model for subsequent responses
+ * Note: Gemini CLI binary support is pending; currently the host adapter restarts the process.
+ */
+interface SetModelControl {
+    subtype: 'set_model';
+    /** The model identifier to switch to */
+    model: string;
+}
 /**
  * Control message sent to CLI
  */
 interface ControlInputMessage {
     type: JsonInputMessageType.CONTROL;
-    control: InterruptControl | TruncateHistoryControl | ResumeSessionControl | ReplaceHistoryControl;
+    control: InterruptControl | TruncateHistoryControl | ResumeSessionControl | ReplaceHistoryControl | SetModelControl;
     session_id?: string;
 }
 /**
@@ -1011,6 +1020,8 @@ declare class GeminiStreamClient extends EventEmitter$1 {
     private initTimeout;
     private tempSettingsPath;
     private logger;
+    /** stderr 行缓冲，处理 chunk 分片导致的半行问题 */
+    private stderrLineBuffer;
     constructor(options: GeminiStreamOptions);
     /**
      * Start the Gemini CLI process
@@ -1069,6 +1080,14 @@ declare class GeminiStreamClient extends EventEmitter$1 {
         role: string;
         parts: unknown[];
     }>): Promise<void>;
+    /**
+     * Switch model for subsequent responses.
+     * Note: Requires Gemini CLI binary support for the 'set_model' control subtype.
+     * Currently a preparatory API — the host adapter uses process restart to switch models.
+     *
+     * @param model - The model identifier to switch to
+     */
+    setModel(model: string): Promise<void>;
     /**
      * Send a response to an ask_user request from the CLI
      *
@@ -1144,6 +1163,20 @@ declare class GeminiStreamClient extends EventEmitter$1 {
      * Handle process error
      */
     private handleProcessError;
+    /**
+     * 处理 stderr chunk：按行切分并识别 turn finished reason
+     */
+    private processStderrChunk;
+    /**
+     * 进程结束时，处理 stderr 缓冲里最后一行（若存在）
+     */
+    private flushStderrLineBuffer;
+    /**
+     * 处理单行 stderr：
+     * - 识别 [StreamJsonMode] Turn finished: <reason>，并发出 FINISHED 结构化事件
+     * - 其余日志按原行为输出
+     */
+    private processStderrLine;
 }
 
 /**
@@ -1199,4 +1232,4 @@ declare function formatDuration(ms: number): string;
  */
 declare function formatTokens(tokens: number): string;
 
-export { type AskUserEvent, type AskUserResponseInputMessage, type ContextConfig, type ControlInputMessage, type ControlSubtype, type ErrorEvent, ExitCode, GeminiClient, type GeminiOptions, GeminiSDKError, GeminiStreamClient, type GeminiStreamOptions, type HooksConfiguration, type InitEvent, type InterruptControl, type JsonInputMessage, JsonInputMessageType, type JsonStreamEvent, JsonStreamEventType, LogLevel, type Logger, type LoggerOptions, type MCPServerConfig, type MCPServersConfig, type MessageEvent, ProcessStatus, type QueryResult, type Question, type QuestionOption, QuestionType, type ResultEvent, type ResumeSessionControl, SDKLogger, type StreamStats, type ThoughtEvent, type ToolPermissionDecision, type ToolPermissionRequest, type ToolResultEvent, type ToolUseEvent, type ToolsConfig, type TruncateHistoryControl, type UserInputMessage, createLogger, findGeminiCLI, formatDuration, formatTokens, getApiKey, query, sdkLogger, silentLogger, validateApiKey, validateModel };
+export { type AskUserEvent, type AskUserResponseInputMessage, type ContextConfig, type ControlInputMessage, type ControlSubtype, type ErrorEvent, ExitCode, GeminiClient, type GeminiOptions, GeminiSDKError, GeminiStreamClient, type GeminiStreamOptions, type HooksConfiguration, type InitEvent, type InterruptControl, type JsonInputMessage, JsonInputMessageType, type JsonStreamEvent, JsonStreamEventType, LogLevel, type Logger, type LoggerOptions, type MCPServerConfig, type MCPServersConfig, type MessageEvent, ProcessStatus, type QueryResult, type Question, type QuestionOption, QuestionType, type ReplaceHistoryControl, type ResultEvent, type ResumeSessionControl, SDKLogger, type SetModelControl, type StreamStats, type ThoughtEvent, type ToolPermissionDecision, type ToolPermissionRequest, type ToolResultEvent, type ToolUseEvent, type ToolsConfig, type TruncateHistoryControl, type UserInputMessage, createLogger, findGeminiCLI, formatDuration, formatTokens, getApiKey, query, sdkLogger, silentLogger, validateApiKey, validateModel };

package/dist/index.d.ts

@@ -545,7 +545,7 @@ interface UserInputMessage {
 /**
  * Control subtypes for control messages
  */
-type ControlSubtype = 'interrupt' | 'cancel' | 'shutdown' | 'truncate_history' | 'resume_session' | 'replace_history';
+type ControlSubtype = 'interrupt' | 'cancel' | 'shutdown' | 'truncate_history' | 'resume_session' | 'replace_history' | 'set_model';
 /**
  * Interrupt control - stop current processing
  */
@@ -590,12 +590,21 @@ interface ReplaceHistoryControl {
         parts: unknown[];
     }>;
 }
+/**
+ * Set model control - switch model for subsequent responses
+ * Note: Gemini CLI binary support is pending; currently the host adapter restarts the process.
+ */
+interface SetModelControl {
+    subtype: 'set_model';
+    /** The model identifier to switch to */
+    model: string;
+}
 /**
  * Control message sent to CLI
  */
 interface ControlInputMessage {
     type: JsonInputMessageType.CONTROL;
-    control: InterruptControl | TruncateHistoryControl | ResumeSessionControl | ReplaceHistoryControl;
+    control: InterruptControl | TruncateHistoryControl | ResumeSessionControl | ReplaceHistoryControl | SetModelControl;
     session_id?: string;
 }
 /**
@@ -1011,6 +1020,8 @@ declare class GeminiStreamClient extends EventEmitter$1 {
     private initTimeout;
     private tempSettingsPath;
     private logger;
+    /** stderr 行缓冲，处理 chunk 分片导致的半行问题 */
+    private stderrLineBuffer;
     constructor(options: GeminiStreamOptions);
     /**
      * Start the Gemini CLI process
@@ -1069,6 +1080,14 @@ declare class GeminiStreamClient extends EventEmitter$1 {
         role: string;
         parts: unknown[];
     }>): Promise<void>;
+    /**
+     * Switch model for subsequent responses.
+     * Note: Requires Gemini CLI binary support for the 'set_model' control subtype.
+     * Currently a preparatory API — the host adapter uses process restart to switch models.
+     *
+     * @param model - The model identifier to switch to
+     */
+    setModel(model: string): Promise<void>;
     /**
      * Send a response to an ask_user request from the CLI
      *
@@ -1144,6 +1163,20 @@ declare class GeminiStreamClient extends EventEmitter$1 {
      * Handle process error
      */
     private handleProcessError;
+    /**
+     * 处理 stderr chunk：按行切分并识别 turn finished reason
+     */
+    private processStderrChunk;
+    /**
+     * 进程结束时，处理 stderr 缓冲里最后一行（若存在）
+     */
+    private flushStderrLineBuffer;
+    /**
+     * 处理单行 stderr：
+     * - 识别 [StreamJsonMode] Turn finished: <reason>，并发出 FINISHED 结构化事件
+     * - 其余日志按原行为输出
+     */
+    private processStderrLine;
 }
 
 /**
@@ -1199,4 +1232,4 @@ declare function formatDuration(ms: number): string;
  */
 declare function formatTokens(tokens: number): string;
 
-export { type AskUserEvent, type AskUserResponseInputMessage, type ContextConfig, type ControlInputMessage, type ControlSubtype, type ErrorEvent, ExitCode, GeminiClient, type GeminiOptions, GeminiSDKError, GeminiStreamClient, type GeminiStreamOptions, type HooksConfiguration, type InitEvent, type InterruptControl, type JsonInputMessage, JsonInputMessageType, type JsonStreamEvent, JsonStreamEventType, LogLevel, type Logger, type LoggerOptions, type MCPServerConfig, type MCPServersConfig, type MessageEvent, ProcessStatus, type QueryResult, type Question, type QuestionOption, QuestionType, type ResultEvent, type ResumeSessionControl, SDKLogger, type StreamStats, type ThoughtEvent, type ToolPermissionDecision, type ToolPermissionRequest, type ToolResultEvent, type ToolUseEvent, type ToolsConfig, type TruncateHistoryControl, type UserInputMessage, createLogger, findGeminiCLI, formatDuration, formatTokens, getApiKey, query, sdkLogger, silentLogger, validateApiKey, validateModel };
+export { type AskUserEvent, type AskUserResponseInputMessage, type ContextConfig, type ControlInputMessage, type ControlSubtype, type ErrorEvent, ExitCode, GeminiClient, type GeminiOptions, GeminiSDKError, GeminiStreamClient, type GeminiStreamOptions, type HooksConfiguration, type InitEvent, type InterruptControl, type JsonInputMessage, JsonInputMessageType, type JsonStreamEvent, JsonStreamEventType, LogLevel, type Logger, type LoggerOptions, type MCPServerConfig, type MCPServersConfig, type MessageEvent, ProcessStatus, type QueryResult, type Question, type QuestionOption, QuestionType, type ReplaceHistoryControl, type ResultEvent, type ResumeSessionControl, SDKLogger, type SetModelControl, type StreamStats, type ThoughtEvent, type ToolPermissionDecision, type ToolPermissionRequest, type ToolResultEvent, type ToolUseEvent, type ToolsConfig, type TruncateHistoryControl, type UserInputMessage, createLogger, findGeminiCLI, formatDuration, formatTokens, getApiKey, query, sdkLogger, silentLogger, validateApiKey, validateModel };

package/dist/index.js

@@ -492,6 +492,8 @@ var GeminiStreamClient = class extends EventEmitter {
   initTimeout = null;
   tempSettingsPath = null;
   logger;
+  /** stderr 行缓冲，处理 chunk 分片导致的半行问题 */
+  stderrLineBuffer = "";
   /**
    * Start the Gemini CLI process
    */
@@ -535,11 +537,7 @@ var GeminiStreamClient = class extends EventEmitter {
     }
     if (this.process.stderr) {
       this.process.stderr.on("data", (chunk) => {
-        const message = chunk.toString().trim();
-        if (!message || message.includes("Flushing log events")) {
-          return;
-        }
-        this.logger.error("stderr:", message);
+        this.processStderrChunk(chunk.toString());
       });
     }
     this.emit("started");
@@ -670,6 +668,30 @@ var GeminiStreamClient = class extends EventEmitter {
     };
     this.writeMessage(message);
   }
+  /**
+   * Switch model for subsequent responses.
+   * Note: Requires Gemini CLI binary support for the 'set_model' control subtype.
+   * Currently a preparatory API — the host adapter uses process restart to switch models.
+   *
+   * @param model - The model identifier to switch to
+   */
+  async setModel(model) {
+    if (!this.isReady()) {
+      throw new GeminiSDKError("Client not ready. Call start() first.");
+    }
+    if (!model || typeof model !== "string") {
+      throw new GeminiSDKError("Model must be a non-empty string.");
+    }
+    const message = {
+      type: "control" /* CONTROL */,
+      control: {
+        subtype: "set_model",
+        model
+      },
+      session_id: this.options.sessionId
+    };
+    this.writeMessage(message);
+  }
   /**
    * Send a response to an ask_user request from the CLI
    *
@@ -952,6 +974,7 @@ var GeminiStreamClient = class extends EventEmitter {
    * Handle process exit
    */
   handleProcessExit(code, signal) {
+    this.flushStderrLineBuffer();
     this.logger.debug("Process exited:", { code, signal });
     if (code !== 0 && code !== null) {
       this.status = "error" /* ERROR */;
@@ -975,6 +998,50 @@ var GeminiStreamClient = class extends EventEmitter {
     this.status = "error" /* ERROR */;
     this.emit("error", error);
   }
+  /**
+   * 处理 stderr chunk：按行切分并识别 turn finished reason
+   */
+  processStderrChunk(chunkText) {
+    this.stderrLineBuffer += chunkText;
+    const lines = this.stderrLineBuffer.split(/\r?\n/);
+    this.stderrLineBuffer = lines.pop() ?? "";
+    for (const line of lines) {
+      this.processStderrLine(line);
+    }
+  }
+  /**
+   * 进程结束时，处理 stderr 缓冲里最后一行（若存在）
+   */
+  flushStderrLineBuffer() {
+    if (!this.stderrLineBuffer) return;
+    this.processStderrLine(this.stderrLineBuffer);
+    this.stderrLineBuffer = "";
+  }
+  /**
+   * 处理单行 stderr：
+   * - 识别 [StreamJsonMode] Turn finished: <reason>，并发出 FINISHED 结构化事件
+   * - 其余日志按原行为输出
+   */
+  processStderrLine(rawLine) {
+    const line = rawLine.trim();
+    if (!line || line.includes("Flushing log events")) {
+      return;
+    }
+    const match = line.match(/\[StreamJsonMode\]\s+Turn finished:\s*(.+)\s*$/);
+    if (match) {
+      const reason = match[1]?.trim();
+      if (reason) {
+        this.emit("event", {
+          type: "finished" /* FINISHED */,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          value: {
+            reason
+          }
+        });
+      }
+    }
+    this.logger.error("stderr:", line);
+  }
 };
 function findGeminiCLI(cwd = process.cwd()) {
   if (process.env.GEMINI_CLI_PATH) {