@downcity/agent 1.1.237 → 1.1.258

package/src/plugin/core/PluginRegistry.ts

@@ -8,7 +8,7 @@
  */
 
 import { toPluginView } from "@/plugin/core/PluginCatalog.js";
-import type { HookRegistry } from "@/plugin/core/HookRegistry.js";
+import { HookRegistry } from "@/plugin/core/HookRegistry.js";
 import type { Plugin } from "@/types/plugin/PluginDefinition.js";
 import type { PluginActionResult } from "@/types/plugin/PluginAction.js";
 import type {
@@ -21,14 +21,13 @@ import type {
   PluginView,
 } from "@/types/plugin/PluginRuntime.js";
 import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
-import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { AgentContext } from "@/agent/AgentContext.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type {
   PluginRuntimeRecord,
   PluginSnapshot,
 } from "@/types/plugin/PluginState.js";
-
-type ContextResolver = () => AgentContext;
+import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
 
 function now_ms(): number {
   return Date.now();
@@ -98,12 +97,10 @@ async function run_serial(
  * PluginRegistry：Agent plugin 注册、卸载与调用实现。
  */
 export class PluginRegistry implements AgentPlugins {
-  private readonly contextResolver: ContextResolver;
+  private context?: AgentContext;
 
   private readonly hookRegistry: HookRegistry;
 
-  private readonly pluginInstances: Map<string, Plugin>;
-
   private readonly records = new Map<string, PluginRuntimeRecord>();
 
   private readonly retired_records = new Set<PluginRuntimeRecord>();
@@ -115,14 +112,36 @@ export class PluginRegistry implements AgentPlugins {
     plugin_name: string;
   }) => void;
 
-  constructor(params: {
-    contextResolver: ContextResolver;
-    hookRegistry: HookRegistry;
-    pluginInstances: Map<string, Plugin>;
-  }) {
-    this.contextResolver = params.contextResolver;
-    this.hookRegistry = params.hookRegistry;
-    this.pluginInstances = params.pluginInstances;
+  constructor(plugins: Plugin[] = []) {
+    this.hookRegistry = new HookRegistry({
+      get_context: () => this.require_context(),
+      is_plugin_ready: (plugin_name) => this.isReady(plugin_name),
+    });
+    for (const plugin of plugins) {
+      this.mount(plugin);
+    }
+  }
+
+  /**
+   * 绑定当前 Registry 所属的唯一 AgentContext。
+   *
+   * 关键点（中文）
+   * - 初始 Plugin 可以在 Context 创建前同步挂载。
+   * - lifecycle、action、hook 首次执行前必须完成绑定。
+   */
+  bind_context(context: AgentContext): void {
+    if (this.context && this.context !== context) {
+      throw new Error("PluginRegistry context is already bound");
+    }
+    this.context = context;
+  }
+
+  /** 返回已经绑定的 AgentContext。 */
+  private require_context(): AgentContext {
+    if (!this.context) {
+      throw new Error("PluginRegistry context is not bound");
+    }
+    return this.context;
   }
 
   /**
@@ -151,7 +170,6 @@ export class PluginRegistry implements AgentPlugins {
     const record = create_record(plugin);
     this.records.set(key, record);
     this.register_hooks(plugin);
-    this.pluginInstances.set(key, plugin);
 
     try {
       await this.start_record(record);
@@ -160,7 +178,6 @@ export class PluginRegistry implements AgentPlugins {
     } catch (error) {
       this.unregister_hooks(key);
       this.records.delete(key);
-      this.pluginInstances.delete(key);
       throw error;
     }
   }
@@ -184,7 +201,6 @@ export class PluginRegistry implements AgentPlugins {
     const record = create_record(plugin);
     this.records.set(key, record);
     this.register_hooks(plugin);
-    this.pluginInstances.set(key, plugin);
     return to_plugin_snapshot(record);
   }
 
@@ -204,7 +220,6 @@ export class PluginRegistry implements AgentPlugins {
 
     this.unregister_hooks(key);
     this.records.delete(key);
-    this.pluginInstances.delete(key);
     this.retire_record(record);
     this.change_listener?.({ type: "unregister", plugin_name: key });
     return true;
@@ -308,7 +323,7 @@ export class PluginRegistry implements AgentPlugins {
         return;
       }
       try {
-        await record.plugin.lifecycle?.start?.(this.contextResolver());
+        await record.plugin.lifecycle?.start?.(this.require_context());
         record.lifecycle_started = true;
         update_record_state(record, "ready");
       } catch (error) {
@@ -322,7 +337,7 @@ export class PluginRegistry implements AgentPlugins {
     await run_serial(record, async () => {
       if (!record.lifecycle_started) return;
       try {
-        await record.plugin.lifecycle?.stop?.(this.contextResolver());
+        await record.plugin.lifecycle?.stop?.(this.require_context());
       } finally {
         record.lifecycle_started = false;
         record.updated_at = now_ms();
@@ -476,7 +491,7 @@ export class PluginRegistry implements AgentPlugins {
     }
 
     if (record.plugin.availability) {
-      return await record.plugin.availability(this.contextResolver());
+      return await record.plugin.availability(this.require_context());
     }
 
     return {
@@ -515,6 +530,7 @@ export class PluginRegistry implements AgentPlugins {
     plugin: string;
     action: string;
     payload?: JsonValue;
+    run_context?: SessionRunContext;
   }): Promise<PluginActionResult<JsonValue>> {
     return await this.run_action_from_records(this.records, params);
   }
@@ -528,6 +544,7 @@ export class PluginRegistry implements AgentPlugins {
       plugin: string;
       action: string;
       payload?: JsonValue;
+      run_context?: SessionRunContext;
     },
   ): Promise<PluginActionResult<JsonValue>> {
     const key = normalize_plugin_name(params.plugin);
@@ -577,10 +594,11 @@ export class PluginRegistry implements AgentPlugins {
         return parsed_payload;
       }
       const result = await action.execute({
-        context: this.contextResolver(),
+        context: this.require_context(),
         input: parsed_payload.input,
         pluginName: record.plugin.name,
         actionName,
+        ...(params.run_context ? { run_context: params.run_context } : {}),
       });
       return result;
     } catch (error) {
@@ -595,8 +613,10 @@ export class PluginRegistry implements AgentPlugins {
   /**
    * 读取当前生效的 plugin system blocks。
    */
-  async systemBlocks(): Promise<AgentSessionSystemBlock[]> {
-    return await this.system_blocks_from_records(this.records);
+  async systemBlocks(
+    run_context?: SessionRunContext,
+  ): Promise<AgentSessionSystemBlock[]> {
+    return await this.system_blocks_from_records(this.records, run_context);
   }
 
   /**
@@ -604,8 +624,9 @@ export class PluginRegistry implements AgentPlugins {
    */
   private async system_blocks_from_records(
     records: ReadonlyMap<string, PluginRuntimeRecord>,
+    run_context?: SessionRunContext,
   ): Promise<AgentSessionSystemBlock[]> {
-    const context = this.contextResolver();
+    const context = this.require_context();
     const out: AgentSessionSystemBlock[] = [];
     for (const record of records.values()) {
       const plugin = record.plugin;
@@ -616,7 +637,9 @@ export class PluginRegistry implements AgentPlugins {
           const availability = await plugin.availability(context);
           if (!availability.available) continue;
         }
-        const text = String(await plugin.system(context)).trim();
+        const text = String(
+          await plugin.system(context, run_context),
+        ).trim();
         if (!text) continue;
         out.push({
           source: "plugin",
@@ -639,8 +662,8 @@ export class PluginRegistry implements AgentPlugins {
       read: (params) => this.read_from_records(records, params),
       runAction: async (params) =>
         await this.run_action_from_records(records, params),
-      systemBlocks: async () =>
-        await this.system_blocks_from_records(records),
+      systemBlocks: async (run_context) =>
+        await this.system_blocks_from_records(records, run_context),
       acquire: () => this.acquire_execution_view(records),
     };
   }
@@ -669,8 +692,8 @@ export class PluginRegistry implements AgentPlugins {
       read: (params) => this.read_from_records(leased_records, params),
       runAction: async (params) =>
         await this.run_action_from_records(leased_records, params),
-      systemBlocks: async () =>
-        await this.system_blocks_from_records(leased_records),
+      systemBlocks: async (run_context) =>
+        await this.system_blocks_from_records(leased_records, run_context),
       release: async () => {
         if (released) return;
         released = true;
@@ -723,7 +746,7 @@ export class PluginRegistry implements AgentPlugins {
       } catch (error) {
         update_record_state(record, "error", String(error));
         try {
-          await this.contextResolver().logger.log(
+          await this.require_context().logger.log(
             "error",
             "[plugin] lifecycle.stop failed after execution release",
             {

package/src/plugin/core/PluginStateController.ts

@@ -6,7 +6,7 @@
  * - 控制动作与类型协议保持一致，只支持状态查询和卸载。
  */
 
-import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { AgentContext } from "@/agent/AgentContext.js";
 import type {
   PluginControlAction,
   PluginControlResult,

package/src/{agent/remote → remote}/RemoteAgent.ts

@@ -1,5 +1,5 @@
 /**
- * Agent remote：统一远程 SDK 客户端。
+ * RemoteAgent：统一远程 SDK 客户端。
  *
  * 关键点（中文）
  * - 对外只暴露一个 `url` 入口，不向用户暴露 transport 细节。
@@ -23,9 +23,9 @@ import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "@/types/agent/RemoteAgentPluginAction.js";
-import type { RemoteAgentTransport } from "@/agent/remote/RemoteTransport.js";
-import { RemoteSession } from "@/agent/remote/RemoteSession.js";
-import { create_remote_agent_transport } from "@/agent/remote/TransportFactory.js";
+import type { RemoteAgentTransport } from "@/remote/RemoteTransport.js";
+import { RemoteSession } from "@/remote/RemoteSession.js";
+import { create_remote_agent_transport } from "@/remote/TransportFactory.js";
 
 /**
  * RemoteAgent：远程 Agent 客户端。

package/src/{agent/remote → remote}/RemoteSession.ts

@@ -8,7 +8,6 @@ import type {
   AgentSessionConfigSnapshot,
   AgentSessionForkInput,
   AgentSessionInfo,
-  AgentSessionSetInput,
   AgentSessionSystemSnapshot,
 } from "@/types/agent/SessionTypes.js";
 import type { RemoteAgentSession } from "@/types/agent/SessionActor.js";
@@ -39,7 +38,7 @@ import { SessionEventHub } from "@/session/runtime/SessionEventHub.js";
 import type {
   RemoteSessionTransport,
   TransportSubscription,
-} from "@/agent/remote/RemoteTransport.js";
+} from "@/remote/RemoteTransport.js";
 
 type Deferred<T> = {
   /** 当前延迟 Promise。 */
@@ -77,29 +76,9 @@ export class RemoteSession implements RemoteAgentSession {
     this.id = info.sessionId;
     this.agentId = info.agentId;
     this.config = {
-      ...(info.modelId ? { modelId: info.modelId } : {}),
       ...(info.modelLabel ? { modelLabel: info.modelLabel } : {}),
     };
-    this.event_hub = new SessionEventHub({
-      create_reply: (mutation) => ({
-        approval: async ({ decision }) => {
-          return await this.resolve_approval({
-            approval_id: require_approval_id(mutation),
-            decision,
-          });
-        },
-      }),
-    });
-  }
-
-  /** 按稳定模型 ID 更新远程 Session 模型。 */
-  async set(input: AgentSessionSetInput): Promise<void> {
-    if (input.model) throw new Error("Remote session.set does not accept a local model instance.");
-    const model_id = String(input.modelId || "").trim();
-    if (!model_id) throw new Error("Remote session.set requires modelId.");
-    const info = await this.transport.set(this.id, { modelId: model_id });
-    this.config.modelId = info.modelId;
-    this.config.modelLabel = info.modelLabel;
+    this.event_hub = new SessionEventHub();
   }
 
   /** 读取当前远程 Session 详情。 */
@@ -292,15 +271,3 @@ function create_turn_handle(lifecycle: RemoteTurnLifecycle): AgentSessionTurnHan
     finished: lifecycle.deferred_finished.promise,
   };
 }
-
-function require_approval_id(mutation: SessionMutation): string {
-  if (
-    mutation.variant === "part" &&
-    mutation.type === "tool" &&
-    mutation.part.state === "approval-required" &&
-    mutation.part.approval_id
-  ) {
-    return mutation.part.approval_id;
-  }
-  throw new Error("Current Session Mutation is not an approval-required Tool Part");
-}

package/src/{agent/remote → remote}/RemoteTransport.ts

@@ -18,7 +18,6 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
 import type {
   RemoteAgentPluginActionInput,
@@ -53,8 +52,6 @@ export type TransportSubscription = {
 export type RemoteSessionTransport = {
   /** 读取 session 信息。 */
   get_info(session_id: string): Promise<AgentSessionInfo>;
-  /** 按稳定模型 ID 更新远程 session 配置。 */
-  set(session_id: string, input: AgentSessionSetInput): Promise<AgentSessionInfo>;
   /** 发送 prompt。 */
   prompt(
     session_id: string,

package/src/{agent/remote → remote}/TransportFactory.ts

@@ -6,9 +6,9 @@
  * - HTTP token 只传给 HTTP transport，RPC 不读取 token。
  */
 
-import type { RemoteAgentTransport } from "@/agent/remote/RemoteTransport.js";
-import { HttpRemoteAgentTransport } from "@/agent/remote/transports/HttpRemoteAgentTransport.js";
-import { RpcRemoteAgentTransport } from "@/agent/remote/transports/RpcRemoteAgentTransport.js";
+import type { RemoteAgentTransport } from "@/remote/RemoteTransport.js";
+import { HttpRemoteAgentTransport } from "@/remote/transports/HttpRemoteAgentTransport.js";
+import { RpcRemoteAgentTransport } from "@/remote/transports/RpcRemoteAgentTransport.js";
 
 /**
  * 根据 URL 协议创建远程 transport。

package/src/{agent/remote → remote}/transports/HttpRemoteAgentTransport.ts

@@ -18,7 +18,6 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
 import type {
   ListSessionMessagesInput,
@@ -34,7 +33,7 @@ import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
   RemoteAgentTransport,
   TransportSubscription,
-} from "@/agent/remote/RemoteTransport.js";
+} from "@/remote/RemoteTransport.js";
 import type {
   ResolveSessionApprovalInput,
   SessionApproval,
@@ -102,27 +101,6 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     return payload.session;
   }
 
-  async set(
-    session_id: string,
-    input: AgentSessionSetInput,
-  ): Promise<AgentSessionInfo> {
-    const payload = await read_http_json<{
-      success?: boolean;
-      error?: string;
-      session?: AgentSessionInfo;
-    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/model`, {
-      method: "PUT",
-      headers: this.headers({
-        "Content-Type": "application/json",
-      }),
-      body: JSON.stringify({ modelId: input.modelId }),
-    });
-    if (!payload.success || !payload.session?.sessionId) {
-      throw new Error(String(payload.error || "Remote session model update failed"));
-    }
-    return payload.session;
-  }
-
   async prompt(
     session_id: string,
     input: AgentSessionPromptInput,

package/src/{rpc/Client.ts → remote/transports/RpcClient.ts}

@@ -1,5 +1,5 @@
 /**
- * Agent 本机 RPC Client。
+ * RemoteAgent 本机 RPC Client。
  *
  * 职责说明（中文）
  * - 为 `RemoteAgent(rpc://...)` 提供最小客户端实现。
@@ -19,7 +19,6 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
 import type {
   ListSessionMessagesInput,
@@ -171,23 +170,6 @@ export class RpcClient {
     return data.session;
   }
 
-  /** 按稳定模型 ID 更新远程 Session。 */
-  async set_session(params: {
-    /** 目标 session id。 */
-    session_id: string;
-    /** Session 配置更新输入。 */
-    input: AgentSessionSetInput;
-  }): Promise<AgentSessionInfo> {
-    const data = await this.request<{ session: AgentSessionInfo }>({
-      method: "sdk.sessions.set",
-      params: {
-        sessionId: params.session_id,
-        input: params.input,
-      },
-    });
-    return data.session;
-  }
-
   /**
    * 发送 prompt。
    */

package/src/{agent/remote → remote}/transports/RpcRemoteAgentTransport.ts

@@ -18,7 +18,6 @@ import type {
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
-  AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
 import type {
   ListSessionMessagesInput,
@@ -31,11 +30,11 @@ import type {
 import type { SessionMutation } from "@/types/session/SessionMutation.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 { RpcClient, parse_rpc_url } from "@/remote/transports/RpcClient.js";
 import type {
   RemoteAgentTransport,
   TransportSubscription,
-} from "@/agent/remote/RemoteTransport.js";
+} from "@/remote/RemoteTransport.js";
 import type {
   ResolveSessionApprovalInput,
   SessionApproval,
@@ -62,13 +61,6 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     return await this.client.get_session(session_id);
   }
 
-  async set(
-    session_id: string,
-    input: AgentSessionSetInput,
-  ): Promise<AgentSessionInfo> {
-    return await this.client.set_session({ session_id, input });
-  }
-
   async prompt(
     session_id: string,
     input: AgentSessionPromptInput,

package/src/session/DefaultSessionComposer.ts

@@ -0,0 +1,79 @@
+/**
+ * 默认 Session Composer。
+ *
+ * 负责把 Session 的只读状态与 canonical Message 快照组装为模型输入；
+ * 压缩只生成计划，实际 Segment 提交仍由 SessionMessages 负责。
+ */
+
+import { build_session_system_blocks } from "@/session/SessionSystem.js";
+import { compose_session_compaction } from "@/session/messages/SessionMessageCompaction.js";
+import { to_executor_history } from "@/session/messages/SessionMessageCodec.js";
+import type {
+  SessionComposer,
+  SessionCompactionInput,
+  SessionCompactionPlan,
+  SessionComposeInput,
+  SessionStepInput,
+} from "@/types/session/SessionComposer.js";
+
+/** 默认 Session 执行策略。 */
+export class DefaultSessionComposer implements SessionComposer {
+  readonly name = "default_session";
+
+  /** 组装当前 Step 的 system、history 与 tools。 */
+  async compose(input: SessionComposeInput): Promise<SessionStepInput> {
+    const system_blocks = await build_session_system_blocks({
+      agent_id: input.session.agent_id,
+      project_root: input.session.project_root,
+      session_id: input.session.session_id,
+      created_at: input.session.created_at,
+      timezone: input.session.timezone,
+      get_instruction_system_blocks: () => [
+        ...input.state.instruction_system_blocks,
+      ],
+      get_managed_plugin_system_blocks: async () => [
+        ...input.state.managed_plugin_system_blocks,
+      ],
+      get_plugin_system_blocks: async () => [
+        ...input.state.plugin_system_blocks,
+      ],
+    });
+
+    return {
+      system: system_blocks.map((block) => ({
+        role: "system" as const,
+        content: block.content,
+      })),
+      system_blocks,
+      messages: to_executor_history(
+        input.session.session_id,
+        input.history,
+      ),
+      tools: { ...input.state.tools },
+    };
+  }
+
+  /** 生成等待 SessionMessages 提交的压缩计划。 */
+  async compact(
+    input: SessionCompactionInput,
+  ): Promise<SessionCompactionPlan | null> {
+    if (!input.force && input.turn.retry_count <= 0) return null;
+    if (!input.state.model) return null;
+    return await compose_session_compaction({
+      session_id: input.session.session_id,
+      snapshot: input.history,
+      model: input.state.model,
+    });
+  }
+
+  /** 判断错误是否属于模型上下文超限。 */
+  should_compact(error: unknown): boolean {
+    const message = String(error ?? "");
+    return (
+      message.includes("context_length") ||
+      message.includes("too long") ||
+      message.includes("maximum context") ||
+      message.includes("context window")
+    );
+  }
+}