@downcity/agent 1.1.150 → 1.1.152

package/scripts/session-list-title.test.mjs

@@ -0,0 +1,141 @@
+/**
+ * @file 验证 session 列表从正确目录读取持久化 title。
+ *
+ * 关键点（中文）
+ * - 普通列表只读取 `.downcity/agents/<agentId>/sessions` 下的 meta。
+ * - 归档列表只读取 `.downcity/agents/<agentId>/archived-sessions` 下的 meta。
+ * - title 允许为空；这里仅验证已由模型生成并落盘的 title 能被列表返回。
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import os from "node:os";
+import path from "node:path";
+import fs from "node:fs/promises";
+
+import { MockLanguageModelV3 } from "ai/test";
+import { Agent } from "../bin/index.js";
+
+function create_mock_title_model(title_text) {
+  return new MockLanguageModelV3({
+    modelId: "mock-session-list-title-model",
+    doGenerate: async () => ({
+      content: [
+        {
+          type: "text",
+          text: title_text,
+        },
+      ],
+      finishReason: "stop",
+      usage: {
+        inputTokens: {
+          total: 0,
+          noCache: 0,
+          cacheRead: 0,
+          cacheWrite: 0,
+        },
+        outputTokens: {
+          total: 0,
+          text: 0,
+          reasoning: 0,
+        },
+      },
+      warnings: [],
+    }),
+  });
+}
+
+async function create_agent_with_titled_session(input) {
+  const agent_path = await fs.mkdtemp(
+    path.join(os.tmpdir(), input.tmp_prefix),
+  );
+  const agent = new Agent({
+    id: input.agent_id,
+    path: agent_path,
+    model: create_mock_title_model(input.title),
+  });
+  const collection = agent.session_collection();
+  const session = await collection.create_session({
+    sessionId: input.session_id,
+  });
+
+  await session.appendUserMessage({
+    text: input.first_user_text,
+  });
+
+  return {
+    agent,
+    collection,
+    session,
+  };
+}
+
+test("list_sessions returns persisted title from active session metadata", async () => {
+  const { agent, collection, session } = await create_agent_with_titled_session({
+    tmp_prefix: "downcity-agent-session-list-title-",
+    agent_id: "list_title_agent",
+    session_id: "active_session",
+    title: "列表标题",
+    first_user_text: "Need the session list to show the generated title",
+  });
+
+  try {
+    const page = await collection.list_sessions();
+
+    assert.equal(page.total, 1);
+    assert.deepEqual(
+      page.items.map((item) => ({
+        sessionId: item.sessionId,
+        title: item.title,
+        messageCount: item.messageCount,
+      })),
+      [
+        {
+          sessionId: session.id,
+          title: "列表标题",
+          messageCount: 1,
+        },
+      ],
+    );
+  } finally {
+    await agent.dispose();
+  }
+});
+
+test("archive_sessions returns title from archived session metadata", async () => {
+  const { agent, collection, session } = await create_agent_with_titled_session({
+    tmp_prefix: "downcity-agent-archive-list-title-",
+    agent_id: "archive_list_title_agent",
+    session_id: "archived_session",
+    title: "归档标题",
+    first_user_text: "Archive this titled session",
+  });
+
+  try {
+    await collection.archive_session({
+      id: session.id,
+    });
+
+    const active_page = await collection.list_sessions();
+    const archived_page = await collection.archive_sessions();
+
+    assert.equal(active_page.total, 0);
+    assert.equal(archived_page.total, 1);
+    assert.deepEqual(
+      archived_page.items.map((item) => ({
+        sessionId: item.sessionId,
+        title: item.title,
+        messageCount: item.messageCount,
+      })),
+      [
+        {
+          sessionId: session.id,
+          title: "归档标题",
+          messageCount: 1,
+        },
+      ],
+    );
+  } finally {
+    await agent.dispose();
+  }
+});

package/scripts/session-prompt-runtime.test.mjs

@@ -247,3 +247,41 @@ test("SessionPromptRuntime stops current turn and cancels unmerged queued prompt
     ["turn-start", "turn-start", "turn-finish", "turn-finish"],
   );
 });
+
+test("SessionPromptRuntime does not synthesize assistant text when stopped before output", async () => {
+  const executionFinished = createDeferred();
+
+  const runtime = new SessionPromptRuntime({
+    sessionId: "test",
+    publish: () => {},
+    createAndPersistUserMessage: async (input) => {
+      return createUserMessage(input.query, 1);
+    },
+    executeTurn: async (input) => {
+      await new Promise((resolve) => {
+        input.abortSignal.addEventListener("abort", resolve, { once: true });
+      });
+      await executionFinished.promise;
+      return {
+        text: "",
+        success: false,
+        error: "Turn stopped",
+      };
+    },
+    stopTurn: () => {
+      executionFinished.resolve();
+      return true;
+    },
+  });
+
+  const turn = await runtime.prompt({ query: "first" });
+  await waitUntil(() => runtime.isActive());
+
+  runtime.stop();
+  const result = await turn.finished;
+
+  assert.equal(result.success, false);
+  assert.equal(result.error, "Turn stopped");
+  assert.equal(result.text, "");
+  assert.equal(result.assistantMessage, undefined);
+});

package/src/executor/core-engine/CoreEngineRunner.ts

@@ -227,6 +227,15 @@ export class CoreEngineRunner {
             abortSignal: input.run_context.abortSignal,
           });
 
+        final_assistant_ui_message = mergeAssistantUiMessages(
+          final_assistant_ui_message,
+          step_assistant_ui_message,
+        );
+
+        // 关键点（中文）：先保存本 step 已收敛的 assistant 消息，再等待 steps。
+        // stop/abort 时 `result.steps` 可能抛错，但当前已经生成的文本仍应沉淀。
+        message_state.appendRuntimeSessionMessage(step_assistant_ui_message);
+
         const executed_steps = await result.steps;
         const last_step = executed_steps[executed_steps.length - 1];
         if (!last_step) break;
@@ -313,14 +322,6 @@ export class CoreEngineRunner {
           : [];
         message_state.appendModelMessages(response_messages);
 
-        final_assistant_ui_message = mergeAssistantUiMessages(
-          final_assistant_ui_message,
-          step_assistant_ui_message,
-        );
-
-        // 关键点（中文）：把本 step 的 assistant UI 消息并入运行时上下文，保证后续全量重算不丢历史。
-        message_state.appendRuntimeSessionMessage(step_assistant_ui_message);
-
         if (loop_decision.continueForToolCalls) {
           text_only_continuation_count = 0;
           incomplete_response_recovery_count = 0;
@@ -414,18 +415,16 @@ export class CoreEngineRunner {
         await this.logger.log("info", "[agent] stopped", {
           sessionId: session_id,
         });
-        const stopped_message = mergePendingAssistantFileParts(
-          final_assistant_ui_message ||
-            this.context_composer.buildFallbackAssistantMessage(
-              error_text,
-              input.run_context,
-            ),
-          input.run_context.pendingAssistantFileParts,
-        );
+        const stopped_message = final_assistant_ui_message
+          ? mergePendingAssistantFileParts(
+              final_assistant_ui_message,
+              input.run_context.pendingAssistantFileParts,
+            )
+          : null;
         return {
           success: false,
           error: error_text,
-          assistantMessage: stopped_message,
+          ...(stopped_message ? { assistantMessage: stopped_message } : {}),
           deferredPersistedUserMessages: [
             ...input.run_context.deferredPersistedUserMessages,
           ],

package/src/executor/types/SessionRun.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - `SessionRunInput` 表示上层会话入口输入（例如 context query）。
  * - `SessionExecuteInput` 表示 Executor 通过 Composer 装配后的中间运行态。
- * - 输出仅暴露 assistantMessage（UIMessage）。
+ * - 输出暴露可选 assistantMessage（UIMessage）。
  */
 
 import type { Tool, UIMessageChunk } from "ai";
@@ -94,8 +94,12 @@ export interface SessionRunResult {
 
   /**
    * 最终 assistant 消息。
+   *
+   * 关键点（中文）
+   * - stop/abort 且没有任何 assistant 内容时可以为空。
+   * - turn 状态通过 `success` / `error` 表达，不应伪造成 assistant 正文。
    */
-  assistantMessage: SessionMessageV1;
+  assistantMessage?: SessionMessageV1 | null;
 
   /**
    * 本轮执行结束后待写入长期历史的 user 消息。

package/src/session/browse/Browse.ts

@@ -32,15 +32,12 @@ import type {
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
 import { pickLastSuccessfulChatSendText } from "@/executor/messages/UserVisibleText.js";
 import { getSdkAgentSessionMessagesPath } from "@/session/storage/Paths.js";
+import { getSdkAgentSessionMetaPath } from "@/session/storage/Paths.js";
 import { getSdkAgentSessionsRootDirPath } from "@/session/storage/Paths.js";
 import { getSdkAgentArchivedSessionsDirPath } from "@/session/storage/Paths.js";
 import { getSdkAgentArchivedSessionMessagesPath } from "@/session/storage/Paths.js";
 import { getSdkAgentArchivedSessionMetaPath } from "@/session/storage/Paths.js";
-import { readSessionMetadata } from "@/session/storage/Metadata.js";
 import { readSessionMetadataFromPath } from "@/session/storage/Metadata.js";
-import {
-  ensureSessionTitle,
-} from "@/session/SessionTitle.js";
 
 type AnyUiPart = UIMessagePart<Record<string, never>, Record<string, never>>;
 
@@ -479,7 +476,7 @@ export async function listAgentSessionSummaryPage(params: {
     const sessionId = decodeMaybe(entry.name);
     if (!sessionId) continue;
     const metadata = await readSessionMetadataFromPath({
-      filePath: getSdkAgentArchivedSessionMetaPath(
+      filePath: getSdkAgentSessionMetaPath(
         params.projectRoot,
         params.agentId,
         sessionId,
@@ -488,19 +485,17 @@ export async function listAgentSessionSummaryPage(params: {
       agentId: params.agentId,
     });
     const messages = await loadSessionMessagesFromPath(
-      getSdkAgentArchivedSessionMessagesPath(
+      getSdkAgentSessionMessagesPath(
         params.projectRoot,
         params.agentId,
         sessionId,
       ),
     );
-    // 关键点（中文）：归档 session 不再生成新 title，仅读取已有 meta。
-    const metadataWithTitle = metadata;
     const info = buildSessionInfo({
       projectRoot: params.projectRoot,
       agentId: params.agentId,
       sessionId,
-      metadata: metadataWithTitle,
+      metadata,
       messages,
       executing: params.executingSessionIds?.has(sessionId),
     });
@@ -575,27 +570,28 @@ export async function listArchivedAgentSessionSummaryPage(params: {
     if (!entry.isDirectory()) continue;
     const sessionId = decodeMaybe(entry.name);
     if (!sessionId) continue;
-    const metadata = await readSessionMetadata({
-      projectRoot: params.projectRoot,
-      agentId: params.agentId,
+    const metadata = await readSessionMetadataFromPath({
+      filePath: getSdkAgentArchivedSessionMetaPath(
+        params.projectRoot,
+        params.agentId,
+        sessionId,
+      ),
       sessionId,
+      agentId: params.agentId,
     });
     const messages = await loadSessionMessagesFromPath(
-      getSdkAgentSessionMessagesPath(params.projectRoot, params.agentId, sessionId),
+      getSdkAgentArchivedSessionMessagesPath(
+        params.projectRoot,
+        params.agentId,
+        sessionId,
+      ),
     );
-    const metadataWithTitle = metadata.title
-      ? metadata
-      : await ensureSessionTitle({
-          projectRoot: params.projectRoot,
-          agentId: params.agentId,
-          sessionId,
-          messages,
-        });
+    // 关键点（中文）：归档 session 不再生成新 title，仅读取归档目录内已有 meta。
     const info = buildSessionInfo({
       projectRoot: params.projectRoot,
       agentId: params.agentId,
       sessionId,
-      metadata: metadataWithTitle,
+      metadata,
       messages,
       executing: false,
     });

package/src/session/runtime/SessionPromptRuntime.ts

@@ -106,7 +106,7 @@ export interface SessionPromptRuntimeOptions {
   }) => Promise<{
     text: string;
     success: boolean;
-    assistantMessage: SessionMessageV1;
+    assistantMessage?: SessionMessageV1 | null;
     error?: string;
   }>;
 
@@ -233,7 +233,9 @@ export class SessionPromptRuntime {
           turnId,
           text: result.text,
           success: stopped ? false : result.success,
-          assistantMessage: result.assistantMessage,
+          ...(result.assistantMessage
+            ? { assistantMessage: result.assistantMessage }
+            : {}),
           ...(stopped
             ? { error: TURN_STOPPED_MESSAGE }
             : result.error ? { error: result.error } : {}),

package/src/session/services/SessionStateService.ts

@@ -289,7 +289,7 @@ export class SessionStateService {
    * 持久化最终 assistant 结果。
    */
   async persist_assistant_result(
-    assistant_message: SessionMessageV1,
+    assistant_message?: SessionMessageV1 | null,
   ): Promise<void> {
     await persistSdkAssistantResult({
       projectRoot: this.project_root,

package/src/session/services/SessionTurnService.ts

@@ -146,7 +146,7 @@ export class SessionTurnService {
   }): Promise<{
     text: string;
     success: boolean;
-    assistantMessage: SessionMessageV1;
+    assistantMessage?: SessionMessageV1 | null;
     error?: string;
   }> {
     const tool_name_by_call_id = new Map<string, string>();
@@ -214,9 +214,13 @@ export class SessionTurnService {
       result.deferredPersistedUserMessages,
     );
     return {
-      text: extractTextFromUiMessage(result.assistantMessage),
+      text: result.assistantMessage
+        ? extractTextFromUiMessage(result.assistantMessage)
+        : "",
       success: result.success,
-      assistantMessage: result.assistantMessage,
+      ...(result.assistantMessage
+        ? { assistantMessage: result.assistantMessage }
+        : {}),
       ...(result.error ? { error: result.error } : {}),
     };
   }

package/src/session/storage/Persistence.ts

@@ -60,8 +60,12 @@ export interface PersistSdkAssistantResultParams
   };
   /**
    * 本轮执行得到的 assistant 消息。
+   *
+   * 关键点（中文）
+   * - stop/abort 且没有 assistant 内容时允许为空。
+   * - 为空时仅刷新 metadata，不写入伪造 assistant 正文。
    */
-  assistantMessage: SessionMessageV1;
+  assistantMessage?: SessionMessageV1 | null;
 }
 
 /**
@@ -104,7 +108,9 @@ export async function persistSdkAssistantResult(
   await persistAssistantResult({
     writer: params.executor,
     assistantMessage: params.assistantMessage,
-    fallbackText: extractTextFromUiMessage(params.assistantMessage),
+    fallbackText: params.assistantMessage
+      ? extractTextFromUiMessage(params.assistantMessage)
+      : undefined,
   });
   await touchSessionMetadata(params);
 }

package/src/types/agent/SessionTypes.ts

@@ -212,8 +212,8 @@ export interface AgentSessionSummary {
    *
    * 说明（中文）
    * - 标题持久化在 session `meta.json` 顶层。
-   * - 首条用户消息出现后，SDK 会优先生成标题，失败时回退到首条用户消息截断。
-   * - 空 session 可能暂时没有标题，调用方可回退到 `sessionId`。
+   * - SDK 只在模型成功生成标题时写入，不再从首条用户消息生成 fallback。
+   * - 标题允许为空，调用方需要展示占位文案时可自行回退到 `sessionId`。
    */
   title?: string;
   /**