@downcity/agent 1.1.10 → 1.1.11

package/src/{agent → runtime}/AgentRuntimeTypes.ts

@@ -9,12 +9,12 @@
 
 import type { LanguageModel } from "ai";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 import type {
   AgentPathRuntime,
   AgentPlatformRuntime,
   AgentPluginConfigRuntime,
-} from "@/host/types/AgentHost.js";
+} from "@/types/host/AgentHost.js";
 import type { BaseService } from "@/service/builtins/BaseService.js";
 import type { Session } from "@session/Session.js";
 

package/src/sandbox/SandboxConfigResolver.ts

@@ -8,7 +8,7 @@
  */
 
 import path from "node:path";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { ResolvedSandboxConfig } from "@/sandbox/types/SandboxRuntime.js";
 
 const DEFAULT_ENV_ALLOWLIST = [

package/src/sandbox/SandboxRunner.ts

@@ -7,7 +7,7 @@
  * - shell 命令不再允许回退到宿主机普通子进程执行。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { SandboxSpawnResult } from "@/sandbox/types/SandboxRuntime.js";
 import { resolveSandboxConfig, resolveSandboxCwd } from "@/sandbox/SandboxConfigResolver.js";
 import { spawnMacOsSeatbeltSandbox } from "@/sandbox/MacOsSeatbeltSandbox.js";

package/src/{host/sdk → sdk}/Agent.ts

@@ -12,11 +12,11 @@ import { nanoid } from "nanoid";
 import type { Tool } from "ai";
 import { Logger } from "@/utils/logger/Logger.js";
 import type { BaseService } from "@/service/builtins/BaseService.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
-import type { JsonValue } from "@/utils/types/Json.js";
-import type { AgentPlatformRuntime } from "@/host/types/AgentHost.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+import type { JsonValue } from "@/types/common/Json.js";
+import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
 import type {
   Plugin,
   PluginAvailability,
@@ -26,12 +26,12 @@ import type {
 import type {
   AgentOptions,
   AgentSessionMetadata,
-} from "@/host/sdk/AgentSdkTypes.js";
-import { SdkSession } from "@/host/sdk/Session.js";
+} from "@/sdk/AgentSdkTypes.js";
+import { SdkSession } from "@/sdk/Session.js";
 import { loadStaticSystemPrompts } from "@session/composer/system/default/StaticPromptCatalog.js";
-import { getSdkAgentSessionsRootDirPath } from "@/host/sdk/Paths.js";
-import { SdkAgentHttpServer } from "@/host/sdk/HttpServer.js";
-import { SdkAgentRpcServer } from "@/host/sdk/RpcServer.js";
+import { getSdkAgentSessionsRootDirPath } from "@/sdk/Paths.js";
+import { SdkAgentHttpServer } from "@/sdk/HttpServer.js";
+import { SdkAgentRpcServer } from "@/sdk/RpcServer.js";
 import {
   createAgentPathRuntime,
   createAgentPluginConfigRuntime,

package/src/{host/sdk → sdk}/AgentSdkTypes.ts

@@ -9,10 +9,10 @@
 
 import type { LanguageModel, Tool } from "ai";
 import type { BaseService } from "@/service/builtins/BaseService.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 import type { Plugin } from "@/plugin/types/Plugin.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
-import type { AgentPlatformRuntime } from "@/host/types/AgentHost.js";
+import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
 
 /**
  * 本地 Agent 构造参数。

package/src/{host/sdk → sdk}/HttpServer.ts

@@ -9,7 +9,7 @@
 import http from "node:http";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
-import type { Agent } from "@/host/sdk/Agent.js";
+import type { Agent } from "@/sdk/Agent.js";
 
 type SdkHttpStartOptions = {
   /**
@@ -86,6 +86,15 @@ export class SdkAgentHttpServer {
       });
     });
 
+    app.get("/api/sdk/sessions/:sessionId/system", async (c) => {
+      const session = await this.agent.session(String(c.req.param("sessionId") || ""));
+      return c.json({
+        success: true,
+        sessionId: session.id,
+        system: await session.system(),
+      });
+    });
+
     app.post("/api/sdk/sessions/:sessionId/run", async (c) => {
       const session = await this.agent.session(String(c.req.param("sessionId") || ""));
       const body = await c.req.json().catch(() => ({}));

package/src/{host/sdk → sdk}/RemoteAgent.ts

@@ -13,7 +13,7 @@ import type {
   AgentSessionSetInput,
   AgentSessionStreamEvent,
   RemoteAgentOptions,
-} from "@/host/sdk/AgentSdkTypes.js";
+} from "@/sdk/AgentSdkTypes.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
 
 /**
@@ -77,6 +77,24 @@ class RemoteSession {
     return payload.messages;
   }
 
+  /**
+   * 读取远程 session 当前生效的 system prompt 文本集合。
+   */
+  async system(): Promise<string[]> {
+    const response = await fetch(
+      `${this.baseUrl}/api/sdk/sessions/${encodeURIComponent(this.id)}/system`,
+    );
+    const payload = (await response.json()) as {
+      success?: boolean;
+      error?: string;
+      system?: string[];
+    };
+    if (!response.ok || !payload.success || !Array.isArray(payload.system)) {
+      throw new Error(String(payload.error || "Remote session system failed"));
+    }
+    return payload.system;
+  }
+
   /**
    * 分叉远程 session。
    */

package/src/{host/sdk → sdk}/RpcServer.ts

@@ -10,12 +10,12 @@
 import fs from "fs-extra";
 import net, { type Server } from "node:net";
 import path from "node:path";
-import type { Agent } from "@/host/sdk/Agent.js";
+import type { Agent } from "@/sdk/Agent.js";
 import type {
   LocalRpcRequest,
   LocalRpcResponse,
-} from "@/host/rpc/types/LocalRpc.js";
-import { getSdkAgentRpcEndpointPath } from "@/host/sdk/Paths.js";
+} from "@/types/rpc/LocalRpc.js";
+import { getSdkAgentRpcEndpointPath } from "@/sdk/Paths.js";
 
 /**
  * SDK RPC Server 管理器。
@@ -208,6 +208,24 @@ export class SdkAgentRpcServer {
         };
       }
 
+      const systemMatch =
+        /^\/api\/sdk\/sessions\/([^/]+)\/system$/.exec(request.path);
+      if (request.method === "GET" && systemMatch) {
+        const session = await this.agent.session(
+          decodeURIComponent(systemMatch[1] || ""),
+        );
+        return {
+          requestId,
+          status: 200,
+          success: true,
+          data: {
+            success: true,
+            sessionId: session.id,
+            system: await session.system(),
+          } as unknown as LocalRpcResponse["data"],
+        };
+      }
+
       return {
         requestId,
         status: 404,

package/src/sdk/SdkSessionSystemComposer.ts

@@ -0,0 +1,173 @@
+/**
+ * SDK Session 默认 system composer。
+ *
+ * 关键点（中文）
+ * - 面向 `Agent` SDK 的本地会话执行场景。
+ * - 注入静态 PROFILE / SOUL / core prompt、显式注入 service system、显式注册 plugin system 与运行时时钟上下文。
+ */
+
+import { SessionSystemComposer } from "@session/composer/system/SessionSystemComposer.js";
+import { getSessionRunScope } from "@session/SessionRunScope.js";
+import { transformPromptsIntoSystemMessages } from "@session/composer/system/default/PromptRenderer.js";
+import { buildRuntimeClockSystemPrompt } from "@session/composer/system/default/variables/VariableReplacer.js";
+import type { SessionSystemMessage } from "@/session/types/SessionPrompts.js";
+
+/**
+ * 解析 SDK session system messages 的输入。
+ */
+export interface ResolveSdkSessionSystemMessagesParams {
+  /**
+   * 当前 agent 绑定的项目根目录。
+   */
+  projectRoot: string;
+
+  /**
+   * 当前 sessionId。
+   */
+  sessionId: string;
+
+  /**
+   * 读取当前生效的静态 system 文本集合。
+   */
+  getStaticSystemPrompts: () => string[];
+
+  /**
+   * 读取当前显式注入 service 的 system 文本集合。
+   */
+  getServiceSystemPrompts: () => Promise<string[]>;
+
+  /**
+   * 读取当前显式注册 plugin 的 system 文本集合。
+   */
+  getPluginSystemPrompts: () => Promise<string[]>;
+}
+
+type SdkSessionSystemComposerOptions = {
+  /**
+   * 当前 agent 绑定的项目根目录。
+   */
+  projectRoot: string;
+
+  /**
+   * 读取当前生效的静态 system 文本集合。
+   */
+  getStaticSystemPrompts: () => string[];
+
+  /**
+   * 读取当前显式注册 plugin 的 system 文本集合。
+   */
+  getPluginSystemPrompts: () => Promise<string[]>;
+
+  /**
+   * 读取当前显式注入 service 的 system 文本集合。
+   */
+  getServiceSystemPrompts: () => Promise<string[]>;
+};
+
+async function resolvePromptMessages(params: {
+  /**
+   * 原始 system prompt 文本集合。
+   */
+  prompts: string[];
+  /**
+   * 当前项目根目录。
+   */
+  projectRoot: string;
+  /**
+   * 当前 sessionId。
+   */
+  sessionId: string;
+}): Promise<SessionSystemMessage[]> {
+  const nonEmptyPrompts = params.prompts.filter((item) =>
+    String(item || "").trim(),
+  );
+  return await transformPromptsIntoSystemMessages(nonEmptyPrompts, {
+    projectPath: params.projectRoot,
+    sessionId: params.sessionId,
+    variableMode: "stable",
+  });
+}
+
+/**
+ * 解析 SDK session 当前生效的 system messages。
+ */
+export async function resolveSdkSessionSystemMessages(
+  params: ResolveSdkSessionSystemMessagesParams,
+): Promise<SessionSystemMessage[]> {
+  const projectRoot = String(params.projectRoot || "").trim();
+  const sessionId = String(params.sessionId || "").trim();
+  if (!projectRoot) {
+    throw new Error("resolveSdkSessionSystemMessages requires a non-empty projectRoot");
+  }
+  if (!sessionId) {
+    throw new Error("resolveSdkSessionSystemMessages requires a non-empty sessionId");
+  }
+  const staticMessages = await resolvePromptMessages({
+    prompts: params.getStaticSystemPrompts(),
+    projectRoot,
+    sessionId,
+  });
+  const serviceMessages = await resolvePromptMessages({
+    prompts: await params.getServiceSystemPrompts(),
+    projectRoot,
+    sessionId,
+  });
+  const pluginMessages = await resolvePromptMessages({
+    prompts: await params.getPluginSystemPrompts(),
+    projectRoot,
+    sessionId,
+  });
+
+  return [
+    ...staticMessages,
+    ...serviceMessages,
+    ...pluginMessages,
+    {
+      role: "system" as const,
+      content: buildRuntimeClockSystemPrompt({
+        projectPath: projectRoot,
+        sessionId,
+      }),
+    },
+  ];
+}
+
+/**
+ * SDK Session system composer 实现。
+ */
+export class SdkSessionSystemComposer extends SessionSystemComposer {
+  readonly name = "sdk_prompt_system";
+
+  private readonly projectRoot: string;
+  private readonly getStaticSystemPrompts: SdkSessionSystemComposerOptions["getStaticSystemPrompts"];
+  private readonly getServiceSystemPrompts: SdkSessionSystemComposerOptions["getServiceSystemPrompts"];
+  private readonly getPluginSystemPrompts: SdkSessionSystemComposerOptions["getPluginSystemPrompts"];
+
+  constructor(options: SdkSessionSystemComposerOptions) {
+    super();
+    this.projectRoot = String(options.projectRoot || "").trim();
+    this.getStaticSystemPrompts = options.getStaticSystemPrompts;
+    this.getServiceSystemPrompts = options.getServiceSystemPrompts;
+    this.getPluginSystemPrompts = options.getPluginSystemPrompts;
+    if (!this.projectRoot) {
+      throw new Error("SdkSessionSystemComposer requires a non-empty projectRoot");
+    }
+  }
+
+  /**
+   * 解析本轮 SDK session system messages。
+   */
+  async resolve() {
+    const sessionId = String(getSessionRunScope()?.sessionId || "").trim();
+    if (!sessionId) {
+      throw new Error("SdkSessionSystemComposer.resolve requires a non-empty sessionId");
+    }
+    return await resolveSdkSessionSystemMessages({
+      projectRoot: this.projectRoot,
+      sessionId,
+      getStaticSystemPrompts: this.getStaticSystemPrompts,
+      getServiceSystemPrompts: this.getServiceSystemPrompts,
+      getPluginSystemPrompts: this.getPluginSystemPrompts,
+    });
+  }
+}

package/src/{host/sdk → sdk}/Session.ts

@@ -8,12 +8,11 @@
  */
 
 import { nanoid } from "nanoid";
-import type { LanguageModel, Tool, UIMessageChunk } from "ai";
+import type { LanguageModel, Tool } from "ai";
 import { Session as CoreSession } from "@session/Session.js";
 import { JsonlSessionHistoryComposer } from "@session/composer/history/jsonl/JsonlSessionHistoryComposer.js";
 import { JsonlSessionCompactionComposer } from "@session/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
 import { LocalSessionExecutor } from "@session/executors/local/LocalSessionExecutor.js";
-import { resolveAssistantMessageForPersistence } from "@/service/builtins/chat/runtime/UserVisibleText.js";
 import { extractTextFromUiMessage } from "@/service/builtins/chat/runtime/UIMessageTransformer.js";
 import type {
   AgentSessionConfigSnapshot,
@@ -23,22 +22,28 @@ import type {
   AgentSessionRunResult,
   AgentSessionSetInput,
   AgentSessionStreamEvent,
-} from "@/host/sdk/AgentSdkTypes.js";
-import type { SessionHistoryMetaV1 } from "@/session/types/SessionHistoryMeta.js";
+} from "@/sdk/AgentSdkTypes.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
-import { SdkSessionSystemComposer } from "@/host/sdk/SdkSessionSystemComposer.js";
+import { SdkSessionSystemComposer } from "@/sdk/SdkSessionSystemComposer.js";
+import { resolveSdkSessionSystemMessages } from "@/sdk/SdkSessionSystemComposer.js";
 import {
   inferModelLabel,
   patchSdkSessionModelLabel,
   readSdkSessionMetadata,
   writeSdkSessionMetadata,
-} from "@/host/sdk/SessionMetadata.js";
+} from "@/sdk/SessionMetadata.js";
 import {
   getSdkAgentSessionArchiveDirPath,
   getSdkAgentSessionDirPath,
-} from "@/host/sdk/Paths.js";
-import { AsyncQueue } from "@/host/sdk/AsyncQueue.js";
-import type { SessionPort } from "@/agent/AgentContextTypes.js";
+} from "@/sdk/Paths.js";
+import { AsyncQueue } from "@/sdk/AsyncQueue.js";
+import type { SessionPort } from "@/runtime/AgentContextTypes.js";
+import { pushUiMessageChunkAsSdkEvent } from "@/sdk/StreamEvents.js";
+import {
+  persistSdkAssistantResult,
+  touchSdkSessionMetadata,
+} from "@/sdk/SessionPersistence.js";
+import { createSdkSessionServicePort } from "@/sdk/SessionServicePort.js";
 
 type SdkSessionOptions = {
   /**
@@ -269,6 +274,27 @@ export class SdkSession {
     return await this.historyComposer.list();
   }
 
+  /**
+   * 读取当前 session 生效的 system prompt 文本集合。
+   *
+   * 关键点（中文）
+   * - 返回内容与实际 run 时使用的 SDK system composer 同源。
+   * - 包含静态 system、显式注入 service system、显式注册 plugin system 与 runtime clock。
+   * - 这里只返回文本数组，不把 system prompt 写入会话历史。
+   */
+  async system(): Promise<string[]> {
+    const messages = await resolveSdkSessionSystemMessages({
+      projectRoot: this.projectRoot,
+      sessionId: this.id,
+      getStaticSystemPrompts: this.getStaticSystemPrompts,
+      getServiceSystemPrompts: this.getServiceSystemPrompts,
+      getPluginSystemPrompts: this.getPluginSystemPrompts,
+    });
+    return messages
+      .map((message) => String(message.content || ""))
+      .filter((content) => content.trim().length > 0);
+  }
+
   /**
    * 返回当前 session 是否正在执行。
    */
@@ -323,7 +349,11 @@ export class SdkSession {
         const result = await this.coreSession.run({
           query,
           onUiMessageChunkCallback: async (chunk) => {
-            this.pushChunkEvent(queue, chunk, toolNameByCallId);
+            pushUiMessageChunkAsSdkEvent({
+              queue,
+              chunk,
+              toolNameByCallId,
+            });
           },
         });
         await this.persistAssistantResult(result.assistantMessage);
@@ -410,173 +440,39 @@ export class SdkSession {
 
   /**
    * 返回供 chat service 使用的 session 端口。
-   *
-   * 关键点（中文）
-   * - 这里不走 SDK `run()` 包装层，而是直接暴露底层 `CoreSession` 协议。
-   * - 这样 chat queue worker 可以复用既有 `SessionPort` 契约，不会重复补写消息。
    */
   getServicePort(): SessionPort {
     if (this.servicePort) return this.servicePort;
-    this.servicePort = {
+    this.servicePort = createSdkSessionServicePort({
       sessionId: this.id,
-      getExecutor: () => this.coreSession.getExecutor(),
-      getHistoryComposer: () => this.historyComposer,
-      run: async (params) => {
-        return await this.coreSession.run(params);
-      },
-      clearExecutor: () => {
-        this.coreSession.clearExecutor();
-      },
-      afterSessionUpdatedAsync: async () => {
-        await this.coreSession.afterSessionUpdatedAsync();
-      },
-      appendUserMessage: async (params) => {
-        await this.coreSession.appendUserMessage(params);
-        await this.touchMetadata();
-      },
-      appendAssistantMessage: async (params) => {
-        await this.coreSession.appendAssistantMessage(params);
+      coreSession: this.coreSession,
+      historyComposer: this.historyComposer,
+      touchMetadata: async () => {
         await this.touchMetadata();
       },
-      isExecuting: () => this.coreSession.isExecuting(),
-    };
+    });
     return this.servicePort;
   }
 
   private async touchMetadata(): Promise<void> {
-    const current = await readSdkSessionMetadata({
+    await touchSdkSessionMetadata({
       projectRoot: this.projectRoot,
       agentId: this.agentId,
       sessionId: this.id,
-    });
-    const next: SessionHistoryMetaV1 = {
-      ...current,
-      agentId: this.agentId,
-      createdAt:
-        typeof current.createdAt === "number" ? current.createdAt : Date.now(),
-      updatedAt: Date.now(),
-      ...(this.sessionConfig.modelLabel
-        ? {
-            sdkConfig: {
-              ...(current.sdkConfig || {}),
-              modelLabel: this.sessionConfig.modelLabel,
-            },
-          }
-        : {}),
-    };
-    await writeSdkSessionMetadata({
-      projectRoot: this.projectRoot,
-      agentId: this.agentId,
-      sessionId: this.id,
-      meta: next,
+      sessionConfig: this.sessionConfig,
     });
   }
 
   private async persistAssistantResult(
     assistantMessage: SessionMessageV1,
   ): Promise<void> {
-    const persisted = resolveAssistantMessageForPersistence(assistantMessage);
-    await this.coreSession.appendAssistantMessage({
-      ...(persisted ? { message: persisted } : {}),
-      fallbackText: extractTextFromUiMessage(assistantMessage),
+    await persistSdkAssistantResult({
+      projectRoot: this.projectRoot,
+      agentId: this.agentId,
+      sessionId: this.id,
+      sessionConfig: this.sessionConfig,
+      coreSession: this.coreSession,
+      assistantMessage,
     });
-    await this.touchMetadata();
-  }
-
-  private pushChunkEvent(
-    queue: AsyncQueue<AgentSessionStreamEvent>,
-    chunk: UIMessageChunk,
-    toolNameByCallId: Map<string, string>,
-  ): void {
-    switch (chunk.type) {
-      case "text-delta":
-        queue.push({
-          type: "text-delta",
-          text: chunk.delta,
-        });
-        return;
-      case "reasoning-delta":
-        queue.push({
-          type: "reasoning-delta",
-          text: chunk.delta,
-        });
-        return;
-      case "tool-input-start":
-        toolNameByCallId.set(chunk.toolCallId, chunk.toolName);
-        return;
-      case "tool-input-available":
-        toolNameByCallId.set(chunk.toolCallId, chunk.toolName);
-        queue.push({
-          type: "tool-call",
-          toolCallId: chunk.toolCallId,
-          toolName: chunk.toolName,
-          args: this.toJsonValue(chunk.input),
-        });
-        return;
-      case "tool-output-available":
-        queue.push({
-          type: "tool-result",
-          toolCallId: chunk.toolCallId,
-          toolName: toolNameByCallId.get(chunk.toolCallId) || "unknown",
-          result: this.toJsonValue(chunk.output),
-        });
-        return;
-      case "tool-output-error":
-        queue.push({
-          type: "tool-error",
-          toolCallId: chunk.toolCallId,
-          toolName: toolNameByCallId.get(chunk.toolCallId) || "unknown",
-          error: chunk.errorText,
-        });
-        return;
-      case "tool-input-error":
-        toolNameByCallId.set(chunk.toolCallId, chunk.toolName);
-        queue.push({
-          type: "tool-error",
-          toolCallId: chunk.toolCallId,
-          toolName: chunk.toolName,
-          error: chunk.errorText,
-        });
-        return;
-      case "error":
-        queue.push({
-          type: "error",
-          error: chunk.errorText,
-        });
-        return;
-      case "abort":
-        queue.push({
-          type: "error",
-          error: String(chunk.reason || "stream aborted"),
-        });
-        return;
-      case "finish":
-        queue.push({
-          type: "finish",
-          ...(typeof chunk.finishReason === "string"
-            ? { finishReason: chunk.finishReason }
-            : {}),
-        });
-        return;
-      default:
-        return;
-    }
-  }
-
-  private toJsonValue(value: unknown) {
-    if (value === undefined) return null;
-    if (value === null) return null;
-    if (
-      typeof value === "string" ||
-      typeof value === "number" ||
-      typeof value === "boolean"
-    ) {
-      return value;
-    }
-    try {
-      return JSON.parse(JSON.stringify(value));
-    } catch {
-      return String(value);
-    }
   }
 }

package/src/{host/sdk → sdk}/SessionMetadata.ts

@@ -12,7 +12,7 @@ import type {
   SessionHistoryMetaV1,
   SessionHistorySdkConfigV1,
 } from "@/session/types/SessionHistoryMeta.js";
-import { getSdkAgentSessionMetaPath } from "@/host/sdk/Paths.js";
+import { getSdkAgentSessionMetaPath } from "@/sdk/Paths.js";
 
 type ReadSessionMetadataInput = {
   /**