@downcity/agent 1.1.430 → 1.1.437

package/scripts/session-turn-context.test.mjs

@@ -12,52 +12,40 @@ import test from "node:test";
 
 import { create_session_turn_context } from "../bin/session/runtime/SessionTurnContext.js";
 
-function create_user_message(message_id, text, created_at) {
-  return {
-    message_id,
-    session_id: "session-context-test",
-    turn_id: "turn-context-test",
-    sequence: created_at,
-    revision: 1,
-    visibility: "visible",
-    created_at,
-    updated_at: created_at,
-    type: "user",
-    input_type: "steer",
-    parts: [{
-      part_id: `${message_id}:text`,
-      type: "text",
-      text,
-      state: "done",
-    }],
-  };
-}
-
 test("SessionTurnContext 在检查点消费输入并封装输出缓冲", async () => {
+  let commit_count = 0;
+  const internal_messages = [];
   const context = create_session_turn_context({
     session_id: "session-context-test",
     session_origin: { type: "chat" },
     turn_id: "turn-context-test",
     project_root: "/workspace",
-    merge_step_input: async () => [create_user_message("queued-message", "queued", 2)],
+    commit_step_input: async () => {
+      commit_count += 1;
+    },
+    append_internal_user_message: async (parts) => {
+      internal_messages.push(parts);
+      return {
+        message_id: "internal-1", session_id: "session-context-test",
+        turn_id: "turn-context-test", sequence: 1, revision: 1,
+        visibility: "internal", created_at: 1, updated_at: 1,
+        role: "user", parts: parts.map((part, index) => ({
+          ...part, part_id: `part-${index + 1}`, sequence: index + 1,
+        })),
+      };
+    },
   });
-  context.input.inject_user_message(
-    create_user_message("injected-message", "injected", 1),
-  );
+  await context.input.append_internal([{ type: "text", text: "injected" }]);
   context.output.enqueue_assistant_parts([{
     type: "file",
     media_type: "text/plain",
     url: "/workspace/result.txt",
   }]);
 
-  assert.deepEqual(
-    (await context.input.checkpoint()).map((message) => message.message_id),
-    ["injected-message", "queued-message"],
-  );
-  assert.deepEqual(
-    (await context.input.checkpoint()).map((message) => message.message_id),
-    ["queued-message"],
-  );
+  await context.input.checkpoint();
+  await context.input.checkpoint();
+  assert.equal(internal_messages[0][0].text, "injected");
+  assert.equal(commit_count, 2);
   assert.equal(context.output.take_assistant_parts().length, 1);
   assert.equal(context.output.take_assistant_parts().length, 0);
 });

package/src/agent/Agent.ts

@@ -14,7 +14,10 @@ import type {
   StorageProvider,
   WorkspaceRuntime,
 } from "@downcity/type";
-import { normalize_instruction_input } from "@/agent/AgentInstructions.js";
+import {
+  create_instruction_system_blocks,
+  normalize_instruction_input,
+} from "@/agent/AgentInstructions.js";
 import type {
   AgentOptions,
   AgentSessionConstructor,
@@ -29,10 +32,13 @@ import { LocalSessionStore } from "@/session/storage/LocalSessionStore.js";
 import { EMPTY_SESSION_HOOKS } from "@/session/SessionHooks.js";
 import type { AgentStorage } from "@/types/agent/AgentStorage.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
+import type { SessionComposer } from "@/types/session/SessionComposer.js";
 import {
-  resolve_session_system_messages,
-  type SystemProfile,
-} from "@/executor/composer/system/default/SystemDomain.js";
+  build_session_system_blocks,
+  resolve_session_plugin_system_blocks,
+} from "@/session/SessionSystem.js";
+import { create_session_hook_context } from "@/session/runtime/SessionTurnContext.js";
+import { resolve_system_timezone } from "@/session/storage/Metadata.js";
 
 /** SDK Agent 主体。 */
 export class Agent {
@@ -57,6 +63,9 @@ export class Agent {
   /** Agent 使用的 Session 类。 */
   readonly session_class?: AgentSessionConstructor;
 
+  /** 为每个 Session 创建独立 Composer 的工厂。 */
+  readonly session_composer?: () => SessionComposer;
+
   /** Agent 级日志器，不绑定任何 Workspace。 */
   private readonly logger = new Logger();
 
@@ -89,6 +98,7 @@ export class Agent {
     this.model = options.model;
     this.instruction = normalize_instruction_input(options.instruction);
     this.session_class = options.session_class;
+    this.session_composer = options.session_composer;
     this.custom_tools = options.tools && typeof options.tools === "object"
       ? { ...options.tools }
       : {};
@@ -99,6 +109,7 @@ export class Agent {
       ensure_agent_ready: async () => await this.ensure_ready(),
       get_agent_model: () => this.model,
       session_class: this.session_class,
+      create_session_composer: this.session_composer,
       on_session_routed: () => {
         if (!this.city) this.memory_session_started = true;
       },
@@ -180,19 +191,42 @@ export class Agent {
     input: {
       /** 目标 Session 稳定标识。 */
       session_id: string;
-      /** system message 使用场景。 */
-      profile?: SystemProfile;
     },
   ): Promise<SessionSystemMessage[]> {
     this.assert_workspace(workspace);
-    return await resolve_session_system_messages({
+    const session_id = String(input.session_id || "").trim();
+    if (!session_id) {
+      throw new Error("resolve_system_messages requires a non-empty session_id");
+    }
+    const instruction_system_blocks = create_instruction_system_blocks(
+      [...this.get_instructions()],
+      workspace.path,
+    );
+    const hooks = this.city?.get_session_hooks(this.id, workspace)
+      ?? EMPTY_SESSION_HOOKS;
+    const hook_context = create_session_hook_context({
+      session_id,
+      session_origin: { type: "chat" },
+      project_root: workspace.path,
+      workspace_env: Object.freeze({ ...workspace.get_env() }),
+      agent_systems: instruction_system_blocks.map((block) => block.content),
+    });
+    const plugin_system_blocks = await resolve_session_plugin_system_blocks({
+      session_id,
+      hooks,
+      context: hook_context,
+    });
+    const blocks = await build_session_system_blocks({
+      agent_id: this.id,
       project_root: workspace.path,
-      session_id: input.session_id,
-      profile: input.profile || "chat",
-      static_system_prompts: [...this.get_instructions()],
-      hooks: this.city?.get_session_hooks(this.id, workspace)
-        ?? EMPTY_SESSION_HOOKS,
+      session_id,
+      created_at: Date.now(),
+      timezone: resolve_system_timezone(),
+      get_instruction_system_blocks: () => instruction_system_blocks,
+      get_managed_plugin_system_blocks: async () => [],
+      get_plugin_system_blocks: async () => plugin_system_blocks,
     });
+    return blocks.map((block) => ({ role: "system", content: block.content }));
   }
 
   /** 释放 Agent 的 Session 后台任务、存储与宿主引用。 */
@@ -229,10 +263,12 @@ export class Agent {
     this.agent_storage = {
       root_path: scope.root_path,
       files: scope.files,
+      database_location: scope.database_location,
       sessions: new LocalSessionStore({
         files: scope.files,
         storage_root_path: scope.root_path,
         agent_id: this.id,
+        database_location: scope.database_location,
       }),
     };
     return this.agent_storage;

package/src/agent/AgentInstructions.ts

@@ -8,7 +8,7 @@
  */
 
 import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
-import { DEFAULT_SHIP_PROMPTS } from "@executor/composer/system/default/SystemDomain.js";
+import { CORE_SYSTEM_PROMPT } from "@executor/composer/system/default/SystemPromptAssets.js";
 
 /**
  * 归一化调用方传入的静态 instruction。
@@ -28,7 +28,7 @@ export function normalize_instruction_input(
 
 function createCoreInstructionContent(project_root: string): string {
   const current_year = String(new Date().getFullYear());
-  return DEFAULT_SHIP_PROMPTS
+  return CORE_SYSTEM_PROMPT
     .replaceAll("{{project_path}}", project_root)
     .replaceAll("{{project_root}}", project_root)
     .replaceAll("{{current_year}}", current_year);

package/src/agent/AgentMemoryStorage.ts

@@ -191,6 +191,7 @@ export class AgentMemoryStorageProvider implements StorageProvider {
     const scope = Object.freeze({
       root_path,
       files: new AgentMemoryFileSystem(root_path),
+      database_location: { type: "memory" as const },
     });
     this.scopes_by_key.set(scope_key, scope);
     return scope;

package/src/agent/AgentSessions.ts

@@ -29,9 +29,12 @@ import type {
 import type { AgentManagedSession } from "@/types/session/SessionOptions.js";
 import { Session } from "@/session/Session.js";
 import type { SessionPort } from "@/types/session/SessionPort.js";
+import type { SessionComposer } from "@/types/session/SessionComposer.js";
 import { create_instruction_system_blocks } from "@/agent/AgentInstructions.js";
+import { DefaultSessionComposer } from "@/session/DefaultSessionComposer.js";
 import type { SessionHookRuntime } from "@downcity/type";
 import type { SessionStore } from "@/types/store/SessionStore.js";
+import type { SessionStorage } from "@/types/store/SessionStorage.js";
 import type { WorkspaceRuntime } from "@downcity/type";
 import type { SessionOrigin } from "@downcity/type";
 import { normalize_session_origin, normalize_session_origin_type } from "@downcity/type";
@@ -78,6 +81,9 @@ type AgentSessionsOptions = {
    */
   session_class?: AgentSessionConstructor;
 
+  /** 为每个 Session 创建独立 Composer 的工厂。 */
+  create_session_composer?: () => SessionComposer;
+
   /** 读取 Agent 当前持有的运行时模型实例。 */
   get_agent_model: () => ModelClient | undefined;
 
@@ -95,6 +101,7 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
   private readonly get_instruction: AgentSessionsOptions["get_instruction"];
   private readonly ensure_agent_ready: AgentSessionsOptions["ensure_agent_ready"];
   private readonly session_class: AgentSessionConstructor;
+  private readonly create_session_composer: () => SessionComposer;
   private readonly get_agent_model: AgentSessionsOptions["get_agent_model"];
   private readonly on_session_routed?: AgentSessionsOptions["on_session_routed"];
   private readonly sessions_by_id = new Map<string, AgentManagedSession>();
@@ -106,6 +113,8 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
     this.get_instruction = options.get_instruction;
     this.ensure_agent_ready = options.ensure_agent_ready;
     this.session_class = options.session_class || Session;
+    this.create_session_composer = options.create_session_composer ||
+      (() => new DefaultSessionComposer());
     this.get_agent_model = options.get_agent_model;
     this.on_session_routed = options.on_session_routed;
   }
@@ -180,9 +189,17 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
     input?: AgentCreateSessionInput & { workspace?: WorkspaceRuntime },
   ): Promise<AgentSession> {
     const origin = normalize_session_origin(input?.origin);
+    const session_id = `session-${Date.now()}-${nanoid(8)}`;
+    const context = this.resolve_session_context(input?.workspace);
     const session = this.get_or_create_session({
+      session_id,
       workspace: input?.workspace,
       origin,
+      storage: context.store.create_session(
+        session_id,
+        origin,
+        context.workspace_id,
+      ),
     });
     this.on_session_routed?.(session.id, this);
     await session.initialize();
@@ -213,9 +230,8 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
         `Session "${resolved_session_id}" not found in origin "${resolved_origin_type}"`,
       );
     }
-    const persisted_metadata = await store
-      .session(resolved_session_id, { type: resolved_origin_type }, input?.workspace?.id)
-      .read_metadata();
+    const storage = await store.open_session(resolved_session_id, resolved_origin_type);
+    const persisted_metadata = await storage.read_metadata();
     const persisted_workspace_id = String(persisted_metadata.workspace_id || "").trim() || undefined;
     const persisted_origin = persisted_metadata.origin;
     const cached = this.sessions_by_id.get(cache_key);
@@ -236,6 +252,7 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
       session_id: resolved_session_id,
       workspace: input?.workspace,
       origin: persisted_origin,
+      storage,
     });
     this.on_session_routed?.(resolved_session_id, this);
     await session.initialize();
@@ -349,7 +366,7 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
    * 把 Session 重新绑定到另一个 Workspace。
    *
    * 关键点（中文）
-   * - 只改写 meta.json 中的 workspace_id 并清掉运行时缓存；
+   * - 只改写 session_state 中的 workspace_id 并清掉运行时缓存；
    * - 之后用新 Workspace 恢复时不再触发严格的 workspace 归属校验。
    */
   async workspace(
@@ -370,10 +387,9 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
     if (!(await context.store.has_session(resolved_session_id, resolved_origin_type))) {
       throw new Error(`Session "${resolved_session_id}" not found`);
     }
-    const store = context.store.session(
+    const store = await context.store.open_session(
       resolved_session_id,
-      { type: resolved_origin_type },
-      context.workspace_id,
+      resolved_origin_type,
     );
     const metadata = await store.read_metadata();
     if (metadata.agent_id !== this.agent_id) {
@@ -397,10 +413,12 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
     workspace?: WorkspaceRuntime;
     /** 当前 Session 的创建来源。 */
     origin?: SessionOrigin;
+    /** 已由集合层创建或打开的单 Session Storage。 */
+    storage?: SessionStorage;
   }): AgentManagedSession {
-    const resolved_session_id =
-      String(input?.session_id || "").trim() ||
-      `session-${Date.now()}-${nanoid(8)}`;
+    const resolved_session_id = String(
+      input?.session_id || input?.storage?.session_id || "",
+    ).trim() || `session-${Date.now()}-${nanoid(8)}`;
     const origin = normalize_session_origin(input?.origin);
     const cache_key = this.session_cache_key(resolved_session_id, origin.type);
     const cached = this.sessions_by_id.get(cache_key);
@@ -412,8 +430,8 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
       workspace_path: context.workspace_path,
       ...(context.workspace_id ? { workspace_id: context.workspace_id } : {}),
       origin,
-      store: context.store.session(resolved_session_id, origin, context.workspace_id),
-      get_session_store: (session_id) => context.store.session(session_id, origin, context.workspace_id),
+      store: input?.storage || context.store.create_session(resolved_session_id, origin, context.workspace_id),
+      create_session_store: (session_id) => context.store.create_session(session_id, origin, context.workspace_id),
       register_forked_session: (session) => this.register_forked_session(session),
       session_id: resolved_session_id,
       get_tools: () => context.get_tools(),
@@ -424,6 +442,7 @@ export class AgentSessions implements AgentSessionsContract<AgentSession> {
       get_agent_model: () => this.get_agent_model(),
       get_hooks: () => context.get_hooks(),
       get_managed_plugin_system_blocks: async () => [],
+      create_composer: this.create_session_composer,
       ensure_configured: async (session) => {
         await this.ensure_agent_ready();
       },