claude-teammate 0.1.311 → 0.1.313

package/package.json

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

package/src/claude/prompts.js

@@ -32,6 +32,14 @@ const LANGUAGE_PRESERVATION_RULES = [
   "When writing Vietnamese, always use proper Vietnamese diacritics (e.g. 'Ho so nang luc' is wrong; 'Hồ sơ năng lực' is correct)."
 ].join(" ");
 
+// Only the 4 typographic characters below may be ASCII-folded. This rule must
+// never be generalized into "non-ASCII not allowed in code" — it does not touch
+// letters with diacritics (Vietnamese accents, đ, etc.), which stay exactly as written.
+const SMART_PUNCTUATION_RULE =
+  "When editing code or markup, only these typographic characters are disallowed and must be replaced: " +
+  'smart quotes -> ", em/en dashes -> -. ' +
+  "This applies ONLY to those characters. Never alter letters with diacritics or any other natural-language text; keep it exactly as written.";
+
 export function buildRepoSelectionSystemPrompt() {
   return [
     "You are selecting the single repository that a Jira implementation task should use.",
@@ -338,8 +346,8 @@ export function buildGitHubPRImplementationSystemPrompt() {
     "Implement the plan from the pull request description.",
     "Read the epic memory snapshot before making changes so you can reuse known repo-specific build or verification knowledge and avoid repeating past mistakes.",
     "Run only the commands needed to inspect, edit, and test.",
-    'When editing code or markup, smart quotes and em/en dashes are not allowed; replace them if encountered: smart quotes -> ", em/en dashes -> -.',
     LANGUAGE_PRESERVATION_RULES,
+    SMART_PUNCTUATION_RULE,
     "Only perform frontend/browser verification when the task explicitly asks for UI validation, when the latest human feedback asks for visual confirmation, or when the affected change is clearly user-facing and the verification path is obvious from the repository or epic memory.",
     "When frontend/browser verification is needed, prefer the narrowest useful check, such as an existing targeted test or a short focused Playwright flow, instead of broad exploratory verification.",
     "Do not spend significant time inferring how to start the app or configuring Playwright unless that verification is necessary to confirm the requested change.",
@@ -396,7 +404,7 @@ ${formatPriorWorkContext(input)}
 Instructions:
 - Checkout the branch above in this repository.
 - Implement the plan described in the pull request body.
-- Smart quotes and em/en dashes are not allowed. Use: smart quotes -> ", em/en dashes -> -.
+- Only these typographic characters are disallowed in code/markup and must be replaced: smart quotes -> ", em/en dashes -> -. This does not apply to diacritics or other natural-language text — keep those exactly as written.
 - If the latest human PR comment requests a change or reports a problem, address that feedback as part of this implementation run.
 - Only use frontend/browser verification when it is needed to confirm the requested change. If verification is needed, prefer existing targeted checks or the most direct focused Playwright flow you can determine from the repository or epic memory.
 - Do not spend significant time inferring app startup or Playwright setup unless visual confirmation is actually necessary for this PR.
@@ -414,6 +422,8 @@ export function buildGitHubPRPlanBreakdownSystemPrompt() {
     "Each step must be self-contained: a single developer can implement it in isolation by reading only that step description.",
     "Steps must be ordered by dependency — steps that others depend on come first.",
     "Each step description must be specific enough to act on without reading the full PR body: name the exact files, classes, functions, or fields to change and what the change is.",
+    "Each step must describe a product code, configuration, schema, or test-code change in the target repository.",
+    "Do not create process-only steps such as opening a terminal, changing directories, locating files, reading files, running grep/ls/find, or using an editor.",
     "Aim for 3-8 steps. Do not produce trivial steps or steps that only say 'test' or 'verify'.",
     LANGUAGE_PRESERVATION_RULES,
     "Return only structured output matching the provided schema.",
@@ -436,9 +446,10 @@ ${JSON.stringify(input.memory?.epic || {}, null, 2)}
 Instructions:
 - Produce an ordered list of atomic implementation steps.
 - Each step must be specific enough to implement without reading this full description again: name the exact files, classes, methods, or enum values involved.
+- Each step must describe a code/config/schema/test-code change, not an execution tactic or repository exploration action.
 - Steps must be ordered by dependency (earlier steps must not depend on later ones).
 - Aim for 3-8 steps covering the full scope of the plan.
-- Do not include steps for committing, pushing, or testing unless the test is part of the plan.`;
+- Do not include steps for committing, pushing, opening a terminal, changing directories, locating files, reading files, running grep/ls/find, using an editor, or testing unless the test is part of the plan.`;
 }
 
 export function buildGitHubPRStepBreakdownSystemPrompt() {
@@ -447,6 +458,8 @@ export function buildGitHubPRStepBreakdownSystemPrompt() {
     "Each sub-step must be self-contained and implementable by reading only that sub-step description.",
     "Sub-steps must be ordered by dependency.",
     "Each sub-step must be specific: name the exact files, classes, functions, or fields to change.",
+    "Each sub-step must describe a code/config/schema/test-code change, not an execution tactic or repository exploration action.",
+    "Do not create process-only sub-steps such as opening a terminal, changing directories, locating files, reading files, running grep/ls/find, or using an editor.",
     "Do not produce trivial sub-steps.",
     LANGUAGE_PRESERVATION_RULES,
     "Return only structured output matching the provided schema."
@@ -465,8 +478,9 @@ ${input.step}
 Instructions:
 - Produce 2-4 ordered atomic sub-steps that together complete this step.
 - Each sub-step must be specific: name the exact files, classes, methods, or values to change.
+- Each sub-step must describe a code/config/schema/test-code change, not an execution tactic or repository exploration action.
 - Sub-steps must be ordered by dependency.
-- Do not include steps for committing, pushing, or testing.`;
+- Do not include steps for committing, pushing, opening a terminal, changing directories, locating files, reading files, running grep/ls/find, using an editor, or testing.`;
 }
 
 export function buildGitHubPRImplementationStepSystemPrompt() {
@@ -478,8 +492,8 @@ export function buildGitHubPRImplementationStepSystemPrompt() {
     "Implement only the specific step described — do not implement other parts of the larger plan.",
     "Read the epic memory snapshot before making changes so you can reuse known repo-specific knowledge and avoid repeating past mistakes.",
     "Run only the commands needed to inspect, edit, and test this specific step.",
-    "When editing code or markup, smart quotes and em/en dashes are not allowed; replace them if encountered.",
     LANGUAGE_PRESERVATION_RULES,
+    SMART_PUNCTUATION_RULE,
     "Do not run git add, git commit, or git push. The outer worker will handle all git operations.",
     "If you are blocked on this step, return result=stuck with a concise reason.",
     "Return only structured output matching the provided schema.",
@@ -512,7 +526,7 @@ ${formatPriorWorkContext(input)}
 Instructions:
 - Checkout the branch above in this repository.
 - Implement only the step described above. Do not implement other parts of the plan.
-- Smart quotes and em/en dashes are not allowed. Use: smart quotes -> ", em/en dashes -> -.
+- Only these typographic characters are disallowed in code/markup and must be replaced: smart quotes -> ", em/en dashes -> -. This does not apply to diacritics or other natural-language text — keep those exactly as written.
 - Do not commit or push; leave modified files in the working tree.
 - Return summary as 1-2 sentences describing what changed in this step.
 - If successful, return result=implemented.

package/src/worker/pr-session-store.js

@@ -2,11 +2,12 @@ import { mkdir, readFile } from "node:fs/promises";
 import path from "node:path";
 import { atomicWriteFile } from "../fs-atomic.js";
 
-// Durable map of Claude session ids keyed by repo + PR branch, so a PR comment
+// Durable map of Claude session ids keyed by repo + PR branch + PR scope, so a PR comment
 // or reopen can resume the prior conversation instead of rebuilding context
 // from memory (which previously dropped diffs / decisions and caused the model
-// to "forget" earlier work). Stored under the same memory dir as issue memory
-// so it survives worker restarts.
+// to "forget" earlier work). The PR scope prevents separate PRs that reuse a
+// generic branch name from inheriting each other's Claude conversation.
+// Stored under the same memory dir as issue memory so it survives worker restarts.
 const SESSIONS_FILE = "pr-sessions.json";
 const MAX_ENTRIES = 1000;
 
@@ -14,8 +15,13 @@ function sessionStorePath(projectRoot) {
   return path.join(projectRoot, "memory", SESSIONS_FILE);
 }
 
-function sessionKey(repoUrl, branchName) {
-  return `${String(repoUrl || "").trim()}#${String(branchName || "").trim()}`;
+function sessionKey(repoUrl, branchName, scope = "") {
+  const parts = [String(repoUrl || "").trim(), String(branchName || "").trim()];
+  const normalizedScope = String(scope || "").trim();
+  if (normalizedScope) {
+    parts.push(normalizedScope);
+  }
+  return parts.join("#");
 }
 
 async function readStore(projectRoot) {
@@ -29,12 +35,12 @@ async function readStore(projectRoot) {
   }
 }
 
-export async function loadPrSessionId(projectRoot, repoUrl, branchName) {
+export async function loadPrSessionId(projectRoot, repoUrl, branchName, scope = "") {
   if (!projectRoot || !branchName) {
     return "";
   }
   const store = await readStore(projectRoot);
-  const entry = store[sessionKey(repoUrl, branchName)];
+  const entry = store[sessionKey(repoUrl, branchName, scope)];
   return entry && typeof entry.session_id === "string" ? entry.session_id : "";
 }
 
@@ -42,14 +48,17 @@ export async function loadPrSessionId(projectRoot, repoUrl, branchName) {
 // never lose each other's entries.
 let writeChain = Promise.resolve();
 
-export async function savePrSessionId(projectRoot, repoUrl, branchName, sessionId) {
+export async function savePrSessionId(projectRoot, repoUrl, branchName, scopeOrSessionId, maybeSessionId) {
+  const hasScope = maybeSessionId !== undefined;
+  const scope = hasScope ? scopeOrSessionId : "";
+  const sessionId = hasScope ? maybeSessionId : scopeOrSessionId;
   if (!projectRoot || !branchName || !sessionId) {
     return;
   }
   writeChain = writeChain
     .then(async () => {
       const store = await readStore(projectRoot);
-      store[sessionKey(repoUrl, branchName)] = {
+      store[sessionKey(repoUrl, branchName, scope)] = {
         session_id: String(sessionId).trim(),
         updated_at: new Date().toISOString()
       };

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

@@ -2,8 +2,7 @@ import {
   isClaudeCliError,
   runClaudeImplementation,
   runClaudeImplementationPlanBreakdown,
-  runClaudeImplementationStep,
-  runClaudeStepBreakdown
+  runClaudeImplementationStep
 } from "../claude.js";
 import {
   branchHasChangesAgainstMain,
@@ -30,13 +29,23 @@ import {
   formatPullRequestOutcomeComment,
   getNextPlanStep,
   hasImplementationPlan,
-  replaceStepWithSubSteps,
   setImplementationPlan,
   setPullRequestStatus,
+  stripImplementationPlan,
   tickPlanStep
 } from "./pull-request.js";
 import { extractJiraKey, parseOptionalInt, summarizeForLog, toErrorMessage } from "./utils.js";
 
+const STEP_BRANCH_DIFF_MAX_CHARS = 3000;
+
+function truncateForPrompt(value, maxChars, label) {
+  const text = String(value || "");
+  if (text.length <= maxChars) {
+    return text;
+  }
+  return `${text.slice(0, maxChars)}\n\n[${label}: ${text.length - maxChars} chars omitted]`;
+}
+
 async function commitPartialPullRequestChanges(repo, detail, logger) {
   try {
     const commitResult = await commitAndPushRepoChanges(
@@ -81,7 +90,6 @@ export function createPullRequestImplementationServices(overrides = {}) {
     runClaudeImplementation,
     runClaudeImplementationPlanBreakdown,
     runClaudeImplementationStep,
-    runClaudeStepBreakdown,
     commitAndPushRepoChanges,
     prepareRepoForBranch,
     persistEpicImplementationKnowledge,
@@ -186,9 +194,13 @@ export async function processPullRequestImplementation({
     // it from memory (which dropped diffs/decisions and caused re-work). The
     // branchDiff + latestComment below remain as the fallback when no session
     // id is stored or the stored id is stale.
-    const resumeSessionId = await loadPrSessionId(projectRoot, repo.url, detail.headRef);
+    const prSessionScope =
+      [githubIssueMemory?.jira_key, detail.number, detail.url].filter(Boolean).map(String).join("#") ||
+      detail.headRef ||
+      issueKey;
+    const resumeSessionId = await loadPrSessionId(projectRoot, repo.url, detail.headRef, prSessionScope);
     const onSessionId = (sessionId) => {
-      void savePrSessionId(projectRoot, repo.url, detail.headRef, sessionId);
+      void savePrSessionId(projectRoot, repo.url, detail.headRef, prSessionScope, sessionId);
     };
 
     // Re-ground the run on any work earlier runs already committed to this
@@ -198,12 +210,17 @@ export async function processPullRequestImplementation({
       typeof services.getBranchDiffAgainstBase === "function"
         ? await services.getBranchDiffAgainstBase(repoPath, detail.baseRef)
         : "";
+    const stepBranchDiff = truncateForPrompt(
+      branchDiff,
+      STEP_BRANCH_DIFF_MAX_CHARS,
+      "branch diff truncated for step prompt"
+    );
 
     // Proactively break down large PRs before attempting full implementation
     if (!inStepMode && nextBody.length > 5000) {
       try {
         const proactiveBreakdown = await services.runClaudeImplementationPlanBreakdown({
-          pullRequest: { ...detail, body: nextBody.slice(0, 8000) },
+          pullRequest: { ...detail, body: stripImplementationPlan(nextBody).slice(0, 8000) },
           memory: { epic: epicSnapshot },
           issueKey,
           logger
@@ -269,7 +286,7 @@ export async function processPullRequestImplementation({
         step: stepText,
         memory: { epic: epicSnapshot },
         epicContext: epicMemory,
-        branchDiff,
+        branchDiff: stepBranchDiff,
         repoPath,
         repoPaths: repoAccess.repoPaths,
         branchName: detail.headRef,
@@ -504,7 +521,7 @@ export async function processPullRequestImplementation({
             const issueKey = githubIssueMemory?.jira_key || `PR-${detail.number}`;
             const epicSnapshot = buildEpicMemoryPromptSnapshot(epicMemory);
             const breakdown = await services.runClaudeImplementationPlanBreakdown({
-              pullRequest: { ...detail, body: nextBody.slice(0, 8000) },
+              pullRequest: { ...detail, body: stripImplementationPlan(nextBody).slice(0, 8000) },
               memory: { epic: epicSnapshot },
               issueKey,
               logger
@@ -527,38 +544,15 @@ export async function processPullRequestImplementation({
             });
           }
         }
-        // Try to split the failing step into sub-steps before giving up permanently.
         if (inStepMode && stepText) {
-          try {
-            const issueKey = githubIssueMemory?.jira_key || `PR-${detail.number}`;
-            const subBreakdown = await services.runClaudeStepBreakdown({
-              pullRequest: { ...detail },
-              step: stepText,
-              issueKey,
-              logger
-            });
-            if (subBreakdown?.steps?.length > 1) {
-              const splitBody = setPullRequestStatus(
-                replaceStepWithSubSteps(nextBody, stepText, subBreakdown.steps),
-                "IMPLEMENTING"
-              );
-              await github.updatePullRequest(repo.url, detail.number, { title: detail.title, body: splitBody });
-              await logger.info("Split too-large step into sub-steps", {
-                repo: repo.url,
-                pr: detail.number,
-                subSteps: subBreakdown.steps.length
-              });
-              return buildDraftPrState({ ...detail, body: splitBody }, "IMPLEMENTING", "implementing");
-            }
-          } catch (stepBreakdownError) {
-            await logger.error("Failed to split stuck step into sub-steps", {
-              repo: repo.url,
-              pr: detail.number,
-              error: stepBreakdownError
-            });
-          }
+          await logger.error("Pull request implementation step is too large; stopping without recursive breakdown", {
+            repo: repo.url,
+            pr: detail.number,
+            step: summarizeForLog(stepText)
+          });
         }
-        // Step could not be subdivided further → permanent stuck.
+        // A planned step that still exceeds the prompt budget should stop here
+        // instead of recursively expanding the PR body with more generated steps.
         // Otherwise (no plan yet, breakdown failed) → allow auto-retry by preserving STUCK_AT.
         const promptTooLongComment = inStepMode
           ? "Even a single implementation step is too large for Claude to process. Please split this PR into smaller, more focused changes."

package/src/worker/pull-request.js

@@ -132,15 +132,30 @@ const PLAN_START = "<!-- tm8:steps -->";
 const PLAN_END = "<!-- /tm8:steps -->";
 const UNCHECKED_STEP_RE = /^- \[ \] (.+)$/mu;
 const CHECKED_STEP_RE = /^- \[x\] /mu;
+const MAX_IMPLEMENTATION_PLAN_STEPS = 20;
+const MAX_STEP_BREAKDOWN_STEPS = 4;
+const MAX_IMPLEMENTATION_STEP_CHARS = 1000;
 
 export function hasImplementationPlan(body) {
   const s = String(body || "");
   return s.includes(PLAN_START) && s.includes(PLAN_END);
 }
 
+export function stripImplementationPlan(body) {
+  const normalized = String(body || "");
+  if (!hasImplementationPlan(normalized)) {
+    return normalized;
+  }
+  return normalized
+    .replace(new RegExp(`\\n*${escapeRegExpStr(PLAN_START)}[\\s\\S]*?${escapeRegExpStr(PLAN_END)}`, "u"), "")
+    .trimEnd();
+}
+
 export function setImplementationPlan(body, steps) {
   const normalized = String(body || "");
-  const planLines = steps.map((step) => `- [ ] ${step}`).join("\n");
+  const planLines = normalizeImplementationSteps(steps, MAX_IMPLEMENTATION_PLAN_STEPS)
+    .map((step) => `- [ ] ${step}`)
+    .join("\n");
   const planBlock = `${PLAN_START}\n${planLines}\n${PLAN_END}`;
   if (hasImplementationPlan(normalized)) {
     return normalized.replace(
@@ -173,7 +188,9 @@ export function replaceStepWithSubSteps(body, stepText, subSteps) {
     return body;
   }
   const escaped = stepText.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
-  const subLines = subSteps.map((s) => `- [ ] ${s}`).join("\n");
+  const subLines = normalizeImplementationSteps(subSteps, MAX_STEP_BREAKDOWN_STEPS)
+    .map((s) => `- [ ] ${s}`)
+    .join("\n");
   return String(body || "").replace(new RegExp(`^- \\[ \\] ${escaped}$`, "mu"), subLines);
 }
 
@@ -192,6 +209,25 @@ function escapeRegExpStr(value) {
   return String(value).replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 }
 
+function normalizeImplementationSteps(steps, maxSteps) {
+  if (!Array.isArray(steps)) {
+    return [];
+  }
+  return steps
+    .map((step) =>
+      String(step || "")
+        .replace(/\s+/gu, " ")
+        .trim()
+    )
+    .filter(Boolean)
+    .slice(0, maxSteps)
+    .map((step) =>
+      step.length > MAX_IMPLEMENTATION_STEP_CHARS
+        ? `${step.slice(0, MAX_IMPLEMENTATION_STEP_CHARS - 3).trimEnd()}...`
+        : step
+    );
+}
+
 export function formatPullRequestOutcomeComment(summary, fallback) {
   const normalized = String(summary || "").trim();
   return normalized || fallback;