Skip to content

Commit 63f74e2

Browse files
authored
fix(opencode): fill blank reasoning labels (#14978)
1 parent ca4f84e commit 63f74e2

16 files changed

Lines changed: 397 additions & 21 deletions

File tree

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export interface ThreadComposerProps {
150150
*/
151151
readonly threadSyncPhase?: "loading" | "syncing" | null;
152152
readonly selectedThread: EnvironmentThreadShell;
153+
readonly reportedModelSelection?: ModelSelection | null;
153154
readonly hasCompactableConversation: boolean;
154155
readonly serverConfig: T3ServerConfig | null;
155156
readonly queueCount: number;
@@ -667,6 +668,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
667668
providerInstanceId: currentModelSelection.instanceId,
668669
providerGroups: threadProviderGroups,
669670
selectedModel: currentModelSelection,
671+
reportedModelSelection: props.reportedModelSelection,
670672
onSelectModel: (option) =>
671673
props.onUpdateModelSelection(withRememberedModelOptions(option.selection)),
672674
optionDescriptors: providerOptionDescriptors,
@@ -683,6 +685,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
683685
}),
684686
[
685687
currentModelSelection,
688+
props.reportedModelSelection,
686689
currentRuntimeMode,
687690
props.onUpdateModelSelection,
688691
props.onUpdateRuntimeMode,

‎apps/mobile/src/features/threads/ThreadDetailScreen.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useThreadReportedModelSelection } from "../../state/entities";
12
import { UsageLimitRecoveryCard } from "./UsageLimitRecoveryCard";
23
import { useNavigation } from "@react-navigation/native";
34
import type { WorktreeSetupCardProps } from "./worktree-setup-card";
@@ -303,6 +304,10 @@ const USER_INPUT_TOGGLE_TIMING = {
303304

304305
export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: ThreadDetailScreenProps) {
305306
const navigation = useNavigation();
307+
const reportedModelSelection = useThreadReportedModelSelection({
308+
environmentId: props.environmentId,
309+
threadId: props.selectedThread.id,
310+
});
306311
const deviceState = useEnvironmentQuery(
307312
deviceEnvironment.state({ environmentId: props.environmentId, input: {} }),
308313
);
@@ -1277,6 +1282,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
12771282
effortLabel={formatModelSelectionEffort(
12781283
props.selectedThread.modelSelection,
12791284
providerSubagentProvider?.models,
1285+
reportedModelSelection,
12801286
)}
12811287
status={props.providerSubagentStatus ?? null}
12821288
onOpenParent={
@@ -1293,6 +1299,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
12931299
) : (
12941300
<>
12951301
<ThreadComposer
1302+
reportedModelSelection={reportedModelSelection}
12961303
editorRef={composerEditorRef}
12971304
draftMessage={props.draftMessage}
12981305
draftAttachments={props.draftAttachments}

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ type ThreadSettingsSessionProps = {
245245
readonly providerInstanceId?: ProviderInstanceId;
246246
readonly providerGroups: ReadonlyArray<ProviderGroup>;
247247
readonly selectedModel: ModelSelection | null;
248+
readonly reportedModelSelection?: ModelSelection | null;
248249
readonly onSelectModel: (option: ModelOption) => void;
249250
readonly optionDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
250251
readonly onUpdateOptionSelections: (selections: ReadonlyArray<ProviderOptionSelection>) => void;
@@ -304,6 +305,8 @@ type ThreadSettingsSessionValue = {
304305
readonly runtimeModeChoices: ReturnType<typeof runtimeModeChoicesForSupportedModes>;
305306
readonly onUpdateRuntimeMode: (mode: RuntimeMode) => void;
306307
readonly displayedDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
308+
readonly displayedModelSelection: ModelSelection | null;
309+
readonly reportedModelSelection: ModelSelection | null;
307310
readonly providerExpansionOverrides: ReadonlySet<string>;
308311
readonly hasLegacyModels: boolean;
309312
readonly pendingModel: ModelOption | null;
@@ -476,6 +479,8 @@ function ThreadSettingsSessionProvider(
476479
runtimeModeChoices,
477480
onUpdateRuntimeMode: props.onUpdateRuntimeMode,
478481
displayedDescriptors,
482+
displayedModelSelection: pendingModel?.selection ?? props.selectedModel,
483+
reportedModelSelection: pendingModel ? null : (props.reportedModelSelection ?? null),
479484
favoriteKeys,
480485
favoritesLoaded,
481486
providerExpansionOverrides,
@@ -507,6 +512,8 @@ function ThreadSettingsSessionProvider(
507512
isApplied,
508513
isDisplayed,
509514
props.environmentId,
515+
props.selectedModel,
516+
props.reportedModelSelection,
510517
props.providerInstanceId,
511518
pendingModel,
512519
pressModel,
@@ -743,7 +750,11 @@ function ThreadSettingsOptionsItem(props: {
743750
>
744751
<DisclosureRow
745752
label={descriptor.label}
746-
value={getProviderOptionCurrentLabel(descriptor)}
753+
value={getProviderOptionCurrentLabel(
754+
descriptor,
755+
session.displayedModelSelection,
756+
session.reportedModelSelection,
757+
)}
747758
onPress={() => props.onOpenSubmenu({ kind: "descriptor", id: descriptor.id })}
748759
/>
749760
</Animated.View>
@@ -997,7 +1008,13 @@ function ThreadSettingsChoiceContent(props: {
9971008
id: choice.id,
9981009
label: choice.label,
9991010
description: undefined,
1000-
selected: choice.id === getProviderOptionCurrentValue(activeDescriptor),
1011+
selected:
1012+
choice.id ===
1013+
getProviderOptionCurrentValue(
1014+
activeDescriptor,
1015+
session.displayedModelSelection,
1016+
session.reportedModelSelection,
1017+
),
10011018
onPress: () => {
10021019
void Haptics.selectionAsync();
10031020
session.applyOptionChange(activeDescriptor.id, choice.id);

‎apps/mobile/src/state/entities.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { useAtomValue } from "@effect/atom-react";
2+
import { deriveReportedModelSelection } from "@t3tools/client-runtime/state/thread-execution";
23

34
import { appAtomRegistry } from "./atom-registry";
45
import type {
56
EnvironmentProject,
7+
EnvironmentThread,
68
EnvironmentThreadShell,
79
} from "@t3tools/client-runtime/state/shell";
810
import type {
@@ -15,7 +17,7 @@ import { Atom } from "effect/unstable/reactivity";
1517

1618
import { environmentProjects } from "./projects";
1719
import { environmentServerConfigsAtom, serverEnvironment } from "./server";
18-
import { environmentThreadShells } from "./threads";
20+
import { environmentThreadDetails, environmentThreadShells } from "./threads";
1921

2022
const EMPTY_PROJECT_ATOM = Atom.make<EnvironmentProject | null>(null).pipe(
2123
Atom.withLabel("mobile-project:empty"),
@@ -87,3 +89,10 @@ export function useEnvironmentServerConfig(
8789
export function useServerConfigs(): ReadonlyMap<EnvironmentId, ServerConfig> {
8890
return useAtomValue(environmentServerConfigsAtom);
8991
}
92+
93+
const selectReportedModelSelection = (thread: EnvironmentThread | null) =>
94+
thread === null ? null : deriveReportedModelSelection(thread.projection);
95+
96+
export function useThreadReportedModelSelection(ref: ScopedThreadRef) {
97+
return useAtomValue(environmentThreadDetails.threadAtom(ref), selectReportedModelSelection);
98+
}

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,11 @@ describe("OpenCode2 adapter", () => {
410410
promptAccepted,
411411
event("session.execution.succeeded", { sessionID: SESSION }),
412412
]);
413+
assert.deepEqual(thread.nativeMetadata?.modelSelection, {
414+
...bigPickle,
415+
options: [{ id: "variant", value: "default" }],
416+
});
417+
assert.equal(bigPickle.options, undefined);
413418
const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
414419
yield* runtime.startTurn(
415420
turnInput(thread, {
@@ -2833,6 +2838,10 @@ describe("OpenCode2 adapter", () => {
28332838
modelSelection: bigPickle,
28342839
runtimePolicy: customPolicy,
28352840
});
2841+
assert.deepEqual(thread.nativeMetadata?.modelSelection, {
2842+
...bigPickle,
2843+
options: [{ id: "variant", value: "default" }],
2844+
});
28362845
// Each directory keeps its own limit, whichever was read last.
28372846
assert.equal(runtime.getModelContextWindow?.(bigPickle, WORK), 160000);
28382847
assert.equal(runtime.getModelContextWindow?.(bigPickle, custom), 48000);
@@ -3869,3 +3878,44 @@ const providerTurnId = Effect.gen(function* () {
38693878
nativeTurnId: `${SESSION}:attempt:attempt:opencode2-adapter`,
38703879
});
38713880
}).pipe(Effect.provide(IdAllocator.layer));
3881+
3882+
describe("OpenCode reported model variants", () => {
3883+
it.effect(
3884+
"updates reported variants from selected-model and step events without duplicate updates",
3885+
() =>
3886+
Effect.gen(function* () {
3887+
const model = { providerID: "opencode", id: "big-pickle", variant: "thinking" };
3888+
const step = {
3889+
sessionID: SESSION,
3890+
assistantMessageID: "msg_0eb735d5b001oAFVeY5jz3WD4Z",
3891+
agent: "build",
3892+
model,
3893+
started: 1,
3894+
};
3895+
const { runtime, thread } = yield* resumed([
3896+
out("session.prompt", { sessionID: SESSION, text: "<any>" }),
3897+
promptAccepted,
3898+
event("session.execution.started", { sessionID: SESSION }),
3899+
event("session.model.selected", { sessionID: SESSION, model }),
3900+
event("session.step.started", step),
3901+
event("session.step.started", { ...step, model: { ...model, variant: "none" } }),
3902+
event("session.execution.succeeded", { sessionID: SESSION }),
3903+
]);
3904+
const collected = yield* runtime.events.pipe(
3905+
Stream.takeUntil((event) => event.type === "turn.terminal"),
3906+
Stream.runCollect,
3907+
Effect.forkScoped,
3908+
);
3909+
yield* runtime.startTurn(turnInput(thread));
3910+
const updates = (yield* Fiber.join(collected)).filter(
3911+
(event) => event.type === "provider_thread.updated",
3912+
);
3913+
assert.deepEqual(
3914+
updates.map(
3915+
(event) => event.providerThread.nativeMetadata?.modelSelection?.options?.[0]?.value,
3916+
),
3917+
["default", "thinking", "none", "none"],
3918+
);
3919+
}).pipe(Effect.scoped),
3920+
);
3921+
});

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.ts‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
7878
import { buildRuntimeInstructions } from "../../provider/RuntimeInstructions.ts";
7979
import { t3OrchestrationSystemPrompt } from "../../provider/T3OrchestrationInstructions.ts";
8080
import { SKILL_MENTION_PATTERN } from "@t3tools/shared/composerInlineTokens";
81-
import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
81+
import { getModelSelectionStringOptionValue, modelSelectionsEqual } from "@t3tools/shared/model";
8282
import { causeErrorTag } from "@t3tools/shared/observability";
8383

8484
import { providerMessageTextWithAttachmentPaths } from "../AttachmentPrompt.ts";
@@ -1385,6 +1385,27 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
13851385
});
13861386
});
13871387

1388+
const withReportedModel = (
1389+
providerThread: OrchestrationV2ProviderThread,
1390+
model: ModelRef | undefined,
1391+
): OrchestrationV2ProviderThread => {
1392+
if (model === undefined) return providerThread;
1393+
const modelSelection: ModelSelection = {
1394+
instanceId,
1395+
model: `${model.providerID}/${model.id}`,
1396+
options: model.variant === undefined ? [] : [{ id: "variant", value: model.variant }],
1397+
};
1398+
if (
1399+
providerThread.nativeMetadata?.modelSelection !== undefined &&
1400+
modelSelectionsEqual(providerThread.nativeMetadata.modelSelection, modelSelection)
1401+
)
1402+
return providerThread;
1403+
return {
1404+
...providerThread,
1405+
nativeMetadata: { ...providerThread.nativeMetadata, modelSelection },
1406+
};
1407+
};
1408+
13881409
/**
13891410
* Gives a subagent call its session once both are known: OpenCode names
13901411
* the session on the call's progress, and announces it just before. The
@@ -1463,7 +1484,8 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
14631484
const child =
14641485
previous ?? newThreadState(childId, providerThread, call.state.directory, subagent);
14651486
child.subagent = subagent;
1466-
child.providerThread = providerThread;
1487+
child.model = info?.model ?? child.model;
1488+
child.providerThread = withReportedModel(providerThread, child.model);
14671489
child.directory = call.state.directory;
14681490
child.agent = info?.agent ?? call.agent ?? child.agent;
14691491
// OpenCode gives a new session its parent's rules, which are the thread's.
@@ -1472,7 +1494,11 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
14721494
childOwners.set(childId, rootOf(call.state));
14731495
call.child = child;
14741496
yield* emit({ type: "app_thread.created", driver, appThread });
1475-
yield* emit({ type: "provider_thread.updated", driver, providerThread });
1497+
yield* emit({
1498+
type: "provider_thread.updated",
1499+
driver,
1500+
providerThread: child.providerThread,
1501+
});
14761502
yield* emitSubagent(call);
14771503
// A session called again was not made now, so it may hold the rules of
14781504
// a mode the thread has left. OpenCode applies a rules change to the
@@ -2520,6 +2546,18 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
25202546
if (sessionId === undefined) return;
25212547
const state = threads.get(sessionId);
25222548
if (state === undefined) return;
2549+
if (event.type === "session.model.selected" || event.type === "session.step.started") {
2550+
if (event.type === "session.model.selected") state.model = event.data.model;
2551+
const providerThread = withReportedModel(state.providerThread, event.data.model);
2552+
if (providerThread !== state.providerThread) {
2553+
state.providerThread = { ...providerThread, updatedAt: yield* DateTime.now };
2554+
yield* emit({
2555+
type: "provider_thread.updated",
2556+
driver,
2557+
providerThread: state.providerThread,
2558+
});
2559+
}
2560+
}
25232561
if (
25242562
event.type === "session.inbox.enqueued" &&
25252563
state.subagent !== undefined &&
@@ -2962,6 +3000,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
29623000
},
29633001
directory: string,
29643002
) => {
3003+
providerThread = withReportedModel(providerThread, native.model);
29653004
const existing = threads.get(native.id);
29663005
if (existing !== undefined) {
29673006
existing.providerThread = providerThread;
@@ -3582,7 +3621,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
35823621
directory,
35833622
);
35843623
state.policy = policy;
3585-
return providerThread;
3624+
return state.providerThread;
35863625
}).pipe(
35873626
Effect.mapError((cause) =>
35883627
isProviderAdapterError(cause)
@@ -3625,7 +3664,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
36253664
directory: AbsolutePath.make(cwd),
36263665
});
36273666
}
3628-
return providerThread;
3667+
return state.providerThread;
36293668
}).pipe(
36303669
Effect.mapError((cause) =>
36313670
isProviderAdapterError(cause)
@@ -4183,7 +4222,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
41834222
directory: AbsolutePath.make(cwd),
41844223
});
41854224
}
4186-
return providerThread;
4225+
return state.providerThread;
41874226
}).pipe(
41884227
exclusive(forkInput.sourceProviderThread),
41894228
Effect.mapError((cause) =>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ import { effectiveSnoozed, threadWokeAt } from "@t3tools/client-runtime/state/th
8888
import { useThreadActions } from "../hooks/useThreadActions";
8989
import {
9090
deriveProviderSubagentStatus,
91+
deriveReportedModelSelection,
9192
formatModelSelectionEffort,
9293
deriveRunlessWorkStartedAt,
9394
deriveThreadActivityRun,
@@ -1626,6 +1627,9 @@ export default function ChatView(props: ChatViewProps) {
16261627
});
16271628
const serverThreadProjection = useThreadProjection(routeThreadDetailRef);
16281629
const serverProjection = serverThreadProjection?.projection ?? null;
1630+
const reportedModelSelection = serverProjection
1631+
? deriveReportedModelSelection(serverProjection)
1632+
: null;
16291633
const threadStatus = useThreadStatus(routeThreadDetailRef);
16301634
const threadSyncPhase = resolveThreadSyncPhase({
16311635
detailExists: serverProjection !== null,
@@ -4073,7 +4077,11 @@ export default function ChatView(props: ChatViewProps) {
40734077
const providerSubagentEffortLabel =
40744078
activeThread === undefined
40754079
? null
4076-
: formatModelSelectionEffort(activeThread.modelSelection, providerSubagentModels);
4080+
: formatModelSelectionEffort(
4081+
activeThread.modelSelection,
4082+
providerSubagentModels,
4083+
reportedModelSelection,
4084+
);
40774085
const mountComposerContextStrip = shouldShowComposerContextStrip({
40784086
isDraftHeroState,
40794087
persistInActiveThreads: settings.persistComposerContextStrip,
@@ -10818,6 +10826,7 @@ export default function ChatView(props: ChatViewProps) {
1081810826
) : null}
1081910827
{!composerMounted ? null : (
1082010828
<ChatComposer
10829+
reportedModelSelection={reportedModelSelection}
1082110830
multipleModelSelections={multipleModelSelections}
1082210831
supportsMultipleModels={
1082310832
serverConfig?.environment.capabilities.requiredWorktreeBootstrap ===

0 commit comments

Comments
 (0)