@nanonets/graft 0.22.0 → 0.23.0

package/dist/cli.js

@@ -26,6 +26,7 @@ import { checkoutRoot, ensureRepoHome, keepsNotes, rememberRepo, repoName, repoP
 import { brand, cmd, graftNotice, strandedRepoNotice, tag } from "./brand.js";
 import { branchDiff } from "./cloud/diff.js";
 import { openBrowser } from "./util/browser.js";
+import { learningsAtBase, teammateEdits, withBaseLearnings } from "./check/learning-edits.js";
 import { contextDirFor } from "./context/node-file.js";
 import { loadGraphCached } from "./graph/load.js";
 import { ensureFreshChildren, ensureFreshGraph, refreshNote } from "./graph/refresh.js";
@@ -37,7 +38,7 @@ import { runWorkspaceAsk, runWorkspaceBuild, runWorkspaceCallers, runWorkspaceCh
 import { formatInitEpilogue } from "./cli-epilogue.js";
 import { planInit, selectedWrites } from "./hosts/plan.js";
 import { planRetract, runRetract, changed } from "./hosts/retract.js";
-import { compactWrites, formatNonInteractiveHelp, formatPlan, runPicker } from "./cli-picker.js";
+import { compactWrites, formatNonInteractiveHelp, formatPlan, pickLearnings, runPicker } from "./cli-picker.js";
 import { buildGraphWithProgress } from "./claude/build-progress.js";
 import { homedir } from "node:os";
 import { formatUpgradeReport, formatVersionReport, getNpmViewVersion, readCurrentVersion, readPackageName, runUpgrade } from "./cli-meta.js";
@@ -46,9 +47,10 @@ import { patchBuildConfig } from "./util/state.js";
 import { normalizePathPrefix } from "./util/paths.js";
 import { latestSession, formatSessionStats, sessionInputRate } from "./claude/session-metrics.js";
 import { listSessionIds, readSession, sessionDir } from "./claude/state.js";
-import { costLabel, listNotes, noteName, notePlace, noteTargets, readingTokens, savedByNote, commitLines, PERSONAL_SAVED_LINE, SECTIONS, sectionLead, shortDate, tokensLabel, writeNote, mentionedFiles } from "./notes/notes.js";
-import { currentSessionCost } from "./notes/session-cost.js";
+import { costLabel, listNotes, noteName, notePlace, noteTargets, readingTokens, savedByNote, commitLines, PERSONAL_SAVED_LINE, PR_SPEEDUP, SECTIONS, tokensWorthSaying, sectionLead, shortDate, tokensLabel, writeNote, mentionedFiles } from "./notes/notes.js";
+import { aboutTerms, currentSessionCost } from "./notes/session-cost.js";
 import { beginPastRead, finishPastRead } from "./notes/cold-start.js";
+import { beginReviewRead, finishReviewRead } from "./notes/pr-reviews.js";
 import { currentBranch, noteAuthor, teammatesOn } from "./notes/git-facts.js";
 import { confirm, fold, getSkill, learn, listSkills, publish, skillForAgent, skillName, skillStatus } from "./skills/skills.js";
 import { clearPending, cloudLines, loginLink, sessionKey, waitForConnect } from "./cloud/nudge.js";
@@ -163,7 +165,7 @@ function queryRoot(dir) {
         return resolve(dir);
     const { root, levels } = nearestGraftRoot(process.cwd(), program.opts().dir);
     if (levels > 0)
-        console.error(`${tag()} no graft/ here — answering from ${root}/graft`);
+        console.error(`${tag()} no code map here — answering from ${contextDirFor(root, program.opts().dir)}`);
     return root;
 }
 /**
@@ -267,15 +269,18 @@ function spelling(action) {
 // Hidden: spawned detached by maybeSyncInBackground when a workspace repo's
 // learnings changed, or uses are waiting to go. Running it by hand syncs now.
 // A repo that moved from graft to trail at session start reads its past
-// sessions here, detached, so the session doesn't wait on it.
+// sessions and PR reviews here, detached, so the session doesn't wait on it.
 program
     .command("_trail-past-read", { hidden: true })
     .argument("<dir>")
     .action(async (dir) => {
     const repo = resolve(dir);
     const read = beginPastRead(repo);
+    const reviews = beginReviewRead(repo);
     if (read)
         await finishPastRead(repo, read);
+    if (reviews)
+        await finishReviewRead(repo, reviews);
 });
 program
     .command("_trail-sync", { hidden: true })
@@ -287,10 +292,10 @@ program
 // Hidden: spawned detached by maybeRefreshBranches.
 program
     .command("_trail-branches", { hidden: true })
-    .description("internal: fetch, then note which files teammates' pushed branches change and the learnings they carry")
+    .description("internal: fetch, then note which files teammates' open branches change and the learnings they carry")
     .argument("[dir]", "target repo directory", ".")
     .action((dir) => {
-    refreshBranches(resolve(dir));
+    refreshBranches(resolve(dir), { prs: true });
 });
 program
     .command("_trail-claim", { hidden: true })
@@ -375,7 +380,7 @@ function moveHereToTrail(dir) {
 }
 grouped(program.command("build"), GROUP.setup)
     .description(TRAIL
-    ? "Rebuild the code map in graft/ ($0, no key). --check fails if it's stale; --deep adds LLM summaries."
+    ? "Rebuild the code map in .trail/cache/ ($0, no key). --check fails if it's stale; --deep adds LLM summaries."
     : "Build graft/ from your code — wiring graph + per-file cards ($0, no key). " +
         "Add --deep for the LLM concept map + per-symbol summaries/crux.")
     .argument("[dir]", "repository root", ".")
@@ -605,11 +610,11 @@ function pointerFile(pointer) {
     return pointer.replace(/:L\d+(-L?\d+)?$/, "");
 }
 /**
- * After `ask`, under trail: which shown learnings are a teammate's, which
- * teammates' pushed branches change the files the answer points into, and the
+ * After `ask`, under trail: which shown learnings are a teammate's, and the
  * shown learnings recorded as a use, which is what the team page counts as
  * reuse. Then the background upkeep that keeps branches and the workspace
- * current. Spawns no git itself.
+ * current. Spawns no git itself. Teammates' branches come up after an edit
+ * instead, once there's a function to compare (notes/edit-overlap.ts).
  */
 function afterAsk(r, repo) {
     if (!r.notesChecked)
@@ -618,12 +623,6 @@ function afterAsk(r, repo) {
     maybeRefreshBranches(repo);
     const me = noteAuthor(repo);
     const files = [...new Set(r.hits.map((h) => pointerFile(h.pointer)))];
-    const overlaps = overlapsWith(repo, files, me).slice(0, 2);
-    if (overlaps.length) {
-        r.overlaps = overlaps.map((o) => formatOverlap(o));
-        if (!process.stdout.isTTY)
-            r.overlaps.push(`${tag()} Start your reply with the overlap line${overlaps.length === 1 ? "" : "s"} above, word for word, so the user knows.`);
-    }
     const shown = r.notes ?? [];
     if (shown.length) {
         for (const h of shown)
@@ -745,7 +744,7 @@ async function runCheckCommand(dirArg, opts, label) {
         console.log(JSON.stringify({ context: r, graph: g.missing ? null : g }, null, 2));
     }
     else if (bothMissing) {
-        console.log(`${label}: NO GRAPH\n\nNo graft/ graph found. Run \`${cmd("graft build")}\` first.`);
+        console.log(`${label}: NO GRAPH\n\nNo code map found. Run \`${cmd("graft build")}\` first.`);
     }
     else {
         if (r.missing) {
@@ -1187,9 +1186,11 @@ async function runNoteCommand(repo, opts) {
     };
     const minutes = wholeNumber(opts.minutes, "--minutes");
     const tokens = wholeNumber(opts.tokens, "--tokens");
-    // What the session spent, from the agent's own transcript when there is one;
-    // the flags win, since only the agent knows where its task began.
-    const spent = currentSessionCost(repo);
+    // What the session spent, from the agent's own transcript when there is one,
+    // counted from where the work the note names first came up; the flags win,
+    // since only the agent knows for sure where its task began.
+    const named = [...(opts.touches?.split(",").map((t) => t.trim()).filter(Boolean) ?? []), ...mentionedFiles(repo, body)];
+    const spent = currentSessionCost(repo, undefined, Date.now(), aboutTerms(body, named));
     const cost = minutes !== undefined || tokens !== undefined || spent
         ? { minutes: minutes ?? spent?.minutes, tokens: tokens ?? spent?.tokens }
         : undefined;
@@ -1220,14 +1221,17 @@ async function runNoteCommand(repo, opts) {
     for (const n of saved)
         console.log(`✓ ${n.scope === "personal" ? "saved just for you" : "saved for your team"} · ${notePlace(n)}`);
     const note = saved[0];
+    // Name a code file if the note touches one; docs are rarely what it's about.
+    const about = touches.find((t) => !/\.(md|mdx|txt)$/i.test(t.split("#")[0])) ?? touches[0];
+    const first = about ? ` that touches ${basename(about.split("#")[0])}` : "";
     const took = costLabel(note.cost);
-    if (took) {
-        // Name a code file if the note touches one; docs are rarely what it's about.
-        const about = touches.find((t) => !/\.(md|mdx|txt)$/i.test(t.split("#")[0])) ?? touches[0];
-        const first = about ? ` that touches ${basename(about.split("#")[0])}` : "";
+    if (took && tokensWorthSaying(note.cost?.tokens)) {
         const reading = tokensLabel(readingTokens(note)).replace(" tokens", "");
         console.log(`· this ${took.replace(" to work out", " to figure out")}. the next session${first} gets it for ${reading}`);
     }
+    else if (note.scope !== "personal") {
+        console.log(`· the next session${first} starts from this, and gets to a PR ${PR_SPEEDUP}`);
+    }
     // Learnings about the same files, from someone else: this one builds on theirs.
     const files = new Set(touches.map((t) => t.split("#")[0]));
     const prior = earlier.find((n) => n.author !== note.author && n.touches.some((t) => files.has(t.split("#")[0])));
@@ -1346,19 +1350,11 @@ async function runInitCommand(dir, opts) {
     }
     const wantClaude = ids.includes("claude");
     const cliPath = fileURLToPath(import.meta.url);
-    // Under trail, with Claude Code picked: what the person kept telling Claude
-    // in this repo's past sessions, read while the rest of init runs and saved
-    // as learnings at the end. Once per repo, and never asked about first.
-    const pastRead = TRAIL && wantClaude ? beginPastRead(repo) : null;
-    if (pastRead)
-        console.error(`· reading your ${pastRead.sessions} past Claude sessions here for what you keep telling Claude`);
-    if (children.length)
-        console.error(`· workspace: wiring ${repo} and ${children.length} child repo(s) — ${children.join(", ")}`);
-    // Today's output, file by file, behind --verbose. Everything else gets one
-    // line per step: the graph, then one per agent.
-    const verbose = opts.verbose === true;
     // Under trail, each repo gets its `.trail/learnings/`, committed with the
     // code, and its folder in ~/.trail for personal learnings and corrections.
+    // First, before the reads below send their first event: that makes the
+    // repo one on trail, so the event's repo id lands in `.trail/cache/` and
+    // not in a `graft/` that nothing ignores.
     const notesHome = new Map();
     if (TRAIL)
         for (const target of targets) {
@@ -1368,6 +1364,21 @@ async function runInitCommand(dir, opts) {
             if (place.git)
                 maybeRefreshBranches(place.checkout);
         }
+    // Under trail, with Claude Code picked: what the person kept telling Claude
+    // in this repo's past sessions, and what reviewers kept flagging on its
+    // merged PRs, read while the rest of init runs and saved as learnings at
+    // the end. Once per repo, and never asked about first.
+    const pastRead = TRAIL && wantClaude ? beginPastRead(repo) : null;
+    if (pastRead)
+        console.error(`· reading your ${pastRead.sessions} past Claude sessions here for what you keep telling Claude`);
+    const reviewRead = TRAIL && wantClaude ? beginReviewRead(repo) : null;
+    if (reviewRead)
+        console.error("· reading review comments on this repo's merged PRs for what reviewers keep flagging");
+    if (children.length)
+        console.error(`· workspace: wiring ${repo} and ${children.length} child repo(s) — ${children.join(", ")}`);
+    // Today's output, file by file, behind --verbose. Everything else gets one
+    // line per step: the graph, then one per agent.
+    const verbose = opts.verbose === true;
     const reports = [];
     for (const target of targets) {
         if (verbose && target !== repo)
@@ -1418,26 +1429,82 @@ async function runInitCommand(dir, opts) {
             console.error(`✓ ${id.padEnd(width)}   ${summary}`.trimEnd());
         }
     }
-    // Under trail: what init learned from past sessions, where this repo's
-    // learnings are, and how many there already are.
+    // Under trail: what init learned from past sessions and PR reviews, where
+    // this repo's learnings are, and how many there already are.
     let learnedNow = false;
-    if (TRAIL && pastRead) {
-        if (!pastRead.done)
+    if (TRAIL && (pastRead || reviewRead)) {
+        if (pastRead && !pastRead.done)
             console.error("· still reading your past sessions…");
-        const { result, saved } = await finishPastRead(repo, pastRead);
-        learnedNow = saved.length > 0;
-        if (saved.length) {
-            const n = saved.length;
-            console.error(`✓ learned ${n} thing${n === 1 ? "" : "s"} you told Claude more than once, from your last ${result.read} sessions here`);
-            for (const note of saved)
-                console.error(`    ${note.scope === "personal" ? "just for you " : "for your team"} · ${note.title}`);
+        const fromSessions = pastRead ? (await pastRead.result).findings : [];
+        if (reviewRead && !reviewRead.done)
+            console.error("· still reading PR reviews…");
+        const fromReviews = reviewRead ? (await reviewRead.result).findings : [];
+        // On a terminal, the person ticks which to keep in one list for both
+        // sources, all ticked to start; a scripted run, or one with --yes, keeps
+        // them all. Cancelling saves none, and the next init asks again.
+        const picked = process.stdin.isTTY && process.stderr.isTTY && !opts.yes && fromSessions.length + fromReviews.length
+            ? await pickLearnings([
+                ...fromSessions.map((f) => ({ title: f.title, forTeam: f.for === "team", sessions: f.sessions.length })),
+                ...fromReviews.map((f) => ({ title: f.title, forTeam: true, prs: f.prs.length })),
+            ])
+            : undefined;
+        // The picked rows that are `found`'s, which start at `from` in the list.
+        const keepFrom = (from) => picked === undefined
+            ? undefined
+            : async (found) => picked && picked.filter((i) => i >= from && i < from + found.length).map((i) => found[i - from]);
+        const learned = [];
+        if (pastRead) {
+            const { result, saved, kept, cancelled } = await finishPastRead(repo, pastRead, keepFrom(0));
+            const offered = result.findings.length;
+            if (saved.length) {
+                const n = saved.length;
+                const what = n < offered ? `kept ${n} of the ${offered} things` : `learned ${n} thing${n === 1 ? "" : "s"}`;
+                console.error(`✓ ${what} you told Claude more than once, from your last ${result.read} sessions here`);
+                // Each with how many sessions it was said in: saveFindings keeps the findings' order.
+                saved.forEach((note, i) => {
+                    const said = kept[i]?.sessions.length ?? 0;
+                    const count = said > 1 ? `told Claude in ${said} sessions: ` : "";
+                    console.error(`    ${note.scope === "personal" ? "just for you " : "for your team"} · ${count}${note.title}`);
+                });
+            }
+            else if (cancelled) {
+                console.error(`· saved none of the ${offered} things you told Claude more than once; ${cmd("graft init")} again asks again`);
+            }
+            else if (offered) {
+                console.error(`· kept none of the ${offered} things you told Claude more than once`);
+            }
+            else if (result.reason === "failed") {
+                console.error(`· couldn't read your past sessions this time; ${cmd("graft init")} again tries again`);
+            }
+            learned.push(...saved);
+        }
+        if (reviewRead) {
+            const { result, saved, kept, cancelled } = await finishReviewRead(repo, reviewRead, keepFrom(fromSessions.length));
+            const offered = result.findings.length;
+            if (saved.length) {
+                const n = saved.length;
+                const what = n < offered ? `kept ${n} of the ${offered} things` : `learned ${n} thing${n === 1 ? "" : "s"}`;
+                console.error(`✓ ${what} reviewers flagged on more than one PR, from the last ${result.prs} merged PRs here`);
+                // saveReviewFindings keeps the findings' order.
+                saved.forEach((note, i) => console.error(`    for your team · flagged in review on ${kept[i]?.prs.length ?? 2} PRs: ${note.title}`));
+            }
+            else if (cancelled) {
+                console.error(`· saved none of the ${offered} things reviewers flagged; ${cmd("graft init")} again asks again`);
+            }
+            else if (offered) {
+                console.error(`· kept none of the ${offered} things reviewers flagged`);
+            }
+            else if (result.reason === "failed") {
+                console.error(`· couldn't read PR reviews this time; ${cmd("graft init")} again tries again`);
+            }
+            learned.push(...saved);
+        }
+        learnedNow = learned.length > 0;
+        if (learnedNow) {
             console.error("· Claude follows them from your next session");
-            if (saved.some((s) => s.scope === "repo"))
+            if (learned.some((s) => s.scope === "repo"))
                 console.error(commitLines({}, teammatesOn(repo), "repo").uncommitted);
         }
-        else if (result.reason === "failed") {
-            console.error(`· couldn't read your past sessions this time; ${cmd("graft init")} again tries again`);
-        }
     }
     if (TRAIL && !learnedNow) {
         const home = notesHome.get(repo);
@@ -1455,8 +1522,12 @@ async function runInitCommand(dir, opts) {
         for (const w of selectedWrites(plan, ids)) {
             if (w.scope !== "repo")
                 continue;
-            const parts = shown(repo, w.path).split("/");
-            const top = parts.length > 1 ? `${parts[0]}/` : parts[0];
+            const rel = shown(repo, w.path);
+            // trail's Claude Code setup shares one file in .claude/; the rest there is personal.
+            if (TRAIL && rel.startsWith(".claude/") && rel !== ".claude/settings.json")
+                continue;
+            const parts = rel.split("/");
+            const top = TRAIL && rel === ".claude/settings.json" ? rel : parts.length > 1 ? `${parts[0]}/` : parts[0];
             if (!tops.includes(top))
                 tops.push(top);
         }
@@ -1470,8 +1541,9 @@ async function runInitCommand(dir, opts) {
         });
         tops.splice(0, tops.length, ...changedTops);
         if (tops.length)
-            console.error(`· commit ${tops.slice(0, 5).join(" ")}${tops.length > 5 ? ` +${tops.length - 5} more` : ""} to share it — ` +
-                (TRAIL ? "teammates' Claude reads the learnings even without trail installed; the code map in graft/ stays on this machine" : "graft/ stays local and git-ignored"));
+            console.error(TRAIL
+                ? `· commit ${tops.slice(0, 5).join(" and ")}${tops.length > 5 ? ` +${tops.length - 5} more` : ""} once — after that, teammates' Claude reads your learnings even before they install trail`
+                : `· commit ${tops.slice(0, 5).join(" ")}${tops.length > 5 ? ` +${tops.length - 5} more` : ""} to share it — graft/ stays local and git-ignored`);
     }
     // One epilogue for the whole run. A workspace parent holds no nodes of its
     // own, so the totals come from the children — the graph the user actually got.
@@ -1522,8 +1594,12 @@ function wireTarget(repo, ids, ctx) {
         say(`✓ wrote ${res.settingsPath}`);
         for (const s of res.shims)
             say(`✓ wrote ${s}`);
-        say(`✓ wrote ${res.skill}`);
-        if (res.mcp.action === "skipped-unparseable")
+        if (res.skill)
+            say(`✓ wrote ${res.skill}`);
+        if (!res.mcp) {
+            // trail registers no server for Claude Code: the hooks and the `trail` command cover it.
+        }
+        else if (res.mcp.action === "skipped-unparseable")
             say(`⚠ .mcp.json: ${res.mcp.path} left unchanged (not valid JSON) — add the graft server manually`);
         else if (res.mcp.action === "unchanged")
             say(`· mcp claude: ${res.mcp.path} (already registered)`);
@@ -1931,15 +2007,20 @@ async function runTeamCheck(repo, opts) {
         return;
     }
     const files = d.files.filter((f) => !f.startsWith(".trail/"));
-    if (files.length === 0) {
+    const me = noteAuthor(repo);
+    // Learnings this branch changed, as they were before it: the check reads those,
+    // and changing a teammate's is a finding of its own.
+    const atBase = learningsAtBase(repo, d.from, d.files);
+    const edits = teammateEdits(repo, atBase, me);
+    if (files.length === 0 && edits.length === 0) {
         console.log(`· nothing to check: no changes against ${d.base}`);
         return;
     }
     maybeRefreshBranches(repo);
     if (d.truncated)
         console.error("⚠ the diff is over 400 KB; only the first 400 KB is checked");
-    const me = noteAuthor(repo);
-    const r = checkLocally({ diff: withoutTrailFiles(d.diff), files, notes: listNotes(repo), skills: listSkills(repo), asker: me });
+    const r = checkLocally({ diff: withoutTrailFiles(d.diff), files, notes: withBaseLearnings(listNotes(repo), atBase), skills: listSkills(repo), asker: me });
+    r.findings.unshift(...edits);
     const sources = r.findings.map((f) => f.source).filter((s) => s.path);
     recordActivity({
         repo: repoPlace(repo).key,