@downcity/agent 1.1.208 → 1.1.210

package/src/executor/composer/history/SessionHistoryWriter.ts

@@ -4,7 +4,6 @@
  * 关键点（中文）
  * - 只负责当前 session 的 user / assistant 消息补写。
  * - 只依赖当前 session 的 history Store，不感知其他 session。
- * - 会话更新后的通知也收在这里，避免把写入细节散到 Session 主类里。
  */
 
 import type { JsonObject } from "@/types/common/Json.js";
@@ -25,10 +24,6 @@ type SessionHistoryWriterOptions = {
    */
   getHistoryStore: () => SessionHistoryStore;
 
-  /**
-   * session 更新后的异步回调。
-   */
-  runAfterSessionUpdated?: (sessionId: string) => Promise<void>;
 };
 
 /**
@@ -37,29 +32,15 @@ type SessionHistoryWriterOptions = {
 export class SessionHistoryWriter {
   private readonly sessionId: string;
   private readonly getHistoryStore: SessionHistoryWriterOptions["getHistoryStore"];
-  private readonly runAfterSessionUpdated?: SessionHistoryWriterOptions["runAfterSessionUpdated"];
 
   constructor(options: SessionHistoryWriterOptions) {
     this.sessionId = String(options.sessionId || "").trim();
     this.getHistoryStore = options.getHistoryStore;
-    this.runAfterSessionUpdated = options.runAfterSessionUpdated;
     if (!this.sessionId) {
       throw new Error("SessionHistoryWriter requires a non-empty sessionId");
     }
   }
 
-  /**
-   * 触发 session 更新后的异步回调。
-   */
-  async afterSessionUpdatedAsync(): Promise<void> {
-    if (!this.runAfterSessionUpdated) return;
-    try {
-      await this.runAfterSessionUpdated(this.sessionId);
-    } catch {
-      // ignore
-    }
-  }
-
   /**
    * 追加一条 user 消息。
    */
@@ -68,29 +49,23 @@ export class SessionHistoryWriter {
     text?: string;
     extra?: JsonObject;
   }): Promise<void> {
-    try {
-      const historyStore = this.getHistoryStore();
-      if (params.message && typeof params.message === "object") {
-        await historyStore.write_record(params.message);
-        void this.afterSessionUpdatedAsync();
-        return;
-      }
+    const historyStore = this.getHistoryStore();
+    if (params.message && typeof params.message === "object") {
+      await historyStore.write_record(params.message);
+      return;
+    }
 
-      const fallbackText = String(params.text || "").trim();
-      if (!fallbackText) return;
+    const fallbackText = String(params.text || "").trim();
+    if (!fallbackText) return;
 
-      const message = historyStore.userText({
-        text: fallbackText,
-        metadata: {
-          sessionId: this.sessionId,
-          extra: params.extra,
-        } as Omit<SessionMetadataV1, "v" | "ts">,
-      });
-      await historyStore.write_record(message);
-      void this.afterSessionUpdatedAsync();
-    } catch {
-      // ignore
-    }
+    const message = historyStore.userText({
+      text: fallbackText,
+      metadata: {
+        sessionId: this.sessionId,
+        extra: params.extra,
+      } as Omit<SessionMetadataV1, "v" | "ts">,
+    });
+    await historyStore.write_record(message);
   }
 
   /**
@@ -101,31 +76,25 @@ export class SessionHistoryWriter {
     fallbackText?: string;
     extra?: JsonObject;
   }): Promise<void> {
-    try {
-      const historyStore = this.getHistoryStore();
-      if (params.message && typeof params.message === "object") {
-        await historyStore.finalize_inflight(params.message);
-        void this.afterSessionUpdatedAsync();
-        return;
-      }
+    const historyStore = this.getHistoryStore();
+    if (params.message && typeof params.message === "object") {
+      await historyStore.finalize_inflight(params.message);
+      return;
+    }
 
-      const fallbackText = String(params.fallbackText || "").trim();
-      if (!fallbackText) return;
+    const fallbackText = String(params.fallbackText || "").trim();
+    if (!fallbackText) return;
 
-      await historyStore.finalize_inflight(
-        historyStore.assistantText({
-          text: fallbackText,
-          metadata: {
-            sessionId: this.sessionId,
-            extra: params.extra,
-          },
-          kind: "normal",
-          source: "egress",
-        }),
-      );
-      void this.afterSessionUpdatedAsync();
-    } catch {
-      // ignore
-    }
+    await historyStore.finalize_inflight(
+      historyStore.assistantText({
+        text: fallbackText,
+        metadata: {
+          sessionId: this.sessionId,
+          extra: params.extra,
+        },
+        kind: "normal",
+        source: "egress",
+      }),
+    );
   }
 }

package/src/executor/messages/AssistantFileResource.ts

@@ -15,6 +15,11 @@ import fs from "fs-extra";
 import type { FileUIPart } from "ai";
 import { getDowncityResourcesDirPath } from "@/config/Paths.js";
 
+/** 单个 assistant 资源下载允许占用的最长时间。 */
+const ASSISTANT_RESOURCE_TIMEOUT_MS = 30_000;
+/** 单个 assistant 资源允许写入内存与磁盘的最大字节数。 */
+const MAX_ASSISTANT_RESOURCE_BYTES = 25 * 1024 * 1024;
+
 type ParsedDataUrl = {
   /**
    * data URL 声明的媒体类型。
@@ -186,22 +191,49 @@ async function read_remote_resource(raw_url: string): Promise<{
   filename?: string;
   bytes: Buffer;
 }> {
-  const result = await fetch_with_retry(raw_url);
-  if (!result.ok) {
-    throw new Error(
-      `Failed to download assistant file resource: ${result.status} :: url=${raw_url}`,
-    );
-  }
-  const array_buffer = await result.arrayBuffer();
-  const bytes = Buffer.from(array_buffer);
-  if (bytes.length === 0) {
-    throw new Error(`Downloaded assistant file resource is empty :: url=${raw_url}`);
+  const abort_controller = new AbortController();
+  const timeout = setTimeout(() => {
+    abort_controller.abort(new Error("Assistant resource download timed out"));
+  }, ASSISTANT_RESOURCE_TIMEOUT_MS);
+  try {
+    const result = await fetch_with_retry(raw_url, abort_controller.signal);
+    if (!result.ok) {
+      throw new Error(
+        `Failed to download assistant file resource: ${result.status} :: url=${raw_url}`,
+      );
+    }
+    const declared_size = Number(result.headers.get("content-length"));
+    if (Number.isFinite(declared_size) && declared_size > MAX_ASSISTANT_RESOURCE_BYTES) {
+      throw new Error(`Assistant file resource exceeds 25 MiB :: url=${raw_url}`);
+    }
+    if (!result.body) {
+      throw new Error(`Assistant file resource has no response body :: url=${raw_url}`);
+    }
+
+    const reader = result.body.getReader();
+    const chunks: Buffer[] = [];
+    let total_bytes = 0;
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      total_bytes += value.byteLength;
+      if (total_bytes > MAX_ASSISTANT_RESOURCE_BYTES) {
+        await reader.cancel();
+        throw new Error(`Assistant file resource exceeds 25 MiB :: url=${raw_url}`);
+      }
+      chunks.push(Buffer.from(value));
+    }
+    if (total_bytes === 0) {
+      throw new Error(`Downloaded assistant file resource is empty :: url=${raw_url}`);
+    }
+    return {
+      mediaType: result.headers.get("content-type")?.split(";")[0]?.trim(),
+      filename: filename_from_url(raw_url),
+      bytes: Buffer.concat(chunks, total_bytes),
+    };
+  } finally {
+    clearTimeout(timeout);
   }
-  return {
-    mediaType: result.headers.get("content-type")?.split(";")[0]?.trim(),
-    filename: filename_from_url(raw_url),
-    bytes,
-  };
 }
 
 /**
@@ -213,13 +245,14 @@ async function read_remote_resource(raw_url: string): Promise<{
  */
 async function fetch_with_retry(
   raw_url: string,
+  signal: AbortSignal,
 ): Promise<Response> {
   const delays_ms = [250, 1_000];
   const attempts = delays_ms.length + 1;
   let last_error: unknown;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
-      return await fetch(raw_url);
+      return await fetch(raw_url, { signal });
     } catch (error) {
       last_error = error;
       if (!is_transient_fetch_error(error) || attempt === attempts - 1) {
@@ -286,7 +319,14 @@ async function read_local_resource(
     : path.isAbsolute(raw)
       ? raw
       : path.resolve(projectRoot, raw);
+  const file_stat = await fs.stat(file_path);
+  if (file_stat.size > MAX_ASSISTANT_RESOURCE_BYTES) {
+    throw new Error(`Assistant file resource exceeds 25 MiB: ${file_path}`);
+  }
   const bytes = await fs.readFile(file_path);
+  if (bytes.length > MAX_ASSISTANT_RESOURCE_BYTES) {
+    throw new Error(`Assistant file resource exceeds 25 MiB: ${file_path}`);
+  }
   if (bytes.length === 0) {
     throw new Error(`Assistant file resource is empty: ${file_path}`);
   }
@@ -306,6 +346,9 @@ async function materialize_file_part(params: {
   }
   const parsed_data_url = parse_data_url(raw_url);
   if (parsed_data_url) {
+    if (parsed_data_url.bytes.length > MAX_ASSISTANT_RESOURCE_BYTES) {
+      throw new Error("Assistant data URL resource exceeds 25 MiB");
+    }
     const media_type =
       String(params.part.mediaType || parsed_data_url.media_type || "").trim() ||
       "application/octet-stream";
@@ -352,8 +395,9 @@ async function materialize_file_part(params: {
     } catch (error) {
       // 关键点（中文）：远程下载失败时保留原始 URL，不让整张图导致 action 失败。
       // 这样图片至少以链接形式存在，用户可手动点击或后续再试。
+      const error_message = error instanceof Error ? error.message : String(error);
       console.warn(
-        `[AssistantFileResource] remote download failed, keeping original url :: ${describe_error_cause(error instanceof Error ? error : new Error(String(error)))} :: url=${raw_url}`,
+        `[AssistantFileResource] remote download failed, keeping original url :: ${error_message}`,
       );
       return params.part;
     }

package/src/executor/services/ExecutorInflightService.ts

@@ -23,10 +23,6 @@ interface ExecutorInflightServiceOptions {
    */
   history_store: SessionHistoryStore;
 
-  /**
-   * inflight 更新完成后的异步通知。
-   */
-  run_after_session_updated_async?: () => Promise<void>;
 }
 
 /**
@@ -35,13 +31,10 @@ interface ExecutorInflightServiceOptions {
 export class ExecutorInflightService {
   private readonly session_id: string;
   private readonly history_store: SessionHistoryStore;
-  private readonly run_after_session_updated_async?: ExecutorInflightServiceOptions["run_after_session_updated_async"];
 
   constructor(options: ExecutorInflightServiceOptions) {
     this.session_id = String(options.session_id || "").trim();
     this.history_store = options.history_store;
-    this.run_after_session_updated_async =
-      options.run_after_session_updated_async;
 
     if (!this.session_id) {
       throw new Error("ExecutorInflightService requires a non-empty session_id");
@@ -98,8 +91,5 @@ export class ExecutorInflightService {
         };
 
     await this.history_store.write_inflight(next_message);
-    if (this.run_after_session_updated_async) {
-      await this.run_after_session_updated_async();
-    }
   }
 }

package/src/executor/store/history/jsonl/JsonlSessionHistoryStore.ts

@@ -34,6 +34,7 @@ import type {
   SessionHistoryCompactInput,
   SessionHistoryStore,
 } from "@/executor/store/history/SessionHistoryStore.js";
+import { resolve_session_message_preview } from "@/session/preview/SessionMessagePreview.js";
 
 /**
  * JSONL history store 构造参数。
@@ -359,6 +360,19 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
         ...(this.normalizeText(raw.modelLabel)
           ? { modelLabel: this.normalizeText(raw.modelLabel) }
           : {}),
+        ...(typeof raw.messageCount === "number" &&
+        Number.isInteger(raw.messageCount) &&
+        raw.messageCount >= 0
+          ? { messageCount: raw.messageCount }
+          : {}),
+        ...(this.normalizeText(raw.previewText)
+          ? { previewText: this.normalizeText(raw.previewText) }
+          : {}),
+        ...(typeof raw.historyBytes === "number" &&
+        Number.isInteger(raw.historyBytes) &&
+        raw.historyBytes >= 0
+          ? { historyBytes: raw.historyBytes }
+          : {}),
       };
     } catch {
       return {
@@ -391,6 +405,19 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
       ...(this.normalizeText(next.modelLabel)
         ? { modelLabel: this.normalizeText(next.modelLabel) }
         : {}),
+      ...(typeof next.messageCount === "number" &&
+      Number.isInteger(next.messageCount) &&
+      next.messageCount >= 0
+        ? { messageCount: next.messageCount }
+        : {}),
+      ...(this.normalizeText(next.previewText)
+        ? { previewText: this.normalizeText(next.previewText) }
+        : {}),
+      ...(typeof next.historyBytes === "number" &&
+      Number.isInteger(next.historyBytes) &&
+      next.historyBytes >= 0
+        ? { historyBytes: next.historyBytes }
+        : {}),
     };
     await fs.writeJson(this.getMetaFilePath(), normalized, { spaces: 2 });
   }
@@ -432,6 +459,82 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     );
   }
 
+  private async get_history_bytes_unsafe(): Promise<number> {
+    try {
+      const file_stat = await statNative(this.getMessagesFilePath());
+      return file_stat.size;
+    } catch {
+      return 0;
+    }
+  }
+
+  private async read_persisted_records_unsafe(): Promise<SessionRecordV1[]> {
+    const raw = await fs.readFile(this.getMessagesFilePath(), "utf8").catch(() => "");
+    const records: SessionRecordV1[] = [];
+    for (const line of raw.split("\n").filter(Boolean)) {
+      try {
+        const record = this.normalizePersistedMessage(JSON.parse(line));
+        if (record) records.push(record);
+      } catch {
+        // 关键点（中文）：摘要重建跳过损坏行，与正式历史读取语义保持一致。
+      }
+    }
+    return records;
+  }
+
+  private async write_history_summary_unsafe(
+    records: SessionRecordV1[],
+  ): Promise<void> {
+    const current = await this.readMetaUnsafe();
+    const last_record = records[records.length - 1];
+    const preview_text = last_record
+      ? resolve_session_message_preview(last_record).slice(0, 180).trim()
+      : "";
+    const { previewText: _previous_preview, ...metadata_without_preview } = current;
+    void _previous_preview;
+    await this.writeMetaUnsafe({
+      ...metadata_without_preview,
+      updatedAt: Date.now(),
+      messageCount: records.length,
+      historyBytes: await this.get_history_bytes_unsafe(),
+      ...(preview_text ? { previewText: preview_text } : {}),
+    });
+  }
+
+  private async update_history_summary_after_append_unsafe(input: {
+    /** 本次追加前 messages.jsonl 的字节长度。 */
+    previous_history_bytes: number;
+    /** 本次实际追加的 records，按写入顺序排列。 */
+    appended_records: SessionRecordV1[];
+  }): Promise<void> {
+    if (input.appended_records.length === 0) return;
+    const current = await this.readMetaUnsafe();
+    const previous_message_count = current.messageCount;
+    if (
+      current.historyBytes !== input.previous_history_bytes ||
+      typeof previous_message_count !== "number"
+    ) {
+      await this.write_history_summary_unsafe(
+        await this.read_persisted_records_unsafe(),
+      );
+      return;
+    }
+
+    const last_record = input.appended_records[input.appended_records.length - 1];
+    const preview_text = resolve_session_message_preview(last_record)
+      .slice(0, 180)
+      .trim();
+    const { previewText: _previous_preview, ...metadata_without_preview } = current;
+    void _previous_preview;
+    await this.writeMetaUnsafe({
+      ...metadata_without_preview,
+      updatedAt: Date.now(),
+      messageCount: previous_message_count + input.appended_records.length,
+      historyBytes: await this.get_history_bytes_unsafe(),
+      ...(preview_text ? { previewText: preview_text } : {}),
+    });
+  }
+
   private async rewriteMessagesUnsafe(messages: SessionRecordV1[]): Promise<void> {
     const file = this.getMessagesFilePath();
     const temp = `${file}.${process.pid}.${Date.now()}.tmp`;
@@ -445,7 +548,7 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
 
   private async upsert_action_record_unsafe(
     message: SessionActionRecordV1,
-  ): Promise<void> {
+  ): Promise<SessionRecordV1[]> {
     const file = this.getMessagesFilePath();
     const raw = await fs.readFile(file, "utf8").catch(() => "");
     const messages: SessionRecordV1[] = [];
@@ -468,6 +571,7 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
 
     if (!replaced) messages.push(message);
     await this.rewriteMessagesUnsafe(messages);
+    return messages;
   }
 
   private async withWriteLock<T>(fn: () => Promise<T>): Promise<T> {
@@ -555,8 +659,8 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
         }),
         getArchiveDirPath: () => this.getArchiveDirPath(),
         getMessagesFilePath: () => this.getMessagesFilePath(),
-        readMetaUnsafe: () => this.readMetaUnsafe(),
-        writeMetaUnsafe: (next) => this.writeMetaUnsafe(next),
+        writeHistorySummaryUnsafe: (records) =>
+          this.write_history_summary_unsafe(records),
       },
       {
         model: input.model,
@@ -575,21 +679,31 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
       const normalized = this.normalizePersistedMessage(message);
       if (!normalized) return;
       if (is_session_action_record(normalized)) {
-        await this.upsert_action_record_unsafe(normalized);
+        const records = await this.upsert_action_record_unsafe(normalized);
+        await this.write_history_summary_unsafe(records);
         return;
       }
 
+      const previous_history_bytes = await this.get_history_bytes_unsafe();
+      const appended_records: SessionRecordV1[] = [];
+
       // 关键点（中文）：若上一次 assistant 在运行中中断，新的 user 到来前先把残留快照收口到正式历史，
       // 避免 `list_records()` 时旧 inflight 跑到新 user 后面，打乱时序。
       if (is_session_message_record(normalized) && normalized.role === "user") {
         const current_inflight = await this.read_inflight_unsafe();
         if (current_inflight) {
           await this.appendMessageUnsafe(current_inflight);
+          appended_records.push(current_inflight);
           await this.removeInflightUnsafe();
         }
       }
 
       await this.appendMessageUnsafe(normalized);
+      appended_records.push(normalized);
+      await this.update_history_summary_after_append_unsafe({
+        previous_history_bytes,
+        appended_records,
+      });
     });
   }
 
@@ -611,7 +725,12 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
       .map((message) => `${JSON.stringify(message)}\n`)
       .join("");
     await this.withWriteLock(async () => {
+      const previous_history_bytes = await this.get_history_bytes_unsafe();
       await fs.appendFile(this.getMessagesFilePath(), payload, "utf8");
+      await this.update_history_summary_after_append_unsafe({
+        previous_history_bytes,
+        appended_records: normalized_list,
+      });
     });
   }
 
@@ -628,6 +747,7 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
 
   async finalize_inflight(message?: SessionRecordV1 | null): Promise<void> {
     await this.withWriteLock(async () => {
+      const previous_history_bytes = await this.get_history_bytes_unsafe();
       const current_inflight = await this.read_inflight_unsafe();
       const normalized_message = this.normalizePersistedMessage(message);
       const final_message =
@@ -640,6 +760,12 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
       if (current_inflight) {
         await this.removeInflightUnsafe();
       }
+      if (final_message) {
+        await this.update_history_summary_after_append_unsafe({
+          previous_history_bytes,
+          appended_records: [final_message],
+        });
+      }
     });
   }
 

package/src/executor/types/SessionHistoryMeta.ts

@@ -23,4 +23,10 @@ export type SessionHistoryMetaV1 = {
   title?: string;
   /** 当前 session 绑定模型的可读标签。 */
   modelLabel?: string;
+  /** 当前 session 已持久化记录数量，用于列表查询避免扫描完整历史。 */
+  messageCount?: number;
+  /** 当前 session 最后一条记录的用户可见摘要，用于列表预览。 */
+  previewText?: string;
+  /** 生成当前摘要时 messages.jsonl 的字节长度，用于校验摘要是否仍然有效。 */
+  historyBytes?: number;
 };