kiku-agent 1.0.7 → 1.0.9

package/server/agent/agentCore.js

@@ -12,7 +12,8 @@ import { ResearchOrchestrator } from './research.js';
 import { SuggestionEngine } from './suggestions.js';
 import { McpClientManager } from './mcpClient.js';
 import { DynamicToolRouter } from './toolRouter.js';
-import { contextCompactor } from './contextCompactor.js';
+import { contextCompactor } from './contextCompactor.js';
+import { AgentJobManager } from './jobManager.js';
 
 export function detectDominantLanguage(text) {
   if (!text || typeof text !== 'string') return 'th';
@@ -63,7 +64,8 @@ export class KikuAgent {
     this.mcpManager = options.mcpManager || new McpClientManager();
     this.router = new DynamicToolRouter(this.getAllToolsSchema());
     this.research = new ResearchOrchestrator({ client: this.client });
-    this.suggestions = new SuggestionEngine({ client: this.client, memory: this.memory });
+    this.suggestions = new SuggestionEngine({ client: this.client, memory: this.memory });
+    this.jobs = new AgentJobManager();
     this.systemPrompt = this.buildSystemPrompt();
     this.initHistory();
     this.restoredMessageCount = 0;
@@ -101,33 +103,39 @@ export class KikuAgent {
     return this._ready;
   }
 
-  async runSubagent(task, options = {}) {
-    await this._ready;
-    const subagent = new ResearchSubagent({
-      client: this.client,
-      maxIterations: options.maxIterations || 3,
-    });
-    return subagent.run(task, {
-      signal: options.signal,
-      onProgress: options.onProgress,
-      skillContext: this.memory.buildUserSkillContext(),
-    });
-  }
-
-  async runResearch(question, options = {}) {
-    await this._ready;
-    return this.research.run(question, {
-      ...options,
-      skillContext: this.memory.buildUserSkillContext(),
-    });
+  async runSubagent(task, options = {}) {
+    await this._ready;
+    return this.jobs.run('subagent', task, async ({ signal }) => {
+      const subagent = new ResearchSubagent({
+        client: this.client,
+        maxIterations: options.maxIterations || 3,
+      });
+      return subagent.run(task, {
+        signal,
+        onProgress: options.onProgress,
+        skillContext: this.memory.buildUserSkillContext(),
+      });
+    }, options);
+  }
+
+  async runResearch(question, options = {}) {
+    await this._ready;
+    const type = options.mode === 'verify' ? 'verify' : 'research';
+    return this.jobs.run(type, question, ({ signal }) => this.research.run(question, {
+      ...options,
+      signal,
+      skillContext: this.memory.buildUserSkillContext(),
+    }), options);
   }
 
   getResearchStatus() {
     return this.research.getStatus();
   }
 
-  cancelResearch() {
-    return this.research.cancel();
+  cancelResearch() {
+    const direct = this.research.cancel();
+    const tracked = this.jobs.cancelType('research') || this.jobs.cancelType('verify');
+    return direct || tracked;
   }
 
   async generateSuggestions(options = {}) {
@@ -135,14 +143,33 @@ export class KikuAgent {
     return this.suggestions.generateSuggestions(options);
   }
 
-  async runSuggestionBatch(targets, options = {}) {
-    await this._ready;
-    return this.suggestions.runBatchSubagents(targets, options);
-  }
-
-  getLastSuggestions() {
-    return this.suggestions.getLastSuggestions();
-  }
+  async runSuggestionBatch(targets, options = {}) {
+    await this._ready;
+    return this.jobs.run('suggestion', String(targets || 'all'), ({ signal }) => this.suggestions.runBatchSubagents(targets, {
+      ...options,
+      signal,
+    }), options);
+  }
+
+  getLastSuggestions() {
+    return this.suggestions.getLastSuggestions();
+  }
+
+  getJobs() {
+    return this.jobs.list();
+  }
+
+  getJob(id) {
+    return this.jobs.get(id);
+  }
+
+  cancelJob(id) {
+    return this.jobs.cancel(id);
+  }
+
+  clearJobs() {
+    return this.jobs.clear();
+  }
 
   initHistory() {
     this.conversationHistory = [

package/server/agent/cli.js

@@ -17,8 +17,9 @@ import { sanitizeQuery } from './sanitizer.js';
 import { isAbortError } from './errors.js';
 import { COMMAND_DEFINITIONS, SUB_COMMANDS, findCommandDefinition, getCommandDetails } from './commandRegistry.js';
 import { ModelManager } from './modelManager.js';
-import { PACKAGE_VERSION } from './version.js';
-import { getTheme, getThemeName } from './theme.js';
+import { PACKAGE_VERSION } from './version.js';
+import { getTheme, getThemeName } from './theme.js';
+import { createTerminalImageGallery } from './terminalImage.js';
 import {
   classifyToolResult,
   formatDetailDuration,
@@ -38,7 +39,7 @@ import {
   printWelcomeHero, getWelcomeHeroLines, randomFanName, setupOutputInterception,
   rawWrite, INPUT_PLACEHOLDER, UI_ICONS,
   spinnerFrames, thinkingFrames, createProgressRunner,
-  enterAlternateScreen, exitAlternateScreen, getTuiViewportLayout, VirtualScreenBuffer,
+  enterAlternateScreen, exitAlternateScreen, getTuiViewportLayout, getNewOutputScrollOffset, VirtualScreenBuffer,
 } from './ui.js';
 
 let activeAbortController = null;
@@ -490,7 +491,11 @@ function printAd() {
 
 class InteractiveTuiPrompt {
   constructor(options = {}) {
-    this.promptText = options.prompt || 'Kiku ❯ ';
+    this.defaultPromptText = options.prompt || 'Kiku ❯ ';
+    this.promptText = this.defaultPromptText;
+    this.inputPlaceholder = INPUT_PLACEHOLDER;
+    this.recordInputHistory = true;
+    this.cancelValue = null;
     this.agent = options.agent || null;
     this.modelName = options.modelName || 'gemma-4-e4b';
     this.provider = options.provider || 'lmstudio';
@@ -521,27 +526,28 @@ class InteractiveTuiPrompt {
     );
   }
 
-  addViewportLines(lines) {
-    if (lines === null || lines === undefined) return;
-    if (!Array.isArray(lines)) lines = [lines];
-    const wasLive = this.scrollOffset === 0;
-    for (const l of lines) {
-      if (typeof l === 'string') {
-        const sublines = l.split('\n');
-        for (const sl of sublines) {
-          this.viewportLines.push(sl);
-        }
-      } else if (l != null) {
-        this.viewportLines.push(String(l));
-      }
+  addViewportLines(lines) {
+    if (lines === null || lines === undefined) return;
+    if (!Array.isArray(lines)) lines = [lines];
+    const wasLive = this.scrollOffset === 0;
+    let addedLineCount = 0;
+    for (const l of lines) {
+      if (typeof l === 'string') {
+        const sublines = l.split('\n');
+        for (const sl of sublines) {
+          this.viewportLines.push(sl);
+          addedLineCount += 1;
+        }
+      } else if (l != null) {
+        this.viewportLines.push(String(l));
+        addedLineCount += 1;
+      }
     }
     if (this.viewportLines.length > 5000) {
       const removedCount = this.viewportLines.length - 5000;
       this.viewportLines.splice(0, removedCount);
     }
-    if (wasLive) {
-      this.scrollOffset = 0;
-    }
+    this.scrollOffset = getNewOutputScrollOffset(addedLineCount, process.stdout.rows || 24, wasLive ? 0 : this.scrollOffset);
     this.render();
   }
 
@@ -578,10 +584,15 @@ class InteractiveTuiPrompt {
     try { if (input.isTTY) input.setRawMode(false); } catch { }
   }
 
-  async readLine() {
-    return new Promise((resolve, reject) => {
-      this._cleanupInput();
-      this.line = '';
+  async readLine(options = {}) {
+    return new Promise((resolve, reject) => {
+      this._cleanupInput();
+      const inputOptions = typeof options === 'string' ? { prompt: options } : options;
+      this.promptText = inputOptions.prompt || this.defaultPromptText;
+      this.inputPlaceholder = inputOptions.placeholder || INPUT_PLACEHOLDER;
+      this.recordInputHistory = inputOptions.history !== false;
+      this.cancelValue = inputOptions.cancelValue ?? null;
+      this.line = '';
       this.cursor = 0;
       this.historyIndex = -1;
       this.popoverIndex = 0;
@@ -615,7 +626,7 @@ class InteractiveTuiPrompt {
     this.cursor = 0;
     this.popoverActive = false;
     this.popoverItems = [];
-    if (result && result.trim()) this.history.push(result);
+    if (this.recordInputHistory && result && result.trim()) this.history.push(result);
     const resolve = this.activeResolve;
     this.activeResolve = null;
     this.activeReject = null;
@@ -784,7 +795,7 @@ class InteractiveTuiPrompt {
         trailingStyled = `${C.dim}${C.slate}${ghostDisplay}${C.reset}`;
       }
     } else if (!this.line) {
-      const placeholder = sliceLineForDisplay(INPUT_PLACEHOLDER, 0, maxLineWidth).displayLine;
+      const placeholder = sliceLineForDisplay(this.inputPlaceholder, 0, maxLineWidth).displayLine;
       trailingStyled = `${C.dim}${C.slate}${placeholder}${C.reset}`;
     }
 
@@ -801,8 +812,12 @@ class InteractiveTuiPrompt {
   handleKeypress(str, key) {
     if (!key && !str) return;
 
-    if ((key?.ctrl && key?.name === 'c') || str === '\x03') {
-      if (isProcessing) {
+    if ((key?.ctrl && key?.name === 'c') || str === '\x03') {
+      if (this.cancelValue !== null) {
+        this.finish(this.cancelValue);
+        return;
+      }
+      if (isProcessing) {
         if (this.onCancel) this.onCancel();
         else if (this.onSigInt) this.onSigInt();
         this.addViewportLines(`  ${C.amber}[✓ Cancelled by user]${C.reset}`);
@@ -827,8 +842,12 @@ class InteractiveTuiPrompt {
       return;
     }
 
-    if (key?.name === 'escape' || str === '\x1b') {
-      if (this.popoverActive) {
+    if (key?.name === 'escape' || str === '\x1b') {
+      if (this.cancelValue !== null) {
+        this.finish(this.cancelValue);
+        return;
+      }
+      if (this.popoverActive) {
         this.popoverActive = false;
         this.popoverItems = [];
         this.ghostText = '';
@@ -1601,7 +1620,7 @@ async function main() {
             return false;
           }
 
-          const tuiPrompt = new InteractiveTuiPrompt({
+          const tuiPrompt = new InteractiveTuiPrompt({
             prompt: 'Kiku ❯ ',
             agent,
             modelName: opts.model || client.model || 'gemma-4-e4b',
@@ -1621,7 +1640,8 @@ async function main() {
                 process.exit(0);
               }
             }
-          });
+          });
+          const terminalGallery = createTerminalImageGallery();
 
           globalTuiPrompt = tuiPrompt;
           setupOutputInterception(tuiPrompt, () => isProcessing);
@@ -1743,9 +1763,17 @@ async function main() {
 
           const mcpStatus = agent.mcpManager ? agent.mcpManager.getStatus() : null;
           if (mcpStatus && mcpStatus.activeServersCount > 0 && !opts.mcp) {
-            const serverSummaries = mcpStatus.servers
-              .filter(s => s.status === 'connected')
-              .map(s => `• ${s.name} (${s.type}) — ${s.toolsCount} tools`);
+            const serverSummaries = mcpStatus.servers
+              .filter(s => s.status === 'connected')
+              .map(s => {
+                const sources = (s.sources || [])
+                  .map(source => String(source).split(/[\\/]/).pop())
+                  .filter(Boolean);
+                const sourceLabel = sources.length > 0
+                  ? ` • source: ${[...new Set(sources)].join(', ')}`
+                  : '';
+                return `• ${s.name} (${s.type}) — ${s.toolsCount} tools${sourceLabel}`;
+              });
             printRichCard({
               title: 'Persisted MCP Connected',
               status: 'mcp',
@@ -1804,10 +1832,16 @@ async function main() {
             printHelp,
             printQueryDetails,
             copyQueryDetails,
-            printWelcome: printWelcomeHero,
-            printAd,
-            cancelActiveQuery,
-            enqueueQuery: async (prompt, isRetry) => {
+            printWelcome: printWelcomeHero,
+            printAd,
+            showTerminalImage: () => {
+              const imageLines = terminalGallery.maybeRender(queryCount, { force: true });
+              if (imageLines.length > 0) tuiPrompt.addViewportLines(imageLines);
+              return imageLines.length > 0;
+            },
+            cancelActiveQuery,
+            readInput: options => tuiPrompt.readLine(options),
+            enqueueQuery: async (prompt, isRetry) => {
               queryQueue.push({ id: 'q_' + Date.now(), number: nextQueryNumber++, prompt, addedAt: Date.now() });
               triggerQueueProcessing();
             },
@@ -1879,10 +1913,12 @@ async function main() {
                       });
                     }
                   } finally {
-                    activeAbortController = null;
-                    queryCount++;
-                    printAd();
-                    activeQueryNumber = null;
+                    activeAbortController = null;
+                    queryCount++;
+                    printAd();
+                    const imageLines = terminalGallery.maybeRender(queryCount);
+                    if (imageLines.length > 0) tuiPrompt.addViewportLines(imageLines);
+                    activeQueryNumber = null;
                     if (globalTuiPrompt) {
                       globalTuiPrompt.agentState = '';
                       globalTuiPrompt.render();