@getpaseo/server 0.1.3 → 0.1.4

package/dist/server/server/agent/providers/claude/tool-call-mapper.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { isSpeakToolName } from "../../tool-name-normalization.js";
 import { deriveClaudeToolDetail } from "./tool-call-detail-parser.js";
 const ClaudeToolCallStatusSchema = z.enum([
     "running",
@@ -28,6 +29,51 @@ const ClaudeToolCallPass1Schema = ClaudeRawToolCallSchema.transform((raw) => ({
     error: raw.error ?? null,
     status: raw.status,
 }));
+const ClaudeShellToolNameSchema = z.union([
+    z.literal("Bash"),
+    z.literal("bash"),
+    z.literal("shell"),
+    z.literal("exec_command"),
+]);
+const ClaudeReadToolNameSchema = z.union([
+    z.literal("Read"),
+    z.literal("read"),
+    z.literal("read_file"),
+    z.literal("view_file"),
+]);
+const ClaudeWriteToolNameSchema = z.union([
+    z.literal("Write"),
+    z.literal("write"),
+    z.literal("write_file"),
+    z.literal("create_file"),
+]);
+const ClaudeEditToolNameSchema = z.union([
+    z.literal("Edit"),
+    z.literal("MultiEdit"),
+    z.literal("multi_edit"),
+    z.literal("edit"),
+    z.literal("apply_patch"),
+    z.literal("apply_diff"),
+    z.literal("str_replace_editor"),
+]);
+const ClaudeSearchToolNameSchema = z.union([
+    z.literal("WebSearch"),
+    z.literal("web_search"),
+    z.literal("search"),
+]);
+const ClaudeSpeakToolNameSchema = z
+    .string()
+    .min(1)
+    .refine((name) => isSpeakToolName(name.trim()));
+const ClaudeToolKindSchema = z.enum([
+    "shell",
+    "read",
+    "write",
+    "edit",
+    "search",
+    "speak",
+    "unknown",
+]);
 const ClaudeToolCallPass2BaseSchema = z.object({
     callId: z.string().min(1),
     name: z.string().min(1),
@@ -36,37 +82,105 @@ const ClaudeToolCallPass2BaseSchema = z.object({
     metadata: z.record(z.string(), z.unknown()).optional(),
     error: z.unknown().nullable(),
     status: ClaudeToolCallStatusSchema,
-    toolKind: z.enum(["speak", "other"]),
+    toolKind: ClaudeToolKindSchema,
 });
 const ClaudeToolCallPass2InputSchema = ClaudeToolCallPass2BaseSchema.omit({
     toolKind: true,
 });
 const ClaudeToolCallPass2EnvelopeSchema = z.union([
     ClaudeToolCallPass2InputSchema.extend({
-        name: z.literal("mcp__paseo__speak"),
+        name: ClaudeShellToolNameSchema,
+    }).transform((normalized) => ({
+        ...normalized,
+        name: normalized.name.trim(),
+        toolKind: "shell",
+    })),
+    ClaudeToolCallPass2InputSchema.extend({
+        name: ClaudeReadToolNameSchema,
+    }).transform((normalized) => ({
+        ...normalized,
+        name: normalized.name.trim(),
+        toolKind: "read",
+    })),
+    ClaudeToolCallPass2InputSchema.extend({
+        name: ClaudeWriteToolNameSchema,
+    }).transform((normalized) => ({
+        ...normalized,
+        name: normalized.name.trim(),
+        toolKind: "write",
+    })),
+    ClaudeToolCallPass2InputSchema.extend({
+        name: ClaudeEditToolNameSchema,
+    }).transform((normalized) => ({
+        ...normalized,
+        name: normalized.name.trim(),
+        toolKind: "edit",
+    })),
+    ClaudeToolCallPass2InputSchema.extend({
+        name: ClaudeSearchToolNameSchema,
     }).transform((normalized) => ({
         ...normalized,
         name: normalized.name.trim(),
+        toolKind: "search",
+    })),
+    ClaudeToolCallPass2InputSchema.extend({
+        name: ClaudeSpeakToolNameSchema,
+    }).transform((normalized) => ({
+        ...normalized,
+        name: "speak",
         toolKind: "speak",
     })),
     ClaudeToolCallPass2InputSchema.transform((normalized) => ({
         ...normalized,
         name: normalized.name.trim(),
-        toolKind: "other",
+        toolKind: "unknown",
     })),
 ]);
 const ClaudeToolCallPass2Schema = z.discriminatedUnion("toolKind", [
+    ClaudeToolCallPass2BaseSchema.extend({
+        toolKind: z.literal("shell"),
+        name: ClaudeShellToolNameSchema,
+    }),
+    ClaudeToolCallPass2BaseSchema.extend({
+        toolKind: z.literal("read"),
+        name: ClaudeReadToolNameSchema,
+    }),
+    ClaudeToolCallPass2BaseSchema.extend({
+        toolKind: z.literal("write"),
+        name: ClaudeWriteToolNameSchema,
+    }),
+    ClaudeToolCallPass2BaseSchema.extend({
+        toolKind: z.literal("edit"),
+        name: ClaudeEditToolNameSchema,
+    }),
+    ClaudeToolCallPass2BaseSchema.extend({
+        toolKind: z.literal("search"),
+        name: ClaudeSearchToolNameSchema,
+    }),
     ClaudeToolCallPass2BaseSchema.extend({
         toolKind: z.literal("speak"),
-        name: z.literal("mcp__paseo__speak"),
+        name: z.literal("speak"),
     }),
     ClaudeToolCallPass2BaseSchema.extend({
-        toolKind: z.literal("other"),
+        toolKind: z.literal("unknown"),
     }),
 ]);
 function toToolCallTimelineItem(normalized) {
     const name = normalized.toolKind === "speak" ? "speak" : normalized.name;
-    const detail = deriveClaudeToolDetail(name, normalized.input, normalized.output);
+    const detailName = normalized.toolKind === "shell"
+        ? "shell"
+        : normalized.toolKind === "read"
+            ? "read_file"
+            : normalized.toolKind === "write"
+                ? "write_file"
+                : normalized.toolKind === "edit"
+                    ? "apply_patch"
+                    : normalized.toolKind === "search"
+                        ? "search"
+                        : normalized.toolKind === "speak"
+                            ? "speak"
+                            : normalized.name;
+    const detail = deriveClaudeToolDetail(detailName, normalized.input, normalized.output);
     if (normalized.status === "failed") {
         return {
             type: "tool_call",

package/dist/server/server/agent/providers/claude/tool-call-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-call-mapper.js","sourceRoot":"","sources":["../../../../../../src/server/agent/providers/claude/tool-call-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-call-mapper.js","sourceRoot":"","sources":["../../../../../../src/server/agent/providers/claude/tool-call-mapper.ts"],"names":[],"mappings":"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"}

package/dist/server/server/agent/providers/claude-agent.d.ts

@@ -2,6 +2,13 @@ import { type AgentDefinition } from "@anthropic-ai/claude-agent-sdk";
 import type { Logger } from "pino";
 import type { AgentCapabilityFlags, AgentClient, AgentModelDefinition, AgentPersistenceHandle, AgentSession, AgentSessionConfig, AgentTimelineItem, ListModelsOptions, ListPersistedAgentsOptions, PersistedAgentDescriptor } from "../agent-sdk-types.js";
 import { type ProviderRuntimeSettings } from "../provider-launch-config.js";
+type NormalizeClaudeRuntimeModelIdOptions = {
+    runtimeModelId: string;
+    supportedModelIds: ReadonlySet<string> | null;
+    configuredModelId?: string | null;
+    currentModelId?: string | null;
+};
+export declare function normalizeClaudeRuntimeModelId(options: NormalizeClaudeRuntimeModelIdOptions): string;
 export type ClaudeContentChunk = {
     type: string;
     [key: string]: any;

package/dist/server/server/agent/providers/claude-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/claude-agent.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,eAAe,EAerB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAQnC,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EAIX,oBAAoB,EAKpB,sBAAsB,EAItB,YAAY,EACZ,kBAAkB,EAGlB,iBAAiB,EAGjB,iBAAiB,EACjB,0BAA0B,EAE1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAqEtC,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAItE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAAE,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;CAC3C,CAAC;AAkDF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAgCtE;AA2KD,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAY;IACvC,QAAQ,CAAC,YAAY,uBAAuB;IAE5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA+C;IACzE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAA0B;gBAE/C,OAAO,EAAE,wBAAwB;IAW7C,OAAO,CAAC,oBAAoB;IA2BtB,aAAa,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;IAUhE,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,OAAO,CAAC,YAAY,CAAC;IAiBlB,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAwCxE,mBAAmB,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAuB9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC,OAAO,CAAC,YAAY;CAMrB;AA+mDD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,GACzE,iBAAiB,EAAE,CAoDrB"}
+{"version":3,"file":"claude-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/claude-agent.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,eAAe,EAerB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAQnC,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EAIX,oBAAoB,EAKpB,sBAAsB,EAItB,YAAY,EACZ,kBAAkB,EAGlB,iBAAiB,EAGjB,iBAAiB,EACjB,0BAA0B,EAE1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AA8BtC,KAAK,oCAAoC,GAAG;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9C,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAqBF,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,oCAAoC,GAC5C,MAAM,CAwDR;AAyCD,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAItE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAAE,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;CAC3C,CAAC;AAkDF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAgCtE;AA2KD,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAY;IACvC,QAAQ,CAAC,YAAY,uBAAuB;IAE5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA+C;IACzE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAA0B;gBAE/C,OAAO,EAAE,wBAAwB;IAW7C,OAAO,CAAC,oBAAoB;IA2BtB,aAAa,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;IAUhE,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,OAAO,CAAC,YAAY,CAAC;IAiBlB,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAwCxE,mBAAmB,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAuB9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC,OAAO,CAAC,YAAY;CAMrB;AAioDD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,GACzE,iBAAiB,EAAE,CAoDrB"}

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

@@ -22,6 +22,65 @@ function normalizeClaudeModelLabel(model) {
     }
     return fallback;
 }
+function normalizeModelIdCandidate(modelId) {
+    if (typeof modelId !== "string") {
+        return null;
+    }
+    const trimmed = modelId.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+function pickSupportedModelId(supportedModelIds, candidate) {
+    const normalizedCandidate = normalizeModelIdCandidate(candidate);
+    if (!normalizedCandidate) {
+        return null;
+    }
+    return supportedModelIds.has(normalizedCandidate) ? normalizedCandidate : null;
+}
+export function normalizeClaudeRuntimeModelId(options) {
+    const runtimeModel = options.runtimeModelId.trim();
+    if (!runtimeModel) {
+        return runtimeModel;
+    }
+    const supportedModelIds = options.supportedModelIds;
+    if (!supportedModelIds || supportedModelIds.size === 0) {
+        return runtimeModel;
+    }
+    const lowerRuntimeModel = runtimeModel.toLowerCase();
+    if (lowerRuntimeModel.includes("sonnet")) {
+        const explicitSonnet = pickSupportedModelId(supportedModelIds, "sonnet");
+        if (explicitSonnet) {
+            return explicitSonnet;
+        }
+        const defaultAlias = pickSupportedModelId(supportedModelIds, "default");
+        if (defaultAlias) {
+            return defaultAlias;
+        }
+    }
+    if (lowerRuntimeModel.includes("opus")) {
+        const alias = pickSupportedModelId(supportedModelIds, "opus");
+        if (alias) {
+            return alias;
+        }
+    }
+    if (lowerRuntimeModel.includes("haiku")) {
+        const alias = pickSupportedModelId(supportedModelIds, "haiku");
+        if (alias) {
+            return alias;
+        }
+    }
+    if (supportedModelIds.has(runtimeModel)) {
+        return runtimeModel;
+    }
+    const configuredModelId = pickSupportedModelId(supportedModelIds, options.configuredModelId);
+    if (configuredModelId) {
+        return configuredModelId;
+    }
+    const currentModelId = pickSupportedModelId(supportedModelIds, options.currentModelId);
+    if (currentModelId) {
+        return currentModelId;
+    }
+    return runtimeModel;
+}
 const CLAUDE_CAPABILITIES = {
     supportsStreaming: true,
     supportsSessionPersistence: true,
@@ -407,6 +466,7 @@ class ClaudeAgentSession {
         this.activeTurnPromise = null;
         this.cachedRuntimeInfo = null;
         this.lastOptionsModel = null;
+        this.selectableModelIds = null;
         this.activeSidechains = new Map();
         this.compacting = false;
         this.queryRestartNeeded = false;
@@ -607,13 +667,6 @@ class ClaudeAgentSession {
             queue.end();
         };
         this.cancelCurrentTurn = requestCancel;
-        if (this.historyPending && this.persistedHistory.length > 0) {
-            for (const item of this.persistedHistory) {
-                queue.push({ type: "timeline", item, provider: "claude" });
-            }
-            this.historyPending = false;
-            this.persistedHistory = [];
-        }
         // Start forwarding events and track the promise so future turns can wait for completion
         const forwardPromise = this.forwardPromptEvents(sdkMessage, queue, turnId);
         this.activeTurnPromise = forwardPromise;
@@ -828,6 +881,20 @@ class ClaudeAgentSession {
             usage,
         };
     }
+    async primeSelectableModelIds(query) {
+        try {
+            const models = await query.supportedModels();
+            const ids = models
+                .map((model) => model.value?.trim())
+                .filter((id) => typeof id === "string" && id.length > 0);
+            this.selectableModelIds = new Set(ids);
+            this.logger.debug({ modelIds: ids }, "Primed Claude selectable model IDs");
+        }
+        catch (error) {
+            this.selectableModelIds = null;
+            this.logger.warn({ err: error }, "Failed to prime Claude selectable model IDs");
+        }
+    }
     async ensureQuery() {
         if (this.query && !this.queryRestartNeeded) {
             return this.query;
@@ -847,6 +914,7 @@ class ClaudeAgentSession {
         this.logger.debug({ options }, "claude query");
         this.input = input;
         this.query = query({ prompt: input, options });
+        await this.primeSelectableModelIds(this.query);
         await this.query.setPermissionMode(this.currentMode);
         return this.query;
     }
@@ -1271,8 +1339,14 @@ class ClaudeAgentSession {
         this.persistence = null;
         // Capture actual model from SDK init message (not just the configured model)
         if (message.model) {
-            this.logger.debug({ model: message.model }, "Captured model from SDK init");
-            this.lastOptionsModel = message.model;
+            const normalizedModel = normalizeClaudeRuntimeModelId({
+                runtimeModelId: message.model,
+                supportedModelIds: this.selectableModelIds,
+                configuredModelId: this.config.model ?? null,
+                currentModelId: this.lastOptionsModel,
+            });
+            this.logger.debug({ model: message.model, normalizedModel }, "Captured model from SDK init");
+            this.lastOptionsModel = normalizedModel;
             // Invalidate cached runtime info so it picks up the new model
             this.cachedRuntimeInfo = null;
         }