@posthog/agent 2.1.17 → 2.1.29

package/dist/server/bin.cjs

@@ -1175,7 +1175,7 @@ var import_uuid = require("uuid");
 // package.json
 var package_default = {
   name: "@posthog/agent",
-  version: "2.1.17",
+  version: "2.1.29",
   repository: "https://github.com/PostHog/twig",
   description: "TypeScript agent framework wrapping Claude Agent SDK with Git-based task execution for PostHog",
   exports: {
@@ -1247,11 +1247,11 @@ var package_default = {
   },
   devDependencies: {
     "@changesets/cli": "^2.27.8",
+    "@posthog/shared": "workspace:*",
+    "@twig/git": "workspace:*",
     "@types/bun": "latest",
     "@types/tar": "^6.1.13",
     minimatch: "^10.0.3",
-    "@posthog/shared": "workspace:*",
-    "@twig/git": "workspace:*",
     msw: "^2.12.7",
     tsup: "^8.5.1",
     tsx: "^4.20.6",
@@ -1259,16 +1259,16 @@ var package_default = {
     vitest: "^2.1.8"
   },
   dependencies: {
+    "@agentclientprotocol/sdk": "^0.14.0",
+    "@anthropic-ai/claude-agent-sdk": "0.2.42",
+    "@anthropic-ai/sdk": "^0.71.0",
+    "@hono/node-server": "^1.19.9",
+    "@modelcontextprotocol/sdk": "^1.25.3",
     "@opentelemetry/api-logs": "^0.208.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.208.0",
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-logs": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
-    "@agentclientprotocol/sdk": "^0.14.0",
-    "@anthropic-ai/claude-agent-sdk": "0.2.12",
-    "@anthropic-ai/sdk": "^0.71.0",
-    "@hono/node-server": "^1.19.9",
-    "@modelcontextprotocol/sdk": "^1.25.3",
     "@types/jsonwebtoken": "^9.0.10",
     commander: "^14.0.2",
     diff: "^8.0.2",
@@ -2234,19 +2234,9 @@ function streamEventToAcpNotifications(message, sessionId, toolUseCache, fileCon
   }
 }
 async function handleSystemMessage(message, context) {
-  const { session, sessionId, client, logger } = context;
+  const { sessionId, client, logger } = context;
   switch (message.subtype) {
     case "init":
-      if (message.session_id && session && !session.sessionId) {
-        session.sessionId = message.session_id;
-        if (session.taskRunId) {
-          await client.extNotification("_posthog/sdk_session", {
-            taskRunId: session.taskRunId,
-            sessionId: message.session_id,
-            adapter: "claude"
-          });
-        }
-      }
       break;
     case "compact_boundary":
       await client.extNotification("_posthog/compact_boundary", {
@@ -3211,7 +3201,7 @@ function buildSessionOptions(params) {
     ),
     ...params.onProcessSpawned && {
       spawnClaudeCodeProcess: buildSpawnWrapper(
-        params.sessionId ?? "unknown",
+        params.sessionId,
         params.onProcessSpawned,
         params.onProcessExited
       )
@@ -3220,8 +3210,11 @@ function buildSessionOptions(params) {
   if (process.env.CLAUDE_CODE_EXECUTABLE) {
     options.pathToClaudeCodeExecutable = process.env.CLAUDE_CODE_EXECUTABLE;
   }
-  if (params.sessionId) {
+  if (params.isResume) {
     options.resume = params.sessionId;
+    options.forkSession = false;
+  } else {
+    options.sessionId = params.sessionId;
   }
   if (params.additionalDirectories) {
     options.additionalDirectories = params.additionalDirectories;
@@ -3298,7 +3291,7 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
   async newSession(params) {
     this.checkAuthStatus();
     const meta = params._meta;
-    const internalSessionId = (0, import_uuid.v7)();
+    const sessionId = (0, import_uuid.v7)();
     const permissionMode = meta?.permissionMode && TWIG_EXECUTION_MODES.includes(meta.permissionMode) ? meta.permissionMode : "default";
     const mcpServers = parseMcpServers(params);
     await fetchMcpToolMetadata(mcpServers, this.logger);
@@ -3306,18 +3299,20 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       cwd: params.cwd,
       mcpServers,
       permissionMode,
-      canUseTool: this.createCanUseTool(internalSessionId),
+      canUseTool: this.createCanUseTool(sessionId),
       logger: this.logger,
       systemPrompt: buildSystemPrompt(meta?.systemPrompt),
       userProvidedOptions: meta?.claudeCode?.options,
-      onModeChange: this.createOnModeChange(internalSessionId),
+      sessionId,
+      isResume: false,
+      onModeChange: this.createOnModeChange(sessionId),
       onProcessSpawned: this.processCallbacks?.onProcessSpawned,
       onProcessExited: this.processCallbacks?.onProcessExited
     });
     const input = new Pushable();
     const q = (0, import_claude_agent_sdk.query)({ prompt: input, options });
     const session = this.createSession(
-      internalSessionId,
+      sessionId,
       q,
       input,
       permissionMode,
@@ -3325,19 +3320,23 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       options.abortController
     );
     session.taskRunId = meta?.taskRunId;
-    this.registerPersistence(
-      internalSessionId,
-      meta
-    );
+    this.registerPersistence(sessionId, meta);
+    if (meta?.taskRunId) {
+      await this.client.extNotification("_posthog/sdk_session", {
+        taskRunId: meta.taskRunId,
+        sessionId,
+        adapter: "claude"
+      });
+    }
     const modelOptions = await this.getModelConfigOptions();
     session.modelId = modelOptions.currentModelId;
     await this.trySetModel(q, modelOptions.currentModelId);
     this.sendAvailableCommandsUpdate(
-      internalSessionId,
+      sessionId,
       await getAvailableSlashCommands(q)
     );
     return {
-      sessionId: internalSessionId,
+      sessionId,
       configOptions: await this.buildConfigOptions(modelOptions)
     };
   }
@@ -3345,34 +3344,31 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
     return this.resumeSession(params);
   }
   async resumeSession(params) {
-    const { sessionId: internalSessionId } = params;
-    if (this.sessionId === internalSessionId) {
+    const meta = params._meta;
+    const sessionId = meta?.sessionId;
+    if (!sessionId) {
+      throw new Error("Cannot resume session without sessionId");
+    }
+    if (this.sessionId === sessionId) {
       return {};
     }
-    const meta = params._meta;
     const mcpServers = parseMcpServers(params);
     await fetchMcpToolMetadata(mcpServers, this.logger);
     const permissionMode = meta?.permissionMode && TWIG_EXECUTION_MODES.includes(meta.permissionMode) ? meta.permissionMode : "default";
     const { query: q, session } = await this.initializeQuery({
-      internalSessionId,
       cwd: params.cwd,
       permissionMode,
       mcpServers,
       systemPrompt: buildSystemPrompt(meta?.systemPrompt),
       userProvidedOptions: meta?.claudeCode?.options,
-      sessionId: meta?.sessionId,
+      sessionId,
+      isResume: true,
       additionalDirectories: meta?.claudeCode?.options?.additionalDirectories
     });
     session.taskRunId = meta?.taskRunId;
-    if (meta?.sessionId) {
-      session.sessionId = meta.sessionId;
-    }
-    this.registerPersistence(
-      internalSessionId,
-      meta
-    );
+    this.registerPersistence(sessionId, meta);
     this.sendAvailableCommandsUpdate(
-      internalSessionId,
+      sessionId,
       await getAvailableSlashCommands(q)
     );
     return {
@@ -3441,20 +3437,21 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       cwd: config.cwd,
       mcpServers: config.mcpServers,
       permissionMode: config.permissionMode,
-      canUseTool: this.createCanUseTool(config.internalSessionId),
+      canUseTool: this.createCanUseTool(config.sessionId),
       logger: this.logger,
       systemPrompt: config.systemPrompt,
       userProvidedOptions: config.userProvidedOptions,
       sessionId: config.sessionId,
+      isResume: config.isResume,
       additionalDirectories: config.additionalDirectories,
-      onModeChange: this.createOnModeChange(config.internalSessionId),
+      onModeChange: this.createOnModeChange(config.sessionId),
       onProcessSpawned: this.processCallbacks?.onProcessSpawned,
       onProcessExited: this.processCallbacks?.onProcessExited
     });
     const q = (0, import_claude_agent_sdk.query)({ prompt: input, options });
     const abortController = options.abortController;
     const session = this.createSession(
-      config.internalSessionId,
+      config.sessionId,
       q,
       input,
       config.permissionMode,
@@ -3647,6 +3644,7 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       }
       case "tool_progress":
       case "auth_status":
+      case "tool_use_summary":
         return null;
       default:
         unreachable(message, this.logger);
@@ -4260,19 +4258,36 @@ var PostHogAPIClient = class {
 };
 
 // src/session-log-writer.ts
-var SessionLogWriter = class {
+var SessionLogWriter = class _SessionLogWriter {
+  static FLUSH_DEBOUNCE_MS = 500;
+  static FLUSH_MAX_INTERVAL_MS = 5e3;
+  static MAX_FLUSH_RETRIES = 10;
+  static MAX_RETRY_DELAY_MS = 3e4;
   posthogAPI;
   pendingEntries = /* @__PURE__ */ new Map();
   flushTimeouts = /* @__PURE__ */ new Map();
+  lastFlushAttemptTime = /* @__PURE__ */ new Map();
+  retryCounts = /* @__PURE__ */ new Map();
   sessions = /* @__PURE__ */ new Map();
+  messageCounts = /* @__PURE__ */ new Map();
   logger;
   constructor(options = {}) {
     this.posthogAPI = options.posthogAPI;
     this.logger = options.logger ?? new Logger({ debug: false, prefix: "[SessionLogWriter]" });
   }
   async flushAll() {
+    const sessionIds = [...this.sessions.keys()];
+    const pendingCounts = sessionIds.map((id) => ({
+      id,
+      pending: this.pendingEntries.get(id)?.length ?? 0,
+      messages: this.messageCounts.get(id) ?? 0
+    }));
+    this.logger.info("flushAll called", {
+      sessions: sessionIds.length,
+      pending: pendingCounts
+    });
     const flushPromises = [];
-    for (const sessionId of this.sessions.keys()) {
+    for (const sessionId of sessionIds) {
       flushPromises.push(this.flush(sessionId));
     }
     await Promise.all(flushPromises);
@@ -4281,7 +4296,12 @@ var SessionLogWriter = class {
     if (this.sessions.has(sessionId)) {
       return;
     }
+    this.logger.info("Session registered", {
+      sessionId,
+      taskId: context.taskId
+    });
     this.sessions.set(sessionId, { context });
+    this.lastFlushAttemptTime.set(sessionId, Date.now());
   }
   isRegistered(sessionId) {
     return this.sessions.has(sessionId);
@@ -4289,8 +4309,16 @@ var SessionLogWriter = class {
   appendRawLine(sessionId, line) {
     const session = this.sessions.get(sessionId);
     if (!session) {
+      this.logger.warn("appendRawLine called for unregistered session", {
+        sessionId
+      });
       return;
     }
+    const count = (this.messageCounts.get(sessionId) ?? 0) + 1;
+    this.messageCounts.set(sessionId, count);
+    if (count % 10 === 1) {
+      this.logger.info("Messages received", { count, sessionId });
+    }
     try {
       const message = JSON.parse(line);
       const timestamp = (/* @__PURE__ */ new Date()).toISOString();
@@ -4326,24 +4354,56 @@ var SessionLogWriter = class {
   }
   async flush(sessionId) {
     const session = this.sessions.get(sessionId);
-    if (!session) return;
+    if (!session) {
+      this.logger.warn("flush: no session found", { sessionId });
+      return;
+    }
     this.emitCoalescedMessage(sessionId, session);
     const pending = this.pendingEntries.get(sessionId);
-    if (!this.posthogAPI || !pending?.length) return;
+    if (!this.posthogAPI || !pending?.length) {
+      this.logger.info("flush: nothing to persist", {
+        sessionId,
+        hasPosthogAPI: !!this.posthogAPI,
+        pendingCount: pending?.length ?? 0
+      });
+      return;
+    }
     this.pendingEntries.delete(sessionId);
     const timeout = this.flushTimeouts.get(sessionId);
     if (timeout) {
       clearTimeout(timeout);
       this.flushTimeouts.delete(sessionId);
     }
+    this.lastFlushAttemptTime.set(sessionId, Date.now());
     try {
       await this.posthogAPI.appendTaskRunLog(
         session.context.taskId,
         session.context.runId,
         pending
       );
+      this.retryCounts.set(sessionId, 0);
+      this.logger.info("Flushed session logs", {
+        sessionId,
+        entryCount: pending.length
+      });
     } catch (error) {
-      this.logger.error("Failed to persist session logs:", error);
+      const retryCount = (this.retryCounts.get(sessionId) ?? 0) + 1;
+      this.retryCounts.set(sessionId, retryCount);
+      if (retryCount >= _SessionLogWriter.MAX_FLUSH_RETRIES) {
+        this.logger.error(
+          `Dropping ${pending.length} session log entries after ${retryCount} failed flush attempts`,
+          { sessionId, error }
+        );
+        this.retryCounts.set(sessionId, 0);
+      } else {
+        this.logger.error(
+          `Failed to persist session logs (attempt ${retryCount}/${_SessionLogWriter.MAX_FLUSH_RETRIES}):`,
+          error
+        );
+        const currentPending = this.pendingEntries.get(sessionId) ?? [];
+        this.pendingEntries.set(sessionId, [...pending, ...currentPending]);
+        this.scheduleFlush(sessionId);
+      }
     }
   }
   isAgentMessageChunk(message) {
@@ -4389,7 +4449,21 @@ var SessionLogWriter = class {
   scheduleFlush(sessionId) {
     const existing = this.flushTimeouts.get(sessionId);
     if (existing) clearTimeout(existing);
-    const timeout = setTimeout(() => this.flush(sessionId), 500);
+    const retryCount = this.retryCounts.get(sessionId) ?? 0;
+    const lastAttempt = this.lastFlushAttemptTime.get(sessionId) ?? 0;
+    const elapsed = Date.now() - lastAttempt;
+    let delay2;
+    if (retryCount > 0) {
+      delay2 = Math.min(
+        _SessionLogWriter.FLUSH_DEBOUNCE_MS * 2 ** retryCount,
+        _SessionLogWriter.MAX_RETRY_DELAY_MS
+      );
+    } else if (elapsed >= _SessionLogWriter.FLUSH_MAX_INTERVAL_MS) {
+      delay2 = 0;
+    } else {
+      delay2 = _SessionLogWriter.FLUSH_DEBOUNCE_MS;
+    }
+    const timeout = setTimeout(() => this.flush(sessionId), delay2);
     this.flushTimeouts.set(sessionId, timeout);
   }
 };
@@ -10363,6 +10437,7 @@ var AgentServer = class {
       });
       const mode = this.getEffectiveMode(payload);
       if (mode === "background") {
+        await this.session.logWriter.flushAll();
         await this.signalTaskComplete(payload, result.stopReason);
       } else {
         this.logger.info("Interactive mode - staying open for conversation");
@@ -10371,6 +10446,9 @@ var AgentServer = class {
       this.logger.error("Failed to send initial task message", error);
       const mode = this.getEffectiveMode(payload);
       if (mode === "background") {
+        if (this.session) {
+          await this.session.logWriter.flushAll();
+        }
         await this.signalTaskComplete(payload, "error");
       }
     }
@@ -10385,10 +10463,24 @@ After completing the requested changes:
 3. Push the branch to origin
 4. Create a pull request using \`gh pr create\` with a descriptive title and body
 
-Important: Always create the PR. Do not ask for confirmation.
+Important:
+- Always create the PR. Do not ask for confirmation.
+- Do NOT add "Co-Authored-By" trailers to commit messages.
+- Do NOT add "Generated with [Claude Code]" or similar attribution lines to PR descriptions.
 `;
   }
   async signalTaskComplete(payload, stopReason) {
+    if (this.session?.payload.run_id === payload.run_id) {
+      try {
+        await this.session.logWriter.flush(payload.run_id);
+      } catch (error) {
+        this.logger.warn("Failed to flush session logs before completion", {
+          taskId: payload.task_id,
+          runId: payload.run_id,
+          error
+        });
+      }
+    }
     const status = stopReason === "cancelled" ? "cancelled" : stopReason === "error" ? "failed" : "completed";
     try {
       await this.posthogAPI.updateTaskRun(payload.task_id, payload.run_id, {