Merge branch 'next' into kimi-runtime-support

src/runtime-artifact-layout.cts

@@ -391,7 +391,17 @@ function resolveRuntimeArtifactLayout(runtime: string, configDir: string, scope:
       break;
 
     case 'codebuddy':
-      kinds = [skillsKind('skills', 'gsd-', 'convertClaudeCommandToCodebuddySkill', 'codebuddy', configDir)];
+      // CodeBuddy (Tencent) reads two user-level surfaces (codebuddy.ai/docs/cli):
+      //   1. commands/gsd-<name>.md      — slash commands shown in the '/' menu (#789)
+      //   2. skills/gsd-<name>/SKILL.md  — model-invocable skills, emitted with
+      //      user-invocable:false so they stay OUT of '/' (the commands surface is
+      //      the sole '/' entry point) — avoids a duplicated /gsd-* per workflow.
+      // Subagents (~/.codebuddy/agents/) are already emitted by the generic agents
+      // block in bin/install.js; MCP is excluded (gsd ships no MCP server).
+      kinds = [
+        convertedCommandsKind('commands', 'gsd-', 'convertClaudeCommandToCodebuddyCommand', configDir),
+        skillsKind('skills', 'gsd-', 'convertClaudeCommandToCodebuddySkill', 'codebuddy', configDir),
+      ];
       break;
 
     case 'cline':

src/shell-command-projection.cts

@@ -181,6 +181,10 @@ const MANAGED_HOOK_COMMAND_BASENAMES_BY_SURFACE: Record<string, Set<string>> = {
     // reconcileCodexHooksJsonSessionStart can replace stale node-runner commands
     // with the .cmd shim on reinstall (and vice-versa on cross-platform moves).
     'gsd-check-update.cmd',
+    // #772: context-monitor is now registered for Codex SubagentStart/Stop/PostToolUse.
+    'gsd-context-monitor.js',
+    // #772: Windows .cmd shim for gsd-context-monitor — same #3426 pattern.
+    'gsd-context-monitor.cmd',
   ]),
 };