@downcity/agent 1.1.430 → 1.1.437

package/src/session/SessionComposition.ts

@@ -19,14 +19,13 @@ import type {
 } from "@/types/session/SessionComposer.js";
 import type {
   SessionHookContextBlock,
-  SessionSystemContextHookValue,
   SessionTurnContextHookValue,
 } from "@downcity/type";
 import type { SessionTurnContext } from "@/types/executor/SessionTurnContext.js";
-import type { SessionHookRuntime } from "@downcity/type";
 import type { SessionCompositionOptions } from "@/types/session/SessionComposition.js";
 import { create_session_hook_context } from "@/session/runtime/SessionTurnContext.js";
 import { SESSION_HOOK_POINTS } from "@/session/SessionHookPoints.js";
+import { resolve_session_plugin_system_blocks } from "@/session/SessionSystem.js";
 
 /** 管理当前 Session 的 system snapshot 与 Step 组装输入。 */
 export class SessionComposition {
@@ -50,6 +49,8 @@ export class SessionComposition {
   async initialize(): Promise<void> {
     if (!this.initialize_promise) {
       this.initialize_promise = (async () => {
+        await this.options.store.initialize();
+        await this.options.composer.initialize({ storage: this.options.store });
         const persisted_instruction = await this.options.store.read_instruction();
         if (persisted_instruction === null) return;
 
@@ -76,7 +77,15 @@ export class SessionComposition {
         ];
       })();
     }
-    await this.initialize_promise;
+    const initialize_promise = this.initialize_promise;
+    try {
+      await initialize_promise;
+    } catch (error) {
+      if (this.initialize_promise === initialize_promise) {
+        this.initialize_promise = null;
+      }
+      throw error;
+    }
   }
 
   /** 把当前完整 system 显式固化到 instruction.md。 */
@@ -163,24 +172,24 @@ export class SessionComposition {
           (block) => block.content,
         ),
       });
-    const history = await this.options.messages.context_snapshot();
     const plugin_runtime = refresh_system
       ? this.options.get_hooks()
       : turn_context?.step.hooks || this.options.get_hooks();
-    const plugin_system_blocks = this.snapshot_blocks && !refresh_system
-      ? []
-      : refresh_system
-        ? await plugin_runtime.system_blocks(hook_context)
-        : turn_context?.step.hooks
-          ? await turn_context.step.hooks.system_blocks(hook_context)
-          : await plugin_runtime.system_blocks(hook_context);
     const resolved_plugin_system_blocks = this.snapshot_blocks && !refresh_system
       ? []
-      : await this.resolve_plugin_system_context(
-          plugin_runtime,
-          plugin_system_blocks,
-          turn_context?.session.turn_id,
-        );
+      : await resolve_session_plugin_system_blocks({
+          session_id: this.options.session_id,
+          ...(turn_context?.session.turn_id
+            ? { turn_id: turn_context.session.turn_id }
+            : {}),
+          hooks: plugin_runtime,
+          context: hook_context,
+          on_error: async (error) => await this.log_plugin_hook_warning(
+            SESSION_HOOK_POINTS.system_context,
+            error,
+            turn_context?.session.turn_id,
+          ),
+        });
     const plugin_context_blocks = turn_context
       ? await turn_context.step.resolve_plugin_context_blocks(async () => {
           const hooks = turn_context.step.hooks;
@@ -188,19 +197,13 @@ export class SessionComposition {
           const value: SessionTurnContextHookValue = {
             session_id: this.options.session_id,
             turn_id: turn_context.session.turn_id,
-            user_messages: history.messages.flatMap((message) => {
-              if (
-                message.type !== "user" ||
-                message.turn_id !== turn_context.session.turn_id
-              ) return [];
-              return [{
+            user_messages: turn_context.input.user_messages().map((message) => ({
                 message_id: message.message_id,
                 text: message.parts
                   .filter((part) => part.type === "text")
                   .map((part) => part.text)
                   .join("\n"),
-              }];
-            }),
+              })),
             blocks: [],
           };
           try {
@@ -237,7 +240,7 @@ export class SessionComposition {
         plugin_system_blocks: resolved_plugin_system_blocks,
         plugin_context_blocks,
       },
-      history,
+      storage: this.options.store,
       turn: {
         ...(turn_context ? { turn_id: turn_context.session.turn_id } : {}),
         retry_count,
@@ -260,33 +263,6 @@ export class SessionComposition {
     };
   }
 
-  /** 通过 pipeline point 解析 Plugin 追加的命名 system blocks。 */
-  private async resolve_plugin_system_context(
-    hooks: SessionHookRuntime | NonNullable<SessionTurnContext["step"]["hooks"]>,
-    blocks: readonly AgentSessionSystemBlock[],
-    turn_id?: string,
-  ): Promise<AgentSessionSystemBlock[]> {
-    const value: SessionSystemContextHookValue = {
-      session_id: this.options.session_id,
-      ...(turn_id ? { turn_id } : {}),
-      blocks: blocks.map((block) => ({ ...block })),
-    };
-    try {
-      const output = await hooks.pipeline(
-        SESSION_HOOK_POINTS.system_context,
-        value as unknown as JsonValue,
-      ) as unknown as SessionSystemContextHookValue;
-      return normalize_plugin_system_blocks(output?.blocks);
-    } catch (error) {
-      await this.log_plugin_hook_warning(
-        SESSION_HOOK_POINTS.system_context,
-        error,
-        turn_id,
-      );
-      return value.blocks;
-    }
-  }
-
   /** Plugin 上下文 Hook 失败只降级当前扩展内容。 */
   private async log_plugin_hook_warning(
     point_name: string,
@@ -330,19 +306,6 @@ export class SessionComposition {
   }
 }
 
-/** 把 system pipeline 输出限制为 Plugin 命名内容块。 */
-function normalize_plugin_system_blocks(input: unknown): AgentSessionSystemBlock[] {
-  if (!Array.isArray(input)) return [];
-  return input.flatMap((item) => {
-    if (!item || typeof item !== "object" || Array.isArray(item)) return [];
-    const record = item as Record<string, unknown>;
-    const name = String(record.name || "").trim();
-    const content = String(record.content || "").trim();
-    if (!name || !content) return [];
-    return [{ source: "plugin" as const, name, content }];
-  });
-}
-
 /** 把 Turn pipeline 输出限制为低权限动态参考内容块。 */
 function normalize_plugin_context_blocks(input: unknown): SessionHookContextBlock[] {
   if (!Array.isArray(input)) return [];