banana-code 1.3.1 → 1.4.1

package/banana.js

@@ -81,7 +81,7 @@ let pendingHumanQuestion = null; // { resolve, question }
 // CONFIGURATION
 // =============================================================================
 
-const VERSION = '1.3.1';
+const VERSION = '1.4.0';
 const { PAD } = require('./lib/borderRenderer'); // Single source of truth for left padding
 const DEBUG_DISABLED_VALUES = new Set(['0', 'false', 'off', 'no']);
 const NEXT_TURN_RESERVE_TOKENS = 1200;
@@ -389,7 +389,7 @@ ${P}${c.yellow}/hooks${c.reset}               Manage lifecycle hooks (add, edit,
 ${P}${c.yellow}/steer <text>${c.reset}       Steer next turn (or interrupt + redirect current turn)
 ${P}${c.yellow}/model [name]${c.reset}      Show/switch model
 ${P}${c.yellow}/model search <query>${c.reset} Search OpenRouter models and add one
-${P}${c.yellow}/connect [provider]${c.reset} Connect provider (Anthropic, OpenAI OAuth, OpenRouter)
+${P}${c.yellow}/connect [provider]${c.reset} Connect/disconnect providers (Anthropic, OpenAI, OpenRouter, Claude Code)
 ${P}${c.yellow}/prompt [name]${c.reset}     Show/switch prompt (base, code-agent, or any .md)
 
 ${P}${c.banana}${c.dim}Config Commands:${c.reset}
@@ -442,6 +442,15 @@ function initProject() {
   tokenCounter = new TokenCounter(config);
   imageHandler = new ImageHandler(projectDir);
 
+  const lastRunSnapshot = config.getRunSnapshot();
+  if (lastRunSnapshot && lastRunSnapshot.completed === false) {
+    const when = lastRunSnapshot.savedAt ? new Date(lastRunSnapshot.savedAt).toLocaleString() : 'recently';
+    console.log(`${PAD}${c.yellow}⚠ Previous run appears to have ended unexpectedly.${c.reset} ${c.dim}(${when})${c.reset}`);
+    if (lastRunSnapshot.userMessage) {
+      console.log(`${PAD}${c.dim}  Last request: ${String(lastRunSnapshot.userMessage).slice(0, 120)}${c.reset}`);
+    }
+  }
+
   // Initialize LM Studio + provider manager
   const lmStudioUrl = config.get('lmStudioUrl') || 'http://localhost:1234';
   lmStudio = new LmStudio({ baseUrl: lmStudioUrl });
@@ -913,6 +922,7 @@ function normalizeProviderKey(raw) {
   const key = String(raw || '').trim().toLowerCase();
   if (!key) return null;
   if (key === 'lmstudio' || key === 'local') return 'local';
+  if (key === 'claude' || key === 'claudecode' || key === 'claude-code') return 'claude-code';
   if (PROVIDERS.includes(key)) return key;
   return null;
 }
@@ -958,7 +968,11 @@ function buildFullSystemPrompt(promptMode = resolveActivePromptMode()) {
   // Build cache key from prompt mode + instruction file modification times
   const globalInstructions = globalConfig ? globalConfig.getInstructions() : null;
   const instructions = config ? config.getInstructions() : null;
-  const cacheKey = `${promptMode}|${globalInstructions?.source || ''}|${instructions?.source || ''}`;
+  // Include file mtimes so edits mid-session invalidate the cache
+  function safeMtime(filePath) {
+    try { return filePath ? fs.statSync(filePath).mtimeMs : 0; } catch { return 0; }
+  }
+  const cacheKey = `${promptMode}|${globalInstructions?.source || ''}:${safeMtime(globalInstructions?.source)}|${instructions?.source || ''}:${safeMtime(instructions?.source)}`;
 
   if (_systemPromptCache.key === cacheKey) {
     return _systemPromptCache.value;
@@ -966,11 +980,23 @@ function buildFullSystemPrompt(promptMode = resolveActivePromptMode()) {
 
   const systemPrompt = promptManager ? promptManager.get(promptMode) : '';
   let fullSystemPrompt = systemPrompt || '';
+
+  // Strip HTML comments and collapse blank lines from instruction files to avoid wasting tokens
+  // on placeholder templates that users haven't edited yet
+  function cleanInstructions(raw) {
+    const stripped = raw.replace(/<!--[\s\S]*?-->/g, '').replace(/\n{3,}/g, '\n\n').trim();
+    // If only headings and whitespace remain, treat as empty (unedited template)
+    const withoutHeadings = stripped.replace(/^#+\s+.*$/gm, '').trim();
+    return withoutHeadings ? stripped : '';
+  }
+
   if (globalInstructions) {
-    fullSystemPrompt += `\n\n## Global Instructions\n\n${globalInstructions.content}`;
+    const cleaned = cleanInstructions(globalInstructions.content);
+    if (cleaned) fullSystemPrompt += `\n\n## Global Instructions\n\n${cleaned}`;
   }
   if (instructions) {
-    fullSystemPrompt += `\n\n## Project Instructions\n\n${instructions.content}`;
+    const cleaned = cleanInstructions(instructions.content);
+    if (cleaned) fullSystemPrompt += `\n\n## Project Instructions\n\n${cleaned}`;
   }
 
   _systemPromptCache = { key: cacheKey, value: fullSystemPrompt };
@@ -1301,24 +1327,85 @@ function listProviderStatus() {
 
 async function connectProviderInteractive(provider) {
   if (!provider) {
-    const providerItems = PROVIDERS.map(p => ({
-      key: p,
-      label: PROVIDER_LABELS[p] || p,
-      description: p === 'openai'
-        ? 'OAuth device login for Codex subscription'
-        : 'Connect with API key',
-      tags: ['provider'],
-      active: providerStore.isConnected(p)
-    }));
-    const selected = await pick(providerItems, { title: 'Connect Provider' });
+    const providerItems = PROVIDERS.filter(p => p !== 'monkey').map(p => {
+      const connected = providerStore.isConnected(p);
+      let description;
+      if (connected) {
+        description = 'Connected';
+      } else if (p === 'openai') {
+        description = 'OAuth device login for Codex subscription';
+      } else if (p === 'claude-code') {
+        description = 'Use your Claude Code CLI subscription (no API key needed)';
+      } else {
+        description = 'Connect with API key';
+      }
+      return {
+        key: p,
+        label: PROVIDER_LABELS[p] || p,
+        description,
+        tags: [],
+        active: connected
+      };
+    });
+    const selected = await pick(providerItems, { title: 'Manage Providers' });
     if (!selected) {
       console.log(`${PAD}${c.dim}Cancelled${c.reset}\n`);
       return;
     }
     provider = selected.key;
+
+    // If already connected, offer to disconnect
+    if (providerStore.isConnected(provider)) {
+      const providerLabel = PROVIDER_LABELS[provider] || provider;
+      const answer = await askQuestion(`${PAD}${c.yellow}Disconnect ${providerLabel}? (y/N): ${c.reset}`);
+      if (answer && answer.trim().toLowerCase() === 'y') {
+        const wasActiveProvider = (modelRegistry.getCurrentModel()?.provider || 'local') === provider;
+        providerStore.disconnect(provider);
+        modelRegistry.refreshRemoteModels();
+        if (wasActiveProvider) {
+          const fallback = modelRegistry.getDefault();
+          if (fallback) {
+            await switchModel(fallback);
+          } else {
+            console.log(`${PAD}${c.yellow}No fallback model available.${c.reset}`);
+          }
+        }
+        console.log(`${PAD}${c.green}✓ Disconnected ${providerLabel}${c.reset}\n`);
+      } else {
+        console.log(`${PAD}${c.dim}Cancelled${c.reset}\n`);
+      }
+      return;
+    }
   }
   const providerLabel = PROVIDER_LABELS[provider] || provider;
 
+  // If called with an explicit provider arg and it's already connected, offer disconnect or reconnect
+  if (providerStore.isConnected(provider)) {
+    console.log(`\n${PAD}${c.cyan}${providerLabel} is already connected.${c.reset}`);
+    const answer = await askQuestion(`${PAD}${c.yellow}Disconnect (d), reconnect with new key (r), or cancel (Enter): ${c.reset}`);
+    const choice = (answer || '').trim().toLowerCase();
+    if (choice === 'd') {
+      const wasActiveProvider = (modelRegistry.getCurrentModel()?.provider || 'local') === provider;
+      providerStore.disconnect(provider);
+      modelRegistry.refreshRemoteModels();
+      if (wasActiveProvider) {
+        const fallback = modelRegistry.getDefault();
+        if (fallback) {
+          await switchModel(fallback);
+        } else {
+          console.log(`${PAD}${c.yellow}No fallback model available.${c.reset}`);
+        }
+      }
+      console.log(`${PAD}${c.green}✓ Disconnected ${providerLabel}${c.reset}\n`);
+      return;
+    } else if (choice === 'r') {
+      // Fall through to the connect flow below to re-enter credentials
+    } else {
+      console.log(`${PAD}${c.dim}Cancelled${c.reset}\n`);
+      return;
+    }
+  }
+
   if (provider === 'anthropic' || provider === 'openrouter') {
     const label = provider === 'anthropic' ? 'ANTHROPIC_API_KEY' : 'OPENROUTER_API_KEY';
     console.log(`\n${PAD}${c.cyan}${providerLabel} Connection${c.reset}`);
@@ -1351,6 +1438,29 @@ async function connectProviderInteractive(provider) {
     return;
   }
 
+  if (provider === 'claude-code') {
+    console.log(`\n${PAD}${c.cyan}Claude Code CLI Connection${c.reset}`);
+    console.log(`${PAD}${c.dim}Checking for Claude Code CLI...${c.reset}`);
+
+    const { ClaudeCodeClient } = require('./lib/claudeCodeProvider');
+    const claudeClient = new ClaudeCodeClient();
+    const connected = await claudeClient.isConnected();
+
+    if (!connected) {
+      console.log(`${PAD}${c.red}✗ Claude Code CLI not found.${c.reset}`);
+      console.log(`${PAD}${c.dim}Install it: npm install -g @anthropic-ai/claude-code${c.reset}`);
+      console.log(`${PAD}${c.dim}Then run: claude login${c.reset}\n`);
+      return;
+    }
+
+    providerStore.connectClaudeCode();
+    modelRegistry.refreshRemoteModels();
+    console.log(`${PAD}${c.green}✓ Connected Claude Code CLI${c.reset}`);
+    console.log(`${PAD}${c.dim}Uses your existing Claude subscription (no API key needed).${c.reset}`);
+    console.log(`${PAD}${c.dim}Use /model to switch to Claude Code models.${c.reset}\n`);
+    return;
+  }
+
   throw new Error(`Unsupported provider: ${provider}`);
 }
 
@@ -1589,9 +1699,15 @@ async function handleCommand(input) {
       tokenCounter.resetSession();
       imageHandler.clearPending();
       setContextEstimate(0);
+      promptDuringWork = false;
+      renderWorkingPrompt = null;
+      if (rl) {
+        rl.write(null, { ctrl: true, name: 'u' });
+      }
       if (statusBar) {
+        statusBar.setInputHint('');
         statusBar.update({ sessionIn: 0, sessionOut: 0 });
-        statusBar.reinstall();
+        statusBar.uninstall();
       }
       console.clear();
       // Push cursor to bottom of scroll region so prompt isn't stranded at the top
@@ -1603,6 +1719,9 @@ async function handleCommand(input) {
         if (padding > 0) process.stdout.write('\n'.repeat(padding));
       }
       refreshIdleContextEstimate();
+      if (statusBar) {
+        statusBar.reinstall();
+      }
       if (rl) {
         rl.setPrompt(buildPromptPrefix());
         rl.prompt(false);
@@ -2009,13 +2128,52 @@ async function handleCommand(input) {
         await modelRegistry.refreshLmStudio();
         const models = modelRegistry.list();
         const current = modelRegistry.getCurrent();
-        const pickerItems = models.map(m => ({
-          key: m.key,
-          label: m.name,
-          description: m.description || '',
-          tags: m.tags || [],
-          active: m.key === current
-        }));
+
+        // Group models by provider for clarity
+        const providerOrder = ['monkey', 'claude-code', 'anthropic', 'openai', 'openrouter', 'local'];
+        const providerHints = {
+          monkey: 'Banana Cloud',
+          'claude-code': 'Claude Code CLI',
+          anthropic: 'your API key',
+          openai: 'your API key',
+          openrouter: 'your API key',
+          local: 'local'
+        };
+
+        // Sort models by provider group order, then by name within each group
+        const sorted = [...models].sort((a, b) => {
+          const aIdx = providerOrder.indexOf(a.provider || 'local');
+          const bIdx = providerOrder.indexOf(b.provider || 'local');
+          const aOrder = aIdx >= 0 ? aIdx : providerOrder.length;
+          const bOrder = bIdx >= 0 ? bIdx : providerOrder.length;
+          if (aOrder !== bOrder) return aOrder - bOrder;
+          return (a.name || '').localeCompare(b.name || '');
+        });
+
+        // Build picker items with provider context in description
+        const pickerItems = sorted.map(m => {
+          const provider = m.provider || 'local';
+          const providerLabel = PROVIDER_LABELS[provider] || provider;
+          const hint = providerHints[provider] || provider;
+          const via = `${providerLabel} (${hint})`;
+          const hasProviderInfo = m.description && m.description.includes(' via ');
+          let baseDesc = (m.description && m.description !== m.name) ? m.description : '';
+          if (baseDesc.length > 30) baseDesc = baseDesc.slice(0, 28) + '..';
+          const desc = hasProviderInfo
+            ? `${m.description} (${hint})`
+            : baseDesc
+              ? `${baseDesc} [${hint}]`
+              : `[${hint}]`;
+          // Pass vision tag through for the V indicator column, but drop the rest to keep lines short
+          const visionTags = (m.tags || []).includes('vision') ? ['vision'] : [];
+          return {
+            key: m.key,
+            label: m.name,
+            description: desc,
+            tags: visionTags,
+            active: m.key === current
+          };
+        });
 
         const selected = await pick(pickerItems, {
           title: 'Switch Model',
@@ -2117,8 +2275,8 @@ async function handleCommand(input) {
 
       if (normalizedSub === 'disconnect') {
         const provider = normalizeProviderKey(secondArg);
-        if (!provider || provider === 'local') {
-          console.log(`\n${PAD}${c.yellow}Usage: /connect disconnect <anthropic|openai|openrouter>${c.reset}\n`);
+        if (!provider || provider === 'local' || provider === 'monkey') {
+          console.log(`\n${PAD}${c.yellow}Usage: /connect disconnect <anthropic|openai|openrouter|claude-code>${c.reset}\n`);
           return true;
         }
         const wasActiveProvider = (modelRegistry.getCurrentModel()?.provider || 'local') === provider;
@@ -2135,7 +2293,7 @@ async function handleCommand(input) {
       if (normalizedSub === 'use') {
         const provider = normalizeProviderKey(secondArg);
         if (!provider) {
-          console.log(`\n${PAD}${c.yellow}Usage: /connect use <local|anthropic|openai|openrouter>${c.reset}\n`);
+          console.log(`\n${PAD}${c.yellow}Usage: /connect use <local|anthropic|openai|openrouter|claude-code>${c.reset}\n`);
           return true;
         }
 
@@ -2160,7 +2318,7 @@ async function handleCommand(input) {
       if (!provider || provider === 'local') {
         console.log(`\n${PAD}${c.yellow}Usage:${c.reset}`);
         console.log(`${PAD}${c.dim}  /connect${c.reset}`);
-        console.log(`${PAD}${c.dim}  /connect <anthropic|openai|openrouter>${c.reset}`);
+        console.log(`${PAD}${c.dim}  /connect <anthropic|openai|openrouter|claude-code>${c.reset}`);
         console.log(`${PAD}${c.dim}  /connect status${c.reset}`);
         console.log(`${PAD}${c.dim}  /connect disconnect <provider>${c.reset}`);
         console.log(`${PAD}${c.dim}  /connect use <local|provider>${c.reset}\n`);
@@ -2684,9 +2842,19 @@ async function sendMessage(message) {
     fullMessage += '\n\n[Image analysis above is primary source of truth. Focus on image content, not file listing.]';
   }
 
+  config.saveRunSnapshot({
+    projectDir,
+    activeModel: modelRegistry.getCurrent(),
+    userMessage: message,
+    fullMessagePreview: fullMessage.slice(0, 2000),
+    conversationLength: conversationHistory.length
+  });
+
   try {
     await sendAgenticMessage(fullMessage, pendingImages, message);
+    config.completeRunSnapshot({ status: 'completed' });
   } catch (error) {
+    config.completeRunSnapshot({ status: 'failed', error: error.message });
     const provider = activeProviderKey();
     const providerLabel = providerManager.getProviderLabel(provider);
     console.log(`\n${PAD}${c.red}✗ Error: ${error.message}${c.reset}`);
@@ -2985,6 +3153,11 @@ async function sendStreamingMessage(message, images = [], rawMessage = '') {
 
   try {
     await streamHandler.handleStream(response);
+    const streamResult = streamHandler.getResult();
+    if (!streamResult.completed && streamResult.warning) {
+      fullResponse = `${streamResult.warning}\n\n${fullResponse}`.trim();
+      console.log(`\n${PAD}${c.yellow}⚠ ${streamResult.warning}${c.reset}`);
+    }
   } catch (error) {
     stopStatus();
     // Check if this was an abort
@@ -5172,10 +5345,12 @@ Examples:
   // then subsequent lines arrive as new 'line' events. We detect paste by
   // buffering lines that arrive within PASTE_DELAY_MS of each other.
   const PASTE_DELAY_MS = 400; // 400ms to handle large pastes and Windows Terminal dialog latency
+  const PASTE_STRAGGLER_WINDOW_MS = 1200; // Late lines can arrive after submit on Windows Terminal
   let pasteBuffer = [];
   let pasteTimer = null;
   let waitingForInput = false;
   let lastFlushTime = 0; // Track when paste buffer last flushed (to catch stragglers)
+  let lastPasteStragglerWarningAt = 0;
 
   showGeminiKeyPrompt = (callback) => {
     awaitingGeminiKey = true;
@@ -5342,13 +5517,17 @@ Examples:
         return;
       }
 
-      // Straggler paste lines: arrived after flush but within 2s and before AI started.
-      // This happens on Windows when the paste confirmation dialog adds latency between lines.
-      if (!currentAbortController && lastFlushTime && (Date.now() - lastFlushTime) < 2000) {
+      // Straggler paste lines: arrived after flush but before the paste has fully settled.
+      // On Windows Terminal, delayed lines can arrive after the first chunk was submitted,
+      // and without this guard they'd be misread as mid-turn steering.
+      if (lastFlushTime && (Date.now() - lastFlushTime) < PASTE_STRAGGLER_WINDOW_MS) {
         const trimmed = String(input || '').trim();
         if (trimmed) {
           appendDebugLog(`[paste-straggler] Dropped line arrived ${Date.now() - lastFlushTime}ms after flush: ${trimmed.slice(0, 60)}\n`);
-          console.log(`${PAD}${c.yellow}Lines were dropped from your paste.${c.reset} ${c.dim}Try pasting again, or disable the paste warning in Windows Terminal settings.${c.reset}`);
+          if (lastPasteStragglerWarningAt !== lastFlushTime) {
+            lastPasteStragglerWarningAt = lastFlushTime;
+            console.log(`${PAD}${c.yellow}Ignored delayed paste lines from the previous submission.${c.reset} ${c.dim}If this keeps happening, disable the Windows Terminal paste warning or paste again after the prompt settles.${c.reset}`);
+          }
         }
         return;
       }
@@ -5476,6 +5655,9 @@ process.on('SIGINT', () => {
   if (config && config.get('autoSaveHistory') && conversationHistory.length > 0) {
     config.saveConversation('autosave', conversationHistory);
   }
+  if (config) {
+    config.completeRunSnapshot({ status: 'cancelled' });
+  }
   if (watcher) watcher.stop();
   console.log(`\n${PAD}${c.cyan}👋 See you later!${c.reset}\n`);
   process.exit(0);
@@ -5484,6 +5666,12 @@ process.on('SIGINT', () => {
 main().catch(error => {
   logSessionEnd('crash', ` error=${error.message}`);
   if (statusBar) statusBar.uninstall();
+  if (config && config.get('autoSaveHistory') && conversationHistory.length > 0) {
+    config.saveConversation('autosave-crash', conversationHistory);
+  }
+  if (config) {
+    config.completeRunSnapshot({ status: 'crashed', error: error.message });
+  }
   console.error(`${c.red}Fatal error: ${error.message}${c.reset}`);
   if (watcher) watcher.stop();
   process.exit(1);