引入游玩回合与开场收口，抽出可替换 agent 司机并支持运行中止；完善预设洞位、世界书拼装与试跑，并打磨会话运行时与 Web 交互。

Co-authored-by: Cursor <cursoragent@cursor.com>

src/llm/preset-wrapper.ts

@@ -1,4 +1,5 @@
-import { assemblePresetMessages, mergeMessages } from "../preset/assembler.js";
+import { loadAppSettings } from "../config/settings.js";
+import { resolveActivePreset } from "../preset/store.js";
 import type { PresetPackage } from "../types/preset.js";
 import type {
   ChatMessage,
@@ -9,9 +10,35 @@ import type {
   LlmProvider,
   StreamCallbacks,
 } from "./client.js";
+import {
+  TokenTrackingProvider,
+  type LlmTrackingContext,
+} from "./token-tracker.js";
+
+export type LlmTrackingRef = { current: LlmTrackingContext };
+
+function readActivePreset(): PresetPackage | null {
+  return resolveActivePreset(loadAppSettings().activePresetId);
+}
 
 /**
- * 在所有 LLM 请求前注入当前 preset 的 prompt 片段与生成参数。
+ * 统计在内、预设在外：痕迹里的 messages / generation 就是发给模型的那一份。
+ * 当前没有选用预设时仍包一层，请求原样转发。
+ */
+export function wrapLlmForSession(
+  inner: LlmProvider,
+  trackingRef?: LlmTrackingRef,
+  getPreset: () => PresetPackage | null = readActivePreset,
+): LlmProvider {
+  const tracked = trackingRef
+    ? new TokenTrackingProvider(inner, () => trackingRef.current)
+    : inner;
+  return new PresetLlmProvider(tracked, getPreset);
+}
+
+/**
+ * 在所有 LLM 请求上合并当前 preset 的生成参数。
+ * prompt / marker 不在此前置，由 play worker 按扩展 prompt_order 填洞。
  */
 export class PresetLlmProvider implements LlmProvider {
   constructor(
@@ -19,41 +46,57 @@ export class PresetLlmProvider implements LlmProvider {
     private readonly getPreset: () => PresetPackage | null,
   ) {}
 
+  private prepare(
+    messages: ChatMessage[],
+    options?: CompleteOptions,
+  ): { messages: ChatMessage[]; options: CompleteOptions | undefined } {
+    const preset = this.getPreset();
+    if (!preset) return { messages, options };
+    // 生成参数全局合并；prompt/marker 只在 play worker 按 prompt_order 填洞，这里不再前置。
+    return {
+      messages,
+      options: {
+        ...options,
+        generation: options?.generation ?? preset.generation,
+      },
+    };
+  }
+
   async complete(
     messages: ChatMessage[],
     options?: CompleteOptions,
   ): Promise<CompleteResult> {
-    const preset = this.getPreset();
-    if (!preset) {
-      return this.inner.complete(messages, options);
+    const prepared = this.prepare(messages, options);
+    return this.inner.complete(prepared.messages, prepared.options);
+  }
+
+  async completeStream(
+    messages: ChatMessage[],
+    options?: CompleteOptions,
+    callbacks: StreamCallbacks = {},
+  ): Promise<CompleteResult> {
+    if (!this.inner.completeStream) {
+      const result = await this.complete(messages, options);
+      if (result.reasoning) callbacks.onReasoningDelta?.(result.reasoning);
+      if (result.content) callbacks.onContentDelta?.(result.content);
+      return result;
     }
-
-    const presetMessages = assemblePresetMessages(preset);
-    const merged = mergeMessages(presetMessages, messages);
-    const generation = options?.generation ?? preset.generation;
-
-    return this.inner.complete(merged, {
-      ...options,
-      generation,
-    });
+    const prepared = this.prepare(messages, options);
+    return this.inner.completeStream(
+      prepared.messages,
+      prepared.options,
+      callbacks,
+    );
   }
 
   async completeWithTools(
     messages: ChatMessage[],
     options: CompleteWithToolsOptions,
   ): Promise<CompleteWithToolsResult> {
-    const preset = this.getPreset();
-    if (!preset) {
-      return this.inner.completeWithTools(messages, options);
-    }
-
-    const presetMessages = assemblePresetMessages(preset);
-    const merged = mergeMessages(presetMessages, messages);
-    const generation = options.generation ?? preset.generation;
-
-    return this.inner.completeWithTools(merged, {
+    const prepared = this.prepare(messages, options);
+    return this.inner.completeWithTools(prepared.messages, {
       ...options,
-      generation,
+      ...prepared.options,
     });
   }
 
@@ -62,17 +105,14 @@ export class PresetLlmProvider implements LlmProvider {
     options: CompleteWithToolsOptions,
     callbacks: StreamCallbacks,
   ): Promise<CompleteWithToolsResult> {
-    const preset = this.getPreset();
     if (!this.inner.completeWithToolsStream) {
       return this.completeWithTools(messages, options);
     }
-    const presetMessages = preset ? assemblePresetMessages(preset) : [];
-    const merged = preset ? mergeMessages(presetMessages, messages) : messages;
-    const generation = options.generation ?? preset?.generation;
-
-    return this.inner.completeWithToolsStream(merged, {
-      ...options,
-      generation,
-    }, callbacks);
+    const prepared = this.prepare(messages, options);
+    return this.inner.completeWithToolsStream(
+      prepared.messages,
+      { ...options, ...prepared.options },
+      callbacks,
+    );
   }
 }