phasegate 0.335.0 → 0.340.0

package/scripts/harness/installation/application/usecases/run-install.ts

@@ -19,6 +19,8 @@
 // @work-item-id WI-315
 // @work-item-id WI-326
 // @work-item-id WI-331
+// @work-item-id WI-385
+// @work-item-id WI-387
 
 import {
   access,
@@ -34,11 +36,13 @@ import {
   writeFile,
 } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { type AgentTarget, resolveAgentTarget } from "../../domain/agent-target.js";
 import { DeploymentEntry } from "../../domain/deployment-entry.js";
 import { DeploymentManifest, type InstallationFlags } from "../../domain/deployment-manifest.js";
 import type { ManagedBlockInput } from "../../domain/managed-block.js";
 import type { RepairMode } from "../../domain/repair-mode.js";
 import { getBundledSkillsForSet, type SkillSet } from "../bundled-skill-selection.js";
+import { mergeNamedHookJson } from "../named-hook-json.js";
 import type { HashCalculatorPort } from "../ports/hash-calculator-port.js";
 import type { ManifestRepositoryPort } from "../ports/manifest-repository-port.js";
 import type { ModelDelegationPort } from "../ports/model-delegation-port.js";
@@ -46,6 +50,7 @@ import type { ModelDelegationPort } from "../ports/model-delegation-port.js";
 type InstallAction = "missing" | "will-merge" | "will-skip" | "will-overwrite";
 type StrategyType =
   | "json"
+  | "json-named"
   | "shell"
   | "yaml-add"
   | "package-json"
@@ -83,7 +88,7 @@ export interface RunInstallInput {
   readonly includeCi?: boolean;
   readonly skillSet?: "core" | "all";
   readonly workflow?: "standard" | "strict";
-  readonly agent?: "claude" | "codex" | "both";
+  readonly agent?: AgentTarget;
   readonly personal?: boolean;
 }
 
@@ -130,6 +135,7 @@ const PERSONAL_AGENT_RUNTIME_FILES = new Set([
   ".claude/settings.json",
   "AGENTS.md",
   ".codex/hooks.json",
+  ".agents/hooks.json",
 ]);
 const SHARED_SKILLS_VERSION_PATH = "skills/.harness-version";
 const PERSONAL_PRINCIPLES_DOCS = ".phasegate-local/docs/principles";
@@ -361,7 +367,7 @@ function mergeManagedMarkdown(existing: string | null, incoming: string): string
 function renderAgentContextTemplate(
   template: string,
   options: {
-    readonly agent: "claude" | "codex" | "both";
+    readonly agent: AgentTarget;
     readonly skillSet: "core" | "all";
     readonly workflow: "standard" | "strict";
     readonly includeHusky: boolean;
@@ -409,20 +415,6 @@ function mergePackageJson(existing: Record<string, unknown>, version: string): R
   };
 }
 
-function hasCustomJson(content: string | null): boolean {
-  if (content === null) return false;
-  try {
-    const parsed = JSON.parse(content) as unknown;
-    if (!isRecord(parsed)) return true;
-    const withoutEmptyHooks = { ...parsed };
-    if (isRecord(withoutEmptyHooks.hooks) && Object.keys(withoutEmptyHooks.hooks).length === 0)
-      delete withoutEmptyHooks.hooks;
-    return Object.keys(withoutEmptyHooks).length > 0;
-  } catch {
-    return true;
-  }
-}
-
 function errorCode(error: unknown): string {
   if (isRecord(error) && typeof error.code === "string") return error.code;
   return "UNKNOWN";
@@ -471,17 +463,19 @@ export class RunInstallUseCase {
   ) {}
 
   async execute(input: RunInstallInput): Promise<RunInstallResult> {
-    const includeClaude = input.includeClaude ?? true;
-    const includeCodex = input.includeCodex ?? true;
+    const legacyIncludeClaude = input.includeClaude ?? true;
+    const legacyIncludeCodex = input.includeCodex ?? true;
     const includeHusky = input.includeHusky ?? true;
     const includeCi = input.includeCi ?? true;
     const skillSet = input.skillSet ?? "all";
     const workflow = input.workflow ?? "standard";
-    const agent = input.agent ?? (includeClaude && includeCodex ? "both" : includeCodex ? "codex" : "claude");
+    const agent =
+      input.agent ?? (legacyIncludeClaude && legacyIncludeCodex ? "both" : legacyIncludeCodex ? "codex" : "claude");
+    const selection = resolveAgentTarget(agent);
     const personal = input.personal ?? false;
     const targets = personal
-      ? this.createPersonalTargets({ includeClaude, includeCodex })
-      : this.createTargets({ includeClaude, includeCodex, includeHusky, includeCi });
+      ? this.createPersonalTargets(selection)
+      : this.createTargets({ ...selection, includeHusky, includeCi });
     // Persist the effective opt-in state so a later reconcile can honor the
     // original install options. Personal installs never deploy Husky/CI
     // targets, so their effective state is recorded as false regardless of
@@ -584,7 +578,7 @@ export class RunInstallUseCase {
       const mode = before === null ? "created" : "merged";
       const hash = this.hashCalculator.compute(next);
       const manifestEntry = baseManifest.findEntry(target.path);
-      if (manifestEntry !== null && manifestEntry.hash.equals(hash)) {
+      if (manifestEntry?.hash.equals(hash)) {
         manifest = manifest.addEntry(manifestEntry);
       } else {
         manifest = manifest.addEntry(
@@ -600,7 +594,11 @@ export class RunInstallUseCase {
     }
 
     const personalSkillTargets = input.personal
-      ? [...(includeClaude ? [".claude/skills"] : []), ...(includeCodex ? [".codex/skills"] : [])]
+      ? [
+          ...(selection.claudeSkills ? [".claude/skills"] : []),
+          ...(selection.codexSkills ? [".codex/skills"] : []),
+          ...(selection.antigravitySkills ? [".agents/skills"] : []),
+        ]
       : [];
     const selectedPersonalSkills = input.personal ? await listSelectedBundledSkills(input.harnessRoot, skillSet) : [];
     for (const skillPath of personalSkillTargets) {
@@ -644,7 +642,7 @@ export class RunInstallUseCase {
       }
     }
 
-    if (!input.personal && (includeClaude || includeCodex)) {
+    if (!input.personal && (selection.claudeSkills || selection.codexSkills || selection.antigravitySkills)) {
       const sharedSkills = await listSelectedBundledSkills(input.harnessRoot, skillSet);
       const item = await this.planSharedSkillDirectory(input, sharedSkills, baseManifest);
       plan.push(item);
@@ -673,8 +671,9 @@ export class RunInstallUseCase {
     const linkSpecs = input.personal
       ? []
       : [
-          ...(includeClaude ? [{ path: ".claude/skills", target: "../skills" }] : []),
-          ...(includeCodex ? [{ path: ".codex/skills", target: "../skills" }] : []),
+          ...(selection.claudeSkills ? [{ path: ".claude/skills", target: "../skills" }] : []),
+          ...(selection.codexSkills ? [{ path: ".codex/skills", target: "../skills" }] : []),
+          ...(selection.antigravitySkills ? [{ path: ".agents/skills", target: "../skills" }] : []),
         ];
     for (const linkSpec of linkSpecs) {
       const item = await this.planSkillLink(input.projectRoot, linkSpec.path, linkSpec.target);
@@ -703,7 +702,7 @@ export class RunInstallUseCase {
       });
     }
 
-    if (input.personal && includeCodex) {
+    if (input.personal && selection.codexHook) {
       plan.push({
         path: "~/.codex/config.toml",
         action: "will-skip",
@@ -770,8 +769,11 @@ export class RunInstallUseCase {
   }
 
   private createTargets(options: {
-    readonly includeClaude: boolean;
-    readonly includeCodex: boolean;
+    readonly claudeHook: boolean;
+    readonly claudeContext: boolean;
+    readonly codexHook: boolean;
+    readonly agentsContext: boolean;
+    readonly antigravityHook: boolean;
     readonly includeHusky: boolean;
     readonly includeCi: boolean;
   }): readonly InstallTarget[] {
@@ -781,7 +783,7 @@ export class RunInstallUseCase {
         strategy: "copy" as const,
         templatePath: "docs/templates/project/phasegate.config.json",
       },
-      ...(options.includeClaude
+      ...(options.claudeHook
         ? [
             {
               path: ".claude/settings.json",
@@ -789,16 +791,60 @@ export class RunInstallUseCase {
               templatePath: "templates/.claude/settings.json",
             },
             {
-              path: "CLAUDE.md",
-              strategy: "markdown-managed" as const,
-              templatePath: "docs/templates/agent-context/CLAUDE.md.template.md",
-              block: { start: MARKDOWN_BEGIN, end: MARKDOWN_END, content: "phasegate CLAUDE.md managed section" },
+              path: ".claude/scripts/deny-check.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/deny-check.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-settings-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/format-settings-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-typescript-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/format-typescript-hook.sh",
+              executable: true,
             },
+            {
+              path: ".claude/scripts/analyze-errors-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/analyze-errors-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/hook-config.json",
+              strategy: "copy" as const,
+              templatePath: "templates/.claude/scripts/hook-config.json",
+            },
+            ...(options.claudeContext
+              ? [
+                  {
+                    path: "CLAUDE.md",
+                    strategy: "markdown-managed" as const,
+                    templatePath: "docs/templates/agent-context/CLAUDE.md.template.md",
+                    block: { start: MARKDOWN_BEGIN, end: MARKDOWN_END, content: "phasegate CLAUDE.md managed section" },
+                  },
+                ]
+              : []),
           ]
         : []),
-      ...(options.includeCodex
+      ...(options.codexHook
+        ? [{ path: ".codex/hooks.json", strategy: "json" as const, templatePath: "templates/.codex/hooks.json" }]
+        : []),
+      ...(options.antigravityHook
+        ? [
+            {
+              path: ".agents/hooks.json",
+              strategy: "json-named" as const,
+              templatePath: "templates/.agents/hooks.json",
+            },
+          ]
+        : []),
+      ...(options.agentsContext
         ? [
-            { path: ".codex/hooks.json", strategy: "json" as const, templatePath: "templates/.codex/hooks.json" },
             {
               path: "AGENTS.md",
               strategy: "markdown-managed" as const,
@@ -846,8 +892,11 @@ export class RunInstallUseCase {
   }
 
   private createPersonalTargets(options: {
-    readonly includeClaude: boolean;
-    readonly includeCodex: boolean;
+    readonly claudeHook: boolean;
+    readonly claudeContext: boolean;
+    readonly codexHook: boolean;
+    readonly agentsContext: boolean;
+    readonly antigravityHook: boolean;
   }): readonly InstallTarget[] {
     return [
       {
@@ -855,27 +904,60 @@ export class RunInstallUseCase {
         strategy: "copy" as const,
         templatePath: "docs/templates/personal/phasegate-local-config.json",
       },
-      ...(options.includeClaude
+      ...(options.claudeHook
         ? [
-            {
-              path: ".claude/CLAUDE.md",
-              strategy: "markdown-managed" as const,
-              templatePath: "docs/templates/agent-context/CLAUDE.md.template.md",
-              block: {
-                start: MARKDOWN_BEGIN,
-                end: MARKDOWN_END,
-                content: "phasegate personal .claude/CLAUDE.md managed section",
-              },
-              personalManualIfUnmanaged: true,
-            },
+            ...(options.claudeContext
+              ? [
+                  {
+                    path: ".claude/CLAUDE.md",
+                    strategy: "markdown-managed" as const,
+                    templatePath: "docs/templates/agent-context/CLAUDE.md.template.md",
+                    block: {
+                      start: MARKDOWN_BEGIN,
+                      end: MARKDOWN_END,
+                      content: "phasegate personal .claude/CLAUDE.md managed section",
+                    },
+                    personalManualIfUnmanaged: true,
+                  },
+                ]
+              : []),
             {
               path: ".claude/settings.json",
               strategy: "copy" as const,
               templatePath: "templates/.claude/settings.json",
             },
+            {
+              path: ".claude/scripts/deny-check.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/deny-check.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-settings-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/format-settings-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-typescript-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/format-typescript-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/analyze-errors-hook.sh",
+              strategy: "shell" as const,
+              templatePath: "templates/.claude/scripts/analyze-errors-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/hook-config.json",
+              strategy: "copy" as const,
+              templatePath: "templates/.claude/scripts/hook-config.json",
+            },
           ]
         : []),
-      ...(options.includeCodex
+      ...(options.agentsContext
         ? [
             {
               path: "AGENTS.md",
@@ -888,6 +970,10 @@ export class RunInstallUseCase {
               },
               personalManualIfUnmanaged: true,
             },
+          ]
+        : []),
+      ...(options.codexHook
+        ? [
             {
               path: ".codex/hooks.json",
               strategy: "copy" as const,
@@ -895,6 +981,15 @@ export class RunInstallUseCase {
             },
           ]
         : []),
+      ...(options.antigravityHook
+        ? [
+            {
+              path: ".agents/hooks.json",
+              strategy: "json-named" as const,
+              templatePath: "templates/.agents/hooks.json",
+            },
+          ]
+        : []),
       {
         path: ".git/hooks/pre-commit",
         strategy: "copy" as const,
@@ -943,6 +1038,7 @@ export class RunInstallUseCase {
     if (target.strategy === "copy-dir") return "mechanical";
     if (target.strategy === "symlink") return "mechanical";
     if (target.strategy === "json") return jsonRepairMode(before);
+    if (target.strategy === "json-named") return jsonRepairMode(before);
     if (target.strategy === "markdown-managed") return "mechanical";
     return "mechanical";
   }
@@ -966,6 +1062,10 @@ export class RunInstallUseCase {
     }
     const existing = before === null ? {} : (JSON.parse(before) as unknown);
     const incoming = JSON.parse(template) as unknown;
+    if (target.strategy === "json-named") {
+      const merged = mergeNamedHookJson(isRecord(existing) ? existing : {}, isRecord(incoming) ? incoming : {});
+      return `${JSON.stringify(merged, null, 2)}\n`;
+    }
     const merged = mergeJsonObject(isRecord(existing) ? existing : {}, isRecord(incoming) ? incoming : {});
     return `${JSON.stringify(merged, null, 2)}\n`;
   }
@@ -1124,7 +1224,7 @@ export class RunInstallUseCase {
   ): DeploymentManifest {
     const hash = this.hashCalculator.compute(input.contentForHash);
     const existingEntry = baseManifest.findEntry(input.path);
-    if (existingEntry !== null && existingEntry.hash.equals(hash)) {
+    if (existingEntry?.hash.equals(hash)) {
       return manifest.addEntry(existingEntry);
     }
     return manifest.addEntry(

package/scripts/harness/installation/application/usecases/run-reconcile.ts

@@ -10,6 +10,8 @@
 // @work-item-id WI-315
 // @work-item-id WI-326
 // @work-item-id WI-331
+// @work-item-id WI-385
+// @work-item-id WI-387
 
 import {
   access,
@@ -30,6 +32,7 @@ import { DeploymentManifest } from "../../domain/deployment-manifest.js";
 import type { ManagedBlockInput } from "../../domain/managed-block.js";
 import type { RepairMode } from "../../domain/repair-mode.js";
 import { getBundledSkillsForSet, type SkillSet } from "../bundled-skill-selection.js";
+import { mergeNamedHookJson } from "../named-hook-json.js";
 import type { HashCalculatorPort } from "../ports/hash-calculator-port.js";
 import type { ManifestRepositoryPort } from "../ports/manifest-repository-port.js";
 import type { ModelDelegationPort } from "../ports/model-delegation-port.js";
@@ -37,10 +40,12 @@ import type { ModelDelegationPort } from "../ports/model-delegation-port.js";
 type ReconcileAction = "missing-manifest" | "update" | "add" | "link" | "skip" | "refuse" | "prune";
 type StrategyType =
   | "json"
+  | "json-named"
   | "shell"
   | "yaml-add"
   | "package-json"
   | "markdown-managed"
+  | "copy"
   | "copy-dir"
   | "symlink"
   | "unknown";
@@ -96,7 +101,7 @@ const USER_SECTION_END = "<!-- phasegate:user-section:end -->";
 const USER_SECTION_PLACEHOLDER = "Project-specific agent instructions go here.";
 const SHARED_SKILLS_VERSION_PATH = "skills/.harness-version";
 const HARNESS_VERSION_BASENAME = ".harness-version";
-const SKILL_ROOT_PREFIXES = ["skills", ".claude/skills", ".codex/skills"] as const;
+const SKILL_ROOT_PREFIXES = ["skills", ".claude/skills", ".codex/skills", ".agents/skills"] as const;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -387,7 +392,9 @@ export class RunReconcileUseCase {
 
     const includeHusky = input.includeHusky ?? manifest.installationFlags?.includeHusky ?? true;
     const includeCi = input.includeCi ?? manifest.installationFlags?.includeCi ?? true;
-    const targets = this.createTargets({ includeHusky, includeCi });
+    const includeAntigravity = manifest.findEntry(".agents/hooks.json") !== null;
+    const includeClaudeScripts = manifest.findEntry(".claude/settings.json") !== null;
+    const targets = this.createTargets({ includeHusky, includeCi, includeAntigravity, includeClaudeScripts });
     const targetsByPath = new Map(targets.map((target) => [target.path, target]));
     let nextManifest = DeploymentManifest.reconstitute({
       version: input.phasegateVersion,
@@ -507,7 +514,9 @@ export class RunReconcileUseCase {
           }
         } else if (
           outcome.item.strategy === "copy-dir" &&
-          (outcome.item.path === ".claude/skills" || outcome.item.path === ".codex/skills")
+          (outcome.item.path === ".claude/skills" ||
+            outcome.item.path === ".codex/skills" ||
+            outcome.item.path === ".agents/skills")
         ) {
           const personalSkills = await listSelectedBundledSkills(input.harnessRoot, "all");
           nextManifest = nextManifest.addEntry(
@@ -560,7 +569,10 @@ export class RunReconcileUseCase {
     const rawTemplate = target.templatePath ? await readFile(join(input.harnessRoot, target.templatePath), "utf8") : "";
     const template = target.strategy === "markdown-managed" ? renderAgentContextTemplate(rawTemplate) : rawTemplate;
     const next =
-      entry.mode === "created" && target.strategy !== "package-json" && target.strategy !== "markdown-managed"
+      entry.mode === "created" &&
+      target.strategy !== "package-json" &&
+      target.strategy !== "markdown-managed" &&
+      target.strategy !== "json-named"
         ? template
         : this.reconcileContent(target, before, template, input.phasegateVersion);
     const changed = before !== next;
@@ -681,6 +693,7 @@ export class RunReconcileUseCase {
     return (
       manifest.findEntry(".claude/skills") !== null ||
       manifest.findEntry(".codex/skills") !== null ||
+      manifest.findEntry(".agents/skills") !== null ||
       manifest.entries.some((entry) => entry.path.startsWith("skills/"))
     );
   }
@@ -692,16 +705,23 @@ export class RunReconcileUseCase {
     return (
       manifest.findEntry(".phasegate-local/phasegate.config.json") !== null ||
       manifest.entries.some(
-        (entry) => (entry.path === ".claude/skills" || entry.path === ".codex/skills") && entry.mode === "created",
+        (entry) =>
+          (entry.path === ".claude/skills" || entry.path === ".codex/skills" || entry.path === ".agents/skills") &&
+          entry.mode === "created",
       ) ||
       manifest.entries.some(
-        (entry) => entry.path.startsWith(".claude/skills/") || entry.path.startsWith(".codex/skills/"),
+        (entry) =>
+          entry.path.startsWith(".claude/skills/") ||
+          entry.path.startsWith(".codex/skills/") ||
+          entry.path.startsWith(".agents/skills/"),
       )
     );
   }
 
-  private personalSkillPaths(manifest: DeploymentManifest): Array<".claude/skills" | ".codex/skills"> {
-    const paths = new Set<".claude/skills" | ".codex/skills">();
+  private personalSkillPaths(
+    manifest: DeploymentManifest,
+  ): Array<".claude/skills" | ".codex/skills" | ".agents/skills"> {
+    const paths = new Set<".claude/skills" | ".codex/skills" | ".agents/skills">();
     if (
       manifest.findEntry(".claude/skills") !== null ||
       manifest.entries.some((entry) => entry.path.startsWith(".claude/skills/"))
@@ -712,6 +732,11 @@ export class RunReconcileUseCase {
       manifest.entries.some((entry) => entry.path.startsWith(".codex/skills/"))
     )
       paths.add(".codex/skills");
+    if (
+      manifest.findEntry(".agents/skills") !== null ||
+      manifest.entries.some((entry) => entry.path.startsWith(".agents/skills/"))
+    )
+      paths.add(".agents/skills");
     return [...paths].sort();
   }
 
@@ -783,7 +808,7 @@ export class RunReconcileUseCase {
   private async planPersonalSkills(
     input: RunReconcileInput,
     manifest: DeploymentManifest,
-    relativePath: ".claude/skills" | ".codex/skills",
+    relativePath: ".claude/skills" | ".codex/skills" | ".agents/skills",
     skills: readonly string[],
     skillSet: SkillSet,
   ) {
@@ -936,21 +961,61 @@ export class RunReconcileUseCase {
     if (target.strategy === "yaml-add") return template;
     if (target.strategy === "shell") return reconcileShell(before, template);
     if (target.strategy === "markdown-managed") return reconcileManagedMarkdown(before, template);
+    if (target.strategy === "copy") return before ?? template;
     if (target.strategy === "package-json") {
       const existing = before === null ? {} : (JSON.parse(before) as unknown);
       return `${JSON.stringify(reconcilePackageJson(isRecord(existing) ? existing : {}, version), null, 2)}\n`;
     }
     const existing = before === null ? {} : (JSON.parse(before) as unknown);
     const incoming = JSON.parse(template) as unknown;
+    if (target.strategy === "json-named") {
+      const merged = mergeNamedHookJson(isRecord(existing) ? existing : {}, isRecord(incoming) ? incoming : {});
+      return `${JSON.stringify(merged, null, 2)}\n`;
+    }
     return `${JSON.stringify(reconcileJsonObject(isRecord(existing) ? existing : {}, isRecord(incoming) ? incoming : {}), null, 2)}\n`;
   }
 
   private createTargets(options: {
     readonly includeHusky: boolean;
     readonly includeCi: boolean;
+    readonly includeAntigravity: boolean;
+    readonly includeClaudeScripts: boolean;
   }): readonly ReconcileTarget[] {
     return [
       { path: ".claude/settings.json", strategy: "json", templatePath: "templates/.claude/settings.json" },
+      ...(options.includeClaudeScripts
+        ? ([
+            {
+              path: ".claude/scripts/deny-check.sh",
+              strategy: "shell",
+              templatePath: "templates/.claude/scripts/deny-check.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-settings-hook.sh",
+              strategy: "shell",
+              templatePath: "templates/.claude/scripts/format-settings-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/format-typescript-hook.sh",
+              strategy: "shell",
+              templatePath: "templates/.claude/scripts/format-typescript-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/analyze-errors-hook.sh",
+              strategy: "shell",
+              templatePath: "templates/.claude/scripts/analyze-errors-hook.sh",
+              executable: true,
+            },
+            {
+              path: ".claude/scripts/hook-config.json",
+              strategy: "copy",
+              templatePath: "templates/.claude/scripts/hook-config.json",
+            },
+          ] as const satisfies readonly ReconcileTarget[])
+        : []),
       {
         path: "CLAUDE.md",
         strategy: "markdown-managed",
@@ -958,6 +1023,11 @@ export class RunReconcileUseCase {
         block: { start: MARKDOWN_BEGIN, end: MARKDOWN_END, content: "phasegate CLAUDE.md managed section" },
       },
       { path: ".codex/hooks.json", strategy: "json", templatePath: "templates/.codex/hooks.json" },
+      ...(options.includeAntigravity
+        ? ([
+            { path: ".agents/hooks.json", strategy: "json-named", templatePath: "templates/.agents/hooks.json" },
+          ] as const)
+        : []),
       {
         path: "AGENTS.md",
         strategy: "markdown-managed",
@@ -1001,6 +1071,7 @@ export class RunReconcileUseCase {
       { path: "package.json", strategy: "package-json", templatePath: "package.json" },
       { path: ".claude/skills", strategy: "symlink" },
       { path: ".codex/skills", strategy: "symlink" },
+      ...(options.includeAntigravity ? ([{ path: ".agents/skills", strategy: "symlink" }] as const) : []),
     ];
   }
 
@@ -1014,7 +1085,12 @@ export class RunReconcileUseCase {
 
   private managedBlockFor(path: string, strategy: StrategyType): ManagedBlockInput | null {
     if (strategy === "shell") return { start: SHELL_BEGIN, end: SHELL_END, content: `phasegate ${path} managed block` };
-    if (strategy === "json" || strategy === "package-json" || strategy === "markdown-managed") {
+    if (
+      strategy === "json" ||
+      strategy === "json-named" ||
+      strategy === "package-json" ||
+      strategy === "markdown-managed"
+    ) {
       return { start: "phasegate structured merge", end: "phasegate structured merge", content: `${strategy}:${path}` };
     }
     return null;