@posthog/agent 2.1.67 → 2.1.70

package/package.json

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

package/src/adapters/claude/claude-agent.ts

@@ -33,7 +33,7 @@ import { v7 as uuidv7 } from "uuid";
 import packageJson from "../../../package.json" with { type: "json" };
 import type { SessionContext } from "../../otel-log-writer.js";
 import type { SessionLogWriter } from "../../session-log-writer.js";
-import { unreachable } from "../../utils/common.js";
+import { unreachable, withTimeout } from "../../utils/common.js";
 import { Logger } from "../../utils/logger.js";
 import { Pushable } from "../../utils/streams.js";
 import { BaseAcpAgent } from "../base-acp-agent.js";
@@ -66,6 +66,8 @@ import type {
   ToolUseCache,
 } from "./types.js";
 
+const SESSION_VALIDATION_TIMEOUT_MS = 10_000;
+
 export interface ClaudeAcpAgentOptions {
   onProcessSpawned?: (info: ProcessSpawnedInfo) => void;
   onProcessExited?: (pid: number) => void;
@@ -247,6 +249,16 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
 
     this.registerPersistence(sessionId, meta as Record<string, unknown>);
 
+    // Validate the resumed session is alive. For stale sessions this throws
+    // (e.g. "No conversation found"), preventing a broken session.
+    const validation = await withTimeout(
+      q.initializationResult(),
+      SESSION_VALIDATION_TIMEOUT_MS,
+    );
+    if (validation.result === "timeout") {
+      throw new Error("Session validation timed out");
+    }
+
     // Deferred: slash commands + MCP metadata (not needed to return configOptions)
     this.deferBackgroundFetches(q, sessionId, mcpServers);
 
@@ -486,15 +498,15 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
   }
 
   private async setModelWithFallback(q: Query, modelId: string): Promise<void> {
+    const sdkModelId = toSdkModelId(modelId);
     try {
-      await q.setModel(modelId);
-      return;
+      await q.setModel(sdkModelId);
     } catch (err) {
-      const fallback = toSdkModelId(modelId);
-      if (fallback === modelId) {
+      if (sdkModelId === modelId) {
         throw err;
       }
-      await q.setModel(fallback);
+      // Fallback to raw gateway ID if SDK model ID failed
+      await q.setModel(modelId);
     }
   }
 

package/src/utils/common.ts

@@ -1,5 +1,24 @@
 import type { Logger } from "./logger.js";
 
+/**
+ * Races an operation against a timeout.
+ * Returns success with the value if the operation completes in time,
+ * or timeout if the operation takes longer than the specified duration.
+ */
+export async function withTimeout<T>(
+  operation: Promise<T>,
+  timeoutMs: number,
+): Promise<{ result: "success"; value: T } | { result: "timeout" }> {
+  const timeoutPromise = new Promise<{ result: "timeout" }>((resolve) =>
+    setTimeout(() => resolve({ result: "timeout" }), timeoutMs),
+  );
+  const operationPromise = operation.then((value) => ({
+    result: "success" as const,
+    value,
+  }));
+  return Promise.race([operationPromise, timeoutPromise]);
+}
+
 export const IS_ROOT =
   typeof process !== "undefined" &&
   (process.geteuid?.() ?? process.getuid?.()) === 0;