@ketd/gemini-cli-sdk 0.2.2 → 0.2.4

package/dist/index.d.cts

@@ -114,6 +114,7 @@ interface ToolPermissionDecision {
  * JSON Stream Event Types
  *
  * Based on: @google/gemini-cli/packages/core/src/output/types.ts
+ * Plus additional event types actually sent by CLI
  */
 declare enum JsonStreamEventType {
     /** Session initialization */
@@ -129,7 +130,13 @@ declare enum JsonStreamEventType {
     /** Error event */
     ERROR = "error",
     /** Final result */
-    RESULT = "result"
+    RESULT = "result",
+    /** Message content chunk (streaming) */
+    CONTENT = "content",
+    /** Message completion with metadata */
+    FINISHED = "finished",
+    /** Model information */
+    MODEL_INFO = "model_info"
 }
 /**
  * Base event interface
@@ -178,13 +185,21 @@ interface ToolResultEvent extends BaseJsonStreamEvent {
         message: string;
     };
 }
+/**
+ * Thought summary containing subject and description
+ */
+interface ThoughtSummary {
+    subject: string;
+    description?: string;
+}
 /**
  * Thought/reasoning event
+ * Emitted by Gemini CLI when the model is thinking
  */
 interface ThoughtEvent extends BaseJsonStreamEvent {
     type: JsonStreamEventType.THOUGHT;
-    subject: string;
-    description?: string;
+    value: ThoughtSummary;
+    traceId?: string;
 }
 /**
  * Error event
@@ -216,10 +231,50 @@ interface ResultEvent extends BaseJsonStreamEvent {
     };
     stats?: StreamStats;
 }
+/**
+ * Content event (streaming message chunk)
+ * This is the actual event type sent by Gemini CLI for message content
+ */
+interface ContentEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.CONTENT;
+    value: string;
+    traceId?: string;
+}
+/**
+ * Finished event (message completion with metadata)
+ */
+interface FinishedEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.FINISHED;
+    value: {
+        reason: string;
+        usageMetadata?: {
+            promptTokenCount?: number;
+            candidatesTokenCount?: number;
+            totalTokenCount?: number;
+            trafficType?: string;
+            promptTokensDetails?: Array<{
+                modality: string;
+                tokenCount: number;
+            }>;
+            candidatesTokensDetails?: Array<{
+                modality: string;
+                tokenCount: number;
+            }>;
+            thoughtsTokenCount?: number;
+        };
+    };
+}
+/**
+ * Model information event
+ */
+interface ModelInfoEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.MODEL_INFO;
+    value: string;
+}
 /**
  * Union type of all JSON stream events
  */
-type JsonStreamEvent = InitEvent | MessageEvent | ToolUseEvent | ToolResultEvent | ThoughtEvent | ErrorEvent | ResultEvent;
+type JsonStreamEvent = InitEvent | MessageEvent | ToolUseEvent | ToolResultEvent | ThoughtEvent | ErrorEvent | ResultEvent | ContentEvent | FinishedEvent | ModelInfoEvent;
 /**
  * Gemini CLI exit codes
  */
@@ -321,6 +376,33 @@ interface ControlInputMessage {
  * Union type for input messages
  */
 type JsonInputMessage = UserInputMessage | ControlInputMessage;
+/**
+ * Hook configuration types (from Gemini CLI)
+ */
+interface HookConfig {
+    type: 'command';
+    command: string;
+    timeout?: number;
+}
+interface HookDefinition {
+    matcher?: string;
+    sequential?: boolean;
+    hooks: HookConfig[];
+}
+interface HooksConfiguration {
+    BeforeTool?: HookDefinition[];
+    AfterTool?: HookDefinition[];
+    BeforeAgent?: HookDefinition[];
+    AfterAgent?: HookDefinition[];
+    BeforeModel?: HookDefinition[];
+    AfterModel?: HookDefinition[];
+    BeforeToolSelection?: HookDefinition[];
+    Notification?: HookDefinition[];
+    SessionStart?: HookDefinition[];
+    SessionEnd?: HookDefinition[];
+    PreCompress?: HookDefinition[];
+    disabled?: string[];
+}
 /**
  * Options for GeminiStreamClient
  */
@@ -373,6 +455,17 @@ interface GeminiStreamOptions {
      * @default 30000
      */
     initTimeout?: number;
+    /**
+     * Hooks configuration
+     * Passed to Gemini CLI via temporary settings.json
+     */
+    hooks?: HooksConfiguration;
+    /**
+     * Resume from a previous session file path
+     * If provided, Gemini CLI will load the session history using --resume flag
+     * @example '/path/to/session-2025-01-01T12-00-abc123.json'
+     */
+    resumeSessionFilePath?: string;
 }
 
 /**
@@ -536,6 +629,7 @@ declare class GeminiStreamClient extends EventEmitter$1 {
     private status;
     private initEvent;
     private initTimeout;
+    private tempSettingsPath;
     constructor(options: GeminiStreamOptions);
     /**
      * Start the Gemini CLI process
@@ -569,6 +663,10 @@ declare class GeminiStreamClient extends EventEmitter$1 {
      * Get process PID
      */
     getPid(): number | undefined;
+    /**
+     * Create temporary settings.json for hooks configuration
+     */
+    private createTempSettings;
     /**
      * Build CLI command arguments
      */

package/dist/index.d.ts

@@ -114,6 +114,7 @@ interface ToolPermissionDecision {
  * JSON Stream Event Types
  *
  * Based on: @google/gemini-cli/packages/core/src/output/types.ts
+ * Plus additional event types actually sent by CLI
  */
 declare enum JsonStreamEventType {
     /** Session initialization */
@@ -129,7 +130,13 @@ declare enum JsonStreamEventType {
     /** Error event */
     ERROR = "error",
     /** Final result */
-    RESULT = "result"
+    RESULT = "result",
+    /** Message content chunk (streaming) */
+    CONTENT = "content",
+    /** Message completion with metadata */
+    FINISHED = "finished",
+    /** Model information */
+    MODEL_INFO = "model_info"
 }
 /**
  * Base event interface
@@ -178,13 +185,21 @@ interface ToolResultEvent extends BaseJsonStreamEvent {
         message: string;
     };
 }
+/**
+ * Thought summary containing subject and description
+ */
+interface ThoughtSummary {
+    subject: string;
+    description?: string;
+}
 /**
  * Thought/reasoning event
+ * Emitted by Gemini CLI when the model is thinking
  */
 interface ThoughtEvent extends BaseJsonStreamEvent {
     type: JsonStreamEventType.THOUGHT;
-    subject: string;
-    description?: string;
+    value: ThoughtSummary;
+    traceId?: string;
 }
 /**
  * Error event
@@ -216,10 +231,50 @@ interface ResultEvent extends BaseJsonStreamEvent {
     };
     stats?: StreamStats;
 }
+/**
+ * Content event (streaming message chunk)
+ * This is the actual event type sent by Gemini CLI for message content
+ */
+interface ContentEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.CONTENT;
+    value: string;
+    traceId?: string;
+}
+/**
+ * Finished event (message completion with metadata)
+ */
+interface FinishedEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.FINISHED;
+    value: {
+        reason: string;
+        usageMetadata?: {
+            promptTokenCount?: number;
+            candidatesTokenCount?: number;
+            totalTokenCount?: number;
+            trafficType?: string;
+            promptTokensDetails?: Array<{
+                modality: string;
+                tokenCount: number;
+            }>;
+            candidatesTokensDetails?: Array<{
+                modality: string;
+                tokenCount: number;
+            }>;
+            thoughtsTokenCount?: number;
+        };
+    };
+}
+/**
+ * Model information event
+ */
+interface ModelInfoEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.MODEL_INFO;
+    value: string;
+}
 /**
  * Union type of all JSON stream events
  */
-type JsonStreamEvent = InitEvent | MessageEvent | ToolUseEvent | ToolResultEvent | ThoughtEvent | ErrorEvent | ResultEvent;
+type JsonStreamEvent = InitEvent | MessageEvent | ToolUseEvent | ToolResultEvent | ThoughtEvent | ErrorEvent | ResultEvent | ContentEvent | FinishedEvent | ModelInfoEvent;
 /**
  * Gemini CLI exit codes
  */
@@ -321,6 +376,33 @@ interface ControlInputMessage {
  * Union type for input messages
  */
 type JsonInputMessage = UserInputMessage | ControlInputMessage;
+/**
+ * Hook configuration types (from Gemini CLI)
+ */
+interface HookConfig {
+    type: 'command';
+    command: string;
+    timeout?: number;
+}
+interface HookDefinition {
+    matcher?: string;
+    sequential?: boolean;
+    hooks: HookConfig[];
+}
+interface HooksConfiguration {
+    BeforeTool?: HookDefinition[];
+    AfterTool?: HookDefinition[];
+    BeforeAgent?: HookDefinition[];
+    AfterAgent?: HookDefinition[];
+    BeforeModel?: HookDefinition[];
+    AfterModel?: HookDefinition[];
+    BeforeToolSelection?: HookDefinition[];
+    Notification?: HookDefinition[];
+    SessionStart?: HookDefinition[];
+    SessionEnd?: HookDefinition[];
+    PreCompress?: HookDefinition[];
+    disabled?: string[];
+}
 /**
  * Options for GeminiStreamClient
  */
@@ -373,6 +455,17 @@ interface GeminiStreamOptions {
      * @default 30000
      */
     initTimeout?: number;
+    /**
+     * Hooks configuration
+     * Passed to Gemini CLI via temporary settings.json
+     */
+    hooks?: HooksConfiguration;
+    /**
+     * Resume from a previous session file path
+     * If provided, Gemini CLI will load the session history using --resume flag
+     * @example '/path/to/session-2025-01-01T12-00-abc123.json'
+     */
+    resumeSessionFilePath?: string;
 }
 
 /**
@@ -536,6 +629,7 @@ declare class GeminiStreamClient extends EventEmitter$1 {
     private status;
     private initEvent;
     private initTimeout;
+    private tempSettingsPath;
     constructor(options: GeminiStreamOptions);
     /**
      * Start the Gemini CLI process
@@ -569,6 +663,10 @@ declare class GeminiStreamClient extends EventEmitter$1 {
      * Get process PID
      */
     getPid(): number | undefined;
+    /**
+     * Create temporary settings.json for hooks configuration
+     */
+    private createTempSettings;
     /**
      * Build CLI command arguments
      */

package/dist/index.js

@@ -1,8 +1,9 @@
 import { spawn } from 'child_process';
 import * as readline from 'readline';
 import { EventEmitter } from 'events';
-import * as path from 'path';
-import * as fs from 'fs';
+import * as fs2 from 'fs';
+import * as path2 from 'path';
+import * as os from 'os';
 
 // src/query.ts
 
@@ -15,6 +16,9 @@ var JsonStreamEventType = /* @__PURE__ */ ((JsonStreamEventType2) => {
   JsonStreamEventType2["THOUGHT"] = "thought";
   JsonStreamEventType2["ERROR"] = "error";
   JsonStreamEventType2["RESULT"] = "result";
+  JsonStreamEventType2["CONTENT"] = "content";
+  JsonStreamEventType2["FINISHED"] = "finished";
+  JsonStreamEventType2["MODEL_INFO"] = "model_info";
   return JsonStreamEventType2;
 })(JsonStreamEventType || {});
 var ExitCode = /* @__PURE__ */ ((ExitCode2) => {
@@ -384,6 +388,7 @@ var GeminiStreamClient = class extends EventEmitter {
   status = "idle" /* IDLE */;
   initEvent = null;
   initTimeout = null;
+  tempSettingsPath = null;
   /**
    * Start the Gemini CLI process
    */
@@ -392,6 +397,9 @@ var GeminiStreamClient = class extends EventEmitter {
       throw new GeminiSDKError("Process already started");
     }
     this.status = "running" /* RUNNING */;
+    if (this.options.hooks) {
+      await this.createTempSettings();
+    }
     const args = this.buildCommand();
     const env = this.buildEnv();
     this.process = spawn("node", args, {
@@ -499,6 +507,17 @@ var GeminiStreamClient = class extends EventEmitter {
     }
     this.process = null;
     this.status = "completed" /* COMPLETED */;
+    if (this.tempSettingsPath) {
+      try {
+        fs2.unlinkSync(this.tempSettingsPath);
+        if (this.options.debug) {
+          console.log("[GeminiStreamClient] Cleaned up temp settings:", this.tempSettingsPath);
+        }
+      } catch (error) {
+        console.error("[GeminiStreamClient] Failed to clean up temp settings:", error);
+      }
+      this.tempSettingsPath = null;
+    }
   }
   /**
    * Check if client is ready to send messages
@@ -524,6 +543,28 @@ var GeminiStreamClient = class extends EventEmitter {
   getPid() {
     return this.process?.pid;
   }
+  /**
+   * Create temporary settings.json for hooks configuration
+   */
+  async createTempSettings() {
+    const tempDir = os.tmpdir();
+    this.tempSettingsPath = path2.join(tempDir, `gemini-settings-${this.options.sessionId}.json`);
+    const settings = {
+      tools: {
+        enableHooks: true
+      },
+      hooks: this.options.hooks
+    };
+    try {
+      fs2.writeFileSync(this.tempSettingsPath, JSON.stringify(settings, null, 2), "utf-8");
+      if (this.options.debug) {
+        console.log("[GeminiStreamClient] Created temp settings:", this.tempSettingsPath);
+        console.log("[GeminiStreamClient] Settings content:", JSON.stringify(settings, null, 2));
+      }
+    } catch (error) {
+      throw new GeminiSDKError(`Failed to create temp settings file: ${error}`);
+    }
+  }
   /**
    * Build CLI command arguments
    */
@@ -535,6 +576,15 @@ var GeminiStreamClient = class extends EventEmitter {
       "--output-format",
       "stream-json"
     ];
+    if (this.tempSettingsPath) {
+      args.push("--settings-file", this.tempSettingsPath);
+    }
+    if (this.options.resumeSessionFilePath) {
+      args.push("--resume", this.options.resumeSessionFilePath);
+      if (this.options.debug) {
+        console.log("[GeminiStreamClient] Resuming from session file:", this.options.resumeSessionFilePath);
+      }
+    }
     if (this.options.model) {
       args.push("--model", this.options.model);
     }
@@ -556,12 +606,28 @@ var GeminiStreamClient = class extends EventEmitter {
     };
     if (this.options.apiKey) {
       const useVertexAI = this.options.env?.GOOGLE_GENAI_USE_VERTEXAI === "true";
+      if (this.options.debug) {
+        console.log("[GeminiStreamClient] buildEnv() - API Key prefix:", this.options.apiKey.substring(0, 3));
+        console.log("[GeminiStreamClient] buildEnv() - GOOGLE_GENAI_USE_VERTEXAI:", this.options.env?.GOOGLE_GENAI_USE_VERTEXAI);
+        console.log("[GeminiStreamClient] buildEnv() - useVertexAI:", useVertexAI);
+      }
       if (useVertexAI) {
         env.GOOGLE_API_KEY = this.options.apiKey;
+        if (this.options.debug) {
+          console.log("[GeminiStreamClient] buildEnv() - Setting GOOGLE_API_KEY for Vertex AI");
+        }
       } else {
         env.GEMINI_API_KEY = this.options.apiKey;
+        if (this.options.debug) {
+          console.log("[GeminiStreamClient] buildEnv() - Setting GEMINI_API_KEY for AI Studio");
+        }
       }
     }
+    if (this.options.debug) {
+      console.log("[GeminiStreamClient] buildEnv() - Final env has GOOGLE_API_KEY:", !!env.GOOGLE_API_KEY);
+      console.log("[GeminiStreamClient] buildEnv() - Final env has GEMINI_API_KEY:", !!env.GEMINI_API_KEY);
+      console.log("[GeminiStreamClient] buildEnv() - Final env GOOGLE_GENAI_USE_VERTEXAI:", env.GOOGLE_GENAI_USE_VERTEXAI);
+    }
     return env;
   }
   /**
@@ -680,17 +746,17 @@ var GeminiStreamClient = class extends EventEmitter {
 function findGeminiCLI(cwd = process.cwd()) {
   if (process.env.GEMINI_CLI_PATH) {
     const envPath = process.env.GEMINI_CLI_PATH;
-    if (fs.existsSync(envPath)) {
+    if (fs2.existsSync(envPath)) {
       return envPath;
     }
   }
-  const localPath = path.join(cwd, "node_modules", "@google", "gemini-cli", "bundle", "gemini.js");
-  if (fs.existsSync(localPath)) {
+  const localPath = path2.join(cwd, "node_modules", "@google", "gemini-cli", "bundle", "gemini.js");
+  if (fs2.existsSync(localPath)) {
     return localPath;
   }
   let currentDir = cwd;
   for (let i = 0; i < 5; i++) {
-    const parentPath = path.join(
+    const parentPath = path2.join(
       currentDir,
       "node_modules",
       "@google",
@@ -698,10 +764,10 @@ function findGeminiCLI(cwd = process.cwd()) {
       "bundle",
       "gemini.js"
     );
-    if (fs.existsSync(parentPath)) {
+    if (fs2.existsSync(parentPath)) {
       return parentPath;
     }
-    const parentDir = path.dirname(currentDir);
+    const parentDir = path2.dirname(currentDir);
     if (parentDir === currentDir) break;
     currentDir = parentDir;
   }