@opengsd/gsd-core 1.7.0-rc.5 → 1.7.0

package/gsd-core/bin/lib/runtime-hooks-surface.cjs

@@ -31,7 +31,7 @@ const node_os_1 = __importDefault(require("node:os"));
 const imperative_hook_bus_cjs_1 = require("./host-integration-adapters/imperative-hook-bus.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const shellCmdProjection = require("./shell-command-projection.cjs");
-const { isManagedHookBasename, isManagedHookCommand, projectLegacySettingsHookCommand, projectManagedHookCommand, projectPortableHookBaseDir, projectCodexHookTomlCommand, shellHookOmitsBashRunner, } = shellCmdProjection;
+const { isManagedHookBasename, isManagedHookCommand, projectLegacySettingsHookCommand, projectManagedHookCommand, projectPortableHookBaseDir, projectCodexHookTomlCommand, shellHookOmitsBashRunner, escapeTomlDoubleQuotedString, } = shellCmdProjection;
 // ---------------------------------------------------------------------------
 // Terminal color constants (mirrors install.js for console output parity)
 // ---------------------------------------------------------------------------
@@ -53,6 +53,23 @@ const GSD_COPILOT_SESSION_HOOK_BASH = 'if [ -f .planning/STATE.md ]; then ' +
 const GSD_COPILOT_SESSION_HOOK_PWSH = 'if (Test-Path .planning/STATE.md) ' +
     `{ '{"additionalContext":"${GSD_COPILOT_SESSION_MSG_PRESENT}"}' } ` +
     `else { '{"additionalContext":"${GSD_COPILOT_SESSION_MSG_ABSENT}"}' }`;
+// #2099 UPGRADE 1: multi-event hook bus. Each additional event is a static,
+// deterministic advisory (no branching/no-op-style, matching sessionStart's
+// tone) so the emitted hooks/gsd-session.json stays golden-trackable — no
+// node-runner invocation, no filesystem probing beyond what sessionStart
+// already does.
+const GSD_COPILOT_PRE_TOOL_MSG = 'GSD: confirm this tool use is in scope for the active phase before proceeding.';
+const GSD_COPILOT_PRE_TOOL_HOOK_BASH = `printf '%s' '{"additionalContext":"${GSD_COPILOT_PRE_TOOL_MSG}"}'`;
+const GSD_COPILOT_PRE_TOOL_HOOK_PWSH = `'{"additionalContext":"${GSD_COPILOT_PRE_TOOL_MSG}"}'`;
+const GSD_COPILOT_POST_TOOL_MSG = 'GSD: review the tool result against the active phase before continuing.';
+const GSD_COPILOT_POST_TOOL_HOOK_BASH = `printf '%s' '{"additionalContext":"${GSD_COPILOT_POST_TOOL_MSG}"}'`;
+const GSD_COPILOT_POST_TOOL_HOOK_PWSH = `'{"additionalContext":"${GSD_COPILOT_POST_TOOL_MSG}"}'`;
+const GSD_COPILOT_PROMPT_SUBMIT_MSG = 'GSD: check this request against .planning/STATE.md scope before acting.';
+const GSD_COPILOT_PROMPT_SUBMIT_HOOK_BASH = `printf '%s' '{"additionalContext":"${GSD_COPILOT_PROMPT_SUBMIT_MSG}"}'`;
+const GSD_COPILOT_PROMPT_SUBMIT_HOOK_PWSH = `'{"additionalContext":"${GSD_COPILOT_PROMPT_SUBMIT_MSG}"}'`;
+const GSD_COPILOT_SESSION_END_MSG = 'GSD: update .planning/STATE.md with the session outcome before ending.';
+const GSD_COPILOT_SESSION_END_HOOK_BASH = `printf '%s' '{"additionalContext":"${GSD_COPILOT_SESSION_END_MSG}"}'`;
+const GSD_COPILOT_SESSION_END_HOOK_PWSH = `'{"additionalContext":"${GSD_COPILOT_SESSION_END_MSG}"}'`;
 // ---------------------------------------------------------------------------
 // Cursor hook constants
 // ---------------------------------------------------------------------------
@@ -76,6 +93,28 @@ const CURSOR_MANAGED_EVENTS = imperative_hook_bus_cjs_1.CURSOR_HOOK_EVENTS;
 const GSD_AGENTS_MD_MARKER = '<!-- GSD Configuration — managed by gsd-core installer -->';
 const GSD_AGENTS_MD_CLOSE_MARKER = '<!-- End GSD Configuration -->';
 // ---------------------------------------------------------------------------
+// Descriptor-driven runtime title lookup (ADR-1239 / #2092)
+// ---------------------------------------------------------------------------
+/**
+ * Console-log label for a runtime, sourced from the capability registry's
+ * `title` field (capabilities/<runtime>/capability.json). Folded from a
+ * hardcoded `runtime === 'qwen' ? 'Qwen Code' : runtime === 'claude' ?
+ * 'Claude Code' : runtime` ternary — cosmetic (log text) only, but resolves
+ * to the same 'Qwen Code' / 'Claude Code' values for those two runtimes.
+ * Falls back to the raw runtime id if the registry can't be loaded or the
+ * runtime has no title.
+ */
+function _capabilityTitle(runtime) {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const reg = require('./capability-registry.cjs');
+        return reg?.runtimes?.[runtime]?.title || runtime;
+    }
+    catch {
+        return runtime;
+    }
+}
+// ---------------------------------------------------------------------------
 // atomicWriteFileSync — shared canonical implementation.
 //
 // __atomicWrittenTmps is exported so bin/install.js can merge it into its
@@ -228,7 +267,7 @@ function normalizeNodePath(execPath, opts) {
         return execPath;
     const env = (opts && opts.env) || process.env;
     const existsSync = (opts && opts.existsSync) || node_fs_1.default.existsSync;
-    const normalizedForMatch = execPath.replace(/\\/g, '/');
+    const normalizedForMatch = shellCmdProjection.posixNormalize(execPath);
     if (/\/fnm_multishells\/[0-9]+_[0-9]+\/node(\.exe)?$/i.test(normalizedForMatch)) {
         const candidates = [];
         if (env.FNM_DIR) {
@@ -244,11 +283,16 @@ function normalizeNodePath(execPath, opts) {
         }
         return execPath;
     }
-    if (/^\/usr\/local\/Cellar\/node(@\d+)?\/[^/]+\/bin\/node(\.exe)?$/.test(execPath)) {
-        return '/usr/local/bin/node';
-    }
-    if (/^\/opt\/homebrew\/Cellar\/node(@\d+)?\/[^/]+\/bin\/node(\.exe)?$/.test(execPath)) {
-        return '/opt/homebrew/bin/node';
+    // Homebrew (macOS Intel /usr/local, Apple Silicon /opt/homebrew, Linuxbrew
+    // /home/linuxbrew/.linuxbrew, and any custom HOMEBREW_PREFIX) pins node at
+    // <prefix>/Cellar/node(<@ver>)?/<ver>/bin/node, then deletes prior versions on
+    // `brew upgrade node`. Rewrite to the stable <prefix>/bin/node symlink, which
+    // survives the upgrade. Derive <prefix> from the path itself (more reliable
+    // than HOMEBREW_PREFIX env — the path IS the install location) so every layout
+    // is covered by one branch instead of one per known prefix (#2185).
+    const homebrewMatch = normalizedForMatch.match(/^(.+)\/Cellar\/node(@\d+)?\/[^/]+\/bin\/node(\.exe)?$/i);
+    if (homebrewMatch) {
+        return `${homebrewMatch[1]}/bin/node${homebrewMatch[3] || ''}`;
     }
     // mise pins a concrete node version at <data>/installs/node/<ver>/bin/node
     // (Windows: <data>/installs/node/<ver>/node.exe). Node realpaths
@@ -272,7 +316,7 @@ function resolveNodeRunner(opts) {
     if (!execPath)
         return null;
     const stablePath = normalizeNodePath(execPath, opts);
-    return JSON.stringify(stablePath.replace(/\\/g, '/'));
+    return JSON.stringify(shellCmdProjection.posixNormalize(stablePath));
 }
 function resolveBashRunner(opts) {
     const platform = (opts && opts.platform) || process.platform;
@@ -293,7 +337,7 @@ function resolveBashRunner(opts) {
     }
     for (const candidate of candidates) {
         if (candidate && exists(candidate)) {
-            return JSON.stringify(candidate.replace(/\\/g, '/'));
+            return JSON.stringify(shellCmdProjection.posixNormalize(candidate));
         }
     }
     return null;
@@ -333,7 +377,7 @@ function rewriteLegacyManagedNodeHookCommands(settings, absoluteRunner, opts) {
                 }
                 else {
                     _runnerToken = m[1];
-                    const runnerPath = (m[2] || m[3] || m[4] || '').replace(/\\/g, '/');
+                    const runnerPath = shellCmdProjection.posixNormalize(m[2] || m[3] || m[4] || '');
                     const stableRunner = normalizeNodePath(runnerPath);
                     if (stableRunner === runnerPath && platform !== 'win32')
                         continue;
@@ -523,10 +567,10 @@ function buildCodexHookWindowsShimIR(scriptAbsPath, absoluteRunnerToken) {
     catch {
         interpreter = absoluteRunnerToken;
     }
-    const targetAbs = scriptAbsPath.replace(/\\/g, '/');
+    const targetAbs = shellCmdProjection.posixNormalize(scriptAbsPath);
     const scriptQuoted = JSON.stringify(targetAbs);
     const cmdPath = scriptAbsPath.replace(/\.js$/, '.cmd');
-    const hookCommand = JSON.stringify(cmdPath.replace(/\\/g, '/'));
+    const hookCommand = JSON.stringify(shellCmdProjection.posixNormalize(cmdPath));
     const runnerQuoted = JSON.stringify(interpreter);
     return {
         invocation: { interpreter, target: scriptAbsPath },
@@ -545,7 +589,7 @@ function ensureCodexHooksJsonSessionStart(targetDir, opts = {}) {
     const hooksJsonPath = node_path_1.default.join(targetDir, 'hooks.json');
     if (!absoluteRunner)
         return { changed: false, wrote: false, path: hooksJsonPath };
-    const scriptPath = node_path_1.default.resolve(targetDir, 'hooks', 'gsd-check-update.js').replace(/\\/g, '/');
+    const scriptPath = shellCmdProjection.posixNormalize(node_path_1.default.resolve(targetDir, 'hooks', 'gsd-check-update.js'));
     const cmdShimPath = scriptPath.replace(/\.js$/, '.cmd');
     let managedCommand;
     if (platform === 'win32') {
@@ -575,7 +619,7 @@ function ensureCodexHooksJsonSessionStart(targetDir, opts = {}) {
     if (!managedCommand)
         return { changed: false, wrote: false, path: hooksJsonPath };
     const commandWindows = platform === 'win32'
-        ? JSON.stringify(cmdShimPath.replace(/\\/g, '/'))
+        ? JSON.stringify(shellCmdProjection.posixNormalize(cmdShimPath))
         : undefined;
     return reconcileCodexHooksJsonSessionStart(targetDir, { managedCommand, commandWindows });
 }
@@ -585,7 +629,7 @@ function ensureCodexHooksJsonEvent(targetDir, eventName, opts = {}) {
     const hooksJsonPath = node_path_1.default.join(targetDir, 'hooks.json');
     if (!absoluteRunner)
         return { changed: false, wrote: false, path: hooksJsonPath };
-    const scriptPath = node_path_1.default.resolve(targetDir, 'hooks', 'gsd-context-monitor.js').replace(/\\/g, '/');
+    const scriptPath = shellCmdProjection.posixNormalize(node_path_1.default.resolve(targetDir, 'hooks', 'gsd-context-monitor.js'));
     let managedCommand;
     if (platform === 'win32') {
         const shimIR = buildCodexHookWindowsShimIR(scriptPath, absoluteRunner);
@@ -628,6 +672,7 @@ function buildHookCommand(configDir, hookName, opts) {
         opts = {};
     const platform = opts.platform || process.platform;
     const runtime = opts.runtime || 'generic';
+    const hookShell = opts.hookShell;
     const isShellHook = hookName.endsWith('.sh');
     if (shellHookOmitsBashRunner({ platform, runtime, isShellHook })) {
         if (opts.portableHooks) {
@@ -637,7 +682,7 @@ function buildHookCommand(configDir, hookName, opts) {
             });
             return JSON.stringify(`${portableBaseDir}/hooks/${hookName}`);
         }
-        return JSON.stringify(configDir.replace(/\\/g, '/') + '/hooks/' + hookName);
+        return JSON.stringify(shellCmdProjection.posixNormalize(configDir) + '/hooks/' + hookName);
     }
     const nodeRunner = resolveNodeRunner();
     const runner = isShellHook ? resolveBashRunner(opts) : nodeRunner;
@@ -653,14 +698,16 @@ function buildHookCommand(configDir, hookName, opts) {
             scriptPath: `${portableBaseDir}/hooks/${hookName}`,
             runtime: opts.runtime || 'generic',
             platform,
+            hookShell,
         });
     }
-    const hooksPath = configDir.replace(/\\/g, '/') + '/hooks/' + hookName;
+    const hooksPath = shellCmdProjection.posixNormalize(configDir) + '/hooks/' + hookName;
     return projectManagedHookCommand({
         absoluteRunner: runner,
         scriptPath: hooksPath,
         runtime,
         platform,
+        hookShell,
     });
 }
 // ---------------------------------------------------------------------------
@@ -805,7 +852,7 @@ function writeClineArtifacts(targetDir, isGlobalInstall) {
 function buildCursorHookEntry(scriptPath) {
     return {
         type: 'command',
-        command: scriptPath.replace(/\\/g, '/'),
+        command: shellCmdProjection.posixNormalize(scriptPath),
         [GSD_CURSOR_HOOK_MARKER]: true,
     };
 }
@@ -932,6 +979,193 @@ function removeCursorHooksJson(targetDir) {
     return { changed: result.changed };
 }
 // ---------------------------------------------------------------------------
+// Windsurf/Cascade hook functions (ADR-1239 / #2100 Stage 2 — HOOK-BRIDGE)
+//
+// Cascade (Windsurf's agent) hooks.json format is DISTINCT from Cursor's:
+//   { "hooks": { "<event>": [ { "command": "<shell cmd>", ... } ] } }
+// Each entry carries a bare `command` STRING (a shell command line) — not
+// Cursor's `{ type: 'command', command: <cmd> }` wrapper — and there is no
+// top-level `version` field. Docs (reference): https://docs.windsurf.com/llms-full.txt ,
+// https://docs.devin.ai/desktop/cascade/hooks
+//
+// Cascade blocks via EXIT CODE 2 (+ a stderr reason), not Cursor's stdout-JSON
+// `{ block: true, reason }` form — so the two hook scripts installed here
+// (hooks/gsd-windsurf-pre-write.js, hooks/gsd-windsurf-pre-command.js) speak a
+// different protocol than the Cursor scripts, even though the surrounding
+// install/reconcile infra mirrors writeCursorHooksJson/removeCursorHooksJson.
+//
+// Only 2 of GSD's 6 Cursor-parity hook events have a Cascade counterpart with
+// BLOCKING semantics: pre_write_code and pre_run_command. Cascade has no
+// context-injection channel (no `additional_context`-style advisory
+// response), so the 4 advisory events GSD registers on Cursor (sessionStart,
+// postToolUse, stop, subagentStart/subagentStop) are deliberately NOT ported.
+// ---------------------------------------------------------------------------
+const GSD_WINDSURF_PRE_WRITE_HOOK_SCRIPT = 'gsd-windsurf-pre-write.js';
+const GSD_WINDSURF_PRE_COMMAND_HOOK_SCRIPT = 'gsd-windsurf-pre-command.js';
+const GSD_WINDSURF_HOOK_MARKER = 'gsd-managed';
+/** The 2 Cascade hook events GSD wires with blocking (exit-code-2) guards. */
+const WINDSURF_HOOK_EVENTS = Object.freeze(['pre_write_code', 'pre_run_command']);
+/** Event → hook-script mapping (mirrors CURSOR_EVENT_SCRIPT_MAP's convention). */
+const WINDSURF_EVENT_SCRIPT_MAP = Object.freeze({
+    pre_write_code: GSD_WINDSURF_PRE_WRITE_HOOK_SCRIPT,
+    pre_run_command: GSD_WINDSURF_PRE_COMMAND_HOOK_SCRIPT,
+});
+/** All GSD-managed Windsurf hook scripts (used by uninstall cleanup). */
+const GSD_WINDSURF_HOOK_SCRIPTS = [
+    GSD_WINDSURF_PRE_WRITE_HOOK_SCRIPT,
+    GSD_WINDSURF_PRE_COMMAND_HOOK_SCRIPT,
+];
+/**
+ * Build a single Cascade hooks.json managed entry. Cascade's entry shape has
+ * no `type` field (unlike Cursor's `{ type: 'command', command }`) — just a
+ * bare `command` shell string plus the GSD marker.
+ */
+function buildWindsurfHookEntry(command) {
+    return {
+        command,
+        [GSD_WINDSURF_HOOK_MARKER]: true,
+    };
+}
+function isManagedWindsurfHookEntry(entry) {
+    return Boolean(entry && typeof entry === 'object' && entry[GSD_WINDSURF_HOOK_MARKER]);
+}
+/**
+ * Reconcile GSD's managed Cascade hook entries into `<targetDir>/hooks.json`,
+ * preserving any user-owned entries. Mirrors reconcileCursorHooksJson's
+ * merge/no-write-when-unchanged semantics, adapted to Cascade's flatter
+ * `{ hooks: { <event>: [...] } }` shape (no `version` field, no legacy
+ * top-level-array lift — Cascade's hooks.json is a brand-new surface with no
+ * prior shape to migrate from).
+ */
+function reconcileWindsurfHooksJson(hooksJsonPath, managedEntries) {
+    let parsed = {};
+    let currentContent = null;
+    if (node_fs_1.default.existsSync(hooksJsonPath)) {
+        const raw = node_fs_1.default.readFileSync(hooksJsonPath, 'utf8');
+        currentContent = raw;
+        if (raw.trim()) {
+            try {
+                parsed = JSON.parse(raw);
+            }
+            catch (err) {
+                throw new Error(`Windsurf hooks.json parse failed: ${err && err.message ? err.message : String(err)}`);
+            }
+        }
+    }
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+        parsed = {};
+    const hasNestedHooksObject = parsed['hooks'] && typeof parsed['hooks'] === 'object' && !Array.isArray(parsed['hooks']);
+    if (!hasNestedHooksObject)
+        parsed['hooks'] = {};
+    const hookTable = parsed['hooks'];
+    const entries = managedEntries || {};
+    for (const event of WINDSURF_HOOK_EVENTS) {
+        const existing = Array.isArray(hookTable[event]) ? hookTable[event] : [];
+        const userOwned = existing.filter((e) => !isManagedWindsurfHookEntry(e));
+        const newEntry = entries[event] || null;
+        if (newEntry) {
+            hookTable[event] = [...userOwned, newEntry];
+        }
+        else if (userOwned.length > 0) {
+            hookTable[event] = userOwned;
+        }
+        else {
+            delete hookTable[event];
+        }
+    }
+    // Avoid writing an empty `{ "hooks": {} }` artifact.
+    if (Object.keys(hookTable).length === 0)
+        delete parsed['hooks'];
+    const nextContent = `${JSON.stringify(parsed, null, 2)}\n`;
+    const changed = currentContent !== nextContent;
+    const shouldWrite = changed && (currentContent !== null || Object.keys(parsed).length > 0);
+    if (shouldWrite) {
+        atomicWriteFileSync(hooksJsonPath, nextContent, 'utf8');
+    }
+    return { changed: changed, wrote: shouldWrite, path: hooksJsonPath };
+}
+/**
+ * Write GSD-managed Cascade lifecycle hooks into `<targetDir>/hooks.json`.
+ * Both managed hook scripts (gsd-windsurf-pre-write.js,
+ * gsd-windsurf-pre-command.js) are copied from the GSD hooks/ source to
+ * `<targetDir>/hooks/` first, so the hooks.json entries never reference a
+ * script that wasn't installed. Mirrors writeCursorHooksJson's structure;
+ * `buildHookCommand` is runtime-agnostic (it already returns a plain shell
+ * command string), so it is reused as-is with `runtime: 'windsurf'` — only
+ * the hooks.json ENTRY shape (buildWindsurfHookEntry) and the reconcile
+ * function differ from Cursor's.
+ *
+ * @param targetDir - The Windsurf config dir (global: ~/.codeium/windsurf; local: .windsurf)
+ * @param src       - The GSD install source root (for copying hook scripts)
+ * @param opts      - `{ platform? }`
+ * @returns `{ hooksJsonPath, changed }`
+ */
+function writeWindsurfHooksJson(targetDir, src, opts) {
+    opts = opts || {};
+    const hooksDir = node_path_1.default.join(targetDir, 'hooks');
+    node_fs_1.default.mkdirSync(hooksDir, { recursive: true });
+    const srcHooksDir = node_path_1.default.join(src, 'hooks');
+    const installedScripts = new Set();
+    for (const script of GSD_WINDSURF_HOOK_SCRIPTS) {
+        const srcPath = node_path_1.default.join(srcHooksDir, script);
+        const destPath = node_path_1.default.join(hooksDir, script);
+        if (node_fs_1.default.existsSync(srcPath)) {
+            let content = node_fs_1.default.readFileSync(srcPath, 'utf8');
+            content = content.replace(/gsd:/gi, 'gsd-');
+            node_fs_1.default.writeFileSync(destPath, content);
+            try {
+                node_fs_1.default.chmodSync(destPath, 0o755);
+            }
+            catch { /* Windows: ignore chmod */ }
+            installedScripts.add(script);
+        }
+    }
+    const hookOpts = { runtime: 'windsurf', platform: opts.platform || process.platform };
+    const commands = {};
+    for (const ev of WINDSURF_HOOK_EVENTS) {
+        const script = WINDSURF_EVENT_SCRIPT_MAP[ev];
+        commands[ev] = (script && installedScripts.has(script)) ? buildHookCommand(targetDir, script, hookOpts) : null;
+    }
+    const managedEntries = {};
+    for (const ev of WINDSURF_HOOK_EVENTS) {
+        const cmd = commands[ev];
+        if (cmd)
+            managedEntries[ev] = buildWindsurfHookEntry(cmd);
+    }
+    const hooksJsonPath = node_path_1.default.join(targetDir, 'hooks.json');
+    const result = reconcileWindsurfHooksJson(hooksJsonPath, managedEntries);
+    return { hooksJsonPath, changed: result.changed };
+}
+/**
+ * Remove all GSD-managed Cascade hook entries from hooks.json. User-owned
+ * entries are preserved. If the file becomes empty, it is removed.
+ *
+ * @param targetDir - The Windsurf config dir
+ * @returns `{ changed }`
+ */
+function removeWindsurfHooksJson(targetDir) {
+    const hooksJsonPath = node_path_1.default.join(targetDir, 'hooks.json');
+    if (!node_fs_1.default.existsSync(hooksJsonPath))
+        return { changed: false };
+    const result = reconcileWindsurfHooksJson(hooksJsonPath, null);
+    if (result.changed) {
+        try {
+            const contentRaw = node_fs_1.default.readFileSync(hooksJsonPath, 'utf8');
+            const parsed = JSON.parse(contentRaw);
+            const hookTable = (parsed['hooks'] && typeof parsed['hooks'] === 'object' && !Array.isArray(parsed['hooks']))
+                ? parsed['hooks']
+                : {};
+            const hasAnyEvents = Object.keys(hookTable).some((k) => Array.isArray(hookTable[k]) && hookTable[k].length > 0);
+            if (!hasAnyEvents) {
+                node_fs_1.default.unlinkSync(hooksJsonPath);
+                return { changed: true };
+            }
+        }
+        catch { /* best-effort: leave the file */ }
+    }
+    return { changed: result.changed };
+}
+// ---------------------------------------------------------------------------
 // Copilot hook functions
 // ---------------------------------------------------------------------------
 function buildCopilotHookConfig() {
@@ -946,6 +1180,41 @@ function buildCopilotHookConfig() {
                     timeoutSec: 10,
                 },
             ],
+            // #2099 UPGRADE 1: multi-event hook bus — preToolUse (worktree/read-safety
+            // advisory), postToolUse (context-monitor advisory), userPromptSubmitted
+            // (prompt-guard advisory), sessionEnd (session-finalize advisory).
+            preToolUse: [
+                {
+                    type: 'command',
+                    bash: GSD_COPILOT_PRE_TOOL_HOOK_BASH,
+                    powershell: GSD_COPILOT_PRE_TOOL_HOOK_PWSH,
+                    timeoutSec: 10,
+                },
+            ],
+            postToolUse: [
+                {
+                    type: 'command',
+                    bash: GSD_COPILOT_POST_TOOL_HOOK_BASH,
+                    powershell: GSD_COPILOT_POST_TOOL_HOOK_PWSH,
+                    timeoutSec: 10,
+                },
+            ],
+            userPromptSubmitted: [
+                {
+                    type: 'command',
+                    bash: GSD_COPILOT_PROMPT_SUBMIT_HOOK_BASH,
+                    powershell: GSD_COPILOT_PROMPT_SUBMIT_HOOK_PWSH,
+                    timeoutSec: 10,
+                },
+            ],
+            sessionEnd: [
+                {
+                    type: 'command',
+                    bash: GSD_COPILOT_SESSION_END_HOOK_BASH,
+                    powershell: GSD_COPILOT_SESSION_END_HOOK_PWSH,
+                    timeoutSec: 10,
+                },
+            ],
         },
     };
 }
@@ -970,7 +1239,13 @@ function applySettingsJsonHooks(settings, opts) {
     // register settings.json hooks; runtimes with hooksSurface === 'none'
     // (opencode, kilo) are skipped. Equivalence: hooksSurface !== 'none' iff
     // the old !isOpencode && !isKilo check.
-    if (hooksSurface !== 'none') {
+    // #2095: kimi's hooksSurface is 'kimi-hooks-toml' — it registers hooks into
+    // its own native config.toml via writeKimiHooksToml, not settings.json (kimi
+    // never writes settings.json at all: writesSharedSettings stays false). This
+    // guard must also skip kimi's surface so applySettingsJsonHooks doesn't log
+    // misleading "Configured ..." console messages for a settings object that
+    // finishInstall() will never persist for kimi.
+    if (hooksSurface !== 'none' && hooksSurface !== 'kimi-hooks-toml') {
         if (!settings.hooks) {
             settings.hooks = {};
         }
@@ -1272,12 +1547,18 @@ function applySettingsJsonHooks(settings, opts) {
         else if (!hasPhaseBoundaryHook && !phaseBoundaryCommand) {
             console.warn(`  ${yellow}⚠${reset}  Skipped phase boundary hook — Bash executable path unavailable (#3393)`);
         }
-        // ── Extended hook events: SubagentStop / Stop / PreCompact (#788 + #770) ──
-        // Claude Code (since #770) and Qwen Code (since #788) both support these
-        // three lifecycle events.  Wire gsd-context-monitor so agents get context-
-        // headroom warnings at subagent completion, model stop, and pre-compaction
-        // (the most critical moment to surface headroom info).
+        // ── Extended hook events: SubagentStop / Stop / PreCompact / SubagentStart
+        //    (#788 + #770 + #2092) ────────────────────────────────────────────────
+        // Claude Code (since #770) and Qwen Code (since #788) both support the
+        // SubagentStop / Stop / PreCompact lifecycle events. Qwen Code additionally
+        // supports SubagentStart (#2092 Phase B, Upgrade 2). Wire gsd-context-
+        // monitor so agents get context-headroom warnings at subagent start,
+        // subagent completion, model stop, and pre-compaction (the most critical
+        // moment to surface headroom info).
         //
+        //   SubagentStart — subagent lifecycle start (context headroom tracking;
+        //                   qwen-only today — no other runtime declares it in
+        //                   extendedHookEvents)
         //   SubagentStop  — subagent lifecycle completion (context headroom tracking)
         //   Stop          — model stop / final-response moment (context headroom)
         //   PreCompact    — fires before conversation compaction (most critical
@@ -1287,11 +1568,15 @@ function applySettingsJsonHooks(settings, opts) {
         // user prompt text, not a tool invocation, so gsd-prompt-guard (which
         // exits unless tool_name is Write/Edit) would be a silent no-op.  A
         // dedicated handler for UserPromptSubmit is deferred to a follow-on issue.
-        // SubagentStop, Stop, PreCompact — route through the context monitor.
-        // Guard is now descriptor-driven: only events present in extendedEvents are wired.
+        // SubagentStart, SubagentStop, Stop, PreCompact — route through the context monitor.
+        // Guard is descriptor-driven: only events present in extendedEvents are wired,
+        // so this loop is a no-op for every runtime that doesn't list SubagentStart.
         {
-            const runtimeLabel = runtime === 'qwen' ? 'Qwen Code' : runtime === 'claude' ? 'Claude Code' : runtime;
-            for (const event of ['SubagentStop', 'Stop', 'PreCompact']) {
+            // Descriptor-driven (ADR-1239 / #2092): folded from a hardcoded
+            // `runtime === 'qwen' ? ... : ...` ternary into a capability-title
+            // lookup (see _capabilityTitle above).
+            const runtimeLabel = _capabilityTitle(runtime);
+            for (const event of ['SubagentStop', 'Stop', 'PreCompact', 'SubagentStart']) {
                 if (!extendedEvents.includes(event))
                     continue;
                 if (!settings.hooks[event]) {
@@ -1315,7 +1600,7 @@ function applySettingsJsonHooks(settings, opts) {
                 }
             }
         }
-        // ── end SubagentStop / Stop / PreCompact events ────────────────────────────
+        // ── end SubagentStop / Stop / PreCompact / SubagentStart events ────────────
         // ── Extended hook events (#776; Gemini runtime removed #1928) ──────────────
         // The Gemini-3-backend dialect exposes several hook events beyond
         // BeforeTool/AfterTool. These were added for the now-removed Gemini CLI
@@ -1412,6 +1697,199 @@ function applySettingsJsonHooks(settings, opts) {
                      @typescript-eslint/no-unsafe-assignment */
 }
 // ---------------------------------------------------------------------------
+// Kimi hooks.toml (#2095 EoS/kimi Upgrade 1 — native hook bus)
+//
+// Kimi CLI reads lifecycle hooks from a flat `[[hooks]]` array in its own
+// config.toml (moonshotai.github.io/kimi-cli/en/customization/hooks.html),
+// not from settings.json. Unlike every other hooksSurface writer above, this
+// file lives OUTSIDE the runtime's GSD configDir: kimi's configDir is the
+// generic Agent-Skills root (~/.config/agents by default), while config.toml
+// is a sibling at ~/.kimi (KIMI_SHARE_DIR override), resolved by
+// resolveKimiHooksTomlDir in runtime-homes.cts. Callers resolve that path and
+// pass it in explicitly — this module never reaches into runtime-homes.cjs
+// itself, keeping the same configDir/targetDir-passed-in shape every other
+// writer in this file uses.
+//
+// GSD-owned [[hooks]] entries are wrapped in marker comments so a reinstall
+// can find-and-replace only GSD's own block, leaving any user-authored
+// [[hooks]] entries elsewhere in the file untouched — mirrors the marker
+// approach stripStaleGsdHookBlocks uses for Codex's config.toml, simplified
+// to plain string slicing since this block is a flat, self-contained span
+// (no nested per-key structural TOML parsing is needed).
+// ---------------------------------------------------------------------------
+const KIMI_HOOKS_TOML_MARKER_BEGIN = '# GSD Hooks BEGIN — managed by GSD, do not edit between these markers';
+const KIMI_HOOKS_TOML_MARKER_END = '# GSD Hooks END';
+function buildKimiHookEntryToml(spec) {
+    if (!spec.command)
+        return null;
+    const lines = ['[[hooks]]', `event = "${spec.event}"`];
+    if (spec.matcher) {
+        lines.push(`matcher = "${escapeTomlDoubleQuotedString(spec.matcher)}"`);
+    }
+    lines.push(`command = "${escapeTomlDoubleQuotedString(spec.command)}"`);
+    if (typeof spec.timeout === 'number') {
+        lines.push(`timeout = ${spec.timeout}`);
+    }
+    return lines.join('\n');
+}
+/**
+ * Build the full marker-delimited GSD [[hooks]] block for kimi's config.toml,
+ * or null when no GSD hook resolved to a usable command (hooks/ missing, or
+ * the node/bash runner could not be resolved — mirrors the #1754/#3002
+ * defensive guards applySettingsJsonHooks applies per-hook above).
+ *
+ * Event -> hook mapping mirrors applySettingsJsonHooks' settings.json wiring
+ * 1:1 by GSD hook script (update check, session-state, phase-boundary,
+ * graphify, context monitor, prompt/read/workflow/worktree guards, commit
+ * validation). Kimi's 13 lifecycle events include exact-name equivalents for
+ * every Claude-dialect event GSD currently wires (SessionStart, PreToolUse,
+ * PostToolUse, Stop, PreCompact, SubagentStart, SubagentStop) — see
+ * moonshotai.github.io/kimi-cli/en/customization/hooks.html.
+ *
+ * Matcher translation (best-effort — Kimi's tool-name vocabulary is
+ * confirmed distinct from Claude's by the upstream hooks doc's own examples):
+ *   Bash -> Shell, Write -> WriteFile, Edit/MultiEdit -> StrReplaceFile.
+ * Read -> ReadFile follows the same WriteFile/StrReplaceFile naming
+ * convention but is not independently doc-confirmed. Claude's Agent|Task
+ * (subagent-dispatch) matcher segment has no confirmed Kimi tool name and is
+ * dropped rather than guessed — gsd-context-monitor's PostToolUse entry runs
+ * unmatched (all tools) instead, which only widens when it fires, it never
+ * narrows incorrectly.
+ */
+function buildKimiHooksTomlBlock(targetDir, opts) {
+    const { hookOpts } = opts;
+    const cmd = (hookName) => {
+        if (!node_fs_1.default.existsSync(node_path_1.default.join(targetDir, 'hooks', hookName)))
+            return null;
+        return buildHookCommand(targetDir, hookName, hookOpts);
+    };
+    const specs = [
+        // SessionStart — unmatched (session-level; no tool_name to filter on).
+        { event: 'SessionStart', command: cmd('gsd-check-update.js') },
+        { event: 'SessionStart', command: cmd('gsd-session-state.sh') },
+        // PreToolUse
+        { event: 'PreToolUse', command: cmd('gsd-prompt-guard.js'), matcher: 'WriteFile|StrReplaceFile', timeout: 5 },
+        { event: 'PreToolUse', command: cmd('gsd-read-guard.js'), matcher: 'WriteFile|StrReplaceFile', timeout: 5 },
+        { event: 'PreToolUse', command: cmd('gsd-worktree-path-guard.js'), matcher: 'WriteFile|StrReplaceFile', timeout: 5 },
+        { event: 'PreToolUse', command: cmd('gsd-workflow-guard.js'), matcher: 'Shell|WriteFile|StrReplaceFile', timeout: 5 },
+        { event: 'PreToolUse', command: cmd('gsd-validate-commit.sh'), matcher: 'Shell', timeout: 5 },
+        // PostToolUse
+        { event: 'PostToolUse', command: cmd('gsd-context-monitor.js'), timeout: 10 },
+        { event: 'PostToolUse', command: cmd('gsd-phase-boundary.sh'), matcher: 'WriteFile|StrReplaceFile', timeout: 5 },
+        { event: 'PostToolUse', command: cmd('gsd-read-injection-scanner.js'), matcher: 'ReadFile', timeout: 5 },
+        { event: 'PostToolUse', command: cmd('gsd-graphify-update.sh'), matcher: 'Shell', timeout: 5 },
+        // Extended lifecycle events — context-headroom tracking (unmatched).
+        { event: 'Stop', command: cmd('gsd-context-monitor.js'), timeout: 10 },
+        { event: 'PreCompact', command: cmd('gsd-context-monitor.js'), timeout: 10 },
+        { event: 'SubagentStart', command: cmd('gsd-context-monitor.js'), timeout: 10 },
+        { event: 'SubagentStop', command: cmd('gsd-context-monitor.js'), timeout: 10 },
+    ];
+    const entries = specs
+        .map(buildKimiHookEntryToml)
+        .filter((entry) => entry !== null);
+    if (entries.length === 0)
+        return null;
+    return [KIMI_HOOKS_TOML_MARKER_BEGIN, '', entries.join('\n\n'), '', KIMI_HOOKS_TOML_MARKER_END].join('\n');
+}
+/**
+ * Strip a previously-written GSD [[hooks]] block from kimi's config.toml
+ * content. Pure string function (no fs access) so install, uninstall, and
+ * tests share one strip implementation. Returns null when stripping leaves
+ * nothing but whitespace (the file was GSD-only), so the caller can unlink
+ * it instead of writing an empty file.
+ */
+function stripKimiHooksTomlBlock(content) {
+    const beginIdx = content.indexOf(KIMI_HOOKS_TOML_MARKER_BEGIN);
+    if (beginIdx === -1) {
+        return content.trim() === '' ? null : content;
+    }
+    const endMarkerIdx = content.indexOf(KIMI_HOOKS_TOML_MARKER_END, beginIdx);
+    if (endMarkerIdx === -1) {
+        // Malformed marker pair — BEGIN present but no END after it (missing END,
+        // or an END that only appears earlier in the file, before BEGIN). Never
+        // fall back to content.length here: that would slice to EOF and destroy
+        // every user section that follows. Leave the content untouched instead;
+        // a subsequent writeKimiHooksToml call will append a fresh, well-formed
+        // block rather than silently deleting user data.
+        return content;
+    }
+    const endIdx = endMarkerIdx + KIMI_HOOKS_TOML_MARKER_END.length;
+    // Swallow blank lines immediately surrounding the block so repeated
+    // strip+rewrite cycles never accumulate blank lines.
+    let sliceStart = beginIdx;
+    while (sliceStart > 0 && (content[sliceStart - 1] === '\n' || content[sliceStart - 1] === '\r'))
+        sliceStart -= 1;
+    let sliceEnd = endIdx;
+    while (sliceEnd < content.length && (content[sliceEnd] === '\n' || content[sliceEnd] === '\r'))
+        sliceEnd += 1;
+    const before = content.slice(0, sliceStart);
+    const after = content.slice(sliceEnd);
+    // Blank-line swallowing above consumes every newline flanking the block,
+    // including the one required to keep the surrounding user sections on
+    // separate lines. If the block sat BETWEEN two user sections (content
+    // survives on both sides), concatenating `before` + `after` directly would
+    // glue the last line of the earlier section onto the first line of the
+    // later one. Reinsert a blank-line separator in that case; when only one
+    // side has content (block at file start or EOF), no separator is needed —
+    // that matches the pre-existing idempotent behavior for those shapes.
+    const result = before.trim() !== '' && after.trim() !== ''
+        ? `${before}\n\n${after}`
+        : before + after;
+    return result.trim() === '' ? null : result;
+}
+/**
+ * Idempotently (re)write kimi's GSD-owned [[hooks]] block into its native
+ * config.toml at `configPath` (resolved by the caller via
+ * resolveKimiHooksTomlDir). No-ops (`{changed:false}`) when the computed
+ * block is byte-identical to what's already on disk, so reinstalls don't
+ * touch the file's mtime for no reason.
+ */
+function writeKimiHooksToml(configPath, targetDir, opts) {
+    const existing = node_fs_1.default.existsSync(configPath) ? node_fs_1.default.readFileSync(configPath, 'utf8') : '';
+    const stripped = stripKimiHooksTomlBlock(existing) ?? '';
+    const block = buildKimiHooksTomlBlock(targetDir, opts);
+    const entryCount = block ? (block.match(/\[\[hooks\]\]/g) || []).length : 0;
+    if (!block) {
+        if (stripped === existing)
+            return { changed: false, path: configPath, entryCount: 0 };
+        if (stripped.trim() === '') {
+            if (node_fs_1.default.existsSync(configPath))
+                node_fs_1.default.unlinkSync(configPath);
+        }
+        else {
+            node_fs_1.default.mkdirSync(node_path_1.default.dirname(configPath), { recursive: true });
+            atomicWriteFileSync(configPath, stripped, 'utf8');
+        }
+        return { changed: true, path: configPath, entryCount: 0 };
+    }
+    const separator = stripped.trim() === '' ? '' : (stripped.endsWith('\n') ? '\n' : '\n\n');
+    const next = stripped.trim() === '' ? `${block}\n` : `${stripped}${separator}${block}\n`;
+    if (next === existing)
+        return { changed: false, path: configPath, entryCount };
+    node_fs_1.default.mkdirSync(node_path_1.default.dirname(configPath), { recursive: true });
+    atomicWriteFileSync(configPath, next, 'utf8');
+    return { changed: true, path: configPath, entryCount };
+}
+/**
+ * Uninstall-time counterpart to writeKimiHooksToml: strips the GSD block and
+ * deletes the file if nothing but GSD's own block was ever in it.
+ */
+function removeKimiHooksToml(configPath) {
+    if (!node_fs_1.default.existsSync(configPath))
+        return { changed: false };
+    const existing = node_fs_1.default.readFileSync(configPath, 'utf8');
+    const stripped = stripKimiHooksTomlBlock(existing);
+    if (stripped === existing)
+        return { changed: false };
+    if (stripped === null || stripped.trim() === '') {
+        node_fs_1.default.unlinkSync(configPath);
+    }
+    else {
+        atomicWriteFileSync(configPath, stripped, 'utf8');
+    }
+    return { changed: true };
+}
+// ---------------------------------------------------------------------------
 // referencesHook
 //
 // Pure predicate — checks whether a hook entry object references a managed
@@ -1458,6 +1936,18 @@ module.exports = {
     GSD_CURSOR_SUBAGENT_START_HOOK_SCRIPT,
     GSD_CURSOR_SUBAGENT_STOP_HOOK_SCRIPT,
     GSD_CURSOR_HOOK_MARKER,
+    // Windsurf/Cascade
+    buildWindsurfHookEntry,
+    isManagedWindsurfHookEntry,
+    reconcileWindsurfHooksJson,
+    writeWindsurfHooksJson,
+    removeWindsurfHooksJson,
+    WINDSURF_HOOK_EVENTS,
+    WINDSURF_EVENT_SCRIPT_MAP,
+    GSD_WINDSURF_PRE_WRITE_HOOK_SCRIPT,
+    GSD_WINDSURF_PRE_COMMAND_HOOK_SCRIPT,
+    GSD_WINDSURF_HOOK_SCRIPTS,
+    GSD_WINDSURF_HOOK_MARKER,
     // Copilot
     buildCopilotHookConfig,
     writeCopilotHookConfig,
@@ -1473,6 +1963,13 @@ module.exports = {
     // Codex TOML
     buildCodexHookBlock,
     rewriteLegacyCodexHookBlock,
+    // Kimi hooks.toml
+    buildKimiHooksTomlBlock,
+    stripKimiHooksTomlBlock,
+    writeKimiHooksToml,
+    removeKimiHooksToml,
+    KIMI_HOOKS_TOML_MARKER_BEGIN,
+    KIMI_HOOKS_TOML_MARKER_END,
     // Shared
     buildHookCommand,
     applySettingsJsonHooks,