kiku-agent 1.0.9 → 1.0.11

package/server/agent/commands.js

@@ -771,10 +771,14 @@ export const handlers = {
   },
 
   '/session': async (ctx) => {
-    const { agent, sub } = ctx;
+    const { agent, sub, extra } = ctx;
     const sess = agent.session;
     const action = (sub || 'info').toLowerCase();
 
+    if (/^\d+$/.test(action) || action.startsWith('sess_')) {
+      return handlers['/session']({ ...ctx, sub: 'load', extra: sub });
+    }
+
     if (action === 'info' || !action) {
       const msgCount = sess.messages.length;
       const userMsgs = sess.messages.filter(m => m.role === 'user').length;
@@ -783,17 +787,31 @@ export const handlers = {
       const totalDur = ((sess.stats.totalDurationMs || 0) / 1000).toFixed(1);
       const createdAt = sess.createdAt ? sess.createdAt.toLocaleString() : 'unknown';
 
+      const lines = [
+        `${C.gold}Session ID:${C.reset}      ${C.white}${sess.id}${C.reset}`,
+        `${C.gold}Created At:${C.reset}      ${C.white}${createdAt}${C.reset}`,
+        `${C.gold}Total Messages:${C.reset}  ${C.cyberCyan}${msgCount}${C.reset} total ${C.dim}(${userMsgs} user, ${assistantMsgs} assistant)${C.reset}`,
+        `${C.gold}Total Queries:${C.reset}   ${C.cyberCyan}${sess.stats.totalQueries}${C.reset}`,
+        `${C.gold}Tool Calls:${C.reset}      ${C.cyberCyan}${toolCalls}${C.reset}`,
+        `${C.gold}Total Duration:${C.reset}  ${C.cyberCyan}${totalDur}s${C.reset}`,
+        `${C.gold}Thinking Mode:${C.reset}   ${C.bold}${C.gold}${sess.thinkingMode.toUpperCase()}${C.reset}`
+      ];
+
+      const toolStats = typeof sess.getToolStats === 'function' ? sess.getToolStats() : {};
+      const toolEntries = Object.entries(toolStats);
+      if (toolEntries.length > 0) {
+        lines.push('', `${C.bold}${C.lavender}Tool Executions Breakdown:${C.reset}`);
+        for (const [name, s] of toolEntries) {
+          const dur = (s.totalDurationMs / 1000).toFixed(2);
+          lines.push(`  ${C.cyberCyan}• ${name.padEnd(24)}${C.reset} ${C.white}${s.count} call(s)${C.reset} ${C.dim}(${s.successCount} ok, ${s.notFoundCount} empty, ${s.errorCount} err • ${dur}s)${C.reset}`);
+        }
+      }
+
+      lines.push('', `${C.dim}Commands: /session summary | /session export [markdown|json|text] | /session copy | /session clear${C.reset}`);
+
       printSolidPanel({
-        title: `Active Session Details`,
-        lines: [
-          `${C.gold}Session ID:${C.reset}      ${C.white}${sess.id}${C.reset}`,
-          `${C.gold}Created At:${C.reset}      ${C.white}${createdAt}${C.reset}`,
-          `${C.gold}Total Messages:${C.reset}  ${C.cyberCyan}${msgCount}${C.reset} total ${C.dim}(${userMsgs} user, ${assistantMsgs} assistant)${C.reset}`,
-          `${C.gold}Total Queries:${C.reset}   ${C.cyberCyan}${sess.stats.totalQueries}${C.reset}`,
-          `${C.gold}Tool Calls:${C.reset}      ${C.cyberCyan}${toolCalls}${C.reset}`,
-          `${C.gold}Total Duration:${C.reset}  ${C.cyberCyan}${totalDur}s${C.reset}`,
-          `${C.gold}Thinking Mode:${C.reset}   ${C.bold}${C.gold}${sess.thinkingMode.toUpperCase()}${C.reset}`
-        ],
+        title: `Active Session Details • ${sess.id}`,
+        lines,
         headerBg: '\x1b[48;2;48;54;70m',
         bg: '\x1b[48;2;36;40;52m'
       });
@@ -839,10 +857,10 @@ export const handlers = {
         title: `Archived Sessions (Total: ${sessions.length})`,
         lines: sessions.length === 0
           ? [`${C.dim}No archived sessions found.${C.reset}`]
-          : sessions.map(s => {
+          : sessions.map((s, i) => {
             const date = new Date(s.createdAt).toLocaleString();
             const dur = ((s.stats?.totalDurationMs || 0) / 1000).toFixed(1);
-            return `${C.gold}${s.id}${C.reset} ${C.dim}(${date})${C.reset} — ${s.messageCount} msgs, ${dur}s`;
+            return `${C.gold}[${i + 1}] ${s.id}${C.reset} ${C.dim}(${date})${C.reset} — ${s.messageCount} msgs, ${dur}s`;
           }),
         headerBg: '\x1b[48;2;48;54;70m',
         bg: '\x1b[48;2;36;40;52m'
@@ -850,20 +868,98 @@ export const handlers = {
       return 'HANDLED';
     }
 
+    if (action === 'load' || action === 'resume' || action === 'restore') {
+      const target = (extra || '').trim();
+      if (!target) {
+        const sessions = agent.memory.getArchivedSessions(10);
+        if (sessions.length === 0) {
+          console.log(`\n  ${C.amber}No archived sessions available to load.${C.reset}\n`);
+          return 'HANDLED';
+        }
+        printSolidPanel({
+          title: 'Load Session Usage',
+          lines: [
+            `${C.dim}Specify a session ID or list number to resume:${C.reset}`,
+            '',
+            ...sessions.map((s, i) => {
+              const date = new Date(s.createdAt).toLocaleString();
+              return `  ${C.gold}[${i + 1}]${C.reset} ${C.bold}${C.white}${s.id}${C.reset} ${C.dim}(${date} — ${s.messageCount} msgs)${C.reset}`;
+            }),
+            '',
+            `${C.dim}Example: /session load 1  OR  /session load ${sessions[0].id}${C.reset}`,
+          ],
+          headerBg: '\x1b[48;2;48;54;70m',
+          bg: '\x1b[48;2;36;40;52m',
+        });
+        return 'HANDLED';
+      }
+
+      const restored = await agent.restoreSession(target);
+      if (!restored) {
+        console.log(`\n  ${C.amber}Session "${target}" not found. Use /session list to view available archives.${C.reset}\n`);
+        return 'HANDLED';
+      }
+
+      const date = restored.createdAt ? new Date(restored.createdAt).toLocaleString() : 'unknown';
+      const msgCount = restored.messages?.length || 0;
+      const totalDur = (((restored.stats?.totalDurationMs) || 0) / 1000).toFixed(1);
+
+      printSolidPanel({
+        title: 'Session Restored Successfully',
+        lines: [
+          `${C.gold}Session ID:${C.reset}      ${C.bold}${C.white}${restored.id}${C.reset}`,
+          `${C.gold}Created At:${C.reset}      ${C.white}${date}${C.reset}`,
+          `${C.gold}Restored Messages:${C.reset} ${C.cyberCyan}${msgCount}${C.reset} exchanges loaded into memory`,
+          `${C.gold}Total Queries:${C.reset}   ${C.cyberCyan}${restored.stats?.totalQueries || 0}${C.reset}`,
+          `${C.gold}Tool Invocations:${C.reset} ${C.cyberCyan}${restored.stats?.totalToolCalls || 0}${C.reset}`,
+          `${C.gold}Total Duration:${C.reset}  ${C.cyberCyan}${totalDur}s${C.reset}`,
+          '',
+          `${C.emerald}✓ Session conversation context reloaded. You can now continue chatting!${C.reset}`,
+        ],
+        headerBg: '\x1b[48;2;48;54;70m',
+        bg: '\x1b[48;2;36;40;52m',
+      });
+      return 'HANDLED';
+    }
+
     if (action === 'export') {
-      const exported = await agent.session.exportToMarkdown();
-      console.log(`\n  ${C.emerald}[OK] Session transcript exported.${C.reset}`);
-      console.log(`  ${C.slate}• File:${C.reset} ${C.white}${exported.filePath}${C.reset}\n`);
+      const format = (extra || '').toLowerCase().trim();
+      let exported;
+      if (format === 'json') {
+        exported = await agent.session.exportToJson();
+      } else if (format === 'text' || format === 'txt') {
+        exported = await agent.session.exportToText();
+      } else {
+        exported = await agent.session.exportToMarkdown();
+      }
+
+      printRichCard({
+        title: 'Session Exported Successfully',
+        status: 'ok',
+        lines: [
+          `• Format:   ${exported.format.toUpperCase()}`,
+          `• File:     ${exported.filePath}`,
+          `• Size:     ${(exported.size || 0).toLocaleString()} bytes`,
+        ],
+      });
       return 'HANDLED';
     }
 
+    if (action === 'copy') {
+      if (typeof ctx.copyQueryDetails === 'function') {
+        ctx.copyQueryDetails(`session ${extra || ''}`.trim());
+        return 'HANDLED';
+      }
+      return handlers['/copy']({ ...ctx, sub: 'session', extra });
+    }
+
     if (action === 'clear' || action === 'new' || action === 'reset') {
       await agent.endSession();
       console.log(`\n  ${C.emerald}[OK] Previous session archived. Started fresh.${C.reset}\n`);
       return 'HANDLED';
     }
 
-    console.log(`\n  ${C.amber}Unknown session action: "${sub}". Use /session [info|list|export|clear]${C.reset}\n`);
+    console.log(`\n  ${C.amber}Unknown session action: "${sub}". Use /session [info|summary|list|load|export|copy|clear]${C.reset}\n`);
     return 'HANDLED';
   },
 
@@ -930,14 +1026,28 @@ export const handlers = {
       return 'HANDLED';
     }
 
-    const requested = action === 'reset' ? 'sakura' : action;
+    let requested = action === 'reset' ? 'sakura' : action;
+    if (action === 'next' || action === 'cycle') {
+      const currentIndex = THEME_NAMES.indexOf(current);
+      const nextIndex = (currentIndex + 1) % THEME_NAMES.length;
+      requested = THEME_NAMES[nextIndex];
+    } else if (action === 'prev') {
+      const currentIndex = THEME_NAMES.indexOf(current);
+      const prevIndex = (currentIndex - 1 + THEME_NAMES.length) % THEME_NAMES.length;
+      requested = THEME_NAMES[prevIndex];
+    }
+
     const theme = setTheme(requested);
     if (!theme) {
       console.log(`\n  ${C.amber}Unknown theme: "${action}".${C.reset}`);
-      console.log(`  ${C.dim}Available: ${THEME_NAMES.join(', ')}${C.reset}\n`);
+      console.log(`  ${C.dim}Available: ${THEME_NAMES.join(', ')}, next, prev, reset${C.reset}\n`);
       return 'HANDLED';
     }
 
+    if (ctx.tuiPrompt) {
+      ctx.tuiPrompt.render();
+    }
+
     printSolidPanel({
       title: 'Theme Updated',
       lines: [
@@ -1168,7 +1278,16 @@ export const handlers = {
 
   '/stop': async () => { await audioPlayer.stop(); console.log(`\n  ${C.emerald}[OK] Stopped${C.reset}\n`); return 'HANDLED'; },
   '/pause': async () => { const r = await audioPlayer.pause(); console.log(`\n  ${C.emerald}${r}${C.reset}\n`); return 'HANDLED'; },
-  '/resume': async () => { const r = await audioPlayer.resume(); console.log(`\n  ${C.emerald}${r}${C.reset}\n`); return 'HANDLED'; },
+  '/resume': async (ctx) => {
+    const { sub, extra } = ctx || {};
+    if (sub) {
+      const target = extra ? `${sub} ${extra}`.trim() : sub;
+      return handlers['/session']({ ...ctx, sub: 'load', extra: target });
+    }
+    const r = await audioPlayer.resume();
+    console.log(`\n  ${C.emerald}${r}${C.reset}\n`);
+    return 'HANDLED';
+  },
   '/next': async () => { const r = await audioPlayer.next(); console.log(`\n  ${C.emerald}${r}${C.reset}\n`); return 'HANDLED'; },
   '/prev': async () => { const r = await audioPlayer.prev(); console.log(`\n  ${C.emerald}${r}${C.reset}\n`); return 'HANDLED'; },
   '/mute': async () => { const r = await audioPlayer.mute(); console.log(`\n  ${C.emerald}${r}${C.reset}\n`); return 'HANDLED'; },
@@ -1302,9 +1421,24 @@ export const handlers = {
           ctx.modelManager.client = ctx.client;
           ctx.modelManager.requestedModel = info.model;
           const resolution = await ctx.modelManager.resolve({ requestedModel: info.model });
-          if (resolution.connected && resolution.usedFallback) {
-            console.log(`  ${C.amber}• Requested model unavailable; using ${resolution.selectedModel}${C.reset}`);
+          if (resolution.connected && resolution.selectedModel) {
+            ctx.setCatalogOnlyMode?.(false);
+            if (ctx.tuiPrompt) {
+              ctx.tuiPrompt.isConnected = true;
+              ctx.tuiPrompt.modelName = resolution.selectedModel;
+              ctx.tuiPrompt.provider = info.providerName;
+              ctx.tuiPrompt.render();
+            }
+            if (resolution.usedFallback) {
+              console.log(`  ${C.amber}• Requested model unavailable; using ${resolution.selectedModel}${C.reset}`);
+            }
           } else if (!resolution.connected) {
+            ctx.setCatalogOnlyMode?.(true);
+            if (ctx.tuiPrompt) {
+              ctx.tuiPrompt.isConnected = false;
+              ctx.tuiPrompt.provider = info.providerName;
+              ctx.tuiPrompt.render();
+            }
             console.log(`  ${C.amber}• Provider is not ready: ${resolution.error}${C.reset}`);
           }
         }
@@ -1428,9 +1562,11 @@ export const handlers = {
         return 'HANDLED';
       }
 
-      if (targetProvider === ctx.client.provider) {
-        ctx.client.setApiKey(newKey);
-        if (ctx.agent?.client) ctx.agent.client.setApiKey(newKey);
+      if (ctx.client?.setApiKey) {
+        ctx.client.setApiKey(newKey, targetProvider);
+      }
+      if (ctx.agent?.client?.setApiKey) {
+        ctx.agent.client.setApiKey(newKey, targetProvider);
       }
       const pDef = getProvider(targetProvider);
       if (pDef) pDef.apiKey = newKey;
@@ -1438,7 +1574,7 @@ export const handlers = {
       const masked = newKey.length > 8
         ? `${newKey.slice(0, 4)}...${newKey.slice(-4)}`
         : '****';
-      console.log(`\n  ${C.emerald}[OK] API key updated for ${targetProvider}${C.reset} (${masked})\n`);
+      console.log(`\n  ${C.emerald}[OK] API key saved & persisted for ${targetProvider}${C.reset} (${masked})\n`);
       return 'HANDLED';
     }
 
@@ -1468,9 +1604,10 @@ export const handlers = {
   },
 
   '/model': async (ctx) => {
-    const action = (ctx.sub || 'status').toLowerCase();
+    const rawSub = (ctx.sub || '').trim();
+    const action = (rawSub || 'status').toLowerCase();
     const providerName = ctx.client.providerName || 'Model';
-    const { getRecommendedModels } = await import('./config.js');
+    const { getRecommendedModels, CLOUD_PROVIDERS } = await import('./config.js');
 
     if (action === 'reconnect') {
       if (!ctx.modelManager) {
@@ -1480,8 +1617,18 @@ export const handlers = {
       const resolution = await ctx.modelManager.resolve();
       if (resolution.connected && resolution.selectedModel) {
         ctx.setCatalogOnlyMode?.(false);
+        if (ctx.tuiPrompt) {
+          ctx.tuiPrompt.isConnected = true;
+          ctx.tuiPrompt.modelName = resolution.selectedModel;
+          ctx.tuiPrompt.render();
+        }
         console.log(`\n  ${C.emerald}[OK] Connected using ${resolution.selectedModel}.${C.reset}\n`);
       } else {
+        ctx.setCatalogOnlyMode?.(true);
+        if (ctx.tuiPrompt) {
+          ctx.tuiPrompt.isConnected = false;
+          ctx.tuiPrompt.render();
+        }
         console.log(`\n  ${C.red}[MODEL ERROR] ${resolution.error || 'No chat model is ready.'}${C.reset}\n`);
       }
       return 'HANDLED';
@@ -1523,19 +1670,42 @@ export const handlers = {
           `${C.bold}${C.lavender}Reported by Server:${C.reset}`,
           ...(serverModels.length ? serverModels.map(s => `  ${s}`) : [`  ${C.dim}No live model list reported by ${providerName}.${C.reset}`]),
           '',
-          `${C.dim}Select model: /model use <model_id>${C.reset}`
+          `${C.dim}Select model: /model use <model_id> or /model <provider_or_model>${C.reset}`
         ],
       });
       return 'HANDLED';
     }
 
-    if (action === 'use') {
+    const isDirectUse = action === 'use';
+    const targetModel = isDirectUse ? (ctx.extra?.trim() || '') : (!['status', 'diag', 'diagnostics'].includes(action) ? rawSub : '');
+
+    if (targetModel) {
       try {
-        const targetModel = ctx.extra?.trim() || '';
-        if (!targetModel) {
-          console.log(`\n  ${C.amber}Usage: /model use <model_id>${C.reset}\n`);
-          return 'HANDLED';
+        const lowerTarget = targetModel.toLowerCase();
+
+        
+        if (CLOUD_PROVIDERS[lowerTarget]) {
+          return await handlers['/provider']({ ...ctx, sub: 'use', extra: lowerTarget, parts: ['/provider', 'use', lowerTarget] });
         }
+
+       
+        let matchedProvider = null;
+        if (lowerTarget.includes('gemma') || lowerTarget === 'google/gemma-4-e4b') {
+          matchedProvider = 'lmstudio';
+        } else {
+          for (const [pId, pDef] of Object.entries(CLOUD_PROVIDERS)) {
+            if (pDef.recommendedModels?.some(rm => rm.id.toLowerCase() === lowerTarget || rm.id.toLowerCase().includes(lowerTarget))) {
+              matchedProvider = pId;
+              break;
+            }
+          }
+        }
+
+        if (matchedProvider && matchedProvider !== ctx.client.provider) {
+          console.log(`  ${C.cyberCyan}• Switching provider to ${CLOUD_PROVIDERS[matchedProvider].name} for model ${targetModel}...${C.reset}`);
+          return await handlers['/provider']({ ...ctx, sub: 'use', extra: `${matchedProvider} ${targetModel}`, parts: ['/provider', 'use', matchedProvider, targetModel] });
+        }
+
         if (ctx.modelManager) {
           const selected = ctx.modelManager.select(targetModel, liveCheck.models || []);
           console.log(`\n  ${C.emerald}[OK] Active model changed to ${selected}.${C.reset}\n`);
@@ -2282,20 +2452,12 @@ export const handlers = {
     const reference = [ctx.sub, ctx.extra].filter(Boolean).join(' ');
     const request = parseDetailsRequest(reference);
     const details = ctx.agent?.lastQueryDetails || null;
-    if (!details) {
-      printRichCard({
-        title: 'No Diagnostics Recorded',
-        status: 'warning',
-        lines: ['No completed model queries are available to copy.'],
-      });
-      return 'HANDLED';
-    }
-    const copyable = getCopyableContent(details, request);
+    const copyable = getCopyableContent(details, request, ctx.agent?.session);
     if (!copyable?.text) {
       printRichCard({
         title: 'Nothing to Copy',
         status: 'warning',
-        lines: ['The requested query section is empty.'],
+        lines: ['The requested query or session section is empty.'],
       });
       return 'HANDLED';
     }
@@ -2318,7 +2480,8 @@ export const handlers = {
   },
 
   '/gallery': async (ctx) => {
-    const displayed = typeof ctx.showTerminalImage === 'function' && ctx.showTerminalImage();
+    const count = Number(ctx.sub) || 2;
+    const displayed = typeof ctx.showTerminalImage === 'function' && ctx.showTerminalImage(count);
     if (!displayed) {
       printRichCard({
         title: 'Terminal Gallery Unavailable',
@@ -2571,6 +2734,11 @@ export const handlers = {
     }
     return 'HANDLED';
   },
+
+  '/exit': async (ctx) => {
+    try { await ctx.agent?.endSession(); } catch {}
+    return 'EXIT';
+  },
 };
 
 const ALIASES = {
@@ -2580,6 +2748,7 @@ const ALIASES = {
   '/?': '/help', '/commands': '/help', '/menu': '/help',
   '/hist': '/history', '/h': '/history',
   '/sess': '/session', '/sessions': '/session',
+  '/load-session': '/session', '/load': '/session', '/restore': '/session',
   '/think': '/thinking', '/th': '/thinking',
   '/detail': '/details', '/d': '/details',
   '/language': '/lang',
@@ -2608,6 +2777,9 @@ const ALIASES = {
   '/export': '/save',
   '/r': '/retry',
   '/kvip': '/key',
+  '/switch': '/provider',
+  '/providers': '/provider',
+  '/fallback': '/provider',
 };
 
 export async function routeCommand(rawInput, ctx) {