@downcity/agent 1.1.228 → 1.1.232

package/src/session/Session.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - 面向 `new Agent(...)` 的本地会话使用场景。
  * - 对外保留稳定 Session facade，把状态、turn、view 逻辑下沉到独立 service。
- * - 内部继续复用 `Executor` / `JsonlSessionHistoryStore` / Composer 体系。
+ * - 内部使用 `SessionRecorder` 统一管理 Active、Segment 与流式 Assistant 草稿。
  */
 
 import { Executor } from "@executor/Executor.js";
@@ -55,6 +55,7 @@ import { SessionStateService } from "@/session/services/SessionStateService.js";
 import { SessionTurnService } from "@/session/services/SessionTurnService.js";
 import { SessionViewService } from "@/session/services/SessionViewService.js";
 import type { SessionLocalState } from "@/types/session/SessionLocalState.js";
+import type { AgentSessionConfigMutation } from "@/types/session/SessionConfigMutation.js";
 import type {
   SessionComposerFactoryContext,
   SessionComposerInput,
@@ -65,6 +66,7 @@ import type { SessionContextComposer } from "@/executor/composer/context/Session
 import type { SessionHistoryComposer } from "@/executor/composer/history/SessionHistoryComposer.js";
 import type { SessionSystemComposer } from "@/executor/composer/system/SessionSystemComposer.js";
 import type { SessionOptions } from "@/types/session/SessionOptions.js";
+import type { AgentPluginExecutionRuntime } from "@/types/plugin/PluginRuntime.js";
 
 /**
  * SDK 本地 Session。
@@ -92,6 +94,11 @@ export class Session implements AgentSession {
   private readonly set_approval_mode_hook: SessionOptions["set_approval_mode"];
   private readonly resolve_approval_hook: SessionOptions["resolve_approval"];
   private readonly localState: SessionLocalState;
+  private readonly getAgentEnv: SessionOptions["getAgentEnv"];
+  private readonly get_agent_plugins: SessionOptions["get_agent_plugins"];
+  private effective_instruction_system_blocks: AgentSessionSystemBlock[];
+  private effective_agent_env: Record<string, string>;
+  private effective_agent_plugins: AgentPluginExecutionRuntime;
   private readonly stateService: SessionStateService;
   private readonly turnService: SessionTurnService;
   private readonly viewService: SessionViewService<this>;
@@ -104,6 +111,13 @@ export class Session implements AgentSession {
     this.tools = options.tools;
     this.logger = options.logger;
     this.getInstructionSystemBlocks = options.getInstructionSystemBlocks;
+    this.getAgentEnv = options.getAgentEnv;
+    this.get_agent_plugins = options.get_agent_plugins;
+    this.effective_instruction_system_blocks = options
+      .getInstructionSystemBlocks()
+      .map((block) => ({ ...block }));
+    this.effective_agent_env = { ...options.getAgentEnv() };
+    this.effective_agent_plugins = options.get_agent_plugins();
     this.getManagedPluginSystemBlocks = options.getManagedPluginSystemBlocks;
     this.getPluginSystemBlocks = options.getPluginSystemBlocks;
     this.ensureConfiguredHook = options.ensureConfigured;
@@ -187,9 +201,11 @@ export class Session implements AgentSession {
       state_service: this.stateService,
       logger: this.logger,
       is_executing: () => this.isExecuting(),
-      get_instruction_system_blocks: this.getInstructionSystemBlocks,
+      get_instruction_system_blocks: () =>
+        this.effective_instruction_system_blocks.map((block) => ({ ...block })),
       get_managed_plugin_system_blocks: this.getManagedPluginSystemBlocks,
-      get_plugin_system_blocks: this.getPluginSystemBlocks,
+      get_plugin_system_blocks: async () =>
+        await this.effective_agent_plugins.systemBlocks(),
       ...(this.composers?.systemComposer
         ? { custom_system_composer: system_composer }
         : {}),
@@ -226,7 +242,10 @@ export class Session implements AgentSession {
    * 写入当前 session 默认配置。
    */
   async set(input: AgentSessionSetInput): Promise<void> {
-    await this.stateService.set(input);
+    const configured = await this.stateService.set(input);
+    if (configured.mutation) {
+      this.turnService.enqueue_config(configured.mutation);
+    }
   }
 
   /**
@@ -243,6 +262,47 @@ export class Session implements AgentSession {
     return await this.turnService.stop();
   }
 
+  /**
+   * 把 Agent configured state 修改加入当前 Session 的统一输入队列。
+   */
+  enqueue_agent_config(mutation: AgentSessionConfigMutation): void {
+    this.turnService.enqueue_config({
+      mutation_id: mutation.mutation_id,
+      scope: "agent",
+      apply: async ({ turn_id }) => {
+        if (mutation.type === "instruction") {
+          this.effective_instruction_system_blocks = mutation
+            .instruction_blocks
+            .map((block) => ({ ...block }));
+          await this.stateService.emit_action_event({
+            id: `agent-instruction:${this.id}:${mutation.mutation_id}`,
+            title: "Agent instruction updated",
+            state: "completed",
+            turnId: turn_id,
+          });
+          return;
+        }
+        if (mutation.type === "env") {
+          this.effective_agent_env = { ...mutation.env };
+          await this.stateService.emit_action_event({
+            id: `agent-env:${this.id}:${mutation.mutation_id}`,
+            title: "Agent environment updated",
+            state: "completed",
+            turnId: turn_id,
+          });
+          return;
+        }
+        this.effective_agent_plugins = mutation.plugins;
+        await this.stateService.emit_action_event({
+          id: `agent-plugins:${this.id}:${mutation.mutation_id}`,
+          title: mutation.title,
+          state: "completed",
+          turnId: turn_id,
+        });
+      },
+    });
+  }
+
   /**
    * 订阅当前 Session 的未来事件。
    */
@@ -388,8 +448,11 @@ export class Session implements AgentSession {
       tools: this.tools,
       logger: this.logger,
       getInstructionSystemBlocks: this.getInstructionSystemBlocks,
+      getAgentEnv: this.getAgentEnv,
+      get_agent_plugins: this.get_agent_plugins,
       getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
-      getPluginSystemBlocks: this.getPluginSystemBlocks,
+      getPluginSystemBlocks: async () =>
+        await this.effective_agent_plugins.systemBlocks(),
       ensureConfigured: this.ensureConfiguredHook,
       composers: this.composers,
       list_approvals: this.list_approvals,
@@ -422,7 +485,7 @@ export class Session implements AgentSession {
     const messages_dir_path = `${session_dir_path}/messages`;
     return new JsonlSessionMessageStore({
       session_id: this.id,
-      file_path: `${messages_dir_path}/messages.jsonl`,
+      file_path: `${messages_dir_path}/active.jsonl`,
       assistant_message_file_path: getSdkAgentSessionAssistantMessagePath(
         this.projectRoot,
         this.agentId,
@@ -441,6 +504,7 @@ export class Session implements AgentSession {
   private create_local_state(): SessionLocalState {
     return {
       sessionConfig: {},
+      effective_session_config: {},
       createdAt: Date.now(),
       timezone: resolveSystemTimezone(),
       initializePromise: null,
@@ -455,9 +519,11 @@ export class Session implements AgentSession {
       sessionId: this.id,
       historyStore: this.historyStore,
       getTools: () => this.tools,
-      getInstructionSystemBlocks: this.getInstructionSystemBlocks,
+      getInstructionSystemBlocks: () =>
+        this.effective_instruction_system_blocks.map((block) => ({ ...block })),
       getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
-      getPluginSystemBlocks: this.getPluginSystemBlocks,
+      getPluginSystemBlocks: async () =>
+        await this.effective_agent_plugins.systemBlocks(),
       getSessionCreatedAt: () => this.localState.createdAt,
       getSessionTimezone: () => this.localState.timezone,
     };
@@ -482,9 +548,11 @@ export class Session implements AgentSession {
         projectRoot: this.projectRoot,
         getSessionCreatedAt: () => this.localState.createdAt,
         getSessionTimezone: () => this.localState.timezone,
-        getInstructionSystemBlocks: this.getInstructionSystemBlocks,
+        getInstructionSystemBlocks: () =>
+          this.effective_instruction_system_blocks.map((block) => ({ ...block })),
         getManagedPluginSystemBlocks: this.getManagedPluginSystemBlocks,
-        getPluginSystemBlocks: this.getPluginSystemBlocks,
+        getPluginSystemBlocks: async () =>
+          await this.effective_agent_plugins.systemBlocks(),
       }),
     );
   }
@@ -516,10 +584,20 @@ export class Session implements AgentSession {
       sessionId: this.id,
       historyStore: this.historyStore,
       historyComposer: this.historyComposer,
-      getModel: () => this.localState.sessionConfig.model,
+      getModel: () =>
+        this.localState.effective_session_config.model ||
+        this.localState.sessionConfig.model,
+      get_model_context_window: () =>
+        this.localState.effective_session_config.model
+          ? this.localState.effective_session_config.model_context_window
+          : this.localState.sessionConfig.model_context_window,
       logger: this.logger,
       systemComposer: system_composer,
       getTools: () => this.tools,
+      getEnv: () => ({ ...this.effective_agent_env }),
+      get_systems: () =>
+        this.effective_instruction_system_blocks.map((block) => block.content),
+      get_plugins: () => this.effective_agent_plugins,
       ...(context_composer ? { contextComposer: context_composer } : {}),
       ...(compaction_composer
         ? { compactionComposer: compaction_composer }

package/src/session/browse/Browse.ts

@@ -94,13 +94,6 @@ type SessionBrowseBaseInput = {
   executing?: boolean;
 };
 
-type SessionArchiveFileV1 = {
-  v?: unknown;
-  sessionId?: unknown;
-  archivedAt?: unknown;
-  messages?: unknown;
-};
-
 function decodeMaybe(input: string): string {
   try {
     return decodeURIComponent(input);
@@ -140,11 +133,6 @@ function encodeCursor(offset: number): string | undefined {
   return String(Math.floor(offset));
 }
 
-function normalizeArchiveId(input: unknown): string | undefined {
-  const value = String(input || "").trim();
-  return value || undefined;
-}
-
 function stringifyForDisplay(input: unknown, maxChars = 2400): string {
   if (input === undefined) return "";
   if (input === null) return "null";
@@ -344,7 +332,7 @@ export async function loadSessionMessagesFromPath(
     }
   }
 
-  const inflight_path = filePath.replace(/messages\.jsonl$/, "assistant_message.json");
+  const inflight_path = path.join(path.dirname(filePath), "assistant_message.json");
   if (await fs.pathExists(inflight_path)) {
     try {
       const message = (await fs.readJson(inflight_path)) as SessionMessage;
@@ -395,52 +383,12 @@ function project_canonical_message_record(message: SessionMessage): SessionRecor
   }];
 }
 
-/**
- * 读取 compact archive 文件中的消息。
- *
- * 关键点（中文）
- * - archive 是 compact 时被覆盖的“上一层历史”，不是当前运行态事实源。
- * - 这里不读取 inflight，因为 archive 层永远是已完成的历史快照。
- */
-export async function loadSessionArchiveMessagesFromPath(
-  filePath: string,
-): Promise<SessionRecordV1[]> {
-  try {
-    const raw = (await fs.readJson(filePath)) as SessionArchiveFileV1 | null;
-    const items = Array.isArray(raw?.messages) ? raw.messages : [];
-    return items.filter((item): item is SessionRecordV1 => {
-      if (!item || typeof item !== "object") return false;
-      const candidate = item as { type?: unknown; role?: unknown; parts?: unknown };
-      return (
-        (
-          candidate.type === "action" ||
-          candidate.role === "user" ||
-          candidate.role === "assistant"
-        ) &&
-        (candidate.type === "action" || Array.isArray(candidate.parts))
-      );
-    });
-  } catch {
-    return [];
-  }
-}
-
 function isCompactSummaryMessage(message: SessionRecordV1): boolean {
   if (!is_session_message_record(message)) return false;
   const metadata = (message.metadata || null) as SessionMetadataV1 | null;
   return metadata?.source === "compact" || metadata?.kind === "summary";
 }
 
-function resolvePreviousArchiveId(messages: SessionRecordV1[]): string | undefined {
-  for (const message of messages) {
-    if (!isCompactSummaryMessage(message)) continue;
-    const metadata = (message.metadata || null) as SessionMetadataV1 | null;
-    const archiveId = normalizeArchiveId(metadata?.archiveId);
-    if (archiveId) return archiveId;
-  }
-  return undefined;
-}
-
 function filterUserVisibleHistoryMessages(
   messages: SessionRecordV1[],
 ): SessionRecordV1[] {
@@ -460,9 +408,11 @@ export function buildSessionInfo(
         180,
       )
     : input.metadata.previewText;
-  const message_count = messages
-    ? messages.length
-    : input.metadata.messageCount || 0;
+  const message_count = typeof input.metadata.messageCount === "number"
+    ? input.metadata.messageCount
+    : messages
+      ? filterUserVisibleHistoryMessages(messages).length
+      : 0;
   const title =
     typeof input.metadata.title === "string" && input.metadata.title.trim()
       ? input.metadata.title.trim()
@@ -494,7 +444,7 @@ export function buildSessionInfo(
  * 读取列表所需的轻量 session 摘要。
  *
  * 关键点（中文）
- * - 新记录直接使用 metadata 摘要，不扫描 messages.jsonl。
+ * - 新记录直接使用 metadata 摘要，不扫描 active.jsonl。
  * - 旧记录或执行中记录回退读取一次完整历史，并把摘要补写回 metadata。
  */
 async function resolve_session_summary_metadata(input: {
@@ -507,10 +457,9 @@ async function resolve_session_summary_metadata(input: {
   /** 是否强制刷新摘要。 */
   refresh: boolean;
 }): Promise<SessionHistoryMetaV1> {
-  const history_bytes = await fs.stat(input.messagesPath)
-    .then((file_stat) => file_stat.size)
-    .catch(() => 0);
-  const inflight_path = `${input.messagesPath.slice(0, -"messages.jsonl".length)}assistant_message.json`;
+  const storage_stats = await resolve_session_disk_stats(input.messagesPath);
+  const history_bytes = storage_stats.history_bytes;
+  const inflight_path = path.join(path.dirname(input.messagesPath), "assistant_message.json");
   const has_inflight = await fs.pathExists(inflight_path);
   if (
     !input.refresh &&
@@ -529,9 +478,11 @@ async function resolve_session_summary_metadata(input: {
   void _previous_preview;
   const next_metadata: SessionHistoryMetaV1 = {
     ...metadata_without_preview,
-    messageCount: messages.length,
+    messageCount: storage_stats.message_count,
     historyBytes: history_bytes,
-    ...(preview_text ? { previewText: preview_text } : {}),
+    ...(preview_text || input.metadata.previewText
+      ? { previewText: preview_text || input.metadata.previewText }
+      : {}),
   };
   const temp_path = `${input.metaPath}.${process.pid}.${Date.now()}.tmp`;
   await fs.ensureDir(path.dirname(input.metaPath));
@@ -540,6 +491,65 @@ async function resolve_session_summary_metadata(input: {
   return next_metadata;
 }
 
+/**
+ * 只读取 Active 和 Segment 文件索引，计算列表所需的持久化统计。
+ *
+ * 关键点（中文）
+ * - Segment 的结束 sequence 直接来自文件名，不解析历史正文。
+ * - Active 需要逐行读取，以同时覆盖 revision 行与运行中 Assistant sequence。
+ */
+async function resolve_session_disk_stats(messages_path: string) {
+  const messages_dir_path = path.dirname(messages_path);
+  const segments_dir_path = path.join(messages_dir_path, "segments");
+  const segment_entries = await fs.readdir(segments_dir_path, { withFileTypes: true })
+    .catch(() => []);
+  const segment_files = segment_entries.flatMap((entry) => {
+    if (!entry.isFile()) return [];
+    const match = /^(\d+)-(\d+)\.jsonl$/.exec(entry.name);
+    if (!match) return [];
+    return [{
+      file_path: path.join(segments_dir_path, entry.name),
+      end_sequence: Number(match[2]),
+    }];
+  });
+  const active_raw = await fs.readFile(messages_path, "utf8").catch(() => "");
+  let latest_active_sequence = 0;
+  for (const line of active_raw.split("\n")) {
+    if (!line.trim()) continue;
+    try {
+      const message = JSON.parse(line) as Partial<SessionMessage>;
+      if (Number.isInteger(message.sequence)) {
+        latest_active_sequence = Math.max(latest_active_sequence, Number(message.sequence));
+      }
+    } catch {
+      // 单行损坏不阻断 Session 列表，其正文读取时会按既有规则忽略。
+    }
+  }
+  const inflight_path = path.join(messages_dir_path, "assistant_message.json");
+  try {
+    const inflight = await fs.readJson(inflight_path) as Partial<SessionMessage>;
+    if (Number.isInteger(inflight.sequence)) {
+      latest_active_sequence = Math.max(latest_active_sequence, Number(inflight.sequence));
+    }
+  } catch {
+    // 草稿不存在或损坏时只统计已完成历史。
+  }
+  const segment_sizes = await Promise.all(
+    segment_files.map(({ file_path }) => fs.stat(file_path)
+      .then((file_stat) => file_stat.size)
+      .catch(() => 0)),
+  );
+  const latest_segment_sequence = segment_files.reduce(
+    (latest, segment) => Math.max(latest, segment.end_sequence),
+    0,
+  );
+  return {
+    history_bytes: Buffer.byteLength(active_raw, "utf8") +
+      segment_sizes.reduce((total, size) => total + size, 0),
+    message_count: Math.max(latest_segment_sequence, latest_active_sequence),
+  };
+}
+
 /**
  * 基于完整消息列表构建 session records 分页结果。
  */
@@ -552,8 +562,6 @@ export function buildSessionRecordsPage(params: {
   const order = params.input?.order || "asc";
   const limit = normalizeLimit(params.input?.limit, 50, 500);
   const cursor = normalizeCursor(params.input?.cursor);
-  const archive_id = normalizeArchiveId(params.input?.archive_id);
-  const previous_archive_id = resolvePreviousArchiveId(params.messages);
   const visibleMessages = filterUserVisibleHistoryMessages(params.messages);
 
   if (view === "timeline") {
@@ -570,8 +578,6 @@ export function buildSessionRecordsPage(params: {
         ? { next_cursor: encodeCursor(nextOffset) }
         : {}),
       has_more: nextOffset < orderedEvents.length,
-      ...(archive_id ? { archive_id } : {}),
-      ...(previous_archive_id ? { previous_archive_id } : {}),
     };
   }
 
@@ -588,8 +594,6 @@ export function buildSessionRecordsPage(params: {
       ? { next_cursor: encodeCursor(nextOffset) }
       : {}),
     has_more: nextOffset < orderedMessages.length,
-    ...(archive_id ? { archive_id } : {}),
-    ...(previous_archive_id ? { previous_archive_id } : {}),
   };
 }