@downcity/agent 1.1.338 → 1.1.400

package/src/plugin/core/PluginRegistry.ts

@@ -22,13 +22,16 @@ import type {
 } from "@/types/plugin/PluginRuntime.js";
 import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
 import type { PluginContext } from "@/types/plugin/PluginContext.js";
+import type { AgentPluginContext } from "@/types/plugin/AgentPluginContext.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type {
   PluginRuntimeRecord,
   PluginSnapshot,
 } from "@/types/plugin/PluginState.js";
 import type { PluginExecutionContext } from "@/types/plugin/PluginExecutionContext.js";
-import type { Tool } from "ai";
+import type { SessionInteractionPort } from "@/types/session/SessionInteraction.js";
+import { execute_plugin_action } from "@/plugin/core/PluginActionExecution.js";
+import type { RuntimeTool as Tool } from "@downcity/type";
 import { create_plugin_tools } from "@/plugin/tool/PluginTools.js";
 import type {
   PluginRegistryChange,
@@ -44,11 +47,16 @@ function normalize_plugin_name(plugin_name: string): string {
   return String(plugin_name || "").trim();
 }
 
+/** 为当前 Workspace 的指定 Plugin 创建专属运行时 Context。 */
+type PluginContextFactory = (
+  plugin_name: string,
+) => PluginContext;
+
 function create_record(plugin: Plugin): PluginRuntimeRecord {
   const current_time = now_ms();
   return {
     plugin,
-    state: "ready",
+    state: "initializing",
     registered_at: current_time,
     updated_at: current_time,
     chain: Promise.resolve(),
@@ -103,21 +111,28 @@ async function run_serial(
 /**
  * PluginRegistry：Agent plugin 注册、卸载与调用实现。
  */
-export class PluginRegistry implements AgentPlugins {
-  private context?: PluginContext;
-
+export class PluginRegistry {
   private readonly hookRegistry: HookRegistry;
 
   private readonly records = new Map<string, PluginRuntimeRecord>();
 
+  /** 当前 Registry 所属 Agent 的生命周期上下文。 */
+  private readonly agent_context: AgentPluginContext;
+
+  /** Agent 当前已进入 Workspace 的 Plugin Context 工厂。 */
+  private readonly workspace_context_factories = new Map<string, PluginContextFactory>();
+
+  /** 初始 Plugin lifecycle 的唯一启动流程。 */
+  private initial_start_promise?: Promise<PluginSnapshot[]>;
+
   private readonly retired_records = new Set<PluginRuntimeRecord>();
 
   /** Plugin 配置变化订阅器。 */
   private readonly change_subscribers = new Set<PluginRegistrySubscriber>();
 
-  constructor(plugins: Plugin[] = []) {
+  constructor(agent_context: AgentPluginContext, plugins: Plugin[] = []) {
+    this.agent_context = agent_context;
     this.hookRegistry = new HookRegistry({
-      get_context: () => this.require_context(),
       is_plugin_ready: (plugin_name) => this.is_ready(plugin_name),
     });
     for (const plugin of plugins) {
@@ -125,28 +140,6 @@ export class PluginRegistry implements AgentPlugins {
     }
   }
 
-  /**
-   * 绑定当前 Registry 所属的唯一 PluginContext。
-   *
-   * 关键点（中文）
-   * - 初始 Plugin 可以在 Context 创建前同步挂载。
-   * - lifecycle、action、hook 首次执行前必须完成绑定。
-   */
-  bind_context(context: PluginContext): void {
-    if (this.context && this.context !== context) {
-      throw new Error("PluginRegistry context is already bound");
-    }
-    this.context = context;
-  }
-
-  /** 返回已经绑定的 PluginContext。 */
-  private require_context(): PluginContext {
-    if (!this.context) {
-      throw new Error("PluginRegistry context is not bound");
-    }
-    return this.context;
-  }
-
   /** 订阅 Plugin 配置的后续变化。 */
   subscribe_change(
     subscriber: PluginRegistrySubscriber,
@@ -157,6 +150,25 @@ export class PluginRegistry implements AgentPlugins {
     };
   }
 
+  /** 绑定当前 Workspace 的 Plugin Context 工厂。 */
+  bind_workspace_context(
+    context: PluginContext,
+    factory: PluginContextFactory,
+  ): void {
+    this.workspace_context_factories.set(context.workspace_id, factory);
+  }
+
+  /** 解除当前 Workspace 的 Plugin Context 工厂。 */
+  unbind_workspace_context(context: PluginContext): void {
+    this.workspace_context_factories.delete(context.workspace_id);
+  }
+
+  /** 返回指定 Plugin 的运行时 Context；未绑定工厂时回退到传入 Context。 */
+  plugin_context(context: PluginContext, plugin_name: string): PluginContext {
+    const key = normalize_plugin_name(plugin_name);
+    return this.workspace_context_factories.get(context.workspace_id)?.(key) || context;
+  }
+
   /**
    * 返回当前 Registry 向 Agent 提供的 Plugin Tools。
    *
@@ -164,9 +176,44 @@ export class PluginRegistry implements AgentPlugins {
    * - 没有任何 Action 时不暴露空壳 Tool。
    * - Tool 闭包绑定当前 Registry，动态 Plugin 变化无需重建 bridge。
    */
-  tools(): Record<string, Tool> {
+  tools(context: PluginContext): Record<string, Tool> {
     if (!this.list().some((plugin) => plugin.actions.length > 0)) return {};
-    return { ...create_plugin_tools({ plugins: this }) };
+    return { ...create_plugin_tools({ plugins: this.contextual(context) }) };
+  }
+
+  /**
+   * 创建绑定当前 Session Workspace 上下文的 Plugin 调用面。
+   *
+   * Registry 只保存 Agent 注册的 Plugin；Action、Hook、System 与 availability 在
+   * 调用时显式使用这里捕获的 Workspace Context。
+   */
+  contextual(context: PluginContext): AgentPlugins {
+    return {
+      register: async (plugin) => await this.register(plugin),
+      unregister: async (plugin_name) => await this.unregister(plugin_name),
+      start_all: async () => await this.start_all(),
+      unregister_all: async () => await this.unregister_all(),
+      has: (plugin_name) => this.has(plugin_name),
+      get: (plugin_name) => this.get(plugin_name),
+      status: (plugin_name) => this.status(plugin_name),
+      snapshots: () => this.snapshots(),
+      list: () => this.list(),
+      read: (params) => this.read(params),
+      availability: async (plugin_name) =>
+        await this.availability(context, plugin_name),
+      run_action: async (params) =>
+        await this.run_action({ context, ...params }),
+      system_blocks: async (execution_context) =>
+        await this.system_blocks(context, execution_context),
+      pipeline: async (point_name, value) =>
+        await this.pipeline(context, point_name, value),
+      guard: async (point_name, value) =>
+        await this.guard(context, point_name, value),
+      effect: async (point_name, value) =>
+        await this.effect(context, point_name, value),
+      resolve: async (point_name, value) =>
+        await this.resolve(context, point_name, value),
+    };
   }
 
   /**
@@ -196,6 +243,7 @@ export class PluginRegistry implements AgentPlugins {
     } catch (error) {
       this.unregister_hooks(key);
       this.records.delete(key);
+      await this.stop_record(record).catch(() => undefined);
       throw error;
     }
   }
@@ -258,16 +306,26 @@ export class PluginRegistry implements AgentPlugins {
    * 启动全部已挂载 plugin。
    */
   async start_all(): Promise<PluginSnapshot[]> {
-    const snapshots: PluginSnapshot[] = [];
-    for (const record of this.records.values()) {
+    this.initial_start_promise ??= this.start_initial_records();
+    return await this.initial_start_promise;
+  }
+
+  /** 串行启动构造期挂载的 Plugin，并隔离单个 lifecycle 失败。 */
+  private async start_initial_records(): Promise<PluginSnapshot[]> {
+    const initial_records = [...this.records.values()];
+    for (const record of initial_records) {
       try {
         await this.start_record(record);
       } catch {
-        // 关键点（中文）：单个 plugin 启动失败只影响自身，不能阻断其他 plugin 与 Agent ready。
+        // 关键点（中文）：单个 Plugin 启动失败只影响自身，不能阻断其他 Plugin 与 Agent ready。
       }
-      snapshots.push(to_plugin_snapshot(record));
     }
-    return snapshots;
+    return initial_records.map(to_plugin_snapshot);
+  }
+
+  /** 确保任何异步 Plugin 执行都发生在初始 lifecycle 启动完成后。 */
+  private async ensure_initial_started(): Promise<void> {
+    await this.start_all();
   }
 
   /**
@@ -341,7 +399,9 @@ export class PluginRegistry implements AgentPlugins {
     this.hookRegistry.unregister_plugin(plugin_name);
   }
 
-  private async start_record(record: PluginRuntimeRecord): Promise<void> {
+  private async start_record(
+    record: PluginRuntimeRecord,
+  ): Promise<void> {
     if (record.lifecycle_started) {
       update_record_state(record, "ready");
       return;
@@ -352,7 +412,7 @@ export class PluginRegistry implements AgentPlugins {
         return;
       }
       try {
-        await record.plugin.lifecycle?.start?.(this.require_context());
+        await record.plugin.lifecycle?.start?.(this.agent_context);
         record.lifecycle_started = true;
         update_record_state(record, "ready");
       } catch (error) {
@@ -365,44 +425,89 @@ export class PluginRegistry implements AgentPlugins {
   private async stop_record(record: PluginRuntimeRecord): Promise<void> {
     await run_serial(record, async () => {
       if (!record.lifecycle_started) return;
+      const errors: unknown[] = [];
       try {
-        await record.plugin.lifecycle?.stop?.(this.require_context());
+        try {
+          await record.plugin.lifecycle?.stop?.(this.agent_context);
+        } catch (error) {
+          errors.push(error);
+        }
       } finally {
         record.lifecycle_started = false;
         record.updated_at = now_ms();
       }
+      if (errors.length > 0) {
+        throw new AggregateError(errors, `Plugin cleanup failed: ${record.plugin.name}`);
+      }
     });
   }
 
   /**
    * 运行 pipeline 点。
    */
-  async pipeline<T = JsonValue>(point_name: string, value: T): Promise<T> {
-    return this.hookRegistry.pipelineValue(point_name, value);
+  async pipeline<T = JsonValue>(
+    context: PluginContext,
+    point_name: string,
+    value: T,
+  ): Promise<T> {
+    await this.ensure_initial_started();
+    return this.hookRegistry.pipelineValue(
+      context,
+      point_name,
+      value,
+      (plugin_name) => this.plugin_context(context, plugin_name),
+    );
   }
 
   /**
    * 运行 guard 点。
    */
-  async guard<T = JsonValue>(point_name: string, value: T): Promise<void> {
-    return this.hookRegistry.guardValue(point_name, value);
+  async guard<T = JsonValue>(
+    context: PluginContext,
+    point_name: string,
+    value: T,
+  ): Promise<void> {
+    await this.ensure_initial_started();
+    return this.hookRegistry.guardValue(
+      context,
+      point_name,
+      value,
+      (plugin_name) => this.plugin_context(context, plugin_name),
+    );
   }
 
   /**
    * 运行 effect 点。
    */
-  async effect<T = JsonValue>(point_name: string, value: T): Promise<void> {
-    return this.hookRegistry.effectValue(point_name, value);
+  async effect<T = JsonValue>(
+    context: PluginContext,
+    point_name: string,
+    value: T,
+  ): Promise<void> {
+    await this.ensure_initial_started();
+    return this.hookRegistry.effectValue(
+      context,
+      point_name,
+      value,
+      (plugin_name) => this.plugin_context(context, plugin_name),
+    );
   }
 
   /**
    * 运行 resolve 点。
    */
   async resolve<TInput = JsonValue, TOutput = JsonValue>(
+    context: PluginContext,
     point_name: string,
     value: TInput,
   ): Promise<TOutput> {
-    return this.hookRegistry.resolveValue<TInput, TOutput>(point_name, value);
+    await this.ensure_initial_started();
+    return this.hookRegistry.resolveValue<TInput, TOutput>(
+      context,
+      point_name,
+      value,
+      (plugin_name) => this.plugin_context(context, plugin_name),
+    );
   }
 
   /**
@@ -498,7 +603,11 @@ export class PluginRegistry implements AgentPlugins {
   /**
    * 检查 plugin 可用性。
    */
-  async availability(plugin_name: string): Promise<PluginAvailability> {
+  async availability(
+    context: PluginContext,
+    plugin_name: string,
+  ): Promise<PluginAvailability> {
+    await this.ensure_initial_started();
     const key = normalize_plugin_name(plugin_name);
     const record = this.records.get(key);
     if (!record) {
@@ -518,7 +627,7 @@ export class PluginRegistry implements AgentPlugins {
     }
 
     if (record.plugin.availability) {
-      return await record.plugin.availability(this.require_context());
+      return await record.plugin.availability(this.plugin_context(context, key));
     }
 
     return {
@@ -528,38 +637,19 @@ export class PluginRegistry implements AgentPlugins {
     };
   }
 
-  /**
-   * 按 action schema 校验 payload。
-   */
-  private parseActionPayload(params: {
-    plugin_name: string;
-    action_name: string;
-    payload: JsonValue;
-    action: NonNullable<Plugin["actions"]>[string];
-  }): PluginActionResult<JsonValue> | { input: JsonValue } {
-    const schema = params.action.input_schema?.zod;
-    if (!schema) return { input: params.payload };
-    const parsed = schema.safeParse(params.payload);
-    if (parsed.success) {
-      return { input: parsed.data as JsonValue };
-    }
-    return {
-      success: false,
-      error: `Invalid payload for ${params.plugin_name}.${params.action_name}: ${parsed.error.message}`,
-      message: `Invalid payload for ${params.plugin_name}.${params.action_name}`,
-    };
-  }
-
   /**
    * 运行 plugin action。
    */
   async run_action(params: {
+    context: PluginContext;
     plugin: string;
     action: string;
     payload?: JsonValue;
     execution_context?: PluginExecutionContext;
+    interactions?: SessionInteractionPort;
   }): Promise<PluginActionResult<JsonValue>> {
-    return await this.run_action_from_records(this.records, params);
+    await this.ensure_initial_started();
+    return await this.run_action_from_records(this.records, params.context, params);
   }
 
   /**
@@ -567,11 +657,13 @@ export class PluginRegistry implements AgentPlugins {
    */
   private async run_action_from_records(
     records: ReadonlyMap<string, PluginRuntimeRecord>,
+    context: PluginContext,
     params: {
       plugin: string;
       action: string;
       payload?: JsonValue;
       execution_context?: PluginExecutionContext;
+      interactions?: SessionInteractionPort;
     },
   ): Promise<PluginActionResult<JsonValue>> {
     const key = normalize_plugin_name(params.plugin);
@@ -610,43 +702,30 @@ export class PluginRegistry implements AgentPlugins {
       };
     }
 
-    try {
-      const parsed_payload = this.parseActionPayload({
-        plugin_name: record.plugin.name,
-        action_name,
-        payload: (params.payload ?? {}) as JsonValue,
-        action,
-      });
-      if (!("input" in parsed_payload)) {
-        return parsed_payload;
-      }
-      const result = await action.execute({
-        context: this.require_context(),
-        input: parsed_payload.input,
-        plugin_name: record.plugin.name,
-        action_name,
-        ...(params.execution_context
-          ? { execution_context: params.execution_context }
-          : {}),
-      });
-      return result;
-    } catch (error) {
-      return {
-        success: false,
-        error: String(error),
-        message: String(error),
-      };
-    }
+    return await execute_plugin_action({
+      context: this.plugin_context(context, record.plugin.name),
+      plugin_name: record.plugin.name,
+      action_name,
+      action,
+      payload: (params.payload ?? {}) as JsonValue,
+      ...(params.execution_context
+        ? { snapshot: params.execution_context }
+        : {}),
+      ...(params.interactions ? { interactions: params.interactions } : {}),
+    });
   }
 
   /**
    * 读取当前生效的 plugin system blocks。
    */
   async system_blocks(
+    context: PluginContext,
     execution_context?: PluginExecutionContext,
   ): Promise<AgentSessionSystemBlock[]> {
+    await this.ensure_initial_started();
     return await this.system_blocks_from_records(
       this.records,
+      context,
       execution_context,
     );
   }
@@ -656,9 +735,9 @@ export class PluginRegistry implements AgentPlugins {
    */
   private async system_blocks_from_records(
     records: ReadonlyMap<string, PluginRuntimeRecord>,
+    context: PluginContext,
     execution_context?: PluginExecutionContext,
   ): Promise<AgentSessionSystemBlock[]> {
-    const context = this.require_context();
     const out: AgentSessionSystemBlock[] = [];
     for (const record of records.values()) {
       const plugin = record.plugin;
@@ -666,11 +745,15 @@ export class PluginRegistry implements AgentPlugins {
       if (typeof plugin.system !== "function") continue;
       try {
         if (typeof plugin.availability === "function") {
-          const availability = await plugin.availability(context);
+          const plugin_context = this.plugin_context(context, plugin.name);
+          const availability = await plugin.availability(plugin_context);
           if (!availability.available) continue;
         }
         const text = String(
-          await plugin.system(context, execution_context),
+          await plugin.system(
+            this.plugin_context(context, plugin.name),
+            execution_context,
+          ),
         ).trim();
         if (!text) continue;
         out.push({
@@ -688,15 +771,15 @@ export class PluginRegistry implements AgentPlugins {
   /**
    * 创建当前 configured registry 的 Session step 执行视图。
    */
-  execution_view(): AgentPluginExecutionRuntime {
+  execution_view(context: PluginContext): AgentPluginExecutionRuntime {
     const records = new Map(this.records);
     return {
       read: (params) => this.read_from_records(records, params),
       run_action: async (params) =>
-        await this.run_action_from_records(records, params),
+        await this.run_action_from_records(records, context, params),
       system_blocks: async (execution_context) =>
-        await this.system_blocks_from_records(records, execution_context),
-      acquire: () => this.acquire_execution_view(records),
+        await this.system_blocks_from_records(records, context, execution_context),
+      acquire: () => this.acquire_execution_view(records, context),
     };
   }
 
@@ -705,6 +788,7 @@ export class PluginRegistry implements AgentPlugins {
    */
   private acquire_execution_view(
     records: ReadonlyMap<string, PluginRuntimeRecord>,
+    context: PluginContext,
   ): AgentPluginExecutionLease {
     const leased_records = new Map<string, PluginRuntimeRecord>();
     for (const [name, record] of records) {
@@ -723,10 +807,11 @@ export class PluginRegistry implements AgentPlugins {
     return {
       read: (params) => this.read_from_records(leased_records, params),
       run_action: async (params) =>
-        await this.run_action_from_records(leased_records, params),
+        await this.run_action_from_records(leased_records, context, params),
       system_blocks: async (execution_context) =>
         await this.system_blocks_from_records(
           leased_records,
+          context,
           execution_context,
         ),
       release: async () => {
@@ -776,12 +861,13 @@ export class PluginRegistry implements AgentPlugins {
     }
     record.retirement_started = true;
     void (async () => {
+      const logger = this.agent_context.logger;
       try {
         await this.stop_record(record);
       } catch (error) {
         update_record_state(record, "error", String(error));
         try {
-          await this.require_context().logger.log(
+          await logger?.log(
             "error",
             "[plugin] lifecycle.stop failed after execution release",
             {

package/src/plugin/tool/PluginToolRuntime.ts

@@ -53,7 +53,10 @@ export async function invoke_plugin_call_tool(
       plugin,
       action,
       payload,
-      execution_context: turn_context.step.plugin_execution_context(),
+      execution_context: turn_context.step.plugin_execution_context(params.call_id),
+      ...(turn_context.interactions
+        ? { interactions: turn_context.interactions }
+        : {}),
     });
     return {
       output: {

package/src/plugin/tool/PluginToolSchemas.ts

@@ -4,14 +4,13 @@
  * 关键点（中文）
  * - plugin_call 是 agent 内置的最低层 plugin action 入口。
  * - plugin_call.payload 是透传给具体 plugin action 的 JSON object。
- * - 这里不用 Zod 表达 payload 的开放对象语义，避免 AI SDK zodSchema
+ * - 这里不用 Zod 表达 payload 的开放对象语义，避免 JSON Schema
  *   转换后把 additionalProperties 收窄为 false。
  */
 
-import { jsonSchema } from "ai";
 import { z } from "zod";
 
-export const plugin_call_input_schema = jsonSchema({
+export const plugin_call_input_schema = {
   type: "object",
   required: ["plugin", "action"],
   additionalProperties: false,
@@ -31,7 +30,7 @@ export const plugin_call_input_schema = jsonSchema({
       description: "JSON payload passed to the plugin action.",
     },
   },
-});
+};
 
 export const plugin_read_input_schema = z.object({
   plugin: z

package/src/plugin/tool/PluginTools.ts

@@ -1,13 +1,16 @@
 /**
- * Plugin AI SDK tools。
+ * Plugin 运行时工具。
  *
  * 设计目标（中文）
  * - plugin_call 是 agent 内置 plugin action 的底层能力入口。
- * - tool 只负责 AI SDK 工具协议适配，不理解具体 plugin 的业务语义。
+ * - tool 只负责 Downcity Runtime Tool 协议适配，不理解具体 plugin 的业务语义。
  * - Plugin Action 返回的 messages 由 Executor 的统一 ActionResult 边界分流。
  */
 
-import { tool, type ToolExecutionOptions } from "ai";
+import {
+  define_runtime_tool,
+  type RuntimeToolExecutionOptions as ToolExecutionOptions,
+} from "@downcity/type";
 import type {
   AgentPluginTools,
   CreatePluginToolsOptions,
@@ -31,7 +34,7 @@ import type { SessionTurnContext } from "@/types/executor/SessionTurnContext.js"
 function require_turn_context(
   options: ToolExecutionOptions,
 ): SessionTurnContext {
-  const execution_context = options.experimental_context as
+  const execution_context = options.context as
     | Partial<SessionToolExecutionContext>
     | undefined;
   const turn_context = execution_context?.session_turn_context;
@@ -45,14 +48,15 @@ function require_turn_context(
  * 创建 `plugin_call`：调用当前 Agent 已注册 plugin action。
  */
 export function create_plugin_call_tool(options: CreatePluginToolsOptions) {
-  return tool({
+  return define_runtime_tool<PluginCallInput>({
     description:
       "Call a registered agent plugin action. Use plugin_read first when you need the action list, input schema, or examples. Generated files may be attached to the final assistant message automatically.",
-    inputSchema: plugin_call_input_schema,
+    input_schema: plugin_call_input_schema,
     execute: async (input, execution_options) =>
       await invoke_plugin_call_tool({
         plugins: options.plugins,
         turn_context: require_turn_context(execution_options),
+        call_id: String(execution_options.tool_call_id || "").trim(),
         input: input as PluginCallInput,
       }),
   });
@@ -62,10 +66,10 @@ export function create_plugin_call_tool(options: CreatePluginToolsOptions) {
  * 创建 `plugin_read`：读取当前 Agent 已注册 plugin / action metadata。
  */
 export function create_plugin_read_tool(options: CreatePluginToolsOptions) {
-  return tool({
+  return define_runtime_tool<PluginReadInput>({
     description:
       "Read registered agent plugin metadata, including action names, descriptions, input schemas, and examples. Use this before plugin_call when the payload shape is unclear.",
-    inputSchema: plugin_read_input_schema,
+    input_schema: plugin_read_input_schema,
     execute: async (input, execution_options) =>
       await invoke_plugin_read_tool({
         plugins: options.plugins,

package/src/plugin/types/ActionSchedule.ts

@@ -27,6 +27,10 @@ export interface ActionScheduleJobRecord {
    * ActionSchedule 任务唯一 ID。
    */
   id: string;
+  /** 执行该任务的 Agent 稳定标识。 */
+  agent_id: string;
+  /** 任务所属 Workspace 的稳定标识。 */
+  workspace_id?: string;
   /**
    * 目标 plugin 名称。
    */
@@ -65,6 +69,8 @@ export interface ActionScheduleJobRecord {
  * 创建 ActionSchedule 任务所需输入。
  */
 export interface CreateActionScheduleJobInput {
+  /** 任务执行时解析 PluginContext 所需的 Workspace 稳定标识；省略时使用当前活动 Workspace。 */
+  workspace_id: string;
   /**
    * 目标 plugin 名称。
    */

package/src/remote/transports/HttpRemoteAgentTransport.ts

@@ -78,9 +78,7 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
       headers: this.headers({
         "Content-Type": "application/json",
       }),
-      body: JSON.stringify({
-        ...(input?.session_id ? { session_id: input.session_id } : {}),
-      }),
+      body: JSON.stringify({}),
     });
     if (!payload.success || !payload.session?.session_id) {
       throw new Error(String(payload.error || "Remote session create failed"));
@@ -259,6 +257,7 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
       typeof input === "string"
         ? String(input || "").trim() || undefined
         : String(input?.message_id || "").trim() || undefined;
+    const include_message = typeof input === "string" || input?.include_message !== false;
     const payload = await read_http_json<{
       success?: boolean;
       error?: string;
@@ -270,6 +269,7 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
       }),
       body: JSON.stringify({
         ...(message_id ? { message_id: message_id } : {}),
+        ...(message_id && !include_message ? { include_message: false } : {}),
       }),
     });
     if (!payload.success || !payload.session?.session_id) {