@posthog/agent 2.1.16 → 2.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/agent",
-  "version": "2.1.16",
+  "version": "2.1.22",
   "repository": "https://github.com/PostHog/twig",
   "description": "TypeScript agent framework wrapping Claude Agent SDK with Git-based task execution for PostHog",
   "exports": {
@@ -76,16 +76,16 @@
     "@twig/git": "1.0.0"
   },
   "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",

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

@@ -137,7 +137,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
     this.checkAuthStatus();
 
     const meta = params._meta as NewSessionMeta | undefined;
-    const internalSessionId = uuidv7();
+    const sessionId = uuidv7();
     const permissionMode: TwigExecutionMode =
       meta?.permissionMode &&
       TWIG_EXECUTION_MODES.includes(meta.permissionMode as TwigExecutionMode)
@@ -151,11 +151,13 @@ export class ClaudeAcpAgent 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,
     });
@@ -164,7 +166,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
     const q = query({ prompt: input, options });
 
     const session = this.createSession(
-      internalSessionId,
+      sessionId,
       q,
       input,
       permissionMode,
@@ -172,21 +174,27 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
       options.abortController as AbortController,
     );
     session.taskRunId = meta?.taskRunId;
-    this.registerPersistence(
-      internalSessionId,
-      meta as Record<string, unknown>,
-    );
+    this.registerPersistence(sessionId, meta as Record<string, unknown>);
+
+    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),
     };
   }
@@ -198,12 +206,15 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
   async resumeSession(
     params: LoadSessionRequest,
   ): Promise<LoadSessionResponse> {
-    const { sessionId: internalSessionId } = params;
-    if (this.sessionId === internalSessionId) {
+    const meta = params._meta as NewSessionMeta | undefined;
+    const sessionId = meta?.sessionId;
+    if (!sessionId) {
+      throw new Error("Cannot resume session without sessionId");
+    }
+    if (this.sessionId === sessionId) {
       return {};
     }
 
-    const meta = params._meta as NewSessionMeta | undefined;
     const mcpServers = parseMcpServers(params);
     await fetchMcpToolMetadata(mcpServers, this.logger);
 
@@ -214,27 +225,21 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
         : "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 as Record<string, unknown>,
-    );
+    this.registerPersistence(sessionId, meta as Record<string, unknown>);
     this.sendAvailableCommandsUpdate(
-      internalSessionId,
+      sessionId,
       await getAvailableSlashCommands(q),
     );
 
@@ -322,13 +327,13 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
   }
 
   private async initializeQuery(config: {
-    internalSessionId: string;
     cwd: string;
     permissionMode: TwigExecutionMode;
     mcpServers: ReturnType<typeof parseMcpServers>;
     userProvidedOptions?: Options;
     systemPrompt?: Options["systemPrompt"];
-    sessionId?: string;
+    sessionId: string;
+    isResume: boolean;
     additionalDirectories?: string[];
   }): Promise<{
     query: Query;
@@ -341,13 +346,14 @@ export class ClaudeAcpAgent 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,
     });
@@ -356,7 +362,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
     const abortController = options.abortController as AbortController;
 
     const session = this.createSession(
-      config.internalSessionId,
+      config.sessionId,
       q,
       input,
       config.permissionMode,
@@ -596,6 +602,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
 
       case "tool_progress":
       case "auth_status":
+      case "tool_use_summary":
         return null;
 
       default:

package/src/adapters/claude/conversion/sdk-to-acp.ts

@@ -328,20 +328,10 @@ export async function handleSystemMessage(
   message: any,
   context: MessageHandlerContext,
 ): Promise<void> {
-  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", {

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

@@ -27,7 +27,8 @@ export interface BuildOptionsParams {
   logger: Logger;
   systemPrompt?: Options["systemPrompt"];
   userProvidedOptions?: Options;
-  sessionId?: string;
+  sessionId: string;
+  isResume: boolean;
   additionalDirectories?: string[];
   onModeChange?: OnModeChange;
   onProcessSpawned?: (info: ProcessSpawnedInfo) => void;
@@ -175,7 +176,22 @@ function buildSpawnWrapper(
   };
 }
 
+function ensureLocalSettings(cwd: string): void {
+  const claudeDir = path.join(cwd, ".claude");
+  const localSettingsPath = path.join(claudeDir, "settings.local.json");
+  try {
+    if (!fs.existsSync(localSettingsPath)) {
+      fs.mkdirSync(claudeDir, { recursive: true });
+      fs.writeFileSync(localSettingsPath, "{}\n", { flag: "wx" });
+    }
+  } catch {
+    // Best-effort — don't fail session creation if we can't write
+  }
+}
+
 export function buildSessionOptions(params: BuildOptionsParams): Options {
+  ensureLocalSettings(params.cwd);
+
   const options: Options = {
     ...params.userProvidedOptions,
     systemPrompt: params.systemPrompt ?? buildSystemPrompt(),
@@ -198,7 +214,7 @@ export function buildSessionOptions(params: BuildOptionsParams): Options {
     ),
     ...(params.onProcessSpawned && {
       spawnClaudeCodeProcess: buildSpawnWrapper(
-        params.sessionId ?? "unknown",
+        params.sessionId,
         params.onProcessSpawned,
         params.onProcessExited,
       ),
@@ -209,8 +225,11 @@ export function buildSessionOptions(params: BuildOptionsParams): Options {
     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) {

package/src/adapters/claude/types.ts

@@ -29,7 +29,6 @@ export type Session = BaseSession & {
   modelId?: string;
   cwd: string;
   taskRunId?: string;
-  sessionId?: string;
   lastPlanFilePath?: string;
   lastPlanContent?: string;
 };

package/src/test/mocks/claude-sdk.ts

@@ -95,6 +95,11 @@ export function createMockQuery(
       .fn()
       .mockResolvedValue({ added: [], removed: [], errors: {} }),
     streamInput: vi.fn().mockResolvedValue(undefined),
+    close: vi.fn(),
+    initializationResult: vi.fn().mockResolvedValue({}),
+    reconnectMcpServer: vi.fn().mockResolvedValue(undefined),
+    toggleMcpServer: vi.fn().mockResolvedValue(undefined),
+    stopTask: vi.fn().mockResolvedValue(undefined),
     [Symbol.asyncDispose]: vi.fn().mockResolvedValue(undefined),
     _abortController: abortController,
     _mockHelpers: {
@@ -158,6 +163,7 @@ export function createSuccessResult(
     is_error: false,
     num_turns: 1,
     result: "Done",
+    stop_reason: null,
     total_cost_usd: 0.01,
     usage: {
       input_tokens: 100,
@@ -190,6 +196,7 @@ export function createErrorResult(
     duration_ms: 100,
     duration_api_ms: 50,
     num_turns: 1,
+    stop_reason: null,
     total_cost_usd: 0.01,
     usage: {
       input_tokens: 100,