fapony 0.1.3 → 0.2.1

package/src/install/opencode.ts

@@ -113,6 +113,7 @@ export function cmdInstallOpencode(
     reportSkills(linkSkills(skillsDir, dryRun), skillsDir, dryRun);
     installReadHintPlugin(dryRun, getHome);
     installCommitHintPlugin(dryRun, getHome);
+    installEditHintPlugin(dryRun, getHome);
     return;
   }
 
@@ -136,6 +137,7 @@ export function cmdInstallOpencode(
     console.log(computeDiff(before, after));
     installReadHintPlugin(dryRun, getHome);
     installCommitHintPlugin(dryRun, getHome);
+    installEditHintPlugin(dryRun, getHome);
     return;
   }
 
@@ -157,6 +159,7 @@ export function cmdInstallOpencode(
   reportSkills(linkSkills(skillsDir, dryRun), skillsDir, dryRun);
   installReadHintPlugin(dryRun, getHome);
   installCommitHintPlugin(dryRun, getHome);
+  installEditHintPlugin(dryRun, getHome);
 }
 
 /**
@@ -185,27 +188,64 @@ export function readHintPluginSource(root: string): string {
 // factual review-seed pointer, plus any convention debt or mem-log row about
 // the file. Annotate only: never blocks, never dedupes.
 // Generated by \`fapony install\` — edit src/hook.ts in the fapony checkout.
-import { readHintFor, readContextLines } from ${hookModule};
+import { readHintFor, rereadHintFor, readContextData, recordHintFire } from ${hookModule};
 
 export const FaponyReadHint = async ({ directory }) => {
   return {
     "tool.execute.after": async (input, output) => {
       try {
         if (input.tool !== "read") return;
+        const filePath = input.args?.filePath;
         const parts = [];
         const hint = readHintFor({
-          filePath: input.args?.filePath,
+          filePath,
           offset: input.args?.offset,
           limit: input.args?.limit,
           cwd: directory,
         });
         if (hint) parts.push(hint);
-        for (const line of readContextLines(input.args?.filePath, directory)) {
-          parts.push(line);
+        const reread = rereadHintFor({
+          filePath,
+          offset: input.args?.offset,
+          limit: input.args?.limit,
+          cwd: directory,
+          session: input.sessionID,
+        });
+        if (reread) parts.push(reread);
+        const ctx = readContextData(filePath, directory);
+        if (ctx) {
+          for (const line of [...ctx.debtLines, ...ctx.memLines]) {
+            parts.push(line);
+          }
         }
         if (parts.length > 0 && typeof output.output === "string") {
           output.output = output.output + "\\n" + parts.join("\\n");
         }
+
+        // --- hint-fire log (PLAN-feedback-surface chunk 1) ---
+        // After output — best-effort, never block the hint.
+        if (ctx?.worktree) {
+          const rel = typeof filePath === "string" ? (() => {
+            try {
+              const { realpathSync } = require("node:fs");
+              const { relative } = require("node:path");
+              const { join: pjoin } = require("node:path");
+              const wt = ctx.worktree;
+              const abs = realpathSync(filePath.startsWith("/") ? filePath : pjoin(directory, filePath));
+              const r = relative(wt, abs).split("\\\\").join("/");
+              return r.startsWith("..") ? null : r;
+            } catch { return null; }
+          })() : null;
+          if (hint) {
+            recordHintFire({ ts: new Date().toISOString(), worktree: ctx.worktree, surface: "read", file: rel, count: 1 });
+          }
+          if (ctx.debtIds.length > 0) {
+            recordHintFire({ ts: new Date().toISOString(), worktree: ctx.worktree, surface: "debt", file: rel, count: ctx.debtIds.length, ids: ctx.debtIds });
+          }
+          if (ctx.memLines.length > 0) {
+            recordHintFire({ ts: new Date().toISOString(), worktree: ctx.worktree, surface: "mem", file: rel, count: ctx.memLines.length });
+          }
+        }
       } catch {
         // a hint must never break a read
       }
@@ -230,7 +270,7 @@ export function commitHintPluginSource(root: string): string {
 // verdict reminder when commits have no verdict filed yet.
 // Annotate only: never blocks, never dedupes.
 // Generated by \`fapony install\` — edit src/hook.ts in the fapony checkout.
-import { commitHintFor } from ${hookModule};
+import { commitHintFor, recordHintFire } from ${hookModule};
 
 export const FaponyCommitHint = async ({ directory }) => {
   return {
@@ -245,6 +285,23 @@ export const FaponyCommitHint = async ({ directory }) => {
         if (hint && typeof output.output === "string") {
           output.output = output.output + "\\n" + hint;
         }
+
+        // --- hint-fire log (PLAN-feedback-surface chunk 1) ---
+        // After output — best-effort, never block the hint.
+        if (hint) {
+          try {
+            const { spawnSync } = require("node:child_process");
+            const git = spawnSync("git", ["rev-parse", "--show-toplevel"], { cwd: directory, encoding: "utf-8" });
+            if (git.status === 0) {
+              const worktree = require("node:fs").realpathSync(git.stdout.trim());
+              // Count commits from the hint message (lines starting with "fapony:   ").
+              const commitLines = hint.split("\\n").filter(l => /^fapony:\\s+\\w{7,}/.test(l));
+              recordHintFire({ ts: new Date().toISOString(), worktree, surface: "commit", file: null, count: commitLines.length || 1 });
+            }
+          } catch {
+            // best-effort
+          }
+        }
       } catch {
         // a hint must never break a bash command
       }
@@ -254,6 +311,80 @@ export const FaponyCommitHint = async ({ directory }) => {
 `;
 }
 
+/**
+ * OpenCode plugin — the edit hint's in-process shape. `tool.execute.after`
+ * on the edit and write tools: when the touched file has importers, appends
+ * the importer count plus the review-seed command that lists them. Annotate
+ * only (no block, no dedupe beyond what editHintFor does itself).
+ *
+ * This is the OpenCode parity of Claude's Edit PreToolUse hook
+ * (PLAN-edit-importer-hint): same shared logic (editHintFor in src/hook.ts),
+ * same once-per-(session, file) dedupe, same `"edit"` fire surface. One
+ * known difference: OpenCode's only annotate channel is `after`, so the hint
+ * lands one step after the edit instead of before it — the `before` hook can
+ * only mutate args or throw, and a hint must never block a tool call.
+ *
+ * `write` is guarded alongside `edit` for free: a write to a new file
+ * resolves to null inside editHintFor (nothing imports it yet), so only a
+ * write that overwrites an imported file fires. `apply_patch` is out of
+ * scope — its paths live inside patchText, not filePath (separate plan).
+ */
+export function editHintPluginSource(root: string): string {
+  const hookModule = JSON.stringify(join(root, "src", "hook.ts"));
+  return `// fapony edit hint — annotates edits to source files that have importers
+// with the importer count plus the review-seed command that lists them.
+// Annotate only: never blocks, dedupe per (session, file) inside editHintFor.
+// Generated by \`fapony install\` — edit src/hook.ts in the fapony checkout.
+import { editHintFor, recordHintFire } from ${hookModule};
+
+export const FaponyEditHint = async ({ directory }) => {
+  return {
+    "tool.execute.after": async (input, output) => {
+      try {
+        if (input.tool !== "edit" && input.tool !== "write") return;
+        // The only channel that reaches the agent is output.output; if it is
+        // not a string the hint cannot surface, so bail before editHintFor
+        // spends the per-session dedupe row or logs a fire that never showed.
+        if (typeof output.output !== "string") return;
+        const filePath = input.args?.filePath;
+        const hint = editHintFor({
+          filePath,
+          cwd: directory,
+          session: input.sessionID,
+        });
+
+        // --- hint-fire log (PLAN-edit-importer-hint, opencode parity) ---
+        // After output — best-effort, never block the hint.
+        if (hint) {
+          output.output = output.output + "\\n" + hint;
+          try {
+            const { spawnSync } = require("node:child_process");
+            const git = spawnSync("git", ["rev-parse", "--show-toplevel"], { cwd: directory, encoding: "utf-8" });
+            if (git.status === 0) {
+              const worktree = require("node:fs").realpathSync(git.stdout.trim());
+              const rel = typeof filePath === "string" ? (() => {
+                try {
+                  const { relative, join: pjoin } = require("node:path");
+                  const abs = require("node:fs").realpathSync(filePath.startsWith("/") ? filePath : pjoin(directory, filePath));
+                  const r = relative(worktree, abs).split("\\\\").join("/");
+                  return r.startsWith("..") ? null : r;
+                } catch { return null; }
+              })() : null;
+              recordHintFire({ ts: new Date().toISOString(), worktree, surface: "edit", file: rel, count: 1 });
+            }
+          } catch {
+            // best-effort
+          }
+        }
+      } catch {
+        // a hint must never break an edit
+      }
+    },
+  };
+};
+`;
+}
+
 function installReadHintPlugin(dryRun: boolean, getHome: () => string): void {
   const pluginsDir = join(getHome(), ".config", "opencode", "plugins");
   const pluginPath = join(pluginsDir, "fapony-read-hint.ts");
@@ -319,3 +450,36 @@ function installCommitHintPlugin(dryRun: boolean, getHome: () => string): void {
     `  commit hint: ${dryRun ? "would write" : "wrote"} ${pluginPath}`,
   );
 }
+
+function installEditHintPlugin(dryRun: boolean, getHome: () => string): void {
+  const pluginsDir = join(getHome(), ".config", "opencode", "plugins");
+  const pluginPath = join(pluginsDir, "fapony-edit-hint.ts");
+  if (existsSync(pluginPath)) {
+    let current = "";
+    try {
+      current = readFileSync(pluginPath, "utf-8");
+    } catch {
+      current = "";
+    }
+    if (current.includes("editHintFor")) {
+      console.error(`  edit hint: already installed — no change`);
+      return;
+    }
+    console.error(
+      `  edit hint: ${pluginPath} exists but isn't fapony's — not overwriting.`,
+    );
+    return;
+  }
+  if (!dryRun) {
+    try {
+      mkdirSync(pluginsDir, { recursive: true });
+      writeFileSync(pluginPath, editHintPluginSource(INSTALL_ROOT), "utf-8");
+    } catch (e) {
+      console.error(`  edit hint: failed to write — ${(e as Error).message}`);
+      return;
+    }
+  }
+  console.error(
+    `  edit hint: ${dryRun ? "would write" : "wrote"} ${pluginPath}`,
+  );
+}

package/src/install.ts

@@ -28,12 +28,13 @@ export {
   claudeGetPointsToFapony,
   cmdInstallClaude,
 } from "./install/claude.js";
-export { cmdInstallCodex } from "./install/codex.js";
+export { cmdInstallCodex, findCodexHooksJson } from "./install/codex.js";
 export { cmdInstallCursor } from "./install/cursor.js";
 export { detectClients } from "./install/detect.js";
 export {
   cmdInstallOpencode,
   commitHintPluginSource,
+  editHintPluginSource,
   readHintPluginSource,
 } from "./install/opencode.js";
 export {

package/src/lint-baseline.ts

@@ -12,14 +12,9 @@
 // never blocks — the agent decides whether to fix the old issues too
 
 import { execSync } from "node:child_process";
-import {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  rmSync,
-  writeFileSync,
-} from "node:fs";
+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 { assertSafe } from "./safety.js";
 
@@ -63,7 +58,7 @@ function baselinePath(worktree: string): string {
 }
 
 function readEvidenceLintCmd(worktree: string): string | null {
-  const evidence = join(worktree, ".fapony", "evidence.json");
+  const evidence = join(worktree, DEFAULT_EVIDENCE_FILE);
   try {
     const parsed = JSON.parse(readFileSync(evidence, "utf-8")) as {
       commands?: { name?: string; cmd?: string }[];

package/src/mcp/evidence.ts

@@ -17,7 +17,13 @@
 import { execSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { join, relative } from "node:path";
-import { type Config, evidenceFile, safetyDeny } from "../db/index.js";
+import {
+  type Config,
+  EVIDENCE_FILENAME,
+  evidenceFile,
+  FAPONY_DIR,
+  safetyDeny,
+} from "../db/index.js";
 import { assertSafe } from "../safety.js";
 import type { EvidenceItem, EvidenceStatus } from "./primitives.js";
 
@@ -41,7 +47,7 @@ const AGENT_PROVENANCE = { verified: false, source: "agent_report" } as const;
 
 // --- App-scoped resolution ---
 
-// Monorepo group dirs — same order as templates/mem/store.ts (first hit wins there;
+// Monorepo group dirs — same order as src/mem/store.ts (first hit wins there;
 // here every file must already agree on one group+app, so order never matters).
 const APP_GROUPS = ["apps", "packages", "services"];
 
@@ -80,7 +86,13 @@ export function resolveEvidencePath(
       APP_GROUPS.includes(group) &&
       heads.every(([g, a]) => g === group && a === app)
     ) {
-      const candidate = join(worktree, group, app, ".fapony", "evidence.json");
+      const candidate = join(
+        worktree,
+        group,
+        app,
+        FAPONY_DIR,
+        EVIDENCE_FILENAME,
+      );
       if (existsSync(candidate)) return candidate;
     }
   }