@downcity/agent 1.1.74 → 1.1.81

package/src/session/SessionSystemBuilder.ts

@@ -8,12 +8,12 @@
  */
 
 import type { SessionSystemComposer } from "@executor/composer/system/SessionSystemComposer.js";
-import { getSessionRunScope } from "@executor/SessionRunScope.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 import type {
   AgentSessionSystemBlock,
   AgentSessionSystemSessionInfo,
 } from "@/types/agent/AgentTypes.js";
+import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
 
 /**
  * 解析 SDK session system blocks 的输入。
@@ -240,8 +240,8 @@ export class SessionSystemBuilder implements SessionSystemComposer {
   /**
    * 解析本轮 SDK session system messages。
    */
-  async resolve() {
-    const sessionId = String(getSessionRunScope()?.sessionId || "").trim();
+  async resolve(run_context: SessionRunContext) {
+    const sessionId = String(run_context.sessionId || "").trim();
     if (!sessionId) {
       throw new Error("SessionSystemBuilder.resolve requires a non-empty sessionId");
     }

package/src/session/browse/Browse.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - 统一负责 session 列表摘要、session 详情与 history 分页的投影逻辑。
  * - session title 允许为空；浏览层不会再从首条 user message 推导 fallback title。
- * - 面向 SDK / RemoteAgent / HTTP route 复用，避免在多个入口重复拼列表与分页语义。
+ * - 面向 SDK / RemoteAgent / Town gateway route 复用，避免在多个入口重复拼列表与分页语义。
  * - 这里不持有运行态状态；执行状态等动态信息通过调用参数显式注入。
  */
 
@@ -322,20 +322,39 @@ export function toSessionTimelineEvents(
 export async function loadSessionMessagesFromPath(
   filePath: string,
 ): Promise<SessionMessageV1[]> {
-  if (!(await fs.pathExists(filePath))) return [];
-  const raw = await fs.readFile(filePath, "utf-8");
-  const lines = raw.split("\n").filter(Boolean);
   const messages: SessionMessageV1[] = [];
-  for (const line of lines) {
+  if (await fs.pathExists(filePath)) {
+    const raw = await fs.readFile(filePath, "utf-8");
+    const lines = raw.split("\n").filter(Boolean);
+    for (const line of lines) {
+      try {
+        const parsed = JSON.parse(line) as SessionMessageV1;
+        if (!parsed || typeof parsed !== "object") continue;
+        if (parsed.role !== "user" && parsed.role !== "assistant") continue;
+        messages.push(parsed);
+      } catch {
+        // 关键点（中文）：单行损坏不影响整个 session 的可读性。
+      }
+    }
+  }
+
+  const inflight_path = filePath.replace(/messages\.jsonl$/, "inflight.json");
+  if (await fs.pathExists(inflight_path)) {
     try {
-      const parsed = JSON.parse(line) as SessionMessageV1;
-      if (!parsed || typeof parsed !== "object") continue;
-      if (parsed.role !== "user" && parsed.role !== "assistant") continue;
-      messages.push(parsed);
+      const parsed = (await fs.readJson(inflight_path)) as SessionMessageV1;
+      if (
+        parsed &&
+        typeof parsed === "object" &&
+        parsed.role === "assistant" &&
+        Array.isArray(parsed.parts)
+      ) {
+        messages.push(parsed);
+      }
     } catch {
-      // 关键点（中文）：单行损坏不影响整个 session 的可读性。
+      // ignore invalid inflight snapshot
     }
   }
+
   return messages;
 }
 

package/src/session/index.ts

@@ -12,6 +12,7 @@ export {
   getSdkAgentDirPath,
   getSdkAgentSessionArchiveDirPath,
   getSdkAgentSessionDirPath,
+  getSdkAgentSessionInflightPath,
   getSdkAgentSessionMessagesDirPath,
   getSdkAgentSessionMessagesPath,
   getSdkAgentSessionMetaPath,

package/src/session/services/SessionStateService.ts

@@ -0,0 +1,341 @@
+/**
+ * SessionStateService：本地 Session 状态与持久化服务。
+ *
+ * 关键点（中文）
+ * - 统一管理本地 Session 的初始化、配置、标题、metadata 与消息持久化。
+ * - 该服务只关心状态事实源与持久化副作用，不负责 turn 编排。
+ * - `Session` facade 与 turn/view service 都通过它访问可变 session 运行态。
+ */
+
+import {
+  inferAgentModelLabel,
+  normalizeAgentModel,
+} from "@/model/CityModelAdapter.js";
+import {
+  patchSessionModelLabel,
+  readSessionMetadata,
+  resolveSystemTimezone,
+  touchSessionMetadata,
+  writeSessionMetadata,
+} from "@/session/index.js";
+import { ensureSessionTitle } from "@/session/SessionTitle.js";
+import { persistSdkAssistantResult } from "@/session/storage/Persistence.js";
+import type { Executor } from "@executor/Executor.js";
+import type { JsonlSessionHistoryStore } from "@/executor/store/history/jsonl/JsonlSessionHistoryStore.js";
+import type {
+  AgentSessionConfigSnapshot,
+  AgentSessionSetInput,
+} from "@/types/agent/AgentTypes.js";
+import type {
+  AgentSessionEvent,
+} from "@/types/sdk/AgentSessionEvent.js";
+import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type {
+  SessionMessageV1,
+  SessionUserMessageV1,
+} from "@/executor/types/SessionMessages.js";
+import type { SessionLocalState } from "@/types/session/SessionLocalState.js";
+
+type SessionStateServiceOptions = {
+  /**
+   * 当前 agent 稳定标识。
+   */
+  agent_id: string;
+
+  /**
+   * 当前项目根目录。
+   */
+  project_root: string;
+
+  /**
+   * 当前 session 标识。
+   */
+  session_id: string;
+
+  /**
+   * 当前 session 历史事实源。
+   */
+  history_store: JsonlSessionHistoryStore;
+
+  /**
+   * 当前 session 执行器。
+   */
+  executor: Executor;
+
+  /**
+   * 当前 session 可变运行态。
+   */
+  state: SessionLocalState;
+
+  /**
+   * 在执行前补齐宿主级配置。
+   */
+  ensure_configured_hook?: () => Promise<void>;
+
+  /**
+   * 发布 session 事件。
+   */
+  publish_event: (event: AgentSessionEvent) => void;
+};
+
+/**
+ * 本地 Session 状态与持久化服务。
+ */
+export class SessionStateService {
+  private readonly agent_id: string;
+  private readonly project_root: string;
+  private readonly session_id: string;
+  private readonly history_store: JsonlSessionHistoryStore;
+  private readonly executor: Executor;
+  private readonly state: SessionLocalState;
+  private readonly ensure_configured_hook?: SessionStateServiceOptions["ensure_configured_hook"];
+  private readonly publish_event: SessionStateServiceOptions["publish_event"];
+
+  constructor(options: SessionStateServiceOptions) {
+    this.agent_id = options.agent_id;
+    this.project_root = options.project_root;
+    this.session_id = options.session_id;
+    this.history_store = options.history_store;
+    this.executor = options.executor;
+    this.state = options.state;
+    this.ensure_configured_hook = options.ensure_configured_hook;
+    this.publish_event = options.publish_event;
+  }
+
+  /**
+   * 读取当前 session 配置快照。
+   */
+  get_config(): AgentSessionConfigSnapshot {
+    return {
+      ...this.state.sessionConfig,
+    };
+  }
+
+  /**
+   * 读取当前 session 创建时间。
+   */
+  get_created_at(): number {
+    return this.state.createdAt;
+  }
+
+  /**
+   * 读取当前 session 参考时区。
+   */
+  get_timezone(): string {
+    return this.state.timezone;
+  }
+
+  /**
+   * 初始化当前 session metadata 与内存快照。
+   */
+  async initialize(): Promise<void> {
+    if (this.state.initializePromise) {
+      await this.state.initializePromise;
+      return;
+    }
+    this.state.initializePromise = (async () => {
+      const metadata = await readSessionMetadata({
+        projectRoot: this.project_root,
+        agentId: this.agent_id,
+        sessionId: this.session_id,
+      });
+      const created_at =
+        typeof metadata.createdAt === "number" ? metadata.createdAt : Date.now();
+      const timezone =
+        typeof metadata.timezone === "string" && metadata.timezone.trim()
+          ? metadata.timezone.trim()
+          : resolveSystemTimezone();
+      await writeSessionMetadata({
+        projectRoot: this.project_root,
+        agentId: this.agent_id,
+        sessionId: this.session_id,
+        meta: {
+          ...metadata,
+          agentId: this.agent_id,
+          createdAt: created_at,
+          timezone,
+        },
+      });
+      this.state.createdAt = created_at;
+      this.state.timezone = timezone;
+      this.state.sessionConfig = {
+        ...(metadata.modelLabel
+          ? { modelLabel: metadata.modelLabel }
+          : {}),
+      };
+    })();
+    await this.state.initializePromise;
+  }
+
+  /**
+   * 在执行前确保当前 session 已完成初始化与宿主装配。
+   */
+  async ensure_ready_for_execution(): Promise<void> {
+    await this.initialize();
+    if (this.state.ensureConfiguredPromise) {
+      await this.state.ensureConfiguredPromise;
+      return;
+    }
+    this.state.ensureConfiguredPromise = (async () => {
+      if (!this.ensure_configured_hook) return;
+      await this.ensure_configured_hook();
+    })();
+    try {
+      await this.state.ensureConfiguredPromise;
+    } catch (error) {
+      this.state.ensureConfiguredPromise = null;
+      throw error;
+    }
+  }
+
+  /**
+   * 在 prompt 执行前确保当前 session 已可运行。
+   */
+  async ensure_runnable(): Promise<void> {
+    await this.ensure_ready_for_execution();
+    if (!this.state.sessionConfig.model) {
+      throw new Error(
+        `Session "${this.session_id}" requires a configured model. Pass model to new Agent({ model }) or call session.set({ model }) first.`,
+      );
+    }
+  }
+
+  /**
+   * 写入当前 session 配置。
+   */
+  async set(input: AgentSessionSetInput): Promise<void> {
+    if (input.model) {
+      this.state.sessionConfig.model = normalizeAgentModel(input.model);
+      this.state.sessionConfig.modelLabel = inferAgentModelLabel(input.model);
+      this.executor.clearExecutor();
+    }
+    await patchSessionModelLabel({
+      projectRoot: this.project_root,
+      agentId: this.agent_id,
+      sessionId: this.session_id,
+      model: this.state.sessionConfig.model,
+    });
+  }
+
+  /**
+   * 追加一条 user 消息并刷新标题与 metadata。
+   */
+  async append_user_message(params: {
+    message?: SessionMessageV1 | null;
+    text?: string;
+  }): Promise<void> {
+    await this.executor.appendUserMessage(params);
+    await this.ensure_title_from_history({ generate: true });
+    await this.touch_metadata();
+  }
+
+  /**
+   * 追加一条 assistant 消息并刷新 metadata。
+   */
+  async append_assistant_message(params: {
+    message?: SessionMessageV1 | null;
+    fallbackText?: string;
+  }): Promise<void> {
+    await this.executor.appendAssistantMessage(params);
+    await this.touch_metadata();
+  }
+
+  /**
+   * 仅刷新当前 session metadata。
+   */
+  async touch_metadata(): Promise<void> {
+    await touchSessionMetadata({
+      projectRoot: this.project_root,
+      agentId: this.agent_id,
+      sessionId: this.session_id,
+      sessionConfig: this.state.sessionConfig,
+    });
+  }
+
+  /**
+   * 确保当前 session 已持久化 title。
+   */
+  async ensure_title_from_history(input?: {
+    /**
+     * 是否允许调用模型生成标题。
+     */
+    generate?: boolean;
+  }): Promise<void> {
+    const messages = await this.history_store.list();
+    const before_metadata = await readSessionMetadata({
+      projectRoot: this.project_root,
+      agentId: this.agent_id,
+      sessionId: this.session_id,
+    });
+    const before_title = String(before_metadata.title || "").trim();
+    const next_metadata = await ensureSessionTitle({
+      projectRoot: this.project_root,
+      agentId: this.agent_id,
+      sessionId: this.session_id,
+      messages,
+      ...(input?.generate ? { model: this.state.sessionConfig.model } : {}),
+      generate: input?.generate === true,
+    });
+    const next_title = String(next_metadata.title || "").trim();
+    if (!next_title || next_title === before_title) return;
+    this.publish_event({
+      type: "session-title",
+      sessionId: this.session_id,
+      title: next_title,
+    });
+  }
+
+  /**
+   * 持久化最终 assistant 结果。
+   */
+  async persist_assistant_result(
+    assistant_message: SessionMessageV1,
+  ): Promise<void> {
+    await persistSdkAssistantResult({
+      projectRoot: this.project_root,
+      agentId: this.agent_id,
+      sessionId: this.session_id,
+      sessionConfig: this.state.sessionConfig,
+      executor: this.executor,
+      assistantMessage: assistant_message,
+    });
+  }
+
+  /**
+   * 构造并持久化一条 prompt user 消息。
+   */
+  async create_and_persist_user_prompt_message(
+    input: AgentSessionPromptInput,
+  ): Promise<SessionUserMessageV1> {
+    const message = this.history_store.userText({
+      text: String(input.query || "").trim(),
+      metadata: {
+        sessionId: this.session_id,
+      },
+    }) as SessionUserMessageV1;
+    await this.executor.appendUserMessage({
+      message,
+    });
+    await this.ensure_title_from_history({ generate: true });
+    await this.touch_metadata();
+    return message;
+  }
+
+  /**
+   * 持久化本轮执行期间延迟写入的 user 消息。
+   */
+  async persist_deferred_user_messages(
+    deferred_messages?: SessionUserMessageV1[],
+  ): Promise<void> {
+    const normalized_messages = Array.isArray(deferred_messages)
+      ? deferred_messages
+      : [];
+    if (normalized_messages.length <= 0) return;
+    for (const message of normalized_messages) {
+      await this.executor.appendUserMessage({
+        message,
+      });
+    }
+    await this.touch_metadata();
+  }
+}

package/src/session/services/SessionTurnService.ts

@@ -0,0 +1,202 @@
+/**
+ * SessionTurnService：本地 Session turn 编排服务。
+ *
+ * 关键点（中文）
+ * - 统一管理 prompt actor 调度、turn 执行与 Session 事件流派发。
+ * - 该服务负责把 SessionPromptRuntime 与 Executor 连接起来。
+ * - metadata、title、assistant 结果持久化等状态副作用交由 SessionStateService 处理。
+ */
+
+import { extractTextFromUiMessage } from "@/executor/messages/UIMessageTransformer.js";
+import type { Executor } from "@executor/Executor.js";
+import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
+import type {
+  AgentSessionSubscriber,
+  AgentSessionUnsubscribe,
+} from "@/types/sdk/AgentSessionEvent.js";
+import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type { AgentSessionTurnHandle } from "@/types/sdk/AgentSessionTurn.js";
+import type {
+  SessionMessageV1,
+  SessionUserMessageV1,
+} from "@/executor/types/SessionMessages.js";
+import { mapAgentEventToSessionEvent, mapUiMessageChunkToAgentEvent } from "@/session/SessionEventMapper.js";
+import { SessionEventHub } from "@/session/runtime/SessionEventHub.js";
+import { SessionPromptRuntime } from "@/session/runtime/SessionPromptRuntime.js";
+import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
+import { SessionStateService } from "@/session/services/SessionStateService.js";
+
+type SessionTurnServiceOptions = {
+  /**
+   * 当前 session 标识。
+   */
+  session_id: string;
+
+  /**
+   * 当前 session 执行器。
+   */
+  executor: Executor;
+
+  /**
+   * 当前 session 状态服务。
+   */
+  state_service: SessionStateService;
+
+  /**
+   * 当前 session 共享事件总线。
+   */
+  event_hub: SessionEventHub;
+};
+
+/**
+ * 本地 Session turn 编排服务。
+ */
+export class SessionTurnService {
+  private readonly session_id: string;
+  private readonly executor: Executor;
+  private readonly state_service: SessionStateService;
+  private readonly event_hub: SessionEventHub;
+  private readonly prompt_runtime: SessionPromptRuntime;
+
+  constructor(options: SessionTurnServiceOptions) {
+    this.session_id = options.session_id;
+    this.executor = options.executor;
+    this.state_service = options.state_service;
+    this.event_hub = options.event_hub;
+    this.prompt_runtime = new SessionPromptRuntime({
+      sessionId: this.session_id,
+      publish: (event) => {
+        this.publish_event(event);
+      },
+      createAndPersistUserMessage: async (input) => {
+        return await this.state_service.create_and_persist_user_prompt_message(
+          input,
+        );
+      },
+      executeTurn: async ({ turnId, promptInput, onStepMerge }) => {
+        return await this.execute_prompt_turn({
+          turnId,
+          promptInput,
+          onStepMerge,
+        });
+      },
+    });
+  }
+
+  /**
+   * 发布一条 session 事件。
+   */
+  publish_event(event: AgentSessionEvent): void {
+    this.event_hub.publish(event);
+  }
+
+  /**
+   * 订阅当前 session 的未来事件。
+   */
+  subscribe(subscriber: AgentSessionSubscriber): AgentSessionUnsubscribe {
+    return this.event_hub.subscribe(subscriber);
+  }
+
+  /**
+   * 判断当前 turn 调度器是否活跃。
+   */
+  is_prompt_runtime_active(): boolean {
+    return this.prompt_runtime.isActive();
+  }
+
+  /**
+   * 追加一条新的 Session prompt。
+   */
+  async prompt(input: AgentSessionPromptInput): Promise<AgentSessionTurnHandle> {
+    const query = String(input.query || "").trim();
+    if (!query) {
+      throw new Error("session.prompt requires a non-empty query");
+    }
+    await this.state_service.ensure_runnable();
+    return await this.prompt_runtime.prompt({
+      query,
+    });
+  }
+
+  /**
+   * 执行单轮 prompt turn。
+   */
+  private async execute_prompt_turn(input: {
+    turnId: string;
+    promptInput: AgentSessionPromptInput;
+    onStepMerge: () => Promise<SessionUserMessageV1[]>;
+  }): Promise<{
+    text: string;
+    success: boolean;
+    assistantMessage: SessionMessageV1;
+    error?: string;
+  }> {
+    const tool_name_by_call_id = new Map<string, string>();
+    const run_context: SessionRunContext = {
+      sessionId: this.session_id,
+      onStepCallback: input.onStepMerge,
+      onAssistantStepCallback: async (step) => {
+        this.publish_event({
+          type: "assistant-step",
+          turnId: input.turnId,
+          text: step.text,
+          stepIndex: step.stepIndex,
+          ...(step.visibility ? { visibility: step.visibility } : {}),
+        });
+      },
+      onUiMessageChunkCallback: async (chunk) => {
+        if (chunk.type === "tool-input-start") {
+          tool_name_by_call_id.set(chunk.toolCallId, chunk.toolName);
+          return;
+        }
+        const event = mapUiMessageChunkToAgentEvent(chunk);
+        if (!event) return;
+        const resolved_event =
+          (
+            event.type === "tool-result" ||
+            event.type === "tool-error"
+          ) &&
+          event.toolName === "unknown"
+            ? {
+                ...event,
+                toolName:
+                  tool_name_by_call_id.get(event.toolCallId) || event.toolName,
+              }
+            : event;
+        if (
+          resolved_event.type === "tool-call" ||
+          resolved_event.type === "tool-error"
+        ) {
+          tool_name_by_call_id.set(
+            resolved_event.toolCallId,
+            resolved_event.toolName,
+          );
+        }
+        const session_event = mapAgentEventToSessionEvent({
+          event: resolved_event,
+          turnId: input.turnId,
+        });
+        if (session_event) {
+          this.publish_event(session_event);
+        }
+      },
+      injectedUserMessages: [],
+      deferredPersistedUserMessages: [],
+      pendingAssistantFileParts: [],
+    };
+    const result = await this.executor.run({
+      query: input.promptInput.query,
+      runContext: run_context,
+    });
+    await this.state_service.persist_assistant_result(result.assistantMessage);
+    await this.state_service.persist_deferred_user_messages(
+      result.deferredPersistedUserMessages,
+    );
+    return {
+      text: extractTextFromUiMessage(result.assistantMessage),
+      success: result.success,
+      assistantMessage: result.assistantMessage,
+      ...(result.error ? { error: result.error } : {}),
+    };
+  }
+}