foliko 1.1.67 → 1.1.69

package/cli/src/ui/footer-bar.js

@@ -6,12 +6,13 @@
  */
 
 const chalk = require('chalk').default;
+const { visibleWidth, truncateToWidth } = require('@earendil-works/pi-tui');
 const { TokenCounter } = require('../../../src/core/token-counter');
 
 // Foliko 配色
 const folikoDim = chalk.hex('#6B7280');
 const folikoAccent = chalk.hex('#2A9D8F');
-const folikoGold = chalk.hex('#E9C46A');
+const folikoGold = chalk.hex('#999a9c');
 
 class FooterBar {
   /**
@@ -116,7 +117,7 @@ class FooterBar {
 
   /**
    * 从 agent 刷新数据
-   * 从 messageStore 获取最新一次调用的用量，计算增量后累加
+   * 从 SessionManager 获取最新一次调用的用量，计算增量后累加
    */
   refreshFromAgent() {
     try {
@@ -125,14 +126,9 @@ class FooterBar {
 
       const sessionId = 'cli_default';
 
-      // 主动加载历史记录（确保从 SessionContext/文件加载历史消息）
-      chatHandler._chatSession.loadHistory(sessionId);
-
-      const messageStore = chatHandler._chatSession.getSessionMessageStore(sessionId);
-      if (!messageStore) return;
-
       // 1. Token 用量：计算与上次记录的增量
-      if (messageStore.usage) {
+      const messageStore = chatHandler._chatSession.getSessionMessageStore(sessionId);
+      if (messageStore && messageStore.usage) {
         const u = messageStore.usage;
         const inputTokens = u.promptTokens || u.prompt_tokens || 0;
         const outputTokens = u.completionTokens || u.completion_tokens || 0;
@@ -152,12 +148,16 @@ class FooterBar {
         this._lastUsage = { inputTokens, outputTokens };
       }
 
-      // 2. 上下文 token 估算（使用 TokenCounter）
-      if (messageStore.messages && messageStore.messages.length > 0) {
-        const msgTokens = this._tokenCounter.countMessages(messageStore.messages);
-        this._stats.contextTokens = msgTokens;
-        if (this._stats.maxContextTokens > 0) {
-          this._stats.contextPercent = Math.min(100, (msgTokens / this._stats.maxContextTokens) * 100);
+      // 2. 上下文 token 估算（使用 SessionManager）
+      const sessionCtx = this.agent.framework?.getSessionContext(sessionId);
+      if (sessionCtx && typeof sessionCtx.getMessages === 'function') {
+        const messages = sessionCtx.getMessages();
+        if (messages && messages.length > 0) {
+          const msgTokens = this._tokenCounter.countMessages(messages);
+          this._stats.contextTokens = msgTokens;
+          if (this._stats.maxContextTokens > 0) {
+            this._stats.contextPercent = Math.min(100, (msgTokens / this._stats.maxContextTokens) * 100);
+          }
         }
       }
 
@@ -182,10 +182,10 @@ class FooterBar {
     const parts = [];
 
     // ↑ input tokens
-    parts.push(folikoGold(`↑${this._formatNum(s.inputTokens)}`));
+    parts.push(chalk.dim(`↑${this._formatNum(s.inputTokens)}`));
 
     // ↓ output tokens
-    parts.push(folikoGold(`↓${this._formatNum(s.outputTokens)}`));
+    parts.push(chalk.dim(`↓${this._formatNum(s.outputTokens)}`));
 
     // $ cost
     if (s.cost > 0) {
@@ -212,7 +212,7 @@ class FooterBar {
     let line = parts.join(' ');
 
     // 计算实际显示宽度（去除 ANSI 编码）
-    const visibleLen = visibleWidth ? visibleWidth(line) : line.length;
+    const visibleLen = visibleWidth(line);
 
     // 如果太长，缩短模型名
     if (visibleLen > width) {
@@ -226,38 +226,12 @@ class FooterBar {
     }
 
     // 截断到可用宽度
-    if (visibleWidth && visibleWidth(line) > width) {
-      line = truncateToWidth ? truncateToWidth(line, width) : line.slice(0, width);
+    if (visibleWidth(line) > width) {
+      line = truncateToWidth(line, width);
     }
 
     return [line];
   }
 }
 
-function visibleWidth(text) {
-  // 简易 ANSI 不可见宽度计算
-  const stripped = text.replace(/\x1B\[[0-9;]*m/g, '');
-  return stripped.length;
-}
-
-function truncateToWidth(text, maxWidth) {
-  const stripped = text.replace(/\x1B\[[0-9;]*m/g, '');
-  if (stripped.length <= maxWidth) return text;
-
-  // 需要截断，保留 ANSI 编码不变
-  let result = '';
-  let visLen = 0;
-  const regex = /(\x1B\[[0-9;]*m)|(.)/g;
-  let match;
-  while ((match = regex.exec(text)) !== null && visLen < maxWidth) {
-    if (match[1]) {
-      result += match[1];
-    } else {
-      result += match[2];
-      visLen++;
-    }
-  }
-  return result;
-}
-
 module.exports = { FooterBar };

package/cli/src/ui/message-bubble.js

@@ -28,11 +28,22 @@ class MessageBubble {
     this._cachedLines = null;
   }
 
+  /**
+   * 实现 pi-tui Component 的 invalidate 接口
+   * 主题变化时由 TUI 调用，清除所有缓存
+   */
+  invalidate() {
+    this._cacheKey = null;
+    this._cachedLines = null;
+    if (this._markdown) {
+      this._markdown.invalidate?.();
+    }
+  }
+
   setContent(content) {
     if (this.content !== content) {
       this.content = content;
-      this._cacheKey = null;
-      this._cachedLines = null;
+      this.invalidate();
     }
   }
 
@@ -41,6 +52,17 @@ class MessageBubble {
     this.setContent(content);
   }
 
+  /**
+   * 追加已渲染的内容（流式输出增量追加）
+   * 比 setText 更高效：跳过全量置换，只追加新内容并清缓存
+   * @param {string} renderedDelta - 新渲染的 ANSI 文本片段
+   */
+  appendContent(renderedDelta) {
+    this.content += renderedDelta;
+    this._cacheKey = null;
+    this._cachedLines = null;
+  }
+
   render(width) {
     // 检查缓存
     const cacheKey = `${width}:${this.content}`;

package/cli/src/ui/status-bar.js

@@ -0,0 +1,177 @@
+/**
+ * StatusBar — 状态栏组件
+ *
+ * 封装三个状态槽位：通知(notifier) / 工具调用(tooler) / 思考中(loader)
+ * 每个槽位通过子 Container 管理显示/隐藏
+ */
+
+const { Container, Spacer,Loader } = require('@earendil-works/pi-tui');
+const chalk = require('chalk').default;
+
+// Foliko 配色
+const folikoPrimary = chalk.hex('#2A9D8F');
+const folikoGold = chalk.hex('#E9C46A');
+
+/**
+ * NoMarginLoader — 去掉 Loader 默认的上方空行
+ */
+class NoMarginLoader extends Loader {
+  render(width) {
+    return super.render(width).slice(1); // 去掉 Loader 自动追加的空行
+  }
+}
+
+class StatusBar {
+  constructor(tui, editor) {
+    this.tui = tui;
+    this.editor = editor;
+
+    // 顶层容器
+    this.container = new Container();
+
+    // 三个子 Container 槽位
+    this._notifierSlot = new Container();
+    this._toolerSlot = new Container();
+    this._loaderSlot = new Container();
+
+    // 工具调用 Loader
+    const tooler = new NoMarginLoader(
+      tui,
+      (s) => chalk.green(s),
+      (s) => chalk.yellow(s),
+      '工具调用...',
+      { frames: ['|', '/', '-', '\\'].map((str) => folikoGold(str)) },
+    );
+
+    // 思考中 Loader
+    const loader = new NoMarginLoader(
+      tui,
+      (s) => chalk.cyan(s),
+      (s) => chalk.dim(s),
+      '正在思考中...',
+      { frames: ['⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷'].map((str) => folikoPrimary(str)) },
+    );
+
+    // Spacer 占位（隐藏时填充）
+    const toolerSpacer = new Spacer(0);
+    const loaderSpacer = new Spacer(0);
+    const notifierSpacer = new Spacer(0);
+
+    // 初始化所有槽位为 Spacer
+    this._notifierSlot.addChild(notifierSpacer);
+    this._toolerSlot.addChild(toolerSpacer);
+    this._loaderSlot.addChild(loaderSpacer);
+
+    // 挂载到顶层容器
+    this.container.addChild(this._notifierSlot);
+    this.container.addChild(this._toolerSlot);
+    this.container.addChild(this._loaderSlot);
+
+    // ——— 公开 API ———
+    const self = this;
+
+    /** 工具调用状态 */
+    this.tooler = {
+      dom: tooler,
+      _spacer: toolerSpacer,
+      _showed: false,
+      show(text) {
+        this._showed = true;
+        self._toolerSlot.clear();
+        self._toolerSlot.addChild(this.dom);
+        this.dom.setMessage(text);
+        return this.dom;
+      },
+      hide() {
+        this._showed = false;
+        self._toolerSlot.clear();
+        self._toolerSlot.addChild(this._spacer);
+        self.tui.requestRender();
+      },
+      setText(text) {
+        if (!this._showed) {
+          this.show(text);
+        } else {
+          this.dom.setMessage(text);
+        }
+      },
+    };
+
+    /** 通知提示 */
+    this.notifier = {
+      dom: null,
+      _spacer: notifierSpacer,
+      _showed: false,
+      _timeout: null,
+      show(text, duration = 5000) {
+        if (this._timeout) clearTimeout(this._timeout);
+
+        if (!this.dom) {
+          this.dom = new NoMarginLoader(tui, (s) => chalk.cyan(s), (s) => chalk.yellow(s), text);
+        }
+        this.dom.setMessage(text);
+        self._notifierSlot.clear();
+        self._notifierSlot.addChild(this.dom);
+        this._showed = true;
+
+        this._timeout = setTimeout(() => this.hide(), duration);
+      },
+      hide() {
+        if (this._timeout) {
+          clearTimeout(this._timeout);
+          this._timeout = null;
+        }
+        this._showed = false;
+        self._notifierSlot.clear();
+        self._notifierSlot.addChild(this._spacer);
+        self.tui.requestRender();
+      },
+    };
+
+    /** 思考中 Loader（带计时） */
+    this.loader = {
+      dom: loader,
+      _spacer: loaderSpacer,
+      _startTime: null,
+      _timer: null,
+      show() {
+        self._loaderSlot.clear();
+        self._loaderSlot.addChild(this.dom);
+        if (self.editor) self.editor.disableSubmit = true;
+
+        this._startTime = Date.now();
+        this.dom.setMessage('正在思考中... (0秒)');
+        this.dom.start();
+
+        this._timer = setInterval(() => {
+          const elapsed = Math.floor((Date.now() - this._startTime) / 1000);
+          const seconds = elapsed % 60;
+          const minutes = Math.floor(elapsed / 60);
+          const timeStr = minutes > 0 ? `${minutes}分${seconds}秒` : `${seconds}秒`;
+          this.dom.setMessage(`正在思考中... (${timeStr})`);
+        }, 1000);
+
+        return this.dom;
+      },
+      hide() {
+        if (self.editor) self.editor.disableSubmit = false;
+        if (this._timer) {
+          clearInterval(this._timer);
+          this._timer = null;
+        }
+        this.dom.stop();
+        self._loaderSlot.clear();
+        self._loaderSlot.addChild(this._spacer);
+        self.tui.requestRender();
+      },
+    };
+  }
+
+  invalidate() {
+    for (const child of this.container.children) {
+      child.invalidate?.();
+    }
+  }
+}
+
+module.exports = { StatusBar };

package/cli/src/utils/config.js

@@ -0,0 +1,29 @@
+/**
+ * Foliko 公共配置
+ */
+
+// 配置目录名（统一管理，方便改名）
+const AGENT_DIR_NAME = '.foliko';
+
+// 其他配置目录
+const AGENT_SUBDIRS = {
+  AGENTS: 'agents',
+  PLUGINS: 'plugins',
+  SKILLS: 'skills',
+  DATA: 'data',
+  SESSIONS: 'sessions',
+  LOGS: 'logs',
+  MCP_CONFIG: 'mcp_config.json',
+  RULES: 'rules',
+};
+
+module.exports = {
+  AGENT_DIR_NAME,
+  AGENT_SUBDIRS,
+  getAgentDir: () => AGENT_DIR_NAME,
+  getAgentsDir: () => `${AGENT_DIR_NAME}/${AGENT_SUBDIRS.AGENTS}`,
+  getPluginsDir: () => `${AGENT_DIR_NAME}/${AGENT_SUBDIRS.PLUGINS}`,
+  getDataDir: () => `${AGENT_DIR_NAME}/${AGENT_SUBDIRS.DATA}`,
+  getSessionsDir: () => `${AGENT_DIR_NAME}/${AGENT_SUBDIRS.SESSIONS}`,
+  getLogsDir: () => `${AGENT_DIR_NAME}/${AGENT_SUBDIRS.LOGS}`,
+};

package/cli/src/utils/plugin-config.js

@@ -16,7 +16,7 @@ const IGNORE_PATTERNS = [
   '*.lock',
   '*.bak',
   '.claude',
-  '.agent',
+  '.foliko',
   'examples',
   'dist',
   'build',

package/docker-compose.yml

@@ -1,33 +1,33 @@
-# ========== Foliko Docker Compose ==========
-# 使用方式: docker-compose up -d
-
-services:
-  foliko:
-    build: .
-    container_name: foliko-agent
-    restart: unless-stopped
-    ports:
-      - '3000:3000'
-    environment:
-      # AI 配置
-      - FOLIKO_PROVIDER=${FOLIKO_PROVIDER:-minimax}
-      - FOLIKO_MODEL=${FOLIKO_MODEL:-}
-      - FOLIKO_BASE_URL=${FOLIKO_BASE_URL:-}
-      - FOLIKO_API_KEY=${FOLIKO_API_KEY:-}
-      # Web 服务配置
-      - WEB_PORT=3000
-      - WEB_HOST=0.0.0.0
-      - WEB_BASE_URL=${WEB_BASE_URL:-}
-      # Telegram 配置（可选）
-      - TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
-      # 飞书配置（可选）
-      - FEISHU_APP_ID=${FEISHU_APP_ID:-}
-      - FEISHU_APP_SECRET=${FEISHU_APP_SECRET:-}
-    volumes:
-      # 持久化数据
-      - foliko-data:/app/.agent/data
-    tty: true
-    stdin_open: true
-
-volumes:
-  foliko-data:
+# ========== Foliko Docker Compose ==========
+# 使用方式: docker-compose up -d
+
+services:
+  foliko:
+    build: .
+    container_name: foliko-agent
+    restart: unless-stopped
+    ports:
+      - '3000:3000'
+    environment:
+      # AI 配置
+      - FOLIKO_PROVIDER=${FOLIKO_PROVIDER:-minimax}
+      - FOLIKO_MODEL=${FOLIKO_MODEL:-}
+      - FOLIKO_BASE_URL=${FOLIKO_BASE_URL:-}
+      - FOLIKO_API_KEY=${FOLIKO_API_KEY:-}
+      # Web 服务配置
+      - WEB_PORT=3000
+      - WEB_HOST=0.0.0.0
+      - WEB_BASE_URL=${WEB_BASE_URL:-}
+      # Telegram 配置（可选）
+      - TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
+      # 飞书配置（可选）
+      - FEISHU_APP_ID=${FEISHU_APP_ID:-}
+      - FEISHU_APP_SECRET=${FEISHU_APP_SECRET:-}
+    volumes:
+      # 持久化数据
+      - foliko-data:/app/.foliko/data
+    tty: true
+    stdin_open: true
+
+volumes:
+  foliko-data: