@mmmbuto/nexuscli 0.7.3 → 0.7.4

package/lib/server/services/cli-loader.js

@@ -48,7 +48,7 @@ class CliLoader {
   async loadMessagesFromCLI({
     sessionId,
     threadId,          // optional native thread id (e.g., Codex exec thread)
-    sessionPath,       // alias for compatibility
+    sessionPath,       // alias kept for compatibility
     engine = 'claude',
     workspacePath,
     limit = DEFAULT_LIMIT,
@@ -74,7 +74,7 @@ class CliLoader {
         break;
 
       case 'gemini':
-        result = await this.loadGeminiMessages({ sessionId, limit, before, mode });
+        result = await this.loadGeminiMessages({ sessionId, nativeId, limit, before, mode });
         break;
 
       default:
@@ -284,24 +284,85 @@ class CliLoader {
     return null;
   }
 
+  /**
+   * Find Gemini session file by native ID (short hash)
+   * Searches in ~/.gemini/tmp/<installation-hash>/chats/
+   *
+   * @param {string} nativeId - Short hash (first 8 chars of UUID)
+   * @returns {string|null} - Full path to session file or null
+   */
+  findGeminiSessionFile(nativeId) {
+    const tmpDir = path.join(this.geminiPath, 'tmp');
+
+    if (!nativeId || !fs.existsSync(tmpDir)) {
+      return null;
+    }
+
+    try {
+      // Extract short hash from nativeId (first 8 chars if UUID, or use as-is)
+      const shortHash = nativeId.length > 8 ? nativeId.substring(0, 8) : nativeId;
+
+      // Scan all installation hash directories
+      const installations = fs.readdirSync(tmpDir);
+
+      for (const installHash of installations) {
+        const chatsDir = path.join(tmpDir, installHash, 'chats');
+
+        if (!fs.existsSync(chatsDir)) continue;
+
+        // List all session files
+        const files = fs.readdirSync(chatsDir);
+
+        // Find file matching pattern: session-*-<shortHash>.json
+        for (const file of files) {
+          if (file.endsWith(`-${shortHash}.json`)) {
+            return path.join(chatsDir, file);
+          }
+        }
+      }
+    } catch (err) {
+      console.warn(`[CliLoader] Failed to search Gemini session file: ${err.message}`);
+    }
+
+    return null;
+  }
+
   // ============================================================
-  // GEMINI - Load from ~/.gemini/sessions/<sessionId>.jsonl
+  // GEMINI - Load from ~/.gemini/tmp/<hash>/chats/session-*.json
   // ============================================================
 
-  async loadGeminiMessages({ sessionId, limit, before, mode }) {
-    const sessionFile = path.join(this.geminiPath, 'sessions', `${sessionId}.jsonl`);
+  async loadGeminiMessages({ sessionId, nativeId, limit, before, mode }) {
+    // Use nativeId (short hash) to find the file
+    const shortHash = nativeId
+      ? (nativeId.length > 8 ? nativeId.substring(0, 8) : nativeId)
+      : (sessionId.length > 8 ? sessionId.substring(0, 8) : sessionId);
+
+    const sessionFile = this.findGeminiSessionFile(shortHash);
 
     // Gemini CLI may not save sessions - check if file exists
-    if (!fs.existsSync(sessionFile)) {
-      console.log(`[CliLoader] Gemini session file not found: ${sessionFile}`);
+    if (!sessionFile || !fs.existsSync(sessionFile)) {
+      console.log(`[CliLoader] Gemini session file not found (id=${shortHash})`);
       return this._emptyResult();
     }
 
-    const rawMessages = await this._parseJsonlFile(sessionFile);
+    // Parse JSON file (NOT jsonl!)
+    let sessionData;
+    try {
+      const fileContent = fs.readFileSync(sessionFile, 'utf8');
+      sessionData = JSON.parse(fileContent);
+    } catch (err) {
+      console.error(`[CliLoader] Failed to parse Gemini session file: ${err.message}`);
+      return this._emptyResult();
+    }
+
+    // Extract messages array from session object
+    const rawMessages = Array.isArray(sessionData)
+      ? sessionData
+      : (sessionData.messages || []);
 
     // Filter and normalize
     const messages = rawMessages
-      .filter(entry => entry.role === 'user' || entry.role === 'model' || entry.role === 'assistant')
+      .filter(entry => entry.type === 'user' || entry.type === 'gemini')
       .map(entry => this._normalizeGeminiEntry(entry));
 
     return this._paginateMessages(messages, limit, before, mode);
@@ -311,8 +372,8 @@ class CliLoader {
    * Normalize Gemini session entry to message shape
    */
   _normalizeGeminiEntry(entry) {
-    // Gemini uses 'model' instead of 'assistant'
-    const role = entry.role === 'model' ? 'assistant' : (entry.role || 'assistant');
+    // Gemini uses 'gemini' instead of 'assistant' in type field
+    const role = entry.type === 'gemini' ? 'assistant' : (entry.type || 'assistant');
     const created_at = entry.timestamp ? new Date(entry.timestamp).getTime() : Date.now();
 
     // Gemini content format
@@ -320,7 +381,7 @@ class CliLoader {
     if (typeof entry.content === 'string') {
       content = entry.content;
     } else if (Array.isArray(entry.parts)) {
-      // Gemini uses parts array: [{text: '...'}]
+      // Gemini API uses parts array: [{text: '...'}]
       content = entry.parts
         .filter(p => p.text)
         .map(p => p.text)
@@ -336,7 +397,10 @@ class CliLoader {
       engine: 'gemini',
       created_at,
       metadata: {
-        model: entry.model
+        model: entry.model,
+        tokens: entry.tokens,  // Contatori token (input/output/cached/thoughts)
+        thoughts: entry.thoughts,  // Thinking process (Gemini 3+)
+        toolCalls: entry.toolCalls  // Tool usage tracking
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmmbuto/nexuscli",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "NexusCLI - TRI CLI Control Plane (Claude/Codex/Gemini)",
   "main": "lib/server/server.js",
   "bin": {