@getpaseo/server 0.1.74 → 0.1.75

package/dist/server/server/agent/providers/claude/agent.js

@@ -12,6 +12,7 @@ import { formatDiagnosticStatus, formatProviderDiagnostic, formatProviderDiagnos
 import { appendOrReplaceGrowingAssistantMessage, runProviderTurn } from "../provider-runner.js";
 import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
 import { claudeQuery } from "./query.js";
+import { getAgentStreamEventTurnId, } from "../../agent-sdk-types.js";
 import { createProviderEnv, createProviderEnvSpec, } from "../../provider-launch-config.js";
 import { findExecutable, isCommandAvailable } from "../../../../utils/executable.js";
 import { withTimeout } from "../../../../utils/promise-timeout.js";
@@ -837,7 +838,6 @@ export function readEventIdentifiers(message) {
         ]),
     };
 }
-const claudeDebug = process.env.PASEO_CLAUDE_DEBUG === "1";
 export class ClaudeAgentClient {
     constructor(options) {
         this.provider = "claude";
@@ -853,6 +853,7 @@ export class ClaudeAgentClient {
         return new ClaudeAgentSession(claudeConfig, {
             defaults: this.defaults,
             runtimeSettings: this.runtimeSettings,
+            agentId: launchContext?.agentId,
             launchEnv: launchContext?.env,
             persistSession: options?.persistSession,
             logger: this.logger,
@@ -876,6 +877,7 @@ export class ClaudeAgentClient {
             defaults: this.defaults,
             runtimeSettings: this.runtimeSettings,
             handle,
+            agentId: launchContext?.agentId,
             launchEnv: launchContext?.env,
             logger: this.logger,
             queryFactory: this.queryFactory,
@@ -1202,10 +1204,11 @@ class ClaudeAgentSession {
         };
         this.config = config;
         this.launchEnv = options.launchEnv;
+        this.agentId = options.agentId;
         this.defaults = options.defaults;
         this.runtimeSettings = options.runtimeSettings;
         this.persistSession = options.persistSession;
-        this.logger = options.logger;
+        this.logger = options.logger.child({ agentId: this.agentId });
         this.queryFactory = options.queryFactory;
         this.resolveBinary = options.resolveBinary;
         const handle = options.handle;
@@ -1494,12 +1497,15 @@ class ClaudeAgentSession {
     }
     async close() {
         this.logger.trace({
-            claudeSessionId: this.claudeSessionId,
+            agentId: this.agentId,
+            provider: "claude",
+            sessionId: this.claudeSessionId,
+            turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
             turnState: this.turnState,
             hasQuery: Boolean(this.query),
             hasInput: Boolean(this.input),
             hasActiveForegroundTurnId: Boolean(this.activeForegroundTurnId),
-        }, "Claude session close: start");
+        }, "provider.claude.session_close.start");
         this.closed = true;
         this.rejectAllPendingPermissions(new Error("Claude session closed"));
         this.cancelCurrentTurn?.();
@@ -1530,7 +1536,12 @@ class ClaudeAgentSession {
                 }
             }
         }
-        this.logger.trace({ claudeSessionId: this.claudeSessionId, turnState: this.turnState }, "Claude session close: completed");
+        this.logger.trace({
+            agentId: this.agentId,
+            provider: "claude",
+            sessionId: this.claudeSessionId,
+            turnState: this.turnState,
+        }, "provider.claude.session_close.complete");
     }
     async listCommands() {
         const q = await this.ensureQuery();
@@ -1763,14 +1774,33 @@ class ClaudeAgentSession {
     }
     async awaitWithTimeout(promise, label) {
         if (!promise) {
-            this.logger.trace({ label }, "Claude query operation skipped (no promise)");
+            this.logger.trace({
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+                label,
+            }, "provider.claude.query_operation.skip");
             return;
         }
         const startedAt = Date.now();
-        this.logger.trace({ label }, "Claude query operation wait start");
+        this.logger.trace({
+            agentId: this.agentId,
+            provider: "claude",
+            sessionId: this.claudeSessionId,
+            turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+            label,
+        }, "provider.claude.query_operation.start");
         try {
             await withTimeout(promise, 3000, "timeout");
-            this.logger.trace({ label, durationMs: Date.now() - startedAt }, "Claude query operation settled");
+            this.logger.trace({
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+                label,
+                durationMs: Date.now() - startedAt,
+            }, "provider.claude.query_operation.settled");
         }
         catch (error) {
             this.logger.warn({ err: error, label }, "Claude query operation did not settle cleanly");
@@ -2107,7 +2137,13 @@ class ClaudeAgentSession {
             return;
         }
         const pump = this.runQueryPump().catch((error) => {
-            this.logger.trace({ err: error }, "Claude query pump exited unexpectedly");
+            this.logger.trace({
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+                err: error,
+            }, "provider.claude.query_pump.exit_unexpected");
         });
         this.queryPumpPromise = pump;
         void pump.finally(() => {
@@ -2122,21 +2158,28 @@ class ClaudeAgentSession {
             activeQuery = await this.ensureQuery();
         }
         catch (error) {
-            this.logger.trace({ err: error }, "Failed to initialize Claude query pump");
+            this.logger.trace({
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+                err: error,
+            }, "provider.claude.query_pump.init_failed");
             this.failActiveTurns(error instanceof Error ? error.message : "Claude stream failed");
             return;
         }
         let consecutiveInterruptAbortRecoveries = 0;
         const logRawMessage = (message) => {
-            if (!claudeDebug) {
-                return;
-            }
             this.logger.trace({
-                claudeSessionId: this.claudeSessionId,
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
                 messageType: message.type,
                 messageSubtype: "subtype" in message ? message.subtype : undefined,
                 messageUuid: "uuid" in message ? message.uuid : undefined,
-            }, "Claude query pump: raw SDK message");
+                rawEvent: message,
+            }, "provider.claude.raw_event");
         };
         const handlePumpedMessage = async (message) => {
             logRawMessage(message);
@@ -2234,13 +2277,15 @@ class ClaudeAgentSession {
         }
         const turnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null;
         const identifiers = readEventIdentifiers(message);
-        if (claudeDebug) {
-            this.logger.trace({
-                claudeSessionId: this.claudeSessionId,
-                messageType: message.type,
-                turnId,
-            }, "Claude query pump: SDK message");
-        }
+        this.logger.trace({
+            agentId: this.agentId,
+            provider: "claude",
+            sessionId: this.claudeSessionId,
+            turnId: turnId ?? undefined,
+            messageType: message.type,
+            identifiers,
+            rawEvent: message,
+        }, "provider.claude.parsed_event");
         const messageEvents = this.translateMessageToEvents(message, {
             suppressAssistantText: true,
             suppressReasoning: true,
@@ -2284,7 +2329,6 @@ class ClaudeAgentSession {
             return false;
         }
         this.logger.warn({
-            claudeSessionId: this.claudeSessionId,
             error: staleResumeError,
         }, "Claude resumed session no longer exists; invalidating persisted session");
         this.failActiveTurns(staleResumeError);
@@ -2307,7 +2351,12 @@ class ClaudeAgentSession {
     async interruptActiveTurn() {
         const queryToInterrupt = this.query;
         if (!queryToInterrupt || typeof queryToInterrupt.interrupt !== "function") {
-            this.logger.trace("interruptActiveTurn: no query to interrupt");
+            this.logger.trace({
+                agentId: this.agentId,
+                provider: "claude",
+                sessionId: this.claudeSessionId,
+                turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? undefined,
+            }, "provider.claude.interrupt.no_query");
             return;
         }
         this.pendingInterruptAbort = true;
@@ -2759,6 +2808,13 @@ class ClaudeAgentSession {
     notifySubscribers(event) {
         const turnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id;
         const tagged = turnId ? { ...event, turnId } : event;
+        this.logger.trace({
+            agentId: this.agentId,
+            provider: "claude",
+            sessionId: this.claudeSessionId,
+            turnId: getAgentStreamEventTurnId(tagged),
+            event: tagged,
+        }, "provider.claude.event_emit");
         for (const callback of this.subscribers) {
             try {
                 callback(tagged);