@hasna/skills 0.10.20 → 0.10.23

package/bin/index.js

@@ -36868,7 +36868,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/skills",
-    version: "0.10.20",
+    version: "0.10.23",
     description: "Skills library for AI coding agents",
     type: "module",
     bin: {
@@ -39931,12 +39931,16 @@ function assertAgentPolicyCollections(policy) {
     }
   if (bridge.codexPluginSkills !== undefined)
     for (const control of array(bridge.codexPluginSkills, 4096)) {
-      requireBound(object(control) && Object.keys(control).every((key) => ["name", "pluginId", "namespace", "pluginParent", "manifestSha256", "appSha256"].includes(key)));
+      requireBound(object(control) && Object.keys(control).every((key) => ["name", "pluginId", "namespace", "pluginParent", "manifestSha256", "appSha256", "mcpSha256", "remotePluginId"].includes(key)));
       text(control.name, 129);
       text(control.pluginId, 1024);
       text(control.namespace, 64);
       text(control.pluginParent);
       requireBound(isAbsolute2(control.pluginParent) && resolve3(control.pluginParent) === control.pluginParent && /^[a-f0-9]{64}$/.test(control.manifestSha256));
+      if (control.remotePluginId !== undefined)
+        requireBound(typeof control.remotePluginId === "string" && /^[A-Za-z0-9_~-]{1,1024}$/.test(control.remotePluginId));
+      if (control.mcpSha256 !== undefined)
+        requireBound(typeof control.mcpSha256 === "string" && /^[a-f0-9]{64}$/.test(control.mcpSha256));
       if (control.appSha256 !== undefined)
         requireBound(typeof control.appSha256 === "string" && /^[a-f0-9]{64}$/.test(control.appSha256));
     }
@@ -39959,8 +39963,8 @@ function assertAgentPolicyCollections(policy) {
       text(source.path);
       requireBound(source.sha256 === null || typeof source.sha256 === "string" && /^[a-f0-9]{64}$/.test(source.sha256));
       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(["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", "codex-settings-v2"].includes(source.hashMode) && source.format === undefined && source.fields === undefined && (source.hashMode === "bytes" || source.sha256 !== null));
+      if (source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2")
         requireBound(agent === "codex" && value.agent === "codex" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute2(source.path) && resolve3(source.path) === source.path && basename2(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) && isAbsolute2(source.path) && resolve3(source.path) === source.path && basename2(source.path) === "settings.json");
@@ -50884,6 +50888,28 @@ var init_claude_settings_witness = __esm(() => {
   PERSISTED_EFFORT_LEVELS = new Set(["low", "medium", "high", "xhigh"]);
 });
 
+// src/lib/codex-native-compatibility.ts
+function supportsCodexNativeCapability(version, capability) {
+  return typeof version === "string" && Object.hasOwn(MEASURED_CODEX_CAPABILITIES, version) && MEASURED_CODEX_CAPABILITIES[version].includes(capability);
+}
+var MEASURED_CODEX_CAPABILITIES, SUPPORTED_CODEX_HOOK_VERSIONS;
+var init_codex_native_compatibility = __esm(() => {
+  MEASURED_CODEX_CAPABILITIES = {
+    "codex-cli 0.153.0": ["hooks"],
+    "codex-cli 0.154.0": ["hooks"],
+    "codex-cli 0.155.0": ["hooks"],
+    "codex-cli 0.155.1": ["hooks"],
+    "codex-cli 0.156.1": ["hooks"],
+    "codex-cli 0.157.0": ["hooks"],
+    "codex-cli 0.157.1": ["hooks"],
+    "codex-cli 0.158.0": ["hooks"],
+    "codex-cli 0.159.0": ["hooks"],
+    "codex-cli 0.159.2": ["hooks", "qualified-skill-catalog"],
+    "codex-cli 0.160.0": ["hooks", "qualified-skill-catalog"]
+  };
+  SUPPORTED_CODEX_HOOK_VERSIONS = Object.freeze(Object.keys(MEASURED_CODEX_CAPABILITIES).filter((version) => supportsCodexNativeCapability(version, "hooks")));
+});
+
 // src/lib/codex-hook-rpc.ts
 import { execFile, spawn as spawn2 } from "child_process";
 import { realpathSync as realpathSync3, statSync as statSync7 } from "fs";
@@ -50906,7 +50932,7 @@ async function connectCodexHookRpc(options) {
   } catch {
     throw new Error("CODEX_HOOK_TRUST_NATIVE_UNAVAILABLE");
   }
-  if (!SUPPORTED_CODEX_HOOK_VERSIONS.includes(version))
+  if (!supportsCodexNativeCapability(version, "hooks"))
     throw new Error("CODEX_HOOK_TRUST_NATIVE_UNSUPPORTED_VERSION");
   const current = statSync7(binary);
   if (realpathSync3(found) !== binary || ["dev", "ino", "size", "mtimeMs", "ctimeMs"].some((k) => stat[k] !== current[k]))
@@ -51025,9 +51051,9 @@ async function connectCodexHookRpc(options) {
     throw new Error("CODEX_HOOK_TRUST_NATIVE_UNSUPPORTED: native hooks/list and versioned config writes are required");
   }
 }
-var SUPPORTED_CODEX_HOOK_VERSIONS;
 var init_codex_hook_rpc = __esm(() => {
-  SUPPORTED_CODEX_HOOK_VERSIONS = ["codex-cli 0.153.0", "codex-cli 0.154.0", "codex-cli 0.155.0", "codex-cli 0.155.1", "codex-cli 0.156.1", "codex-cli 0.157.0", "codex-cli 0.157.1", "codex-cli 0.158.0", "codex-cli 0.159.0", "codex-cli 0.159.2"];
+  init_codex_native_compatibility();
+  init_codex_native_compatibility();
 });
 
 // src/lib/codex-native-skill-catalog.ts
@@ -51062,7 +51088,11 @@ function projectCodexInstalledPlugins(response) {
     for (const value of marketplace.plugins) {
       if (!object4(value) || !scalar(value.id, MAX_PLUGIN_ID_BYTES) || !scalar(value.name, MAX_NAME_BYTES) || value.id !== `${value.name}@${marketplace.name}`)
         refuse();
-      plugins.push({ ...value, marketplace: marketplace.name });
+      plugins.push({
+        ...value,
+        marketplace: marketplace.name,
+        sourceType: object4(value.source) && value.source.type === "remote" ? "remote" : undefined
+      });
     }
   }
   return projectCodexInstalledPluginEntries(plugins);
@@ -51072,13 +51102,21 @@ function projectCodexInstalledPluginEntries(value) {
     refuse();
   const ids = new Set;
   return value.map((item) => {
-    if (!object4(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))
+    if (!object4(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) || item.remotePluginId !== undefined && item.remotePluginId !== null && !remotePluginIdentifier(item.remotePluginId) || item.sourceType !== undefined && item.sourceType !== "remote")
       refuse();
     const at2 = item.id.lastIndexOf("@");
     if (at2 < 1 || item.id.slice(0, at2) !== item.name || at2 === item.id.length - 1 || ids.has(item.id))
       refuse();
     ids.add(item.id);
-    return { id: item.id, name: item.name, installed: item.installed, enabled: item.enabled, localVersion: item.localVersion ?? null };
+    return {
+      id: item.id,
+      name: item.name,
+      installed: item.installed,
+      enabled: item.enabled,
+      localVersion: item.localVersion ?? null,
+      ...item.sourceType === "remote" ? { sourceType: "remote" } : {},
+      ...item.remotePluginId == null ? {} : { remotePluginId: item.remotePluginId }
+    };
   });
 }
 async function captureCodexNativeSkillCatalog(options, connect = connectCodexHookRpc) {
@@ -51091,7 +51129,7 @@ async function captureCodexNativeSkillCatalog(options, connect = connectCodexHoo
     ...options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }
   });
   try {
-    if (!SUPPORTED_NAME_CONTROL_VERSIONS.has(rpc.version))
+    if (!supportsCodexNativeCapability(rpc.version, "qualified-skill-catalog"))
       throw new Error("CODEX_NATIVE_SKILL_CATALOG_UNSUPPORTED_VERSION");
     const response = await rpc.request("skills/list", { cwds: [options.cwd], forceReload: true });
     const installed = await rpc.request("plugin/installed", { cwds: [options.cwd] });
@@ -51142,10 +51180,10 @@ function isCodexNativeSkillDisabled(skill, rules) {
   }
   return disabled;
 }
-var MAX_SKILLS = 4096, MAX_NAME_BYTES = 1024, MAX_PATH_BYTES = 16384, MAX_PLUGIN_ID_BYTES = 1024, SUPPORTED_NAME_CONTROL_VERSIONS, object4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value), scalar = (value, max2) => typeof value === "string" && value.length > 0 && value.trim() === value && Buffer.byteLength(value, "utf8") <= max2 && !/[\u0000-\u001f\u007f]/u.test(value), absolutePath2 = (value) => scalar(value, MAX_PATH_BYTES) && isAbsolute10(value);
+var MAX_SKILLS = 4096, MAX_NAME_BYTES = 1024, MAX_PATH_BYTES = 16384, MAX_PLUGIN_ID_BYTES = 1024, object4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value), scalar = (value, max2) => typeof value === "string" && value.length > 0 && value.trim() === value && Buffer.byteLength(value, "utf8") <= max2 && !/[\u0000-\u001f\u007f]/u.test(value), remotePluginIdentifier = (value) => typeof value === "string" && /^[A-Za-z0-9_~-]{1,1024}$/.test(value), absolutePath2 = (value) => scalar(value, MAX_PATH_BYTES) && isAbsolute10(value);
 var init_codex_native_skill_catalog = __esm(() => {
   init_codex_hook_rpc();
-  SUPPORTED_NAME_CONTROL_VERSIONS = new Set(["codex-cli 0.159.2"]);
+  init_codex_native_compatibility();
 });
 
 // src/lib/codex-plugin-skill-controls.ts
@@ -51154,6 +51192,21 @@ import { lstatSync as lstatSync12, readdirSync as readdirSync6, readlinkSync as
 function refuse2() {
   throw new Error("CODEX_NATIVE_SKILL_IDENTITY_UNSUPPORTED: review native plugin names and hook controls");
 }
+function remoteInstallationMatches(parent, remotePluginId, read2) {
+  try {
+    if (!remotePluginIdentifier(remotePluginId) || !lstatSync12(parent).isDirectory() || realpathSync5(parent) !== parent)
+      return false;
+    const path = join18(parent, ".codex-remote-plugin-install.json"), stat = lstatSync12(path, { throwIfNoEntry: false });
+    if (!stat?.isFile() || stat.isSymbolicLink() || stat.size > 16384)
+      return false;
+    const text2 = read2(path);
+    hashNativeJsonControls(text2);
+    const value = JSON.parse(text2);
+    return Boolean(value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 2 && value.schema_version === 1 && value.remote_plugin_id === remotePluginId);
+  } catch {
+    return false;
+  }
+}
 function appControls(path, read2) {
   const text2 = read2(path);
   let value, sha2562;
@@ -51175,6 +51228,42 @@ function appControls(path, read2) {
   }
   return sha2562;
 }
+function mcpControls(path, read2) {
+  const text2 = read2(path);
+  let value, sha2562;
+  try {
+    sha2562 = hashNativeJsonControls(text2);
+    value = JSON.parse(text2);
+  } catch {
+    refuse2();
+  }
+  const object5 = (v) => Boolean(v && typeof v === "object" && !Array.isArray(v));
+  const textField = (v, empty = false) => typeof v === "string" && (empty || Boolean(v.trim())) && Buffer.byteLength(v) <= 16384 && !/[\x00-\x1f\x7f]/.test(v);
+  const envName = (v) => typeof v === "string" && /^[A-Za-z_][A-Za-z0-9_]{0,255}$/.test(v);
+  if (!object5(value) || Object.keys(value).length !== 1 || !object5(value.mcpServers))
+    refuse2();
+  const servers = Object.entries(value.mcpServers);
+  if (!servers.length || servers.length > 256)
+    refuse2();
+  for (const [name, server] of servers) {
+    if (!identifier2(name) || !object5(server) || !Object.keys(server).every((key) => ["command", "args", "cwd", "env_vars"].includes(key)) || !textField(server.command) || server.args !== undefined && (!Array.isArray(server.args) || server.args.length > 256 || !server.args.every((arg) => textField(arg, true))) || server.cwd !== undefined && !textField(server.cwd))
+      refuse2();
+    if (server.env_vars !== undefined) {
+      if (!Array.isArray(server.env_vars) || server.env_vars.length > 256)
+        refuse2();
+      const names = server.env_vars.map((entry) => {
+        if (envName(entry))
+          return entry;
+        if (!object5(entry) || !Object.keys(entry).every((key) => ["name", "source"].includes(key)) || !envName(entry.name) || entry.source !== undefined && entry.source !== "local")
+          refuse2();
+        return entry.name;
+      });
+      if (new Set(names).size !== names.length)
+        refuse2();
+    }
+  }
+  return sha2562;
+}
 function rootControls(root, read2) {
   const manifestPath = join18(root, ".codex-plugin/plugin.json"), manifestFile = lstatSync12(manifestPath, { throwIfNoEntry: false });
   if (!lstatSync12(join18(root, ".codex-plugin"), { throwIfNoEntry: false })?.isDirectory() || !manifestFile?.isFile() || manifestFile.size > 1024 * 1024)
@@ -51192,15 +51281,21 @@ function rootControls(root, read2) {
   const cacheVersion = basename5(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))
     refuse2();
-  if (manifest.hooks !== undefined || manifest.mcpServers !== undefined || manifest.commands !== undefined || manifest.apps !== undefined && manifest.apps !== "./.app.json" || ["hooks", ".mcp.json"].some((path) => lstatSync12(join18(root, path), { throwIfNoEntry: false })))
+  if (manifest.hooks !== undefined || manifest.commands !== undefined || manifest.mcpServers !== undefined && manifest.mcpServers !== "./.mcp.json" || manifest.apps !== undefined && manifest.apps !== "./.app.json" || lstatSync12(join18(root, "hooks"), { throwIfNoEntry: false }))
     refuse2();
+  const mcp = join18(root, ".mcp.json"), mcpPresent = lstatSync12(mcp, { throwIfNoEntry: false });
+  if (mcpPresent && (!mcpPresent.isFile() || mcpPresent.isSymbolicLink() || mcpPresent.size > 1024 * 1024 || realpathSync5(mcp) !== mcp))
+    refuse2();
+  if (Boolean(mcpPresent) !== (manifest.mcpServers !== undefined))
+    refuse2();
+  const mcpSha256 = mcpPresent ? mcpControls(mcp, read2) : undefined;
   const app = join18(root, ".app.json"), present = lstatSync12(app, { throwIfNoEntry: false });
   if (present && (!present.isFile() || present.isSymbolicLink() || present.size > 1024 * 1024))
     refuse2();
   if (manifest.apps !== undefined && !present)
     refuse2();
   const appSha256 = present ? appControls(app, read2) : undefined;
-  return { namespace: manifest.name, manifestSha256, ...appSha256 ? { appSha256 } : {} };
+  return { namespace: manifest.name, manifestSha256, ...appSha256 ? { appSha256 } : {}, ...mcpSha256 ? { mcpSha256 } : {} };
 }
 function identity4(document3, cache3, read2) {
   if (!document3.startsWith(cache3 + sep4) || !document3.endsWith(sep4 + "SKILL.md"))
@@ -51243,6 +51338,10 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache3, controls, read2) {
     for (const parent of new Set(controls.map((control) => control.pluginParent))) {
       if (!parent.startsWith(cache3 + sep4) || !lstatSync12(parent, { throwIfNoEntry: false })?.isDirectory())
         return false;
+      for (const control of controls.filter((control2) => control2.pluginParent === parent)) {
+        if (control.remotePluginId !== undefined && !remoteInstallationMatches(parent, control.remotePluginId, read2))
+          return false;
+      }
       const names = readdirSync6(parent);
       entries += names.length;
       if (entries > 4096)
@@ -51259,7 +51358,7 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache3, controls, read2) {
         if (!stat.isDirectory() || ![".codex-plugin/plugin.json", ".app.json", "hooks", ".mcp.json"].some((path) => lstatSync12(join18(root, path), { throwIfNoEntry: false })))
           continue;
         const parsed = rootControls(root, read2);
-        if (!controls.some((control) => control.pluginParent === parent && control.namespace === parsed.namespace && control.manifestSha256 === parsed.manifestSha256 && control.appSha256 === parsed.appSha256))
+        if (!controls.some((control) => control.pluginParent === parent && control.namespace === parsed.namespace && control.manifestSha256 === parsed.manifestSha256 && control.appSha256 === parsed.appSha256 && control.mcpSha256 === parsed.mcpSha256))
           return false;
       }
     }
@@ -51269,7 +51368,7 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache3, controls, read2) {
   }
 }
 function reviewCodexPluginSkillControls(catalog, documents, cache3, cwd2, read2, rules) {
-  if (catalog?.version !== "codex-cli 0.159.2" || catalog.cwd !== cwd2)
+  if (!supportsCodexNativeCapability(catalog?.version, "qualified-skill-catalog") || catalog.cwd !== cwd2)
     refuse2();
   const skills = projectCodexNativeSkillCatalog({ data: [{ cwd: cwd2, errors: [], skills: catalog.skills }] }, cwd2);
   const allowed = new Set(documents), result2 = [];
@@ -51296,22 +51395,30 @@ function reviewCodexPluginSkillControls(catalog, documents, cache3, cwd2, read2,
     const listed = skills.filter((skill) => skill.path === document3);
     if (listed.length > 1)
       refuse2();
+    let remotePluginId;
     if (listed.length === 1) {
       if (listed[0].name !== parsed.name || listed[0].pluginId !== expectedPluginId)
         refuse2();
     } 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)
+      const installed = installedPlugins.filter((plugin2) => plugin2.id === expectedPluginId && plugin2.name === pluginName);
+      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled)
         refuse2();
-      if (installed[0].localVersion !== basename5(dirname10(dirname10(dirname10(document3)))))
-        continue;
+      const plugin = installed[0];
+      if (plugin.localVersion !== null) {
+        if (plugin.localVersion !== basename5(dirname10(dirname10(dirname10(document3)))))
+          continue;
+      } else {
+        if (plugin.sourceType !== "remote" || !plugin.remotePluginId || !remoteInstallationMatches(parsed.pluginParent, plugin.remotePluginId, read2) || !lstatSync12(document3).isFile() || realpathSync5(document3) !== document3)
+          refuse2();
+        remotePluginId = plugin.remotePluginId;
+      }
       const exactPathDeny = Array.isArray(rules) && rules.some((rule) => rule?.path === document3 && rule?.enabled === false);
       if (!exactPathDeny || !isCodexNativeSkillDisabled({ name: parsed.name, path: document3, pluginId: expectedPluginId, enabled: true }, rules))
         refuse2();
     }
-    result2.push({ ...parsed, pluginId: expectedPluginId });
+    result2.push({ ...parsed, pluginId: expectedPluginId, ...remotePluginId ? { remotePluginId } : {} });
   }
-  if (!result2.length || new Set(result2.map((item) => item.name)).size !== result2.length)
+  if (!result2.length && documents.some((document3) => document3.startsWith(cache3 + sep4)) || new Set(result2.map((item) => item.name)).size !== result2.length)
     refuse2();
   return result2;
 }
@@ -51324,8 +51431,8 @@ function isReviewedCodexPluginSkillDisabled(document3, cache3, controls, rules,
   } catch {
     return false;
   }
-  const reviewed = controls.find((item) => item.name === parsed.name && item.namespace === parsed.namespace && item.pluginParent === parsed.pluginParent && item.manifestSha256 === parsed.manifestSha256 && item.appSha256 === parsed.appSha256);
-  if (!reviewed)
+  const reviewed = controls.find((item) => item.name === parsed.name && item.namespace === parsed.namespace && item.pluginParent === parsed.pluginParent && item.manifestSha256 === parsed.manifestSha256 && item.appSha256 === parsed.appSha256 && item.mcpSha256 === parsed.mcpSha256);
+  if (!reviewed || reviewed.remotePluginId !== undefined && !remoteInstallationMatches(reviewed.pluginParent, reviewed.remotePluginId, read2))
     return false;
   return isCodexNativeSkillDisabled({ name: parsed.name, path: document3, pluginId: reviewed.pluginId, enabled: true }, rules);
 }
@@ -51346,10 +51453,11 @@ enabled = false
 var identifier2 = (v) => typeof v === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(v), CODEX_DEFAULT_AGENT_PLUGIN_VERSION = "1.0.0";
 var init_codex_plugin_skill_controls = __esm(() => {
   init_claude_settings_witness();
+  init_codex_native_compatibility();
   init_codex_native_skill_catalog();
 });
 
-// src/lib/codex-settings-witness.ts
+// src/lib/codex-settings-witness-v1.ts
 import { createHash as createHash9 } from "crypto";
 function need3(value) {
   if (!value)
@@ -51440,21 +51548,173 @@ function captureCodexSettings(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const text2 = readNativeSettingsWitnessFile(path, budget, "config.toml");
   return { path, hashMode: "codex-settings-v1", sha256: hashCodexSettingsReplacement(text2) };
 }
+var sha = (text2) => createHash9("sha256").update(text2).digest("hex"), EFFORT, VERBOSITY;
+var init_codex_settings_witness_v1 = __esm(() => {
+  init_claude_settings_witness();
+  EFFORT = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
+  VERBOSITY = new Set(["low", "medium", "high"]);
+});
+
+// src/lib/codex-settings-witness.ts
+import { createHash as createHash10 } from "crypto";
+function need4(value) {
+  if (!value)
+    throw new Error("Invalid Codex settings witness");
+}
+function isRecord3(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function isDate2(value) {
+  return value instanceof Date;
+}
+function numericTokens2(text2) {
+  const result2 = [];
+  for (let at2 = 0;at2 < text2.length; ) {
+    const char = text2[at2];
+    if (char === "#") {
+      while (at2 < text2.length && text2[at2] !== `
+`)
+        at2++;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      const quote = char, triple = text2.slice(at2, at2 + 3) === quote.repeat(3);
+      at2 += triple ? 3 : 1;
+      while (at2 < text2.length) {
+        if (quote === '"' && text2[at2] === "\\") {
+          at2 += 2;
+          continue;
+        }
+        if (text2.slice(at2, at2 + (triple ? 3 : 1)) === quote.repeat(triple ? 3 : 1)) {
+          at2 += triple ? 3 : 1;
+          break;
+        }
+        at2++;
+      }
+      continue;
+    }
+    if (/[0-9+-]/.test(char)) {
+      const start = at2;
+      while (at2 < text2.length && !/[\s,\]{}#=]/.test(text2[at2]))
+        at2++;
+      if (at2 > start) {
+        result2.push(text2.slice(start, at2));
+        continue;
+      }
+    }
+    at2++;
+  }
+  return result2.sort();
+}
+function canonical4(value, depth = 0, budget = { remaining: 65536 }) {
+  need4(depth <= 32 && --budget.remaining >= 0);
+  if (value === null)
+    return ["null"];
+  if (typeof value === "string")
+    return ["string", value];
+  if (typeof value === "boolean")
+    return ["boolean", value];
+  if (typeof value === "number") {
+    need4(Number.isFinite(value));
+    return ["number", String(value)];
+  }
+  if (isDate2(value)) {
+    need4(Number.isFinite(value.getTime()));
+    return ["date", value.toISOString()];
+  }
+  if (Array.isArray(value))
+    return ["array", value.map((child) => canonical4(child, depth + 1, budget))];
+  need4(isRecord3(value));
+  return ["object", Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, child]) => [key, canonical4(child, depth + 1, budget)])];
+}
+function normalize3(config) {
+  if (isRecord3(config.hooks)) {
+    delete config.hooks.state;
+    if (!Object.keys(config.hooks).length)
+      delete config.hooks;
+  }
+  if (isRecord3(config.skills) && Array.isArray(config.skills.config)) {
+    const skills = config.skills;
+    const retained = skills.config.filter((entry) => !disablesOneSkill(entry));
+    if (retained.length !== skills.config.length) {
+      if (retained.length)
+        skills.config = retained;
+      else
+        delete skills.config;
+    }
+    if (!Object.keys(skills).length)
+      delete config.skills;
+  }
+  inference(config);
+  if (isRecord3(config.profiles)) {
+    for (const profile of Object.values(config.profiles))
+      if (isRecord3(profile))
+        inference(profile);
+  }
+}
+function disablesOneSkill(entry) {
+  if (!isRecord3(entry) || entry.enabled !== false)
+    return false;
+  const keys2 = Object.keys(entry);
+  if (!keys2.every((key) => key === "path" || key === "name" || key === "enabled"))
+    return false;
+  const selector = ["path", "name"].filter((key) => Object.hasOwn(entry, key));
+  return selector.length === 1 && typeof entry[selector[0]] === "string" && entry[selector[0]].length > 0;
+}
+function inference(target) {
+  for (const key of INFERENCE)
+    if (Object.hasOwn(target, key)) {
+      const value = target[key];
+      if (key === "model")
+        need4(typeof value === "string" && MODEL.test(value));
+      else
+        need4(typeof value === "string" && (key === "model_reasoning_effort" ? EFFORT2.has(value) : VERBOSITY2.has(value)));
+      delete target[key];
+    }
+}
+function settingsDigest2(text2) {
+  let config;
+  try {
+    config = Bun.TOML.parse(text2);
+  } catch {
+    throw new Error("Invalid Codex settings witness");
+  }
+  need4(isRecord3(config));
+  normalize3(config);
+  return sha2(`hasna.skills.codex-settings.v2\x00${JSON.stringify([canonical4(config), numericTokens2(text2)])}`);
+}
+function hashCodexSettingsReplacementV2(text2, budget = { remaining: 256 * 1024 * 1024 }) {
+  need4(Buffer.byteLength(text2) <= 1024 * 1024 && budget.remaining >= Buffer.byteLength(text2));
+  budget.remaining -= Buffer.byteLength(text2);
+  return settingsDigest2(text2);
+}
+function captureCodexSettingsV2(path, budget = { remaining: 256 * 1024 * 1024 }) {
+  const text2 = readNativeSettingsWitnessFile(path, budget, "config.toml");
+  return { path, hashMode: "codex-settings-v2", sha256: settingsDigest2(text2) };
+}
+function readCodexSettingsPreimage(path, budget = { remaining: 2 * 1024 * 1024 }) {
+  return readNativeSettingsWitnessFile(path, budget, "config.toml");
+}
 function upgradeCodexSettingsWitness(previous, reviewedSettingsPath) {
-  need3(previous && Object.keys(previous).every((key) => ["path", "hashMode", "sha256"].includes(key)) && (previous.hashMode === undefined || previous.hashMode === "bytes") && /^[a-f0-9]{64}$/.test(previous.sha256));
+  need4(previous && Object.keys(previous).every((key) => ["path", "hashMode", "sha256"].includes(key)) && (previous.hashMode === undefined || previous.hashMode === "bytes" || previous.hashMode === "codex-settings-v1") && /^[a-f0-9]{64}$/.test(previous.sha256));
   const budget = { remaining: 2 * 1024 * 1024 };
   const before2 = readNativeSettingsWitnessFile(reviewedSettingsPath, budget, "config.toml"), current = readNativeSettingsWitnessFile(previous.path, budget, "config.toml");
-  need3(sha(before2) === previous.sha256);
-  const sha2562 = hashCodexSettingsReplacement(current);
-  if (hashCodexSettingsReplacement(before2) !== sha2562)
+  need4((previous.hashMode === "codex-settings-v1" ? hashCodexSettingsReplacement(before2) : sha2(before2)) === previous.sha256);
+  const sha2562 = settingsDigest2(current);
+  if (settingsDigest2(before2) !== sha2562)
     throw new Error("Codex non-preference settings changed; explicit discovery review required");
-  return { path: previous.path, hashMode: "codex-settings-v1", sha256: sha2562 };
+  return { path: previous.path, hashMode: "codex-settings-v2", sha256: sha2562 };
 }
-var sha = (text2) => createHash9("sha256").update(text2).digest("hex"), EFFORT, VERBOSITY;
+var sha2 = (text2) => createHash10("sha256").update(text2).digest("hex"), EFFORT2, VERBOSITY2, MODEL, CODEX_DISCOVERY_PROJECTION_FIELDS, INFERENCE;
 var init_codex_settings_witness = __esm(() => {
+  init_codex_settings_witness_v1();
+  init_codex_settings_witness_v1();
   init_claude_settings_witness();
-  EFFORT = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
-  VERBOSITY = new Set(["low", "medium", "high"]);
+  EFFORT2 = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
+  VERBOSITY2 = new Set(["low", "medium", "high"]);
+  MODEL = /^[A-Za-z0-9][A-Za-z0-9._:/-]{0,127}$/;
+  CODEX_DISCOVERY_PROJECTION_FIELDS = ["plugins", "marketplaces", "skills"];
+  INFERENCE = ["model", "model_reasoning_effort", "model_verbosity"];
 });
 
 // src/lib/managed-policy.ts
@@ -51543,7 +51803,7 @@ var init_managed_policy = __esm(() => {
 });
 
 // src/lib/agent-bridge.ts
-import { createHash as createHash10 } from "crypto";
+import { createHash as createHash11 } from "crypto";
 import { lstatSync as lstatSync14, readFileSync as readFileSync12, readdirSync as readdirSync7 } from "fs";
 import { join as join20 } from "path";
 function isOwnedCliBridge(path, expectedPaths) {
@@ -51577,7 +51837,7 @@ Use the Skills CLI as the skill authority for this station.
 This bridge contains no skill payloads. Do not copy skill content into agent-native skill directories or load other native skill copies. If a Skills command refuses authority, selection, integrity, or native drift, report that refusal and use its repair guidance; do not substitute bundled or stale local content. Explicit local draft authoring remains available.
 `, CLI_BRIDGE_DIGEST, CLI_BRIDGE_FILES;
 var init_agent_bridge = __esm(() => {
-  CLI_BRIDGE_DIGEST = createHash10("sha256").update(markdown).digest("hex");
+  CLI_BRIDGE_DIGEST = createHash11("sha256").update(markdown).digest("hex");
   CLI_BRIDGE_FILES = Object.freeze({
     "SKILL.md": markdown,
     ".hasna-skills.json": `${JSON.stringify({ managedBy: "@hasna/skills", kind: "cli-bridge", version: CLI_BRIDGE_VERSION, protocol: "selection-v1", contentSha256: CLI_BRIDGE_DIGEST }, null, 2)}
@@ -51856,7 +52116,8 @@ var init_agent_codex = __esm(() => {
 });
 
 // src/lib/agent-integration.ts
-import { createHash as createHash11, randomUUID as randomUUID5 } from "crypto";
+import { createHash as createHash12, randomUUID as randomUUID5 } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual4 } from "util";
 import { existsSync as existsSync12, lstatSync as lstatSync15, statSync as statSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync13, readdirSync as readdirSync8, opendirSync as opendirSync3, readlinkSync as readlinkSync4, realpathSync as realpathSync6, renameSync as renameSync2, rmdirSync as rmdirSync2, writeFileSync as writeFileSync4, unlinkSync as unlinkSync3, chmodSync, openSync as openSync8, closeSync as closeSync8, fsyncSync as fsyncSync2, fstatSync as fstatSync8, readSync as readSync6, constants as constants8, linkSync } from "fs";
 import { dirname as dirname11, join as join21, resolve as resolve11, relative as relative5, isAbsolute as isAbsolute11, sep as sep5 } from "path";
 import { homedir as homedir3 } from "os";
@@ -51965,7 +52226,7 @@ function readNativeBytes(path, maximum = 64 * 1024 * 1024) {
   }
 }
 function treeHash(root) {
-  const hash2 = createHash11("sha256");
+  const hash2 = createHash12("sha256");
   let bytes = 0, files = 0;
   function visit2(path) {
     const stat = lstatSync15(path);
@@ -51992,7 +52253,7 @@ function treeHash(root) {
   return hash2.digest("hex");
 }
 function parseNativeMigrationTargetManifest(input) {
-  const digest = sha2(input);
+  const digest = sha3(input);
   let value;
   try {
     value = JSON.parse(input.toString());
@@ -52397,7 +52658,7 @@ function planAgentIntegration(options) {
   const observedNativeSources = [];
   const codexPluginSkills = options.codexNativeCatalog ? reviewCodexPluginSkillControls(options.codexNativeCatalog, nativeSkills.filter((entry) => entry.agent === "codex" && entry.vendor).map((entry) => join21(entry.path, "SKILL.md")), canonicalAgentPath(join21(home, ".codex/plugins/cache"), aliases), resolve11(options.projectDir ?? home), (path) => {
     const bytes = readNativeBytes(path, 1024 * 1024);
-    observedNativeSources.push({ path, sha256: sha2(bytes) });
+    observedNativeSources.push({ path, sha256: sha3(bytes) });
     return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
   }, codexConfig.skills?.config ?? []) : policy.bridge?.codexPluginSkills ?? [];
   const changes = [];
@@ -52425,7 +52686,7 @@ function planAgentIntegration(options) {
         throw new Error("Refusing to overwrite an unrecognized Hermes supervisor");
       if (supervisorBefore !== supervisorAfter)
         changes.push({ path: supervisorPath, before: supervisorBefore, after: supervisorAfter });
-      const supervisor = { path: supervisorPath, runtime: process.execPath, sha256: sha2(supervisorAfter) };
+      const supervisor = { path: supervisorPath, runtime: process.execPath, sha256: sha3(supervisorAfter) };
       const after3 = configureHermesHooks(before2, supervisor, previous);
       if (before2 !== after3)
         changes.push({ path, before: before2, after: after3 });
@@ -52472,12 +52733,12 @@ function planAgentIntegration(options) {
     agents: [...new Set([...priorAgents, ...options.agents])].sort(),
     home: resolve11(home),
     includeVendor: true,
-    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join21(dataDir3, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha2(renderHermesSupervisor(bindings.get("hermes").command, bindings.get("hermes").profileId)) } } } : {},
+    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join21(dataDir3, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha3(renderHermesSupervisor(bindings.get("hermes").command, bindings.get("hermes").profileId)) } } } : {},
     commands: { ...policy.bridge?.commands, ...Object.fromEntries([...bindings].map(([agent, binding]) => [agent, binding.command])) },
     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(join21(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: sha2(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(join21(home, ".codex/config.toml"), aliases))?.before === null ? null : sha2(readOptional(canonicalAgentPath(join21(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(join21(home, ".codex/config.toml"), aliases))?.before === null ? null : sha3(readOptional(canonicalAgentPath(join21(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
     discovery: { ...policy.bridge?.discovery, ...Object.fromEntries(discoveryAfter.map((binding) => [binding.agent, binding])) }
   } };
   const serializedPolicy = serializeManagedSkillPolicy(nextPolicy);
@@ -52515,7 +52776,7 @@ function atomicWrite2(path, content) {
 function planAgentSettingsWitnessUpgrade(options) {
   const home = resolve11(options.home ?? homedir3()), dataDir3 = options.dataDir ?? getDataDirReadOnly();
   const snapshot = readManagedSkillPolicySnapshot(dataDir3);
-  if (!snapshot || sha2(snapshot.text) !== options.expectedPolicySha256)
+  if (!snapshot || sha3(snapshot.text) !== options.expectedPolicySha256)
     throw new Error("Managed policy preimage changed");
   const policy = snapshot.value, aliases = policy.bridge?.rootAliases ?? [];
   recheckRootAliases(aliases);
@@ -52524,7 +52785,7 @@ function planAgentSettingsWitnessUpgrade(options) {
     throw new Error("Settings witness upgrade requires an existing reviewed native binding");
   const configPath = canonicalAgentPath(join21(home, options.agent === "claude" ? ".claude/settings.json" : ".codex/config.toml"), aliases);
   const settings = readOptional(configPath);
-  if (settings === null || sha2(settings) !== options.expectedSettingsSha256)
+  if (settings === null || sha3(settings) !== options.expectedSettingsSha256)
     throw new Error("Native settings preimage changed");
   const sources = binding.sources.filter((source) => source.path === configPath && source.format === undefined && source.fields === undefined);
   if (sources.length !== 1)
@@ -52532,15 +52793,40 @@ function planAgentSettingsWitnessUpgrade(options) {
   const previous = sources[0];
   if (typeof previous.sha256 !== "string")
     throw new Error("Settings witness upgrade requires a preserved settings preimage");
+  const replaced = [previous];
+  if (options.agent === "codex") {
+    if (previous.hashMode !== undefined && previous.hashMode !== "bytes" && previous.hashMode !== "codex-settings-v1")
+      throw new Error("Codex settings witness upgrade requires a preserved raw or codex-settings-v1 configuration witness");
+    const preimage = readCodexSettingsPreimage(options.reviewedPreimage);
+    for (const source of binding.sources) {
+      if (source === previous || source.path !== configPath)
+        continue;
+      const fields = source.fields;
+      if (source.hashMode !== undefined || source.format !== "toml" || !Array.isArray(fields) || !isDeepStrictEqual4(fields, [...CODEX_DISCOVERY_PROJECTION_FIELDS]) || typeof source.sha256 !== "string")
+        throw new Error("Codex settings witness upgrade found an unrecognized configuration witness");
+      if (projectNativeDiscoveryFields(preimage, "toml", fields, configPath) !== source.sha256)
+        throw new Error("Reviewed preimage does not explain the Codex discovery projection witness");
+      replaced.push(source);
+    }
+  }
   const next = options.agent === "claude" ? upgradeClaudeSettingsWitness(previous, options.reviewedPreimage) : upgradeCodexSettingsWitness(previous, options.reviewedPreimage);
-  const replacement = { ...binding, sources: binding.sources.map((source) => source === previous ? next : source) };
+  const rebound = [];
+  for (const source of binding.sources) {
+    if (!replaced.includes(source)) {
+      rebound.push(source);
+      continue;
+    }
+    if (source === replaced[0])
+      rebound.push(next);
+  }
+  const replacement = { ...binding, sources: rebound };
   verifyAgentDiscovery(replacement);
   const after2 = serializeManagedSkillPolicy({ ...policy, bridge: { ...policy.bridge, discovery: { ...policy.bridge.discovery, [options.agent]: replacement } } });
-  return { dataDir: dataDir3, profileId: policy.profileId, changes: [{ path: join21(dataDir3, "agent-policy.json"), before: snapshot.text, after: after2 }], nativeSkills: [], observedPolicy: { path: join21(dataDir3, "agent-policy.json"), before: snapshot.text }, observedSettings: { path: configPath, before: settings }, discoveryBefore: [replacement], discoveryAfter: [replacement], rootAliases: aliases, managedAgentChecks: { home, agents: [options.agent] }, settingsWitnessUpgrade: { agent: options.agent, path: configPath, fromHashMode: previous.hashMode ?? "bytes", fromSha256: previous.sha256, toHashMode: next.hashMode, toSha256: next.sha256, reviewedPreimage: options.reviewedPreimage, currentSettingsSha256: options.expectedSettingsSha256 } };
+  return { dataDir: dataDir3, profileId: policy.profileId, changes: [{ path: join21(dataDir3, "agent-policy.json"), before: snapshot.text, after: after2 }], nativeSkills: [], observedPolicy: { path: join21(dataDir3, "agent-policy.json"), before: snapshot.text }, observedSettings: { path: configPath, before: settings }, discoveryBefore: [replacement], discoveryAfter: [replacement], rootAliases: aliases, managedAgentChecks: { home, agents: [options.agent] }, settingsWitnessUpgrade: { agent: options.agent, path: configPath, fromHashMode: previous.hashMode ?? "bytes", fromSha256: previous.sha256, toHashMode: next.hashMode, toSha256: next.sha256, reviewedPreimage: options.reviewedPreimage, currentSettingsSha256: options.expectedSettingsSha256, replacedWitnesses: replaced.map((source) => ({ hashMode: source.hashMode ?? "bytes", sha256: source.sha256 })) } };
 }
 function applyAgentIntegration(plan) {
   for (const source of plan.observedNativeSources ?? [])
-    if (sha2(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+    if (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
       throw new Error("Native identity source changed after planning");
   if (plan.observedSettings && readOptional(plan.observedSettings.path) !== plan.observedSettings.before)
     throw new Error("Native settings changed after witness planning");
@@ -52560,7 +52846,7 @@ function applyAgentIntegration(plan) {
     const upgrade = plan.settingsWitnessUpgrade;
     if (!plan.managedAgentChecks || !plan.observedPolicy?.before)
       throw new Error("Invalid settings witness upgrade plan");
-    const verified = planAgentSettingsWitnessUpgrade({ agent: upgrade.agent, reviewedPreimage: upgrade.reviewedPreimage, home: plan.managedAgentChecks.home, dataDir: plan.dataDir, expectedPolicySha256: sha2(plan.observedPolicy.before), expectedSettingsSha256: upgrade.currentSettingsSha256 });
+    const verified = planAgentSettingsWitnessUpgrade({ agent: upgrade.agent, reviewedPreimage: upgrade.reviewedPreimage, home: plan.managedAgentChecks.home, dataDir: plan.dataDir, expectedPolicySha256: sha3(plan.observedPolicy.before), expectedSettingsSha256: upgrade.currentSettingsSha256 });
     if (JSON.stringify(verified.changes) !== JSON.stringify(plan.changes) || JSON.stringify(verified.settingsWitnessUpgrade) !== JSON.stringify(upgrade))
       throw new Error("Settings witness upgrade plan changed");
     provenDiscovery = verified.discoveryBefore[0];
@@ -52588,7 +52874,7 @@ function applyAgentIntegration(plan) {
   chmodSync(backupRoot, 448);
   for (const [index, change] of plan.changes.entries())
     if (change.before !== null) {
-      const backup = join21(backupRoot, `${index}-${sha2(change.path).slice(0, 12)}.backup`);
+      const backup = join21(backupRoot, `${index}-${sha3(change.path).slice(0, 12)}.backup`);
       writeFileSync4(backup, change.before, { mode: 384, flag: "wx" });
       if (readFileSync13(backup, "utf8") !== change.before)
         throw new Error("Native configuration preservation readback failed");
@@ -52607,7 +52893,7 @@ function applyAgentIntegration(plan) {
     }
     recheckRootAliases(aliases);
     for (const source of plan.observedNativeSources ?? [])
-      if (sha2(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+      if (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
         throw new Error("Native identity source changed during application");
     if (plan.observedSettings && readOptional(plan.observedSettings.path) !== plan.observedSettings.before)
       throw new Error("Native settings changed during witness application");
@@ -52619,7 +52905,7 @@ function applyAgentIntegration(plan) {
     }
     for (const agent of plan.managedAgentChecks?.agents ?? [])
       assertManagedAgentBridge(agent, { home: plan.managedAgentChecks.home, dataDir: plan.dataDir, projectDir: plan.managedAgentChecks.home });
-    atomicWrite2(join21(backupRoot, "receipt.json"), JSON.stringify({ version: 1, changes: written.map((change) => ({ path: change.path, beforeHash: change.before === null ? null : sha2(change.before), afterHash: sha2(change.after) })), backups, ...aliases.length ? { rootAliases: aliases } : {} }) + `
+    atomicWrite2(join21(backupRoot, "receipt.json"), JSON.stringify({ version: 1, changes: written.map((change) => ({ path: change.path, beforeHash: change.before === null ? null : sha3(change.before), afterHash: sha3(change.after) })), backups, ...aliases.length ? { rootAliases: aliases } : {} }) + `
 `);
   } catch (error) {
     for (const change of written.reverse()) {
@@ -52698,8 +52984,8 @@ function archiveNativeSkills(inventory, options) {
   const operationId = randomUUID5(), archiveRoot = join21(options.dataDir ?? getDataDir(), "migration", operationId, "native"), receiptPath = join21(archiveRoot, "receipt.json");
   const entries = selected.map((entry, index) => ({
     source: entry.vendor ? join21(entry.path, "SKILL.md") : entry.path,
-    archive: join21(archiveRoot, `${index}-${sha2(entry.path).slice(0, 12)}`),
-    hash: entry.vendor ? sha2(readNativeBytes(join21(entry.path, "SKILL.md"))) : entry.hash,
+    archive: join21(archiveRoot, `${index}-${sha3(entry.path).slice(0, 12)}`),
+    hash: entry.vendor ? sha3(readNativeBytes(join21(entry.path, "SKILL.md"))) : entry.hash,
     ...entry.vendor ? { discoveryOnly: true } : {},
     status: "planned"
   }));
@@ -52710,7 +52996,7 @@ function archiveNativeSkills(inventory, options) {
     const stat = lstatSync15(entry.archive);
     if (entry.discoveryOnly ? !stat.isFile() : !stat.isDirectory())
       throw new Error("Archive type changed");
-    if ((entry.discoveryOnly ? sha2(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
+    if ((entry.discoveryOnly ? sha3(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
       throw new Error("Archive bytes changed");
   };
   assertSafePath(archiveRoot);
@@ -52830,7 +53116,7 @@ function assertManagedAgentBridgeWithDiscovery(agent, options = {}, provenDiscov
     throw new Error("NATIVE_SKILL_DRIFT: the hook selection profile differs from its managed binding; restart the native client after reviewing skills hook install");
   if (agent === "hermes") {
     const supervisor = binding.supervisors?.hermes;
-    if (supervisor?.path !== join21(dataDir3, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha2(renderHermesSupervisor(command, profile)))
+    if (supervisor?.path !== join21(dataDir3, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha3(renderHermesSupervisor(command, profile)))
       throw new Error("NATIVE_SKILL_DRIFT: Hermes supervisor binding changed; run skills hook install");
     assertHermesProtection(home, config, command, profile, supervisor);
   } else if (agent === "opencode") {
@@ -52946,7 +53232,7 @@ function assertNativeExportAllowed(dataDir3 = getDataDirReadOnly()) {
   if (requiresCliSkillLoading(dataDir3))
     throw new Error("NATIVE_SKILL_EXPORT_DISABLED: this station loads skills through the Skills CLI; use skills sync --selection-profile <id>");
 }
-var sha2 = (data) => createHash11("sha256").update(data).digest("hex"), HOOK_EVENTS, ROOTS, SKILLS_LOADING_POLICY = "Skills loading policy: discover skills with `skills list` or `skills search`, and read selected instructions with `skills load <slug>`. Use `skills sync` to refresh the shared profile. The only native skill is the owned skills-cli bridge. Create and edit payload skills in the Skills authoring workspace; do not copy payload instructions into native discovery folders. Context loading does not authorize execution; use `skills run` only when the task calls for running a skill.";
+var sha3 = (data) => createHash12("sha256").update(data).digest("hex"), HOOK_EVENTS, ROOTS, SKILLS_LOADING_POLICY = "Skills loading policy: discover skills with `skills list` or `skills search`, and read selected instructions with `skills load <slug>`. Use `skills sync` to refresh the shared profile. The only native skill is the owned skills-cli bridge. Create and edit payload skills in the Skills authoring workspace; do not copy payload instructions into native discovery folders. Context loading does not authorize execution; use `skills run` only when the task calls for running a skill.";
 var init_agent_integration = __esm(() => {
   init_codex_plugin_skill_controls();
   init_codex_native_skill_catalog();
@@ -54528,7 +54814,7 @@ var init_selection_resolver = __esm(() => {
 });
 
 // src/lib/plugin-projection.ts
-import { createHash as createHash12 } from "crypto";
+import { createHash as createHash13 } from "crypto";
 import { posix } from "path";
 function pluginRefusal(message) {
   throw new SkillSelectionError("PLUGIN_ADMISSION_REFUSED", message);
@@ -54721,7 +55007,7 @@ function buildPluginProjection(entries) {
   files.sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
   return { manifest, payloads: manifest.payloads, files, witnesses: pluginFileWitnesses(files), originalTreeDigest, projectionTreeDigest: pluginTreeDigest(files), removed: removed.length ? pluginFileWitnesses(removed) : [] };
 }
-var PLUGIN_PROJECTION_MANIFEST = "plugin-projection.json", PLUGIN_PROJECTION_LIMITS, pluginHash = (bytes) => createHash12("sha256").update(bytes).digest("hex"), MANIFEST_FIELDS;
+var PLUGIN_PROJECTION_MANIFEST = "plugin-projection.json", PLUGIN_PROJECTION_LIMITS, pluginHash = (bytes) => createHash13("sha256").update(bytes).digest("hex"), MANIFEST_FIELDS;
 var init_plugin_projection = __esm(() => {
   init_selection_cache();
   PLUGIN_PROJECTION_LIMITS = Object.freeze({ files: 1024, bytes: 64 * 1024 * 1024, fileBytes: 16 * 1024 * 1024, metadataBytes: 512 * 1024, registrations: 64, history: 128 });
@@ -54729,7 +55015,7 @@ var init_plugin_projection = __esm(() => {
 });
 
 // src/lib/plugin-projection-store.ts
-import { createHash as createHash13, randomUUID as randomUUID6 } from "crypto";
+import { createHash as createHash14, randomUUID as randomUUID6 } from "crypto";
 import { constants as constants9, closeSync as closeSync9, fchmodSync, fstatSync as fstatSync9, fsyncSync as fsyncSync3, linkSync as linkSync2, lstatSync as lstatSync17, mkdirSync as mkdirSync9, openSync as openSync9, opendirSync as opendirSync4, readSync as readSync7, renameSync as renameSync5, rmdirSync as rmdirSync3, rmSync as rmSync4, unlinkSync as unlinkSync4, writeSync as writeSync2 } from "fs";
 import { dirname as dirname13, isAbsolute as isAbsolute12, join as join29, parse as parse5, resolve as resolve12 } from "path";
 function stat(path) {
@@ -54741,7 +55027,7 @@ function stat(path) {
     return pluginRefusal("Cannot inspect plugin filesystem entry");
   }
 }
-function canonical4(path) {
+function canonical5(path) {
   pluginNeed(typeof path === "string" && path.length <= 8192 && isAbsolute12(path) && resolve12(path) === path && !/[\x00-\x1f\x7f]/.test(path), "Plugin storage paths must be canonical absolute paths");
 }
 function owner(stats, system = false) {
@@ -54752,7 +55038,7 @@ function same3(left, right, identityOnly = false) {
   pluginNeed(right && left.dev === right.dev && left.ino === right.ino && left.mode === right.mode && left.uid === right.uid && left.gid === right.gid && (identityOnly || left.size === right.size && left.nlink === right.nlink && left.mtimeNs === right.mtimeNs && left.ctimeNs === right.ctimeNs), "Plugin filesystem entry changed during access");
 }
 function ancestors(path, create3 = false) {
-  canonical4(path);
+  canonical5(path);
   const result2 = [], parent = dirname13(path), filesystemRoot = parse5(parent).root;
   let current = filesystemRoot;
   for (const segment of ["", ...parent.slice(filesystemRoot.length).split("/").filter(Boolean)]) {
@@ -55067,7 +55353,7 @@ function pluginExecutableDigest(path) {
     const opened = fstatSync9(fd, { bigint: true });
     same3(before2, opened);
     fileShape(opened, maximum, "executable");
-    const hash2 = createHash13("sha256"), buffer = new Uint8Array(64 * 1024);
+    const hash2 = createHash14("sha256"), buffer = new Uint8Array(64 * 1024);
     let remaining = Number(opened.size);
     while (remaining > 0) {
       const count = readSync7(fd, buffer, 0, Math.min(buffer.byteLength, remaining), null);
@@ -55650,21 +55936,21 @@ var init_plugin_discovery = __esm(() => {
 });
 
 // src/lib/claude-marketplace-registry.ts
-import { createHash as createHash14 } from "crypto";
+import { createHash as createHash15 } from "crypto";
 import { closeSync as closeSync11, constants as constants11, fstatSync as fstatSync11, lstatSync as lstatSync19, openSync as openSync11, readSync as readSync9 } from "fs";
 import { basename as basename8, dirname as dirname15, isAbsolute as isAbsolute15, resolve as resolve15 } from "path";
-function need4(value, reason) {
+function need5(value, reason) {
   if (!value)
     throw new Error(`Claude marketplace registry ${reason}`);
 }
 function absolutePath3(value) {
-  need4(typeof value === "string" && value.length > 0 && value.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.pathCharacters && !/[\x00-\x1f\x7f]/.test(value) && isAbsolute15(value) && resolve15(value) === value, "requires a normalized absolute path");
+  need5(typeof value === "string" && value.length > 0 && value.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.pathCharacters && !/[\x00-\x1f\x7f]/.test(value) && isAbsolute15(value) && resolve15(value) === value, "requires a normalized absolute path");
 }
 function parents2(path) {
   const result2 = [];
   for (let at2 = dirname15(path);; at2 = dirname15(at2)) {
     const stat2 = lstatSync19(at2, { bigint: true });
-    need4(stat2.isDirectory() && !stat2.isSymbolicLink(), "path traverses a symlink or non-directory");
+    need5(stat2.isDirectory() && !stat2.isSymbolicLink(), "path traverses a symlink or non-directory");
     result2.push([at2, stat2]);
     if (at2 === dirname15(at2))
       return result2;
@@ -55672,15 +55958,15 @@ function parents2(path) {
 }
 function readRegistry2(path, budget) {
   absolutePath3(path);
-  need4(basename8(path) === "known_marketplaces.json", "requires known_marketplaces.json");
-  need4(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
+  need5(basename8(path) === "known_marketplaces.json", "requires known_marketplaces.json");
+  need5(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
   const ancestors2 = parents2(path), initial2 = lstatSync19(path, { bigint: true });
-  need4(initial2.isFile() && !initial2.isSymbolicLink() && initial2.size <= BigInt(CLAUDE_MARKETPLACE_REGISTRY_LIMITS.bytes), "is not a bounded regular file");
-  need4(initial2.size <= BigInt(budget.remaining), "exceeds its aggregate byte limit");
+  need5(initial2.isFile() && !initial2.isSymbolicLink() && initial2.size <= BigInt(CLAUDE_MARKETPLACE_REGISTRY_LIMITS.bytes), "is not a bounded regular file");
+  need5(initial2.size <= BigInt(budget.remaining), "exceeds its aggregate byte limit");
   const fd = openSync11(path, constants11.O_RDONLY | constants11.O_NOFOLLOW | constants11.O_NONBLOCK);
   try {
     const opened = fstatSync11(fd, { bigint: true });
-    need4(opened.isFile() && sameFile2(initial2, opened), "changed during open");
+    need5(opened.isFile() && sameFile2(initial2, opened), "changed during open");
     const bytes = Buffer.alloc(Number(opened.size) + 1);
     let length = 0;
     while (length < bytes.length) {
@@ -55690,10 +55976,10 @@ function readRegistry2(path, budget) {
       length += count;
     }
     const after2 = fstatSync11(fd, { bigint: true }), current = lstatSync19(path, { bigint: true });
-    need4(current.isFile() && sameFile2(opened, after2) && sameFile2(after2, current) && BigInt(length) === opened.size, "changed during read");
+    need5(current.isFile() && sameFile2(opened, after2) && sameFile2(after2, current) && BigInt(length) === opened.size, "changed during read");
     for (const [ancestor, before2] of ancestors2) {
       const now3 = lstatSync19(ancestor, { bigint: true });
-      need4(now3.isDirectory() && before2.dev === now3.dev && before2.ino === now3.ino && before2.mode === now3.mode, "parent changed during read");
+      need5(now3.isDirectory() && before2.dev === now3.dev && before2.ino === now3.ino && before2.mode === now3.mode, "parent changed during read");
     }
     budget.remaining -= length;
     try {
@@ -55713,7 +55999,7 @@ function parse6(text2) {
       at2++;
   };
   function string() {
-    need4(text2[at2] === '"', "contains invalid JSON");
+    need5(text2[at2] === '"', "contains invalid JSON");
     const start = at2++;
     while (at2 < text2.length) {
       const character = text2[at2++];
@@ -55724,7 +56010,7 @@ function parse6(text2) {
         } catch {
           throw new Error("Claude marketplace registry contains invalid JSON string");
         }
-        need4(value2.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.stringCharacters, "exceeds its string limit");
+        need5(value2.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.stringCharacters, "exceeds its string limit");
         return value2;
       }
       if (character === "\\")
@@ -55733,7 +56019,7 @@ function parse6(text2) {
     throw new Error("Claude marketplace registry contains an unterminated JSON string");
   }
   function value(depth) {
-    need4(depth <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.depth && ++nodes <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.nodes, "exceeds its nesting or node limit");
+    need5(depth <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.depth && ++nodes <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.nodes, "exceeds its nesting or node limit");
     space();
     const character = text2[at2];
     if (character === '"')
@@ -55747,17 +56033,17 @@ function parse6(text2) {
           if (object5) {
             space();
             const key = string();
-            need4(!keys2.has(key), "contains a duplicate JSON key");
+            need5(!keys2.has(key), "contains a duplicate JSON key");
             keys2.add(key);
             space();
-            need4(text2[at2++] === ":", "contains invalid JSON");
+            need5(text2[at2++] === ":", "contains invalid JSON");
             entries.push([key, value(depth + 1)]);
           } else
             items.push(value(depth + 1));
           space();
           if (text2[at2] === end)
             break;
-          need4(text2[at2++] === ",", "contains invalid JSON");
+          need5(text2[at2++] === ",", "contains invalid JSON");
         }
       at2++;
       return object5 ? { kind: "object", entries } : { kind: "array", items };
@@ -55769,21 +56055,21 @@ function parse6(text2) {
       }
     numberPattern.lastIndex = at2;
     const number = numberPattern.exec(text2);
-    need4(number, "contains invalid JSON");
+    need5(number, "contains invalid JSON");
     at2 += number[0].length;
     return { kind: "number", value: number[0] };
   }
   const root2 = value(0);
   space();
-  need4(at2 === text2.length && root2.kind === "object", "requires a JSON object without trailing content");
-  need4(root2.entries.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.rows, "exceeds its marketplace row limit");
+  need5(at2 === text2.length && root2.kind === "object", "requires a JSON object without trailing content");
+  need5(root2.entries.length <= CLAUDE_MARKETPLACE_REGISTRY_LIMITS.rows, "exceeds its marketplace row limit");
   return root2;
 }
 function exactKeys(value, keys2) {
   return value?.kind === "object" && value.entries.length === keys2.length && value.entries.every(([key]) => keys2.includes(key));
 }
 function textField(value) {
-  need4(value?.kind === "string" && value.value.length > 0 && !/[\x00-\x1f\x7f]/.test(value.value), "contains an invalid recognized field");
+  need5(value?.kind === "string" && value.value.length > 0 && !/[\x00-\x1f\x7f]/.test(value.value), "contains an invalid recognized field");
   return value.value;
 }
 function normalizeRow(row, version = 1) {
@@ -55791,7 +56077,7 @@ function normalizeRow(row, version = 1) {
     if (version !== 2 || !exactKeys(row, ["source", "installLocation", "lastUpdated", "autoUpdate"]))
       return;
     const autoUpdate = field(row, "autoUpdate");
-    need4(autoUpdate?.kind === "literal" && (autoUpdate.value === "true" || autoUpdate.value === "false"), "contains an invalid automatic-update preference");
+    need5(autoUpdate?.kind === "literal" && (autoUpdate.value === "true" || autoUpdate.value === "false"), "contains an invalid automatic-update preference");
   }
   const source = field(row, "source");
   if (source?.kind !== "object")
@@ -55807,23 +56093,23 @@ function normalizeRow(row, version = 1) {
     absolutePath3(sourceLocation);
   absolutePath3(textField(field(row, "installLocation")));
   const updated = textField(field(row, "lastUpdated"));
-  need4(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(updated), "contains an invalid recognized update timestamp");
+  need5(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(updated), "contains an invalid recognized update timestamp");
   const millis = Date.parse(updated);
-  need4(Number.isFinite(millis) && new Date(millis).toISOString() === updated, "contains an invalid recognized update timestamp");
+  need5(Number.isFinite(millis) && new Date(millis).toISOString() === updated, "contains an invalid recognized update timestamp");
   row.entries = row.entries.map(([key, value]) => [key, key === "lastUpdated" ? { kind: "validated-update-time" } : value]);
 }
 function captureClaudeMarketplaceRegistry(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const value = parse6(readRegistry2(path, budget));
   for (const [, row] of value.entries)
     normalizeRow(row);
-  const sha2562 = createHash14("sha256").update("hasna.skills.claude-marketplace-registry.v1\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash15("sha256").update("hasna.skills.claude-marketplace-registry.v1\x00").update(JSON.stringify(value)).digest("hex");
   return { path, hashMode: "claude-marketplace-registry", sha256: sha2562 };
 }
 function captureClaudeMarketplaceRegistryV2(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const value = parse6(readRegistry2(path, budget));
   for (const [, row] of value.entries)
     normalizeRow(row, 2);
-  const sha2562 = createHash14("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash15("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
   return { path, hashMode: "claude-marketplace-registry-v2", sha256: sha2562 };
 }
 var CLAUDE_MARKETPLACE_REGISTRY_LIMITS, sameFile2 = (a, b) => a.dev === b.dev && a.ino === b.ino && a.mode === b.mode && a.uid === b.uid && a.gid === b.gid && a.nlink === b.nlink && a.size === b.size && a.mtimeNs === b.mtimeNs && a.ctimeNs === b.ctimeNs, field = (object5, key) => object5.entries.find(([name]) => name === key)?.[1];
@@ -55833,17 +56119,17 @@ var init_claude_marketplace_registry = __esm(() => {
 
 // src/lib/codex-hook-trust-files.ts
 import { closeSync as closeSync12, constants as constants12, fstatSync as fstatSync12, fsyncSync as fsyncSync4, lstatSync as lstatSync20, openSync as openSync12, readSync as readSync10, writeFileSync as writeFileSync8 } from "fs";
-import { createHash as createHash15 } from "crypto";
+import { createHash as createHash16 } from "crypto";
 import { dirname as dirname16 } from "path";
-function need5(value, code) {
+function need6(value, code) {
   if (!value)
     throw new Error(`CODEX_HOOK_TRUST_${code}`);
 }
 function safeParents(file) {
   for (let p = dirname16(file);; p = dirname16(p)) {
     const s = lstatSync20(p);
-    need5(s.isDirectory() && !s.isSymbolicLink(), "UNSAFE_PARENT");
-    need5((s.mode & 18) === 0 || s.uid === 0 && (s.mode & 512) !== 0, "UNSAFE_PARENT");
+    need6(s.isDirectory() && !s.isSymbolicLink(), "UNSAFE_PARENT");
+    need6((s.mode & 18) === 0 || s.uid === 0 && (s.mode & 512) !== 0, "UNSAFE_PARENT");
     if (dirname16(p) === p)
       break;
   }
@@ -55852,12 +56138,12 @@ function snapshot(file, privateFile = false, options = {}) {
   const readOnlyPackage = options.readOnlyPackage === true && !privateFile;
   safeParents(file);
   const initial2 = lstatSync20(file, { bigint: true });
-  need5(initial2.isFile() && initial2.uid === BigInt(process.getuid()) && (initial2.nlink === 1n || readOnlyPackage && initial2.nlink > 1n) && (initial2.mode & 0o022n) === 0n && (!privateFile || (initial2.mode & 0o777n) === 0o600n), "UNSAFE_FILE");
-  need5(initial2.size <= 8n * 1024n * 1024n, "FILE_BOUND");
+  need6(initial2.isFile() && initial2.uid === BigInt(process.getuid()) && (initial2.nlink === 1n || readOnlyPackage && initial2.nlink > 1n) && (initial2.mode & 0o022n) === 0n && (!privateFile || (initial2.mode & 0o777n) === 0o600n), "UNSAFE_FILE");
+  need6(initial2.size <= 8n * 1024n * 1024n, "FILE_BOUND");
   const fd = openSync12(file, constants12.O_RDONLY | constants12.O_NOFOLLOW | constants12.O_NONBLOCK);
   try {
     const before2 = fstatSync12(fd, { bigint: true });
-    need5(sameStat(initial2, before2), "INPUT_CHANGED");
+    need6(sameStat(initial2, before2), "INPUT_CHANGED");
     const bytes = Buffer.alloc(Number(before2.size) + 1);
     let length = 0;
     while (length < bytes.length) {
@@ -55866,16 +56152,16 @@ function snapshot(file, privateFile = false, options = {}) {
         break;
       length += n2;
     }
-    need5(length === Number(before2.size) && sameStat(before2, fstatSync12(fd, { bigint: true })) && sameStat(before2, lstatSync20(file, { bigint: true })), "INPUT_CHANGED");
+    need6(length === Number(before2.size) && sameStat(before2, fstatSync12(fd, { bigint: true })) && sameStat(before2, lstatSync20(file, { bigint: true })), "INPUT_CHANGED");
     const content = bytes.subarray(0, length), text2 = new TextDecoder("utf-8", { fatal: true }).decode(content);
-    return { file, privateFile, readOnlyPackage, text: text2, bytes: content, stat: before2, sha256: createHash15("sha256").update(content).digest("hex") };
+    return { file, privateFile, readOnlyPackage, text: text2, bytes: content, stat: before2, sha256: createHash16("sha256").update(content).digest("hex") };
   } finally {
     closeSync12(fd);
   }
 }
 function unchanged2(before2) {
   const after2 = snapshot(before2.file, before2.privateFile, before2.readOnlyPackage ? { readOnlyPackage: true } : {});
-  need5(sameStat(before2.stat, after2.stat) && after2.sha256 === before2.sha256, "INPUT_CHANGED");
+  need6(sameStat(before2.stat, after2.stat) && after2.sha256 === before2.sha256, "INPUT_CHANGED");
 }
 function save(file, content) {
   safeParents(file);
@@ -55891,7 +56177,7 @@ var sameStat = (a, b) => ["dev", "ino", "uid", "nlink", "mode", "size", "mtimeNs
 var init_codex_hook_trust_files = () => {};
 
 // src/lib/codex-hook-trust-layout.ts
-import { isDeepStrictEqual as isDeepStrictEqual4 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual5 } from "util";
 function codexTrustTextWitness(text2, keys2, canonicalize = true) {
   const parsed = Bun.TOML.parse(text2), wanted = new Set(keys2);
   const headers = [...text2.matchAll(/^[ \t]*(\[[^\r\n]+\])[ \t]*(#[^\r\n]*)?(?:\r?\n|$)/gm)];
@@ -55956,7 +56242,7 @@ function codexTrustTextWitness(text2, keys2, canonicalize = true) {
   if (expected.hooks)
     delete expected.hooks.state;
   try {
-    if (!isDeepStrictEqual4(prune(Bun.TOML.parse(noState)), prune(expected)))
+    if (!isDeepStrictEqual5(prune(Bun.TOML.parse(noState)), prune(expected)))
       throw fail2();
   } catch {
     throw fail2();
@@ -56026,55 +56312,55 @@ var init_codex_hook_trust_layout = () => {};
 
 // src/lib/codex-hook-additions-review.ts
 import { isAbsolute as isAbsolute16 } from "path";
-import { isDeepStrictEqual as isDeepStrictEqual5 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual6 } from "util";
 function exactKeys2(value, keys2) {
-  need5(value && typeof value === "object" && !Array.isArray(value) && isDeepStrictEqual5(Object.keys(value).sort(), [...keys2].sort()), "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
+  need6(value && typeof value === "object" && !Array.isArray(value) && isDeepStrictEqual6(Object.keys(value).sort(), [...keys2].sort()), "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
 }
 function readReviewedAdditionTrustStates(proof, before2, current, journalHooks) {
   const captured = proofs.get(proof);
-  need5(!!captured && captured.before.file === before2.file && captured.before.sha256 === before2.sha256 && captured.current.file === current.file && captured.current.sha256 === current.sha256 && isDeepStrictEqual5(captured.journalHooks, journalHooks.map(({ key, currentHash }) => ({ key, currentHash }))), "RECONCILE_ADDITIONS_PROOF_CHANGED");
+  need6(!!captured && captured.before.file === before2.file && captured.before.sha256 === before2.sha256 && captured.current.file === current.file && captured.current.sha256 === current.sha256 && isDeepStrictEqual6(captured.journalHooks, journalHooks.map(({ key, currentHash }) => ({ key, currentHash }))), "RECONCILE_ADDITIONS_PROOF_CHANGED");
   captured.recheck();
   unchanged2(before2);
   unchanged2(current);
   return captured.states;
 }
 function reviewNativeHookAdditions(options) {
-  need5(isAbsolute16(options.path), "RECONCILE_ADDITIONS_REVIEW_PATH");
+  need6(isAbsolute16(options.path), "RECONCILE_ADDITIONS_REVIEW_PATH");
   const reviewFile = snapshot(options.path, true), review = JSON.parse(reviewFile.text);
   exactKeys2(review, ["version", "kind", "reason", "producerEvidence", "journalIntentSha256", "policySha256", "configCurrentSha256", "hooksCurrentSha256", "producerBefore", "additions"]);
-  need5((review.version === 1 || review.version === 2) && review.kind === "native-hook-additions" && text2(review.reason) && text2(review.producerEvidence), "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
+  need6((review.version === 1 || review.version === 2) && review.kind === "native-hook-additions" && text2(review.reason) && text2(review.producerEvidence), "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
   for (const [name, expected] of [["journalIntentSha256", options.intent.sha256], ["policySha256", options.policy.sha256], ["configCurrentSha256", options.configCurrent.sha256], ["hooksCurrentSha256", options.hooksCurrent.sha256]])
-    need5(hash2(review[name]) && review[name] === expected, "RECONCILE_ADDITIONS_REVIEW_CHANGED");
+    need6(hash2(review[name]) && review[name] === expected, "RECONCILE_ADDITIONS_REVIEW_CHANGED");
   exactKeys2(review.producerBefore, ["configPath", "configSha256", "hooksPath", "hooksSha256"]);
   const before2 = review.producerBefore;
-  need5(isAbsolute16(before2.configPath) && isAbsolute16(before2.hooksPath) && hash2(before2.configSha256) && hash2(before2.hooksSha256), "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
+  need6(isAbsolute16(before2.configPath) && isAbsolute16(before2.hooksPath) && hash2(before2.configSha256) && hash2(before2.hooksSha256), "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
   const producerConfig = snapshot(before2.configPath, true), producerHooks = snapshot(before2.hooksPath, true);
-  need5(producerConfig.sha256 === before2.configSha256 && producerHooks.sha256 === before2.hooksSha256 && producerHooks.sha256 === options.hooksBefore.sha256, "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
+  need6(producerConfig.sha256 === before2.configSha256 && producerHooks.sha256 === before2.hooksSha256 && producerHooks.sha256 === options.hooksBefore.sha256, "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
   const original = structure(options.configBefore.text), producer = structure(producerConfig.text), expectedProducer = structuredClone(original), originalKeys = options.journalHooks.map((hook) => hook.key);
   expectedProducer.hooks ??= {};
   expectedProducer.hooks.state ??= {};
   for (const hook of options.journalHooks)
     expectedProducer.hooks.state[hook.key] = { ...expectedProducer.hooks.state[hook.key], enabled: true, trusted_hash: hook.currentHash };
-  need5(isDeepStrictEqual5(expectedProducer, producer) && codexTrustReconcileWitness(options.configBefore.text, originalKeys) === codexTrustReconcileWitness(producerConfig.text, originalKeys) && codexTrustUnmanagedSemantic(options.configBefore.text, originalKeys) === codexTrustUnmanagedSemantic(producerConfig.text, originalKeys), "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
-  need5(Array.isArray(review.additions) && review.additions.length > 0 && review.additions.length <= 20, "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
+  need6(isDeepStrictEqual6(expectedProducer, producer) && codexTrustReconcileWitness(options.configBefore.text, originalKeys) === codexTrustReconcileWitness(producerConfig.text, originalKeys) && codexTrustUnmanagedSemantic(options.configBefore.text, originalKeys) === codexTrustUnmanagedSemantic(producerConfig.text, originalKeys), "RECONCILE_ADDITIONS_PRODUCER_PREIMAGE");
+  need6(Array.isArray(review.additions) && review.additions.length > 0 && review.additions.length <= 20, "RECONCILE_ADDITIONS_REVIEW_SCHEMA");
   const expectedHooks = JSON.parse(options.hooksBefore.text), currentHooks = JSON.parse(options.hooksCurrent.text), expectedConfig = structuredClone(producer);
-  need5(expectedHooks.hooks && typeof expectedHooks.hooks === "object" && !Array.isArray(expectedHooks.hooks), "RECONCILE_ADDITIONS_DECLARATIONS");
+  need6(expectedHooks.hooks && typeof expectedHooks.hooks === "object" && !Array.isArray(expectedHooks.hooks), "RECONCILE_ADDITIONS_DECLARATIONS");
   const added = [], states = [], seen = new Set, commands = new Set(options.recordedNativeHooks.map((hook) => hook.command));
   for (const addition of review.additions) {
     exactKeys2(addition, review.version === 1 ? ["event", "nativeHook"] : ["event", "nativeHook", "trustState"]);
-    need5(Object.hasOwn(review.version === 1 ? events : matchedEvents, addition.event), "RECONCILE_ADDITIONS_DECLARATIONS");
+    need6(Object.hasOwn(review.version === 1 ? events : matchedEvents, addition.event), "RECONCILE_ADDITIONS_DECLARATIONS");
     const { event, nativeHook: hook } = addition;
     exactKeys2(hook, nativeKeys);
     const groups = expectedHooks.hooks[event] ?? [];
-    need5(Array.isArray(groups), "RECONCILE_ADDITIONS_DECLARATIONS");
+    need6(Array.isArray(groups), "RECONCILE_ADDITIONS_DECLARATIONS");
     const key = `${options.nativeHooksPath}:${matchedEvents[event][1]}:${groups.length}:0`;
-    need5(hook.key === key && !seen.has(key) && !options.recordedNativeHooks.some((originalHook) => originalHook.key === key) && !Object.hasOwn(expectedConfig.hooks.state, key), "RECONCILE_ADDITIONS_IDENTITY");
-    need5(hook.eventName === matchedEvents[event][0] && hook.handlerType === "command" && (review.version === 2 ? v2Command(hook.command) : text2(hook.command, 16384)) && !commands.has(hook.command) && Number.isInteger(hook.timeoutSec) && hook.timeoutSec > 0 && hook.timeoutSec <= 60 && (event === "PreToolUse" ? text2(hook.matcher) : hook.matcher === null) && hook.async === false && hook.statusMessage === null && hook.additionalContextLimit === null && hook.sourcePath === options.nativeHooksPath && hook.source === "user" && hook.pluginId === null && hook.isManaged === false && /^sha256:[a-f0-9]{64}$/.test(hook.currentHash) && hook.enabled === true && hook.trustStatus === "trusted", "RECONCILE_ADDITIONS_IDENTITY");
+    need6(hook.key === key && !seen.has(key) && !options.recordedNativeHooks.some((originalHook) => originalHook.key === key) && !Object.hasOwn(expectedConfig.hooks.state, key), "RECONCILE_ADDITIONS_IDENTITY");
+    need6(hook.eventName === matchedEvents[event][0] && hook.handlerType === "command" && (review.version === 2 ? v2Command(hook.command) : text2(hook.command, 16384)) && !commands.has(hook.command) && Number.isInteger(hook.timeoutSec) && hook.timeoutSec > 0 && hook.timeoutSec <= 60 && (event === "PreToolUse" ? text2(hook.matcher) : hook.matcher === null) && hook.async === false && hook.statusMessage === null && hook.additionalContextLimit === null && hook.sourcePath === options.nativeHooksPath && hook.source === "user" && hook.pluginId === null && hook.isManaged === false && /^sha256:[a-f0-9]{64}$/.test(hook.currentHash) && hook.enabled === true && hook.trustStatus === "trusted", "RECONCILE_ADDITIONS_IDENTITY");
     let trustState = { enabled: true, trusted_hash: hook.currentHash };
     if (review.version === 2) {
       const state = addition.trustState;
       exactKeys2(state, state && Object.hasOwn(state, "enabled") ? ["enabled", "trusted_hash"] : ["trusted_hash"]);
-      need5(state.trusted_hash === hook.currentHash && (!Object.hasOwn(state, "enabled") || state.enabled === true), "RECONCILE_ADDITIONS_TRUST_STATE");
+      need6(state.trusted_hash === hook.currentHash && (!Object.hasOwn(state, "enabled") || state.enabled === true), "RECONCILE_ADDITIONS_TRUST_STATE");
       trustState = { ...state };
     }
     seen.add(key);
@@ -56084,9 +56370,9 @@ function reviewNativeHookAdditions(options) {
     expectedHooks.hooks[event] = [...groups, { ...event === "PreToolUse" ? { matcher: hook.matcher } : {}, hooks: [{ type: "command", command: hook.command, timeout: hook.timeoutSec }] }];
     expectedConfig.hooks.state[key] = trustState;
   }
-  need5(isDeepStrictEqual5(expectedHooks, currentHooks), "RECONCILE_ADDITIONS_DECLARATIONS");
+  need6(isDeepStrictEqual6(expectedHooks, currentHooks), "RECONCILE_ADDITIONS_DECLARATIONS");
   const keys2 = added.map((hook) => hook.key);
-  need5(isDeepStrictEqual5(expectedConfig, structure(options.configCurrent.text)) && codexTrustReconcileWitness(producerConfig.text, keys2) === codexTrustReconcileWitness(options.configCurrent.text, keys2) && codexTrustUnmanagedSemantic(producerConfig.text, keys2) === codexTrustUnmanagedSemantic(options.configCurrent.text, keys2), "RECONCILE_ADDITIONS_CONFIG");
+  need6(isDeepStrictEqual6(expectedConfig, structure(options.configCurrent.text)) && codexTrustReconcileWitness(producerConfig.text, keys2) === codexTrustReconcileWitness(options.configCurrent.text, keys2) && codexTrustUnmanagedSemantic(producerConfig.text, keys2) === codexTrustUnmanagedSemantic(options.configCurrent.text, keys2), "RECONCILE_ADDITIONS_CONFIG");
   const inputs = [reviewFile, producerConfig, producerHooks, options.intent, options.policy, options.configBefore, options.configCurrent, options.hooksBefore, options.hooksCurrent];
   const recheck = () => {
     for (const input of inputs)
@@ -56108,8 +56394,8 @@ var init_codex_hook_additions_review = __esm(() => {
 });
 
 // src/lib/codex-hook-discovery-recovery.ts
-import { createHash as createHash16 } from "crypto";
-import { isDeepStrictEqual as isDeepStrictEqual6 } from "util";
+import { createHash as createHash17 } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual7 } from "util";
 function createCodexHookDiscoveryRecovery(binding, before2, current, hooks, additions) {
   const journalHooks = hooks.map(({ key, currentHash }) => ({ key, currentHash }));
   const additionStates = additions ? readReviewedAdditionTrustStates(additions, before2, current, journalHooks) : [];
@@ -56120,16 +56406,16 @@ function createCodexHookDiscoveryRecovery(binding, before2, current, hooks, addi
   const raw = binding.sources.filter((source) => source.path === current.file && source.hashMode === "bytes");
   if (!raw.some((source) => source.sha256 !== current.sha256))
     return;
-  need5(binding.agent === "codex" && binding.method === "reviewed" && raw.length === 1 && raw[0].sha256 === before2.sha256 && before2.sha256 !== current.sha256, "RECONCILE_DISCOVERY_CONFIG_WITNESS");
-  need5(raw[0].format === undefined && raw[0].fields === undefined && raw[0].managedPlugins === undefined, "RECONCILE_DISCOVERY_CONFIG_WITNESS");
+  need6(binding.agent === "codex" && binding.method === "reviewed" && raw.length === 1 && raw[0].sha256 === before2.sha256 && before2.sha256 !== current.sha256, "RECONCILE_DISCOVERY_CONFIG_WITNESS");
+  need6(raw[0].format === undefined && raw[0].fields === undefined && raw[0].managedPlugins === undefined, "RECONCILE_DISCOVERY_CONFIG_WITNESS");
   const typed = binding.sources.filter((source) => source.path === current.file && source.format === "toml");
-  need5(typed.length === 1 && typed[0].hashMode === undefined && isDeepStrictEqual6(typed[0].fields, fields), "RECONCILE_DISCOVERY_TYPED_WITNESS");
+  need6(typed.length === 1 && typed[0].hashMode === undefined && isDeepStrictEqual7(typed[0].fields, fields), "RECONCILE_DISCOVERY_TYPED_WITNESS");
   const original = structure2(before2.text), actual = structure2(current.text);
   const project = (value) => Object.fromEntries(fields.map((field2) => [field2, value[field2] ?? null]));
-  const projection = sha3(JSON.stringify(project(original)));
-  need5(typed[0].sha256 === projection && sha3(JSON.stringify(project(actual))) === projection && isDeepStrictEqual6(project(original), project(actual)), "RECONCILE_DISCOVERY_TYPED_WITNESS");
+  const projection = sha4(JSON.stringify(project(original)));
+  need6(typed[0].sha256 === projection && sha4(JSON.stringify(project(actual))) === projection && isDeepStrictEqual7(project(original), project(actual)), "RECONCILE_DISCOVERY_TYPED_WITNESS");
   const keys2 = [...journalHooks.map((hook) => hook.key), ...additionStates.map((hook) => hook.key)];
-  need5(journalHooks.length > 0 && keys2.length <= 100 && new Set(keys2).size === keys2.length && journalHooks.every((hook) => typeof hook.key === "string" && /^sha256:[a-f0-9]{64}$/.test(hook.currentHash)), "RECONCILE_DISCOVERY_TRUST_WITNESS");
+  need6(journalHooks.length > 0 && keys2.length <= 100 && new Set(keys2).size === keys2.length && journalHooks.every((hook) => typeof hook.key === "string" && /^sha256:[a-f0-9]{64}$/.test(hook.currentHash)), "RECONCILE_DISCOVERY_TRUST_WITNESS");
   const expected = structuredClone(original);
   expected.hooks ??= {};
   expected.hooks.state ??= {};
@@ -56137,16 +56423,16 @@ function createCodexHookDiscoveryRecovery(binding, before2, current, hooks, addi
     expected.hooks.state[hook.key] = { ...expected.hooks.state[hook.key], enabled: true, trusted_hash: hook.currentHash };
   for (const { key, state } of additionStates)
     expected.hooks.state[key] = { ...state };
-  need5(isDeepStrictEqual6(expected, actual) && codexTrustReconcileWitness(before2.text, keys2) === codexTrustReconcileWitness(current.text, keys2) && codexTrustUnmanagedSemantic(before2.text, keys2) === codexTrustUnmanagedSemantic(current.text, keys2), "RECONCILE_DISCOVERY_TRUST_WITNESS");
+  need6(isDeepStrictEqual7(expected, actual) && codexTrustReconcileWitness(before2.text, keys2) === codexTrustReconcileWitness(current.text, keys2) && codexTrustUnmanagedSemantic(before2.text, keys2) === codexTrustUnmanagedSemantic(current.text, keys2), "RECONCILE_DISCOVERY_TRUST_WITNESS");
   unchanged2(before2);
   unchanged2(current);
-  const witness = Object.freeze({ configPath: current.file, beforeSha256: before2.sha256, currentSha256: current.sha256, discoverySha256: sha3(JSON.stringify(binding)), typedProjectionSha256: projection });
+  const witness = Object.freeze({ configPath: current.file, beforeSha256: before2.sha256, currentSha256: current.sha256, discoverySha256: sha4(JSON.stringify(binding)), typedProjectionSha256: projection });
   proofs2.set(witness, { before: before2, current, recheckAdditions });
   return witness;
 }
 function assertCodexHookDiscoveryRecovery(binding, witness) {
   const proof = proofs2.get(witness);
-  need5(!!proof && binding.agent === "codex" && witness.discoverySha256 === sha3(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
+  need6(!!proof && binding.agent === "codex" && witness.discoverySha256 === sha4(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
   unchanged2(proof.before);
   unchanged2(proof.current);
   proof.recheckAdditions();
@@ -56155,23 +56441,24 @@ function verifiesCodexHookDiscoverySource(binding, source, currentDigest, witnes
   if (!witness || source.path !== witness.configPath || source.hashMode !== "bytes")
     return false;
   assertCodexHookDiscoveryRecovery(binding, witness);
-  need5(source.sha256 === witness.beforeSha256 && currentDigest === witness.currentSha256, "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
+  need6(source.sha256 === witness.beforeSha256 && currentDigest === witness.currentSha256, "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
   return true;
 }
-var sha3 = (text3) => createHash16("sha256").update(text3).digest("hex"), fields, structure2 = (text3) => JSON.parse(JSON.stringify(Bun.TOML.parse(text3))), proofs2;
+var sha4 = (text3) => createHash17("sha256").update(text3).digest("hex"), fields, structure2 = (text3) => JSON.parse(JSON.stringify(Bun.TOML.parse(text3))), proofs2;
 var init_codex_hook_discovery_recovery = __esm(() => {
   init_codex_hook_trust_files();
   init_codex_hook_trust_layout();
   init_codex_hook_additions_review();
-  fields = ["plugins", "marketplaces", "skills"];
+  init_codex_settings_witness();
+  fields = [...CODEX_DISCOVERY_PROJECTION_FIELDS];
   proofs2 = new WeakMap;
 });
 
 // src/lib/agent-discovery.ts
-import { createHash as createHash17 } from "crypto";
+import { createHash as createHash18 } from "crypto";
 import { lstatSync as lstatSync21, readFileSync as readFileSync18, readdirSync as readdirSync11, realpathSync as realpathSync7 } from "fs";
 import { basename as basename9, dirname as dirname17, isAbsolute as isAbsolute17, join as join32, resolve as resolve16, sep as sep6 } from "path";
-import { isDeepStrictEqual as isDeepStrictEqual7 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual8 } from "util";
 function parseConfig(text3, path, toml = false) {
   try {
     const value = toml ? Bun.TOML.parse(text3) : JSON.parse(text3);
@@ -56203,14 +56490,26 @@ function read2(path, changes) {
     throw new Error(`Unsupported or oversized native discovery input: ${path}`);
   return readFileSync18(path, "utf8");
 }
+function projectNativeDiscoveryFields(text3, format, fields2, path) {
+  const object5 = format === "yaml" ? parseHermesConfig(text3) : parseConfig(text3, path, format === "toml");
+  if (!object5 || typeof object5 !== "object" || Array.isArray(object5))
+    throw new Error("Expected native discovery configuration object");
+  return digest(JSON.stringify(Object.fromEntries(fields2.map((field2) => [field2, object5[field2] ?? null]))));
+}
+function isSupersededCodexProjection(agent, configPath, source) {
+  return agent === "codex" && source.path === configPath && source.format === "toml" && isDeepStrictEqual8(source.fields, [...CODEX_DISCOVERY_PROJECTION_FIELDS]);
+}
+function supersedesCodexProjection(sources, configPath) {
+  return sources.some((source) => source.path === configPath && source.hashMode === "codex-settings-v2");
+}
 function projected(source, changes, budget = discoveryByteBudget()) {
-  if (source.hashMode === "codex-settings-v1") {
+  if (source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2") {
     if (source.format !== undefined || source.fields !== undefined || source.managedPlugins !== undefined || typeof source.sha256 !== "string" || !/^[a-f0-9]{64}$/.test(source.sha256))
       throw new Error("Codex settings witnesses require exact typed metadata");
-    const current = captureCodexSettings(source.path, budget).sha256;
+    const current = (source.hashMode === "codex-settings-v2" ? captureCodexSettingsV2 : captureCodexSettings)(source.path, budget).sha256;
     if (current !== source.sha256)
       throw new Error(`Native discovery input changed; run skills hook install with a fresh discovery review: ${source.path}`);
-    return changes?.has(source.path) ? hashCodexSettingsReplacement(changes.get(source.path), budget) : current;
+    return changes?.has(source.path) ? (source.hashMode === "codex-settings-v2" ? hashCodexSettingsReplacementV2 : hashCodexSettingsReplacement)(changes.get(source.path), budget) : current;
   }
   if (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3") {
     if (source.format !== undefined || source.fields !== undefined || source.managedPlugins !== undefined || typeof source.sha256 !== "string" || !/^[a-f0-9]{64}$/.test(source.sha256))
@@ -56249,10 +56548,7 @@ function projected(source, changes, budget = discoveryByteBudget()) {
     return null;
   if (!source.format)
     return digest(text3);
-  const object5 = source.format === "yaml" ? parseHermesConfig(text3) : parseConfig(text3, source.path, source.format === "toml");
-  if (!object5 || typeof object5 !== "object" || Array.isArray(object5))
-    throw new Error("Expected native discovery configuration object");
-  return digest(JSON.stringify(Object.fromEntries((source.fields ?? []).map((field2) => [field2, object5[field2] ?? null]))));
+  return projectNativeDiscoveryFields(text3, source.format, source.fields ?? [], source.path);
 }
 function verifyAgentDiscovery(binding, codexRecovery) {
   if (codexRecovery)
@@ -56280,7 +56576,7 @@ function verifyAgentDiscovery(binding, codexRecovery) {
     safe4(root2);
 }
 function assertMarketplaceBinding(binding, source) {
-  if (source.hashMode === "codex-settings-v1" && (binding.agent !== "codex" || binding.method !== "reviewed" || basename9(source.path) !== "config.toml"))
+  if ((source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2") && (binding.agent !== "codex" || binding.method !== "reviewed" || basename9(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" || basename9(source.path) !== "settings.json"))
     throw new Error("Claude settings witnesses require explicit reviewed Claude configuration");
@@ -56297,8 +56593,8 @@ function rebindAgentDiscovery(binding, changes) {
     return { ...source, sha256: sha2562 };
   }) };
 }
-function assertProjectDiscovery(agent, directories, home, canonical5 = resolve16, reviewed) {
-  const homeConfigPath = canonical5(agentDiscoveryConfigPath(home, agent));
+function assertProjectDiscovery(agent, directories, home, canonical6 = resolve16, reviewed) {
+  const homeConfigPath = canonical6(agentDiscoveryConfigPath(home, agent));
   for (const directory of directories) {
     const isHome = resolve16(directory) === resolve16(home);
     if (agent === "hermes") {
@@ -56309,7 +56605,7 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve16
       continue;
     const paths = agent === "claude" ? [...isHome ? [] : [".claude/settings.json"], ".claude/settings.local.json"] : agent === "codex" ? [".codex/config.toml"] : agent === "gemini" ? [".gemini/settings.json"] : agent === "opencode" ? ["opencode.json", "opencode.jsonc", ".opencode/opencode.json", ".opencode/opencode.jsonc"] : [".cursor/hooks.json"];
     for (const suffix of paths) {
-      const path = canonical5(join32(directory, suffix)), raw = read2(path);
+      const path = canonical6(join32(directory, suffix)), raw = read2(path);
       if (raw === null)
         continue;
       const isRootAliasedHomeConfig = agent === "claude" && suffix === ".claude/settings.json" || agent === "codex" && suffix === ".codex/config.toml";
@@ -56325,14 +56621,14 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve16
         const managed = reviewed.sources.flatMap((source) => source.hashMode === "claude-plugin-registry" ? source.managedPlugins ?? [] : []);
         if (exact && projected(exact) === exact.sha256 && managed.length) {
           const bindings = managed.map((item) => readPluginBinding(item.storeRoot, item.bindingId));
-          admittedPlugins = Object.entries(config.enabledPlugins).every(([id, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id && binding.target.registrations.some((scope) => scope.scope === "project" && scope.projectPath === canonical5(directory))));
+          admittedPlugins = Object.entries(config.enabledPlugins).every(([id, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id && binding.target.registrations.some((scope) => scope.scope === "project" && scope.projectPath === canonical6(directory))));
         }
       }
       if (keys2.some((key) => config[key] !== undefined && !(key === "enabledPlugins" && admittedPlugins)) || config.disableAllHooks === true || config.disableBundledSkills === false || config.hooksConfig?.enabled === false || config.permission?.skill !== undefined || config.permissions?.deny?.some((rule) => typeof rule === "string" && /^Skill(?:\(|$)/.test(rule)))
         throw new Error(`NATIVE_SKILL_DRIFT: higher-precedence project skill or hook configuration requires review: ${path}`);
     }
     if (agent === "claude") {
-      const commands = canonical5(join32(directory, ".claude/commands"));
+      const commands = canonical6(join32(directory, ".claude/commands"));
       safe4(commands);
       if (lstatSync21(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync11(commands).length)
         throw new Error("NATIVE_SKILL_DRIFT: legacy project command discovery requires a dedicated format adapter");
@@ -56343,10 +56639,10 @@ function agentDiscoveryConfigPath(home, agent) {
   return join32(home, agent === "hermes" ? ".hermes/config.yaml" : agent === "opencode" ? ".config/opencode/opencode.json" : `.${agent}/${agent === "codex" ? "config.toml" : agent === "cursor" ? "hooks.json" : "settings.json"}`);
 }
 function resolveAgentDiscovery(options) {
-  const canonical5 = options.canonical ?? resolve16, home = resolve16(options.home), agent = options.agent;
+  const canonical6 = options.canonical ?? resolve16, home = resolve16(options.home), agent = options.agent;
   const sources = [], roots = new Set, builtinNames = [];
   const witness = (path, format, fields2) => {
-    const source = { path: canonical5(path), sha256: null, ...format ? { format, fields: fields2 } : {} };
+    const source = { path: canonical6(path), sha256: null, ...format ? { format, fields: fields2 } : {} };
     source.sha256 = projected(source);
     sources.push(source);
     return read2(source.path);
@@ -56354,7 +56650,7 @@ function resolveAgentDiscovery(options) {
   if (agent === "hermes")
     assertHermesEnvironment(home);
   const configPath = agentDiscoveryConfigPath(home, agent);
-  const configText = witness(configPath, agent === "hermes" ? "yaml" : agent === "codex" ? "toml" : "json", agent === "hermes" ? ["skills", "plugins", "hooks"] : agent === "claude" ? ["enabledPlugins", "extraKnownMarketplaces"] : agent === "codex" ? ["plugins", "marketplaces", "skills"] : agent === "gemini" ? ["skills", "extensions", "security"] : agent === "opencode" ? ["plugin", "skills"] : ["version"]);
+  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"] : ["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`);
@@ -56413,11 +56709,12 @@ function resolveAgentDiscovery(options) {
     if (retained.agent !== agent || retained.method !== "reviewed")
       unresolved("invalid retained review");
     verifyAgentDiscovery(retained);
-    if (!retained.sources.some((source) => source.path === canonical5(configPath) && source.format === undefined && source.fields === undefined))
+    if (!retained.sources.some((source) => source.path === canonical6(configPath) && source.format === undefined && source.fields === undefined))
       unresolved("retained review is missing the full agent configuration source");
-    if (retained.sources.some((source) => (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || (source.hashMode === "claude-settings-v3" || source.hashMode === "codex-settings-v1")) && source.path !== canonical5(configPath)))
+    if (retained.sources.some((source) => (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || (source.hashMode === "claude-settings-v3" || (source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2"))) && source.path !== canonical6(configPath)))
       unresolved("retained settings witness names another configuration source");
-    if (sources.some((source) => !retained.sources.some((saved) => isDeepStrictEqual7(saved, source))) || [...roots].some((root2) => !retained.roots.includes(root2)) || agent === "gemini" && JSON.stringify(retained.builtinNames) !== JSON.stringify(builtinNames))
+    const covered = supersedesCodexProjection(retained.sources, canonical6(configPath)) ? sources.filter((source) => !isSupersededCodexProjection(agent, canonical6(configPath), source)) : sources;
+    if (covered.some((source) => !retained.sources.some((saved) => isDeepStrictEqual8(saved, source))) || [...roots].some((root2) => !retained.roots.includes(root2)) || agent === "gemini" && JSON.stringify(retained.builtinNames) !== JSON.stringify(builtinNames))
       unresolved("retained review is missing current runtime discovery coverage");
     return retained;
   }
@@ -56431,14 +56728,15 @@ function resolveAgentDiscovery(options) {
     if (review.sources.some((source) => source.format !== undefined || source.fields !== undefined))
       throw new Error("Explicit discovery reviews require full source-file hashes");
     verifyAgentDiscovery(supplied);
-    if (review.sources.some((source) => (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || (source.hashMode === "claude-settings-v3" || source.hashMode === "codex-settings-v1")) && source.path !== canonical5(configPath)))
+    if (review.sources.some((source) => (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || (source.hashMode === "claude-settings-v3" || (source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2"))) && source.path !== canonical6(configPath)))
       throw new Error("Semantic settings witnesses must name the configured Claude configuration source");
-    if (!review.sources.some((source) => source.path === canonical5(configPath)))
+    if (!review.sources.some((source) => source.path === canonical6(configPath)))
       throw new Error("Discovery review must include the agent configuration source");
-    return { ...supplied, roots: [...new Set([...roots, ...supplied.roots])].sort(), sources: [...sources, ...review.sources], ...agent === "gemini" ? { builtinNames } : {} };
+    const reviewedSources = supersedesCodexProjection(review.sources, canonical6(configPath)) ? sources.filter((source) => !isSupersededCodexProjection(agent, canonical6(configPath), source)) : sources;
+    return { ...supplied, roots: [...new Set([...roots, ...supplied.roots])].sort(), sources: [...reviewedSources, ...review.sources], ...agent === "gemini" ? { builtinNames } : {} };
   }
   function plugin(root2) {
-    root2 = canonical5(root2);
+    root2 = canonical6(root2);
     safe4(root2);
     const manifestPath = join32(root2, agent === "claude" ? ".claude-plugin/plugin.json" : ".codex-plugin/plugin.json");
     const raw = witness(manifestPath);
@@ -56470,7 +56768,7 @@ function resolveAgentDiscovery(options) {
   if (agent === "claude") {
     const registrations = witness(join32(home, ".claude/plugins/installed_plugins.json"));
     const installed = registrations === null ? {} : parseConfig(registrations, join32(home, ".claude/plugins/installed_plugins.json")).plugins;
-    const commands = canonical5(join32(home, ".claude/commands"));
+    const commands = canonical6(join32(home, ".claude/commands"));
     safe4(commands);
     if (lstatSync21(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync11(commands).length)
       unresolved("legacy home command discovery requires a dedicated format adapter");
@@ -56544,9 +56842,9 @@ function resolveAgentDiscovery(options) {
         roots.add(join32(root2, "skills"));
       }
   }
-  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join32(home, ".hermes/plugins"), join32(home, ".hermes/hermes-agent")].map((path) => canonical5(path))) } : {} };
+  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join32(home, ".hermes/plugins"), join32(home, ".hermes/hermes-agent")].map((path) => canonical6(path))) } : {} };
 }
-var digest = (text3) => createHash17("sha256").update(text3).digest("hex");
+var digest = (text3) => createHash18("sha256").update(text3).digest("hex");
 var init_agent_discovery = __esm(() => {
   init_agent_policy_limits();
   init_agent_hermes();
@@ -56679,7 +56977,7 @@ import {
   statSync as statSync11,
   writeFileSync as writeFileSync9
 } from "fs";
-import { basename as basename11, dirname as dirname19, isAbsolute as isAbsolute18, join as join34, normalize as normalize3, relative as relative6, resolve as resolve18, sep as sep8 } from "path";
+import { basename as basename11, dirname as dirname19, isAbsolute as isAbsolute18, join as join34, normalize as normalize4, relative as relative6, resolve as resolve18, sep as sep8 } from "path";
 function getPortableSkillsRoot(options = {}) {
   return resolvePortableSkillsRoot(options, true);
 }
@@ -56777,7 +57075,7 @@ function scaffoldPortableSkill(name, options = {}) {
   return { name: skillName, path: skillPath, manifest, created: true };
 }
 function portPortableSkillDirectory(sourceDir, options = {}) {
-  const absoluteSource = normalize3(sourceDir);
+  const absoluteSource = normalize4(sourceDir);
   if (!existsSync18(absoluteSource) || !statSync11(absoluteSource).isDirectory()) {
     throw new Error(`Import directory not found: ${sourceDir}`);
   }
@@ -56844,7 +57142,7 @@ function assertDisjointImportPaths(source, destination) {
   }
 }
 function portPortableSkill(sourcePath, options = {}) {
-  const absoluteSource = normalize3(sourcePath);
+  const absoluteSource = normalize4(sourcePath);
   if (!existsSync18(absoluteSource) || !statSync11(absoluteSource).isDirectory()) {
     throw new Error(`Skill source directory not found: ${sourcePath}`);
   }
@@ -57056,7 +57354,7 @@ function safeIsDirectory(path) {
 function isSafeRelativePath2(value) {
   if (!value.trim() || isAbsolute18(value))
     return false;
-  const normalized = normalize3(value).replace(/\\/g, "/");
+  const normalized = normalize4(value).replace(/\\/g, "/");
   return normalized !== ".." && !normalized.startsWith("../") && !normalized.includes("/../");
 }
 function add4(target, code, message) {
@@ -59482,7 +59780,7 @@ var init_remote_workspace_selection = __esm(() => {
 });
 
 // src/lib/remote-private-publications.ts
-import { createHash as createHash18 } from "crypto";
+import { createHash as createHash19 } from "crypto";
 function checkedPublicationDeclaration(value) {
   if (!exact(value, ["idempotencyKey", "version", "expectedCurrentVersionId", "manifestText", "archiveSha256", "archiveByteSize"]) || !publicationUuid(value.idempotencyKey) || !(value.expectedCurrentVersionId === null || publicationUuid(value.expectedCurrentVersionId)) || typeof value.version !== "string" || !value.version || value.version.length > 128 || /[\p{Cc}\p{Cs}]/u.test(value.version) || typeof value.manifestText !== "string" || Buffer.byteLength(value.manifestText) > 16384 || !hash3(value.archiveSha256) || !Number.isSafeInteger(value.archiveByteSize) || Number(value.archiveByteSize) < 1 || Number(value.archiveByteSize) > PRIVATE_PUBLICATION_MAX_BYTES)
     return bad();
@@ -59743,7 +60041,7 @@ var PRIVATE_PUBLICATION_MAX_BYTES, failures, PrivatePublicationError, bad = () =
   throw new PrivatePublicationError("INVALID_PUBLICATION_INPUT", "Invalid publication input or recovery data.");
 }, invalid3 = () => {
   throw new PrivatePublicationError("INVALID_PUBLICATION_RESPONSE", "The server returned an invalid publication result.");
-}, publicationUuid = (v) => typeof v === "string" && /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/.test(v), hash3 = (v) => typeof v === "string" && /^[a-f0-9]{64}$/.test(v), record4 = (v) => !!v && typeof v === "object" && !Array.isArray(v), exact = (v, keys2) => record4(v) && Object.keys(v).sort().join(",") === keys2.sort().join(","), date = (v) => typeof v === "string" && /^\d{4}-\d\d-\d\dT[0-9:.]+(?:Z|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/.test(v) && Number.isFinite(Date.parse(v)), publicationSha256 = (bytes) => createHash18("sha256").update(bytes).digest("hex");
+}, publicationUuid = (v) => typeof v === "string" && /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/.test(v), hash3 = (v) => typeof v === "string" && /^[a-f0-9]{64}$/.test(v), record4 = (v) => !!v && typeof v === "object" && !Array.isArray(v), exact = (v, keys2) => record4(v) && Object.keys(v).sort().join(",") === keys2.sort().join(","), date = (v) => typeof v === "string" && /^\d{4}-\d\d-\d\dT[0-9:.]+(?:Z|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/.test(v) && Number.isFinite(Date.parse(v)), publicationSha256 = (bytes) => createHash19("sha256").update(bytes).digest("hex");
 var init_remote_private_publications = __esm(() => {
   init_fleet_credentials();
   init_remote_workspace_selection();
@@ -63282,15 +63580,15 @@ var init_schemas = __esm(() => {
         } catch (_err) {}
       }
       const input = payload.value;
-      const isDate2 = input instanceof Date;
-      const isValidDate = isDate2 && !Number.isNaN(input.getTime());
+      const isDate3 = input instanceof Date;
+      const isValidDate = isDate3 && !Number.isNaN(input.getTime());
       if (isValidDate)
         return payload;
       payload.issues.push({
         expected: "date",
         code: "invalid_type",
         input,
-        ...isDate2 ? { received: "Invalid Date" } : {},
+        ...isDate3 ? { received: "Invalid Date" } : {},
         inst
       });
       return payload;
@@ -79132,7 +79430,7 @@ var init_v4 = __esm(() => {
 });
 
 // src/lib/canonical-json.ts
-import { createHash as createHash19 } from "crypto";
+import { createHash as createHash20 } from "crypto";
 function canonicalJson2(value, maximumBytes = 2 * 1024 * 1024) {
   return canonicalJsonAtDepth(value, maximumBytes, 64);
 }
@@ -79176,7 +79474,7 @@ function canonicalJsonAtDepth(value, maximumBytes, maximumDepth) {
   return visit3(value, 0);
 }
 function canonicalJsonSha256(value, maximumBytes) {
-  return createHash19("sha256").update(canonicalJson2(value, maximumBytes)).digest("hex");
+  return createHash20("sha256").update(canonicalJson2(value, maximumBytes)).digest("hex");
 }
 var init_canonical_json = () => {};
 
@@ -79511,7 +79809,7 @@ var init_remote_recurring = __esm(() => {
 
 // src/lib/remote-run-contract.ts
 function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
-  const record8 = isRecord3(payload) ? payload : {};
+  const record8 = isRecord4(payload) ? payload : {};
   return {
     contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
     ...pickString(record8, "id"),
@@ -79533,7 +79831,7 @@ function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
     ...hasOwn(record8, "details") ? { details: record8.details } : {}
   };
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function hasOwn(record8, key) {
@@ -79672,7 +79970,7 @@ var init_remote_credit_checkout = __esm(() => {
 
 // src/lib/remote-profile.ts
 function customerNamePatch(input2, field2) {
-  if (!isRecord4(input2) || Object.keys(input2).length !== 1 || !Object.hasOwn(input2, field2))
+  if (!isRecord5(input2) || Object.keys(input2).length !== 1 || !Object.hasOwn(input2, field2))
     throw new Error("Provide only the requested name field.");
   const value = input2[field2];
   if (typeof value !== "string" || /[\p{Cc}\p{Cs}\u2028\u2029]/u.test(value) || !value.trim() || [...value.trim()].length > 100) {
@@ -79680,22 +79978,22 @@ function customerNamePatch(input2, field2) {
   }
   return { [field2]: value.trim() };
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function string4(value) {
   return typeof value === "string" && value.length > 0;
 }
 function parseUpdatedProfile(value) {
-  const user = isRecord4(value) && value.user;
-  if (!isRecord4(user) || !string4(user.id) || !string4(user.email) || !(user.displayName === null || typeof user.displayName === "string") || typeof user.role !== "string" || !["owner", "admin", "member", "viewer"].includes(user.role)) {
+  const user = isRecord5(value) && value.user;
+  if (!isRecord5(user) || !string4(user.id) || !string4(user.email) || !(user.displayName === null || typeof user.displayName === "string") || typeof user.role !== "string" || !["owner", "admin", "member", "viewer"].includes(user.role)) {
     throw new Error("The server returned an invalid account profile.");
   }
   return { user: { id: user.id, email: user.email, displayName: user.displayName, role: user.role } };
 }
 function parseUpdatedWorkspace(value) {
-  const organization2 = isRecord4(value) && value.organization;
-  if (!isRecord4(organization2) || !string4(organization2.id) || !string4(organization2.slug) || !string4(organization2.name)) {
+  const organization2 = isRecord5(value) && value.organization;
+  if (!isRecord5(organization2) || !string4(organization2.id) || !string4(organization2.slug) || !string4(organization2.name)) {
     throw new Error("The server returned an invalid workspace.");
   }
   return { organization: { id: organization2.id, slug: organization2.slug, name: organization2.name } };
@@ -80877,7 +81175,7 @@ async function requestAuthApi(instance, path, options) {
   const text4 = await res.text();
   const body = text4 ? parseJsonBody(text4) : {};
   if (!res.ok) {
-    const record9 = isRecord5(body) ? body : {};
+    const record9 = isRecord6(body) ? body : {};
     const detail = typeof record9.detail === "string" ? record9.detail : undefined;
     const error61 = typeof record9.error === "string" ? record9.error : undefined;
     const code = typeof record9.code === "string" ? record9.code : undefined;
@@ -80905,7 +81203,7 @@ function condenseErrorBody(text4) {
     return collapsed;
   return `${collapsed.slice(0, MAX_ERROR_DETAIL_LENGTH - 1).trimEnd()}\u2026`;
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
@@ -81090,10 +81388,10 @@ var init_remote_auth = __esm(() => {
 });
 
 // src/lib/sign-in.ts
-import { createHash as createHash20 } from "crypto";
+import { createHash as createHash21 } from "crypto";
 import { chmodSync as chmodSync3, mkdirSync as mkdirSync12, readFileSync as readFileSync21, readdirSync as readdirSync14, renameSync as renameSync8, unlinkSync as unlinkSync6, writeFileSync as writeFileSync11 } from "fs";
 import { basename as basename13, dirname as dirname21, join as join37 } from "path";
-function isRecord6(value) {
+function isRecord7(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function boundedText(value, max2 = 2048) {
@@ -81118,7 +81416,7 @@ function clampIntervalMs(seconds) {
   return Math.min(MAX_INTERVAL_MS, Math.max(MIN_INTERVAL_MS, Math.round(seconds * 1000)));
 }
 function parseDeviceAuthorizationStart(body) {
-  const record9 = isRecord6(body) ? body : {};
+  const record9 = isRecord7(body) ? body : {};
   if (typeof record9.error === "string") {
     throw new Error(typeof record9.detail === "string" ? record9.detail : record9.error);
   }
@@ -81152,7 +81450,7 @@ function pollDeviceToken(origin, deviceCode) {
   });
 }
 function deviceErrorCode(error61) {
-  if (!(error61 instanceof HostedApiError) && !(isRecord6(error61) && error61.name === "HostedApiError"))
+  if (!(error61 instanceof HostedApiError) && !(isRecord7(error61) && error61.name === "HostedApiError"))
     return;
   const failure = error61;
   const named = [failure.code, failure.detail, failure.message].find((value) => value === "slow_down" || value === "authorization_pending" || value === "expired_token" || value === "invalid_device_code" || value === "access_denied");
@@ -81213,7 +81511,7 @@ async function pollDeviceAuthorization(input2) {
           throw error61;
       }
     }
-    const record9 = isRecord6(body) ? body : {};
+    const record9 = isRecord7(body) ? body : {};
     const code = typeof record9.error === "string" ? record9.error : undefined;
     if (code === "authorization_pending" || code === undefined && record9.status === "pending") {
       await wait();
@@ -81241,7 +81539,7 @@ function pendingDeviceSignInStem(env3) {
 }
 function pendingDeviceSignInPath(origin, env3 = process.env) {
   const { dir, stem } = pendingDeviceSignInStem(env3);
-  return join37(dir, `${stem}-${createHash20("sha256").update(origin).digest("hex").slice(0, 16)}.json`);
+  return join37(dir, `${stem}-${createHash21("sha256").update(origin).digest("hex").slice(0, 16)}.json`);
 }
 function savePendingDeviceSignIn(origin, start, env3 = process.env, now3 = Date.now()) {
   const path = pendingDeviceSignInPath(origin, env3);
@@ -81271,7 +81569,7 @@ function loadPendingDeviceSignIn(origin, env3 = process.env, now3 = Date.now())
   } catch {
     return null;
   }
-  if (!isRecord6(parsed))
+  if (!isRecord7(parsed))
     return null;
   const deviceCode = boundedText(parsed.deviceCode, 512);
   const userCode = boundedText(parsed.userCode, 64);
@@ -81313,7 +81611,7 @@ function pendingDeviceSignInOrigins(env3 = process.env, now3 = Date.now()) {
       continue;
     try {
       const parsed = JSON.parse(readFileSync21(join37(location.dir, entry), "utf8"));
-      if (isRecord6(parsed) && typeof parsed.origin === "string" && Number(parsed.expiresAt) > now3 && pendingDeviceSignInPath(parsed.origin, env3) === join37(location.dir, entry))
+      if (isRecord7(parsed) && typeof parsed.origin === "string" && Number(parsed.expiresAt) > now3 && pendingDeviceSignInPath(parsed.origin, env3) === join37(location.dir, entry))
         origins.push(parsed.origin);
     } catch {}
   }
@@ -81355,7 +81653,7 @@ async function persistSignIn(result2, origin, env3 = process.env, issuedBy = "si
       headers: { Authorization: `Bearer ${result2.token}` },
       body: JSON.stringify({ name: "cli" })
     });
-    apiKey = isRecord6(created) && typeof created.key === "string" && created.key.trim() ? created.key : undefined;
+    apiKey = isRecord7(created) && typeof created.key === "string" && created.key.trim() ? created.key : undefined;
   }
   if (!apiKey)
     throw new Error("Sign-in succeeded but the server returned no API key");
@@ -81394,7 +81692,7 @@ async function revokeStoredKey(origin, apiKey) {
     }
     return { outcome: "failed", detail: "the server could not be reached" };
   }
-  if (isRecord6(body) && body.revoked === true)
+  if (isRecord7(body) && body.revoked === true)
     return { outcome: "revoked" };
   return { outcome: "not_revoked", detail: "the server answered without confirming revocation" };
 }
@@ -81518,10 +81816,10 @@ async function readSignedInAccount(env3 = process.env) {
     const body = await new RemoteSkillsAuthClient(connection.apiOrigin).request("/api/auth/whoami", {
       headers: { Authorization: `Bearer ${connection.apiKey}` }
     });
-    const record9 = isRecord6(body) ? body : {};
-    const data = isRecord6(record9.data) ? record9.data : {};
-    const user = isRecord6(record9.user) ? record9.user : isRecord6(data.user) ? data.user : {};
-    const organization2 = isRecord6(record9.organization) ? record9.organization : isRecord6(data.organization) ? data.organization : {};
+    const record9 = isRecord7(body) ? body : {};
+    const data = isRecord7(record9.data) ? record9.data : {};
+    const user = isRecord7(record9.user) ? record9.user : isRecord7(data.user) ? data.user : {};
+    const organization2 = isRecord7(record9.organization) ? record9.organization : isRecord7(data.organization) ? data.organization : {};
     const email4 = boundedText(user.email, 320);
     const org = boundedText(organization2.slug, 200) ?? boundedText(organization2.name, 200);
     return { ...base2, ...email4 ? { email: email4 } : {}, ...org ? { organization: org } : {} };
@@ -81936,7 +82234,7 @@ function optionPrefix(program2, args) {
 }
 
 // src/lib/revision.ts
-import { createHash as createHash21 } from "crypto";
+import { createHash as createHash22 } from "crypto";
 function revisionIdOf(content) {
   const canonicalContent = {
     slug: content.slug,
@@ -81956,8 +82254,8 @@ function revisionIdOf(content) {
     canonicalContent.archiveReason = content.archiveReason ?? null;
     canonicalContent.replacementSlug = content.replacementSlug ?? null;
   }
-  const canonical5 = JSON.stringify(canonicalContent);
-  return createHash21("sha256").update(canonical5).digest("hex");
+  const canonical6 = JSON.stringify(canonicalContent);
+  return createHash22("sha256").update(canonical6).digest("hex");
 }
 var REVISION_ID_PATTERN;
 var init_revision = __esm(() => {
@@ -82406,7 +82704,7 @@ var init_pull = __esm(() => {
 });
 
 // src/lib/skill-context.ts
-import { createHash as createHash22 } from "crypto";
+import { createHash as createHash23 } from "crypto";
 import { resolve as resolve19 } from "path";
 function words2(value) {
   return new Set(value.toLowerCase().match(/[a-z0-9]+/g) ?? []);
@@ -82495,7 +82793,7 @@ ${content}`;
 `);
   const receipt = {
     schemaVersion: 1,
-    id: createHash22("sha256").update(JSON.stringify({ profile: profile.profileRevision, sessionId, selections, omitted })).digest("hex"),
+    id: createHash23("sha256").update(JSON.stringify({ profile: profile.profileRevision, sessionId, selections, omitted })).digest("hex"),
     profileId: profile.profileId,
     profileRevision: profile.profileRevision,
     authority: profile.authority,
@@ -82517,8 +82815,8 @@ var init_skill_context = __esm(() => {
 });
 
 // src/lib/session-reconciliation.ts
-import { createHash as createHash23 } from "crypto";
-import { isDeepStrictEqual as isDeepStrictEqual8 } from "util";
+import { createHash as createHash24 } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual9 } from "util";
 function exactTimestamp(value) {
   const parsed = value === undefined ? Number.NaN : Date.parse(value);
   if (!Number.isFinite(parsed) || new Date(parsed).toISOString() !== value) {
@@ -82575,7 +82873,7 @@ async function reconcileSkillSessionIfSafe(sessionId, profileId, options = {}) {
   for (const key of old.loaded) {
     const previous = oldByKey.get(key);
     const current = targetBySlug.get(previous.slug);
-    if (!current || !isDeepStrictEqual8({ ...previous, profileRevision: target.profileRevision }, current)) {
+    if (!current || !isDeepStrictEqual9({ ...previous, profileRevision: target.profileRevision }, current)) {
       throw new SkillSelectionError("SESSION_RECONCILIATION_REQUIRED", "A loaded Skills selection was removed or changed; review skills sessions reconcile before changing this session's pin.");
     }
   }
@@ -82657,7 +82955,7 @@ async function reconcileSkillSession(input2, options = {}) {
   const result2 = replaceSkillSession(skillSessionSnapshotBinding(snapshot2), replacement, { ...plan, planDigest }, options, () => assertPlanWindow(issuedAt, expiresAt, (options.now ?? Date.now)()));
   return { applied: true, plan, planDigest, ...result2 };
 }
-var SESSION_RECONCILIATION_PLAN_TTL_MS, digest3 = (value) => createHash23("sha256").update(JSON.stringify(value)).digest("hex");
+var SESSION_RECONCILIATION_PLAN_TTL_MS, digest3 = (value) => createHash24("sha256").update(JSON.stringify(value)).digest("hex");
 var init_session_reconciliation = __esm(() => {
   init_profile_client();
   init_selection_cache();
@@ -83793,7 +84091,7 @@ function handleDiff(name, options) {
   const sourcePath = getSkillPath(bare);
   const canonicalDir = join39(resolveCorpusRoot(), normalized);
   const canonicalSkillMd = join39(canonicalDir, "SKILL.md");
-  const canonical5 = {
+  const canonical6 = {
     present: existsSync22(canonicalSkillMd),
     path: canonicalDir,
     ...existsSync22(canonicalSkillMd) ? { hash: hashSkillMarkdownFile(canonicalSkillMd) } : {},
@@ -83825,7 +84123,7 @@ function handleDiff(name, options) {
         stub = undefined;
       }
     }
-    const diverged = present && canonical5.present && managed && hash5 !== canonical5.hash;
+    const diverged = present && canonical6.present && managed && hash5 !== canonical6.hash;
     homes.push({
       agent,
       path: dir,
@@ -83840,7 +84138,7 @@ function handleDiff(name, options) {
   if (options.json) {
     console.log(JSON.stringify({
       name: bare,
-      canonical: canonical5,
+      canonical: canonical6,
       pinned,
       installedVersion,
       registryVersion,
@@ -83848,10 +84146,10 @@ function handleDiff(name, options) {
       homes
     }, null, 2));
   } else {
-    if (!canonical5.present) {
+    if (!canonical6.present) {
       console.log(source_default.yellow(`${bare}: no canonical corpus entry`));
     } else {
-      console.log(source_default.dim(`${bare} canonical: ${canonical5.hash?.slice(0, 12)}\u2026`));
+      console.log(source_default.dim(`${bare} canonical: ${canonical6.hash?.slice(0, 12)}\u2026`));
     }
     if (pinned) {
       console.log(upToDate ? source_default.green(`\u2713 pin is up to date (${installedVersion})`) : source_default.yellow(`pin metadata differs: ${installedVersion} \u2192 ${registryVersion}`));
@@ -83862,14 +84160,14 @@ function handleDiff(name, options) {
       } else if (!home.managed) {
         console.log(`${source_default.dim("\u2022")} ${home.agent}: ${source_default.yellow("unmarked (adoption candidate)")}`);
       } else if (home.diverged) {
-        const stubNote = home.stub === true ? " (home is a pointer stub; canonical holds content)" : canonical5.stub === true ? " (home holds content; canonical renders a pointer stub \u2014 sync refuses to replace it)" : "";
-        console.log(`${source_default.red("\u2717")} ${home.agent}: ${source_default.red("diverged")} ${source_default.dim(home.hash?.slice(0, 12))} \u2260 ${source_default.dim(canonical5.hash?.slice(0, 12))}${stubNote}`);
+        const stubNote = home.stub === true ? " (home is a pointer stub; canonical holds content)" : canonical6.stub === true ? " (home holds content; canonical renders a pointer stub \u2014 sync refuses to replace it)" : "";
+        console.log(`${source_default.red("\u2717")} ${home.agent}: ${source_default.red("diverged")} ${source_default.dim(home.hash?.slice(0, 12))} \u2260 ${source_default.dim(canonical6.hash?.slice(0, 12))}${stubNote}`);
       } else {
         console.log(`${source_default.green("\u2713")} ${home.agent}: ${source_default.green("matches canonical")}`);
       }
     }
   }
-  if (divergedHomes.length > 0 || homes.length > 0 && !canonical5.present)
+  if (divergedHomes.length > 0 || homes.length > 0 && !canonical6.present)
     process.exitCode = 1;
 }
 var init_introspect = __esm(() => {
@@ -87175,7 +87473,7 @@ var init_execution_grants = __esm(() => {
 });
 
 // src/lib/execution-grant-client.ts
-import { isDeepStrictEqual as isDeepStrictEqual9 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual10 } from "util";
 function id(value) {
   if (!grantIdentifier(value))
     throw new Error("Invalid execution grant profile or revision identifier.");
@@ -87227,7 +87525,7 @@ async function saveExecutionGrantPolicy(profileId, grants, revision) {
     headers: revision === undefined ? { "If-None-Match": "*" } : { "If-Match": `"${revision}"` },
     body: JSON.stringify({ grants: snapshot2 })
   }));
-  if (policy.profileId !== profileId || policy.previousRevision !== (revision ?? null) || !isDeepStrictEqual9(policy.grants, snapshot2)) {
+  if (policy.profileId !== profileId || policy.previousRevision !== (revision ?? null) || !isDeepStrictEqual10(policy.grants, snapshot2)) {
     throw new Error("The API did not preserve the reviewed execution grant policy; read it before retrying.");
   }
   return policy;
@@ -87238,7 +87536,7 @@ async function resolveExecutionGrant(input2) {
   if (!grantRecord(value) || Object.keys(value).length !== 3 || !grantIdentifier(value.policyRevision) || !grantIdentifier(value.grantId) || !grantRecord(value.bindings)) {
     throw new SkillSelectionError("INVALID_EXECUTION_GRANT", "The Skills API returned an invalid execution grant.");
   }
-  if (!isDeepStrictEqual9(value.bindings.selection, snapshot2.selection) || !isDeepStrictEqual9(value.bindings.consumer, snapshot2.consumer)) {
+  if (!isDeepStrictEqual10(value.bindings.selection, snapshot2.selection) || !isDeepStrictEqual10(value.bindings.consumer, snapshot2.consumer)) {
     throw new SkillSelectionError("EXECUTION_GRANT_SCOPE_MISMATCH", "The Skills API returned a grant for a different selection or consumer.");
   }
   return value;
@@ -87257,7 +87555,7 @@ __export(exports_selected_run, {
   prepareSelectedSecretBindings: () => prepareSelectedSecretBindings,
   executeSelectedLocal: () => executeSelectedLocal
 });
-import { createHash as createHash24 } from "crypto";
+import { createHash as createHash25 } from "crypto";
 import { spawn as spawn3 } from "child_process";
 import { mkdirSync as mkdirSync15, mkdtempSync as mkdtempSync4, writeFileSync as writeFileSync15, realpathSync as realpathSync11 } from "fs";
 import { dirname as dirname23, join as join45, resolve as resolve20 } from "path";
@@ -87383,7 +87681,7 @@ async function executeSelectedLocal(selected, options = {}) {
     selection: selection2,
     target: "local",
     runtime: runtimeName,
-    inputDigest: `sha256:${createHash24("sha256").update(input2).digest("hex")}`,
+    inputDigest: `sha256:${createHash25("sha256").update(input2).digest("hex")}`,
     runDirectory,
     ...executionGrant ? { executionGrant } : {},
     ...bindings ? { secretBinding: { schema: bindings.schema, selection: bindings.selection, consumer: bindings.consumer, secretsAuthority: bindings.secretsAuthority, bindings: bindings.bindings } } : {},
@@ -91600,7 +91898,7 @@ var init_runs = __esm(() => {
 });
 
 // src/lib/run-state.ts
-import { createHash as createHash25, randomBytes } from "crypto";
+import { createHash as createHash26, randomBytes } from "crypto";
 import { existsSync as existsSync27, mkdirSync as mkdirSync16, readFileSync as readFileSync32, readdirSync as readdirSync18, statSync as statSync16, writeFileSync as writeFileSync16 } from "fs";
 import { extname, join as join46, relative as relative7 } from "path";
 function createSkillRun(params, targetDir = process.cwd()) {
@@ -91737,7 +92035,7 @@ function collectRunArtifacts(context) {
     artifacts.push({
       path: toProjectRelative(context.targetDir, path),
       mime: mimeForPath(path),
-      sha256: createHash25("sha256").update(bytes).digest("hex"),
+      sha256: createHash26("sha256").update(bytes).digest("hex"),
       sizeBytes: stat2.size
     });
   }
@@ -97463,8 +97761,8 @@ var require_resolve = __commonJS((exports) => {
     }
     return count;
   }
-  function getFullPath(resolver, id2 = "", normalize4) {
-    if (normalize4 !== false)
+  function getFullPath(resolver, id2 = "", normalize5) {
+    if (normalize5 !== false)
       id2 = normalizeId(id2);
     const p = resolver.parse(id2);
     return _getFullPath(resolver, p);
@@ -99023,7 +99321,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return decodedScheme;
   }
-  function normalize4(uri, options) {
+  function normalize5(uri, options) {
     if (typeof uri === "string") {
       uri = normalizeString(uri, options);
     } else if (typeof uri === "object") {
@@ -99400,7 +99698,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   var fastUri = {
     SCHEMES,
-    normalize: normalize4,
+    normalize: normalize5,
     resolve: resolve21,
     resolveComponent,
     equal,
@@ -104410,7 +104708,7 @@ async function continueRecurringRecovery(customer, directory, options) {
     throw error61;
   }
 }
-var uuid11, sha4, common2, intentSchema, stateSchema, invalid6 = () => {
+var uuid11, sha5, common2, intentSchema, stateSchema, invalid6 = () => {
   throw new RecurringCustomerError("RECURRING_RECOVERY_INVALID", "The original recovery directory or record is invalid or changed. Preserve it; do not create a replacement activation automatically.");
 };
 var init_recurring_recovery = __esm(() => {
@@ -104420,7 +104718,7 @@ var init_recurring_recovery = __esm(() => {
   init_remote_recurring();
   init_recurring_customer();
   uuid11 = exports_external.string().regex(/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/);
-  sha4 = exports_external.string().regex(/^[a-f0-9]{64}$/);
+  sha5 = exports_external.string().regex(/^[a-f0-9]{64}$/);
   common2 = exports_external.object({
     contractVersion: exports_external.literal(1),
     apiOrigin: exports_external.string().min(1).max(4096),
@@ -104433,7 +104731,7 @@ var init_recurring_recovery = __esm(() => {
     common2.extend({
       operation: exports_external.literal("activate"),
       draftId: uuid11,
-      termsSha256: sha4,
+      termsSha256: sha5,
       approvalDeadline: exports_external.string().datetime(),
       approval: recurringActivationSchema
     }).strict(),
@@ -104441,7 +104739,7 @@ var init_recurring_recovery = __esm(() => {
   ]);
   stateSchema = exports_external.object({
     contractVersion: exports_external.literal(1),
-    intentSha256: sha4,
+    intentSha256: sha5,
     phase: exports_external.enum(["prepared", "pending", "observed"]),
     consentId: uuid11.nullable()
   }).strict();
@@ -106985,7 +107283,7 @@ var init_schedule_tools = __esm(() => {
 });
 
 // src/lib/native-storage.ts
-import { createHash as createHash26, createHmac as createHmac3 } from "crypto";
+import { createHash as createHash27, createHmac as createHmac3 } from "crypto";
 import {
   existsSync as existsSync31,
   mkdirSync as mkdirSync21,
@@ -106994,7 +107292,7 @@ import {
   statSync as statSync18,
   writeFileSync as writeFileSync20
 } from "fs";
-import { dirname as dirname27, join as join52, normalize as normalize4, relative as relative8, sep as sep9 } from "path";
+import { dirname as dirname27, join as join52, normalize as normalize5, relative as relative8, sep as sep9 } from "path";
 function resolveSkillsNativeStorageConfig(env3 = process.env) {
   assertNoRetiredModeEnvVars(env3, {
     app: SKILLS_ENV_NAMESPACE,
@@ -107062,7 +107360,7 @@ function exportSkillsLocalSnapshot(targetDir = process.cwd(), options = {}) {
       files.push({
         path: relativePath,
         sizeBytes: bytes.byteLength,
-        sha256: createHash26("sha256").update(bytes).digest("hex"),
+        sha256: createHash27("sha256").update(bytes).digest("hex"),
         ...options.includeFileContents ? { contentBase64: Buffer.from(bytes).toString("base64") } : {}
       });
     }
@@ -108244,7 +108542,7 @@ var init_remote_account2 = __esm(() => {
 });
 
 // src/cli/commands/runtime-copyfile.ts
-import { createHash as createHash27, randomUUID as randomUUID9 } from "crypto";
+import { createHash as createHash28, randomUUID as randomUUID9 } from "crypto";
 import { Readable } from "stream";
 import { createGunzip as createGunzip2 } from "zlib";
 import {
@@ -108268,7 +108566,7 @@ function object9(value, code2) {
   return value;
 }
 function hash5(bytes) {
-  return createHash27("sha256").update(bytes).digest("hex");
+  return createHash28("sha256").update(bytes).digest("hex");
 }
 function isWithin(parent, child) {
   const rel = relative9(parent, child);
@@ -108419,7 +108717,7 @@ function verifyIntegrity(bytes, integrity) {
   const match = /^sha512-([A-Za-z0-9+/]+={0,2})$/.exec(integrity);
   if (!match)
     throw new Error("REGISTRY_INTEGRITY_UNSUPPORTED");
-  const actual = createHash27("sha512").update(bytes).digest("base64");
+  const actual = createHash28("sha512").update(bytes).digest("base64");
   if (actual !== match[1])
     throw new Error("TARBALL_INTEGRITY_MISMATCH");
 }
@@ -109420,7 +109718,7 @@ var exports_runtime = {};
 __export(exports_runtime, {
   registerRuntime: () => registerRuntime
 });
-import { createHash as createHash28, randomUUID as randomUUID10 } from "crypto";
+import { createHash as createHash29, randomUUID as randomUUID10 } from "crypto";
 import { lstatSync as lstatSync29, mkdirSync as mkdirSync25, readFileSync as readFileSync38, realpathSync as realpathSync15, writeFileSync as writeFileSync24 } from "fs";
 import { basename as basename15, isAbsolute as isAbsolute25, join as join56 } from "path";
 import { createInterface } from "readline";
@@ -109461,7 +109759,7 @@ function registerRuntime(parent) {
       if (!expected)
         throw new Error("Cloud artifact not found");
       const bytes = await client2.download(id2, name);
-      if (bytes.length !== expected.byteSize || createHash28("sha256").update(bytes).digest("hex") !== expected.sha256)
+      if (bytes.length !== expected.byteSize || createHash29("sha256").update(bytes).digest("hex") !== expected.sha256)
         throw new Error("Cloud artifact integrity verification failed");
       writeFileSync24(options.output, bytes, { flag: "wx", mode: 384 });
       console.log(JSON.stringify({ path: options.output, sha256: expected.sha256, byteSize: bytes.length }));
@@ -111104,7 +111402,7 @@ var init_portable_snapshot_filter = __esm(() => {
 });
 
 // src/lib/station-snapshot.ts
-import { createHash as createHash29 } from "crypto";
+import { createHash as createHash30 } from "crypto";
 import {
   copyFileSync as copyFileSync2,
   mkdirSync as mkdirSync26,
@@ -111119,7 +111417,7 @@ function validateStationId(stationId) {
   }
 }
 function sha256File(filePath) {
-  return createHash29("sha256").update(readFileSync39(filePath)).digest("hex");
+  return createHash30("sha256").update(readFileSync39(filePath)).digest("hex");
 }
 function scanHome(definition, homesRoot) {
   const homePath = homePathFor(definition, homesRoot);
@@ -111691,8 +111989,8 @@ var init_create_sync_config = __esm(() => {
 });
 
 // src/lib/codex-native-config.ts
-import { isDeepStrictEqual as isDeepStrictEqual10 } from "util";
-function isRecord7(value) {
+import { isDeepStrictEqual as isDeepStrictEqual11 } from "util";
+function isRecord8(value) {
   if (!value || typeof value !== "object")
     return false;
   const prototype = Object.getPrototypeOf(value);
@@ -111713,10 +112011,10 @@ function decimalIdentity(text4) {
   return `${match[1]}${coefficient}e${exponent}`;
 }
 function codexNativeConfigEqual(native, expected) {
-  if (isDeepStrictEqual10(native, expected))
+  if (isDeepStrictEqual11(native, expected))
     return true;
   if (typeof expected === "number") {
-    if (!Number.isFinite(expected) || !isRecord7(native))
+    if (!Number.isFinite(expected) || !isRecord8(native))
       return false;
     const keys3 = Object.keys(native);
     const value = native[NUMBER_TAG];
@@ -111728,7 +112026,7 @@ function codexNativeConfigEqual(native, expected) {
   if (Array.isArray(native) || Array.isArray(expected)) {
     return Array.isArray(native) && Array.isArray(expected) && native.length === expected.length && native.every((value, index) => codexNativeConfigEqual(value, expected[index]));
   }
-  if (!isRecord7(native) || !isRecord7(expected))
+  if (!isRecord8(native) || !isRecord8(expected))
     return false;
   const actual = native, wanted = expected;
   return Object.keys(actual).length === Object.keys(wanted).length && Object.keys(wanted).every((key) => Object.hasOwn(actual, key) && codexNativeConfigEqual(actual[key], wanted[key]));
@@ -111739,42 +112037,42 @@ var init_codex_native_config = () => {};
 // src/lib/codex-hook-trust-identity.ts
 import { realpathSync as realpathSync16 } from "fs";
 import { dirname as dirname33, isAbsolute as isAbsolute27, join as join59 } from "path";
-import { isDeepStrictEqual as isDeepStrictEqual11 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual12 } from "util";
 function inspectRecordedSkillsCli(command, expected) {
-  need5(isAbsolute27(command) && !command.includes("\x00"), "RECONCILE_RECORDED_COMMAND_REQUIRED");
+  need6(isAbsolute27(command) && !command.includes("\x00"), "RECONCILE_RECORDED_COMMAND_REQUIRED");
   const resolved = realpathSync16(command);
   const cli = snapshot(resolved, false, { readOnlyPackage: true });
   const manifest = snapshot(join59(dirname33(dirname33(resolved)), "package.json"), false, { readOnlyPackage: true });
   const pkg = JSON.parse(manifest.text);
-  need5(pkg.name === "@hasna/skills" && /^\d+\.\d+\.\d+$/.test(pkg.version) && pkg.bin?.skills === "bin/index.js" && resolved === join59(dirname33(manifest.file), "bin/index.js"), "SKILLS_PACKAGE_MISMATCH");
-  need5((cli.stat.mode & 0o100n) !== 0n, "SKILLS_COMMAND_NOT_EXECUTABLE");
+  need6(pkg.name === "@hasna/skills" && /^\d+\.\d+\.\d+$/.test(pkg.version) && pkg.bin?.skills === "bin/index.js" && resolved === join59(dirname33(manifest.file), "bin/index.js"), "SKILLS_PACKAGE_MISMATCH");
+  need6((cli.stat.mode & 0o100n) !== 0n, "SKILLS_COMMAND_NOT_EXECUTABLE");
   const receipt = { path: resolved, version: pkg.version, sha256: cli.sha256, manifestSha256: manifest.sha256 };
-  need5(isDeepStrictEqual11(receipt, expected), "RECONCILE_SKILLS_BINDING_CHANGED");
+  need6(isDeepStrictEqual12(receipt, expected), "RECONCILE_SKILLS_BINDING_CHANGED");
   return { receipt, recheck() {
-    need5(realpathSync16(command) === resolved, "SKILLS_COMMAND_CHANGED");
+    need6(realpathSync16(command) === resolved, "SKILLS_COMMAND_CHANGED");
     unchanged2(cli);
     unchanged2(manifest);
   } };
 }
 function bindSkillsCli(command, reviewed) {
   const normal = Bun.which("skills", { PATH: process.env.PATH });
-  need5(normal, "SKILLS_COMMAND_UNAVAILABLE");
+  need6(normal, "SKILLS_COMMAND_UNAVAILABLE");
   const resolved = realpathSync16(normal);
   const bound = isAbsolute27(command) ? command : command === "skills" ? normal : undefined;
-  need5(bound && realpathSync16(bound) === resolved, "SKILLS_COMMAND_MISMATCH");
+  need6(bound && realpathSync16(bound) === resolved, "SKILLS_COMMAND_MISMATCH");
   const entrypoint = reviewed?.path ?? process.argv[1];
-  need5(entrypoint && realpathSync16(entrypoint) === resolved, "SKILLS_ENTRYPOINT_MISMATCH");
+  need6(entrypoint && realpathSync16(entrypoint) === resolved, "SKILLS_ENTRYPOINT_MISMATCH");
   const cli = snapshot(resolved, false, { readOnlyPackage: true });
   const manifest = snapshot(join59(dirname33(dirname33(resolved)), "package.json"), false, { readOnlyPackage: true });
   const pkg = JSON.parse(manifest.text);
-  need5(pkg.name === "@hasna/skills" && /^\d+\.\d+\.\d+$/.test(pkg.version) && pkg.bin?.skills === "bin/index.js" && resolved === join59(dirname33(manifest.file), "bin/index.js"), "SKILLS_PACKAGE_MISMATCH");
+  need6(pkg.name === "@hasna/skills" && /^\d+\.\d+\.\d+$/.test(pkg.version) && pkg.bin?.skills === "bin/index.js" && resolved === join59(dirname33(manifest.file), "bin/index.js"), "SKILLS_PACKAGE_MISMATCH");
   if (reviewed)
-    need5(/^[a-f0-9]{64}$/.test(reviewed.sha256) && reviewed.sha256 === cli.sha256 && reviewed.version === pkg.version, "SKILLS_RELEASE_MISMATCH");
-  need5((cli.stat.mode & 0o100n) !== 0n, "SKILLS_COMMAND_NOT_EXECUTABLE");
+    need6(/^[a-f0-9]{64}$/.test(reviewed.sha256) && reviewed.sha256 === cli.sha256 && reviewed.version === pkg.version, "SKILLS_RELEASE_MISMATCH");
+  need6((cli.stat.mode & 0o100n) !== 0n, "SKILLS_COMMAND_NOT_EXECUTABLE");
   return {
     receipt: { path: resolved, version: pkg.version, sha256: cli.sha256, manifestSha256: manifest.sha256 },
     recheck() {
-      need5(Bun.which("skills", { PATH: process.env.PATH }) === normal && realpathSync16(normal) === resolved && realpathSync16(bound) === resolved && realpathSync16(entrypoint) === resolved, "SKILLS_COMMAND_CHANGED");
+      need6(Bun.which("skills", { PATH: process.env.PATH }) === normal && realpathSync16(normal) === resolved && realpathSync16(bound) === resolved && realpathSync16(entrypoint) === resolved, "SKILLS_COMMAND_CHANGED");
       unchanged2(cli);
       unchanged2(manifest);
     }
@@ -111785,19 +112083,19 @@ var init_codex_hook_trust_identity = __esm(() => {
 });
 
 // src/lib/codex-hook-policy-recovery.ts
-import { isDeepStrictEqual as isDeepStrictEqual12 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual13 } from "util";
 function reviewedClaudeDiscoveryChange(beforeText, currentText, options) {
-  need5(typeof options.reason === "string" && options.reason.trim().length > 0 && options.reason.length <= 512 && !/[\x00-\x1f\x7f]/.test(options.reason), "RECONCILE_RECOVERY_REASON_REQUIRED");
-  need5(options.reviewedPlanDigest === undefined || /^[a-f0-9]{64}$/.test(options.reviewedPlanDigest), "RECONCILE_RECOVERY_PLAN_CHANGED");
+  need6(typeof options.reason === "string" && options.reason.trim().length > 0 && options.reason.length <= 512 && !/[\x00-\x1f\x7f]/.test(options.reason), "RECONCILE_RECOVERY_REASON_REQUIRED");
+  need6(options.reviewedPlanDigest === undefined || /^[a-f0-9]{64}$/.test(options.reviewedPlanDigest), "RECONCILE_RECOVERY_PLAN_CHANGED");
   const before2 = parseManagedSkillPolicy(beforeText), current = parseManagedSkillPolicy(currentText);
   const oldDiscovery = before2.bridge?.discovery?.claude, newDiscovery = current.bridge?.discovery?.claude;
-  need5(oldDiscovery?.agent === "claude" && newDiscovery?.agent === "claude" && oldDiscovery.method === "reviewed" && newDiscovery.method === "reviewed", "RECONCILE_POLICY_CHANGED");
-  const changes = ["roots", "sources"].filter((key) => !isDeepStrictEqual12(oldDiscovery[key], newDiscovery[key])).map((key) => ({ path: `bridge.discovery.claude.${key}`, before: oldDiscovery[key], after: newDiscovery[key] }));
-  need5(changes.length > 0, "RECONCILE_POLICY_CHANGED");
+  need6(oldDiscovery?.agent === "claude" && newDiscovery?.agent === "claude" && oldDiscovery.method === "reviewed" && newDiscovery.method === "reviewed", "RECONCILE_POLICY_CHANGED");
+  const changes = ["roots", "sources"].filter((key) => !isDeepStrictEqual13(oldDiscovery[key], newDiscovery[key])).map((key) => ({ path: `bridge.discovery.claude.${key}`, before: oldDiscovery[key], after: newDiscovery[key] }));
+  need6(changes.length > 0, "RECONCILE_POLICY_CHANGED");
   const compared = structuredClone(current);
   compared.bridge.discovery.claude.roots = oldDiscovery.roots;
   compared.bridge.discovery.claude.sources = oldDiscovery.sources;
-  need5(isDeepStrictEqual12(before2, compared), "RECONCILE_POLICY_CHANGED");
+  need6(isDeepStrictEqual13(before2, compared), "RECONCILE_POLICY_CHANGED");
   verifyAgentDiscovery(newDiscovery);
   return { reason: options.reason, changes };
 }
@@ -111809,21 +112107,21 @@ var init_codex_hook_policy_recovery = __esm(() => {
 
 // src/lib/agent-codex-trust.ts
 import { lstatSync as lstatSync31, mkdirSync as mkdirSync27, readdirSync as readdirSync23, readFileSync as readFileSync40, realpathSync as realpathSync17, statSync as statSync21 } from "fs";
-import { createHash as createHash30, randomUUID as randomUUID11 } from "crypto";
+import { createHash as createHash31, randomUUID as randomUUID11 } from "crypto";
 import { execFileSync } from "child_process";
 import { dirname as dirname34, isAbsolute as isAbsolute28, join as join60, resolve as resolve25 } from "path";
 import { homedir as homedir12 } from "os";
-import { isDeepStrictEqual as isDeepStrictEqual13 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual14 } from "util";
 function verifyReleaseArtifact(proof, skillsCli) {
-  need5(isAbsolute28(proof.packageTarPath) && !proof.packageTarPath.includes("\x00"), "RECONCILE_RELEASE_PROVENANCE_PATH");
+  need6(isAbsolute28(proof.packageTarPath) && !proof.packageTarPath.includes("\x00"), "RECONCILE_RELEASE_PROVENANCE_PATH");
   const tarPath = realpathSync17(proof.packageTarPath);
-  need5(statSync21(tarPath).isFile(), "RECONCILE_RELEASE_PROVENANCE_PATH");
+  need6(statSync21(tarPath).isFile(), "RECONCILE_RELEASE_PROVENANCE_PATH");
   const tarBytes = readFileSync40(tarPath);
-  need5(tarBytes.byteLength === proof.packageTarBytes && createHash30("sha256").update(tarBytes).digest("hex") === proof.packageTarSha256, "RECONCILE_RELEASE_ARTIFACT_CHANGED");
+  need6(tarBytes.byteLength === proof.packageTarBytes && createHash31("sha256").update(tarBytes).digest("hex") === proof.packageTarSha256, "RECONCILE_RELEASE_ARTIFACT_CHANGED");
   const packageRoot = dirname34(dirname34(realpathSync17(skillsCli.receipt.path)));
   const manifest = readFileSync40(join60(packageRoot, "package.json"));
-  need5(createHash30("sha256").update(manifest).digest("hex") === skillsCli.receipt.manifestSha256 && skillsCli.receipt.manifestSha256 === proof.manifestSha256, "RECONCILE_RELEASE_MANIFEST_CHANGED");
-  need5(createHash30("sha256").update(readFileSync40(skillsCli.receipt.path)).digest("hex") === proof.executableSha256 && skillsCli.receipt.sha256 === proof.executableSha256, "RECONCILE_RELEASE_EXECUTABLE_CHANGED");
+  need6(createHash31("sha256").update(manifest).digest("hex") === skillsCli.receipt.manifestSha256 && skillsCli.receipt.manifestSha256 === proof.manifestSha256, "RECONCILE_RELEASE_MANIFEST_CHANGED");
+  need6(createHash31("sha256").update(readFileSync40(skillsCli.receipt.path)).digest("hex") === proof.executableSha256 && skillsCli.receipt.sha256 === proof.executableSha256, "RECONCILE_RELEASE_EXECUTABLE_CHANGED");
   const members2 = [["package/package.json", manifest], ["package/bin/index.js", readFileSync40(skillsCli.receipt.path)]];
   for (const [member, expected] of members2) {
     let actual;
@@ -111832,7 +112130,7 @@ function verifyReleaseArtifact(proof, skillsCli) {
     } catch {
       throw new Error("RECONCILE_RELEASE_ARTIFACT_MEMBER_MISSING");
     }
-    need5(Buffer.compare(actual, expected) === 0, "RECONCILE_RELEASE_ARTIFACT_MEMBER_CHANGED");
+    need6(Buffer.compare(actual, expected) === 0, "RECONCILE_RELEASE_ARTIFACT_MEMBER_CHANGED");
   }
 }
 async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc) {
@@ -111840,48 +112138,48 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
   try {
     const home = resolve25(options.home ?? homedir12()), dataDir3 = resolve25(options.dataDir ?? getDataDirReadOnly());
     const parent = resolve25(join60(dataDir3, "native-hook-trust")), journal = resolve25(options.journal);
-    need5(journal.startsWith(parent + "/") && /^[a-f0-9-]{36}$/.test(journal.slice(parent.length + 1)), "RECONCILE_JOURNAL_PATH");
+    need6(journal.startsWith(parent + "/") && /^[a-f0-9-]{36}$/.test(journal.slice(parent.length + 1)), "RECONCILE_JOURNAL_PATH");
     const dir = lstatSync31(journal, { throwIfNoEntry: false });
-    need5(!!dir && dir.isDirectory() && !dir.isSymbolicLink() && dir.uid === process.getuid() && (dir.mode & 511) === 448, "UNSAFE_JOURNAL");
-    need5(!lstatSync31(join60(journal, "receipt.json"), { throwIfNoEntry: false }), "RECONCILE_ALREADY_COMPLETE");
-    need5(lstatSync31(join60(journal, "stopped.json"), { throwIfNoEntry: false })?.isFile(), "RECONCILE_JOURNAL_INCOMPLETE");
+    need6(!!dir && dir.isDirectory() && !dir.isSymbolicLink() && dir.uid === process.getuid() && (dir.mode & 511) === 448, "UNSAFE_JOURNAL");
+    need6(!lstatSync31(join60(journal, "receipt.json"), { throwIfNoEntry: false }), "RECONCILE_ALREADY_COMPLETE");
+    need6(lstatSync31(join60(journal, "stopped.json"), { throwIfNoEntry: false })?.isFile(), "RECONCILE_JOURNAL_INCOMPLETE");
     const stoppedFile = snapshot(join60(journal, "stopped.json"), true);
     const intentFile = snapshot(join60(journal, "intent.json"), true), intent = JSON.parse(intentFile.text);
     const configBefore = snapshot(join60(journal, "config.before.toml"), true), hooksBefore = snapshot(join60(journal, "hooks.before.json"), true), policyBefore = snapshot(join60(journal, "policy.before.json"), true);
     const legacyIntent = intent.home === undefined && intent.configSha256 === undefined && intent.configVersion === undefined && intent.declarations === undefined && intent.admitted === undefined && intent.nativeHooks === undefined;
-    need5(intent.version === 1 && /^[a-f0-9]{64}$/.test(intent.planDigest) && typeof intent.configPath === "string" && /^[a-f0-9]{64}$/.test(intent.policySha256) && /^[a-f0-9]{64}$/.test(intent.hooksSha256) && Array.isArray(intent.hooks) && intent.hooks.length > 0 && intent.hooks.length <= 100 && (legacyIntent || typeof intent.home === "string" && intent.home === home && /^[a-f0-9]{64}$/.test(intent.configSha256) && typeof intent.configVersion === "string" && Array.isArray(intent.declarations) && Array.isArray(intent.admitted) && Array.isArray(intent.nativeHooks)), "RECONCILE_INTENT_INVALID");
+    need6(intent.version === 1 && /^[a-f0-9]{64}$/.test(intent.planDigest) && typeof intent.configPath === "string" && /^[a-f0-9]{64}$/.test(intent.policySha256) && /^[a-f0-9]{64}$/.test(intent.hooksSha256) && Array.isArray(intent.hooks) && intent.hooks.length > 0 && intent.hooks.length <= 100 && (legacyIntent || typeof intent.home === "string" && intent.home === home && /^[a-f0-9]{64}$/.test(intent.configSha256) && typeof intent.configVersion === "string" && Array.isArray(intent.declarations) && Array.isArray(intent.admitted) && Array.isArray(intent.nativeHooks)), "RECONCILE_INTENT_INVALID");
     const declarations = intent.declarations ?? intent.hooks.map((hook) => ({ event: hook.event, key: `${join60(home, ".codex/hooks.json")}${hook.key.slice(hook.key.indexOf(".codex/hooks.json") + ".codex/hooks.json".length)}`, command: hook.command }));
     const admitted = intent.admitted ?? intent.hooks;
     const configSha256 = intent.configSha256 ?? configBefore.sha256, configVersion = intent.configVersion ?? intent.expectedVersion;
     const digestInput = { version: 1, home: intent.home ?? home, configPath: intent.configPath, ...intent.nativeConfigPath !== undefined ? { nativeConfigPath: intent.nativeConfigPath } : {}, configSha256, configVersion, policySha256: intent.policySha256, hooksSha256: intent.hooksSha256, skillsCli: intent.skillsCli, nativeVersion: intent.nativeVersion, declarations, admitted };
-    need5(makePlanDigest(digestInput) === intent.planDigest, "RECONCILE_PLAN_CHANGED");
-    need5(isDeepStrictEqual13(intent.hooks, admitted.filter((hook) => !hook.enabled || hook.trustStatus !== "trusted")), "RECONCILE_INTENT_HOOKS_CHANGED");
-    need5(configBefore.sha256 === (intent.beforeSha256 ?? intent.configSha256) && hooksBefore.sha256 === intent.hooksSha256 && policyBefore.sha256 === intent.policySha256, "RECONCILE_JOURNAL_CHANGED");
+    need6(makePlanDigest(digestInput) === intent.planDigest, "RECONCILE_PLAN_CHANGED");
+    need6(isDeepStrictEqual14(intent.hooks, admitted.filter((hook) => !hook.enabled || hook.trustStatus !== "trusted")), "RECONCILE_INTENT_HOOKS_CHANGED");
+    need6(configBefore.sha256 === (intent.beforeSha256 ?? intent.configSha256) && hooksBefore.sha256 === intent.hooksSha256 && policyBefore.sha256 === intent.policySha256, "RECONCILE_JOURNAL_CHANGED");
     const policyCurrent = snapshot(join60(dataDir3, "agent-policy.json"), true);
     const { claudeDiscoveryRecovery: claudeRecovery, nativeHookAdditionsRecovery: additionsRecovery } = options;
     const recovery = claudeRecovery ?? additionsRecovery;
-    need5(!recovery || !options.supersedeBinding, "RECONCILE_RECOVERY_MODE_CONFLICT");
-    need5(!claudeRecovery || !additionsRecovery || claudeRecovery.reviewedPlanDigest === additionsRecovery.reviewedPlanDigest, "RECONCILE_RECOVERY_MODE_CONFLICT");
-    need5(recovery?.reviewedPlanDigest === undefined || /^[a-f0-9]{64}$/.test(recovery.reviewedPlanDigest), "RECONCILE_RECOVERY_PLAN_CHANGED");
+    need6(!recovery || !options.supersedeBinding, "RECONCILE_RECOVERY_MODE_CONFLICT");
+    need6(!claudeRecovery || !additionsRecovery || claudeRecovery.reviewedPlanDigest === additionsRecovery.reviewedPlanDigest, "RECONCILE_RECOVERY_MODE_CONFLICT");
+    need6(recovery?.reviewedPlanDigest === undefined || /^[a-f0-9]{64}$/.test(recovery.reviewedPlanDigest), "RECONCILE_RECOVERY_PLAN_CHANGED");
     const policyChange = claudeRecovery ? reviewedClaudeDiscoveryChange(policyBefore.text, policyCurrent.text, claudeRecovery) : undefined;
     let supersededBinding = false;
     if (policyCurrent.sha256 !== policyBefore.sha256 && !claudeRecovery) {
-      need5(options.supersedeBinding === true, "RECONCILE_POLICY_CHANGED");
+      need6(options.supersedeBinding === true, "RECONCILE_POLICY_CHANGED");
       const oldPolicy = JSON.parse(policyBefore.text), currentPolicy = JSON.parse(policyCurrent.text);
-      need5(isDeepStrictEqual13(withoutCodexCommand(oldPolicy), withoutCodexCommand(currentPolicy)), "RECONCILE_POLICY_CHANGED");
+      need6(isDeepStrictEqual14(withoutCodexCommand(oldPolicy), withoutCodexCommand(currentPolicy)), "RECONCILE_POLICY_CHANGED");
       supersededBinding = true;
     }
     if (supersededBinding || recovery) {
-      need5(Array.isArray(intent.nativeHooks) && intent.nativeHooks.length > 0, "RECONCILE_NATIVE_INVENTORY_REQUIRED");
+      need6(Array.isArray(intent.nativeHooks) && intent.nativeHooks.length > 0, "RECONCILE_NATIVE_INVENTORY_REQUIRED");
       const proof = options.releaseProof;
-      need5(!!proof && isAbsolute28(proof.packageTarPath) && /^[a-f0-9]{64}$/.test(proof.packageTarSha256) && Number.isInteger(proof.packageTarBytes) && proof.packageTarBytes > 0 && /^[a-f0-9]{64}$/.test(proof.manifestSha256) && /^[a-f0-9]{64}$/.test(proof.executableSha256), "RECONCILE_RELEASE_PROVENANCE_REQUIRED");
+      need6(!!proof && isAbsolute28(proof.packageTarPath) && /^[a-f0-9]{64}$/.test(proof.packageTarSha256) && Number.isInteger(proof.packageTarBytes) && proof.packageTarBytes > 0 && /^[a-f0-9]{64}$/.test(proof.manifestSha256) && /^[a-f0-9]{64}$/.test(proof.executableSha256), "RECONCILE_RELEASE_PROVENANCE_REQUIRED");
     }
     const currentConfig = snapshot(intent.configPath, true);
     const policy = parseManagedSkillPolicy(policyCurrent.text), binding = policy.bridge;
     const alias = binding.rootAliases?.find((item) => item.agent === "codex"), physicalRoot = alias?.target ?? join60(home, ".codex"), hooksPath = join60(physicalRoot, "hooks.json");
-    need5(resolve25(intent.configPath) === resolve25(join60(physicalRoot, "config.toml")), "RECONCILE_CONFIG_PATH_CHANGED");
+    need6(resolve25(intent.configPath) === resolve25(join60(physicalRoot, "config.toml")), "RECONCILE_CONFIG_PATH_CHANGED");
     const nativeConfigPath = intent.nativeConfigPath ?? intent.configPath;
-    need5([join60(home, ".codex/config.toml"), join60(physicalRoot, "config.toml")].includes(nativeConfigPath), "RECONCILE_NATIVE_CONFIG_PATH_CHANGED");
+    need6([join60(home, ".codex/config.toml"), join60(physicalRoot, "config.toml")].includes(nativeConfigPath), "RECONCILE_NATIVE_CONFIG_PATH_CHANGED");
     const codexHome = nativeConfigPath !== intent.configPath ? undefined : dirname34(nativeConfigPath);
     const hooksCurrent = snapshot(hooksPath);
     const additions = additionsRecovery ? reviewNativeHookAdditions({ path: additionsRecovery.path, intent: intentFile, policy: policyCurrent, configBefore, configCurrent: currentConfig, hooksBefore, hooksCurrent, nativeHooksPath: join60(dirname34(nativeConfigPath), "hooks.json"), journalHooks: intent.hooks, recordedNativeHooks: intent.nativeHooks }) : undefined;
@@ -111889,7 +112187,7 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
     const managedKeys = managedHooks.map((h) => h.key);
     const witnessSame = codexTrustReconcileWitness(configBefore.text, managedKeys) === codexTrustReconcileWitness(currentConfig.text, managedKeys);
     const unmanagedSame = codexTrustUnmanagedSemantic(configBefore.text, managedKeys) === codexTrustUnmanagedSemantic(currentConfig.text, managedKeys);
-    need5(unmanagedSame && (witnessSame || supersededBinding), "RECONCILE_UNRELATED_CONFIG_CHANGED");
+    need6(unmanagedSame && (witnessSame || supersededBinding), "RECONCILE_UNRELATED_CONFIG_CHANGED");
     const before2 = structure3(configBefore.text), current = structure3(currentConfig.text), expectedConfig = structuredClone(before2);
     expectedConfig.hooks ??= {};
     expectedConfig.hooks.state ??= {};
@@ -111901,10 +112199,10 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
     if (supersededBinding) {
       for (const hook of intent.hooks) {
         const state = current.hooks?.state?.[hook.key];
-        need5(state?.enabled === true && typeof state.trusted_hash === "string" && /^sha256:[a-f0-9]{64}$/.test(state.trusted_hash), "RECONCILE_CONFIG_DRIFT");
+        need6(state?.enabled === true && typeof state.trusted_hash === "string" && /^sha256:[a-f0-9]{64}$/.test(state.trusted_hash), "RECONCILE_CONFIG_DRIFT");
       }
     } else
-      need5(isDeepStrictEqual13(expectedConfig, current), "RECONCILE_CONFIG_DRIFT");
+      need6(isDeepStrictEqual14(expectedConfig, current), "RECONCILE_CONFIG_DRIFT");
     const configDiscoveryRecovery = recovery && binding.discovery?.codex ? createCodexHookDiscoveryRecovery(binding.discovery.codex, configBefore, currentConfig, intent.hooks, additions?.trustProof) : undefined;
     assertManagedAgentBridge("codex", { home, dataDir: dataDir3, projectDir: home, codexDiscoveryRecovery: configDiscoveryRecovery });
     const recoveryCli = recovery ? bindSkillsCli("skills", options.reviewedSkillsCli) : undefined;
@@ -111913,29 +112211,29 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
     const skillsCli = recovery ? inspectRecordedSkillsCli(binding.commands.codex, intent.skillsCli) : bindSkillsCli(binding.commands.codex, options.reviewedSkillsCli);
     if (supersededBinding)
       verifyReleaseArtifact(options.releaseProof, skillsCli);
-    const skillsBindingChanged = !isDeepStrictEqual13(skillsCli.receipt, intent.skillsCli);
-    need5(!skillsBindingChanged || supersededBinding, "RECONCILE_SKILLS_BINDING_CHANGED");
+    const skillsBindingChanged = !isDeepStrictEqual14(skillsCli.receipt, intent.skillsCli);
+    need6(!skillsBindingChanged || supersededBinding, "RECONCILE_SKILLS_BINDING_CHANGED");
     if (!additions && hooksCurrent.sha256 !== intent.hooksSha256 && hooksCurrent.sha256 !== hooksBefore.sha256) {
-      need5(supersededBinding, "RECONCILE_HOOKS_CHANGED");
+      need6(supersededBinding, "RECONCILE_HOOKS_CHANGED");
       const currentDeclarations = JSON.parse(hooksCurrent.text).hooks;
       for (const [event, [nativeEvent]] of Object.entries(eventNames)) {
         const command = renderAgentHookCommand(binding.commands.codex, "codex", binding.profiles.codex, event);
-        need5(isDeepStrictEqual13(currentDeclarations?.[event], [{ hooks: [{ type: "command", command, timeout: 15 }] }]), "RECONCILE_BINDING_HOOK_CHANGED");
+        need6(isDeepStrictEqual14(currentDeclarations?.[event], [{ hooks: [{ type: "command", command, timeout: 15 }] }]), "RECONCILE_BINDING_HOOK_CHANGED");
       }
     }
     rpc = await connect({ command: options.codexCommand ?? "codex", home, codexHome });
-    need5(rpc.version === intent.nativeVersion, "RECONCILE_NATIVE_VERSION_CHANGED");
+    need6(rpc.version === intent.nativeVersion, "RECONCILE_NATIVE_VERSION_CHANGED");
     const discovered = await rpc.request("hooks/list", { cwds: [home] });
-    need5(Array.isArray(discovered?.data) && discovered.data.length === 1 && discovered.data[0].cwd === home && !discovered.data[0].errors?.length && !discovered.data[0].warnings?.length, "RECONCILE_NATIVE_DISCOVERY_REFUSED");
+    need6(Array.isArray(discovered?.data) && discovered.data.length === 1 && discovered.data[0].cwd === home && !discovered.data[0].errors?.length && !discovered.data[0].warnings?.length, "RECONCILE_NATIVE_DISCOVERY_REFUSED");
     const nativeHooks = discovered.data[0].hooks;
     const recordedNativeHooks = intent.nativeHooks;
     if (recordedNativeHooks)
-      need5(nativeHooks.length === recordedNativeHooks.length + (additions?.hooks.length ?? 0), "RECONCILE_NATIVE_HOOK_LIST_CHANGED");
+      need6(nativeHooks.length === recordedNativeHooks.length + (additions?.hooks.length ?? 0), "RECONCILE_NATIVE_HOOK_LIST_CHANGED");
     const plannedKeys = new Set(intent.hooks.map((hook) => hook.key));
     let nativeTrustPending = false;
     for (const expected of [...recordedNativeHooks ?? [], ...additions?.hooks ?? []]) {
       const matches2 = nativeHooks.filter((hook) => hook.key === expected.key);
-      need5(matches2.length === 1, "RECONCILE_NATIVE_HOOK_LIST_CHANGED");
+      need6(matches2.length === 1, "RECONCILE_NATIVE_HOOK_LIST_CHANGED");
       const actual = safeNativeHook(matches2[0]);
       const stable = (hook) => {
         const { enabled, trustStatus, ...identity5 } = hook;
@@ -111943,35 +112241,35 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
           delete identity5.command;
         return identity5;
       };
-      need5(isDeepStrictEqual13(stable(actual), stable(expected)), "RECONCILE_NATIVE_IDENTITY_CHANGED");
+      need6(isDeepStrictEqual14(stable(actual), stable(expected)), "RECONCILE_NATIVE_IDENTITY_CHANGED");
       if (!plannedKeys.has(expected.key))
-        need5(isDeepStrictEqual13(actual, expected), "RECONCILE_UNRELATED_HOOK_CHANGED");
+        need6(isDeepStrictEqual14(actual, expected), "RECONCILE_UNRELATED_HOOK_CHANGED");
     }
     for (const wanted of intent.hooks) {
       const matches2 = nativeHooks.filter((h2) => h2.key === wanted.key || h2.key === wanted.key.replace(join60(home, ".codex/hooks.json"), hooksPath));
-      need5(matches2.length === 1, "RECONCILE_NATIVE_IDENTITY_CHANGED");
+      need6(matches2.length === 1, "RECONCILE_NATIVE_IDENTITY_CHANGED");
       const h = matches2[0];
       const trusted = h.trustStatus === "trusted";
-      need5(h.enabled === true && (trusted || supersededBinding && h.trustStatus === "modified") && (h.currentHash === wanted.currentHash || supersededBinding && /^sha256:[a-f0-9]{64}$/.test(h.currentHash)), "RECONCILE_NATIVE_STATE_INCOMPLETE");
+      need6(h.enabled === true && (trusted || supersededBinding && h.trustStatus === "modified") && (h.currentHash === wanted.currentHash || supersededBinding && /^sha256:[a-f0-9]{64}$/.test(h.currentHash)), "RECONCILE_NATIVE_STATE_INCOMPLETE");
       if (!trusted)
         nativeTrustPending = true;
       if (supersededBinding) {
         const nativeToCliEvent = { userPromptSubmit: "UserPromptSubmit", sessionStart: "SessionStart", subagentStart: "SubagentStart" };
-        need5(h.command === renderAgentHookCommand(binding.commands.codex, "codex", binding.profiles.codex, nativeToCliEvent[wanted.event] ?? ""), "RECONCILE_BINDING_HOOK_CHANGED");
+        need6(h.command === renderAgentHookCommand(binding.commands.codex, "codex", binding.profiles.codex, nativeToCliEvent[wanted.event] ?? ""), "RECONCILE_BINDING_HOOK_CHANGED");
       }
     }
     const config2 = await rpc.request("config/read", { includeLayers: true, cwd: home });
     const layers = config2?.layers?.filter((layer) => layer.name?.type === "user" && layer.name.file === nativeConfigPath && !layer.name.profile);
-    need5(layers?.length === 1 && !layers[0].disabledReason && codexNativeConfigEqual(layers[0].config, current), "RECONCILE_NATIVE_CONFIG_MISMATCH");
+    need6(layers?.length === 1 && !layers[0].disabledReason && codexNativeConfigEqual(layers[0].config, current), "RECONCILE_NATIVE_CONFIG_MISMATCH");
     const finalDiscovery = await rpc.request("hooks/list", { cwds: [home] });
-    need5(Array.isArray(finalDiscovery?.data) && finalDiscovery.data.length === 1 && finalDiscovery.data[0].cwd === home && !finalDiscovery.data[0].errors?.length && !finalDiscovery.data[0].warnings?.length && (!recordedNativeHooks || isDeepStrictEqual13(finalDiscovery.data[0].hooks.map(safeNativeHook), nativeHooks.map(safeNativeHook))), "RECONCILE_NATIVE_STATE_CHANGED");
+    need6(Array.isArray(finalDiscovery?.data) && finalDiscovery.data.length === 1 && finalDiscovery.data[0].cwd === home && !finalDiscovery.data[0].errors?.length && !finalDiscovery.data[0].warnings?.length && (!recordedNativeHooks || isDeepStrictEqual14(finalDiscovery.data[0].hooks.map(safeNativeHook), nativeHooks.map(safeNativeHook))), "RECONCILE_NATIVE_STATE_CHANGED");
     const finalConfig = await rpc.request("config/read", { includeLayers: true, cwd: home });
     const finalLayers = finalConfig?.layers?.filter((layer) => layer.name?.type === "user" && layer.name.file === nativeConfigPath && !layer.name.profile);
-    need5(finalLayers?.length === 1 && !finalLayers[0].disabledReason && codexNativeConfigEqual(finalLayers[0].config, current), "RECONCILE_NATIVE_CONFIG_CHANGED");
+    need6(finalLayers?.length === 1 && !finalLayers[0].disabledReason && codexNativeConfigEqual(finalLayers[0].config, current), "RECONCILE_NATIVE_CONFIG_CHANGED");
     if (recovery) {
       for (const response of [config2, finalConfig]) {
         const layerIndex = response.layers.findIndex((layer) => layer.name?.type === "user" && layer.name.file === nativeConfigPath && !layer.name.profile);
-        need5(response.config && response.config.features?.hooks !== false && response.layers.slice(0, layerIndex).every((layer) => layer.config?.hooks === undefined && layer.config?.features?.hooks === undefined), "RECONCILE_NATIVE_CONFIG_OVERRIDDEN");
+        need6(response.config && response.config.features?.hooks !== false && response.layers.slice(0, layerIndex).every((layer) => layer.config?.hooks === undefined && layer.config?.features?.hooks === undefined), "RECONCILE_NATIVE_CONFIG_OVERRIDDEN");
       }
       recoveryCli.recheck();
       verifyReleaseArtifact(options.releaseProof, recoveryCli);
@@ -111992,7 +112290,7 @@ async function reconcileCodexNativeHooks(options, connect = connectCodexHookRpc)
     const recoveryPlan = recovery ? { version: 1, kind: additions ? claudeRecovery ? "claude-discovery-and-native-hook-additions" : "native-hook-additions" : "claude-discovery-only", journal, journalIntentSha256: intentFile.sha256, stoppedSha256: stoppedFile.sha256, originalPlanDigest: intent.planDigest, policyBeforeSha256: policyBefore.sha256, policyCurrentSha256: policyCurrent.sha256, configBeforeSha256: configBefore.sha256, configCurrentSha256: currentConfig.sha256, ...configDiscoveryRecovery ? { configDiscoveryRecovery } : {}, ...additions ? { nativeHookAdditions: additions.receipt } : {}, hooksSha256: hooksCurrent.sha256, nativeConfigPath, nativeVersion: rpc.version, nativeInventorySha256: makePlanDigest(nativeHooks.map(safeNativeHook)), recordedNativeInventorySha256: makePlanDigest(recordedNativeHooks), boundSkillsCli: skillsCli.receipt, recoveryCli: recoveryCli.receipt, releaseProof: options.releaseProof, ...policyChange } : undefined;
     const recoveryPlanDigest = recoveryPlan ? makePlanDigest(recoveryPlan) : undefined;
     if (recovery?.reviewedPlanDigest !== undefined)
-      need5(recovery.reviewedPlanDigest === recoveryPlanDigest, "RECONCILE_RECOVERY_PLAN_CHANGED");
+      need6(recovery.reviewedPlanDigest === recoveryPlanDigest, "RECONCILE_RECOVERY_PLAN_CHANGED");
     const preview2 = !!recovery && recovery.reviewedPlanDigest === undefined;
     const receipt = { version: 1, status: preview2 ? "recovery-review-required" : supersededBinding ? "superseded" : "reconciled", reconciled: !preview2, supersededBinding, automaticRollback: false, journal, planDigest: intent.planDigest, nativeVersion: rpc.version, nativeStateVerified: !nativeTrustPending, nativeTrustPending, bindingRefreshRequired: !!configDiscoveryRecovery, nativeExecutionVerified: false, configSha256: currentConfig.sha256, hooksSha256: hooksCurrent.sha256, policySha256: policyBefore.sha256, policyBeforeSha256: policyBefore.sha256, policyCurrentSha256: policyCurrent.sha256, previousSkillsCli: intent.skillsCli, skillsCli: skillsCli.receipt, releaseProof: options.releaseProof, nativeInventoryScope: recordedNativeHooks ? "complete" : "declared-managed-hooks-only", unrelatedNativeHooksPreserved: !!recordedNativeHooks, unrelatedSettingsAndCommentsPreserved: true, ...recoveryPlan ? { recoveryPlan, recoveryPlanDigest } : {} };
     if (preview2)
@@ -112015,7 +112313,7 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
     const binding = policy.bridge, alias = binding.rootAliases?.find((item) => item.agent === "codex");
     const skillsCli = bindSkillsCli(binding.commands.codex, options.reviewedSkillsCli);
     const physicalRoot = alias?.target ?? join60(home, ".codex"), hooksPath = join60(physicalRoot, "hooks.json"), configPath = join60(physicalRoot, "config.toml");
-    need5(options.codexHome === undefined || isAbsolute28(options.codexHome) && [join60(home, ".codex"), physicalRoot].includes(options.codexHome), "NATIVE_HOME_NOT_ADMITTED");
+    need6(options.codexHome === undefined || isAbsolute28(options.codexHome) && [join60(home, ".codex"), physicalRoot].includes(options.codexHome), "NATIVE_HOME_NOT_ADMITTED");
     const codexHome = options.codexHome === undefined ? undefined : physicalRoot;
     const nativeConfigPath = join60(codexHome ?? join60(home, ".codex"), "config.toml");
     const hooksFile = snapshot(hooksPath), configFile = snapshot(configPath, true), original = structure3(configFile.text);
@@ -112023,38 +112321,38 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
     for (const [event, [nativeEvent, label]] of Object.entries(eventNames)) {
       const command = renderAgentHookCommand(binding.commands.codex, "codex", binding.profiles.codex, event);
       const groups = declarations[event];
-      need5(Array.isArray(groups), "DECLARATION_CHANGED");
+      need6(Array.isArray(groups), "DECLARATION_CHANGED");
       const matches2 = groups.flatMap((group, gi) => (group.hooks ?? []).flatMap((entry, hi) => entry.command === command ? [{ group, entry, gi, hi }] : []));
-      need5(matches2.length === 1 && isDeepStrictEqual13(matches2[0].group, { hooks: [{ type: "command", command, timeout: 15 }] }), "DECLARATION_CHANGED");
+      need6(matches2.length === 1 && isDeepStrictEqual14(matches2[0].group, { hooks: [{ type: "command", command, timeout: 15 }] }), "DECLARATION_CHANGED");
       expected.push({ event: nativeEvent, key: `${join60(home, ".codex/hooks.json")}:${label}:${matches2[0].gi}:${matches2[0].hi}`, command });
     }
     codexTrustTextWitness(configFile.text, expected.map((h) => h.key));
     rpc = await connect({ command: options.codexCommand ?? "codex", home, codexHome });
-    need5(SUPPORTED_CODEX_HOOK_VERSIONS.includes(rpc.version), "NATIVE_UNSUPPORTED_VERSION");
+    need6(SUPPORTED_CODEX_HOOK_VERSIONS.includes(rpc.version), "NATIVE_UNSUPPORTED_VERSION");
     const list2 = async () => {
       const response = await rpc.request("hooks/list", { cwds: [home] });
       const nativeRoots = [...new Set([physicalRoot, join60(home, ".codex")])];
       const coexistenceWarnings = nativeRoots.flatMap((hooksRoot) => nativeRoots.map((configRoot) => `loading hooks from both ${join60(hooksRoot, "hooks.json")} and ${join60(configRoot, "config.toml")}; prefer a single representation for this layer`));
       const entry = response?.data?.[0];
-      need5(Array.isArray(response?.data) && response.data.length === 1 && entry.cwd === home && Array.isArray(entry.hooks) && entry.hooks.length <= 1e4 && Array.isArray(entry.errors) && entry.errors.length === 0 && Array.isArray(entry.warnings) && entry.warnings.length <= 1 && entry.warnings.every((warning) => typeof warning === "string" && coexistenceWarnings.includes(warning)), "NATIVE_DISCOVERY_REFUSED");
+      need6(Array.isArray(response?.data) && response.data.length === 1 && entry.cwd === home && Array.isArray(entry.hooks) && entry.hooks.length <= 1e4 && Array.isArray(entry.errors) && entry.errors.length === 0 && Array.isArray(entry.warnings) && entry.warnings.length <= 1 && entry.warnings.every((warning) => typeof warning === "string" && coexistenceWarnings.includes(warning)), "NATIVE_DISCOVERY_REFUSED");
       return response.data[0].hooks;
     };
     const admit = (hooks) => expected.map((wanted) => {
       const canonicalKey = wanted.key.replace(join60(home, ".codex/hooks.json"), hooksPath);
       const matches2 = hooks.filter((h2) => h2.key === wanted.key || h2.key === canonicalKey);
-      need5(matches2.length === 1, "AMBIGUOUS_IDENTITY");
+      need6(matches2.length === 1, "AMBIGUOUS_IDENTITY");
       const h = matches2[0];
-      need5(h.eventName === wanted.event && h.handlerType === "command" && h.command === wanted.command && h.matcher === null && h.timeoutSec === 15 && h.async === false && h.statusMessage === null && h.additionalContextLimit === null && [hooksPath, join60(home, ".codex/hooks.json")].includes(h.sourcePath) && h.source === "user" && h.pluginId === null && h.isManaged === false && /^sha256:[a-f0-9]{64}$/.test(h.currentHash) && typeof h.enabled === "boolean", "NATIVE_IDENTITY_CHANGED");
-      need5(hooks.filter((other) => other.command === wanted.command).length === 1, "AMBIGUOUS_IDENTITY");
-      need5(["trusted", "untrusted", "modified"].includes(h.trustStatus), "UNKNOWN_TRUST_STATUS");
+      need6(h.eventName === wanted.event && h.handlerType === "command" && h.command === wanted.command && h.matcher === null && h.timeoutSec === 15 && h.async === false && h.statusMessage === null && h.additionalContextLimit === null && [hooksPath, join60(home, ".codex/hooks.json")].includes(h.sourcePath) && h.source === "user" && h.pluginId === null && h.isManaged === false && /^sha256:[a-f0-9]{64}$/.test(h.currentHash) && typeof h.enabled === "boolean", "NATIVE_IDENTITY_CHANGED");
+      need6(hooks.filter((other) => other.command === wanted.command).length === 1, "AMBIGUOUS_IDENTITY");
+      need6(["trusted", "untrusted", "modified"].includes(h.trustStatus), "UNKNOWN_TRUST_STATUS");
       return { key: h.key, event: wanted.event, command: wanted.command, handlerType: h.handlerType, timeoutSec: h.timeoutSec, sourcePath: h.sourcePath, currentHash: h.currentHash, enabled: h.enabled, trustStatus: h.trustStatus };
     });
     const discovered = await list2(), admitted = admit(discovered);
     const config2 = await rpc.request("config/read", { includeLayers: true, cwd: home });
     const layers = config2?.layers?.filter((layer) => layer.name?.type === "user" && layer.name.file === nativeConfigPath && !layer.name.profile);
-    need5(layers?.length === 1 && /^sha256:[a-f0-9]{64}$/.test(layers[0].version) && !layers[0].disabledReason && codexNativeConfigEqual(layers[0].config, original), "NATIVE_CONFIG_MISMATCH");
-    need5(config2.config && config2.config.features?.hooks !== false, "NATIVE_HOOKS_DISABLED");
-    need5(config2.layers.slice(0, config2.layers.indexOf(layers[0])).every((layer) => layer.config?.hooks === undefined && layer.config?.features?.hooks === undefined), "NATIVE_CONFIG_OVERRIDDEN");
+    need6(layers?.length === 1 && /^sha256:[a-f0-9]{64}$/.test(layers[0].version) && !layers[0].disabledReason && codexNativeConfigEqual(layers[0].config, original), "NATIVE_CONFIG_MISMATCH");
+    need6(config2.config && config2.config.features?.hooks !== false, "NATIVE_HOOKS_DISABLED");
+    need6(config2.layers.slice(0, config2.layers.indexOf(layers[0])).every((layer) => layer.config?.hooks === undefined && layer.config?.features?.hooks === undefined), "NATIVE_CONFIG_OVERRIDDEN");
     const keys3 = admitted.map((h) => h.key), planned = admitted.filter((h) => !h.enabled || h.trustStatus !== "trusted");
     const preservationText = codexTrustTextWitness(configFile.text, keys3);
     const checkInputs = () => {
@@ -112069,16 +112367,16 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
     const planDigest = makePlanDigest(digestInput);
     const baseReceipt = { planDigest, skillsCli: skillsCli.receipt, nativeVersion: rpc.version, nativeConfigPath, ownedNativeProcessId: rpc.processId, agent: "codex", applied: false, planned, nativeEligible: planned.length === 0, bindingRefreshRequired: false, transport: "owned-stdio-process", existingSessionsReloaded: false, nativeExecutionVerified: false };
     if (options.apply)
-      need5(options.reviewedPlanDigest === planDigest, "PLAN_CHANGED: run the dry-run again and pass its reviewed --plan-digest with --apply");
+      need6(options.reviewedPlanDigest === planDigest, "PLAN_CHANGED: run the dry-run again and pass its reviewed --plan-digest with --apply");
     const parent = join60(dataDir3, "native-hook-trust");
     const st = lstatSync31(parent, { throwIfNoEntry: false });
     if (st) {
-      need5(st.isDirectory() && !st.isSymbolicLink() && st.uid === process.getuid() && (st.mode & 511) === 448, "UNSAFE_JOURNAL");
+      need6(st.isDirectory() && !st.isSymbolicLink() && st.uid === process.getuid() && (st.mode & 511) === 448, "UNSAFE_JOURNAL");
       const priorJournals = readdirSync23(parent);
-      need5(priorJournals.length < 1000, "JOURNAL_BOUND");
+      need6(priorJournals.length < 1000, "JOURNAL_BOUND");
       for (const name of priorJournals) {
-        need5(/^[a-f0-9-]{36}$/.test(name), "UNSAFE_JOURNAL");
-        need5(lstatSync31(join60(parent, name, "receipt.json"), { throwIfNoEntry: false })?.isFile(), "RECONCILE_REQUIRED: inspect the incomplete private journal before applying again");
+        need6(/^[a-f0-9-]{36}$/.test(name), "UNSAFE_JOURNAL");
+        need6(lstatSync31(join60(parent, name, "receipt.json"), { throwIfNoEntry: false })?.isFile(), "RECONCILE_REQUIRED: inspect the incomplete private journal before applying again");
       }
     }
     if (!options.apply || !planned.length)
@@ -112091,7 +112389,7 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
     save(join60(journal, "hooks.before.json"), hooksFile.bytes);
     save(join60(journal, "policy.before.json"), policyFile.bytes);
     save(join60(journal, "intent.json"), json2({ ...digestInput, planDigest, hooks: planned, nativeHooks: discovered.map(safeNativeHook) }));
-    need5(isDeepStrictEqual13(admit(await list2()), admitted), "NATIVE_DISCOVERY_CHANGED");
+    need6(isDeepStrictEqual14(admit(await list2()), admitted), "NATIVE_DISCOVERY_CHANGED");
     checkInputs();
     let result2;
     try {
@@ -112099,22 +112397,22 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
     } catch {
       throw new Error("CODEX_HOOK_TRUST_NATIVE_WRITE_FAILED: reconcile the private journal before retrying");
     }
-    need5(result2?.status === "ok" && result2.filePath === configPath && /^sha256:[a-f0-9]{64}$/.test(result2.version), "NATIVE_WRITE_OVERRIDDEN");
+    need6(result2?.status === "ok" && result2.filePath === configPath && /^sha256:[a-f0-9]{64}$/.test(result2.version), "NATIVE_WRITE_OVERRIDDEN");
     const after2 = snapshot(configPath, true), expectedConfig = structuredClone(original);
     expectedConfig.hooks ??= {};
     expectedConfig.hooks.state ??= {};
     for (const h of planned)
       expectedConfig.hooks.state[h.key] = { ...expectedConfig.hooks.state[h.key], enabled: true, trusted_hash: h.currentHash };
-    need5(isDeepStrictEqual13(structure3(after2.text), expectedConfig) && codexTrustTextWitness(after2.text, keys3) === preservationText, "PRESERVATION_FAILED");
+    need6(isDeepStrictEqual14(structure3(after2.text), expectedConfig) && codexTrustTextWitness(after2.text, keys3) === preservationText, "PRESERVATION_FAILED");
     const savedConfig = snapshot(join60(journal, "config.before.toml"), true);
-    need5(savedConfig.sha256 === configFile.sha256, "JOURNAL_CHANGED");
+    need6(savedConfig.sha256 === configFile.sha256, "JOURNAL_CHANGED");
     const discoveryTransition = binding.discovery?.codex ? createCodexHookDiscoveryRecovery(binding.discovery.codex, savedConfig, after2, planned) : undefined;
     unchanged2(policyFile);
     unchanged2(hooksFile);
     assertManagedAgentBridge("codex", { home, dataDir: dataDir3, projectDir: home, codexDiscoveryRecovery: discoveryTransition });
     const current = await list2(), confirmed = admit(current);
-    need5(confirmed.every((h) => h.enabled && h.trustStatus === "trusted") && isDeepStrictEqual13(confirmed.map((h) => [h.key, h.currentHash]), admitted.map((h) => [h.key, h.currentHash])), "NATIVE_NOT_ELIGIBLE");
-    need5(isDeepStrictEqual13(current.filter((h) => !keys3.includes(h.key)), discovered.filter((h) => !keys3.includes(h.key))), "UNRELATED_HOOK_CHANGED");
+    need6(confirmed.every((h) => h.enabled && h.trustStatus === "trusted") && isDeepStrictEqual14(confirmed.map((h) => [h.key, h.currentHash]), admitted.map((h) => [h.key, h.currentHash])), "NATIVE_NOT_ELIGIBLE");
+    need6(isDeepStrictEqual14(current.filter((h) => !keys3.includes(h.key)), discovered.filter((h) => !keys3.includes(h.key))), "UNRELATED_HOOK_CHANGED");
     unchanged2(after2);
     unchanged2(savedConfig);
     unchanged2(hooksFile);
@@ -112137,7 +112435,7 @@ async function enrollCodexNativeHooks(options = {}, connect = connectCodexHookRp
   }
 }
 var json2 = (value) => JSON.stringify(value, null, 2) + `
-`, structure3 = (text4) => JSON.parse(JSON.stringify(Bun.TOML.parse(text4))), eventNames, makePlanDigest = (value) => createHash30("sha256").update(json2(value)).digest("hex"), safeNativeHook = (hook) => ({ key: hook.key, eventName: hook.eventName, handlerType: hook.handlerType, command: hook.command, matcher: hook.matcher, timeoutSec: hook.timeoutSec, async: hook.async, statusMessage: hook.statusMessage, additionalContextLimit: hook.additionalContextLimit, sourcePath: hook.sourcePath, source: hook.source, pluginId: hook.pluginId, isManaged: hook.isManaged, currentHash: hook.currentHash, enabled: hook.enabled, trustStatus: hook.trustStatus }), withoutCodexCommand = (value) => {
+`, structure3 = (text4) => JSON.parse(JSON.stringify(Bun.TOML.parse(text4))), eventNames, makePlanDigest = (value) => createHash31("sha256").update(json2(value)).digest("hex"), safeNativeHook = (hook) => ({ key: hook.key, eventName: hook.eventName, handlerType: hook.handlerType, command: hook.command, matcher: hook.matcher, timeoutSec: hook.timeoutSec, async: hook.async, statusMessage: hook.statusMessage, additionalContextLimit: hook.additionalContextLimit, sourcePath: hook.sourcePath, source: hook.source, pluginId: hook.pluginId, isManaged: hook.isManaged, currentHash: hook.currentHash, enabled: hook.enabled, trustStatus: hook.trustStatus }), withoutCodexCommand = (value) => {
   const copy = structuredClone(value);
   if (copy?.bridge?.commands && Object.hasOwn(copy.bridge.commands, "codex"))
     copy.bridge.commands.codex = "<reviewed-codex-binding>";
@@ -112277,7 +112575,7 @@ __export(exports_agent_integration, {
   registerAgentIntegration: () => registerAgentIntegration
 });
 import { existsSync as existsSync35, lstatSync as lstatSync32, readFileSync as readFileSync41, writeFileSync as writeFileSync26 } from "fs";
-import { createHash as createHash31 } from "crypto";
+import { createHash as createHash32 } from "crypto";
 import { homedir as homedir13 } from "os";
 import { isAbsolute as isAbsolute29 } from "path";
 function pinnedHookProfile(input3, configuredProfile) {
@@ -112375,7 +112673,7 @@ function registerAgentIntegration(parent) {
         skillCount: catalog.skills.length,
         output: options.output,
         bytes: Buffer.byteLength(bytes),
-        sha256: createHash31("sha256").update(bytes).digest("hex")
+        sha256: createHash32("sha256").update(bytes).digest("hex")
       };
       await writeCliOutput(options.json ? JSON.stringify(receipt) : `Captured ${receipt.skillCount} native Codex skill(s) in ${receipt.output}.`);
     } catch (error61) {
@@ -112384,10 +112682,10 @@ function registerAgentIntegration(parent) {
       process.exitCode = 1;
     }
   });
-  hook.command("witness").requiredOption("--kind <kind>", "claude-settings-v3, claude-settings-v2, codex-settings-v1 or claude-marketplace-registry-v2").requiredOption("--path <path>", "Canonical absolute path to the reviewed settings or registry file").option("--json", "Output the discovery witness as JSON", false).description("Capture an explicit versioned review witness without installing it").action(async (options) => {
-    const capture2 = options.kind === "codex-settings-v1" ? captureCodexSettings : options.kind === "claude-settings-v3" ? captureClaudeSettingsV3 : options.kind === "claude-settings-v2" ? captureClaudeSettingsV2 : options.kind === "claude-marketplace-registry-v2" ? captureClaudeMarketplaceRegistryV2 : null;
+  hook.command("witness").requiredOption("--kind <kind>", "claude-settings-v3, claude-settings-v2, codex-settings-v2, codex-settings-v1 or claude-marketplace-registry-v2").requiredOption("--path <path>", "Canonical absolute path to the reviewed settings or registry file").option("--json", "Output the discovery witness as JSON", false).description("Capture an explicit versioned review witness without installing it").action(async (options) => {
+    const capture2 = options.kind === "codex-settings-v2" ? captureCodexSettingsV2 : options.kind === "codex-settings-v1" ? captureCodexSettings : options.kind === "claude-settings-v3" ? captureClaudeSettingsV3 : options.kind === "claude-settings-v2" ? captureClaudeSettingsV2 : options.kind === "claude-marketplace-registry-v2" ? captureClaudeMarketplaceRegistryV2 : null;
     if (!capture2)
-      throw new Error("Unsupported witness kind; select claude-settings-v3, claude-settings-v2, codex-settings-v1 or claude-marketplace-registry-v2");
+      throw new Error("Unsupported witness kind; select claude-settings-v3, claude-settings-v2, codex-settings-v2, codex-settings-v1 or claude-marketplace-registry-v2");
     await writeCliOutput(JSON.stringify(capture2(options.path), null, 2));
   });
   hook.command("rebind-settings").requiredOption("--agent <agent>", "claude or codex").requiredOption("--reviewed-preimage <path>", "Exact preserved legacy settings.json or config.toml").requiredOption("--expected-policy-sha256 <sha256>", "Exact current managed policy bytes").requiredOption("--expected-settings-sha256 <sha256>", "Exact current native settings bytes").option("--apply", "Apply the explicit semantic witness upgrade with preservation and readback", false).option("--json", "Return the metadata-only plan or receipt", false).description("Explicitly migrate a legacy native settings witness after proving only known preferences changed").action(async (options) => {
@@ -112406,7 +112704,7 @@ function registerAgentIntegration(parent) {
   hook.command("agents").option("--json", "Output the adapter capability inventory", false).description("Show maintained native adapters and explicit coverage limits").action(async () => {
     await writeCliOutput(JSON.stringify({ agents: INTEGRATION_AGENTS.map((agent) => ({ agent, bridge: true, ...AGENT_ADAPTERS[agent] })), inventoryOnly: ["codewith", "windsurf", "pi", "amp", "cline", "roo", "copilot"], limitations: ["Cursor prompt hooks gate submission; selected context is injected at session start only.", "Native discovery checks cover known home roots and current project ancestors. External plugin hook injection and arbitrary added directories require separate review.", "Hermes injects selected prompt context, but native pre_llm_call fails open. Exact native hook trust, bundled reseeding opt-out, native payload retirement and a supervised pre-tool guard are required. Child failures block explicitly; native host/supervisor death is not a universal fail-closed guarantee.", "Restart agents and use their normal hook trust controls after installation."] }, null, 2));
   });
-  hook.command("install").option("--agent <agent>", `Agent to configure: ${INTEGRATION_AGENTS.join(", ")}, all`, "all").option("--command <path>", "Skills executable used by the hook (preserves existing binding; new agents use skills)").option("--selection-profile <id>", "Selection profile (preserves existing binding; new agents use default)").option("--include-vendor", "Retained for compatibility; vendor system skills are always inventoried and disabled", false).option("--discovery-inputs <file>", "Advanced reviewed active plugin roots and source hashes for unsupported registrations").option("--codex-native-catalog <file>", "Reviewed Codex 0.159.2 skill and installed-plugin receipt for exact qualified-name disables").option("--reviewed-cache-alias <path>", "Exact skill-containing vendor cache alias reviewed for this hook plan").option("--allow-root-aliases", "Allow home .claude/.codex aliases to existing directories within this home", false).option("--apply", "Apply the plan, preserving prior configuration in private backups", false).option("--json", "Output a receipt as JSON", false).description("Plan or install one Skills CLI bridge plus native prompt hooks").action(async (options) => {
+  hook.command("install").option("--agent <agent>", `Agent to configure: ${INTEGRATION_AGENTS.join(", ")}, all`, "all").option("--command <path>", "Skills executable used by the hook (preserves existing binding; new agents use skills)").option("--selection-profile <id>", "Selection profile (preserves existing binding; new agents use default)").option("--include-vendor", "Retained for compatibility; vendor system skills are always inventoried and disabled", false).option("--discovery-inputs <file>", "Advanced reviewed active plugin roots and source hashes for unsupported registrations").option("--codex-native-catalog <file>", "Reviewed supported Codex skill and installed-plugin receipt for exact qualified-name disables").option("--reviewed-cache-alias <path>", "Exact skill-containing vendor cache alias reviewed for this hook plan").option("--allow-root-aliases", "Allow home .claude/.codex aliases to existing directories within this home", false).option("--apply", "Apply the plan, preserving prior configuration in private backups", false).option("--json", "Output a receipt as JSON", false).description("Plan or install one Skills CLI bridge plus native prompt hooks").action(async (options) => {
     try {
       const discoveryInputs = options.discoveryInputs ? JSON.parse(readFileSync41(options.discoveryInputs, "utf8")) : undefined;
       const plan = planAgentIntegration({ projectDir: process.cwd(), agents: agents(options.agent), command: options.command, profileId: options.selectionProfile, includeVendor: options.includeVendor, discoveryInputs, allowRootAliases: options.allowRootAliases, reviewedCacheAlias: options.reviewedCacheAlias, codexNativeCatalog: options.codexNativeCatalog ? JSON.parse(readFileSync41(options.codexNativeCatalog, "utf8")) : undefined });
@@ -112889,7 +113187,7 @@ var init_grants = __esm(() => {
 });
 
 // src/lib/station-hydrate.ts
-import { createHash as createHash32 } from "crypto";
+import { createHash as createHash33 } from "crypto";
 import {
   copyFileSync as copyFileSync3,
   mkdirSync as mkdirSync28,
@@ -113092,7 +113390,7 @@ function skillSha256(skill) {
     return sha256File(skill.files[0].winner.fullPath);
   }
   const joined = skill.files.map((file2) => sha256File(file2.winner.fullPath));
-  return createHash32("sha256").update(joined.sort().join(`
+  return createHash33("sha256").update(joined.sort().join(`
 `)).digest("hex");
 }
 function writeStationHydration(options) {
@@ -113249,7 +113547,7 @@ var init_hydrate = __esm(() => {
 });
 
 // src/lib/prepare-skill.ts
-import { createHash as createHash33, randomUUID as randomUUID12 } from "crypto";
+import { createHash as createHash34, randomUUID as randomUUID12 } from "crypto";
 import { chmodSync as chmodSync5, existsSync as existsSync36, lstatSync as lstatSync33, mkdirSync as mkdirSync29, mkdtempSync as mkdtempSync6, readFileSync as readFileSync43, readdirSync as readdirSync25, renameSync as renameSync14, rmSync as rmSync9, writeFileSync as writeFileSync30 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { dirname as dirname36, isAbsolute as isAbsolute30, join as join62, relative as relative11, resolve as resolve27, sep as sep14 } from "path";
@@ -113266,7 +113564,7 @@ function prepareSkill(name, options) {
   let manifest;
   try {
     const parsed = JSON.parse(manifestFile.bytes.toString("utf8"));
-    if (!isRecord8(parsed))
+    if (!isRecord9(parsed))
       throw new Error("not an object");
     manifest = parsed;
   } catch {
@@ -113288,7 +113586,7 @@ function prepareSkill(name, options) {
   if (documentKind !== undefined && documentKind !== kind) {
     throw new Error("SKILL.md kind conflicts with the candidate skill.json kind. Review and align both declarations (or remove the optional frontmatter kind), then prepare again; no files were changed.");
   }
-  if (manifest.provenance !== undefined && !isRecord8(manifest.provenance))
+  if (manifest.provenance !== undefined && !isRecord9(manifest.provenance))
     throw new Error("skill.json provenance must be an object.");
   const provenance = manifest.provenance;
   const candidate2 = { ...manifest, version: options.version, kind, provenance: { ...provenance } };
@@ -113353,7 +113651,7 @@ function escapedRelativePath(path) {
   return JSON.stringify(bounded);
 }
 function validateRuntimeEntrypoint(candidate2, root2) {
-  if (candidate2.kind !== "executable" || !isRecord8(candidate2.runtime))
+  if (candidate2.kind !== "executable" || !isRecord9(candidate2.runtime))
     return;
   const entry = candidate2.runtime.entrypoint;
   if (typeof entry !== "string")
@@ -113363,7 +113661,7 @@ function validateRuntimeEntrypoint(candidate2, root2) {
     throw new Error("Executable runtime.entrypoint must name an existing regular file inside the skill directory.");
   }
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function validateRawCandidate(candidate2) {
@@ -113388,7 +113686,7 @@ function validateRawCandidate(candidate2) {
     if (!Array.isArray(items))
       throw new Error(`skill.json ${field2} must be an array.`);
     for (const item of items) {
-      if (!isRecord8(item) || typeof item.name !== "string" || !item.name.trim())
+      if (!isRecord9(item) || typeof item.name !== "string" || !item.name.trim())
         throw new Error(`Invalid skill.json ${field2} name.`);
       if (field2 === "inputs" && (typeof item.type !== "string" || !item.type.trim() || item.required !== undefined && typeof item.required !== "boolean"))
         throw new Error("Invalid skill.json input type or required flag.");
@@ -113407,7 +113705,7 @@ function validateRawCandidate(candidate2) {
   }
 }
 function validateRuntimeEntrypointCompatibility(candidate2) {
-  if (candidate2.kind !== "executable" || !isRecord8(candidate2.runtime))
+  if (candidate2.kind !== "executable" || !isRecord9(candidate2.runtime))
     return;
   const runtime = candidate2.runtime.runtime;
   const entrypoint = candidate2.runtime.entrypoint;
@@ -113448,7 +113746,7 @@ function snapshot2(root2) {
   if (rootStat.isSymbolicLink() || !rootStat.isDirectory())
     throw new Error("Skill root must be a real directory, not a symlink.");
   const files = [], directories = [];
-  const hash6 = createHash33("sha256").update(`${rootStat.dev}:${rootStat.ino}\x00`);
+  const hash6 = createHash34("sha256").update(`${rootStat.dev}:${rootStat.ino}\x00`);
   let count = 0, bytes = 0;
   const walk2 = (relative12) => {
     for (const name of readdirSync25(join62(root2, relative12)).sort()) {
@@ -114734,7 +115032,7 @@ async function apiRequest(path, options, instance) {
   const origin = instance ?? getApiUrl(`${(options?.method || "GET").toUpperCase()} ${path}`);
   return new RemoteSkillsAuthClient(origin).request(path, options);
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function commandErrorPayload(err, fallback) {
@@ -114748,11 +115046,11 @@ function commandErrorPayload(err, fallback) {
       ...err.apiUrl ? { apiUrl: err.apiUrl } : {}
     };
   }
-  const code2 = isRecord9(err) && typeof err.code === "string" ? err.code : undefined;
+  const code2 = isRecord10(err) && typeof err.code === "string" ? err.code : undefined;
   return {
     error: err?.message || fallback,
     ...code2 ? { code: code2 } : {},
-    ...isRecord9(err) && Array.isArray(err.next) ? { next: err.next } : {}
+    ...isRecord10(err) && Array.isArray(err.next) ? { next: err.next } : {}
   };
 }
 function writeCommandError(err, fallback, json3) {
@@ -114777,7 +115075,7 @@ function stringField2(value) {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 function recordField(value) {
-  return isRecord9(value) ? value : undefined;
+  return isRecord10(value) ? value : undefined;
 }
 function identityApiKey(live) {
   const root2 = recordField(live);
@@ -115250,7 +115548,7 @@ async function runWhoami(options) {
     } catch {}
     payload.permissions = { publish: access?.permissions?.publish ?? null, profilesWrite: access?.permissions?.profilesWrite ?? null };
     const apiKey = identityApiKey(res);
-    if (access?.scopes && (apiKey === undefined || isRecord9(apiKey) && !Object.hasOwn(apiKey, "scopes"))) {
+    if (access?.scopes && (apiKey === undefined || isRecord10(apiKey) && !Object.hasOwn(apiKey, "scopes"))) {
       payload.scopes = access.scopes;
     }
     if (options.json) {