@downcity/agent 1.1.337 → 1.1.399

package/src/session/browse/Browse.ts

@@ -15,25 +15,19 @@ import type {
   AgentSessionSummary,
   AgentSessionSummaryPage,
 } from "@/types/agent/SessionTypes.js";
-import type {
-  SessionRecordV1,
-  SessionMetadataV1,
-} from "@/executor/types/SessionRecords.js";
-import { is_session_message_record } from "@/executor/types/SessionRecords.js";
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
 import { resolve_session_message_preview } from "@/session/preview/SessionMessagePreview.js";
 import {
-  get_sdk_agent_archived_session_messages_path,
-  get_sdk_agent_archived_session_meta_path,
-  get_sdk_agent_archived_sessions_dir_path,
-  get_sdk_agent_session_messages_path,
-  get_sdk_agent_session_meta_path,
-  get_sdk_agent_sessions_root_dir_path,
+  get_workspace_archived_session_active_messages_path,
+  get_workspace_archived_session_meta_path,
+  get_workspace_archived_sessions_path,
+  get_workspace_session_active_messages_path,
+  get_workspace_session_meta_path,
+  get_workspace_sessions_path,
 } from "@/workspace/store/LocalStorePaths.js";
 import { read_session_metadata_from_path } from "@/session/storage/Metadata.js";
-import { to_executor_ui_message } from "@/session/messages/SessionMessageCodec.js";
 import type { SessionMessage } from "@/types/session/SessionMessage.js";
-import type { FileSystem } from "@/types/workspace/FileSystem.js";
+import type { FileSystem } from "@downcity/workspace";
 
 type SessionBrowseBaseInput = {
   /**
@@ -61,7 +55,7 @@ type SessionBrowseBaseInput = {
    *
    * 说明（中文）：列表查询已有 metadata 摘要时可省略，详情查询仍传完整记录。
    */
-  messages?: SessionRecordV1[];
+  messages?: SessionMessage[];
 
   /**
    * 当前 session 是否正在执行。
@@ -114,7 +108,7 @@ function encodeCursor(offset: number): string | undefined {
 export async function load_session_messages_from_path(
   filePath: string,
   files: FileSystem,
-): Promise<SessionRecordV1[]> {
+): Promise<SessionMessage[]> {
   const messages_by_id = new Map<string, SessionMessage>();
   if (await files.path_exists(filePath)) {
     const raw = (await files.read_file(filePath)).toString("utf8");
@@ -148,8 +142,7 @@ export async function load_session_messages_from_path(
   }
 
   return [...messages_by_id.values()]
-    .sort((left, right) => left.sequence - right.sequence)
-    .flatMap(project_canonical_message_record);
+    .sort((left, right) => left.sequence - right.sequence);
 }
 
 function is_canonical_session_message(input: unknown): input is SessionMessage {
@@ -167,35 +160,16 @@ function is_canonical_session_message(input: unknown): input is SessionMessage {
   );
 }
 
-function project_canonical_message_record(message: SessionMessage): SessionRecordV1[] {
-  const projected = to_executor_ui_message(message);
-  if (projected) return [projected];
-  if (message.type !== "action") return [];
-  return [{
-    type: "action",
-    id: message.message_id,
-    title: message.title,
-    ...(message.description ? { description: message.description } : {}),
-    state: message.status,
-    metadata: {
-      v: 1,
-      ts: message.updated_at,
-      session_id: message.session_id,
-      ...(message.turn_id ? { turn_id: message.turn_id } : {}),
-    },
-  }];
-}
-
-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 is_compact_summary_message(message: SessionMessage): boolean {
+  return message.type === "assistant" && message.kind === "summary";
 }
 
-function filterUserVisibleHistoryMessages(
-  messages: SessionRecordV1[],
-): SessionRecordV1[] {
-  return messages.filter((message) => !isCompactSummaryMessage(message));
+function filter_user_visible_history_messages(
+  messages: SessionMessage[],
+): SessionMessage[] {
+  return messages.filter((message) =>
+    message.visibility === "visible" && !is_compact_summary_message(message)
+  );
 }
 
 /**
@@ -214,7 +188,7 @@ export function build_session_info(
   const message_count = typeof input.metadata.message_count === "number"
     ? input.metadata.message_count
     : messages
-      ? filterUserVisibleHistoryMessages(messages).length
+      ? filter_user_visible_history_messages(messages).length
       : 0;
   const title =
     typeof input.metadata.title === "string" && input.metadata.title.trim()
@@ -235,6 +209,7 @@ export function build_session_info(
     ...(input.metadata.model_label
       ? { model_label: input.metadata.model_label }
       : {}),
+    ...(input.metadata.origin ? { origin: input.metadata.origin } : {}),
     ...(typeof input.metadata.timezone === "string" && input.metadata.timezone.trim()
       ? { timezone: input.metadata.timezone.trim() }
       : {}),
@@ -372,6 +347,7 @@ async function resolve_session_disk_stats(
 export async function list_agent_session_summary_page(params: {
   project_root: string;
   agent_id: string;
+  workspace_id?: string;
   input?: AgentListSessionsInput;
   executingSessionIds?: Set<string>;
   files: FileSystem;
@@ -379,10 +355,7 @@ export async function list_agent_session_summary_page(params: {
   const limit = normalizeLimit(params.input?.limit, 50, 500);
   const cursor = normalizeCursor(params.input?.cursor);
   const query = String(params.input?.query || "").trim().toLowerCase();
-  const sessionsRoot = get_sdk_agent_sessions_root_dir_path(
-    params.project_root,
-    params.agent_id,
-  );
+  const sessionsRoot = get_workspace_sessions_path(params.project_root);
 
   if (!(await params.files.path_exists(sessionsRoot))) {
     return {
@@ -399,22 +372,22 @@ export async function list_agent_session_summary_page(params: {
     if (!entry.is_directory) continue;
     const session_id = decodeMaybe(entry.name);
     if (!session_id) continue;
-    const meta_path = get_sdk_agent_session_meta_path(
+    const meta_path = get_workspace_session_meta_path(
       params.project_root,
-      params.agent_id,
       session_id,
     );
-    const messages_path = get_sdk_agent_session_messages_path(
+    const messages_path = get_workspace_session_active_messages_path(
       params.project_root,
-      params.agent_id,
       session_id,
     );
     const persisted_metadata = await read_session_metadata_from_path({
       filePath: meta_path,
       session_id,
       agent_id: params.agent_id,
+      workspace_id: params.workspace_id,
       files: params.files,
-    });
+    }).catch(() => null);
+    if (!persisted_metadata) continue;
     const metadata = await resolve_session_summary_metadata({
       metadata: persisted_metadata,
       messagesPath: messages_path,
@@ -438,6 +411,7 @@ export async function list_agent_session_summary_page(params: {
       ...(typeof info.created_at === "number" ? { created_at: info.created_at } : {}),
       ...(typeof info.updated_at === "number" ? { updated_at: info.updated_at } : {}),
       ...(info.model_label ? { model_label: info.model_label } : {}),
+      ...(info.origin ? { origin: info.origin } : {}),
       ...(info.executing ? { executing: true } : {}),
     };
 
@@ -475,16 +449,14 @@ export async function list_agent_session_summary_page(params: {
 export async function list_archived_agent_session_summary_page(params: {
   project_root: string;
   agent_id: string;
+  workspace_id?: string;
   input?: AgentListSessionsInput;
   files: FileSystem;
 }): Promise<AgentSessionSummaryPage> {
   const limit = normalizeLimit(params.input?.limit, 50, 500);
   const cursor = normalizeCursor(params.input?.cursor);
   const query = String(params.input?.query || "").trim().toLowerCase();
-  const archivedRoot = get_sdk_agent_archived_sessions_dir_path(
-    params.project_root,
-    params.agent_id,
-  );
+  const archivedRoot = get_workspace_archived_sessions_path(params.project_root);
 
   if (!(await params.files.path_exists(archivedRoot))) {
     return {
@@ -501,22 +473,22 @@ export async function list_archived_agent_session_summary_page(params: {
     if (!entry.is_directory) continue;
     const session_id = decodeMaybe(entry.name);
     if (!session_id) continue;
-    const meta_path = get_sdk_agent_archived_session_meta_path(
+    const meta_path = get_workspace_archived_session_meta_path(
       params.project_root,
-      params.agent_id,
       session_id,
     );
-    const messages_path = get_sdk_agent_archived_session_messages_path(
+    const messages_path = get_workspace_archived_session_active_messages_path(
       params.project_root,
-      params.agent_id,
       session_id,
     );
     const persisted_metadata = await read_session_metadata_from_path({
       filePath: meta_path,
       session_id,
       agent_id: params.agent_id,
+      workspace_id: params.workspace_id,
       files: params.files,
-    });
+    }).catch(() => null);
+    if (!persisted_metadata) continue;
     const metadata = await resolve_session_summary_metadata({
       metadata: persisted_metadata,
       messagesPath: messages_path,

package/src/session/control/SessionInteractions.ts

@@ -98,11 +98,17 @@ export class SessionInteractions implements SessionInteractionPort, SessionInter
       input.interaction_id,
       input.response,
     );
-    const result: SessionInteractionResult = {
-      status: "resolved",
-      interaction_id: input.interaction_id,
-      response: structuredClone(input.response),
-    };
+    const result: SessionInteractionResult = input.response.outcome === "denied"
+      ? {
+        status: "denied",
+        interaction_id: input.interaction_id,
+        reason: extract_interaction_reason(input.response.payload),
+      }
+      : {
+        status: "resolved",
+        interaction_id: input.interaction_id,
+        response: structuredClone(input.response),
+      };
     this.finish_pending(input.interaction_id, result);
     return result;
   }
@@ -162,21 +168,27 @@ export class SessionInteractions implements SessionInteractionPort, SessionInter
     ) {
       throw new Error("Session Interaction expires_at must not precede created_at");
     }
-    if (request.kind === "question") {
-      if (request.questions.length === 0) {
+    if (!String(request.type || "").trim()) {
+      throw new Error("Session Interaction requires a non-empty type");
+    }
+    if (!request.source || typeof request.source !== "object") {
+      throw new Error("Session Interaction requires a source");
+    }
+    if (request.type === "question") {
+      const payload = request.payload as { questions?: unknown };
+      const questions = payload?.questions;
+      if (!Array.isArray(questions) || questions.length === 0) {
         throw new Error("Question Interaction requires at least one question");
       }
       const question_ids = new Set<string>();
-      for (const question of request.questions) {
+      for (const question of questions as Array<Record<string, unknown>>) {
         if (!String(question.question_id || "").trim()) {
           throw new Error("Interaction question requires question_id");
         }
-        if (question_ids.has(question.question_id)) {
-          throw new Error(
-            `Duplicate Interaction question_id: ${question.question_id}`,
-          );
+        if (question_ids.has(String(question.question_id))) {
+          throw new Error("Duplicate Interaction question_id");
         }
-        question_ids.add(question.question_id);
+        question_ids.add(String(question.question_id));
         if (!String(question.prompt || "").trim()) {
           throw new Error(
             `Interaction question requires prompt: ${question.question_id}`,
@@ -184,7 +196,7 @@ export class SessionInteractions implements SessionInteractionPort, SessionInter
         }
         if (
           question.response_type !== "text" &&
-          (!question.options || question.options.length === 0)
+          (!Array.isArray(question.options) || question.options.length === 0)
         ) {
           throw new Error(
             `Select Interaction question requires options: ${question.question_id}`,
@@ -192,76 +204,76 @@ export class SessionInteractions implements SessionInteractionPort, SessionInter
         }
         if (question.options) {
           const option_values = new Set<string>();
-          for (const option of question.options) {
+          for (const option of question.options as Array<Record<string, unknown>>) {
             if (!String(option.value || "").trim()) {
               throw new Error(
                 `Interaction option requires value: ${question.question_id}`,
               );
             }
-            if (option_values.has(option.value)) {
-              throw new Error(
-                `Duplicate Interaction option value: ${question.question_id}/${option.value}`,
-              );
+            const option_value = String(option.value);
+            if (option_values.has(option_value)) {
+              throw new Error("Duplicate Interaction option value");
             }
-            option_values.add(option.value);
+            option_values.add(option_value);
           }
         }
       }
     }
   }
 
-  /** 校验响应 kind、问题集合与回答值。 */
+  /** 校验响应 type、问题集合与回答值。 */
   private validate_response(
     request: SessionInteractionRequest,
     response: SessionInteractionResponse,
   ): void {
-    if (request.kind !== response.kind) {
-      throw new Error(
-        `Session Interaction response kind mismatch: ${request.interaction_id}`,
-      );
+    if (request.type !== response.type) {
+      throw new Error("Session Interaction response type mismatch");
+    }
+    if (response.outcome !== "resolved" && response.outcome !== "denied") {
+      throw new Error("Session Interaction response requires a valid outcome");
     }
-    if (request.kind !== "question" || response.kind !== "question") return;
+    if (request.type !== "question") return;
+    const request_payload = request.payload as { questions?: unknown };
+    const response_payload = response.payload as { answers?: unknown };
+    const questions = Array.isArray(request_payload.questions)
+      ? request_payload.questions as Array<Record<string, unknown>>
+      : [];
+    const response_answers = Array.isArray(response_payload?.answers)
+      ? response_payload.answers as Array<Record<string, unknown>>
+      : [];
     const answers = new Map<string, string | string[]>();
-    for (const answer of response.answers) {
-      if (answers.has(answer.question_id)) {
-        throw new Error(
-          `Duplicate Session Interaction answer: ${answer.question_id}`,
-        );
+    for (const answer of response_answers) {
+      const question_id = String(answer.question_id || "");
+      if (answers.has(question_id)) {
+        throw new Error("Duplicate Session Interaction answer");
       }
-      answers.set(answer.question_id, answer.value);
+      answers.set(question_id, answer.value as string | string[]);
     }
-    if (answers.size !== request.questions.length) {
-      throw new Error(
-        `Session Interaction answer count mismatch: ${request.interaction_id}`,
-      );
+    if (answers.size !== questions.length) {
+      throw new Error("Session Interaction answer count mismatch");
     }
-    for (const question of request.questions) {
-      const value = answers.get(question.question_id);
+    for (const question of questions) {
+      const question_id = String(question.question_id || "");
+      const value = answers.get(question_id);
       if (value === undefined) {
-        throw new Error(
-          `Session Interaction answer is missing: ${question.question_id}`,
-        );
+        throw new Error("Session Interaction answer is missing");
       }
       if (question.response_type === "multi_select") {
         if (!Array.isArray(value)) {
-          throw new Error(
-            `Session Interaction answer must be an array: ${question.question_id}`,
-          );
+          throw new Error("Session Interaction answer must be an array");
         }
       } else if (typeof value !== "string") {
-        throw new Error(
-          `Session Interaction answer must be a string: ${question.question_id}`,
-        );
+        throw new Error("Session Interaction answer must be a string");
       }
       if (question.response_type !== "text") {
         const allowed = new Set(
-          (question.options || []).map((option) => option.value),
+          (Array.isArray(question.options) ? question.options : []).map(
+            (option) => (option as { value: string }).value,
+          ),
         );
         const selected = Array.isArray(value) ? value : [value];
         if (selected.some((item) => !allowed.has(item))) {
-          throw new Error(
-            `Session Interaction answer contains an invalid option: ${question.question_id}`,
-          );
+          throw new Error("Session Interaction answer contains an invalid option");
         }
       }
     }
@@ -288,3 +300,12 @@ export class SessionInteractions implements SessionInteractionPort, SessionInter
     pending.resolve(result);
   }
 }
+
+/** 从通用响应 payload 中读取可选的人类可读拒绝原因。 */
+function extract_interaction_reason(payload: unknown): string | undefined {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return undefined;
+  }
+  const reason = (payload as { reason?: unknown }).reason;
+  return typeof reason === "string" ? reason : undefined;
+}

package/src/session/execution/SessionAssistantOutputAdapter.ts

@@ -1,19 +1,22 @@
 /**
- * AI SDK Assistant 输出到 Session canonical Message 的协议 Adapter。
+ * Downcity 模型事件到 canonical Assistant Message 的输出 Adapter。
  *
- * 本模块是 AI SDK 临时 ID、空 Part 与最终 UIMessage 快照能进入的最外层边界。
- * 它只通过 SessionMessages 打开 Writer，不持有第二份 Assistant Message 状态。
+ * Adapter 只负责惰性打开当前 Turn 的唯一 Writer，并把标准模型事件、Tool 结果与
+ * Action 内容转交给 Writer；`SessionMessages` 始终是唯一事实源。
  */
 
-import type { SessionMessageRecordV1 } from "@/executor/types/SessionRecords.js";
-import { from_ui_assistant_parts } from "@/session/messages/SessionMessageCodec.js";
+import type { ModelStreamEvent } from "@downcity/type";
 import {
   SessionAssistantMessageWriter,
   SessionMessages,
 } from "@/session/SessionMessages.js";
+import type { SessionAssistantResultPart } from "@/types/session/SessionContent.js";
+import type { SessionAssistantMessagePart } from "@/types/session/SessionMessage.js";
 import type { SessionAssistantOutput } from "@/types/executor/SessionAssistantOutput.js";
-import type { SessionToolInputReady } from "@/types/session/SessionTool.js";
-import type { UIMessage, UIMessageChunk } from "ai";
+import type {
+  SessionToolExecutionResult,
+  SessionToolInputReady,
+} from "@/types/session/SessionTool.js";
 
 /** 单个 Turn 使用的 Assistant 输出 Adapter。 */
 export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
@@ -36,7 +39,7 @@ export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
     }
   }
 
-  /** 开始当前 Provider Step。 */
+  /** 开始当前模型 Step。 */
   async begin_step(): Promise<void> {
     if (this.writer) {
       await this.writer.begin_step();
@@ -45,17 +48,25 @@ export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
     this.step_pending = true;
   }
 
-  /** 把可持久化 AI SDK Chunk 写入当前 canonical Message。 */
-  async write_chunk(chunk: UIMessageChunk): Promise<void> {
-    if (!is_assistant_content_chunk(chunk.type)) return;
-    await (await this.ensure_writer()).apply_chunk(chunk);
+  /** 直接写入单个标准模型事件。 */
+  async write_model_event(event: ModelStreamEvent): Promise<void> {
+    if (!is_assistant_content_event(event)) return;
+    await (await this.ensure_writer()).apply_model_event(event);
   }
 
-  /** 使用最终快照校验当前 Step Part 顺序并补齐 metadata。 */
-  async finish_step(message: SessionMessageRecordV1): Promise<void> {
-    await (await this.ensure_writer()).finish_step(
-      from_ui_assistant_parts(message.parts),
-    );
+  /** 在 Tool 执行前提交完整输入。 */
+  async prepare_tool_input(input: SessionToolInputReady): Promise<void> {
+    await (await this.ensure_writer()).prepare_tool_input(input);
+  }
+
+  /** 写入 Tool 执行终态。 */
+  async write_tool_result(result: SessionToolExecutionResult): Promise<void> {
+    await (await this.ensure_writer()).apply_tool_result(result);
+  }
+
+  /** 使用模型聚合出的 canonical Parts 校验当前 Step。 */
+  async finish_step(parts: SessionAssistantMessagePart[]): Promise<void> {
+    await (await this.ensure_writer()).finish_step(parts);
   }
 
   /** 清理异常结束的 Step 作用域。 */
@@ -64,12 +75,7 @@ export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
     this.step_pending = false;
   }
 
-  /** 在 Tool 实现开始前提交完整输入。 */
-  async prepare_tool_input(input: SessionToolInputReady): Promise<void> {
-    await (await this.ensure_writer()).prepare_tool_input(input);
-  }
-
-  /** User steer 已持久化后关闭当前 Assistant Message；没有输出时保持为空。 */
+  /** User steer 持久化后关闭它之前的当前 Assistant Message。 */
   async close_current_message(): Promise<void> {
     if (!this.writer) {
       this.step_pending = false;
@@ -79,12 +85,10 @@ export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
     this.writer = null;
   }
 
-  /** 把 Action 产生的完整 UI Parts 追加到当前 canonical Assistant Message。 */
-  async append_parts(parts: UIMessage["parts"]): Promise<void> {
-    if (!Array.isArray(parts) || parts.length === 0) return;
-    await (await this.ensure_writer()).append_parts(
-      from_ui_assistant_parts(parts),
-    );
+  /** 追加 Action 产生的封闭 Assistant 内容。 */
+  async append_result_parts(parts: readonly SessionAssistantResultPart[]): Promise<void> {
+    if (parts.length === 0) return;
+    await (await this.ensure_writer()).append_result_parts(parts);
   }
 
   /** 按 Turn 结果收口最后一个 canonical Message。 */
@@ -125,20 +129,15 @@ export class SessionAssistantOutputAdapter implements SessionAssistantOutput {
   }
 }
 
-/** 判断 AI SDK Chunk 是否属于 canonical Assistant 内容。 */
-function is_assistant_content_chunk(type: string): boolean {
-  return (
-    type === "text-start" ||
-    type === "text-delta" ||
-    type === "text-end" ||
-    type === "reasoning-start" ||
-    type === "reasoning-delta" ||
-    type === "reasoning-end" ||
-    type.startsWith("tool-") ||
-    type === "file" ||
-    type === "source-url" ||
-    type === "source-document" ||
-    type === "start-step" ||
-    type.startsWith("data-")
-  );
+/** 判断标准模型事件是否会产生 canonical Assistant 内容。 */
+function is_assistant_content_event(event: ModelStreamEvent): boolean {
+  return event.type === "text_start" ||
+    event.type === "text_delta" ||
+    event.type === "text_finish" ||
+    event.type === "reasoning_start" ||
+    event.type === "reasoning_delta" ||
+    event.type === "reasoning_finish" ||
+    event.type === "tool_call_start" ||
+    event.type === "tool_call_delta" ||
+    event.type === "tool_call_finish";
 }

package/src/session/execution/tools/SessionShellApprovalAdapter.ts

@@ -10,7 +10,7 @@ import type {
   ShellApprovalHandle,
   ShellApprovalRequest,
   ShellApprovalStatus,
-} from "@downcity/shell";
+} from "@downcity/workspace";
 import type { SessionInteractions } from "@/session/control/SessionInteractions.js";
 import type { SessionApprovalMode } from "@/types/session/SessionInteraction.js";
 import { generate_id } from "@/utils/Id.js";
@@ -54,18 +54,27 @@ export class SessionShellApprovalAdapter implements ShellApprovalGateway {
     const handle = await this.interactions.request({
       interaction_id,
       turn_id: input.turn_id,
-      kind: "approval",
+      type: "approval",
       source: {
-        type: "tool",
+        type: "shell",
         tool_call_id: input.tool_call_id,
         tool_name: input.tool_name,
       },
       title: `Approve ${input.tool_name}`,
       description: input.reason,
-      command: input.command,
-      cwd: input.cwd,
-      reason: input.reason,
-      operation: input.operation,
+      payload: {
+        operation: input.operation,
+        command: input.command,
+        cwd: input.cwd,
+        reason: input.reason,
+      },
+      response_schema: {
+        type: "object",
+        required: ["decision"],
+        properties: {
+          decision: { type: "string", enum: ["approved", "denied"] },
+        },
+      },
       created_at,
       expires_at: created_at + input.timeout_ms,
     });
@@ -76,8 +85,10 @@ export class SessionShellApprovalAdapter implements ShellApprovalGateway {
       decision: handle.result.then((result): ShellApprovalStatus => {
         if (result.status === "expired") return "expired";
         if (result.status !== "resolved") return "denied";
-        if (result.response.kind !== "approval") return "denied";
-        return result.response.decision;
+        if (result.response.outcome !== "resolved" || result.response.type !== "approval") return "denied";
+        const payload = result.response.payload;
+        if (!payload || typeof payload !== "object" || Array.isArray(payload)) return "denied";
+        return (payload as { decision?: "approved" | "denied" }).decision || "denied";
       }),
     };
   }