@mmmbuto/nexuscli 0.8.1 → 0.8.3

package/README.md

@@ -28,7 +28,7 @@ NexusCLI is a lightweight AI cockpit (Termux-first) to orchestrate Claude Code,
 
 ---
 
-## Highlights (v0.8.0)
+## Highlights (v0.8.3)
 
 - Multi-engine: Claude, Codex, Gemini
 - Native resume: same engine resumes the session; switching engines uses handoff with summary/history
@@ -36,6 +36,7 @@ NexusCLI is a lightweight AI cockpit (Termux-first) to orchestrate Claude Code,
 - Session import: on startup it imports native sessions from ~/.claude ~/.codex ~/.gemini; manual endpoint `POST /api/v1/sessions/import`
 - Voice input (Whisper), auto HTTPS for remote microphone
 - Mobile-first UI with SSE streaming and explicit workspace selection
+- Termux: postinstall installs `ripgrep`; Claude wrapper auto-patches missing `vendor/ripgrep/arm64-android/rg`; Codex parser exposes threadId to prevent crash on exit
 
 ## Supported Engines
 

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

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const pty = require('../lib/pty-adapter');
 const OutputParser = require('./output-parser');
+const BaseCliWrapper = require('./base-cli-wrapper');
 const { getApiKey } = require('../db');
 
 /**
@@ -18,11 +19,15 @@ const { getApiKey } = require('../db');
  * - Parses stdout for tool use, thinking, file ops
  * - Emits status events → SSE stream
  * - Returns final response text → saved in DB
+ *
+ * @version 0.5.0 - Extended BaseCliWrapper for interrupt support
  */
-class ClaudeWrapper {
+class ClaudeWrapper extends BaseCliWrapper {
   constructor(options = {}) {
+    super();  // Initialize activeProcesses from BaseCliWrapper
     this.claudePath = this.resolveClaudePath(options.claudePath);
     this.workspaceDir = options.workspaceDir || process.env.NEXUSCLI_WORKSPACE || process.cwd();
+    this.rgPatched = false;
   }
 
   isExistingSession(sessionId, workspacePath) {
@@ -75,6 +80,60 @@ class ClaudeWrapper {
     return null;
   }
 
+  /**
+   * Termux fix: Claude Code bundles ripgrep only for arm64-linux, but on Android
+   * it looks for vendor/ripgrep/arm64-android/rg. Create a symlink on the fly so
+   * fresh installs work without manual steps.
+   */
+  ensureRipgrepForTermux() {
+    if (this.rgPatched) return;
+    const isTermux = (process.env.PREFIX || '').includes('/com.termux/');
+    if (!isTermux || !this.claudePath) return;
+
+    try {
+      // claudePath points to cli.js or wrapper binary; vendor lives alongside
+      const cliDir = path.dirname(this.claudePath);
+      const vendorDir = path.join(cliDir, 'vendor', 'ripgrep');
+      const linuxRg = path.join(vendorDir, 'arm64-linux', 'rg');
+      const androidDir = path.join(vendorDir, 'arm64-android');
+      const androidRg = path.join(androidDir, 'rg');
+
+      if (!fs.existsSync(vendorDir)) return;
+
+      // Prefer bundled arm64-linux rg; fallback to system rg if bundle missing
+      let rgSource = null;
+      if (fs.existsSync(linuxRg)) {
+        rgSource = linuxRg;
+      } else {
+        // Try system rg (Termux package ripgrep)
+        try {
+          const whichRg = require('child_process')
+            .execSync('which rg', { encoding: 'utf8' })
+            .trim();
+          if (whichRg && fs.existsSync(whichRg)) {
+            rgSource = whichRg;
+            console.log('[ClaudeWrapper] Using system ripgrep for Termux:', whichRg);
+          }
+        } catch (_) {
+          // leave rgSource null; we’ll exit gracefully
+        }
+      }
+
+      if (!rgSource) return;
+      if (fs.existsSync(androidRg)) {
+        this.rgPatched = true;
+        return;
+      }
+
+      fs.mkdirSync(androidDir, { recursive: true });
+      fs.symlinkSync(rgSource, androidRg);
+      console.log('[ClaudeWrapper] Created ripgrep symlink for Termux:', androidRg, '→', rgSource);
+      this.rgPatched = true;
+    } catch (err) {
+      console.warn('[ClaudeWrapper] Failed to patch ripgrep for Termux:', err.message);
+    }
+  }
+
   /**
    * Send message to Claude Code CLI
    *
@@ -125,6 +184,9 @@ class ClaudeWrapper {
       // Use provided workspace or fallback to default
       const cwd = workspacePath || this.workspaceDir;
 
+      // Termux compatibility: make sure ripgrep path exists before spawn
+      this.ensureRipgrepForTermux();
+
       // Build environment - detect DeepSeek models and configure API accordingly
       const spawnEnv = { ...process.env };
       const isDeepSeek = model.startsWith('deepseek-');
@@ -200,8 +262,28 @@ class ClaudeWrapper {
         return reject(new Error(msg));
       }
 
+      // Register process for interrupt capability
+      this.registerProcess(conversationId, ptyProcess, 'pty');
+
       let stdout = '';
 
+      // Timeout after 10 minutes (same as Codex wrapper)
+      const timeout = setTimeout(() => {
+        console.error('[ClaudeWrapper] Timeout after 10 minutes');
+        if (onStatus) {
+          onStatus({ type: 'error', category: 'timeout', message: 'Claude CLI timeout after 10 minutes' });
+        }
+        try {
+          ptyProcess.kill();
+        } catch (e) {
+          console.error('[ClaudeWrapper] Failed to kill timed-out process:', e.message);
+        }
+        if (!promiseSettled) {
+          promiseSettled = true;
+          reject(new Error('Claude CLI timeout after 10 minutes'));
+        }
+      }, 600000);
+
       // Process output chunks
       ptyProcess.onData((data) => {
         stdout += data;
@@ -255,6 +337,12 @@ class ClaudeWrapper {
       }
 
       ptyProcess.onExit(({ exitCode }) => {
+        // Clear timeout on exit
+        clearTimeout(timeout);
+
+        // Unregister process on exit
+        this.unregisterProcess(conversationId);
+
         console.log(`[ClaudeWrapper] Exit code: ${exitCode}`);
 
         if (exitCode !== 0) {

package/lib/server/services/codex-output-parser.js

@@ -263,6 +263,13 @@ class CodexOutputParser {
     return this.usage;
   }
 
+  /**
+   * Get thread ID (native Codex session ID)
+   */
+  getThreadId() {
+    return this.threadId;
+  }
+
   /**
    * Reset parser state for new request
    */
@@ -270,6 +277,7 @@ class CodexOutputParser {
     this.buffer = '';
     this.finalResponse = '';
     this.usage = null;
+    this.threadId = null;
     this.pendingCommands.clear();
   }
 }

package/lib/setup/postinstall.js

@@ -137,7 +137,8 @@ async function main() {
   console.log('');
 
   // Required packages
-  const packages = ['termux-api', 'termux-tools'];
+  // - ripgrep is needed by Claude CLI (vendor lookup expects it on Termux)
+  const packages = ['termux-api', 'termux-tools', 'ripgrep'];
 
   log(colors.cyan('Installing Termux packages:'));
   for (const pkg of packages) {

package/package.json

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