@mmmbuto/nexuscli 0.7.5 → 0.7.7

package/lib/server/services/gemini-wrapper.js

@@ -10,13 +10,14 @@
  * - -o stream-json: JSON streaming output
  * - --include-directories: Workspace access
  *
- * @version 0.4.0 - TRI CLI Support
+ * @version 0.5.0 - Extended BaseCliWrapper for interrupt support
  */
 
 const fs = require('fs');
 const path = require('path');
 const pty = require('../lib/pty-adapter');
 const GeminiOutputParser = require('./gemini-output-parser');
+const BaseCliWrapper = require('./base-cli-wrapper');
 
 // Default model - Gemini 3 Pro Preview
 const DEFAULT_MODEL = 'gemini-3-pro-preview';
@@ -24,8 +25,9 @@ const DEFAULT_MODEL = 'gemini-3-pro-preview';
 // CLI timeout (10 minutes)
 const CLI_TIMEOUT_MS = 600000;
 
-class GeminiWrapper {
+class GeminiWrapper extends BaseCliWrapper {
   constructor(options = {}) {
+    super();  // Initialize activeProcesses from BaseCliWrapper
     this.geminiPath = this._resolveGeminiPath(options.geminiPath);
     this.workspaceDir = options.workspaceDir || process.cwd();
 
@@ -67,15 +69,15 @@ class GeminiWrapper {
    *
    * @param {Object} params
    * @param {string} params.prompt - User message/prompt
-   * @param {string} params.sessionId - Session UUID (for logging)
+   * @param {string} params.threadId - Native Gemini session ID for resume
    * @param {string} [params.model='gemini-3-pro-preview'] - Model name
    * @param {string} [params.workspacePath] - Workspace directory
    * @param {Function} [params.onStatus] - Callback for status events (SSE streaming)
-   * @returns {Promise<{text: string, usage: Object}>}
+   * @returns {Promise<{text: string, usage: Object, sessionId: string}>}
    */
   async sendMessage({
     prompt,
-    sessionId,
+    threadId,
     model = DEFAULT_MODEL,
     workspacePath,
     onStatus
@@ -87,16 +89,23 @@ class GeminiWrapper {
       const cwd = workspacePath || this.workspaceDir;
 
       // Build CLI arguments
-      // Note: cwd is set in pty.spawn() options, no need for --include-directories
+      // If threadId exists, use --resume to continue native session
       const args = [
         '-y',                              // YOLO mode - auto-approve all actions
         '-m', model,                       // Model selection
         '-o', 'stream-json',               // JSON streaming for structured events
-        prompt                             // Prompt as positional argument
       ];
 
+      // Add resume flag if continuing existing session
+      if (threadId) {
+        args.push('--resume', threadId);
+      }
+
+      // Add prompt as positional argument
+      args.push(prompt);
+
       console.log(`[GeminiWrapper] Model: ${model}`);
-      console.log(`[GeminiWrapper] Session: ${sessionId}`);
+      console.log(`[GeminiWrapper] ThreadId: ${threadId || '(new session)'}`);
       console.log(`[GeminiWrapper] CWD: ${cwd}`);
       console.log(`[GeminiWrapper] Prompt length: ${prompt.length}`);
 
@@ -117,6 +126,11 @@ class GeminiWrapper {
         return reject(new Error(`Failed to spawn Gemini CLI: ${spawnError.message}`));
       }
 
+      // Register process for interrupt capability
+      // Use threadId if available, otherwise generate temp ID
+      const processId = threadId || `gemini-${Date.now()}`;
+      this.registerProcess(processId, ptyProcess, 'pty');
+
       let stdout = '';
 
       // Handle PTY data
@@ -145,6 +159,9 @@ class GeminiWrapper {
 
       // Handle PTY exit
       ptyProcess.onExit(({ exitCode }) => {
+        // Unregister process on exit
+        this.unregisterProcess(processId);
+
         if (promiseSettled) return;
         promiseSettled = true;
 
@@ -170,6 +187,7 @@ class GeminiWrapper {
 
         resolve({
           text: finalResponse,
+          sessionId: parser.getSessionId(), // Native Gemini session ID for resume
           usage: {
             prompt_tokens: promptTokens,
             completion_tokens: completionTokens,

package/lib/server/services/session-manager.js

@@ -442,6 +442,26 @@ class SessionManager {
     }
   }
 
+  /**
+   * Bump session activity counters (message_count, last_used_at)
+   * @param {string} sessionId
+   * @param {number} increment
+   */
+  bumpSessionActivity(sessionId, increment = 1) {
+    if (!sessionId) return;
+    try {
+      const stmt = prepare(`
+        UPDATE sessions
+        SET message_count = COALESCE(message_count, 0) + ?, last_used_at = ?
+        WHERE id = ?
+      `);
+      stmt.run(increment, Date.now(), sessionId);
+      saveDb();
+    } catch (error) {
+      console.warn(`[SessionManager] Failed to bump activity for ${sessionId}:`, error.message);
+    }
+  }
+
   /**
    * Get all sessions for a conversation
    */

package/lib/server/services/workspace-manager.js

@@ -396,7 +396,7 @@ class WorkspaceManager {
    * @returns {string}
    */
   getSessionPath(workspacePath) {
-    // Convert /home/user/myproject → -home-user-myproject
+    // Convert /var/www/myapp → -var-www-myapp
     const projectDir = workspacePath.replace(/\//g, '-').replace(/^-/, '');
     return path.join(this.claudePath, 'projects', projectDir);
   }

package/lib/server/tests/performance.test.js

@@ -45,7 +45,7 @@ describe('Performance Benchmarks', () => {
 
   test('Workspace validation should be fast', async () => {
     const manager = new WorkspaceManager();
-    const testPath = '/home/user/myproject';
+    const testPath = '/var/www/myapp';
 
     const start = Date.now();
     const validated = await manager.validateWorkspace(testPath);

package/lib/server/tests/services.test.js

@@ -16,7 +16,7 @@ describe('WorkspaceManager', () => {
 
   test('should validate workspace path', async () => {
     // Test with allowed path
-    const validPath = '/home/user/myproject';
+    const validPath = '/var/www/myapp';
     const result = await manager.validateWorkspace(validPath);
     expect(result).toBe(validPath);
   });
@@ -147,7 +147,7 @@ describe('SummaryGenerator', () => {
 describe('Integration - Service Interactions', () => {
   test('WorkspaceManager should use consistent path resolution', async () => {
     const manager = new WorkspaceManager();
-    const testPath = '/home/user/myproject';
+    const testPath = '/var/www/myapp';
     const validated = await manager.validateWorkspace(testPath);
     expect(validated).toBe(testPath);
   });

package/package.json

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