dsh-vision-fallback 0.5.0 → 0.6.0

package/lib/index.js

@@ -449,13 +449,16 @@ class ReplacementCoordinator {
       replacements = new Map();
       this.pending.set(session, replacements);
     }
+    const activeMessageIds = new Set(originalMessages.map((message) => message.id));
+    for (const messageId of replacements.keys()) {
+      if (!activeMessageIds.has(messageId)) replacements.delete(messageId);
+    }
     for (let index = 0; index < originalMessages.length; index += 1) {
       const original = originalMessages[index];
       const rewritten = rewrittenMessages[index];
       if (original === rewritten || !contentHasImage(original.content ?? [])) continue;
       replacements.set(original.id, rewritten);
     }
-    if (replacements.size > 128) replacements.clear();
   }
 
   onSessionEvent(session, event) {
@@ -512,9 +515,9 @@ function apply(ctx, config) {
   ctx.on("agent/pre-step", async ({ agent, signal }, next) => {
     const decision = await next();
     if (decision.kind === "reject" || signal.aborted) return decision;
-    const contextMessages = [...agent.session.deriveMessages(), ...decision.messages];
-    const rewritten = await controller.preprocess(decision.messages, contextMessages, signal);
-    replacements.stage(agent.session, decision.messages, rewritten);
+    const modelMessages = [...agent.session.deriveMessages(), ...decision.messages];
+    const rewritten = await controller.preprocess(modelMessages, modelMessages, signal);
+    replacements.stage(agent.session, modelMessages, rewritten);
     return decision;
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vision-fallback",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "DSH 静默视觉增强：主模型照常选择，图片自动交给固定视觉模型后以隐藏上下文返回主模型。",
   "type": "module",
   "main": "lib/index.js",

package/test/vision-fallback.test.mjs

@@ -198,6 +198,52 @@ test("surface replacement 事件不会再次触发替换", async () => {
   assert.deepEqual(appends[0].options.surfaceOp, { op: "replace", start: 12, end: 12 });
 });
 
+test("历史工具结果中的图片只以文字形式进入模型视图", async () => {
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = async () => ({
+    ok: true,
+    json: async () => ({ choices: [{ message: { content: "这是主题插件的界面截图" } }] })
+  });
+  const historicalToolResult = userMessage("tool-result-1", [{
+    type: "tool-result",
+    toolCallId: "read-image-1",
+    content: [
+      { type: "text", text: "图片读取成功" },
+      { type: "image", attachment }
+    ],
+    isError: false
+  }]);
+  const current = userMessage("u2", [{ type: "text", text: "这是什么插件？" }]);
+  const surface = [historicalToolResult];
+  const session = {
+    deriveMessages: () => surface,
+    append() {
+      throw new Error("历史消息投影不应改写界面事件");
+    }
+  };
+  const controller = new VisionFallbackController(createServiceContext(), () => config);
+  const coordinator = new ReplacementCoordinator({ error() {} });
+
+  try {
+    const modelMessages = [...session.deriveMessages(), current];
+    const rewritten = await controller.preprocess(modelMessages, modelMessages);
+    coordinator.stage(session, modelMessages, rewritten);
+
+    const projected = session.deriveMessages();
+    assert.equal(projected.length, 1);
+    assert.equal(projected[0].id, historicalToolResult.id);
+    assert.equal(projected[0].content[0].type, "tool-result");
+    assert.equal(projected[0].content[0].content[1].type, "text");
+    assert.match(projected[0].content[0].content[1].text, /这是主题插件的界面截图/);
+    assert.equal(JSON.stringify(projected).includes('"type":"image"'), false);
+    assert.equal(surface[0], historicalToolResult);
+    assert.equal(surface[0].content[0].content[1].type, "image");
+  } finally {
+    coordinator.dispose();
+    globalThis.fetch = originalFetch;
+  }
+});
+
 test("图片能力覆盖可随开关变化并能恢复", async () => {
   let current = config;
   const original = async (provider, model) => ({