@hasna/skills 0.10.20 → 0.10.22

package/dist/index.js

@@ -7262,7 +7262,7 @@ import {
   statSync as statSync10,
   writeFileSync as writeFileSync8
 } from "fs";
-import { basename as basename11, dirname as dirname19, isAbsolute as isAbsolute17, join as join29, normalize as normalize3, relative as relative6, resolve as resolve17, sep as sep8 } from "path";
+import { basename as basename11, dirname as dirname19, isAbsolute as isAbsolute17, join as join29, normalize as normalize4, relative as relative6, resolve as resolve17, sep as sep8 } from "path";
 
 // src/lib/registry-data/index.ts
 var SKILLS = [];
@@ -9038,12 +9038,14 @@ function assertAgentPolicyCollections(policy) {
     }
   if (bridge.codexPluginSkills !== undefined)
     for (const control of array(bridge.codexPluginSkills, 4096)) {
-      requireBound(object(control) && Object.keys(control).every((key) => ["name", "pluginId", "namespace", "pluginParent", "manifestSha256", "appSha256"].includes(key)));
+      requireBound(object(control) && Object.keys(control).every((key) => ["name", "pluginId", "namespace", "pluginParent", "manifestSha256", "appSha256", "remotePluginId"].includes(key)));
       text(control.name, 129);
       text(control.pluginId, 1024);
       text(control.namespace, 64);
       text(control.pluginParent);
       requireBound(isAbsolute2(control.pluginParent) && resolve2(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.appSha256 !== undefined)
         requireBound(typeof control.appSha256 === "string" && /^[a-f0-9]{64}$/.test(control.appSha256));
     }
@@ -9066,8 +9068,8 @@ function assertAgentPolicyCollections(policy) {
       text(source.path);
       requireBound(source.sha256 === null || typeof source.sha256 === "string" && /^[a-f0-9]{64}$/.test(source.sha256));
       if (source.hashMode !== undefined)
-        requireBound(["bytes", "path-bytes", "claude-plugin-registry", "claude-marketplace-registry", "claude-settings-v1", "claude-settings-v2", "claude-settings-v3", "claude-marketplace-registry-v2", "codex-settings-v1"].includes(source.hashMode) && source.format === undefined && source.fields === undefined && (source.hashMode === "bytes" || source.sha256 !== null));
-      if (source.hashMode === "codex-settings-v1")
+        requireBound(["bytes", "path-bytes", "claude-plugin-registry", "claude-marketplace-registry", "claude-settings-v1", "claude-settings-v2", "claude-settings-v3", "claude-marketplace-registry-v2", "codex-settings-v1", "codex-settings-v2"].includes(source.hashMode) && source.format === undefined && source.fields === undefined && (source.hashMode === "bytes" || source.sha256 !== null));
+      if (source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2")
         requireBound(agent === "codex" && value.agent === "codex" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute2(source.path) && resolve2(source.path) === source.path && basename2(source.path) === "config.toml");
       if (source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3")
         requireBound(agent === "claude" && value.agent === "claude" && value.method === "reviewed" && !/[\x00-\x1f\x7f]/.test(source.path) && isAbsolute2(source.path) && resolve2(source.path) === source.path && basename2(source.path) === "settings.json");
@@ -9103,10 +9105,10 @@ function assertAgentPolicyCollections(policy) {
 }
 
 // src/lib/agent-discovery.ts
-import { createHash as createHash17 } from "crypto";
+import { createHash as createHash18 } from "crypto";
 import { lstatSync as lstatSync21, readFileSync as readFileSync17, readdirSync as readdirSync10, realpathSync as realpathSync7 } from "fs";
 import { basename as basename9, dirname as dirname17, isAbsolute as isAbsolute16, join as join27, resolve as resolve15, sep as sep6 } from "path";
-import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
+import { isDeepStrictEqual as isDeepStrictEqual4 } from "util";
 
 // node_modules/yaml/dist/index.js
 var composer = require_composer();
@@ -10877,7 +10879,7 @@ function replaceSkillSession(expected, replacement, plan, options = {}, beforeCo
 // package.json
 var package_default = {
   name: "@hasna/skills",
-  version: "0.10.20",
+  version: "0.10.22",
   description: "Skills library for AI coding agents",
   type: "module",
   bin: {
@@ -13027,6 +13029,25 @@ function hashNativeJsonControls(text2, excludedMetadata) {
 import { basename as basename5, dirname as dirname10, join as join14, relative as relative4, resolve as resolve9, sep as sep4 } from "path";
 import { lstatSync as lstatSync12, readdirSync as readdirSync6, readlinkSync as readlinkSync3, 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 isAbsolute10, normalize as normalize2 } from "path";
@@ -13036,7 +13057,6 @@ import { execFile, spawn } from "child_process";
 import { realpathSync as realpathSync3, statSync as statSync7 } from "fs";
 import { isAbsolute as isAbsolute9 } 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)
@@ -13054,7 +13074,7 @@ async function connectCodexHookRpc(options) {
   } catch {
     throw new Error("CODEX_HOOK_TRUST_NATIVE_UNAVAILABLE");
   }
-  if (!SUPPORTED_CODEX_HOOK_VERSIONS.includes(version))
+  if (!supportsCodexNativeCapability(version, "hooks"))
     throw new Error("CODEX_HOOK_TRUST_NATIVE_UNSUPPORTED_VERSION");
   const current = statSync7(binary);
   if (realpathSync3(found) !== binary || ["dev", "ino", "size", "mtimeMs", "ctimeMs"].some((k) => stat[k] !== current[k]))
@@ -13179,12 +13199,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 refuse() {
   throw new Error("CODEX_NATIVE_SKILL_CATALOG_INVALID");
 }
 var object4 = (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) && isAbsolute10(value);
 function projectCodexNativeSkillCatalog(response, cwd) {
   if (!absolutePath2(cwd) || !object4(response) || !Array.isArray(response.data) || response.data.length !== 1)
@@ -13212,7 +13232,11 @@ function projectCodexInstalledPlugins(response) {
     for (const value of marketplace.plugins) {
       if (!object4(value) || !scalar(value.id, MAX_PLUGIN_ID_BYTES) || !scalar(value.name, MAX_NAME_BYTES) || value.id !== `${value.name}@${marketplace.name}`)
         refuse();
-      plugins.push({ ...value, marketplace: marketplace.name });
+      plugins.push({
+        ...value,
+        marketplace: marketplace.name,
+        sourceType: object4(value.source) && value.source.type === "remote" ? "remote" : undefined
+      });
     }
   }
   return projectCodexInstalledPluginEntries(plugins);
@@ -13222,13 +13246,21 @@ function projectCodexInstalledPluginEntries(value) {
     refuse();
   const ids = new Set;
   return value.map((item) => {
-    if (!object4(item) || !scalar(item.id, MAX_PLUGIN_ID_BYTES) || !scalar(item.name, MAX_NAME_BYTES) || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean" || item.localVersion !== null && !scalar(item.localVersion, MAX_NAME_BYTES))
+    if (!object4(item) || !scalar(item.id, MAX_PLUGIN_ID_BYTES) || !scalar(item.name, MAX_NAME_BYTES) || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean" || item.localVersion !== null && !scalar(item.localVersion, MAX_NAME_BYTES) || item.remotePluginId !== undefined && item.remotePluginId !== null && !remotePluginIdentifier(item.remotePluginId) || item.sourceType !== undefined && item.sourceType !== "remote")
       refuse();
     const at = item.id.lastIndexOf("@");
     if (at < 1 || item.id.slice(0, at) !== item.name || at === item.id.length - 1 || ids.has(item.id))
       refuse();
     ids.add(item.id);
-    return { id: item.id, name: item.name, installed: item.installed, enabled: item.enabled, localVersion: item.localVersion ?? null };
+    return {
+      id: item.id,
+      name: item.name,
+      installed: item.installed,
+      enabled: item.enabled,
+      localVersion: item.localVersion ?? null,
+      ...item.sourceType === "remote" ? { sourceType: "remote" } : {},
+      ...item.remotePluginId == null ? {} : { remotePluginId: item.remotePluginId }
+    };
   });
 }
 async function captureCodexNativeSkillCatalog(options, connect = connectCodexHookRpc) {
@@ -13241,7 +13273,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] });
@@ -13299,6 +13331,21 @@ var CODEX_DEFAULT_AGENT_PLUGIN_VERSION = "1.0.0";
 function refuse2() {
   throw new Error("CODEX_NATIVE_SKILL_IDENTITY_UNSUPPORTED: review native plugin names and hook controls");
 }
+function remoteInstallationMatches(parent, remotePluginId, read2) {
+  try {
+    if (!remotePluginIdentifier(remotePluginId) || !lstatSync12(parent).isDirectory() || realpathSync5(parent) !== parent)
+      return false;
+    const path = join14(parent, ".codex-remote-plugin-install.json"), stat = lstatSync12(path, { throwIfNoEntry: false });
+    if (!stat?.isFile() || stat.isSymbolicLink() || stat.size > 16384)
+      return false;
+    const text2 = read2(path);
+    hashNativeJsonControls(text2);
+    const value = JSON.parse(text2);
+    return Boolean(value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 2 && value.schema_version === 1 && value.remote_plugin_id === remotePluginId);
+  } catch {
+    return false;
+  }
+}
 function appControls(path, read2) {
   const text2 = read2(path);
   let value, sha2562;
@@ -13388,6 +13435,10 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read2) {
     for (const parent of new Set(controls.map((control) => control.pluginParent))) {
       if (!parent.startsWith(cache + sep4) || !lstatSync12(parent, { throwIfNoEntry: false })?.isDirectory())
         return false;
+      for (const control of controls.filter((control2) => control2.pluginParent === parent)) {
+        if (control.remotePluginId !== undefined && !remoteInstallationMatches(parent, control.remotePluginId, read2))
+          return false;
+      }
       const names = readdirSync6(parent);
       entries += names.length;
       if (entries > 4096)
@@ -13414,7 +13465,7 @@ function reviewedCodexPluginCapabilitiesUnchanged(cache, controls, read2) {
   }
 }
 function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read2, rules) {
-  if (catalog?.version !== "codex-cli 0.159.2" || catalog.cwd !== cwd)
+  if (!supportsCodexNativeCapability(catalog?.version, "qualified-skill-catalog") || catalog.cwd !== cwd)
     refuse2();
   const skills = projectCodexNativeSkillCatalog({ data: [{ cwd, errors: [], skills: catalog.skills }] }, cwd);
   const allowed = new Set(documents), result = [];
@@ -13441,20 +13492,28 @@ function reviewCodexPluginSkillControls(catalog, documents, cache, cwd, read2, r
     const listed = skills.filter((skill) => skill.path === document2);
     if (listed.length > 1)
       refuse2();
+    let remotePluginId;
     if (listed.length === 1) {
       if (listed[0].name !== parsed.name || listed[0].pluginId !== expectedPluginId)
         refuse2();
     } else {
-      const installed = installedPlugins.filter((plugin) => plugin.id === expectedPluginId && plugin.name === pluginName);
-      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled || !installed[0].localVersion)
+      const installed = installedPlugins.filter((plugin2) => plugin2.id === expectedPluginId && plugin2.name === pluginName);
+      if (installed.length !== 1 || !installed[0].installed || !installed[0].enabled)
         refuse2();
-      if (installed[0].localVersion !== basename5(dirname10(dirname10(dirname10(document2)))))
-        continue;
+      const plugin = installed[0];
+      if (plugin.localVersion !== null) {
+        if (plugin.localVersion !== basename5(dirname10(dirname10(dirname10(document2)))))
+          continue;
+      } else {
+        if (plugin.sourceType !== "remote" || !plugin.remotePluginId || !remoteInstallationMatches(parsed.pluginParent, plugin.remotePluginId, read2) || !lstatSync12(document2).isFile() || realpathSync5(document2) !== document2)
+          refuse2();
+        remotePluginId = plugin.remotePluginId;
+      }
       const exactPathDeny = Array.isArray(rules) && rules.some((rule) => rule?.path === document2 && rule?.enabled === false);
       if (!exactPathDeny || !isCodexNativeSkillDisabled({ name: parsed.name, path: document2, pluginId: expectedPluginId, enabled: true }, rules))
         refuse2();
     }
-    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)
     refuse2();
@@ -13470,7 +13529,7 @@ function isReviewedCodexPluginSkillDisabled(document2, cache, controls, rules, r
     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)
+  if (!reviewed || reviewed.remotePluginId !== undefined && !remoteInstallationMatches(reviewed.pluginParent, reviewed.remotePluginId, read2))
     return false;
   return isCodexNativeSkillDisabled({ name: parsed.name, path: document2, pluginId: reviewed.pluginId, enabled: true }, rules);
 }
@@ -13489,7 +13548,7 @@ enabled = false
   return text2;
 }
 
-// src/lib/codex-settings-witness.ts
+// src/lib/codex-settings-witness-v1.ts
 import { createHash as createHash9 } from "crypto";
 var sha = (text2) => createHash9("sha256").update(text2).digest("hex");
 var EFFORT = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
@@ -13583,19 +13642,167 @@ function captureCodexSettings(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const text2 = readNativeSettingsWitnessFile(path, budget, "config.toml");
   return { path, hashMode: "codex-settings-v1", sha256: hashCodexSettingsReplacement(text2) };
 }
+
+// src/lib/codex-settings-witness.ts
+import { createHash as createHash10 } from "crypto";
+var sha2 = (text2) => createHash10("sha256").update(text2).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 need4(value) {
+  if (!value)
+    throw new Error("Invalid Codex settings witness");
+}
+function isRecord3(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function isDate(value) {
+  return value instanceof Date;
+}
+function numericTokens2(text2) {
+  const result = [];
+  for (let at = 0;at < text2.length; ) {
+    const char = text2[at];
+    if (char === "#") {
+      while (at < text2.length && text2[at] !== `
+`)
+        at++;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      const quote = char, triple = text2.slice(at, at + 3) === quote.repeat(3);
+      at += triple ? 3 : 1;
+      while (at < text2.length) {
+        if (quote === '"' && text2[at] === "\\") {
+          at += 2;
+          continue;
+        }
+        if (text2.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 < text2.length && !/[\s,\]{}#=]/.test(text2[at]))
+        at++;
+      if (at > start) {
+        result.push(text2.slice(start, at));
+        continue;
+      }
+    }
+    at++;
+  }
+  return result.sort();
+}
+function canonical4(value, depth = 0, budget = { remaining: 65536 }) {
+  need4(depth <= 32 && --budget.remaining >= 0);
+  if (value === null)
+    return ["null"];
+  if (typeof value === "string")
+    return ["string", value];
+  if (typeof value === "boolean")
+    return ["boolean", value];
+  if (typeof value === "number") {
+    need4(Number.isFinite(value));
+    return ["number", String(value)];
+  }
+  if (isDate(value)) {
+    need4(Number.isFinite(value.getTime()));
+    return ["date", value.toISOString()];
+  }
+  if (Array.isArray(value))
+    return ["array", value.map((child) => canonical4(child, depth + 1, budget))];
+  need4(isRecord3(value));
+  return ["object", Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, child]) => [key, canonical4(child, depth + 1, budget)])];
+}
+function normalize3(config) {
+  if (isRecord3(config.hooks)) {
+    delete config.hooks.state;
+    if (!Object.keys(config.hooks).length)
+      delete config.hooks;
+  }
+  if (isRecord3(config.skills) && Array.isArray(config.skills.config)) {
+    const skills = config.skills;
+    const retained = skills.config.filter((entry) => !disablesOneSkill(entry));
+    if (retained.length !== skills.config.length) {
+      if (retained.length)
+        skills.config = retained;
+      else
+        delete skills.config;
+    }
+    if (!Object.keys(skills).length)
+      delete config.skills;
+  }
+  inference(config);
+  if (isRecord3(config.profiles)) {
+    for (const profile of Object.values(config.profiles))
+      if (isRecord3(profile))
+        inference(profile);
+  }
+}
+function disablesOneSkill(entry) {
+  if (!isRecord3(entry) || entry.enabled !== false)
+    return false;
+  const keys = Object.keys(entry);
+  if (!keys.every((key) => key === "path" || key === "name" || key === "enabled"))
+    return false;
+  const selector = ["path", "name"].filter((key) => Object.hasOwn(entry, key));
+  return selector.length === 1 && typeof entry[selector[0]] === "string" && entry[selector[0]].length > 0;
+}
+function inference(target) {
+  for (const key of INFERENCE)
+    if (Object.hasOwn(target, key)) {
+      const value = target[key];
+      if (key === "model")
+        need4(typeof value === "string" && MODEL.test(value));
+      else
+        need4(typeof value === "string" && (key === "model_reasoning_effort" ? EFFORT2.has(value) : VERBOSITY2.has(value)));
+      delete target[key];
+    }
+}
+function settingsDigest2(text2) {
+  let config;
+  try {
+    config = Bun.TOML.parse(text2);
+  } catch {
+    throw new Error("Invalid Codex settings witness");
+  }
+  need4(isRecord3(config));
+  normalize3(config);
+  return sha2(`hasna.skills.codex-settings.v2\x00${JSON.stringify([canonical4(config), numericTokens2(text2)])}`);
+}
+function hashCodexSettingsReplacementV2(text2, budget = { remaining: 256 * 1024 * 1024 }) {
+  need4(Buffer.byteLength(text2) <= 1024 * 1024 && budget.remaining >= Buffer.byteLength(text2));
+  budget.remaining -= Buffer.byteLength(text2);
+  return settingsDigest2(text2);
+}
+function captureCodexSettingsV2(path, budget = { remaining: 256 * 1024 * 1024 }) {
+  const text2 = readNativeSettingsWitnessFile(path, budget, "config.toml");
+  return { path, hashMode: "codex-settings-v2", sha256: settingsDigest2(text2) };
+}
+function readCodexSettingsPreimage(path, budget = { remaining: 2 * 1024 * 1024 }) {
+  return readNativeSettingsWitnessFile(path, budget, "config.toml");
+}
 function upgradeCodexSettingsWitness(previous, reviewedSettingsPath) {
-  need3(previous && Object.keys(previous).every((key) => ["path", "hashMode", "sha256"].includes(key)) && (previous.hashMode === undefined || previous.hashMode === "bytes") && /^[a-f0-9]{64}$/.test(previous.sha256));
+  need4(previous && Object.keys(previous).every((key) => ["path", "hashMode", "sha256"].includes(key)) && (previous.hashMode === undefined || previous.hashMode === "bytes" || previous.hashMode === "codex-settings-v1") && /^[a-f0-9]{64}$/.test(previous.sha256));
   const budget = { remaining: 2 * 1024 * 1024 };
   const before = readNativeSettingsWitnessFile(reviewedSettingsPath, budget, "config.toml"), current = readNativeSettingsWitnessFile(previous.path, budget, "config.toml");
-  need3(sha(before) === previous.sha256);
-  const sha2562 = hashCodexSettingsReplacement(current);
-  if (hashCodexSettingsReplacement(before) !== sha2562)
+  need4((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/agent-integration.ts
-import { createHash as createHash11, randomUUID as randomUUID2 } from "crypto";
+import { createHash as createHash12, randomUUID as randomUUID2 } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
 import { existsSync as existsSync8, lstatSync as lstatSync15, statSync as statSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync12, readdirSync as readdirSync8, opendirSync as opendirSync3, readlinkSync as readlinkSync4, realpathSync as realpathSync6, renameSync as renameSync2, rmdirSync as rmdirSync2, writeFileSync as writeFileSync4, unlinkSync as unlinkSync3, chmodSync, openSync as openSync8, closeSync as closeSync8, fsyncSync as fsyncSync2, fstatSync as fstatSync8, readSync as readSync6, constants as constants7, linkSync } from "fs";
 import { dirname as dirname11, join as join17, resolve as resolve10, relative as relative5, isAbsolute as isAbsolute11, sep as sep5 } from "path";
 import { homedir as homedir2 } from "os";
@@ -13681,7 +13888,7 @@ function requiresCliSkillLoading(dataDir2 = getDataDirReadOnly()) {
 }
 
 // src/lib/agent-bridge.ts
-import { createHash as createHash10 } from "crypto";
+import { createHash as createHash11 } from "crypto";
 import { lstatSync as lstatSync14, readFileSync as readFileSync11, readdirSync as readdirSync7 } from "fs";
 import { join as join16 } from "path";
 var CLI_BRIDGE_NAME = "skills-cli";
@@ -13700,7 +13907,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 = createHash10("sha256").update(markdown).digest("hex");
+var CLI_BRIDGE_DIGEST = createHash11("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)}
@@ -13992,7 +14199,7 @@ function disableCodexBundledSkills(text2) {
 }
 
 // src/lib/agent-integration.ts
-var sha2 = (data) => createHash11("sha256").update(data).digest("hex");
+var sha3 = (data) => createHash12("sha256").update(data).digest("hex");
 var ROOTS = NATIVE_SKILL_ROOTS;
 function assertSafePath(path) {
   let cursor = resolve10(path);
@@ -14099,7 +14306,7 @@ function readNativeBytes(path, maximum = 64 * 1024 * 1024) {
   }
 }
 function treeHash(root) {
-  const hash2 = createHash11("sha256");
+  const hash2 = createHash12("sha256");
   let bytes = 0, files = 0;
   function visit2(path) {
     const stat = lstatSync15(path);
@@ -14484,7 +14691,7 @@ function planAgentIntegration(options) {
   const observedNativeSources = [];
   const codexPluginSkills = options.codexNativeCatalog ? reviewCodexPluginSkillControls(options.codexNativeCatalog, nativeSkills.filter((entry) => entry.agent === "codex" && entry.vendor).map((entry) => join17(entry.path, "SKILL.md")), canonicalAgentPath(join17(home, ".codex/plugins/cache"), aliases), resolve10(options.projectDir ?? home), (path) => {
     const bytes = readNativeBytes(path, 1024 * 1024);
-    observedNativeSources.push({ path, sha256: sha2(bytes) });
+    observedNativeSources.push({ path, sha256: sha3(bytes) });
     return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
   }, codexConfig.skills?.config ?? []) : policy.bridge?.codexPluginSkills ?? [];
   const changes = [];
@@ -14512,7 +14719,7 @@ function planAgentIntegration(options) {
         throw new Error("Refusing to overwrite an unrecognized Hermes supervisor");
       if (supervisorBefore !== supervisorAfter)
         changes.push({ path: supervisorPath, before: supervisorBefore, after: supervisorAfter });
-      const supervisor = { path: supervisorPath, runtime: process.execPath, sha256: sha2(supervisorAfter) };
+      const supervisor = { path: supervisorPath, runtime: process.execPath, sha256: sha3(supervisorAfter) };
       const after2 = configureHermesHooks(before, supervisor, previous);
       if (before !== after2)
         changes.push({ path, before, after: after2 });
@@ -14559,12 +14766,12 @@ function planAgentIntegration(options) {
     agents: [...new Set([...priorAgents, ...options.agents])].sort(),
     home: resolve10(home),
     includeVendor: true,
-    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join17(dataDir2, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha2(renderHermesSupervisor(bindings.get("hermes").command, bindings.get("hermes").profileId)) } } } : {},
+    ...options.agents.includes("hermes") ? { supervisors: { ...policy.bridge?.supervisors, hermes: { path: join17(dataDir2, "agent-hooks", "hermes.js"), runtime: process.execPath, sha256: sha3(renderHermesSupervisor(bindings.get("hermes").command, bindings.get("hermes").profileId)) } } } : {},
     commands: { ...policy.bridge?.commands, ...Object.fromEntries([...bindings].map(([agent, binding]) => [agent, binding.command])) },
     profiles: Object.fromEntries([...new Set([...priorAgents, ...options.agents])].sort().map((agent) => [agent, bindings.get(agent)?.profileId ?? policy.bridge?.profiles?.[agent] ?? policy.profileId])),
     disabledBuiltins: options.agents.includes("codex") ? nativeSkills.filter((entry) => entry.agent === "codex" && entry.vendor && entry.path.startsWith(canonicalAgentPath(join17(home, ".codex", "skills", ".system"), aliases) + sep5)).map((entry) => ({ path: entry.path, hash: entry.hash })) : policy.bridge?.disabledBuiltins ?? [],
     rootAliases: aliases,
-    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha2(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd), ...options.codexNativeCatalog.plugins === undefined ? {} : { plugins: projectCodexInstalledPluginEntries(options.codexNativeCatalog.plugins) } })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join17(home, ".codex/config.toml"), aliases))?.before === null ? null : sha2(readOptional(canonicalAgentPath(join17(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
+    ...codexPluginSkills.length ? { codexPluginSkills, codexPluginSkillReview: options.codexNativeCatalog ? { version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, catalogSha256: sha3(JSON.stringify({ version: options.codexNativeCatalog.version, cwd: options.codexNativeCatalog.cwd, skills: projectCodexNativeSkillCatalog({ data: [{ cwd: options.codexNativeCatalog.cwd, errors: [], skills: options.codexNativeCatalog.skills }] }, options.codexNativeCatalog.cwd), ...options.codexNativeCatalog.plugins === undefined ? {} : { plugins: projectCodexInstalledPluginEntries(options.codexNativeCatalog.plugins) } })), configSha256: changes.find((change) => change.path === canonicalAgentPath(join17(home, ".codex/config.toml"), aliases))?.before === null ? null : sha3(readOptional(canonicalAgentPath(join17(home, ".codex/config.toml"), aliases)) ?? "") } : policy.bridge?.codexPluginSkillReview } : {},
     discovery: { ...policy.bridge?.discovery, ...Object.fromEntries(discoveryAfter.map((binding) => [binding.agent, binding])) }
   } };
   const serializedPolicy = serializeManagedSkillPolicy(nextPolicy);
@@ -14580,12 +14787,12 @@ function planClaudePreToolUseHookUpdate(options) {
   return planClaudeHookEventsUpdate({ ...options, events: ["PreToolUse"] });
 }
 function claudeSettingsConsumers(home, path, discoveries, aliases) {
-  const canonical4 = (value) => canonicalAgentPath(value, aliases);
+  const canonical5 = (value) => canonicalAgentPath(value, aliases);
   const containsSettings = (root) => {
-    const distance = relative5(canonical4(root), path);
+    const distance = relative5(canonical5(root), path);
     return distance === "" || distance !== ".." && !distance.startsWith(`..${sep5}`) && !isAbsolute11(distance);
   };
-  return discoveries.filter((binding) => binding.agent === "claude" || binding.agent === "opencode" || canonical4(join17(home, AGENT_ADAPTERS[binding.agent].config)) === path || binding.sources.some((source) => canonical4(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" || canonical5(join17(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);
 }
 function verifyCoordinatedDiscovery(binding, home, aliases) {
   try {
@@ -14617,7 +14824,7 @@ function planClaudeHookEventsUpdate(options) {
   const path = canonicalAgentPath(join17(home, ".claude", "settings.json"), aliases);
   assertSafePath(path);
   const before = lstatSync15(path, { throwIfNoEntry: false }) ? new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(readNativeBytes(path, 1024 * 1024)) : null;
-  if ((before === null ? "absent" : sha2(before)) !== options.expectedSettingsSha256)
+  if ((before === null ? "absent" : sha3(before)) !== options.expectedSettingsSha256)
     throw new Error("Claude settings preimage changed");
   assertClaudeHookEventsReplacement(before, options.replacement, options.events);
   const agents = bridge.agents;
@@ -14683,7 +14890,7 @@ function atomicWrite2(path, content) {
 function planAgentSettingsWitnessUpgrade(options) {
   const home = resolve10(options.home ?? homedir2()), dataDir2 = options.dataDir ?? getDataDirReadOnly();
   const snapshot = readManagedSkillPolicySnapshot(dataDir2);
-  if (!snapshot || sha2(snapshot.text) !== options.expectedPolicySha256)
+  if (!snapshot || sha3(snapshot.text) !== options.expectedPolicySha256)
     throw new Error("Managed policy preimage changed");
   const policy = snapshot.value, aliases = policy.bridge?.rootAliases ?? [];
   recheckRootAliases(aliases);
@@ -14692,7 +14899,7 @@ function planAgentSettingsWitnessUpgrade(options) {
     throw new Error("Settings witness upgrade requires an existing reviewed native binding");
   const configPath = canonicalAgentPath(join17(home, options.agent === "claude" ? ".claude/settings.json" : ".codex/config.toml"), aliases);
   const settings = readOptional(configPath);
-  if (settings === null || sha2(settings) !== options.expectedSettingsSha256)
+  if (settings === null || sha3(settings) !== options.expectedSettingsSha256)
     throw new Error("Native settings preimage changed");
   const sources = binding.sources.filter((source) => source.path === configPath && source.format === undefined && source.fields === undefined);
   if (sources.length !== 1)
@@ -14700,15 +14907,40 @@ function planAgentSettingsWitnessUpgrade(options) {
   const previous = sources[0];
   if (typeof previous.sha256 !== "string")
     throw new Error("Settings witness upgrade requires a preserved settings preimage");
+  const replaced = [previous];
+  if (options.agent === "codex") {
+    if (previous.hashMode !== undefined && previous.hashMode !== "bytes" && previous.hashMode !== "codex-settings-v1")
+      throw new Error("Codex settings witness upgrade requires a preserved raw or codex-settings-v1 configuration witness");
+    const preimage = readCodexSettingsPreimage(options.reviewedPreimage);
+    for (const source of binding.sources) {
+      if (source === previous || source.path !== configPath)
+        continue;
+      const fields = source.fields;
+      if (source.hashMode !== undefined || source.format !== "toml" || !Array.isArray(fields) || !isDeepStrictEqual3(fields, [...CODEX_DISCOVERY_PROJECTION_FIELDS]) || typeof source.sha256 !== "string")
+        throw new Error("Codex settings witness upgrade found an unrecognized configuration witness");
+      if (projectNativeDiscoveryFields(preimage, "toml", fields, configPath) !== source.sha256)
+        throw new Error("Reviewed preimage does not explain the Codex discovery projection witness");
+      replaced.push(source);
+    }
+  }
   const next = options.agent === "claude" ? upgradeClaudeSettingsWitness(previous, options.reviewedPreimage) : upgradeCodexSettingsWitness(previous, options.reviewedPreimage);
-  const replacement = { ...binding, sources: binding.sources.map((source) => source === previous ? next : source) };
+  const rebound = [];
+  for (const source of binding.sources) {
+    if (!replaced.includes(source)) {
+      rebound.push(source);
+      continue;
+    }
+    if (source === replaced[0])
+      rebound.push(next);
+  }
+  const replacement = { ...binding, sources: rebound };
   verifyAgentDiscovery(replacement);
   const after = serializeManagedSkillPolicy({ ...policy, bridge: { ...policy.bridge, discovery: { ...policy.bridge.discovery, [options.agent]: replacement } } });
-  return { dataDir: dataDir2, profileId: policy.profileId, changes: [{ path: join17(dataDir2, "agent-policy.json"), before: snapshot.text, after }], nativeSkills: [], observedPolicy: { path: join17(dataDir2, "agent-policy.json"), before: snapshot.text }, observedSettings: { path: configPath, before: settings }, discoveryBefore: [replacement], discoveryAfter: [replacement], rootAliases: aliases, managedAgentChecks: { home, agents: [options.agent] }, settingsWitnessUpgrade: { agent: options.agent, path: configPath, fromHashMode: previous.hashMode ?? "bytes", fromSha256: previous.sha256, toHashMode: next.hashMode, toSha256: next.sha256, reviewedPreimage: options.reviewedPreimage, currentSettingsSha256: options.expectedSettingsSha256 } };
+  return { dataDir: dataDir2, profileId: policy.profileId, changes: [{ path: join17(dataDir2, "agent-policy.json"), before: snapshot.text, after }], nativeSkills: [], observedPolicy: { path: join17(dataDir2, "agent-policy.json"), before: snapshot.text }, observedSettings: { path: configPath, before: settings }, discoveryBefore: [replacement], discoveryAfter: [replacement], rootAliases: aliases, managedAgentChecks: { home, agents: [options.agent] }, settingsWitnessUpgrade: { agent: options.agent, path: configPath, fromHashMode: previous.hashMode ?? "bytes", fromSha256: previous.sha256, toHashMode: next.hashMode, toSha256: next.sha256, reviewedPreimage: options.reviewedPreimage, currentSettingsSha256: options.expectedSettingsSha256, replacedWitnesses: replaced.map((source) => ({ hashMode: source.hashMode ?? "bytes", sha256: source.sha256 })) } };
 }
 function applyAgentIntegration(plan) {
   for (const source of plan.observedNativeSources ?? [])
-    if (sha2(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+    if (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
       throw new Error("Native identity source changed after planning");
   if (plan.observedSettings && readOptional(plan.observedSettings.path) !== plan.observedSettings.before)
     throw new Error("Native settings changed after witness planning");
@@ -14728,7 +14960,7 @@ function applyAgentIntegration(plan) {
     const upgrade = plan.settingsWitnessUpgrade;
     if (!plan.managedAgentChecks || !plan.observedPolicy?.before)
       throw new Error("Invalid settings witness upgrade plan");
-    const verified = planAgentSettingsWitnessUpgrade({ agent: upgrade.agent, reviewedPreimage: upgrade.reviewedPreimage, home: plan.managedAgentChecks.home, dataDir: plan.dataDir, expectedPolicySha256: sha2(plan.observedPolicy.before), expectedSettingsSha256: upgrade.currentSettingsSha256 });
+    const verified = planAgentSettingsWitnessUpgrade({ agent: upgrade.agent, reviewedPreimage: upgrade.reviewedPreimage, home: plan.managedAgentChecks.home, dataDir: plan.dataDir, expectedPolicySha256: sha3(plan.observedPolicy.before), expectedSettingsSha256: upgrade.currentSettingsSha256 });
     if (JSON.stringify(verified.changes) !== JSON.stringify(plan.changes) || JSON.stringify(verified.settingsWitnessUpgrade) !== JSON.stringify(upgrade))
       throw new Error("Settings witness upgrade plan changed");
     provenDiscovery = verified.discoveryBefore[0];
@@ -14756,7 +14988,7 @@ function applyAgentIntegration(plan) {
   chmodSync(backupRoot, 448);
   for (const [index, change] of plan.changes.entries())
     if (change.before !== null) {
-      const backup = join17(backupRoot, `${index}-${sha2(change.path).slice(0, 12)}.backup`);
+      const backup = join17(backupRoot, `${index}-${sha3(change.path).slice(0, 12)}.backup`);
       writeFileSync4(backup, change.before, { mode: 384, flag: "wx" });
       if (readFileSync12(backup, "utf8") !== change.before)
         throw new Error("Native configuration preservation readback failed");
@@ -14775,7 +15007,7 @@ function applyAgentIntegration(plan) {
     }
     recheckRootAliases(aliases);
     for (const source of plan.observedNativeSources ?? [])
-      if (sha2(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
+      if (sha3(readNativeBytes(source.path, 1024 * 1024)) !== source.sha256)
         throw new Error("Native identity source changed during application");
     if (plan.observedSettings && readOptional(plan.observedSettings.path) !== plan.observedSettings.before)
       throw new Error("Native settings changed during witness application");
@@ -14787,7 +15019,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(join17(backupRoot, "receipt.json"), JSON.stringify({ version: 1, changes: written.map((change) => ({ path: change.path, beforeHash: change.before === null ? null : sha2(change.before), afterHash: sha2(change.after) })), backups, ...aliases.length ? { rootAliases: aliases } : {} }) + `
+    atomicWrite2(join17(backupRoot, "receipt.json"), JSON.stringify({ version: 1, changes: written.map((change) => ({ path: change.path, beforeHash: change.before === null ? null : sha3(change.before), afterHash: sha3(change.after) })), backups, ...aliases.length ? { rootAliases: aliases } : {} }) + `
 `);
   } catch (error) {
     for (const change of written.reverse()) {
@@ -14866,8 +15098,8 @@ function archiveNativeSkills(inventory, options) {
   const operationId = randomUUID2(), archiveRoot = join17(options.dataDir ?? getDataDir(), "migration", operationId, "native"), receiptPath = join17(archiveRoot, "receipt.json");
   const entries = selected.map((entry, index) => ({
     source: entry.vendor ? join17(entry.path, "SKILL.md") : entry.path,
-    archive: join17(archiveRoot, `${index}-${sha2(entry.path).slice(0, 12)}`),
-    hash: entry.vendor ? sha2(readNativeBytes(join17(entry.path, "SKILL.md"))) : entry.hash,
+    archive: join17(archiveRoot, `${index}-${sha3(entry.path).slice(0, 12)}`),
+    hash: entry.vendor ? sha3(readNativeBytes(join17(entry.path, "SKILL.md"))) : entry.hash,
     ...entry.vendor ? { discoveryOnly: true } : {},
     status: "planned"
   }));
@@ -14878,7 +15110,7 @@ function archiveNativeSkills(inventory, options) {
     const stat = lstatSync15(entry.archive);
     if (entry.discoveryOnly ? !stat.isFile() : !stat.isDirectory())
       throw new Error("Archive type changed");
-    if ((entry.discoveryOnly ? sha2(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
+    if ((entry.discoveryOnly ? sha3(readNativeBytes(entry.archive)) : treeHash(entry.archive)) !== entry.hash)
       throw new Error("Archive bytes changed");
   };
   assertSafePath(archiveRoot);
@@ -14998,7 +15230,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 !== join17(dataDir2, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha2(renderHermesSupervisor(command, profile)))
+    if (supervisor?.path !== join17(dataDir2, "agent-hooks", "hermes.js") || supervisor?.sha256 !== sha3(renderHermesSupervisor(command, profile)))
       throw new Error("NATIVE_SKILL_DRIFT: Hermes supervisor binding changed; run skills hook install");
     assertHermesProtection(home, config, command, profile, supervisor);
   } else if (agent === "opencode") {
@@ -16296,7 +16528,7 @@ function exactProfileSelection(spec, profile) {
 }
 
 // src/lib/plugin-projection.ts
-import { createHash as createHash12 } from "crypto";
+import { createHash as createHash13 } from "crypto";
 import { posix } 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 });
@@ -16307,7 +16539,7 @@ function pluginNeed(value, message) {
   if (!value)
     pluginRefusal(message);
 }
-var pluginHash = (bytes) => createHash12("sha256").update(bytes).digest("hex");
+var pluginHash = (bytes) => createHash13("sha256").update(bytes).digest("hex");
 function pluginObject(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -16495,7 +16727,7 @@ function buildPluginProjection(entries) {
 }
 
 // src/lib/plugin-projection-store.ts
-import { createHash as createHash13, randomUUID as randomUUID3 } from "crypto";
+import { createHash as createHash14, randomUUID as randomUUID3 } from "crypto";
 import { constants as constants8, closeSync as closeSync9, fchmodSync, fstatSync as fstatSync9, fsyncSync as fsyncSync3, linkSync as linkSync2, lstatSync as lstatSync17, mkdirSync as mkdirSync8, openSync as openSync9, opendirSync as opendirSync4, readSync as readSync7, renameSync as renameSync4, rmdirSync as rmdirSync3, rmSync as rmSync3, unlinkSync as unlinkSync4, writeSync as writeSync2 } from "fs";
 import { dirname as dirname13, isAbsolute as isAbsolute12, join as join23, parse as parse5, resolve as resolve11 } from "path";
 var READ_FLAGS = constants8.O_RDONLY | constants8.O_NOFOLLOW | constants8.O_NONBLOCK;
@@ -16511,7 +16743,7 @@ function stat(path) {
     return pluginRefusal("Cannot inspect plugin filesystem entry");
   }
 }
-function canonical4(path) {
+function canonical5(path) {
   pluginNeed(typeof path === "string" && path.length <= 8192 && isAbsolute12(path) && resolve11(path) === path && !/[\x00-\x1f\x7f]/.test(path), "Plugin storage paths must be canonical absolute paths");
 }
 function owner(stats, system = false) {
@@ -16522,7 +16754,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 = dirname13(path), filesystemRoot = parse5(parent).root;
   let current = filesystemRoot;
   for (const segment of ["", ...parent.slice(filesystemRoot.length).split("/").filter(Boolean)]) {
@@ -16837,7 +17069,7 @@ function pluginExecutableDigest(path) {
     const opened = fstatSync9(fd, { bigint: true });
     same3(before, opened);
     fileShape(opened, maximum, "executable");
-    const hash2 = createHash13("sha256"), buffer = new Uint8Array(64 * 1024);
+    const hash2 = createHash14("sha256"), buffer = new Uint8Array(64 * 1024);
     let remaining = Number(opened.size);
     while (remaining > 0) {
       const count = readSync7(fd, buffer, 0, Math.min(buffer.byteLength, remaining), null);
@@ -17396,23 +17628,23 @@ function captureManagedPluginRegistry(path, managedPlugins) {
 }
 
 // src/lib/claude-marketplace-registry.ts
-import { createHash as createHash14 } from "crypto";
+import { createHash as createHash15 } from "crypto";
 import { closeSync as closeSync11, constants as constants10, fstatSync as fstatSync11, lstatSync as lstatSync19, openSync as openSync11, readSync as readSync9 } from "fs";
 import { basename as basename8, dirname as dirname15, isAbsolute as isAbsolute15, resolve as resolve14 } 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) && resolve14(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) && resolve14(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 = dirname15(path);; at = dirname15(at)) {
     const stat2 = lstatSync19(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 === dirname15(at))
       return result;
@@ -17420,15 +17652,15 @@ function parents2(path) {
 }
 function readRegistry2(path, budget) {
   absolutePath3(path);
-  need4(basename8(path) === "known_marketplaces.json", "requires known_marketplaces.json");
-  need4(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
+  need5(basename8(path) === "known_marketplaces.json", "requires known_marketplaces.json");
+  need5(Number.isSafeInteger(budget.remaining) && budget.remaining >= 0, "has an invalid byte budget");
   const ancestors2 = parents2(path), initial = lstatSync19(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 = openSync11(path, constants10.O_RDONLY | constants10.O_NOFOLLOW | constants10.O_NONBLOCK);
   try {
     const opened = fstatSync11(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) {
@@ -17438,10 +17670,10 @@ function readRegistry2(path, budget) {
       length += count;
     }
     const after = fstatSync11(fd, { bigint: true }), current = lstatSync19(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 = lstatSync19(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 {
@@ -17461,7 +17693,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++];
@@ -17472,7 +17704,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 === "\\")
@@ -17481,7 +17713,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 === '"')
@@ -17495,17 +17727,17 @@ function parse6(text2) {
           if (object5) {
             space();
             const key = string();
-            need4(!keys.has(key), "contains a duplicate JSON key");
+            need5(!keys.has(key), "contains a duplicate JSON key");
             keys.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 };
@@ -17517,14 +17749,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 exactKeys(value, keys) {
@@ -17532,7 +17764,7 @@ function exactKeys(value, keys) {
 }
 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) {
@@ -17540,7 +17772,7 @@ function normalizeRow(row, version = 1) {
     if (version !== 2 || !exactKeys(row, ["source", "installLocation", "lastUpdated", "autoUpdate"]))
       return;
     const autoUpdate = field(row, "autoUpdate");
-    need4(autoUpdate?.kind === "literal" && (autoUpdate.value === "true" || autoUpdate.value === "false"), "contains an invalid automatic-update preference");
+    need5(autoUpdate?.kind === "literal" && (autoUpdate.value === "true" || autoUpdate.value === "false"), "contains an invalid automatic-update preference");
   }
   const source = field(row, "source");
   if (source?.kind !== "object")
@@ -17556,34 +17788,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 = createHash14("sha256").update("hasna.skills.claude-marketplace-registry.v1\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash15("sha256").update("hasna.skills.claude-marketplace-registry.v1\x00").update(JSON.stringify(value)).digest("hex");
   return { path, hashMode: "claude-marketplace-registry", sha256: sha2562 };
 }
 function captureClaudeMarketplaceRegistryV2(path, budget = { remaining: 256 * 1024 * 1024 }) {
   const value = parse6(readRegistry2(path, budget));
   for (const [, row] of value.entries)
     normalizeRow(row, 2);
-  const sha2562 = createHash14("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
+  const sha2562 = createHash15("sha256").update("hasna.skills.claude-marketplace-registry.v2\x00").update(JSON.stringify(value)).digest("hex");
   return { path, hashMode: "claude-marketplace-registry-v2", sha256: sha2562 };
 }
 
 // src/lib/codex-hook-discovery-recovery.ts
-import { createHash as createHash16 } from "crypto";
+import { createHash as createHash17 } from "crypto";
 
 // src/lib/codex-hook-trust-files.ts
 import { closeSync as closeSync12, constants as constants11, fstatSync as fstatSync12, fsyncSync as fsyncSync4, lstatSync as lstatSync20, openSync as openSync12, readSync as readSync10, writeFileSync as writeFileSync7 } from "fs";
-import { createHash as createHash15 } from "crypto";
+import { createHash as createHash16 } from "crypto";
 import { dirname as dirname16 } from "path";
-function need5(value, code) {
+function need6(value, code) {
   if (!value)
     throw new Error(`CODEX_HOOK_TRUST_${code}`);
 }
@@ -17591,8 +17823,8 @@ var sameStat = (a, b) => ["dev", "ino", "uid", "nlink", "mode", "size", "mtimeNs
 function safeParents(file) {
   for (let p = dirname16(file);; p = dirname16(p)) {
     const s = lstatSync20(p);
-    need5(s.isDirectory() && !s.isSymbolicLink(), "UNSAFE_PARENT");
-    need5((s.mode & 18) === 0 || s.uid === 0 && (s.mode & 512) !== 0, "UNSAFE_PARENT");
+    need6(s.isDirectory() && !s.isSymbolicLink(), "UNSAFE_PARENT");
+    need6((s.mode & 18) === 0 || s.uid === 0 && (s.mode & 512) !== 0, "UNSAFE_PARENT");
     if (dirname16(p) === p)
       break;
   }
@@ -17601,12 +17833,12 @@ function snapshot(file, privateFile = false, options = {}) {
   const readOnlyPackage = options.readOnlyPackage === true && !privateFile;
   safeParents(file);
   const initial = lstatSync20(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 = openSync12(file, constants11.O_RDONLY | constants11.O_NOFOLLOW | constants11.O_NONBLOCK);
   try {
     const before = fstatSync12(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) {
@@ -17615,16 +17847,16 @@ function snapshot(file, privateFile = false, options = {}) {
         break;
       length += n2;
     }
-    need5(length === Number(before.size) && sameStat(before, fstatSync12(fd, { bigint: true })) && sameStat(before, lstatSync20(file, { bigint: true })), "INPUT_CHANGED");
+    need6(length === Number(before.size) && sameStat(before, fstatSync12(fd, { bigint: true })) && sameStat(before, lstatSync20(file, { bigint: true })), "INPUT_CHANGED");
     const content = bytes.subarray(0, length), text2 = new TextDecoder("utf-8", { fatal: true }).decode(content);
-    return { file, privateFile, readOnlyPackage, text: text2, bytes: content, stat: before, sha256: createHash15("sha256").update(content).digest("hex") };
+    return { file, privateFile, readOnlyPackage, text: text2, bytes: content, stat: before, sha256: createHash16("sha256").update(content).digest("hex") };
   } finally {
     closeSync12(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
@@ -17633,11 +17865,12 @@ var matchedEvents = { ...events, PreToolUse: ["preToolUse", "pre_tool_use"] };
 var proofs = new WeakMap;
 
 // src/lib/codex-hook-discovery-recovery.ts
-var sha3 = (text2) => createHash16("sha256").update(text2).digest("hex");
+var sha4 = (text2) => createHash17("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 === sha3(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
+  need6(!!proof && binding.agent === "codex" && witness.discoverySha256 === sha4(JSON.stringify(binding)), "RECONCILE_DISCOVERY_RECOVERY_CHANGED");
   unchanged2(proof.before);
   unchanged2(proof.current);
   proof.recheckAdditions();
@@ -17646,12 +17879,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 digest = (text2) => createHash17("sha256").update(text2).digest("hex");
+var digest = (text2) => createHash18("sha256").update(text2).digest("hex");
 function parseConfig(text2, path, toml = false) {
   try {
     const value = toml ? Bun.TOML.parse(text2) : JSON.parse(text2);
@@ -17683,14 +17916,26 @@ function read2(path, changes) {
     throw new Error(`Unsupported or oversized native discovery input: ${path}`);
   return readFileSync17(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 digest(JSON.stringify(Object.fromEntries(fields2.map((field2) => [field2, object5[field2] ?? null]))));
+}
+function isSupersededCodexProjection(agent, configPath, source) {
+  return agent === "codex" && source.path === configPath && source.format === "toml" && isDeepStrictEqual4(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))
@@ -17729,10 +17974,7 @@ function projected(source, changes, budget = discoveryByteBudget()) {
     return null;
   if (!source.format)
     return digest(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 digest(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)
@@ -17760,7 +18002,7 @@ function verifyAgentDiscovery(binding, codexRecovery) {
     safe4(root2);
 }
 function assertMarketplaceBinding(binding, source) {
-  if (source.hashMode === "codex-settings-v1" && (binding.agent !== "codex" || binding.method !== "reviewed" || basename9(source.path) !== "config.toml"))
+  if ((source.hashMode === "codex-settings-v1" || source.hashMode === "codex-settings-v2") && (binding.agent !== "codex" || binding.method !== "reviewed" || basename9(source.path) !== "config.toml"))
     throw new Error("Codex settings witnesses require explicit reviewed Codex configuration");
   if ((source.hashMode === "claude-settings-v1" || source.hashMode === "claude-settings-v2" || source.hashMode === "claude-settings-v3") && (binding.agent !== "claude" || binding.method !== "reviewed" || basename9(source.path) !== "settings.json"))
     throw new Error("Claude settings witnesses require explicit reviewed Claude configuration");
@@ -17789,8 +18031,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 = resolve15, reviewed) {
-  const homeConfigPath = canonical5(agentDiscoveryConfigPath(home, agent));
+function assertProjectDiscovery(agent, directories, home, canonical6 = resolve15, reviewed) {
+  const homeConfigPath = canonical6(agentDiscoveryConfigPath(home, agent));
   for (const directory of directories) {
     const isHome = resolve15(directory) === resolve15(home);
     if (agent === "hermes") {
@@ -17801,7 +18043,7 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve15
       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(join27(directory, suffix)), raw = read2(path);
+      const path = canonical6(join27(directory, suffix)), raw = read2(path);
       if (raw === null)
         continue;
       const isRootAliasedHomeConfig = agent === "claude" && suffix === ".claude/settings.json" || agent === "codex" && suffix === ".codex/config.toml";
@@ -17817,14 +18059,14 @@ function assertProjectDiscovery(agent, directories, home, canonical5 = resolve15
         const managed = reviewed.sources.flatMap((source) => source.hashMode === "claude-plugin-registry" ? source.managedPlugins ?? [] : []);
         if (exact && projected(exact) === exact.sha256 && managed.length) {
           const bindings = managed.map((item) => readPluginBinding(item.storeRoot, item.bindingId));
-          admittedPlugins = Object.entries(config.enabledPlugins).every(([id, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id && binding.target.registrations.some((scope) => scope.scope === "project" && scope.projectPath === canonical5(directory))));
+          admittedPlugins = Object.entries(config.enabledPlugins).every(([id, enabled]) => typeof enabled === "boolean" && bindings.some((binding) => binding.target.pluginId === id && binding.target.registrations.some((scope) => scope.scope === "project" && scope.projectPath === canonical6(directory))));
         }
       }
       if (keys.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(join27(directory, ".claude/commands"));
+      const commands = canonical6(join27(directory, ".claude/commands"));
       safe4(commands);
       if (lstatSync21(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync10(commands).length)
         throw new Error("NATIVE_SKILL_DRIFT: legacy project command discovery requires a dedicated format adapter");
@@ -17835,10 +18077,10 @@ function agentDiscoveryConfigPath(home, agent) {
   return join27(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 ?? resolve15, home = resolve15(options.home), agent = options.agent;
+  const canonical6 = options.canonical ?? resolve15, home = resolve15(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);
@@ -17846,7 +18088,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`);
@@ -17905,11 +18147,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) => isDeepStrictEqual4(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;
   }
@@ -17923,14 +18166,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 = join27(root2, agent === "claude" ? ".claude-plugin/plugin.json" : ".codex-plugin/plugin.json");
     const raw = witness(manifestPath);
@@ -17962,7 +18206,7 @@ function resolveAgentDiscovery(options) {
   if (agent === "claude") {
     const registrations = witness(join27(home, ".claude/plugins/installed_plugins.json"));
     const installed = registrations === null ? {} : parseConfig(registrations, join27(home, ".claude/plugins/installed_plugins.json")).plugins;
-    const commands = canonical5(join27(home, ".claude/commands"));
+    const commands = canonical6(join27(home, ".claude/commands"));
     safe4(commands);
     if (lstatSync21(commands, { throwIfNoEntry: false })?.isDirectory() && readdirSync10(commands).length)
       unresolved("legacy home command discovery requires a dedicated format adapter");
@@ -18036,7 +18280,7 @@ function resolveAgentDiscovery(options) {
         roots.add(join27(root2, "skills"));
       }
   }
-  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join27(home, ".hermes/plugins"), join27(home, ".hermes/hermes-agent")].map((path) => canonical5(path))) } : {} };
+  return { agent, roots: [...roots].sort(), sources, method: "automatic", ...agent === "gemini" ? { builtinNames } : {}, ...agent === "hermes" ? { directories: captureDiscoveryDirectories([join27(home, ".hermes/plugins"), join27(home, ".hermes/hermes-agent")].map((path) => canonical6(path))) } : {} };
 }
 
 // src/lib/authoring-path.ts
@@ -18228,7 +18472,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 (!existsSync13(absoluteSource) || !statSync10(absoluteSource).isDirectory()) {
     throw new Error(`Import directory not found: ${sourceDir}`);
   }
@@ -18295,7 +18539,7 @@ function assertDisjointImportPaths(source, destination) {
   }
 }
 function portPortableSkill(sourcePath, options = {}) {
-  const absoluteSource = normalize3(sourcePath);
+  const absoluteSource = normalize4(sourcePath);
   if (!existsSync13(absoluteSource) || !statSync10(absoluteSource).isDirectory()) {
     throw new Error(`Skill source directory not found: ${sourcePath}`);
   }
@@ -18571,7 +18815,7 @@ function safeIsDirectory(path) {
 function isSafeRelativePath2(value) {
   if (!value.trim() || isAbsolute17(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) {
@@ -18885,7 +19129,7 @@ function getAllTags() {
   return Array.from(tagSet).sort();
 }
 // src/lib/run-state.ts
-import { createHash as createHash18, randomBytes } from "crypto";
+import { createHash as createHash19, randomBytes } from "crypto";
 import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync19, readdirSync as readdirSync13, statSync as statSync11, writeFileSync as writeFileSync9 } from "fs";
 import { extname, join as join31, relative as relative7 } from "path";
 function createSkillRun(params, targetDir = process.cwd()) {
@@ -19012,7 +19256,7 @@ function collectRunArtifacts(context) {
     artifacts.push({
       path: toProjectRelative(context.targetDir, path),
       mime: mimeForPath(path),
-      sha256: createHash18("sha256").update(bytes).digest("hex"),
+      sha256: createHash19("sha256").update(bytes).digest("hex"),
       sizeBytes: stat2.size
     });
   }
@@ -22370,15 +22614,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;
@@ -38431,7 +38675,7 @@ function clone2(value) {
   return value === undefined ? undefined : JSON.parse(JSON.stringify(value));
 }
 // src/lib/canonical-json.ts
-import { createHash as createHash19 } from "crypto";
+import { createHash as createHash20 } from "crypto";
 function canonicalJson2(value, maximumBytes = 2 * 1024 * 1024) {
   return canonicalJsonAtDepth(value, maximumBytes, 64);
 }
@@ -38475,7 +38719,7 @@ function canonicalJsonAtDepth(value, maximumBytes, maximumDepth) {
   return visit3(value, 0);
 }
 function canonicalJsonSha256(value, maximumBytes) {
-  return createHash19("sha256").update(canonicalJson2(value, maximumBytes)).digest("hex");
+  return createHash20("sha256").update(canonicalJson2(value, maximumBytes)).digest("hex");
 }
 
 // src/lib/remote-recurring-contract.ts
@@ -39231,7 +39475,7 @@ function getApiUrl(action, env = process.env, options = {}) {
 // src/lib/remote-run-contract.ts
 var REMOTE_SKILL_RUN_CONTRACT_VERSION = 1;
 function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
-  const record6 = isRecord3(payload) ? payload : {};
+  const record6 = isRecord4(payload) ? payload : {};
   return {
     contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
     ...pickString(record6, "id"),
@@ -39253,7 +39497,7 @@ function normalizeRemoteSkillRunContract(payload, fallbackSkill) {
     ...hasOwn(record6, "details") ? { details: record6.details } : {}
   };
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function hasOwn(record6, key) {
@@ -39385,7 +39629,7 @@ function creditCheckoutFailure(value, status, key) {
 
 // src/lib/remote-profile.ts
 function customerNamePatch(input2, field2) {
-  if (!isRecord4(input2) || Object.keys(input2).length !== 1 || !Object.hasOwn(input2, field2))
+  if (!isRecord5(input2) || Object.keys(input2).length !== 1 || !Object.hasOwn(input2, field2))
     throw new Error("Provide only the requested name field.");
   const value = input2[field2];
   if (typeof value !== "string" || /[\p{Cc}\p{Cs}\u2028\u2029]/u.test(value) || !value.trim() || [...value.trim()].length > 100) {
@@ -39393,22 +39637,22 @@ function customerNamePatch(input2, field2) {
   }
   return { [field2]: value.trim() };
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function string4(value) {
   return typeof value === "string" && value.length > 0;
 }
 function parseUpdatedProfile(value) {
-  const user = isRecord4(value) && value.user;
-  if (!isRecord4(user) || !string4(user.id) || !string4(user.email) || !(user.displayName === null || typeof user.displayName === "string") || typeof user.role !== "string" || !["owner", "admin", "member", "viewer"].includes(user.role)) {
+  const user = isRecord5(value) && value.user;
+  if (!isRecord5(user) || !string4(user.id) || !string4(user.email) || !(user.displayName === null || typeof user.displayName === "string") || typeof user.role !== "string" || !["owner", "admin", "member", "viewer"].includes(user.role)) {
     throw new Error("The server returned an invalid account profile.");
   }
   return { user: { id: user.id, email: user.email, displayName: user.displayName, role: user.role } };
 }
 function parseUpdatedWorkspace(value) {
-  const organization2 = isRecord4(value) && value.organization;
-  if (!isRecord4(organization2) || !string4(organization2.id) || !string4(organization2.slug) || !string4(organization2.name)) {
+  const organization2 = isRecord5(value) && value.organization;
+  if (!isRecord5(organization2) || !string4(organization2.id) || !string4(organization2.slug) || !string4(organization2.name)) {
     throw new Error("The server returned an invalid workspace.");
   }
   return { organization: { id: organization2.id, slug: organization2.slug, name: organization2.name } };
@@ -40597,11 +40841,11 @@ function validateCronField(expr, min, max, label) {
   return { valid: true };
 }
 function validateCron(expr) {
-  const fields = expr.trim().split(/\s+/);
-  if (fields.length !== 5) {
-    return { valid: false, error: `Expected 5 fields, got ${fields.length}. Format: "minute hour day-of-month month day-of-week"` };
+  const fields2 = expr.trim().split(/\s+/);
+  if (fields2.length !== 5) {
+    return { valid: false, error: `Expected 5 fields, got ${fields2.length}. Format: "minute hour day-of-month month day-of-week"` };
   }
-  const [minuteF, hourF, domF, monthF, dowF] = fields;
+  const [minuteF, hourF, domF, monthF, dowF] = fields2;
   const checks3 = [
     { expr: minuteF, min: 0, max: 59, label: "minute" },
     { expr: hourF, min: 0, max: 23, label: "hour" },
@@ -40742,7 +40986,7 @@ function recordScheduleRun(id, status, targetDir) {
   saveSchedules(data, targetDir);
 }
 // src/lib/revision.ts
-import { createHash as createHash20 } from "crypto";
+import { createHash as createHash21 } from "crypto";
 var REVISION_ID_PATTERN = /^[0-9a-f]{64}$/;
 function revisionIdOf(content) {
   const canonicalContent = {
@@ -40763,8 +41007,8 @@ function revisionIdOf(content) {
     canonicalContent.archiveReason = content.archiveReason ?? null;
     canonicalContent.replacementSlug = content.replacementSlug ?? null;
   }
-  const canonical5 = JSON.stringify(canonicalContent);
-  return createHash20("sha256").update(canonical5).digest("hex");
+  const canonical6 = JSON.stringify(canonicalContent);
+  return createHash21("sha256").update(canonical6).digest("hex");
 }
 function revisionIdOfRecord(record7) {
   return revisionIdOf(record7);
@@ -41305,7 +41549,7 @@ async function requestInvitationEmail(origin, action, input2) {
 }
 
 // src/lib/remote-private-publications.ts
-import { createHash as createHash21 } from "crypto";
+import { createHash as createHash22 } from "crypto";
 var PRIVATE_PUBLICATION_MAX_BYTES = 16 * 1024 * 1024;
 var failures2 = {
   INVALID_REQUEST: [400, "The publication request is invalid."],
@@ -41352,7 +41596,7 @@ var hash3 = (v) => typeof v === "string" && /^[a-f0-9]{64}$/.test(v);
 var record8 = (v) => !!v && typeof v === "object" && !Array.isArray(v);
 var exact = (v, keys) => record8(v) && Object.keys(v).sort().join(",") === keys.sort().join(",");
 var date5 = (v) => typeof v === "string" && /^\d{4}-\d\d-\d\dT[0-9:.]+(?:Z|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/.test(v) && Number.isFinite(Date.parse(v));
-var publicationSha256 = (bytes) => createHash21("sha256").update(bytes).digest("hex");
+var publicationSha256 = (bytes) => createHash22("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 || !hash3(value.archiveSha256) || !Number.isSafeInteger(value.archiveByteSize) || Number(value.archiveByteSize) < 1 || Number(value.archiveByteSize) > PRIVATE_PUBLICATION_MAX_BYTES)
     return bad();
@@ -41651,7 +41895,7 @@ async function requestAuthApi(instance, path, options) {
   const text3 = await res.text();
   const body = text3 ? parseJsonBody(text3) : {};
   if (!res.ok) {
-    const record9 = isRecord5(body) ? body : {};
+    const record9 = isRecord6(body) ? body : {};
     const detail = typeof record9.detail === "string" ? record9.detail : undefined;
     const error61 = typeof record9.error === "string" ? record9.error : undefined;
     const code = typeof record9.code === "string" ? record9.code : undefined;
@@ -41679,7 +41923,7 @@ function condenseErrorBody(text3) {
     return collapsed;
   return `${collapsed.slice(0, MAX_ERROR_DETAIL_LENGTH - 1).trimEnd()}\u2026`;
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
@@ -41836,7 +42080,7 @@ class RemoteSkillsAuthClient {
 
 // src/lib/recurring-recovery.ts
 var uuid12 = exports_external.string().regex(/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/);
-var sha4 = exports_external.string().regex(/^[a-f0-9]{64}$/);
+var sha5 = exports_external.string().regex(/^[a-f0-9]{64}$/);
 var common = exports_external.object({
   contractVersion: exports_external.literal(1),
   apiOrigin: exports_external.string().min(1).max(4096),
@@ -41849,7 +42093,7 @@ var intentSchema = exports_external.discriminatedUnion("operation", [
   common.extend({
     operation: exports_external.literal("activate"),
     draftId: uuid12,
-    termsSha256: sha4,
+    termsSha256: sha5,
     approvalDeadline: exports_external.string().datetime(),
     approval: recurringActivationSchema
   }).strict(),
@@ -41857,7 +42101,7 @@ var intentSchema = exports_external.discriminatedUnion("operation", [
 ]);
 var stateSchema = exports_external.object({
   contractVersion: exports_external.literal(1),
-  intentSha256: sha4,
+  intentSha256: sha5,
   phase: exports_external.enum(["prepared", "pending", "observed"]),
   consentId: uuid12.nullable()
 }).strict();
@@ -43218,7 +43462,7 @@ function isApiMode(env = process.env) {
   }
 }
 // src/lib/native-storage.ts
-import { createHash as createHash22, createHmac as createHmac2 } from "crypto";
+import { createHash as createHash23, createHmac as createHmac2 } from "crypto";
 import {
   existsSync as existsSync19,
   mkdirSync as mkdirSync15,
@@ -43227,7 +43471,7 @@ import {
   statSync as statSync12,
   writeFileSync as writeFileSync13
 } from "fs";
-import { dirname as dirname23, join as join35, normalize as normalize4, relative as relative9, sep as sep9 } from "path";
+import { dirname as dirname23, join as join35, normalize as normalize5, relative as relative9, sep as sep9 } from "path";
 var SKILLS_STORAGE_TABLES = [
   "skills_sync_records",
   "skills_sync_cursors"
@@ -43394,7 +43638,7 @@ function exportSkillsLocalSnapshot(targetDir = process.cwd(), options = {}) {
       files.push({
         path: relativePath,
         sizeBytes: bytes.byteLength,
-        sha256: createHash22("sha256").update(bytes).digest("hex"),
+        sha256: createHash23("sha256").update(bytes).digest("hex"),
         ...options.includeFileContents ? { contentBase64: Buffer.from(bytes).toString("base64") } : {}
       });
     }
@@ -43419,7 +43663,7 @@ function importSkillsLocalSnapshot(snapshot2, targetDir = process.cwd(), options
       continue;
     }
     const bytes = Buffer.from(file2.contentBase64, "base64");
-    const hash4 = createHash22("sha256").update(bytes).digest("hex");
+    const hash4 = createHash23("sha256").update(bytes).digest("hex");
     if (hash4 !== file2.sha256) {
       throw new Error(`Snapshot file checksum mismatch: ${file2.path}`);
     }
@@ -43731,7 +43975,7 @@ function walkFiles2(dir) {
   return files;
 }
 function resolveSnapshotPath(targetDir, snapshotPath) {
-  const normalizedPath = normalize4(snapshotPath);
+  const normalizedPath = normalize5(snapshotPath);
   if (normalizedPath.startsWith("..") || normalizedPath.includes(`${sep9}..${sep9}`) || normalizedPath.startsWith(sep9)) {
     throw new Error(`Unsafe snapshot path: ${snapshotPath}`);
   }
@@ -43751,7 +43995,7 @@ function toIsoString(value) {
   return Number.isNaN(date6.getTime()) ? value : date6.toISOString();
 }
 function sha256Hex2(value) {
-  return createHash22("sha256").update(value).digest("hex");
+  return createHash23("sha256").update(value).digest("hex");
 }
 function normalizeHeaders(headers) {
   const result = {};
@@ -43803,7 +44047,7 @@ function toArrayBuffer(bytes) {
   return buffer;
 }
 // src/lib/station-snapshot.ts
-import { createHash as createHash23 } from "crypto";
+import { createHash as createHash24 } from "crypto";
 import {
   copyFileSync,
   mkdirSync as mkdirSync16,
@@ -43978,7 +44222,7 @@ function validateStationId(stationId) {
   }
 }
 function sha256File(filePath) {
-  return createHash23("sha256").update(readFileSync25(filePath)).digest("hex");
+  return createHash24("sha256").update(readFileSync25(filePath)).digest("hex");
 }
 function scanHome(definition, homesRoot) {
   const homePath = homePathFor(definition, homesRoot);
@@ -44129,7 +44373,7 @@ function writeStationSnapshot(options) {
   };
 }
 // src/lib/station-hydrate.ts
-import { createHash as createHash24 } from "crypto";
+import { createHash as createHash25 } from "crypto";
 import {
   copyFileSync as copyFileSync2,
   mkdirSync as mkdirSync17,
@@ -44335,7 +44579,7 @@ function skillSha256(skill) {
     return sha256File(skill.files[0].winner.fullPath);
   }
   const joined = skill.files.map((file2) => sha256File(file2.winner.fullPath));
-  return createHash24("sha256").update(joined.sort().join(`
+  return createHash25("sha256").update(joined.sort().join(`
 `)).digest("hex");
 }
 function writeStationHydration(options) {
@@ -44663,7 +44907,7 @@ async function inspectLocked(client2, directory2, cancel) {
   return privatePublicationResult(directory2, receipt);
 }
 // src/lib/skill-context.ts
-import { createHash as createHash25 } from "crypto";
+import { createHash as createHash26 } from "crypto";
 import { resolve as resolve21 } from "path";
 function words(value) {
   return new Set(value.toLowerCase().match(/[a-z0-9]+/g) ?? []);
@@ -44752,7 +44996,7 @@ ${content}`;
 `);
   const receipt = {
     schemaVersion: 1,
-    id: createHash25("sha256").update(JSON.stringify({ profile: profile.profileRevision, sessionId, selections, omitted })).digest("hex"),
+    id: createHash26("sha256").update(JSON.stringify({ profile: profile.profileRevision, sessionId, selections, omitted })).digest("hex"),
     profileId: profile.profileId,
     profileRevision: profile.profileRevision,
     authority: profile.authority,
@@ -44768,9 +45012,9 @@ ${content}`;
   return { context: context2, selections, omitted, receipt };
 }
 // src/lib/session-reconciliation.ts
-import { createHash as createHash26 } from "crypto";
+import { createHash as createHash27 } from "crypto";
 var SESSION_RECONCILIATION_PLAN_TTL_MS = 5 * 60 * 1000;
-var digest3 = (value) => createHash26("sha256").update(JSON.stringify(value)).digest("hex");
+var digest3 = (value) => createHash27("sha256").update(JSON.stringify(value)).digest("hex");
 function exactTimestamp(value) {
   const parsed = value === undefined ? Number.NaN : Date.parse(value);
   if (!Number.isFinite(parsed) || new Date(parsed).toISOString() !== value) {
@@ -45069,6 +45313,7 @@ export {
   captureDiscoveryPathSources,
   captureDiscoveryDirectories,
   captureDiscoveryByteSources,
+  captureCodexSettingsV2,
   captureCodexSettings,
   captureCodexNativeSkillCatalog,
   captureClaudeSettingsV3,