@nanonets/graft 0.22.1 → 0.23.0

package/dist/cli.js

@@ -48,7 +48,7 @@ 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 { currentSessionCost } from "./notes/session-cost.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";
@@ -165,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;
 }
 /**
@@ -292,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 })
@@ -380,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", ".")
@@ -610,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)
@@ -623,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)
@@ -750,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) {
@@ -1192,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;
@@ -1354,6 +1350,20 @@ async function runInitCommand(dir, opts) {
     }
     const wantClaude = ids.includes("claude");
     const cliPath = fileURLToPath(import.meta.url);
+    // 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) {
+            const { place } = ensureRepoHome(target);
+            const created = place.git ? ensureRepoTrail(place.checkout) : false;
+            notesHome.set(target, { created, dir: place.git ? place.checkout : place.dir });
+            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
@@ -1369,17 +1379,6 @@ async function runInitCommand(dir, opts) {
     // 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.
-    const notesHome = new Map();
-    if (TRAIL)
-        for (const target of targets) {
-            const { place } = ensureRepoHome(target);
-            const created = place.git ? ensureRepoTrail(place.checkout) : false;
-            notesHome.set(target, { created, dir: place.git ? place.checkout : place.dir });
-            if (place.git)
-                maybeRefreshBranches(place.checkout);
-        }
     const reports = [];
     for (const target of targets) {
         if (verbose && target !== repo)
@@ -1523,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);
         }
@@ -1538,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.
@@ -1590,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)`);