@downcity/agent 1.1.81 → 1.1.83

package/src/session/Session.ts

@@ -75,7 +75,7 @@ export class Session implements AgentSession {
   private readonly localState: SessionLocalState;
   private readonly stateService: SessionStateService;
   private readonly turnService: SessionTurnService;
-  private readonly viewService: SessionViewService<Session>;
+  private readonly viewService: SessionViewService<this>;
   private runtimePort: SessionPort | null = null;
 
   constructor(options: SessionOptions) {
@@ -99,82 +99,19 @@ export class Session implements AgentSession {
       throw new Error("Session requires a non-empty projectRoot");
     }
 
-    const session_dir_path = getSdkAgentSessionDirPath(
-      this.projectRoot,
-      this.agentId,
-      this.id,
-    );
-    const messages_dir_path = `${session_dir_path}/messages`;
-    this.historyStore = new JsonlSessionHistoryStore({
-      rootPath: this.projectRoot,
-      agentId: this.agentId,
-      sessionId: this.id,
-      paths: {
-        sessionDirPath: session_dir_path,
-        messagesDirPath: messages_dir_path,
-        messagesFilePath: `${messages_dir_path}/messages.jsonl`,
-        metaFilePath: `${messages_dir_path}/meta.json`,
-        archiveDirPath: getSdkAgentSessionArchiveDirPath(
-          this.projectRoot,
-          this.agentId,
-          this.id,
-        ),
-        inflightFilePath: getSdkAgentSessionInflightPath(
-          this.projectRoot,
-          this.agentId,
-          this.id,
-        ),
-      },
-    });
-    this.localState = {
-      sessionConfig: {},
-      createdAt: Date.now(),
-      timezone: resolveSystemTimezone(),
-      initializePromise: null,
-      ensureConfiguredPromise: null,
-    };
+    this.historyStore = this.create_history_store();
+    this.localState = this.create_local_state();
     const composer_context = this.create_composer_context();
-    this.historyComposer = this.resolve_composer(
-      this.composers?.historyComposer,
-      composer_context,
-      () =>
-        new JsonlSessionHistoryComposer({
-          store: this.historyStore,
-        }),
-    );
-    const system_composer = this.resolve_composer(
-      this.composers?.systemComposer,
-      composer_context,
-      () =>
-        new SessionSystemBuilder({
-          agentId: this.agentId,
-          projectRoot: this.projectRoot,
-          getSessionCreatedAt: () => this.localState.createdAt,
-          getSessionTimezone: () => this.localState.timezone,
-          getInstructionSystemBlocks: this.getInstructionSystemBlocks,
-          getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
-          getPluginSystemBlocks: this.getPluginSystemBlocks,
-        }),
+    this.historyComposer = this.create_history_composer(composer_context);
+    const system_composer = this.create_system_composer(composer_context);
+    const context_composer = this.create_context_composer(composer_context);
+    const compaction_composer =
+      this.create_compaction_composer(composer_context);
+    this.executor = this.create_executor(
+      system_composer,
+      context_composer,
+      compaction_composer,
     );
-    const context_composer = this.resolve_optional_composer<
-      SessionContextComposer
-    >(this.composers?.contextComposer, composer_context);
-    const compaction_composer = this.resolve_optional_composer<
-      SessionCompactionComposer
-    >(this.composers?.compactionComposer, composer_context);
-    this.executor = new Executor({
-      sessionId: this.id,
-      historyStore: this.historyStore,
-      historyComposer: this.historyComposer,
-      getModel: () => this.localState.sessionConfig.model,
-      logger: this.logger as never,
-      systemComposer: system_composer,
-      getTools: () => this.tools,
-      ...(context_composer ? { contextComposer: context_composer } : {}),
-      ...(compaction_composer
-        ? { compactionComposer: compaction_composer }
-        : {}),
-    });
     this.stateService = new SessionStateService({
       agent_id: this.agentId,
       project_root: this.projectRoot,
@@ -197,7 +134,7 @@ export class Session implements AgentSession {
       state_service: this.stateService,
       event_hub: this.eventHub,
     });
-    this.viewService = new SessionViewService<Session>({
+    this.viewService = new SessionViewService<this>({
       agent_id: this.agentId,
       project_root: this.projectRoot,
       session_id: this.id,
@@ -211,7 +148,7 @@ export class Session implements AgentSession {
         ? { custom_system_composer: system_composer }
         : {}),
       create_fork_session: async (session_id) => {
-        const session = this.createChildSession(session_id);
+        const session = this.create_fork_session(session_id);
         await session.initialize();
         return {
           session,
@@ -318,7 +255,7 @@ export class Session implements AgentSession {
   /**
    * 从当前 session 创建一个分叉会话。
    */
-  async fork(input?: AgentSessionForkInput | string): Promise<Session> {
+  async fork(input?: AgentSessionForkInput | string): Promise<this> {
     return await this.viewService.fork(input);
   }
 
@@ -363,8 +300,8 @@ export class Session implements AgentSession {
     await this.stateService.ensure_ready_for_execution();
   }
 
-  private createChildSession(session_id: string): Session {
-    return new Session({
+  private create_fork_session(session_id: string): this {
+    return this.create_child_session({
       agentId: this.agentId,
       projectRoot: this.projectRoot,
       sessionId: session_id,
@@ -373,10 +310,65 @@ export class Session implements AgentSession {
       getInstructionSystemBlocks: this.getInstructionSystemBlocks,
       getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
       getPluginSystemBlocks: this.getPluginSystemBlocks,
+      ensureConfigured: this.ensureConfiguredHook,
       composers: this.composers,
     });
   }
 
+  /**
+   * 创建当前 Session 的同类子会话。
+   *
+   * 关键点（中文）
+   * - 默认沿用当前实例的 class，避免自定义 Session 在 fork 后退回默认实现。
+   * - 子类仍可覆盖该方法，接管更特殊的子会话创建逻辑。
+   */
+  protected create_child_session(options: SessionOptions): this {
+    const SessionClass = this.constructor as new (
+      options: SessionOptions,
+    ) => Session;
+    return new SessionClass(options) as this;
+  }
+
+  private create_history_store(): JsonlSessionHistoryStore {
+    const session_dir_path = getSdkAgentSessionDirPath(
+      this.projectRoot,
+      this.agentId,
+      this.id,
+    );
+    const messages_dir_path = `${session_dir_path}/messages`;
+    return new JsonlSessionHistoryStore({
+      rootPath: this.projectRoot,
+      agentId: this.agentId,
+      sessionId: this.id,
+      paths: {
+        sessionDirPath: session_dir_path,
+        messagesDirPath: messages_dir_path,
+        messagesFilePath: `${messages_dir_path}/messages.jsonl`,
+        metaFilePath: `${messages_dir_path}/meta.json`,
+        archiveDirPath: getSdkAgentSessionArchiveDirPath(
+          this.projectRoot,
+          this.agentId,
+          this.id,
+        ),
+        inflightFilePath: getSdkAgentSessionInflightPath(
+          this.projectRoot,
+          this.agentId,
+          this.id,
+        ),
+      },
+    });
+  }
+
+  private create_local_state(): SessionLocalState {
+    return {
+      sessionConfig: {},
+      createdAt: Date.now(),
+      timezone: resolveSystemTimezone(),
+      initializePromise: null,
+      ensureConfiguredPromise: null,
+    };
+  }
+
   private create_composer_context(): SessionComposerFactoryContext {
     return {
       agentId: this.agentId,
@@ -392,6 +384,70 @@ export class Session implements AgentSession {
     };
   }
 
+  private create_history_composer(
+    context: SessionComposerFactoryContext,
+  ): SessionHistoryComposer {
+    return this.resolve_composer(this.composers?.historyComposer, context, () =>
+      new JsonlSessionHistoryComposer({
+        store: this.historyStore,
+      }),
+    );
+  }
+
+  private create_system_composer(
+    context: SessionComposerFactoryContext,
+  ): SessionSystemComposer {
+    return this.resolve_composer(this.composers?.systemComposer, context, () =>
+      new SessionSystemBuilder({
+        agentId: this.agentId,
+        projectRoot: this.projectRoot,
+        getSessionCreatedAt: () => this.localState.createdAt,
+        getSessionTimezone: () => this.localState.timezone,
+        getInstructionSystemBlocks: this.getInstructionSystemBlocks,
+        getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
+        getPluginSystemBlocks: this.getPluginSystemBlocks,
+      }),
+    );
+  }
+
+  private create_context_composer(
+    context: SessionComposerFactoryContext,
+  ): SessionContextComposer | undefined {
+    return this.resolve_optional_composer<SessionContextComposer>(
+      this.composers?.contextComposer,
+      context,
+    );
+  }
+
+  private create_compaction_composer(
+    context: SessionComposerFactoryContext,
+  ): SessionCompactionComposer | undefined {
+    return this.resolve_optional_composer<SessionCompactionComposer>(
+      this.composers?.compactionComposer,
+      context,
+    );
+  }
+
+  private create_executor(
+    system_composer: SessionSystemComposer,
+    context_composer?: SessionContextComposer,
+    compaction_composer?: SessionCompactionComposer,
+  ): Executor {
+    return new Executor({
+      sessionId: this.id,
+      historyStore: this.historyStore,
+      historyComposer: this.historyComposer,
+      getModel: () => this.localState.sessionConfig.model,
+      logger: this.logger,
+      systemComposer: system_composer,
+      getTools: () => this.tools,
+      ...(context_composer ? { contextComposer: context_composer } : {}),
+      ...(compaction_composer
+        ? { compactionComposer: compaction_composer }
+        : {}),
+    });
+  }
+
   private resolve_composer<TComposer>(
     input: SessionComposerInput<TComposer> | undefined,
     context: SessionComposerFactoryContext,

package/src/session/services/SessionViewService.ts

@@ -22,6 +22,7 @@ import type {
   AgentSessionHistoryInput,
   AgentSessionHistoryPage,
   AgentSessionInfo,
+  AgentSession,
   AgentSessionSystemBlock,
   AgentSessionSystemSnapshot,
 } from "@/types/agent/AgentTypes.js";
@@ -29,7 +30,7 @@ import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
 import { SessionStateService } from "@/session/services/SessionStateService.js";
 import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
 
-type SessionViewServiceOptions<TSession> = {
+type SessionViewServiceOptions<TSession extends Pick<AgentSession, "set">> = {
   /**
    * 当前 agent 稳定标识。
    */
@@ -97,7 +98,7 @@ type SessionViewServiceOptions<TSession> = {
 /**
  * 本地 Session 查询与派生视图服务。
  */
-export class SessionViewService<TSession> {
+export class SessionViewService<TSession extends Pick<AgentSession, "set">> {
   private readonly agent_id: string;
   private readonly project_root: string;
   private readonly session_id: string;
@@ -137,20 +138,37 @@ export class SessionViewService<TSession> {
       }),
       this.history_store.list(),
     ]);
-    const metadata_with_title = metadata.title
-      ? metadata
+    return await this.build_info({
+      metadata,
+      messages,
+    });
+  }
+
+  private async build_info(input: {
+    /**
+     * 当前 session metadata。
+     */
+    metadata: Awaited<ReturnType<typeof readSessionMetadata>>;
+
+    /**
+     * 当前 session 消息列表。
+     */
+    messages: SessionMessageV1[];
+  }): Promise<AgentSessionInfo> {
+    const metadata_with_title = input.metadata.title
+      ? input.metadata
       : await ensureSessionTitle({
           projectRoot: this.project_root,
           agentId: this.agent_id,
           sessionId: this.session_id,
-          messages,
+          messages: input.messages,
         });
     return buildSessionInfo({
       projectRoot: this.project_root,
       agentId: this.agent_id,
       sessionId: this.session_id,
       metadata: metadata_with_title,
-      messages,
+      messages: input.messages,
       executing: this.is_executing(),
     });
   }
@@ -161,10 +179,18 @@ export class SessionViewService<TSession> {
   async history(
     input?: AgentSessionHistoryInput,
   ): Promise<AgentSessionHistoryPage> {
-    const [session, messages] = await Promise.all([
-      this.get_info(),
+    const [metadata, messages] = await Promise.all([
+      readSessionMetadata({
+        projectRoot: this.project_root,
+        agentId: this.agent_id,
+        sessionId: this.session_id,
+      }),
       this.history_store.list(),
     ]);
+    const session = await this.build_info({
+      metadata,
+      messages,
+    });
     return buildSessionHistoryPage({
       session,
       messages,
@@ -246,11 +272,7 @@ export class SessionViewService<TSession> {
     const forked = forked_bundle.session;
     const session_config = this.state_service.get_config();
     if (session_config.model) {
-      await (
-        forked as unknown as {
-          set(input: { model: unknown }): Promise<void>;
-        }
-      ).set({
+      await forked.set({
         model: session_config.model,
       });
     }

package/src/types/session/SessionOptions.ts

@@ -12,6 +12,7 @@ import type { AgentSession } from "@/types/agent/SessionActor.js";
 import type { SessionPort } from "@/types/runtime/agent/AgentContext.js";
 import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
 import type { SessionComposerOptions } from "@/types/session/SessionComposerOptions.js";
+import type { Logger } from "@/utils/logger/Logger.js";
 
 /**
  * Agent 可管理的本地 Session 实例。
@@ -60,17 +61,7 @@ export interface SessionOptions {
   /**
    * 统一日志器。
    */
-  logger: {
-    /**
-     * 记录普通信息。
-     */
-    info(message: string, details?: Record<string, unknown>): void;
-
-    /**
-     * 记录警告信息。
-     */
-    warn(message: string, details?: Record<string, unknown>): void;
-  };
+  logger: Logger;
 
   /**
    * 读取当前 SDK 调用方传入的 instruction system blocks。