@posthog/agent 2.1.115 → 2.1.120

package/dist/agent.js

@@ -276,7 +276,7 @@ import { v7 as uuidv7 } from "uuid";
 // package.json
 var package_default = {
   name: "@posthog/agent",
-  version: "2.1.115",
+  version: "2.1.120",
   repository: "https://github.com/PostHog/twig",
   description: "TypeScript agent framework wrapping Claude Agent SDK with Git-based task execution for PostHog",
   exports: {
@@ -657,6 +657,10 @@ ${chunk.resource.text}
 function promptToClaude(prompt) {
   const content = [];
   const context = [];
+  const prContext = prompt._meta?.prContext;
+  if (typeof prContext === "string") {
+    content.push(sdkText(prContext));
+  }
   for (const chunk of prompt.prompt) {
     processPromptChunk(chunk, content, context);
   }
@@ -2103,9 +2107,10 @@ async function handleAskUserQuestionTool(context) {
     }
   });
   if (response.outcome?.outcome !== "selected") {
+    const customMessage = response._meta?.message;
     return {
       behavior: "deny",
-      message: "User cancelled the questions",
+      message: typeof customMessage === "string" ? customMessage : "User cancelled the questions",
       interrupt: true
     };
   }
@@ -2490,12 +2495,10 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
   toolUseCache;
   backgroundTerminals = {};
   clientCapabilities;
-  logWriter;
   options;
   lastSentConfigOptions;
-  constructor(client, logWriter, options) {
+  constructor(client, options) {
     super(client);
-    this.logWriter = logWriter;
     this.options = options;
     this.toolUseCache = {};
     this.logger = new Logger({ debug: true, prefix: "[ClaudeAcpAgent]" });
@@ -2540,7 +2543,14 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
   async newSession(params) {
     this.checkAuthStatus();
     const meta = params._meta;
+    const taskId = meta?.persistence?.taskId;
     const sessionId = uuidv7();
+    this.logger.info("Creating new session", {
+      sessionId,
+      taskId,
+      taskRunId: meta?.taskRunId,
+      cwd: params.cwd
+    });
     const permissionMode = meta?.permissionMode && TWIG_EXECUTION_MODES.includes(meta.permissionMode) ? meta.permissionMode : "default";
     const mcpServers = parseMcpServers(params);
     const options = buildSessionOptions({
@@ -2569,7 +2579,6 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       options.abortController
     );
     session.taskRunId = meta?.taskRunId;
-    this.registerPersistence(sessionId, meta);
     if (meta?.taskRunId) {
       await this.client.extNotification("_posthog/sdk_session", {
         taskRunId: meta.taskRunId,
@@ -2595,6 +2604,7 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
   }
   async resumeSession(params) {
     const meta = params._meta;
+    const taskId = meta?.persistence?.taskId;
     const sessionId = meta?.sessionId;
     if (!sessionId) {
       throw new Error("Cannot resume session without sessionId");
@@ -2602,6 +2612,12 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
     if (this.sessionId === sessionId) {
       return {};
     }
+    this.logger.info("Resuming session", {
+      sessionId,
+      taskId,
+      taskRunId: meta?.taskRunId,
+      cwd: params.cwd
+    });
     const mcpServers = parseMcpServers(params);
     const permissionMode = meta?.permissionMode && TWIG_EXECUTION_MODES.includes(meta.permissionMode) ? meta.permissionMode : "default";
     const { query: q, session } = await this.initializeQuery({
@@ -2614,15 +2630,36 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       isResume: true,
       additionalDirectories: meta?.claudeCode?.options?.additionalDirectories
     });
+    this.logger.info("Session query initialized, awaiting resumption", {
+      sessionId,
+      taskId,
+      taskRunId: meta?.taskRunId
+    });
     session.taskRunId = meta?.taskRunId;
-    this.registerPersistence(sessionId, meta);
-    const validation = await withTimeout(
-      q.initializationResult(),
-      SESSION_VALIDATION_TIMEOUT_MS
-    );
-    if (validation.result === "timeout") {
-      throw new Error("Session validation timed out");
+    try {
+      const result = await withTimeout(
+        q.initializationResult(),
+        SESSION_VALIDATION_TIMEOUT_MS
+      );
+      if (result.result === "timeout") {
+        throw new Error(
+          `Session resumption timed out for sessionId=${sessionId}`
+        );
+      }
+    } catch (err) {
+      this.logger.error("Session resumption failed", {
+        sessionId,
+        taskId,
+        taskRunId: meta?.taskRunId,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      throw err;
     }
+    this.logger.info("Session resumed successfully", {
+      sessionId,
+      taskId,
+      taskRunId: meta?.taskRunId
+    });
     this.deferBackgroundFetches(q, sessionId);
     const configOptions = await this.buildConfigOptions();
     return { configOptions };
@@ -2821,12 +2858,6 @@ var ClaudeAcpAgent = class extends BaseAcpAgent {
       this.logger.warn("Failed to fetch deferred session data", { err });
     });
   }
-  registerPersistence(sessionId, meta) {
-    const persistence = meta?.persistence;
-    if (persistence && this.logWriter) {
-      this.logWriter.register(sessionId, persistence);
-    }
-  }
   sendAvailableCommandsUpdate(sessionId, availableCommands) {
     setTimeout(() => {
       this.client.sessionUpdate({
@@ -3114,7 +3145,7 @@ function createClaudeConnection(config) {
   const agentStream = ndJsonStream(agentWritable, streams.agent.readable);
   let agent = null;
   const agentConnection = new AgentSideConnection((client) => {
-    agent = new ClaudeAcpAgent(client, logWriter, config.processCallbacks);
+    agent = new ClaudeAcpAgent(client, config.processCallbacks);
     logger.info(`Created ${agent.adapterName} agent`);
     return agent;
   }, agentStream);
@@ -3449,6 +3480,16 @@ var PostHogAPIClient = class {
       }
     );
   }
+  async relayMessage(taskId, runId, text2) {
+    const teamId = this.getTeamId();
+    await this.apiRequest(
+      `/api/projects/${teamId}/tasks/${taskId}/runs/${runId}/relay_message/`,
+      {
+        method: "POST",
+        body: JSON.stringify({ text: text2 })
+      }
+    );
+  }
   async uploadTaskArtifacts(taskId, runId, artifacts) {
     if (!artifacts.length) {
       return [];
@@ -3554,11 +3595,15 @@ var SessionLogWriter = class _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
-    }));
+    const pendingCounts = sessionIds.map((id) => {
+      const session = this.sessions.get(id);
+      return {
+        taskId: session?.context.taskId,
+        runId: session?.context.runId,
+        pending: this.pendingEntries.get(id)?.length ?? 0,
+        messages: this.messageCounts.get(id) ?? 0
+      };
+    });
     this.logger.info("flushAll called", {
       sessions: sessionIds.length,
       pending: pendingCounts
@@ -3574,8 +3619,8 @@ var SessionLogWriter = class _SessionLogWriter {
       return;
     }
     this.logger.info("Session registered", {
-      sessionId,
-      taskId: context.taskId
+      taskId: context.taskId,
+      runId: context.runId
     });
     this.sessions.set(sessionId, { context });
     this.lastFlushAttemptTime.set(sessionId, Date.now());
@@ -3609,7 +3654,11 @@ var SessionLogWriter = class _SessionLogWriter {
     const count = (this.messageCounts.get(sessionId) ?? 0) + 1;
     this.messageCounts.set(sessionId, count);
     if (count % 10 === 1) {
-      this.logger.info("Messages received", { count, sessionId });
+      this.logger.info("Messages received", {
+        count,
+        taskId: session.context.taskId,
+        runId: session.context.runId
+      });
     }
     try {
       const message = JSON.parse(line);
@@ -3626,6 +3675,10 @@ var SessionLogWriter = class _SessionLogWriter {
         return;
       }
       this.emitCoalescedMessage(sessionId, session);
+      const nonChunkAgentText = this.extractAgentMessageText(message);
+      if (nonChunkAgentText) {
+        session.lastAgentMessage = nonChunkAgentText;
+      }
       const entry = {
         type: "notification",
         timestamp,
@@ -3640,7 +3693,8 @@ var SessionLogWriter = class _SessionLogWriter {
       }
     } catch {
       this.logger.warn("Failed to parse raw line for persistence", {
-        sessionId,
+        taskId: session.context.taskId,
+        runId: session.context.runId,
         lineLength: line.length
       });
     }
@@ -3655,7 +3709,8 @@ var SessionLogWriter = class _SessionLogWriter {
     const pending = this.pendingEntries.get(sessionId);
     if (!this.posthogAPI || !pending?.length) {
       this.logger.info("flush: nothing to persist", {
-        sessionId,
+        taskId: session.context.taskId,
+        runId: session.context.runId,
         hasPosthogAPI: !!this.posthogAPI,
         pendingCount: pending?.length ?? 0
       });
@@ -3676,7 +3731,8 @@ var SessionLogWriter = class _SessionLogWriter {
       );
       this.retryCounts.set(sessionId, 0);
       this.logger.info("Flushed session logs", {
-        sessionId,
+        taskId: session.context.taskId,
+        runId: session.context.runId,
         entryCount: pending.length
       });
     } catch (error) {
@@ -3685,7 +3741,11 @@ var SessionLogWriter = class _SessionLogWriter {
       if (retryCount >= _SessionLogWriter.MAX_FLUSH_RETRIES) {
         this.logger.error(
           `Dropping ${pending.length} session log entries after ${retryCount} failed flush attempts`,
-          { sessionId, error }
+          {
+            taskId: session.context.taskId,
+            runId: session.context.runId,
+            error
+          }
         );
         this.retryCounts.set(sessionId, 0);
       } else {
@@ -3718,6 +3778,7 @@ var SessionLogWriter = class _SessionLogWriter {
     if (!session.chunkBuffer) return;
     const { text: text2, firstTimestamp } = session.chunkBuffer;
     session.chunkBuffer = void 0;
+    session.lastAgentMessage = text2;
     const entry = {
       type: "notification",
       timestamp: firstTimestamp,
@@ -3740,6 +3801,29 @@ var SessionLogWriter = class _SessionLogWriter {
       this.scheduleFlush(sessionId);
     }
   }
+  getLastAgentMessage(sessionId) {
+    return this.sessions.get(sessionId)?.lastAgentMessage;
+  }
+  extractAgentMessageText(message) {
+    if (message.method !== "session/update") {
+      return null;
+    }
+    const params = message.params;
+    const update = params?.update;
+    if (update?.sessionUpdate !== "agent_message") {
+      return null;
+    }
+    const content = update.content;
+    if (content?.type === "text" && typeof content.text === "string") {
+      const trimmed = content.text.trim();
+      return trimmed.length > 0 ? trimmed : null;
+    }
+    if (typeof update.message === "string") {
+      const trimmed = update.message.trim();
+      return trimmed.length > 0 ? trimmed : null;
+    }
+    return null;
+  }
   scheduleFlush(sessionId) {
     const existing = this.flushTimeouts.get(sessionId);
     if (existing) clearTimeout(existing);
@@ -3774,7 +3858,12 @@ var SessionLogWriter = class _SessionLogWriter {
       fs3.appendFileSync(logPath, `${JSON.stringify(entry)}
 `);
     } catch (error) {
-      this.logger.warn("Failed to write to local cache", { logPath, error });
+      this.logger.warn("Failed to write to local cache", {
+        taskId: session.context.taskId,
+        runId: session.context.runId,
+        logPath,
+        error
+      });
     }
   }
 };