@downcity/agent 1.1.207 → 1.1.210

package/src/agent/local/Agent.ts

@@ -10,12 +10,10 @@
 import type { Tool } from "ai";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
-import type { AgentPlugins } from "@/plugin/types/Plugin.js";
-import type {
-  AgentModel,
-  AgentOptions,
-  AgentSessions as AgentSessionsApi,
-} from "@/types/agent/AgentTypes.js";
+import type { AgentPlugins } from "@/types/plugin/PluginRuntime.js";
+import type { AgentModel } from "@/model/CityModelAdapter.js";
+import type { AgentOptions } from "@/types/agent/AgentOptions.js";
+import type { AgentSessions as AgentSessionsApi } from "@/types/agent/SessionActor.js";
 import type {
   ShellApprovalMode,
   ShellApprovalDecisionResult,
@@ -25,7 +23,6 @@ import type {
   ShellApprovalView,
   Shell,
 } from "@downcity/shell";
-import { PluginRegistry } from "@/plugin/core/PluginRegistry.js";
 import { Logger } from "@/utils/logger/Logger.js";
 import { normalizeInstructionInput } from "@/agent/local/AgentInstructions.js";
 import {
@@ -47,7 +44,6 @@ export class Agent {
 
   private readonly logger: Logger;
   private readonly agentContext: AgentContext;
-  private readonly pluginRegistry: PluginRegistry;
   private readonly config: DowncityConfig;
   private readonly env: Record<string, string>;
   private readonly defaultModel?: AgentModel;
@@ -84,7 +80,6 @@ export class Agent {
     this.plugins = assembly.plugins;
     this.logger = assembly.logger;
     this.agentContext = assembly.agent_context;
-    this.pluginRegistry = assembly.plugin_registry;
     this.config = assembly.config;
     this.env = assembly.env;
     this.instruction = assembly.instruction;
@@ -262,7 +257,6 @@ export class Agent {
       logger: this.logger || assembly.logger,
       get_agent_context: () => this.agentContext ?? assembly.agent_context,
       get_instruction: () => this.instruction,
-      plugin_instances: assembly.plugin_instances,
       ensure_agent_ready: async () => {
         await this.backgroundService.ready();
       },

package/src/agent/local/AgentInstructions.ts

@@ -3,11 +3,12 @@
  *
  * 关键点（中文）
  * - 这里只处理静态 instruction 与默认 core prompt。
+ * - instruction 永远在 core 前面；core 不会被调用方 instruction 替代。
  * - 不读取 session、plugin 或 runtime 状态，保持为纯函数。
  */
 
 import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
-import type { AgentSessionSystemBlock } from "@/types/agent/AgentTypes.js";
+import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
 import { DEFAULT_SHIP_PROMPTS } from "@executor/composer/system/default/SystemDomain.js";
 
 /**
@@ -51,18 +52,17 @@ export function createInstructionSystemBlocks(
   instruction: string[],
   project_root: string,
 ): AgentSessionSystemBlock[] {
-  if (instruction.length === 0) {
-    return [
-      {
-        source: "core",
-        name: "default",
-        content: createCoreInstructionContent(project_root),
-      },
-    ];
-  }
-  return instruction.map((content, index) => ({
+  const instruction_blocks = instruction.map((content, index) => ({
     source: "instruction" as const,
     name: instruction.length === 1 ? "agent" : `agent:${index + 1}`,
     content,
   }));
+  return [
+    ...instruction_blocks,
+    {
+      source: "core",
+      name: "default",
+      content: createCoreInstructionContent(project_root),
+    },
+  ];
 }

package/src/agent/local/services/AgentAssemblyService.ts

@@ -11,8 +11,8 @@ import type { LanguageModel, Tool } from "ai";
 import type { Plugin } from "@/types/plugin/PluginDefinition.js";
 import { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
-import type { AgentPlugins } from "@/plugin/types/Plugin.js";
-import type { AgentOptions } from "@/types/agent/AgentTypes.js";
+import type { AgentPlugins } from "@/types/plugin/PluginRuntime.js";
+import type { AgentOptions } from "@/types/agent/AgentOptions.js";
 import { Logger } from "@/utils/logger/Logger.js";
 import { loadDowncityConfig, resolveAgentEnv } from "@/config/Config.js";
 import { PluginRegistry } from "@/plugin/core/PluginRegistry.js";
@@ -30,7 +30,7 @@ import {
 import {
   createPluginTools,
 } from "@executor/tools/plugin/PluginToolDefinition.js";
-import type { AgentManagedSession } from "@/types/agent/AgentTypes.js";
+import type { AgentManagedSession } from "@/types/session/SessionOptions.js";
 import type { SessionPort } from "@/types/runtime/agent/AgentContext.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 
@@ -102,11 +102,6 @@ export interface AgentAssemblyResult {
    */
   plugin_instances: Map<string, Plugin>;
 
-  /**
-   * 当前 plugin 注册表。
-   */
-  plugin_registry: PluginRegistry;
-
   /**
    * 当前 agent plugin 调用面。
    */
@@ -238,7 +233,6 @@ export class AgentAssemblyService {
       instruction,
       config,
       plugin_instances,
-      plugin_registry,
       plugins,
       agent_context: agent_context!,
       ...(shell ? { shell } : {}),

package/src/agent/local/services/AgentSessions.ts

@@ -19,25 +19,25 @@ import type {
   AgentArchiveSessionsResult,
   AgentCleanArchiveResult,
   AgentListSessionsInput,
-  AgentManagedSession,
-  AgentModel,
-  AgentSession,
-  AgentSessions as AgentSessionsApi,
-  AgentSessionConstructor,
   AgentSessionSummaryPage,
   AgentSessionSystemBlock,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/SessionTypes.js";
+import type { AgentModel } from "@/model/CityModelAdapter.js";
+import type { AgentSessionConstructor } from "@/types/agent/AgentOptions.js";
+import type { AgentSession, AgentSessions as AgentSessionsApi } from "@/types/agent/SessionActor.js";
+import type { AgentManagedSession } from "@/types/session/SessionOptions.js";
 import { Session } from "@/session/Session.js";
 import {
   getSdkAgentArchivedSessionDirPath,
   getSdkAgentArchivedSessionsDirPath,
   getSdkAgentSessionDirPath,
+} from "@/session/storage/Paths.js";
+import {
   listArchivedAgentSessionSummaryPage,
   listAgentSessionSummaryPage,
-} from "@/session/index.js";
+} from "@/session/browse/Browse.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { SessionPort } from "@/types/runtime/agent/AgentContext.js";
-import type { Plugin } from "@/types/plugin/PluginDefinition.js";
 import { createInstructionSystemBlocks } from "@/agent/local/AgentInstructions.js";
 
 function decodeMaybe(input: string): string {
@@ -82,11 +82,6 @@ type AgentSessionsOptions = {
    */
   get_instruction: () => string[];
 
-  /**
-   * 当前 plugin 实例集合。
-   */
-  plugin_instances: Map<string, Plugin>;
-
   /**
    * 等待当前 Agent 后台能力启动完成。
    */
@@ -113,7 +108,6 @@ export class AgentSessions implements AgentSessionsApi<AgentSession> {
   private readonly logger: Logger;
   private readonly get_agent_context: AgentSessionsOptions["get_agent_context"];
   private readonly get_instruction: AgentSessionsOptions["get_instruction"];
-  private readonly plugin_instances: Map<string, Plugin>;
   private readonly ensure_agent_ready: AgentSessionsOptions["ensure_agent_ready"];
   private readonly default_model?: AgentModel;
   private readonly SessionClass: AgentSessionConstructor;
@@ -127,7 +121,6 @@ export class AgentSessions implements AgentSessionsApi<AgentSession> {
     this.logger = options.logger;
     this.get_agent_context = options.get_agent_context;
     this.get_instruction = options.get_instruction;
-    this.plugin_instances = options.plugin_instances;
     this.ensure_agent_ready = options.ensure_agent_ready;
     this.default_model = options.default_model;
     this.SessionClass = options.SessionClass || Session;

package/src/agent/remote/RemoteAgent.ts

@@ -16,12 +16,13 @@ import type {
   AgentCreateSessionInput,
   AgentListSessionsInput,
   AgentSessionSummaryPage,
-  AgentSessions,
+} from "@/types/agent/SessionTypes.js";
+import type { AgentSessions, RemoteAgentSession } from "@/types/agent/SessionActor.js";
+import type { RemoteAgentOptions } from "@/types/agent/RemoteAgentOptions.js";
+import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
-  RemoteAgentOptions,
-  RemoteAgentSession,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/RemoteAgentPluginAction.js";
 import type {
   ShellApprovalMode,
   ShellApprovalDecisionResult,

package/src/agent/remote/RemoteSession.ts

@@ -14,8 +14,8 @@ import type {
   AgentSessionInfo,
   AgentSessionSetInput,
   AgentSessionSystemSnapshot,
-  RemoteAgentSession,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/SessionTypes.js";
+import type { RemoteAgentSession } from "@/types/agent/SessionActor.js";
 import { isAgentSessionPromptInputEmpty } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
@@ -171,6 +171,9 @@ export class RemoteSession implements RemoteAgentSession {
         on_event: (event) => {
           this.handle_event(event);
         },
+        on_close: (error) => {
+          this.handle_event_pump_closed(error);
+        },
       });
       this.event_pump_running = true;
       if (!resolved_ready) {
@@ -211,6 +214,22 @@ export class RemoteSession implements RemoteAgentSession {
     this.event_hub.publish(event);
   }
 
+  /**
+   * 收口底层事件连接断开后的运行态。
+   *
+   * 关键点（中文）
+   * - 连接已经结束时必须清除 running 标记，后续 prompt 才会重新订阅。
+   * - 当前未完成 turn 立即失败，避免调用侧永久等待 finished。
+   */
+  private handle_event_pump_closed(error?: unknown): void {
+    this.event_subscription = null;
+    this.event_pump_running = false;
+    const message = error instanceof Error
+      ? error.message
+      : String(error || "Remote session events connection closed");
+    this.fail_pending_turns(message);
+  }
+
   private ensure_turn_lifecycle(turn_id: string): RemoteTurnLifecycle {
     const cached = this.turns_by_id.get(turn_id);
     if (cached) return cached;

package/src/agent/remote/RemoteTransport.ts

@@ -20,12 +20,14 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionStopResult,
+} from "@/types/agent/SessionTypes.js";
+import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/RemoteAgentPluginAction.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
   ShellApprovalMode,
   ShellApprovalDecisionResult,
@@ -61,6 +63,8 @@ export type RemoteSessionTransport = {
     session_id: string;
     on_ready: () => void;
     on_event: (event: AgentSessionEvent) => void;
+    /** 底层事件连接结束后的通知；主动关闭不触发。 */
+    on_close: (error?: unknown) => void;
   }): Promise<TransportSubscription>;
   /** 读取 history。 */
   records(

package/src/agent/remote/transports/HttpRemoteAgentTransport.ts

@@ -20,12 +20,14 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionStopResult,
+} from "@/types/agent/SessionTypes.js";
+import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/RemoteAgentPluginAction.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
   RemoteAgentTransport,
   TransportSubscription,
@@ -145,6 +147,7 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     session_id: string;
     on_ready: () => void;
     on_event: (event: AgentSessionEvent) => void;
+    on_close: (error?: unknown) => void;
   }): Promise<TransportSubscription> {
     const abort_controller = new AbortController();
     let resolve_ready!: () => void;
@@ -175,6 +178,10 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
         reject_ready(error);
       },
       on_event: params.on_event,
+    }).then((error) => {
+      if (!abort_controller.signal.aborted) {
+        params.on_close(error);
+      }
     });
     await ready_promise;
     return {
@@ -495,11 +502,12 @@ async function consume_http_event_stream(params: {
   on_ready: () => void;
   on_ready_error: (error: unknown) => void;
   on_event: (event: AgentSessionEvent) => void;
-}): Promise<void> {
+}): Promise<unknown | undefined> {
   const decoder = new TextDecoder();
   const reader = params.body.getReader();
   let buffered = "";
   let ready_resolved = false;
+  let close_error: unknown;
 
   try {
     while (true) {
@@ -546,6 +554,7 @@ async function consume_http_event_stream(params: {
       });
     }
   } catch (error) {
+    close_error = error;
     if (!params.abort_controller.signal.aborted) {
       if (!ready_resolved) {
         params.on_ready_error(error);
@@ -562,6 +571,7 @@ async function consume_http_event_stream(params: {
       // ignore
     }
   }
+  return close_error;
 }
 
 function extract_error_message(payload: unknown): string {

package/src/agent/remote/transports/RpcRemoteAgentTransport.ts

@@ -20,12 +20,14 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionStopResult,
+} from "@/types/agent/SessionTypes.js";
+import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
-} from "@/types/agent/AgentTypes.js";
+} from "@/types/agent/RemoteAgentPluginAction.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
+import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import { RpcClient, parse_rpc_url } from "@/rpc/Client.js";
 import type {
   RemoteAgentTransport,
@@ -76,11 +78,13 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     session_id: string;
     on_ready: () => void;
     on_event: (event: AgentSessionEvent) => void;
+    on_close: (error?: unknown) => void;
   }): Promise<TransportSubscription> {
     const subscription = await this.client.subscribe_session({
       session_id: params.session_id,
       on_ready: params.on_ready,
       on_event: params.on_event,
+      on_close: params.on_close,
     });
     return {
       close: async () => {

package/src/executor/Executor.ts

@@ -86,10 +86,6 @@ type ExecutorOptions = {
    */
   contextComposer?: SessionContextComposer;
 
-  /**
-   * session 更新后的异步回调。
-   */
-  runAfterSessionUpdated?: (sessionId: string) => Promise<void>;
 };
 
 /**
@@ -139,13 +135,10 @@ export class Executor implements SessionExecutor {
     this.historyWriter = new SessionHistoryWriter({
       sessionId,
       getHistoryStore: () => this.getHistoryStore(),
-      runAfterSessionUpdated: options.runAfterSessionUpdated,
     });
     this.inflight_service = new ExecutorInflightService({
       session_id: this.sessionId,
       history_store: this.historyStore,
-      run_after_session_updated_async: async () =>
-        await this.afterSessionUpdatedAsync(),
     });
     this.recovery_policy = new ExecutorRecoveryPolicy({
       compaction_composer: this.compactionComposer,
@@ -196,22 +189,6 @@ export class Executor implements SessionExecutor {
     return this;
   }
 
-  /**
-   * 清理当前 session 的执行器运行态。
-   *
-   * 关键点（中文）
-   * - 当前 Executor 不缓存模型实例，模型每轮 run 都从 `getModel()` 读取。
-   * - history 是事实源，不应随着执行态一起丢失。
-   */
-  clearExecutor(): void {}
-
-  /**
-   * 触发 session 更新后的异步回调。
-   */
-  async afterSessionUpdatedAsync(): Promise<void> {
-    await this.historyWriter.afterSessionUpdatedAsync();
-  }
-
   /**
    * 追加一条 user 消息。
    */

package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts

@@ -26,7 +26,6 @@ import type {
 import {
   is_session_message_record,
 } from "@/executor/types/SessionRecords.js";
-import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
 import {
   append_session_compaction_file_operations,
   build_initial_session_compaction_prompt,
@@ -57,8 +56,7 @@ type SessionCompactDeps = {
   }) => SessionRecordV1;
   getArchiveDirPath: () => string;
   getMessagesFilePath: () => string;
-  readMetaUnsafe: () => Promise<SessionHistoryMetaV1>;
-  writeMetaUnsafe: (next: SessionHistoryMetaV1) => Promise<void>;
+  writeHistorySummaryUnsafe: (records: SessionRecordV1[]) => Promise<void>;
 };
 
 /**
@@ -259,11 +257,7 @@ export async function compactSessionMessagesIfNeeded(
     await fs.writeFile(tmp, next.map((m) => JSON.stringify(m)).join("\n") + "\n", "utf8");
     await fs.move(tmp, messagesPath, { overwrite: true });
 
-    const prevMeta = await deps.readMetaUnsafe();
-    await deps.writeMetaUnsafe({
-      ...prevMeta,
-      updatedAt: Date.now(),
-    });
+    await deps.writeHistorySummaryUnsafe(next);
   });
 
   if (action_started) {

package/src/executor/composer/history/SessionHistoryWriter.ts

@@ -4,7 +4,6 @@
  * 关键点（中文）
  * - 只负责当前 session 的 user / assistant 消息补写。
  * - 只依赖当前 session 的 history Store，不感知其他 session。
- * - 会话更新后的通知也收在这里，避免把写入细节散到 Session 主类里。
  */
 
 import type { JsonObject } from "@/types/common/Json.js";
@@ -25,10 +24,6 @@ type SessionHistoryWriterOptions = {
    */
   getHistoryStore: () => SessionHistoryStore;
 
-  /**
-   * session 更新后的异步回调。
-   */
-  runAfterSessionUpdated?: (sessionId: string) => Promise<void>;
 };
 
 /**
@@ -37,29 +32,15 @@ type SessionHistoryWriterOptions = {
 export class SessionHistoryWriter {
   private readonly sessionId: string;
   private readonly getHistoryStore: SessionHistoryWriterOptions["getHistoryStore"];
-  private readonly runAfterSessionUpdated?: SessionHistoryWriterOptions["runAfterSessionUpdated"];
 
   constructor(options: SessionHistoryWriterOptions) {
     this.sessionId = String(options.sessionId || "").trim();
     this.getHistoryStore = options.getHistoryStore;
-    this.runAfterSessionUpdated = options.runAfterSessionUpdated;
     if (!this.sessionId) {
       throw new Error("SessionHistoryWriter requires a non-empty sessionId");
     }
   }
 
-  /**
-   * 触发 session 更新后的异步回调。
-   */
-  async afterSessionUpdatedAsync(): Promise<void> {
-    if (!this.runAfterSessionUpdated) return;
-    try {
-      await this.runAfterSessionUpdated(this.sessionId);
-    } catch {
-      // ignore
-    }
-  }
-
   /**
    * 追加一条 user 消息。
    */
@@ -68,29 +49,23 @@ export class SessionHistoryWriter {
     text?: string;
     extra?: JsonObject;
   }): Promise<void> {
-    try {
-      const historyStore = this.getHistoryStore();
-      if (params.message && typeof params.message === "object") {
-        await historyStore.write_record(params.message);
-        void this.afterSessionUpdatedAsync();
-        return;
-      }
+    const historyStore = this.getHistoryStore();
+    if (params.message && typeof params.message === "object") {
+      await historyStore.write_record(params.message);
+      return;
+    }
 
-      const fallbackText = String(params.text || "").trim();
-      if (!fallbackText) return;
+    const fallbackText = String(params.text || "").trim();
+    if (!fallbackText) return;
 
-      const message = historyStore.userText({
-        text: fallbackText,
-        metadata: {
-          sessionId: this.sessionId,
-          extra: params.extra,
-        } as Omit<SessionMetadataV1, "v" | "ts">,
-      });
-      await historyStore.write_record(message);
-      void this.afterSessionUpdatedAsync();
-    } catch {
-      // ignore
-    }
+    const message = historyStore.userText({
+      text: fallbackText,
+      metadata: {
+        sessionId: this.sessionId,
+        extra: params.extra,
+      } as Omit<SessionMetadataV1, "v" | "ts">,
+    });
+    await historyStore.write_record(message);
   }
 
   /**
@@ -101,31 +76,25 @@ export class SessionHistoryWriter {
     fallbackText?: string;
     extra?: JsonObject;
   }): Promise<void> {
-    try {
-      const historyStore = this.getHistoryStore();
-      if (params.message && typeof params.message === "object") {
-        await historyStore.finalize_inflight(params.message);
-        void this.afterSessionUpdatedAsync();
-        return;
-      }
+    const historyStore = this.getHistoryStore();
+    if (params.message && typeof params.message === "object") {
+      await historyStore.finalize_inflight(params.message);
+      return;
+    }
 
-      const fallbackText = String(params.fallbackText || "").trim();
-      if (!fallbackText) return;
+    const fallbackText = String(params.fallbackText || "").trim();
+    if (!fallbackText) return;
 
-      await historyStore.finalize_inflight(
-        historyStore.assistantText({
-          text: fallbackText,
-          metadata: {
-            sessionId: this.sessionId,
-            extra: params.extra,
-          },
-          kind: "normal",
-          source: "egress",
-        }),
-      );
-      void this.afterSessionUpdatedAsync();
-    } catch {
-      // ignore
-    }
+    await historyStore.finalize_inflight(
+      historyStore.assistantText({
+        text: fallbackText,
+        metadata: {
+          sessionId: this.sessionId,
+          extra: params.extra,
+        },
+        kind: "normal",
+        source: "egress",
+      }),
+    );
   }
 }

package/src/executor/composer/system/default/StaticPromptCatalog.ts

@@ -117,6 +117,10 @@ function systemsEqual(a: string[], b: string[]): boolean {
 
 /**
  * 构建静态系统提示列表。
+ *
+ * 关键点（中文）
+ * - PROFILE/SOUL 这类项目指令在前，Downcity core 在后。
+ * - 该顺序对应 SDK session 中 instruction -> core 的稳定分层。
  */
 export function buildStaticSystemPrompts(staticProfiles: string[]): string[] {
   return [...staticProfiles, DEFAULT_SHIP_PROMPTS].filter(Boolean);

package/src/executor/composer/system/default/SystemDomain.ts

@@ -12,7 +12,6 @@ import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import { buildRuntimeClockSystemPrompt } from "@executor/composer/system/default/variables/VariableReplacer.js";
 import {
   CORE_SYSTEM_PROMPT,
-  PLUGIN_SYSTEM_PROMPT,
   TASK_SYSTEM_PROMPT,
 } from "@executor/composer/system/default/SystemPromptAssets.js";
 
@@ -27,8 +26,6 @@ function normalizeSystemText(input: string | null | undefined): string {
  */
 export const DEFAULT_SHIP_PROMPTS = CORE_SYSTEM_PROMPT;
 
-const MAIN_PLUGIN_PROMPT = PLUGIN_SYSTEM_PROMPT;
-
 /**
  * 构建一次运行的运行时 system prompt。
  *
@@ -146,7 +143,7 @@ export function resolveSystemContextProfile(
  * 收集受 agent 托管的 plugin system 文本。
  *
  * 关键点（中文）
- * - 顺序：main plugin prompt -> plugin.system。
+ * - core prompt 已包含 plugin 系统总规则；这里仅收集各 plugin 自己的 system prompt。
  * - 单个加载失败走 fail-open，不阻断主链路。
  */
 export async function loadManagedPluginSystemPrompts(input: {
@@ -161,11 +158,6 @@ export async function loadManagedPluginSystemPrompts(input: {
   disabledPluginNames: string[];
 }): Promise<string[]> {
   const out: string[] = [];
-  const mainPluginPrompt = normalizeSystemText(MAIN_PLUGIN_PROMPT);
-  if (mainPluginPrompt) {
-    out.push(mainPluginPrompt);
-  }
-
   const disabledPluginNames = new Set(
     input.disabledPluginNames
       .map((item) => String(item || "").trim())

package/src/executor/composer/system/default/SystemPromptAssets.ts

@@ -7,7 +7,6 @@
  */
 
 import coreSystemPromptText from "@executor/composer/system/default/assets/core.prompt.js";
-import pluginSystemPromptText from "@executor/composer/system/default/assets/plugin.prompt.js";
 import taskSystemPromptText from "@executor/composer/system/default/assets/task.prompt.js";
 
 /**
@@ -15,11 +14,6 @@ import taskSystemPromptText from "@executor/composer/system/default/assets/task.
  */
 export const CORE_SYSTEM_PROMPT = coreSystemPromptText.trim();
 
-/**
- * plugin 层稳定 system prompt。
- */
-export const PLUGIN_SYSTEM_PROMPT = pluginSystemPromptText.trim();
-
 /**
  * task 模式专用 system prompt。
  */