dlw-machine-setup 0.8.6 → 0.8.7

package/bin/installer.js

@@ -3905,6 +3905,9 @@ ${endMarker}`;
 var claudeCodeProfile = {
   agent: "claude-code",
   instructionsFile: "CLAUDE.md",
+  // Claude exposes a top-level `statusLine` setting in settings.json.
+  // Bundles gate statusline-related ops with `when: 'statusline-supported'`.
+  statusLineSupported: true,
   handlers: {
     agent: {
       supported: true,
@@ -3940,6 +3943,9 @@ var claudeCodeProfile = {
 var githubCopilotProfile = {
   agent: "github-copilot",
   instructionsFile: ".github/copilot-instructions.md",
+  // No statusLine equivalent in Copilot CLI — drops Factory's statusline
+  // op via the `statusline-supported` capability gate.
+  statusLineSupported: false,
   handlers: {
     agent: {
       supported: true,
@@ -3957,12 +3963,35 @@ var githubCopilotProfile = {
       destination: (name) => `.github/skills/${name}/SKILL.md`
     },
     hook: {
-      // Hooks are Claude-only by policy (see plan doc). The bundle's
-      // hook-related ops are gated with `when: 'hooks-supported'`, so
-      // Copilot installs ship no hook events, no hook scripts, and no
-      // statusLine setting. Phase 4 (Copilot hook implementation) was
-      // canceled — this is the permanent final state.
-      supported: false
+      supported: true,
+      scriptDir: ".github/hooks",
+      configFile: ".github/hooks/hooks.json",
+      configKey: "hooks",
+      // Copilot's hooks.json requires a top-level { "version": 1 }.
+      // Merged into the patch root once per install.
+      configRoot: { version: 1 },
+      mapEvent: (event) => {
+        const map = {
+          SessionStart: "sessionStart",
+          SessionEnd: "sessionEnd",
+          UserPromptSubmit: "userPromptSubmitted",
+          PreToolUse: "preToolUse",
+          PostToolUse: "postToolUse"
+        };
+        return map[event] ?? null;
+      },
+      // Copilot's cross-platform shape. We use the same `node <script>`
+      // command for both shells — node is the same binary regardless of
+      // shell, and Copilot picks `bash` or `powershell` based on the
+      // host OS at runtime. The script's `matcher` is intentionally
+      // dropped: Copilot has no per-tool matcher. Hooks that need
+      // matcher semantics filter inline (Factory's hooks already do).
+      buildHookEntry: (_asset, command) => ({
+        type: "command",
+        bash: command,
+        powershell: command,
+        timeoutSec: 30
+      })
     },
     "instructions-snippet": {
       supported: true
@@ -4057,7 +4086,8 @@ function runBundleV2(manifest, ctx) {
   }
   for (const op of manifest.ops ?? []) {
     if (op.when === "hooks-supported" && !profile.handlers.hook.supported) continue;
-    executeOp(op, manifest.name, ctx, result);
+    if (op.when === "statusline-supported" && !profile.statusLineSupported) continue;
+    executeOp(substituteHookDir(op, profile), manifest.name, ctx, result);
     result.opsExecuted++;
   }
   writeGitignoreBlock(manifest, ctx, result);
@@ -4107,6 +4137,8 @@ function runAssetCopy(asset, handler, ctx, result) {
 function accumulateHook(asset, handler, hookPatches, ctx, result) {
   if (!handler.supported) return;
   if (!handler.configFile || !handler.configKey) return;
+  const eventName = handler.mapEvent ? handler.mapEvent(asset.event) : asset.event;
+  if (eventName === null) return;
   if (asset.script && handler.scriptDir) {
     const scriptSource = resolveBundlePath(asset.script, ctx);
     if ((0, import_fs6.existsSync)(scriptSource)) {
@@ -4119,19 +4151,33 @@ function accumulateHook(asset, handler, hookPatches, ctx, result) {
     }
   }
   const command = handler.scriptDir ? asset.command.replace(/\{hookDir\}/g, handler.scriptDir) : asset.command;
-  const entry = {
-    hooks: [{ type: "command", command }]
-  };
-  if (asset.matcher) entry.matcher = asset.matcher;
+  const entry = handler.buildHookEntry ? handler.buildHookEntry(asset, command) : (() => {
+    const e = {
+      hooks: [{ type: "command", command }]
+    };
+    if (asset.matcher) e.matcher = asset.matcher;
+    return e;
+  })();
   let patch = hookPatches.get(handler.configFile);
   if (!patch) {
-    patch = {};
+    patch = handler.configRoot ? { ...handler.configRoot } : {};
     hookPatches.set(handler.configFile, patch);
   }
   const root = patch[handler.configKey] ??= {};
-  const events = root[asset.event] ??= [];
+  const events = root[eventName] ??= [];
   events.push(entry);
 }
+function substituteHookDir(op, profile) {
+  const scriptDir = profile.handlers.hook.scriptDir;
+  if (!scriptDir) return op;
+  if (op.op === "copy") {
+    return { ...op, to: op.to.replace(/\{hookDir\}/g, scriptDir) };
+  }
+  if (op.op === "merge-json") {
+    return { ...op, file: op.file.replace(/\{hookDir\}/g, scriptDir) };
+  }
+  return op;
+}
 function writeGitignoreBlock(manifest, ctx, result) {
   if (!manifest.gitignore?.length) return;
   upsertMarkerBlock(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlw-machine-setup",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "One-shot installer for The Machine toolchain",
   "bin": {
     "dlw-machine-setup": "bin/installer.js"