Skip to content

🤖 fix: use defaultModel directly instead of wrapper #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylecarbs merged 2 commits into from
Nov 16, 2025
Merged

🤖 fix: use defaultModel directly instead of wrapper #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f5565
🤖 fix: use defaultModel directly instead of wrapper
kylecarbs Nov 16, 2025
7908ff1
🤖 fix: format agentSessionCli.ts
kylecarbs Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/cli/debug/agentSessionCli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -183,8 +183,7 @@ async function main(): Promise<void> {
throw new Error("Message must be provided via --message or stdin");
}

const model =
values.model && values.model.trim().length > 0 ? values.model.trim() : getDefaultModel();
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);
Expand Down
4 changes: 2 additions & 2 deletions src/cli/debug/costs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/cli/debug/send-message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down Expand Up @@ -104,7 +104,7 @@ export function sendMessageCommand(

// Prepare options
const options: SendMessageOptions = {
model: getDefaultModel(),
model: defaultModel,
};

if (editMessageId) {
Expand Down
13 changes: 0 additions & 13 deletions src/common/utils/model/defaults.ts
View file
Open in desktop

This file was deleted.