pi-skill-shiori 0.3.2 → 0.5.0

package/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 This project follows semantic versioning.
 
+## [0.5.0] - 2026-06-28
+
+### Added
+
+- Vault-wide skill inventory: Shiori indexes skills from project `.pi/skills`, `.agents/skills`, the user-global `~/.pi/agent/skills` root, and optional policy `inventory.roots`.
+- Automatic inventory refresh when skill files change under any indexed root (enabled by default; disable with `inventory.autoRefreshOnChange: false`).
+- `/shiori:doctor` now lists indexed roots with per-root skill counts and auto-refresh status.
+- `/shiori:stats` counters for manual and automatic inventory refreshes.
+- Tests for multi-root discovery, refresh after local changes, and policy-aware retrieval.
+
+### Changed
+
+- `/shiori:reload` rebuilds the vault-wide inventory and SQLite FTS index instead of relying on the session-start snapshot only.
+
+## [0.4.0] - 2026-06-28
+
+### Added
+
+- Always Visible Skill policy: Zero-Catalog Mode now keeps only `alwaysVisible` allowlisted skills in the Skill Catalog instead of hiding every entry.
+- Diagnostics for missing or duplicate `alwaysVisible` policy entries in `/shiori:doctor` and one-time runtime warnings for missing skills.
+- Tests for visible, missing, duplicate, and markdown catalog filtering cases.
+
+### Changed
+
+- `alwaysVisible` policy entries are normalized to a deduplicated allowlist at load time.
+
 ## [0.3.2] - 2026-06-24
 
 ### Added

package/README.md

@@ -12,12 +12,13 @@ For maintenance priorities and the phased plan, see [`ROADMAP.md`](ROADMAP.md).
 - **Policy-based retrieval**: treats skills as explicit by default and only candidates skills marked as triggerable.
 - **Compact candidate injection**: injects short skill suggestions instead of full `SKILL.md` files.
 - **On-demand loading**: exposes `shiori_load_skill` so the model can load one selected skill body when needed.
+- **Vault-wide skill inventory**: indexes skills from project and user-global roots, with optional extra roots in policy.
 - **SQLite FTS retrieval**: indexes skill names, descriptions, and policy triggers with `node:sqlite` + FTS5, with token-match fallback.
 - **Compact UI output**: keeps skill-load logs short while still passing full skill text to the model.
 
 ## Status
 
-`0.3.1` is an early working release. It is useful for local Pi workflows, but the prompt-boundary suppression logic is intentionally conservative: if Shiori cannot safely recognize a catalog boundary, it leaves the prompt untouched and warns instead of deleting too much.
+`0.5.0` is an early working release. It is useful for local Pi workflows, but the prompt-boundary suppression logic is intentionally conservative: if Shiori cannot safely recognize a catalog boundary, it leaves the prompt untouched and warns instead of deleting too much.
 
 ## Requirements
 
@@ -39,7 +40,7 @@ Pi core packages are peer dependencies and should be supplied by the Pi runtime:
 After the package is published to npm:
 
 ```bash
-pi install npm:pi-skill-shiori@0.3.1
+pi install npm:pi-skill-shiori@0.5.0
 ```
 
 Without a version pin:
@@ -53,7 +54,7 @@ pi install npm:pi-skill-shiori
 Use `-l` to write the package to the current project’s `.pi/settings.json`:
 
 ```bash
-pi install -l npm:pi-skill-shiori@0.3.1
+pi install -l npm:pi-skill-shiori@0.5.0
 ```
 
 Without a version pin:
@@ -67,7 +68,7 @@ Equivalent pinned manual `.pi/settings.json` entry:
 ```json
 {
   "packages": [
-    "npm:pi-skill-shiori@0.3.1"
+    "npm:pi-skill-shiori@0.5.0"
   ]
 }
 ```
@@ -85,7 +86,7 @@ Equivalent unpinned manual `.pi/settings.json` entry:
 ### Global install from GitHub
 
 ```bash
-pi install git:github.com/eiei114/pi-skill-shiori@v0.3.1
+pi install git:github.com/eiei114/pi-skill-shiori@v0.5.0
 ```
 
 Without a tag pin:
@@ -97,7 +98,7 @@ pi install git:github.com/eiei114/pi-skill-shiori
 ### Project-local install from GitHub
 
 ```bash
-pi install -l git:github.com/eiei114/pi-skill-shiori@v0.3.1
+pi install -l git:github.com/eiei114/pi-skill-shiori@v0.5.0
 ```
 
 Without a tag pin:
@@ -131,7 +132,38 @@ Or add a relative local path to `.pi/settings.json`:
 }
 ```
 
-> Note: policy/index changes can be refreshed with `/shiori:reload`, but extension code changes require restarting the Pi process because Node keeps imported extension modules cached.
+> Note: policy/index changes can be refreshed with `/shiori:reload`, and Shiori auto-refreshes the vault-wide inventory when skill files change under indexed roots. Extension code changes still require restarting the Pi process because Node keeps imported extension modules cached.
+
+## Vault-wide skill inventory
+
+Shiori builds a searchable inventory from these roots (in discovery order; first match wins on duplicate skill names):
+
+| Root | Scope |
+|---|---|
+| `<cwd>/.pi/skills` | Project-local Pi skills |
+| `<cwd>/.agents/skills` | Project-local Agent skills |
+| `~/.pi/agent/skills` | User-global Pi agent skills |
+| `inventory.roots` entries | Optional extra roots (relative to `<cwd>` or absolute) |
+
+Refresh behavior:
+
+- **Session start** builds the initial inventory and SQLite FTS index.
+- **Auto-refresh** (default) rescans roots before retrieval when any `SKILL.md` path changes. This is a directory walk only; it rebuilds the FTS index when the fingerprint changes.
+- **Manual refresh** via `/shiori:reload` always rebuilds the inventory and FTS index immediately.
+- Disable auto-refresh when you prefer a fixed snapshot:
+
+```yaml
+inventory:
+  autoRefreshOnChange: false
+  roots:
+    - custom-skills
+```
+
+Cost/latency trade-offs:
+
+- Auto-refresh adds a shallow filesystem walk on each agent turn while enabled. It avoids stale search results after local skill edits without restarting Pi.
+- A full refresh rebuilds the SQLite FTS database and scales with total indexed skills and description length. Large vaults with many roots may prefer `autoRefreshOnChange: false` plus explicit `/shiori:reload` after bulk imports.
+- Search stays description-first and policy-aware: only `triggerable` skills become candidates, with FTS ranking over names, descriptions, and policy triggers.
 
 ## Configure
 
@@ -168,7 +200,8 @@ Policy rules:
 
 - `defaults.activation: explicit` is the safe default. Unlisted skills are not auto-candidates.
 - `activation: triggerable` allows Shiori to recommend the skill for matching requests.
-- `alwaysVisible` lists skills that should remain visible/operational in Zero-Catalog workflows.
+- `alwaysVisible` lists skills that should remain visible in the Skill Catalog during Zero-Catalog Mode. Use this for a tiny safety-critical allowlist instead of broad trigger rules.
+- Missing `alwaysVisible` entries are reported by `/shiori:doctor` and warned once per session when Zero-Catalog Mode runs.
 - `candidateInjection.maxCandidates` limits how many suggestions enter the prompt.
 - `candidateInjection.minScore` drops weak matches.
 
@@ -184,7 +217,7 @@ This writes a generated review file next to `.pi/skill-shiori.yml`. Review it be
 
 | Command | Purpose |
 |---|---|
-| `/shiori:doctor` | Show policy path, inventory count, retrieval backend, suppression status, and code marker. |
+| `/shiori:doctor` | Show policy path, indexed roots, inventory count, retrieval backend, suppression status, and code marker. |
 | `/shiori:bootstrap` | Generate a review draft policy from discovered skill descriptions. |
 | `/shiori:reload` | Ask what to reload, then rebuild Shiori’s skill inventory and optionally ask Pi to reload runtime resources. Code changes may still need full restart. |
 | `/shiori:recommend` | Ask what you need help with, then either pre-load matches and queue the task for the agent or review recommendations only. Planning phrases (e.g. `計画を立てたい`) return the dev-plan intake template without dumping SKILL bodies. |
@@ -280,7 +313,7 @@ npm login
 After publishing, verify the Pi install path:
 
 ```bash
-pi install npm:pi-skill-shiori@0.3.1
+pi install npm:pi-skill-shiori@0.5.0
 pi install npm:pi-skill-shiori
 pi list
 /shiori:doctor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-skill-shiori",
-  "version": "0.3.2",
+  "version": "0.5.0",
   "description": "Pi extension that reduces Agent Skill catalog tokens with policy-based skill retrieval and on-demand skill loading.",
   "type": "module",
   "license": "MIT",

package/src/always-visible.ts

@@ -0,0 +1,54 @@
+import type { SkillRecord } from "./types.js";
+
+export interface AlwaysVisibleDiagnostics {
+  missing: string[];
+  duplicates: string[];
+  resolved: string[];
+}
+
+export function normalizeAlwaysVisible(alwaysVisible: string[] | undefined): {
+  allowlist: string[];
+  duplicates: string[];
+} {
+  const duplicates: string[] = [];
+  const seen = new Set<string>();
+  const allowlist: string[] = [];
+
+  for (const entry of alwaysVisible ?? []) {
+    const name = entry.trim();
+    if (!name) continue;
+    if (seen.has(name)) {
+      if (!duplicates.includes(name)) duplicates.push(name);
+      continue;
+    }
+    seen.add(name);
+    allowlist.push(name);
+  }
+
+  return { allowlist, duplicates };
+}
+
+export function evaluateAlwaysVisible(
+  alwaysVisible: string[] | undefined,
+  skills: SkillRecord[],
+): AlwaysVisibleDiagnostics {
+  const { allowlist, duplicates } = normalizeAlwaysVisible(alwaysVisible);
+  const inventory = new Set(skills.map((skill) => skill.name));
+  const missing = allowlist.filter((name) => !inventory.has(name));
+  const resolved = allowlist.filter((name) => inventory.has(name));
+  return { missing, duplicates, resolved };
+}
+
+export function formatAlwaysVisibleDiagnostics(diagnostics: AlwaysVisibleDiagnostics): string[] {
+  const lines: string[] = [];
+  if (diagnostics.resolved.length > 0) {
+    lines.push(`alwaysVisible resolved: ${diagnostics.resolved.join(", ")}`);
+  }
+  if (diagnostics.missing.length > 0) {
+    lines.push(`alwaysVisible missing: ${diagnostics.missing.join(", ")}`);
+  }
+  if (diagnostics.duplicates.length > 0) {
+    lines.push(`alwaysVisible duplicates: ${diagnostics.duplicates.join(", ")}`);
+  }
+  return lines;
+}

package/src/discovery.ts

@@ -1,18 +1,42 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, dirname, join, resolve } from "node:path";
+import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { parse as parseYaml } from "yaml";
-import type { SkillRecord } from "./types.js";
+import type { ShioriPolicy, SkillRecord } from "./types.js";
 
 const SKILL_FILE = "SKILL.md";
 
-export async function discoverSkills(cwd: string): Promise<SkillRecord[]> {
+/** Project-local skill roots scanned on every vault-wide inventory build. */
+export const VAULT_LOCAL_SKILL_ROOT_SEGMENTS = [".pi/skills", ".agents/skills"] as const;
+
+/** User-global Pi agent skills root (lowest discovery precedence). */
+export const GLOBAL_AGENT_SKILL_ROOT_SEGMENTS = ".pi/agent/skills";
+
+export function resolveVaultSkillRoots(cwd: string, policy?: Pick<ShioriPolicy, "inventory">): string[] {
   const roots = [
     join(cwd, ".pi", "skills"),
     join(cwd, ".agents", "skills"),
     join(homedir(), ".pi", "agent", "skills"),
   ];
 
+  for (const entry of policy?.inventory?.roots ?? []) {
+    const trimmed = entry.trim();
+    if (!trimmed) continue;
+    const resolved = isAbsolute(trimmed) ? resolve(trimmed) : resolve(cwd, trimmed);
+    if (!roots.includes(resolved)) {
+      roots.push(resolved);
+    }
+  }
+
+  return roots;
+}
+
+export async function discoverSkills(cwd: string, policy?: ShioriPolicy): Promise<SkillRecord[]> {
+  const roots = resolveVaultSkillRoots(cwd, policy);
+  return discoverSkillsFromRoots(roots);
+}
+
+export async function discoverSkillsFromRoots(roots: string[]): Promise<SkillRecord[]> {
   const records: SkillRecord[] = [];
   for (const root of roots) {
     const files = await findSkillFiles(root);
@@ -23,6 +47,15 @@ export async function discoverSkills(cwd: string): Promise<SkillRecord[]> {
   return dedupeByDiscoveryOrder(records);
 }
 
+export async function computeInventoryFingerprint(roots: string[]): Promise<string> {
+  const parts: string[] = [];
+  for (const root of roots) {
+    const files = await findSkillFiles(root);
+    parts.push(`${root}:${files.sort().join(",")}`);
+  }
+  return parts.join("|");
+}
+
 export function findDuplicates(records: SkillRecord[]): Map<string, SkillRecord[]> {
   const groups = new Map<string, SkillRecord[]>();
   for (const record of records) {

package/src/index.ts

@@ -2,8 +2,9 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { readFile, writeFile } from "node:fs/promises";
-import { discoverSkills, findDuplicates } from "./discovery.js";
-import { buildSkillIndex, type SkillIndex } from "./indexer.js";
+import { evaluateAlwaysVisible, formatAlwaysVisibleDiagnostics } from "./always-visible.js";
+import { findDuplicates, formatInventoryRoots, isAutoRefreshEnabled, isInventoryStale, refreshSkillInventory } from "./inventory.js";
+import type { SkillIndex } from "./indexer.js";
 import { loadRecommendedSkills } from "./load-skills.js";
 import { formatPlanningKickoffMessage, isPlanningIntent } from "./planning-kickoff.js";
 import { createStats } from "./metrics.js";
@@ -35,22 +36,42 @@ const CANCEL_CHOICE = "Cancel";
 
 export default function piSkillShiori(pi: ExtensionAPI) {
   let index: SkillIndex | undefined;
+  let inventoryFingerprint: string | undefined;
+  let inventoryRoots: string[] = [];
+  let warnedAlwaysVisibleMissing = new Set<string>();
   const stats = createStats();
 
   async function reload(cwd: string): Promise<SkillIndex> {
-    const [policy, skills] = await Promise.all([loadPolicy(cwd), discoverSkills(cwd)]);
-    index?.close?.();
-    index = await buildSkillIndex(cwd, skills, policy);
-    stats.inventoryCount = skills.length;
-    stats.duplicateCount = findDuplicates(skills).size;
+    const policy = await loadPolicy(cwd);
+    const inventory = await refreshSkillInventory(cwd, policy, index);
+    index = inventory.index;
+    inventoryFingerprint = inventory.fingerprint;
+    inventoryRoots = inventory.roots;
+    stats.inventoryCount = index.skills.length;
+    stats.duplicateCount = findDuplicates(index.skills).size;
     stats.lastReloadAt = index.builtAt;
     stats.retrievalBackend = index.retrievalBackend;
     stats.suppressionStatus = policy.zeroCatalog.enabled ? "not-needed" : "disabled";
+    stats.inventoryRefreshCount += 1;
     return index;
   }
 
   async function ensureIndex(cwd: string): Promise<SkillIndex> {
-    return index ?? reload(cwd);
+    if (!index || !inventoryFingerprint) {
+      return reload(cwd);
+    }
+
+    const policy = await loadPolicy(cwd);
+    if (!isAutoRefreshEnabled(policy)) {
+      return index;
+    }
+
+    if (await isInventoryStale(cwd, policy, inventoryFingerprint)) {
+      stats.inventoryAutoRefreshCount += 1;
+      return reload(cwd);
+    }
+
+    return index;
   }
 
   function withRecommendLimits(current: SkillIndex) {
@@ -70,6 +91,8 @@ export default function piSkillShiori(pi: ExtensionAPI) {
   pi.on("session_shutdown", () => {
     index?.close?.();
     index = undefined;
+    inventoryFingerprint = undefined;
+    inventoryRoots = [];
   });
 
   pi.on("input", async (event) => {
@@ -83,7 +106,20 @@ export default function piSkillShiori(pi: ExtensionAPI) {
     const current = await ensureIndex(ctx.cwd);
     if (!current.policy.zeroCatalog.enabled) return;
 
-    const suppression = suppressSkillCatalog(event.systemPrompt);
+    const alwaysVisible = evaluateAlwaysVisible(current.policy.alwaysVisible, current.skills);
+    for (const name of alwaysVisible.missing) {
+      if (warnedAlwaysVisibleMissing.has(name)) continue;
+      warnedAlwaysVisibleMissing.add(name);
+      ctx.ui.notify(
+        `Pi Skill Shiori: always-visible skill not found in inventory: ${name}`,
+        "warning",
+      );
+    }
+
+    const suppression = suppressSkillCatalog(event.systemPrompt, {
+      alwaysVisible: current.policy.alwaysVisible,
+      skills: current.skills,
+    });
     stats.suppressionStatus = suppression.status;
     if (suppression.status === "failed-pattern-not-found") {
       ctx.ui.notify("Pi Skill Shiori: Skill Catalog suppression pattern not found; leaving system prompt unchanged.", "warning");
@@ -186,21 +222,29 @@ export default function piSkillShiori(pi: ExtensionAPI) {
     handler: async (_args, ctx) => {
       const current = await ensureIndex(ctx.cwd);
       const duplicates = findDuplicates(current.skills);
-      ctx.ui.notify(
-        [
-          "Pi Skill Shiori doctor",
-          `policy: ${getPolicyPath(ctx.cwd)}`,
-          `zeroCatalog: ${current.policy.zeroCatalog.enabled ? "enabled" : "disabled"}`,
-          `skills: ${current.skills.length}`,
-          `duplicates: ${duplicates.size}`,
-          `alwaysVisible: ${current.policy.alwaysVisible.join(", ") || "none"}`,
-          `retrievalBackend: ${current.retrievalBackend}`,
-          `suppression: ${stats.suppressionStatus}`,
-          `code: ${SHIORI_CODE_MARKER}`,
-          `builtAt: ${current.builtAt}`,
-        ].join("\n"),
-        duplicates.size > 0 || stats.suppressionStatus === "failed-pattern-not-found" ? "warning" : "info",
-      );
+      const alwaysVisible = evaluateAlwaysVisible(current.policy.alwaysVisible, current.skills);
+      const doctorLines = [
+        "Pi Skill Shiori doctor",
+        `policy: ${getPolicyPath(ctx.cwd)}`,
+        `zeroCatalog: ${current.policy.zeroCatalog.enabled ? "enabled" : "disabled"}`,
+        `skills: ${current.skills.length}`,
+        `duplicates: ${duplicates.size}`,
+        `alwaysVisible: ${current.policy.alwaysVisible.join(", ") || "none"}`,
+        ...formatAlwaysVisibleDiagnostics(alwaysVisible),
+        "inventoryRoots:",
+        ...formatInventoryRoots(inventoryRoots, current.skills).map((line) => `  - ${line}`),
+        `autoRefreshOnChange: ${isAutoRefreshEnabled(current.policy) ? "enabled" : "disabled"}`,
+        `retrievalBackend: ${current.retrievalBackend}`,
+        `suppression: ${stats.suppressionStatus}`,
+        `code: ${SHIORI_CODE_MARKER}`,
+        `builtAt: ${current.builtAt}`,
+      ];
+      const hasWarning =
+        duplicates.size > 0 ||
+        stats.suppressionStatus === "failed-pattern-not-found" ||
+        alwaysVisible.missing.length > 0 ||
+        alwaysVisible.duplicates.length > 0;
+      ctx.ui.notify(doctorLines.join("\n"), hasWarning ? "warning" : "info");
     },
   });
 

package/src/inventory.ts

@@ -0,0 +1,58 @@
+import {
+  computeInventoryFingerprint,
+  discoverSkillsFromRoots,
+  findDuplicates,
+  resolveVaultSkillRoots,
+} from "./discovery.js";
+import { buildSkillIndex, type SkillIndex } from "./indexer.js";
+import type { ShioriPolicy } from "./types.js";
+
+export interface SkillInventory {
+  index: SkillIndex;
+  roots: string[];
+  fingerprint: string;
+}
+
+export function isAutoRefreshEnabled(policy: ShioriPolicy): boolean {
+  return policy.inventory?.autoRefreshOnChange !== false;
+}
+
+export async function refreshSkillInventory(
+  cwd: string,
+  policy: ShioriPolicy,
+  previous?: SkillIndex,
+): Promise<SkillInventory> {
+  previous?.close?.();
+  const roots = resolveVaultSkillRoots(cwd, policy);
+  const [skills, fingerprint] = await Promise.all([
+    discoverSkillsFromRoots(roots),
+    computeInventoryFingerprint(roots),
+  ]);
+  const index = await buildSkillIndex(cwd, skills, policy);
+  return { index, roots, fingerprint };
+}
+
+export async function isInventoryStale(
+  cwd: string,
+  policy: ShioriPolicy,
+  fingerprint: string,
+): Promise<boolean> {
+  const roots = resolveVaultSkillRoots(cwd, policy);
+  const current = await computeInventoryFingerprint(roots);
+  return current !== fingerprint;
+}
+
+export function countSkillsByRoot(skills: SkillIndex["skills"], roots: string[]): Map<string, number> {
+  const counts = new Map(roots.map((root) => [root, 0]));
+  for (const skill of skills) {
+    counts.set(skill.source, (counts.get(skill.source) ?? 0) + 1);
+  }
+  return counts;
+}
+
+export function formatInventoryRoots(roots: string[], skills: SkillIndex["skills"]): string[] {
+  const counts = countSkillsByRoot(skills, roots);
+  return roots.map((root) => `${root} (${counts.get(root) ?? 0} skills)`);
+}
+
+export { findDuplicates };

package/src/metrics.ts

@@ -10,5 +10,7 @@ export function createStats(): ShioriStats {
     explicitInvocationCount: 0,
     retrievalBackend: "token-match",
     suppressionStatus: "disabled",
+    inventoryRefreshCount: 0,
+    inventoryAutoRefreshCount: 0,
   };
 }

package/src/policy.ts

@@ -1,6 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { parse } from "yaml";
+import { normalizeAlwaysVisible } from "./always-visible.js";
 import type { ShioriPolicy } from "./types.js";
 
 export const DEFAULT_POLICY: ShioriPolicy = {
@@ -29,6 +30,10 @@ export async function loadPolicy(cwd: string): Promise<ShioriPolicy> {
 }
 
 function normalizePolicy(policy: Partial<ShioriPolicy> | undefined): ShioriPolicy {
+  const extraRoots = (policy?.inventory?.roots ?? [])
+    .map((root) => (typeof root === "string" ? root.trim() : ""))
+    .filter(Boolean);
+
   return {
     zeroCatalog: {
       enabled: policy?.zeroCatalog?.enabled ?? DEFAULT_POLICY.zeroCatalog.enabled,
@@ -40,7 +45,14 @@ function normalizePolicy(policy: Partial<ShioriPolicy> | undefined): ShioriPolic
       maxCandidates: policy?.candidateInjection?.maxCandidates ?? DEFAULT_POLICY.candidateInjection.maxCandidates,
       minScore: policy?.candidateInjection?.minScore ?? DEFAULT_POLICY.candidateInjection.minScore,
     },
-    alwaysVisible: policy?.alwaysVisible ?? DEFAULT_POLICY.alwaysVisible,
+    alwaysVisible: normalizeAlwaysVisible(policy?.alwaysVisible ?? DEFAULT_POLICY.alwaysVisible).allowlist,
+    inventory:
+      extraRoots.length > 0 || policy?.inventory?.autoRefreshOnChange === false
+        ? {
+            roots: extraRoots.length > 0 ? extraRoots : undefined,
+            autoRefreshOnChange: policy?.inventory?.autoRefreshOnChange,
+          }
+        : undefined,
     skills: policy?.skills ?? DEFAULT_POLICY.skills,
   };
 }

package/src/prompt.ts

@@ -1,119 +1,289 @@
-import type { SkillCandidate, SuppressionStatus } from "./types.js";
-
-export interface CatalogSuppressionResult {
-  systemPrompt: string;
-  status: SuppressionStatus;
-}
-
-const COMPACT_DESCRIPTION_LIMIT = 120;
-
-export function formatCandidateInjection(candidates: SkillCandidate[]): string {
-  if (candidates.length === 0) return "";
-  const lines = ["Relevant skills:"];
-  for (const candidate of candidates) {
-    const desc = compactDescription(candidate.skill.description, COMPACT_DESCRIPTION_LIMIT);
-    lines.push(
-      `- ${candidate.skill.name}: ${desc} Reason: ${candidate.why}. Load: shiori_load_skill({ skill: "${candidate.skill.name}" })`,
-    );
-  }
-  return lines.join("\n");
-}
-
-export function formatRecommendKickoffMessage(
-  query: string,
-  loaded: Array<{ candidate: SkillCandidate; content: string }>,
-): string {
-  const lines = [query.trim(), ""];
-
-  if (loaded.length === 0) {
-    lines.push(
-      "---",
-      "Pi Skill Shiori: no matching skills for this task.",
-      "Continue without a dedicated skill, or refine the task description and run /shiori:recommend again.",
-    );
-    return lines.join("\n");
-  }
-
-  const names = loaded.map(({ candidate }) => candidate.skill.name).join(", ");
-  lines.push(
-    "---",
-    `Pi Skill Shiori: pre-loaded ${loaded.length} skill(s): ${names}`,
-    "Follow the skill instructions below and continue with the task above.",
-    "",
-  );
-
-  for (const { candidate, content } of loaded) {
-    lines.push(
-      `### Skill: ${candidate.skill.name}`,
-      `Score: ${candidate.score.toFixed(2)} | Why: ${candidate.why}`,
-      `Path: ${candidate.skill.path}`,
-      "",
-      content.trim(),
-      "",
-    );
-  }
-
-  return lines.join("\n");
-}
-
-export function formatLoadedSkillsSummary(loaded: Array<{ candidate: SkillCandidate; content: string }>): string {
-  if (loaded.length === 0) return "";
-  const lines = [`Pre-loaded ${loaded.length} skill(s):`];
-  for (const { candidate } of loaded) {
-    const desc = compactDescription(candidate.skill.description, COMPACT_DESCRIPTION_LIMIT);
-    lines.push(`- ${candidate.skill.name} (${candidate.score.toFixed(2)}): ${desc}`);
-  }
-  return lines.join("\n");
-}
-
-export function formatCandidateDetail(candidate: SkillCandidate): string {
-  return [
-    candidate.skill.name,
-    `Description: ${candidate.skill.description}`,
-    `Score: ${candidate.score.toFixed(2)}`,
-    `Why: ${candidate.why}`,
-    `Path: ${candidate.skill.path}`,
-    `Load: shiori_load_skill({ skill: "${candidate.skill.name}" })`,
-  ].join("\n");
-}
-
-export function compactDescription(description: string, maxChars = COMPACT_DESCRIPTION_LIMIT): string {
-  const singleLine = description.replace(/\s+/g, " ").trim();
-  if (singleLine.length <= maxChars) return singleLine;
-  return `${singleLine.slice(0, Math.max(0, maxChars - 1)).trimEnd()}…`;
-}
-
-export function suppressSkillCatalog(systemPrompt: string): CatalogSuppressionResult {
-  const replacement = [
-    "### Available skills",
-    "Normal Skill Catalog hidden by Pi Skill Shiori.",
-    "Use injected candidates or shiori_load_skill when relevant.",
-    "Explicit /skill:name invocation remains allowed.",
-  ].join("\n");
-
-  const patterns = [
-    /\r?\n\r?\nThe following skills provide specialized instructions for specific tasks\.\r?\n[\s\S]*?\r?\n<available_skills>[\s\S]*?\r?\n<\/available_skills>/,
-    /(^|\r?\n)<available_skills>[\s\S]*?<\/available_skills>/i,
-    /(^|\r?\n)#{2,4}\s*Available skills\b[\s\S]*?(?=\r?\n#{2,4}\s*How to use skills\b)/i,
-    /(^|\r?\n)#{2,4}\s*Available skills\b[\s\S]*?(?=\r?\n#{2,4}\s*Fallback\b)/i,
-  ];
-  for (const pattern of patterns) {
-    if (!pattern.test(systemPrompt)) continue;
-    return {
-      systemPrompt: systemPrompt.replace(pattern, `${replacement}\n`),
-      status: "suppressed",
-    };
-  }
-
-  if (!hasSkillCatalogSignal(systemPrompt)) {
-    return { systemPrompt, status: "not-needed" };
-  }
-
-  return { systemPrompt, status: "failed-pattern-not-found" };
-}
-
-function hasSkillCatalogSignal(systemPrompt: string): boolean {
-  return /<\/?available_skills>|The following skills provide specialized instructions|#{2,4}\s*Available skills\b/i.test(
-    systemPrompt,
-  );
-}
+import { normalizeAlwaysVisible } from "./always-visible.js";
+import type { SkillCandidate, SkillRecord, SuppressionStatus } from "./types.js";
+
+export interface CatalogSuppressionResult {
+  systemPrompt: string;
+  status: SuppressionStatus;
+}
+
+export interface SuppressCatalogOptions {
+  alwaysVisible: string[];
+  skills: SkillRecord[];
+}
+
+const COMPACT_DESCRIPTION_LIMIT = 120;
+
+const CATALOG_BOUNDARY_PATTERNS: Array<{ pattern: RegExp; format: "xml" | "markdown" }> = [
+  {
+    pattern:
+      /\r?\n\r?\nThe following skills provide specialized instructions for specific tasks\.\r?\n[\s\S]*?\r?\n<available_skills>[\s\S]*?\r?\n<\/available_skills>/,
+    format: "xml",
+  },
+  {
+    pattern: /(^|\r?\n)<available_skills>[\s\S]*?<\/available_skills>/i,
+    format: "xml",
+  },
+  {
+    pattern: /(^|\r?\n)#{2,4}\s*Available skills\b[\s\S]*?(?=\r?\n#{2,4}\s*How to use skills\b)/i,
+    format: "markdown",
+  },
+  {
+    pattern: /(^|\r?\n)#{2,4}\s*Available skills\b[\s\S]*?(?=\r?\n#{2,4}\s*Fallback\b)/i,
+    format: "markdown",
+  },
+];
+
+export function formatCandidateInjection(candidates: SkillCandidate[]): string {
+  if (candidates.length === 0) return "";
+  const lines = ["Relevant skills:"];
+  for (const candidate of candidates) {
+    const desc = compactDescription(candidate.skill.description, COMPACT_DESCRIPTION_LIMIT);
+    lines.push(
+      `- ${candidate.skill.name}: ${desc} Reason: ${candidate.why}. Load: shiori_load_skill({ skill: "${candidate.skill.name}" })`,
+    );
+  }
+  return lines.join("\n");
+}
+
+export function formatRecommendKickoffMessage(
+  query: string,
+  loaded: Array<{ candidate: SkillCandidate; content: string }>,
+): string {
+  const lines = [query.trim(), ""];
+
+  if (loaded.length === 0) {
+    lines.push(
+      "---",
+      "Pi Skill Shiori: no matching skills for this task.",
+      "Continue without a dedicated skill, or refine the task description and run /shiori:recommend again.",
+    );
+    return lines.join("\n");
+  }
+
+  const names = loaded.map(({ candidate }) => candidate.skill.name).join(", ");
+  lines.push(
+    "---",
+    `Pi Skill Shiori: pre-loaded ${loaded.length} skill(s): ${names}`,
+    "Follow the skill instructions below and continue with the task above.",
+    "",
+  );
+
+  for (const { candidate, content } of loaded) {
+    lines.push(
+      `### Skill: ${candidate.skill.name}`,
+      `Score: ${candidate.score.toFixed(2)} | Why: ${candidate.why}`,
+      `Path: ${candidate.skill.path}`,
+      "",
+      content.trim(),
+      "",
+    );
+  }
+
+  return lines.join("\n");
+}
+
+export function formatLoadedSkillsSummary(loaded: Array<{ candidate: SkillCandidate; content: string }>): string {
+  if (loaded.length === 0) return "";
+  const lines = [`Pre-loaded ${loaded.length} skill(s):`];
+  for (const { candidate } of loaded) {
+    const desc = compactDescription(candidate.skill.description, COMPACT_DESCRIPTION_LIMIT);
+    lines.push(`- ${candidate.skill.name} (${candidate.score.toFixed(2)}): ${desc}`);
+  }
+  return lines.join("\n");
+}
+
+export function formatCandidateDetail(candidate: SkillCandidate): string {
+  return [
+    candidate.skill.name,
+    `Description: ${candidate.skill.description}`,
+    `Score: ${candidate.score.toFixed(2)}`,
+    `Why: ${candidate.why}`,
+    `Path: ${candidate.skill.path}`,
+    `Load: shiori_load_skill({ skill: "${candidate.skill.name}" })`,
+  ].join("\n");
+}
+
+export function compactDescription(description: string, maxChars = COMPACT_DESCRIPTION_LIMIT): string {
+  const singleLine = description.replace(/\s+/g, " ").trim();
+  if (singleLine.length <= maxChars) return singleLine;
+  return `${singleLine.slice(0, Math.max(0, maxChars - 1)).trimEnd()}…`;
+}
+
+export function suppressSkillCatalog(
+  systemPrompt: string,
+  options?: SuppressCatalogOptions,
+): CatalogSuppressionResult {
+  for (const { pattern, format } of CATALOG_BOUNDARY_PATTERNS) {
+    const match = systemPrompt.match(pattern);
+    if (!match) continue;
+    const replacement = buildFilteredCatalogReplacement(match[0], format, options);
+    return {
+      systemPrompt: systemPrompt.replace(pattern, replacement),
+      status: "suppressed",
+    };
+  }
+
+  if (!hasSkillCatalogSignal(systemPrompt)) {
+    return { systemPrompt, status: "not-needed" };
+  }
+
+  return { systemPrompt, status: "failed-pattern-not-found" };
+}
+
+function buildFilteredCatalogReplacement(
+  catalogSection: string,
+  format: "xml" | "markdown",
+  options?: SuppressCatalogOptions,
+): string {
+  if (!options) {
+    return [
+      "### Available skills",
+      "Normal Skill Catalog hidden by Pi Skill Shiori.",
+      "Use injected candidates or shiori_load_skill when relevant.",
+      "Explicit /skill:name invocation remains allowed.",
+    ].join("\n");
+  }
+
+  const { allowlist } = normalizeAlwaysVisible(options.alwaysVisible);
+  const allowSet = new Set(allowlist);
+  const skillsByName = new Map(options.skills.map((skill) => [skill.name, skill]));
+
+  if (format === "xml") {
+    return buildFilteredXmlCatalog(catalogSection, allowSet, allowlist, skillsByName);
+  }
+
+  return buildFilteredMarkdownCatalog(catalogSection, allowSet, allowlist, skillsByName);
+}
+
+function buildFilteredXmlCatalog(
+  catalogSection: string,
+  allowSet: Set<string>,
+  allowlist: string[],
+  skillsByName: Map<string, SkillRecord>,
+): string {
+  const prefix = extractXmlCatalogPrefix(catalogSection);
+  const keptBlocks: string[] = [];
+  const keptNames = new Set<string>();
+
+  for (const block of extractXmlSkillBlocks(catalogSection)) {
+    const name = parseXmlSkillName(block);
+    if (!name || !allowSet.has(name)) continue;
+    keptBlocks.push(block);
+    keptNames.add(name);
+  }
+
+  for (const name of allowlist) {
+    if (keptNames.has(name)) continue;
+    const record = skillsByName.get(name);
+    if (!record) continue;
+    keptBlocks.push(formatXmlSkillBlock(record));
+    keptNames.add(name);
+  }
+
+  if (keptBlocks.length === 0) {
+    return buildHiddenCatalogStub();
+  }
+
+  const lines = [...prefix, "<available_skills>"];
+  for (const block of keptBlocks) {
+    lines.push(block);
+  }
+  lines.push("</available_skills>");
+  return lines.join("\n");
+}
+
+function buildFilteredMarkdownCatalog(
+  catalogSection: string,
+  allowSet: Set<string>,
+  allowlist: string[],
+  skillsByName: Map<string, SkillRecord>,
+): string {
+  const headerMatch = catalogSection.match(/(^|\r?\n)(#{2,4}\s*Available skills\b[^\n]*)/i);
+  const header = headerMatch?.[2] ?? "### Available skills";
+  const keptLines: string[] = [];
+  const keptNames = new Set<string>();
+
+  for (const line of catalogSection.split(/\r?\n/)) {
+    const match = line.match(/^\s*[-*]\s+\*\*([^*]+)\*\*:\s*(.*)$/);
+    if (!match) continue;
+    const name = match[1].trim();
+    if (!allowSet.has(name)) continue;
+    keptLines.push(`- **${name}**: ${match[2].trim()}`);
+    keptNames.add(name);
+  }
+
+  for (const name of allowlist) {
+    if (keptNames.has(name)) continue;
+    const record = skillsByName.get(name);
+    if (!record) continue;
+    keptLines.push(`- **${record.name}**: ${compactDescription(record.description, 240)}`);
+    keptNames.add(name);
+  }
+
+  if (keptLines.length === 0) {
+    return buildHiddenCatalogStub();
+  }
+
+  return [`${header}`, "Pi Skill Shiori: only always-visible skills remain in the Skill Catalog.", ...keptLines].join(
+    "\n",
+  );
+}
+
+function buildHiddenCatalogStub(): string {
+  return [
+    "### Available skills",
+    "Normal Skill Catalog hidden by Pi Skill Shiori.",
+    "Use injected candidates or shiori_load_skill when relevant.",
+    "Explicit /skill:name invocation remains allowed.",
+  ].join("\n");
+}
+
+function extractXmlCatalogPrefix(catalogSection: string): string[] {
+  const marker = catalogSection.search(/<available_skills>/i);
+  if (marker <= 0) return [];
+  return catalogSection.slice(0, marker).replace(/\r?\n$/, "").split(/\r?\n/).filter(Boolean);
+}
+
+function extractXmlSkillBlocks(catalogSection: string): string[] {
+  return [...catalogSection.matchAll(/<skill>[\s\S]*?<\/skill>/gi)].map((match) => match[0]);
+}
+
+function parseXmlSkillName(block: string): string | undefined {
+  const match = block.match(/<name>([\s\S]*?)<\/name>/i);
+  if (!match) return undefined;
+  return unescapeXml(match[1].trim());
+}
+
+function formatXmlSkillBlock(skill: SkillRecord): string {
+  return [
+    "  <skill>",
+    `    <name>${escapeXml(skill.name)}</name>`,
+    `    <description>${escapeXml(skill.description)}</description>`,
+    `    <location>${escapeXml(skill.path)}</location>`,
+    "  </skill>",
+  ].join("\n");
+}
+
+function escapeXml(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}
+
+function unescapeXml(value: string): string {
+  return value
+    .replace(/&apos;/g, "'")
+    .replace(/&quot;/g, '"')
+    .replace(/&gt;/g, ">")
+    .replace(/&lt;/g, "<")
+    .replace(/&amp;/g, "&");
+}
+
+function hasSkillCatalogSignal(systemPrompt: string): boolean {
+  return /<\/?available_skills>|The following skills provide specialized instructions|#{2,4}\s*Available skills\b/i.test(
+    systemPrompt,
+  );
+}

package/src/types.ts

@@ -14,6 +14,12 @@ export interface ShioriPolicy {
     minScore: number;
   };
   alwaysVisible: string[];
+  inventory?: {
+    /** Extra skill roots relative to cwd or absolute paths. */
+    roots?: string[];
+    /** Rebuild the index when skill files change under any root (default: true). */
+    autoRefreshOnChange?: boolean;
+  };
   skills: Record<string, SkillPolicy>;
 }
 
@@ -49,4 +55,6 @@ export interface ShioriStats {
   retrievalBackend: RetrievalBackend;
   suppressionStatus: SuppressionStatus;
   lastReloadAt?: string;
+  inventoryRefreshCount: number;
+  inventoryAutoRefreshCount: number;
 }