kiku-agent 1.0.11 → 1.2.0

package/server/agent/session.js

@@ -4,18 +4,61 @@ import { EXPORT_DIR, SESSION_DIR as DATA_SESSION_DIR } from './appPaths.js';
 
 const SESSION_DIR = DATA_SESSION_DIR;
 const SESSION_FILE = path.join(SESSION_DIR, 'current_session.json');
+const SENSITIVE_FIELD = /(?:authorization|api[-_]?key|access[-_]?token|refresh[-_]?token|secret|password|cookie|private[-_]?key)/i;
+
+export function redactSensitiveValue(value, depth = 0) {
+  if (depth > 12) return '[REDACTED:DEPTH_LIMIT]';
+  if (typeof value === 'string') {
+    return value
+      .replace(/\bBearer\s+[A-Za-z0-9._~+/=-]{12,}/gi, 'Bearer [REDACTED]')
+      .replace(/\b(?:sk-(?:or-v1-)?|gsk_|AIza)[A-Za-z0-9._-]{12,}/g, '[REDACTED_API_KEY]')
+      .replace(/\b(kiku_(?:master|vip|dev)_\S{8,})/gi, '[REDACTED_KIKU_KEY]');
+  }
+  if (Array.isArray(value)) return value.map(item => redactSensitiveValue(item, depth + 1));
+  if (!value || typeof value !== 'object') return value;
+
+  const out = {};
+  for (const [key, item] of Object.entries(value)) {
+    out[key] = SENSITIVE_FIELD.test(key) ? '[REDACTED]' : redactSensitiveValue(item, depth + 1);
+  }
+  return out;
+}
+
+function normalizeStorageKey(value) {
+  return String(value || '')
+    .trim()
+    .replace(/[^a-zA-Z0-9_-]+/g, '_')
+    .slice(0, 120);
+}
 
 export class AgentSession {
   constructor(options = {}) {
-    this.id = `sess_${Date.now()}_${Math.random().toString(36).slice(2, 7)}`;
+    this.persistenceEnabled = options.persistence !== false;
+    this.id = options.sessionId || `sess_${Date.now()}_${Math.random().toString(36).slice(2, 7)}`;
     this.createdAt = new Date();
     this.thinkingMode = options.thinkingMode || 'hide';
+    const storageKey = normalizeStorageKey(options.storageKey);
+    this.storageFile = options.storageFile
+      ? path.resolve(String(options.storageFile))
+      : (storageKey ? path.join(SESSION_DIR, `${storageKey}.json`) : SESSION_FILE);
     this.messages = [];
     this.stats = {
       totalQueries: 0,
       totalToolCalls: 0,
       totalDurationMs: 0,
+      totalPromptTokens: 0,
+      totalCompletionTokens: 0,
+      totalReasoningTokens: 0,
+      totalTokens: 0,
+      totalCostUsd: 0,
+    };
+    this.lastQueryTokens = {
+      prompt: 0,
+      completion: 0,
+      reasoning: 0,
+      total: 0
     };
+    this.lastQueryCostUsd = 0;
     this._storageWarningShown = false;
   }
 
@@ -57,12 +100,49 @@ export class AgentSession {
       model: meta.model || null,
       createdAt: new Date(),
       durationMs: 0,
+      tokens: {
+        prompt: 0,
+        completion: 0,
+        reasoning: 0,
+        total: 0
+      },
+      costUsd: 0,
       parts: []
     };
     this.messages.push(msg);
     return msg;
   }
 
+  recordQueryTokens(tokens = {}, costUsd = 0) {
+    const prompt = Number(tokens.prompt || tokens.prompt_tokens || 0);
+    const completion = Number(tokens.completion || tokens.completion_tokens || 0);
+    const reasoning = Number(tokens.reasoning || tokens.reasoning_tokens || 0);
+    const total = Number(tokens.total || tokens.total_tokens || (prompt + completion));
+    const cost = Number(costUsd || 0);
+
+    this.stats.totalPromptTokens += prompt;
+    this.stats.totalCompletionTokens += completion;
+    this.stats.totalReasoningTokens += reasoning;
+    this.stats.totalTokens += total;
+    this.stats.totalCostUsd = Number((this.stats.totalCostUsd + cost).toFixed(6));
+
+    this.lastQueryTokens = {
+      prompt,
+      completion,
+      reasoning,
+      total
+    };
+    this.lastQueryCostUsd = cost;
+
+    for (let i = this.messages.length - 1; i >= 0; i--) {
+      if (this.messages[i].role === 'assistant') {
+        this.messages[i].tokens = { ...this.lastQueryTokens };
+        this.messages[i].costUsd = cost;
+        break;
+      }
+    }
+  }
+
   addReasoningPart(message, reasoningText) {
     if (!message || !Array.isArray(message.parts)) return null;
     let part = message.parts.find(p => p.type === 'reasoning');
@@ -174,16 +254,17 @@ export class AgentSession {
   }
 
   async saveToDisk() {
+    if (!this.persistenceEnabled) return false;
     try {
-      await fs.mkdir(SESSION_DIR, { recursive: true });
+      await fs.mkdir(SESSION_DIR, { recursive: true, mode: 0o700 });
       const sessionData = {
         id: this.id,
         createdAt: this.createdAt,
         thinkingMode: this.thinkingMode,
-        messages: this.messages,
+        messages: redactSensitiveValue(this.messages),
         stats: this.stats,
       };
-      await fs.writeFile(SESSION_FILE, JSON.stringify(sessionData, null, 2), 'utf-8');
+      await fs.writeFile(this.storageFile, JSON.stringify(sessionData, null, 2), { encoding: 'utf-8', mode: 0o600 });
       return true;
     } catch (error) {
       if (!this._storageWarningShown) {
@@ -217,10 +298,16 @@ export class AgentSession {
     this.createdAt = sessionData.createdAt ? new Date(sessionData.createdAt) : new Date();
     this.thinkingMode = sessionData.thinkingMode || 'hide';
     this.messages = Array.isArray(sessionData.messages) ? sessionData.messages : [];
-    this.stats = sessionData.stats || {
+    this.stats = {
       totalQueries: 0,
       totalToolCalls: 0,
-      totalDurationMs: 0
+      totalDurationMs: 0,
+      totalPromptTokens: 0,
+      totalCompletionTokens: 0,
+      totalReasoningTokens: 0,
+      totalTokens: 0,
+      totalCostUsd: 0,
+      ...(sessionData.stats || {})
     };
     return true;
   }
@@ -232,23 +319,37 @@ export class AgentSession {
     this.stats = {
       totalQueries: 0,
       totalToolCalls: 0,
-      totalDurationMs: 0
+      totalDurationMs: 0,
+      totalPromptTokens: 0,
+      totalCompletionTokens: 0,
+      totalReasoningTokens: 0,
+      totalTokens: 0,
+      totalCostUsd: 0
     };
+    this.lastQueryTokens = { prompt: 0, completion: 0, reasoning: 0, total: 0 };
+    this.lastQueryCostUsd = 0;
   }
 
   async loadFromDisk() {
+    if (!this.persistenceEnabled) return false;
     try {
-      const data = await fs.readFile(SESSION_FILE, 'utf-8');
+      const data = await fs.readFile(this.storageFile, 'utf-8');
       const sessionData = JSON.parse(data);
       
       this.id = sessionData.id;
       this.createdAt = new Date(sessionData.createdAt);
       this.thinkingMode = sessionData.thinkingMode || 'hide';
       this.messages = sessionData.messages || [];
-      this.stats = sessionData.stats || {
+      this.stats = {
         totalQueries: 0,
         totalToolCalls: 0,
-        totalDurationMs: 0
+        totalDurationMs: 0,
+        totalPromptTokens: 0,
+        totalCompletionTokens: 0,
+        totalReasoningTokens: 0,
+        totalTokens: 0,
+        totalCostUsd: 0,
+        ...(sessionData.stats || {})
       };
       return true;
     } catch {
@@ -257,8 +358,9 @@ export class AgentSession {
   }
 
   async clearDisk() {
+    if (!this.persistenceEnabled) return false;
     try {
-      await fs.unlink(SESSION_FILE);
+      await fs.unlink(this.storageFile);
       return true;
     } catch {
       return false;
@@ -366,6 +468,198 @@ export class AgentSession {
     return out;
   }
 
+  getTranscriptHtml() {
+    const now = new Date();
+    const createdStr = this.createdAt ? new Date(this.createdAt).toISOString().replace('T', ' ').slice(0, 19) : 'unknown';
+    const totalDurationSec = ((this.stats.totalDurationMs || 0) / 1000).toFixed(1);
+    const toolStats = this.getToolStats();
+    const toolEntries = Object.entries(toolStats);
+
+    const escapeHtml = str => String(str || '')
+      .replace(/&/g, '&')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;');
+
+    let toolTableHtml = '';
+    if (toolEntries.length > 0) {
+      toolTableHtml = `
+      <div class="card" style="margin-bottom: 24px;">
+        <h3>[Tools] Tool Invocations Summary</h3>
+        <table class="data-table">
+          <thead>
+            <tr><th>Tool Name</th><th>Invocations</th><th>OK</th><th>Not Found</th><th>Errors</th><th>Total Time</th></tr>
+          </thead>
+          <tbody>
+            ${toolEntries.map(([name, s]) => `
+              <tr>
+                <td><code>${escapeHtml(name)}</code></td>
+                <td>${s.count}</td>
+                <td><span class="badge ok">${s.successCount}</span></td>
+                <td><span class="badge warn">${s.notFoundCount}</span></td>
+                <td><span class="badge err">${s.errorCount}</span></td>
+                <td>${(s.totalDurationMs / 1000).toFixed(2)}s</td>
+              </tr>
+            `).join('')}
+          </tbody>
+        </table>
+      </div>`;
+    }
+
+    let messagesHtml = '';
+    let qIdx = 1;
+    for (const msg of this.messages) {
+      if (msg.role === 'user') {
+        const text = msg.parts?.find(p => p.type === 'text')?.content || '';
+        const qNum = msg.queryNumber || qIdx++;
+        messagesHtml += `
+        <div class="message user-message">
+          <div class="message-header">
+            <span class="user-badge">Question ${qNum}</span>
+            <span class="timestamp">${msg.createdAt ? new Date(msg.createdAt).toLocaleTimeString() : ''}</span>
+          </div>
+          <div class="message-content user-text">${escapeHtml(text)}</div>
+        </div>`;
+      } else if (msg.role === 'assistant') {
+        let partsContent = '';
+        for (const part of msg.parts || []) {
+          if (part.type === 'reasoning' && part.content) {
+            const dur = part.durationMs ? `${(part.durationMs / 1000).toFixed(1)}s` : 'Completed';
+            partsContent += `
+            <details class="reasoning-box">
+              <summary>[Thinking] Reasoning Trace (${dur})</summary>
+              <pre><code>${escapeHtml(part.content.trim())}</code></pre>
+            </details>`;
+          } else if (part.type === 'tool') {
+            const dur = part.durationMs !== undefined ? `${part.durationMs}ms` : '';
+            const statusClass = part.status === 'ok' ? 'ok' : part.status === 'not_found' ? 'warn' : 'err';
+            partsContent += `
+            <details class="tool-box">
+              <summary>[Tool] <code>${escapeHtml(part.name)}</code> <span class="badge ${statusClass}">${(part.status || 'ok').toUpperCase()}</span> <span class="dim">(${dur})</span></summary>
+              <div class="tool-detail">
+                <strong>Arguments:</strong>
+                <pre><code>${escapeHtml(JSON.stringify(part.args, null, 2))}</code></pre>
+                ${part.result ? `<strong>Result:</strong><pre><code>${escapeHtml(JSON.stringify(part.result, null, 2))}</code></pre>` : ''}
+              </div>
+            </details>`;
+          } else if (part.type === 'text' && part.content) {
+            const formatted = escapeHtml(part.content)
+              .replace(/\n\n/g, '<br><br>')
+              .replace(/\n/g, '<br>');
+            partsContent += `<div class="assistant-text">${formatted}</div>`;
+          }
+        }
+
+        messagesHtml += `
+        <div class="message assistant-message">
+          <div class="message-header">
+            <span class="kiku-badge">Kiku AI</span>
+            ${msg.model ? `<span class="model-tag">${escapeHtml(msg.model)}</span>` : ''}
+          </div>
+          <div class="message-content">${partsContent}</div>
+        </div>`;
+      }
+    }
+
+    return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Kiku AI Agent — Session Transcript (${escapeHtml(this.id)})</title>
+  <style>
+    :root {
+      --bg: #090d16;
+      --card-bg: rgba(15, 23, 42, 0.85);
+      --card-border: rgba(255, 183, 197, 0.2);
+      --primary: #ff7eb3;
+      --secondary: #ff758c;
+      --accent: #38bdf8;
+      --text: #f8fafc;
+      --text-dim: #94a3b8;
+      --ok: #10b981;
+      --warn: #f59e0b;
+      --err: #ef4444;
+    }
+    * { box-sizing: border-box; margin: 0; padding: 0; }
+    body {
+      background: var(--bg);
+      color: var(--text);
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+      line-height: 1.6;
+      padding: 32px 16px;
+    }
+    .container { max-width: 900px; margin: 0 auto; }
+    .header {
+      background: linear-gradient(135deg, rgba(255, 126, 179, 0.15), rgba(56, 189, 248, 0.1));
+      border: 1px solid var(--card-border);
+      border-radius: 16px;
+      padding: 28px;
+      margin-bottom: 24px;
+      backdrop-filter: blur(12px);
+    }
+    .title { font-size: 24px; font-weight: 700; color: var(--primary); margin-bottom: 12px; }
+    .meta-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); gap: 12px; }
+    .meta-item { background: rgba(0, 0, 0, 0.3); padding: 10px 14px; border-radius: 8px; border: 1px solid rgba(255,255,255,0.05); }
+    .meta-label { font-size: 11px; text-transform: uppercase; color: var(--text-dim); }
+    .meta-value { font-size: 14px; font-weight: 600; color: var(--text); }
+    .card {
+      background: var(--card-bg);
+      border: 1px solid var(--card-border);
+      border-radius: 12px;
+      padding: 20px;
+      margin-bottom: 20px;
+    }
+    .card h3 { color: var(--accent); font-size: 16px; margin-bottom: 12px; }
+    .data-table { width: 100%; border-collapse: collapse; font-size: 13px; }
+    .data-table th, .data-table td { padding: 8px 12px; text-align: left; border-bottom: 1px solid rgba(255,255,255,0.06); }
+    .data-table th { color: var(--text-dim); font-weight: 600; }
+    .badge { display: inline-block; padding: 2px 8px; border-radius: 4px; font-size: 11px; font-weight: 700; }
+    .badge.ok { background: rgba(16, 185, 129, 0.2); color: var(--ok); }
+    .badge.warn { background: rgba(245, 158, 11, 0.2); color: var(--warn); }
+    .badge.err { background: rgba(239, 68, 68, 0.2); color: var(--err); }
+    .message { margin-bottom: 24px; border-radius: 12px; border: 1px solid var(--card-border); overflow: hidden; }
+    .user-message { background: rgba(30, 41, 59, 0.6); }
+    .assistant-message { background: var(--card-bg); }
+    .message-header {
+      display: flex; justify-content: space-between; align-items: center;
+      padding: 12px 16px; background: rgba(0, 0, 0, 0.2);
+      border-bottom: 1px solid rgba(255,255,255,0.05); font-size: 13px;
+    }
+    .user-badge { color: var(--accent); font-weight: 700; }
+    .kiku-badge { color: var(--primary); font-weight: 700; }
+    .model-tag { color: var(--text-dim); font-size: 11px; background: rgba(255,255,255,0.05); padding: 2px 6px; border-radius: 4px; }
+    .timestamp { color: var(--text-dim); font-size: 11px; }
+    .message-content { padding: 16px; font-size: 14px; }
+    .user-text { font-size: 15px; font-weight: 500; }
+    .assistant-text { margin-top: 8px; }
+    details { margin: 10px 0; border: 1px solid rgba(255,255,255,0.1); border-radius: 8px; overflow: hidden; }
+    summary { padding: 8px 12px; background: rgba(0,0,0,0.3); cursor: pointer; font-size: 12px; font-weight: 600; }
+    pre { padding: 12px; background: rgba(0,0,0,0.4); font-size: 12px; overflow-x: auto; color: #e2e8f0; }
+    code { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace; }
+    .tool-detail { padding: 12px; font-size: 12px; }
+    .dim { color: var(--text-dim); }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <div class="header">
+      <div class="title">Kiku AI Agent — Session Transcript</div>
+      <div class="meta-grid">
+        <div class="meta-item"><div class="meta-label">Session ID</div><div class="meta-value">${escapeHtml(this.id)}</div></div>
+        <div class="meta-item"><div class="meta-label">Total Queries</div><div class="meta-value">${this.stats.totalQueries}</div></div>
+        <div class="meta-item"><div class="meta-label">Tool Calls</div><div class="meta-value">${this.stats.totalToolCalls}</div></div>
+        <div class="meta-item"><div class="meta-label">Total Duration</div><div class="meta-value">${totalDurationSec}s</div></div>
+        <div class="meta-item"><div class="meta-label">Exported At</div><div class="meta-value">${now.toISOString().slice(0, 19)} UTC</div></div>
+      </div>
+    </div>
+    ${toolTableHtml}
+    ${messagesHtml}
+  </div>
+</body>
+</html>`;
+  }
+
   async exportToMarkdown(options = {}) {
     const exportDir = EXPORT_DIR;
     await fs.mkdir(exportDir, { recursive: true }).catch(() => {});
@@ -380,6 +674,20 @@ export class AgentSession {
     return { filePath, filename, format: 'markdown', size: md.length };
   }
 
+  async exportToHtml() {
+    const exportDir = EXPORT_DIR;
+    await fs.mkdir(exportDir, { recursive: true }).catch(() => {});
+
+    const now = new Date();
+    const timestamp = now.toISOString().replace(/[:.]/g, '-').slice(0, 19);
+    const filename = `kiku-session-${timestamp}.html`;
+    const filePath = path.join(exportDir, filename);
+
+    const html = this.getTranscriptHtml();
+    await fs.writeFile(filePath, html, 'utf-8');
+    return { filePath, filename, format: 'html', size: html.length };
+  }
+
   async exportToJson() {
     const exportDir = EXPORT_DIR;
     await fs.mkdir(exportDir, { recursive: true }).catch(() => {});

package/server/agent/subagent.js

@@ -68,7 +68,8 @@ ${options.skillContext ? `\nUser response skill:\n${options.skillContext}` : ''}
 
       const calls = (response.tool_calls || []).map(normalizeToolCall);
       if (calls.length === 0) {
-        return { task: objective, answer: response.content || '', toolCalls, iterations: iteration + 1 };
+        const text = response.content || response.reasoning_content || '';
+        return { task: objective, answer: text, toolCalls, iterations: iteration + 1 };
       }
 
       for (const call of calls) {
@@ -104,7 +105,7 @@ ${options.skillContext ? `\nUser response skill:\n${options.skillContext}` : ''}
 
     messages.push({
       role: 'user',
-      content: 'Stop researching and return the concise evidence report now. Mention any missing or unverified information.',
+      content: 'Synthesize your research findings and return the concise evidence report now in clear markdown. State key facts directly.',
     });
     const final = await this.client.chat({
       messages,
@@ -112,6 +113,10 @@ ${options.skillContext ? `\nUser response skill:\n${options.skillContext}` : ''}
       stream: false,
       signal: options.signal,
     });
-    return { task: objective, answer: final?.content || '', toolCalls, iterations: this.maxIterations };
+    let finalAnswer = final?.content || final?.reasoning_content || '';
+    if (!finalAnswer.trim() && toolCalls.length > 0) {
+      finalAnswer = `Verified primary evidence from ${toolCalls.length} catalog/web tools: ` + toolCalls.map(t => t.name).join(', ');
+    }
+    return { task: objective, answer: finalAnswer, toolCalls, iterations: this.maxIterations };
   }
 }