@posthog/agent 2.3.15 → 2.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/agent",
-  "version": "2.3.15",
+  "version": "2.3.21",
   "repository": "https://github.com/PostHog/code",
   "description": "TypeScript agent framework wrapping Claude Agent SDK with Git-based task execution for PostHog",
   "exports": {

package/src/adapters/claude/conversion/tool-use-to-acp.ts

@@ -1,3 +1,4 @@
+import fs from "node:fs";
 import path from "node:path";
 import type {
   PlanEntry,
@@ -179,18 +180,22 @@ export function toolInfoFromToolUse(
         : null;
       let newText: string = input?.new_string ? String(input.new_string) : "";
 
-      // If we have cached file content, show a full-file diff
-      if (
-        filePath &&
-        options?.cachedFileContent &&
-        filePath in options.cachedFileContent
-      ) {
-        const oldContent = options.cachedFileContent[filePath];
-        const newContent = input?.replace_all
-          ? oldContent.replaceAll(oldText ?? "", newText)
-          : oldContent.replace(oldText ?? "", newText);
-        oldText = oldContent;
-        newText = newContent;
+      // try to display a rich diff by first checking if file content is cached
+      // and valid (old_text exists in the content), then fall back to reading
+      // file from disk, then fall back to fragemented snippet diff
+      if (filePath && oldText !== null) {
+        const fileContent = resolveFileContent(
+          filePath,
+          oldText,
+          options?.cachedFileContent,
+        );
+        if (fileContent) {
+          const newContent = input?.replace_all
+            ? fileContent.replaceAll(oldText, newText)
+            : fileContent.replace(oldText, newText);
+          oldText = fileContent;
+          newText = newContent;
+        }
       }
 
       return {
@@ -759,6 +764,37 @@ export function planEntries(input: { todos: ClaudePlanEntry[] }): PlanEntry[] {
   }));
 }
 
+/**
+ * attempt to resolve full file contents for diff generation
+ *
+ * 1) check file content cache exists, and is valid (old_text in content)
+ * 2) if missing or invalid, read file from disk
+ * 3) if both fail, return null, we'll fall back to fragmented snippet diff
+ */
+function resolveFileContent(
+  filePath: string,
+  oldText: string,
+  cachedFileContent?: Record<string, string>,
+): string | null {
+  if (cachedFileContent && filePath in cachedFileContent) {
+    const cached = cachedFileContent[filePath];
+    if (cached.includes(oldText)) {
+      return cached;
+    }
+  }
+
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    if (content.includes(oldText)) {
+      return content;
+    }
+  } catch {
+    return null;
+  }
+
+  return null;
+}
+
 function markdownEscape(text: string): string {
   let escapedText = "```";
   for (const [m] of text.matchAll(/^```+/gm)) {

package/src/adapters/claude/session/instructions.ts

@@ -0,0 +1,19 @@
+const BRANCH_NAMING = `
+# Branch Naming
+
+When working in a detached HEAD state, create a descriptive branch name based on the work being done before committing. Do this automatically without asking the user.
+`;
+
+const PLAN_MODE = `
+# Plan Mode
+
+Only enter plan mode (EnterPlanMode) when the user is requesting a significant change in approach or direction mid-task. Do NOT enter plan mode for:
+- Confirmations or approvals ("yes", "looks good", "continue", "go ahead")
+- Minor clarifications or small adjustments
+- Answers to questions you asked (unless you are still in the initial planning phase and have not yet started executing)
+- Feedback that does not require replanning
+
+When in doubt, continue executing and incorporate the feedback inline.
+`;
+
+export const APPENDED_INSTRUCTIONS = BRANCH_NAMING + PLAN_MODE;

package/src/adapters/claude/session/options.ts

@@ -18,6 +18,7 @@ import {
 } from "../hooks";
 import type { CodeExecutionMode } from "../tools";
 import type { EffortLevel } from "../types";
+import { APPENDED_INSTRUCTIONS } from "./instructions";
 import { DEFAULT_MODEL } from "./models";
 import type { SettingsManager } from "./settings";
 
@@ -47,19 +48,13 @@ export interface BuildOptionsParams {
   effort?: EffortLevel;
 }
 
-const BRANCH_NAMING_INSTRUCTIONS = `
-# Branch Naming
-
-When working in a detached HEAD state, create a descriptive branch name based on the work being done before committing. Do this automatically without asking the user.
-`;
-
 export function buildSystemPrompt(
   customPrompt?: unknown,
 ): Options["systemPrompt"] {
   const defaultPrompt: Options["systemPrompt"] = {
     type: "preset",
     preset: "claude_code",
-    append: BRANCH_NAMING_INSTRUCTIONS,
+    append: APPENDED_INSTRUCTIONS,
   };
 
   if (!customPrompt) {
@@ -67,7 +62,7 @@ export function buildSystemPrompt(
   }
 
   if (typeof customPrompt === "string") {
-    return customPrompt + BRANCH_NAMING_INSTRUCTIONS;
+    return customPrompt + APPENDED_INSTRUCTIONS;
   }
 
   if (
@@ -78,7 +73,7 @@ export function buildSystemPrompt(
   ) {
     return {
       ...defaultPrompt,
-      append: customPrompt.append + BRANCH_NAMING_INSTRUCTIONS,
+      append: customPrompt.append + APPENDED_INSTRUCTIONS,
     };
   }