@downcity/agent 1.1.69 → 1.1.70

package/src/config/Config.ts

@@ -96,6 +96,17 @@ function assertNoProjectExtensionsLayer(
   );
 }
 
+function normalizeDefaultAgentId(projectRoot: string): string {
+  const basename = path.basename(projectRoot);
+  return basename
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "_")
+    .replace(/^_+|_+$/g, "")
+    .replace(/_{2,}/g, "_")
+    .trim() || basename || "agent";
+}
+
 /**
  * 加载当前项目最终生效的 `downcity.json` 配置。
  *
@@ -124,10 +135,12 @@ export function loadDowncityConfig(projectRoot: string): DowncityConfig {
   }
 
   const candidate = merged as Partial<DowncityConfig>;
-  if (typeof candidate.id !== "string" || typeof candidate.version !== "string") {
-    throw new Error("Invalid downcity.json: missing required fields id/version");
-  }
-  const config = candidate as DowncityConfig;
+  // 关键点（中文）：运行态 agent id 与 CLI resolveAgentId 保持一致，未显式配置时用目录名兜底。
+  const config: DowncityConfig = {
+    ...candidate,
+    id: String(candidate.id || "").trim() || normalizeDefaultAgentId(projectRoot),
+    version: String(candidate.version || "").trim() || "1.0.0",
+  };
   assertProjectExecutionTarget(config);
   return config;
 }

package/src/rpc/Client.ts

@@ -29,6 +29,7 @@ import type {
 } from "@/plugin/types/Plugin.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type { ControlSessionExecuteAttachmentInput } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
 
 type RpcClientRequest =
   | {
@@ -97,6 +98,36 @@ type RpcClientRequest =
       id: string;
       method: "internal.status.get";
     }
+  | {
+      id: string;
+      method: "internal.sessions.execute";
+      params: {
+        sessionId: string;
+        instructions: string;
+        attachments?: ControlSessionExecuteAttachmentInput[];
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.clear_messages";
+      params: {
+        sessionId: string;
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.clear_chat_history";
+      params: {
+        sessionId: string;
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.resolve_system_prompt";
+      params: {
+        sessionId: string;
+      };
+    }
   | {
       id: string;
       method: "internal.plugins.catalog";
@@ -188,6 +219,60 @@ export interface RpcSessionSubscription {
   unsubscribe(): Promise<void>;
 }
 
+/**
+ * RPC system prompt 分段条目。
+ */
+export interface RpcSystemPromptSectionItem {
+  /** 消息序号。 */
+  index: number;
+  /** system message 文本内容。 */
+  content: string;
+}
+
+/**
+ * RPC system prompt 分段。
+ */
+export interface RpcSystemPromptSection {
+  /** 分段稳定 key。 */
+  key: string;
+  /** 分段展示标题。 */
+  title: string;
+  /** 分段内消息条目。 */
+  items: RpcSystemPromptSectionItem[];
+}
+
+/**
+ * RPC system prompt 响应。
+ */
+export interface RpcSystemPromptPayload {
+  /** 请求是否成功。 */
+  success?: boolean;
+  /** 当前 session id。 */
+  sessionId: string;
+  /** system message 总数。 */
+  totalMessages: number;
+  /** system message 总字符数。 */
+  totalChars: number;
+  /** system message 分段。 */
+  sections: RpcSystemPromptSection[];
+}
+
+/**
+ * RPC session execute 响应。
+ */
+export interface RpcSessionExecuteResult {
+  /** 执行是否成功。 */
+  success: boolean;
+  /** 失败错误信息。 */
+  error?: string;
+  /** assistant 原始消息。 */
+  assistantMessage?: unknown;
+  /** 用户可见文本。 */
+  userVisible: string;
+  /** 是否进入队列。 */
+  queued: boolean;
+}
+
 /**
  * RPC Client。
  */
@@ -353,6 +438,69 @@ export class RpcClient {
     });
   }
 
+  /**
+   * 在 Agent runtime 内执行一轮 session 指令。
+   */
+  async execute_internal_session(params: {
+    session_id: string;
+    instructions: string;
+    attachments?: ControlSessionExecuteAttachmentInput[];
+  }): Promise<{ sessionId: string; result: RpcSessionExecuteResult }> {
+    return await this.request<{
+      sessionId: string;
+      result: RpcSessionExecuteResult;
+    }>({
+      method: "internal.sessions.execute",
+      params: {
+        sessionId: params.session_id,
+        instructions: params.instructions,
+        ...(params.attachments !== undefined ? { attachments: params.attachments } : {}),
+      },
+    });
+  }
+
+  /**
+   * 清空 Agent runtime 内指定 session 的消息。
+   */
+  async clear_internal_session_messages(
+    session_id: string,
+  ): Promise<{ sessionId: string; cleared: boolean }> {
+    return await this.request<{ sessionId: string; cleared: boolean }>({
+      method: "internal.sessions.clear_messages",
+      params: {
+        sessionId: session_id,
+      },
+    });
+  }
+
+  /**
+   * 清空 Agent runtime 内指定 session 的 chat history。
+   */
+  async clear_internal_chat_history(
+    session_id: string,
+  ): Promise<{ sessionId: string; cleared: boolean }> {
+    return await this.request<{ sessionId: string; cleared: boolean }>({
+      method: "internal.sessions.clear_chat_history",
+      params: {
+        sessionId: session_id,
+      },
+    });
+  }
+
+  /**
+   * 解析 Agent runtime 内指定 session 的 system prompt。
+   */
+  async resolve_internal_system_prompt(
+    session_id: string,
+  ): Promise<RpcSystemPromptPayload> {
+    return await this.request<RpcSystemPromptPayload>({
+      method: "internal.sessions.resolve_system_prompt",
+      params: {
+        sessionId: session_id,
+      },
+    });
+  }
+
   /**
    * 列出 Agent runtime 注册的 plugin catalog。
    */

package/src/rpc/Server.ts

@@ -8,6 +8,9 @@
  */
 
 import net from "node:net";
+import fs from "fs-extra";
+import { dirname } from "node:path";
+import type { SystemModelMessage } from "ai";
 import type {
   AgentListSessionsInput,
   AgentSessionCollection,
@@ -15,14 +18,22 @@ import type {
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { PluginStateControlAction } from "@/plugin/types/Plugin.js";
+import type { ControlSessionExecuteAttachmentInput } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
+import {
+  getDowncityChatHistoryPath,
+  getDowncitySessionMessagesPath,
+} from "@/config/Paths.js";
+import { resolveSessionSystemMessages } from "@/executor/composer/system/default/SystemDomain.js";
 import {
   controlPluginState,
   listPluginStates,
 } from "@/plugin/core/PluginStateController.js";
 import { parsePluginCommandRequestBody } from "@/plugin/core/PluginCommandRequest.js";
 import { runPluginCommand } from "@/plugin/core/PluginActionRunner.js";
+import { executeBySessionId } from "@/runtime/server/http/control/ExecuteBySession.js";
 
 type RpcSessionRequest =
   | {
@@ -98,6 +109,36 @@ type RpcSessionRequest =
       id: string;
       method: "internal.status.get";
     }
+  | {
+      id: string;
+      method: "internal.sessions.execute";
+      params: {
+        sessionId: string;
+        instructions: string;
+        attachments?: ControlSessionExecuteAttachmentInput[];
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.clear_messages";
+      params: {
+        sessionId: string;
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.clear_chat_history";
+      params: {
+        sessionId: string;
+      };
+    }
+  | {
+      id: string;
+      method: "internal.sessions.resolve_system_prompt";
+      params: {
+        sessionId: string;
+      };
+    }
   | {
       id: string;
       method: "internal.plugins.catalog";
@@ -176,6 +217,8 @@ export interface RpcServerStartOptions {
   sessionCollection: AgentSessionCollection;
   /** Agent 上下文访问口。 */
   getAgentContext?: () => AgentContext;
+  /** Agent 运行态访问口。 */
+  getAgentRuntime?: () => AgentRuntime;
 }
 
 /**
@@ -304,6 +347,67 @@ export async function startRpcServer(
             writeSuccess(request.id, { status: "ok" });
             return;
           }
+          case "internal.sessions.execute": {
+            const runtime = requireAgentRuntime(options);
+            const context = requireAgentContext(options);
+            const result = await executeBySessionId({
+              agentState: runtime,
+              executionContext: context,
+              sessionId: request.params.sessionId,
+              instructions: request.params.instructions,
+              attachments: request.params.attachments,
+            });
+            writeSuccess(request.id, {
+              sessionId: request.params.sessionId,
+              result,
+            });
+            return;
+          }
+          case "internal.sessions.clear_messages": {
+            const runtime = requireAgentRuntime(options);
+            const sessionId = String(request.params.sessionId || "").trim();
+            if (!sessionId) throw new Error("Missing sessionId");
+            const messagesPath = getDowncitySessionMessagesPath(
+              runtime.rootPath,
+              runtime.paths.agentId,
+              sessionId,
+            );
+            await fs.remove(dirname(messagesPath));
+            runtime.getSession(sessionId).clearExecutor();
+            writeSuccess(request.id, {
+              sessionId,
+              cleared: true,
+            });
+            return;
+          }
+          case "internal.sessions.clear_chat_history": {
+            const runtime = requireAgentRuntime(options);
+            const sessionId = String(request.params.sessionId || "").trim();
+            if (!sessionId) throw new Error("Missing sessionId");
+            await fs.remove(getDowncityChatHistoryPath(runtime.rootPath, sessionId));
+            writeSuccess(request.id, {
+              sessionId,
+              cleared: true,
+            });
+            return;
+          }
+          case "internal.sessions.resolve_system_prompt": {
+            const runtime = requireAgentRuntime(options);
+            const context = requireAgentContext(options);
+            const sessionId = String(request.params.sessionId || "").trim() || "consoleui-chat-main";
+            const systemMessages = await resolveSessionSystemMessages({
+              projectRoot: runtime.rootPath,
+              sessionId,
+              profile: "chat",
+              staticSystemPrompts: runtime.systems,
+              context,
+            });
+            writeSuccess(request.id, {
+              sessionId,
+              ...toSystemPromptPayload(systemMessages),
+            });
+            return;
+          }
           case "internal.plugins.catalog": {
             const context = requireAgentContext(options);
             writeSuccess(request.id, {
@@ -439,3 +543,65 @@ function requireAgentContext(options: RpcServerStartOptions): AgentContext {
   }
   return context;
 }
+
+function requireAgentRuntime(options: RpcServerStartOptions): AgentRuntime {
+  const runtime = options.getAgentRuntime?.();
+  if (!runtime) {
+    throw new Error("Agent RPC server was started without AgentRuntime");
+  }
+  return runtime;
+}
+
+function normalizeSystemText(input: string | null | undefined): string {
+  return String(input || "").trim();
+}
+
+function toSystemMessageText(message: SystemModelMessage): string {
+  const content = message.content as unknown;
+  if (typeof content === "string") return normalizeSystemText(content);
+  if (!Array.isArray(content)) return "";
+  const parts = content as Array<{ text?: unknown }>;
+  const texts: string[] = [];
+  for (const part of parts) {
+    if (!part || typeof part !== "object") continue;
+    const text = normalizeSystemText(String(part.text || ""));
+    if (!text) continue;
+    texts.push(text);
+  }
+  return texts.join("\n").trim();
+}
+
+/**
+ * 把 system messages 转成 Console/Town 可直接渲染的结构。
+ */
+function toSystemPromptPayload(messages: SystemModelMessage[]): {
+  sections: Array<{
+    key: string;
+    title: string;
+    items: Array<{ index: number; content: string }>;
+  }>;
+  totalMessages: number;
+  totalChars: number;
+} {
+  const items = messages
+    .map((message, index) => ({
+      index: index + 1,
+      content: toSystemMessageText(message),
+    }))
+    .filter((item) => item.content);
+  const totalChars = items.reduce(
+    (acc, item) => acc + String(item.content || "").length,
+    0,
+  );
+  return {
+    sections: [
+      {
+        key: "resolved",
+        title: "Resolved System Messages",
+        items,
+      },
+    ],
+    totalMessages: items.length,
+    totalChars,
+  };
+}