@uniqbit/mate-core 0.18.3-canary.0 → 0.18.3

package/src/tools/setup/__snapshots__/runtime-surface-golden.test.ts.snap

@@ -77,8 +77,6 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
 exports[`runtime surface golden fixtures setup graphify × claude 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -124,9 +122,7 @@ exports[`runtime surface golden fixtures setup graphify × claude 2`] = `
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -151,7 +147,7 @@ exports[`runtime surface golden fixtures setup graphify × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -169,7 +165,7 @@ exports[`runtime surface golden fixtures setup graphify × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -177,7 +173,16 @@ exports[`runtime surface golden fixtures setup graphify × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -332,30 +337,7 @@ exports[`runtime surface golden fixtures setup graphify × opencode 2`] = `
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -371,7 +353,7 @@ exports[`runtime surface golden fixtures setup graphify × opencode 3`] = `
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -392,6 +374,49 @@ exports[`runtime surface golden fixtures setup graphify × opencode 3`] = `
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -511,8 +536,6 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
 exports[`runtime surface golden fixtures setup graphify × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -558,9 +581,7 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 2`] =
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -618,30 +639,7 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 2`] =
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -661,7 +659,7 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -679,7 +677,15 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
                 "type": "command",
               },
             ],
@@ -687,7 +693,8 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -731,7 +738,7 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 3`] =
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -752,6 +759,49 @@ exports[`runtime surface golden fixtures setup graphify × claude+opencode 3`] =
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -851,8 +901,6 @@ exports[`runtime surface golden fixtures setup tokensave × claude 1`] = `
 exports[`runtime surface golden fixtures setup tokensave × claude 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -895,9 +943,7 @@ exports[`runtime surface golden fixtures setup tokensave × claude 2`] = `
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -922,12 +968,24 @@ exports[`runtime surface golden fixtures setup tokensave × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
             "matcher": "Write|Edit|MultiEdit|Bash",
           },
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-pre-tool-use",
+                ],
+                "command": "<root>/bin/tokensave",
+                "type": "command",
+              },
+            ],
+            "matcher": "Agent|Grep|Bash",
+          },
         ],
       },
       {
@@ -940,15 +998,64 @@ exports[`runtime surface golden fixtures setup tokensave × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
+                "type": "command",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "UserPromptSubmit",
+        ],
+        "kind": "list",
+        "values": [
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-prompt-submit",
+                ],
+                "command": "<root>/bin/tokensave",
                 "type": "command",
               },
             ],
           },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "Stop",
+        ],
+        "kind": "list",
+        "values": [
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "args": [
+                  "hook-stop",
+                ],
+                "command": "<root>/bin/tokensave",
                 "type": "command",
               },
             ],
@@ -1109,30 +1216,7 @@ exports[`runtime surface golden fixtures setup tokensave × opencode 2`] = `
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -1148,7 +1232,7 @@ exports[`runtime surface golden fixtures setup tokensave × opencode 3`] = `
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -1186,6 +1270,49 @@ exports[`runtime surface golden fixtures setup tokensave × opencode 3`] = `
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -1313,8 +1440,6 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 1`]
 exports[`runtime surface golden fixtures setup tokensave × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -1357,9 +1482,7 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 2`]
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -1414,30 +1537,7 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 2`]
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -1457,12 +1557,24 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 3`]
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
             "matcher": "Write|Edit|MultiEdit|Bash",
           },
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-pre-tool-use",
+                ],
+                "command": "<root>/bin/tokensave",
+                "type": "command",
+              },
+            ],
+            "matcher": "Agent|Grep|Bash",
+          },
         ],
       },
       {
@@ -1475,15 +1587,64 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 3`]
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
+                "type": "command",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "UserPromptSubmit",
+        ],
+        "kind": "list",
+        "values": [
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-prompt-submit",
+                ],
+                "command": "<root>/bin/tokensave",
                 "type": "command",
               },
             ],
           },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "Stop",
+        ],
+        "kind": "list",
+        "values": [
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "args": [
+                  "hook-stop",
+                ],
+                "command": "<root>/bin/tokensave",
                 "type": "command",
               },
             ],
@@ -1545,7 +1706,7 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 3`]
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -1583,6 +1744,49 @@ exports[`runtime surface golden fixtures setup tokensave × claude+opencode 3`]
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -1634,8 +1838,6 @@ exports[`runtime surface golden fixtures setup context-mode × claude 1`] = `
 exports[`runtime surface golden fixtures setup context-mode × claude 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -1670,9 +1872,7 @@ exports[`runtime surface golden fixtures setup context-mode × claude 2`] = `
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
     "--plugin-dir",
@@ -1699,7 +1899,7 @@ exports[`runtime surface golden fixtures setup context-mode × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -1717,7 +1917,15 @@ exports[`runtime surface golden fixtures setup context-mode × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
                 "type": "command",
               },
             ],
@@ -1725,7 +1933,8 @@ exports[`runtime surface golden fixtures setup context-mode × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -1857,30 +2066,7 @@ exports[`runtime surface golden fixtures setup context-mode × opencode 2`] = `
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -1896,7 +2082,8 @@ exports[`runtime surface golden fixtures setup context-mode × opencode 3`] = `
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "context-mode@1.0.169",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -1917,12 +2104,55 @@ exports[`runtime surface golden fixtures setup context-mode × opencode 3`] = `
           },
         ],
       },
-    ],
-  },
-]
-`;
-
-exports[`runtime surface golden fixtures setup context-mode × claude+opencode 1`] = `
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
+    ],
+  },
+]
+`;
+
+exports[`runtime surface golden fixtures setup context-mode × claude+opencode 1`] = `
 {
   "agentsMd": 
 "<!-- MATE:COMPANION:START -->
@@ -1995,8 +2225,6 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
 exports[`runtime surface golden fixtures setup context-mode × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -2031,9 +2259,7 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 2
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
     "--plugin-dir",
@@ -2082,30 +2308,7 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 2
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -2125,7 +2328,7 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -2143,7 +2346,15 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
                 "type": "command",
               },
             ],
@@ -2151,7 +2362,8 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -2193,7 +2405,8 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 3
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "context-mode@1.0.169",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -2214,6 +2427,49 @@ exports[`runtime surface golden fixtures setup context-mode × claude+opencode 3
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -2233,9 +2489,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 1`] = `
 <!-- MATE:COMPANION:END -->
 "
 ,
-  "claudeHooks": {
-    "react-doctor.sh": "a33e1b4ac810",
-  },
+  "claudeHooks": {},
   "claudeMcpConfig": {
     "mcpServers": {},
   },
@@ -2245,45 +2499,19 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 1`] = `
 ,
   "claudeSettingsLocal": {
     "autoMemoryEnabled": false,
-    "hooks": {
-      "PostToolUse": [
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 5,
-              "type": "command",
-            },
-          ],
-          "matcher": "Write|Edit|MultiEdit|NotebookEdit|ApplyPatch",
-        },
-      ],
-      "Stop": [
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 45,
-              "type": "command",
-            },
-          ],
-        },
-      ],
-    },
     "permissions": {
       "allow": [
+        "Bash(<react-doctor-bin>:*)",
         "Bash(mate:*)",
-        "Bash(npx react-doctor:*)",
-        "Bash(npx react-doctor@latest *)",
         "Edit(<root>/companion/**)",
         "Read(<root>/companion/**)",
-        "Skill(react-doctor)",
+        "Skill(mate-react-doctor)",
       ],
     },
   },
   "claudeSkills": {
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
   },
   "opencodeConfig": null,
   "opencodePlugins": {},
@@ -2296,8 +2524,6 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 1`] = `
 exports[`runtime surface golden fixtures setup react-doctor × claude 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -2332,9 +2558,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 2`] = `
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -2359,7 +2583,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -2377,7 +2601,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -2385,7 +2609,16 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -2412,9 +2645,8 @@ exports[`runtime surface golden fixtures setup react-doctor × claude 3`] = `
           "Bash(mate:*)",
           "Read(<root>/companion/**)",
           "Edit(<root>/companion/**)",
-          "Skill(react-doctor)",
-          "Bash(npx react-doctor:*)",
-          "Bash(npx react-doctor@latest *)",
+          "Skill(mate-react-doctor)",
+          "Bash(<react-doctor-bin>:*)",
         ],
       },
     ],
@@ -2462,8 +2694,8 @@ exports[`runtime surface golden fixtures setup react-doctor × opencode 1`] = `
   "opencodeSkills": {},
   "opencodeTui": null,
   "sharedSkills": {
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
   },
 }
 `;
@@ -2510,30 +2742,7 @@ exports[`runtime surface golden fixtures setup react-doctor × opencode 2`] = `
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -2549,7 +2758,7 @@ exports[`runtime surface golden fixtures setup react-doctor × opencode 3`] = `
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -2570,6 +2779,49 @@ exports[`runtime surface golden fixtures setup react-doctor × opencode 3`] = `
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -2589,9 +2841,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 1
 <!-- MATE:COMPANION:END -->
 "
 ,
-  "claudeHooks": {
-    "react-doctor.sh": "a33e1b4ac810",
-  },
+  "claudeHooks": {},
   "claudeMcpConfig": {
     "mcpServers": {},
   },
@@ -2601,45 +2851,19 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 1
 ,
   "claudeSettingsLocal": {
     "autoMemoryEnabled": false,
-    "hooks": {
-      "PostToolUse": [
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 5,
-              "type": "command",
-            },
-          ],
-          "matcher": "Write|Edit|MultiEdit|NotebookEdit|ApplyPatch",
-        },
-      ],
-      "Stop": [
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 45,
-              "type": "command",
-            },
-          ],
-        },
-      ],
-    },
     "permissions": {
       "allow": [
+        "Bash(<react-doctor-bin>:*)",
         "Bash(mate:*)",
-        "Bash(npx react-doctor:*)",
-        "Bash(npx react-doctor@latest *)",
         "Edit(<root>/companion/**)",
         "Read(<root>/companion/**)",
-        "Skill(react-doctor)",
+        "Skill(mate-react-doctor)",
       ],
     },
   },
   "claudeSkills": {
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
   },
   "opencodeConfig": {
     "$schema": "https://opencode.ai/config.json",
@@ -2662,8 +2886,8 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 1
   "opencodeSkills": {},
   "opencodeTui": null,
   "sharedSkills": {
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
   },
 }
 `;
@@ -2671,8 +2895,6 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 1
 exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -2707,9 +2929,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 2
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -2756,30 +2976,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 2
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -2799,7 +2996,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -2817,7 +3014,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -2825,7 +3022,16 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -2852,9 +3058,8 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
           "Bash(mate:*)",
           "Read(<root>/companion/**)",
           "Edit(<root>/companion/**)",
-          "Skill(react-doctor)",
-          "Bash(npx react-doctor:*)",
-          "Bash(npx react-doctor@latest *)",
+          "Skill(mate-react-doctor)",
+          "Bash(<react-doctor-bin>:*)",
         ],
       },
     ],
@@ -2868,7 +3073,7 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -2889,6 +3094,49 @@ exports[`runtime surface golden fixtures setup react-doctor × claude+opencode 3
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -2945,7 +3193,7 @@ exports[`runtime surface golden fixtures setup openspec × claude 1`] = `
   "claudeSkills": {
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -2953,8 +3201,8 @@ exports[`runtime surface golden fixtures setup openspec × claude 1`] = `
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "b023edd228ab",
     "openspec-archive-change/SKILL.md": "890bada99035",
@@ -2972,8 +3220,6 @@ exports[`runtime surface golden fixtures setup openspec × claude 1`] = `
 exports[`runtime surface golden fixtures setup openspec × claude 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -3010,9 +3256,7 @@ exports[`runtime surface golden fixtures setup openspec × claude 2`] = `
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -3037,7 +3281,7 @@ exports[`runtime surface golden fixtures setup openspec × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -3055,7 +3299,7 @@ exports[`runtime surface golden fixtures setup openspec × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -3063,7 +3307,16 @@ exports[`runtime surface golden fixtures setup openspec × claude 3`] = `
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -3156,7 +3409,7 @@ exports[`runtime surface golden fixtures setup openspec × opencode 1`] = `
     ".openspec-target": "38700dfad571",
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -3164,8 +3417,8 @@ exports[`runtime surface golden fixtures setup openspec × opencode 1`] = `
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "c657f1b4e9eb",
     "openspec-archive-change/SKILL.md": "ad2463670c0f",
@@ -3219,30 +3472,7 @@ exports[`runtime surface golden fixtures setup openspec × opencode 2`] = `
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -3258,7 +3488,7 @@ exports[`runtime surface golden fixtures setup openspec × opencode 3`] = `
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -3279,6 +3509,49 @@ exports[`runtime surface golden fixtures setup openspec × opencode 3`] = `
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -3335,7 +3608,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 1`] =
   "claudeSkills": {
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -3343,8 +3616,8 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 1`] =
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "b023edd228ab",
     "openspec-archive-change/SKILL.md": "890bada99035",
@@ -3375,7 +3648,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 1`] =
     ".openspec-target": "38700dfad571",
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -3383,8 +3656,8 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 1`] =
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "c657f1b4e9eb",
     "openspec-archive-change/SKILL.md": "ad2463670c0f",
@@ -3397,8 +3670,6 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 1`] =
 exports[`runtime surface golden fixtures setup openspec × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -3435,9 +3706,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 2`] =
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
   ],
@@ -3486,30 +3755,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 2`] =
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -3529,7 +3775,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
@@ -3547,7 +3793,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -3555,7 +3801,16 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 3`] =
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
                 "type": "command",
               },
             ],
@@ -3611,7 +3866,7 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 3`] =
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -3632,6 +3887,49 @@ exports[`runtime surface golden fixtures setup openspec × claude+opencode 3`] =
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -3659,9 +3957,7 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
 <!-- mate:managed:context-mode:9561e6cf6059 end -->
 "
 ,
-  "claudeHooks": {
-    "react-doctor.sh": "a33e1b4ac810",
-  },
+  "claudeHooks": {},
   "claudeMcpConfig": {
     "mcpServers": {
       "tokensave": {
@@ -3679,18 +3975,6 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
   "claudeSettingsLocal": {
     "autoMemoryEnabled": false,
     "hooks": {
-      "PostToolUse": [
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 5,
-              "type": "command",
-            },
-          ],
-          "matcher": "Write|Edit|MultiEdit|NotebookEdit|ApplyPatch",
-        },
-      ],
       "PreToolUse": [
         {
           "hooks": [
@@ -3726,15 +4010,6 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
             },
           ],
         },
-        {
-          "hooks": [
-            {
-              "command": "sh "<root>/companion/.claude/hooks/react-doctor.sh"",
-              "timeout": 45,
-              "type": "command",
-            },
-          ],
-        },
       ],
       "UserPromptSubmit": [
         {
@@ -3752,14 +4027,13 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
     },
     "permissions": {
       "allow": [
+        "Bash(<react-doctor-bin>:*)",
         "Bash(<wrapper-bin>/graphify:*)",
         "Bash(<wrapper-bin>/openspec:*)",
         "Bash(graphify:*)",
         "Bash(mate cap graphify:*)",
         "Bash(mate cap graphify:*)",
         "Bash(mate:*)",
-        "Bash(npx react-doctor:*)",
-        "Bash(npx react-doctor@latest *)",
         "Bash(openspec:*)",
         "Edit(<root>/companion/**)",
         "Read(<root>/companion/**)",
@@ -3772,13 +4046,13 @@ Canonical Mate policy and any more specific tool-routing instructions remain aut
         "Skill(mate-grilling)",
         "Skill(mate-interview-me)",
         "Skill(mate-openspec-backfill)",
+        "Skill(mate-react-doctor)",
         "Skill(mate-show-me)",
         "Skill(mate-simplify-code)",
         "Skill(openspec-apply-change)",
         "Skill(openspec-archive-change)",
         "Skill(openspec-explore)",
         "Skill(openspec-propose)",
-        "Skill(react-doctor)",
         "mcp__plugin_context-mode_context-mode__*",
         "mcp__tokensave__*",
       ],
@@ -3802,7 +4076,7 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
 ,
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -3810,15 +4084,15 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "b023edd228ab",
     "openspec-archive-change/SKILL.md": "890bada99035",
     "openspec-explore/SKILL.md": "477fdec2cdb0",
     "openspec-propose/SKILL.md": "13e8a2d0d873",
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
   },
   "opencodeConfig": {
     "$schema": "https://opencode.ai/config.json",
@@ -3880,7 +4154,7 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
     ".openspec-target": "38700dfad571",
     "mate-artifact-publish/SKILL.md": "9ae069fc6d0d",
     "mate-artifact-publish/references/openspec.md": "b5c986ed9bdc",
-    "mate-create-report/SKILL.md": "020b5c3a53ce",
+    "mate-create-report/SKILL.md": "04ac157043b8",
     "mate-domain-modeling/SKILL.md": "722d0e5a972d",
     "mate-domain-modeling/references/ADR-FORMAT.md": "824b87e87d9b",
     "mate-domain-modeling/references/CONTEXT-FORMAT.md": "172622594277",
@@ -3888,15 +4162,15 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
     "mate-grill-with-docs/SKILL.md": "2e4dbb346e51",
     "mate-grilling/SKILL.md": "f37ff4dd9b6d",
     "mate-interview-me/SKILL.md": "5ac966ca1e48",
-    "mate-openspec-backfill/SKILL.md": "fa73daee9951",
-    "mate-show-me/SKILL.md": "42bdac3dd7f2",
+    "mate-openspec-backfill/SKILL.md": "44c4d5e064dc",
+    "mate-react-doctor/SKILL.md": "2ecf137679df",
+    "mate-react-doctor/references/explain.md": "86754a7e5436",
+    "mate-show-me/SKILL.md": "7bda10cae936",
     "mate-simplify-code/SKILL.md": "6fff7fff920c",
     "openspec-apply-change/SKILL.md": "c657f1b4e9eb",
     "openspec-archive-change/SKILL.md": "ad2463670c0f",
     "openspec-explore/SKILL.md": "214bba092ffa",
     "openspec-propose/SKILL.md": "c09159964f8e",
-    "react-doctor/SKILL.md": "df58b3490543",
-    "react-doctor/references/explain.md": "2382ea820f20",
   },
 }
 `;
@@ -3904,8 +4178,6 @@ Write chunks to $GRAPHIFY_OUT and read $GRAPHIFY_OUT later.
 exports[`runtime surface golden fixtures setup all capabilities × claude+opencode 2`] = `
 {
   "claudeArgs": [
-    "--add-dir",
-    "<root>/companion",
     "--append-system-prompt",
     
 "## MANDATORY RULES - NON-NEGOTIABLE
@@ -3953,9 +4225,7 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
     "--setting-sources",
     "user,project,local",
     "--settings",
-    "<root>/companion/.claude/settings.local.json",
-    "--mcp-config",
-    "<root>/companion/.mcp.json",
+    "<root>/companion/.claude/state/launch-settings.app.json",
     "--plugin-dir",
     "<claude-plugin>",
     "--plugin-dir",
@@ -4017,30 +4287,7 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
       "errors": [],
       "version": 1,
     },
-    "OPENCODE_CONFIG_CONTENT": {
-      "permissions": [
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion",
-        },
-        {
-          "action": "external_directory",
-          "effect": "allow",
-          "resource": "<root>/companion/**",
-        },
-      ],
-      "plugins": [
-        "<opencode-plugin>",
-      ],
-      "references": {
-        "mate": "<root>/companion",
-      },
-      "skills": [
-        "<root>/companion/.agents/skills",
-      ],
-    },
-    "OPENCODE_CONFIG_DIR": "<root>/companion/.opencode",
+    "OPENCODE_CONFIG_CONTENT": {},
   },
 }
 `;
@@ -4060,12 +4307,24 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/validate-artifact-path.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/validate-artifact-path.mjs"",
                 "type": "command",
               },
             ],
             "matcher": "Write|Edit|MultiEdit|Bash",
           },
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-pre-tool-use",
+                ],
+                "command": "<root>/bin/tokensave",
+                "type": "command",
+              },
+            ],
+            "matcher": "Agent|Grep|Bash",
+          },
         ],
       },
       {
@@ -4078,7 +4337,7 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-banner.mjs" --projected",
+                "command": "node "<runtime-claude-plugin>/hooks/session-banner.mjs" --projected",
                 "type": "command",
               },
             ],
@@ -4086,7 +4345,56 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
           {
             "hooks": [
               {
-                "command": "node "<claude-plugin>/hooks/session-guidance.mjs"",
+                "command": "node "<runtime-claude-plugin>/hooks/session-guidance.mjs"",
+                "type": "command",
+              },
+            ],
+          },
+          {
+            "hooks": [
+              {
+                "command": "node "<runtime-claude-plugin>/hooks/session-prepare.mjs"",
+                "timeout": 45,
+                "type": "command",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "UserPromptSubmit",
+        ],
+        "kind": "list",
+        "values": [
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-prompt-submit",
+                ],
+                "command": "<root>/bin/tokensave",
+                "type": "command",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "at": [
+          "hooks",
+          "Stop",
+        ],
+        "kind": "list",
+        "values": [
+          {
+            "hooks": [
+              {
+                "args": [
+                  "hook-stop",
+                ],
+                "command": "<root>/bin/tokensave",
                 "type": "command",
               },
             ],
@@ -4129,9 +4437,8 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
           "Bash(openspec:*)",
           "Bash(mate cap graphify:*)",
           "Bash(<wrapper-bin>/openspec:*)",
-          "Skill(react-doctor)",
-          "Bash(npx react-doctor:*)",
-          "Bash(npx react-doctor@latest *)",
+          "Skill(mate-react-doctor)",
+          "Bash(<react-doctor-bin>:*)",
           "mcp__tokensave__*",
           "Skill(graphify)",
           "Bash(graphify:*)",
@@ -4173,7 +4480,8 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
         ],
         "kind": "list",
         "values": [
-          "<opencode-plugin>",
+          "context-mode@1.0.169",
+          "<runtime-opencode-plugin>",
         ],
       },
       {
@@ -4211,6 +4519,49 @@ exports[`runtime surface golden fixtures setup all capabilities × claude+openco
           },
         ],
       },
+      {
+        "at": [
+          "skills",
+        ],
+        "kind": "list",
+        "values": [
+          "<root>/companion/.agents/skills",
+        ],
+      },
+      {
+        "at": [
+          "references",
+        ],
+        "entries": {
+          "mate": "<root>/companion",
+        },
+        "kind": "map",
+      },
+      {
+        "at": [
+          "compaction",
+        ],
+        "kind": "value",
+        "value": {
+          "auto": true,
+          "buffer": 20000,
+          "keep": {
+            "tokens": 15000,
+          },
+        },
+        "yields": true,
+      },
+      {
+        "at": [
+          "tool_output",
+        ],
+        "kind": "value",
+        "value": {
+          "max_bytes": 40000,
+          "max_lines": 1000,
+        },
+        "yields": true,
+      },
     ],
   },
 ]
@@ -4588,7 +4939,7 @@ User notes.
 "# mate managed: start
 /.mate/
 /.claude/
-/.opencode/
+/.opencode/opencode.json
 /.agents/
 /.mcp.json
 # mate managed: end
@@ -4634,7 +4985,7 @@ User notes.
 "# mate managed: start
 /.mate/
 /.claude/
-/.opencode/
+/.opencode/opencode.json
 /.agents/
 /.mcp.json
 # mate managed: end