@getpaseo/server 0.1.68 → 0.1.70

package/dist/server/server/agent/providers/{claude-agent.js → claude/agent.js}

@@ -3,22 +3,79 @@ import fs from "node:fs";
 import { promises } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { query, } from "@anthropic-ai/claude-agent-sdk";
-import { mapClaudeCanceledToolCall, mapClaudeCompletedToolCall, mapClaudeFailedToolCall, mapClaudeRunningToolCall, } from "./claude/tool-call-mapper.js";
-import { mapTaskNotificationSystemRecordToToolCall, mapTaskNotificationUserContentToToolCall, } from "./claude/task-notification-tool-call.js";
-import { getClaudeModels, normalizeClaudeRuntimeModelId } from "./claude/claude-models.js";
-import { parsePartialJsonObject } from "./claude/partial-json.js";
-import { ClaudeSidechainTracker } from "./claude/sidechain-tracker.js";
-import { formatDiagnosticStatus, formatProviderDiagnostic, formatProviderDiagnosticError, toDiagnosticErrorMessage, } from "./diagnostic-utils.js";
-import { appendOrReplaceGrowingAssistantMessage, runProviderTurn } from "./provider-runner.js";
-import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
-import { createProviderEnv, createProviderEnvSpec, } from "../provider-launch-config.js";
-import { findExecutable, isCommandAvailable } from "../../../utils/executable.js";
-import { withTimeout } from "../../../utils/promise-timeout.js";
-import { execCommand, spawnProcess } from "../../../utils/spawn.js";
-import { getOrchestratorModeInstructions } from "../orchestrator-instructions.js";
+import { mapClaudeCanceledToolCall, mapClaudeCompletedToolCall, mapClaudeFailedToolCall, mapClaudeRunningToolCall, } from "./tool-call-mapper.js";
+import { mapTaskNotificationSystemRecordToToolCall, mapTaskNotificationUserContentToToolCall, } from "./task-notification-tool-call.js";
+import { getClaudeModels, normalizeClaudeRuntimeModelId } from "./models.js";
+import { parsePartialJsonObject } from "./partial-json.js";
+import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
+import { formatDiagnosticStatus, formatProviderDiagnostic, formatProviderDiagnosticError, toDiagnosticErrorMessage, } from "../diagnostic-utils.js";
+import { appendOrReplaceGrowingAssistantMessage, runProviderTurn } from "../provider-runner.js";
+import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
+import { claudeQuery } from "./query.js";
+import { createProviderEnv, createProviderEnvSpec, } from "../../provider-launch-config.js";
+import { findExecutable, isCommandAvailable } from "../../../../utils/executable.js";
+import { withTimeout } from "../../../../utils/promise-timeout.js";
+import { execCommand } from "../../../../utils/spawn.js";
+import { getOrchestratorModeInstructions } from "../../orchestrator-instructions.js";
 const fsPromises = promises;
 const CLAUDE_SETTING_SOURCES = ["user", "project"];
+function readNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value : null;
+}
+export function normalizeClaudeAskUserQuestionUpdatedInput(updatedInput, fallbackInput) {
+    const fallback = isMetadata(fallbackInput) ? fallbackInput : {};
+    const base = isMetadata(updatedInput) ? updatedInput : {};
+    // Paseo's shared question UI serializes answers by question header, but Claude's
+    // AskUserQuestion tool expects answer keys to match the full question text. Merge
+    // the original request payload back in so provider callbacks that only return
+    // `{ answers }` still satisfy Claude's full tool input schema.
+    const merged = { ...fallback, ...base };
+    const questions = (Array.isArray(base.questions) ? base.questions : null) ??
+        (Array.isArray(fallback.questions) ? fallback.questions : null);
+    const answers = isMetadata(base.answers) ? base.answers : null;
+    if (!questions || !answers) {
+        return merged;
+    }
+    const normalizedAnswers = {};
+    for (const item of questions) {
+        const question = isMetadata(item) ? item : null;
+        if (!question) {
+            continue;
+        }
+        const questionText = readNonEmptyString(question.question);
+        if (!questionText) {
+            continue;
+        }
+        const header = readNonEmptyString(question.header);
+        const answer = readNonEmptyString(answers[questionText]) ??
+            (header ? readNonEmptyString(answers[header]) : null);
+        if (answer) {
+            normalizedAnswers[questionText] = answer;
+        }
+    }
+    if (Object.keys(normalizedAnswers).length === 0) {
+        return merged;
+    }
+    return {
+        ...merged,
+        answers: normalizedAnswers,
+    };
+}
+function isObjectRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function toObjectRecord(value) {
+    return isObjectRecord(value) ? value : undefined;
+}
+function isUnknownArray(value) {
+    return Array.isArray(value);
+}
+function isImageMimeType(value) {
+    return (value === "image/jpeg" ||
+        value === "image/png" ||
+        value === "image/gif" ||
+        value === "image/webp");
+}
 const CLAUDE_CAPABILITIES = {
     supportsStreaming: true,
     supportsSessionPersistence: true,
@@ -92,60 +149,6 @@ function extractSessionIdRaw(msg) {
         return msg.session.id;
     return "";
 }
-function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
-    const commandConfig = runtimeSettings?.command;
-    if (!commandConfig || commandConfig.mode === "default") {
-        return {
-            command: spawnOptions.command,
-            args: [...spawnOptions.args],
-        };
-    }
-    if (commandConfig.mode === "append") {
-        return {
-            command: spawnOptions.command,
-            args: [...spawnOptions.args, ...(commandConfig.args ?? [])],
-        };
-    }
-    return {
-        command: commandConfig.argv[0],
-        args: [...commandConfig.argv.slice(1), ...spawnOptions.args],
-    };
-}
-function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings, launchEnv) {
-    return {
-        ...options,
-        spawnClaudeCodeProcess: (spawnOptions) => {
-            const resolved = resolveClaudeSpawnCommand(spawnOptions, runtimeSettings);
-            // When the SDK passes a default JS runtime ("node"/"bun"), replace it with
-            // process.execPath — the actual node binary running the daemon. This avoids
-            // PATH lookup failures in the managed runtime bundle.
-            // When the SDK passes a native binary path (from pathToClaudeCodeExecutable)
-            // or the user overrides the command via runtime settings, use that directly.
-            const isDefaultRuntime = resolved.command === "node" || resolved.command === "bun";
-            const command = isDefaultRuntime ? process.execPath : resolved.command;
-            const child = spawnProcess(command, resolved.args, {
-                cwd: spawnOptions.cwd,
-                ...createProviderEnvSpec({
-                    baseEnv: spawnOptions.env,
-                    runtimeSettings,
-                    overlays: [launchEnv],
-                }),
-                signal: spawnOptions.signal,
-                stdio: ["pipe", "pipe", "pipe"],
-                // Bypass cmd.exe on Windows: the SDK passes --mcp-config with inline JSON
-                // containing double quotes, which cmd.exe mangles (strips quotes, breaks parsing).
-                // The command is always a resolved binary path, so shell routing is unnecessary.
-                shell: false,
-            });
-            if (typeof options.stderr === "function") {
-                child.stderr?.on("data", (chunk) => {
-                    options.stderr?.(chunk.toString());
-                });
-            }
-            return child;
-        },
-    };
-}
 function isClaudeThinkingEffort(value) {
     return (value === "low" ||
         value === "medium" ||
@@ -168,11 +171,11 @@ function summarizeClaudeOptionsForLog(options) {
         if (typeof systemPromptRaw === "string") {
             return { mode: "string", preset: null };
         }
-        const prompt = systemPromptRaw;
-        const promptType = typeof prompt.type === "string" ? prompt.type : "custom";
+        const prompt = toObjectRecord(systemPromptRaw);
+        const promptType = typeof prompt?.type === "string" ? prompt.type : "custom";
         return {
             mode: promptType === "preset" ? "preset" : "custom",
-            preset: typeof prompt.preset === "string" && prompt.preset.length > 0 ? prompt.preset : null,
+            preset: typeof prompt?.preset === "string" && prompt.preset.length > 0 ? prompt.preset : null,
         };
     })();
     const mcpServerNames = options.mcpServers ? Object.keys(options.mcpServers).sort() : [];
@@ -234,7 +237,11 @@ function normalizeForDeterministicString(value, seen) {
             return "[circular]";
         }
         seen.add(objectValue);
-        const record = value;
+        const record = toObjectRecord(value);
+        if (!record) {
+            seen.delete(objectValue);
+            return "[invalid]";
+        }
         const normalized = {};
         for (const key of Object.keys(record).sort()) {
             normalized[key] = normalizeForDeterministicString(record[key], seen);
@@ -242,7 +249,10 @@ function normalizeForDeterministicString(value, seen) {
         seen.delete(objectValue);
         return normalized;
     }
-    return String(value);
+    if (typeof value === "number" || typeof value === "boolean") {
+        return String(value);
+    }
+    return "[unsupported]";
 }
 function deterministicStringify(value) {
     if (typeof value === "undefined") {
@@ -256,12 +266,13 @@ function deterministicStringify(value) {
         return JSON.stringify(normalized);
     }
     catch {
-        try {
-            return String(value);
+        if (typeof value === "string") {
+            return value;
         }
-        catch {
-            return "[unserializable]";
+        if (typeof value === "number" || typeof value === "boolean") {
+            return String(value);
         }
+        return "[unserializable]";
     }
 }
 function coerceToolResultContentToString(content) {
@@ -302,20 +313,21 @@ function collectClaudeTextContentParts(content) {
         const normalized = normalizeClaudeTranscriptText(content);
         return normalized ? [normalized] : [];
     }
-    if (!Array.isArray(content)) {
+    if (!isUnknownArray(content)) {
         return [];
     }
     const parts = [];
     for (const block of content) {
-        if (!block || typeof block !== "object") {
+        const blockRecord = toObjectRecord(block);
+        if (!blockRecord) {
             continue;
         }
-        const text = normalizeClaudeTranscriptText(block.text);
+        const text = normalizeClaudeTranscriptText(blockRecord.text);
         if (text) {
             parts.push(text);
             continue;
         }
-        const input = normalizeClaudeTranscriptText(block.input);
+        const input = normalizeClaudeTranscriptText(blockRecord.input);
         if (input) {
             parts.push(input);
         }
@@ -495,6 +507,7 @@ function toClaudeSdkMcpConfig(config) {
                 headers: config.headers,
             };
     }
+    throw new Error("Unhandled MCP server config type");
 }
 function isClaudeContentChunk(value) {
     return isMetadata(value) && typeof value.type === "string";
@@ -585,7 +598,7 @@ class TimelineAssembler {
         return this.applyAbsoluteFragments(state, fragments);
     }
     consumeStreamEvent(message, runId, messageIdHint) {
-        const event = message.event;
+        const event = toObjectRecord(message.event) ?? {};
         const eventType = readTrimmedString(event.type);
         const streamEventMessageId = this.readMessageIdFromStreamEvent(event) ?? messageIdHint;
         if (eventType === "message_start") {
@@ -768,19 +781,20 @@ class TimelineAssembler {
         return fragments;
     }
     readMessageIdFromAssistantMessage(message) {
-        const candidate = message;
-        return (readTrimmedString(candidate.message_id) ?? readTrimmedString(candidate.message?.id) ?? null);
+        const candidate = toObjectRecord(message);
+        const messageContainer = toObjectRecord(candidate?.message);
+        return (readTrimmedString(candidate?.message_id) ?? readTrimmedString(messageContainer?.id) ?? null);
     }
     readMessageIdFromStreamEvent(event) {
-        const message = event.message;
-        return readTrimmedString(event.message_id) ?? readTrimmedString(message?.id) ?? null;
+        const messageContainer = toObjectRecord(event.message);
+        return readTrimmedString(event.message_id) ?? readTrimmedString(messageContainer?.id) ?? null;
     }
 }
 function isSyntheticUserEntry(entry) {
-    if (!entry || typeof entry !== "object") {
+    const candidate = toObjectRecord(entry);
+    if (!candidate) {
         return false;
     }
-    const candidate = entry;
     return candidate.isSynthetic === true || candidate.isMeta === true;
 }
 function firstTrimmedString(sources) {
@@ -793,11 +807,11 @@ function firstTrimmedString(sources) {
     return null;
 }
 export function readEventIdentifiers(message) {
-    const root = message;
+    const root = toObjectRecord(message) ?? {};
     const messageType = readTrimmedString(root.type);
-    const streamEvent = root.event;
-    const streamEventMessage = streamEvent?.message;
-    const messageContainer = root.message;
+    const streamEvent = toObjectRecord(root.event);
+    const streamEventMessage = toObjectRecord(streamEvent?.message);
+    const messageContainer = toObjectRecord(root.message);
     const messageIdFromUuid = messageType === "user" ? root.uuid : undefined;
     return {
         taskId: firstTrimmedString([
@@ -831,7 +845,8 @@ export class ClaudeAgentClient {
         this.defaults = options.defaults;
         this.logger = options.logger.child({ module: "agent", provider: "claude" });
         this.runtimeSettings = options.runtimeSettings;
-        this.queryFactory = options.queryFactory ?? query;
+        this.queryFactory = options.queryFactory;
+        this.resolveBinary = options.resolveBinary ?? (() => resolveClaudeBinary(this.runtimeSettings));
     }
     async createSession(config, launchContext, options) {
         const claudeConfig = this.assertConfig(config);
@@ -842,6 +857,7 @@ export class ClaudeAgentClient {
             persistSession: options?.persistSession,
             logger: this.logger,
             queryFactory: this.queryFactory,
+            resolveBinary: this.resolveBinary,
         });
     }
     async resumeSession(handle, overrides, launchContext) {
@@ -863,6 +879,7 @@ export class ClaudeAgentClient {
             launchEnv: launchContext?.env,
             logger: this.logger,
             queryFactory: this.queryFactory,
+            resolveBinary: this.resolveBinary,
         });
     }
     async listModels(_options) {
@@ -887,9 +904,7 @@ export class ClaudeAgentClient {
         if (command?.mode === "replace") {
             return await isCommandAvailable(command.argv[0]);
         }
-        // Default mode uses @anthropic-ai/claude-agent-sdk's bundled cli.js run
-        // via process.execPath. No external `claude` binary is required.
-        return true;
+        return await isCommandAvailable("claude");
     }
     async getDiagnostic() {
         try {
@@ -938,6 +953,20 @@ export class ClaudeAgentClient {
         return { ...config, provider: "claude" };
     }
 }
+async function resolveClaudeBinary(runtimeSettings) {
+    const command = runtimeSettings?.command;
+    if (command?.mode === "replace") {
+        const foundOverride = await findExecutable(command.argv[0]);
+        if (foundOverride) {
+            return foundOverride;
+        }
+    }
+    const found = await findExecutable("claude");
+    if (found) {
+        return found;
+    }
+    throw new Error("Claude binary not found. Install Claude Code (https://github.com/anthropics/claude-code) and ensure it is available in your shell PATH.");
+}
 async function resolveClaudeVersion(runtimeSettings) {
     const command = runtimeSettings?.command;
     const envSpec = createProviderEnvSpec({ runtimeSettings });
@@ -970,11 +999,11 @@ async function resolveClaudeAuth(runtimeSettings) {
             });
         }
         catch (error) {
-            const err = error;
-            return {
-                stdout: err.stdout ?? "",
-                stderr: err.stderr ?? err.message ?? "",
-            };
+            const err = toObjectRecord(error);
+            const stdout = typeof err?.stdout === "string" ? err.stdout : "";
+            const stderr = typeof err?.stderr === "string" ? err.stderr : "";
+            const fallbackMessage = typeof err?.message === "string" ? err.message : "";
+            return { stdout, stderr: stderr || fallbackMessage };
         }
     };
     try {
@@ -1000,15 +1029,17 @@ async function resolveClaudeAuth(runtimeSettings) {
     }
 }
 function extractContextWindowSize(modelUsage) {
-    if (!modelUsage || typeof modelUsage !== "object") {
+    const usageRecord = toObjectRecord(modelUsage);
+    if (!usageRecord) {
         return undefined;
     }
     let maxContextWindow;
-    for (const value of Object.values(modelUsage)) {
-        if (!value || typeof value !== "object") {
+    for (const value of Object.values(usageRecord)) {
+        const valueRecord = toObjectRecord(value);
+        if (!valueRecord) {
             continue;
         }
-        const contextWindow = value.contextWindow;
+        const contextWindow = valueRecord.contextWindow;
         if (typeof contextWindow !== "number" ||
             !Number.isFinite(contextWindow) ||
             contextWindow <= 0) {
@@ -1035,8 +1066,8 @@ function readUsageFromTaskNotification(message) {
     return readUsageTotalTokens(message.usage);
 }
 function readStreamRequestInputTokens(event) {
-    const messageUsage = event.message?.usage;
-    if (!messageUsage || typeof messageUsage !== "object") {
+    const messageUsage = toObjectRecord(toObjectRecord(event.message)?.usage);
+    if (!messageUsage) {
         return undefined;
     }
     const usage = messageUsage;
@@ -1057,7 +1088,7 @@ function readStreamRequestInputTokens(event) {
     return inputTokens + cacheCreationInputTokens + cacheReadInputTokens;
 }
 function readStreamRequestOutputTokens(event) {
-    const outputTokens = event.usage?.output_tokens;
+    const outputTokens = toObjectRecord(event.usage)?.output_tokens;
     if (typeof outputTokens !== "number" || !Number.isFinite(outputTokens) || outputTokens < 0) {
         return undefined;
     }
@@ -1175,7 +1206,8 @@ class ClaudeAgentSession {
         this.runtimeSettings = options.runtimeSettings;
         this.persistSession = options.persistSession;
         this.logger = options.logger;
-        this.queryFactory = options.queryFactory ?? query;
+        this.queryFactory = options.queryFactory;
+        this.resolveBinary = options.resolveBinary;
         const handle = options.handle;
         if (handle) {
             if (!handle.sessionId) {
@@ -1409,9 +1441,12 @@ class ClaudeAgentSession {
                     },
                 }));
             }
+            const updatedInput = pending.request.kind === "question"
+                ? normalizeClaudeAskUserQuestionUpdatedInput(response.updatedInput, pending.request.input ?? undefined)
+                : (response.updatedInput ?? pending.request.input ?? {});
             const result = {
                 behavior: "allow",
-                updatedInput: response.updatedInput ?? pending.request.input ?? {},
+                updatedInput,
                 updatedPermissions: this.normalizePermissionUpdates(response.updatedPermissions),
             };
             pending.resolve(result);
@@ -1700,7 +1735,11 @@ class ClaudeAgentSession {
         const options = await this.buildOptions();
         this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
         this.input = input;
-        this.query = this.queryFactory({ prompt: input.iterable, options });
+        this.query = claudeQuery({ prompt: input.iterable, options }, {
+            runtimeSettings: this.runtimeSettings,
+            launchEnv: this.launchEnv,
+            queryFactory: this.queryFactory,
+        });
         // Do not kick off background control-plane queries here. Methods like
         // supportedCommands()/setPermissionMode() may execute immediately after
         // ensureQuery() (for listCommands()/setMode()), and sharing the same query
@@ -1727,12 +1766,7 @@ class ClaudeAgentSession {
             ? this.config.thinkingOptionId
             : undefined;
         if (thinkingOptionId && isClaudeThinkingEffort(thinkingOptionId)) {
-            // SDK 0.2.71 types `effort` as 'low' | 'medium' | 'high' | 'max'; Opus 4.7
-            // adds 'xhigh' which the binary accepts but the typings don't yet expose.
-            return {
-                thinking: { type: "adaptive" },
-                effort: thinkingOptionId,
-            };
+            return { thinking: { type: "adaptive" }, effort: thinkingOptionId };
         }
         return { thinking: undefined, effort: undefined };
     }
@@ -1758,7 +1792,7 @@ class ClaudeAgentSession {
                 this.launchEnv,
             ],
         });
-        const claudeBinary = await findExecutable("claude");
+        const claudeBinary = await this.resolveBinary();
         this.logger.debug({
             claudeBinary,
             pathEnvKey: resolvePathEnvKey(),
@@ -1776,7 +1810,7 @@ class ClaudeAgentSession {
             allowDangerouslySkipPermissions: true,
             agents: this.defaults?.agents,
             canUseTool: this.handlePermissionRequest,
-            ...(claudeBinary ? { pathToClaudeCodeExecutable: claudeBinary } : {}),
+            pathToClaudeCodeExecutable: claudeBinary,
             // Use Claude Code preset system prompt and load CLAUDE.md files
             // Append provider-agnostic system prompt and orchestrator instructions for agents.
             systemPrompt: {
@@ -1816,10 +1850,7 @@ class ClaudeAgentSession {
                 ...this.runtimeSettings.disallowedTools,
             ];
         }
-        return this.applyRuntimeSettings(base);
-    }
-    applyRuntimeSettings(options) {
-        return applyRuntimeSettingsToClaudeOptions(options, this.runtimeSettings, this.launchEnv);
+        return base;
     }
     normalizeMcpServers(servers) {
         const result = {};
@@ -1836,14 +1867,16 @@ class ClaudeAgentSession {
                     content.push({ type: "text", text: chunk.text });
                 }
                 else if (chunk.type === "image") {
-                    content.push({
-                        type: "image",
-                        source: {
-                            type: "base64",
-                            media_type: chunk.mimeType,
-                            data: chunk.data,
-                        },
-                    });
+                    if (isImageMimeType(chunk.mimeType)) {
+                        content.push({
+                            type: "image",
+                            source: {
+                                type: "base64",
+                                media_type: chunk.mimeType,
+                                data: chunk.data,
+                            },
+                        });
+                    }
                 }
                 else {
                     content.push({ type: "text", text: renderPromptAttachmentAsText(chunk) });
@@ -2062,7 +2095,7 @@ class ClaudeAgentSession {
             this.logger.trace({ err: error }, "Claude query pump exited unexpectedly");
         });
         this.queryPumpPromise = pump;
-        pump.finally(() => {
+        void pump.finally(() => {
             if (this.queryPumpPromise === pump) {
                 this.queryPumpPromise = null;
             }
@@ -2341,7 +2374,7 @@ class ClaudeAgentSession {
             return;
         }
         if (message.subtype === "status") {
-            const status = message.status;
+            const status = toObjectRecord(message)?.status;
             if (status === "compacting") {
                 this.compacting = true;
                 events.push({
@@ -2367,6 +2400,16 @@ class ClaudeAgentSession {
             return;
         }
         if (message.subtype === "task_notification") {
+            // TODO: subagent timelines are best-effort. Subagent task_notifications
+            // arrive without parent_tool_use_id but with tool_use_id pointing at the
+            // parent's Task call, so they slip past the sidechain router and pollute
+            // the parent timeline. Drop them here; eventually thread them into the
+            // parent Task tool call's sub_agent log instead.
+            const taskUseId = message.tool_use_id;
+            const cachedTool = taskUseId ? this.toolUseCache.get(taskUseId) : undefined;
+            if (cachedTool?.name === "Task") {
+                return;
+            }
             const taskNotificationItem = mapTaskNotificationSystemRecordToToolCall(message);
             if (taskNotificationItem) {
                 events.push({
@@ -2478,8 +2521,12 @@ class ClaudeAgentSession {
         };
     }
     captureSessionIdFromMessage(message) {
-        const msg = message;
-        const sessionId = extractSessionIdRaw(msg).trim();
+        const msgRecord = toObjectRecord(message) ?? {};
+        const sessionId = extractSessionIdRaw({
+            session_id: msgRecord.session_id,
+            sessionId: msgRecord.sessionId,
+            session: isObjectRecord(msgRecord.session) ? { id: msgRecord.session.id } : null,
+        }).trim();
         if (!sessionId) {
             return { threadStartedSessionId: null, notice: null };
         }
@@ -2507,8 +2554,12 @@ class ClaudeAgentSession {
         if (message.subtype !== "init") {
             return { threadStartedSessionId: null, notice: null };
         }
-        const msg = message;
-        const newSessionId = extractSessionIdRaw(msg).trim();
+        const msgRecord = toObjectRecord(message) ?? {};
+        const newSessionId = extractSessionIdRaw({
+            session_id: msgRecord.session_id,
+            sessionId: msgRecord.sessionId,
+            session: isObjectRecord(msgRecord.session) ? { id: msgRecord.session.id } : null,
+        }).trim();
         if (!newSessionId) {
             return { threadStartedSessionId: null, notice: null };
         }
@@ -2631,10 +2682,10 @@ class ClaudeAgentSession {
         };
     }
     trackStreamEventUsage(event) {
-        if (!event || typeof event !== "object") {
+        const streamEvent = toObjectRecord(event);
+        if (!streamEvent) {
             return null;
         }
-        const streamEvent = event;
         const eventType = readTrimmedString(streamEvent.type);
         if (eventType === "message_start") {
             const inputTokens = readStreamRequestInputTokens(streamEvent);
@@ -2748,7 +2799,12 @@ class ClaudeAgentSession {
         }
         let entry;
         try {
-            entry = JSON.parse(trimmed);
+            const parsed = JSON.parse(trimmed);
+            const record = toObjectRecord(parsed);
+            if (!record) {
+                return;
+            }
+            entry = record;
         }
         catch {
             return;
@@ -3289,12 +3345,20 @@ function hasToolLikeBlock(block) {
     return type.includes("tool");
 }
 function readCompactionMetadata(source) {
-    const candidates = [source.compact_metadata, source.compactMetadata, source.compactionMetadata];
+    const sourceRecord = toObjectRecord(source);
+    if (!sourceRecord) {
+        return null;
+    }
+    const candidates = [
+        sourceRecord.compact_metadata,
+        sourceRecord.compactMetadata,
+        sourceRecord.compactionMetadata,
+    ];
     for (const candidate of candidates) {
-        if (!candidate || typeof candidate !== "object") {
+        const metadata = toObjectRecord(candidate);
+        if (!metadata) {
             continue;
         }
-        const metadata = candidate;
         const trigger = typeof metadata.trigger === "string" ? metadata.trigger : undefined;
         const preTokensRaw = metadata.preTokens ?? metadata.pre_tokens;
         const preTokens = typeof preTokensRaw === "number" ? preTokensRaw : undefined;
@@ -3484,10 +3548,10 @@ function isFinishedAccumulator(acc) {
     return Boolean(acc.sessionId && acc.cwd && acc.title);
 }
 function applyClaudeSessionEntryToAccumulator(entryRaw, acc) {
-    if (!entryRaw || typeof entryRaw !== "object") {
+    const entry = toObjectRecord(entryRaw);
+    if (!entry) {
         return;
     }
-    const entry = entryRaw;
     if (entry.isSidechain) {
         return;
     }
@@ -3571,10 +3635,10 @@ async function parseClaudeSessionDescriptor(filePath, mtime) {
     };
 }
 function extractClaudeUserText(messageRaw) {
-    if (!messageRaw || typeof messageRaw !== "object") {
+    const message = toObjectRecord(messageRaw);
+    if (!message) {
         return null;
     }
-    const message = messageRaw;
     if (typeof message.content === "string") {
         const normalized = message.content.trim();
         return normalized && !isClaudeTranscriptNoiseText(normalized) ? normalized : null;
@@ -3583,12 +3647,11 @@ function extractClaudeUserText(messageRaw) {
         const normalized = message.text.trim();
         return normalized && !isClaudeTranscriptNoiseText(normalized) ? normalized : null;
     }
-    if (Array.isArray(message.content)) {
+    if (isUnknownArray(message.content)) {
         for (const block of message.content) {
-            if (block &&
-                typeof block === "object" &&
-                typeof block.text === "string") {
-                const normalized = block.text.trim();
+            const blockRecord = toObjectRecord(block);
+            if (blockRecord && typeof blockRecord.text === "string") {
+                const normalized = blockRecord.text.trim();
                 if (normalized && !isClaudeTranscriptNoiseText(normalized)) {
                     return normalized;
                 }
@@ -3597,4 +3660,4 @@ function extractClaudeUserText(messageRaw) {
     }
     return null;
 }
-//# sourceMappingURL=claude-agent.js.map
+//# sourceMappingURL=agent.js.map