takomi 2.1.44 → 2.1.45

package/.pi/extensions/takomi-context-manager/skill-registry.ts

@@ -1,6 +1,7 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { getSkillCategory } from "./skill-categories";
 import type { SkillRecord } from "./types";
 
 export function normalizeText(value: string): string {
@@ -35,7 +36,10 @@ export function collectSkillsFromOptions(options: unknown): SkillRecord[] {
     return [{
       name,
       description: getString(item, ["description", "summary"]),
-      location: getString(item, ["location", "path", "file", "skillPath"]),
+      location: getString(item, ["filePath", "location", "path", "file", "skillPath"]),
+      category: getString(item, ["category", "group", "taxonomy"]),
+      sourceCategory: getString(item, ["sourceCategory", "installerCategory"]),
+      packageName: getString(item, ["package", "packageName", "sourceSlug", "source"]),
       source: "systemPromptOptions",
     }];
   });
@@ -57,7 +61,15 @@ export function collectSkillsFromXml(systemPrompt: string): SkillRecord[] {
   for (const match of root[1].matchAll(/<skill>([\s\S]*?)<\/skill>/gi)) {
     const name = extractTag(match[1], "name");
     if (!name) continue;
-    skills.push({ name, description: extractTag(match[1], "description"), location: extractTag(match[1], "location"), source: "xml" });
+    skills.push({
+      name,
+      description: extractTag(match[1], "description"),
+      location: extractTag(match[1], "location"),
+      category: extractTag(match[1], "category") ?? extractTag(match[1], "group"),
+      sourceCategory: extractTag(match[1], "source_category") ?? extractTag(match[1], "installer_category"),
+      packageName: extractTag(match[1], "package") ?? extractTag(match[1], "source"),
+      source: "xml",
+    });
   }
   return skills;
 }
@@ -71,14 +83,95 @@ export function mergeSkills(records: SkillRecord[]): Map<string, SkillRecord> {
       name: existing.name,
       description: existing.description ?? skill.description,
       location: existing.location ?? skill.location,
+      category: existing.category ?? skill.category,
+      sourceCategory: existing.sourceCategory ?? skill.sourceCategory,
+      packageName: existing.packageName ?? skill.packageName,
       source: existing.source === "systemPromptOptions" ? existing.source : skill.source,
     } : skill);
   }
   return merged;
 }
 
+export function compareSkillText(a: string, b: string): number {
+  return normalizeName(a).localeCompare(normalizeName(b), "en") || a.localeCompare(b, "en");
+}
+
 export function sortedSkills(skills: Map<string, SkillRecord>): SkillRecord[] {
-  return [...skills.values()].sort((a, b) => a.name.localeCompare(b.name));
+  return [...skills.values()].sort((a, b) => compareSkillText(a.name, b.name));
+}
+
+export type SkillCategoryGroup = { category: string; skills: SkillRecord[] };
+
+/** Safe, renderer-only skill fields. Keep discovery/source details out of tool results. */
+export type SkillRenderProjection = Pick<SkillRecord, "name" | "description">;
+export type SkillIndexRenderGroup = { category: string; skills: SkillRenderProjection[] };
+
+function categorySlug(value: string | undefined): string | undefined {
+  const normalized = value?.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
+  return normalized || undefined;
+}
+
+function pathTaxonomyCategory(location: string | undefined): string | undefined {
+  if (!location) return undefined;
+  const segments = location.replace(/\\/g, "/").split("/").filter(Boolean);
+  const skillsIndex = segments.map((segment) => segment.toLowerCase()).lastIndexOf("skills");
+  if (skillsIndex < 0) return undefined;
+  // A categorized filesystem layout is .../skills/<category>/<skill>/SKILL.md.
+  // A normal flat skill root (.../skills/<skill>/SKILL.md) intentionally falls through.
+  const afterSkills = segments.slice(skillsIndex + 1);
+  return afterSkills.length >= 3 ? categorySlug(afterSkills[0]) : undefined;
+}
+
+function packageSlug(location: string | undefined): string | undefined {
+  if (!location) return undefined;
+  const segments = location.replace(/\\/g, "/").split("/").filter(Boolean);
+  const nodeModulesIndex = segments.map((segment) => segment.toLowerCase()).lastIndexOf("node_modules");
+  if (nodeModulesIndex < 0) return undefined;
+  const first = segments[nodeModulesIndex + 1];
+  if (!first) return undefined;
+  if (first.startsWith("@")) {
+    const second = segments[nodeModulesIndex + 2];
+    return second ? categorySlug(`${first.slice(1)}-${second}`) : categorySlug(first.slice(1));
+  }
+  return categorySlug(first);
+}
+
+/**
+ * Category precedence is deterministic and does not infer from a skill name:
+ * explicit skill metadata → installer/source taxonomy → path/package metadata
+ * → uncategorized.
+ */
+export function skillCategory(skill: SkillRecord): string {
+  return categorySlug(skill.category)
+    ?? categorySlug(skill.sourceCategory)
+    ?? pathTaxonomyCategory(skill.location)
+    ?? categorySlug(skill.packageName)
+    ?? packageSlug(skill.location)
+    ?? "uncategorized";
+}
+
+export function groupedSkills(skills: Iterable<SkillRecord>): SkillCategoryGroup[] {
+  const grouped = new Map<string, SkillRecord[]>();
+  for (const skill of skills) {
+    const category = skillCategory(skill);
+    const entries = grouped.get(category) ?? [];
+    entries.push(skill);
+    grouped.set(category, entries);
+  }
+  return [...grouped.entries()]
+    .sort(([a], [b]) => compareSkillText(a, b))
+    .map(([category, entries]) => ({ category, skills: entries.sort((a, b) => compareSkillText(a.name, b.name)) }));
+}
+
+/**
+ * Project the registry into the only fields the skill-index renderer needs.
+ * Locations and discovery metadata must remain internal to the registry.
+ */
+export function skillIndexRenderGroups(skills: Iterable<SkillRecord>): SkillIndexRenderGroup[] {
+  return groupedSkills(skills).map(({ category, skills: entries }) => ({
+    category,
+    skills: entries.map(({ name, description }) => ({ name, description })),
+  }));
 }
 
 export function findSkill(skills: Map<string, SkillRecord>, name: string): SkillRecord | undefined {
@@ -117,7 +210,14 @@ async function readSkillFile(filePath: string): Promise<SkillRecord | undefined>
     const name = frontmatter.name?.trim() || path.basename(path.dirname(filePath));
     const description = frontmatter.description?.trim();
     if (!name || !description) return undefined;
-    return { name, description, location: filePath, source: "filesystem" };
+    return {
+      name,
+      description,
+      location: filePath,
+      category: frontmatter.category?.trim() || frontmatter.group?.trim(),
+      packageName: frontmatter.package?.trim() || frontmatter.source?.trim(),
+      source: "filesystem",
+    };
   } catch {
     return undefined;
   }
@@ -175,6 +275,77 @@ async function collectPackageSkillRoots(nodeModulesRoot: string): Promise<string
   return roots;
 }
 
+export type InstallerTaxonomyEntry = { category: string; skillFilePath: string };
+
+export type InstallerTaxonomyOptions = {
+  home?: string;
+  takomiHome?: string;
+};
+
+function canonicalPath(filePath: string): string {
+  const resolved = path.normalize(path.resolve(filePath));
+  return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+}
+
+/**
+ * Read Takomi's installer ownership registry without mutating or reconciling it.
+ * Legacy owned entries without category metadata use the tracked catalog's
+ * stable primary category, so upgrades do not require another installer run.
+ */
+export async function readInstallerTaxonomy(options: InstallerTaxonomyOptions = {}): Promise<Map<string, InstallerTaxonomyEntry>> {
+  const home = options.home ?? os.homedir();
+  const manifestPath = path.join(options.takomiHome ?? process.env.TAKOMI_HOME_DIR ?? path.join(home, ".takomi"), "skills-manifest.json");
+  try {
+    const manifest = JSON.parse(await readFile(manifestPath, "utf8")) as {
+      targetRoot?: unknown;
+      owned?: Record<string, unknown>;
+    };
+    const targetRoot = typeof manifest.targetRoot === "string" && manifest.targetRoot.trim()
+      ? manifest.targetRoot
+      : path.join(home, ".agents", "skills");
+    const taxonomy = new Map<string, InstallerTaxonomyEntry>();
+    for (const [name, rawEntry] of Object.entries(manifest.owned ?? {})) {
+      if (!rawEntry || (typeof rawEntry !== "object" && typeof rawEntry !== "string")) continue;
+      const entry = typeof rawEntry === "object" ? rawEntry as Record<string, unknown> : {};
+      const manifestCategory = typeof entry.category === "string" && entry.category.trim()
+        ? entry.category.trim()
+        : undefined;
+      const category = manifestCategory ?? getSkillCategory(name);
+      if (!category) continue;
+      const targetPath = typeof entry.targetPath === "string" && entry.targetPath.trim()
+        ? entry.targetPath
+        : path.join(targetRoot, name);
+      taxonomy.set(normalizeName(name), {
+        category,
+        skillFilePath: canonicalPath(path.join(targetPath, "SKILL.md")),
+      });
+    }
+    return taxonomy;
+  } catch {
+    return new Map();
+  }
+}
+
+/**
+ * Enrich records already supplied by Pi using exact name + canonical SKILL.md
+ * ownership. This remains independent from filesystem discovery and read-only.
+ */
+export function applyInstallerTaxonomy(skills: SkillRecord[], taxonomy: Map<string, InstallerTaxonomyEntry>): SkillRecord[] {
+  return skills.map((skill) => {
+    const entry = taxonomy.get(normalizeName(skill.name));
+    if (!entry || !skill.location || canonicalPath(skill.location) !== entry.skillFilePath) return skill;
+    return { ...skill, sourceCategory: skill.sourceCategory ?? entry.category };
+  });
+}
+
+export async function enrichSkillsWithInstallerTaxonomy(
+  skills: SkillRecord[],
+  options: InstallerTaxonomyOptions = {},
+): Promise<SkillRecord[]> {
+  if (skills.length === 0) return skills;
+  return applyInstallerTaxonomy(skills, await readInstallerTaxonomy(options));
+}
+
 function ancestorSkillRoots(cwd: string): string[] {
   const roots: string[] = [];
   let current = path.resolve(cwd || process.cwd());
@@ -190,8 +361,8 @@ function ancestorSkillRoots(cwd: string): string[] {
   return roots;
 }
 
-export async function discoverSkillsFromFilesystem(cwd = process.cwd()): Promise<SkillRecord[]> {
-  const home = os.homedir();
+export async function discoverSkillsFromFilesystem(cwd = process.cwd(), options: InstallerTaxonomyOptions = {}): Promise<SkillRecord[]> {
+  const home = options.home ?? os.homedir();
   const roots = [
     { root: path.join(home, ".pi", "agent", "skills"), directMarkdownFiles: true },
     { root: path.join(home, ".agents", "skills"), directMarkdownFiles: false },
@@ -202,6 +373,6 @@ export async function discoverSkillsFromFilesystem(cwd = process.cwd()): Promise
   for (const { root, directMarkdownFiles } of roots) {
     for (const file of await collectSkillFiles(root, directMarkdownFiles)) skillFiles.add(file);
   }
-  const skills = await Promise.all([...skillFiles].map(readSkillFile));
-  return skills.filter((skill): skill is SkillRecord => Boolean(skill));
+  const skills = (await Promise.all([...skillFiles].map(readSkillFile))).filter((skill): skill is SkillRecord => Boolean(skill));
+  return enrichSkillsWithInstallerTaxonomy(skills, options);
 }

package/.pi/extensions/takomi-context-manager/skill-tools.ts

@@ -1,103 +1,208 @@
-import { readFile } from "node:fs/promises";
-import path from "node:path";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import type { ContextManagerState } from "./state";
-import { discoverSkillsFromFilesystem, findSkill, mergeSkills, normalizeName, sortedSkills } from "./skill-registry";
-import { persistReportSnapshot, restoreReportFromSession } from "./session-state";
-
-function renderSkillIndex(state: ContextManagerState): string {
-  const skills = sortedSkills(state.skills);
-  if (skills.length === 0) return "Available skills (names only): none discovered.";
-  return ["Available skills (names only):", ...skills.map((skill) => `- ${skill.name}`)].join("\n");
-}
-
-function renderManifest(state: ContextManagerState, names: string[]): string {
-  if (names.length === 0) return "No skills requested.";
-  return names.map((name) => {
-    const skill = findSkill(state.skills, name);
-    if (!skill) {
-      const close = sortedSkills(state.skills).filter((candidate) => normalizeName(candidate.name).includes(normalizeName(name).slice(0, 4))).slice(0, 5).map((candidate) => candidate.name);
-      return [`Skill not found: ${name}`, close.length ? `Known close matches: ${close.join(", ")}` : ""].filter(Boolean).join("\n");
-    }
-    return [`Skill: ${skill.name}`, `Description: ${skill.description ?? "(no description discovered)"}`, `Location: ${skill.location ?? "(no location discovered)"}`].join("\n");
-  }).join("\n\n");
-}
-
-async function loadSkillContent(location: string): Promise<string> {
-  const fileName = path.basename(location).toLowerCase();
-  if (fileName !== "skill.md" && !location.toLowerCase().endsWith(".md")) throw new Error(`Refusing to load non-markdown skill location: ${location}`);
-  return readFile(location, "utf8");
-}
-
-async function ensureSkillsDiscovered(state: ContextManagerState, cwd: string): Promise<void> {
-  if (state.skills.size > 0) return;
-  state.skills = mergeSkills(await discoverSkillsFromFilesystem(cwd));
-  state.report.skillCount = state.skills.size;
-}
-
-export function registerSkillTools(pi: ExtensionAPI, state: ContextManagerState): void {
-  pi.registerTool({
-    name: "skill_index",
-    label: "Skill Index",
-    description: "Return the available skill names only. Use this to inspect capability names without loading descriptions or full instructions.",
-    promptSnippet: "List available skill names only for progressive skill loading",
-    parameters: Type.Object({}),
-    async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
-      restoreReportFromSession(state, ctx);
-      await ensureSkillsDiscovered(state, ctx.cwd);
-      state.report.timestamp = new Date().toISOString();
-      state.report.cwd = ctx.cwd;
-      state.report.toolCalls.skillIndex += 1;
-      persistReportSnapshot(pi, state, "skill_index");
-      return { content: [{ type: "text", text: renderSkillIndex(state) }], details: { skillCount: state.skills.size } };
-    },
-  });
-
-  pi.registerTool({
-    name: "skill_manifest",
-    label: "Skill Manifest",
-    description: "Return descriptions and locations for selected skills without loading full SKILL.md instructions.",
-    promptSnippet: "Show selected skill descriptions and locations without full instructions",
-    parameters: Type.Object({ skills: Type.Array(Type.String({ description: "Skill name to inspect" })) }),
-    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      restoreReportFromSession(state, ctx);
-      await ensureSkillsDiscovered(state, ctx.cwd);
-      state.report.timestamp = new Date().toISOString();
-      state.report.cwd = ctx.cwd;
-      state.report.toolCalls.skillManifest += 1;
-      persistReportSnapshot(pi, state, "skill_manifest");
-      return { content: [{ type: "text", text: renderManifest(state, params.skills) }], details: { requested: params.skills } };
-    },
-  });
-
-  pi.registerTool({
-    name: "skill_load",
-    label: "Skill Load",
-    description: "Load the full SKILL.md content for one selected skill that will actually be used.",
-    promptSnippet: "Load full SKILL.md instructions for one selected skill",
-    parameters: Type.Object({ skill: Type.String({ description: "Exact skill name to load" }) }),
-    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      restoreReportFromSession(state, ctx);
-      await ensureSkillsDiscovered(state, ctx.cwd);
-      state.report.timestamp = new Date().toISOString();
-      state.report.cwd = ctx.cwd;
-      state.report.toolCalls.skillLoad += 1;
-      const skill = findSkill(state.skills, params.skill);
-      if (!skill?.location) {
-        persistReportSnapshot(pi, state, "skill_load_not_found");
-        return { content: [{ type: "text", text: renderManifest(state, [params.skill]) }], details: { found: false, requested: params.skill }, isError: true };
-      }
-      try {
-        const content = await loadSkillContent(skill.location);
-        state.report.loadedByTool = [...new Set([...state.report.loadedByTool, skill.name])].sort();
-        persistReportSnapshot(pi, state, "skill_load");
-        return { content: [{ type: "text", text: [`Skill: ${skill.name}`, `Location: ${skill.location}`, "", content].join("\n") }], details: { found: true, skill: skill.name, location: skill.location } };
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        persistReportSnapshot(pi, state, "skill_load_error");
-        return { content: [{ type: "text", text: message }], details: { found: true, skill: skill.name, error: message }, isError: true };
-      }
-    },
-  });
-}
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Container, Markdown, Text } from "@earendil-works/pi-tui";
+import { getMarkdownTheme, keyHint } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import type { ContextManagerState } from "./state";
+import { discoverSkillsFromFilesystem, findSkill, mergeSkills, normalizeName, skillIndexRenderGroups, sortedSkills, type SkillIndexRenderGroup } from "./skill-registry";
+import { persistReportSnapshot, restoreReportFromSession } from "./session-state";
+import { renderCompactCard, renderExpandedMarkdown, renderToolCall, resultText, sanitizePresentation } from "./tool-renderers";
+
+function renderSkillIndex(state: ContextManagerState): string {
+  const skills = sortedSkills(state.skills);
+  if (skills.length === 0) return "Available skills (names only): none discovered.";
+  return ["Available skills (names only):", ...skills.map((skill) => `- ${skill.name}`)].join("\n");
+}
+
+function renderManifest(state: ContextManagerState, names: string[]): string {
+  if (names.length === 0) return "No skills requested.";
+  return names.map((name) => {
+    const skill = findSkill(state.skills, name);
+    if (!skill) {
+      const close = sortedSkills(state.skills).filter((candidate) => normalizeName(candidate.name).includes(normalizeName(name).slice(0, 4))).slice(0, 5).map((candidate) => candidate.name);
+      return [`Skill not found: ${name}`, close.length ? `Known close matches: ${close.join(", ")}` : ""].filter(Boolean).join("\n");
+    }
+    return [`Skill: ${skill.name}`, `Description: ${skill.description ?? "(no description discovered)"}`, `Location: ${skill.location ?? "(no location discovered)"}`].join("\n");
+  }).join("\n\n");
+}
+
+const COMPACT_CATEGORY_LIMIT = 3;
+
+function groupSummaryItems(groups: SkillIndexRenderGroup[], maximum = groups.length): string[] {
+  const visible = groups.slice(0, maximum).map((group) => `${group.category} ${group.skills.length}`);
+  const overflow = groups.length - visible.length;
+  return [...visible, ...(overflow > 0 ? [`+${overflow} more categories`] : [])];
+}
+
+function groupSummary(groups: SkillIndexRenderGroup[], maximum = groups.length): string {
+  return groupSummaryItems(groups, maximum).join(" · ");
+}
+
+function renderGroupedSkillIndex(groups: SkillIndexRenderGroup[]): string {
+  if (groups.length === 0) return "No skills discovered.";
+  return groups.map((group) => [
+    `## ${group.category}`,
+    "",
+    ...group.skills.map((skill) => `- \`${skill.name}\`${skill.description ? ` — ${skill.description}` : ""}`),
+  ].join("\n")).join("\n\n");
+}
+
+function skillMarkdown(text: string): string {
+  const separator = text.indexOf("\n\n");
+  return separator >= 0 ? text.slice(separator + 2) : text;
+}
+
+async function loadSkillContent(location: string): Promise<string> {
+  const fileName = path.basename(location).toLowerCase();
+  if (fileName !== "skill.md" && !location.toLowerCase().endsWith(".md")) throw new Error(`Refusing to load non-markdown skill location: ${location}`);
+  return readFile(location, "utf8");
+}
+
+async function ensureSkillsDiscovered(state: ContextManagerState, cwd: string): Promise<void> {
+  if (state.skills.size > 0) return;
+  state.skills = mergeSkills(await discoverSkillsFromFilesystem(cwd));
+  state.report.skillCount = state.skills.size;
+}
+
+export function registerSkillTools(pi: ExtensionAPI, state: ContextManagerState): void {
+  pi.registerTool({
+    name: "skill_index",
+    label: "Skill Index",
+    description: "Return the available skill names only. Use this to inspect capability names without loading descriptions or full instructions.",
+    promptSnippet: "List available skill names only for progressive skill loading",
+    parameters: Type.Object({}),
+    async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
+      restoreReportFromSession(state, ctx);
+      await ensureSkillsDiscovered(state, ctx.cwd);
+      state.report.timestamp = new Date().toISOString();
+      state.report.cwd = ctx.cwd;
+      state.report.toolCalls.skillIndex += 1;
+      persistReportSnapshot(pi, state, "skill_index");
+      const groups = skillIndexRenderGroups(state.skills.values());
+      return { content: [{ type: "text", text: renderSkillIndex(state) }], details: { skillCount: state.skills.size, groups } };
+    },
+    renderCall(_args, theme) {
+      return renderToolCall("skill_index", undefined, theme);
+    },
+    renderResult(result, { expanded }, theme) {
+      const details = result.details as { skillCount?: number; groups?: SkillIndexRenderGroup[] } | undefined;
+      const groups = details?.groups ?? [];
+      const count = details?.skillCount ?? groups.reduce((total, group) => total + group.skills.length, 0);
+      if (!expanded) {
+        return renderCompactCard({
+          status: count ? "success" : "pending",
+          title: "Skill index",
+          summary: count ? `${count} skills across ${groups.length} categories` : "no skills discovered",
+          responsiveMetadata: groups.length ? groupSummaryItems(groups, COMPACT_CATEGORY_LIMIT) : undefined,
+        }, theme);
+      }
+      return renderExpandedMarkdown({
+        status: count ? "success" : "pending",
+        title: "Skill index",
+        summary: count ? `${count} skills across ${groups.length} categories` : "no skills discovered",
+        metadata: groups.length ? [groupSummary(groups)] : undefined,
+        markdown: renderGroupedSkillIndex(groups),
+      }, theme);
+    },
+  });
+
+  pi.registerTool({
+    name: "skill_manifest",
+    label: "Skill Manifest",
+    description: "Return descriptions and locations for selected skills without loading full SKILL.md instructions.",
+    promptSnippet: "Show selected skill descriptions and locations without full instructions",
+    parameters: Type.Object({ skills: Type.Array(Type.String({ description: "Skill name to inspect" })) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      restoreReportFromSession(state, ctx);
+      await ensureSkillsDiscovered(state, ctx.cwd);
+      state.report.timestamp = new Date().toISOString();
+      state.report.cwd = ctx.cwd;
+      state.report.toolCalls.skillManifest += 1;
+      persistReportSnapshot(pi, state, "skill_manifest");
+      const found = params.skills.filter((name) => Boolean(findSkill(state.skills, name)));
+      const missing = params.skills.filter((name) => !findSkill(state.skills, name));
+      return { content: [{ type: "text", text: renderManifest(state, params.skills) }], details: { requested: params.skills, found, missing } };
+    },
+    renderCall(args, theme) {
+      return renderToolCall("skill_manifest", `${args.skills.length} requested`, theme);
+    },
+    renderResult(result, { expanded }, theme) {
+      const details = result.details as { requested?: string[]; found?: string[]; missing?: string[] } | undefined;
+      const requested = details?.requested ?? [];
+      const found = details?.found ?? [];
+      const missing = details?.missing ?? [];
+      const status = missing.length ? "warning" : requested.length ? "success" : "pending";
+      const summary = missing.length ? `${found.length} found · ${missing.length} unavailable` : requested.length ? `${found.length} skills available` : "no skills requested";
+      const metadata = missing.length ? `Missing: ${missing.join(", ")}` : `${requested.length} requested`;
+      if (!expanded) return renderCompactCard({ status, title: "Skill manifest", summary, metadata }, theme);
+      return renderExpandedMarkdown({ status, title: "Skill manifest", summary, metadata: [metadata], markdown: resultText(result) }, theme);
+    },
+  });
+
+  pi.registerTool({
+    name: "skill_load",
+    label: "Skill Load",
+    description: "Load the full SKILL.md content for one selected skill that will actually be used.",
+    promptSnippet: "Load full SKILL.md instructions for one selected skill",
+    parameters: Type.Object({ skill: Type.String({ description: "Exact skill name to load" }) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      restoreReportFromSession(state, ctx);
+      await ensureSkillsDiscovered(state, ctx.cwd);
+      state.report.timestamp = new Date().toISOString();
+      state.report.cwd = ctx.cwd;
+      state.report.toolCalls.skillLoad += 1;
+      const skill = findSkill(state.skills, params.skill);
+      if (!skill?.location) {
+        persistReportSnapshot(pi, state, "skill_load_not_found");
+        return { content: [{ type: "text", text: renderManifest(state, [params.skill]) }], details: { found: false, requested: params.skill }, isError: true };
+      }
+      try {
+        const content = await loadSkillContent(skill.location);
+        state.report.loadedByTool = [...new Set([...state.report.loadedByTool, skill.name])].sort();
+        persistReportSnapshot(pi, state, "skill_load");
+        return {
+          content: [{ type: "text", text: [`Skill: ${skill.name}`, `Location: ${skill.location}`, "", content].join("\n") }],
+          details: {
+            found: true,
+            skill: skill.name,
+            description: skill.description,
+            location: skill.location,
+            lineCount: content.split(/\r?\n/).length,
+          },
+        };
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        persistReportSnapshot(pi, state, "skill_load_error");
+        return { content: [{ type: "text", text: message }], details: { found: true, skill: skill.name, error: message }, isError: true };
+      }
+    },
+    renderCall(args, theme) {
+      return renderToolCall("skill_load", args.skill, theme);
+    },
+    renderResult(result, { expanded }, theme) {
+      const details = result.details as { found?: boolean; skill?: string; description?: string; location?: string; lineCount?: number; error?: string } | undefined;
+      const text = resultText(result);
+      if (details?.error || details?.found === false) {
+        const summary = details?.error ?? "skill not found";
+        if (!expanded) return renderCompactCard({ status: "error", title: "Skill load", summary }, theme);
+        return renderExpandedMarkdown({ status: "error", title: "Skill load", summary, markdown: text }, theme);
+      }
+
+      const name = sanitizePresentation(details?.skill ?? "skill");
+      const description = details?.description ? sanitizePresentation(details.description) : undefined;
+      const summary = description ?? "skill instructions loaded";
+      const metadata = `${details?.lineCount ?? text.split(/\r?\n/).length} lines`;
+      if (!expanded) return renderCompactCard({ status: "success", title: name, summary, metadata }, theme);
+
+      const location = details?.location ? sanitizePresentation(details.location) : undefined;
+      const container = new Container();
+      container.addChild(new Text(`${theme.fg("success", "✓")} ${theme.fg("accent", theme.bold(name))} ${theme.fg("muted", "skill instructions")}`, 0, 0));
+      if (description) container.addChild(new Text(theme.fg("muted", description), 0, 0));
+      if (location) container.addChild(new Text(theme.fg("dim", location), 0, 0));
+      container.addChild(new Text(theme.fg("dim", keyHint("app.tools.expand", "collapse")), 0, 0));
+      container.addChild(new Markdown(sanitizePresentation(skillMarkdown(text)), 0, 1, getMarkdownTheme()));
+      return container;
+    },
+  });
+}