@springbrand/agent-runtime 0.1.3-alpha.4 → 0.1.3-alpha.6

package/src/kernel/runtime-load.ts

@@ -1,5 +1,94 @@
 import type { RuntimeLoadPhase, RuntimeLoadState } from "./state";
 
+/** Hard ceiling for one Host-owned Runtime definition phase. */
+export const RUNTIME_LOAD_TIMEOUT_MS = 180_000;
+
+/** Hard ceiling for one optional external capability load. */
+export const RUNTIME_CAPABILITY_LOAD_TIMEOUT_MS = 60_000;
+
+const reportedFailures = new WeakSet<object>();
+
+function errorText(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+/** Emit one stable structured record for a Runtime load failure. */
+export function logRuntimeLoadFailure(
+  step: string,
+  error: unknown,
+  details: {
+    reason?: "error" | "timeout";
+    timeoutMs?: number;
+    durationMs?: number;
+  } = {},
+): void {
+  if (typeof error === "object" && error !== null) {
+    if (reportedFailures.has(error)) return;
+    reportedFailures.add(error);
+  }
+  console.error(
+    "[runtime-load:failed]",
+    JSON.stringify({
+      step,
+      reason: details.reason ?? "error",
+      ...(details.timeoutMs !== undefined
+        ? { timeoutMs: details.timeoutMs }
+        : {}),
+      ...(details.durationMs !== undefined
+        ? { durationMs: details.durationMs }
+        : {}),
+      error: errorText(error),
+    }),
+  );
+}
+
+/** Stop waiting for one Runtime load boundary and report any failure once. */
+export async function withRuntimeLoadTimeout<T>(
+  step: string,
+  load: () => T | PromiseLike<T>,
+  options: {
+    timeoutMs?: number;
+    onLateResult?: (value: T) => void | Promise<void>;
+  } = {},
+): Promise<T> {
+  const timeoutMs = options.timeoutMs ?? RUNTIME_CAPABILITY_LOAD_TIMEOUT_MS;
+  const startedAt = Date.now();
+  let timeout: ReturnType<typeof setTimeout> | undefined;
+  let timedOut = false;
+  const operation = Promise.resolve().then(load);
+
+  if (options.onLateResult) {
+    void operation.then(async (value) => {
+      if (timedOut) await options.onLateResult!(value);
+    }, () => undefined).catch((error) => {
+      logRuntimeLoadFailure(`${step}:late-cleanup`, error);
+    });
+  }
+
+  try {
+    return await Promise.race([
+      operation,
+      new Promise<never>((_, reject) => {
+        timeout = setTimeout(() => {
+          timedOut = true;
+          reject(new Error(
+            `Runtime load step "${step}" timed out after ${timeoutMs}ms`,
+          ));
+        }, timeoutMs);
+      }),
+    ]);
+  } catch (error) {
+    logRuntimeLoadFailure(step, error, {
+      reason: timedOut ? "timeout" : "error",
+      timeoutMs,
+      durationMs: Date.now() - startedAt,
+    });
+    throw error;
+  } finally {
+    if (timeout !== undefined) clearTimeout(timeout);
+  }
+}
+
 /**
  * 装载状态机与宿主之间的全部接触面。
  *

package/src/layers/orchestration/temporary-agent/core.ts

@@ -1,9 +1,21 @@
+import type { ExecutionLevel } from "../../../lib/execution-level";
+
+export const TEMPORARY_AGENT_LAUNCH_KEY =
+  "universal-agent:temporary-agent-launch";
+
 export interface TemporaryAgentRequest {
   subagentName: string;
   instructions: string;
   task: string;
 }
 
+export interface TemporaryAgentLaunch<Config = unknown>
+  extends TemporaryAgentRequest {
+  runtimeKey: string;
+  config: Config;
+  executionLevel: ExecutionLevel;
+}
+
 export interface TemporaryAgentRunContext {
   signal: AbortSignal;
   requestId: string;
@@ -149,4 +161,3 @@ export class TemporaryAgentCoordinator {
     });
   }
 }
-import type { ExecutionLevel } from "../../../lib/execution-level";

package/src/layers/orchestration/temporary-agent/runner.ts

@@ -10,7 +10,6 @@ const BLOCKED_TOOLS = new Set([
   "resume_schedule",
   "change_schedule_agent",
   "cancel_schedule",
-  "execute",
   "set_context",
   "load_context",
   "search_context",
@@ -25,7 +24,7 @@ const BLOCKED_TOOLS = new Set([
  * @remarks
  * 宿主在装配临时 Agent 的平台、Workspace、Sandbox 和其他 Tool 时调用；调用方可再加名字或前缀黑名单。
  *
- * 固定黑名单排除再次委派、调度、主 Session 上下文和绕过隔离边界的 execute，以保持单层临时 Agent 和已确认的继承范围。
+ * 固定黑名单排除再次委派、调度和主 Session 上下文，以保持单层临时 Agent 和已确认的继承范围。
  *
  * Agent、Session、Workspace 和 Tool 的术语见 `src/index.ts`。
  */

package/src/lib/mcp.ts

@@ -1,4 +1,5 @@
 import type { RetryOptions } from "agents";
+import { withRuntimeLoadTimeout } from "../kernel/runtime-load";
 
 const MCP_RETRY: RetryOptions = {
   maxAttempts: 3,
@@ -63,9 +64,12 @@ export async function connectConfiguredMcpServers(
   const servers = [...pending.values()];
   const settled = await Promise.allSettled(
     servers.map((server) =>
-      host.addMcpServer(server.name, server.url, {
-        retry: MCP_RETRY,
-      }),
+      withRuntimeLoadTimeout(
+        `mcp:${server.name}:connect`,
+        () => host.addMcpServer(server.name, server.url, {
+          retry: MCP_RETRY,
+        }),
+      ),
     ),
   );
   const failed = settled.flatMap((result, index) =>

package/src/pi/assembly/context.ts

@@ -367,7 +367,7 @@ async function readMemory(
   return { blocks, degradations };
 }
 
-// 作用：把已授权 Skill 的持久化 catalog 整理成提示词。
+// 作用：把已配置 Skill 的持久化 catalog 整理成提示词。
 // 调用：系统上下文装配在需要告诉模型当前可用 Skill 时调用。
 // 原因：catalog 已在发布和绑定时固定，装配期不得为此访问远端内容来源。
 function renderSkillCatalog(
@@ -379,8 +379,8 @@ function renderSkillCatalog(
   if (bindings.length === 0) return null;
 
   return [
-    "AUTHORIZED SKILLS",
-    "Use an authorized Skill when its description matches. Read its instructions or files only through the authorized Skill tool.",
+    "AVAILABLE SKILLS",
+    "Use an available Skill when its description matches. Read its instructions or files only through the Skill tools.",
     "",
     ...bindings.map(
       ({ name, description }) => `- ${name}: ${description}`,

package/src/pi/assembly/extensions.ts

@@ -11,6 +11,7 @@ import type {
   RuntimeExtensionPermissions,
 } from "../../kernel/extensions";
 import type { RuntimeDegradation } from "../../kernel/degradation";
+import { withRuntimeLoadTimeout } from "../../kernel/runtime-load";
 import { sanitizeExtensionName } from "../../lib/extension-name";
 import type { PiToolCandidate } from "../tool/compiler";
 
@@ -42,9 +43,6 @@ export interface PiLoadedExtension {
 
 export interface AssemblePiExtensionsOptions {
   readonly extensions: readonly RuntimeExtensionConfig[];
-  readonly published: ReadonlySet<string>;
-  readonly enabled: ReadonlySet<string>;
-  readonly authorized: ReadonlySet<string>;
   readonly load: (
     extension: RuntimeExtensionConfig,
   ) => Promise<LoadedRuntimeExtension>;
@@ -237,7 +235,7 @@ const EXTENSION_HOOK_NAMES = [
  * 通过 Cloudflare ExtensionManager 加载一个 Extension，并只暴露 Runtime 需要的描述和执行能力。
  *
  * @remarks
- * Runtime 准备阶段会对已授权 Extension 调用，资源发布的 smoke test 也会用它校验候选源码；调用方必须提供 WorkerLoader，并在权限需要时提供 Host 绑定工厂。
+ * Runtime 准备阶段会对已配置 Extension 调用，资源发布的 smoke test 也会用它校验候选源码；调用方必须提供 WorkerLoader，并在权限需要时提供 Host 绑定工厂。
  *
  * discovery 使用剔除权限的 manifest，有外部访问的执行 isolate 则延迟到首次 Tool 执行时创建。这是为了防止 `describe()` 在授权和审批前获得网络或 Host 能力，不能随意合并两条加载路径。
  *
@@ -267,9 +265,12 @@ export async function loadPiExtension(
   const { permissions: _ignored, ...manifestWithoutPermissions } =
     extension.manifest;
   try {
-    await discovery.load(
-      manifestWithoutPermissions as ExtensionManifest,
-      extension.source,
+    await withRuntimeLoadTimeout(
+      `extension:${name}:discover`,
+      () => discovery.load(
+        manifestWithoutPermissions as ExtensionManifest,
+        extension.source,
+      ),
     );
   } catch (cause) {
     // Upstream assumes describe() yields an array and throws an opaque TypeError
@@ -507,20 +508,17 @@ export function extensionToolRequiredExecutionLevel(
 }
 
 /**
- * 把当前已发布、已启用且已授权的 Extension 装配成 Runtime 能力。
+ * 把当前已配置的 Extension 装配成 Runtime 能力。
  *
  * @remarks
- * Runtime 准备阶段和资源 smoke test 调用；调用方传入三个选择集合及一个已经确定加载策略的 `load`。
+ * Runtime 准备阶段和资源 smoke test 调用；调用方传入已选 Extension 及已确定加载策略的 `load`。
  *
- * 只有同时通过三道选择的 Extension 才会被加载，单个加载失败记为 degradation 而不影响其他项；不要绕过这个交集直接注册 Tool。
+ * 单个加载失败记为 degradation 而不影响其他项。
  *
  * 核心术语见包入口 `index.ts`。
  */
 export async function assemblePiExtensions({
   extensions,
-  published,
-  enabled,
-  authorized,
   load,
 }: AssemblePiExtensionsOptions): Promise<PiExtensionAssembly> {
   const loadedExtensions: PiLoadedExtension[] = [];
@@ -530,14 +528,6 @@ export async function assemblePiExtensions({
 
   for (const extension of extensions) {
     const name = extension.manifest.name.trim();
-    if (
-      !published.has(name) ||
-      !enabled.has(name) ||
-      !authorized.has(name)
-    ) {
-      continue;
-    }
-
     let loaded: LoadedRuntimeExtension;
     try {
       loaded = await load(extension);
@@ -608,7 +598,6 @@ export async function assemblePiExtensions({
       });
       candidates.push(Object.freeze({
         owner: `extension:${name}@${extension.manifest.version}`,
-        authorized: true,
         requiredExecutionLevel,
         summary: description,
         tool,

package/src/pi/assembly/snapshot.ts

@@ -22,7 +22,7 @@ import type { PiToolCandidate } from "../tool/compiler";
  */
 export interface PiToolSurface {
   finalize(
-    authorizedCandidates: readonly PiToolCandidate[],
+    candidates: readonly PiToolCandidate[],
   ): readonly PiToolCandidate[];
 }
 

package/src/pi/message/contract.ts

@@ -2,6 +2,13 @@ import type { UIMessage } from "ai";
 
 export type UIChatTrigger = "submit-message" | "regenerate-message";
 
+/** A user-selected Runtime capability persisted with the visible UIMessage. */
+export interface RequestedCapability {
+  readonly kind: "skill" | "plan";
+  readonly name: string;
+  readonly label: string;
+}
+
 export interface UIChatRequestBody {
   readonly messages: readonly UIMessage[];
   readonly trigger: UIChatTrigger;

package/src/pi/message/conversion.ts

@@ -26,6 +26,7 @@ function attachmentText(
 
 function userContent(
   parts: ReadonlyArray<UIMessage["parts"][number]>,
+  privateContext?: string,
 ): UserMessage["content"] {
   const content: Exclude<UserMessage["content"], string> = [];
   for (const part of parts) {
@@ -46,16 +47,23 @@ function userContent(
     }
   }
   if (content.length === 0) throw new Error("User message content is required");
+  if (privateContext) {
+    content.unshift({
+      type: "text",
+      text: `[Agent private context]\n${privateContext}\n[/Agent private context]`,
+    });
+  }
   return content;
 }
 
 /** Convert an official user UIMessage into canonical Pi model input. */
 export function uiUserMessageToPi(
   message: UIMessage & { readonly role: "user" },
+  privateContext?: string,
 ): UserMessage {
   return {
     role: "user",
-    content: userContent(message.parts),
+    content: userContent(message.parts, privateContext),
     timestamp: timestampOf(message),
   };
 }

package/src/pi/runtime-adapter/assembly.ts

@@ -248,10 +248,12 @@ function describeTools(candidates: readonly PiToolCandidate[]) {
       name: candidate.tool.name,
       owner: candidate.owner,
       label: candidate.tool.label,
-      description:
-        candidate.tool.description ?? candidate.tool.label,
+      description: candidate.tool.description ?? candidate.tool.label,
       parameters: candidate.tool.parameters,
       requiredExecutionLevel: candidate.requiredExecutionLevel,
+      ...(candidate.alwaysRequiresApproval
+        ? { alwaysRequiresApproval: true }
+        : {}),
       ...(candidate.source ? { source: candidate.source } : {}),
       retry: piToolRetryPolicy(candidate),
     }))
@@ -390,16 +392,8 @@ async function preparePiAssembly(
   options: PreparePiAssemblyOptions,
 ): Promise<PreparedPiAssembly> {
   const { snapshot } = options;
-  const extensionNames = new Set(
-    snapshot.pi.extensions.map((extension) =>
-      extension.manifest.name.trim()
-    ),
-  );
   const extensions = await assemblePiExtensions({
     extensions: snapshot.pi.extensions,
-    published: extensionNames,
-    enabled: extensionNames,
-    authorized: extensionNames,
     load: async (extension) => {
       const workspacePermission =
         extension.manifest.permissions?.workspace ?? "none";

package/src/pi/runtime-adapter/index.ts

@@ -107,8 +107,11 @@ export class PiRuntimeAdapter {
    * 实现理由：转换只生成 Pi UserMessage 的 content 和 timestamp，原始浏览器视图由 transcript sidecar 另行保存。
    * 不要把 UI id、metadata 或原始 part 结构并入 canonical message。
    */
-  normalizeUserInput(input: UIMessage & { role: "user" }) {
-    return uiUserMessageToPi(input);
+  normalizeUserInput(
+    input: UIMessage & { role: "user" },
+    privateContext?: string,
+  ) {
+    return uiUserMessageToPi(input, privateContext);
   }
 
   resolveApiKey(
@@ -209,6 +212,7 @@ export class PiRuntimeAdapter {
 }
 
 export type {
+  RequestedCapability,
   UIChatRequestBody,
 } from "../message";
 export type { PiToolApproval } from "../turn";

package/src/pi/tool/base.ts

@@ -8,6 +8,10 @@ import type { RuntimeMemoryPort } from "../../kernel/bindings";
 import type { RuntimeMemoryProfile } from "../../kernel/profile";
 import { serializeOutput } from "../../lib/artifacts";
 import type { PiToolCandidate } from "./compiler";
+import {
+  toolRegistryFromPiCandidates,
+  type ToolRegistry,
+} from "../../tool-registry";
 import { webSearchPiToolCandidate } from "./web-search";
 import type { WebSearch } from "./web-search/api";
 
@@ -140,7 +144,6 @@ function result<T>(details: T): AgentToolResult<T> {
 function candidate<T extends TSchema>(tool: AgentTool<T>): PiToolCandidate {
   return {
     owner: "runtime-base",
-    authorized: true,
     requiredExecutionLevel: "safe",
     source: "action",
     tool,
@@ -265,9 +268,21 @@ export function memoryPiToolCandidate(
   };
   return {
     owner: "runtime-memory",
-    authorized: true,
     requiredExecutionLevel: "safe",
     source: "action",
     tool,
   };
 }
+
+/** 从 Memory Port 生成 `set_context` Tool。 */
+export function createMemoryTools(
+  memory: RuntimeMemoryPort,
+  profile: Pick<
+    RuntimeMemoryProfile,
+    "memoryTokens" | "preferencesTokens"
+  >,
+): ToolRegistry {
+  return toolRegistryFromPiCandidates([
+    memoryPiToolCandidate(memory, profile),
+  ]);
+}

package/src/pi/tool/compiler.ts

@@ -36,7 +36,6 @@ export interface PiToolInteractionSpec {
 /** 描述一个尚未进入最终 Tool Surface 和结算包装的 Pi 工具。 */
 export interface PiToolCandidate {
   readonly owner: string;
-  readonly authorized: boolean;
   readonly tool: AgentTool<any, any>;
   /** Conservative maximum used in the stable Runtime descriptor. */
   readonly requiredExecutionLevel: ExecutionLevel;

package/src/pi/tool/core.ts

@@ -12,6 +12,10 @@ import { serializeOutput } from "../../lib/artifacts";
 import type { PiLoadedExtension } from "../assembly/extensions";
 import { aiToolToPi } from "./ai-adapter";
 import type { PiToolCandidate } from "./compiler";
+import {
+  toolRegistryFromPiCandidates,
+  type ToolRegistry,
+} from "../../tool-registry";
 
 // 本文件沿用 `../../index.ts` 入口定义的 Extension、Port 和 Tool Candidate 术语。
 
@@ -47,7 +51,6 @@ export function browserQuickActionPiToolCandidates(
   return Object.entries(createQuickActionTools({ browser })).map(
     ([name, tool]) => ({
       owner: "core:browser",
-      authorized: true,
       requiredExecutionLevel: "low",
       tool: aiToolToPi(name, tool, {
         label: BROWSER_TOOL_LABELS[name] ?? name,
@@ -90,7 +93,6 @@ export function listExtensionsPiToolCandidate(
   };
   return {
     owner: "core:extensions",
-    authorized: true,
     requiredExecutionLevel: "low",
     tool,
   };
@@ -170,7 +172,6 @@ export function codeExecutionPiToolCandidate(
   };
   return {
     owner: "core:codemode",
-    authorized: true,
     requiredExecutionLevel: "high",
     source: "codemode",
     summary: "Run JavaScript with network and configured connector access",
@@ -178,4 +179,13 @@ export function codeExecutionPiToolCandidate(
   };
 }
 
+/** 从 Codemode Runtime Port 生成 `execute` Tool。 */
+export function createCodeExecutionTool(
+  runtime: RuntimeCodeExecutionPort,
+): ToolRegistry {
+  return toolRegistryFromPiCandidates([
+    codeExecutionPiToolCandidate(runtime),
+  ]);
+}
+
 // #endregion

package/src/pi/tool/mcp.ts

@@ -263,7 +263,6 @@ export function createPiMcpToolCandidate(
   };
   return {
     owner: policy.owner,
-    authorized: true,
     tool,
     summary: label,
     requiredExecutionLevel: policy.requiredExecutionLevel,
@@ -278,15 +277,15 @@ export function createPiMcpToolCandidate(
 }
 
 /**
- * 把当前已连接且获授权的 MCP 工具转换成 Pi 候选工具。
+ * 把当前已配置且 ready 的 MCP 工具转换成 Pi 候选工具。
  *
  * Tool Surface 在 Runtime 准备时调用它。调用方应传入
  * Agent Host，以及同一 Runtime 快照中的 MCP 配置；未就绪、未配置或重复 URL
  * 的连接不会进入模型工具目录。
  *
  * “候选工具”是进入 Pi 编译和统一治理前的内部描述。连接、凭据和恢复由 Host
- * 与 Agents SDK 管理；本函数只做授权快照过滤、Schema 转接和公开结果投影。
- * 远端 Server 提供的 annotations 只是提示，不是本地授权边界，所以所有动态
+ * 与 Agents SDK 管理；本函数只做动态连接状态过滤、Schema 转接和公开结果投影。
+ * 远端 Server 提供的 annotations 只是提示，不是本地审批边界，所以所有动态
  * MCP 工具继续标为高风险，不能据此绕过审批。
  *
  * `Host`、`Pi`、`Runtime Snapshot` 与“候选工具”见 `../../index.ts`。

package/src/pi/tool/schedule.ts

@@ -10,6 +10,10 @@ import type {
 import type { ScheduleSpec } from "../../kernel/receipts";
 import { serializeOutput } from "../../lib/artifacts";
 import type { PiToolCandidate } from "./compiler";
+import {
+  toolRegistryFromPiCandidates,
+  type ToolRegistry,
+} from "../../tool-registry";
 
 const scheduleTriggerParameters = Type.Union([
   Type.Object({
@@ -95,7 +99,6 @@ function candidate<T extends TSchema>(
 ): PiToolCandidate {
   return {
     owner: options.owner ?? "runtime-base",
-    authorized: true,
     requiredExecutionLevel: options.requiredExecutionLevel ?? "safe",
     source: "action",
     tool,
@@ -240,3 +243,10 @@ export function schedulePiToolCandidates(
     ),
   ];
 }
+
+/** 从 {@link RuntimeSchedulePort} 生成定时任务 Tool 集。 */
+export function createScheduleTools(
+  schedule: RuntimeSchedulePort,
+): ToolRegistry {
+  return toolRegistryFromPiCandidates(schedulePiToolCandidates(schedule));
+}

package/src/pi/tool/skill.ts

@@ -13,9 +13,10 @@ import type {
 import { aiToolToPi } from "./ai-adapter";
 import type { PiToolCandidate } from "./compiler";
 
-/** An authorized Skill source and its script capabilities. */
+/** A configured Skill source and its script capabilities. */
 export interface PiSkillBinding {
   readonly name: string;
+  readonly description: string;
   readonly source: SkillSource;
   readonly script?: RuntimeSkillScriptPolicy;
 }
@@ -46,42 +47,23 @@ function scriptTools(
   })) as ToolSet;
 }
 
-// A binding authorizes one configured name even if its backing source happens
-// to contain more Skills. Source failures are also sanitized at this boundary.
-function authorizedSource(binding: PiSkillBinding): SkillSource {
-  const { name, source } = binding;
+function catalogSkillSource(binding: PiSkillBinding): SkillSource {
+  const source = binding.source;
   return {
-    id: `${source.id}:${name}`,
+    id: source.id,
     get fingerprint() {
-      return `${source.fingerprint}:${name}`;
-    },
-    async list() {
-      return (await source.list()).filter((skill) => skill.name === name);
-    },
-    async load(requested) {
-      if (requested !== name) return null;
-      try {
-        const skill = await source.load(requested);
-        return skill?.name === name ? skill : null;
-      } catch (cause) {
-        throw new Error(`Skill unavailable: ${name}`, { cause });
-      }
+      return source.fingerprint;
     },
+    // Runtime configuration already resolved the catalogue; Skill content stays lazy.
+    list: async () => [{
+      name: binding.name,
+      description: binding.description,
+      sourceId: source.id,
+    }],
+    load: (name) => source.load(name),
     ...(source.readResource
-      ? {
-          async readResource(requested: string, path: string) {
-            if (requested !== name) return null;
-            try {
-              const resource = await source.readResource!(requested, path);
-              return resource?.path === path ? resource : null;
-            } catch (cause) {
-              throw new Error(
-                `Skill resource unavailable: ${name}/${path}`,
-                { cause },
-              );
-            }
-          },
-        }
+      ? { readResource: (name: string, path: string) =>
+        source.readResource!(name, path) }
       : {}),
     ...(source.refresh ? { refresh: () => source.refresh!() } : {}),
   };
@@ -123,6 +105,9 @@ const SKILL_TOOL_LABELS: Readonly<Record<string, string>> = {
   run_skill_script: "Run Skill script",
 };
 
+const SKILL_ENTRY_READ_GUIDANCE =
+  "SKILL.md contains the Skill instructions; use activate_skill instead.";
+
 /** Create Pi candidates from the official Agents SDK SkillRegistry tools. */
 export async function skillPiToolCandidates(
   bindings: readonly PiSkillBinding[],
@@ -131,17 +116,46 @@ export async function skillPiToolCandidates(
   if (bindings.length === 0) return [];
 
   const registry = new SkillRegistry(
-    bindings.map(authorizedSource),
+    bindings.map(catalogSkillSource),
     scriptRunner(bindings, options),
   );
   await registry.load();
 
-  return Object.entries(registry.tools()).map(([name, tool]) => ({
-    owner: "runtime-skill",
-    authorized: true,
-    requiredExecutionLevel: name === "run_skill_script" ? "high" : "safe",
-    tool: aiToolToPi(name, tool, {
+  return Object.entries(registry.tools()).map(([name, tool]) => {
+    const adapted = aiToolToPi(name, tool, {
       label: SKILL_TOOL_LABELS[name] ?? name,
-    }),
-  }));
+      ...(name === "read_skill_resource"
+        ? {
+            description:
+              "Read a bundled resource listed by activate_skill. Do not pass SKILL.md; activate_skill returns the Skill instructions.",
+          }
+        : {}),
+    });
+    if (name === "read_skill_resource") {
+      const execute = adapted.execute;
+      adapted.execute = (toolCallId, input, signal) => {
+        const target = input as { name?: unknown; path?: unknown };
+        const parts = typeof target.path === "string"
+          ? target.path.split("/")
+          : [];
+        if (
+          target.path === "SKILL.md" ||
+          (target.name === undefined &&
+            parts.length === 2 &&
+            parts[1] === "SKILL.md")
+        ) {
+          return Promise.resolve({
+            content: [{ type: "text", text: SKILL_ENTRY_READ_GUIDANCE }],
+            details: SKILL_ENTRY_READ_GUIDANCE,
+          });
+        }
+        return execute(toolCallId, input, signal);
+      };
+    }
+    return {
+      owner: "runtime-skill",
+      requiredExecutionLevel: name === "run_skill_script" ? "high" : "safe",
+      tool: adapted,
+    };
+  });
 }