From 34f55657c8a34102dcb2ba220ee8d063283c330d Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 16 Nov 2025 09:58:26 -0500 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20fix:=20use=20defaultModel=20?= =?UTF-8?q?directly=20instead=20of=20wrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unnecessary defaults.ts wrapper - CLI code can import defaultModel directly from @/common/utils/ai/models. _Generated with `mux`_ --- src/cli/debug/agentSessionCli.ts | 4 ++-- src/cli/debug/costs.ts | 4 ++-- src/cli/debug/send-message.ts | 4 ++-- src/common/utils/model/defaults.ts | 13 ------------- 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 src/common/utils/model/defaults.ts diff --git a/src/cli/debug/agentSessionCli.ts b/src/cli/debug/agentSessionCli.ts index 653e23a849..039c4d5767 100644 --- a/src/cli/debug/agentSessionCli.ts +++ b/src/cli/debug/agentSessionCli.ts @@ -24,7 +24,7 @@ import { type SendMessageOptions, type WorkspaceChatMessage, } from "@/common/types/ipc"; -import { getDefaultModel } from "@/common/utils/model/defaults"; +import { defaultModel } from "@/common/utils/ai/models"; import { ensureProvidersConfig } from "@/common/utils/providers/ensureProvidersConfig"; import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/common/utils/ui/modeUtils"; import { @@ -184,7 +184,7 @@ async function main(): Promise { } const model = - values.model && values.model.trim().length > 0 ? values.model.trim() : getDefaultModel(); + values.model && values.model.trim().length > 0 ? values.model.trim() : defaultModel; const timeoutMs = parseTimeout(values.timeout); const thinkingLevel = parseThinkingLevel(values["thinking-level"]); const initialMode = parseMode(values.mode); diff --git a/src/cli/debug/costs.ts b/src/cli/debug/costs.ts index 995297ce33..83ae64a746 100644 --- a/src/cli/debug/costs.ts +++ b/src/cli/debug/costs.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { defaultConfig } from "@/node/config"; import type { MuxMessage } from "@/common/types/message"; import { calculateTokenStats } from "@/common/utils/tokens/tokenStatsCalculator"; -import { getDefaultModel } from "@/common/utils/model/defaults"; +import { defaultModel } from "@/common/utils/ai/models"; /** * Debug command to display cost/token statistics for a workspace @@ -35,7 +35,7 @@ export async function costsCommand(workspaceId: string) { // Detect model from first assistant message const firstAssistantMessage = messages.find((msg) => msg.role === "assistant"); - const model = firstAssistantMessage?.metadata?.model ?? getDefaultModel(); + const model = firstAssistantMessage?.metadata?.model ?? defaultModel; // Calculate stats using shared logic (now synchronous) const stats = await calculateTokenStats(messages, model); diff --git a/src/cli/debug/send-message.ts b/src/cli/debug/send-message.ts index f1c8925eaf..d3018ed8ca 100644 --- a/src/cli/debug/send-message.ts +++ b/src/cli/debug/send-message.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { defaultConfig } from "@/node/config"; import type { MuxMessage } from "@/common/types/message"; import type { SendMessageOptions } from "@/common/types/ipc"; -import { getDefaultModel } from "@/common/utils/model/defaults"; +import { defaultModel } from "@/common/utils/ai/models"; import { getMuxSessionsDir } from "@/common/constants/paths"; /** @@ -104,7 +104,7 @@ export function sendMessageCommand( // Prepare options const options: SendMessageOptions = { - model: getDefaultModel(), + model: defaultModel, }; if (editMessageId) { diff --git a/src/common/utils/model/defaults.ts b/src/common/utils/model/defaults.ts deleted file mode 100644 index dbe2edda53..0000000000 --- a/src/common/utils/model/defaults.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Default model utilities for use across contexts (browser, CLI, etc.) - */ - -import { defaultModel } from "@/common/utils/ai/models"; - -/** - * Get the default model for CLI and non-browser contexts - * This is a simplified version that doesn't access browser localStorage - */ -export function getDefaultModel(): string { - return defaultModel; -} From 7908ff1f45f3dc64564cbfdb7409827c47204216 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 16 Nov 2025 10:00:39 -0500 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20fix:=20format=20agentSession?= =?UTF-8?q?Cli.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit _Generated with `mux`_ --- src/cli/debug/agentSessionCli.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cli/debug/agentSessionCli.ts b/src/cli/debug/agentSessionCli.ts index 039c4d5767..184fb201af 100644 --- a/src/cli/debug/agentSessionCli.ts +++ b/src/cli/debug/agentSessionCli.ts @@ -183,8 +183,7 @@ async function main(): Promise { throw new Error("Message must be provided via --message or stdin"); } - const model = - values.model && values.model.trim().length > 0 ? values.model.trim() : defaultModel; + const model = values.model && values.model.trim().length > 0 ? values.model.trim() : defaultModel; const timeoutMs = parseTimeout(values.timeout); const thinkingLevel = parseThinkingLevel(values["thinking-level"]); const initialMode = parseMode(values.mode);