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

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
       "name": "context-mode",
       "skills": "./claude-code/skills",
       "source": "./",
-      "version": "2.0.0-next.5"
+      "version": "2.0.0-next.7"
     }
   ]
 }

package/.claude-plugin/plugin.json

@@ -12,5 +12,5 @@
   },
   "name": "context-mode",
   "skills": "./claude-code/skills",
-  "version": "2.0.0-next.5"
+  "version": "2.0.0-next.7"
 }

package/.codex-plugin/hooks.json

@@ -0,0 +1,50 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "hooks": [
+          {
+            "command": "node \"${PLUGIN_ROOT}/hook.mjs\" --agent codex",
+            "timeout": 5,
+            "type": "command"
+          }
+        ],
+        "matcher": "^(Bash|apply_patch|mcp__context_mode__ctx_.*)$"
+      }
+    ],
+    "PreToolUse": [
+      {
+        "hooks": [
+          {
+            "command": "node \"${PLUGIN_ROOT}/hook.mjs\" --agent codex",
+            "timeout": 5,
+            "type": "command"
+          }
+        ],
+        "matcher": "^(Bash|apply_patch|mcp__context_mode__ctx_.*)$"
+      }
+    ],
+    "SessionStart": [
+      {
+        "hooks": [
+          {
+            "command": "node \"${PLUGIN_ROOT}/hook.mjs\" --agent codex",
+            "timeout": 5,
+            "type": "command"
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "command": "node \"${PLUGIN_ROOT}/hook.mjs\" --agent codex",
+            "timeout": 5,
+            "type": "command"
+          }
+        ]
+      }
+    ]
+  }
+}

package/.codex-plugin/mcp.json

@@ -0,0 +1,14 @@
+{
+  "mcpServers": {
+    "context-mode": {
+      "args": [
+        "./server.mjs",
+        "--agent",
+        "codex"
+      ],
+      "command": "node",
+      "cwd": ".",
+      "default_tools_approval_mode": "approve"
+    }
+  }
+}

package/.codex-plugin/plugin.json

@@ -0,0 +1,12 @@
+{
+  "description": "Context Mode for Codex",
+  "hooks": "./.codex-plugin/hooks.json",
+  "interface": {
+    "category": "Productivity",
+    "displayName": "context-mode"
+  },
+  "mcpServers": "./.codex-plugin/mcp.json",
+  "name": "context-mode",
+  "skills": "./codex/skills/",
+  "version": "2.0.0-next.7"
+}

package/SHA256SUMS

@@ -1,13 +1,19 @@
-b56b6785a4a93ab800598c09605bf52ecf59448102978e6486d96eaf7ebba716  .claude-plugin/marketplace.json
-6dbd4097855d694477f3145086a727cab30cfeaf6ba65c9a4ba45e61095c1a00  .claude-plugin/plugin.json
+7362028009067c6db76e755a639e87a1e3cfe4dfc8d913fcefd5169d55103080  .claude-plugin/marketplace.json
+e5d35796110662348715d11a79e794fbbe9e61e62902cd76cd68486da635f1a3  .claude-plugin/plugin.json
+187503e1455560d4ab5a72e3b8cd2f274abd4ccc5faa60dd66c37e44bb5f10c2  .codex-plugin/hooks.json
+4edea851775bc3f0418f8d9cf6ead74f2767c3a9e3b8c05749eacb78ebb3b896  .codex-plugin/mcp.json
+f96f490f057000cab1f5c56496c0fc3de446a637b6f954d6d853663e9b03197c  .codex-plugin/plugin.json
 1773e40a89384dd1af9023ba533da1908f3e2435dbaaa7cc941edf0514148313  claude-code/skills/ctx-doctor/SKILL.md
 34fffb9c76d69c551f07036230bec0fbaca7a69177a5a47f89ddb9a9990a1fa2  claude-code/skills/ctx-stats/SKILL.md
 d8f835d2f2b3eb70c5902f8707e7c5857977cec9e20ace76c499378a04e178e0  claude-code/skills/ctx-upgrade/SKILL.md
-363b624a157ba796a4ae73481c5159fb3bf4a54ec18570ac54f43f82f3ca7897  cli.mjs
-1c7ea3030f85ce4990c69e1aba7eaa4c5e52e0ca023d923e3f63fb339fa76ea0  copilot/plugin.json
+4716b2bc1bce3752f140f6b8f2b276f53b36960ac724eb7f03e1c93318fee4f1  cli.mjs
+83c297020ed0c592fc68c9c482546a6999d41df5d06d8a329498f10edb1bd38e  codex/skills/ctx-doctor/SKILL.md
+adc2c374f699d3698110920bb48411965de09fc6e7232ce59c913f6d58c0d738  codex/skills/ctx-stats/SKILL.md
+5c12cdd19a5e3ed7d9ba3a47b24d03864a28d36cf7006876284ee07cd4221ec4  codex/skills/ctx-upgrade/SKILL.md
+83ba9e9cfc9ed07b404f2afd55f65c04a2716e428559c5264ceb97bdfcf3cdae  copilot/plugin.json
 832bf0d31c37a448f3904bc41c7df071777aec2f8fce9d667f1fcf5b03a52a91  fixtures/hook-roundtrip.json
-8a32cfefc76b23e6fb317e5caa869f0c01d5132f16648f0d3aac9a5dbb61f763  gemini-extension.json
-77e6322222838ac99fa8d320c2a358b488d9060660ba574cf60a2f1e27c47cd4  hook.mjs
+d28e323da98711de50112f1e7a1242c22133cd3490e0109d6824732cfd494c4e  gemini-extension.json
+ccab1edf7d21b15976b3523acecca1f485f4b0822b265e27c7a0df821e097c1c  hook.mjs
 1f8d8650d2b38737522cab6b875878e8baf84a74acf98cd924c7af22852d873f  hooks/claude-code.json
 2524a0eb52683b65c65943c5097db513e9845ba14e84324b39e9a8ea2bb43193  hooks/codex.json
 b656fed2b754ebcfd4c156bee81d5879c21a8083fc0d6b8e3241462b63a214b6  hooks/copilot-cli.json
@@ -16,16 +22,16 @@ f336d1db67de49e641687bbd41ba1a9424e31dfe2377b2284bf44358288ebd8b  hooks/kiro.jso
 017c9cc3997dd53231b8548b1a1609fddc51177af53501565a4f334602039860  hooks/qwen.json
 33f69267645338d0dc392ce551dcd7c69a0b508113469d6ea637d3f34239ef1d  hooks/vscode.json
 085630bccf2073ac9a62be24ef91dfc47d106092dc82c822db70890b7d3ae1c0  hooks/zcode.json
-65293aa65a8f05605354128530bd9a46d2fdb2b6aeb784b482b0e67e50fc9047  opencode/plugin.js
-5f605e530767e65e9dae61545d2e3a29637e85f160d1c932d8901b71bfecf872  package.json
-5b254ae726b8d92bd083069d54ea3a92465d07655d8cf0bb321585572c5d6044  pi/index.js
+8dfb464afb21d1548e5c1368fac5fd8d43838a2d8111bc3ec82cac8a09c977e3  opencode/plugin.js
+d38b8f717169353ff603f6b22ee66d25c01e1670a64583e28ccec3862f29e215  package.json
+d8784f4a18e478f7176189d9c45ab28843e3dbfa7e4c50103c1f20036961e8d0  pi/index.js
 8712881622c9905aa4836af50d903042d34a91506264e459bc7839331f6f0192  pi/skills/ctx-doctor/SKILL.md
 8d6e8e2a82eb079bddc60727f52d9f9a6e0bf9e15391357fed82ee76ab5fe76c  pi/skills/ctx-stats/SKILL.md
 db6f9c006bc864a7271f1eeffb1e316ebb537a3414f1c22f8b9de0a896e8e3c5  pi/skills/ctx-upgrade/SKILL.md
-60c29a65f5cc4f08a81944c38252ff5c57d49516cf0a0058c4fd5f4885e4ac3a  qwen-extension.json
-52add685290c12127664d24753f897b81350ec44453f91330b332027bc56b52a  run.mjs
-52add685290c12127664d24753f897b81350ec44453f91330b332027bc56b52a  search.mjs
-02bfde857e38769a5f643d73564a817acdc526a796f5f49af45521d0230d7818  server.mjs
-6a7fdf30ff29c57a0edbcbe508b77151cc71dd78ef3b6ee90d957ce0c8d28d6f  skills/ctx-doctor/SKILL.md
-81be076a843f0b352075c73a09ec0fa62adea4f3bc01409f516d26891b32e835  skills/ctx-stats/SKILL.md
-df85a77653622d23d8851fb7eb16f977e5f8646aa54ca5ede0db811dcd950916  skills/ctx-upgrade/SKILL.md
+6a8c387c281796e0f90309e730424e60191471ea0f26585dde7a4f22124c8ed4  qwen-extension.json
+54f4ec9ac9cc26814e7e548b8bafb05bf2610eb0ed0bab2f1e9576e2c99a799d  run.mjs
+54f4ec9ac9cc26814e7e548b8bafb05bf2610eb0ed0bab2f1e9576e2c99a799d  search.mjs
+f8929b0cb819af7a2e6989efb34da39ff46a4e3a53702e717903442bdc8874b5  server.mjs
+e5503a22a6238901484d123efc11d2d933aa9a54c6ac2018812cfa65ec4e53e3  skills/ctx-doctor/SKILL.md
+1044587a1906c69f2467c089a25e19819a290ea5728389bd1f086c6dfc0d0c51  skills/ctx-stats/SKILL.md
+c1cac75b7506ee0d06089ce611ac6dc9314cf12435da318ce88ad50e2c5debbf  skills/ctx-upgrade/SKILL.md

package/cli.mjs

@@ -442,8 +442,12 @@ var UPGRADE_REPORT_ONLY_REASONS = Object.freeze([V1_REASON.statusLine, V1_REASON
 var OPENCODE_TOOL_PREFIX = SERVER_KEY + "_";
 var JSON_INDENT_UNIT = "  ";
 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: {
@@ -830,9 +834,62 @@ function readResult4(resp) {
   const isError = typeof resp === "object" && resp !== null && resp.is_error === true;
   return { isError, bytes: Buffer.byteLength(text2), text: text2 };
 }
+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 r2 = isRecord2(v) ? v : {};
+  const text2 = typeof r2.textResultForLlm === "string" ? r2.textResultForLlm : "";
+  return { isError: typeof r2.resultType === "string" && r2.resultType !== RESULT_SUCCESS2, bytes: Buffer.byteLength(text2), text: text2 };
+}
+function decodeCamel(p3, 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(p3.sessionId ?? ""), cwd: String(p3.cwd ?? "") };
+  if (event === "SessionStart" && typeof p3.source === "string" && SESSION_SOURCES[p3.source] !== void 0) ev.source = SESSION_SOURCES[p3.source];
+  if (event === "UserPromptSubmit" && typeof p3.prompt === "string") ev.prompt = p3.prompt;
+  if (event === "PreToolUse" || event === "PostToolUse") {
+    const toolName = String(p3.toolName ?? "");
+    ev.tool = { name: toolName, canonicalName: canonicalName4(toolName), input: readArgs2(p3.toolArgs) };
+  }
+  if (event === "PostToolUse") ev.result = readCamelResult(p3.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 p3 = raw;
+  if (p3.hookEventName !== void 0) return decodeCamel(p3, p3.hookEventName);
+  if (p3.hook_event_name === void 0) {
+    const byKey = EVENT_BY_KEY2.find(([key]) => Object.hasOwn(p3, key))?.[1];
+    if (byKey === void 0) throw new Error("vscode: missing required field hook_event_name");
+    return decodeCamel(p3, byKey);
+  }
   const event = VSCODE_EVENTS.find((e) => e === p3.hook_event_name);
   if (event === void 0) throw new Error("vscode: unknown hook event " + String(p3.hook_event_name));
   const ev = { event, agent: "vscode", sessionId: String(p3.session_id ?? ""), cwd: String(p3.cwd ?? "") };
@@ -840,7 +897,7 @@ function decode6(raw) {
   if (event === "UserPromptSubmit" && typeof p3.prompt === "string") ev.prompt = p3.prompt;
   if (event === "PreToolUse" || event === "PostToolUse") {
     const name = String(p3.tool_name ?? "");
-    const input = typeof p3.tool_input === "object" && p3.tool_input !== null && !Array.isArray(p3.tool_input) ? p3.tool_input : {};
+    const input = isRecord2(p3.tool_input) ? p3.tool_input : {};
     ev.tool = { name, canonicalName: canonicalName4(name), input };
   }
   if (event === "PostToolUse") ev.result = readResult4(p3.tool_response);
@@ -859,12 +916,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((n3) => [n3, "Bash"]));
 var MCP_SEP3 = "_";
 var KIRO_SOURCES = { startup: "startup", resume: "resume", clear: "clear", compact: "compact" };
 function canonicalName5(name) {
@@ -1005,8 +1064,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;
@@ -1126,8 +1185,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
   },
@@ -1163,8 +1222,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
   },
@@ -1173,9 +1232,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",
@@ -1188,7 +1247,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",
@@ -1230,7 +1289,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).
@@ -5151,6 +5210,7 @@ var STATE_DIR = ".context-mode";
 var LOCK_FILE = "setup.lock";
 var BACKUP_DIR = "backups";
 var PLUGIN_ID = `${SERVER_KEY}@${SERVER_KEY}`;
+var SKILLS_DIR_NAME = "skills";
 var INSTRUCTION_FILES = Object.freeze([
   "CLAUDE.md",
   "AGENTS.md",
@@ -5164,10 +5224,17 @@ function configEdits(c3) {
   return [[c3.key, c3.value], ...c3.also ?? []];
 }
 var COMMAND_SKILLS = Object.freeze(["ctx-doctor", "ctx-stats", "ctx-upgrade"]);
-var SKILLS_DIR = "skills";
 var SKILL_FILE = "SKILL.md";
 var OPENCODE_PLUGIN = ["opencode", "plugin.js"];
 var CODEX_CONFIG_FILE = "config.toml";
+var CODEX_HOME_ENV2 = "CODEX_HOME";
+var CODEX_DIR = ".codex";
+function agentPath(ctx, id, rel) {
+  const segs = typeof rel === "string" ? rel.split("/") : [...rel];
+  const codexHome = ctx.env[CODEX_HOME_ENV2];
+  if (id === "codex" && segs[0] === CODEX_DIR && codexHome !== void 0 && codexHome !== "") return path2.join(codexHome, ...segs.slice(1));
+  return path2.join(ctx.home, ...segs);
+}
 function renderSkill(text2, prefix) {
   const prefixes = typeof prefix === "string" ? [prefix] : prefix;
   if (prefixes.length === 1 && prefixes[0] === "") return text2;
@@ -5183,6 +5250,23 @@ function skillDirPrefixes(dirPath) {
   }
   return out2;
 }
+var EXTENSION_LIST = ["extensions", "list"];
+function extensionPlugin(bin, id) {
+  return {
+    bin,
+    args: EXTENSION_LIST,
+    plugin: SERVER_KEY,
+    hooksVia: getAdapter(id).hookChannel.path,
+    skillsVia: SKILLS_DIR_NAME,
+    format: "extension",
+    enable: ["extensions", "enable", SERVER_KEY]
+  };
+}
+var NATIVE_PLUGIN = {
+  codex: { bin: "codex", args: ["plugin", "list"], plugin: PLUGIN_ID, hooksVia: ".codex-plugin", skillsVia: path2.join("codex", SKILLS_DIR_NAME), format: "table" },
+  qwen: extensionPlugin("qwen", "qwen"),
+  gemini: extensionPlugin("gemini", "gemini")
+};
 function serverCmd(ctx, id) {
   return [process.execPath, path2.join(ctx.pkgDir, SERVER_BUNDLE), AGENT_FLAG, id];
 }
@@ -5205,7 +5289,7 @@ function configFor(ctx, id) {
   const [node, server, flag, agent] = serverCmd(ctx, id);
   const own2 = OWN_MCP_ENTRY[id];
   if (own2) {
-    const file = path2.join(ctx.home, ...own2.file);
+    const file = agentPath(ctx, id, own2.file);
     const format = file.endsWith(".toml") ? "toml" : id === "vscode" ? "jsonc" : "json";
     const args = id === "vscode" ? [server, flag, agent, WORKSPACE_FOLDER_FLAG, VSCODE_WORKSPACE_VAR] : [server, flag, agent];
     const also = own2.also?.map(([k, v]) => [k, v]);
@@ -5255,10 +5339,11 @@ var LIST = {
   // D-HF-OPENCODE-LIST-1: --pure skips external plugins, so a fresh HOME does not wait on the @opencode-ai/plugin install.
   opencode: { bin: "opencode", args: ["mcp", "list", "--pure"] }
 };
-function hookFilesFor(home, id) {
+function hookFilesFor(ctx, id) {
+  const home = ctx.home;
   switch (id) {
     case "codex":
-      return [{ file: path2.join(home, ".codex", "hooks.json"), mode: "rewrite" }];
+      return [{ file: agentPath(ctx, id, [CODEX_DIR, "hooks.json"]), mode: "rewrite" }];
     case "copilot-cli":
       return [{ file: path2.join(home, ".copilot", "hooks", "context-mode.json"), mode: "rewrite" }];
     case "claude-code":
@@ -5276,7 +5361,7 @@ function hookInstallFor(ctx, row, command) {
   if (ch.kind === "home-file") {
     const shape = HOOK_SHAPES[row.id];
     if (!shape) throw new Error(`setup: ${row.id} has a home-file hook channel and no hook shape`);
-    const file = path2.join(ctx.home, ch.path);
+    const file = agentPath(ctx, row.id, ch.path);
     if (row.id === "codex") return { kind: "file", file, shape: shape(row, command), command, trust: path2.join(path2.dirname(file), CODEX_CONFIG_FILE) };
     return { kind: "file", file, shape: shape(row, command), command };
   }
@@ -5290,13 +5375,19 @@ function hookInstallFor(ctx, row, command) {
   }
   return { kind: "package", via: ch.path };
 }
+function bareSkillDir() {
+  const row = ADAPTERS.find((r2) => r2.skillChannel.kind === "package" && r2.toolNamePrefix === "");
+  if (row === void 0) throw new Error("setup: no package skill channel holds the bare tool names");
+  return row.skillChannel.path;
+}
 function skillInstallFor(ctx, row) {
   const ch = row.skillChannel;
   if (ch.kind === "package") return { kind: "package", via: ch.path };
-  const dir = path2.join(ctx.home, ch.path);
+  const dir = agentPath(ctx, row.id, ch.path);
+  const src = path2.join(ctx.pkgDir, bareSkillDir());
   return { kind: "dir", dir, prefixes: skillDirPrefixes(ch.path), files: COMMAND_SKILLS.map((name) => ({
     name,
-    src: path2.join(ctx.pkgDir, SKILLS_DIR, name, SKILL_FILE),
+    src: path2.join(src, name, SKILL_FILE),
     file: path2.join(dir, name, SKILL_FILE)
   })) };
 }
@@ -5304,7 +5395,7 @@ function buildRegistry(ctx) {
   return ADAPTERS.map((row) => {
     const id = row.id;
     const config = configFor(ctx, id);
-    const hookFiles = hookFilesFor(ctx.home, id);
+    const hookFiles = hookFilesFor(ctx, id);
     const hookCommand = [process.execPath, path2.join(ctx.pkgDir, HOOK_BUNDLE), AGENT_FLAG, id];
     const command = `"${hookCommand[0]}" "${hookCommand[1]}" ${AGENT_FLAG} ${id}`;
     const hookInstall = hookInstallFor(ctx, getAdapter(id), command);
@@ -5333,6 +5424,8 @@ function buildRegistry(ctx) {
     if (row.installMode !== "in-process") out2.hookCommand = hookCommand;
     const copy = copyFor(ctx, id);
     if (copy) out2.copy = copy;
+    const native = NATIVE_PLUGIN[id];
+    if (native) out2.nativePlugin = native;
     return out2;
   });
 }
@@ -5935,6 +6028,79 @@ function skillsCheck(row, pkgDir) {
   const bad = s.files.filter((f2) => readOr(f2.file) !== (existsSync6(f2.src) ? renderSkill(readFileSync3(f2.src, "utf8"), s.prefixes) : void 0));
   return { name: "skills", ok: bad.length === 0, detail: bad.length ? `${bad.map((f2) => f2.file).join(", ")} missing or without the ${s.prefixes.join(" / ") || "plain"} tool prefix` : void 0 };
 }
+var PLUGIN_ENABLED = "enabled";
+var WORD_TRIM = ",;";
+var EXT_ENABLED_USER = "Enabled (User):";
+var EXT_TRUE = "true";
+function tableState(n3, text2) {
+  const line = text2.split("\n").find((l2) => l2.split(" ").includes(n3.plugin));
+  if (line === void 0) return void 0;
+  return line.split(" ").map((w) => trimChars(w, WORD_TRIM)).includes(PLUGIN_ENABLED) ? "enabled" : "disabled";
+}
+function extensionState(n3, text2) {
+  let mine = false;
+  for (const raw of text2.split("\n")) {
+    const line = raw.trimEnd();
+    if (line.length && !line.startsWith(" ")) {
+      mine = line.split(" ")[1] === n3.plugin;
+      continue;
+    }
+    const t2 = line.trim();
+    if (mine && t2.startsWith(EXT_ENABLED_USER)) return t2.slice(EXT_ENABLED_USER.length).trim() === EXT_TRUE ? "enabled" : "disabled";
+  }
+  return void 0;
+}
+function nativeState(row, env) {
+  const n3 = row.nativePlugin;
+  if (!n3 || !hostBin(n3.bin, env).file) return void 0;
+  const r2 = runBin(n3.bin, n3.args, env);
+  if (r2.status !== 0) return void 0;
+  return n3.format === "extension" ? extensionState(n3, `${r2.stdout}${r2.stderr}`) : tableState(n3, `${r2.stdout}`);
+}
+function nativeRow(row, n3) {
+  return {
+    ...row,
+    config: void 0,
+    cli: void 0,
+    copy: void 0,
+    hookFiles: [],
+    listCommand: { bin: n3.bin, args: n3.args },
+    hookInstall: { kind: "package", via: n3.hooksVia },
+    skillInstall: { kind: "package", via: n3.skillsVia }
+  };
+}
+function trimChars(w, chars) {
+  let a2 = 0;
+  let b3 = w.length;
+  while (a2 < b3 && chars.includes(w.charAt(a2))) a2++;
+  while (b3 > a2 && chars.includes(w.charAt(b3 - 1))) b3--;
+  return w.slice(a2, b3);
+}
+async function nativeResult(row, ctx) {
+  const n3 = row.nativePlugin;
+  const state = nativeState(row, ctx.env);
+  if (!n3 || state === void 0) return void 0;
+  const bin = hostBin(n3.bin, ctx.env).file;
+  if (state === "disabled") {
+    if (!n3.enable) return void 0;
+    return {
+      id: row.id,
+      status: "FAIL",
+      v1: [],
+      changes: [],
+      checks: [],
+      bin,
+      reason: `context-mode is installed but disabled in ${n3.bin}, run ${n3.bin} ${n3.enable.join(" ")}`
+    };
+  }
+  const res = { id: row.id, status: "PASS", v1: [], changes: [], checks: await verifyRow(nativeRow(row, n3), ctx), bin };
+  const bad = res.checks.filter((c3) => !c3.ok);
+  if (bad.length) {
+    res.status = "FAIL";
+    res.reason = bad.map((c3) => `${c3.name}: ${c3.detail}`).join("; ");
+  }
+  return res;
+}
 async function verifyRow(row, ctx) {
   const env = ctx.env;
   const checks = [parseCheck(row)];
@@ -6042,7 +6208,7 @@ async function runSetup(opts) {
       }
       current = id;
       opts.onAgent?.(id, "start");
-      const res = await setupRow(row, ctx, run, !!opts.dryRun);
+      const res = await nativeResult(row, ctx) ?? await setupRow(row, ctx, run, !!opts.dryRun);
       current = void 0;
       agents.push(res);
       opts.onAgent?.(id, "done", res);
@@ -6117,6 +6283,12 @@ async function runDoctor(opts) {
       continue;
     }
     opts.onAgent?.(id, "start");
+    const native = await nativeResult(row, ctx);
+    if (native) {
+      agents.push(native);
+      opts.onAgent?.(id, "done", native);
+      continue;
+    }
     const res = await setupRow(row, ctx, run, true);
     if (res.status === "PASS") {
       if (res.v1.some((f2) => !UPGRADE_REPORT_ONLY_REASONS.includes(f2.reason))) {

package/codex/skills/ctx-doctor/SKILL.md

@@ -0,0 +1,6 @@
+---
+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.

package/codex/skills/ctx-stats/SKILL.md

@@ -0,0 +1,6 @@
+---
+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.

package/codex/skills/ctx-upgrade/SKILL.md

@@ -0,0 +1,6 @@
+---
+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.

package/copilot/plugin.json

@@ -10,5 +10,5 @@
     }
   },
   "name": "context-mode",
-  "version": "2.0.0-next.5"
+  "version": "2.0.0-next.7"
 }

package/gemini-extension.json

@@ -10,5 +10,5 @@
     }
   },
   "name": "context-mode",
-  "version": "2.0.0-next.5"
+  "version": "2.0.0-next.7"
 }