@hasna/skills 0.10.20 → 0.10.23

package/dist/sdk/index.js

@@ -9004,7 +9004,7 @@ var require_client = __commonJS((exports) => {
 var require_config = __commonJS((exports) => {
   var { homedir: homedir7 } = __require("os");
   var { sep: sep9, join: join4 } = __require("path");
-  var { createHash: createHash20 } = __require("crypto");
+  var { createHash: createHash21 } = __require("crypto");
   var { readFile: readFile$1 } = __require("fs/promises");
   var { IniSectionType } = require_dist_cjs();
   var { normalizeProvider } = require_client();
@@ -9159,7 +9159,7 @@ var require_config = __commonJS((exports) => {
   var DEFAULT_PROFILE = "default";
   var getProfileName = (init) => init.profile || process.env[ENV_PROFILE] || DEFAULT_PROFILE;
   var getSSOTokenFilepath = (id2) => {
-    const hasher = createHash20("sha1");
+    const hasher = createHash21("sha1");
     const cacheName = hasher.update(id2).digest("hex");
     return join4(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
   };
@@ -10511,7 +10511,7 @@ var require_endpoints = __commonJS((exports) => {
 
 // node_modules/@smithy/core/dist-cjs/submodules/serde/index.js
 var require_serde = __commonJS((exports) => {
-  var { createHmac: createHmac2, createHash: createHash20, getRandomValues } = __require("crypto");
+  var { createHmac: createHmac2, createHash: createHash21, getRandomValues } = __require("crypto");
   var { hasOwn: hasOwn2, HttpResponse } = require_transport();
   exports.hasOwn = hasOwn2;
   var { ReadStream, lstatSync: lstatSync23, fstatSync: fstatSync4 } = __require("fs");
@@ -11416,7 +11416,7 @@ var require_serde = __commonJS((exports) => {
       return Promise.resolve(this.hash.digest());
     }
     reset() {
-      this.hash = this.secret ? createHmac2(this.algorithmIdentifier, castSourceData(this.secret)) : createHash20(this.algorithmIdentifier);
+      this.hash = this.secret ? createHmac2(this.algorithmIdentifier, castSourceData(this.secret)) : createHash21(this.algorithmIdentifier);
     }
   }
   function castSourceData(toCast, encoding) {
@@ -12155,7 +12155,7 @@ var require_checksum = __commonJS((exports) => {
   var { createReadStream } = __require("fs");
   var { Writable } = __require("stream");
   var { toUint8Array, concatBytes } = require_serde();
-  var { createHash: createHash20, createHmac: createHmac2 } = __require("crypto");
+  var { createHash: createHash21, createHmac: createHmac2 } = __require("crypto");
   var zlib = __require("zlib");
   async function blobReader(blob, onChunk, chunkSize = 1024 * 1024) {
     const size = blob.size;
@@ -12320,7 +12320,7 @@ var require_checksum = __commonJS((exports) => {
   }
   var hasNativeCrypto$1 = (() => {
     try {
-      createHash20("md5");
+      createHash21("md5");
       return true;
     } catch {
       return false;
@@ -12330,7 +12330,7 @@ var require_checksum = __commonJS((exports) => {
   function buildNativeClass$2() {
     return class Md5Node2 {
       digestLength = 16;
-      hash = createHash20("md5");
+      hash = createHash21("md5");
       update(data) {
         this.hash.update(toUint8Array(data));
       }
@@ -12339,7 +12339,7 @@ var require_checksum = __commonJS((exports) => {
         return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
       }
       reset() {
-        this.hash = createHash20("md5");
+        this.hash = createHash21("md5");
       }
     };
   }
@@ -12629,7 +12629,7 @@ var require_checksum = __commonJS((exports) => {
   ]);
   var hasNativeCrypto = (() => {
     try {
-      createHash20("sha256");
+      createHash21("sha256");
       return true;
     } catch {
       return false;
@@ -12669,7 +12669,7 @@ var require_checksum = __commonJS((exports) => {
         this.finished = false;
       }
       createHash() {
-        return this.secret ? createHmac2("sha256", toBuffer(this.secret)) : createHash20("sha256");
+        return this.secret ? createHmac2("sha256", toBuffer(this.secret)) : createHash21("sha256");
       }
     };
   }
@@ -14538,8 +14538,8 @@ var require_protocols = __commonJS((exports) => {
   class Fields {
     entries = {};
     encoding;
-    constructor({ fields = [], encoding = "utf-8" }) {
-      fields.forEach(this.setField.bind(this));
+    constructor({ fields: fields2 = [], encoding = "utf-8" }) {
+      fields2.forEach(this.setField.bind(this));
       this.encoding = encoding;
     }
     setField(field2) {
@@ -18166,7 +18166,7 @@ ${toHex(hashedRequest)}`;
     return hash2.digest();
   };
   var getCanonicalHeaders = ({ headers }, unsignableHeaders, signableHeaders) => {
-    const canonical5 = {};
+    const canonical6 = {};
     for (const headerName of Object.keys(headers).sort()) {
       if (headers[headerName] == undefined) {
         continue;
@@ -18177,9 +18177,9 @@ ${toHex(hashedRequest)}`;
           continue;
         }
       }
-      canonical5[canonicalHeaderName] = headers[headerName].trim().replace(/\s+/g, " ");
+      canonical6[canonicalHeaderName] = headers[headerName].trim().replace(/\s+/g, " ");
     }
-    return canonical5;
+    return canonical6;
   };
   var getPayloadHash = async ({ headers, body }, hashConstructor) => {
     for (const headerName in headers) {
@@ -21700,12 +21700,12 @@ var require_protocols2 = __commonJS((exports) => {
       return expandToDecimal(numericString) === expandToDecimal(String(value));
     }
     const normalized = numericString.replace(/(\.\d*?)0+$/, "$1").replace(/\.$/, "");
-    const canonical5 = String(value);
-    if (normalized === canonical5) {
+    const canonical6 = String(value);
+    if (normalized === canonical6) {
       return true;
     }
-    if (/[eE]/.test(canonical5)) {
-      return normalized === expandToDecimal(canonical5);
+    if (/[eE]/.test(canonical6)) {
+      return normalized === expandToDecimal(canonical6);
     }
     return false;
   }
@@ -29443,7 +29443,7 @@ var require_signin = __commonJS((exports) => {
 });
 
 // node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-login/dist-es/LoginCredentialsFetcher.js
-import { createHash as createHash20, createPrivateKey, createPublicKey, sign } from "crypto";
+import { createHash as createHash21, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs2 } from "fs";
 import { homedir as homedir7 } from "os";
 import { dirname as dirname21, join as join33 } from "path";
@@ -29615,7 +29615,7 @@ var init_LoginCredentialsFetcher = __esm(() => {
     getTokenFilePath() {
       const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join33(homedir7(), ".aws", "login", "cache");
       const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
-      const loginSessionSha256 = createHash20("sha256").update(loginSessionBytes).digest("hex");
+      const loginSessionSha256 = createHash21("sha256").update(loginSessionBytes).digest("hex");
       return join33(directory, `${loginSessionSha256}.json`);
     }
     derToRawSignature(derSignature) {
@@ -32373,7 +32373,7 @@ var init_event_sink = __esm(() => {
 // package.json
 var package_default = {
   name: "@hasna/skills",
-  version: "0.10.20",
+  version: "0.10.23",
   description: "Skills library for AI coding agents",
   type: "module",
   bin: {
@@ -37455,7 +37455,7 @@ async function reconcileSkillSession(input, options = {}) {
   return { applied: true, plan, planDigest, ...result };
 }
 // src/lib/selected-run.ts
-import { createHash as createHash19 } from "crypto";
+import { createHash as createHash20 } from "crypto";
 import { spawn as spawn2 } from "child_process";
 import { mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync3, writeFileSync as writeFileSync9, realpathSync as realpathSync11 } from "fs";
 import { dirname as dirname20, join as join32, resolve as resolve18 } from "path";
@@ -38009,6 +38009,25 @@ function hashNativeJsonControls(text, excludedMetadata) {
 import { basename as basename3, dirname as dirname5, join as join10, relative as relative3, resolve as resolve4, sep as sep2 } from "path";
 import { lstatSync as lstatSync6, readdirSync as readdirSync3, readlinkSync as readlinkSync2, realpathSync as realpathSync5 } from "fs";
 
+// src/lib/codex-native-compatibility.ts
+var 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"]
+};
+function supportsCodexNativeCapability(version, capability) {
+  return typeof version === "string" && Object.hasOwn(MEASURED_CODEX_CAPABILITIES, version) && MEASURED_CODEX_CAPABILITIES[version].includes(capability);
+}
+var SUPPORTED_CODEX_HOOK_VERSIONS = Object.freeze(Object.keys(MEASURED_CODEX_CAPABILITIES).filter((version) => supportsCodexNativeCapability(version, "hooks")));
+
 // src/lib/codex-native-skill-catalog.ts
 import { realpathSync as realpathSync4 } from "fs";
 import { isAbsolute as isAbsolute5, normalize } from "path";
@@ -38018,7 +38037,6 @@ import { execFile, spawn } from "child_process";
 import { realpathSync as realpathSync3, statSync as statSync3 } from "fs";
 import { isAbsolute as isAbsolute4 } from "path";
 import { promisify } from "util";
-var 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"];
 async function connectCodexHookRpc(options) {
   const timeoutMs = options.timeoutMs ?? 20000;
   if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 100 || timeoutMs > 20000)
@@ -38036,7 +38054,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 = statSync3(binary);
   if (realpathSync3(found) !== binary || ["dev", "ino", "size", "mtimeMs", "ctimeMs"].some((k) => stat[k] !== current[k]))
@@ -38161,12 +38179,12 @@ var MAX_SKILLS = 4096;
 var MAX_NAME_BYTES = 1024;
 var MAX_PATH_BYTES = 16384;
 var MAX_PLUGIN_ID_BYTES = 1024;
-var SUPPORTED_NAME_CONTROL_VERSIONS = new Set(["codex-cli 0.159.2"]);
 function refuse2() {
   throw new Error("CODEX_NATIVE_SKILL_CATALOG_INVALID");
 }
 var object2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var scalar = (value, max) => typeof value === "string" && value.length > 0 && value.trim() === value && Buffer.byteLength(value, "utf8") <= max && !/[\u0000-\u001f\u007f]/u.test(value);
+var remotePluginIdentifier = (value) => typeof value === "string" && /^[A-Za-z0-9_~-]{1,1024}$/.test(value);
 var absolutePath2 = (value) => scalar(value, MAX_PATH_BYTES) && isAbsolute5(value);
 function projectCodexNativeSkillCatalog(response, cwd) {
   if (!absolutePath2(cwd) || !object2(response) || !Array.isArray(response.data) || response.data.length !== 1)
@@ -38194,7 +38212,11 @@ function projectCodexInstalledPlugins(response) {
     for (const value of marketplace.plugins) {
       if (!object2(value) || !scalar(value.id, MAX_PLUGIN_ID_BYTES) || !scalar(value.name, MAX_NAME_BYTES) || value.id !== `${value.name}@${marketplace.name}`)
         refuse2();
-      plugins.push({ ...value, marketplace: marketplace.name });
+      plugins.push({
+        ...value,
+        marketplace: marketplace.name,
+        sourceType: object2(value.source) && value.source.type === "remote" ? "remote" : undefined
+      });
     }
   }
   return projectCodexInstalledPluginEntries(plugins);
@@ -38204,13 +38226,21 @@ function projectCodexInstalledPluginEntries(value) {
     refuse2();
   const ids = new Set;
   return value.map((item) => {
-    if (!object2(item) || !scalar(item.id, MAX_PLUGIN_ID_BYTES) || !scalar(item.name, MAX_NAME_BYTES) || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean" || item.localVersion !== null && !scalar(item.localVersion, MAX_NAME_BYTES))
+    if (!object2(item) || !scalar(item.id, MAX_PLUGIN_ID_BYTES) || !scalar(item.name, MAX_NAME_BYTES) || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean" || item.localVersion !== null && !scalar(item.localVersion, MAX_NAME_BYTES) || item.remotePluginId !== undefined && item.remotePluginId !== null && !remotePluginIdentifier(item.remotePluginId) || item.sourceType !== undefined && item.sourceType !== "remote")
       refuse2();
     const at = item.id.lastIndexOf("@");
     if (at < 1 || item.id.slice(0, at) !== item.name || at === item.id.length - 1 || ids.has(item.id))
       refuse2();
     ids.add(item.id);
-    return { id: item.id, name: item.name, installed: item.installed, enabled: item.enabled, localVersion: item.localVersion ?? null };
+    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) {
@@ -38223,7 +38253,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] });
@@ -38281,6 +38311,21 @@ var CODEX_DEFAULT_AGENT_PLUGIN_VERSION = "1.0.0";
 function refuse3() {
   throw new Error("CODEX_NATIVE_SKILL_IDENTITY_UNSUPPORTED: review native plugin names and hook controls");
 }
+function remoteInstallationMatches(parent, remotePluginId, read) {
+  try {
+    if (!remotePluginIdentifier(remotePluginId) || !lstatSync6(parent).isDirectory() || realpathSync5(parent) !== parent)
+      return false;
+    const path = join10(parent, ".codex-remote-plugin-install.json"), stat = lstatSync6(path, { throwIfNoEntry: false });
+    if (!stat?.isFile() || stat.isSymbolicLink() || stat.size > 16384)
+      return false;
+    const text = read(path);
+    hashNativeJsonControls(text);
+    const value = JSON.parse(text);
+    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, read) {
   const text = read(path);
   let value, sha2562;
@@ -38302,6 +38347,42 @@ function appControls(path, read) {
   }
   return sha2562;
 }
+function mcpControls(path, read) {
+  const text = read(path);
+  let value, sha2562;
+  try {
+    sha2562 = hashNativeJsonControls(text);
+    value = JSON.parse(text);
+  } catch {
+    refuse3();
+  }
+  const object3 = (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 (!object3(value) || Object.keys(value).length !== 1 || !object3(value.mcpServers))
+    refuse3();
+  const servers = Object.entries(value.mcpServers);
+  if (!servers.length || servers.length > 256)
+    refuse3();
+  for (const [name, server] of servers) {
+    if (!identifier3(name) || !object3(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))
+      refuse3();
+    if (server.env_vars !== undefined) {
+      if (!Array.isArray(server.env_vars) || server.env_vars.length > 256)
+        refuse3();
+      const names = server.env_vars.map((entry) => {
+        if (envName(entry))
+          return entry;
+        if (!object3(entry) || !Object.keys(entry).every((key) => ["name", "source"].includes(key)) || !envName(entry.name) || entry.source !== undefined && entry.source !== "local")
+          refuse3();
+        return entry.name;
+      });
+      if (new Set(names).size !== names.length)
+        refuse3();
+    }
+  }
+  return sha2562;
+}
 function rootControls(root, read) {
   const manifestPath = join10(root, ".codex-plugin/plugin.json"), manifestFile = lstatSync6(manifestPath, { throwIfNoEntry: false });
   if (!lstatSync6(join10(root, ".codex-plugin"), { throwIfNoEntry: false })?.isDirectory() || !manifestFile?.isFile() || manifestFile.size > 1024 * 1024)
@@ -38319,15 +38400,21 @@ function rootControls(root, read) {
   const cacheVersion = basename3(root), declaredVersion = manifest.version === undefined ? "" : typeof manifest.version === "string" ? manifest.version.trim() : null;
   if (declaredVersion === null || (declaredVersion ? declaredVersion !== cacheVersion : cacheVersion !== CODEX_DEFAULT_AGENT_PLUGIN_VERSION))
     refuse3();
-  if (manifest.hooks !== undefined || manifest.mcpServers !== undefined || manifest.commands !== undefined || manifest.apps !== undefined && manifest.apps !== "./.app.json" || ["hooks", ".mcp.json"].some((path) => lstatSync6(join10(root, path), { throwIfNoEntry: false })))
+  if (manifest.hooks !== undefined || manifest.commands !== undefined || manifest.mcpServers !== undefined && manifest.mcpServers !== "./.mcp.json" || manifest.apps !== undefined && manifest.apps !== "./.app.json" || lstatSync6(join10(root, "hooks"), { throwIfNoEntry: false }))
+    refuse3();
+  const mcp = join10(root, ".mcp.json"), mcpPresent = lstatSync6(mcp, { throwIfNoEntry: false });
+  if (mcpPresent && (!mcpPresent.isFile() || mcpPresent.isSymbolicLink() || mcpPresent.size > 1024 * 1024 || realpathSync5(mcp) !== mcp))
+    refuse3();
+  if (Boolean(mcpPresent) !== (manifest.mcpServers !== undefined))
     refuse3();
+  const mcpSha256 = mcpPresent ? mcpControls(mcp, read) : undefined;
   const app = join10(root, ".app.json"), present = lstatSync6(app, { throwIfNoEntry: false });
   if (present && (!present.isFile() || present.isSymbolicLink() || present.size > 1024 * 1024))
     refuse3();
   if (manifest.apps !== undefined && !present)
     refuse3();
   const appSha256 = present ? appControls(app, read) : undefined;
-  return { namespace: manifest.name, manifestSha256, ...appSha256 ? { appSha256 } : {} };
+  return { namespace: manifest.name, manifestSha256, ...appSha256 ? { appSha256 } : {}, ...mcpSha256 ? { mcpSha256 } : {} };
 }
 function identity(document, cache, read) {
   if (!document.startsWith(cache + sep2) || !document.endsWith(sep2 + "SKILL.md"))
@@ -38370,6 +38457,10 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read) {
     for (const parent of new Set(controls.map((control) => control.pluginParent))) {
       if (!parent.startsWith(cache + sep2) || !lstatSync6(parent, { throwIfNoEntry: false })?.isDirectory())
         return false;
+      for (const control of controls.filter((control2) => control2.pluginParent === parent)) {
+        if (control.remotePluginId !== undefined && !remoteInstallationMatches(parent, control.remotePluginId, read))
+          return false;
+      }
       const names = readdirSync3(parent);
       entries += names.length;
       if (entries > 4096)
@@ -38386,7 +38477,7 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read) {
         if (!stat.isDirectory() || ![".codex-plugin/plugin.json", ".app.json", "hooks", ".mcp.json"].some((path) => lstatSync6(join10(root, path), { throwIfNoEntry: false })))
           continue;
         const parsed = rootControls(root, read);
-        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;
       }
     }
@@ -38396,7 +38487,7 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read) {
   }
 }
 function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read, rules) {
-  if (catalog?.version !== "codex-cli 0.159.2" || catalog.cwd !== cwd)
+  if (!supportsCodexNativeCapability(catalog?.version, "qualified-skill-catalog") || catalog.cwd !== cwd)
     refuse3();
   const skills = projectCodexNativeSkillCatalog({ data: [{ cwd, errors: [], skills: catalog.skills }] }, cwd);
   const allowed = new Set(documents), result = [];
@@ -38423,22 +38514,30 @@ function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read, ru
     const listed = skills.filter((skill) => skill.path === document);
     if (listed.length > 1)
       refuse3();
+    let remotePluginId;
     if (listed.length === 1) {
       if (listed[0].name !== parsed.name || listed[0].pluginId !== expectedPluginId)
         refuse3();
     } else {
-      const installed = installedPlugins.filter((plugin) => plugin.id === expectedPluginId && plugin.name === pluginName);
-      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled || !installed[0].localVersion)
+      const installed = installedPlugins.filter((plugin2) => plugin2.id === expectedPluginId && plugin2.name === pluginName);
+      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled)
         refuse3();
-      if (installed[0].localVersion !== basename3(dirname5(dirname5(dirname5(document)))))
-        continue;
+      const plugin = installed[0];
+      if (plugin.localVersion !== null) {
+        if (plugin.localVersion !== basename3(dirname5(dirname5(dirname5(document)))))
+          continue;
+      } else {
+        if (plugin.sourceType !== "remote" || !plugin.remotePluginId || !remoteInstallationMatches(parsed.pluginParent, plugin.remotePluginId, read) || !lstatSync6(document).isFile() || realpathSync5(document) !== document)
+          refuse3();
+        remotePluginId = plugin.remotePluginId;
+      }
       const exactPathDeny = Array.isArray(rules) && rules.some((rule) => rule?.path === document && rule?.enabled === false);
       if (!exactPathDeny || !isCodexNativeSkillDisabled({ name: parsed.name, path: document, pluginId: expectedPluginId, enabled: true }, rules))
         refuse3();
     }
-    result.push({ ...parsed, pluginId: expectedPluginId });
+    result.push({ ...parsed, pluginId: expectedPluginId, ...remotePluginId ? { remotePluginId } : {} });
   }
-  if (!result.length || new Set(result.map((item) => item.name)).size !== result.length)
+  if (!result.length && documents.some((document) => document.startsWith(cache + sep2)) || new Set(result.map((item) => item.name)).size !== result.length)
     refuse3();
   return result;
 }
@@ -38451,8 +38550,8 @@ function isReviewedCodexPluginSkillDisabled(document, cache, controls, rules, re
   } 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, read))
     return false;
   return isCodexNativeSkillDisabled({ name: parsed.name, path: document, pluginId: reviewed.pluginId, enabled: true }, rules);
 }
@@ -38471,7 +38570,7 @@ enabled = false
   return text;
 }
 
-// src/lib/codex-settings-witness.ts
+// src/lib/codex-settings-witness-v1.ts
 import { createHash as createHash6 } from "crypto";
 var sha = (text) => createHash6("sha256").update(text).digest("hex");
 var EFFORT = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
@@ -38565,15 +38664,162 @@ function captureCodexSettings(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const text = readNativeSettingsWitnessFile(path, budget, "config.toml");
   return { path, hashMode: "codex-settings-v1", sha256: hashCodexSettingsReplacement(text) };
 }
+
+// src/lib/codex-settings-witness.ts
+import { createHash as createHash7 } from "crypto";
+var sha2 = (text) => createHash7("sha256").update(text).digest("hex");
+var EFFORT2 = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
+var VERBOSITY2 = new Set(["low", "medium", "high"]);
+var MODEL = /^[A-Za-z0-9][A-Za-z0-9._:/-]{0,127}$/;
+var CODEX_DISCOVERY_PROJECTION_FIELDS = ["plugins", "marketplaces", "skills"];
+var INFERENCE = ["model", "model_reasoning_effort", "model_verbosity"];
+function need3(value) {
+  if (!value)
+    throw new Error("Invalid Codex settings witness");
+}
+function isRecord(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function isDate(value) {
+  return value instanceof Date;
+}
+function numericTokens2(text) {
+  const result = [];
+  for (let at = 0;at < text.length; ) {
+    const char = text[at];
+    if (char === "#") {
+      while (at < text.length && text[at] !== `
+`)
+        at++;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      const quote = char, triple = text.slice(at, at + 3) === quote.repeat(3);
+      at += triple ? 3 : 1;
+      while (at < text.length) {
+        if (quote === '"' && text[at] === "\\") {
+          at += 2;
+          continue;
+        }
+        if (text.slice(at, at + (triple ? 3 : 1)) === quote.repeat(triple ? 3 : 1)) {
+          at += triple ? 3 : 1;
+          break;
+        }
+        at++;
+      }
+      continue;
+    }
+    if (/[0-9+-]/.test(char)) {
+      const start = at;
+      while (at < text.length && !/[\s,\]{}#=]/.test(text[at]))
+        at++;
+      if (at > start) {
+        result.push(text.slice(start, at));
+        continue;
+      }
+    }
+    at++;
+  }
+  return result.sort();
+}
+function canonical3(value, depth = 0, budget = { remaining: 65536 }) {
+  need3(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") {
+    need3(Number.isFinite(value));
+    return ["number", String(value)];
+  }
+  if (isDate(value)) {
+    need3(Number.isFinite(value.getTime()));
+    return ["date", value.toISOString()];
+  }
+  if (Array.isArray(value))
+    return ["array", value.map((child) => canonical3(child, depth + 1, budget))];
+  need3(isRecord(value));
+  return ["object", Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, child]) => [key, canonical3(child, depth + 1, budget)])];
+}
+function normalize2(config) {
+  if (isRecord(config.hooks)) {
+    delete config.hooks.state;
+    if (!Object.keys(config.hooks).length)
+      delete config.hooks;
+  }
+  if (isRecord(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 (isRecord(config.profiles)) {
+    for (const profile of Object.values(config.profiles))
+      if (isRecord(profile))
+        inference(profile);
+  }
+}
+function disablesOneSkill(entry) {
+  if (!isRecord(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")
+        need3(typeof value === "string" && MODEL.test(value));
+      else
+        need3(typeof value === "string" && (key === "model_reasoning_effort" ? EFFORT2.has(value) : VERBOSITY2.has(value)));
+      delete target[key];
+    }
+}
+function settingsDigest2(text) {
+  let config;
+  try {
+    config = Bun.TOML.parse(text);
+  } catch {
+    throw new Error("Invalid Codex settings witness");
+  }
+  need3(isRecord(config));
+  normalize2(config);
+  return sha2(`hasna.skills.codex-settings.v2\x00${JSON.stringify([canonical3(config), numericTokens2(text)])}`);
+}
+function hashCodexSettingsReplacementV2(text, budget = { remaining: 256 * 1024 * 1024 }) {
+  need3(Buffer.byteLength(text) <= 1024 * 1024 && budget.remaining >= Buffer.byteLength(text));
+  budget.remaining -= Buffer.byteLength(text);
+  return settingsDigest2(text);
+}
+function captureCodexSettingsV2(path, budget = { remaining: 256 * 1024 * 1024 }) {
+  const text = readNativeSettingsWitnessFile(path, budget, "config.toml");
+  return { path, hashMode: "codex-settings-v2", sha256: settingsDigest2(text) };
+}
+function readCodexSettingsPreimage(path, budget = { remaining: 2 * 1024 * 1024 }) {
+  return readNativeSettingsWitnessFile(path, budget, "config.toml");
+}
 function upgradeCodexSettingsWitness(previous, reviewedSettingsPath) {
-  need2(previous && Object.keys(previous).every((key) => ["path", "hashMode", "sha256"].includes(key)) && (previous.hashMode === undefined || previous.hashMode === "bytes") && /^[a-f0-9]{64}$/.test(previous.sha256));
+  need3(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 before = readNativeSettingsWitnessFile(reviewedSettingsPath, budget, "config.toml"), current = readNativeSettingsWitnessFile(previous.path, budget, "config.toml");
-  need2(sha(before) === previous.sha256);
-  const sha2562 = hashCodexSettingsReplacement(current);
-  if (hashCodexSettingsReplacement(before) !== sha2562)
+  need3((previous.hashMode === "codex-settings-v1" ? hashCodexSettingsReplacement(before) : sha2(before)) === previous.sha256);
+  const sha2562 = settingsDigest2(current);
+  if (settingsDigest2(before) !== 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 };
 }
 
 // src/lib/native-discovery-roots.ts
@@ -38596,7 +38842,8 @@ var NATIVE_SKILL_ROOTS = [
 ];
 
 // src/lib/agent-integration.ts
-import { createHash as createHash17, randomUUID as randomUUID3 } from "crypto";
+import { createHash as createHash18, randomUUID as randomUUID3 } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual5 } from "util";
 import { existsSync as existsSync6, lstatSync as lstatSync19, statSync as statSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync14, readdirSync as readdirSync8, opendirSync as opendirSync5, readlinkSync as readlinkSync4, realpathSync as realpathSync7, renameSync as renameSync3, rmdirSync as rmdirSync3, writeFileSync as writeFileSync4, unlinkSync as unlinkSync4, chmodSync, openSync as openSync16, closeSync as closeSync16, fsyncSync as fsyncSync4, fstatSync as fstatSync16, readSync as readSync11, constants as constants12, linkSync as linkSync2 } from "fs";
 import { dirname as dirname15, join as join22, resolve as resolve15, relative as relative4, isAbsolute as isAbsolute17, sep as sep5 } from "path";
 import { homedir as homedir3 } from "os";
@@ -38655,12 +38902,16 @@ function assertAgentPolicyCollections(policy) {
     }
   if (bridge.codexPluginSkills !== undefined)
     for (const control of array(bridge.codexPluginSkills, 4096)) {
-      requireBound(object3(control) && Object.keys(control).every((key) => ["name", "pluginId", "namespace", "pluginParent", "manifestSha256", "appSha256"].includes(key)));
+      requireBound(object3(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(isAbsolute6(control.pluginParent) && resolve5(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));
     }
@@ -38683,8 +38934,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) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename4(source.path) === "config.toml");
       if (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3")
         requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute6(source.path) && resolve5(source.path) === source.path && basename4(source.path) === "settings.json");
@@ -38798,7 +39049,7 @@ function requiresCliSkillLoading(dataDir2 = getDataDirReadOnly()) {
 }
 
 // src/lib/agent-bridge.ts
-import { createHash as createHash7 } from "crypto";
+import { createHash as createHash8 } from "crypto";
 import { lstatSync as lstatSync8, readFileSync as readFileSync9, readdirSync as readdirSync4 } from "fs";
 import { join as join12 } from "path";
 var CLI_BRIDGE_NAME = "skills-cli";
@@ -38817,7 +39068,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.
 `;
-var CLI_BRIDGE_DIGEST = createHash7("sha256").update(markdown).digest("hex");
+var CLI_BRIDGE_DIGEST = createHash8("sha256").update(markdown).digest("hex");
 var 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)}
@@ -38841,7 +39092,7 @@ function isOwnedCliBridge(path, expectedPaths) {
 }
 
 // src/lib/agent-discovery.ts
-import { createHash as createHash16 } from "crypto";
+import { createHash as createHash17 } from "crypto";
 import { lstatSync as lstatSync18, readFileSync as readFileSync13, readdirSync as readdirSync7, realpathSync as realpathSync6 } from "fs";
 import { basename as basename7, dirname as dirname14, isAbsolute as isAbsolute16, join as join21, resolve as resolve14, sep as sep4 } from "path";
 import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
@@ -39100,17 +39351,17 @@ if (failed) process.exitCode = 2;
 }
 
 // src/lib/agent-discovery-directories.ts
-import { createHash as createHash8 } from "crypto";
+import { createHash as createHash9 } from "crypto";
 import { lstatSync as lstatSync10, opendirSync as opendirSync2 } from "fs";
 import { dirname as dirname7, isAbsolute as isAbsolute8, join as join14, resolve as resolve7 } from "path";
-function need3(value, message) {
+function need4(value, message) {
   if (!value)
     throw new Error(message);
 }
 function safe(path) {
-  need3(typeof path === "string" && path.length <= AGENT_POLICY_LIMITS.pathCharacters && isAbsolute8(path) && resolve7(path) === path && !path.includes("\x00"), "Expected a canonical absolute discovery directory path");
+  need4(typeof path === "string" && path.length <= AGENT_POLICY_LIMITS.pathCharacters && isAbsolute8(path) && resolve7(path) === path && !path.includes("\x00"), "Expected a canonical absolute discovery directory path");
   for (let cursor = path;; cursor = dirname7(cursor)) {
-    need3(!lstatSync10(cursor, { throwIfNoEntry: false })?.isSymbolicLink(), "Refusing symlink native discovery directory");
+    need4(!lstatSync10(cursor, { throwIfNoEntry: false })?.isSymbolicLink(), "Refusing symlink native discovery directory");
     if (dirname7(cursor) === cursor)
       break;
   }
@@ -39123,55 +39374,55 @@ function capture(path, budget) {
   const root = lstatSync10(path, { throwIfNoEntry: false });
   if (!root)
     return { path, sha256: null };
-  need3(root.isDirectory(), "Unsupported native discovery directory input");
-  const hash2 = createHash8("sha256");
+  need4(root.isDirectory(), "Unsupported native discovery directory input");
+  const hash2 = createHash9("sha256");
   function walk2(current, relative4, before, depth) {
-    need3(depth <= 64, "Native discovery directory depth limit exceeded");
+    need4(depth <= 64, "Native discovery directory depth limit exceeded");
     const names = [], directory = opendirSync2(current);
     try {
       for (let entry = directory.readSync();entry; entry = directory.readSync()) {
-        need3(++budget.entries <= AGENT_POLICY_LIMITS.discoveryDirectoryEntries, "Native discovery directory entry limit exceeded");
+        need4(++budget.entries <= AGENT_POLICY_LIMITS.discoveryDirectoryEntries, "Native discovery directory entry limit exceeded");
         names.push(entry.name);
       }
     } finally {
       directory.closeSync();
     }
-    need3(new Set(names).size === names.length, "Ambiguous native discovery directory names");
+    need4(new Set(names).size === names.length, "Ambiguous native discovery directory names");
     for (const name of names.sort()) {
       const child = join14(current, name), childRelative = relative4 ? `${relative4}/${name}` : name;
-      need3(child.length <= AGENT_POLICY_LIMITS.pathCharacters, "Native discovery directory path limit exceeded");
+      need4(child.length <= AGENT_POLICY_LIMITS.pathCharacters, "Native discovery directory path limit exceeded");
       const stat = lstatSync10(child);
-      need3(stat.isFile() || stat.isDirectory(), "Refusing symlink or special native discovery directory member");
+      need4(stat.isFile() || stat.isDirectory(), "Refusing symlink or special native discovery directory member");
       const row = JSON.stringify([childRelative, stat.isDirectory() ? "directory" : "file"]) + `
 `;
       budget.bytes += Buffer.byteLength(row);
-      need3(budget.bytes <= AGENT_POLICY_LIMITS.discoveryDirectoryBytes, "Native discovery directory metadata limit exceeded");
+      need4(budget.bytes <= AGENT_POLICY_LIMITS.discoveryDirectoryBytes, "Native discovery directory metadata limit exceeded");
       hash2.update(row);
       if (stat.isDirectory())
         walk2(child, childRelative, stat, depth + 1);
     }
-    need3(same(before, lstatSync10(current, { throwIfNoEntry: false })), "Native discovery directory changed while reading");
+    need4(same(before, lstatSync10(current, { throwIfNoEntry: false })), "Native discovery directory changed while reading");
   }
   walk2(path, "", root, 0);
   safe(path);
   return { path, sha256: hash2.digest("hex") };
 }
 function captureDiscoveryDirectories(paths) {
-  need3(Array.isArray(paths) && paths.length <= AGENT_POLICY_LIMITS.discoveryDirectories && new Set(paths).size === paths.length, "Invalid native discovery directory collection");
+  need4(Array.isArray(paths) && paths.length <= AGENT_POLICY_LIMITS.discoveryDirectories && new Set(paths).size === paths.length, "Invalid native discovery directory collection");
   const budget = { entries: 0, bytes: 0 };
   return paths.map((path) => capture(path, budget));
 }
 function verifyDiscoveryDirectories(directories) {
-  need3(Array.isArray(directories) && directories.length <= AGENT_POLICY_LIMITS.discoveryDirectories, "Invalid native discovery directory collection");
+  need4(Array.isArray(directories) && directories.length <= AGENT_POLICY_LIMITS.discoveryDirectories, "Invalid native discovery directory collection");
   for (const directory of directories)
-    need3(directory && typeof directory === "object" && (directory.sha256 === null || typeof directory.sha256 === "string" && /^[a-f0-9]{64}$/.test(directory.sha256)), "Invalid native discovery directory digest");
+    need4(directory && typeof directory === "object" && (directory.sha256 === null || typeof directory.sha256 === "string" && /^[a-f0-9]{64}$/.test(directory.sha256)), "Invalid native discovery directory digest");
   const current = captureDiscoveryDirectories(directories.map((directory) => directory.path));
   for (let i = 0;i < directories.length; i++)
-    need3(current[i].sha256 === directories[i].sha256, `Native discovery directory membership changed; run skills hook install with a fresh discovery review: ${directories[i].path}`);
+    need4(current[i].sha256 === directories[i].sha256, `Native discovery directory membership changed; run skills hook install with a fresh discovery review: ${directories[i].path}`);
 }
 
 // src/lib/agent-discovery-bytes.ts
-import { createHash as createHash9 } from "crypto";
+import { createHash as createHash10 } from "crypto";
 import { closeSync as closeSync11, constants as constants7, fstatSync as fstatSync11, lstatSync as lstatSync11, openSync as openSync11, readSync as readSync6 } from "fs";
 import { dirname as dirname8, isAbsolute as isAbsolute9, resolve as resolve8 } from "path";
 function discoveryByteBudget() {
@@ -39202,7 +39453,7 @@ function hashRawDiscoveryFile(path, budget, changes) {
     if (bytes > AGENT_POLICY_LIMITS.discoveryRawSourceBytes)
       throw new Error("Raw discovery file byte limit exceeded");
     consume(budget, bytes);
-    return createHash9("sha256").update(text2).digest("hex");
+    return createHash10("sha256").update(text2).digest("hex");
   }
   const initial = lstatSync11(path, { throwIfNoEntry: false });
   if (!initial)
@@ -39216,7 +39467,7 @@ function hashRawDiscoveryFile(path, budget, changes) {
     const opened = fstatSync11(fd);
     if (!opened.isFile() || !same2(initial, opened))
       throw new Error("Raw discovery input changed during open");
-    const hash2 = createHash9("sha256"), buffer = Buffer.alloc(64 * 1024);
+    const hash2 = createHash10("sha256"), buffer = Buffer.alloc(64 * 1024);
     let bytes = 0;
     while (true) {
       const count = readSync6(fd, buffer, 0, Math.min(buffer.length, AGENT_POLICY_LIMITS.discoveryRawSourceBytes - bytes + 1), null);
@@ -39239,7 +39490,7 @@ function hashRawDiscoveryFile(path, budget, changes) {
 }
 
 // src/lib/agent-discovery-path-bytes.ts
-import { createHash as createHash10 } from "crypto";
+import { createHash as createHash11 } from "crypto";
 import { lstatSync as lstatSync12, readlinkSync as readlinkSync3 } from "fs";
 import { dirname as dirname9, isAbsolute as isAbsolute10, join as join15, parse as parse3, resolve as resolve9, sep as sep3 } from "path";
 function identity3(stat, mutable = false) {
@@ -39252,12 +39503,12 @@ function identity3(stat, mutable = false) {
     ...mutable ? { size: String(stat.size), mtimeNs: String(stat.mtimeNs), ctimeNs: String(stat.ctimeNs) } : {}
   };
 }
-function canonical3(path) {
+function canonical4(path) {
   if (typeof path !== "string" || !isAbsolute10(path) || path !== resolve9(path) || path.length > AGENT_POLICY_LIMITS.pathCharacters || path.includes("\x00") || Buffer.from(path).toString("utf8") !== path)
     throw new Error("Expected a canonical absolute discovery path");
 }
 function trace(path) {
-  canonical3(path);
+  canonical4(path);
   const rows = [], paths = [];
   let metadataBytes = 0, steps = 0, links = 0, cursor = parse3(path).root, pending = path.slice(cursor.length).split(sep3);
   function record3(path2, row) {
@@ -39349,7 +39600,7 @@ function hashDiscoveryPathFile(path, budget, changes) {
   const after = trace(path);
   if (JSON.stringify(before.rows) !== JSON.stringify(after.rows) || before.file !== after.file)
     throw new Error("Discovery path input changed during read");
-  return createHash10("sha256").update(JSON.stringify({ version: 1, path, rows: before.rows, content })).digest("hex");
+  return createHash11("sha256").update(JSON.stringify({ version: 1, path, rows: before.rows, content })).digest("hex");
 }
 
 // src/lib/plugin-discovery.ts
@@ -39361,7 +39612,7 @@ import { homedir as homedir2 } from "os";
 import { isAbsolute as isAbsolute13, join as join19, resolve as resolve11 } from "path";
 
 // src/lib/plugin-projection.ts
-import { createHash as createHash11 } from "crypto";
+import { createHash as createHash12 } from "crypto";
 import { posix as posix2 } from "path";
 var PLUGIN_PROJECTION_MANIFEST = "plugin-projection.json";
 var PLUGIN_PROJECTION_LIMITS = Object.freeze({ files: 1024, bytes: 64 * 1024 * 1024, fileBytes: 16 * 1024 * 1024, metadataBytes: 512 * 1024, registrations: 64, history: 128 });
@@ -39372,7 +39623,7 @@ function pluginNeed(value, message) {
   if (!value)
     pluginRefusal(message);
 }
-var pluginHash = (bytes) => createHash11("sha256").update(bytes).digest("hex");
+var pluginHash = (bytes) => createHash12("sha256").update(bytes).digest("hex");
 function pluginObject(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -39560,7 +39811,7 @@ function buildPluginProjection(entries) {
 }
 
 // src/lib/plugin-projection-store.ts
-import { createHash as createHash12, randomUUID as randomUUID2 } from "crypto";
+import { createHash as createHash13, randomUUID as randomUUID2 } from "crypto";
 import { constants as constants8, closeSync as closeSync12, fchmodSync, fstatSync as fstatSync12, fsyncSync as fsyncSync2, linkSync, lstatSync as lstatSync13, mkdirSync as mkdirSync4, openSync as openSync12, opendirSync as opendirSync3, readSync as readSync7, renameSync as renameSync2, rmdirSync as rmdirSync2, rmSync, unlinkSync as unlinkSync3, writeSync as writeSync2 } from "fs";
 import { dirname as dirname10, isAbsolute as isAbsolute11, join as join16, parse as parse5, resolve as resolve10 } from "path";
 var READ_FLAGS = constants8.O_RDONLY | constants8.O_NOFOLLOW | constants8.O_NONBLOCK;
@@ -39576,7 +39827,7 @@ function stat(path) {
     return pluginRefusal("Cannot inspect plugin filesystem entry");
   }
 }
-function canonical4(path) {
+function canonical5(path) {
   pluginNeed(typeof path === "string" && path.length <= 8192 && isAbsolute11(path) && resolve10(path) === path && !/[\x00-\x1f\x7f]/.test(path), "Plugin storage paths must be canonical absolute paths");
 }
 function owner(stats, system = false) {
@@ -39587,7 +39838,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, create = false) {
-  canonical4(path);
+  canonical5(path);
   const result = [], parent = dirname10(path), filesystemRoot = parse5(parent).root;
   let current = filesystemRoot;
   for (const segment of ["", ...parent.slice(filesystemRoot.length).split("/").filter(Boolean)]) {
@@ -39902,7 +40153,7 @@ function pluginExecutableDigest(path) {
     const opened = fstatSync12(fd, { bigint: true });
     same3(before, opened);
     fileShape(opened, maximum, "executable");
-    const hash2 = createHash12("sha256"), buffer = new Uint8Array(64 * 1024);
+    const hash2 = createHash13("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);
@@ -39927,7 +40178,7 @@ function pluginExecutableDigest(path) {
 
 // src/lib/skill-validation.ts
 import { existsSync as existsSync5, lstatSync as lstatSync14, readFileSync as readFileSync12, readdirSync as readdirSync6, statSync as statSync5 } from "fs";
-import { isAbsolute as isAbsolute12, join as join18, normalize as normalize2 } from "path";
+import { isAbsolute as isAbsolute12, join as join18, normalize as normalize3 } from "path";
 
 // src/lib/hosted-skill-set.ts
 import { existsSync as existsSync4, readFileSync as readFileSync11, readdirSync as readdirSync5, statSync as statSync4 } from "fs";
@@ -40033,7 +40284,7 @@ function sortMessages(messages) {
 function isSafeRelativePath(value) {
   if (!value.trim() || isAbsolute12(value))
     return false;
-  const normalized = normalize2(value).replace(/\\/g, "/");
+  const normalized = normalize3(value).replace(/\\/g, "/");
   return normalized !== ".." && !normalized.startsWith("../") && !normalized.includes("/../");
 }
 function validateRuntimeEntry(skillPath, entrypoint, issues, warnings) {
@@ -40897,23 +41148,23 @@ function captureManagedPluginRegistry(path, managedPlugins) {
 }
 
 // src/lib/claude-marketplace-registry.ts
-import { createHash as createHash13 } from "crypto";
+import { createHash as createHash14 } from "crypto";
 import { closeSync as closeSync14, constants as constants10, fstatSync as fstatSync14, lstatSync as lstatSync16, openSync as openSync14, readSync as readSync9 } from "fs";
 import { basename as basename6, dirname as dirname12, isAbsolute as isAbsolute15, resolve as resolve13 } from "path";
 var CLAUDE_MARKETPLACE_REGISTRY_LIMITS = Object.freeze({ bytes: 1024 * 1024, rows: 1024, depth: 32, nodes: 65536, stringCharacters: 16384, pathCharacters: 4096 });
-function need4(value, reason) {
+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) && resolve13(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) && resolve13(value) === value, "requires a normalized absolute path");
 }
 var 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;
 function parents2(path) {
   const result = [];
   for (let at = dirname12(path);; at = dirname12(at)) {
     const stat2 = lstatSync16(at, { 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");
     result.push([at, stat2]);
     if (at === dirname12(at))
       return result;
@@ -40921,15 +41172,15 @@ function parents2(path) {
 }
 function readRegistry2(path, budget) {
   absolutePath3(path);
-  need4(basename6(path) === "known_marketplaces.json", "requires known_marketplaces.json");
-  need4(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
+  need5(basename6(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), initial = lstatSync16(path, { bigint: true });
-  need4(initial.isFile() && !initial.isSymbolicLink() && initial.size <= BigInt(CLAUDE_MARKETPLACE_REGISTRY_LIMITS.bytes), "is not a bounded regular file");
-  need4(initial.size <= BigInt(budget.remaining), "exceeds its aggregate byte limit");
+  need5(initial.isFile() && !initial.isSymbolicLink() && initial.size <= BigInt(CLAUDE_MARKETPLACE_REGISTRY_LIMITS.bytes), "is not a bounded regular file");
+  need5(initial.size <= BigInt(budget.remaining), "exceeds its aggregate byte limit");
   const fd = openSync14(path, constants10.O_RDONLY | constants10.O_NOFOLLOW | constants10.O_NONBLOCK);
   try {
     const opened = fstatSync14(fd, { bigint: true });
-    need4(opened.isFile() && sameFile2(initial, opened), "changed during open");
+    need5(opened.isFile() && sameFile2(initial, opened), "changed during open");
     const bytes = Buffer.alloc(Number(opened.size) + 1);
     let length = 0;
     while (length < bytes.length) {
@@ -40939,10 +41190,10 @@ function readRegistry2(path, budget) {
       length += count;
     }
     const after = fstatSync14(fd, { bigint: true }), current = lstatSync16(path, { bigint: true });
-    need4(current.isFile() && sameFile2(opened, after) && sameFile2(after, current) && BigInt(length) === opened.size, "changed during read");
+    need5(current.isFile() && sameFile2(opened, after) && sameFile2(after, current) && BigInt(length) === opened.size, "changed during read");
     for (const [ancestor, before] of ancestors2) {
       const now = lstatSync16(ancestor, { bigint: true });
-      need4(now.isDirectory() && before.dev === now.dev && before.ino === now.ino && before.mode === now.mode, "parent changed during read");
+      need5(now.isDirectory() && before.dev === now.dev && before.ino === now.ino && before.mode === now.mode, "parent changed during read");
     }
     budget.remaining -= length;
     try {
@@ -40962,7 +41213,7 @@ function parse6(text2) {
       at++;
   };
   function string() {
-    need4(text2[at] === '"', "contains invalid JSON");
+    need5(text2[at] === '"', "contains invalid JSON");
     const start = at++;
     while (at < text2.length) {
       const character = text2[at++];
@@ -40973,7 +41224,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 === "\\")
@@ -40982,7 +41233,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[at];
     if (character === '"')
@@ -40996,17 +41247,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[at++] === ":", "contains invalid JSON");
+            need5(text2[at++] === ":", "contains invalid JSON");
             entries.push([key, value(depth + 1)]);
           } else
             items.push(value(depth + 1));
           space();
           if (text2[at] === end)
             break;
-          need4(text2[at++] === ",", "contains invalid JSON");
+          need5(text2[at++] === ",", "contains invalid JSON");
         }
       at++;
       return object5 ? { kind: "object", entries } : { kind: "array", items };
@@ -41018,14 +41269,14 @@ function parse6(text2) {
       }
     numberPattern.lastIndex = at;
     const number = numberPattern.exec(text2);
-    need4(number, "contains invalid JSON");
+    need5(number, "contains invalid JSON");
     at += number[0].length;
     return { kind: "number", value: number[0] };
   }
   const root2 = value(0);
   space();
-  need4(at === 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(at === 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 exactKeys2(value, keys2) {
@@ -41033,7 +41284,7 @@ function exactKeys2(value, keys2) {
 }
 var field = (object5, key) => object5.entries.find(([name]) => name === key)?.[1];
 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) {
@@ -41041,7 +41292,7 @@ function normalizeRow(row, version = 1) {
     if (version !== 2 || !exactKeys2(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")
@@ -41057,34 +41308,34 @@ 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 = createHash13("sha256").update("hasna.skills.claude-marketplace-registry.v1\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash14("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 = createHash13("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash14("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
   return { path, hashMode: "claude-marketplace-registry-v2", sha256: sha2562 };
 }
 
 // src/lib/codex-hook-discovery-recovery.ts
-import { createHash as createHash15 } from "crypto";
+import { createHash as createHash16 } from "crypto";
 
 // src/lib/codex-hook-trust-files.ts
 import { closeSync as closeSync15, constants as constants11, fstatSync as fstatSync15, fsyncSync as fsyncSync3, lstatSync as lstatSync17, openSync as openSync15, readSync as readSync10, writeFileSync as writeFileSync3 } from "fs";
-import { createHash as createHash14 } from "crypto";
+import { createHash as createHash15 } from "crypto";
 import { dirname as dirname13 } from "path";
-function need5(value, code) {
+function need6(value, code) {
   if (!value)
     throw new Error(`CODEX_HOOK_TRUST_${code}`);
 }
@@ -41092,8 +41343,8 @@ var sameStat = (a, b) => ["dev", "ino", "uid", "nlink", "mode", "size", "mtimeNs
 function safeParents(file) {
   for (let p = dirname13(file);; p = dirname13(p)) {
     const s = lstatSync17(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 (dirname13(p) === p)
       break;
   }
@@ -41102,12 +41353,12 @@ function snapshot(file, privateFile = false, options = {}) {
   const readOnlyPackage = options.readOnlyPackage === true && !privateFile;
   safeParents(file);
   const initial = lstatSync17(file, { bigint: true });
-  need5(initial.isFile() && initial.uid === BigInt(process.getuid()) && (initial.nlink === 1n || readOnlyPackage && initial.nlink > 1n) && (initial.mode & 0o022n) === 0n && (!privateFile || (initial.mode & 0o777n) === 0o600n), "UNSAFE_FILE");
-  need5(initial.size <= 8n * 1024n * 1024n, "FILE_BOUND");
+  need6(initial.isFile() && initial.uid === BigInt(process.getuid()) && (initial.nlink === 1n || readOnlyPackage && initial.nlink > 1n) && (initial.mode & 0o022n) === 0n && (!privateFile || (initial.mode & 0o777n) === 0o600n), "UNSAFE_FILE");
+  need6(initial.size <= 8n * 1024n * 1024n, "FILE_BOUND");
   const fd = openSync15(file, constants11.O_RDONLY | constants11.O_NOFOLLOW | constants11.O_NONBLOCK);
   try {
     const before = fstatSync15(fd, { bigint: true });
-    need5(sameStat(initial, before), "INPUT_CHANGED");
+    need6(sameStat(initial, before), "INPUT_CHANGED");
     const bytes = Buffer.alloc(Number(before.size) + 1);
     let length = 0;
     while (length < bytes.length) {
@@ -41116,16 +41367,16 @@ function snapshot(file, privateFile = false, options = {}) {
         break;
       length += n2;
     }
-    need5(length === Number(before.size) && sameStat(before, fstatSync15(fd, { bigint: true })) && sameStat(before, lstatSync17(file, { bigint: true })), "INPUT_CHANGED");
+    need6(length === Number(before.size) && sameStat(before, fstatSync15(fd, { bigint: true })) && sameStat(before, lstatSync17(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: before, sha256: createHash14("sha256").update(content).digest("hex") };
+    return { file, privateFile, readOnlyPackage, text: text2, bytes: content, stat: before, sha256: createHash15("sha256").update(content).digest("hex") };
   } finally {
     closeSync15(fd);
   }
 }
 function unchanged2(before) {
   const after = snapshot(before.file, before.privateFile, before.readOnlyPackage ? { readOnlyPackage: true } : {});
-  need5(sameStat(before.stat, after.stat) && after.sha256 === before.sha256, "INPUT_CHANGED");
+  need6(sameStat(before.stat, after.stat) && after.sha256 === before.sha256, "INPUT_CHANGED");
 }
 
 // src/lib/codex-hook-additions-review.ts
@@ -41134,11 +41385,12 @@ var matchedEvents = { ...events, PreToolUse: ["preToolUse", "pre_tool_use"] };
 var proofs = new WeakMap;
 
 // src/lib/codex-hook-discovery-recovery.ts
-var sha2 = (text2) => createHash15("sha256").update(text2).digest("hex");
+var sha3 = (text2) => createHash16("sha256").update(text2).digest("hex");
+var fields = [...CODEX_DISCOVERY_PROJECTION_FIELDS];
 var proofs2 = new WeakMap;
 function assertCodexHookDiscoveryRecovery(binding, witness) {
   const proof = proofs2.get(witness);
-  need5(!!proof && binding.agent === "codex" && witness.discoverySha256 === sha2(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
+  need6(!!proof && binding.agent === "codex" && witness.discoverySha256 === sha3(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
   unchanged2(proof.before);
   unchanged2(proof.current);
   proof.recheckAdditions();
@@ -41147,12 +41399,12 @@ 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;
 }
 
 // src/lib/agent-discovery.ts
-var digest2 = (text2) => createHash16("sha256").update(text2).digest("hex");
+var digest2 = (text2) => createHash17("sha256").update(text2).digest("hex");
 function parseConfig(text2, path, toml = false) {
   try {
     const value = toml ? Bun.TOML.parse(text2) : JSON.parse(text2);
@@ -41184,14 +41436,26 @@ function read2(path, changes) {
     throw new Error(`Unsupported or oversized native discovery input: ${path}`);
   return readFileSync13(path, "utf8");
 }
+function projectNativeDiscoveryFields(text2, format, fields2, path) {
+  const object5 = format === "yaml" ? parseHermesConfig(text2) : parseConfig(text2, path, format === "toml");
+  if (!object5 || typeof object5 !== "object" || Array.isArray(object5))
+    throw new Error("Expected native discovery configuration object");
+  return digest2(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" && isDeepStrictEqual3(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))
@@ -41230,10 +41494,7 @@ function projected(source, changes, budget = discoveryByteBudget()) {
     return null;
   if (!source.format)
     return digest2(text2);
-  const object5 = source.format === "yaml" ? parseHermesConfig(text2) : parseConfig(text2, source.path, source.format === "toml");
-  if (!object5 || typeof object5 !== "object" || Array.isArray(object5))
-    throw new Error("Expected native discovery configuration object");
-  return digest2(JSON.stringify(Object.fromEntries((source.fields ?? []).map((field2) => [field2, object5[field2] ?? null]))));
+  return projectNativeDiscoveryFields(text2, source.format, source.fields ?? [], source.path);
 }
 function verifyAgentDiscovery(binding, codexRecovery) {
   if (codexRecovery)
@@ -41261,7 +41522,7 @@ function verifyAgentDiscovery(binding, codexRecovery) {
     safe4(root2);
 }
 function assertMarketplaceBinding(binding, source) {
-  if (source.hashMode === "codex-settings-v1" && (binding.agent !== "codex" || binding.method !== "reviewed" || basename7(source.path) !== "config.toml"))
+  if ((source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2") && (binding.agent !== "codex" || binding.method !== "reviewed" || basename7(source.path) !== "config.toml"))
     throw new Error("Codex settings witnesses require explicit reviewed Codex configuration");
   if ((source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3") && (binding.agent !== "claude" || binding.method !== "reviewed" || basename7(source.path) !== "settings.json"))
     throw new Error("Claude settings witnesses require explicit reviewed Claude configuration");
@@ -41290,8 +41551,8 @@ function captureDiscoveryPathSources(paths) {
   const budget = discoveryByteBudget();
   return paths.map((path) => ({ path, hashMode: "path-bytes", sha256: hashDiscoveryPathFile(path, budget) }));
 }
-function assertProjectDiscovery(agent, directories, home, canonical5 = resolve14, reviewed) {
-  const homeConfigPath = canonical5(agentDiscoveryConfigPath(home, agent));
+function assertProjectDiscovery(agent, directories, home, canonical6 = resolve14, reviewed) {
+  const homeConfigPath = canonical6(agentDiscoveryConfigPath(home, agent));
   for (const directory of directories) {
     const isHome = resolve14(directory) === resolve14(home);
     if (agent === "hermes") {
@@ -41302,7 +41563,7 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve14
       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(join21(directory, suffix)), raw = read2(path);
+      const path = canonical6(join21(directory, suffix)), raw = read2(path);
       if (raw === null)
         continue;
       const isRootAliasedHomeConfig = agent === "claude" && suffix === ".claude/settings.json" || agent === "codex" && suffix === ".codex/config.toml";
@@ -41318,14 +41579,14 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve14
         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(([id2, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id2 && binding.target.registrations.some((scope) => scope.scope === "project" && scope.projectPath === canonical5(directory))));
+          admittedPlugins = Object.entries(config.enabledPlugins).every(([id2, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id2 && 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(join21(directory, ".claude/commands"));
+      const commands = canonical6(join21(directory, ".claude/commands"));
       safe4(commands);
       if (lstatSync18(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync7(commands).length)
         throw new Error("NATIVE_SKILL_DRIFT: legacy project command discovery requires a dedicated format adapter");
@@ -41336,10 +41597,10 @@ function agentDiscoveryConfigPath(home, agent) {
   return join21(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 ?? resolve14, home = resolve14(options.home), agent = options.agent;
+  const canonical6 = options.canonical ?? resolve14, home = resolve14(options.home), agent = options.agent;
   const sources = [], roots = new Set, builtinNames = [];
-  const witness = (path, format, fields) => {
-    const source = { path: canonical5(path), sha256: null, ...format ? { format, fields } : {} };
+  const witness = (path, format, fields2) => {
+    const source = { path: canonical6(path), sha256: null, ...format ? { format, fields: fields2 } : {} };
     source.sha256 = projected(source);
     sources.push(source);
     return read2(source.path);
@@ -41347,7 +41608,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`);
@@ -41406,11 +41667,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) => isDeepStrictEqual3(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) => isDeepStrictEqual3(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;
   }
@@ -41424,14 +41686,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 = join21(root2, agent === "claude" ? ".claude-plugin/plugin.json" : ".codex-plugin/plugin.json");
     const raw = witness(manifestPath);
@@ -41463,7 +41726,7 @@ function resolveAgentDiscovery(options) {
   if (agent === "claude") {
     const registrations = witness(join21(home, ".claude/plugins/installed_plugins.json"));
     const installed = registrations === null ? {} : parseConfig(registrations, join21(home, ".claude/plugins/installed_plugins.json")).plugins;
-    const commands = canonical5(join21(home, ".claude/commands"));
+    const commands = canonical6(join21(home, ".claude/commands"));
     safe4(commands);
     if (lstatSync18(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync7(commands).length)
       unresolved("legacy home command discovery requires a dedicated format adapter");
@@ -41537,7 +41800,7 @@ function resolveAgentDiscovery(options) {
         roots.add(join21(root2, "skills"));
       }
   }
-  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join21(home, ".hermes/plugins"), join21(home, ".hermes/hermes-agent")].map((path) => canonical5(path))) } : {} };
+  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join21(home, ".hermes/plugins"), join21(home, ".hermes/hermes-agent")].map((path) => canonical6(path))) } : {} };
 }
 
 // src/lib/agent-adapters.ts
@@ -41716,10 +41979,10 @@ function inlineRowsAsTables(value, newline) {
   for (const row of rows) {
     if (!row.startsWith("{") || !row.endsWith("}"))
       return null;
-    const fields = splitTopLevel(row.slice(1, -1), ",");
-    if (!fields)
+    const fields2 = splitTopLevel(row.slice(1, -1), ",");
+    if (!fields2)
       return null;
-    const lines = fields.map((field2) => field2.trim()).filter(Boolean);
+    const lines = fields2.map((field2) => field2.trim()).filter(Boolean);
     if (lines.some((line) => !/^(?:path|name|enabled)\s*=/.test(line)))
       return null;
     const keys2 = lines.map((line) => line.slice(0, line.indexOf("=")).trim());
@@ -41875,7 +42138,7 @@ function disableCodexBundledSkills(text2) {
 }
 
 // src/lib/agent-integration.ts
-var sha3 = (data) => createHash17("sha256").update(data).digest("hex");
+var sha4 = (data) => createHash18("sha256").update(data).digest("hex");
 var ROOTS = NATIVE_SKILL_ROOTS;
 function assertSafePath(path) {
   let cursor = resolve15(path);
@@ -41982,7 +42245,7 @@ function readNativeBytes(path, maximum = 64 * 1024 * 1024) {
   }
 }
 function treeHash(root2) {
-  const hash2 = createHash17("sha256");
+  const hash2 = createHash18("sha256");
   let bytes = 0, files = 0;
   function visit2(path) {
     const stat2 = lstatSync19(path);
@@ -42367,7 +42630,7 @@ function planAgentIntegration(options) {
   const observedNativeSources = [];
   const codexPluginSkills = options.codexNativeCatalog ? reviewCodexPluginSkillControls(options.codexNativeCatalog, nativeSkills.filter((entry) => entry.agent === "codex" && entry.vendor).map((entry) => join22(entry.path, "SKILL.md")), canonicalAgentPath(join22(home, ".codex/plugins/cache"), aliases), resolve15(options.projectDir ?? home), (path) => {
     const bytes = readNativeBytes(path, 1024 * 1024);
-    observedNativeSources.push({ path, sha256: sha3(bytes) });
+    observedNativeSources.push({ path, sha256: sha4(bytes) });
     return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
   }, codexConfig.skills?.config ?? []) : policy.bridge?.codexPluginSkills ?? [];
   const changes = [];
@@ -42395,7 +42658,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: sha3(supervisorAfter) };
+      const supervisor = { path: supervisorPath, runtime: process.execPath, sha256: sha4(supervisorAfter) };
       const after2 = configureHermesHooks(before, supervisor, previous);
       if (before !== after2)
         changes.push({ path, before, after: after2 });
@@ -42442,12 +42705,12 @@ function planAgentIntegration(options) {
     agents: [...new Set([...priorAgents, ...options.agents])].sort(),
     home: resolve15(home),
     includeVendor: true,
-    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join22(dataDir2, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha3(renderHermesSupervisor(bindings.get("hermes").command, bindings.get("hermes").profileId)) } } } : {},
+    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join22(dataDir2, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha4(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(join22(home, ".codex", "skills", ".system"), aliases) + sep5)).map((entry) => ({ path: entry.path, hash: entry.hash })) : policy.bridge?.disabledBuiltins ?? [],
     rootAliases: aliases,
-    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha3(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd), ...options.codexNativeCatalog.plugins === undefined ? {} : { plugins: projectCodexInstalledPluginEntries(options.codexNativeCatalog.plugins) } })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join22(home, ".codex/config.toml"), aliases))?.before === null ? null : sha3(readOptional(canonicalAgentPath(join22(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
+    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha4(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd), ...options.codexNativeCatalog.plugins === undefined ? {} : { plugins: projectCodexInstalledPluginEntries(options.codexNativeCatalog.plugins) } })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join22(home, ".codex/config.toml"), aliases))?.before === null ? null : sha4(readOptional(canonicalAgentPath(join22(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
     discovery: { ...policy.bridge?.discovery, ...Object.fromEntries(discoveryAfter.map((binding) => [binding.agent, binding])) }
   } };
   const serializedPolicy = serializeManagedSkillPolicy(nextPolicy);
@@ -42463,12 +42726,12 @@ function planClaudePreToolUseHookUpdate(options) {
   return planClaudeHookEventsUpdate({ ...options, events: ["PreToolUse"] });
 }
 function claudeSettingsConsumers(home, path, discoveries, aliases) {
-  const canonical5 = (value) => canonicalAgentPath(value, aliases);
+  const canonical6 = (value) => canonicalAgentPath(value, aliases);
   const containsSettings = (root2) => {
-    const distance = relative4(canonical5(root2), path);
+    const distance = relative4(canonical6(root2), path);
     return distance === "" || distance !== ".." && !distance.startsWith(`..${sep5}`) && !isAbsolute17(distance);
   };
-  return discoveries.filter((binding) => binding.agent === "claude" || binding.agent === "opencode" || canonical5(join22(home, AGENT_ADAPTERS[binding.agent].config)) === path || binding.sources.some((source) => canonical5(source.path) === path) || binding.roots.some(containsSettings) || binding.directories?.some((directory) => containsSettings(directory.path))).map((binding) => binding.agent);
+  return discoveries.filter((binding) => binding.agent === "claude" || binding.agent === "opencode" || canonical6(join22(home, AGENT_ADAPTERS[binding.agent].config)) === path || binding.sources.some((source) => canonical6(source.path) === path) || binding.roots.some(containsSettings) || binding.directories?.some((directory) => containsSettings(directory.path))).map((binding) => binding.agent);
 }
 function verifyCoordinatedDiscovery(binding, home, aliases) {
   try {
@@ -42500,7 +42763,7 @@ function planClaudeHookEventsUpdate(options) {
   const path = canonicalAgentPath(join22(home, ".claude", "settings.json"), aliases);
   assertSafePath(path);
   const before = lstatSync19(path, { throwIfNoEntry: false }) ? new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(readNativeBytes(path, 1024 * 1024)) : null;
-  if ((before === null ? "absent" : sha3(before)) !== options.expectedSettingsSha256)
+  if ((before === null ? "absent" : sha4(before)) !== options.expectedSettingsSha256)
     throw new Error("Claude settings preimage changed");
   assertClaudeHookEventsReplacement(before, options.replacement, options.events);
   const agents = bridge.agents;
@@ -42566,7 +42829,7 @@ function atomicWrite2(path, content) {
 function planAgentSettingsWitnessUpgrade(options) {
   const home = resolve15(options.home ?? homedir3()), dataDir2 = options.dataDir ?? getDataDirReadOnly();
   const snapshot2 = readManagedSkillPolicySnapshot(dataDir2);
-  if (!snapshot2 || sha3(snapshot2.text) !== options.expectedPolicySha256)
+  if (!snapshot2 || sha4(snapshot2.text) !== options.expectedPolicySha256)
     throw new Error("Managed policy preimage changed");
   const policy = snapshot2.value, aliases = policy.bridge?.rootAliases ?? [];
   recheckRootAliases(aliases);
@@ -42575,7 +42838,7 @@ function planAgentSettingsWitnessUpgrade(options) {
     throw new Error("Settings witness upgrade requires an existing reviewed native binding");
   const configPath = canonicalAgentPath(join22(home, options.agent === "claude" ? ".claude/settings.json" : ".codex/config.toml"), aliases);
   const settings = readOptional(configPath);
-  if (settings === null || sha3(settings) !== options.expectedSettingsSha256)
+  if (settings === null || sha4(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)
@@ -42583,15 +42846,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 fields2 = source.fields;
+      if (source.hashMode !== undefined || source.format !== "toml" || !Array.isArray(fields2) || !isDeepStrictEqual5(fields2, [...CODEX_DISCOVERY_PROJECTION_FIELDS]) || typeof source.sha256 !== "string")
+        throw new Error("Codex settings witness upgrade found an unrecognized configuration witness");
+      if (projectNativeDiscoveryFields(preimage, "toml", fields2, 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 after = serializeManagedSkillPolicy({ ...policy, bridge: { ...policy.bridge, discovery: { ...policy.bridge.discovery, [options.agent]: replacement } } });
-  return { dataDir: dataDir2, profileId: policy.profileId, changes: [{ path: join22(dataDir2, "agent-policy.json"), before: snapshot2.text, after }], nativeSkills: [], observedPolicy: { path: join22(dataDir2, "agent-policy.json"), before: snapshot2.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: dataDir2, profileId: policy.profileId, changes: [{ path: join22(dataDir2, "agent-policy.json"), before: snapshot2.text, after }], nativeSkills: [], observedPolicy: { path: join22(dataDir2, "agent-policy.json"), before: snapshot2.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 (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+    if (sha4(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");
@@ -42611,7 +42899,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: sha3(plan.observedPolicy.before), expectedSettingsSha256: upgrade.currentSettingsSha256 });
+    const verified = planAgentSettingsWitnessUpgrade({ agent: upgrade.agent, reviewedPreimage: upgrade.reviewedPreimage, home: plan.managedAgentChecks.home, dataDir: plan.dataDir, expectedPolicySha256: sha4(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];
@@ -42639,7 +42927,7 @@ function applyAgentIntegration(plan) {
   chmodSync(backupRoot, 448);
   for (const [index, change] of plan.changes.entries())
     if (change.before !== null) {
-      const backup = join22(backupRoot, `${index}-${sha3(change.path).slice(0, 12)}.backup`);
+      const backup = join22(backupRoot, `${index}-${sha4(change.path).slice(0, 12)}.backup`);
       writeFileSync4(backup, change.before, { mode: 384, flag: "wx" });
       if (readFileSync14(backup, "utf8") !== change.before)
         throw new Error("Native configuration preservation readback failed");
@@ -42658,7 +42946,7 @@ function applyAgentIntegration(plan) {
     }
     recheckRootAliases(aliases);
     for (const source of plan.observedNativeSources ?? [])
-      if (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+      if (sha4(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");
@@ -42670,7 +42958,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(join22(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 } : {} }) + `
+    atomicWrite2(join22(backupRoot, "receipt.json"), JSON.stringify({ version: 1, changes: written.map((change) => ({ path: change.path, beforeHash: change.before === null ? null : sha4(change.before), afterHash: sha4(change.after) })), backups, ...aliases.length ? { rootAliases: aliases } : {} }) + `
 `);
   } catch (error) {
     for (const change of written.reverse()) {
@@ -42749,8 +43037,8 @@ function archiveNativeSkills(inventory, options) {
   const operationId = randomUUID3(), archiveRoot = join22(options.dataDir ?? getDataDir(), "migration", operationId, "native"), receiptPath = join22(archiveRoot, "receipt.json");
   const entries = selected.map((entry, index) => ({
     source: entry.vendor ? join22(entry.path, "SKILL.md") : entry.path,
-    archive: join22(archiveRoot, `${index}-${sha3(entry.path).slice(0, 12)}`),
-    hash: entry.vendor ? sha3(readNativeBytes(join22(entry.path, "SKILL.md"))) : entry.hash,
+    archive: join22(archiveRoot, `${index}-${sha4(entry.path).slice(0, 12)}`),
+    hash: entry.vendor ? sha4(readNativeBytes(join22(entry.path, "SKILL.md"))) : entry.hash,
     ...entry.vendor ? { discoveryOnly: true } : {},
     status: "planned"
   }));
@@ -42761,7 +43049,7 @@ function archiveNativeSkills(inventory, options) {
     const stat2 = lstatSync19(entry.archive);
     if (entry.discoveryOnly ? !stat2.isFile() : !stat2.isDirectory())
       throw new Error("Archive type changed");
-    if ((entry.discoveryOnly ? sha3(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
+    if ((entry.discoveryOnly ? sha4(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
       throw new Error("Archive bytes changed");
   };
   assertSafePath(archiveRoot);
@@ -42881,7 +43169,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 !== join22(dataDir2, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha3(renderHermesSupervisor(command, profile)))
+    if (supervisor?.path !== join22(dataDir2, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha4(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") {
@@ -42979,13 +43267,13 @@ import {
   statSync as statSync9,
   writeFileSync as writeFileSync6
 } from "fs";
-import { basename as basename10, dirname as dirname18, isAbsolute as isAbsolute18, join as join26, normalize as normalize3, relative as relative6, resolve as resolve17, sep as sep8 } from "path";
+import { basename as basename10, dirname as dirname18, isAbsolute as isAbsolute18, join as join26, normalize as normalize4, relative as relative6, resolve as resolve17, sep as sep8 } from "path";
 
 // src/lib/registry-data/index.ts
 var SKILLS = [];
 
 // src/lib/skill-hash.ts
-import { createHash as createHash18 } from "crypto";
+import { createHash as createHash19 } from "crypto";
 import { existsSync as existsSync7, readdirSync as readdirSync9, readFileSync as readFileSync15, statSync as statSync7 } from "fs";
 import { join as join23, sep as sep6 } from "path";
 var CONTENT_HASH_ALGORITHM = "sha256";
@@ -43109,13 +43397,13 @@ function* bundleHashParts(files) {
   yield new TextEncoder().encode("\x00");
 }
 function hashBundleFiles(files) {
-  const hash2 = createHash18(CONTENT_HASH_ALGORITHM);
+  const hash2 = createHash19(CONTENT_HASH_ALGORITHM);
   for (const part of bundleHashParts(files))
     hash2.update(part);
   return hash2.digest("hex");
 }
 async function hashBundleFilesCooperatively(files, check) {
-  const hash2 = createHash18(CONTENT_HASH_ALGORITHM);
+  const hash2 = createHash19(CONTENT_HASH_ALGORITHM);
   let bytesSinceYield = 0;
   for (const part of bundleHashParts(files)) {
     for (let offset = 0;offset < part.byteLength; offset += 64 * 1024) {
@@ -43373,7 +43661,7 @@ var MAX_RUNTIME_TIMEOUT_SECONDS = 900;
 function add2(target, code, message) {
   target.push({ code, message });
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNonEmptyString(value) {
@@ -43401,7 +43689,7 @@ function validatePortableManifestContract(manifest, options = {}) {
   }
   validateRuntimeContract(manifest, issues, options.strict === true);
   const provenance = manifest.provenance;
-  if (provenance && !isRecord(provenance)) {
+  if (provenance && !isRecord2(provenance)) {
     add2(issues, "contract.provenance_invalid", "provenance must be an object");
   } else {
     const sourceCommit = provenance?.source_commit;
@@ -43434,7 +43722,7 @@ function validateRuntimeContract(manifest, issues, strict) {
     }
     return;
   }
-  if (!isRecord(runtime)) {
+  if (!isRecord2(runtime)) {
     add2(issues, "contract.runtime_invalid", "runtime must be an object");
     return;
   }
@@ -43721,7 +44009,7 @@ function readExistingSkillJson(skillPath) {
     return {};
   try {
     const parsed = JSON.parse(readFileSync16(path, "utf-8"));
-    return isRecord2(parsed) ? parsed : {};
+    return isRecord3(parsed) ? parsed : {};
   } catch {
     return {};
   }
@@ -43777,7 +44065,7 @@ function ensurePackageJson(skillPath, manifest) {
   }
   const existing = readJsonObject(pkgPath);
   const bin = {};
-  if (isRecord2(existing.bin)) {
+  if (isRecord3(existing.bin)) {
     for (const [name, value] of Object.entries(existing.bin)) {
       if (typeof value === "string" && value.trim())
         bin[normalizePortableSkillName(name)] = value.replace(/^\.\//, "");
@@ -43788,7 +44076,7 @@ function ensurePackageJson(skillPath, manifest) {
       bin[manifest.name] = binEntry.replace(/^\.\//, "");
   }
   bin[commandName] = entry;
-  const scripts = isRecord2(existing.scripts) ? { ...existing.scripts } : {};
+  const scripts = isRecord3(existing.scripts) ? { ...existing.scripts } : {};
   if (!stringValue(scripts.dev))
     scripts.dev = `bun run ${entry}`;
   writeFileSync5(pkgPath, `${JSON.stringify({
@@ -44009,7 +44297,7 @@ function parseManifestCommands(value) {
   if (!Array.isArray(raw))
     return;
   const commands = raw.map((item) => {
-    if (!isRecord2(item))
+    if (!isRecord3(item))
       return null;
     const name = stringValue(item.name);
     if (!name)
@@ -44026,7 +44314,7 @@ function parseManifestCommands(value) {
 }
 function parseManifestRuntime(value) {
   const raw = value?.runtime;
-  if (!isRecord2(raw))
+  if (!isRecord3(raw))
     return;
   const runtimeName = stringValue(raw.runtime);
   if (!runtimeName)
@@ -44052,7 +44340,7 @@ function parseManifestRuntime(value) {
 }
 function parseManifestProvenance(value) {
   const raw = value?.provenance;
-  if (!isRecord2(raw))
+  if (!isRecord3(raw))
     return;
   const parsed = {};
   if (stringValue(raw.source_commit))
@@ -44068,7 +44356,7 @@ function parseManifestInputs(value) {
   if (!Array.isArray(raw))
     return;
   const inputs = raw.map((item) => {
-    if (!isRecord2(item))
+    if (!isRecord3(item))
       return null;
     const name = stringValue(item.name);
     const type = stringValue(item.type);
@@ -44086,7 +44374,7 @@ function parseManifestInputs(value) {
 function inferPackageCommands(pkg, fallbackName) {
   if (!pkg)
     return;
-  if (isRecord2(pkg.bin)) {
+  if (isRecord3(pkg.bin)) {
     const commands = Object.entries(pkg.bin).filter((entry) => typeof entry[1] === "string" && entry[1].trim().length > 0).map(([name, entry]) => ({
       name: normalizePortableSkillName(name),
       entry: entry.replace(/^\.\//, ""),
@@ -44095,7 +44383,7 @@ function inferPackageCommands(pkg, fallbackName) {
     if (commands.length)
       return commands;
   }
-  const scripts = isRecord2(pkg.scripts) ? pkg.scripts : undefined;
+  const scripts = isRecord3(pkg.scripts) ? pkg.scripts : undefined;
   const dev = stringValue(scripts?.dev);
   const match = dev?.match(/(?:bun\s+run\s+|bun\s+)([^ ]+)/);
   if (match?.[1]) {
@@ -44111,20 +44399,20 @@ function inferRuntimeFromCommands(commands) {
 }
 function readJsonObject(path) {
   const parsed = JSON.parse(readFileSync16(path, "utf-8"));
-  if (!isRecord2(parsed))
+  if (!isRecord3(parsed))
     throw new Error(`${basename8(path)} must contain a JSON object`);
   return parsed;
 }
 function hasPackageDependencies(pkgPath) {
   try {
     const pkg = readJsonObject(pkgPath);
-    const deps = isRecord2(pkg.dependencies) ? Object.keys(pkg.dependencies) : [];
+    const deps = isRecord3(pkg.dependencies) ? Object.keys(pkg.dependencies) : [];
     return deps.length > 0;
   } catch {
     return false;
   }
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringField(value, key) {
@@ -44339,7 +44627,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 (!existsSync9(absoluteSource) || !statSync9(absoluteSource).isDirectory()) {
     throw new Error(`Import directory not found: ${sourceDir}`);
   }
@@ -44406,7 +44694,7 @@ function assertDisjointImportPaths(source, destination) {
   }
 }
 function portPortableSkill(sourcePath, options = {}) {
-  const absoluteSource = normalize3(sourcePath);
+  const absoluteSource = normalize4(sourcePath);
   if (!existsSync9(absoluteSource) || !statSync9(absoluteSource).isDirectory()) {
     throw new Error(`Skill source directory not found: ${sourcePath}`);
   }
@@ -44682,7 +44970,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 add3(target, code, message) {
@@ -46333,7 +46621,7 @@ async function executeSelectedLocal(selected, options = {}) {
     selection: selection2,
     target: "local",
     runtime: runtimeName,
-    inputDigest: `sha256:${createHash19("sha256").update(input).digest("hex")}`,
+    inputDigest: `sha256:${createHash20("sha256").update(input).digest("hex")}`,
     runDirectory,
     ...executionGrant ? { executionGrant } : {},
     ...bindings ? { secretBinding: { schema: bindings.schema, selection: bindings.selection, consumer: bindings.consumer, secretsAuthority: bindings.secretsAuthority, bindings: bindings.bindings } } : {},
@@ -46391,7 +46679,7 @@ async function subprocess(command, cwd, env, input, timeoutMs) {
 // src/lib/remote-run-contract.ts
 var REMOTE_SKILL_RUN_CONTRACT_VERSION = 1;
 function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
-  const record3 = isRecord3(payload) ? payload : {};
+  const record3 = isRecord4(payload) ? payload : {};
   return {
     contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
     ...pickString(record3, "id"),
@@ -46413,7 +46701,7 @@ function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
     ...hasOwn(record3, "details") ? { details: record3.details } : {}
   };
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function hasOwn(record3, key) {
@@ -55623,7 +55911,7 @@ var import_node_http_handler2 = __toESM(require_dist_cjs6(), 1);
 
 // node_modules/@aws-sdk/checksums/dist-cjs/submodules/sha/index.js
 var { toUint8Array: toUint8Array2, concatBytes } = require_serde();
-var { createHmac: createHmac2, createHash: createHash21 } = __require("crypto");
+var { createHmac: createHmac2, createHash: createHash22 } = __require("crypto");
 var { Sha256: Sha2562, Sha256Js, Sha256Node } = require_checksum();
 var BLOCK2 = 64;
 var DIGEST_LENGTH = 20;
@@ -55792,7 +56080,7 @@ class Sha1Js {
 }
 var hasNativeCrypto = (() => {
   try {
-    createHash21("sha1");
+    createHash22("sha1");
     return true;
   } catch {
     return false;
@@ -55832,7 +56120,7 @@ function buildNativeClass() {
       this.finished = false;
     }
     createHash() {
-      return this.secret ? createHmac2("sha1", toBuffer(this.secret)) : createHash21("sha1");
+      return this.secret ? createHmac2("sha1", toBuffer(this.secret)) : createHash22("sha1");
     }
   };
 }
@@ -56700,9 +56988,9 @@ import { mkdirSync as mkdirSync11, readFileSync as readFileSync23, readdirSync a
 import { dirname as dirname23, join as join36 } from "path";
 
 // src/server/auth.ts
-import { createHash as createHash22 } from "crypto";
+import { createHash as createHash23 } from "crypto";
 function hashApiKey(token) {
-  return createHash22("sha256").update(token).digest("hex");
+  return createHash23("sha256").update(token).digest("hex");
 }
 function bearerToken(request2) {
   const header = request2.headers.get("authorization") || "";
@@ -57024,7 +57312,7 @@ function validOperatorScopeEnrollmentInput(input) {
 }
 
 // src/lib/revision.ts
-import { createHash as createHash23 } from "crypto";
+import { createHash as createHash24 } from "crypto";
 var REVISION_ID_PATTERN = /^[0-9a-f]{64}$/;
 function revisionIdOf(content) {
   const canonicalContent = {
@@ -57045,8 +57333,8 @@ function revisionIdOf(content) {
     canonicalContent.archiveReason = content.archiveReason ?? null;
     canonicalContent.replacementSlug = content.replacementSlug ?? null;
   }
-  const canonical5 = JSON.stringify(canonicalContent);
-  return createHash23("sha256").update(canonical5).digest("hex");
+  const canonical6 = JSON.stringify(canonicalContent);
+  return createHash24("sha256").update(canonical6).digest("hex");
 }
 function revisionIdOfRecord(record3) {
   return revisionIdOf(record3);
@@ -58130,7 +58418,7 @@ function nextMonthPrefix(monthPrefix) {
 }
 
 // src/server/skills-api.ts
-import { createHash as createHash24 } from "crypto";
+import { createHash as createHash25 } from "crypto";
 var SLUG_PATTERN = /^[a-z0-9][a-z0-9._-]*$/;
 var SHA256_HEX2 = /^[0-9a-f]{64}$/;
 var MAX_SLUG_LENGTH = 128;
@@ -58320,7 +58608,7 @@ async function parsePublishRequest(request2, config) {
     if (bundleBytes.byteLength === 0) {
       throw new SkillRequestError(400, "BUNDLE_EMPTY", "the uploaded bundle is empty");
     }
-    const sha2562 = createHash24("sha256").update(bundleBytes).digest("hex");
+    const sha2562 = createHash25("sha256").update(bundleBytes).digest("hex");
     const claimed = optionalString(manifest.bundleSha256);
     if (claimed)
       assertSha2562(claimed);
@@ -58435,7 +58723,7 @@ async function readPublishedBundle(store, artifactStorage, principal, slug) {
   if (!bytes) {
     throw new SkillRequestError(503, "BUNDLE_BACKEND_UNAVAILABLE", "bundle storage backend unavailable");
   }
-  const actual = createHash24("sha256").update(bytes).digest("hex");
+  const actual = createHash25("sha256").update(bytes).digest("hex");
   if (actual !== record3.bundleSha256) {
     throw new SkillRequestError(500, "BUNDLE_DIGEST_DRIFT", `stored bundle for '${slug}' hashes to ${actual} but was published as ${record3.bundleSha256}`);
   }
@@ -58583,7 +58871,7 @@ async function readSkillVersionBundle(store, artifactStorage, principal, slug, v
   const bytes = await artifactStorage.readBundle(bundle2);
   if (!bytes)
     throw new SkillRequestError(503, "BUNDLE_BACKEND_UNAVAILABLE", "bundle storage backend unavailable");
-  const actual = createHash24("sha256").update(bytes).digest("hex");
+  const actual = createHash25("sha256").update(bytes).digest("hex");
   if (actual !== found.bundleSha256) {
     throw new SkillRequestError(500, "BUNDLE_DIGEST_DRIFT", `stored bundle for '${slug}@${version2}' hashes to ${actual} but was published as ${found.bundleSha256}`);
   }
@@ -59286,7 +59574,7 @@ class RuntimeExecutionStore {
 }
 
 // src/sdk/execution/admission.ts
-import { createHash as createHash26 } from "crypto";
+import { createHash as createHash27 } from "crypto";
 
 // src/sdk/execution/image-profile.ts
 class ImageProfileResolutionError extends Error {
@@ -59898,11 +60186,11 @@ function ownedAdmission(admission) {
   };
 }
 function digestInput(input) {
-  return createHash26("sha256").update(canonicalJson2(input)).digest("hex");
+  return createHash27("sha256").update(canonicalJson2(input)).digest("hex");
 }
 
 // src/sdk/execution/dispatchers/ecs.ts
-import { createHash as createHash27 } from "crypto";
+import { createHash as createHash28 } from "crypto";
 
 // src/sdk/execution/state-machine.ts
 var LEGAL_TRANSITIONS = {
@@ -63302,13 +63590,13 @@ function observedTask(states, taskArn) {
   return state2.lastStatus === "STOPPED" || LIVE_TASK_STATUSES.has(state2.lastStatus) ? state2 : undefined;
 }
 function clientTokenFor(runId3, attemptId) {
-  return createHash27("sha256").update(`${runId3}\x00${attemptId}`).digest("hex").slice(0, CLIENT_TOKEN_BYTES * 2);
+  return createHash28("sha256").update(`${runId3}\x00${attemptId}`).digest("hex").slice(0, CLIENT_TOKEN_BYTES * 2);
 }
 function startedByFor(runId3, attemptNumber) {
   return `skills-exec/${runId3}/a${attemptNumber}`;
 }
 function requestDigestFor(admission, attemptId) {
-  return createHash27("sha256").update(canonicalJson2({ admission, attemptId })).digest("hex");
+  return createHash28("sha256").update(canonicalJson2({ admission, attemptId })).digest("hex");
 }
 
 class EcsDispatcher {
@@ -63604,10 +63892,10 @@ function validText(value) {
 }
 
 // src/server/runtime-policy.ts
-import { createHash as createHash29, createHmac as createHmac3, timingSafeEqual as timingSafeEqual2 } from "crypto";
+import { createHash as createHash30, createHmac as createHmac3, timingSafeEqual as timingSafeEqual2 } from "crypto";
 
 // src/server/runtime-pure-contract.ts
-import { createHash as createHash28 } from "crypto";
+import { createHash as createHash29 } from "crypto";
 var PURE_DESCRIPTOR = Object.freeze({
   id: "regex-test.v1",
   runtime: "bun",
@@ -63631,7 +63919,7 @@ var PURE_LIMITS = Object.freeze({
   maxArtifactsBytes: 0,
   maxConcurrency: 1
 });
-var hash2 = (bytes) => createHash28("sha256").update(bytes).digest("hex");
+var hash2 = (bytes) => createHash29("sha256").update(bytes).digest("hex");
 var object6 = (v2) => {
   if (!v2 || typeof v2 !== "object" || Array.isArray(v2))
     throw Error("Pure contract requires an object");
@@ -63860,7 +64148,7 @@ function verifyRuntimeToken(token, key, admission, attempt, now = Date.now()) {
   const actual = Buffer.from(token);
   return actual.length === expected.length && timingSafeEqual2(actual, expected);
 }
-var hashBytes = (bytes) => createHash29("sha256").update(bytes).digest("hex");
+var hashBytes = (bytes) => createHash30("sha256").update(bytes).digest("hex");
 
 // src/server/runtime-api.ts
 async function createRuntimeService(options) {
@@ -66048,7 +66336,7 @@ async function readJson(request2, limitBytes) {
   if (!text2.trim())
     return {};
   const parsed = JSON.parse(text2);
-  return isRecord4(parsed) ? parsed : {};
+  return isRecord5(parsed) ? parsed : {};
 }
 function pathSegments(pathname) {
   return pathname.split("/").filter(Boolean).map(decodeSegment);
@@ -66069,7 +66357,7 @@ function json4(payload, init = {}) {
     headers: { "Cache-Control": "no-store", ...init.headers }
   });
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function clampInt(value, fallback, max) {
@@ -70232,7 +70520,7 @@ var localRunExecutor = {
 // src/sdk/storage.ts
 var artifactStorageSeam = ArtifactStorage;
 // src/sdk/outputs.ts
-import { createHash as createHash30 } from "crypto";
+import { createHash as createHash31 } from "crypto";
 class DatabaseOnlyObjectStore {
   usesS3 = false;
   async materialize(run, artifact, body4) {
@@ -70279,7 +70567,7 @@ function createGovernedArtifactWriter(options) {
       const stamped = {
         ...meta,
         byteSize: outputBytes,
-        sha256: createHash30("sha256").update(persistedBytes).digest("hex"),
+        sha256: createHash31("sha256").update(persistedBytes).digest("hex"),
         visibility: options.visibility ?? config.defaultVisibility,
         ...config.artifactTtlSeconds !== undefined ? { expiresAt: expiresAtFor(createdAt, config.artifactTtlSeconds) } : {}
       };
@@ -73750,15 +74038,15 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
       } catch (_err) {}
     }
     const input = payload.value;
-    const isDate = input instanceof Date;
-    const isValidDate = isDate && !Number.isNaN(input.getTime());
+    const isDate2 = input instanceof Date;
+    const isValidDate = isDate2 && !Number.isNaN(input.getTime());
     if (isValidDate)
       return payload;
     payload.issues.push({
       expected: "date",
       code: "invalid_type",
       input,
-      ...isDate ? { received: "Invalid Date" } : {},
+      ...isDate2 ? { received: "Invalid Date" } : {},
       inst
     });
     return payload;
@@ -89046,7 +89334,7 @@ function date4(params) {
   return _coercedDate(ZodDate2, params);
 }
 // src/lib/canonical-json.ts
-import { createHash as createHash31 } from "crypto";
+import { createHash as createHash32 } from "crypto";
 function canonicalJson3(value, maximumBytes = 2 * 1024 * 1024) {
   return canonicalJsonAtDepth(value, maximumBytes, 64);
 }
@@ -89090,7 +89378,7 @@ function canonicalJsonAtDepth(value, maximumBytes, maximumDepth) {
   return visit3(value, 0);
 }
 function canonicalJsonSha256(value, maximumBytes) {
-  return createHash31("sha256").update(canonicalJson3(value, maximumBytes)).digest("hex");
+  return createHash32("sha256").update(canonicalJson3(value, maximumBytes)).digest("hex");
 }
 
 // src/lib/remote-recurring-contract.ts
@@ -89956,7 +90244,7 @@ function creditCheckoutFailure(value, status, key) {
 
 // src/lib/remote-profile.ts
 function customerNamePatch(input2, field2) {
-  if (!isRecord5(input2) || Object.keys(input2).length !== 1 || !Object.hasOwn(input2, field2))
+  if (!isRecord6(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) {
@@ -89964,22 +90252,22 @@ function customerNamePatch(input2, field2) {
   }
   return { [field2]: value.trim() };
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function string4(value) {
   return typeof value === "string" && value.length > 0;
 }
 function parseUpdatedProfile(value) {
-  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)) {
+  const user = isRecord6(value) && value.user;
+  if (!isRecord6(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 = isRecord5(value) && value.organization;
-  if (!isRecord5(organization2) || !string4(organization2.id) || !string4(organization2.slug) || !string4(organization2.name)) {
+  const organization2 = isRecord6(value) && value.organization;
+  if (!isRecord6(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 } };
@@ -91204,7 +91492,7 @@ async function requestInvitationEmail(origin, action, input2) {
 }
 
 // src/lib/remote-private-publications.ts
-import { createHash as createHash32 } from "crypto";
+import { createHash as createHash33 } from "crypto";
 var PRIVATE_PUBLICATION_MAX_BYTES = 16 * 1024 * 1024;
 var failures2 = {
   INVALID_REQUEST: [400, "The publication request is invalid."],
@@ -91251,7 +91539,7 @@ var hash4 = (v2) => typeof v2 === "string" && /^[a-f0-9]{64}$/.test(v2);
 var record9 = (v2) => !!v2 && typeof v2 === "object" && !Array.isArray(v2);
 var exact = (v2, keys3) => record9(v2) && Object.keys(v2).sort().join(",") === keys3.sort().join(",");
 var date5 = (v2) => typeof v2 === "string" && /^\d{4}-\d\d-\d\dT[0-9:.]+(?:Z|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/.test(v2) && Number.isFinite(Date.parse(v2));
-var publicationSha256 = (bytes) => createHash32("sha256").update(bytes).digest("hex");
+var publicationSha256 = (bytes) => createHash33("sha256").update(bytes).digest("hex");
 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 || !hash4(value.archiveSha256) || !Number.isSafeInteger(value.archiveByteSize) || Number(value.archiveByteSize) < 1 || Number(value.archiveByteSize) > PRIVATE_PUBLICATION_MAX_BYTES)
     return bad();
@@ -91550,7 +91838,7 @@ async function requestAuthApi(instance, path2, options) {
   const text3 = await res.text();
   const body4 = text3 ? parseJsonBody(text3) : {};
   if (!res.ok) {
-    const record10 = isRecord6(body4) ? body4 : {};
+    const record10 = isRecord7(body4) ? body4 : {};
     const detail = typeof record10.detail === "string" ? record10.detail : undefined;
     const error61 = typeof record10.error === "string" ? record10.error : undefined;
     const code = typeof record10.code === "string" ? record10.code : undefined;
@@ -91578,7 +91866,7 @@ function condenseErrorBody(text3) {
     return collapsed;
   return `${collapsed.slice(0, MAX_ERROR_DETAIL_LENGTH - 1).trimEnd()}\u2026`;
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
@@ -92086,16 +92374,16 @@ function resultSnapshot(input2, requestId) {
     const value = snapshot2(input2, SKILL_OPERATION_LIMITS.resultBytes).value;
     if (!record10(value) || value.contractVersion !== 1 || value.requestId !== requestId)
       throw Error();
-    const fields = ["contractVersion", "requestId", "status"];
+    const fields2 = ["contractVersion", "requestId", "status"];
     if (value.status === "succeeded")
-      fields.push("output");
+      fields2.push("output");
     else if (value.status === "refused") {
-      fields.push("code");
+      fields2.push("code");
       if (!refusalCodes.has(value.code))
         throw Error();
     } else if (!["not-executed", "pending", "unknown"].includes(value.status))
       throw Error();
-    if (!exact2(value, fields))
+    if (!exact2(value, fields2))
       throw Error();
     return value;
   } catch {