@downcity/agent 1.1.408 → 1.1.437

package/bin/executor/model/ModelStepRunner.js

@@ -4,24 +4,19 @@
  * 模块直接消费 `ModelStreamEvent`、生成 canonical Assistant Parts，并执行本 Step 的工具调用。
  * 标准事件会原样交给 Session 输出端口，不产生 UI-shaped 中间事件。
  */
-import { ModelStreamValidator, } from "@downcity/type";
 import { z } from "zod";
-import { ModelStreamFailure } from "./ModelStreamFailure.js";
+import { consume_model_stream } from "../../executor/model/ModelStreamConsumer.js";
 /** 执行一个 Downcity 模型 Step 并收敛工具结果。 */
 export async function run_model_step(input) {
     const call = {
         messages: [...convert_system_messages(input.system), ...input.messages],
         tools: convert_tools(input.tools),
     };
-    const stream = await input.model.stream(call, input.abort_signal);
     const collector = new StepEventCollector();
-    const validator = new ModelStreamValidator();
-    for await (const event of stream) {
-        validator.accept(event);
+    await consume_model_stream(input.model, call, input.abort_signal, () => collector.has_partial_output(), async (event) => {
         await input.assistant_output?.write_model_event(event);
         collector.accept(event);
-    }
-    validator.finish();
+    });
     const collected = collector.finish();
     const tool_results = await execute_tools(collected.tool_calls, input, call.messages);
     for (const result of tool_results) {
@@ -33,19 +28,6 @@ export async function run_model_step(input) {
         });
     }
     const assistant_parts = append_tool_results(collected.assistant_parts, tool_results);
-    const response_messages = [collected.assistant_model_message];
-    if (tool_results.length > 0) {
-        response_messages.push({
-            role: "tool",
-            content: tool_results.map((result) => ({
-                type: "tool_result",
-                tool_call_id: result.tool_call_id,
-                tool_name: result.tool_name,
-                outcome: result.success ? "succeeded" : "failed",
-                content: [{ type: "json", value: to_model_json_value(result.output) }],
-            })),
-        });
-    }
     return {
         assistant_parts,
         step_result: {
@@ -54,7 +36,6 @@ export async function run_model_step(input) {
             ...(collected.usage ? { usage: collected.usage } : {}),
             tool_calls: collected.tool_calls,
             tool_results,
-            response: { messages: response_messages },
             content: collected.tool_calls.map((tool_call) => ({
                 type: "tool-call",
                 ...tool_call,
@@ -64,7 +45,6 @@ export async function run_model_step(input) {
 }
 /** 模型事件聚合器。 */
 class StepEventCollector {
-    model_content = [];
     assistant_parts = [];
     text_by_id = new Map();
     reasoning_by_id = new Map();
@@ -72,13 +52,14 @@ class StepEventCollector {
     usage;
     finish_reason;
     text = "";
+    /** 当前调用是否已经产生不可安全重复的模型输出。 */
+    has_partial_output() {
+        return this.text.length > 0 ||
+            this.reasoning_by_id.size > 0 ||
+            this.tool_by_content_id.size > 0;
+    }
     /** 消费单个标准模型事件。 */
     accept(event) {
-        if (event.type === "model_error") {
-            throw new ModelStreamFailure(event.error, this.text.length > 0 ||
-                this.reasoning_by_id.size > 0 ||
-                this.tool_by_content_id.size > 0);
-        }
         if (event.type === "text_start") {
             this.text_by_id.set(event.content_id, "");
         }
@@ -88,7 +69,6 @@ class StepEventCollector {
         }
         else if (event.type === "text_finish") {
             const text = this.text_by_id.get(event.content_id) ?? "";
-            this.model_content.push({ type: "text", text });
             this.assistant_parts.push({
                 part_id: `text:${event.content_id}`,
                 sequence: this.assistant_parts.length + 1,
@@ -105,11 +85,6 @@ class StepEventCollector {
         }
         else if (event.type === "reasoning_finish") {
             const text = this.reasoning_by_id.get(event.content_id) ?? "";
-            this.model_content.push({
-                type: "reasoning",
-                text,
-                ...(event.signature ? { signature: event.signature } : {}),
-            });
             this.assistant_parts.push({
                 part_id: `reasoning:${event.content_id}`,
                 sequence: this.assistant_parts.length + 1,
@@ -132,12 +107,6 @@ class StepEventCollector {
                 tool.input = event.input;
                 if (event.input_error)
                     tool.input_error = event.input_error;
-                this.model_content.push({
-                    type: "tool_call",
-                    tool_call_id: tool.tool_call_id,
-                    tool_name: tool.tool_name,
-                    input: tool.input,
-                });
                 this.assistant_parts.push({
                     part_id: `tool:${tool.tool_call_id}`,
                     sequence: this.assistant_parts.length + 1,
@@ -162,7 +131,6 @@ class StepEventCollector {
             throw new Error("Model stream ended without model_finish");
         return {
             assistant_parts: this.assistant_parts,
-            assistant_model_message: { role: "assistant", content: this.model_content },
             finish_reason: this.finish_reason,
             ...(this.usage ? { usage: this.usage } : {}),
             text: this.text,

package/bin/executor/model/ModelStepRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelStepRunner.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModelStepRunner.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"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"}

package/bin/executor/model/ModelStreamConsumer.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 单次模型流消费基础设施。
+ *
+ * 关键点（中文）
+ * - 统一负责模型调用、协议校验、读取失败归一化与 reader 释放。
+ * - 调用方通过事件回调维护自己的领域状态，本模块不理解 Session、Tool 或文本聚合。
+ * - `has_partial_output` 由调用方基于已接收事实判断，保证失败恢复语义准确。
+ */
+import { type ModelCall, type ModelClient, type ModelStreamEvent } from "@downcity/type";
+/** 消费并校验一次完整模型事件流。 */
+export declare function consume_model_stream(model: ModelClient, call: ModelCall, abort_signal: AbortSignal | undefined, has_partial_output: () => boolean, accept_event: (event: ModelStreamEvent) => void | Promise<void>): Promise<void>;
+//# sourceMappingURL=ModelStreamConsumer.d.ts.map

package/bin/executor/model/ModelStreamConsumer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelStreamConsumer.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamConsumer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAOxB,sBAAsB;AACtB,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,WAAW,GAAG,SAAS,EACrC,kBAAkB,EAAE,MAAM,OAAO,EACjC,YAAY,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAC9D,OAAO,CAAC,IAAI,CAAC,CA+Cf"}

package/bin/executor/model/ModelStreamConsumer.js

@@ -0,0 +1,60 @@
+/**
+ * 单次模型流消费基础设施。
+ *
+ * 关键点（中文）
+ * - 统一负责模型调用、协议校验、读取失败归一化与 reader 释放。
+ * - 调用方通过事件回调维护自己的领域状态，本模块不理解 Session、Tool 或文本聚合。
+ * - `has_partial_output` 由调用方基于已接收事实判断，保证失败恢复语义准确。
+ */
+import { ModelStreamValidator, } from "@downcity/type";
+import { ModelStreamFailure, normalize_model_invocation_failure, normalize_model_protocol_failure, } from "../model/ModelStreamFailure.js";
+/** 消费并校验一次完整模型事件流。 */
+export async function consume_model_stream(model, call, abort_signal, has_partial_output, accept_event) {
+    const validator = new ModelStreamValidator();
+    let stream;
+    try {
+        stream = await model.stream(call, abort_signal);
+    }
+    catch (error) {
+        throw normalize_model_invocation_failure(error, false, abort_signal);
+    }
+    const reader = stream.getReader();
+    let stream_complete = false;
+    try {
+        while (true) {
+            let result;
+            try {
+                result = await reader.read();
+            }
+            catch (error) {
+                throw normalize_model_invocation_failure(error, has_partial_output(), abort_signal);
+            }
+            if (result.done) {
+                stream_complete = true;
+                break;
+            }
+            try {
+                validator.accept(result.value);
+            }
+            catch (error) {
+                throw normalize_model_protocol_failure(error, has_partial_output());
+            }
+            await accept_event(result.value);
+            if (result.value.type === "model_error") {
+                throw new ModelStreamFailure(result.value.error, has_partial_output());
+            }
+        }
+    }
+    finally {
+        if (!stream_complete)
+            await reader.cancel().catch(() => undefined);
+        reader.releaseLock();
+    }
+    try {
+        validator.finish();
+    }
+    catch (error) {
+        throw normalize_model_protocol_failure(error, has_partial_output());
+    }
+}
+//# sourceMappingURL=ModelStreamConsumer.js.map

package/bin/executor/model/ModelStreamConsumer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelStreamConsumer.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamConsumer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,oBAAoB,GAIrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kBAAkB,EAClB,kCAAkC,EAClC,gCAAgC,GACjC,MAAM,uCAAuC,CAAC;AAE/C,sBAAsB;AACtB,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,KAAkB,EAClB,IAAe,EACf,YAAqC,EACrC,kBAAiC,EACjC,YAA+D;IAE/D,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,IAAI,MAAwC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,kCAAkC,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,MAA+C,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC/B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,kCAAkC,CACtC,KAAK,EACL,kBAAkB,EAAE,EACpB,YAAY,CACb,CAAC;YACJ,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,eAAe,GAAG,IAAI,CAAC;gBACvB,MAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,gCAAgC,CAAC,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACxC,MAAM,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;IACH,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,eAAe;YAAE,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,CAAC;QACH,SAAS,CAAC,MAAM,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,gCAAgC,CAAC,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACtE,CAAC;AACH,CAAC"}

package/bin/executor/model/ModelStreamFailure.d.ts

@@ -17,6 +17,10 @@ export declare class ModelStreamFailure extends Error {
     readonly provider_request_id?: string;
     constructor(error: ModelError, has_partial_output: boolean);
 }
+/** 把 ModelClient 直接抛出的调用异常归一为可恢复的模型传输失败。 */
+export declare function normalize_model_invocation_failure(error: unknown, has_partial_output: boolean, abort_signal?: AbortSignal): ModelStreamFailure;
+/** 把不合法的模型协议流归一为不可重试的 Provider 失败。 */
+export declare function normalize_model_protocol_failure(error: unknown, has_partial_output: boolean): ModelStreamFailure;
 /** 判断未知错误是否为可安全自动重试的无输出模型流失败。 */
 export declare function is_retryable_empty_model_stream_failure(error: unknown): error is ModelStreamFailure;
 //# sourceMappingURL=ModelStreamFailure.d.ts.map

package/bin/executor/model/ModelStreamFailure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelStreamFailure.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAwB;AACxB,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACxB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAElC,sBAAsB;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,2BAA2B;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,2BAA2B;IAC3B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;gBAE1B,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO;CAU3D;AAED,iCAAiC;AACjC,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAK7B"}
+{"version":3,"file":"ModelStreamFailure.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAwB;AACxB,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACxB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAElC,sBAAsB;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,2BAA2B;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,2BAA2B;IAC3B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;gBAE1B,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO;CAU3D;AAED,4CAA4C;AAC5C,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,YAAY,CAAC,EAAE,WAAW,GACzB,kBAAkB,CAQpB;AAED,sCAAsC;AACtC,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,GAC1B,kBAAkB,CAOpB;AAED,iCAAiC;AACjC,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAK7B"}

package/bin/executor/model/ModelStreamFailure.js

@@ -25,6 +25,27 @@ export class ModelStreamFailure extends Error {
         }
     }
 }
+/** 把 ModelClient 直接抛出的调用异常归一为可恢复的模型传输失败。 */
+export function normalize_model_invocation_failure(error, has_partial_output, abort_signal) {
+    if (error instanceof ModelStreamFailure)
+        return error;
+    const cancelled = abort_signal?.aborted === true;
+    return new ModelStreamFailure({
+        code: cancelled ? "cancelled" : "transport_error",
+        message: error instanceof Error ? error.message : String(error),
+        retryable: !cancelled,
+    }, has_partial_output);
+}
+/** 把不合法的模型协议流归一为不可重试的 Provider 失败。 */
+export function normalize_model_protocol_failure(error, has_partial_output) {
+    if (error instanceof ModelStreamFailure)
+        return error;
+    return new ModelStreamFailure({
+        code: "provider_error",
+        message: error instanceof Error ? error.message : String(error),
+        retryable: false,
+    }, has_partial_output);
+}
 /** 判断未知错误是否为可安全自动重试的无输出模型流失败。 */
 export function is_retryable_empty_model_stream_failure(error) {
     return error instanceof ModelStreamFailure &&

package/bin/executor/model/ModelStreamFailure.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelStreamFailure.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,wBAAwB;AACxB,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACf,IAAI,CAAqB;IAElC,sBAAsB;IACb,SAAS,CAAU;IAE5B,2BAA2B;IAClB,kBAAkB,CAAU;IAErC,2BAA2B;IAClB,mBAAmB,CAAU;IAEtC,YAAY,KAAiB,EAAE,kBAA2B;QACxD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACvD,CAAC;IACH,CAAC;CACF;AAED,iCAAiC;AACjC,MAAM,UAAU,uCAAuC,CACrD,KAAc;IAEd,OAAO,KAAK,YAAY,kBAAkB;QACxC,KAAK,CAAC,SAAS;QACf,CAAC,KAAK,CAAC,kBAAkB;QACzB,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"ModelStreamFailure.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,wBAAwB;AACxB,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACf,IAAI,CAAqB;IAElC,sBAAsB;IACb,SAAS,CAAU;IAE5B,2BAA2B;IAClB,kBAAkB,CAAU;IAErC,2BAA2B;IAClB,mBAAmB,CAAU;IAEtC,YAAY,KAAiB,EAAE,kBAA2B;QACxD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACvD,CAAC;IACH,CAAC;CACF;AAED,4CAA4C;AAC5C,MAAM,UAAU,kCAAkC,CAChD,KAAc,EACd,kBAA2B,EAC3B,YAA0B;IAE1B,IAAI,KAAK,YAAY,kBAAkB;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,SAAS,GAAG,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,OAAO,IAAI,kBAAkB,CAAC;QAC5B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB;QACjD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/D,SAAS,EAAE,CAAC,SAAS;KACtB,EAAE,kBAAkB,CAAC,CAAC;AACzB,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,gCAAgC,CAC9C,KAAc,EACd,kBAA2B;IAE3B,IAAI,KAAK,YAAY,kBAAkB;QAAE,OAAO,KAAK,CAAC;IACtD,OAAO,IAAI,kBAAkB,CAAC;QAC5B,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/D,SAAS,EAAE,KAAK;KACjB,EAAE,kBAAkB,CAAC,CAAC;AACzB,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,uCAAuC,CACrD,KAAc;IAEd,OAAO,KAAK,YAAY,kBAAkB;QACxC,KAAK,CAAC,SAAS;QACf,CAAC,KAAK,CAAC,kBAAkB;QACzB,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;AAC/B,CAAC"}

package/bin/executor/services/ExecutorRecoveryPolicy.d.ts

@@ -3,89 +3,32 @@
  *
  * 关键点（中文）
  * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
- * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - Executor 提供单次 Turn 行为，本模块只决定是否恢复并重试。
  * - 不改变外部行为，只把异常分流规则集中到一个地方。
  */
-import type { ModelClient } from "@downcity/type";
 import type { Logger } from "../../utils/logger/Logger.js";
-import type { SessionTurnContext } from "../../types/executor/SessionTurnContext.js";
-import type { SessionStepExecutionInput, SessionTurnExecutionResult } from "../../types/session/SessionExecution.js";
+import type { SessionTurnExecutionResult } from "../../types/session/SessionExecution.js";
 interface ExecutorRecoveryPolicyOptions {
     /** 当前 Session 稳定标识。 */
     session_id: string;
-    /** 判断错误是否需要持久化压缩后重试。 */
-    should_compact: (error: unknown) => boolean;
+    /** 请求 Composer 尝试推进上下文派生状态。 */
+    recover_context: (error: unknown) => Promise<boolean>;
     /**
      * 当前 session 统一日志器。
      */
     logger: Logger;
 }
-interface ExecutorPrepareExecutionInput {
-    /**
-     * 当前轮用户 query。
-     */
-    query: string;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-    /**
-     * 当前压缩重试次数。
-     */
-    retry_count: number;
-}
-interface ExecutorExecutePreparedInput {
-    /**
-     * 已装配好的执行输入。
-     */
-    execute_input: SessionStepExecutionInput;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-}
 interface ExecutorRecoveryInput {
-    /**
-     * 当前轮用户 query。
-     */
-    query: string;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-    /**
-     * 运行前装配执行输入。
-     */
-    prepare_execute_input: (input: ExecutorPrepareExecutionInput) => Promise<SessionStepExecutionInput>;
-    /**
-     * 执行已装配好的运行输入。
-     */
-    execute_prepared_input: (input: ExecutorExecutePreparedInput) => Promise<SessionTurnExecutionResult>;
+    /** 按当前恢复次数执行完整 Turn。 */
+    execute_turn: (retry_count: number) => Promise<SessionTurnExecutionResult>;
 }
 /**
  * 执行恢复与重试策略服务。
  */
 export declare class ExecutorRecoveryPolicy {
-    private readonly should_compact;
+    private readonly recover_context;
     private readonly logger;
-    private retry_count;
     constructor(options: ExecutorRecoveryPolicyOptions);
-    /**
-     * 重置当前 Turn 执行状态。
-     */
-    reset_execution_state(): void;
     /**
      * 执行一次带恢复策略的 Session Turn。
      */

package/bin/executor/services/ExecutorRecoveryPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutorRecoveryPolicy.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAO7C,UAAU,6BAA6B;IACrC,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,wBAAwB;IACxB,cAAc,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAE5C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,6BAA6B;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,4BAA4B;IACpC;;OAEG;IACH,aAAa,EAAE,yBAAyB,CAAC;IAEzC;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;CAClC;AAED,UAAU,qBAAqB;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,qBAAqB,EAAE,CACrB,KAAK,EAAE,6BAA6B,KACjC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAExC;;OAEG;IACH,sBAAsB,EAAE,CACtB,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkD;IACjF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,EAAE,6BAA6B;IASlD;;OAEG;IACH,qBAAqB,IAAI,IAAI;IAI7B;;OAEG;IACG,kBAAkB,CACtB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,0BAA0B,CAAC;IA2CtC,OAAO,CAAC,oBAAoB;CAoB7B"}
+{"version":3,"file":"ExecutorRecoveryPolicy.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAOtF,UAAU,6BAA6B;IACrC,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,+BAA+B;IAC/B,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,qBAAqB;IAC7B,wBAAwB;IACxB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC5E;AAED;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmD;IACnF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,OAAO,EAAE,6BAA6B;IASlD;;OAEG;IACG,kBAAkB,CACtB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,0BAA0B,CAAC;IAmCtC,OAAO,CAAC,oBAAoB;CAa7B"}

package/bin/executor/services/ExecutorRecoveryPolicy.js

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
- * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - Executor 提供单次 Turn 行为，本模块只决定是否恢复并重试。
  * - 不改变外部行为，只把异常分流规则集中到一个地方。
  */
 /**
@@ -14,63 +14,50 @@ const MAX_COMPACTION_RETRY_ATTEMPTS = 3;
  * 执行恢复与重试策略服务。
  */
 export class ExecutorRecoveryPolicy {
-    should_compact;
+    recover_context;
     logger;
-    retry_count = 0;
     constructor(options) {
         const session_id = String(options.session_id || "").trim();
-        this.should_compact = options.should_compact;
+        this.recover_context = options.recover_context;
         this.logger = options.logger;
         if (!session_id) {
             throw new Error("ExecutorRecoveryPolicy requires a non-empty session_id");
         }
     }
-    /**
-     * 重置当前 Turn 执行状态。
-     */
-    reset_execution_state() {
-        this.retry_count = 0;
-    }
     /**
      * 执行一次带恢复策略的 Session Turn。
      */
     async execute_with_retry(input) {
-        try {
-            const execute_input = await input.prepare_execute_input({
-                query: input.query,
-                model: input.model,
-                turn_context: input.turn_context,
-                retry_count: this.retry_count,
-            });
-            return await input.execute_prepared_input({
-                execute_input,
-                model: input.model,
-                turn_context: input.turn_context,
-            });
-        }
-        catch (error) {
-            if (this.should_compact(error)) {
-                await this.logger.log("info", "[agent] compacting", {
-                    retryCount: this.retry_count,
-                    error: String(error),
-                });
-                if (this.retry_count < MAX_COMPACTION_RETRY_ATTEMPTS) {
-                    this.retry_count += 1;
-                    return await this.execute_with_retry(input);
+        let retry_count = 0;
+        while (true) {
+            try {
+                return await input.execute_turn(retry_count);
+            }
+            catch (error) {
+                if (retry_count < MAX_COMPACTION_RETRY_ATTEMPTS) {
+                    const recovered = await this.recover_context(error);
+                    if (recovered) {
+                        await this.logger.log("info", "[agent] compacting", {
+                            retryCount: retry_count,
+                            error: String(error),
+                        });
+                        retry_count += 1;
+                        continue;
+                    }
                 }
+                if (retry_count > 0) {
+                    return this.build_failure_result({
+                        error_text: "Context length exceeded and retries failed. Please resend your question.",
+                    });
+                }
+                const error_text = String(error);
+                await this.logger.log("error", "Executor execution failed", {
+                    error: error_text,
+                });
                 return this.build_failure_result({
-                    error_text: "Context length exceeded and retries failed. Please resend your question.",
-                    turn_context: input.turn_context,
+                    error_text,
                 });
             }
-            const error_text = String(error);
-            await this.logger.log("error", "Executor execution failed", {
-                error: error_text,
-            });
-            return this.build_failure_result({
-                error_text,
-                turn_context: input.turn_context,
-            });
         }
     }
     build_failure_result(input) {
@@ -78,9 +65,6 @@ export class ExecutorRecoveryPolicy {
             success: false,
             text: "",
             error: input.error_text,
-            deferred_persisted_user_messages: [
-                ...input.turn_context.input.deferred_user_messages(),
-            ],
         };
     }
 }

package/bin/executor/services/ExecutorRecoveryPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutorRecoveryPolicy.js","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH;;GAEG;AACH,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAqFxC;;GAEG;AACH,MAAM,OAAO,sBAAsB;IAChB,cAAc,CAAkD;IAChE,MAAM,CAAS;IACxB,WAAW,GAAG,CAAC,CAAC;IAExB,YAAY,OAAsC;QAChD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACtB,KAA4B;QAE5B,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC;gBACtD,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,sBAAsB,CAAC;gBACxC,aAAa;gBACb,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,YAAY,EAAE,KAAK,CAAC,YAAY;aACjC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE;oBAClD,UAAU,EAAE,IAAI,CAAC,WAAW;oBAC5B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAC;gBAEH,IAAI,IAAI,CAAC,WAAW,GAAG,6BAA6B,EAAE,CAAC;oBACrD,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;oBACtB,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC9C,CAAC;gBAED,OAAO,IAAI,CAAC,oBAAoB,CAAC;oBAC/B,UAAU,EACR,0EAA0E;oBAC5E,YAAY,EAAE,KAAK,CAAC,YAAY;iBACjC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2BAA2B,EAAE;gBAC1D,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,oBAAoB,CAAC;gBAC/B,UAAU;gBACV,YAAY,EAAE,KAAK,CAAC,YAAY;aACjC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,KAU5B;QACC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,KAAK,CAAC,UAAU;YACvB,gCAAgC,EAAE;gBAChC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,sBAAsB,EAAE;aACrD;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"ExecutorRecoveryPolicy.js","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH;;GAEG;AACH,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAoBxC;;GAEG;AACH,MAAM,OAAO,sBAAsB;IAChB,eAAe,CAAmD;IAClE,MAAM,CAAS;IAEhC,YAAY,OAAsC;QAChD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QAC/C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACtB,KAA4B;QAE5B,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,WAAW,GAAG,6BAA6B,EAAE,CAAC;oBAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;oBACpD,IAAI,SAAS,EAAE,CAAC;wBACd,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE;4BAClD,UAAU,EAAE,WAAW;4BACvB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;yBACrB,CAAC,CAAC;wBACH,WAAW,IAAI,CAAC,CAAC;wBACjB,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;oBACpB,OAAO,IAAI,CAAC,oBAAoB,CAAC;wBAC/B,UAAU,EACR,0EAA0E;qBAC7E,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2BAA2B,EAAE;oBAC1D,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,oBAAoB,CAAC;oBAC/B,UAAU;iBACX,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,KAM5B;QACC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,KAAK,CAAC,UAAU;SACxB,CAAC;IACJ,CAAC;CACF"}

package/bin/executor/types/SessionHistoryMeta.d.ts

@@ -2,21 +2,21 @@
  * SessionHistoryMeta：随 session_id 持久化的元信息。
  *
  * 关键点（中文）
- * - 存储位置：Agent Storage `sessions/<encodedSessionId>/meta.json`
+ * - 存储位置：Session SQLite 的 `session_state` 表
  * - 用于保存 session 列表、详情和索引所需的轻量元信息
  */
-import type { SessionOrigin } from "../../types/session/SessionOrigin.js";
-export type SessionHistoryMetaV1 = {
+import type { SessionOrigin } from "@downcity/type";
+export type SessionHistoryMeta = {
     /** schema 版本。 */
-    v: 1;
+    v: 2;
     /** 当前元信息所属的 session_id。 */
     session_id: string;
     /** 当前 session 所属的 agent_id。 */
     agent_id: string;
     /** 当前 session 所属的 workspace_id。 */
     workspace_id?: string;
-    /** 当前 Session 的创建来源；未填写时视为用户直接创建。 */
-    origin?: SessionOrigin;
+    /** 当前 Session 的创建来源与物理存储分区。 */
+    origin: SessionOrigin;
     /** 当前 session 首次创建时间戳（ms）。 */
     created_at?: number;
     /** 当前 session 初始化时解析到的系统时区。 */
@@ -33,7 +33,5 @@ export type SessionHistoryMetaV1 = {
     message_count?: number;
     /** 当前 session 最后一条记录的用户可见摘要，用于列表预览。 */
     preview_text?: string;
-    /** 生成当前摘要时 messages.jsonl 的字节长度，用于校验摘要是否仍然有效。 */
-    historyBytes?: number;
 };
 //# sourceMappingURL=SessionHistoryMeta.d.ts.map

package/bin/executor/types/SessionHistoryMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionHistoryMeta.d.ts","sourceRoot":"","sources":["../../../src/executor/types/SessionHistoryMeta.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,iBAAiB;IACjB,CAAC,EAAE,CAAC,CAAC;IACL,2BAA2B;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,wBAAwB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4BAA4B;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,aAAa,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC;IACvC,0CAA0C;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC"}
+{"version":3,"file":"SessionHistoryMeta.d.ts","sourceRoot":"","sources":["../../../src/executor/types/SessionHistoryMeta.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,iBAAiB;IACjB,CAAC,EAAE,CAAC,CAAC;IACL,2BAA2B;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,wBAAwB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4BAA4B;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,aAAa,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC;IACvC,0CAA0C;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC"}

package/bin/executor/types/SessionHistoryMeta.js

@@ -2,7 +2,7 @@
  * SessionHistoryMeta：随 session_id 持久化的元信息。
  *
  * 关键点（中文）
- * - 存储位置：Agent Storage `sessions/<encodedSessionId>/meta.json`
+ * - 存储位置：Session SQLite 的 `session_state` 表
  * - 用于保存 session 列表、详情和索引所需的轻量元信息
  */
 export {};

package/bin/group/Group.d.ts

@@ -1,19 +1,38 @@
 /** Group 群聊主体的本地实现。 */
 import type { DispatchStrategy } from "../types/group/DispatchStrategy.js";
-import type { AgentModel } from "../agent/AgentModel.js";
+import type { ModelClient, StorageProvider } from "@downcity/type";
 import type { GroupContract, GroupOptions } from "../types/group/Group.js";
 import type { Agent } from "../agent/Agent.js";
-import { GroupSessions } from "./GroupSessions.js";
+import { GroupSessions } from "../group/GroupSessions.js";
+import type { GroupSessionStore } from "../types/group/GroupSessionStore.js";
 /** Group 主体：只持有身份、成员、资源引用和群聊上下文集合。 */
 export declare class Group implements GroupContract {
     readonly id: string;
     readonly name: string;
     readonly instruction?: string;
-    readonly model?: AgentModel;
+    readonly model?: ModelClient;
     readonly members: readonly Agent[];
     readonly dispatch_strategy: DispatchStrategy;
     readonly sessions: GroupSessions;
+    /** 未加入宿主时使用的隔离进程内存储。 */
+    private storage_provider;
+    /** 当前 Group 所属宿主。 */
+    private storage_owner?;
+    /** 延迟创建的 GroupSession 持久化 Store。 */
+    private session_store?;
+    /** 是否已经在无宿主存储中创建或恢复过 Session。 */
+    private memory_session_started;
     constructor(options: GroupOptions);
+    /** 将宿主存储装配到 Group；必须在使用 GroupSessions 前完成。 */
+    attach(owner: object, storage_provider: StorageProvider): void;
+    /** 解除指定宿主的存储装配并释放当前 Store。 */
+    detach(owner: object): Promise<void>;
+    /** 获取或创建 Group 唯一的 Session Store。 */
+    get_session_store(): GroupSessionStore;
+    /** 标记 Group 已经创建或恢复过 Session。 */
+    mark_session_started(): void;
+    /** 释放当前 GroupSession Store。 */
+    dispose_session_store(): Promise<void>;
     /** 释放 Group 所拥有的全部群聊上下文。 */
     dispose(): Promise<void>;
 }