foliko 2.0.30 → 2.0.32

package/tests/core/chat-tool.test.js

@@ -1,187 +1,187 @@
-import { describe, it, expect } from 'vitest';
-
-// 测试 file-system 插件的 chat 工具修复
-// 通过读源码 + 模拟 execute 来验证行为
-
-const fs = require('fs');
-const path = require('path');
-
-const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
-
-function makeFakeFw(opts = {}) {
-  const llmConfig = opts.llmConfig || { model: 'test-model', provider: 'test-provider' };
-  const captured = { agentConfig: null, chatArgs: null, registeredTools: [] };
-  const fw = {
-    getCwd: () => process.cwd(),
-    pluginManager: {
-      get: (name) => {
-        if (name === 'ai') return { getConfig: () => llmConfig };
-        return null;
-      },
-    },
-    // ★ Plugin base class 的 tool.register 会先 push 到 _registeredTools，
-    //   然后查 registry.has()，has() 返回 false 才调 registry.register()。
-    //   所以 mock 必须实现 has() 否则注册流程被中断。
-    registerTool: (toolDef) => {
-      captured.registeredTools.push(toolDef);
-    },
-    toolRegistry: {
-      has: () => false,
-      register: (toolDef) => {
-        captured.registeredTools.push(toolDef);
-      },
-    },
-    createSubAgent: (config) => {
-      captured.agentConfig = config;
-      return {
-        chat: async (msg, opts) => {
-          captured.chatArgs = { msg, opts };
-          return { success: true, message: 'mock reply', steps: 1 };
-        },
-      };
-    },
-  };
-  return { fw, captured };
-}
-
-function getChatTool(captured) {
-  return captured.registeredTools.find(t => t.name === 'chat');
-}
-
-describe('file-system 插件的 chat 工具', () => {
-  it('★ 关键：name 唯一（用 Date.now + random 避免冲突）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    // 直接调工具的 execute
-    // find chat tool in _registeredTools
-    const chatTool = getChatTool(captured);
-    expect(chatTool).toBeTruthy();
-    if (!chatTool) return;
-
-    const r1 = await chatTool.execute({ message: 'hi' }, fw);
-    const r2 = await chatTool.execute({ message: 'hi2' }, fw);
-
-    expect(captured.agentConfig.name).toMatch(/^file-system-chat-\d+/);
-    // 两次调用应产生不同名字
-    const name1 = r1.metadata?.agent;
-    const name2 = r2.metadata?.agent;
-    expect(name1).not.toBe(name2);
-  });
-
-  it('★ 关键：sessionId 隔离（避免污染主对话）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    // 1. 不传 sessionId → 自动生成
-    await chatTool.execute({ message: 'm1' }, fw);
-    expect(captured.chatArgs.opts.sessionId).toMatch(/^chat-\d+$/);
-
-    // 2. 传 sessionId → 使用传入的
-    await chatTool.execute({ message: 'm2', sessionId: 'my-session' }, fw);
-    expect(captured.chatArgs.opts.sessionId).toBe('my-session');
-  });
-
-  it('★ 关键：跟随主 agent 的 LLM 配置', async () => {
-    const llmConfig = {
-      model: 'deepseek-chat',
-      provider: 'deepseek',
-      apiKey: 'sk-test',
-      baseURL: 'https://api.deepseek.com/v1',
-    };
-    const { fw, captured } = makeFakeFw({ llmConfig });
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    await chatTool.execute({ message: 'hi' }, fw);
-    expect(captured.agentConfig.model).toBe('deepseek-chat');
-    expect(captured.agentConfig.provider).toBe('deepseek');
-    expect(captured.agentConfig.apiKey).toBe('sk-test');
-    expect(captured.agentConfig.baseURL).toBe('https://api.deepseek.com/v1');
-    expect(captured.agentConfig.hidden).toBe(true);
-  });
-
-  it('★ 关键：data 只返回 message 文本（不返回整个对象）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    const r = await chatTool.execute({ message: 'hi' }, fw);
-    expect(r.success).toBe(true);
-    expect(r.data).toBe('mock reply');  // 只是字符串，不是整个对象
-    expect(typeof r.data).toBe('string');
-    // metadata 含元信息
-    expect(r.metadata).toBeTruthy();
-    expect(r.metadata.steps).toBe(1);
-  });
-
-  it('★ 关键：systemPrompt 默认值合理', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    // 不传 systemPrompt → 用默认
-    await chatTool.execute({ message: 'hi' }, fw);
-    expect(captured.agentConfig.systemPrompt).toContain('文件系统');
-
-    // 传 systemPrompt → 覆盖
-    await chatTool.execute({
-      message: 'hi',
-      systemPrompt: '你是一个翻译助手',
-    }, fw);
-    expect(captured.agentConfig.systemPrompt).toBe('你是一个翻译助手');
-  });
-
-  it('★ 关键：错误捕获（AI 抛错时不崩溃）', async () => {
-    const registeredTools = [];
-    const fw = {
-      getCwd: () => process.cwd(),
-      pluginManager: { get: () => null },
-      registerTool: (t) => registeredTools.push(t),
-      toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
-      createSubAgent: () => ({
-        chat: async () => { throw new Error('AI 服务不可用'); },
-      }),
-    };
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = registeredTools.find(t => t.name === 'chat');
-    if (!chatTool) throw new Error('no chat tool');
-
-    const r = await chatTool.execute({ message: 'hi' }, fw);
-    expect(r.success).toBe(false);
-    expect(r.error).toBe('AI 服务不可用');
-  });
-
-  it('★ inputSchema 含 sessionId 字段', () => {
-    // 直接读源码验证
-    const src = fs.readFileSync(
-      path.join(__dirname, '../../plugins/io/file-system/index.js'),
-      'utf-8'
-    );
-    expect(src).toMatch(/sessionId:\s*z\.string\(\)\.optional\(\)/);
-  });
-
-  it('★ 删除死代码：const ai = framework.getAI()', () => {
-    const src = fs.readFileSync(
-      path.join(__dirname, '../../plugins/io/file-system/index.js'),
-      'utf-8'
-    );
-    expect(src).not.toMatch(/const\s+ai\s*=\s*framework\.getAI/);
-  });
-});
+import { describe, it, expect } from 'vitest';
+
+// 测试 file-system 插件的 chat 工具修复
+// 通过读源码 + 模拟 execute 来验证行为
+
+const fs = require('fs');
+const path = require('path');
+
+const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
+
+function makeFakeFw(opts = {}) {
+  const llmConfig = opts.llmConfig || { model: 'test-model', provider: 'test-provider' };
+  const captured = { agentConfig: null, chatArgs: null, registeredTools: [] };
+  const fw = {
+    getCwd: () => process.cwd(),
+    pluginManager: {
+      get: (name) => {
+        if (name === 'ai') return { getConfig: () => llmConfig };
+        return null;
+      },
+    },
+    // ★ Plugin base class 的 tool.register 会先 push 到 _registeredTools，
+    //   然后查 registry.has()，has() 返回 false 才调 registry.register()。
+    //   所以 mock 必须实现 has() 否则注册流程被中断。
+    registerTool: (toolDef) => {
+      captured.registeredTools.push(toolDef);
+    },
+    toolRegistry: {
+      has: () => false,
+      register: (toolDef) => {
+        captured.registeredTools.push(toolDef);
+      },
+    },
+    createSubAgent: (config) => {
+      captured.agentConfig = config;
+      return {
+        chat: async (msg, opts) => {
+          captured.chatArgs = { msg, opts };
+          return { success: true, message: 'mock reply', steps: 1 };
+        },
+      };
+    },
+  };
+  return { fw, captured };
+}
+
+function getChatTool(captured) {
+  return captured.registeredTools.find(t => t.name === 'chat');
+}
+
+describe('file-system 插件的 chat 工具', () => {
+  it('★ 关键：name 唯一（用 Date.now + random 避免冲突）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    // 直接调工具的 execute
+    // find chat tool in _registeredTools
+    const chatTool = getChatTool(captured);
+    expect(chatTool).toBeTruthy();
+    if (!chatTool) return;
+
+    const r1 = await chatTool.execute({ message: 'hi' }, fw);
+    const r2 = await chatTool.execute({ message: 'hi2' }, fw);
+
+    expect(captured.agentConfig.name).toMatch(/^file-system-chat-\d+/);
+    // 两次调用应产生不同名字
+    const name1 = r1.metadata?.agent;
+    const name2 = r2.metadata?.agent;
+    expect(name1).not.toBe(name2);
+  });
+
+  it('★ 关键：sessionId 隔离（避免污染主对话）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 1. 不传 sessionId → 自动生成
+    await chatTool.execute({ message: 'm1' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toMatch(/^chat-\d+$/);
+
+    // 2. 传 sessionId → 使用传入的
+    await chatTool.execute({ message: 'm2', sessionId: 'my-session' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toBe('my-session');
+  });
+
+  it('★ 关键：跟随主 agent 的 LLM 配置', async () => {
+    const llmConfig = {
+      model: 'deepseek-chat',
+      provider: 'deepseek',
+      apiKey: 'sk-test',
+      baseURL: 'https://api.deepseek.com/v1',
+    };
+    const { fw, captured } = makeFakeFw({ llmConfig });
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.model).toBe('deepseek-chat');
+    expect(captured.agentConfig.provider).toBe('deepseek');
+    expect(captured.agentConfig.apiKey).toBe('sk-test');
+    expect(captured.agentConfig.baseURL).toBe('https://api.deepseek.com/v1');
+    expect(captured.agentConfig.hidden).toBe(true);
+  });
+
+  it('★ 关键：data 只返回 message 文本（不返回整个对象）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(true);
+    expect(r.data).toBe('mock reply');  // 只是字符串，不是整个对象
+    expect(typeof r.data).toBe('string');
+    // metadata 含元信息
+    expect(r.metadata).toBeTruthy();
+    expect(r.metadata.steps).toBe(1);
+  });
+
+  it('★ 关键：systemPrompt 默认值合理', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 不传 systemPrompt → 用默认
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.systemPrompt).toContain('文件系统');
+
+    // 传 systemPrompt → 覆盖
+    await chatTool.execute({
+      message: 'hi',
+      systemPrompt: '你是一个翻译助手',
+    }, fw);
+    expect(captured.agentConfig.systemPrompt).toBe('你是一个翻译助手');
+  });
+
+  it('★ 关键：错误捕获（AI 抛错时不崩溃）', async () => {
+    const registeredTools = [];
+    const fw = {
+      getCwd: () => process.cwd(),
+      pluginManager: { get: () => null },
+      registerTool: (t) => registeredTools.push(t),
+      toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
+      createSubAgent: () => ({
+        chat: async () => { throw new Error('AI 服务不可用'); },
+      }),
+    };
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = registeredTools.find(t => t.name === 'chat');
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(false);
+    expect(r.error).toBe('AI 服务不可用');
+  });
+
+  it('★ inputSchema 含 sessionId 字段', () => {
+    // 直接读源码验证
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).toMatch(/sessionId:\s*z\.string\(\)\.optional\(\)/);
+  });
+
+  it('★ 删除死代码：const ai = framework.getAI()', () => {
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).not.toMatch(/const\s+ai\s*=\s*framework\.getAI/);
+  });
+});

package/tests/core/latest-message-not-filtered.test.js

@@ -0,0 +1,143 @@
+import { describe, it, expect } from 'vitest';
+
+const { ToolLoop } = require('../../src/agent/tool-loop.js');
+
+/**
+ * 验证："每次发送消息都是最新的，不会被过滤掉"
+ * 即：无论历史消息如何被 sanitize / 补 reasoning / 去重，
+ *     用户最新的一条消息永远作为最后一条被发送给 API，绝不丢失。
+ */
+
+// 一个最小可捕获的 OpenAI 兼容客户端 mock
+function mockClient(responses) {
+  const calls = [];
+  return {
+    calls,
+    chat: {
+      completions: {
+        create: async (params) => {
+          // 深拷贝快照，避免后续 loop 复用引用导致断言失真
+          calls.push(JSON.parse(JSON.stringify(params)));
+          const r = responses.shift();
+          if (r instanceof Error) throw r;
+          return r;
+        },
+      },
+    },
+  };
+}
+
+// 非流式最终答复（无 tool_calls）
+function finalAnswer(text) {
+  return {
+    choices: [{ message: { content: text }, finish_reason: 'stop' }],
+    usage: { prompt_tokens: 1, completion_tokens: 1 },
+  };
+}
+
+const lastOf = (arr) => arr[arr.length - 1];
+
+describe('最新消息一定被发送（_buildApiMessages 层）', () => {
+  it('纯文本历史 + 最新 user → 最新 user 永远在最后', () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 1 });
+    const api = loop._buildApiMessages([
+      { role: 'user', content: '第一条' },
+      { role: 'assistant', content: '回复第一条' },
+      { role: 'user', content: '最新消息-abc' },
+    ], 'sys');
+    expect(lastOf(api)).toEqual({ role: 'user', content: '最新消息-abc' });
+  });
+
+  it('历史含 tool_calls / tool 结果 / reasoning 时，最新 user 仍在最后且内容不变', () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 1, thinkingMode: true });
+    const api = loop._buildApiMessages([
+      { role: 'user', content: '早前的问题' },
+      {
+        role: 'assistant',
+        content: '',
+        reasoning_content: '先读文件',
+        tool_calls: [{ id: 'c1', type: 'function', function: { name: 'read', arguments: '{}' } }],
+      },
+      { role: 'tool', tool_call_id: 'c1', content: 'file data' },
+      { role: 'assistant', content: '读完了' },
+      { role: 'user', content: '这是我最新发的-xyz' },
+    ], 'sys');
+    const last = lastOf(api);
+    expect(last.role).toBe('user');
+    expect(last.content).toBe('这是我最新发的-xyz');
+  });
+
+  it('最新 user 内容为空字符串也不会被丢弃', () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 1 });
+    const api = loop._buildApiMessages([
+      { role: 'assistant', content: '上一轮' },
+      { role: 'user', content: '' },
+    ], 'sys');
+    expect(lastOf(api)).toEqual({ role: 'user', content: '' });
+  });
+
+  it('最新 user 是数组内容（含 text part）时，文本被保留为最后一条', () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 1 });
+    const api = loop._buildApiMessages([
+      { role: 'user', content: '历史' },
+      { role: 'assistant', content: 'ok' },
+      { role: 'user', content: [{ type: 'text', text: '多模态最新-777' }] },
+    ], 'sys');
+    const last = lastOf(api);
+    expect(last.role).toBe('user');
+    expect(last.content).toBe('多模态最新-777');
+  });
+});
+
+describe('最新消息一定被发送（generate 端到端，mock client）', () => {
+  it('实际发给 API 的 messages 末尾就是最新 user 输入', async () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 3 });
+    const client = mockClient([finalAnswer('这是回复')]);
+
+    const messages = [
+      { role: 'user', content: '旧消息1' },
+      { role: 'assistant', content: '旧回复1' },
+      { role: 'user', content: '★最新用户输入★' },
+    ];
+
+    const result = await loop.generate({ messages, systemPrompt: 'sys', model: 'm', client });
+
+    expect(result.text).toBe('这是回复');
+    expect(client.calls).toHaveLength(1);
+    const sent = lastOf(client.calls[0].messages);
+    expect(sent.role).toBe('user');
+    expect(sent.content).toBe('★最新用户输入★');
+  });
+
+  it('触发 reasoning_content 自愈重试后，最新 user 依旧在最后（两次请求都保住）', async () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 3 });
+    const err = new Error('400 The reasoning_content in the thinking mode must be passed back to the API.');
+    const client = mockClient([err, finalAnswer('重试成功的回复')]);
+
+    const messages = [
+      { role: 'user', content: '历史问' },
+      {
+        role: 'assistant',
+        content: '',
+        tool_calls: [{ id: 'c1', type: 'function', function: { name: 'read', arguments: '{}' } }],
+      },
+      { role: 'tool', tool_call_id: 'c1', content: 'done' },
+      { role: 'user', content: '重试也要带上的最新消息-999' },
+    ];
+
+    const result = await loop.generate({ messages, systemPrompt: 'sys', model: 'm', client });
+
+    expect(result.text).toBe('重试成功的回复');
+    // 一次失败 + 一次自愈重试 = 2 次调用
+    expect(client.calls).toHaveLength(2);
+    for (const call of client.calls) {
+      const last = lastOf(call.messages);
+      expect(last.role).toBe('user');
+      expect(last.content).toBe('重试也要带上的最新消息-999');
+    }
+    // 自愈生效：重试请求里 assistant 已补上 reasoning_content
+    const retried = client.calls[1].messages;
+    const assistantMsg = retried.find((m) => m.role === 'assistant' && m.tool_calls);
+    expect(assistantMsg.reasoning_content).toBeTruthy();
+  });
+});

package/tests/core/p0-fixes.test.js

@@ -0,0 +1,129 @@
+import { describe, it, expect } from 'vitest';
+
+const { ToolLoop } = require('../../src/agent/tool-loop.js');
+const { ContextCompressor } = require('../../src/context/compressor.js');
+
+// 最小可捕获的 OpenAI 兼容客户端 mock
+function mockClient(responses) {
+  const calls = [];
+  return {
+    calls,
+    chat: { completions: { create: async (p) => { calls.push(p); const r = responses.shift(); if (r instanceof Error) throw r; return r; } } },
+  };
+}
+const finalAnswer = (text, reasoning) => ({
+  choices: [{ message: { content: text, ...(reasoning ? { reasoning_content: reasoning } : {}) }, finish_reason: 'stop' }],
+  usage: { prompt_tokens: 1, completion_tokens: 1 },
+});
+const toolThenAnswer = (toolName) => ({
+  choices: [{ message: { content: '', tool_calls: [{ id: 'c1', type: 'function', function: { name: toolName, arguments: '{}' } }] }, finish_reason: 'tool_calls' }],
+  usage: { prompt_tokens: 1, completion_tokens: 1 },
+});
+
+describe('P0#2 — 最终 assistant 回复被写进 messages（generate）', () => {
+  it('无工具时，最终回复作为 assistant 消息追加到 messages', async () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 3 });
+    const client = mockClient([finalAnswer('这是最终答复', '我的思考')]);
+    const messages = [{ role: 'user', content: '问题' }];
+
+    const result = await loop.generate({ messages, systemPrompt: 'sys', model: 'm', client });
+
+    expect(result.text).toBe('这是最终答复');
+    const last = messages[messages.length - 1];
+    expect(last.role).toBe('assistant');
+    expect(last.content).toBe('这是最终答复');
+    expect(last.reasoning_content).toBe('我的思考');
+  });
+
+  it('工具轮 + 最终回复：messages 末尾是 assistant 答复（历史不丢答复）', async () => {
+    const loop = new ToolLoop({ tools: { read: { name: 'read', execute: async () => 'file data' } }, maxSteps: 3 });
+    const client = mockClient([toolThenAnswer('read'), finalAnswer('读完了，结果是X')]);
+    const messages = [{ role: 'user', content: '读文件' }];
+
+    await loop.generate({ messages, systemPrompt: 'sys', model: 'm', client });
+
+    const roles = messages.map(m => m.role);
+    // user -> assistant(tool_calls) -> tool -> assistant(final)
+    expect(roles[0]).toBe('user');
+    expect(roles[roles.length - 1]).toBe('assistant');
+    expect(messages[messages.length - 1].content).toBe('读完了，结果是X');
+  });
+});
+
+describe('P0#2/#3 — stream 追加最终回复 + thinking 只发增量', () => {
+  async function drain(gen) {
+    const events = [];
+    let ret;
+    while (true) {
+      const { value, done } = await gen.next();
+      if (done) { ret = value; break; }
+      events.push(value);
+    }
+    return { events, ret };
+  }
+
+  // 流式 chunk 构造
+  const chunk = (delta, finish = null) => ({ choices: [{ delta, finish_reason: finish }] });
+
+  it('thinking 事件是增量而非累积（不重复）', async () => {
+    const loop = new ToolLoop({ tools: {}, maxSteps: 2, thinkingMode: true });
+    async function* streamGen() {
+      yield chunk({ reasoning_content: '我先' });
+      yield chunk({ reasoning_content: '想一下' });
+      yield chunk({ content: '答复' });
+      yield chunk({}, 'stop');
+      yield { choices: [], usage: { prompt_tokens: 1, completion_tokens: 1 } };
+    }
+    const client = { chat: { completions: { create: async () => streamGen() } } };
+    const messages = [{ role: 'user', content: 'hi' }];
+
+    const { events } = await drain(loop.stream({ messages, systemPrompt: 'sys', model: 'm', client }));
+    const thinking = events.filter(e => e.type === 'thinking').map(e => e.text);
+    // 增量应为 ['我先','想一下']，而不是 ['我先','我先想一下']
+    expect(thinking).toEqual(['我先', '想一下']);
+    // 且最终 assistant 回复被追加，reasoning 完整保存
+    const last = messages[messages.length - 1];
+    expect(last.role).toBe('assistant');
+    expect(last.content).toBe('答复');
+    expect(last.reasoning_content).toBe('我先想一下');
+  });
+});
+
+describe('P0#4 — 压缩器按 sessionId 隔离在途 promise', () => {
+  it('不同 session 并发压缩各自独立执行（不共享 in-flight）', async () => {
+    const comp = new ContextCompressor({ agent: null, framework: null, model: 'deepseek-chat', keepRecentMessages: 1, enableSmartCompress: false });
+    let calls = 0;
+    const orig = comp._doCompress.bind(comp);
+    comp._doCompress = async (...a) => { calls++; return orig(...a); };
+    const mkMsgs = (tag) => [
+      { role: 'user', content: `${tag}-1` },
+      { role: 'assistant', content: `${tag}-2` },
+      { role: 'user', content: `${tag}-3` },
+    ];
+    const storeA = { messages: mkMsgs('A'), save: async () => {} };
+    const storeB = { messages: mkMsgs('B'), save: async () => {} };
+
+    await Promise.all([
+      comp.compress('sessA', storeA.messages, storeA),
+      comp.compress('sessB', storeB.messages, storeB),
+    ]);
+    // 两个 session 各自跑一次压缩（旧实现里 B 会拿到 A 的 promise、根本不压缩自己）
+    expect(calls).toBe(2);
+  });
+
+  it('同一 session 并发调用只执行一次压缩（复用 in-flight）', async () => {
+    const comp = new ContextCompressor({ agent: null, framework: null, model: 'deepseek-chat', keepRecentMessages: 1, enableSmartCompress: false });
+    let calls = 0;
+    const orig = comp._doCompress.bind(comp);
+    comp._doCompress = async (...a) => { calls++; return orig(...a); };
+    const msgs = [
+      { role: 'user', content: 'x1' }, { role: 'assistant', content: 'x2' }, { role: 'user', content: 'x3' },
+    ];
+    const store = { messages: msgs, save: async () => {} };
+    await Promise.all([
+      comp.compress('same', msgs, store),
+      comp.compress('same', msgs, store),
+    ]);
+    expect(calls).toBe(1);
+  });
+});