@downcity/agent 1.1.408 → 1.1.437

package/src/group/GroupSessions.ts

@@ -3,8 +3,7 @@
 import { nanoid } from "nanoid";
 import { GroupSession } from "@/group/GroupSession.js";
 import type { Group } from "@/group/Group.js";
-import type { WorkspaceBase } from "@downcity/workspace";
-import { get_group_session_store, mark_group_session_started } from "@/internal/GroupRuntime.js";
+import type { WorkspaceRuntime } from "@downcity/type";
 import type {
   GroupSession as GroupSessionContract,
   GroupSessionCreateInput,
@@ -26,9 +25,9 @@ export class GroupSessions implements GroupSessionsContract {
   /** 创建一个新的群聊上下文，session_id 由内部生成。 */
   async create(input?: GroupSessionCreateInput): Promise<GroupSessionContract> {
     const session = this.create_runtime_session(`group-session-${Date.now()}-${nanoid(8)}`, input?.workspace);
-    const store = get_group_session_store(this.group);
+    const store = this.group.get_session_store();
     await session.initialize(store.session(session.id));
-    mark_group_session_started(this.group);
+    this.group.mark_session_started();
     this.sessions_by_id.set(session.id, session);
     return session;
   }
@@ -43,20 +42,20 @@ export class GroupSessions implements GroupSessionsContract {
       }
       return cached;
     }
-    const store = get_group_session_store(this.group);
+    const store = this.group.get_session_store();
     if (!(await store.has_session(resolved_session_id))) return null;
     const session = this.create_runtime_session(resolved_session_id, input?.workspace);
     await session.initialize(store.session(resolved_session_id));
-    mark_group_session_started(this.group);
+    this.group.mark_session_started();
     this.sessions_by_id.set(session.id, session);
     return session;
   }
 
   /** 恢复当前 Group 的全部群聊上下文。 */
   async list(input?: GroupSessionListInput): Promise<readonly GroupSessionSummary[]> {
-    const store = get_group_session_store(this.group);
+    const store = this.group.get_session_store();
     const metadata = await store.list_session_metadata();
-    if (metadata.length > 0) mark_group_session_started(this.group);
+    if (metadata.length > 0) this.group.mark_session_started();
     const workspace_id = String(input?.workspace_id || "").trim() || undefined;
     const filtered_metadata = workspace_id
       ? metadata.filter((item) => item.workspace_id === workspace_id)
@@ -68,6 +67,7 @@ export class GroupSessions implements GroupSessionsContract {
       updated_at: item.updated_at,
       message_count: item.message_count,
       ...(item.workspace_id ? { workspace_id: item.workspace_id } : {}),
+      ...(item.title ? { title: item.title } : {}),
       ...(item.preview_text ? { preview_text: item.preview_text } : {}),
     }));
   }
@@ -78,7 +78,7 @@ export class GroupSessions implements GroupSessionsContract {
     const session = await this.get(resolved_session_id, input);
     if (!session) return null;
     await session.dispose();
-    await get_group_session_store(this.group).remove_session(resolved_session_id);
+    await this.group.get_session_store().remove_session(resolved_session_id);
     this.sessions_by_id.delete(resolved_session_id);
     return session;
   }
@@ -87,15 +87,16 @@ export class GroupSessions implements GroupSessionsContract {
   async dispose(): Promise<void> {
     await Promise.allSettled([...this.sessions_by_id.values()].map((session) => session.dispose()));
     this.sessions_by_id.clear();
-    await get_group_session_store(this.group).dispose();
+    await this.group.dispose_session_store();
   }
 
-  private create_runtime_session(session_id: string, workspace?: WorkspaceBase): GroupSession {
+  private create_runtime_session(session_id: string, workspace?: WorkspaceRuntime): GroupSession {
     return new GroupSession({
       id: session_id,
       group_id: this.group.id,
       group_name: this.group.name,
       instruction: this.group.instruction,
+      model: this.group.model,
       members: this.group.members,
       dispatch_strategy: this.group.dispatch_strategy,
       ...(workspace ? { workspace } : {}),

package/src/group/index.ts

@@ -4,9 +4,11 @@ export { GroupSession } from "./GroupSession.js";
 export { GroupSessions } from "./GroupSessions.js";
 export { AiDispatchStrategy } from "@/types/group/DispatchStrategy.js";
 export type {
+  DispatchAssignment,
   DispatchDecision,
-  DispatchNode,
-  DispatchResponseMode,
+  DispatchGroupProfile,
+  DispatchMemberProfile,
+  DispatchStage,
   DispatchTrigger,
   DispatchStrategy,
   AiDispatchStrategyOptions,

package/src/{workspace/store → group/storage}/LocalGroupSessionDataStore.ts

@@ -1,10 +1,12 @@
 /** LocalGroupSessionDataStore：GroupSession 的 metadata 与消息 JSONL 存储。 */
 
 import path from "node:path";
-import type { FileSystem } from "@downcity/workspace";
+import type { FileSystem } from "@downcity/type";
 import type { GroupMessage } from "@/types/group/Group.js";
-import type { GroupDispatchSessionDataStore } from "@/types/group/GroupDispatchSession.js";
-import { LocalGroupDispatchSessionDataStore } from "@/workspace/store/LocalGroupDispatchSessionDataStore.js";
+import type {
+  GroupDispatchTurnRecord,
+  GroupDispatchTurnStatus,
+} from "@/types/group/GroupDispatch.js";
 import type {
   GroupSessionDataStore,
   GroupSessionHistoryMeta,
@@ -14,13 +16,15 @@ import type {
 /** 单个 GroupSession 的本地文件存储。 */
 export class LocalGroupSessionDataStore implements GroupSessionDataStore {
   readonly session_id: string;
-  readonly dispatch_session: GroupDispatchSessionDataStore;
   private readonly files: FileSystem;
   private readonly group_id: string;
   private readonly session_root_path: string;
   private readonly metadata_file_path: string;
   private readonly messages_file_path: string;
   private readonly transaction_lock_path: string;
+  private readonly dispatch_root_path: string;
+  private readonly dispatch_turns_file_path: string;
+  private readonly dispatch_lock_path: string;
 
   constructor(options: {
     /** 当前 Group StorageScope 文件能力。 */
@@ -41,13 +45,12 @@ export class LocalGroupSessionDataStore implements GroupSessionDataStore {
       "sessions",
       encodeURIComponent(this.session_id),
     );
-    this.dispatch_session = new LocalGroupDispatchSessionDataStore({
-      files: this.files,
-      session_root_path: this.session_root_path,
-    });
     this.metadata_file_path = path.join(this.session_root_path, "meta.json");
     this.messages_file_path = path.join(this.session_root_path, "messages.jsonl");
     this.transaction_lock_path = path.join(this.session_root_path, ".lock");
+    this.dispatch_root_path = path.join(this.session_root_path, "dispatch");
+    this.dispatch_turns_file_path = path.join(this.dispatch_root_path, "turns.jsonl");
+    this.dispatch_lock_path = path.join(this.dispatch_root_path, ".lock");
   }
 
   /** 初始化当前 GroupSession 目录与 metadata。 */
@@ -120,6 +123,7 @@ export class LocalGroupSessionDataStore implements GroupSessionDataStore {
       session_id: this.session_id,
       group_id: String(raw.group_id || this.group_id),
       ...(typeof raw.workspace_id === "string" && raw.workspace_id.trim() ? { workspace_id: raw.workspace_id.trim() } : {}),
+      ...(typeof raw.title === "string" && raw.title.trim() ? { title: raw.title.trim() } : {}),
       created_at: typeof raw.created_at === "number" ? raw.created_at : Date.now(),
       updated_at: typeof raw.updated_at === "number" ? raw.updated_at : 0,
       message_count: typeof raw.message_count === "number" ? raw.message_count : 0,
@@ -173,6 +177,30 @@ export class LocalGroupSessionDataStore implements GroupSessionDataStore {
     });
   }
 
+  /** 读取每个 dispatch_id 最后一次成功提交的调度状态。 */
+  async list_dispatch_turns(): Promise<GroupDispatchTurnRecord[]> {
+    if (!(await this.files.path_exists(this.dispatch_turns_file_path))) return [];
+    await this.files.ensure_directory(this.dispatch_root_path);
+    return await this.files.with_file_lock(this.dispatch_lock_path, async () => {
+      const records = await this.read_dispatch_records(true);
+      const turns_by_id = new Map<string, GroupDispatchTurnRecord>();
+      for (const record of records) {
+        turns_by_id.delete(record.dispatch_id);
+        turns_by_id.set(record.dispatch_id, record);
+      }
+      return [...turns_by_id.values()];
+    });
+  }
+
+  /** 向 GroupSession 私有调度日志追加一个完整状态快照。 */
+  async append_dispatch_turn(turn: GroupDispatchTurnRecord): Promise<void> {
+    assert_dispatch_turn(turn);
+    await this.files.ensure_directory(this.dispatch_root_path);
+    await this.files.with_file_lock(this.dispatch_lock_path, async () => {
+      await this.files.append_file(this.dispatch_turns_file_path, `${JSON.stringify(turn)}\n`);
+    });
+  }
+
   /** 校验消息日志并由真实消息重建可恢复的摘要字段。 */
   private async repair_metadata_unlocked(): Promise<void> {
     const messages = await this.read_messages(true);
@@ -215,6 +243,32 @@ export class LocalGroupSessionDataStore implements GroupSessionDataStore {
     return messages;
   }
 
+  /** 读取调度状态日志；只允许修复进程中断产生的最后一条残缺记录。 */
+  private async read_dispatch_records(repair_tail: boolean): Promise<GroupDispatchTurnRecord[]> {
+    const content = (await this.files.read_file(this.dispatch_turns_file_path)).toString("utf8");
+    const lines = content.split("\n");
+    const records: GroupDispatchTurnRecord[] = [];
+    for (let line_index = 0; line_index < lines.length; line_index += 1) {
+      const line = lines[line_index];
+      if (!line.trim()) continue;
+      try {
+        const record = JSON.parse(line) as GroupDispatchTurnRecord;
+        assert_dispatch_turn(record);
+        records.push(record);
+      } catch (error) {
+        const is_tail = lines.slice(line_index + 1).every((item) => !item.trim());
+        if (!repair_tail || !is_tail) throw error;
+        const repaired = records.map((record) => JSON.stringify(record)).join("\n");
+        await this.files.write_file_atomically(
+          this.dispatch_turns_file_path,
+          repaired ? `${repaired}\n` : "",
+        );
+        break;
+      }
+    }
+    return records;
+  }
+
   private create_initial_metadata(): GroupSessionHistoryMeta {
     const created_at = Date.now();
     return {
@@ -228,6 +282,43 @@ export class LocalGroupSessionDataStore implements GroupSessionDataStore {
   }
 }
 
+const dispatch_turn_statuses = new Set<GroupDispatchTurnStatus>([
+  "queued",
+  "running",
+  "completed",
+  "failed",
+  "stopped",
+]);
+
+/** 防止损坏的持久化记录进入 GroupSession 调度恢复流程。 */
+function assert_dispatch_turn(value: GroupDispatchTurnRecord): void {
+  if (!value || typeof value !== "object") throw new Error("Invalid Group dispatch turn record");
+  if (typeof value.dispatch_id !== "string" || !value.dispatch_id.trim()) {
+    throw new Error("Invalid Group dispatch turn id");
+  }
+  if (value.trigger !== "user" && value.trigger !== "auto") {
+    throw new Error(`Invalid Group dispatch trigger: ${String(value.trigger)}`);
+  }
+  if (typeof value.message_id !== "string" || !value.message_id.trim()) {
+    throw new Error(`Invalid Group dispatch message id: ${value.dispatch_id}`);
+  }
+  if (
+    !Array.isArray(value.pending_message_ids)
+    || value.pending_message_ids.some((item) => typeof item !== "string" || !item.trim())
+  ) {
+    throw new Error(`Invalid Group dispatch pending messages: ${value.dispatch_id}`);
+  }
+  if (!dispatch_turn_statuses.has(value.status)) {
+    throw new Error(`Invalid Group dispatch status: ${String(value.status)}`);
+  }
+  if (!Number.isFinite(value.created_at) || !Number.isFinite(value.updated_at)) {
+    throw new Error(`Invalid Group dispatch timestamps: ${value.dispatch_id}`);
+  }
+  if (value.status === "completed" && !value.decision) {
+    throw new Error(`Completed Group dispatch is missing its decision: ${value.dispatch_id}`);
+  }
+}
+
 function normalize_member_session_ids(input: object): Record<string, string> {
   return Object.fromEntries(Object.entries(input).filter(([agent_id, session_id]) => Boolean(agent_id.trim()) && typeof session_id === "string" && session_id.trim()));
 }

package/src/{workspace/store → group/storage}/LocalGroupSessionStore.ts

@@ -1,14 +1,14 @@
 /** LocalGroupSessionStore：基于 City StorageScope 的 GroupSession 集合存储。 */
 
 import path from "node:path";
-import type { FileSystem } from "@downcity/workspace";
+import type { FileSystem } from "@downcity/type";
 import type {
   GroupSessionDataStore,
   GroupSessionHistoryMeta,
   GroupSessionStore,
   GroupSessionStoreOptions,
 } from "@/types/group/GroupSessionStore.js";
-import { LocalGroupSessionDataStore } from "@/workspace/store/LocalGroupSessionDataStore.js";
+import { LocalGroupSessionDataStore } from "@/group/storage/LocalGroupSessionDataStore.js";
 
 /** GroupSession 的底层文件 Store。 */
 export class LocalGroupSessionStore implements GroupSessionStore {