context-mode 2.0.0-next.5 → 2.0.0-next.7

package/search.mjs

@@ -354,8 +354,12 @@ var V1_REASON = Object.freeze({
 var UPGRADE_REPORT_ONLY_REASONS = Object.freeze([V1_REASON.statusLine, V1_REASON.vscodeMcp, V1_REASON.dataDirShared, V1_REASON.tmpFile, V1_REASON.kiroSteering]);
 var OPENCODE_TOOL_PREFIX = SERVER_KEY + "_";
 var ZCODE_MCP_FEATURE_KEY = Object.freeze(["features", "mcp"]);
+var CODEX_OMIT_TOOLS_FROM_FIELD = "omit_tools_from";
+var CODEX_OMIT_DEFERRED = Object.freeze(["deferred"]);
+var CODEX_APPROVAL_MODE_FIELD = "default_tools_approval_mode";
+var CODEX_APPROVAL_APPROVE = "approve";
 var OWN_MCP_ENTRY = Object.freeze({
-  codex: { file: [".codex", "config.toml"], key: ["mcp_servers", SERVER_KEY] },
+  codex: { file: [".codex", "config.toml"], key: ["mcp_servers", SERVER_KEY], fields: { [CODEX_OMIT_TOOLS_FROM_FIELD]: CODEX_OMIT_DEFERRED, [CODEX_APPROVAL_MODE_FIELD]: CODEX_APPROVAL_APPROVE } },
   vscode: { file: [".vscode", "mcp.json"], key: ["servers", SERVER_KEY] },
   kiro: { file: [".kiro", "settings", "mcp.json"], key: ["mcpServers", SERVER_KEY] },
   zcode: {
@@ -746,9 +750,62 @@ function readResult4(resp) {
   const isError = typeof resp === "object" && resp !== null && resp.is_error === true;
   return { isError, bytes: Buffer.byteLength(text), text };
 }
+var CAMEL_EVENTS = {
+  sessionStart: "SessionStart",
+  userPromptSubmitted: "UserPromptSubmit",
+  preToolUse: "PreToolUse",
+  postToolUse: "PostToolUse",
+  preCompact: "PreCompact"
+};
+var EVENT_BY_KEY2 = [
+  ["toolResult", "postToolUse"],
+  ["toolName", "preToolUse"],
+  ["prompt", "userPromptSubmitted"],
+  ["source", "sessionStart"],
+  ["trigger", "preCompact"]
+];
+var SESSION_SOURCES = { new: "startup", startup: "startup", resume: "resume" };
+var RESULT_SUCCESS2 = "success";
+function isRecord2(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function readArgs2(v) {
+  if (isRecord2(v)) return v;
+  if (typeof v !== "string") return {};
+  try {
+    const parsed = JSON.parse(v);
+    return isRecord2(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function readCamelResult(v) {
+  const r = isRecord2(v) ? v : {};
+  const text = typeof r.textResultForLlm === "string" ? r.textResultForLlm : "";
+  return { isError: typeof r.resultType === "string" && r.resultType !== RESULT_SUCCESS2, bytes: Buffer.byteLength(text), text };
+}
+function decodeCamel(p, name) {
+  const event = typeof name === "string" ? CAMEL_EVENTS[name] ?? VSCODE_EVENTS.find((e) => e === name) : void 0;
+  if (event === void 0) throw new Error("vscode: unknown hook event " + String(name));
+  const ev = { event, agent: "vscode", sessionId: String(p.sessionId ?? ""), cwd: String(p.cwd ?? "") };
+  if (event === "SessionStart" && typeof p.source === "string" && SESSION_SOURCES[p.source] !== void 0) ev.source = SESSION_SOURCES[p.source];
+  if (event === "UserPromptSubmit" && typeof p.prompt === "string") ev.prompt = p.prompt;
+  if (event === "PreToolUse" || event === "PostToolUse") {
+    const toolName = String(p.toolName ?? "");
+    ev.tool = { name: toolName, canonicalName: canonicalName4(toolName), input: readArgs2(p.toolArgs) };
+  }
+  if (event === "PostToolUse") ev.result = readCamelResult(p.toolResult);
+  return ev;
+}
 function decode6(raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) throw new Error("vscode: hook payload is not a JSON object");
   const p = raw;
+  if (p.hookEventName !== void 0) return decodeCamel(p, p.hookEventName);
+  if (p.hook_event_name === void 0) {
+    const byKey = EVENT_BY_KEY2.find(([key]) => Object.hasOwn(p, key))?.[1];
+    if (byKey === void 0) throw new Error("vscode: missing required field hook_event_name");
+    return decodeCamel(p, byKey);
+  }
   const event = VSCODE_EVENTS.find((e) => e === p.hook_event_name);
   if (event === void 0) throw new Error("vscode: unknown hook event " + String(p.hook_event_name));
   const ev = { event, agent: "vscode", sessionId: String(p.session_id ?? ""), cwd: String(p.cwd ?? "") };
@@ -756,7 +813,7 @@ function decode6(raw) {
   if (event === "UserPromptSubmit" && typeof p.prompt === "string") ev.prompt = p.prompt;
   if (event === "PreToolUse" || event === "PostToolUse") {
     const name = String(p.tool_name ?? "");
-    const input = typeof p.tool_input === "object" && p.tool_input !== null && !Array.isArray(p.tool_input) ? p.tool_input : {};
+    const input = isRecord2(p.tool_input) ? p.tool_input : {};
     ev.tool = { name, canonicalName: canonicalName4(name), input };
   }
   if (event === "PostToolUse") ev.result = readResult4(p.tool_response);
@@ -775,12 +832,14 @@ var KIRO_EVENTS = {
   PromptSubmit: "UserPromptSubmit",
   userPromptSubmit: "UserPromptSubmit",
   PreToolUse: "PreToolUse",
-  PostToolUse: "PostToolUse"
+  preToolUse: "PreToolUse",
+  PostToolUse: "PostToolUse",
+  postToolUse: "PostToolUse"
 };
 var PROMPT_ENV = "USER_PROMPT";
 var MCP_PREFIX3 = "mcp_";
-var SHELL_TOOL_NAME2 = "execute_bash";
-var NATIVE_TO_CANONICAL5 = { [SHELL_TOOL_NAME2]: "Bash" };
+var SHELL_TOOL_NAMES = Object.freeze(["execute_bash", "execute_pwsh", "shell"]);
+var NATIVE_TO_CANONICAL5 = Object.fromEntries(SHELL_TOOL_NAMES.map((n) => [n, "Bash"]));
 var MCP_SEP3 = "_";
 var KIRO_SOURCES = { startup: "startup", resume: "resume", clear: "clear", compact: "compact" };
 function canonicalName5(name) {
@@ -921,8 +980,8 @@ var OPENCODE_EVENTS = {
   compaction: "PreCompact",
   "step-finish": "Usage"
 };
-var SHELL_TOOL_NAME3 = "bash";
-var NATIVE_TO_CANONICAL7 = { webfetch: "WebFetch", [SHELL_TOOL_NAME3]: "Bash" };
+var SHELL_TOOL_NAME2 = "bash";
+var NATIVE_TO_CANONICAL7 = { webfetch: "WebFetch", [SHELL_TOOL_NAME2]: "Bash" };
 function toCanonicalTool(name) {
   if (name.startsWith(OWN_WIRE_PREFIX)) return name.slice(OWN_WIRE_PREFIX.length);
   return Object.prototype.hasOwnProperty.call(NATIVE_TO_CANONICAL7, name) ? NATIVE_TO_CANONICAL7[name] : name;
@@ -1042,8 +1101,8 @@ var ADAPTERS = Object.freeze([
     hookTimeoutMs: HOOK_TIMEOUT_MS,
     denyChannel: "deny-reason",
     hookChannel: { kind: "package", path: "hooks/qwen.json" },
-    skillChannel: { kind: "home-dir", path: ".qwen/skills" },
-    // ADR-0020
+    skillChannel: { kind: "package", path: "skills" },
+    // ADR-0020, D-HQ-SKILLS-3: qwen loads <extension>/skills, shared with gemini
     decode: decode4,
     encode: encode4
   },
@@ -1079,8 +1138,8 @@ var ADAPTERS = Object.freeze([
     hookTimeoutMs: HOOK_TIMEOUT_MS,
     denyChannel: "deny-reason",
     hookChannel: { kind: "home-file", path: ".copilot/hooks/context-mode-vscode.json" },
-    skillChannel: { kind: "home-dir", path: ".copilot/skills" },
-    // ADR-0020
+    skillChannel: { kind: "home-dir", path: ".agents/skills" },
+    // ADR-0020, D-HQ-COPILOT-NAMES-3: Copilot CLI owns ~/.copilot/skills
     decode: decode6,
     encode: encode6
   },
@@ -1089,9 +1148,9 @@ var ADAPTERS = Object.freeze([
     installMode: "mcp-entry",
     projectSource: "arg:--agent+cwd",
     toolNamePrefix: TOOL_NAME_PREFIX7,
-    nativeTools: { shell: [SHELL_TOOL_NAME2] },
+    nativeTools: { shell: [...SHELL_TOOL_NAMES] },
     execReadOnlyHint: false,
-    // D-HF-KIRO-SHELL-1
+    // D-HF-KIRO-SHELL-1, D-N7-KIRO-1
     eventMap: { SessionStart: "SessionStart", UserPromptSubmit: "UserPromptSubmit", PreToolUse: "PreToolUse", PostToolUse: "PostToolUse" },
     compactDelivery: "none",
     compactSummary: "none",
@@ -1104,7 +1163,7 @@ var ADAPTERS = Object.freeze([
     encode: encode7
   },
   {
-    // toolNamePrefix and nativeTools unverified until T-ZC (DECISIONS-r9 R3, R4: Claude names).
+    // toolNamePrefix is the documented ZCode name mcp__<server>__<tool> (D-N7-ZCODE-NAMES-1); nativeTools are Claude names.
     id: "zcode",
     installMode: "hooks+mcp",
     projectSource: "spawn-cwd",
@@ -1146,7 +1205,7 @@ var ADAPTERS = Object.freeze([
     installMode: "in-process",
     projectSource: "spawn-cwd",
     toolNamePrefix: TOOL_NAME_PREFIX10,
-    nativeTools: { shell: [SHELL_TOOL_NAME3] },
+    nativeTools: { shell: [SHELL_TOOL_NAME2] },
     execReadOnlyHint: false,
     // D-HF-OPENCODE-SHELL-1
     // Usage: step-finish cost row (DEVIATIONS D-M5-arch-2).
@@ -1168,6 +1227,10 @@ var REPLACE_ROWS = /* @__PURE__ */ new Set(["claude-code", "gemini", "copilot-cl
 function hasReplace(row) {
   return REPLACE_ROWS.has(row.id);
 }
+var DUMP_REPLACE_ROWS = /* @__PURE__ */ new Set(["claude-code", "copilot-cli", "pi"]);
+function dumpRunsThenReplaces(row) {
+  return DUMP_REPLACE_ROWS.has(row.id) && hasReplace(row);
+}
 function getAdapter(id) {
   return BY_ID.get(id);
 }
@@ -4642,7 +4705,7 @@ function read(ev, row, input) {
   return ALLOW;
 }
 function shellDump(cmds, cwd, row) {
-  if (row.nativeTools.read !== void 0 && row.nativeTools.read.length > 0 && hasReplace(row)) return null;
+  if (row.nativeTools.read !== void 0 && row.nativeTools.read.length > 0 && dumpRunsThenReplaces(row)) return null;
   if (cmds.length !== 1) return null;
   const c = cmds[0];
   if (c.redirectsToFile || c.endsInBoundedSink) return null;

package/server.mjs

@@ -28312,7 +28312,7 @@ var DECISION_SOURCE = "decision";
 var DECISION_USER_LABEL = "decision (user)";
 var RELEASE_REPO_URL = "https://github.com/mksglu/context-mode.git";
 var RELEASE_BRANCH = "release";
-var BUNDLE_SHA = true ? "0bf5734278463ea178b282436a39ba81347dadab" : void 0;
+var BUNDLE_SHA = true ? "f61b6973877b47851ac5938c46fee1399946289e" : void 0;
 var DOCTOR_CHECK_ORDER = Object.freeze(["D1", "D2", "D3", "D4", "D5", "D5b", "D6", "D7", "D8", "D9", "D10"]);
 var DOCTOR_LABEL = Object.freeze({
   D1: "version",
@@ -28551,6 +28551,7 @@ var V1_HOOKS_DIR_NAME = "hooks";
 var SETTINGS_FILE = "settings.json";
 var CLAUDE_USER_CONFIG_FILE = ".claude.json";
 var HOOKS_JSON_FILE = "hooks.json";
+var CODEX_HOME_ENV = "CODEX_HOME";
 var CONFIG_TOML_FILE = "config.toml";
 var CONFIG_JSON_FILE = "config.json";
 var ZCODE_CLI_DIR = "cli";
@@ -28616,8 +28617,12 @@ var JSON_INDENT_UNIT = "  ";
 var MCP_COMMAND_FIELD = "command";
 var MCP_ARGS_FIELD = "args";
 var ZCODE_MCP_FEATURE_KEY = Object.freeze(["features", "mcp"]);
+var CODEX_OMIT_TOOLS_FROM_FIELD = "omit_tools_from";
+var CODEX_OMIT_DEFERRED = Object.freeze(["deferred"]);
+var CODEX_APPROVAL_MODE_FIELD = "default_tools_approval_mode";
+var CODEX_APPROVAL_APPROVE = "approve";
 var OWN_MCP_ENTRY = Object.freeze({
-  codex: { file: [".codex", "config.toml"], key: ["mcp_servers", SERVER_KEY] },
+  codex: { file: [".codex", "config.toml"], key: ["mcp_servers", SERVER_KEY], fields: { [CODEX_OMIT_TOOLS_FROM_FIELD]: CODEX_OMIT_DEFERRED, [CODEX_APPROVAL_MODE_FIELD]: CODEX_APPROVAL_APPROVE } },
   vscode: { file: [".vscode", "mcp.json"], key: ["servers", SERVER_KEY] },
   kiro: { file: [".kiro", "settings", "mcp.json"], key: ["mcpServers", SERVER_KEY] },
   zcode: {
@@ -29057,6 +29062,10 @@ function homeDirOf(env) {
   if (profile !== void 0 && profile !== "") return profile;
   return null;
 }
+function codexDirOf(env, home) {
+  const dir = env[CODEX_HOME_ENV];
+  return dir !== void 0 && dir !== "" ? dir : join(home, ...AGENT_HOME_DIR.codex);
+}
 function homeOf(env) {
   const home = homeDirOf(env);
   if (home !== null) return home;
@@ -31536,16 +31545,23 @@ var TYPO_MIN_LEN = 5;
 var TYPO_MAX_DIST = 2;
 function typoTerms(db, words) {
   const has = stmt(db.raw, "SELECT 1 AS x FROM chunks_vocab WHERE term = ?");
-  const near = stmt(db.raw, "SELECT term, doc FROM chunks_vocab WHERE length(term) BETWEEN ? AND ?");
+  const near = stmt(db.raw, "SELECT term, doc, length(term) AS n FROM chunks_vocab WHERE length(term) BETWEEN ? AND ?");
+  const stems = queryStems(words.join(" "));
+  const miss = stems.map((stem) => has.get(stem) === void 0 && [...stem].length >= TYPO_MIN_LEN);
+  if (!miss.includes(true)) return null;
+  const lens = stems.filter((_, i) => miss[i]).map((stem) => stem.length);
+  const rows = near.all(Math.min(...lens) - TYPO_MAX_DIST, Math.max(...lens) + TYPO_MAX_DIST);
   let changed = false;
   const out = [];
-  for (const stem of queryStems(words.join(" "))) {
-    if (has.get(stem) !== void 0 || [...stem].length < TYPO_MIN_LEN) {
+  stems.forEach((stem, i) => {
+    if (!miss[i]) {
       out.push(stem);
-      continue;
+      return;
     }
     let best = null;
-    for (const r of near.all(stem.length - TYPO_MAX_DIST, stem.length + TYPO_MAX_DIST)) {
+    for (const r of rows) {
+      const n = Number(r.n);
+      if (n < stem.length - TYPO_MAX_DIST || n > stem.length + TYPO_MAX_DIST) continue;
       const d = editDistance(stem, r.term, TYPO_MAX_DIST);
       if (d > TYPO_MAX_DIST) continue;
       if (best === null || d < best.d || d === best.d && (r.doc > best.doc || r.doc === best.doc && r.term < best.term)) {
@@ -31556,7 +31572,7 @@ function typoTerms(db, words) {
       out.push(best.term);
       changed = true;
     }
-  }
+  });
   return changed ? out.map((t) => `"${t.replaceAll('"', '""')}"*`) : null;
 }
 function ftsQuery(db, q, scope, ctx, sessionId, limit, offset, source) {
@@ -44492,9 +44508,62 @@ function readResult4(resp) {
   const isError = typeof resp === "object" && resp !== null && resp.is_error === true;
   return { isError, bytes: Buffer.byteLength(text), text };
 }
+var CAMEL_EVENTS = {
+  sessionStart: "SessionStart",
+  userPromptSubmitted: "UserPromptSubmit",
+  preToolUse: "PreToolUse",
+  postToolUse: "PostToolUse",
+  preCompact: "PreCompact"
+};
+var EVENT_BY_KEY2 = [
+  ["toolResult", "postToolUse"],
+  ["toolName", "preToolUse"],
+  ["prompt", "userPromptSubmitted"],
+  ["source", "sessionStart"],
+  ["trigger", "preCompact"]
+];
+var SESSION_SOURCES = { new: "startup", startup: "startup", resume: "resume" };
+var RESULT_SUCCESS2 = "success";
+function isRecord2(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function readArgs2(v) {
+  if (isRecord2(v)) return v;
+  if (typeof v !== "string") return {};
+  try {
+    const parsed = JSON.parse(v);
+    return isRecord2(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function readCamelResult(v) {
+  const r = isRecord2(v) ? v : {};
+  const text = typeof r.textResultForLlm === "string" ? r.textResultForLlm : "";
+  return { isError: typeof r.resultType === "string" && r.resultType !== RESULT_SUCCESS2, bytes: Buffer.byteLength(text), text };
+}
+function decodeCamel(p, name) {
+  const event = typeof name === "string" ? CAMEL_EVENTS[name] ?? VSCODE_EVENTS.find((e) => e === name) : void 0;
+  if (event === void 0) throw new Error("vscode: unknown hook event " + String(name));
+  const ev = { event, agent: "vscode", sessionId: String(p.sessionId ?? ""), cwd: String(p.cwd ?? "") };
+  if (event === "SessionStart" && typeof p.source === "string" && SESSION_SOURCES[p.source] !== void 0) ev.source = SESSION_SOURCES[p.source];
+  if (event === "UserPromptSubmit" && typeof p.prompt === "string") ev.prompt = p.prompt;
+  if (event === "PreToolUse" || event === "PostToolUse") {
+    const toolName = String(p.toolName ?? "");
+    ev.tool = { name: toolName, canonicalName: canonicalName4(toolName), input: readArgs2(p.toolArgs) };
+  }
+  if (event === "PostToolUse") ev.result = readCamelResult(p.toolResult);
+  return ev;
+}
 function decode8(raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) throw new Error("vscode: hook payload is not a JSON object");
   const p = raw;
+  if (p.hookEventName !== void 0) return decodeCamel(p, p.hookEventName);
+  if (p.hook_event_name === void 0) {
+    const byKey = EVENT_BY_KEY2.find(([key]) => Object.hasOwn(p, key))?.[1];
+    if (byKey === void 0) throw new Error("vscode: missing required field hook_event_name");
+    return decodeCamel(p, byKey);
+  }
   const event = VSCODE_EVENTS.find((e) => e === p.hook_event_name);
   if (event === void 0) throw new Error("vscode: unknown hook event " + String(p.hook_event_name));
   const ev = { event, agent: "vscode", sessionId: String(p.session_id ?? ""), cwd: String(p.cwd ?? "") };
@@ -44502,7 +44571,7 @@ function decode8(raw) {
   if (event === "UserPromptSubmit" && typeof p.prompt === "string") ev.prompt = p.prompt;
   if (event === "PreToolUse" || event === "PostToolUse") {
     const name = String(p.tool_name ?? "");
-    const input = typeof p.tool_input === "object" && p.tool_input !== null && !Array.isArray(p.tool_input) ? p.tool_input : {};
+    const input = isRecord2(p.tool_input) ? p.tool_input : {};
     ev.tool = { name, canonicalName: canonicalName4(name), input };
   }
   if (event === "PostToolUse") ev.result = readResult4(p.tool_response);
@@ -44521,12 +44590,14 @@ var KIRO_EVENTS = {
   PromptSubmit: "UserPromptSubmit",
   userPromptSubmit: "UserPromptSubmit",
   PreToolUse: "PreToolUse",
-  PostToolUse: "PostToolUse"
+  preToolUse: "PreToolUse",
+  PostToolUse: "PostToolUse",
+  postToolUse: "PostToolUse"
 };
 var PROMPT_ENV = "USER_PROMPT";
 var MCP_PREFIX3 = "mcp_";
-var SHELL_TOOL_NAME2 = "execute_bash";
-var NATIVE_TO_CANONICAL5 = { [SHELL_TOOL_NAME2]: "Bash" };
+var SHELL_TOOL_NAMES = Object.freeze(["execute_bash", "execute_pwsh", "shell"]);
+var NATIVE_TO_CANONICAL5 = Object.fromEntries(SHELL_TOOL_NAMES.map((n) => [n, "Bash"]));
 var MCP_SEP3 = "_";
 var KIRO_SOURCES = { startup: "startup", resume: "resume", clear: "clear", compact: "compact" };
 function canonicalName5(name) {
@@ -44667,8 +44738,8 @@ var OPENCODE_EVENTS = {
   compaction: "PreCompact",
   "step-finish": "Usage"
 };
-var SHELL_TOOL_NAME3 = "bash";
-var NATIVE_TO_CANONICAL7 = { webfetch: "WebFetch", [SHELL_TOOL_NAME3]: "Bash" };
+var SHELL_TOOL_NAME2 = "bash";
+var NATIVE_TO_CANONICAL7 = { webfetch: "WebFetch", [SHELL_TOOL_NAME2]: "Bash" };
 function toCanonicalTool(name) {
   if (name.startsWith(OWN_WIRE_PREFIX)) return name.slice(OWN_WIRE_PREFIX.length);
   return Object.prototype.hasOwnProperty.call(NATIVE_TO_CANONICAL7, name) ? NATIVE_TO_CANONICAL7[name] : name;
@@ -44788,8 +44859,8 @@ var ADAPTERS = Object.freeze([
     hookTimeoutMs: HOOK_TIMEOUT_MS,
     denyChannel: "deny-reason",
     hookChannel: { kind: "package", path: "hooks/qwen.json" },
-    skillChannel: { kind: "home-dir", path: ".qwen/skills" },
-    // ADR-0020
+    skillChannel: { kind: "package", path: "skills" },
+    // ADR-0020, D-HQ-SKILLS-3: qwen loads <extension>/skills, shared with gemini
     decode: decode6,
     encode: encode6
   },
@@ -44825,8 +44896,8 @@ var ADAPTERS = Object.freeze([
     hookTimeoutMs: HOOK_TIMEOUT_MS,
     denyChannel: "deny-reason",
     hookChannel: { kind: "home-file", path: ".copilot/hooks/context-mode-vscode.json" },
-    skillChannel: { kind: "home-dir", path: ".copilot/skills" },
-    // ADR-0020
+    skillChannel: { kind: "home-dir", path: ".agents/skills" },
+    // ADR-0020, D-HQ-COPILOT-NAMES-3: Copilot CLI owns ~/.copilot/skills
     decode: decode8,
     encode: encode8
   },
@@ -44835,9 +44906,9 @@ var ADAPTERS = Object.freeze([
     installMode: "mcp-entry",
     projectSource: "arg:--agent+cwd",
     toolNamePrefix: TOOL_NAME_PREFIX7,
-    nativeTools: { shell: [SHELL_TOOL_NAME2] },
+    nativeTools: { shell: [...SHELL_TOOL_NAMES] },
     execReadOnlyHint: false,
-    // D-HF-KIRO-SHELL-1
+    // D-HF-KIRO-SHELL-1, D-N7-KIRO-1
     eventMap: { SessionStart: "SessionStart", UserPromptSubmit: "UserPromptSubmit", PreToolUse: "PreToolUse", PostToolUse: "PostToolUse" },
     compactDelivery: "none",
     compactSummary: "none",
@@ -44850,7 +44921,7 @@ var ADAPTERS = Object.freeze([
     encode: encode9
   },
   {
-    // toolNamePrefix and nativeTools unverified until T-ZC (DECISIONS-r9 R3, R4: Claude names).
+    // toolNamePrefix is the documented ZCode name mcp__<server>__<tool> (D-N7-ZCODE-NAMES-1); nativeTools are Claude names.
     id: "zcode",
     installMode: "hooks+mcp",
     projectSource: "spawn-cwd",
@@ -44892,7 +44963,7 @@ var ADAPTERS = Object.freeze([
     installMode: "in-process",
     projectSource: "spawn-cwd",
     toolNamePrefix: TOOL_NAME_PREFIX10,
-    nativeTools: { shell: [SHELL_TOOL_NAME3] },
+    nativeTools: { shell: [SHELL_TOOL_NAME2] },
     execReadOnlyHint: false,
     // D-HF-OPENCODE-SHELL-1
     // Usage: step-finish cost row (DEVIATIONS D-M5-arch-2).
@@ -45805,6 +45876,7 @@ function ownHooks(block, shape, timeoutKey, native, agent) {
 var validTimeout = (v) => typeof v === "number" && Number.isFinite(v) && v > 0;
 function mcpFile(row5, home, env) {
   const spec = OWN_MCP_ENTRY[row5.id];
+  if (row5.id === "codex") return join9(codexDirOf(env, home), CONFIG_TOML_FILE);
   if (spec !== void 0) return join9(home, ...spec.file);
   if (row5.id === "opencode") return join9(home, ...AGENT_HOME_DIR.opencode, OPENCODE_BASE_CONFIG_FILE);
   if (row5.id === "pi") {
@@ -45832,9 +45904,10 @@ function hookParts(row5, home, env, worktree) {
   let block;
   try {
     const root = spec.root === "plugin" ? resolvePluginRoot(row5, env) : spec.root === "home" ? home : worktree;
-    block = hostConfigValueAt(readParsed(row5.id, join9(root, ...spec.file)).value, spec.key);
+    const file2 = row5.id === "codex" ? join9(codexDirOf(env, home), HOOKS_JSON_FILE) : join9(root, ...spec.file);
+    block = hostConfigValueAt(readParsed(row5.id, file2).value, spec.key);
     if (row5.id === "codex") {
-      const config4 = readParsed(row5.id, join9(home, ...AGENT_HOME_DIR.codex, CONFIG_TOML_FILE)).value;
+      const config4 = readParsed(row5.id, join9(codexDirOf(env, home), CONFIG_TOML_FILE)).value;
       if (hostConfigValueAt(config4, CODEX_FEATURES_HOOKS_KEY) === false) return [PART_HOOKS];
     }
   } catch {
@@ -46230,8 +46303,8 @@ async function hookRow(ctx, adapter, host) {
       bundleDir: host.bundleDir,
       env: buildChildEnv(host.env),
       signal: ctx.signal,
-      codexConfigDir: join10(needHome(host.env), ...AGENT_HOME_DIR.codex),
-      // same Codex dir D3 reads
+      codexConfigDir: codexDirOf(host.env, needHome(host.env)),
+      // same Codex dir D3 reads (D-N6-CODEX-HOME-2)
       db
     });
   } finally {

package/skills/ctx-doctor/SKILL.md

@@ -3,4 +3,4 @@ name: ctx-doctor
 description: Check that context-mode is installed and working, as a table.
 disable-model-invocation: true
 ---
-Call the mcp_context-mode_ctx_doctor tool and show its table to the user unchanged. If a row failed, list the fixes it names, in order.
+Call the mcp_context-mode_ctx_doctor or mcp__context-mode__ctx_doctor tool and show its table to the user unchanged. If a row failed, list the fixes it names, in order.

package/skills/ctx-stats/SKILL.md

@@ -3,4 +3,4 @@ name: ctx-stats
 description: Show how much context context-mode saved, as a table.
 disable-model-invocation: true
 ---
-Call the mcp_context-mode_ctx_stats tool and show its table to the user unchanged. Add one sentence under the table that names the largest saving.
+Call the mcp_context-mode_ctx_stats or mcp__context-mode__ctx_stats tool and show its table to the user unchanged. Add one sentence under the table that names the largest saving.

package/skills/ctx-upgrade/SKILL.md

@@ -3,4 +3,4 @@ name: ctx-upgrade
 description: Update context-mode to the latest release.
 disable-model-invocation: true
 ---
-Call the mcp_context-mode_ctx_upgrade tool and show its table to the user. Then call mcp_context-mode_ctx_doctor and show its table. If a restart is needed, say so in one sentence.
+Call the mcp_context-mode_ctx_upgrade or mcp__context-mode__ctx_upgrade tool and show its table to the user. Then call mcp_context-mode_ctx_doctor or mcp__context-mode__ctx_doctor and show its table. If a restart is needed, say so in one sentence.