@theokit/sdk 2.23.0 → 2.25.0

package/dist/define-tool.d.ts

@@ -1,13 +1,21 @@
 import type { z as ZodNamespace, ZodType } from "zod";
 import type { SanitizeOptions } from "./sanitize/types.js";
 import type { CustomTool } from "./types/agent.js";
+import type { ToolResultContentBlock } from "./types/content-blocks.js";
 /**
  * Spec accepted by {@link defineTool}. `inputSchema` is a Zod schema; the
  * `handler` argument type is inferred via `z.infer<T>` — no `as` casts.
  *
  * @public
  */
-export interface DefineToolSpec<T extends ZodType> {
+/**
+ * SE16 — the handler's return type. With no `outputSchema` the tool returns a
+ * plain `string` (pre-SE16 shape). With an `outputSchema` the handler returns the
+ * STRUCTURED output inferred from it (validated + serialized to the tool result).
+ * The `[O]` tuple wrap prevents distribution so `never` maps cleanly to `string`.
+ */
+type ToolHandlerReturn<O extends ZodType> = [O] extends [never] ? string : ZodNamespace.infer<O>;
+export interface DefineToolSpec<T extends ZodType, O extends ZodType = never> {
     /** Tool name surfaced to the LLM. Same constraints as {@link CustomTool.name}. */
     name: string;
     /** Description surfaced to the LLM. */
@@ -15,7 +23,16 @@ export interface DefineToolSpec<T extends ZodType> {
     /** Zod schema describing the input. Must be `z.object(...)` at the root for the LLM tool contract. */
     inputSchema: T;
     /**
-     * Handler invoked with the parsed input. Type is inferred via `z.infer<T>`.
+     * SE16 — optional Zod schema describing the OUTPUT. When set, the handler
+     * returns the structured value inferred from it; the value is validated against
+     * this schema and serialized to the tool result (a string stays as-is, an object
+     * is JSON-stringified). A validation failure raises `ZodError`, converted to a
+     * `tool_result(isError)`. Absent ⇒ the handler returns a plain string (unchanged).
+     */
+    outputSchema?: O;
+    /**
+     * Handler invoked with the parsed input. Type is inferred via `z.infer<T>`; the
+     * return type is `z.infer<O>` when `outputSchema` is set, else `string`.
      * #65 — an optional 2nd `ToolContext` argument carries the run's `AbortSignal`,
      * so a cooperative handler can stop early when the run is cancelled. Existing
      * single-argument handlers are unaffected.
@@ -23,7 +40,18 @@ export interface DefineToolSpec<T extends ZodType> {
     handler: (input: ZodNamespace.infer<T>, ctx?: {
         signal?: AbortSignal;
         context?: unknown;
-    }) => string | Promise<string>;
+    }) => ToolHandlerReturn<O> | Promise<ToolHandlerReturn<O>>;
+    /**
+     * SE17 — map the handler's (validated) output to the compact / multimodal
+     * representation the MODEL sees in the tool_result. The handler keeps returning
+     * the FULL result (validated by `outputSchema`); `toModelOutput` shapes only what
+     * reaches the model, so app-facing detail is not forced into model context.
+     * Returns a string OR SE7 `ToolResultContentBlock[]` (text + image). Absent ⇒
+     * the tool_result is the serialized handler output (SE16 / pre-SE17 behavior).
+     * Note: observability (`onToolEnd`) sees the model-facing result this returns,
+     * not the raw handler output — the full result lives in the handler's own scope.
+     */
+    toModelOutput?: (output: ToolHandlerReturn<O>) => string | ToolResultContentBlock[];
     /**
      * Sanitize the raw model-emitted args BEFORE schema validation (`@theokit/sdk/sanitize`).
      * `true` trims whitespace; an object opts into coercion / JSON-repair. Coercion is schema-aware
@@ -32,20 +60,5 @@ export interface DefineToolSpec<T extends ZodType> {
      */
     sanitize?: boolean | SanitizeOptions;
 }
-/**
- * Type-safe builder for {@link CustomTool}. Converts a Zod schema to JSON
- * Schema (for the LLM-facing `inputSchema` field), wraps the handler with a
- * runtime `schema.parse` step, and preserves type inference.
- *
- * Behaviour (ADR D24):
- * - JSON Schema conversion uses Zod 4's native `z.toJSONSchema` with
- *   `unrepresentable: "any"` so transforms/refinements round-trip.
- * - Runtime parse failures throw `ZodError`; the SDK's tool-dispatch converts
- *   them to `tool_result(isError)` with the Zod message.
- * - Handler signature is `(input: z.infer<T>)`, not `Record<string, unknown>`.
- * - `zod` loads lazily via `createRequire` — consumers who don't call
- *   `defineTool` don't need `zod` installed.
- *
- * @public
- */
-export declare function defineTool<T extends ZodType>(spec: DefineToolSpec<T>): CustomTool;
+export declare function defineTool<T extends ZodType, O extends ZodType = never>(spec: DefineToolSpec<T, O>): CustomTool;
+export {};

package/dist/{errors-CkCaIqVP.d.cts → errors-DIKBXffg.d.cts}

@@ -1,4 +1,4 @@
-import { v as RunOperation } from './run-CrIulPF7.cjs';
+import { v as RunOperation } from './run-Cr0C6cOM.cjs';
 
 /**
  * Public type contract for the Budget enforcement primitive

package/dist/{errors-BuwwkrAk.d.ts → errors-DRS-kqOK.d.ts}

@@ -1,4 +1,4 @@
-import { v as RunOperation } from './run-CrIulPF7.js';
+import { v as RunOperation } from './run-Cr0C6cOM.js';
 
 /**
  * Public type contract for the Budget enforcement primitive

package/dist/errors.d.cts

@@ -1,3 +1,3 @@
-export { A as AgentDisposedError, c as AgentRunError, d as AgentRunErrorCode, e as AuthenticationError, g as BudgetExceededError, C as ConfigurationError, u as CredentialPoolExhaustedError, m as ErrorCode, E as ErrorMetadata, I as IntegrationNotConnectedError, n as InvalidTaskIdError, K as KnownAgentRunErrorCode, M as MemoryAdapterError, o as MemoryAdapterErrorCode, N as NetworkError, R as RateLimitError, p as TaskNotFoundError, T as TheokitAgentError, U as UnknownAgentError, q as UnsupportedBudgetOperationError, r as UnsupportedRunOperationError, s as UnsupportedTaskOperationError, t as isTransientError } from './errors-CkCaIqVP.cjs';
-import './run-CrIulPF7.cjs';
+export { A as AgentDisposedError, c as AgentRunError, d as AgentRunErrorCode, e as AuthenticationError, g as BudgetExceededError, C as ConfigurationError, u as CredentialPoolExhaustedError, m as ErrorCode, E as ErrorMetadata, I as IntegrationNotConnectedError, n as InvalidTaskIdError, K as KnownAgentRunErrorCode, M as MemoryAdapterError, o as MemoryAdapterErrorCode, N as NetworkError, R as RateLimitError, p as TaskNotFoundError, T as TheokitAgentError, U as UnknownAgentError, q as UnsupportedBudgetOperationError, r as UnsupportedRunOperationError, s as UnsupportedTaskOperationError, t as isTransientError } from './errors-DIKBXffg.cjs';
+import './run-Cr0C6cOM.cjs';
 import 'zod';

package/dist/eval.cjs

@@ -3457,7 +3457,8 @@ function stripSecretsFromOptions(options) {
     local: serializeLocal(options.local),
     cloud: serializeCloud(options.cloud),
     memory: serializeMemory(options.memory),
-    skills: serializeEnabledList(options.skills),
+    // SE22 — a SkillsResolver function isn't serializable; persist only the static form.
+    skills: serializeEnabledList(typeof options.skills === "function" ? void 0 : options.skills),
     // Code-`Plugin` objects are closures and cannot be persisted (like custom
     // tools); only the named-enable settings form is serialized.
     plugins: serializeEnabledList(asPluginsSettings(options.plugins)),
@@ -3765,6 +3766,7 @@ function serializeCloud2(cloud) {
   return result;
 }
 function serializeSkills(skills) {
+  if (typeof skills === "function") return void 0;
   if (skills?.enabled === void 0 || skills.enabled.length === 0) return void 0;
   return { enabled: [...skills.enabled] };
 }
@@ -5236,6 +5238,7 @@ init_errors();
 function validateCloudToolParity(options) {
   if (options.cloud === void 0) return;
   rejectFunctionSystemPrompt(options);
+  rejectFunctionSkills(options);
   rejectStdioMcpLocalPaths(options);
 }
 function rejectFunctionSystemPrompt(options) {
@@ -5246,6 +5249,14 @@ function rejectFunctionSystemPrompt(options) {
     );
   }
 }
+function rejectFunctionSkills(options) {
+  if (typeof options.skills === "function") {
+    throw new ConfigurationError(
+      "Cloud agents require skills as a static settings object. SkillsResolver functions can't run on PaaS \u2014 resolve to a SkillsSettings object before Agent.create() or move the dynamic logic into a hook rule.",
+      { code: "cloud_incompatible_function_resolver" }
+    );
+  }
+}
 function rejectStdioMcpLocalPaths(options) {
   if (options.mcpServers === void 0) return;
   for (const [name, config] of Object.entries(options.mcpServers)) {
@@ -7102,9 +7113,223 @@ function parseFrontmatterFields(frontmatter) {
   return out;
 }
 
+// src/internal/runtime/skills/discover-skills.ts
+init_errors();
+
+// src/internal/runtime/skills/skill-frontmatter.ts
+init_errors();
+init_yaml_frontmatter();
+function asString(v) {
+  return typeof v === "string" ? v : void 0;
+}
+function toStringFields(raw) {
+  const out = {};
+  for (const [k, v] of Object.entries(raw)) out[k] = asString(v);
+  return out;
+}
+function parseSkillFrontmatter(raw, fallbackName) {
+  const fields = extractAndParseFrontmatter(raw, fallbackName);
+  const name = resolveName(fields, fallbackName);
+  ensureRequiredFields(fields, name);
+  return buildFrontmatter(fields, name);
+}
+function stripSkillFrontmatter(raw) {
+  const match = /^---\s*\n[\s\S]*?\n---\s*\n/.exec(raw);
+  return (match === null ? raw : raw.slice(match[0].length)).trim();
+}
+function extractAndParseFrontmatter(raw, fallbackName) {
+  const match = /^---\s*\n([\s\S]*?)\n---\s*\n/.exec(raw);
+  if (match === null) {
+    throw new ConfigurationError(`Skill ${fallbackName} is missing frontmatter`, {
+      code: "missing_frontmatter"
+    });
+  }
+  const frontmatter = match[1] ?? "";
+  try {
+    return toStringFields(parseSimpleYaml(frontmatter));
+  } catch (cause) {
+    const detail = cause instanceof Error ? cause.message : String(cause);
+    throw new ConfigurationError(
+      `Skill ${fallbackName} has malformed YAML frontmatter: ${detail}`,
+      { code: "schema_invalid", cause }
+    );
+  }
+}
+function resolveName(fields, fallbackName) {
+  if (hasContent(fields.name)) return fields.name;
+  if (hasContent(fallbackName)) return fallbackName;
+  throw new ConfigurationError("Skill at unknown path is missing required field: name", {
+    code: "schema_invalid"
+  });
+}
+function ensureRequiredFields(fields, name) {
+  if (!hasContent(fields.description)) {
+    throw new ConfigurationError(`Skill ${name} is missing required field: description`, {
+      code: "schema_invalid"
+    });
+  }
+}
+function buildFrontmatter(fields, name) {
+  const description = fields.description;
+  if (description === void 0) {
+    throw new ConfigurationError(`Skill ${name} missing description`, { code: "schema_invalid" });
+  }
+  const result = { name, description };
+  if (hasContent(fields.category)) result.category = fields.category;
+  const deps = parseDependencies(fields.dependencies);
+  if (deps !== void 0) result.dependencies = deps;
+  return result;
+}
+function parseDependencies(raw) {
+  if (!hasContent(raw)) return void 0;
+  const deps = raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+  return deps.length > 0 ? deps : void 0;
+}
+function hasContent(value) {
+  return value !== void 0 && value.trim().length > 0;
+}
+
+// src/internal/runtime/skills/discover-skills.ts
+async function discoverSkills(dir, options) {
+  let entries;
+  try {
+    entries = await readWorkspaceDir(dir, "skills_read_error", "skills directory");
+  } catch {
+    return [];
+  }
+  const skills = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    let skillDir;
+    try {
+      skillDir = safePathJoin(dir, entry.name);
+      assertNoSymlinkEscape(skillDir, dir);
+    } catch {
+      continue;
+    }
+    const skillPath = path.join(skillDir, "SKILL.md");
+    let raw;
+    try {
+      raw = await promises.readFile(skillPath, "utf8");
+    } catch {
+      continue;
+    }
+    const skill = tryParseSkill(raw, entry.name, skillPath, options);
+    if (skill !== void 0) skills.push(skill);
+  }
+  return skills;
+}
+function tryParseSkill(raw, fallbackName, source, options) {
+  try {
+    const frontmatter = parseSkillFrontmatter(raw, fallbackName);
+    const skill = {
+      name: frontmatter.name,
+      description: frontmatter.description,
+      source
+    };
+    if (frontmatter.category !== void 0) skill.category = frontmatter.category;
+    if (frontmatter.dependencies !== void 0) skill.dependencies = frontmatter.dependencies;
+    return skill;
+  } catch (cause) {
+    if (cause instanceof ConfigurationError) {
+      options?.onInvalidSkill?.({
+        name: fallbackName,
+        source,
+        code: cause.code ?? "unknown",
+        message: cause.message
+      });
+      return void 0;
+    }
+    throw cause;
+  }
+}
+
+// src/internal/runtime/skills/skills-manager.ts
+var SkillsManager = class {
+  constructor(cwd, _enabled, settingSourcesIncludeProject, skillsDir, inline) {
+    this.cwd = cwd;
+    this.settingSourcesIncludeProject = settingSourcesIncludeProject;
+    this.skillsDir = skillsDir;
+    this.inline = inline;
+  }
+  cwd;
+  settingSourcesIncludeProject;
+  skillsDir;
+  inline;
+  skills = [];
+  async initialize() {
+    if (!this.settingSourcesIncludeProject) {
+      this.skills = this.mergeInline([]);
+      return;
+    }
+    await this.refresh();
+  }
+  async refresh() {
+    const skillsRoot = this.skillsDir ?? path.join(this.cwd, ".theokit", "skills");
+    const discovered = await discoverSkills(skillsRoot, {
+      onInvalidSkill: (info) => {
+        process.stderr.write(
+          `[theokit-sdk] skill ${info.name} skipped (${info.code}): ${info.message}
+`
+        );
+      }
+    });
+    this.skills = this.mergeInline(discovered);
+  }
+  /** M22 — merge inline skills over discovered ones; inline wins on a name conflict. */
+  mergeInline(discovered) {
+    if (this.inline === void 0 || this.inline.length === 0) return discovered;
+    const inlineNames = new Set(this.inline.map((s) => s.name));
+    return [...discovered.filter((s) => !inlineNames.has(s.name)), ...this.inline];
+  }
+  list() {
+    return Promise.resolve(this.skills);
+  }
+  /**
+   * SE20 — resolve a skill by name INCLUDING its body. Inline (`createSkill`)
+   * skills carry `instructions` on the object; filesystem skills read the body
+   * from their `source` SKILL.md (frontmatter stripped). `undefined` when no
+   * enabled skill matches (malformed skills were already excluded at discovery).
+   */
+  async get(name) {
+    const skill = this.skills.find((s) => s.name === name);
+    if (skill === void 0) return void 0;
+    const instructions = typeof skill.instructions === "string" ? skill.instructions : stripSkillFrontmatter(await promises.readFile(skill.source, "utf8"));
+    const references = skill.references;
+    return {
+      name: skill.name,
+      description: skill.description,
+      instructions,
+      ...references !== void 0 ? { references } : {}
+    };
+  }
+};
+
 // src/internal/runtime/system-prompt/local-assembly.ts
-async function buildSystemPromptContext(inputs, userText, memoryFacts) {
-  const skills = inputs.skillsManager !== void 0 ? await inputs.skillsManager.list() : [];
+async function resolveSendSkills(inputs, userText, memoryFacts) {
+  const skills = inputs.options.skills;
+  if (typeof skills !== "function") {
+    return { manager: inputs.skillsManager, autoInject: skills?.autoInject ?? true };
+  }
+  const settings = await skills({
+    agentId: inputs.agentId,
+    cwd: inputs.workspaceCwd,
+    model: inputs.model,
+    userMessage: userText,
+    memory: memoryFacts.map((fact) => ({ text: fact.text }))
+  });
+  const manager = new SkillsManager(
+    inputs.workspaceCwd,
+    settings.enabled,
+    inputs.settingSourcesIncludeProject,
+    settings.skillsDir,
+    settings.inline
+  );
+  await manager.initialize();
+  return { manager, autoInject: settings.autoInject ?? true };
+}
+async function buildSystemPromptContext(inputs, userText, memoryFacts, manager = inputs.skillsManager) {
+  const skills = manager !== void 0 ? await manager.list() : [];
   return {
     agentId: inputs.agentId,
     cwd: inputs.workspaceCwd,
@@ -7115,10 +7340,11 @@ async function buildSystemPromptContext(inputs, userText, memoryFacts) {
   };
 }
 async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary) {
-  const baseCtx = await buildSystemPromptContext(inputs, userText, memoryFacts);
+  const resolved = await resolveSendSkills(inputs, userText, memoryFacts);
+  const baseCtx = await buildSystemPromptContext(inputs, userText, memoryFacts, resolved.manager);
   const assemblyCtx = {
     ...baseCtx,
-    skillsAutoInject: inputs.options.skills?.autoInject ?? true,
+    skillsAutoInject: resolved.autoInject,
     memoryAutoInject: inputs.options.memory?.autoInject ?? true
   };
   if (baseSystemPrompt !== void 0) assemblyCtx.baseSystemPrompt = baseSystemPrompt;
@@ -8370,176 +8596,6 @@ async function loadPluginManifestFromMarkdown(pluginsRoot, folderName) {
   return metadata;
 }
 
-// src/internal/runtime/skills/discover-skills.ts
-init_errors();
-
-// src/internal/runtime/skills/skill-frontmatter.ts
-init_errors();
-init_yaml_frontmatter();
-function asString(v) {
-  return typeof v === "string" ? v : void 0;
-}
-function toStringFields(raw) {
-  const out = {};
-  for (const [k, v] of Object.entries(raw)) out[k] = asString(v);
-  return out;
-}
-function parseSkillFrontmatter(raw, fallbackName) {
-  const fields = extractAndParseFrontmatter(raw, fallbackName);
-  const name = resolveName(fields, fallbackName);
-  ensureRequiredFields(fields, name);
-  return buildFrontmatter(fields, name);
-}
-function extractAndParseFrontmatter(raw, fallbackName) {
-  const match = /^---\s*\n([\s\S]*?)\n---\s*\n/.exec(raw);
-  if (match === null) {
-    throw new ConfigurationError(`Skill ${fallbackName} is missing frontmatter`, {
-      code: "missing_frontmatter"
-    });
-  }
-  const frontmatter = match[1] ?? "";
-  try {
-    return toStringFields(parseSimpleYaml(frontmatter));
-  } catch (cause) {
-    const detail = cause instanceof Error ? cause.message : String(cause);
-    throw new ConfigurationError(
-      `Skill ${fallbackName} has malformed YAML frontmatter: ${detail}`,
-      { code: "schema_invalid", cause }
-    );
-  }
-}
-function resolveName(fields, fallbackName) {
-  if (hasContent(fields.name)) return fields.name;
-  if (hasContent(fallbackName)) return fallbackName;
-  throw new ConfigurationError("Skill at unknown path is missing required field: name", {
-    code: "schema_invalid"
-  });
-}
-function ensureRequiredFields(fields, name) {
-  if (!hasContent(fields.description)) {
-    throw new ConfigurationError(`Skill ${name} is missing required field: description`, {
-      code: "schema_invalid"
-    });
-  }
-}
-function buildFrontmatter(fields, name) {
-  const description = fields.description;
-  if (description === void 0) {
-    throw new ConfigurationError(`Skill ${name} missing description`, { code: "schema_invalid" });
-  }
-  const result = { name, description };
-  if (hasContent(fields.category)) result.category = fields.category;
-  const deps = parseDependencies(fields.dependencies);
-  if (deps !== void 0) result.dependencies = deps;
-  return result;
-}
-function parseDependencies(raw) {
-  if (!hasContent(raw)) return void 0;
-  const deps = raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
-  return deps.length > 0 ? deps : void 0;
-}
-function hasContent(value) {
-  return value !== void 0 && value.trim().length > 0;
-}
-
-// src/internal/runtime/skills/discover-skills.ts
-async function discoverSkills(dir, options) {
-  let entries;
-  try {
-    entries = await readWorkspaceDir(dir, "skills_read_error", "skills directory");
-  } catch {
-    return [];
-  }
-  const skills = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    let skillDir;
-    try {
-      skillDir = safePathJoin(dir, entry.name);
-      assertNoSymlinkEscape(skillDir, dir);
-    } catch {
-      continue;
-    }
-    const skillPath = path.join(skillDir, "SKILL.md");
-    let raw;
-    try {
-      raw = await promises.readFile(skillPath, "utf8");
-    } catch {
-      continue;
-    }
-    const skill = tryParseSkill(raw, entry.name, skillPath, options);
-    if (skill !== void 0) skills.push(skill);
-  }
-  return skills;
-}
-function tryParseSkill(raw, fallbackName, source, options) {
-  try {
-    const frontmatter = parseSkillFrontmatter(raw, fallbackName);
-    const skill = {
-      name: frontmatter.name,
-      description: frontmatter.description,
-      source
-    };
-    if (frontmatter.category !== void 0) skill.category = frontmatter.category;
-    if (frontmatter.dependencies !== void 0) skill.dependencies = frontmatter.dependencies;
-    return skill;
-  } catch (cause) {
-    if (cause instanceof ConfigurationError) {
-      options?.onInvalidSkill?.({
-        name: fallbackName,
-        source,
-        code: cause.code ?? "unknown",
-        message: cause.message
-      });
-      return void 0;
-    }
-    throw cause;
-  }
-}
-
-// src/internal/runtime/skills/skills-manager.ts
-var SkillsManager = class {
-  constructor(cwd, _enabled, settingSourcesIncludeProject, skillsDir, inline) {
-    this.cwd = cwd;
-    this.settingSourcesIncludeProject = settingSourcesIncludeProject;
-    this.skillsDir = skillsDir;
-    this.inline = inline;
-  }
-  cwd;
-  settingSourcesIncludeProject;
-  skillsDir;
-  inline;
-  skills = [];
-  async initialize() {
-    if (!this.settingSourcesIncludeProject) {
-      this.skills = this.mergeInline([]);
-      return;
-    }
-    await this.refresh();
-  }
-  async refresh() {
-    const skillsRoot = this.skillsDir ?? path.join(this.cwd, ".theokit", "skills");
-    const discovered = await discoverSkills(skillsRoot, {
-      onInvalidSkill: (info) => {
-        process.stderr.write(
-          `[theokit-sdk] skill ${info.name} skipped (${info.code}): ${info.message}
-`
-        );
-      }
-    });
-    this.skills = this.mergeInline(discovered);
-  }
-  /** M22 — merge inline skills over discovered ones; inline wins on a name conflict. */
-  mergeInline(discovered) {
-    if (this.inline === void 0 || this.inline.length === 0) return discovered;
-    const inlineNames = new Set(this.inline.map((s) => s.name));
-    return [...discovered.filter((s) => !inlineNames.has(s.name)), ...this.inline];
-  }
-  list() {
-    return Promise.resolve(this.skills);
-  }
-};
-
 // src/internal/runtime/local-agent/local-agent-bootstrap.ts
 function registerLocalAgent(args) {
   registerAgent({
@@ -8575,16 +8631,23 @@ function bootstrapSubmanagers(args) {
     );
   }
   if (args.options.skills !== void 0 || args.settingSourcesIncludeProject) {
+    const staticSkills = typeof args.options.skills === "function" ? void 0 : args.options.skills;
     out.skillsManager = new SkillsManager(
       args.workspaceCwd,
-      args.options.skills?.enabled,
+      staticSkills?.enabled,
       args.settingSourcesIncludeProject,
       // M22 — custom skills directory + inline (code-defined) skills.
-      args.options.skills?.skillsDir,
-      args.options.skills?.inline
+      staticSkills?.skillsDir,
+      staticSkills?.inline
     );
     const localSkills = out.skillsManager;
-    out.skills = { list: () => localSkills.list() };
+    out.skills = {
+      // Project to the public shape (name + description only). Inline skills carry
+      // their body + references on the object; `list()` must never leak them —
+      // the body is reachable exclusively through `get()`.
+      list: async () => (await localSkills.list()).map((s) => ({ name: s.name, description: s.description })),
+      get: (name) => localSkills.get(name)
+    };
   }
   if (args.options.plugins !== void 0 || args.settingSourcesIncludePlugins) {
     out.pluginsManager = new PluginsManager(
@@ -13302,6 +13365,7 @@ function levenshtein(a, b) {
 }
 
 // src/internal/runtime/local-agent/real-local-run.ts
+init_async_local_storage();
 function createRealLocalRun(options) {
   const { userText, id, startTime } = prepareRunContext(options.message);
   const supported = /* @__PURE__ */ new Set(["stream", "wait", "cancel", "conversation"]);
@@ -13413,6 +13477,7 @@ function buildLoopInputs(options, runId, userText) {
     ...options.onStep !== void 0 ? { onStep: options.onStep } : {},
     ...options.onDelta !== void 0 ? { onDelta: options.onDelta } : {},
     ...options.sendOptions.toolChoice !== void 0 ? { toolChoice: options.sendOptions.toolChoice } : {},
+    ...options.sendOptions.activeTools !== void 0 ? { activeTools: options.sendOptions.activeTools } : {},
     ...options.priorMessages !== void 0 ? { priorMessages: options.priorMessages } : {},
     ...options.memoryTools !== void 0 && options.memoryTools.length > 0 ? { memoryTools: options.memoryTools } : {},
     ...buildCustomToolsInput(
@@ -13543,7 +13608,7 @@ var RealLocalRun = class extends FixtureRunBase {
   }
   async executeAgentLoop(inputs) {
     try {
-      const output = await runAgentLoop(inputs);
+      const output = inputs.activeTools !== void 0 ? await withToolWhitelist(new Set(inputs.activeTools), () => runAgentLoop(inputs)) : await runAgentLoop(inputs);
       this.applyAgentLoopOutput(output);
       this.transitionTo(output.finalStatus);
     } catch (cause) {
@@ -16428,7 +16493,7 @@ var LocalAgent = class {
   }
   // biome-ignore format: G8 budget — thin accessor for the assembly inputs.
   assemblyInputs() {
-    return { agentId: this.agentId, workspaceCwd: this.workspaceCwd, model: this.model, options: this.options, context: this.context, skillsManager: this.skillsManager, systemPromptPipeline: this.systemPromptPipeline };
+    return { agentId: this.agentId, workspaceCwd: this.workspaceCwd, model: this.model, options: this.options, context: this.context, skillsManager: this.skillsManager, settingSourcesIncludeProject: this.settingSourcesIncludeProject, systemPromptPipeline: this.systemPromptPipeline };
   }
   async resolveSystemPrompt(userText, options, memoryFacts) {
     const base = await resolveSystemPromptForSend(