@mmmbuto/nexuscli 0.6.0 → 0.6.2

package/lib/server/routes/chat.js

@@ -71,27 +71,39 @@ router.post('/', async (req, res) => {
     // Send initial event
     res.write(`data: ${JSON.stringify({ type: 'message_start', messageId: `user-${Date.now()}`, sessionId })}\n\n`);
 
-    // Use optimized ContextBridge for token-aware context building
+    // Check if this is an engine switch (requires context bridging)
     const lastEngine = Message.getLastEngine(sessionId);
-    const contextResult = await contextBridge.buildContext({
-      sessionId,
-      fromEngine: lastEngine,
-      toEngine: 'claude',
-      userMessage: message
-    });
+    const isEngineBridge = lastEngine && lastEngine !== 'claude';
 
-    const promptWithContext = contextResult.prompt;
-    const isEngineBridge = contextResult.isEngineBridge;
+    // IMPORTANT: Skip contextBridge for Claude native resume!
+    // When Claude uses `-r sessionId`, it loads full history from .jsonl file.
+    // ContextBridge is ONLY needed for:
+    // 1. Engine switches (e.g., Codex → Claude)
+    // 2. New sessions without history
+    let promptToSend = message;
 
-    console.log(`[Chat] Context: ${contextResult.contextTokens} tokens from ${contextResult.contextSource}, total: ${contextResult.totalTokens}`);
-
-    // Notify frontend about engine switch
     if (isEngineBridge) {
+      // Engine switch: need context from previous engine
+      const contextResult = await contextBridge.buildContext({
+        sessionId,
+        fromEngine: lastEngine,
+        toEngine: 'claude',
+        userMessage: message
+      });
+      promptToSend = contextResult.prompt;
+      console.log(`[Chat] Engine bridge: ${contextResult.contextTokens} tokens from ${lastEngine}`);
+
       res.write(`data: ${JSON.stringify({
         type: 'status',
         category: 'engine_switch',
         message: `Continuing conversation from ${lastEngine}`
       })}\n\n`);
+    } else if (!isNewSession) {
+      // Native resume: Claude will load history from session file
+      console.log(`[Chat] Native resume: Claude will use -r ${sessionId} (full history in .jsonl)`);
+    } else {
+      // New session: no context needed
+      console.log(`[Chat] New session: starting fresh`);
     }
 
     try {
@@ -113,7 +125,7 @@ router.post('/', async (req, res) => {
 
       // Call Claude Code wrapper with workspace path for --cwd
       const result = await claudeWrapper.sendMessage({
-        prompt: promptWithContext,
+        prompt: promptToSend,
         conversationId: sessionId,
         model,
         workspacePath,  // Pass workspace for Claude CLI --cwd

package/lib/server/routes/codex.js

@@ -82,28 +82,37 @@ router.post('/', async (req, res) => {
     // Send initial event
     res.write(`data: ${JSON.stringify({ type: 'message_start', messageId: `user-${Date.now()}`, sessionId })}\n\n`);
 
-    // Use optimized ContextBridge for token-aware context building
-    // Note: Codex uses codeOnly mode for better code-focused context
+    // Check if this is an engine switch (requires context bridging)
     const lastEngine = Message.getLastEngine(sessionId);
-    const contextResult = await contextBridge.buildContext({
-      sessionId,
-      fromEngine: lastEngine,
-      toEngine: 'codex',
-      userMessage: message
-    });
-
-    const promptWithContext = contextResult.prompt;
-    const isEngineBridge = contextResult.isEngineBridge;
+    const isEngineBridge = lastEngine && lastEngine !== 'codex';
 
-    console.log(`[Codex] Context: ${contextResult.contextTokens} tokens from ${contextResult.contextSource}, total: ${contextResult.totalTokens}`);
+    // IMPORTANT: Skip contextBridge for Codex native resume!
+    // When Codex uses `exec resume <threadId>`, it loads full history from native thread.
+    // ContextBridge is ONLY needed for engine switches.
+    let promptToSend = message;
 
-    // Notify frontend about engine switch
     if (isEngineBridge) {
+      // Engine switch: need context from previous engine
+      const contextResult = await contextBridge.buildContext({
+        sessionId,
+        fromEngine: lastEngine,
+        toEngine: 'codex',
+        userMessage: message
+      });
+      promptToSend = contextResult.prompt;
+      console.log(`[Codex] Engine bridge: ${contextResult.contextTokens} tokens from ${lastEngine}`);
+
       res.write(`data: ${JSON.stringify({
         type: 'status',
         category: 'engine_switch',
         message: `Continuing conversation from ${lastEngine}`
       })}\n\n`);
+    } else if (nativeThreadId) {
+      // Native resume: Codex will load history from thread
+      console.log(`[Codex] Native resume: Codex will use threadId ${nativeThreadId}`);
+    } else {
+      // New session: no context needed
+      console.log(`[Codex] New session: starting fresh`);
     }
 
     try {
@@ -124,7 +133,7 @@ router.post('/', async (req, res) => {
 
       // Call Codex wrapper with native threadId for session resume
       const result = await codexWrapper.sendMessage({
-        prompt: nativeThreadId ? message : promptWithContext, // Use raw message if resuming native session
+        prompt: promptToSend,
         model,
         threadId: nativeThreadId, // Native Codex thread ID for resume
         reasoningEffort,

package/lib/server/routes/gemini.js

@@ -90,29 +90,38 @@ router.post('/', async (req, res) => {
       engine: 'gemini'
     })}\n\n`);
 
-    // Use optimized ContextBridge for token-aware context building
-    // Note: Gemini has larger context window, uses preferSummary: false config
+    // Check if this is an engine switch (requires context bridging)
     const lastEngine = Message.getLastEngine(sessionId);
-    const contextResult = await contextBridge.buildContext({
-      sessionId,
-      fromEngine: lastEngine,
-      toEngine: 'gemini',
-      userMessage: message
-    });
+    const isEngineBridge = lastEngine && lastEngine !== 'gemini';
 
-    const promptWithContext = contextResult.prompt;
-    const isEngineBridge = contextResult.isEngineBridge;
+    // IMPORTANT: Skip contextBridge for Gemini native resume!
+    // When Gemini uses `--resume <sessionId>`, it loads full history from native session.
+    // ContextBridge is ONLY needed for engine switches.
+    let promptToSend = message;
 
-    console.log(`[Gemini] Context: ${contextResult.contextTokens} tokens from ${contextResult.contextSource}, total: ${contextResult.totalTokens}`);
-
-    // Notify frontend about engine switch
     if (isEngineBridge) {
+      // Engine switch: need context from previous engine
+      const contextResult = await contextBridge.buildContext({
+        sessionId,
+        fromEngine: lastEngine,
+        toEngine: 'gemini',
+        userMessage: message
+      });
+      promptToSend = contextResult.prompt;
+      console.log(`[Gemini] Engine bridge: ${contextResult.contextTokens} tokens from ${lastEngine}`);
+
       res.write(`data: ${JSON.stringify({
         type: 'status',
         category: 'system',
         message: `Context bridged from ${lastEngine}`,
         icon: '🔄'
       })}\n\n`);
+    } else if (nativeSessionId) {
+      // Native resume: Gemini will load history from session
+      console.log(`[Gemini] Native resume: Gemini will use --resume ${nativeSessionId}`);
+    } else {
+      // New session: no context needed
+      console.log(`[Gemini] New session: starting fresh`);
     }
 
     // Save user message to DB
@@ -139,7 +148,7 @@ router.post('/', async (req, res) => {
 
     // Call Gemini wrapper with native sessionId for session resume
     const result = await geminiWrapper.sendMessage({
-      prompt: nativeSessionId ? message : promptWithContext, // Use raw message if resuming native session
+      prompt: promptToSend,
       threadId: nativeSessionId, // Native Gemini session ID for resume
       model,
       workspacePath,

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

@@ -147,6 +147,15 @@ class SessionManager {
     return crypto.createHash('md5').update(workspacePath).digest('hex').substring(0, 8);
   }
 
+  /**
+   * Normalize workspace path (remove trailing slashes)
+   * Prevents duplicate entries like /path and /path/
+   */
+  _normalizePath(workspacePath) {
+    if (!workspacePath) return '';
+    return workspacePath.replace(/\/+$/, '');
+  }
+
   /**
    * Get or create session for conversation + engine
    *
@@ -164,16 +173,17 @@ class SessionManager {
    */
   async getOrCreateSession(conversationId, engine, workspacePath) {
     const normalizedEngine = this._normalizeEngine(engine);
+    const normalizedPath = this._normalizePath(workspacePath);
     const cacheKey = this._getCacheKey(conversationId, normalizedEngine);
 
-    console.log(`[SessionManager] getOrCreateSession(${conversationId}, ${normalizedEngine}, ${workspacePath})`);
+    console.log(`[SessionManager] getOrCreateSession(${conversationId}, ${normalizedEngine}, ${normalizedPath})`);
 
     // 1. Check RAM cache first (fastest path)
     if (this.sessionMap.has(cacheKey)) {
       const cachedId = this.sessionMap.get(cacheKey);
 
       // Verify it still exists on filesystem
-      if (this.sessionFileExists(cachedId, normalizedEngine, workspacePath)) {
+      if (this.sessionFileExists(cachedId, normalizedEngine, normalizedPath)) {
         this.lastAccess.set(cacheKey, Date.now());
         console.log(`[SessionManager] Cache hit: ${cachedId}`);
         return { sessionId: cachedId, isNew: false };
@@ -195,7 +205,7 @@ class SessionManager {
 
       if (row) {
         // 3. Verify session file exists on filesystem
-        if (this.sessionFileExists(row.id, normalizedEngine, row.workspace_path || workspacePath)) {
+        if (this.sessionFileExists(row.id, normalizedEngine, row.workspace_path || normalizedPath)) {
           // Valid session - update cache and return
           this.sessionMap.set(cacheKey, row.id);
           this.lastAccess.set(cacheKey, Date.now());
@@ -223,7 +233,7 @@ class SessionManager {
         VALUES (?, ?, ?, ?, ?, ?, ?)
       `);
       const title = 'New Chat'; // Will be updated after first response
-      insertStmt.run(sessionId, workspacePath, normalizedEngine, conversationId, title, now, now);
+      insertStmt.run(sessionId, normalizedPath, normalizedEngine, conversationId, title, now, now);
       saveDb();
       console.log(`[SessionManager] Saved to DB: ${sessionId}`);
     } catch (dbErr) {

package/package.json

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