fapony 0.7.0 → 0.7.1

package/src/install/claude.ts

@@ -1,160 +1,89 @@
 // src/install/claude.ts — Claude Code install provider
 //
-// Shells out to `claude mcp add` (never parses/writes ~/.claude.json directly).
+// Skills symlink + the PreToolUse hooks fapony still owns. Memory (MCP, Stop,
+// SessionStart, per-file read context) moved to fael — `fael install` wires it.
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { assertSafe } from "../safety.js";
 import { claudeSkillsDir, linkSkills, reportSkills } from "./skills.js";
-import {
-  type ClaudeRunResult,
-  defaultExit,
-  INSTALL_ROOT,
-  type InstallDeps,
-} from "./types.js";
+import { INSTALL_ROOT, type InstallDeps } from "./types.js";
 
-function defaultRun(argv: string[]): ClaudeRunResult {
-  assertSafe(argv);
-  try {
-    const proc = Bun.spawnSync(argv, {
-      stdout: "pipe",
-      stderr: "pipe",
-    });
-    return {
-      exitCode: proc.exitCode,
-      stdout: proc.stdout.toString(),
-      stderr: proc.stderr.toString(),
-    };
-  } catch (e) {
-    // `claude` binary missing (ENOENT) or spawn failed outright.
-    return { exitCode: 127, stdout: "", stderr: (e as Error).message };
-  }
-}
-
-/** `claude mcp get fapony` — read-only probe. exit 0 = an entry named fapony exists. */
-export function claudeGetArgs(): string[] {
-  return ["claude", "mcp", "get", "fapony"];
-}
-
-/** Absolute-path add command — works even before `bun link` puts `fapony` on PATH. */
-export function claudeAddArgs(): string[] {
-  return [
-    "claude",
-    "mcp",
-    "add",
-    "fapony",
-    "-s",
-    "user",
-    "--",
-    "bun",
-    join(INSTALL_ROOT, "fapony.ts"),
-    "mcp",
-  ];
+export function cmdInstallClaude(
+  dryRun: boolean,
+  deps: InstallDeps = {},
+): void {
+  const dir = claudeSkillsDir(deps.homedir ?? homedir);
+  reportSkills(linkSkills(dir, dryRun), dir, dryRun);
+  removeRetiredClaudeHooks(dryRun, deps);
+  installClaudeHooks(dryRun, deps);
 }
 
-function isClaudeMissing(res: ClaudeRunResult): boolean {
+/** Hook subcommands fapony used to register — memory hooks moved to fael,
+ *  the edit hint was cut 2026-09-26 (never moved an agent to migrate). The
+ *  commands are gone, so a leftover entry would error on every tool call. */
+const RETIRED_SUBCOMMANDS = [
+  "hook-read-hint",
+  "hook-stop",
+  "hook-session-start",
+  "hook-edit-hint",
+];
+
+function isRetired(command: unknown): boolean {
   return (
-    res.exitCode === 127 ||
-    /ENOENT|command not found|not found/i.test(res.stderr) ||
-    /ENOENT|command not found|not found/i.test(res.stdout)
+    typeof command === "string" &&
+    command.includes("fapony") &&
+    RETIRED_SUBCOMMANDS.some((sub) => command.endsWith(` ${sub}`))
   );
 }
 
-/**
- * An existing `fapony` entry counts as ours when its Command:/Args: lines
- * mention fapony (covers both `bun <abs>/fapony.ts mcp` and `fapony mcp`
- * launchers). Only those lines are inspected — the `fapony:` header matches
- * trivially and proves nothing. Anything else under our name is someone
- * else's entry — never overwrite it silently.
- */
-export function claudeGetPointsToFapony(getOutput: string): boolean {
-  const cmdLines = getOutput
-    .split("\n")
-    .map((l) => l.trim())
-    .filter((l) => l.startsWith("Command:") || l.startsWith("Args:"));
-  return cmdLines.join("\n").includes("fapony");
-}
-
-export function cmdInstallClaude(
-  dryRun: boolean,
-  deps: InstallDeps = {},
-): void {
-  const run = deps.run ?? defaultRun;
-  const exitFn = deps.exit ?? defaultExit;
-
-  const getArgs = claudeGetArgs();
-  assertSafe(getArgs);
-  const get = run(getArgs);
-  if (isClaudeMissing(get)) {
-    console.error(`claude CLI not found — install Claude Code first`);
-    exitFn(1);
+/** Drop fapony's own retired hook entries from settings.json; foreign entries
+ *  are never touched. An unreadable settings.json is left alone. */
+function removeRetiredClaudeHooks(dryRun: boolean, deps: InstallDeps): void {
+  const home = deps.homedir ? deps.homedir() : homedir();
+  const settingsPath = join(home, ".claude", "settings.json");
+  let settings: { hooks?: Record<string, unknown> };
+  try {
+    settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+  } catch {
     return;
   }
-
-  if (get.exitCode === 0) {
-    if (claudeGetPointsToFapony(`${get.stdout}\n${get.stderr}`)) {
-      console.error(`✓ mcp.fapony already configured — no change needed`);
-      console.error(`  (Claude Code user scope)`);
-      const dir = claudeSkillsDir(deps.homedir ?? homedir);
-      reportSkills(linkSkills(dir, dryRun), dir, dryRun);
-      // MCP is already wired, but a hook can be new since the last install
-      // (e.g. the Edit hint) — always ensure the hook wiring, not only on a
-      // fresh MCP add. This is the upgrade path for existing installs.
-      installClaudeHooks(dryRun, deps);
+  const hooks = settings.hooks;
+  if (!hooks || typeof hooks !== "object") return;
+  let removed = 0;
+  for (const [event, list] of Object.entries(hooks)) {
+    if (!Array.isArray(list)) continue;
+    const kept = list.flatMap((group: { hooks?: { command?: unknown }[] }) => {
+      if (!Array.isArray(group?.hooks)) return [group];
+      const inner = group.hooks.filter((h) => !isRetired(h?.command));
+      removed += group.hooks.length - inner.length;
+      return inner.length === 0 ? [] : [{ ...group, hooks: inner }];
+    });
+    if (kept.length === 0) delete hooks[event];
+    else hooks[event] = kept;
+  }
+  if (removed === 0) return;
+  if (!dryRun) {
+    try {
+      writeFileSync(
+        settingsPath,
+        `${JSON.stringify(settings, null, 2)}\n`,
+        "utf-8",
+      );
+    } catch (e) {
+      console.error(
+        `  retired hooks: failed to write — ${(e as Error).message}`,
+      );
       return;
     }
-    console.error(
-      `an MCP server named "fapony" exists but points elsewhere — not overwriting.`,
-    );
-    console.error(`  inspect with: claude mcp get fapony`);
-    console.error(`  then remove it first: claude mcp remove fapony -s user`);
-    exitFn(1);
-    return;
-  }
-
-  const addArgs = claudeAddArgs();
-  if (dryRun) {
-    console.error(`── dry-run: would run ──`);
-    console.error(`  ${addArgs.join(" ")}`);
-    // Dry-run shows the hook wiring too — the installers are dry-run-safe
-    // ("would write", no writes), so the preview stays truthful.
-    installClaudeHooks(dryRun, deps);
-    return;
-  }
-
-  assertSafe(addArgs);
-  const add = run(addArgs);
-  if (isClaudeMissing(add)) {
-    console.error(`claude CLI not found — install Claude Code first`);
-    exitFn(1);
-    return;
   }
-  if (add.exitCode !== 0) {
-    console.error(
-      `failed to add mcp.fapony to Claude Code (exit ${add.exitCode})`,
-    );
-    const detail = `${add.stdout}\n${add.stderr}`.trim();
-    if (detail) console.error(detail);
-    console.error(`verify with: claude mcp add --help`);
-    exitFn(1);
-    return;
-  }
-  console.error(`✓ mcp.fapony configured for Claude Code (user scope)`);
-  const skillsDir = claudeSkillsDir(deps.homedir ?? homedir);
-  reportSkills(linkSkills(skillsDir, dryRun), skillsDir, dryRun);
-
-  // Wire the Stop hook that refuses to end a turn with ungraded commits,
-  // and the Read/Edit hints that annotate reads of large files and edits to
-  // files with importers (both annotate-only).
-  installClaudeHooks(dryRun, deps);
+  console.error(
+    `  retired hooks: ${dryRun ? "would remove" : "removed"} ${removed} fapony entr${removed === 1 ? "y" : "ies"}`,
+  );
 }
 
 /**
- * Shared append-to-settings.json hook installer. Both fapony hooks live
- * here now (Stop since PLAN-mem-mcp, PreToolUse read hint since the
- * large-file annotate feature) — the read/write/idempotence/append shape
- * is one implementation with two callers, not a scaffold.
+ * Append-to-settings.json hook installer (caller: plan-mv guard).
  * Never touch a hook someone else registered, never fail the install over it.
  */
 function ensureClaudeHook(
@@ -222,64 +151,14 @@ function ensureClaudeHook(
   );
 }
 
-/**
- * Wire every hook fapony owns: the Stop hook that refuses to end a turn with
- * ungraded commits, and the Read/Edit PreToolUse hints (annotate-only).
- * Idempotent and dry-run-safe. Called on every install, not just a fresh MCP
- * add — an existing install must still pick up a hook added later.
- */
+/** Wire every hook fapony owns — the plan-mv guard. Idempotent and dry-run-safe. */
 function installClaudeHooks(dryRun: boolean, deps: InstallDeps): void {
-  installStopHook(dryRun, deps);
-  installReadHintHook(dryRun, deps);
-  installEditHintHook(dryRun, deps);
   installMvGuardHook(dryRun, deps);
-  installSessionStartHook(dryRun, deps);
-}
-
-function installStopHook(dryRun: boolean, deps: InstallDeps): void {
-  ensureClaudeHook(dryRun, deps, {
-    event: "Stop",
-    subcommand: "hook-stop",
-    label: "stop hook",
-  });
-}
-
-/**
- * PreToolUse hook on Read: annotates a full-file read with one factual line —
- * the size + the review-seed command when the file is large, and the re-read
- * line when the same path was already read this session and its mtime has not
- * moved (an unchanged file, so the second read buys nothing; a changed one
- * stays silent). Annotate only — no permissionDecision is ever returned, the
- * read always proceeds. The matcher "Read" keeps the spawn off every other
- * tool call.
- */
-function installReadHintHook(dryRun: boolean, deps: InstallDeps): void {
-  ensureClaudeHook(dryRun, deps, {
-    event: "PreToolUse",
-    matcher: "Read",
-    subcommand: "hook-read-hint",
-    label: "read hint",
-  });
-}
-
-/**
- * PreToolUse hook on Edit: annotates an edit with the file's importer count
- * plus the review-seed command that lists them, once per (session, file).
- * Annotate only — no permissionDecision is ever returned, the edit always
- * proceeds. The matcher "Edit" keeps the spawn off every other tool call.
- */
-function installEditHintHook(dryRun: boolean, deps: InstallDeps): void {
-  ensureClaudeHook(dryRun, deps, {
-    event: "PreToolUse",
-    matcher: "Edit",
-    subcommand: "hook-edit-hint",
-    label: "edit hint",
-  });
 }
 
 /**
  * PreToolUse hook on Bash: denies a raw `git mv` of a plan file into a done/
- * directory, pointing at `fapony mem plan-sweep --apply` instead — that
+ * directory, pointing at `fapony plan sweep --apply` instead — that
  * command does the link rewrite a plain `git mv` skips. The one fapony hook
  * that blocks besides Stop; matcher "Bash" keeps the spawn off every other
  * tool call.
@@ -292,16 +171,3 @@ function installMvGuardHook(dryRun: boolean, deps: InstallDeps): void {
     label: "plan-mv guard",
   });
 }
-
-/**
- * SessionStart hook: injects `fapony mem kickoff` as context when the repo has
- * a mem log, and stays silent when it does not. Context only — SessionStart
- * cannot block, and a repo without mem never sees a line.
- */
-function installSessionStartHook(dryRun: boolean, deps: InstallDeps): void {
-  ensureClaudeHook(dryRun, deps, {
-    event: "SessionStart",
-    subcommand: "hook-session-start",
-    label: "session start",
-  });
-}

package/src/install/codex.ts

@@ -1,192 +1,28 @@
 // src/install/codex.ts — Codex install provider
 //
-// Reads/writes ~/.codex/config.toml directly for MCP config.
-// Reads/writes ~/.codex/hooks.json for lifecycle hooks (Stop, SessionStart).
-// Symlinks skills into ~/.agents/skills/ (same dir as ZCode).
+// Symlinks skills into ~/.agents/skills/ (same dir as ZCode). Memory (MCP,
+// Stop, SessionStart) moved to fael — `fael install` wires it.
 
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { agentsSkillsDir, linkSkills, reportSkills } from "./skills.js";
-import {
-  CODEX_MCP_ENTRY,
-  defaultExit,
-  INSTALL_ROOT,
-  type InstallDeps,
-} from "./types.js";
+import { defaultExit, type InstallDeps } from "./types.js";
 
 export function findCodexConfig(getHome: () => string): string | null {
   const p = join(getHome(), ".codex", "config.toml");
   return existsSync(p) ? p : null;
 }
 
-export function findCodexHooksJson(getHome: () => string): string | null {
-  const p = join(getHome(), ".codex", "hooks.json");
-  return existsSync(p) ? p : null;
-}
-
-function isCodexConfigured(content: string): boolean {
-  // Check if [mcp_servers.fapony] section exists with our command
-  const sectionRegex = /\[mcp_servers\.fapony\]/;
-  if (!sectionRegex.test(content)) return false;
-  // Verify it points to fapony
-  return content.includes("fapony.ts") && content.includes("mcp");
-}
-
-function readJsonObject(path: string): Record<string, unknown> | null {
-  try {
-    const parsed: unknown = JSON.parse(readFileSync(path, "utf-8"));
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-      return null;
-    }
-    return parsed as Record<string, unknown>;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Append a fapony command hook to one event group in ~/.codex/hooks.json.
- * Never replaces other hook groups or foreign entries within the group.
- * A fapony-owned entry is identified by the subcommand string
- * ("hook-stop" / "hook-session-start") inside its command — per-group
- * idempotence, so an existing install with only Stop still picks up
- * SessionStart on the next run.
- */
-function installCodexHookGroup(
-  dryRun: boolean,
-  getHome: () => string,
-  opts: { event: "Stop" | "SessionStart"; subcommand: string; label: string },
-): void {
-  const hooksPath = join(getHome(), ".codex", "hooks.json");
-  let config: Record<string, unknown> = {};
-  if (existsSync(hooksPath)) {
-    const parsed = readJsonObject(hooksPath);
-    if (!parsed) {
-      console.error(
-        `  ${opts.label}: ${hooksPath} is unreadable or malformed — skipping`,
-      );
-      return;
-    }
-    config = parsed;
-  }
-
-  const hookMap = config.hooks;
-  if (
-    hookMap !== undefined &&
-    (typeof hookMap !== "object" || Array.isArray(hookMap))
-  ) {
-    console.error(
-      `  ${opts.label}: ${hooksPath} has an unexpected "hooks" shape — skipping`,
-    );
-    return;
-  }
-
-  const map = (hookMap ?? {}) as Record<string, unknown>;
-  // Codex event arrays: each element is { matcher?, hooks: [...] }
-  const group = Array.isArray(map[opts.event])
-    ? (map[opts.event] as unknown[])
-    : [];
-
-  // Check if the fapony hook is already present in this group (by subcommand)
-  const serialized = JSON.stringify(group);
-  if (serialized.includes(opts.subcommand)) {
-    console.error(
-      `  ${opts.label}: already configured in hooks.json — no change`,
-    );
-    return;
-  }
-
-  const command = `bun ${join(INSTALL_ROOT, "fapony.ts")} ${opts.subcommand}`;
-  const faponyEntry = { hooks: [{ type: "command", command }] };
-  const after = {
-    ...config,
-    hooks: { ...map, [opts.event]: [...group, faponyEntry] },
-  };
-
-  if (!dryRun) {
-    try {
-      writeFileSync(hooksPath, `${JSON.stringify(after, null, 2)}\n`, "utf-8");
-    } catch (e) {
-      console.error(
-        `  ${opts.label}: failed to write — ${(e as Error).message}`,
-      );
-      return;
-    }
-  }
-  console.error(
-    `  ${opts.label}: ${dryRun ? "would write" : "wrote"} hooks.${opts.event} → ${hooksPath}`,
-  );
-  console.error(
-    `    review and trust via Codex /hooks before the hook will run`,
-  );
-}
-
-function installStopHook(dryRun: boolean, getHome: () => string): void {
-  installCodexHookGroup(dryRun, getHome, {
-    event: "Stop",
-    subcommand: "hook-stop",
-    label: "stop hook",
-  });
-}
-
-/**
- * SessionStart hook: injects `fapony mem kickoff` as context when the repo
- * has a mem log, silent when it does not (cmdHookSessionStart exits quiet).
- * Same `hookSpecificOutput.additionalContext` contract Claude uses — Codex
- * SessionStart reads that channel too. No matcher: match-all fires on every
- * source including `clear` and on versions that send no source at all, where
- * a `startup|resume` matcher would silently never fire; kickoff is capped at
- * 4k and costs one cheap spawn, so the /clear path stays fast.
- */
-function installSessionStartHook(dryRun: boolean, getHome: () => string): void {
-  installCodexHookGroup(dryRun, getHome, {
-    event: "SessionStart",
-    subcommand: "hook-session-start",
-    label: "session start",
-  });
-}
-
 export function cmdInstallCodex(dryRun: boolean, deps: InstallDeps = {}): void {
-  const exitFn = deps.exit ?? defaultExit;
   const getHome = deps.homedir ?? homedir;
-  const configPath = findCodexConfig(getHome);
-
-  if (!configPath) {
+  if (!findCodexConfig(getHome)) {
     console.error(
       `Codex config not found — open Codex at least once to create ~/.codex/config.toml`,
     );
-    exitFn(1);
-    return;
-  }
-
-  let content: string;
-  try {
-    content = readFileSync(configPath, "utf-8");
-  } catch (e) {
-    console.error(`failed to read ${configPath}: ${(e as Error).message}`);
-    exitFn(1);
+    (deps.exit ?? defaultExit)(1);
     return;
   }
-
-  if (isCodexConfigured(content)) {
-    console.error(`✓ mcp_servers.fapony already configured — no change needed`);
-    console.error(`  (${configPath})`);
-  } else if (dryRun) {
-    console.error(`── dry-run: would append to ${configPath} ──`);
-    console.log(CODEX_MCP_ENTRY);
-  } else {
-    const newContent = `${content.trimEnd()}\n\n${CODEX_MCP_ENTRY}`;
-    writeFileSync(configPath, newContent);
-    console.error(`✓ added mcp_servers.fapony to ${configPath}`);
-    console.error(`  restart Codex to load the MCP server`);
-  }
-
-  // --- Stop + SessionStart hooks (~/.codex/hooks.json) ---
-  installStopHook(dryRun, getHome);
-  installSessionStartHook(dryRun, getHome);
-
-  // --- Skills (~/.agents/skills/) ---
   const skillsDir = agentsSkillsDir(getHome);
   reportSkills(linkSkills(skillsDir, dryRun), skillsDir, dryRun);
 }

package/src/install/detect.ts

@@ -1,9 +1,8 @@
-// src/install/detect.ts — detect which MCP clients are installed on this machine.
+// src/install/detect.ts — detect which agent clients are installed on this machine.
 //
 // Signal per client:
 //   antigravity = ~/.gemini exists (the app creates it on first run) OR `agy` on PATH
 //   claude      = `command -v claude` (CLI on PATH)
-//   cursor      = ~/.cursor exists (the app creates it on first run)
 //   opencode    = ~/.config/opencode/{opencode.json,opencode.jsonc} exists
 //   zcode       = ~/.zcode/cli/config.json or ~/.agents/mcp.json exists
 //   codex       = ~/.codex/config.toml exists
@@ -12,7 +11,6 @@ import { homedir } from "node:os";
 import { defaultCheckCmd } from "../setup.js";
 import { findGeminiDir } from "./antigravity.js";
 import { findCodexConfig } from "./codex.js";
-import { findCursorDir } from "./cursor.js";
 import { findOpencodeConfig } from "./opencode.js";
 import type { InstallDeps } from "./types.js";
 import { findZcodeConfig } from "./zcode.js";
@@ -24,11 +22,11 @@ export interface DetectedClient {
 }
 
 /**
- * Detect which MCP clients are available on this machine.
- * Returns one entry per platform, ordered: antigravity, claude, cursor, opencode, zcode, codex.
+ * Detect which agent clients are available on this machine.
+ * Returns one entry per platform, ordered: antigravity, claude, opencode, zcode, codex.
  *
  * Uses resolvers from each provider (file/dir-exists check) for
- * antigravity/cursor/opencode/zcode/codex, and `command -v claude`/`command -v agy`
+ * antigravity/opencode/zcode/codex, and `command -v claude`/`command -v agy`
  * for claude/antigravity — all through injected deps for testability.
  */
 export function detectClients(deps: InstallDeps = {}): DetectedClient[] {
@@ -39,7 +37,6 @@ export function detectClients(deps: InstallDeps = {}): DetectedClient[] {
   const agy = checkCmd("agy");
 
   const geminiDir = findGeminiDir(getHome);
-  const cursorDir = findCursorDir(getHome);
   const opencodePath = findOpencodeConfig(getHome);
   const zcodeResult = findZcodeConfig(getHome);
   const codexPath = findCodexConfig(getHome);
@@ -59,13 +56,6 @@ export function detectClients(deps: InstallDeps = {}): DetectedClient[] {
       installed: claude,
       why: claude ? "claude CLI on PATH" : "claude CLI not found on PATH",
     },
-    {
-      platform: "cursor",
-      installed: cursorDir !== null,
-      why: cursorDir
-        ? `dir at ${cursorDir}`
-        : "no ~/.cursor directory (open Cursor once)",
-    },
     {
       platform: "opencode",
       installed: opencodePath !== null,