fapony 0.3.3 → 0.3.4

package/src/init-mem.ts

@@ -6,7 +6,7 @@
 
 import { existsSync, readdirSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
-import { DEFAULT_MEM_DIR, FAPONY_DIR, loadConfig } from "./db/index.js";
+import { DEFAULT_MEM_DIR, FAPONY_DIR, loadConfig } from "./core/config.js";
 import { walkDir } from "./util.js";
 
 export function cmdInitMem(args: string[]): void {

package/src/init.ts

@@ -21,7 +21,7 @@ import {
   memoryDir,
   planDir,
   specDir,
-} from "./db/index.js";
+} from "./core/config.js";
 import { isAffirmative } from "./util.js";
 
 const FAPONY_README = `# .fapony/ — fapony project dir (plans, specs, memory)

package/src/install/claude.ts

@@ -232,6 +232,7 @@ function installClaudeHooks(dryRun: boolean, deps: InstallDeps): void {
   installStopHook(dryRun, deps);
   installReadHintHook(dryRun, deps);
   installEditHintHook(dryRun, deps);
+  installMvGuardHook(dryRun, deps);
   installSessionStartHook(dryRun, deps);
 }
 
@@ -276,6 +277,22 @@ function installEditHintHook(dryRun: boolean, deps: InstallDeps): void {
   });
 }
 
+/**
+ * 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
+ * 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.
+ */
+function installMvGuardHook(dryRun: boolean, deps: InstallDeps): void {
+  ensureClaudeHook(dryRun, deps, {
+    event: "PreToolUse",
+    matcher: "Bash",
+    subcommand: "hook-mv-guard",
+    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

package/src/install/opencode.ts

@@ -81,9 +81,15 @@ function isConfigured(mcp: Record<string, unknown> | undefined): boolean {
   );
 }
 
+export interface OpencodeInstallOpts {
+  /** Opt-in only: write the git-autonomy rewrite plugin. Never default. */
+  gitAutonomy?: boolean;
+}
+
 export function cmdInstallOpencode(
   dryRun: boolean,
   deps: InstallDeps = {},
+  opts: OpencodeInstallOpts = {},
 ): void {
   const exitFn = deps.exit ?? defaultExit;
   const getHome = deps.homedir ?? homedir;
@@ -115,6 +121,7 @@ export function cmdInstallOpencode(
     installCommitHintPlugin(dryRun, getHome);
     installEditHintPlugin(dryRun, getHome);
     installSessionStartPlugin(dryRun, getHome);
+    if (opts.gitAutonomy) installGitAutonomyPlugin(dryRun, getHome);
     return;
   }
 
@@ -140,6 +147,7 @@ export function cmdInstallOpencode(
     installCommitHintPlugin(dryRun, getHome);
     installEditHintPlugin(dryRun, getHome);
     installSessionStartPlugin(dryRun, getHome);
+    if (opts.gitAutonomy) installGitAutonomyPlugin(dryRun, getHome);
     return;
   }
 
@@ -163,6 +171,7 @@ export function cmdInstallOpencode(
   installCommitHintPlugin(dryRun, getHome);
   installEditHintPlugin(dryRun, getHome);
   installSessionStartPlugin(dryRun, getHome);
+  if (opts.gitAutonomy) installGitAutonomyPlugin(dryRun, getHome);
 }
 
 /**
@@ -608,3 +617,108 @@ function installSessionStartPlugin(
     `  session start: ${dryRun ? "would write" : "wrote"} ${pluginPath}`,
   );
 }
+
+/**
+ * OpenCode plugin — git-autonomy rewrites, the parity of the personal
+ * `git-autonomy.ts` plugin. Two hooks because the policy lives on two
+ * surfaces the other never sees:
+ * `experimental.chat.system.transform` (system prompt) + `tool.definition`
+ * (bash tool description).
+ *
+ * OPT-IN ONLY — written only when `fapony install` gets `--git-autonomy`.
+ * Never on the default path, never via `--all` unless the flag rides along.
+ * The policy is an opinion (commit-as-you-go), not a utility, and the file
+ * name is `fapony-git-autonomy.ts`: the user's own `git-autonomy.ts` is a
+ * different file and is never touched — delete it by hand after verifying.
+ *
+ * Logic lives in src/adapters/hooks/git-autonomy.ts
+ * (rewriteGitAutonomySystem / rewriteGitAutonomyTool) — the plugin imports
+ * it from the install root, so `git pull` updates every client. No baked
+ * regex in the generated body: a baked copy would rot silently when upstream
+ * rewords the policy, the same failure this module's gitAutonomyStatus
+ * exists to name. Never throws: a rewrite must not break a session start
+ * or hide a tool.
+ */
+export function gitAutonomyPluginSource(root: string): string {
+  const hookModule = JSON.stringify(join(root, "src", "hook.ts"));
+  return `// fapony git-autonomy — rewrites opencode's ask-first git policy to
+// commit-as-you-go on both surfaces that carry it (system prompt +
+// bash tool description), and cuts the tone few-shot examples.
+// OPT-IN: written only by \`fapony install --platform opencode --git-autonomy\`.
+// Generated by \`fapony install\` — logic lives in src/adapters/hooks/git-autonomy.ts.
+import { rewriteGitAutonomySystem, rewriteGitAutonomyTool } from ${hookModule};
+
+export const FaponyGitAutonomy = async () => ({
+  "experimental.chat.system.transform": async (
+    _input: unknown,
+    output: { system: string[] },
+  ) => {
+    try {
+      for (let i = 0; i < output.system.length; i++) {
+        output.system[i] = rewriteGitAutonomySystem(output.system[i]).text;
+      }
+    } catch {
+      // a rewrite must never break a session start
+    }
+  },
+  "tool.definition": async (
+    input: { toolID: string },
+    output: { description: string; parameters: unknown },
+  ) => {
+    try {
+      const r = rewriteGitAutonomyTool(input.toolID, output.description);
+      output.description = r.description;
+    } catch {
+      // a rewrite must never hide a tool
+    }
+  },
+});
+`;
+}
+
+function installGitAutonomyPlugin(
+  dryRun: boolean,
+  getHome: () => string,
+): void {
+  const pluginsDir = join(getHome(), ".config", "opencode", "plugins");
+  const pluginPath = join(pluginsDir, "fapony-git-autonomy.ts");
+  if (existsSync(pluginPath)) {
+    let current = "";
+    try {
+      current = readFileSync(pluginPath, "utf-8");
+    } catch {
+      current = "";
+    }
+    if (current.includes("FaponyGitAutonomy")) {
+      // Ours — and generated, so never overwritten. Same stale-check shape
+      // as the session-start plugin: an older generation must say so instead
+      // of "no change", or a fixed rewrite never reaches the client.
+      if (current !== gitAutonomyPluginSource(INSTALL_ROOT)) {
+        console.error(
+          `  git-autonomy: stale fapony plugin — delete ${pluginPath} and re-run install --git-autonomy`,
+        );
+        return;
+      }
+      console.error(`  git-autonomy: already installed — no change`);
+      return;
+    }
+    console.error(
+      `  git-autonomy: ${pluginPath} exists but isn't fapony's — not overwriting.`,
+    );
+    return;
+  }
+  if (!dryRun) {
+    try {
+      mkdirSync(pluginsDir, { recursive: true });
+      writeFileSync(pluginPath, gitAutonomyPluginSource(INSTALL_ROOT), "utf-8");
+    } catch (e) {
+      console.error(
+        `  git-autonomy: failed to write — ${(e as Error).message}`,
+      );
+      return;
+    }
+  }
+  console.error(
+    `  git-autonomy: ${dryRun ? "would write" : "wrote"} ${pluginPath}`,
+  );
+}

package/src/install.ts

@@ -37,6 +37,8 @@ export {
   cmdInstallOpencode,
   commitHintPluginSource,
   editHintPluginSource,
+  gitAutonomyPluginSource,
+  type OpencodeInstallOpts,
   readHintPluginSource,
 } from "./install/opencode.js";
 export {
@@ -58,6 +60,10 @@ export async function cmdInstall(
   const platform = args.find((a) => !a.startsWith("--"));
   const dryRun = args.includes("--dry-run");
   const installAll = args.includes("--all");
+  // Opt-in only: the git-autonomy rewrite is an opinion (commit-as-you-go),
+  // not a utility — never installed unless this flag rides along, including
+  // via --all. Opencode-only; other platforms ignore it.
+  const gitAutonomy = args.includes("--git-autonomy");
 
   // --- explicit platform: original behavior, unchanged ---
   if (platform === "antigravity") {
@@ -81,12 +87,12 @@ export async function cmdInstall(
     return;
   }
   if (platform === "opencode") {
-    cmdInstallOpencode(dryRun, deps);
+    cmdInstallOpencode(dryRun, deps, { gitAutonomy });
     return;
   }
   if (platform !== undefined) {
     console.error(
-      `usage: fapony install --platform antigravity|opencode|claude|cursor|zcode|codex [--dry-run]`,
+      `usage: fapony install --platform antigravity|opencode|claude|cursor|zcode|codex [--dry-run] [--git-autonomy]`,
     );
     console.error(
       `  supported platforms: antigravity, opencode, claude, cursor, zcode, codex`,
@@ -125,7 +131,7 @@ export async function cmdInstall(
   if (installAll) {
     console.error();
     for (const client of found) {
-      installPlatform(client.platform, dryRun, deps);
+      installPlatform(client.platform, dryRun, deps, { gitAutonomy });
     }
     return;
   }
@@ -154,7 +160,7 @@ export async function cmdInstall(
     for (const client of found) {
       const answer = await askFn(`install into ${client.platform}?`, "Y");
       if (isAffirmative(answer)) {
-        installPlatform(client.platform, dryRun, deps);
+        installPlatform(client.platform, dryRun, deps, { gitAutonomy });
       }
     }
   } finally {
@@ -166,6 +172,7 @@ function installPlatform(
   platform: string,
   dryRun: boolean,
   deps: InstallDeps,
+  opts: { gitAutonomy?: boolean } = {},
 ): void {
   switch (platform) {
     case "antigravity":
@@ -178,7 +185,7 @@ function installPlatform(
       cmdInstallCursor(dryRun, deps);
       break;
     case "opencode":
-      cmdInstallOpencode(dryRun, deps);
+      cmdInstallOpencode(dryRun, deps, opts);
       break;
     case "zcode":
       cmdInstallZcode(dryRun, deps);

package/src/lint-baseline.ts

@@ -14,8 +14,7 @@
 import { execSync } from "node:child_process";
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join, relative } from "node:path";
-import { DEFAULT_EVIDENCE_FILE } from "./db/index.js";
-import { faponyDir } from "./db/load.js";
+import { DEFAULT_EVIDENCE_FILE, faponyDir } from "./core/config.js";
 import { assertSafe } from "./safety.js";
 
 const USAGE =

package/src/map.ts

@@ -41,19 +41,36 @@ export interface ExportScan {
   error: string | null;
 }
 
-// --- Parse gate ---
+// --- Parse gate (injectable: default is Bun.Transpiler, no Node fallback —
+// Bun-only is a repo constraint. Pass a custom scanner to extractExports()
+// to reuse this module outside Bun or in tests.) ---
 
-let transpiler: Bun.Transpiler | null = null;
+export interface ExportScanner {
+  scan(source: string): { exports: string[] };
+}
+
+function createBunScanner(): ExportScanner {
+  const transpiler = new Bun.Transpiler({ loader: "tsx" });
+  return {
+    scan: (source) => transpiler.scan(source) as { exports: string[] },
+  };
+}
+
+let defaultScanner: ExportScanner | null = null;
+
+function getDefaultScanner(): ExportScanner {
+  if (!defaultScanner) defaultScanner = createBunScanner();
+  return defaultScanner;
+}
 
 interface ScanResult {
   error: string | null;
   exports: string[];
 }
 
-function scanSource(source: string): ScanResult {
+function scanSource(source: string, scanner: ExportScanner): ScanResult {
   try {
-    if (!transpiler) transpiler = new Bun.Transpiler({ loader: "tsx" });
-    const scanned = transpiler.scan(source) as { exports: string[] };
+    const scanned = scanner.scan(source);
     return { error: null, exports: scanned.exports };
   } catch (e) {
     return {
@@ -150,8 +167,12 @@ function braceNames(
 
 const VAR_DECL_RE = /^export\s+(?:const|let|var)\b/;
 
-export function extractExports(source: string): ExportScan {
-  const scanned = scanSource(source);
+export function extractExports(
+  source: string,
+  scanner?: ExportScanner,
+): ExportScan {
+  const s = scanner ?? getDefaultScanner();
+  const scanned = scanSource(source, s);
   if (scanned.error) return { symbols: [], error: scanned.error };
 
   // Ambient declarations (`export declare ...`) are invisible to scan(), so
@@ -161,7 +182,7 @@ export function extractExports(source: string): ExportScan {
     /^([ \t]*)export\s+declare\s+/gm,
     "$1export ",
   );
-  const strippedScan = scanSource(stripped);
+  const strippedScan = scanSource(stripped, s);
   const valid = new Set([
     ...scanned.exports,
     ...(strippedScan.error ? [] : strippedScan.exports),

package/src/mem/commands/plan.ts

@@ -2,8 +2,9 @@
 // rationale: moving by hand = chasing relative links yourself (in the file + files that link to it) → the step gets skipped often
 // no arg = report only (safe, shows every kickoff/stale run)
 // <file.md> = check a single file, is it ready to move
-// <file.md> --apply = git mv + fix markdown links inside the file + fix inbound links from other files in plan/
-//                      + warn about plain-text mentions (detect-only, no auto-fix)
+// <file.md> --apply = git mv + fix markdown links inside the file + fix inbound links from every .md under .fapony/
+//                      (plan/ + done/ + spec/) + warn about plain-text mentions (detect-only, no auto-fix)
+//                      + warn about tracked files outside .fapony/ that mention the filename (detect-only)
 
 import {
   existsSync,
@@ -12,10 +13,20 @@ import {
   readFileSync,
   writeFileSync,
 } from "node:fs";
-import { dirname, join, relative, resolve } from "node:path";
+import { basename, dirname, join, relative, resolve } from "node:path";
 
 import { openRows } from "../selectors.js";
-import { doneDir, memCmd, nextId, planDir, put, rel, rows } from "../store.js";
+import {
+  doneDir,
+  memCmd,
+  nextId,
+  planBase,
+  planDir,
+  put,
+  rel,
+  root,
+  rows,
+} from "../store.js";
 
 const SHIPPED = /^>\s*✅/m;
 const FRONT = /^---\r?\n([\s\S]*?)\r?\n---/;
@@ -52,6 +63,11 @@ const escapeRe = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 // the file moved dir (same content) — an old markdown link meant the old path relative to oldDir, must re-relativize via newDir
 // resolve from newDir (where the file is now) — if the target also moved to the same dir → plain filename,
 // if the target stayed in oldDir → ../target (both correct)
+//
+// Runs on EVERY move, including the standard sibling layout (plan/ → done/ beside
+// it): same depth is not the same directory, so a sibling link like
+// [other](PLAN-other.md) breaks unless rewritten to ../plan/PLAN-other.md.
+// Skipping this pass left exactly that dangling (mtjn3ldk).
 // pass 1 only — fix only [text](target) markdown links, do not touch plain text
 export const rewriteMovedFileLinks = (
   file: string,
@@ -65,11 +81,17 @@ export const rewriteMovedFileLinks = (
     const [target, anchor] = t.split("#");
     if (!target || /^(https?:|mailto:|\/)/.test(target)) return m;
     // resolve from where the file IS now (newDir); if target doesn't exist
-    // there, fall back to oldDir (target stayed in original location)
+    // there, fall back to oldDir (target stayed in original location).
+    // If it exists in neither, the link is already broken — leave it for
+    // plan-check instead of fabricating a new broken path.
     const inNew = resolve(newDir, target);
-    const abs = existsSync(inNew) ? inNew : resolve(oldDir, target);
+    const inOld = resolve(oldDir, target);
+    const abs = existsSync(inNew) ? inNew : existsSync(inOld) ? inOld : null;
+    if (!abs) return m;
+    const next = `](${relative(newDir, abs) || "."}${anchor ? `#${anchor}` : ""})`;
+    if (next === m) return m;
     n++;
-    return `](${relative(newDir, abs) || "."}${anchor ? `#${anchor}` : ""})`;
+    return next;
   });
 
   if (n) writeFileSync(file, out);
@@ -172,11 +194,20 @@ export const cmdPlanSweep = (a: string[]) => {
     return;
   }
 
-  const src = join(dir, target);
-  if (!existsSync(src)) {
-    console.error(`${rel(src)} not found`);
+  // target arrives as a bare name (PLAN-x.md, the SKILL form) or a repo-relative
+  // path (.fapony/plan/PLAN-x.md, the example form) — both must resolve, so try
+  // planDir first, then the repo root, then the bare basename as a last resort.
+  const src = [
+    join(dir, target),
+    join(root, target),
+    join(dir, basename(target)),
+  ].find((p) => existsSync(p));
+  if (!src) {
+    console.error(`${target} not found (looked in ${rel(dir)}/ and repo root)`);
     process.exit(1);
   }
+  const name = basename(src);
+  const srcDir = dirname(src);
   const shipped = hasShippedHeader(src);
   if (!apply) {
     console.log(
@@ -191,21 +222,21 @@ export const cmdPlanSweep = (a: string[]) => {
   // but then run --apply directly and skip everything → risky when an agent ships automatically with no human check, so hard block
   if (!shipped && !process.env.MEM_FORCE) {
     console.error(
-      `${target}: no ✅ shipped header at the top — refusing to move (MEM_FORCE=1 to override)`,
+      `${name}: no ✅ shipped header at the top — refusing to move (MEM_FORCE=1 to override)`,
     );
     process.exit(1);
   }
-  const openSpec = `${rel(dir)}/${target}`;
+  const openSpec = rel(src);
   const openN = openRows(rows()).filter((r) => r.spec === openSpec);
   if (openN.length && !process.env.MEM_FORCE) {
     console.error(
-      `${target}: still has ${openN.length} open row(s) (next/bug/hold/decision/note) — close them or move the spec first (MEM_FORCE=1 to override):\n` +
+      `${name}: still has ${openN.length} open row(s) (next/bug/hold/decision/note) — close them or move the spec first (MEM_FORCE=1 to override):\n` +
         openN.map((r) => `  [${r.id}] ${r.kind} ${r.text}`).join("\n"),
     );
     process.exit(1);
   }
 
-  const dst = join(doneDir, target);
+  const dst = join(doneDir, name);
   if (existsSync(dst)) {
     console.error(`${rel(dst)} already exists`);
     process.exit(1);
@@ -221,14 +252,17 @@ export const cmdPlanSweep = (a: string[]) => {
     process.exit(1);
   }
 
-  // done/ is a sibling of plan/ = same depth, links in the file still resolve, no need to touch
-  // the old layout (plan/done/) is one level deeper, so it does need re-relativizing
-  const nested = dirname(doneDir) !== dirname(dir);
-  const ownLinks = nested ? rewriteMovedFileLinks(dst, dir, doneDir) : 0;
+  // own links always need re-relativizing — the file changed directory even in
+  // the sibling layout (plan/ → done/ beside it), so sibling links dangle
+  // unless rewritten (see rewriteMovedFileLinks).
+  const ownLinks = rewriteMovedFileLinks(dst, srcDir, doneDir);
 
+  // inbound: every .md under .fapony/ can link here — other active plans,
+  // shipped plans in done/ (they reference each other), and specs. Scanning
+  // plan/ only left done/+spec/ links dangling (mtl15q4y).
   let inbound = 0;
   let inboundFiles = 0;
-  for (const f of mdFiles(dir)) {
+  for (const f of mdFiles(planBase)) {
     if (f === dst) continue;
     const n = rewriteMarkdownLinks(f, src, dst);
     if (n) {
@@ -238,13 +272,9 @@ export const cmdPlanSweep = (a: string[]) => {
   }
 
   console.log(`moved ${rel(src)} → ${rel(dst)}`);
+  console.log(`links rewritten inside the file: ${ownLinks}`);
   console.log(
-    nested
-      ? `links rewritten inside the file: ${ownLinks}`
-      : `links rewritten inside the file: 0 (same depth, existing links still resolve)`,
-  );
-  console.log(
-    `inbound links rewritten: ${inbound} in ${inboundFiles} file(s) (scanned ${rel(dir)}/** only)`,
+    `inbound links rewritten: ${inbound} in ${inboundFiles} file(s) (scanned ${rel(planBase)}/**)`,
   );
 
   // log decision — record ship event (reuse existing kind, no new schema)
@@ -252,7 +282,7 @@ export const cmdPlanSweep = (a: string[]) => {
   put({
     id: nextId(rows()),
     kind: "decision",
-    text: `${target} shipped → ${rel(dst)}`,
+    text: `${name} shipped → ${rel(dst)}`,
     spec: doneSpec,
   });
   // ponytail: this decision *is* the move itself, nothing to write back into the spec — do not mark synced
@@ -262,35 +292,33 @@ export const cmdPlanSweep = (a: string[]) => {
   // plain-text mention detection (detect-only, no auto-fix)
   let plainTextTotal = 0;
   const plainTextFiles: string[] = [];
-  for (const f of mdFiles(dir)) {
-    const n = countPlainTextMentions(f, target);
+  for (const f of mdFiles(planBase)) {
+    if (f === dst) continue;
+    const n = countPlainTextMentions(f, name);
     if (n) {
       plainTextTotal += n;
-      plainTextFiles.push(f.replace(`${dir}/`, ""));
+      plainTextFiles.push(f.replace(`${planBase}/`, ""));
     }
   }
   if (plainTextTotal > 0) {
     console.log(
-      `⚠ ${plainTextTotal} plain-text mention(s) in ${plainTextFiles.length} file(s) under ${rel(dir)}/ — grep and update the paths yourself:\n${plainTextFiles.join("\n")}`,
+      `⚠ ${plainTextTotal} plain-text mention(s) in ${plainTextFiles.length} file(s) under ${rel(planBase)}/ — grep and update the paths yourself:\n${plainTextFiles.join("\n")}`,
     );
   }
 
-  // files outside plan/ that mention the target — detect-only
-  const grep = Bun.spawnSync([
-    "git",
-    "grep",
-    "-l",
-    target,
-    "--",
-    // the "files outside plan/" scope = the folder plan/ lives under (apps/vela, .fapony, …)
-    rel(dirname(planDir)),
-    `:!${rel(dir)}`,
-  ])
+  // files outside .fapony/ that mention the filename — detect-only.
+  // Everything under planBase/ was auto-fixed above, so what remains is repo
+  // docs and prose (README, docs/, CLAUDE.md) with hand-written paths.
+  // cwd: root — the pathspecs are root-relative no matter where fapony runs from.
+  const grep = Bun.spawnSync(
+    ["git", "grep", "-l", name, "--", ".", `:!${rel(planBase)}`],
+    { cwd: root },
+  )
     .stdout.toString()
     .trim();
   if (grep)
     console.log(
-      `⚠ files outside ${rel(dir)}/ still mention "${target}" — check them yourself (not auto-fixed):\n${grep}`,
+      `⚠ files outside ${rel(planBase)}/ still mention "${name}" — check them yourself (not auto-fixed):\n${grep}`,
     );
 };
 

package/src/mem/store.ts

@@ -15,7 +15,11 @@ import {
 } from "node:fs";
 import { hostname, networkInterfaces } from "node:os";
 import { basename, dirname, join, relative } from "node:path";
-import { CONFIG_FILENAME, DEFAULT_MEM_DIR, FAPONY_DIR } from "../db/index.js";
+import {
+  CONFIG_FILENAME,
+  DEFAULT_MEM_DIR,
+  FAPONY_DIR,
+} from "../core/config.js";
 import { whereMemDir } from "../memory.js";
 
 // --- types ---