Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"test": "vitest run"
},
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "^0.2.111",
"@anthropic-ai/claude-agent-sdk": "^0.3.154",
"@effect/platform-bun": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/platform-node-shared": "catalog:",
Expand Down
16 changes: 11 additions & 5 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ import { ServerConfig } from "../../config.ts";
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -255,8 +256,11 @@ function normalizeClaudeStreamMessages(
return squashed.length > 0 ? [squashed] : [];
}

function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort);
function getEffectiveClaudeAgentEffort(
effort: string | null | undefined,
model: string | null | undefined,
): ClaudeSdkEffort | null {
const normalized = normalizeClaudeCliEffort(effort, model);
return normalized ? (normalized as ClaudeSdkEffort) : null;
}

Expand DownExpand Up@@ -2908,7 +2912,8 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const thinking = thinkingSupported
? getModelSelectionBooleanOptionValue(modelSelection, "thinking")
: undefined;
const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
const ultracode = isClaudeUltracodeEffort(effort);
const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
const runtimeModeToPermission: Record<string, PermissionMode> = {
"auto-accept-edits": "acceptEdits",
"full-access": "bypassPermissions",
Expand All@@ -2917,15 +2922,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const queryOptions: ClaudeQueryOptions = {
...(input.cwd ? { cwd: input.cwd } : {}),
...(apiModelId ? { model: apiModelId } : {}),
pathToClaudeCodeExecutable: claudeBinaryPath,
systemPrompt: { type: "preset", preset: "claude_code" },
settingSources: [...CLAUDE_SETTING_SOURCES],
// The SDK type lags the CLI here: Opus 4.7 accepts `xhigh` even though
// the published `Options["effort"]` union currently stops at `max`.
// `ultracode` is a Claude Code setting, not an API effort level. It is
// normalized to `xhigh` above and paired with `settings.ultracode`.
...(effectiveEffort
? {
effort: effectiveEffort as unknown as NonNullable<ClaudeQueryOptions["effort"]>,
Expand Down
151 changes: 111 additions & 40 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,25 +48,83 @@ const CLAUDE_PRESENTATION = {
displayName: "Claude",
showInteractionModeToggle: true,
} as const;
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";

const CLAUDE_EFFORT_OPTIONS = {
opus48: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
{ value: "ultracode", label: "Ultracode" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus47: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
opus46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
sonnet46: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonnet 4.6 "Max" option silently behaves as "High"

Medium Severity

The CLAUDE_EFFORT_OPTIONS.sonnet46 constant adds a new max option that didn't exist before for Sonnet 4.6. However, normalizeClaudeCliEffort maps max to "high" when the model is claude-sonnet-4-6. This means the UI presents "Max" and "High" as two distinct effort choices, but they produce identical behavior. Users selecting "Max" will unknowingly receive "High" effort, which is misleading.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 625f0c5. Configure here.

opus45: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
} as const;

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
slug: "claude-opus-4-8",
name: "Claude Opus 4.8",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus48,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
id: "contextWindow",
label: "Context Window",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
{ value: "200k", label: "200k", isDefault: true },
{ value: "1m", label: "1M" },
],
}),
],
}),
},
{
slug: "claude-opus-4-7",
name: "Claude Opus 4.7",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: CLAUDE_EFFORT_OPTIONS.opus47,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand All@@ -89,13 +147,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.opus46,
promptInjectedValues: ["ultrathink"],
}),
buildBooleanOptionDescriptor({
Expand All@@ -122,12 +174,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "max", label: "Max" },
],
options: CLAUDE_EFFORT_OPTIONS.opus45,
}),
buildBooleanOptionDescriptor({
id: "fastMode",
Expand All@@ -145,12 +192,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High", isDefault: true },
{ value: "ultrathink", label: "Ultrathink" },
],
options: CLAUDE_EFFORT_OPTIONS.sonnet46,
promptInjectedValues: ["ultrathink"],
}),
buildSelectOptionDescriptor({
Expand DownExpand Up@@ -179,17 +221,31 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
},
];

function supportsClaudeOpus48(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION) >= 0 : false;
}

function supportsClaudeOpus47(version: string | null | undefined): boolean {
return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION) >= 0 : false;
}

function getBuiltInClaudeModelsForVersion(
version: string | null | undefined,
): ReadonlyArray<ServerProviderModel> {
if (supportsClaudeOpus47(version)) {
return BUILT_IN_MODELS;
}
return BUILT_IN_MODELS.filter((model) => model.slug !== "claude-opus-4-7");
return BUILT_IN_MODELS.filter((model) => {
if (model.slug === "claude-opus-4-8") {
return supportsClaudeOpus48(version);
}
if (model.slug === "claude-opus-4-7") {
return supportsClaudeOpus47(version);
}
return true;
});
}

function formatClaudeOpus48UpgradeMessage(version: string | null): string {
const versionLabel = version ? `v${version}` : "the installed version";
return `Claude Code ${versionLabel} is too old for Claude Opus 4.8. Upgrade to v${MINIMUM_CLAUDE_OPUS_4_8_VERSION} or newer to access it.`;
}

function formatClaudeOpus47UpgradeMessage(version: string | null): string {
Expand DownExpand Up@@ -223,21 +279,34 @@ export function resolveClaudeEffort(
* CLI's `--effort` flag.
*
* Mirrors the mapping used when invoking the Claude Agent SDK
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): the Opus 4.7
* capability `"xhigh"` is rewritten to the accepted CLI value `"max"`, and
* `"ultrathink"` is filtered out because it is a prompt-prefix mode rather
* than a CLI-effort value. Returns `undefined` when no flag should be passed.
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
* because it is a prompt-prefix mode, and older model compatibility mappings
* are preserved for current Claude Code behavior.
*/
export function normalizeClaudeCliEffort(effort: string | null | undefined): string | undefined {
export function normalizeClaudeCliEffort(
effort: string | null | undefined,
model: string | null | undefined,
): string | undefined {
if (!effort || effort === "ultrathink") {
return undefined;
}
if (effort === "xhigh") {
if (effort === "ultracode") {
return "xhigh";
}
if (effort === "xhigh" && model !== "claude-opus-4-8") {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
return "high";
}
return effort;
}

export function isClaudeUltracodeEffort(effort: string | null | undefined): boolean {
return effort === "ultracode";
}

export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
case "1m":
Expand DownExpand Up@@ -617,9 +686,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const opus47UpgradeMessage = supportsClaudeOpus47(parsedVersion)
const versionUpgradeMessage = supportsClaudeOpus48(parsedVersion)
? undefined
: formatClaudeOpus47UpgradeMessage(parsedVersion);
: supportsClaudeOpus47(parsedVersion)
? formatClaudeOpus48UpgradeMessage(parsedVersion)
: formatClaudeOpus47UpgradeMessage(parsedVersion);

const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
Expand DownExpand Up@@ -663,7 +734,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
...(capabilities.email ? { email: capabilities.email } : {}),
...(authMetadata ? authMetadata : {}),
},
...(opus47UpgradeMessage ? { message: opus47UpgradeMessage } : {}),
...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
},
});
});
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/textGeneration/ClaudeTextGeneration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ import {
} from "@t3tools/shared/model";
import {
getClaudeModelCapabilities,
isClaudeUltracodeEffort,
normalizeClaudeCliEffort,
resolveClaudeApiModelId,
resolveClaudeEffort,
Expand DownExpand Up@@ -132,7 +133,8 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
const rawEffortSelection = getModelSelectionStringOptionValue(modelSelection, "effort");
const resolvedEffort = resolveClaudeEffort(caps, rawEffortSelection);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort);
const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
const ultracode = isClaudeUltracodeEffort(resolvedEffort);
const thinkingDescriptor = findDescriptor("thinking");
const fastModeDescriptor = findDescriptor("fastMode");
const thinking =
Expand All@@ -142,6 +144,7 @@ export const makeClaudeTextGeneration = Effect.fn("makeClaudeTextGeneration")(fu
const settings = {
...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
...(fastMode ? { fastMode: true } : {}),
...(ultracode ? { ultracode: true } : {}),
};
const settingsJson =
Object.keys(settings).length > 0
Expand Down
20 changes: 19 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/contracts/src/model.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,9 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<
"gpt-5.3-spark": "gpt-5.3-codex-spark",
},
[CLAUDE_DRIVER_KIND]: {
opus: "claude-opus-4-7",
opus: "claude-opus-4-8",
"opus-4.8": "claude-opus-4-8",
"claude-opus-4.8": "claude-opus-4-8",
"opus-4.7": "claude-opus-4-7",
"claude-opus-4.7": "claude-opus-4-7",
"opus-4.6": "claude-opus-4-6",
Expand Down
Loading