@hasna/skills 0.10.91 → 0.10.93

package/dist/index.js

@@ -16369,7 +16369,7 @@ import { basename as basename15, dirname as dirname27, isAbsolute as isAbsolute2
 import { homedir as homedir5 } from "os";
 import { isAbsolute as isAbsolute25, join as join39, resolve as resolve25 } from "path";
 // package.json
-var version = "0.10.91";
+var version = "0.10.93";
 var package_default = {
   name: "@hasna/skills",
   version,
@@ -20802,6 +20802,82 @@ function assertPinnedLauncherRuntimeSafe(runtime) {
   }
 }
 
+// src/lib/linux-access-acl.ts
+var LINUX_ENODATA = 61;
+var LINUX_EOPNOTSUPP = 95;
+var LINUX_ACL_QUERY_ATTEMPTS = 4;
+var LINUX_ACL_FREE_WHEN_UNSUPPORTED = new Set([
+  0xef53n,
+  0x58465342n,
+  0x9123683en,
+  0x01021994n
+]);
+function queryAttribute(probe2, errno, fd, attribute) {
+  for (let attempt = 0;attempt < LINUX_ACL_QUERY_ATTEMPTS; attempt++) {
+    errno.set?.(0);
+    const result = probe2.fgetxattr(fd, attribute);
+    const code = errno.get();
+    if (result !== -1 && result !== -1n)
+      return "present";
+    if (code === LINUX_ENODATA)
+      return "absent";
+    if (code === LINUX_EOPNOTSUPP)
+      return "unsupported";
+  }
+  return "unverified";
+}
+function linuxAccessAclAbsent(probe2, fd, creationParent) {
+  if (probe2.arch !== "x64" && probe2.arch !== "arm64")
+    return false;
+  const errno = probe2.errno;
+  if (!errno)
+    return false;
+  let unsupported = false;
+  for (const attribute of ["system.posix_acl_access", ...creationParent ? ["system.posix_acl_default"] : []]) {
+    const state = queryAttribute(probe2, errno, fd, attribute);
+    if (state === "present" || state === "unverified")
+      return false;
+    if (state === "unsupported")
+      unsupported = true;
+  }
+  if (!unsupported)
+    return true;
+  const type = probe2.filesystemType(fd);
+  return type !== null && LINUX_ACL_FREE_WHEN_UNSUPPORTED.has(type);
+}
+function withGlibcAclProbe(use) {
+  try {
+    const { dlopen, ptr, read: read2, FFIType } = __require("bun:ffi");
+    const library = dlopen("libc.so.6", {
+      fgetxattr: { args: ["i32", "ptr", "ptr", "u64"], returns: FFIType.i64_fast },
+      fstatfs: { args: ["i32", "ptr"], returns: "i32" },
+      __errno_location: { args: [], returns: "ptr" }
+    });
+    try {
+      const location = library.symbols.__errno_location();
+      const names = new Map;
+      return use({
+        arch: process.arch,
+        errno: location ? { get: () => read2.i32(location) } : null,
+        fgetxattr: (fd, attribute) => {
+          let name = names.get(attribute);
+          if (!name)
+            names.set(attribute, name = Buffer.from(attribute + "\x00"));
+          return library.symbols.fgetxattr(fd, ptr(name), null, 0);
+        },
+        filesystemType: (fd) => {
+          const statfs = new BigUint64Array(32);
+          return library.symbols.fstatfs(fd, ptr(statfs)) === 0 ? statfs[0] : null;
+        }
+      });
+    } finally {
+      library.close();
+    }
+  } catch {
+    return false;
+  }
+}
+
 // src/lib/retained-review-artifacts.ts
 import { createHash as createHash29 } from "crypto";
 import { constants as constants18, closeSync as closeSync17, fstatSync as fstatSync17, fsyncSync as fsyncSync6, lstatSync as lstatSync29, mkdirSync as mkdirSync8, openSync as openSync17, readSync as readSync12, writeSync as writeSync4 } from "fs";
@@ -21796,28 +21872,7 @@ function hookProjectionRefusal(reason2) {
   throw new Error(`CLAUDE_MANAGED_HOOK_${reason2}`);
 }
 function hasNoLinuxAccessAcl(fd, creationParent) {
-  try {
-    const { dlopen, read: read2, ptr } = __require("bun:ffi");
-    const library = dlopen("libc.so.6", {
-      fgetxattr: { args: ["i32", "ptr", "ptr", "u64"], returns: "i64" },
-      __errno_location: { args: [], returns: "ptr" }
-    });
-    try {
-      const errno = library.symbols.__errno_location();
-      if (!errno)
-        return false;
-      for (const attribute of ["system.posix_acl_access", ...creationParent ? ["system.posix_acl_default"] : []]) {
-        const name = Buffer.from(attribute + "\x00");
-        if (Number(library.symbols.fgetxattr(fd, ptr(name), null, 0)) !== -1 || read2.i32(errno) !== 61)
-          return false;
-      }
-      return true;
-    } finally {
-      library.close();
-    }
-  } catch {
-    return false;
-  }
+  return withGlibcAclProbe((probe2) => linuxAccessAclAbsent(probe2, fd, creationParent));
 }
 function assertNativePathAcl(path, observed, options = {}) {
   if (process.platform !== "darwin" && process.platform !== "linux")
@@ -22758,7 +22813,7 @@ function planCodexPluginNameReconcile(request) {
     pathDenies: [...pathDenies].sort(),
     ...discovery ? { discovery } : {}
   };
-  const plan = planAgentIntegration({ home, dataDir: dataDir2, projectDir, agents: ["codex"], codexNativeCatalog: catalog, codexReconcile: input });
+  const plan = planAgentIntegration({ home, dataDir: dataDir2, projectDir, agents: ["codex"], codexNativeCatalog: catalog, codexReconcile: input, allowRootAliases: aliases.length > 0 });
   assertCodexReconcileScope(plan, { configPath, policyPath, prior, names, remoteIdentities, discovery: discovery ?? savedDiscovery });
   const configChange = plan.changes.find((change) => resolve24(change.path) === configPath);
   const plannedRules = configChange ? Bun.TOML.parse(configChange.after).skills?.config ?? [] : [];
@@ -25764,6 +25819,19 @@ function discoveryRootUnresolved(agent, command, detail) {
 function isDiscoveryRootUnresolved(error) {
   return error instanceof Error && error.message.startsWith(`${DISCOVERY_ROOT_UNRESOLVED}: `);
 }
+
+class NativeDiscoveryUnresolved extends Error {
+  agent;
+  detail;
+  source;
+  reviewable = false;
+  constructor(agent, detail, source) {
+    super(`Native discovery is unresolved (${agent}: ${detail}); provide a reviewed --discovery-inputs file`);
+    this.agent = agent;
+    this.detail = detail;
+    this.source = source;
+  }
+}
 var quotedPath = (path) => JSON.stringify(path).replace(/[^\x20-\x7e]/g, (character) => `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`);
 var realpathOrNull = (path) => {
   try {
@@ -26733,9 +26801,96 @@ function nativeDiscoveryAliasTargets(roots, home) {
   }
   return [...targets];
 }
+function hooksAreManagedBridge(agent, hooks, managed) {
+  const table = (value) => Boolean(value && typeof value === "object" && !Array.isArray(value));
+  const exactKeys3 = (value, keys2) => Object.keys(value).sort().join("\x00") === [...keys2].sort().join("\x00");
+  if (!table(hooks) || typeof managed.command !== "string" || !isAbsolute28(managed.command))
+    return false;
+  const events3 = agent === "gemini" ? ["BeforeAgent", "SessionStart", "BeforeTool"] : ["beforeSubmitPrompt", "sessionStart"];
+  for (const [event, entries] of Object.entries(hooks)) {
+    if (!events3.includes(event) || !Array.isArray(entries) || entries.length !== 1)
+      return false;
+    let expected;
+    try {
+      expected = renderAgentHookCommand(managed.command, agent, managed.profile, event);
+    } catch {
+      return false;
+    }
+    const entry = entries[0];
+    if (!table(entry))
+      return false;
+    if (agent === "cursor") {
+      if (!exactKeys3(entry, ["command", "timeout"]) || entry.timeout !== 15 || entry.command !== expected)
+        return false;
+      continue;
+    }
+    if (!exactKeys3(entry, event === "BeforeTool" ? ["hooks", "matcher"] : ["hooks"]) || event === "BeforeTool" && entry.matcher !== "activate_skill" || !Array.isArray(entry.hooks) || entry.hooks.length !== 1)
+      return false;
+    const hook = entry.hooks[0];
+    if (!table(hook) || !exactKeys3(hook, ["command", "timeout", "type"]) || hook.type !== "command" || hook.timeout !== 15000 || hook.command !== expected)
+      return false;
+  }
+  return true;
+}
+function sumiPluginLoadsOnlyBuiltins(text2) {
+  for (const match of text2.matchAll(/\b(?:import|require)\s*\(\s*(.?)/g)) {
+    const rest = text2.slice(match.index + match[0].length - match[1].length);
+    if (!/^(['"])node:[A-Za-z0-9_/.-]+\1/.test(rest))
+      return false;
+  }
+  for (const match of text2.matchAll(/\b(?:from|import)\s*(['"])([^'"]*)\1/g))
+    if (!match[2].startsWith("node:"))
+      return false;
+  return true;
+}
+var CODEX_MARKETPLACE_TIMESTAMP = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?(?:Z|[+-]\d{2}:\d{2})$/;
+function codexRootFreeControls(config) {
+  const table = (value) => Boolean(value && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date));
+  const adapted = [];
+  const servers = config.mcp_servers;
+  if (table(servers) && Object.keys(servers).length <= AGENT_POLICY_LIMITS.discoveryRoots && Object.entries(servers).every(([name, row]) => name !== "codex_apps" && name !== "_codex_apps" && isCodexLocalStdioMcpServer(name, row)))
+    adapted.push("mcp_servers");
+  const agents = config.agents;
+  if (table(agents) && Object.keys(agents).length <= AGENT_POLICY_LIMITS.fields && Object.values(agents).every((value) => typeof value === "boolean" || typeof value === "number" && Number.isFinite(value)))
+    adapted.push("agents");
+  return adapted;
+}
+var CODEX_HOOK_EVENTS = new Set(["PreToolUse", "PermissionRequest", "PostToolUse", "PreCompact", "PostCompact", "SessionStart", "SessionEnd", "UserPromptSubmit", "SubagentStart", "SubagentStop", "Stop", "Interrupt"]);
+function codexPluginHookHandlers(value) {
+  const table = (item) => Boolean(item && typeof item === "object" && !Array.isArray(item));
+  const identifier6 = (item) => typeof item === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(item);
+  const text2 = (item) => typeof item === "string" && item.length <= AGENT_POLICY_LIMITS.pathCharacters && !item.includes("\x00");
+  if (!table(value) || !Object.keys(value).every((key2) => key2 === "hooks" || key2 === "description") || value.description !== undefined && !text2(value.description) || !table(value.hooks) || Object.keys(value.hooks).length > 32)
+    return null;
+  const result = { commands: 0, servers: new Set };
+  for (const [event, groups] of Object.entries(value.hooks)) {
+    if (!CODEX_HOOK_EVENTS.has(event) || !Array.isArray(groups) || groups.length > 32)
+      return null;
+    for (const group of groups) {
+      if (!table(group) || !Object.keys(group).every((key2) => key2 === "hooks" || key2 === "matcher") || group.matcher !== undefined && !text2(group.matcher) || !Array.isArray(group.hooks) || group.hooks.length > 32)
+        return null;
+      for (const handler of group.hooks) {
+        if (!table(handler) || handler.timeout !== undefined && !(Number.isSafeInteger(handler.timeout) && handler.timeout >= 0) || handler.statusMessage !== undefined && !text2(handler.statusMessage))
+          return null;
+        if (handler.type === "command") {
+          if (!text2(handler.command) || !handler.command || !Object.keys(handler).every((key2) => ["type", "command", "commandWindows", "command_windows", "timeout", "async", "statusMessage", "additionalContextLimit"].includes(key2)))
+            return null;
+          result.commands++;
+        } else if (handler.type === "mcp_tool") {
+          if (!identifier6(handler.server) || !identifier6(handler.tool) || handler.input !== undefined && !table(handler.input) || !Object.keys(handler).every((key2) => ["type", "server", "tool", "input", "timeout", "statusMessage"].includes(key2)))
+            return null;
+          result.servers.add(handler.server);
+        } else
+          return null;
+      }
+    }
+  }
+  return result;
+}
 function resolveDiscovery(options, exclusion) {
   const canonical9 = options.canonical ?? resolve28, home = resolve28(options.home), agent = options.agent;
   const sources = [], roots = new Set, builtinNames = [];
+  const sumiLocalPluginTexts = new Map;
   const budget3 = discoveryByteBudget();
   let remainingEntries = AGENT_POLICY_LIMITS.discoveryDirectoryEntries;
   const entries = (path) => {
@@ -26772,8 +26927,8 @@ function resolveDiscovery(options, exclusion) {
   const configPath = exclusion?.nativeHome === undefined ? agentDiscoveryConfigPath(home, agent) : join41(nativeHome, agent === "codex" ? "config.toml" : "settings.json");
   const configText = witness(configPath, agent === "hermes" ? "yaml" : agent === "codex" ? "toml" : "json", agent === "hermes" ? ["skills", "plugins", "hooks"] : agent === "claude" ? ["enabledPlugins", "extraKnownMarketplaces"] : agent === "codex" ? [...CODEX_DISCOVERY_PROJECTION_FIELDS] : agent === "gemini" ? ["skills", "extensions", "security"] : agent === "opencode" ? ["plugin", "skills"] : agent === "sumi" ? [...SUMI_DISCOVERY_PROJECTION_FIELDS] : ["version"]);
   const config = configText === null ? {} : agent === "hermes" ? parseHermesConfig(configText) : parseConfig(configText, configPath, agent === "codex");
-  const unresolved = (detail) => {
-    throw new Error(`Native discovery is unresolved (${agent}: ${detail}); provide a reviewed --discovery-inputs file`);
+  const unresolved = (detail, source) => {
+    throw new NativeDiscoveryUnresolved(agent, detail, source);
   };
   let opaqueClosureVerified = false;
   const verifyOpaqueClosure = (declarations) => {
@@ -26787,6 +26942,17 @@ function resolveDiscovery(options, exclusion) {
     verifyDiscovery(retained, undefined, undefined, undefined, exclusion?.narrowed, canonical9(configPath));
     opaqueClosureVerified = true;
   };
+  const reviewRemedy = (source, check) => {
+    try {
+      check();
+    } catch (error) {
+      if (error instanceof NativeDiscoveryUnresolved) {
+        error.reviewable = true;
+        error.source ??= source;
+      }
+      throw error;
+    }
+  };
   if (exclusion) {
     if (configText !== null && agent !== "codex" && agent !== "hermes")
       parseNativeJsonObject(configText);
@@ -26812,12 +26978,38 @@ function resolveDiscovery(options, exclusion) {
     const controls = agent === "claude" ? claudeDiscoveryControlKeys(configText ?? "{}") : agent === "codex" ? codexDiscoveryControlKeys(config) : Object.keys(config).filter((key2) => /skill|plugin|hook|marketplace|extension|instruction/i.test(key2));
     const fieldKey = (key2) => /^[A-Za-z_$][A-Za-z0-9_$.-]{0,22}$/.test(key2) && !/(?:sk|rk|pk)_(?:live|test)_|whsec_/i.test(key2) ? JSON.stringify(key2) : "[withheld field key]";
     const unsupportedFields = (names, label) => unresolved(`unknown discovery controls have no root-exclusion adapter for ${label}${names.slice(0, 8).map(fieldKey).join(", ")}${names.length > 8 ? ", additional keys withheld" : ""} in ${quotedPath(canonical9(configPath))}`);
-    const unsupportedControls = controls.filter((key2) => !supported[agent].includes(key2));
+    const adapted = agent === "codex" ? codexRootFreeControls(config) : agent === "opencode" && Array.isArray(config.instructions) && config.instructions.length === 0 ? ["instructions"] : [];
+    const unsupportedControls = controls.filter((key2) => !supported[agent].includes(key2) && !adapted.includes(key2));
     if (unsupportedControls.length)
       unsupportedFields(unsupportedControls, "");
     if (config.hooks !== undefined && !object6(config.hooks))
       unresolved("hooks must be an object");
-    const hasHooks = controls.includes("hooks") && config.hooks !== undefined && Object.keys(config.hooks).length > 0;
+    const managedSupervisorOnly = () => {
+      const supervisor = exclusion.managedHook?.supervisor;
+      if (agent !== "hermes" || !supervisor || typeof supervisor.sha256 !== "string" || !/^[a-f0-9]{64}$/.test(supervisor.sha256) || !object6(config.hooks))
+        return false;
+      let expected;
+      try {
+        expected = hermesHookDefinitions(supervisor);
+      } catch {
+        return false;
+      }
+      for (const [event, entries2] of Object.entries(config.hooks)) {
+        const want = expected[event];
+        if (!want || !Array.isArray(entries2) || entries2.length !== 1 || !object6(entries2[0]))
+          return false;
+        const entry = entries2[0];
+        if (Object.keys(entry).sort().join("\x00") !== Object.keys(want).sort().join("\x00") || Object.keys(want).some((key2) => entry[key2] !== want[key2]))
+          return false;
+      }
+      try {
+        return hashRawDiscoveryFile(canonical9(supervisor.path), budget3) === supervisor.sha256;
+      } catch {
+        return false;
+      }
+    };
+    const managedBridgeOnly = (agent === "gemini" || agent === "cursor") && exclusion.managedHook !== undefined && hooksAreManagedBridge(agent, config.hooks, exclusion.managedHook) || managedSupervisorOnly();
+    const hasHooks = controls.includes("hooks") && config.hooks !== undefined && Object.keys(config.hooks).length > 0 && !managedBridgeOnly;
     let hasPluginConfigs = false, hasFunctionHookEnvironment = false;
     const verifyCurrentOpaqueSettings = (label) => {
       const retained = exclusion.retained;
@@ -26832,7 +27024,7 @@ function resolveDiscovery(options, exclusion) {
         unresolved(`non-enumerable ${label} require a current settings review`);
     };
     if (hasHooks)
-      verifyCurrentOpaqueSettings("hooks");
+      reviewRemedy(canonical9(configPath), () => verifyCurrentOpaqueSettings("hooks"));
     if (agent === "claude") {
       if (config.env !== undefined) {
         if (!object6(config.env) || Object.keys(config.env).length > 512)
@@ -26845,7 +27037,7 @@ function resolveDiscovery(options, exclusion) {
         if (hasFunctionHookEnvironment) {
           if (!["0", "1"].includes(config.env.CLAUDE_CODE_ENABLE_FUNCTION_HOOKS))
             unresolved("malformed Claude env.CLAUDE_CODE_ENABLE_FUNCTION_HOOKS flag");
-          verifyCurrentOpaqueSettings("function-hook environment controls");
+          reviewRemedy(canonical9(configPath), () => verifyCurrentOpaqueSettings("function-hook environment controls"));
         }
       }
       if (config.pluginConfigs !== undefined) {
@@ -26872,7 +27064,7 @@ function resolveDiscovery(options, exclusion) {
         }
         hasPluginConfigs = Object.keys(config.pluginConfigs).length > 0;
         if (hasPluginConfigs)
-          verifyCurrentOpaqueSettings("plugin configurations");
+          reviewRemedy(canonical9(configPath), () => verifyCurrentOpaqueSettings("plugin configurations"));
       }
       if (config.enabledPlugins !== undefined && !object6(config.enabledPlugins))
         unresolved("enabledPlugins must be an object");
@@ -26922,7 +27114,9 @@ function resolveDiscovery(options, exclusion) {
           unresolved("malformed Sumi plugins");
     }
     if (agent === "hermes" && config.skills !== undefined) {
-      keys2(config.skills, ["external_dirs"], "Hermes skills");
+      keys2(config.skills, ["external_dirs", "creation_nudge_interval"], "Hermes skills");
+      if (config.skills.creation_nudge_interval !== undefined && !(Number.isSafeInteger(config.skills.creation_nudge_interval) && config.skills.creation_nudge_interval >= 0))
+        unresolved("malformed Hermes skills creation_nudge_interval");
       if (config.skills.external_dirs !== undefined)
         paths(typeof config.skills.external_dirs === "string" ? [config.skills.external_dirs] : config.skills.external_dirs, "Hermes external directories");
     }
@@ -26942,10 +27136,21 @@ function resolveDiscovery(options, exclusion) {
           unresolved(`malformed Codex ${key2}`);
       for (const value of Object.values(config.plugins ?? {}))
         keys2(value, ["enabled"], "Codex plugin registration");
-      for (const value of Object.values(config.marketplaces ?? {}))
-        keys2(value, ["source_type", "source"], "Codex marketplace registration");
+      for (const value of Object.values(config.marketplaces ?? {})) {
+        keys2(value, ["source_type", "source", "last_updated"], "Codex marketplace registration");
+        if (value.last_updated !== undefined && (typeof value.last_updated !== "string" || !CODEX_MARKETPLACE_TIMESTAMP.test(value.last_updated)))
+          unresolved("malformed Codex marketplace refresh time");
+      }
       if (config.skills !== undefined)
-        keys2(config.skills, ["config", "bundled"], "Codex skills");
+        keys2(config.skills, ["config", "bundled", "native_allowed_paths"], "Codex skills");
+      if (config.skills?.native_allowed_paths !== undefined) {
+        for (const value of paths(config.skills.native_allowed_paths, "Codex native allowed skill paths")) {
+          if (!isAbsolute28(value))
+            unresolved("relative Codex native allowed skill path");
+          const path = canonical9(value);
+          roots.add(path.endsWith(`${sep15}SKILL.md`) ? dirname29(path) : path);
+        }
+      }
       if (config.skills?.bundled !== undefined) {
         keys2(config.skills.bundled, ["enabled"], "Codex bundled skills");
         if (typeof config.skills.bundled.enabled !== "boolean")
@@ -26971,7 +27176,7 @@ function resolveDiscovery(options, exclusion) {
     if (Object.keys(config.enabledPlugins ?? config.plugins ?? config.extensions ?? {}).length > 512)
       unresolved("unbounded native registrations");
     if (hasHooks || hasPluginConfigs || hasFunctionHookEnvironment)
-      verifyOpaqueClosure([]);
+      reviewRemedy(canonical9(configPath), () => verifyOpaqueClosure([]));
   }
   if (options.reviewed && (options.reviewed.version !== 1 || !Array.isArray(options.reviewed.agents) || options.reviewed.agents.some((item) => !item || typeof item !== "object") || new Set(options.reviewed.agents.map((item) => item.agent)).size !== options.reviewed.agents.length))
     throw new Error("Invalid --discovery-inputs version or agents");
@@ -27003,7 +27208,9 @@ function resolveDiscovery(options, exclusion) {
           const target = join41(path, name);
           if (!lstatSync34(target).isFile())
             unresolved("local plugin packages need a dedicated discovery adapter");
-          witness(target);
+          const text2 = witness(target);
+          if (exclusion && text2 !== null)
+            sumiLocalPluginTexts.set(canonical9(target), text2);
         }
     }
     for (const root2 of roots) {
@@ -27137,38 +27344,126 @@ function resolveDiscovery(options, exclusion) {
     const unique = combined.filter((source, index) => combined.findIndex((candidate2) => isDeepStrictEqual9(candidate2, source)) === index);
     return { ...supplied, roots: [...new Set([...roots, ...supplied.roots])].sort(), sources: unique, ...agent === "gemini" ? { builtinNames } : {} };
   }
-  function plugin(root2) {
+  const reviewedManifestAbsence = (root2, manifestPath) => {
+    const retained = exclusion?.retained;
+    if (agent !== "claude" || retained?.method !== "reviewed" || ![join41(root2, "skills"), root2].some((path) => retained.roots.includes(path)))
+      return false;
+    const saved = retained.sources.filter((source) => source.path === canonical9(manifestPath) && source.hashMode === "path-bytes" && source.sha256 !== null && source.format === undefined && source.fields === undefined && source.managedPlugins === undefined);
+    return saved.length > 0 && saved.every((source) => projected(source, undefined, budget3) === source.sha256);
+  };
+  const reviewedInstalledCopy = (root2, path, identity5) => {
+    const retained = exclusion?.retained;
+    if (agent !== "codex" || retained?.method !== "reviewed")
+      return false;
+    const inside = relative10(root2, canonical9(path));
+    if (!inside || inside === ".." || inside.startsWith(`..${sep15}`) || isAbsolute28(inside))
+      return false;
+    const parent = canonical9(join41(nativeHome, "plugins/cache", identity5.marketplace, identity5.name));
+    const current = hashRawDiscoveryFile(canonical9(path), budget3);
+    if (current === null)
+      return false;
+    return retained.sources.some((source) => {
+      if (source.sha256 !== current || source.format !== undefined || source.fields !== undefined || ![undefined, "bytes"].includes(source.hashMode) || source.managedPlugins !== undefined || source.reviewArtifact !== undefined || !source.path.startsWith(parent + sep15))
+        return false;
+      const [version2, ...rest] = source.path.slice(parent.length + 1).split(sep15);
+      return Boolean(version2) && version2 !== "." && version2 !== ".." && rest.join(sep15) === inside;
+    });
+  };
+  const verifyCodexPluginHookClosure = (root2, identity5, marketplaceSource, servers, declarations) => {
+    const retained = exclusion.retained;
+    if (retained.codexSemanticCache || retained.codexInstallationInputs || retained.codexRetiredMaterializations)
+      return verifyOpaqueClosure(declarations);
+    const within2 = (base, path) => path === base || path.startsWith(base + sep15);
+    const executables = [];
+    for (const server of servers) {
+      const row = config.mcp_servers?.[server];
+      if (server === "codex_apps" || server === "_codex_apps" || !isCodexLocalStdioMcpServer(server, row))
+        unresolved("plugin hook MCP server is not a configured local stdio server");
+      for (const value of [row.command, ...row.args ?? []])
+        for (const candidate2 of [value, value.slice(value.indexOf("=") + 1)]) {
+          if (!isAbsolute28(candidate2) || /[\0$]/.test(candidate2) || executables.length >= AGENT_POLICY_LIMITS.discoveryRoots)
+            continue;
+          const path = canonical9(candidate2);
+          if (lstatSync34(path, { throwIfNoEntry: false })?.isFile())
+            executables.push(path);
+        }
+    }
+    const cacheRoot = canonical9(join41(nativeHome, "plugins/cache"));
+    const ownCache = canonical9(join41(nativeHome, "plugins/cache", identity5.marketplace, identity5.name));
+    const ownCatalog = canonical9(join41(marketplaceSource, ".agents/plugins/marketplace.json"));
+    const account = canonical9(home);
+    const marketplaceRoots = Object.values(config.marketplaces ?? {}).filter((market) => market?.source_type === "local" && typeof market.source === "string" && isAbsolute28(market.source)).map((market) => canonical9(market.source)).filter((path) => !within2(path, account));
+    const otherPlugin = (path) => !within2(root2, path) && !within2(ownCache, path) && path !== ownCatalog && !executables.includes(path) && (within2(cacheRoot, path) || marketplaceRoots.some((base) => within2(base, path)));
+    const sources2 = retained.sources.filter((source) => source.path !== canonical9(configPath) && !otherPlugin(source.path));
+    if (sources2.some((source) => source.format !== undefined || source.fields !== undefined || source.managedPlugins !== undefined || source.reviewArtifact !== undefined || ![undefined, "bytes", "path-bytes", "executable-v1"].includes(source.hashMode)))
+      return verifyOpaqueClosure(declarations);
+    const declared = declarations.map((path) => relative10(root2, path));
+    const declaration = (path) => declarations.includes(path) || path.startsWith(ownCache + sep15) && declared.includes(path.slice(ownCache.length + 1).split(sep15).slice(1).join(sep15));
+    if (!sources2.some((source) => !declaration(source.path) && source.sha256 !== null))
+      unresolved("opaque executable dependency closure is unavailable");
+    for (const source of sources2)
+      if (projected(source, undefined, budget3) !== source.sha256) {
+        throw new NativeDiscoveryWitnessChange("input", source.path, `Native discovery input changed; run skills hook install with a fresh discovery review: ${source.path}`);
+      }
+    verifyDiscoveryDirectories((retained.directories ?? []).filter((directory2) => !otherPlugin(directory2.path)));
+  };
+  const readCodexHookDeclaration = (text2, path) => {
+    if (text2 === null)
+      return null;
+    try {
+      return codexPluginHookHandlers(parseConfig(text2, path));
+    } catch {
+      return null;
+    }
+  };
+  function plugin(root2, codex) {
     root2 = canonical9(root2);
     safe6(root2);
     if (exclusion)
       roots.add(root2);
     const manifestPath = join41(root2, agent === "claude" ? ".claude-plugin/plugin.json" : ".codex-plugin/plugin.json");
     const raw = witness(manifestPath, undefined, undefined, agent === "claude" ? "claude-plugin-manifest-v1" : undefined);
-    if (raw === null)
+    if (raw === null && !reviewedManifestAbsence(root2, manifestPath))
       unresolved("plugin manifest missing");
-    const manifest = parseConfig(raw, manifestPath);
+    const manifest = raw === null ? {} : parseConfig(raw, manifestPath);
     if (exclusion && Object.keys(manifest).some((key2) => /skill|plugin|hook|marketplace|extension|instruction/i.test(key2) && !["skills", "hooks"].includes(key2)))
       unresolved("unknown plugin discovery controls");
     const hooks = witness(join41(root2, "hooks/hooks.json"));
-    if (manifest.hooks !== undefined || hooks !== null) {
-      if (!exclusion || exclusion.retained?.method !== "reviewed")
-        unresolved("plugin hooks require a separate no-skill-injection review");
-      const required = [manifestPath, ...hooks !== null ? [join41(root2, "hooks/hooks.json")] : []];
-      if (manifest.hooks !== undefined) {
-        if (typeof manifest.hooks !== "string")
-          unresolved("unsupported plugin hooks target");
-        const hook = resolve28(root2, manifest.hooks);
-        if (!hook.startsWith(root2 + sep15))
-          unresolved("plugin hooks target escapes its root");
-        required.push(hook);
-      }
-      for (const path of required) {
-        const saved = exclusion.retained.sources.filter((source) => source.path === canonical9(path) && source.sha256 !== null && source.format === undefined && source.fields === undefined);
-        if (!saved.length || saved.some((source) => projected(source, undefined, budget3) !== source.sha256))
-          unresolved("plugin hooks require current independently reviewed sources");
-      }
-      verifyOpaqueClosure(required.map((path) => canonical9(path)));
-    }
+    if (manifest.hooks !== undefined || hooks !== null)
+      reviewRemedy(canonical9(hooks !== null ? join41(root2, "hooks/hooks.json") : manifestPath), () => {
+        if (!exclusion || exclusion.retained?.method !== "reviewed")
+          unresolved("plugin hooks require a separate no-skill-injection review");
+        const required = [manifestPath, ...hooks !== null ? [join41(root2, "hooks/hooks.json")] : []];
+        const scoped2 = agent === "codex" && codex !== undefined ? [] : undefined;
+        if (manifest.hooks !== undefined) {
+          if (scoped2 && manifest.hooks && typeof manifest.hooks === "object" && !Array.isArray(manifest.hooks)) {
+            const inline = codexPluginHookHandlers(manifest.hooks);
+            if (!inline)
+              unresolved("unsupported inline plugin hooks");
+            scoped2.push(inline);
+          } else {
+            if (typeof manifest.hooks !== "string")
+              unresolved("unsupported plugin hooks target");
+            const hook = resolve28(root2, manifest.hooks);
+            if (!hook.startsWith(root2 + sep15))
+              unresolved("plugin hooks target escapes its root");
+            required.push(hook);
+            if (scoped2)
+              scoped2.push(readCodexHookDeclaration(witness(hook), hook));
+          }
+        }
+        if (scoped2 && hooks !== null)
+          scoped2.push(readCodexHookDeclaration(hooks, join41(root2, "hooks/hooks.json")));
+        for (const path of required) {
+          const saved = exclusion.retained.sources.filter((source) => source.path === canonical9(path) && source.sha256 !== null && source.format === undefined && source.fields === undefined);
+          if (saved.length ? saved.some((source) => projected(source, undefined, budget3) !== source.sha256) : !(scoped2 && reviewedInstalledCopy(root2, path, codex)))
+            unresolved("plugin hooks require current independently reviewed sources", canonical9(path));
+        }
+        if (scoped2 && scoped2.every((item) => item !== null && item.commands === 0)) {
+          verifyCodexPluginHookClosure(root2, codex, codex.source, new Set(scoped2.flatMap((item) => [...item.servers])), required.map((path) => canonical9(path)));
+        } else
+          verifyOpaqueClosure(required.map((path) => canonical9(path)));
+      });
     const commands = join41(root2, "commands");
     safe6(commands);
     if (agent === "claude" && (manifest.commands !== undefined || lstatSync34(commands, { throwIfNoEntry: false })?.isDirectory() && entries(commands).length))
@@ -27223,7 +27518,7 @@ function resolveDiscovery(options, exclusion) {
       const catalog = parseConfig(catalogText, join41(market.source, ".agents/plugins/marketplace.json")), matches = Array.isArray(catalog.plugins) ? catalog.plugins.filter((item) => item.name === name) : [];
       if (matches.length !== 1 || matches[0]?.source?.source !== "local" || typeof matches[0]?.source?.path !== "string")
         unresolved("plugin catalog source is missing or ambiguous");
-      plugin(resolve28(market.source, matches[0].source.path));
+      plugin(resolve28(market.source, matches[0].source.path), exclusion ? { marketplace, name, source: market.source } : undefined);
     }
   } else if (agent === "opencode") {
     if (witness(join41(home, ".config/opencode/opencode.jsonc")) !== null || witness(join41(home, ".config/opencode/config.json")) !== null)
@@ -27240,7 +27535,11 @@ function resolveDiscovery(options, exclusion) {
     if (lstatSync34(localPlugins, { throwIfNoEntry: false }) && entries(localPlugins).some((name) => name !== "skills-cli.js"))
       unresolved("additional local plugin hooks require review");
   } else if (agent === "sumi") {
-    if ((config.plugin?.length ?? 0) > 0 || (config.plugins?.length ?? 0) > 0 || sources.some((source) => source.path !== canonical9(configPath) && source.path !== canonical9(join41(sumiConfigDirectory(home), "sumi.jsonc")) && source.sha256 !== null))
+    const pinnedLocalPlugin = (source) => {
+      const retained = exclusion?.retained, text2 = sumiLocalPluginTexts.get(source.path);
+      return retained?.method === "reviewed" && text2 !== undefined && sumiPluginLoadsOnlyBuiltins(text2) && retained.sources.some((saved) => saved.path === source.path && saved.sha256 === source.sha256 && saved.sha256 !== null && [undefined, "bytes"].includes(saved.hashMode) && saved.format === undefined && saved.fields === undefined && saved.managedPlugins === undefined && saved.reviewArtifact === undefined);
+    };
+    if ((config.plugin?.length ?? 0) > 0 || (config.plugins?.length ?? 0) > 0 || sources.some((source) => source.path !== canonical9(configPath) && source.path !== canonical9(join41(sumiConfigDirectory(home), "sumi.jsonc")) && source.sha256 !== null && !pinnedLocalPlugin(source)))
       unresolved("external or foreign local plugins require review");
   } else if (agent === "hermes") {
     for (const directory2 of [join41(home, ".hermes/plugins"), join41(home, ".hermes/hermes-agent")]) {
@@ -27303,6 +27602,11 @@ function physicalPath(path) {
   }
   return resolve29(realpathSync14(cursor), ...suffix);
 }
+function portableAuthoringDiscoveryRefusal(error, destination) {
+  const head = `Native discovery is unresolved (${error.agent}: ${error.detail}).${error.source ? ` Checked source: ${error.source}.` : ""}`;
+  const review = `skills hook install --agent ${error.agent} --discovery-inputs <reviewed-file> --apply`;
+  return error.reviewable ? `${head} Portable Skills authoring stays refused: an unreviewed ${error.agent} hook or plugin option could load skills written to ${destination}. This command takes no --discovery-inputs option; review the current ${error.agent} configuration with ${review}, then retry.` : `${head} Portable Skills authoring stays refused: Skills cannot list every skill root this ${error.agent} configuration registers, so it cannot rule out ${destination}. This command takes no --discovery-inputs option; correct that ${error.agent} configuration entry, then retry. Where a reviewed discovery binding covers it, record one with ${review}.`;
+}
 function contains2(root2, path) {
   const boundary = root2.endsWith(sep16) ? root2 : root2 + sep16;
   return path === root2 || path.startsWith(boundary);
@@ -27348,7 +27652,10 @@ function configuredRoots(home, explicitHome) {
       if (recorded && (!executable2 || executable2.target !== recorded.target || onPath && onPath.target !== recorded.target) || !executable2 && (binding.builtinNames?.length || binding.agent === "gemini" && binding.sources.some((source) => basename18(source.path) === "package.json"))) {
         throw new Error("Native discovery runtime target is unresolved or changed");
       }
-      roots.push(...resolveAgentDiscoveryExclusionRoots({ home, agent: binding.agent, canonical: physicalPath, retained: binding, executable: executable2, narrowed }));
+      const managedCommand = current.commands?.[agent], managedProfile = current.profiles?.[agent];
+      const supervisor = current.supervisors?.[agent];
+      const managedHook = (binding.agent === "gemini" || binding.agent === "cursor") && typeof managedCommand === "string" && typeof managedProfile === "string" ? { command: managedCommand, profile: managedProfile } : binding.agent === "hermes" && typeof managedCommand === "string" && typeof managedProfile === "string" && supervisor && typeof supervisor === "object" && typeof supervisor.path === "string" && typeof supervisor.runtime === "string" && typeof supervisor.sha256 === "string" ? { command: managedCommand, profile: managedProfile, supervisor: { path: supervisor.path, runtime: supervisor.runtime, sha256: supervisor.sha256 } } : undefined;
+      roots.push(...resolveAgentDiscoveryExclusionRoots({ home, agent: binding.agent, canonical: physicalPath, retained: binding, executable: executable2, narrowed, ...managedHook ? { managedHook } : {} }));
     }
   };
   if (homePolicy)
@@ -27400,11 +27707,18 @@ function assertPortableAuthoringPath(path, options = {}) {
   if (native) {
     throw new Error(`Refusing portable Skills authoring below native discovery root '${native}': ${lexical}. Set HASNA_SKILLS_DIR to a private authoring corpus outside native roots.`);
   }
-  const roots = configuredRoots(home, options.homeDir !== undefined);
-  for (const value of selected) {
-    if (physicalPath(value.path) === physicalPath(join42(home, `.${value.agent}`)))
-      continue;
-    roots.push(...resolveAgentDiscoveryExclusionRoots({ home, agent: value.agent, nativeHome: value.path, canonical: physicalPath, executable: null }));
+  const roots = [];
+  try {
+    roots.push(...configuredRoots(home, options.homeDir !== undefined));
+    for (const value of selected) {
+      if (physicalPath(value.path) === physicalPath(join42(home, `.${value.agent}`)))
+        continue;
+      roots.push(...resolveAgentDiscoveryExclusionRoots({ home, agent: value.agent, nativeHome: value.path, canonical: physicalPath, executable: null }));
+    }
+  } catch (error) {
+    if (error instanceof NativeDiscoveryUnresolved)
+      throw new Error(portableAuthoringDiscoveryRefusal(error, lexical));
+    throw error;
   }
   for (const root2 of roots) {
     if (candidates.some((candidate2) => [resolve29(root2), physicalPath(root2)].some((nativeRoot) => contains2(nativeRoot, candidate2) || contains2(candidate2, nativeRoot)))) {