@nanonets/graft 0.23.0 → 0.24.0

package/dist/cli.js

@@ -31,6 +31,7 @@ import { contextDirFor } from "./context/node-file.js";
 import { loadGraphCached } from "./graph/load.js";
 import { ensureFreshChildren, ensureFreshGraph, refreshNote } from "./graph/refresh.js";
 import { isWorkspaceBuildRoot, readWorkspace } from "./graph/workspace.js";
+import { NOT_GIT_LINE, homeFolderRefusal, isGitWorkTree } from "./init-guard.js";
 import { hasGraftIndex, nearestGraftRoot } from "./graph/root.js";
 import { unsupportedExtensions, supportedExtensions } from "./graph/source-files.js";
 import { discoverWorkspaceChildren } from "./graph/scopes.js";
@@ -48,10 +49,13 @@ 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, PR_SPEEDUP, SECTIONS, tokensWorthSaying, sectionLead, shortDate, tokensLabel, writeNote, mentionedFiles } from "./notes/notes.js";
+import { findLearning, liveLearnings } from "./notes/learning-fields.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 { anchoredReviews, beginReviewRead, finishReviewRead } from "./notes/pr-reviews.js";
+import { finishMemoryRead, memoryCandidates, offeredBefore } from "./notes/memory-notes.js";
 import { currentBranch, noteAuthor, teammatesOn } from "./notes/git-facts.js";
+import { gateNote, namesRepoSymbol, symbolCandidates, trackedFiles } from "./notes/note-gate.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";
 import { addRepo, clearCloud, cloudEnabled, fetchMe, fetchTeam, isError, readCloud, writeCloud } from "./cloud/workspace.js";
@@ -389,6 +393,8 @@ grouped(program.command("build"), GROUP.setup)
     .option("--deep", "run the LLM pass: concept nodes (graft/*.md) + per-symbol summary/crux")
     .option("-e, --extensions <exts...>", 'code extensions to include (e.g. ".ts" ".py"); an extension with no parser is ignored with a warning that lists the supported set')
     .option("-j, --concurrency <n>", "files summarized in parallel during --deep (default 5)")
+    .option("--synth-concurrency <n>", "concept synthesis batches in flight at once during --deep (default 4). Separate from -j: " +
+    "each synthesis call carries a whole batch of summaries, not one file")
     .option("--no-reuse", "re-parse every file instead of replaying unchanged ones from the extraction cache")
     .option("--lsp", "add compiler-grade call edges via a language server if one is installed (opt-in, slower; e.g. rust-analyzer, clangd)")
     .option("--allow-partial", "with --deep: exit 0 even when some files' summaries failed (default: a degraded meaning tier exits 1)")
@@ -422,6 +428,11 @@ grouped(program.command("build"), GROUP.setup)
         console.error(`✗ --concurrency must be a number, got "${opts.concurrency}"`);
         process.exit(1);
     }
+    const synthConcurrency = opts.synthConcurrency ? Math.max(1, Number(opts.synthConcurrency)) : undefined;
+    if (opts.synthConcurrency && !Number.isFinite(synthConcurrency)) {
+        console.error(`✗ --synth-concurrency must be a number, got "${opts.synthConcurrency}"`);
+        process.exit(1);
+    }
     warnUnsupportedExtensions(opts.extensions);
     // Persisted BEFORE the build itself runs, so this invocation's walks (and
     // every later no-flag build / hooks refresh) see it identically — the
@@ -498,6 +509,7 @@ grouped(program.command("build"), GROUP.setup)
             deep: !!deep,
             extensions: opts.extensions,
             concurrency,
+            synthConcurrency,
             childConfig: cliConfig(),
             override: buildGlobalDir,
             includeDirs: opts.includeDir,
@@ -514,6 +526,7 @@ grouped(program.command("build"), GROUP.setup)
         const c = await engine.init(dir, {
             extensions: opts.extensions,
             onlyDirs,
+            synthConcurrency,
             onProgress: ({ phase, index, total, file }) => process.stderr.write(`\r${phase === "summarize" ? "reading" : "writing"} concepts ${index + 1}/${total}: ${file.slice(0, 40).padEnd(40)}`),
         }).catch((err) => {
             // Only the stage and a code enum; the message stays on this machine.
@@ -521,7 +534,11 @@ grouped(program.command("build"), GROUP.setup)
             throw err;
         });
         process.stderr.write("\n");
-        console.log(`✓ concepts: ${c.nodes} nodes, ${c.links} links from ${c.files} files (${c.summarized} read, ${c.cached} cached)`);
+        const conceptLine = `concepts: ${c.nodes} nodes, ${c.links} links from ${c.files} files (${c.summarized} read, ${c.cached} cached)`;
+        if (c.nodes === 0)
+            console.error(`⚠ ${conceptLine}`);
+        else
+            console.log(`✓ ${conceptLine}`);
         for (const e of c.errors)
             console.error(`✗ ${e}`);
         conceptErrors = c.errors;
@@ -983,6 +1000,8 @@ grouped(program.command("note", { hidden: !TRAIL }), GROUP.memory)
     .option("--author <name>", "who wrote it (default: the first word of git config user.name)")
     .option("--minutes <n>", "what it took to work out, when the agent's transcript can't say")
     .option("--tokens <n>", "the same, in tokens")
+    .option("--replaces <file>", "an earlier learning this one takes over from (its file name in .trail/learnings/); the old file stays")
+    .option("--anyway", "save it even if trail's checks (names code, says why, not status, not a repeat) turn it away")
     .option("--json", "print the saved learning as JSON")
     .argument("[dir]", "repository root", ".")
     .action(async (dir, opts) => {
@@ -1198,19 +1217,60 @@ async function runNoteCommand(repo, opts) {
     // session edited. Explicit --touches means just this repo.
     const targets = opts.touches
         ? [{ dir: repo, touches: opts.touches.split(",").map((t) => t.trim()).filter(Boolean) }]
-        : noteTargets(repo, spent?.edited ?? [], spent?.startedAt).map((t) => ({
-            ...t,
-            // And the files the note names, for a session that read code without editing it.
-            touches: [...new Set([...t.touches, ...mentionedFiles(t.dir, body)])].slice(0, 10),
+        : noteTargets(repo, spent?.edited ?? [], spent?.startedAt, spent ? { read: spent.read } : undefined).map((t) => ({
+            dir: t.dir,
+            // Then the files the note names, then the ones the session only read.
+            touches: [...new Set([...t.touches, ...mentionedFiles(t.dir, body), ...(t.read ?? [])])].slice(0, 10),
         }));
+    // A touch is a file git tracks or one this session edited: never a file
+    // that was just lying around (a token, a scratch file).
+    const real = (dir, files) => {
+        const tracked = trackedFiles(dir, files.map((f) => f.split("#")[0]));
+        const edited = new Set((spent?.edited ?? []).map((f) => relative(dir, f).split("\\").join("/")));
+        return files.filter((f) => tracked.has(f.split("#")[0]) || edited.has(f.split("#")[0]));
+    };
+    for (const t of targets)
+        t.touches = real(t.dir, t.touches);
+    const scope = opts.personal ? "personal" : "repo";
+    const primary = targets[0];
+    const existing = listNotes(primary.dir, { branches: false });
+    let old;
+    if (opts.replaces) {
+        const want = basename(opts.replaces.trim());
+        old = findLearning(existing, want);
+        if (!old) {
+            console.error(`✗ --replaces: no learning named ${want} here. The names are the files in .trail/learnings/.`);
+            process.exitCode = 1;
+            return;
+        }
+    }
+    // What `replaces:` holds is the old learning's id (learning-fields.ts), not its file name.
+    const replaces = old?.id;
+    const text = `${opts.title}\n${body}`;
+    const gate = gateNote({
+        title: opts.title,
+        body,
+        personal: scope === "personal",
+        files: real(primary.dir, [...new Set([...mentionedFiles(primary.dir, text), ...(opts.touches ? primary.touches : [])])]),
+        namesSymbol: namesRepoSymbol(primary.dir, symbolCandidates(text)),
+        touches: primary.touches,
+        replaces,
+    }, liveLearnings(existing).filter((n) => (n.scope ?? "repo") === scope));
+    if (gate.problems.length && !opts.anyway) {
+        console.error("✗ not saved yet:");
+        for (const p of gate.problems)
+            console.error(`  · ${p}`);
+        console.error(`Fix it and run ${cmd("graft note")} again, or add --anyway if a check is wrong.`);
+        process.exitCode = 1;
+        return;
+    }
     const author = opts.author?.trim() || noteAuthor(repo);
     const date = new Date().toISOString().slice(0, 10);
-    const scope = opts.personal ? "personal" : "repo";
     const earlier = [];
     const saved = [];
     for (const t of targets) {
         earlier.push(...listNotes(t.dir));
-        saved.push(writeNote(t.dir, { title: opts.title, body, author, date, branch: currentBranch(t.dir), cost, touches: t.touches }, scope));
+        saved.push(writeNote(t.dir, { title: opts.title, body, author, date, branch: currentBranch(t.dir), cost, touches: t.touches, replaces }, scope));
     }
     const touches = targets.flatMap((t) => t.touches);
     track("note_saved", { has_cost: String(cost?.tokens !== undefined || cost?.minutes !== undefined), touches_bucket: countBucket(touches.length), scope: saved[0]?.scope ?? scope }, { repo });
@@ -1239,6 +1299,10 @@ async function runNoteCommand(repo, opts) {
         console.log(`· builds on ${prior.author ? `${prior.author}'s` : "a"} learning from ${shortDate(prior.date)}`);
     if (!SECTIONS.some((s) => sectionLead(body, s.heading) !== null))
         console.log("· tip: learnings read best under ## Decided, ## Tried and ruled out and ## Watch out");
+    for (const w of gate.warnings)
+        console.log(`· ${w}`);
+    if (old)
+        console.log(`· takes over from ${noteName(old)}, which stays as the record`);
     const repoSaved = saved.filter((n) => n.scope === "repo");
     if (repoSaved.length) {
         // Who else works on these files, for the case for committing it.
@@ -1246,7 +1310,8 @@ async function runNoteCommand(repo, opts) {
         console.log(`${lines.uncommitted} · git add ${repoSaved.map(notePlace).join(" ")}`);
         if (!process.stdout.isTTY && TRAIL)
             console.log(`[trail] Close your reply with one line, word for word. If this learning is committed by the end of your turn: ${lines.committed}\n` +
-                `  If it isn't: ${lines.uncommitted}`);
+                `  If it isn't: ${commitAsk(note.title, about)}\n` +
+                "  On a yes, commit it with the change: in the change's own commit when that isn't pushed yet.");
     }
     else {
         console.log("· just for you: kept on this machine, out of the repo");
@@ -1259,6 +1324,11 @@ async function runNoteCommand(repo, opts) {
     }
     printLines(cloudLines(repo, { command: "note" }));
 }
+/** What the agent asks after saving a team learning it hasn't committed: who reads it, and when. */
+export function commitAsk(title, about) {
+    const when = about ? `when they open ${basename(about.split("#")[0])}` : "on their next session here";
+    return `📝 Learning: "${title.replace(/"/g, "'")}" · your teammates' Claude reads it ${when}. Commit it with this change? (y/n)`;
+}
 /** Lines that close a command's output, with a blank line before them. */
 function printLines(lines) {
     if (lines.length)
@@ -1277,6 +1347,14 @@ async function runInitCommand(dir, opts) {
     }
     const repo = resolve(dir);
     const explicit = Array.isArray(opts.agents) ? opts.agents : undefined;
+    // Checked before anything is written: run from the home folder, init wired
+    // it, mapped every code file under it, then said to commit.
+    const refusal = homeFolderRefusal(repo);
+    if (refusal) {
+        console.error(refusal);
+        process.exitCode = 1;
+        return null;
+    }
     if (explicit) {
         const validIds = [...hostIds(), "claude"];
         const unknown = explicit.filter((id) => !validIds.includes(id));
@@ -1429,23 +1507,29 @@ async function runInitCommand(dir, opts) {
             console.error(`✓ ${id.padEnd(width)}   ${summary}`.trimEnd());
         }
     }
-    // Under trail: what init learned from past sessions and PR reviews, where
-    // this repo's learnings are, and how many there already are.
+    // Under trail: what init learned, where this repo's learnings are, and how
+    // many there already are. The team's come from what is tied to the code:
+    // what reviewers kept flagging on merged PRs, and Claude Code's notes about
+    // the repo on this machine. What the person kept telling Claude is theirs.
     let learnedNow = false;
-    if (TRAIL && (pastRead || reviewRead)) {
+    let teamSaved = 0;
+    const memory = TRAIL && wantClaude ? memoryCandidates(repo, { offered: offeredBefore(repo) }) : [];
+    if (TRAIL && (pastRead || reviewRead || memory.length)) {
         if (pastRead && !pastRead.done)
             console.error("· still reading your past sessions…");
         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
+        const fromReviews = reviewRead ? anchoredReviews(repo, (await reviewRead.result).findings) : [];
+        // On a terminal, the person ticks which to keep in one list, the team's
+        // first and ticked, their own unticked. A scripted run, or one with
+        // --yes, keeps the team's and what they told Claude. Cancelling saves
+        // none, and the next init asks again.
+        const picked = process.stdin.isTTY && process.stderr.isTTY && !opts.yes && fromReviews.length + memory.length + fromSessions.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 })),
+                ...fromReviews.map((f) => ({ title: f.title, forTeam: true, prs: f.prs })),
+                ...memory.map((c) => ({ title: c.title, forTeam: c.forTeam, memory: true })),
+                ...fromSessions.map((f) => ({ title: f.title, forTeam: false, sessions: f.sessions.length })),
             ])
             : undefined;
         // The picked rows that are `found`'s, which start at `from` in the list.
@@ -1453,56 +1537,70 @@ async function runInitCommand(dir, opts) {
             ? 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;
+        // Reviews first: which of them are offered depends on the learnings already saved.
+        if (reviewRead) {
+            const { result, saved, kept, cancelled } = await finishReviewRead(repo, reviewRead, keepFrom(0));
+            const offered = fromReviews.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}`);
-                });
+                console.error(`✓ ${what} reviewers made authors change, from the last ${result.prs} merged PRs here`);
+                // saveReviewFindings keeps the findings' order.
+                saved.forEach((note, i) => console.error(`    for your team · from review on ${(kept[i]?.prs ?? []).map((n) => `#${n}`).join(", ")}: ${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`);
+                console.error(`· saved none of the ${offered} things reviewers made authors change; ${cmd("graft init")} again asks again`);
             }
             else if (offered) {
-                console.error(`· kept none of the ${offered} things you told Claude more than once`);
+                console.error(`· kept none of the ${offered} things reviewers made authors change`);
             }
             else if (result.reason === "failed") {
-                console.error(`· couldn't read your past sessions this time; ${cmd("graft init")} again tries again`);
+                console.error(`· couldn't read PR reviews 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));
+        if (memory.length) {
+            const { saved, cancelled } = await finishMemoryRead(repo, memory, keepFrom(fromReviews.length));
+            if (saved.length) {
+                console.error(`✓ kept ${saved.length} of the ${memory.length} notes your Claude keeps about this repo`);
+                for (const note of saved)
+                    console.error(`    ${note.scope === "personal" ? "just for you " : "for your team"} · ${note.title}`);
+            }
+            else if (cancelled) {
+                console.error(`· saved none of the ${memory.length} notes your Claude keeps about this repo; ${cmd("graft init")} again asks again`);
+            }
+            learned.push(...saved);
+        }
+        if (pastRead) {
+            const { result, saved, kept, cancelled } = await finishPastRead(repo, pastRead, keepFrom(fromReviews.length + memory.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}`));
+                console.error(`✓ ${what} you told Claude more than once, from your last ${result.read} sessions here, just for you`);
+                // 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(`    just for you  · ${count}${note.title}`);
+                });
             }
             else if (cancelled) {
-                console.error(`· saved none of the ${offered} things reviewers flagged; ${cmd("graft init")} again asks again`);
+                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 reviewers flagged`);
+                console.error(`· kept none of the ${offered} things you told Claude more than once`);
             }
             else if (result.reason === "failed") {
-                console.error(`· couldn't read PR reviews this time; ${cmd("graft init")} again tries again`);
+                console.error(`· couldn't read your past sessions this time; ${cmd("graft init")} again tries again`);
             }
             learned.push(...saved);
         }
         learnedNow = learned.length > 0;
+        teamSaved = learned.filter((s) => s.scope === "repo").length;
         if (learnedNow) {
             console.error("· Claude follows them from your next session");
-            if (learned.some((s) => s.scope === "repo"))
+            if (teamSaved)
                 console.error(commitLines({}, teammatesOn(repo), "repo").uncommitted);
         }
     }
@@ -1511,7 +1609,7 @@ async function runInitCommand(dir, opts) {
         if (home) {
             const learnings = listNotes(repo, { branches: false }).filter((n) => n.scope === "repo");
             if (learnings.length === 0)
-                console.error(`✓ learnings  ${LEARNINGS_DIR}/ · sessions that take real digging leave one there, for your whole team`);
+                console.error(`✓ learnings  ${LEARNINGS_DIR}/ · a session that fixes a bug, takes a correction or opens a PR leaves one there, for your whole team`);
             else
                 console.error(`✓ learnings  ${learnings.length} in ${LEARNINGS_DIR}/, from ${new Set(learnings.map((n) => n.author || "someone")).size} ${new Set(learnings.map((n) => n.author)).size === 1 ? "person" : "people"}`);
         }
@@ -1540,7 +1638,11 @@ async function runInitCommand(dir, opts) {
             return r.status !== 0 || r.stdout.trim().length > 0;
         });
         tops.splice(0, tops.length, ...changedTops);
-        if (tops.length)
+        // Outside git there is nothing to commit to, and `git status` failing above
+        // made every path look changed.
+        if (TRAIL && !children.length && !isGitWorkTree(repo))
+            console.error(NOT_GIT_LINE);
+        else if (tops.length)
             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`);
@@ -1558,6 +1660,10 @@ async function runInitCommand(dir, opts) {
                 nodes: graphs.reduce((n, g) => n + g.meta.nodeCount, 0),
                 edges: graphs.reduce((n, g) => n + g.meta.edgeCount, 0),
             }));
+    // Run by an agent, not a person: the last line tells it to ask about the
+    // commit, since the person never saw the picker and Claude Code folds the rest.
+    if (teamSaved && !process.stderr.isTTY)
+        console.error(`→ ${teamSaved} team learning${teamSaved === 1 ? "" : "s"} in ${LEARNINGS_DIR}/ ${teamSaved === 1 ? "isn't" : "aren't"} committed yet. Ask the user: "Commit ${teamSaved === 1 ? "it" : `the ${teamSaved}`} so your teammates' Claude starts from ${teamSaved === 1 ? "it" : "them"}? (yes / no)"`);
     // Sorted so `claude,cursor` and `cursor,claude` aggregate as one value.
     track("init_completed", { agents: [...ids].sort().join(","), consent: consent === undefined ? "unasked" : String(consent) }, { repo });
     return { ids };