@springbrand/agent-runtime 0.2.0-alpha.71 → 0.3.0-alpha.1

package/src/{runtime-agent-context.ts → config/agent-context.ts}

@@ -3,12 +3,12 @@ import type {
   ChatCapableAgentClass,
   RunAgentToolOptions,
 } from "agents";
-import type { ExecutionLevel } from "./lib/execution-level";
-import type { RuntimeConfigUpdateResult } from "./kernel/runtime-config";
+import type { ExecutionLevel } from "../lib/execution-level";
+import type { RuntimeConfigUpdateResult } from "./runtime-config";
 import type {
   TemporaryAgentRequest,
   TemporaryAgentRunContext,
-} from "./layers/orchestration/temporary-agent/core";
+} from "../tools/temporary-agent/core";
 
 /**
  * 描述 Agent 寻址路径中的一级父子节点。

package/src/{runtime-assembler.ts → config/assembler.ts}

@@ -14,7 +14,7 @@ import type {
   RuntimeBindings,
   RuntimeSkillScriptPolicy,
   WorkspacePort,
-} from "./kernel/bindings";
+} from "./ports";
 import {
   freezeRuntimeProfile,
   type RuntimeDenyPolicy,
@@ -22,24 +22,24 @@ import {
   type RuntimeMemoryProfile,
   type RuntimeProfile,
   type ThinkingEffort,
-} from "./kernel/profile";
-import type { RuntimeExtensionConfig } from "./kernel/extensions";
-import type { RuntimeDegradation } from "./kernel/degradation";
+} from "./profile";
+import type { RuntimeExtensionConfig } from "../context/extension/contracts";
+import type { RuntimeDegradation } from "./degradation";
 import {
   EXECUTION_LEVELS,
   type ExecutionLevel,
-} from "./lib/execution-level";
+} from "../lib/execution-level";
 import {
   createPiRuntimeAssembly,
   type FinalizedPiToolSurface,
   type PiToolSurface,
   type PiRuntimeAssembly,
-} from "./pi/assembly/snapshot";
+} from "./assembly-snapshot";
 import type { AgentTool } from "@earendil-works/pi-agent-core";
 import type {
   PiToolCandidate,
   ToolExposureMode,
-} from "./pi/tool/compiler";
+} from "../tools/compiler";
 import type {
   AssembleRuntimeSnapshotInput,
   RuntimeSettings,
@@ -48,36 +48,36 @@ import type {
   RuntimeSkillBodyTransform,
   RuntimeSkillContribution,
   RuntimeToolSurfacePolicy,
-} from "./runtime-definition";
-import type { RuntimeCodeExecutionFactory } from "./kernel/bindings";
+} from "./definition";
+import type { RuntimeCodeExecutionFactory } from "./ports";
 import {
   basePiToolCandidates,
   memoryPiToolCandidate,
-} from "./pi/tool/base";
+} from "../tools/base";
 import {
   BROWSER_EXECUTE_TOOL_NAME,
   browserExecutionPiToolCandidate,
   codeExecutionPiToolCandidate,
-} from "./pi/tool/core";
-import { skillPiToolCandidates } from "./pi/tool/skill";
-import { createWebSearch, WEB_SEARCH_MODEL } from "./pi/tool/web-search";
-import { subagentPiToolCandidates } from "./pi/tool/subagent";
-import { resolvePiModel } from "./pi/runtime-adapter/models";
+} from "../tools/core";
+import { skillPiToolCandidates } from "../tools/skill";
+import { createWebSearch, WEB_SEARCH_MODEL } from "../tools/web-search";
+import { subagentPiToolCandidates } from "../tools/subagent";
+import { resolvePiModel } from "../models";
 import {
   normalizeAgentTelemetryBinding,
   type AgentTelemetryBinding,
-} from "./telemetry/contract";
-import { BUILT_IN_RUNTIME_SKILLS } from "./skills";
+} from "../telemetry/contract";
+import { BUILT_IN_RUNTIME_SKILLS } from "../skills";
 
 /** Runtime Assembler：校验一份扁平输入并生成可原子提交的 Snapshot。 */
 
-export type { RuntimeDegradation } from "./kernel/degradation";
+export type { RuntimeDegradation } from "./degradation";
 export type {
   RuntimeExtensionContribution,
   RuntimeProfileContribution,
   RuntimeSkillContribution,
   RuntimeToolSurfacePolicy,
-} from "./runtime-definition";
+} from "./definition";
 
 /** Host Planner 与 Runtime Assembler 之间的一次性内部 seam。 */
 export interface RuntimeAssemblyInput {
@@ -127,6 +127,7 @@ export interface RuntimeSnapshot {
  */
 export interface RuntimeCandidate {
   readonly snapshot: RuntimeSnapshot;
+  readonly runtimeKey?: string;
   readonly commitGuards: readonly (() => Promise<void>)[];
   readonly admission?: RuntimeSubmissionAdmissionHook;
   readonly telemetry?: AgentTelemetryBinding;

package/src/{kernel/runtime-assembly.ts → config/assembly-projection.ts}

@@ -1,7 +1,7 @@
-import type { RuntimeSnapshot } from "../runtime-assembler";
-import type { PreparedPiRuntime } from "../pi/runtime-adapter";
-import type { RuntimeAssemblyView } from "./runtime-assembly-view";
-export type * from "./runtime-assembly-view";
+import type { RuntimeSnapshot } from "./assembler";
+import type { PreparedPiRuntime } from "./harness-runtime";
+import type { RuntimeAssemblyView } from "./assembly-view";
+export type * from "./assembly-view";
 
 /**
  * Serializable view of the Runtime Snapshot currently installed on a Session facet.

package/src/{pi/assembly/snapshot.ts → config/assembly-snapshot.ts}

@@ -11,14 +11,14 @@ import type {
   RuntimeMcpServer,
   RuntimeProfile,
   ThinkingEffort,
-} from "../../kernel/profile";
+} from "./profile";
 import type {
   RuntimeExtensionConfig,
-} from "../../kernel/extensions";
-import type { RuntimeProviderPort } from "../../kernel/bindings";
-import { assembleSystemPrompt } from "../../lib/prompt";
-import { resolvePiModel } from "../runtime-adapter/models";
-import type { PiToolCandidate } from "../tool/compiler";
+} from "../context/extension/contracts";
+import type { RuntimeProviderPort } from "./ports";
+import { assembleSystemPrompt } from "../lib/prompt";
+import { resolvePiModel } from "../models";
+import type { PiToolCandidate } from "../tools/compiler";
 
 /**
  * 收集完动态 Extension/MCP 候选后，一次性生成最终 Tool Surface。

package/src/{runtime-definition.ts → config/definition.ts}

@@ -1,5 +1,5 @@
 import type { SkillSource } from "agents/skills";
-import type { ExecutionLevel } from "./lib/execution-level";
+import type { ExecutionLevel } from "../lib/execution-level";
 import type {
   RuntimeGatewayPort,
   RuntimeMcpHost,
@@ -8,21 +8,21 @@ import type {
   RuntimeSkillScriptPolicy,
   RuntimeSubmissionAdmissionHook,
   RuntimeTurnEventsPort,
-} from "./kernel/bindings";
+} from "./ports";
 import type {
   RuntimeDenyPolicy,
   RuntimeMcpServer,
   RuntimeMemoryProfile,
   ThinkingEffort,
-} from "./kernel/profile";
-import type { RuntimeExtensionConfig } from "./kernel/extensions";
-import type { RuntimeDegradation } from "./kernel/degradation";
-import type { PiToolCandidate } from "./pi/tool/compiler";
+} from "./profile";
+import type { RuntimeExtensionConfig } from "../context/extension/contracts";
+import type { RuntimeDegradation } from "./degradation";
+import type { PiToolCandidate } from "../tools/compiler";
 import type {
   RuntimeAgentContext,
   RuntimeAgentPlanningContext,
-} from "./runtime-agent-context";
-import type { AgentTelemetryBinding } from "./telemetry/contract";
+} from "./agent-context";
+import type { AgentTelemetryBinding } from "../telemetry/contract";
 
 /** Tool Surface 筛选策略（不含 Manifest deny 列表）。 */
 export interface ToolSurfaceSelectionPolicy {
@@ -33,10 +33,10 @@ export interface ToolSurfaceSelectionPolicy {
 
 /** Kernel 绑定仍需要的执行后端；不出现在 Definition 公开类型里。 */
 export interface RuntimeToolBindings {
-  readonly workspace?: import("./kernel/bindings").WorkspacePort;
-  readonly codeExecution?: import("./kernel/bindings").RuntimeCodeExecutionFactory;
-  readonly memory?: import("./kernel/bindings").RuntimeMemoryPort;
-  readonly subagents?: import("./kernel/bindings").RuntimeSubagentPort;
+  readonly workspace?: import("./ports").WorkspacePort;
+  readonly codeExecution?: import("./ports").RuntimeCodeExecutionFactory;
+  readonly memory?: import("./ports").RuntimeMemoryPort;
+  readonly subagents?: import("./ports").RuntimeSubagentPort;
 }
 
 /** Host 一次装配原子提交的 Tool candidates 与 Runtime 绑定。 */
@@ -75,7 +75,7 @@ export interface RuntimeToolSurfacePolicy extends ToolSurfaceSelectionPolicy {
   readonly denyPolicy?: RuntimeDenyPolicy;
 }
 
-export type { RuntimeAgentContext, RuntimeAssemblyContext } from "./runtime-agent-context";
+export type { RuntimeAgentContext, RuntimeAssemblyContext } from "./agent-context";
 
 export interface ResolvedConnectors {
   readonly servers: readonly RuntimeMcpServer[];

package/src/config/harness-runtime.ts

@@ -0,0 +1,182 @@
+import {
+  createModels,
+  type MutableModels,
+} from "@earendil-works/pi-ai";
+import {
+  configurePiModels,
+  createPiModels,
+  withProviderBoundary,
+  type PiGenerationLifecycleObserver,
+} from "../models";
+export {
+  MODEL_STREAM_STALL_TIMEOUT_MS,
+  modelRequestUrl,
+  readModelStreamStallDetails,
+} from "../models";
+import {
+  pinPiRuntime,
+  preparePiRuntime,
+  readPinnedPiRuntime,
+  readPreparedPiRuntime,
+  type PinPiRuntimeOptions,
+  type PinnedPiRuntime,
+  type PreparePiRuntimeOptions,
+  type PreparedPiRuntime,
+} from "./pinning";
+
+/**
+ * Runtime 通过这个配置入口准备、固定并读取 Harness 的模型、提示和工具输入。
+ *
+ * @remarks
+ * Runtime、Pi、Turn、Tool Candidate 和 canonical transcript 等核心术语见包入口 `../../index.ts`。
+ * 本适配器只补充以下局部术语。
+ *
+ * - Prepared Runtime 是配置加载期产生的不透明句柄。
+ *   它包含已加载 Extension、Tool candidate 和快照，但 Runtime 只能读取 revision descriptor 与 degradation。
+ * - revision descriptor 是影响执行行为的已排序 JSON 描述。
+ *   Runtime 会对它取哈希，用来识别当前 Prepared Runtime 的基础版本。
+ * - Pinned Runtime 是 Submission 准入时固定的描述符。
+ *   它在 Prepared Runtime 基础上加入动态 system context、approval mode 和 base revision。
+ * 调用方：`AgentRuntimeKernel` 在配置加载、请求准入与打开 SessionHarness 前调用这些粗粒度能力。
+ *
+ * 执行位置仍由 `SessionHarness` 拥有，消息读写和投影由 `ConversationHistory` 拥有。
+ */
+export class HarnessRuntimeConfig {
+  private readonly owner = {};
+  private readonly models: MutableModels;
+  private readonly managesModels: boolean;
+
+  /**
+   * 创建一个持有独立 Pi 模型目录的 Runtime 适配器。
+   *
+   * @remarks
+   * 调用方：生产 Runtime 使用零参数构造，测试或专用宿主可以注入已经配置好的模型目录。
+   *
+   * 实现理由：适配器只管理自己创建的目录；注入目录的生命周期和配置权仍属于注入方。
+   * 不要让 `activate()` 重配注入目录，否则会覆盖调用方准备的 provider 和模型替身。
+   */
+  constructor(options: { models?: MutableModels } = {}) {
+    this.models = options.models ?? createModels();
+    this.managesModels = !options.models;
+  }
+
+  /**
+   * 加载并预检一份可供后续准入使用的 Prepared Runtime。
+   *
+   * @remarks
+   * 调用方：Runtime 的 `initConfig()` 在取得新快照后调用，再用返回的 revision descriptor 判断是否可以切换配置。
+   *
+   * 实现理由：Extension 加载、Tool candidate 汇总和 Tool 编译预检在配置切换前一次完成。
+   * 返回值绑定当前 Adapter 的 owner，不能交给另一个 Adapter 创建 Turn。
+   */
+  prepare(
+    options: PreparePiRuntimeOptions,
+  ): Promise<PreparedPiRuntime> {
+    if (this.managesModels) {
+      createPiModels(options.snapshot.bindings.provider);
+    }
+    return preparePiRuntime(options, this.owner);
+  }
+
+  hasTool(prepared: PreparedPiRuntime, name: string): boolean {
+    return readPreparedPiRuntime(prepared, this.owner).candidates.some(
+      (candidate) => candidate.tool.name === name,
+    );
+  }
+
+  /** Read the immutable inputs consumed by the Session AgentHarness. */
+  harnessInputs(
+    prepared: PreparedPiRuntime,
+    pinnedDescriptor: string,
+    request: {
+      readonly modelSessionId?: string;
+      readonly onGeneration?: PiGenerationLifecycleObserver;
+    } = {},
+  ) {
+    const { state, descriptor } = readPinnedPiRuntime(
+      prepared,
+      this.owner,
+      pinnedDescriptor,
+    );
+    const pinnedModel = state.snapshot.pi.model;
+    let models!: MutableModels;
+    models = new Proxy(this.models, {
+      get: (target, property) => {
+        if (property === "getModel") {
+          return (provider: string, modelId: string) =>
+            provider === pinnedModel.provider && modelId === pinnedModel.id
+              ? pinnedModel
+              : target.getModel(provider, modelId);
+        }
+        if (property === "streamSimple") {
+          return withProviderBoundary(
+            target.streamSimple.bind(target),
+            request.modelSessionId,
+            request.onGeneration,
+          );
+        }
+        if (property === "completeSimple") {
+          return target.completeSimple.bind(models);
+        }
+        const value = Reflect.get(target, property, target);
+        return typeof value === "function" ? value.bind(target) : value;
+      },
+    });
+    return {
+      models,
+      model: state.snapshot.pi.model,
+      thinkingLevel: state.snapshot.pi.thinkingLevel,
+      systemPrompt: descriptor.systemPrompt,
+      candidates: state.candidates,
+      workspace: state.snapshot.bindings.workspace,
+      platform: state.snapshot.bindings.platform,
+      compaction: {
+        enabled: true,
+        // Pi compacts above contextWindow - reserveTokens. Keep the same
+        // 15% headroom within the available input budget as the pre-Harness runtime.
+        reserveTokens: Math.ceil(state.snapshot.pi.model.contextWindow -
+          (state.snapshot.pi.model.contextWindow - state.snapshot.pi.model.maxTokens) * 0.85),
+        keepRecentTokens: Math.min(
+          20_000,
+          Math.floor(state.snapshot.pi.model.contextWindow * 0.15),
+        ),
+      },
+    } as const;
+  }
+
+  /**
+   * 用已经通过加载检查的快照启用当前部署声明的模型目录。
+   *
+   * @remarks
+   * 调用方：Runtime 的 `initConfig()` 在 Prepared Runtime 和 revision 检查成功后、发布新快照前调用。
+   *
+   * 实现理由：`prepare()` 已校验所有 endpoint 模型，这里只把同一份部署目录切换到长期 Models 实例。
+   * 注入模型目录时跳过此步骤，以保留调用方对目录的配置权。
+   */
+  activate(snapshot: PreparePiRuntimeOptions["snapshot"]): void {
+    if (this.managesModels) {
+      configurePiModels(this.models, snapshot.bindings.provider);
+    }
+  }
+
+  /**
+   * 在接受 Submission 前固定本次执行使用的动态上下文和审批模式。
+   *
+   * @remarks
+   * 调用方：Runtime 的准入流程为每个新 Submission 调用，并把 descriptor 与其哈希一起持久化。
+   *
+   * 实现理由：memory、workspace 和 Extension context 可能随时间变化，所以把准入时的 Turn 字段保存在 descriptor 中。
+   * 不要把 pin 推迟到 Turn 启动后，否则已持久化的 Submission 将失去可验证的执行基线。
+   */
+  pin(options: PinPiRuntimeOptions): Promise<PinnedPiRuntime> {
+    return pinPiRuntime(options, this.owner);
+  }
+
+}
+
+export type {
+  PinPiRuntimeOptions,
+  PinnedPiRuntime,
+  PreparePiRuntimeOptions,
+  PreparedPiRuntime,
+} from "./pinning";

package/src/config/index.ts

@@ -0,0 +1,14 @@
+export * from "./activation";
+export * from "./agent-context";
+export * from "./assembler";
+export * from "./assembly-projection";
+export * from "./assembly-snapshot";
+export * from "./assembly-view";
+export * from "./definition";
+export * from "./degradation";
+export * from "./harness-runtime";
+export * from "./pinning";
+export * from "./ports";
+export * from "./profile";
+export * from "./runtime-config";
+export * from "./runtime-load";

package/src/{pi/runtime-adapter/assembly.ts → config/pinning.ts}

@@ -1,16 +1,17 @@
+import { sha256Hex } from "../lib/artifacts";
 import type {
   RuntimeBindings,
   RuntimeGatewaySession,
   RuntimePlatformPort,
-} from "../../kernel/bindings";
-import type { RuntimeDegradation } from "../../kernel/degradation";
+} from "./ports";
+import type { RuntimeDegradation } from "./degradation";
 import type {
   RuntimeExtensionPermissions,
-} from "../../kernel/extensions";
-import type { RuntimeProfile } from "../../kernel/profile";
-import type { ExecutionLevel } from "../../lib/execution-level";
-import type { RuntimeSnapshot } from "../../runtime-assembler";
-import type { FinalizedPiToolSurface, PiRuntimeAssembly } from "../assembly";
+} from "../context/extension/contracts";
+import type { RuntimeProfile } from "./profile";
+import type { ExecutionLevel } from "../lib/execution-level";
+import type { RuntimeSnapshot } from "./assembler";
+import type { FinalizedPiToolSurface, PiRuntimeAssembly } from "../context";
 import {
   assemblePiSystemContext,
   assemblePiExtensions,
@@ -18,14 +19,35 @@ import {
   type PiExtensionAssembly,
   type PiExtensionContextContribution,
   type PiLoadedExtension,
-} from "../assembly";
+} from "../context";
 import {
   createPiGatewayToolCandidates,
   createPiMcpToolCandidates,
   listExtensionsPiToolCandidate,
   type PiMcpHost,
   type PiToolCandidate,
-} from "../tool";
+} from "../tools";
+
+export interface RuntimeAssemblyPin {
+  readonly revision: string;
+  readonly descriptor: string;
+}
+
+/** A saved pin is reusable only with its original Runtime key and intact descriptor. */
+export async function validateRuntimeAssemblyPin(
+  runtimeKey: string,
+  pin: RuntimeAssemblyPin,
+): Promise<boolean> {
+  if (!runtimeKey) {
+    throw new Error("Cannot safely recover a pinned Submission without its original Runtime key");
+  }
+  if (!pin.revision && !pin.descriptor) return false;
+  if (!pin.revision || !pin.descriptor) throw new Error("Submission assembly pin is incomplete");
+  if (pin.revision !== await sha256Hex(pin.descriptor)) {
+    throw new Error("Pinned Runtime assembly descriptor is invalid");
+  }
+  return true;
+}
 
 /**
  * 本文件负责准备 Pi 的扩展与工具，并为每次提交固定可恢复的运行描述。
@@ -85,7 +107,7 @@ interface PreparedPiAssembly {
  * 提供准备 Pi 所需的已校验 Runtime 快照和 Host 端口。
  *
  * @remarks
- * `PiRuntimeAdapter.prepare` 在加载 Runtime 配置时传入它。
+ * `HarnessRuntimeConfig.prepare` 在加载 Runtime 配置时传入它。
  *
  * 扩展绑定仍由 Host 创建，因为 Cloudflare 绑定属于 Worker 的能力边界。
  *
@@ -128,7 +150,7 @@ export interface PreparedPiRuntime {
  * 提供把一次提交固定到当前 Runtime 所需的值。
  *
  * @remarks
- * Runtime 在写入提交前的准入阶段把它交给 `PiRuntimeAdapter.pin`。
+ * Runtime 在写入提交前的准入阶段把它交给 `HarnessRuntimeConfig.pin`。
  *
  * 扩展没有可读上下文时不需要读取函数，所以该端口保持可选。
  */
@@ -165,7 +187,7 @@ export interface PinnedPiRuntime {
  * 描述一条已存提交可以恢复到哪份 Pi 配置。
  *
  * @remarks
- * `PreparedPiTurnAdapter` 在重建 Turn 前读取这个 JSON 结构。
+ * `HarnessRuntimeConfig.harnessInputs` 在打开或恢复 operation 前读取这个 JSON 结构。
  *
  * 基础版本作为准入时元数据保留，创建 Turn 时不与当前 Runtime 比较。
  */
@@ -282,7 +304,7 @@ function describeRuntime(
 class PreparedRuntime implements PreparedPiRuntime {
   // 把公开版本数据与受身份保护的内部准备状态放在同一个句柄里。
   // 只有 preparePiRuntime 会构造它，并在返回前冻结实例。
-  // owner 使用对象身份区分 PiRuntimeAdapter，避免不同适配器的句柄被混用。
+  // owner 使用对象身份区分 HarnessRuntimeConfig，避免不同适配器的句柄被混用。
   constructor(
     readonly revisionDescriptor: string,
     readonly degradations: readonly RuntimeDegradation[],
@@ -305,7 +327,7 @@ class PreparedRuntime implements PreparedPiRuntime {
 }
 
 /**
- * 为创建它的 PiRuntimeAdapter 打开准备句柄。
+ * 为创建它的 HarnessRuntimeConfig 打开准备句柄。
  *
  * @remarks
  * 固定配置和创建 Turn 都会先调用它，再读取快照、装配结果或工具候选。
@@ -326,7 +348,7 @@ export function readPreparedPiRuntime(
  * 读取已存的固定描述。
  *
  * @remarks
- * `PreparedPiTurnAdapter` 在新建或恢复 Pi Turn 前调用它。
+ * `HarnessRuntimeConfig.harnessInputs` 在新建或恢复 Pi operation 前调用它。
  *
  * Prepared Runtime 提供当前执行能力，descriptor 仅保留 Submission 固定的 Turn 字段。
  */
@@ -415,7 +437,7 @@ async function preparePiAssembly(
  * 为一份已校验的 Runtime 快照准备扩展和工具状态。
  *
  * @remarks
- * `PiRuntimeAdapter.prepare` 在 Runtime 配置阶段、快照生效前调用它。
+ * `HarnessRuntimeConfig.prepare` 在 Runtime 配置阶段、快照生效前调用它。
  *
  * 冻结句柄会保存最终候选列表，对外只提供版本描述和降级结果。
  */

package/src/{kernel/bindings.ts → config/ports.ts}

@@ -1,15 +1,17 @@
+import type { RuntimeModelInputModality } from "./profile";
 import type { SkillSource } from "agents/skills";
-import type { ScheduleSpec } from "./receipts";
-import type { RuntimeActivityProjection } from "./state";
+import type { ScheduleSpec } from "../submission/contracts";
+import type { RuntimeActivityProjection } from "../conversation/state";
 import type { ExecutionLevel } from "../lib/execution-level";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import type { PiToolCandidate } from "../pi/tool/compiler";
+import type { PiToolCandidate } from "../tools/compiler";
 import type {
   RuntimeEventConfirmation,
   RuntimeLifecycleFact,
   RuntimeSubagentUsageEvent,
   RuntimeSubagentUsageMetrics,
-} from "./submission-authority";
+} from "../tools/subagent-authority";
+export type { RuntimeModelInputModality } from "./profile";
 export type {
   RuntimeEventConfirmation,
   RuntimeLifecycleFact,
@@ -19,7 +21,7 @@ export type {
   RuntimeSubmissionAdmissionHook,
   RuntimeSubmissionAdmissionInput,
   RuntimeSubmissionAdmissionResult,
-} from "./submission-authority";
+} from "../tools/subagent-authority";
 
 // #region Workspace 端口
 
@@ -624,7 +626,7 @@ export interface RuntimeGatewayPort {
 }
 
 /** Safe catalog from an external Host; credentials and SDK clients stay there. */
-export type RuntimeMcpHost = import("../pi/tool/mcp").PiMcpHost & {
+export type RuntimeMcpHost = import("../tools/mcp").PiMcpHost & {
   readonly servers: readonly import("./profile").RuntimeMcpServer[];
 };
 
@@ -827,7 +829,7 @@ export interface RuntimeModelUsageEvent {
  * 结算事件刻意不带参数，因为它只用来记账；开始事件必须带，因为它唯一的用处
  * 就是让 Host 立刻知道「正在写的是什么」——只有工具名的话，「write 开始了」
  * 和「一个网页正在生成」之间的差别就丢了，而后者才是盯着屏幕的人要看的。
- * 参数本来就随 Tool 输入里程碑落库，这里没有多暴露任何东西。
+ * 参数本来就随 Pi Tool 调用写入 Session，这里没有多暴露任何东西。
  */
 export interface RuntimeToolStartEvent {
   readonly submissionId: string;
@@ -942,12 +944,6 @@ export type RuntimeModelProtocol =
   | "google-generative-ai"
   | "openai-codex-responses";
 
-export type RuntimeModelInputModality =
-  | "text"
-  | "image"
-  | "file"
-  | "audio"
-  | "video";
 
 /**
  * 描述一个已解析凭据的模型 API 端点。

package/src/{kernel → config}/profile.ts

@@ -1,5 +1,12 @@
 import type { ExecutionLevel } from "../lib/execution-level";
 
+export type RuntimeModelInputModality =
+  | "text"
+  | "image"
+  | "file"
+  | "audio"
+  | "video";
+
 /**
  * 指定模型在一次 Turn 中可以使用的推理强度。
  *

package/src/{kernel → config}/public-contracts.ts

@@ -11,13 +11,13 @@
  * @packageDocumentation
  */
 export * from "./profile";
-export * from "./runtime-assembly-view";
+export * from "./assembly-view";
 export * from "./runtime-config";
-export * from "../pi/message";
-export * from "./receipts";
-export * from "./state";
+export * from "../conversation/message";
+export * from "../submission/contracts";
+export * from "../conversation/state";
 export * from "../lib/execution-level";
-export type { WorkspaceRevision, WorkspaceRevisionManifest } from "../workspace-versioning";
+export type { WorkspaceRevision, WorkspaceRevisionManifest } from "../tools/workspace-versioning";
 export type {
   RuntimeEventConfirmation,
   RuntimeLifecycleFact,
@@ -27,4 +27,4 @@ export type {
   RuntimeSubmissionAdmissionHook,
   RuntimeSubmissionAdmissionInput,
   RuntimeSubmissionAdmissionResult,
-} from "./submission-authority";
+} from "../tools/subagent-authority";

package/src/{kernel → config}/runtime-load.ts

@@ -1,4 +1,4 @@
-import type { RuntimeLoadPhase, RuntimeLoadState } from "./state";
+import type { RuntimeLoadPhase, RuntimeLoadState } from "../conversation/state";
 
 /** Hard ceiling for one Host-owned Runtime definition phase. */
 export const RUNTIME_LOAD_TIMEOUT_MS = 180_000;