@hasna/skills 0.10.18 → 0.10.20

package/dist/sdk/index.js

@@ -25954,12 +25954,12 @@ import fs from "fs/promises";
 var import_client9, import_config17, import_node_http_handler, AWS_CONTAINER_CREDENTIALS_RELATIVE_URI = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", DEFAULT_LINK_LOCAL_HOST = "http://169.254.170.2", AWS_CONTAINER_CREDENTIALS_FULL_URI = "AWS_CONTAINER_CREDENTIALS_FULL_URI", AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE = "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE", AWS_CONTAINER_AUTHORIZATION_TOKEN = "AWS_CONTAINER_AUTHORIZATION_TOKEN", fromHttp = (options = {}) => {
   options.logger?.debug("@aws-sdk/credential-provider-http - fromHttp");
   let host;
-  const relative6 = options.awsContainerCredentialsRelativeUri ?? process.env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI];
+  const relative7 = options.awsContainerCredentialsRelativeUri ?? process.env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI];
   const full = options.awsContainerCredentialsFullUri ?? process.env[AWS_CONTAINER_CREDENTIALS_FULL_URI];
   const token = options.awsContainerAuthorizationToken ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN];
   const tokenFile = options.awsContainerAuthorizationTokenFile ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE];
   const warn = options.logger?.constructor?.name === "NoOpLogger" || !options.logger?.warn ? console.warn : options.logger.warn.bind(options.logger);
-  if (relative6 && full) {
+  if (relative7 && full) {
     warn("@aws-sdk/credential-provider-http: " + "you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
     warn("awsContainerCredentialsRelativeUri will take precedence.");
   }
@@ -25967,8 +25967,8 @@ var import_client9, import_config17, import_node_http_handler, AWS_CONTAINER_CRE
     warn("@aws-sdk/credential-provider-http: " + "you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
     warn("awsContainerAuthorizationTokenFile will take precedence.");
   }
-  if (relative6) {
-    host = `${DEFAULT_LINK_LOCAL_HOST}${relative6}`;
+  if (relative7) {
+    host = `${DEFAULT_LINK_LOCAL_HOST}${relative7}`;
   } else if (full) {
     host = full;
   } else {
@@ -32373,7 +32373,7 @@ var init_event_sink = __esm(() => {
 // package.json
 var package_default = {
   name: "@hasna/skills",
-  version: "0.10.18",
+  version: "0.10.20",
   description: "Skills library for AI coding agents",
   type: "module",
   bin: {
@@ -37692,7 +37692,7 @@ import {
   writeFileSync as writeFileSync7
 } from "fs";
 import { homedir as homedir5 } from "os";
-import { basename as basename10, dirname as dirname19, join as join27 } from "path";
+import { basename as basename11, dirname as dirname19, join as join27 } from "path";
 
 // src/lib/claude-settings-witness.ts
 import { createHash as createHash5 } from "crypto";
@@ -38006,7 +38006,7 @@ function hashNativeJsonControls(text, excludedMetadata) {
 }
 
 // src/lib/codex-plugin-skill-controls.ts
-import { dirname as dirname5, join as join10, resolve as resolve4, sep as sep2 } from "path";
+import { basename as basename3, dirname as dirname5, join as join10, relative as relative3, resolve as resolve4, sep as sep2 } from "path";
 import { lstatSync as lstatSync6, readdirSync as readdirSync3, readlinkSync as readlinkSync2, realpathSync as realpathSync5 } from "fs";
 
 // src/lib/codex-native-skill-catalog.ts
@@ -38160,6 +38160,7 @@ async function connectCodexHookRpc(options) {
 var MAX_SKILLS = 4096;
 var MAX_NAME_BYTES = 1024;
 var MAX_PATH_BYTES = 16384;
+var MAX_PLUGIN_ID_BYTES = 1024;
 var SUPPORTED_NAME_CONTROL_VERSIONS = new Set(["codex-cli 0.159.2"]);
 function refuse2() {
   throw new Error("CODEX_NATIVE_SKILL_CATALOG_INVALID");
@@ -38183,6 +38184,35 @@ function projectCodexNativeSkillCatalog(response, cwd) {
     return { name: value.name, path: value.path, enabled: value.enabled, pluginId: value.pluginId ?? null };
   });
 }
+function projectCodexInstalledPlugins(response) {
+  if (!object2(response) || !Array.isArray(response.marketplaces) || !Array.isArray(response.marketplaceLoadErrors) || response.marketplaceLoadErrors.length !== 0 || response.marketplaces.length > MAX_SKILLS)
+    refuse2();
+  const plugins = [];
+  for (const marketplace of response.marketplaces) {
+    if (!object2(marketplace) || !scalar(marketplace.name, MAX_NAME_BYTES) || !Array.isArray(marketplace.plugins) || marketplace.plugins.length > MAX_SKILLS)
+      refuse2();
+    for (const value of marketplace.plugins) {
+      if (!object2(value) || !scalar(value.id, MAX_PLUGIN_ID_BYTES) || !scalar(value.name, MAX_NAME_BYTES) || value.id !== `${value.name}@${marketplace.name}`)
+        refuse2();
+      plugins.push({ ...value, marketplace: marketplace.name });
+    }
+  }
+  return projectCodexInstalledPluginEntries(plugins);
+}
+function projectCodexInstalledPluginEntries(value) {
+  if (!Array.isArray(value) || value.length > MAX_SKILLS)
+    refuse2();
+  const ids = new Set;
+  return value.map((item) => {
+    if (!object2(item) || !scalar(item.id, MAX_PLUGIN_ID_BYTES) || !scalar(item.name, MAX_NAME_BYTES) || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean" || item.localVersion !== null && !scalar(item.localVersion, MAX_NAME_BYTES))
+      refuse2();
+    const at = item.id.lastIndexOf("@");
+    if (at < 1 || item.id.slice(0, at) !== item.name || at === item.id.length - 1 || ids.has(item.id))
+      refuse2();
+    ids.add(item.id);
+    return { id: item.id, name: item.name, installed: item.installed, enabled: item.enabled, localVersion: item.localVersion ?? null };
+  });
+}
 async function captureCodexNativeSkillCatalog(options, connect = connectCodexHookRpc) {
   if (!absolutePath2(options.cwd) || !absolutePath2(options.home))
     refuse2();
@@ -38196,7 +38226,13 @@ async function captureCodexNativeSkillCatalog(options, connect = connectCodexHoo
     if (!SUPPORTED_NAME_CONTROL_VERSIONS.has(rpc.version))
       throw new Error("CODEX_NATIVE_SKILL_CATALOG_UNSUPPORTED_VERSION");
     const response = await rpc.request("skills/list", { cwds: [options.cwd], forceReload: true });
-    return { version: rpc.version, cwd: options.cwd, skills: projectCodexNativeSkillCatalog(response, options.cwd) };
+    const installed = await rpc.request("plugin/installed", { cwds: [options.cwd] });
+    return {
+      version: rpc.version,
+      cwd: options.cwd,
+      skills: projectCodexNativeSkillCatalog(response, options.cwd),
+      plugins: projectCodexInstalledPlugins(installed)
+    };
   } finally {
     await rpc.close();
   }
@@ -38241,6 +38277,7 @@ function isCodexNativeSkillDisabled(skill, rules) {
 
 // src/lib/codex-plugin-skill-controls.ts
 var identifier3 = (v) => typeof v === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(v);
+var CODEX_DEFAULT_AGENT_PLUGIN_VERSION = "1.0.0";
 function refuse3() {
   throw new Error("CODEX_NATIVE_SKILL_IDENTITY_UNSUPPORTED: review native plugin names and hook controls");
 }
@@ -38279,6 +38316,9 @@ function rootControls(root, read) {
   }
   if (!manifest || typeof manifest !== "object" || Array.isArray(manifest) || !identifier3(manifest.name))
     refuse3();
+  const cacheVersion = basename3(root), declaredVersion = manifest.version === undefined ? "" : typeof manifest.version === "string" ? manifest.version.trim() : null;
+  if (declaredVersion === null || (declaredVersion ? declaredVersion !== cacheVersion : cacheVersion !== CODEX_DEFAULT_AGENT_PLUGIN_VERSION))
+    refuse3();
   if (manifest.hooks !== undefined || manifest.mcpServers !== undefined || manifest.commands !== undefined || manifest.apps !== undefined && manifest.apps !== "./.app.json" || ["hooks", ".mcp.json"].some((path) => lstatSync6(join10(root, path), { throwIfNoEntry: false })))
     refuse3();
   const app = join10(root, ".app.json"), present = lstatSync6(app, { throwIfNoEntry: false });
@@ -38355,22 +38395,48 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read) {
     return false;
   }
 }
-function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read) {
+function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read, rules) {
   if (catalog?.version !== "codex-cli 0.159.2" || catalog.cwd !== cwd)
     refuse3();
   const skills = projectCodexNativeSkillCatalog({ data: [{ cwd, errors: [], skills: catalog.skills }] }, cwd);
   const allowed = new Set(documents), result = [];
-  for (const skill of skills) {
-    if (!allowed.has(skill.path) || !skill.path.startsWith(cache + sep2))
+  let installedPlugins;
+  try {
+    installedPlugins = projectCodexInstalledPluginEntries(catalog.plugins ?? []);
+  } catch {
+    refuse3();
+  }
+  const candidates = catalog.plugins === undefined ? skills.map((skill) => skill.path).filter((path) => allowed.has(path)) : allowed;
+  for (const document of candidates) {
+    if (!document.startsWith(cache + sep2))
       continue;
-    if (skills.filter((other) => other.name === skill.name).length !== 1)
+    const parsed = identity(document, cache, read);
+    if (parsed.name === "skills-cli" || parsed.name.endsWith(":skills-cli"))
+      refuse3();
+    const cacheParts = relative3(cache, parsed.pluginParent).split(sep2);
+    if (cacheParts.length !== 2 || cacheParts.some((part) => !identifier3(part)))
       refuse3();
-    if (!skill.pluginId || skill.name === "skills-cli" || skill.name.endsWith(":skills-cli"))
+    const [marketplace, pluginName] = cacheParts;
+    if (pluginName !== parsed.namespace)
       refuse3();
-    const parsed = identity(skill.path, cache, read);
-    if (parsed.name !== skill.name)
+    const expectedPluginId = `${pluginName}@${marketplace}`;
+    const listed = skills.filter((skill) => skill.path === document);
+    if (listed.length > 1)
       refuse3();
-    result.push({ ...parsed, pluginId: skill.pluginId });
+    if (listed.length === 1) {
+      if (listed[0].name !== parsed.name || listed[0].pluginId !== expectedPluginId)
+        refuse3();
+    } else {
+      const installed = installedPlugins.filter((plugin) => plugin.id === expectedPluginId && plugin.name === pluginName);
+      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled || !installed[0].localVersion)
+        refuse3();
+      if (installed[0].localVersion !== basename3(dirname5(dirname5(dirname5(document)))))
+        continue;
+      const exactPathDeny = Array.isArray(rules) && rules.some((rule) => rule?.path === document && rule?.enabled === false);
+      if (!exactPathDeny || !isCodexNativeSkillDisabled({ name: parsed.name, path: document, pluginId: expectedPluginId, enabled: true }, rules))
+        refuse3();
+    }
+    result.push({ ...parsed, pluginId: expectedPluginId });
   }
   if (!result.length || new Set(result.map((item) => item.name)).size !== result.length)
     refuse3();
@@ -38532,7 +38598,7 @@ var NATIVE_SKILL_ROOTS = [
 // src/lib/agent-integration.ts
 import { createHash as createHash17, randomUUID as randomUUID3 } from "crypto";
 import { existsSync as existsSync6, lstatSync as lstatSync19, statSync as statSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync14, readdirSync as readdirSync8, opendirSync as opendirSync5, readlinkSync as readlinkSync4, realpathSync as realpathSync7, renameSync as renameSync3, rmdirSync as rmdirSync3, writeFileSync as writeFileSync4, unlinkSync as unlinkSync4, chmodSync, openSync as openSync16, closeSync as closeSync16, fsyncSync as fsyncSync4, fstatSync as fstatSync16, readSync as readSync11, constants as constants12, linkSync as linkSync2 } from "fs";
-import { dirname as dirname15, join as join22, resolve as resolve15, relative as relative3, isAbsolute as isAbsolute17, sep as sep5 } from "path";
+import { dirname as dirname15, join as join22, resolve as resolve15, relative as relative4, isAbsolute as isAbsolute17, sep as sep5 } from "path";
 import { homedir as homedir3 } from "os";
 
 // src/lib/managed-policy.ts
@@ -38540,7 +38606,7 @@ import { closeSync as closeSync10, constants as constants6, fstatSync as fstatSy
 import { join as join11 } from "path";
 
 // src/lib/agent-policy-limits.ts
-import { basename as basename3, isAbsolute as isAbsolute6, resolve as resolve5 } from "path";
+import { basename as basename4, isAbsolute as isAbsolute6, resolve as resolve5 } from "path";
 var AGENT_POLICY_LIMITS = Object.freeze({ bytes: 1024 * 1024, agents: 16, discoverySources: 2048, discoveryRawSourceBytes: 64 * 1024 * 1024, discoveryRawTotalBytes: 256 * 1024 * 1024, discoveryPathLinks: 40, discoveryPathSteps: 256, discoveryPathSourceMetadataBytes: 64 * 1024, discoveryPathTotalMetadataBytes: 8 * 1024 * 1024, discoveryRoots: 512, discoveryDirectories: 64, discoveryDirectoryEntries: 20000, discoveryDirectoryBytes: 8 * 1024 * 1024, builtinNames: 2048, rootAliases: 2, fields: 64, pathCharacters: 4096 });
 function object3(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
@@ -38619,11 +38685,11 @@ function assertAgentPolicyCollections(policy) {
       if (source.hashMode !== undefined)
         requireBound(["bytes", "path-bytes", "claude-plugin-registry", "claude-marketplace-registry", "claude-settings-v1", "claude-settings-v2", "claude-settings-v3", "claude-marketplace-registry-v2", "codex-settings-v1"].includes(source.hashMode) && source.format === undefined && source.fields === undefined && (source.hashMode === "bytes" || source.sha256 !== null));
       if (source.hashMode === "codex-settings-v1")
-        requireBound(agent === "codex" && value.agent === "codex" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename3(source.path) === "config.toml");
+        requireBound(agent === "codex" && value.agent === "codex" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename4(source.path) === "config.toml");
       if (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3")
-        requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename3(source.path) === "settings.json");
+        requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename4(source.path) === "settings.json");
       if (source.hashMode === "claude-marketplace-registry" || source.hashMode === "claude-marketplace-registry-v2")
-        requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename3(source.path) === "known_marketplaces.json");
+        requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename4(source.path) === "known_marketplaces.json");
       if (source.hashMode === "claude-plugin-registry") {
         requireBound(agent === "claude");
         const managed = array(source.managedPlugins, 64);
@@ -38777,7 +38843,7 @@ function isOwnedCliBridge(path, expectedPaths) {
 // src/lib/agent-discovery.ts
 import { createHash as createHash16 } from "crypto";
 import { lstatSync as lstatSync18, readFileSync as readFileSync13, readdirSync as readdirSync7, realpathSync as realpathSync6 } from "fs";
-import { basename as basename6, dirname as dirname14, isAbsolute as isAbsolute16, join as join21, resolve as resolve14, sep as sep4 } from "path";
+import { basename as basename7, dirname as dirname14, isAbsolute as isAbsolute16, join as join21, resolve as resolve14, sep as sep4 } from "path";
 import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
 
 // node_modules/yaml/dist/index.js
@@ -39059,7 +39125,7 @@ function capture(path, budget) {
     return { path, sha256: null };
   need3(root.isDirectory(), "Unsupported native discovery directory input");
   const hash2 = createHash8("sha256");
-  function walk2(current, relative3, before, depth) {
+  function walk2(current, relative4, before, depth) {
     need3(depth <= 64, "Native discovery directory depth limit exceeded");
     const names = [], directory = opendirSync2(current);
     try {
@@ -39072,7 +39138,7 @@ function capture(path, budget) {
     }
     need3(new Set(names).size === names.length, "Ambiguous native discovery directory names");
     for (const name of names.sort()) {
-      const child = join14(current, name), childRelative = relative3 ? `${relative3}/${name}` : name;
+      const child = join14(current, name), childRelative = relative4 ? `${relative4}/${name}` : name;
       need3(child.length <= AGENT_POLICY_LIMITS.pathCharacters, "Native discovery directory path limit exceeded");
       const stat = lstatSync10(child);
       need3(stat.isFile() || stat.isDirectory(), "Refusing symlink or special native discovery directory member");
@@ -39288,7 +39354,7 @@ function hashDiscoveryPathFile(path, budget, changes) {
 
 // src/lib/plugin-discovery.ts
 import { closeSync as closeSync13, constants as constants9, fstatSync as fstatSync13, lstatSync as lstatSync15, openSync as openSync13, opendirSync as opendirSync4, readSync as readSync8 } from "fs";
-import { basename as basename4, dirname as dirname11, isAbsolute as isAbsolute14, join as join20, resolve as resolve12 } from "path";
+import { basename as basename5, dirname as dirname11, isAbsolute as isAbsolute14, join as join20, resolve as resolve12 } from "path";
 
 // src/lib/plugin-admission.ts
 import { homedir as homedir2 } from "os";
@@ -39631,7 +39697,7 @@ function directoryNames(path) {
 function snapshotPluginTree(root, options = {}) {
   const chain = ancestors(root), entries = [], files = [], directories = [];
   let bytes = 0, visited = 0;
-  const visit2 = (directory, relative3) => {
+  const visit2 = (directory, relative4) => {
     const before = stat(directory);
     pluginNeed(before && before.isDirectory() && !before.isSymbolicLink(), "Plugin tree must contain real directories");
     const names = directoryNames(directory);
@@ -39639,18 +39705,18 @@ function snapshotPluginTree(root, options = {}) {
     directories.push({ path: directory, stat: before, names });
     for (const name of names) {
       pluginNeed(++visited <= PLUGIN_PROJECTION_LIMITS.files * 50, "Plugin tree membership exceeds its limit");
-      const path = relative3 ? `${relative3}/${name}` : name;
+      const path = relative4 ? `${relative4}/${name}` : name;
       pluginNeed(new TextEncoder().encode(path).byteLength <= 100 && !/[\\:\x00-\x1f\x7f]/u.test(path), "Plugin entry path exceeds its limit or is unsafe");
       const absolute = join16(directory, name), entryStat = stat(absolute);
       pluginNeed(entryStat, "Plugin tree member disappeared");
-      if (relative3 === "" && name === ".orphaned_at" && (options.nativeRuntime === "claude-2.1.274" || options.nativeRuntime === "claude-2.1.276")) {
+      if (relative4 === "" && name === ".orphaned_at" && (options.nativeRuntime === "claude-2.1.274" || options.nativeRuntime === "claude-2.1.276")) {
         const bytes2 = readBytes(absolute, 32, "native-pin");
         pluginNeed(/^[1-9][0-9]{12}$/.test(new TextDecoder().decode(bytes2)), "Malformed native orphan timestamp");
         same3(entryStat, stat(absolute));
         files.push({ path: absolute, stat: entryStat });
         continue;
       }
-      if (relative3 === "" && name === ".in_use" && (options.nativeRuntime === "claude-2.1.274" || options.nativeRuntime === "claude-2.1.276")) {
+      if (relative4 === "" && name === ".in_use" && (options.nativeRuntime === "claude-2.1.274" || options.nativeRuntime === "claude-2.1.276")) {
         pluginNeed(entryStat.isDirectory() && !entryStat.isSymbolicLink(), "Native plugin pins require a real directory");
         owner(entryStat);
         const pins = directoryNames(absolute);
@@ -40769,7 +40835,7 @@ function hashManagedPluginRegistry(path, managed) {
       pluginNeed(/^(?:[A-Za-z0-9][A-Za-z0-9._+-]*-)?[a-f0-9]{12}$/.test(row.version) && row.installPath === join20(cacheRoot, row.version), "Managed plugin cache path or version is outside its registration");
       const approval = (producer) => {
         pluginText(producer);
-        const digest2 = `sha256:${basename4(producer)}`;
+        const digest2 = `sha256:${basename5(producer)}`;
         const receipt2 = readPluginAdmissionReceipt(witness.storeRoot, witness.bindingId, digest2);
         pluginNeed(receipt2.materializedPath === producer, "Managed producer path is not an approved immutable projection");
         if (!verified.has(producer)) {
@@ -40833,7 +40899,7 @@ function captureManagedPluginRegistry(path, managedPlugins) {
 // src/lib/claude-marketplace-registry.ts
 import { createHash as createHash13 } from "crypto";
 import { closeSync as closeSync14, constants as constants10, fstatSync as fstatSync14, lstatSync as lstatSync16, openSync as openSync14, readSync as readSync9 } from "fs";
-import { basename as basename5, dirname as dirname12, isAbsolute as isAbsolute15, resolve as resolve13 } from "path";
+import { basename as basename6, dirname as dirname12, isAbsolute as isAbsolute15, resolve as resolve13 } from "path";
 var CLAUDE_MARKETPLACE_REGISTRY_LIMITS = Object.freeze({ bytes: 1024 * 1024, rows: 1024, depth: 32, nodes: 65536, stringCharacters: 16384, pathCharacters: 4096 });
 function need4(value, reason) {
   if (!value)
@@ -40855,7 +40921,7 @@ function parents2(path) {
 }
 function readRegistry2(path, budget) {
   absolutePath3(path);
-  need4(basename5(path) === "known_marketplaces.json", "requires known_marketplaces.json");
+  need4(basename6(path) === "known_marketplaces.json", "requires known_marketplaces.json");
   need4(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
   const ancestors2 = parents2(path), initial = lstatSync16(path, { bigint: true });
   need4(initial.isFile() && !initial.isSymbolicLink() && initial.size <= BigInt(CLAUDE_MARKETPLACE_REGISTRY_LIMITS.bytes), "is not a bounded regular file");
@@ -41195,9 +41261,9 @@ function verifyAgentDiscovery(binding, codexRecovery) {
     safe4(root2);
 }
 function assertMarketplaceBinding(binding, source) {
-  if (source.hashMode === "codex-settings-v1" && (binding.agent !== "codex" || binding.method !== "reviewed" || basename6(source.path) !== "config.toml"))
+  if (source.hashMode === "codex-settings-v1" && (binding.agent !== "codex" || binding.method !== "reviewed" || basename7(source.path) !== "config.toml"))
     throw new Error("Codex settings witnesses require explicit reviewed Codex configuration");
-  if ((source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3") && (binding.agent !== "claude" || binding.method !== "reviewed" || basename6(source.path) !== "settings.json"))
+  if ((source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3") && (binding.agent !== "claude" || binding.method !== "reviewed" || basename7(source.path) !== "settings.json"))
     throw new Error("Claude settings witnesses require explicit reviewed Claude configuration");
   if ((source.hashMode === "claude-marketplace-registry" || source.hashMode === "claude-marketplace-registry-v2") && (binding.agent !== "claude" || binding.method !== "reviewed"))
     throw new Error("Claude marketplace witnesses require explicit reviewed Claude discovery");
@@ -41833,7 +41899,7 @@ function readRootAlias(home, agent) {
   const targetStat = lstatSync19(targetPath, { throwIfNoEntry: false });
   if (!targetStat?.isDirectory())
     throw new Error(`Agent root alias must target an existing directory: ${alias}`);
-  const target = realpathSync7(targetPath), inside = relative3(realHome, target);
+  const target = realpathSync7(targetPath), inside = relative4(realHome, target);
   if (!inside || inside === ".." || inside.startsWith(`..${sep5}`) || isAbsolute17(inside))
     throw new Error(`Agent root alias target must be inside the real home: ${alias}`);
   return { agent, home: realHome, alias, target, link, aliasIdentity: `${stat2.dev}:${stat2.ino}:${stat2.ctimeNs}`, targetIdentity: `${targetStat.dev}:${targetStat.ino}` };
@@ -41851,7 +41917,7 @@ function rootAliases(home, allowed = false) {
 }
 function canonicalAgentPath(path, aliases) {
   const absolute = resolve15(path), binding = aliases.find((item) => absolute === item.alias || absolute.startsWith(item.alias + sep5));
-  return binding ? join22(binding.target, relative3(binding.alias, absolute)) : absolute;
+  return binding ? join22(binding.target, relative4(binding.alias, absolute)) : absolute;
 }
 function disabledCodexSkillPaths(config, aliases) {
   const skills = config.skills;
@@ -41922,7 +41988,7 @@ function treeHash(root2) {
     const stat2 = lstatSync19(path);
     if (stat2.isSymbolicLink())
       throw new Error(`Refusing symlink in skill: ${path}`);
-    const rel = relative3(root2, path);
+    const rel = relative4(root2, path);
     if (stat2.isDirectory()) {
       hash2.update(`d\x00${rel}\x00`);
       for (const name of readdirSync8(path).sort())
@@ -41948,7 +42014,7 @@ function selectNativeMigrationTargets(inventory, manifest) {
   const identities = new Set;
   const selected = [];
   for (const target of manifest.targets) {
-    const projectRoot = resolve15(target.projectRoot), normalized = relative3(projectRoot, resolve15(projectRoot, target.path));
+    const projectRoot = resolve15(target.projectRoot), normalized = relative4(projectRoot, resolve15(projectRoot, target.path));
     if (!isAbsolute17(target.projectRoot) || projectRoot !== target.projectRoot || !existsSync6(projectRoot) || !lstatSync19(projectRoot).isDirectory())
       throw new Error(`Native migration target project root must be an existing absolute directory: ${target.projectRoot}`);
     assertSafePath(projectRoot);
@@ -42303,7 +42369,7 @@ function planAgentIntegration(options) {
     const bytes = readNativeBytes(path, 1024 * 1024);
     observedNativeSources.push({ path, sha256: sha3(bytes) });
     return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
-  }) : policy.bridge?.codexPluginSkills ?? [];
+  }, codexConfig.skills?.config ?? []) : policy.bridge?.codexPluginSkills ?? [];
   const changes = [];
   for (const agent of [...new Set(options.agents)]) {
     if (!INTEGRATION_AGENTS.includes(agent))
@@ -42381,7 +42447,7 @@ function planAgentIntegration(options) {
     profiles: Object.fromEntries([...new Set([...priorAgents, ...options.agents])].sort().map((agent) => [agent, bindings.get(agent)?.profileId ?? policy.bridge?.profiles?.[agent] ?? policy.profileId])),
     disabledBuiltins: options.agents.includes("codex") ? nativeSkills.filter((entry) => entry.agent === "codex" && entry.vendor && entry.path.startsWith(canonicalAgentPath(join22(home, ".codex", "skills", ".system"), aliases) + sep5)).map((entry) => ({ path: entry.path, hash: entry.hash })) : policy.bridge?.disabledBuiltins ?? [],
     rootAliases: aliases,
-    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha3(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd) })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join22(home, ".codex/config.toml"), aliases))?.before === null ? null : sha3(readOptional(canonicalAgentPath(join22(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
+    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha3(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd), ...options.codexNativeCatalog.plugins === undefined ? {} : { plugins: projectCodexInstalledPluginEntries(options.codexNativeCatalog.plugins) } })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join22(home, ".codex/config.toml"), aliases))?.before === null ? null : sha3(readOptional(canonicalAgentPath(join22(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
     discovery: { ...policy.bridge?.discovery, ...Object.fromEntries(discoveryAfter.map((binding) => [binding.agent, binding])) }
   } };
   const serializedPolicy = serializeManagedSkillPolicy(nextPolicy);
@@ -42399,7 +42465,7 @@ function planClaudePreToolUseHookUpdate(options) {
 function claudeSettingsConsumers(home, path, discoveries, aliases) {
   const canonical5 = (value) => canonicalAgentPath(value, aliases);
   const containsSettings = (root2) => {
-    const distance = relative3(canonical5(root2), path);
+    const distance = relative4(canonical5(root2), path);
     return distance === "" || distance !== ".." && !distance.startsWith(`..${sep5}`) && !isAbsolute17(distance);
   };
   return discoveries.filter((binding) => binding.agent === "claude" || binding.agent === "opencode" || canonical5(join22(home, AGENT_ADAPTERS[binding.agent].config)) === path || binding.sources.some((source) => canonical5(source.path) === path) || binding.roots.some(containsSettings) || binding.directories?.some((directory) => containsSettings(directory.path))).map((binding) => binding.agent);
@@ -42913,7 +42979,7 @@ import {
   statSync as statSync9,
   writeFileSync as writeFileSync6
 } from "fs";
-import { basename as basename9, dirname as dirname18, isAbsolute as isAbsolute18, join as join26, normalize as normalize3, relative as relative5, resolve as resolve17, sep as sep8 } from "path";
+import { basename as basename10, dirname as dirname18, isAbsolute as isAbsolute18, join as join26, normalize as normalize3, relative as relative6, resolve as resolve17, sep as sep8 } from "path";
 
 // src/lib/registry-data/index.ts
 var SKILLS = [];
@@ -43438,7 +43504,7 @@ import {
   realpathSync as realpathSync8,
   writeFileSync as writeFileSync5
 } from "fs";
-import { basename as basename7, dirname as dirname16, join as join24, relative as relative4 } from "path";
+import { basename as basename8, dirname as dirname16, join as join24, relative as relative5 } from "path";
 var ANY_SEGMENT_COPY_EXCLUDES = new Set([
   ".git",
   ".DS_Store",
@@ -43488,11 +43554,11 @@ function normalizeNewPortableSkillName(name) {
     throw new Error(`Invalid skill name '${name}'. Include letters or numbers.`);
   return normalized;
 }
-function readPortableSkillManifest(skillPath, fallbackName = basename7(skillPath)) {
+function readPortableSkillManifest(skillPath, fallbackName = basename8(skillPath)) {
   return readManifest(skillPath, fallbackName, normalizePortableSkillName);
 }
 function readPortableSkillManifestForImport(skillPath) {
-  return readManifest(skillPath, basename7(skillPath), normalizeNewPortableSkillName);
+  return readManifest(skillPath, basename8(skillPath), normalizeNewPortableSkillName);
 }
 function readManifest(skillPath, fallbackName, normalizeName) {
   const skillJsonPath = join24(skillPath, "skill.json");
@@ -43795,7 +43861,7 @@ function copySkillDirectory(source, destination) {
   cpSync(resolvedSource, destination, {
     recursive: true,
     filter: (src) => {
-      const rel = relative4(resolvedSource, src);
+      const rel = relative5(resolvedSource, src);
       if (!rel)
         return true;
       const segments = rel.split(/[\\/]/);
@@ -44046,7 +44112,7 @@ function inferRuntimeFromCommands(commands) {
 function readJsonObject(path) {
   const parsed = JSON.parse(readFileSync16(path, "utf-8"));
   if (!isRecord2(parsed))
-    throw new Error(`${basename7(path)} must contain a JSON object`);
+    throw new Error(`${basename8(path)} must contain a JSON object`);
   return parsed;
 }
 function hasPackageDependencies(pkgPath) {
@@ -44084,7 +44150,7 @@ function escapeJsString(value) {
 // src/lib/authoring-path.ts
 import { lstatSync as lstatSync21, realpathSync as realpathSync9 } from "fs";
 import { homedir as homedir4 } from "os";
-import { basename as basename8, dirname as dirname17, join as join25, resolve as resolve16, sep as sep7 } from "path";
+import { basename as basename9, dirname as dirname17, join as join25, resolve as resolve16, sep as sep7 } from "path";
 var NATIVE_DISCOVERY_ROOTS = NATIVE_SKILL_ROOTS.map(([, path]) => path.split("/"));
 function pathParts(path) {
   return resolve16(path).split(sep7).filter(Boolean);
@@ -44104,7 +44170,7 @@ function physicalPath(path) {
   let cursor = resolve16(path);
   const suffix = [];
   while (!lstatSync21(cursor, { throwIfNoEntry: false })) {
-    suffix.unshift(basename8(cursor));
+    suffix.unshift(basename9(cursor));
     const parent = dirname17(cursor);
     if (parent === cursor)
       return resolve16(path);
@@ -44323,7 +44389,7 @@ function physicalImportPath(path) {
   let ancestor = resolve17(path);
   const suffix = [];
   while (!existsSync9(ancestor)) {
-    suffix.unshift(basename9(ancestor));
+    suffix.unshift(basename10(ancestor));
     ancestor = dirname18(ancestor);
   }
   return join26(realpathSync10(ancestor), ...suffix);
@@ -44332,7 +44398,7 @@ function assertDisjointImportPaths(source, destination) {
   const sourcePath = realpathSync10(source);
   const destinationPath = physicalImportPath(destination);
   const contains2 = (parent, child) => {
-    const path = relative5(parent, child);
+    const path = relative6(parent, child);
     return path === "" || !isAbsolute18(path) && path !== ".." && !path.startsWith(`..${sep8}`);
   };
   if (contains2(sourcePath, destinationPath) || contains2(destinationPath, sourcePath)) {
@@ -44348,8 +44414,8 @@ function portPortableSkill(sourcePath, options = {}) {
   const explicitName = options.name != null;
   const skillName = normalizeNewPortableSkillName(options.name ?? inferred.name);
   if (isOfficialSkillName(skillName) && !options.allowShadow) {
-    const sourceSlug = safeNormalizeName(basename9(absoluteSource));
-    const via = explicitName ? `Name '${skillName}' matches a bundled official skill.` : `Inferred name '${skillName}'${sourceSlug && sourceSlug !== skillName ? ` (from source folder '${basename9(absoluteSource)}')` : ""} matches a bundled official skill.`;
+    const sourceSlug = safeNormalizeName(basename10(absoluteSource));
+    const via = explicitName ? `Name '${skillName}' matches a bundled official skill.` : `Inferred name '${skillName}'${sourceSlug && sourceSlug !== skillName ? ` (from source folder '${basename10(absoluteSource)}')` : ""} matches a bundled official skill.`;
     throw new Error(`${via} Importing it would shadow the official '${skillName}'. ` + `Pass --name to choose a different name, or --allow-shadow to override deliberately.`);
   }
   const readOnlyDestination = join26(resolvePortableSkillsRoot(options, false), skillName);
@@ -44869,7 +44935,7 @@ function writeManagedSkillDir(dir, skillMd, options) {
     return { action, path: skillMdPath };
   const parentDir = dirname19(dir);
   mkdirSync8(parentDir, { recursive: true });
-  const transactionDir = mkdtempSync2(join27(parentDir, `.hasna-skills-write-${basename10(dir)}-`));
+  const transactionDir = mkdtempSync2(join27(parentDir, `.hasna-skills-write-${basename11(dir)}-`));
   const candidateDir = join27(transactionDir, "candidate");
   const backupDir = join27(transactionDir, "backup");
   const candidateSkillMdPath = join27(candidateDir, "SKILL.md");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/skills",
-  "version": "0.10.18",
+  "version": "0.10.20",
   "description": "Skills library for AI coding agents",
   "type": "module",
   "bin": {