@tritard/waterbrother 0.14.9 → 0.14.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.14.9",
+  "version": "0.14.11",
   "description": "Waterbrother: Grok-powered coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -76,18 +76,44 @@ When you use tools:
 - Never claim you ran commands you did not run.
 - If a tool fails, show the failure and recover.
 - You are primarily a coding assistant, but you can also have normal conversations. When the user wants to chat, just chat — be natural, helpful, and engaging. Do not constantly redirect to coding or push "what do you want to build?" when the user is clearly just talking.
-- Only use tools (file writes, shell commands) when the user asks for actual code work. Do not create files for joke requests, hypothetical questions, or non-engineering prompts.`;
+- Only use tools (file writes, shell commands) when the user asks for actual code work. Do not create files for joke requests, hypothetical questions, or non-engineering prompts.
+- You can call multiple tools in a single response. When multiple independent pieces of information are needed, make all calls in parallel for optimal performance. For example, if you need to read 3 files, read all 3 in one response rather than one at a time.`;
+
+const COMPACTION_SYSTEM_PROMPT = `You are compacting a coding assistant conversation for context resumption. Write a continuation summary that allows efficient resumption in a new context window where the conversation history will be replaced with this summary.
 
-const COMPACTION_SYSTEM_PROMPT = `You summarize coding assistant transcripts for context compaction.
 Output concise markdown with these sections:
-- Key Objectives
-- Decisions Made
-- Files and Commands
-- Open Work
+
+1. Task Overview
+   - The user's core request and success criteria
+   - Any clarifications or constraints they specified
+
+2. Current State
+   - What has been completed so far
+   - Files created, modified, or analyzed (with paths)
+   - Key outputs or artifacts produced
+
+3. Important Discoveries
+   - Technical constraints or requirements uncovered
+   - Decisions made and their rationale
+   - Errors encountered and how they were resolved
+   - Approaches tried that didn't work (and why)
+
+4. Next Steps
+   - Specific actions needed to complete the task
+   - Any blockers or open questions to resolve
+   - Priority order if multiple steps remain
+
+5. Context to Preserve
+   - User preferences or style requirements
+   - Domain-specific details that aren't obvious
+   - Any promises made to the user
+   - Active product state, task state, or experiment state
+
 Rules:
-- Preserve concrete facts, paths, commands, and unresolved TODOs.
-- Do not invent details.
-- Keep it brief and scannable.`;
+- Be concise but complete — err on the side of including information that prevents duplicate work or repeated mistakes.
+- Preserve concrete facts: file paths, commands, error messages, metric values.
+- Do not invent details. Only summarize what actually happened.
+- Write in a way that enables immediate resumption of the task.`;
 
 const PROFILE_PROMPTS = {
   coder: "Primary objective: shipping reliable code quickly with strong debugging discipline.",
@@ -101,6 +127,7 @@ const PROFILE_PROMPTS = {
 const MAX_TOOL_CALL_ITERATIONS = 24;
 const LOCAL_COMPACTION_TRANSCRIPT_CHARS = 400_000;
 const LOCAL_COMPACTION_MESSAGE_PREVIEW_CHARS = 280;
+const MAX_COMPACTION_CONSECUTIVE_FAILURES = 3;
 
 function buildSystemPrompt(profile, experienceMode = "standard", autonomyMode = "scoped", memory = "", executionContext = null) {
   const profileLine = PROFILE_PROMPTS[profile] || PROFILE_PROMPTS.coder;
@@ -296,6 +323,8 @@ export class Agent {
     this.autonomyMode = normalizeAutonomyMode(autonomyMode);
     this.requireTurnContracts = requireTurnContracts !== false;
     this.executionContext = null;
+    this._compactionFailures = 0;
+    this._transcriptPath = null;
 
     this.messages = [{ role: "system", content: buildSystemPrompt(profile, this.experienceMode, this.autonomyMode, this.memory) }];
     this.toolRuntime = createToolRuntime({
@@ -417,6 +446,11 @@ export class Agent {
   }
 
   async compactConversation({ keepLast = 24, signal } = {}) {
+    // Circuit breaker: stop trying after consecutive failures
+    if (this._compactionFailures >= MAX_COMPACTION_CONSECUTIVE_FAILURES) {
+      return { compacted: false, reason: "circuit_breaker", totalMessages: this.getSessionMessages().length };
+    }
+
     const keep = Math.max(8, Math.floor(Number(keepLast) || 24));
     const sessionMessages = this.getSessionMessages();
     if (sessionMessages.length <= keep + 2) {
@@ -461,14 +495,35 @@ export class Agent {
         usage = completion?.usage || null;
       } catch (error) {
         if (isAbortError(error)) throw error;
+        this._compactionFailures++;
         summaryBody = summarizeMessagesLocally(toSummarize);
         method = "local-fallback";
       }
     }
 
+    // Reset circuit breaker on success
+    this._compactionFailures = 0;
+
+    // Save transcript to disk before compacting — allows recovery of details
+    let transcriptNote = "";
+    try {
+      if (this.cwd) {
+        const { join } = await import("node:path");
+        const { mkdir, appendFile } = await import("node:fs/promises");
+        const dir = join(this.cwd, ".waterbrother");
+        await mkdir(dir, { recursive: true });
+        const transcriptPath = this._transcriptPath || join(dir, `transcript-${Date.now()}.jsonl`);
+        this._transcriptPath = transcriptPath;
+        for (const msg of toSummarize) {
+          await appendFile(transcriptPath, JSON.stringify(msg) + "\n", "utf8");
+        }
+        transcriptNote = `\n\nIf you need specific details from before compaction (like exact code snippets, error messages, or content you generated), read the full transcript at: ${transcriptPath}`;
+      }
+    } catch {}
+
     const summaryMessage = {
       role: "assistant",
-      content: `### Compacted context summary\n${summaryBody}`
+      content: `### Compacted context summary\n${summaryBody}${transcriptNote}`
     };
 
     this.messages = [

package/src/episodic.js

@@ -8,6 +8,26 @@ const MAX_EPISODIC_PROMPT_CHARS = 2000;
 const MAX_REMINDER_CHARS = 1500;
 const MAX_FILES_PER_EPISODE = 50;
 
+// Memory discipline: what NOT to save (adapted from CC's rules)
+// These patterns indicate facts that are derivable from the codebase
+// and should not waste episode storage or prompt space.
+function isNoiseKeyFact(fact) {
+  const lower = fact.toLowerCase();
+  // File paths without context — derivable from ls/find
+  if (/^(file|path|located at|found at|exists at):?\s/i.test(fact)) return true;
+  // Git history — derivable from git log/blame
+  if (/^(commit|merged|pushed|pulled|branched|rebased)\b/i.test(lower) && !/failed|error|broke/i.test(lower)) return true;
+  // Pure code patterns without decisions — derivable from reading the code
+  if (/^(uses|imports|exports|extends|implements|calls)\s/i.test(lower) && lower.length < 40) return true;
+  // Ephemeral state
+  if (/^(currently|right now|at the moment|in progress)\b/i.test(lower)) return true;
+  return false;
+}
+
+function filterKeyFacts(facts) {
+  return facts.filter((f) => !isNoiseKeyFact(f));
+}
+
 function memoryDir(cwd) {
   return path.join(cwd, ".waterbrother", "memory");
 }
@@ -126,7 +146,7 @@ export function compressEpisode({ task, receipt }) {
     outcome,
     filesChanged,
     filePatterns,
-    keyFacts: keyFacts.slice(0, 8),
+    keyFacts: filterKeyFacts(keyFacts).slice(0, 8),
     warnings: warnings.slice(0, 5),
     sentinelConcerns: sentinelConcerns.slice(0, 5),
     tags
@@ -176,7 +196,7 @@ export function compressSessionEpisode({ receipts = [], userMessages = [] }) {
     outcome: hasMutations ? "session-complete" : "session-readonly",
     filesChanged,
     filePatterns,
-    keyFacts: keyFacts.slice(0, 8),
+    keyFacts: filterKeyFacts(keyFacts).slice(0, 8),
     warnings: [],
     sentinelConcerns,
     tags