Skip to content

Commit 866476e

Browse files
committed
feat: remove Ultrathink
1 parent db1507e commit 866476e

19 files changed

Lines changed: 37 additions & 623 deletions

‎apps/mobile/src/features/threads/thread-settings-menu.test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ const effortDescriptor: ProviderOptionDescriptor = {
4848
{ id: "low", label: "Low" },
4949
{ id: "medium", label: "Medium", isDefault: true },
5050
{ id: "high", label: "High" },
51-
{ id: "ultrathink", label: "Ultrathink" },
5251
{ id: "ultracode", label: "Ultracode" },
5352
],
5453
currentValue: "high",
55-
promptInjectedValues: ["ultrathink"],
5654
};
5755

5856
const fastModeDescriptor: ProviderOptionDescriptor = {

‎apps/mobile/src/features/threads/thread-settings-menu.ts‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@ import {
77

88
import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
99

10-
/**
11-
* Desktop-oriented effort keywords that don't belong in the phone picker.
12-
* Prompt-injected values (ultrathink and friends) are filtered from the
13-
* descriptor metadata; ultracode is a real option but a workflow trigger, not
14-
* a reasoning level. A value set elsewhere still displays, it just isn't
15-
* offered.
16-
*/
10+
/** Desktop-oriented effort keywords that don't belong in the phone picker. */
1711
export const HIDDEN_EFFORT_OPTION_IDS: ReadonlySet<string> = new Set(["ultracode"]);
1812

1913
export const RUNTIME_MODE_CHOICES: ReadonlyArray<{
@@ -30,10 +24,7 @@ export const RUNTIME_MODE_CHOICES: ReadonlyArray<{
3024
export function selectableChoices(
3125
descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
3226
) {
33-
const injected = new Set(descriptor.promptInjectedValues ?? []);
34-
return descriptor.options.filter(
35-
(option) => !injected.has(option.id) && !HIDDEN_EFFORT_OPTION_IDS.has(option.id),
36-
);
27+
return descriptor.options.filter((option) => !HIDDEN_EFFORT_OPTION_IDS.has(option.id));
3728
}
3829

3930
export type ThreadSettingsMenuEvent =

‎apps/server/src/provider/Layers/ClaudeAdapter.test.ts‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -226,31 +226,6 @@ function makeDeterministicRandomService(seed = 0x1234_5678): {
226226
};
227227
}
228228

229-
async function readFirstPromptText(
230-
input:
231-
| {
232-
readonly prompt: AsyncIterable<SDKUserMessage>;
233-
}
234-
| undefined,
235-
): Promise<string | undefined> {
236-
const iterator = input?.prompt[Symbol.asyncIterator]();
237-
if (!iterator) {
238-
return undefined;
239-
}
240-
const next = await iterator.next();
241-
if (next.done) {
242-
return undefined;
243-
}
244-
if (typeof next.value.message.content === "string") {
245-
return next.value.message.content;
246-
}
247-
const content = next.value.message.content[0];
248-
if (!content || content.type !== "text") {
249-
return undefined;
250-
}
251-
return content.text;
252-
}
253-
254229
async function readFirstPromptMessage(
255230
input:
256231
| {
@@ -700,42 +675,6 @@ describe("ClaudeAdapterLive", () => {
700675
);
701676
});
702677

703-
it.effect("treats ultrathink as a prompt keyword instead of a session effort", () => {
704-
const harness = makeHarness();
705-
return Effect.gen(function* () {
706-
const adapter = yield* ClaudeAdapter;
707-
const session = yield* adapter.startSession({
708-
threadId: THREAD_ID,
709-
provider: ProviderDriverKind.make("claudeAgent"),
710-
modelSelection: createModelSelection(
711-
ProviderInstanceId.make("claudeAgent"),
712-
"claude-sonnet-4-6",
713-
[{ id: "effort", value: "ultrathink" }],
714-
),
715-
runtimeMode: "full-access",
716-
});
717-
718-
yield* adapter.sendTurn({
719-
threadId: session.threadId,
720-
input: "Investigate the edge cases",
721-
attachments: [],
722-
modelSelection: createModelSelection(
723-
ProviderInstanceId.make("claudeAgent"),
724-
"claude-sonnet-4-6",
725-
[{ id: "effort", value: "ultrathink" }],
726-
),
727-
});
728-
729-
const createInput = harness.getLastCreateQueryInput();
730-
assert.equal(createInput?.options.effort, "high");
731-
const promptText = yield* Effect.promise(() => readFirstPromptText(createInput));
732-
assert.equal(promptText, "Ultrathink:\nInvestigate the edge cases");
733-
}).pipe(
734-
Effect.provideService(Random.Random, makeDeterministicRandomService()),
735-
Effect.provide(harness.layer),
736-
);
737-
});
738-
739678
it.effect("embeds image attachments in Claude user messages", () => {
740679
const baseDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "claude-attachments-"));
741680
const harness = makeHarness({

‎apps/server/src/provider/Layers/ClaudeAdapter.ts‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ import {
5151
type UserInputQuestion,
5252
} from "@t3tools/contracts";
5353
import {
54-
applyClaudePromptEffortPrefix,
5554
getModelSelectionBooleanOptionValue,
5655
getModelSelectionStringOptionValue,
5756
getProviderOptionDescriptors,
58-
resolvePromptInjectedEffort,
5957
} from "@t3tools/shared/model";
6058
import * as Cause from "effect/Cause";
6159
import * as Crypto from "effect/Crypto";
@@ -1174,20 +1172,8 @@ const CLAUDE_SETTING_SOURCES = [
11741172
"local",
11751173
] as const satisfies ReadonlyArray<SettingSource>;
11761174

1177-
function buildPromptText(
1178-
input: ProviderSendTurnInput,
1179-
boundInstanceId: ProviderInstanceId,
1180-
): string {
1181-
const rawEffort =
1182-
input.modelSelection?.instanceId === boundInstanceId
1183-
? getModelSelectionStringOptionValue(input.modelSelection, "effort")
1184-
: null;
1185-
const claudeModel =
1186-
input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection.model : undefined;
1187-
const caps = getClaudeModelCapabilities(claudeModel);
1188-
1189-
const promptEffort = resolvePromptInjectedEffort(caps, rawEffort);
1190-
return applyClaudePromptEffortPrefix(input.input?.trim() ?? "", promptEffort);
1175+
function buildPromptText(input: ProviderSendTurnInput): string {
1176+
return input.input?.trim() ?? "";
11911177
}
11921178

11931179
function buildUserMessage(input: {
@@ -1226,7 +1212,7 @@ const buildUserMessageEffect = Effect.fn("buildUserMessageEffect")(function* (
12261212
readonly boundInstanceId: ProviderInstanceId;
12271213
},
12281214
) {
1229-
const text = buildPromptText(input, dependencies.boundInstanceId);
1215+
const text = buildPromptText(input);
12301216
const sdkContent: Array<Record<string, unknown>> = [];
12311217

12321218
if (text.length > 0) {

‎apps/server/src/provider/Layers/ClaudeProvider.ts‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
7979
{ value: "xhigh", label: "Extra High" },
8080
{ value: "max", label: "Max" },
8181
{ value: "ultracode", label: "Ultracode" },
82-
{ value: "ultrathink", label: "Ultrathink" },
8382
],
84-
promptInjectedValues: ["ultrathink"],
8583
}),
8684
buildSelectOptionDescriptor({
8785
id: "contextWindow",
@@ -110,9 +108,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
110108
{ value: "xhigh", label: "Extra High" },
111109
{ value: "max", label: "Max" },
112110
{ value: "ultracode", label: "Ultracode" },
113-
{ value: "ultrathink", label: "Ultrathink" },
114111
],
115-
promptInjectedValues: ["ultrathink"],
116112
}),
117113
buildBooleanOptionDescriptor({
118114
id: "fastMode",
@@ -146,9 +142,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
146142
{ value: "xhigh", label: "Extra High" },
147143
{ value: "max", label: "Max" },
148144
{ value: "ultracode", label: "Ultracode" },
149-
{ value: "ultrathink", label: "Ultrathink" },
150145
],
151-
promptInjectedValues: ["ultrathink"],
152146
}),
153147
buildBooleanOptionDescriptor({
154148
id: "fastMode",
@@ -172,9 +166,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
172166
{ value: "high", label: "High" },
173167
{ value: "xhigh", label: "Extra High", isDefault: true },
174168
{ value: "max", label: "Max" },
175-
{ value: "ultrathink", label: "Ultrathink" },
176169
],
177-
promptInjectedValues: ["ultrathink"],
178170
}),
179171
buildBooleanOptionDescriptor({
180172
id: "fastMode",
@@ -197,9 +189,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
197189
{ value: "medium", label: "Medium" },
198190
{ value: "high", label: "High", isDefault: true },
199191
{ value: "max", label: "Max" },
200-
{ value: "ultrathink", label: "Ultrathink" },
201192
],
202-
promptInjectedValues: ["ultrathink"],
203193
}),
204194
buildBooleanOptionDescriptor({
205195
id: "fastMode",
@@ -254,9 +244,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
254244
{ value: "high", label: "High", isDefault: true },
255245
{ value: "xhigh", label: "Extra High" },
256246
{ value: "max", label: "Max" },
257-
{ value: "ultrathink", label: "Ultrathink" },
258247
],
259-
promptInjectedValues: ["ultrathink"],
260248
}),
261249
buildSelectOptionDescriptor({
262250
id: "contextWindow",
@@ -284,9 +272,7 @@ const CLAUDE_MODEL_CATALOG: ReadonlyArray<ServerProviderModel> = [
284272
{ value: "medium", label: "Medium" },
285273
{ value: "high", label: "High", isDefault: true },
286274
{ value: "max", label: "Max" },
287-
{ value: "ultrathink", label: "Ultrathink" },
288275
],
289-
promptInjectedValues: ["ultrathink"],
290276
}),
291277
buildSelectOptionDescriptor({
292278
id: "contextWindow",
@@ -402,15 +388,14 @@ export function resolveClaudeEffort(
402388
*
403389
* Mirrors the mapping used when invoking the Claude Agent SDK
404390
* ({@link getEffectiveClaudeAgentEffort} in ClaudeAdapter): `ultracode` is a
405-
* Claude Code setting that pairs with `xhigh`, `ultrathink` is filtered out
406-
* because it is a prompt-prefix mode, and older model compatibility mappings
407-
* are preserved for current Claude Code behavior.
391+
* Claude Code setting that pairs with `xhigh`, and older model compatibility
392+
* mappings are preserved for current Claude Code behavior.
408393
*/
409394
export function normalizeClaudeCliEffort(
410395
effort: string | null | undefined,
411396
model: string | null | undefined,
412397
): string | undefined {
413-
if (!effort || effort === "ultrathink") {
398+
if (!effort) {
414399
return undefined;
415400
}
416401
if (effort === "ultracode") {

‎apps/server/src/provider/providerSnapshot.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ export function buildSelectOptionDescriptor(input: {
171171
| ReadonlyArray<{ value: string; label: string; isDefault?: boolean | undefined }>
172172
| undefined;
173173
readonly description?: string;
174-
readonly promptInjectedValues?: ReadonlyArray<string>;
175174
}) {
176175
const options = (input.options ?? []).map((option) =>
177176
option.isDefault
@@ -186,9 +185,6 @@ export function buildSelectOptionDescriptor(input: {
186185
options,
187186
...(currentValue ? { currentValue } : {}),
188187
...(input.description ? { description: input.description } : {}),
189-
...(input.promptInjectedValues && input.promptInjectedValues.length > 0
190-
? { promptInjectedValues: [...input.promptInjectedValues] }
191-
: {}),
192188
};
193189
}
194190

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 7 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ import {
3838
scopeProjectRef,
3939
scopeThreadRef,
4040
} from "@t3tools/client-runtime/environment";
41-
import {
42-
applyClaudePromptEffortPrefix,
43-
createModelSelection,
44-
resolvePromptInjectedEffort,
45-
} from "@t3tools/shared/model";
41+
import { createModelSelection } from "@t3tools/shared/model";
4642
import { CHAT_LIST_ANCHOR_OFFSET } from "@t3tools/shared/chatList";
4743
import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts";
4844
import { truncate } from "@t3tools/shared/String";
@@ -179,7 +175,7 @@ import {
179175
} from "~/projectScripts";
180176
import { newDraftId, newMessageId, newThreadId } from "~/lib/utils";
181177
import { useBrowserHistoryStore } from "~/browserHistoryStore";
182-
import { getProviderModelCapabilities, resolveSelectableProvider } from "../providerModels";
178+
import { resolveSelectableProvider } from "../providerModels";
183179
import { NO_PROVIDER_MODEL_SELECTION } from "../providerInstances";
184180
import {
185181
useClientSettings,
@@ -493,17 +489,6 @@ function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
493489
return true;
494490
}
495491

496-
function formatOutgoingPrompt(params: {
497-
provider: ProviderDriverKind;
498-
model: string | null;
499-
models: ReadonlyArray<ServerProvider["models"][number]>;
500-
effort: string | null;
501-
text: string;
502-
}): string {
503-
const caps = getProviderModelCapabilities(params.models, params.model, params.provider);
504-
const promptEffort = resolvePromptInjectedEffort(caps, params.effort);
505-
return applyClaudePromptEffortPrefix(params.text, promptEffort);
506-
}
507492
const SCRIPT_TERMINAL_COLS = 120;
508493
const SCRIPT_TERMINAL_ROWS = 30;
509494

@@ -4927,10 +4912,7 @@ function ChatViewContent(props: ChatViewProps) {
49274912
elementContexts: composerElementContexts,
49284913
previewAnnotations: sendContextPreviewAnnotations,
49294914
reviewComments: composerReviewComments,
4930-
selectedProvider: ctxSelectedProvider,
49314915
selectedModel: ctxSelectedModel,
4932-
selectedProviderModels: ctxSelectedProviderModels,
4933-
selectedPromptEffort: ctxSelectedPromptEffort,
49344916
selectedModelSelection: ctxSelectedModelSelection,
49354917
} = sendCtx;
49364918
const composerImages =
@@ -5079,13 +5061,7 @@ function ChatViewContent(props: ChatViewProps) {
50795061
);
50805062
const messageIdForSend = newMessageId();
50815063
const messageCreatedAt = new Date().toISOString();
5082-
const outgoingMessageText = formatOutgoingPrompt({
5083-
provider: ctxSelectedProvider,
5084-
model: ctxSelectedModel,
5085-
models: ctxSelectedProviderModels,
5086-
effort: ctxSelectedPromptEffort,
5087-
text: messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT,
5088-
});
5064+
const outgoingMessageText = (messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT).trim();
50895065
const turnAttachmentsPromise = Promise.all(
50905066
composerImagesSnapshot.map(async (image) => ({
50915067
type: "image" as const,
@@ -5527,24 +5503,12 @@ function ChatViewContent(props: ChatViewProps) {
55275503
if (!sendCtx?.providerAvailable) {
55285504
return;
55295505
}
5530-
const {
5531-
selectedProvider: ctxSelectedProvider,
5532-
selectedModel: ctxSelectedModel,
5533-
selectedProviderModels: ctxSelectedProviderModels,
5534-
selectedPromptEffort: ctxSelectedPromptEffort,
5535-
selectedModelSelection: ctxSelectedModelSelection,
5536-
} = sendCtx;
5506+
const { selectedModelSelection: ctxSelectedModelSelection } = sendCtx;
55375507

55385508
const threadIdForSend = activeThread.id;
55395509
const messageIdForSend = newMessageId();
55405510
const messageCreatedAt = new Date().toISOString();
5541-
const outgoingMessageText = formatOutgoingPrompt({
5542-
provider: ctxSelectedProvider,
5543-
model: ctxSelectedModel,
5544-
models: ctxSelectedProviderModels,
5545-
effort: ctxSelectedPromptEffort,
5546-
text: trimmed,
5547-
});
5511+
const outgoingMessageText = trimmed;
55485512

55495513
sendInFlightRef.current = true;
55505514
beginLocalDispatch({ preparingWorktree: false });
@@ -5683,25 +5647,13 @@ function ChatViewContent(props: ChatViewProps) {
56835647
if (!sendCtx?.providerAvailable) {
56845648
return;
56855649
}
5686-
const {
5687-
selectedProvider: ctxSelectedProvider,
5688-
selectedModel: ctxSelectedModel,
5689-
selectedProviderModels: ctxSelectedProviderModels,
5690-
selectedPromptEffort: ctxSelectedPromptEffort,
5691-
selectedModelSelection: ctxSelectedModelSelection,
5692-
} = sendCtx;
5650+
const { selectedModelSelection: ctxSelectedModelSelection } = sendCtx;
56935651

56945652
const createdAt = new Date().toISOString();
56955653
const nextThreadId = newThreadId();
56965654
const planMarkdown = activeProposedPlan.planMarkdown;
56975655
const implementationPrompt = buildPlanImplementationPrompt(planMarkdown);
5698-
const outgoingImplementationPrompt = formatOutgoingPrompt({
5699-
provider: ctxSelectedProvider,
5700-
model: ctxSelectedModel,
5701-
models: ctxSelectedProviderModels,
5702-
effort: ctxSelectedPromptEffort,
5703-
text: implementationPrompt,
5704-
});
5656+
const outgoingImplementationPrompt = implementationPrompt.trim();
57055657
const nextThreadTitle = truncate(buildPlanImplementationThreadTitle(planMarkdown));
57065658
const nextThreadModelSelection: ModelSelection = ctxSelectedModelSelection;
57075659

@@ -6405,7 +6357,6 @@ function ChatViewContent(props: ChatViewProps) {
64056357
handleRuntimeModeChange={handleRuntimeModeChange}
64066358
handleInteractionModeChange={handleInteractionModeChange}
64076359
focusComposer={focusComposer}
6408-
scheduleComposerFocus={scheduleComposerFocus}
64096360
setThreadError={setThreadError}
64106361
onExpandImage={onExpandTimelineImage}
64116362
/>

0 commit comments

Comments
 (0)