claude-teammate 0.1.317 → 0.1.319

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-teammate",
-  "version": "0.1.317",
+  "version": "0.1.319",
   "description": "CLI bootstrapper for Claude Teammate.",
   "license": "MIT",
   "type": "module",

package/src/claude/prompts.js

@@ -23,14 +23,37 @@ function formatPriorWorkContext(input) {
   return `${sections.join("\n")}\n`;
 }
 
-// Pre-baked code-graph grounding (symbols + call paths) injected by the worker.
-// Empty when codegraph is unavailable, so prompts are unchanged in that case.
+// Code-graph grounding injected by the worker. Two parts, each optional:
+//  1. a pre-baked seed (symbols + call paths from one explore query)
+//  2. usage instructions so Claude can drive codegraph itself via Bash for
+//     adaptive drill-down (the seed is one query; the live tool is unlimited)
+// Both empty when codegraph is unavailable, so prompts are unchanged then.
 function formatCodegraphContext(input) {
   const ctx = String(input.codegraphContext || "").trim();
-  if (!ctx) {
+  const repoPath = String(input.codegraphRepoPath || "").trim();
+  const bin = String(input.codegraphBin || "").trim();
+  if (!ctx && !(bin && repoPath)) {
     return "";
   }
-  return `\nCode graph context (symbols + call paths relevant to this task — use it to locate code precisely and avoid hallucinating APIs that do not exist in this repository):\n${ctx}\n`;
+  const sections = [];
+  if (ctx) {
+    sections.push(
+      `Code graph context (symbols + call paths relevant to this task — use it to locate code precisely and avoid hallucinating APIs that do not exist in this repository):\n${ctx}`
+    );
+  }
+  if (bin && repoPath) {
+    sections.push(
+      [
+        "Code graph tool: a CodeGraph index of this repository is already built. When you need to locate a symbol, trace call paths, or gauge blast radius before editing, run these via Bash. ALWAYS pass `-p` to point at the indexed checkout (your working directory is a separate worktree without an index):",
+        `- ${bin} explore "<what you are looking for>" -p ${repoPath}`,
+        `- ${bin} node <SymbolOrFile> -p ${repoPath}`,
+        `- ${bin} callers <Symbol> -p ${repoPath}`,
+        `- ${bin} impact <Symbol> -p ${repoPath}`,
+        "Prefer these over blind grep when chasing how code connects. The tool is optional — if a command errors, fall back to Read/Grep and keep going."
+      ].join("\n")
+    );
+  }
+  return `\n${sections.join("\n\n")}\n`;
 }
 
 const INCLUDE_RESOURCE_LINKS_RULE =

package/src/skills/index.js

@@ -1,5 +1,6 @@
-import { mkdir, readdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readdir, readFile } from "node:fs/promises";
 import path from "node:path";
+import { atomicWriteFile } from "../fs-atomic.js";
 import {
   extractSkillFailures,
   inferBypassedSkills,
@@ -665,7 +666,10 @@ async function appendSkillFixEvent(eventsRoot, fields) {
       if (!Array.isArray(events)) events = [];
       events.unshift({ ts: new Date().toISOString(), ...fields });
       events = events.slice(0, SKILL_FIX_EVENTS_MAX);
-      await writeFile(file, JSON.stringify(events, null, 2), "utf8");
+      // Atomic write (tmp + rename) so a concurrent reader never sees a
+      // half-written file. The per-path write chain serializes writes but not
+      // reads-vs-writes; rename gives readers all-or-nothing.
+      await atomicWriteFile(file, JSON.stringify(events, null, 2));
     } catch {
       // never throw — event logging is best-effort
     }

package/src/worker/codegraph-context.js

@@ -101,6 +101,14 @@ export async function exploreCodegraph(repoPath, query, logger) {
   return out.length > CONTEXT_MAX_CHARS ? `${out.slice(0, CONTEXT_MAX_CHARS)}\n[codegraph context truncated]` : out;
 }
 
+// Public: resolved absolute path to the codegraph binary (or null when not
+// found). Lets the prompt layer tell Claude exactly which binary to invoke via
+// Bash — robust to the implementation subprocess having a thinner PATH than the
+// worker. Memoized via resolveCodegraphBin; warns at most once.
+export async function getCodegraphBin(logger) {
+  return resolveCodegraphBin(logger);
+}
+
 // Test seam: reset the memoized binary resolution.
 export function __resetCodegraphBinForTests() {
   resolvedBin = undefined;

package/src/worker/pull-request-workflow-support.js

@@ -14,7 +14,7 @@ import {
   prepareRepoForBranch,
   removeWorktree
 } from "../repo.js";
-import { ensureCodegraphIndex, exploreCodegraph } from "./codegraph-context.js";
+import { ensureCodegraphIndex, exploreCodegraph, getCodegraphBin } from "./codegraph-context.js";
 import { buildEpicMemoryPromptSnapshot, persistEpicImplementationKnowledge } from "./epic-memory.js";
 import {
   clearForgePullRequestBlocked,
@@ -201,11 +201,20 @@ export async function processPullRequestImplementation({
       await ensureGitExcludes(cgRepoPath, [".codegraph/"]);
       await ensureCodegraphIndex(cgRepoPath, logger);
     }
+    // Query an indexed checkout, NOT the worktree. The worktree (repoPath) is a
+    // `-wt-` sibling with no .codegraph/, so exploring it would always return
+    // empty. The primary clone (repo.local_path) is the one we just indexed and
+    // reflects the existing codebase Claude must ground against.
+    const codegraphQueryPath = codegraphRepoPaths.includes(repo.local_path) ? repo.local_path : repoPath;
     const codegraphContext = await exploreCodegraph(
-      repoPath,
+      codegraphQueryPath,
       `${issueKey} ${detail.title} ${stripImplementationPlan(nextBody).slice(0, 500)}`,
       logger
     );
+    // Absolute binary path so the prompt can tell Claude exactly what to run via
+    // Bash for adaptive drill-down (codegraph explore/node/callers/impact -p ...).
+    // Null when codegraph is unavailable — the prompt then omits the usage block.
+    const codegraphBin = await getCodegraphBin(logger);
 
     // Resume the prior Claude conversation for this PR branch so a follow-up
     // comment / reopen keeps the model's earlier context instead of rebuilding
@@ -303,6 +312,8 @@ export async function processPullRequestImplementation({
         pullRequest: { ...detail, body: nextBody },
         step: stepText,
         codegraphContext,
+        codegraphRepoPath: codegraphQueryPath,
+        codegraphBin,
         memory: { epic: epicSnapshot },
         epicContext: epicMemory,
         branchDiff: stepBranchDiff,
@@ -368,6 +379,8 @@ export async function processPullRequestImplementation({
         latestComment,
         branchDiff,
         codegraphContext,
+        codegraphRepoPath: codegraphQueryPath,
+        codegraphBin,
         repoPath,
         repoPaths: repoAccess.repoPaths,
         branchName: detail.headRef,