The best way to control Claude Code, Codex and more from any computer or phone
feat(settings): clean up Labs: promote tool calls, remove plan mode and old toggles (#33131)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Theo Browne committed
Nov 8, 2026 at 16:48 UTC
521ac7c218b3faa74281fb72fc36ce74a0951fb3
87 files changed
+350
-2360
apps/desktop/src/settings/DesktopClientSettings.test.ts
-3
@@ -34,7 +34,6 @@ const clientSettings: ClientSettings = {
34
confirmThreadArchive: true,
35
confirmThreadDelete: false,
36
confirmThreadUnpin: false,
37
- contextWindowMeterEnabled: false,
37
diffFilesCollapsed: true,
38
diffIgnoreWhitespace: true,
39
diffLayout: "stacked",
@@ -52,7 +51,6 @@ const clientSettings: ClientSettings = {
51
glassOpacity: 80,
52
onboardingCompletedAt: null,
53
panelAnimationDurationMs: 0,
55
- planModeEnabled: false,
54
proactivePanelsEnabled: true,
55
showSkillsInSlashMenu: false,
56
persistComposerContextStrip: true,
@@ -67,7 +65,6 @@ const clientSettings: ClientSettings = {
65
boringSidebarMultilineRows: false,
66
threadDetailsUsageEnabled: false,
67
threadDetailsItems: {},
70
- legacySidebarEnabled: false,
68
sidebarWorkingShelfEnabled: false,
69
loadBalancingEnabled: false,
70
loadBalancingWeights: { "environment-1": 75, "environment-2": 0 },
apps/mobile/src/features/settings/SettingsAppearanceRouteScreen.tsx
+2
@@ -8,6 +8,7 @@ import { CodeAppearanceSection } from "./appearance/sections/CodeAppearanceSecti
8
import { TerminalAppearanceSection } from "./appearance/sections/TerminalAppearanceSection";
9
import { TextAppearanceSection } from "./appearance/sections/TextAppearanceSection";
10
import { ThemeAppearanceSection } from "./appearance/sections/ThemeAppearanceSection";
11
+import { ToolCallsAppearanceSection } from "./appearance/sections/ToolCallsAppearanceSection";
12
13
export function SettingsAppearanceRouteScreen() {
14
const insets = useSafeAreaInsets();
@@ -28,6 +29,7 @@ export function SettingsAppearanceRouteScreen() {
29
<TextAppearanceSection />
30
<TerminalAppearanceSection />
31
<CodeAppearanceSection />
32
+ <ToolCallsAppearanceSection />
33
</ScrollView>
34
</SettingsScreen>
35
);
apps/mobile/src/features/settings/ThreadSettingsSections.tsx
-67
@@ -22,8 +22,6 @@ import { serverEnvironment } from "../../state/server";
22
import { useAtomCommand } from "../../state/use-atom-command";
23
import { SettingsSection } from "./components/SettingsSection";
24
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
25
-import { ListChoiceRow } from "../../components/ui/ListChoiceRow";
26
-import type { ToolCallVisibility } from "@t3tools/contracts/settings";
25
import { SettingsScreen } from "./components/SettingsScreen";
26
import { planAutoSettleSettingsSync, type AutoSettleSettings } from "./autoSettleSettingsSync";
27
import { useSettingsEnvironmentFilter } from "./settings-environment-filter";
@@ -45,7 +43,6 @@ export function SettingsLabsRouteScreen() {
43
contentContainerClassName="gap-6 px-5 pt-4"
44
contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
45
>
48
- <ToolCallVisibilitySection />
46
<MachineBetaSection
47
title="Linked environments"
48
icon="link"
@@ -60,7 +57,6 @@ export function SettingsLabsRouteScreen() {
57
setting="fastWorktreeCheckout"
58
description="On a Mac, clone new worktrees from a checkout cached in the T3 home folder instead of writing every file. Uses Git’s normal checkout when it can’t. Turning it off deletes the cache."
59
/>
63
- <LegacySettingsSection />
60
</ScrollView>
61
</SettingsScreen>
62
);
@@ -303,66 +299,3 @@ function MachineBetaSection({
299
</View>
300
);
301
}
306
-
307
-const TOOL_CALL_VISIBILITY_OPTIONS: ReadonlyArray<{
308
- readonly value: ToolCallVisibility;
309
- readonly label: string;
310
-}> = [
311
- { value: "showAll", label: "Show all" },
312
- { value: "hideSuccessful", label: "Hide successful" },
313
- { value: "hideAll", label: "Hide all" },
314
- { value: "zen", label: "Zen" },
315
-];
316
-
317
-function ToolCallVisibilitySection() {
318
- const savePreferences = useAtomSet(updateMobilePreferencesAtom);
319
- const preferences = useAtomValue(mobilePreferencesAtom);
320
- const selected = AsyncResult.isSuccess(preferences)
321
- ? (preferences.value.toolCallVisibility ?? "showAll")
322
- : null;
323
-
324
- return (
325
- <View className="gap-3">
326
- <SettingsSection title="Beta: Tool calls in chat">
327
- {TOOL_CALL_VISIBILITY_OPTIONS.map((option, index) => (
328
- <ListChoiceRow
329
- key={option.value}
330
- label={option.label}
331
- selected={selected === option.value}
332
- separated={index > 0}
333
- disabled={selected === null}
334
- onPress={() => savePreferences({ toolCallVisibility: option.value })}
335
- />
336
- ))}
337
- </SettingsSection>
338
- <Text className="px-2 text-sm text-foreground-muted">
339
- Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows
340
- only final answers. Approvals, questions, and errors always show.
341
- </Text>
342
- </View>
343
- );
344
-}
345
-
346
-function LegacySettingsSection() {
347
- const savePreferences = useAtomSet(updateMobilePreferencesAtom);
348
- const preferences = useAtomValue(mobilePreferencesAtom);
349
- const planModeEnabled =
350
- AsyncResult.isSuccess(preferences) && preferences.value.planModeEnabled === true;
351
-
352
- return (
353
- <View className="gap-3">
354
- <SettingsSection title="Legacy">
355
- <SettingsSwitchRow
356
- icon="hammer"
357
- label="Plan Mode"
358
- value={planModeEnabled}
359
- onValueChange={(value) => savePreferences({ planModeEnabled: value })}
360
- />
361
- </SettingsSection>
362
- <Text className="px-2 text-sm text-foreground-muted">
363
- Opt into retired interfaces kept for compatibility. Plan Mode restores the Build/Plan
364
- control; otherwise every task runs in Build mode.
365
- </Text>
366
- </View>
367
- );
368
-}
apps/mobile/src/features/settings/appearance/sections/ToolCallsAppearanceSection.tsx
new
+48
@@ -0,0 +1,48 @@
1
+import { useAtomSet, useAtomValue } from "@effect/atom-react";
2
+import type { ToolCallVisibility } from "@t3tools/contracts/settings";
3
+import { AsyncResult } from "effect/reactivity";
4
+import { View } from "react-native";
5
+
6
+import { AppText as Text } from "../../../../components/ui/AppText";
7
+import { ListChoiceRow } from "../../../../components/ui/ListChoiceRow";
8
+import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../../state/preferences";
9
+import { SettingsSection } from "../../components/SettingsSection";
10
+
11
+const TOOL_CALL_VISIBILITY_OPTIONS: ReadonlyArray<{
12
+ readonly value: ToolCallVisibility;
13
+ readonly label: string;
14
+}> = [
15
+ { value: "showAll", label: "Show all" },
16
+ { value: "hideSuccessful", label: "Hide successful" },
17
+ { value: "hideAll", label: "Hide all" },
18
+ { value: "zen", label: "Zen" },
19
+];
20
+
21
+export function ToolCallsAppearanceSection() {
22
+ const savePreferences = useAtomSet(updateMobilePreferencesAtom);
23
+ const preferences = useAtomValue(mobilePreferencesAtom);
24
+ const selected = AsyncResult.isSuccess(preferences)
25
+ ? (preferences.value.toolCallVisibility ?? "showAll")
26
+ : null;
27
+
28
+ return (
29
+ <View className="gap-3">
30
+ <SettingsSection title="Tool calls in chat">
31
+ {TOOL_CALL_VISIBILITY_OPTIONS.map((option, index) => (
32
+ <ListChoiceRow
33
+ key={option.value}
34
+ label={option.label}
35
+ selected={selected === option.value}
36
+ separated={index > 0}
37
+ disabled={selected === null}
38
+ onPress={() => savePreferences({ toolCallVisibility: option.value })}
39
+ />
40
+ ))}
41
+ </SettingsSection>
42
+ <Text className="px-2 text-sm text-foreground-muted">
43
+ Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows
44
+ only final answers. Approvals, questions, and errors always show.
45
+ </Text>
46
+ </View>
47
+ );
48
+}
apps/mobile/src/features/settings/settings-search.ts
+6
-8
@@ -26,6 +26,12 @@ const SETTINGS_SEARCH_TERMS = {
26
"terminal",
27
"word break",
28
"math",
29
+ "tool calls in chat",
30
+ "hide tool calls",
31
+ "commands edits searches",
32
+ "work log",
33
+ "zen",
34
+ "final answers only",
35
],
36
SettingsNavigation: ["tabs", "tab order", "reorder", "hide tabs"],
37
SettingsKeyboard: ["return key", "send message", "new line", "hardware keyboard"],
@@ -99,19 +105,11 @@ const SETTINGS_SEARCH_TERMS = {
105
"start from remote",
106
],
107
SettingsLabs: [
102
- "legacy",
103
- "plan mode",
108
"beta",
109
"linked environments",
110
"link machine",
111
"fast worktree checkout",
112
"clone cache",
109
- "tool calls in chat",
110
- "hide tool calls",
111
- "commands edits searches",
112
- "work log",
113
- "zen",
114
- "final answers only",
113
],
114
SettingsEnvironmentMaintenance: ["updates", "provider updates", "restart", "manage environments"],
115
SettingsAbout: [
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+2
-2
@@ -33,6 +33,7 @@ import { KeyboardController } from "react-native-keyboard-controller";
33
34
import {
35
AuthOrchestrationOperateScope,
36
+ DEFAULT_PROVIDER_INTERACTION_MODE,
37
PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
38
resolveEnvironmentMachineKind,
39
} from "@t3tools/contracts";
@@ -873,7 +874,7 @@ export function NewTaskDraftScreen(props: {
874
threadId: ThreadId.make(creationMetadata.threadId),
875
modelSelection: flow.selectedModel,
876
runtimeMode: flow.runtimeMode,
876
- interactionMode: flow.interactionMode,
877
+ interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
878
branch: flow.selectedBranchName,
879
worktreePath: flow.selectedWorktreePath,
880
createdAt: creationMetadata.createdAt,
@@ -971,7 +972,6 @@ export function NewTaskDraftScreen(props: {
972
offersSideChat={false}
973
onReconnectEnvironment={() => onReconnectEnvironment(selectedProject.environmentId)}
974
canSwitchThreadProvider
974
- onUpdateThreadInteractionMode={flow.planModeEnabled ? flow.setInteractionMode : undefined}
975
onRespondToApproval={async () => {}}
976
onSelectUserInputOption={() => {}}
977
onChangeUserInputCustomAnswer={() => {}}
apps/mobile/src/features/threads/ThreadComposer.tsx
-6
@@ -21,7 +21,6 @@ import {
21
type EnvironmentId,
22
type MessageId,
23
type ModelSelection,
24
- type ProviderInteractionMode,
24
type ServerConfig as T3ServerConfig,
25
type UsageLimitsReport,
26
} from "@t3tools/contracts";
@@ -253,7 +252,6 @@ export interface ThreadComposerProps {
252
) => Promise<MessageId | null>;
253
readonly onShowUsageLimits: (report: UsageLimitsReport | null) => void;
254
readonly canSwitchProvider: boolean;
256
- readonly onUpdateInteractionMode?: (interactionMode: ProviderInteractionMode) => void;
255
readonly onHeightChange?: (height: number) => void;
256
readonly onEditorFocusChange?: (focused: boolean) => void;
257
}
@@ -558,10 +556,6 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
556
hasThread: !props.isDraft,
557
hasCompactableConversation: props.hasCompactableConversation,
558
onChangeDraftMessage: props.onChangeDraftMessage,
561
- onUpdateInteractionMode:
562
- selectedProviderStatus?.showInteractionModeToggle === false
563
- ? undefined
564
- : props.onUpdateInteractionMode,
559
offersUsageLimits: usageLimitsOffered,
560
onUsageLimits:
561
usageLimitsOffered && draftAttachments.length === 0 ? openUsageLimits : undefined,
apps/mobile/src/features/threads/ThreadDetailScreen.tsx
-3
@@ -41,7 +41,6 @@ import { deriveBottomControlInsets, type NativeLayoutMetrics } from "../../lib/r
41
import type {
42
EnvironmentId,
43
MessageId,
44
- ProviderInteractionMode,
44
RuntimeRequestId,
45
ScopedThreadRef,
46
ServerConfig as T3ServerConfig,
@@ -301,7 +300,6 @@ export interface ThreadDetailScreenProps {
300
) => Promise<MessageId | null>;
301
readonly onReconnectEnvironment: () => void;
302
readonly canSwitchThreadProvider: boolean;
304
- readonly onUpdateThreadInteractionMode?: (interactionMode: ProviderInteractionMode) => void;
303
readonly onRespondToApproval: ApprovalResponder;
304
readonly onSelectUserInputOption: (
305
requestId: RuntimeRequestId,
@@ -1933,7 +1931,6 @@ function ThreadDetailBody(
1931
onSendMessage={handleSendMessage}
1932
onShowUsageLimits={showUsageLimits}
1933
canSwitchProvider={props.canSwitchThreadProvider}
1936
- onUpdateInteractionMode={props.onUpdateThreadInteractionMode}
1934
onHeightChange={handleComposerHeightChange}
1935
onEditorFocusChange={handleOwnedInputFocusChange}
1936
/>
apps/mobile/src/features/threads/ThreadRouteScreen.tsx
-1
@@ -1063,7 +1063,6 @@ function ThreadRouteContent(
1063
offersSideChat={composer.sideChatUnavailableReason === null}
1064
onReconnectEnvironment={handleReconnectEnvironment}
1065
canSwitchThreadProvider={composer.canSwitchThreadProvider}
1066
- onUpdateThreadInteractionMode={composer.onUpdateInteractionMode}
1066
onRespondToApproval={requests.onRespondToApproval}
1067
onSelectUserInputOption={requests.onSelectUserInputOption}
1068
onChangeUserInputCustomAnswer={requests.onChangeUserInputCustomAnswer}
apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+1
-1
@@ -1338,7 +1338,7 @@ export function ExistingThreadSettingsRouteScreen({
1338
option.selection.model === modelSelection.model,
1339
) ?? null;
1340
const updateModelSelection = (selection: ModelSelection) =>
1341
- updateThreadDraftModelSelection(threadKey, selection, serverConfig?.providers ?? []);
1341
+ updateThreadDraftModelSelection(threadKey, selection);
1342
1343
return (
1344
<ThreadSettingsPickerScreen
apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
-3
@@ -65,9 +65,6 @@ vi.mock("../../state/olderSettledShelf", () => ({ useOlderSettledCount: () => 0
65
vi.mock("../../state/project-grouping", () => ({
66
useMobileProjectGroupingSettings: () => ({ sidebarProjectGroupingMode: "none" }),
67
}));
68
-vi.mock("./use-legacy-plan-mode-enabled", () => ({
69
- useLegacyPlanModeState: () => ({ enabled: false, loaded: true }),
70
-}));
68
vi.mock("../../components/ui/Dialog", () => ({ alert: vi.fn() }));
69
vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => vi.fn() }));
70
vi.mock("../../state/use-remote-environment-registry", () => ({
apps/mobile/src/features/threads/new-task-flow-provider.tsx
+2
-41
@@ -7,7 +7,6 @@ import React, { useEffect, useRef, useState } from "react";
7
import type {
8
EnvironmentId,
9
ModelSelection,
10
- ProviderInteractionMode,
10
ProviderOptionSelection,
11
RuntimeMode,
12
ServerProvider,
@@ -83,11 +82,6 @@ import {
82
type HomeProjectScope,
83
} from "../home/homeThreadList";
84
import { useMobileProjectGroupingSettings } from "../../state/project-grouping";
86
-import {
87
- resolvePendingTaskInteractionMode,
88
- resolveProviderInteractionMode,
89
-} from "../../state/legacy-plan-mode";
90
-import { useLegacyPlanModeState } from "./use-legacy-plan-mode-enabled";
85
import {
86
resolveNewTaskDraftWorkspace,
87
resolveNewTaskBranchWorktreePath,
@@ -156,8 +150,6 @@ type NewTaskFlowContextValue = {
150
readonly availableBranches: ReadonlyArray<VcsRef>;
151
readonly currentCheckoutBranchName: string | null;
152
readonly runtimeMode: RuntimeMode;
159
- readonly interactionMode: ProviderInteractionMode;
160
- readonly planModeEnabled: boolean;
153
readonly expandedProvider: string | null;
154
readonly environments: ReadonlyArray<{
155
readonly environmentId: EnvironmentId;
@@ -209,7 +201,6 @@ type NewTaskFlowContextValue = {
201
readonly setSubmitting: (value: boolean) => void;
202
readonly loadBranches: () => void;
203
readonly setRuntimeMode: (value: RuntimeMode) => void;
212
- readonly setInteractionMode: (value: ProviderInteractionMode) => void;
204
readonly setSelectedModelOptions: (
205
value: ReadonlyArray<ProviderOptionSelection> | undefined,
206
) => void;
@@ -230,7 +221,6 @@ export function NewTaskFlowProvider(
221
const threads = useThreadShells();
222
const { savedConnectionsById } = useSavedRemoteConnections();
223
const groupingSettings = useMobileProjectGroupingSettings();
233
- const { enabled: legacyPlanModeEnabled } = useLegacyPlanModeState();
224
225
const projectScopes = sortHomeProjectScopes({
226
scopes: buildHomeProjectScopes({
@@ -482,11 +472,6 @@ export function NewTaskFlowProvider(
472
selectedEnvironmentServerConfig?.providers.find(
473
(provider) => provider.instanceId === selectedModel?.instanceId,
474
) ?? null;
485
- const planModeEnabled =
486
- legacyPlanModeEnabled && selectedProviderStatus?.showInteractionModeToggle !== false;
487
- const interactionMode = planModeEnabled
488
- ? (selectedProjectDraft.interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE)
489
- : DEFAULT_PROVIDER_INTERACTION_MODE;
475
const setSelectedModelKey = (
476
key: string | null,
477
options?: ReadonlyArray<ProviderOptionSelection>,
@@ -501,15 +486,7 @@ export function NewTaskFlowProvider(
486
const selection = withRememberedModelOptions(
487
options ? { ...option.selection, options } : option.selection,
488
);
504
- const provider = selectedEnvironmentServerConfig?.providers.find(
505
- (candidate) => candidate.instanceId === selection.instanceId,
506
- );
507
- updateComposerDraftSettings(selectedProjectDraftKey, {
508
- modelSelection: selection,
509
- ...(provider?.showInteractionModeToggle === false
510
- ? { interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE }
511
- : {}),
512
- });
489
+ updateComposerDraftSettings(selectedProjectDraftKey, { modelSelection: selection });
490
setStickyComposerModelSelection(selection);
491
};
492
const setSelectedModelOptions = (options: ReadonlyArray<ProviderOptionSelection> | undefined) => {
@@ -709,13 +686,6 @@ export function NewTaskFlowProvider(
686
updateComposerDraftSettings(selectedProjectDraftKey, { runtimeMode: value });
687
}
688
};
712
- const setInteractionMode = (value: ProviderInteractionMode) => {
713
- if (selectedProjectDraftKey) {
714
- updateComposerDraftSettings(selectedProjectDraftKey, {
715
- interactionMode: resolveProviderInteractionMode(selectedProviderStatus, value),
716
- });
717
- }
718
- };
689
690
const buildPendingTaskMessage = (
691
metadata: TurnCommandMetadata,
@@ -761,13 +731,7 @@ export function NewTaskFlowProvider(
731
defaultRuntimeMode,
732
managedPolicy,
733
),
764
- interactionMode: resolvePendingTaskInteractionMode({
765
- planModeEnabled: legacyPlanModeEnabled,
766
- draftInteractionMode: draft.interactionMode,
767
- provider: selectedEnvironmentServerConfig?.providers.find(
768
- (candidate) => candidate.instanceId === draftModelSelection.instanceId,
769
- ),
770
- }),
734
+ interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
735
creation: {
736
projectId: selectedProject.id,
737
projectTitle: selectedProject.title,
@@ -875,8 +839,6 @@ export function NewTaskFlowProvider(
839
availableBranches,
840
currentCheckoutBranchName,
841
runtimeMode,
878
- interactionMode,
879
- planModeEnabled,
842
expandedProvider,
843
environments,
844
selectedProject,
@@ -907,7 +869,6 @@ export function NewTaskFlowProvider(
869
setSubmitting: (value: boolean) => updateFlow({ submitting: value }),
870
loadBranches,
871
setRuntimeMode,
910
- setInteractionMode,
872
setSelectedModelOptions,
873
setExpandedProvider: (value: string | null) => updateFlow({ expandedProvider: value }),
874
} satisfies NewTaskFlowContextValue;
apps/mobile/src/features/threads/use-composer-command-menu.test.ts
+22
-63
@@ -62,37 +62,29 @@ describe("resolveComposerMenuSelection", () => {
62
});
63
64
describe("mobile slash commands", () => {
65
- const antigravity = {
66
- driver: ProviderDriverKind.make("antigravity"),
67
- showInteractionModeToggle: false,
68
- slashCommands: [{ name: "plan", description: "Plan with Antigravity" }],
69
- };
70
-
71
- it.each([false, true])(
72
- "keeps native /plan with legacy mode enabled=%s",
73
- (allowInteractionMode) => {
74
- const items = buildComposerSlashCommandItems({
75
- query: "pl",
76
- atMessageStart: true,
77
- hasThread: true,
78
- allowInteractionMode,
79
- selectedProviderStatus: antigravity,
80
- });
65
+ it("keeps a provider's native /plan", () => {
66
+ const items = buildComposerSlashCommandItems({
67
+ query: "pl",
68
+ atMessageStart: true,
69
+ hasThread: true,
70
+ selectedProviderStatus: {
71
+ driver: ProviderDriverKind.make("antigravity"),
72
+ slashCommands: [{ name: "plan", description: "Plan with Antigravity" }],
73
+ },
74
+ });
75
82
- expect(items).toHaveLength(1);
83
- expect(items[0]?.type).toBe("provider-slash-command");
84
- const item = items[0];
85
- if (!item) throw new Error("Expected the native plan command");
86
- expect(
87
- resolveComposerCommandSelection({
88
- draftMessage: "/pl",
89
- trigger: { rangeStart: 0, rangeEnd: 3 },
90
- item,
91
- allowInteractionMode,
92
- }),
93
- ).toEqual({ text: "/plan ", cursor: 6, interactionMode: null });
94
- },
95
- );
76
+ expect(items).toHaveLength(1);
77
+ expect(items[0]?.type).toBe("provider-slash-command");
78
+ const item = items[0];
79
+ if (!item) throw new Error("Expected the native plan command");
80
+ expect(
81
+ resolveComposerCommandSelection({
82
+ draftMessage: "/pl",
83
+ trigger: { rangeStart: 0, rangeEnd: 3 },
84
+ item,
85
+ }),
86
+ ).toEqual({ text: "/plan ", cursor: 6 });
87
+ });
88
89
it("offers T3's /clear in place of the provider's, only at the message start", () => {
90
const claude = {
@@ -104,7 +96,6 @@ describe("mobile slash commands", () => {
96
query: "cle",
97
atMessageStart,
98
hasThread: true,
107
- allowInteractionMode: true,
99
offersFreshSession,
100
selectedProviderStatus: claude,
101
}).map((item) => item.id);
@@ -112,36 +103,4 @@ describe("mobile slash commands", () => {
103
expect(build(false)).toEqual(["pcmd:clear"]);
104
expect(build(true, false)).toEqual([]);
105
});
115
-
116
- it("still applies the T3 plan command for supported providers", () => {
117
- const items = buildComposerSlashCommandItems({
118
- query: "plan",
119
- atMessageStart: true,
120
- hasThread: true,
121
- allowInteractionMode: true,
122
- selectedProviderStatus: {
123
- driver: ProviderDriverKind.make("codex"),
124
- slashCommands: [],
125
- },
126
- });
127
- const item = items[0];
128
- if (!item) throw new Error("Expected the T3 plan command");
129
- expect(
130
- resolveComposerCommandSelection({
131
- draftMessage: "/plan",
132
- trigger: { rangeStart: 0, rangeEnd: 5 },
133
- item,
134
- allowInteractionMode: true,
135
- }),
136
- ).toEqual({ text: "", cursor: 0, interactionMode: "plan" });
137
-
138
- expect(
139
- resolveComposerCommandSelection({
140
- draftMessage: "/plan",
141
- trigger: { rangeStart: 0, rangeEnd: 5 },
142
- item,
143
- allowInteractionMode: false,
144
- }),
145
- ).toEqual({ text: "/plan ", cursor: 6, interactionMode: null });
146
- });
106
});
apps/mobile/src/features/threads/use-composer-command-menu.ts
+15
-69
@@ -2,7 +2,6 @@ import * as Dialog from "../../components/ui/Dialog";
2
import type {
3
EnvironmentId,
4
ProjectId,
5
- ProviderInteractionMode,
5
ServerProvider,
6
ThreadId,
7
ThreadPullRequestLink,
@@ -107,41 +106,20 @@ export function buildComposerSlashCommandItems(input: {
106
/** T3's `/clear` replaces the provider's, which would clear a session T3 still treats as live. */
107
readonly offersFreshSession?: boolean;
108
readonly offersSideChat?: boolean;
110
- readonly allowInteractionMode: boolean;
111
- readonly selectedProviderStatus: Pick<
112
- ServerProvider,
113
- "driver" | "slashCommands" | "showInteractionModeToggle"
114
- > | null;
109
+ readonly selectedProviderStatus: Pick<ServerProvider, "driver" | "slashCommands"> | null;
110
}): ComposerCommandItem[] {
111
const query = input.query.toLowerCase();
117
- const allowInteractionMode =
118
- input.allowInteractionMode && input.selectedProviderStatus?.showInteractionModeToggle !== false;
119
- const builtIn = [
120
- {
121
- id: "cmd:model",
122
- type: "slash-command",
123
- command: "model",
124
- label: "/model",
125
- description: "Switch model",
126
- },
127
- {
128
- id: "cmd:plan",
129
- type: "slash-command",
130
- command: "plan",
131
- label: "/plan",
132
- description: "Switch to plan mode",
133
- },
134
- {
135
- id: "cmd:default",
136
- type: "slash-command",
137
- command: "default",
138
- label: "/default",
139
- description: "Switch to default mode",
140
- },
141
- ] satisfies ComposerCommandItem[];
142
- const items: ComposerCommandItem[] = builtIn.filter(
143
- (item) => item.command.includes(query) && (item.command === "model" || allowInteractionMode),
144
- );
112
+ const items: ComposerCommandItem[] = "model".includes(query)
113
+ ? [
114
+ {
115
+ id: "cmd:model",
116
+ type: "slash-command",
117
+ command: "model",
118
+ label: "/model",
119
+ description: "Switch model",
120
+ },
121
+ ]
122
+ : [];
123
124
// Providers expand commands only at the start of a message. T3 commands
125
// change local state and do not have this restriction, except `/clear`.
@@ -199,24 +177,8 @@ export function resolveComposerCommandSelection(input: {
177
readonly draftMessage: string;
178
readonly trigger: Pick<ComposerTrigger, "rangeStart" | "rangeEnd">;
179
readonly item: ComposerCommandItem;
202
- readonly allowInteractionMode: boolean;
203
-}): {
204
- readonly text: string;
205
- readonly cursor: number;
206
- readonly interactionMode: ProviderInteractionMode | null;
207
-} {
180
+}): { readonly text: string; readonly cursor: number } {
181
const { draftMessage, trigger, item } = input;
209
- if (
210
- input.allowInteractionMode &&
211
- item.type === "slash-command" &&
212
- (item.command === "plan" || item.command === "default")
213
- ) {
214
- return {
215
- ...replaceTextRange(draftMessage, trigger.rangeStart, trigger.rangeEnd, ""),
216
- interactionMode: item.command,
217
- };
218
- }
219
-
182
let replacement = "";
183
if (item.type === "path") {
184
replacement = `${serializeComposerFileLink(item.path)} `;
@@ -227,10 +189,7 @@ export function resolveComposerCommandSelection(input: {
189
} else if (item.type === "provider-slash-command") {
190
replacement = `/${item.command.name} `;
191
}
230
- return {
231
- ...replaceTextRange(draftMessage, trigger.rangeStart, trigger.rangeEnd, replacement),
232
- interactionMode: null,
233
- };
192
+ return replaceTextRange(draftMessage, trigger.rangeStart, trigger.rangeEnd, replacement);
193
}
194
195
export function useComposerCommandMenu({
@@ -251,7 +210,6 @@ export function useComposerCommandMenu({
210
offersUsageLimits = false,
211
enabled = true,
212
onChangeDraftMessage,
254
- onUpdateInteractionMode,
213
onUsageLimits,
214
onFreshSession,
215
offersSideChat = false,
@@ -274,7 +232,6 @@ export function useComposerCommandMenu({
232
readonly offersUsageLimits?: boolean;
233
readonly enabled?: boolean;
234
readonly onChangeDraftMessage: (value: string) => void;
277
- readonly onUpdateInteractionMode?: (mode: ProviderInteractionMode) => void;
235
readonly onUsageLimits?: () => void;
236
/** Arms a fresh session for the next message; absent where `/clear` is unavailable. */
237
readonly onFreshSession?: () => void;
@@ -384,7 +341,6 @@ export function useComposerCommandMenu({
341
offersUsageLimits,
342
offersFreshSession: onFreshSession !== undefined,
343
offersSideChat,
387
- allowInteractionMode: onUpdateInteractionMode !== undefined,
344
selectedProviderStatus: selectedProviderStatus
345
? {
346
...selectedProviderStatus,
@@ -636,19 +592,9 @@ export function useComposerCommandMenu({
592
return;
593
}
594
639
- const result = resolveComposerCommandSelection({
640
- draftMessage,
641
- trigger,
642
- item,
643
- allowInteractionMode:
644
- onUpdateInteractionMode !== undefined &&
645
- selectedProviderStatus?.showInteractionModeToggle !== false,
646
- });
595
+ const result = resolveComposerCommandSelection({ draftMessage, trigger, item });
596
setSelection({ start: result.cursor, end: result.cursor });
597
onChangeDraftMessage(result.text);
649
- if (result.interactionMode !== null) {
650
- onUpdateInteractionMode?.(result.interactionMode);
651
- }
598
};
599
600
return {
apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts
deleted
-16
@@ -1,16 +0,0 @@
1
-import { useAtomValue } from "@effect/atom-react";
2
-import { AsyncResult } from "effect/reactivity";
3
-
4
-import { mobilePreferencesAtom } from "../../state/preferences";
5
-import { resolveLegacyPlanModeEnabled } from "../../state/legacy-plan-mode";
6
-
7
-export function useLegacyPlanModeState(): { readonly enabled: boolean } {
8
- const preferences = useAtomValue(mobilePreferencesAtom);
9
- const loaded = AsyncResult.isSuccess(preferences);
10
- return {
11
- enabled: resolveLegacyPlanModeEnabled({
12
- loaded,
13
- preference: loaded ? preferences.value.planModeEnabled : undefined,
14
- }),
15
- };
16
-}
apps/mobile/src/persistence/mobile-preferences.ts
-5
@@ -116,7 +116,6 @@ export interface Preferences {
116
readonly microphones?: ReadonlyArray<MicrophoneEntry>;
117
readonly projectGroupingEnabled?: boolean;
118
readonly projectGroupingMode?: SidebarProjectGroupingMode;
119
- readonly planModeEnabled?: boolean;
119
readonly toolCallVisibility?: ToolCallVisibility;
120
readonly workingShelfEnabled?: boolean;
121
readonly useLastProjectForNewThreads?: boolean;
@@ -201,7 +200,6 @@ function sanitizePreferences(parsed: Preferences): Preferences {
200
microphones?: ReadonlyArray<MicrophoneEntry>;
201
projectGroupingEnabled?: boolean;
202
projectGroupingMode?: SidebarProjectGroupingMode;
204
- planModeEnabled?: boolean;
203
toolCallVisibility?: ToolCallVisibility;
204
workingShelfEnabled?: boolean;
205
useLastProjectForNewThreads?: boolean;
@@ -326,9 +324,6 @@ function sanitizePreferences(parsed: Preferences): Preferences {
324
) {
325
preferences.projectGroupingMode = parsed.projectGroupingMode;
326
}
329
- if (typeof parsed.planModeEnabled === "boolean") {
330
- preferences.planModeEnabled = parsed.planModeEnabled;
331
- }
327
if (isToolCallVisibility(parsed.toolCallVisibility)) {
328
preferences.toolCallVisibility = parsed.toolCallVisibility;
329
}
apps/mobile/src/state/legacy-plan-mode.ts
deleted
-34
@@ -1,34 +0,0 @@
1
-import {
2
- DEFAULT_PROVIDER_INTERACTION_MODE,
3
- type ProviderInteractionMode,
4
- type ServerProvider,
5
-} from "@t3tools/contracts";
6
-
7
-type InteractionModeProvider = Pick<ServerProvider, "showInteractionModeToggle">;
8
-
9
-export function resolveProviderInteractionMode(
10
- provider: InteractionModeProvider | null | undefined,
11
- interactionMode: ProviderInteractionMode | null | undefined,
12
-): ProviderInteractionMode {
13
- return provider?.showInteractionModeToggle === false
14
- ? DEFAULT_PROVIDER_INTERACTION_MODE
15
- : (interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE);
16
-}
17
-
18
-export function resolveLegacyPlanModeEnabled(input: {
19
- readonly loaded: boolean;
20
- readonly preference: boolean | undefined;
21
-}): boolean {
22
- return input.loaded && input.preference === true;
23
-}
24
-
25
-export function resolvePendingTaskInteractionMode(input: {
26
- readonly planModeEnabled: boolean;
27
- readonly draftInteractionMode: ProviderInteractionMode | undefined;
28
- readonly provider?: InteractionModeProvider | null;
29
-}): ProviderInteractionMode {
30
- if (input.provider?.showInteractionModeToggle === false || !input.planModeEnabled) {
31
- return DEFAULT_PROVIDER_INTERACTION_MODE;
32
- }
33
- return input.draftInteractionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE;
34
-}
apps/mobile/src/state/thread-outbox-model.ts
+11
-1
@@ -7,6 +7,7 @@ import type { EnvironmentShellStatus } from "@t3tools/client-runtime/state/shell
7
import type { ThreadFamilyRead } from "@t3tools/client-runtime/state/threads";
8
import {
9
CommandId,
10
+ DEFAULT_PROVIDER_INTERACTION_MODE,
11
EnvironmentId,
12
IsoDateTime,
13
MessageId,
@@ -28,7 +29,6 @@ import { DraftComposerAttachmentSchema } from "../lib/composer-image-schema";
29
import type { ComposerDispatchMode } from "@t3tools/client-runtime/state/composer-dispatch";
30
import type { DraftComposerAttachment } from "../lib/composerImages";
31
import { scopedThreadKey } from "../lib/scopedEntities";
31
-import { resolveProviderInteractionMode } from "./legacy-plan-mode";
32
33
// Keep current writes until a compatible native baseline includes the v4 reader.
34
const THREAD_OUTBOX_SCHEMA_VERSION = 3;
@@ -105,6 +105,16 @@ export interface ThreadSettingsSnapshot {
105
readonly interactionMode: ProviderInteractionModeType;
106
}
107
108
+// Providers without a Build/Plan toggle always run in build mode.
109
+function resolveProviderInteractionMode(
110
+ provider: Pick<ServerProvider, "showInteractionModeToggle"> | undefined,
111
+ interactionMode: ProviderInteractionModeType,
112
+): ProviderInteractionModeType {
113
+ return provider?.showInteractionModeToggle === false
114
+ ? DEFAULT_PROVIDER_INTERACTION_MODE
115
+ : interactionMode;
116
+}
117
+
118
export function resolveQueuedThreadSettings(
119
message: QueuedThreadMessage,
120
thread: ThreadSettingsSnapshot,
apps/mobile/src/state/thread-task-permissions.test.ts
-4
@@ -271,11 +271,7 @@ describe("mobile task permissions", () => {
271
expect(state.enqueue).not.toHaveBeenCalled();
272
expect(state.clearDraft).not.toHaveBeenCalled();
273
composer.onChangeDraftMessage("Edited locally");
274
- composer.onUpdateInteractionMode("plan");
274
expect(state.draft.text).toBe("Edited locally");
276
- expect(state.updateSettings).toHaveBeenCalledWith("secondary:thread", {
277
- interactionMode: "plan",
278
- });
275
});
276
277
it("keeps an armed fresh session for the message after an approval redirect", async () => {
apps/mobile/src/state/use-thread-composer-state.ts
+5
-44
@@ -26,10 +26,8 @@ import {
26
orchestrationV2WorktreePending,
27
type EnvironmentId,
28
type ModelSelection,
29
- type ProviderInteractionMode,
29
type RuntimeMode,
30
type ScopedThreadRef,
32
- type ServerProvider,
31
type ThreadId,
32
} from "@t3tools/contracts";
33
@@ -49,7 +47,6 @@ import {
47
describeUnavailableModelSelection,
48
isModelSelectionUnavailable,
49
} from "../lib/modelOptions";
52
-import { resolveProviderInteractionMode } from "./legacy-plan-mode";
50
51
import type { DraftComposerImageAttachment } from "../lib/composerImages";
52
import { scopedThreadKey } from "../lib/scopedEntities";
@@ -181,19 +178,8 @@ export function useThreadDraftForThread(input: {
178
};
179
}
180
184
-/** A provider without the interaction-mode toggle runs in the default mode. */
185
-export function updateThreadDraftModelSelection(
186
- threadKey: string,
187
- value: ModelSelection,
188
- providers: ReadonlyArray<ServerProvider>,
189
-): void {
190
- const provider = providers.find((candidate) => candidate.instanceId === value.instanceId);
191
- updateComposerDraftSettings(threadKey, {
192
- modelSelection: value,
193
- ...(provider?.showInteractionModeToggle === false
194
- ? { interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE }
195
- : {}),
196
- });
181
+export function updateThreadDraftModelSelection(threadKey: string, value: ModelSelection): void {
182
+ updateComposerDraftSettings(threadKey, { modelSelection: value });
183
}
184
185
export function useThreadComposerState(input: {
@@ -328,15 +314,8 @@ export function useThreadComposerState(input: {
314
serverConfig?.providers ?? [],
315
);
316
const runtimeMode = selectedDraft.runtimeMode ?? selectedThread?.runtimeMode ?? null;
331
- const selectedProvider = selectedEnvironmentRuntime?.serverConfig?.providers.find(
332
- (provider) => provider.instanceId === modelSelection?.instanceId,
333
- );
334
- const interactionMode = selectedThread
335
- ? resolveProviderInteractionMode(
336
- selectedProvider,
337
- selectedDraft.interactionMode ?? selectedThread.interactionMode,
338
- )
339
- : null;
317
+ // Plan mode is not offered to users; every send runs in build mode.
318
+ const interactionMode = selectedThread ? DEFAULT_PROVIDER_INTERACTION_MODE : null;
319
const canSwitchThreadProvider = threadAllowsProviderSwitch({
320
thread: selectedThreadShell,
321
projection: selectedThreadProjection?.projection,
@@ -781,10 +760,7 @@ export function useThreadComposerState(input: {
760
context: draft.context,
761
modelSelection,
762
runtimeMode: draft.runtimeMode ?? thread.runtimeMode,
784
- interactionMode: resolveProviderInteractionMode(
785
- provider,
786
- draft.interactionMode ?? thread.interactionMode,
787
- ),
763
+ interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
764
...(compactBeforeSend
765
? { compactBeforeSend, dispatchMode: "queue" as const }
766
: followUpDispatchMode === null
@@ -865,20 +841,6 @@ export function useThreadComposerState(input: {
841
removeComposerDraftAttachment(threadKey, imageId);
842
};
843
868
- const onUpdateInteractionMode = (value: ProviderInteractionMode) => {
869
- if (!selectedThreadKey) {
870
- return;
871
- }
872
- const modelSelection =
873
- getComposerDraftSnapshot(selectedThreadKey).modelSelection ?? selectedThread?.modelSelection;
874
- const provider = selectedEnvironmentRuntime?.serverConfig?.providers.find(
875
- (candidate) => candidate.instanceId === modelSelection?.instanceId,
876
- );
877
- updateComposerDraftSettings(selectedThreadKey, {
878
- interactionMode: resolveProviderInteractionMode(provider, value),
879
- });
880
- };
881
-
844
return {
845
feedbackSubmissions,
846
dismissFeedback,
@@ -917,7 +879,6 @@ export function useThreadComposerState(input: {
879
onNativePasteText,
880
onRemoveDraftImage,
881
onSendMessage,
920
- onUpdateInteractionMode,
882
sideChatUnavailableReason,
883
};
884
}
apps/web/src/components/ChatView.logic.test.ts
-56
@@ -3,7 +3,6 @@ import {
3
buildExpiredTerminalContextToastCopy,
4
mergeDirectPreviewAnnotation,
5
planComposerTurn,
6
- restorePlanFollowUpComposer,
6
snapshotComposerSend,
7
withMessageContext,
8
deriveAvailableRevertTurnCounts,
@@ -1143,61 +1142,6 @@ describe("planComposerTurn", () => {
1142
});
1143
});
1144
1146
-describe("restorePlanFollowUpComposer", () => {
1147
- // The draft is the failed follow-up's thread; the refs and cursor are whatever thread is on
1148
- // screen.
1149
- it.each([
1150
- {
1151
- name: "puts the follow-up back while its thread is open",
1152
- before: { draft: "", refs: "", cursor: null },
1153
- routeIsCurrent: true,
1154
- after: { draft: "Tighten step 2", refs: "Tighten step 2", cursor: "Tighten step 2" },
1155
- },
1156
- {
1157
- name: "keeps a draft typed while the follow-up was in flight",
1158
- before: { draft: "Next idea", refs: "Next idea", cursor: null },
1159
- routeIsCurrent: true,
1160
- after: { draft: "Next idea", refs: "Next idea", cursor: null },
1161
- },
1162
- {
1163
- name: "leaves another thread's composer alone after navigating away",
1164
- before: { draft: "", refs: "Other thread", cursor: null },
1165
- routeIsCurrent: false,
1166
- after: { draft: "Tighten step 2", refs: "Other thread", cursor: null },
1167
- },
1168
- ])("$name", ({ before, routeIsCurrent, after }) => {
1169
- const composer: { draft: string; refs: string; cursor: string | null } = { ...before };
1170
- restorePlanFollowUpComposer({
1171
- snapshot: {
1172
- prompt: "Tighten step 2",
1173
- environmentContexts: [],
1174
- terminalContexts: [],
1175
- reviewComments: [],
1176
- previewAnnotations: [],
1177
- threadContexts: [],
1178
- },
1179
- draftHasUserContent: composer.draft.trim().length > 0,
1180
- routeIsCurrent,
1181
- writeComposerRefs: (snapshot) => {
1182
- composer.refs = snapshot.prompt;
1183
- },
1184
- writePrompt: (prompt) => {
1185
- composer.draft = prompt;
1186
- },
1187
- writeTerminalContexts: () => undefined,
1188
- writeReviewComments: () => undefined,
1189
- writePreviewAnnotations: () => undefined,
1190
- writeThreadContexts: () => undefined,
1191
- writeEnvironmentContexts: () => undefined,
1192
- resetCursor: ({ prompt }) => {
1193
- composer.cursor = prompt;
1194
- },
1195
- });
1196
-
1197
- expect(composer).toEqual(after);
1198
- });
1199
-});
1200
-
1145
describe("withMessageContext", () => {
1146
const context = { records: [] } as unknown as NonNullable<
1147
Parameters<typeof withMessageContext>[0]["context"]
apps/web/src/components/ChatView.logic.ts
+3
-109
@@ -15,11 +15,7 @@ import type { SetStateAction } from "react";
15
import { applyClaudePromptEffortPrefix, resolvePromptInjectedEffort } from "@t3tools/shared/model";
16
import { getProviderModelCapabilities } from "../providerModels";
17
import { sanitizeThreadErrorMessage } from "@t3tools/client-runtime/errors";
18
-import type {
19
- EnvironmentThread,
20
- ThreadStructure,
21
- EnvironmentThreadShell,
22
-} from "@t3tools/client-runtime/state/shell";
18
+import type { EnvironmentThread, ThreadStructure } from "@t3tools/client-runtime/state/shell";
19
import {
20
ANTIGRAVITY_DEFAULT_MODEL,
21
PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
@@ -34,7 +30,6 @@ import {
30
type ModelSelection,
31
type OrchestrationMessageContext,
32
type PreviewAnnotationPayload,
37
- type ProviderInteractionMode,
33
ProviderDriverKind,
34
type ProviderInstanceId,
35
type ServerProvider,
@@ -76,8 +71,7 @@ import {
71
} from "../composerDraftStore";
72
import * as Schema from "effect/Schema";
73
import { appAtomRegistry } from "../rpc/atomRegistry";
79
-import { environmentThreadShells, environmentThreadDetails } from "../state/threads";
80
-import { waitForAtomValue } from "../state/waitForAtomValue";
74
+import { environmentThreadDetails } from "../state/threads";
75
import {
76
filterTerminalContextsWithText,
77
formatTerminalContextLabel,
@@ -94,7 +88,7 @@ import {
88
} from "../lib/composerContextRecords";
89
import type { ComposerDispatchMode } from "@t3tools/client-runtime/state/composer-dispatch";
90
import type { DraftThreadEnvMode } from "../composerDraftStore";
97
-import { collapseExpandedComposerCursor, type ComposerSubmissionIntent } from "../composer-logic";
91
+import { type ComposerSubmissionIntent } from "../composer-logic";
92
import type { ReviewCommentContext } from "../reviewCommentContext";
93
import { derivePhase, type TimelineEntry } from "../session-logic";
94
import type { PreviewMiniPlayerSource } from "../previewMiniPlayerStore";
@@ -539,21 +533,6 @@ export function resolveComposerProviderSelection(input: {
533
};
534
}
535
542
-export function resolveComposerInteractionMode(input: {
543
- planModeEnabled: boolean;
544
- provider: Pick<ServerProvider, "showInteractionModeToggle"> | null | undefined;
545
- interactionMode: ProviderInteractionMode;
546
-}): { enabled: boolean; interactionMode: ProviderInteractionMode } {
547
- const enabled =
548
- input.planModeEnabled &&
549
- input.provider != null &&
550
- input.provider.showInteractionModeToggle !== false;
551
- return {
552
- enabled,
553
- interactionMode: enabled ? input.interactionMode : "default",
554
- };
555
-}
556
-
536
export function getAntigravitySendBlockReason(
537
provider:
538
| Pick<ServerProvider, "driver" | "installed" | "auth" | "models" | "status">
@@ -819,22 +798,6 @@ export function shouldShowBranchMismatchBanner(input: {
798
return input.composerHasContent || input.wasShownForCurrentMismatch;
799
}
800
822
-export function shouldShowPlanFollowUpPrompt(input: {
823
- pendingUserInputCount: number;
824
- interactionMode: ProviderInteractionMode;
825
- latestTurnSettled: boolean;
826
- hasActionableProposedPlan: boolean;
827
- hasComposerAttachments: boolean;
828
-}): boolean {
829
- return (
830
- input.pendingUserInputCount === 0 &&
831
- input.interactionMode === "plan" &&
832
- input.latestTurnSettled &&
833
- input.hasActionableProposedPlan &&
834
- !input.hasComposerAttachments
835
- );
836
-}
837
-
801
const sessionDismissedBranchMismatchKeys = new Set<string>();
802
803
export function dismissBranchMismatchForSession(key: string): void {
@@ -873,18 +836,6 @@ function threadHasStarted(thread: Thread | null | undefined): boolean {
836
return Boolean(thread && (thread.latestRun !== null || thread.itemCount > 0 || thread.runtime));
837
}
838
876
-export function threadShellHasStarted(
877
- shell:
878
- | Pick<EnvironmentThreadShell, "latestRun" | "latestUserMessageAt" | "runtime">
879
- | null
880
- | undefined,
881
-): boolean {
882
- return Boolean(
883
- shell &&
884
- (shell.latestRun !== null || shell.latestUserMessageAt !== null || shell.runtime !== null),
885
- );
886
-}
887
-
839
// Imported history lacks a session until its first prompt; resolve its instance before locking the driver.
840
export function deriveLockedProvider(input: {
841
thread: Thread | null | undefined;
@@ -939,19 +890,6 @@ export function getStartedThreadModelChangeBlockReason(input: {
890
};
891
}
892
942
-export async function waitForStartedServerThread(
943
- threadRef: ScopedThreadRef,
944
- timeoutMs = 1_000,
945
-): Promise<boolean> {
946
- const threadAtom = environmentThreadShells.threadShellAtom(threadRef);
947
- return waitForAtomValue({
948
- registry: appAtomRegistry,
949
- atom: threadAtom,
950
- predicate: threadHasStarted,
951
- timeoutMs,
952
- });
953
-}
954
-
893
export async function waitForRevertedMessage(
894
threadRef: ScopedThreadRef,
895
turnCount: number,
@@ -1168,50 +1106,6 @@ export function shouldRefocusComposerOnWindowFocus(
1106
);
1107
}
1108
1171
-export interface PlanFollowUpComposerSnapshot {
1172
- readonly prompt: string;
1173
- readonly terminalContexts: ReadonlyArray<TerminalContextDraft>;
1174
- readonly reviewComments: ReadonlyArray<ReviewCommentContext>;
1175
- readonly previewAnnotations: ReadonlyArray<PreviewAnnotationPayload>;
1176
- readonly threadContexts: ReadonlyArray<ThreadContextRecord>;
1177
- readonly environmentContexts: ReadonlyArray<EnvironmentContextRecord>;
1178
-}
1179
-
1180
-// A draft typed while the send was in flight is newer and stays. Composer refs and the cursor
1181
-// belong to the thread on screen, so they follow only while the follow-up's route is current.
1182
-export function restorePlanFollowUpComposer(input: {
1183
- readonly snapshot: PlanFollowUpComposerSnapshot;
1184
- readonly draftHasUserContent: boolean;
1185
- readonly routeIsCurrent: boolean;
1186
- readonly writeComposerRefs: (snapshot: PlanFollowUpComposerSnapshot) => void;
1187
- readonly writePrompt: (prompt: string) => void;
1188
- readonly writeTerminalContexts: (contexts: ReadonlyArray<TerminalContextDraft>) => void;
1189
- readonly writeReviewComments: (comments: ReadonlyArray<ReviewCommentContext>) => void;
1190
- readonly writePreviewAnnotations: (annotations: ReadonlyArray<PreviewAnnotationPayload>) => void;
1191
- readonly writeThreadContexts: (records: ReadonlyArray<ThreadContextRecord>) => void;
1192
- readonly writeEnvironmentContexts: (records: ReadonlyArray<EnvironmentContextRecord>) => void;
1193
- readonly resetCursor: (options: {
1194
- cursor: number;
1195
- prompt: string;
1196
- detectTrigger: boolean;
1197
- }) => void;
1198
-}): void {
1199
- if (input.draftHasUserContent) return;
1200
- if (input.routeIsCurrent) input.writeComposerRefs(input.snapshot);
1201
- input.writePrompt(input.snapshot.prompt);
1202
- input.writeTerminalContexts(input.snapshot.terminalContexts);
1203
- input.writeReviewComments(input.snapshot.reviewComments);
1204
- input.writePreviewAnnotations(input.snapshot.previewAnnotations);
1205
- input.writeThreadContexts(input.snapshot.threadContexts);
1206
- input.writeEnvironmentContexts(input.snapshot.environmentContexts);
1207
- if (!input.routeIsCurrent) return;
1208
- input.resetCursor({
1209
- cursor: collapseExpandedComposerCursor(input.snapshot.prompt, input.snapshot.prompt.length),
1210
- prompt: input.snapshot.prompt,
1211
- detectTrigger: true,
1212
- });
1213
-}
1214
-
1109
/** Includes the annotation screenshot only within the attachment cap; exceeding it rejects the whole turn. */
1110
export function mergeDirectPreviewAnnotation(input: {
1111
readonly images: ReadonlyArray<ComposerImageAttachment>;
apps/web/src/components/ChatView.tsx
+3
-79
@@ -28,7 +28,6 @@ import { useRightPanelActions } from "./chat/useRightPanelActions";
28
import { type TerminalLaunchContext, useChatTerminalActions } from "./chat/useChatTerminalActions";
29
import { useComposerSend } from "./chat/useComposerSend";
30
import { useComposerResume } from "./chat/useComposerResume";
31
-import { useImplementPlanInNewThread } from "./chat/useProposedPlanSend";
31
import { ThreadFind, ThreadFindCanvas } from "./chat/ThreadFindProvider";
32
import { closeThreadFind, openThreadFind, useThreadFindOpen } from "./chat/threadFindStore";
33
import { THREAD_FIND_BAR_RESERVED_HEIGHT } from "./chat/ThreadFindBar";
@@ -138,9 +137,7 @@ import {
137
derivePhase,
138
deriveActiveWorkStartedAt,
139
deriveCanInterruptRunningThread,
141
- findLatestProposedPlan,
140
findRevertCheckpoint,
143
- hasActionableProposedPlan,
141
isLatestRunSettled,
142
} from "../session-logic";
143
import { type LegendListRef } from "@legendapp/list/react";
@@ -318,7 +315,7 @@ import { ComposerBannerStack, type ComposerBannerStackItem } from "./chat/Compos
315
import { modelFallbackBannerItem } from "./chat/ComposerUsageLimits";
316
import { ComposerSurface } from "./chat/ComposerSurface";
317
import { resolveThreadSyncPhase } from "../threadSync";
321
-import { hasAvailableCompactionProvider } from "./chat/ContextWindowMeter.logic";
318
+import { hasAvailableCompactionProvider } from "./chat/compaction.logic";
319
import {
320
deriveLatestContextWindowSnapshot,
321
hasDismissedResumeCompaction,
@@ -333,11 +330,9 @@ import {
330
buildLocalDraftThread,
331
deriveCommittedServerUserMessageIds,
332
dismissBranchMismatchForSession,
336
- shouldShowPlanFollowUpPrompt,
333
shouldRenderPreviewMiniPlayer,
334
deriveLockedProvider,
335
resolveFileAttachmentUrl,
340
- resolveComposerInteractionMode,
336
resolveComposerProviderSelection,
337
resolveThreadMetadataUpdateForNextTurn,
338
resolveSendEnvMode,
@@ -583,9 +578,6 @@ export default function ChatView(props: ChatViewProps) {
578
const composerRuntimeMode = useComposerDraftStore(
579
(store) => store.getComposerDraft(composerDraftTarget)?.runtimeMode ?? null,
580
);
586
- const composerInteractionMode = useComposerDraftStore(
587
- (store) => store.getComposerDraft(composerDraftTarget)?.interactionMode ?? null,
588
- );
581
const composerActiveProvider = useComposerDraftStore(
582
(store) => store.getComposerDraft(composerDraftTarget)?.activeProvider ?? null,
583
);
@@ -1312,12 +1304,6 @@ export default function ChatView(props: ChatViewProps) {
1304
const selectedProvider = selectedProviderEntry?.driverKind ?? requestedDriverKind;
1305
const activeProviderInstanceId = selectedProviderEntry?.instanceId ?? null;
1306
const activeProviderStatus = selectedProviderEntry?.snapshot ?? null;
1315
- const { enabled: interactionModeEnabled, interactionMode } = resolveComposerInteractionMode({
1316
- planModeEnabled: settings.planModeEnabled,
1317
- provider: activeProviderStatus,
1318
- interactionMode:
1319
- composerInteractionMode ?? activeThread?.interactionMode ?? DEFAULT_INTERACTION_MODE,
1320
- });
1307
const conversationProviderStatus =
1308
providerStatuses.find((status) => status.instanceId === activeRuntime?.providerInstanceId) ??
1309
activeProviderStatus;
@@ -1374,19 +1360,6 @@ export default function ChatView(props: ChatViewProps) {
1360
const onHeldRequestIdsChange = useStableCallback((requestIds: ReadonlySet<string>) => {
1361
setHeldApprovalRequestIds((current) => (shallow(current, requestIds) ? current : requestIds));
1362
});
1377
- const activeProposedPlan = (() => {
1378
- if (!latestRunSettled) {
1379
- return null;
1380
- }
1381
- return findLatestProposedPlan(serverProjection, activeLatestRun?.runId ?? null);
1382
- })();
1383
- const showPlanFollowUpPrompt = shouldShowPlanFollowUpPrompt({
1384
- pendingUserInputCount: pendingUserInputs.length,
1385
- interactionMode,
1386
- latestTurnSettled: latestRunSettled,
1387
- hasActionableProposedPlan: hasActionableProposedPlan(activeProposedPlan),
1388
- hasComposerAttachments: composerHasAttachments,
1389
- });
1363
// Answering an approval or question on any client resumes quota spending, so include it in the key.
1364
const usageLimitsKey =
1365
activeProviderInstanceId === null || (isServerThread && activeThread === undefined)
@@ -1875,7 +1848,7 @@ export default function ChatView(props: ChatViewProps) {
1848
threadId: activeThreadId,
1849
message: { messageId: newMessageId(), role: "user", text, attachments: [] },
1850
runtimeMode,
1878
- interactionMode,
1851
+ interactionMode: DEFAULT_INTERACTION_MODE,
1852
dispatchMode: "queue",
1853
},
1854
});
@@ -2478,18 +2451,8 @@ export default function ChatView(props: ChatViewProps) {
2451
activeEnvironmentUnavailable ||
2452
feedbackUploading ||
2453
pendingApprovals.length > 0 ||
2481
- pendingUserInputs.length > 0 ||
2482
- showPlanFollowUpPrompt;
2454
+ pendingUserInputs.length > 0;
2455
const compactDisabled = compactThreadUnavailable;
2484
- const compactDisabledReason = compactDisabled
2485
- ? !canOperateThread
2486
- ? "This connection cannot change threads."
2487
- : !activeProject
2488
- ? "Choose a project before compacting"
2489
- : !manualCompactionProviderAvailable
2490
- ? "Compaction is unavailable for this provider"
2491
- : "Compacting is unavailable right now"
2492
- : null;
2456
const resumeCompactionTokens =
2457
activeContextWindow &&
2458
resolveIdleCompaction(
@@ -2855,14 +2818,11 @@ export default function ChatView(props: ChatViewProps) {
2818
2819
const {
2820
getModelDisabledReason,
2858
- handleInteractionModeChange,
2859
- handleInteractionModeChangeStable,
2821
handleRuntimeModeChangeStable,
2822
onEnvModeChangeStable,
2823
onProviderModelSelectStable,
2824
onStartFromOriginChange,
2825
openProviderSetupStable,
2865
- toggleInteractionModeStable,
2826
} = useComposerSelection({
2827
environmentId,
2828
composerDraftTarget,
@@ -2876,8 +2836,6 @@ export default function ChatView(props: ChatViewProps) {
2836
supportsProviderSwitchingViaHandoff,
2837
multipleModelSelections,
2838
runtimeMode,
2879
- interactionMode,
2880
- interactionModeEnabled,
2839
isLocalDraftThread,
2840
canOverrideServerThreadEnvMode,
2841
setPendingServerThreadEnvModeEntry,
@@ -2896,7 +2854,6 @@ export default function ChatView(props: ChatViewProps) {
2854
threadDetailLoading,
2855
activeEnvironmentUnavailable,
2856
runtimeMode,
2899
- interactionMode,
2857
localCheckoutBranchMismatch,
2858
composerRef,
2859
persistThreadSettingsForNextTurn,
@@ -2904,21 +2861,6 @@ export default function ChatView(props: ChatViewProps) {
2861
scrollToEnd,
2862
setThreadError,
2863
});
2907
- const onImplementPlanInNewThread = useImplementPlanInNewThread({
2908
- environmentId,
2909
- routeThreadKey,
2910
- activeThread,
2911
- activeThreadBranch,
2912
- activeProposedPlan,
2913
- isServerThread,
2914
- isSendBusy,
2915
- composerRef,
2916
- beginLocalDispatch,
2917
- resetLocalDispatch,
2918
- activeProject,
2919
- activeEnvironmentUnavailable,
2920
- defaultRuntimeMode,
2921
- });
2864
const { onSend } = useComposerSend({
2865
environmentId,
2866
routeThreadKey,
@@ -2930,7 +2872,6 @@ export default function ChatView(props: ChatViewProps) {
2872
activeThreadBranch,
2873
activeProject,
2874
activeProjectDefaultModelSelection,
2933
- activeProposedPlan,
2875
activeMessageCount,
2876
isServerThread,
2877
isLocalDraftThread,
@@ -2961,7 +2902,6 @@ export default function ChatView(props: ChatViewProps) {
2902
keepFullHistory,
2903
freshSessionAvailable: freshSessionCommandAvailable,
2904
resumeCompactionTokens,
2964
- showPlanFollowUpPrompt,
2905
usageLimitsKey,
2906
usageLimitsOffered,
2907
openUsageLimits,
@@ -2990,13 +2930,11 @@ export default function ChatView(props: ChatViewProps) {
2930
setKeepFullHistory,
2931
anchorNewTurn,
2932
acknowledgeActiveThreadWoke,
2993
- handleInteractionModeChange,
2933
onSideChat: sideChat.available ? sendSideChatStable : undefined,
2934
sideChatDisabledReason,
2935
handleNewThreadInActiveProject,
2936
persistThreadSettingsForNextTurn,
2937
});
2999
- const onImplementPlanInNewThreadStable = useStableCallback(onImplementPlanInNewThread);
2938
2939
const onWorktreeSetupWorkLocally = () => {
2940
if (!worktreeSetup || worktreeSetup.phase !== "running" || !draftId) {
@@ -3634,7 +3572,6 @@ export default function ChatView(props: ChatViewProps) {
3572
draftId={draftId}
3573
activeThreadId={activeThreadId}
3574
activeThread={activeThread}
3637
- activeThreadShell={activeThreadShell}
3575
promptHistoryEntries={timelineEntries}
3576
forceExpandedOnMobile={
3577
forceExpandedMobileComposer && isDraftHeroState
@@ -3701,14 +3638,8 @@ export default function ChatView(props: ChatViewProps) {
3638
activePendingDraftAnswers={activePendingDraftAnswers}
3639
activePendingQuestionIndex={activePendingQuestionIndex}
3640
respondingRequestIds={respondingRequestIds}
3704
- showPlanFollowUpPrompt={showPlanFollowUpPrompt}
3705
- activeProposedPlan={activeProposedPlan}
3706
- threadSyncPhase={
3707
- activeEnvironmentUnavailable ? null : threadSyncPhase
3708
- }
3641
runtimeMode={runtimeMode}
3642
defaultRuntimeMode={defaultRuntimeMode}
3711
- interactionMode={interactionMode}
3643
lockedProvider={modelPickerLockedProvider}
3644
providerStatuses={providerStatuses as ServerProvider[]}
3645
providerCatalogKnown={serverConfig !== null}
@@ -3718,12 +3649,8 @@ export default function ChatView(props: ChatViewProps) {
3649
activeThreadModelSelection={activeThread?.modelSelection}
3650
activeProjectId={activeProject?.id ?? null}
3651
projectName={activeProject?.title}
3721
- contextWindowEntries={serverVisibleTurnItems}
3722
- contextWindowLiveUsage={activeThreadLiveTokenUsage}
3723
- contextWindowProviderThread={activeProviderThread}
3652
compactThreadUnavailable={compactThreadUnavailable}
3653
compactDisabled={compactDisabled}
3726
- compactDisabledReason={compactDisabledReason}
3654
resolvedTheme={resolvedTheme}
3655
settings={settings}
3656
keybindings={keybindings}
@@ -3753,7 +3680,6 @@ export default function ChatView(props: ChatViewProps) {
3680
onSend={onComposerSendStable}
3681
onResume={onComposerResumeStable}
3682
onInterrupt={onInterruptStable}
3756
- onImplementPlanInNewThread={onImplementPlanInNewThreadStable}
3683
onSelectActivePendingUserInputOption={
3684
onSelectActivePendingUserInputOptionStable
3685
}
@@ -3770,9 +3696,7 @@ export default function ChatView(props: ChatViewProps) {
3696
onProviderModelSelect={onProviderModelSelectStable}
3697
onOpenProviderSetup={openProviderSetupStable}
3698
getModelDisabledReason={getModelDisabledReason}
3773
- toggleInteractionMode={toggleInteractionModeStable}
3699
handleRuntimeModeChange={handleRuntimeModeChangeStable}
3775
- handleInteractionModeChange={handleInteractionModeChangeStable}
3700
focusComposer={focusComposerStable}
3701
scheduleComposerFocus={scheduleComposerFocusStable}
3702
setThreadError={setThreadError}
apps/web/src/components/Sidebar.browser.test.tsx
-2
@@ -42,7 +42,6 @@ describe("sidebar header new thread", () => {
42
{ mode: "boring", count: 2, shift: false, picker: true },
43
{ mode: "boring", count: 2, shift: true, picker: false },
44
{ mode: "boring", count: 1, shift: false, picker: false },
45
- { mode: "legacy", count: 2, shift: false, picker: false },
45
] as const)("$mode sidebar, $count projects, shift=$shift: picker=$picker", async (scenario) => {
46
using stack = new DisposableStack();
47
const previousSettings = getClientSettings();
@@ -50,7 +49,6 @@ describe("sidebar header new thread", () => {
49
__setClientSettingsForTests({
50
...DEFAULT_CLIENT_SETTINGS,
51
boringSidebarEnabled: scenario.mode === "boring",
53
- legacySidebarEnabled: scenario.mode === "legacy",
52
});
53
const projects = [project("active"), project("idle")].slice(0, scenario.count);
54
const currentProjectRef = {
apps/web/src/components/Sidebar.tsx
+2
-5
@@ -133,7 +133,7 @@ import { useTerminalFocus } from "../hooks/useTerminalFocus";
133
import { isCommandPaletteOpen, openCommandPalette } from "../commandPaletteBus";
134
import { registerSettleAndAdvance } from "../settleAndAdvance";
135
import { startNewThreadFromContext } from "../lib/chatThreadActions";
136
-import { useBoringSidebarEnabled, useClientSettings } from "../hooks/useSettings";
136
+import { useClientSettings } from "../hooks/useSettings";
137
import { useCopyToClipboard } from "../hooks/useCopyToClipboard";
138
import { useLocalStorage } from "../hooks/useLocalStorage";
139
import { useNowMinute } from "../hooks/useNowMinute";
@@ -989,8 +989,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
989
);
990
},
991
});
992
- const boringSidebarEnabled = useBoringSidebarEnabled();
993
- const legacySidebarEnabled = useClientSettings((settings) => settings.legacySidebarEnabled);
992
+ const boringSidebarEnabled = useClientSettings((settings) => settings.boringSidebarEnabled);
993
const folderRowsMultiline = useClientSettings((settings) => settings.boringSidebarMultilineRows);
994
const newThreadContext = useHandleNewThread();
995
// Row callbacks capture only the handler; the rest of the context changes with the route.
@@ -2954,7 +2953,6 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
2953
2954
const handleNewThreadClick = (event?: ReactMouseEvent) => {
2955
if (
2957
- legacySidebarEnabled ||
2956
shouldCreateNewThreadInCurrentProject(
2957
event?.shiftKey ?? false,
2958
scopeGroups.length,
@@ -3201,7 +3199,6 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
3199
newThreadShortcutLabel={newThreadShortcutLabel}
3200
newThreadInProjectShortcutLabel={newThreadInProjectShortcutLabel}
3201
showNewThreadInProjectHint={
3204
- !legacySidebarEnabled &&
3202
!shouldCreateNewThreadInCurrentProject(
3203
false,
3204
scopeGroups.length,
apps/web/src/components/chat/ChatComposer.tsx
+11
-136
@@ -28,7 +28,6 @@ import type {
28
PreviewAnnotationPayload,
29
ThreadContextRecord,
30
EnvironmentContextRecord,
31
- ProviderInteractionMode,
31
ResolvedKeybindingsConfig,
32
RuntimeMode,
33
RuntimeRequestId,
@@ -82,12 +81,7 @@ import {
81
replaceTextRange,
82
} from "../../composer-logic";
83
import { DEFAULT_COMPOSER_PLACEHOLDER } from "../../composerPlaceholder";
85
-import {
86
- deriveComposerSendState,
87
- getAntigravitySendBlockReason,
88
- resolveComposerInteractionMode,
89
- threadShellHasStarted,
90
-} from "../ChatView.logic";
84
+import { deriveComposerSendState, getAntigravitySendBlockReason } from "../ChatView.logic";
85
import {
86
dataTransferHasComposerMention,
87
makeComposerMentionDragHandlers,
@@ -118,7 +112,6 @@ import {
112
reconcileAttachmentContextReferences,
113
useRetainedContextPayloads,
114
} from "./composerContextUndo";
121
-import type { ThreadSyncPhase } from "../../threadSync";
115
import { ComposerBanner } from "./ComposerBanner";
116
import { ComposerSurface } from "./ComposerSurface";
117
import { ComposerBannerStack, type ComposerBannerStackItem } from "./ComposerBannerStack";
@@ -210,16 +203,10 @@ import {
203
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
204
import { ComposerFooterPrimaryActions } from "./ComposerFooterControls";
205
import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
213
-import { ComposerPlanFollowUpBanner } from "./ComposerPlanFollowUpBanner";
206
import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";
207
import { buildPullRequestReferenceContext } from "../pullRequest/pullRequestDetail.logic";
208
import { getComposerPromptInjectionState, getComposerReasoningStep } from "./composerProviderState";
209
import { readPromptUltrathink } from "./TraitsPicker";
218
-import {
219
- providerSupportsManualCompaction,
220
- resolveContextWindowModelDisplayName,
221
- shouldReserveContextWindowMeter,
222
-} from "./ContextWindowMeter.logic";
210
import {
211
buildAttachmentVideoPreview,
212
buildExpandedImagePreview,
@@ -241,24 +228,17 @@ import { toastManager } from "../ui/toast";
228
import { BuildingIcon, PlayIcon } from "lucide-react";
229
import { Button } from "../ui/button";
230
import { useManagedPolicy } from "../../state/managedPolicy";
244
-import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
231
import { hasProviderSetup } from "./ProviderStatusBanner";
232
import { type AppModelOption, getAppModelOptionsForInstance } from "../../modelSelection";
233
import type { UnifiedSettings } from "@t3tools/contracts/settings";
248
-import { isVideoAttachment, type SessionPhase, type Thread, type ThreadShell } from "../../types";
234
+import { isVideoAttachment, type SessionPhase, type Thread } from "../../types";
235
import { type ComposerPromptHistoryPosition } from "./composerPromptHistory";
236
import type { PendingUserInputDraftAnswer } from "@t3tools/client-runtime/state/pending-user-input";
251
-import type {
252
- LatestProposedPlanState,
253
- PendingApproval,
254
- PendingUserInput,
255
- TimelineEntry,
256
-} from "../../session-logic";
237
+import type { PendingApproval, PendingUserInput, TimelineEntry } from "../../session-logic";
238
import {
239
resolveComposerDispatchMode,
240
type ComposerDispatchMode,
241
} from "@t3tools/client-runtime/state/composer-dispatch";
261
-import { deriveLatestContextWindowSnapshot } from "@t3tools/client-runtime/state/context-window";
242
import {
243
resolveProviderSkillsForCwd,
244
resolveProviderSlashCommandsForCwd,
@@ -342,8 +322,6 @@ export interface ChatComposerHandle {
322
selectedProvider: ProviderDriverKind;
323
selectedModel: string;
324
selectedProviderModels: ReadonlyArray<ServerProvider["models"][number]>;
345
- interactionMode: ProviderInteractionMode;
346
- interactionModeEnabled: boolean;
325
shownPendingApprovalIds: ReadonlyArray<RuntimeRequestId>;
326
};
327
validateProviderInput: (providerInput: string) => boolean;
@@ -369,7 +347,6 @@ export interface ChatComposerProps {
347
348
activeThreadId: ThreadId | null;
349
activeThread: Thread | undefined;
372
- activeThreadShell: ThreadShell | null;
350
promptHistoryEntries: ReadonlyArray<TimelineEntry>;
351
forceExpandedOnMobile: boolean;
352
projectSelectionRequired: boolean;
@@ -418,13 +395,8 @@ export interface ChatComposerProps {
395
activePendingQuestionIndex: number;
396
respondingRequestIds: RuntimeRequestId[];
397
421
- showPlanFollowUpPrompt: boolean;
422
- activeProposedPlan: LatestProposedPlanState | null;
423
- threadSyncPhase: ThreadSyncPhase | null;
424
-
398
runtimeMode: RuntimeMode;
399
defaultRuntimeMode?: RuntimeMode;
427
- interactionMode: ProviderInteractionMode;
400
401
lockedProvider: ProviderDriverKind | null;
402
providerStatuses: ServerProvider[];
@@ -435,12 +407,8 @@ export interface ChatComposerProps {
407
activeProjectId: ProjectId | null;
408
projectName?: string | undefined;
409
438
- contextWindowEntries: Parameters<typeof deriveLatestContextWindowSnapshot>[0];
439
- contextWindowLiveUsage: Parameters<typeof deriveLatestContextWindowSnapshot>[1];
440
- contextWindowProviderThread: Parameters<typeof deriveLatestContextWindowSnapshot>[2];
410
compactThreadUnavailable: boolean;
411
compactDisabled: boolean;
443
- compactDisabledReason: string | null;
412
413
resolvedTheme: "light" | "dark";
414
settings: UnifiedSettings;
@@ -477,7 +445,6 @@ export interface ChatComposerProps {
445
) => void;
446
onResume: () => void;
447
onInterrupt: () => void;
480
- onImplementPlanInNewThread: () => void;
448
onSelectActivePendingUserInputOption: (questionId: string, optionValue: string) => void;
449
onAdvanceActivePendingUserInput: () => void;
450
onDismissActivePendingUserInput: (requestId: RuntimeRequestId) => void;
@@ -497,9 +464,7 @@ export interface ChatComposerProps {
464
) => void;
465
onOpenProviderSetup: (instanceId: ProviderInstanceId) => void;
466
getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
500
- toggleInteractionMode: () => void;
467
handleRuntimeModeChange: (mode: RuntimeMode) => void;
502
- handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
468
469
focusComposer: () => void;
470
scheduleComposerFocus: () => void;
@@ -550,10 +515,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
515
activePendingDraftAnswers,
516
activePendingQuestionIndex,
517
respondingRequestIds,
553
- showPlanFollowUpPrompt,
554
- activeProposedPlan,
518
runtimeMode,
556
- interactionMode: requestedInteractionMode,
519
lockedProvider,
520
providerStatuses,
521
providerCatalogKnown,
@@ -562,12 +524,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
524
reportedModelSelection,
525
activeProjectId,
526
projectName,
565
- contextWindowEntries,
566
- contextWindowLiveUsage,
567
- contextWindowProviderThread,
527
compactThreadUnavailable,
528
compactDisabled,
570
- compactDisabledReason,
529
resolvedTheme,
530
settings,
531
keybindings,
@@ -589,7 +547,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
547
onSend,
548
onResume,
549
onInterrupt,
592
- onImplementPlanInNewThread,
550
onSelectActivePendingUserInputOption,
551
onAdvanceActivePendingUserInput,
552
onDismissActivePendingUserInput,
@@ -598,9 +555,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
555
onProviderModelSelect,
556
onOpenProviderSetup,
557
getModelDisabledReason,
601
- toggleInteractionMode,
558
handleRuntimeModeChange,
603
- handleInteractionModeChange,
559
focusComposer,
560
scheduleComposerFocus,
561
setThreadError,
@@ -609,11 +564,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
564
editingQueuedAttachments,
565
onRemoveEditingQueuedAttachment,
566
} = props;
612
- const activeContextWindow = deriveLatestContextWindowSnapshot(
613
- contextWindowEntries,
614
- contextWindowLiveUsage,
615
- contextWindowProviderThread,
616
- );
567
const primaryEnvironmentId = usePrimaryEnvironmentId();
568
const composerDraftTargetKey = composerTargetKey(composerDraftTarget);
569
const {
@@ -920,8 +870,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
870
? providerInstanceEntries.find((entry) => hasProviderSetup(entry.snapshot))?.instanceId
871
: undefined))
872
: undefined;
923
- const resolvedCompactDisabledReason =
924
- compactDisabledReason ?? (noProviderAvailable ? "Compacting is unavailable right now" : null);
873
const { modes: compatibleRuntimeModes, mode: compatibleRuntimeMode } =
874
resolveCompatibleRuntimeMode(
875
runtimeMode,
@@ -954,7 +902,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
902
(multipleModelSelections === null ? providerSendBlockReason : null)));
903
const isSendDisabled = sendDisabledReason !== null;
904
const selectedProviderStatus = selectedProviderEntry?.snapshot ?? null;
957
- const compactCommandAvailable = providerSupportsManualCompaction(selectedProviderEntry);
905
const selectedProviderSkills = selectedProviderStatus
906
? resolveProviderSkillsForCwd(selectedProviderStatus, gitCwd)
907
: NO_PROVIDER_SKILLS;
@@ -970,11 +917,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
917
918
const selectedPromptEffort = composerProviderState.promptEffort;
919
const selectedModelOptionsForDispatch = composerProviderState.modelOptionsForDispatch;
973
- const { enabled: planModeUiEnabled, interactionMode } = resolveComposerInteractionMode({
974
- planModeEnabled: settings.planModeEnabled,
975
- provider: selectedProviderStatus,
976
- interactionMode: requestedInteractionMode,
977
- });
920
const selectedModelSelection: ModelSelection = createModelSelection(
921
selectedInstanceId,
922
selectedModel,
@@ -1000,19 +942,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
942
: (normalizeModelSlug(selectedModelForPicker, selectedProvider) ?? selectedModelForPicker);
943
})();
944
1003
- const activeThreadModelDisplayName = resolveContextWindowModelDisplayName(
1004
- activeThreadModelSelection,
1005
- modelOptionsByInstance,
1006
- );
1007
- const reserveContextWindowMeter = shouldReserveContextWindowMeter({
1008
- meterEnabled: settings.contextWindowMeterEnabled,
1009
- detailLoading: props.threadSyncPhase === "loading",
1010
- threadStarted: threadShellHasStarted(props.activeThreadShell),
1011
- providerReportsContextWindow: selectedProviderStatus
1012
- ? selectedProviderStatus.reportsContextWindow === true
1013
- : null,
1014
- });
1015
-
945
const [composerCursor, setComposerCursor] = useState(() => {
946
const value = isLiteralPendingAnswer ? (activePendingProgress?.customAnswer ?? prompt) : prompt;
947
return collapseExpandedComposerCursor(value, value.length, isLiteralPendingAnswer);
@@ -1159,7 +1088,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1088
pullRequestProjectId,
1089
pullRequestRepository,
1090
threadPullRequests,
1162
- planModeUiEnabled,
1091
sideChatAvailable: props.sideChatAvailable === true,
1092
sideChatDisabledReason: props.sideChatDisabledReason ?? null,
1093
freshSessionAvailable: props.onFreshSession !== undefined,
@@ -1205,16 +1133,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1133
const activePendingUserInput = pendingUserInputs[0] ?? null;
1134
const isChoiceOnlyPendingQuestion =
1135
activePendingProgress?.activeQuestion?.allowCustomAnswer === false;
1208
- const showComposerTopDrawer =
1209
- pendingUserInputs.length > 0 ||
1210
- (!isComposerCollapsedMobile && showPlanFollowUpPrompt && activeProposedPlan !== null);
1136
+ const showComposerTopDrawer = pendingUserInputs.length > 0;
1137
const showCollapsedMobilePromptRow = isComposerCollapsedMobile;
1138
const showComposerAttachAction =
1139
fileStagingLimit !== null &&
1140
(!activePendingProgress ||
1141
(supportsQuestionAttachments &&
1142
activePendingProgress.activeQuestion?.allowCustomAnswer !== false));
1217
- const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;
1143
+ const composerFooterHasWideActions = activePendingProgress !== null;
1144
1145
const editPromptFromTraits = (edit: (prompt: string) => string) => {
1146
const currentPrompt = getComposerDraft(composerDraftTarget)?.prompt ?? "";
@@ -1961,14 +1887,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1887
if (applied) setComposerHighlightedItemId(null);
1888
return;
1889
}
1964
- if (!planModeUiEnabled) return;
1965
- void handleInteractionModeChange(item.command === "plan" ? "plan" : "default");
1966
- const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
1967
- expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
1968
- });
1969
- if (applied) {
1970
- setComposerHighlightedItemId(null);
1971
- }
1890
return;
1891
}
1892
if (item.type === "provider-slash-command") {
@@ -2130,7 +2048,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2048
if (activePendingProgress) {
2049
return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers);
2050
}
2133
- return showPlanFollowUpPrompt || composerSendState.hasSendableContent;
2051
+ return composerSendState.hasSendableContent;
2052
};
2053
2054
const submitComposerRef = useRef<
@@ -2317,7 +2235,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2235
isCompacting,
2236
followUpBehavior,
2237
isSoftwareKeyboardOpen,
2320
- planModeUiEnabled,
2238
isLiteralPendingAnswer,
2239
pendingUserInputs,
2240
promptHistoryEntries,
@@ -2338,7 +2255,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2255
setComposerTrigger,
2256
setComposerHighlightedItemId,
2257
dismissComposerTrigger,
2341
- toggleInteractionMode,
2258
nudgeComposerMenuHighlight,
2259
onSelectComposerItem,
2260
resolveActiveComposerTrigger,
@@ -2435,13 +2351,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2351
reportedModelSelection={reportedModelSelection}
2352
promptUltrathink={promptUltrathink}
2353
onPromptEdit={editPromptFromTraitsStable}
2438
- planModeEnabled={settings.planModeEnabled}
2439
- planModeUiEnabled={planModeUiEnabled}
2440
- interactionMode={interactionMode}
2354
compatibleRuntimeMode={compatibleRuntimeMode}
2355
defaultRuntimeMode={props.defaultRuntimeMode}
2356
compatibleRuntimeModeOptions={compatibleRuntimeModeOptions}
2444
- toggleInteractionMode={toggleInteractionMode}
2357
handleRuntimeModeChange={handleRuntimeModeChange}
2358
composerControlsCollapsed={composerControlsCollapsed}
2359
effortDisplay={settings.effortDisplay}
@@ -2861,12 +2773,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2773
void onInterrupt();
2774
};
2775
const handleInterruptPrimaryActionStable = useStableCallback(handleInterruptPrimaryAction);
2864
- const handleImplementPlanInNewThreadPrimaryAction = () => {
2865
- void onImplementPlanInNewThread();
2866
- };
2867
- const handleImplementPlanInNewThreadPrimaryActionStable = useStableCallback(
2868
- handleImplementPlanInNewThreadPrimaryAction,
2869
- );
2776
const scheduleComposerCollapseCheck = () => {
2777
if (!isMobileViewport || mobileComposerExpandInFlightRef.current) {
2778
return;
@@ -2986,7 +2892,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2892
reportedModelSelection,
2893
prompt: promptRef.current,
2894
cursor: readComposerSnapshotStable().expandedCursor,
2989
- planModeEnabled: settings.planModeEnabled,
2895
direction,
2896
});
2897
if (!change) return;
@@ -3124,8 +3029,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3029
selectedProvider,
3030
selectedModel,
3031
selectedProviderModels,
3127
- interactionMode,
3128
- interactionModeEnabled: planModeUiEnabled,
3032
}),
3033
setMultipleModelSelections,
3034
validateProviderInput: (providerInput: string) => {
@@ -3179,7 +3082,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3082
selectedModel,
3083
selectedInstanceId,
3084
reportedModelSelection,
3182
- settings.planModeEnabled,
3085
selectedModelSelection,
3086
multipleModelSelections,
3087
setMultipleModelSelections,
@@ -3189,8 +3091,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3091
selectedPromptEffort,
3092
selectedProvider,
3093
selectedProviderModels,
3192
- interactionMode,
3193
- planModeUiEnabled,
3094
compactThreadContextStable,
3095
],
3096
);
@@ -3320,11 +3220,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3220
onAdvance={onAdvanceActivePendingUserInput}
3221
onDismiss={onDismissActivePendingUserInput}
3222
/>
3323
- ) : !isComposerCollapsedMobile && showPlanFollowUpPrompt && activeProposedPlan ? (
3324
- <ComposerPlanFollowUpBanner
3325
- key={activeProposedPlan.id}
3326
- planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}
3327
- />
3223
) : null}
3224
</ComposerBanner.Root>
3225
</ComposerBanner.Attachment>
@@ -3530,13 +3425,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3425
? isChoiceOnlyPendingQuestion
3426
? "Choose an option above"
3427
: "Type your own answer, or leave this blank to use the selected option"
3533
- : showPlanFollowUpPrompt && activeProposedPlan
3534
- ? "Add feedback to refine the plan, or leave this blank to implement it"
3535
- : projectSelectionRequired
3536
- ? "Choose a project above to start a thread"
3537
- : showProviderUnavailable
3538
- ? "Enable a provider in Settings to send a message"
3539
- : DEFAULT_COMPOSER_PLACEHOLDER
3428
+ : projectSelectionRequired
3429
+ ? "Choose a project above to start a thread"
3430
+ : showProviderUnavailable
3431
+ ? "Enable a provider in Settings to send a message"
3432
+ : DEFAULT_COMPOSER_PLACEHOLDER
3433
}
3434
disabled={
3435
projectSelectionRequired ||
@@ -3557,8 +3450,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3450
pendingAction={pendingPrimaryAction}
3451
isRunning={false}
3452
canInterrupt={false}
3560
- showPlanFollowUpPrompt={false}
3561
- promptHasText={false}
3453
isSendBusy={isSendBusy}
3454
sendDisabledReason={voiceSendDisabledReason}
3455
isEnvironmentUnavailable={
@@ -3571,7 +3462,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3462
preserveComposerFocusOnPointerDown
3463
onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}
3464
onInterrupt={handleInterruptPrimaryActionStable}
3574
- onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryActionStable}
3465
/>
3466
</div>
3467
) : null}
@@ -3623,11 +3513,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3513
<ComposerFooterPrimaryActions
3514
compact={isComposerPrimaryActionsCompact}
3515
canOperateThread={canOperateThread}
3626
- activeContextWindow={
3627
- settings.contextWindowMeterEnabled ? activeContextWindow : null
3628
- }
3629
- reserveContextWindowMeter={reserveContextWindowMeter}
3630
- activeThreadModelDisplayName={activeThreadModelDisplayName}
3516
pendingAction={pendingPrimaryAction}
3517
isRunning={phase === "running"}
3518
canInterrupt={canInterrupt}
@@ -3648,10 +3533,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3533
},
3534
},
3535
)}
3651
- showPlanFollowUpPrompt={
3652
- pendingUserInputs.length === 0 && showPlanFollowUpPrompt
3653
- }
3654
- promptHasText={prompt.trim().length > 0 || voiceInputActive}
3536
voiceInputActive={voiceInputActive}
3537
isSendBusy={isSendBusy}
3538
sendDisabledReason={voiceSendDisabledReason}
@@ -3669,15 +3550,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3550
onResume={onResume}
3551
onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}
3552
onInterrupt={handleInterruptPrimaryActionStable}
3672
- onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryActionStable}
3553
compactBeforeSendTokens={props.resumeCompactionTokens}
3554
keepFullHistory={props.keepFullHistory}
3555
onToggleKeepFullHistory={props.onToggleKeepFullHistory}
3676
- compactDisabled={compactDisabled || noProviderAvailable || isSendBusy}
3677
- compactDisabledReason={resolvedCompactDisabledReason}
3678
- {...(compactCommandAvailable
3679
- ? { onCompactContext: compactThreadContextStable }
3680
- : {})}
3556
>
3557
{speechInput.available ? (
3558
<>
apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+6
-32
@@ -1,29 +1,19 @@
1
-import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
1
+import type { RuntimeMode } from "@t3tools/contracts";
2
import { memo, useRef } from "react";
3
import { EllipsisIcon } from "lucide-react";
4
-import {
5
- Menu,
6
- MenuPopup,
7
- MenuRadioGroup,
8
- MenuRadioItem,
9
- MenuSeparator as MenuDivider,
10
- MenuTrigger,
11
-} from "../ui/menu";
4
+import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
5
import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
6
import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
7
import { useComposerMenuState } from "./useComposerMenuState";
8
import { ComposerPermissionsSection, type RuntimeModeOption } from "./ComposerFooterControls";
9
10
export const CompactComposerControlsMenu = memo(function CompactComposerControlsMenu(props: {
18
- interactionMode: ProviderInteractionMode;
11
runtimeMode: RuntimeMode;
12
runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
21
- showInteractionModeToggle: boolean;
22
- showPermissions?: boolean;
13
+ showPermissions: boolean;
14
size?: "sm" | "xs";
15
/** Close the portaled popup when its trigger hides. */
16
hidden?: boolean;
26
- onToggleInteractionMode: () => void;
17
onRuntimeModeChange: (mode: RuntimeMode) => void;
18
}) {
19
const composerFloatingLayerProps = useComposerMenuProps();
@@ -44,36 +34,20 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
34
size={size}
35
className="shrink-0"
36
aria-label="More composer controls"
47
- data-composer-shortcut={props.showPermissions !== false ? "composer.mode" : undefined}
37
+ data-composer-shortcut={props.showPermissions ? "composer.mode" : undefined}
38
/>
39
}
40
>
41
<ComposerControlIcon icon={EllipsisIcon} size={size} />
42
</MenuTrigger>
43
<MenuPopup align="start" {...composerFloatingLayerProps}>
54
- {props.showInteractionModeToggle ? (
55
- <>
56
- <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Mode</div>
57
- <MenuRadioGroup
58
- value={props.interactionMode}
59
- onValueChange={(value) => {
60
- if (!value || value === props.interactionMode) return;
61
- props.onToggleInteractionMode();
62
- }}
63
- >
64
- <MenuRadioItem value="default">Chat</MenuRadioItem>
65
- <MenuRadioItem value="plan">Plan</MenuRadioItem>
66
- </MenuRadioGroup>
67
- {props.showPermissions !== false ? <MenuDivider /> : null}
68
- </>
69
- ) : null}
70
- {props.showPermissions === false ? null : (
44
+ {props.showPermissions ? (
45
<ComposerPermissionsSection
46
runtimeMode={props.runtimeMode}
47
runtimeModeOptions={props.runtimeModeOptions}
48
onRuntimeModeChange={props.onRuntimeModeChange}
49
/>
76
- )}
50
+ ) : null}
51
</MenuPopup>
52
</Menu>
53
);
apps/web/src/components/chat/ComposerControlsBar.tsx
-17
@@ -15,7 +15,6 @@ import {
15
type ModelSelection,
16
type ProviderDriverKind,
17
type ProviderInstanceId,
18
- type ProviderInteractionMode,
18
type RuntimeMode,
19
type ServerProvider,
20
} from "@t3tools/contracts";
@@ -51,16 +50,12 @@ export function ComposerControlsBar(props: {
50
reportedModelSelection: ChatComposerProps["reportedModelSelection"];
51
promptUltrathink: PromptUltrathink;
52
onPromptEdit: (edit: (prompt: string) => string) => void;
54
- planModeEnabled: boolean;
55
- planModeUiEnabled: boolean;
53
effortDisplay: EffortDisplay;
54
/** The strip under a new thread names the permissions, so the row does not repeat them. */
55
permissionsShownInStrip: boolean;
59
- interactionMode: ProviderInteractionMode;
56
compatibleRuntimeMode: RuntimeMode;
57
defaultRuntimeMode: RuntimeMode | undefined;
58
compatibleRuntimeModeOptions: ReadonlyArray<RuntimeModeOption>;
63
- toggleInteractionMode: () => void;
59
handleRuntimeModeChange: (mode: RuntimeMode) => void;
60
composerControlsCollapsed: boolean;
61
composerControlsHidden: boolean;
@@ -102,13 +97,9 @@ export function ComposerControlsBar(props: {
97
reportedModelSelection,
98
promptUltrathink,
99
onPromptEdit,
105
- planModeEnabled,
106
- planModeUiEnabled,
107
- interactionMode,
100
compatibleRuntimeMode,
101
defaultRuntimeMode,
102
compatibleRuntimeModeOptions,
111
- toggleInteractionMode,
103
handleRuntimeModeChange,
104
composerControlsCollapsed,
105
composerControlsHidden,
@@ -147,7 +138,6 @@ export function ComposerControlsBar(props: {
138
pickerOwnsModeShortcut,
139
} = resolveComposerControlsOwnership({
140
matchesDefault: accessMatchesDefault || props.permissionsShownInStrip,
150
- planModeUiEnabled,
141
collapsed: composerControlsCollapsed,
142
measuredHiddenBlockCount,
143
});
@@ -163,7 +153,6 @@ export function ComposerControlsBar(props: {
153
reportedModelSelection,
154
promptUltrathink,
155
onPromptEdit,
166
- planModeEnabled,
156
});
157
const effort = describeComposerEffort(traitsInput, props.effortDisplay, controlSize);
158
const restingBlockDefs = showModeBlock
@@ -172,15 +161,12 @@ export function ComposerControlsBar(props: {
161
id: "mode",
162
content: (
163
<ComposerFooterModeControls
175
- showInteractionModeToggle={planModeUiEnabled}
176
- interactionMode={interactionMode}
164
runtimeMode={compatibleRuntimeMode}
165
runtimeModeOptions={compatibleRuntimeModeOptions}
166
size={controlSize}
167
hidden={composerControlsHidden || restingHiddenBlockCount > 0}
168
accessDisplay={accessDisplay}
169
emphasized={!accessMatchesDefault}
183
- onToggleInteractionMode={toggleInteractionMode}
170
onRuntimeModeChange={handleRuntimeModeChange}
171
/>
172
),
@@ -303,15 +289,12 @@ export function ComposerControlsBar(props: {
289
)}
290
>
291
<CompactComposerControlsMenu
306
- interactionMode={interactionMode}
292
runtimeMode={compatibleRuntimeMode}
293
runtimeModeOptions={compatibleRuntimeModeOptions}
294
size={controlSize}
295
hidden={composerControlsHidden || hiddenRestingBlockIds.length === 0}
311
- showInteractionModeToggle={planModeUiEnabled && hiddenRestingBlockIds.length > 0}
296
// Permissions join the overflow only when their normal home is in it.
297
showPermissions={overflowShowsPermissions}
314
- onToggleInteractionMode={toggleInteractionMode}
298
onRuntimeModeChange={handleRuntimeModeChange}
299
/>
300
</div>
apps/web/src/components/chat/ComposerFooterControls.tsx
+2
-85
@@ -1,21 +1,13 @@
1
-import type {
2
- ModelSelection,
3
- ProviderInstanceId,
4
- ProviderInteractionMode,
5
- RuntimeMode,
6
-} from "@t3tools/contracts";
1
+import type { ModelSelection, ProviderInstanceId, RuntimeMode } from "@t3tools/contracts";
2
import { createModelSelection } from "@t3tools/shared/model";
8
-import { BotIcon, PencilRulerIcon } from "lucide-react";
3
import { type ComponentProps, memo, useId, useRef, useState } from "react";
4
11
-import type { ContextWindowSnapshot } from "@t3tools/client-runtime/state/context-window";
5
import { Menu as MenuPrimitive } from "@base-ui/react/menu";
6
import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
7
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
8
import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
9
import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
10
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
18
-import { ContextWindowMeter, ContextWindowMeterPlaceholder } from "./ContextWindowMeter";
11
import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
12
import { ProviderModelPicker } from "./ProviderModelPicker";
13
import { runtimeModeConfig } from "./runtimeModeConfig";
@@ -30,8 +22,6 @@ const supervisedRuntimeModeOption: RuntimeModeOption = {
22
...runtimeModeConfig["approval-required"],
23
};
24
export const ComposerFooterModeControls = memo(function ComposerFooterModeControls(props: {
33
- showInteractionModeToggle: boolean;
34
- interactionMode: ProviderInteractionMode;
25
runtimeMode: RuntimeMode;
26
runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
27
size?: "sm" | "xs";
@@ -40,7 +30,6 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
30
accessDisplay?: "label" | "icon" | "hidden";
31
/** Draw the icon in the label color, not muted (the mode differs from the user's default). */
32
emphasized?: boolean;
43
- onToggleInteractionMode: () => void;
33
onRuntimeModeChange: (mode: RuntimeMode) => void;
34
}) {
35
const size = props.size ?? "sm";
@@ -52,50 +41,6 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
41
props.runtimeModeOptions.find((option) => option.mode === props.runtimeMode) ??
42
supervisedRuntimeModeOption;
43
const RuntimeModeIcon = runtimeModeOption.icon;
55
- const interactionModeTooltip =
56
- props.interactionMode === "plan"
57
- ? "Plan mode. Click to return to normal build mode"
58
- : "Default mode. Click to enter plan mode";
59
-
60
- const interactionModeToggle = props.showInteractionModeToggle ? (
61
- <Tooltip>
62
- <TooltipTrigger
63
- render={
64
- <ComposerControl
65
- size={size}
66
- className="shrink-0 whitespace-nowrap"
67
- aria-pressed={props.interactionMode === "plan"}
68
- type="button"
69
- onClick={props.onToggleInteractionMode}
70
- aria-label={interactionModeTooltip}
71
- />
72
- }
73
- >
74
- {props.interactionMode === "plan" ? (
75
- <ComposerControlIcon
76
- icon={PencilRulerIcon}
77
- size={size}
78
- className="text-current opacity-100"
79
- />
80
- ) : (
81
- <ComposerControlIcon
82
- icon={BotIcon}
83
- size={size}
84
- opticalSize={size === "xs" ? "default" : "large"}
85
- />
86
- )}
87
- {/* The compacted row (xs) keeps this icon-only, like the other controls there. */}
88
- <span
89
- data-composer-control-label
90
- className={size === "xs" ? "sr-only" : "sr-only sm:not-sr-only"}
91
- >
92
- {props.interactionMode === "plan" ? "Plan" : "Build"}
93
- </span>
94
- </TooltipTrigger>
95
- <TooltipPopup side="top">{interactionModeTooltip}</TooltipPopup>
96
- </Tooltip>
97
- ) : null;
98
-
44
// The chip opens the same Permissions toggle used in the model picker and the overflow menu.
45
const permissionsTooltip = `Permissions: ${runtimeModeOption.label}. ${runtimeModeOption.description}`;
46
const permissionsChip = (
@@ -148,12 +93,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
93
</Menu>
94
);
95
151
- return (
152
- <>
153
- {accessDisplay === "hidden" ? null : permissionsChip}
154
- {interactionModeToggle}
155
- </>
156
- );
96
+ return accessDisplay === "hidden" ? null : permissionsChip;
97
});
98
99
/**
@@ -249,9 +189,6 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
189
children?: React.ReactNode;
190
compact: boolean;
191
canOperateThread: boolean;
252
- activeContextWindow: ContextWindowSnapshot | null;
253
- reserveContextWindowMeter: boolean;
254
- activeThreadModelDisplayName: string | null;
192
isPreparingWorktree: boolean;
193
pendingAction: {
194
questionIndex: number;
@@ -265,8 +202,6 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
202
followUpBehavior: "queue" | "steer";
203
canSteer: boolean;
204
alternateShortcutLabel: string | null;
268
- showPlanFollowUpPrompt: boolean;
269
- promptHasText: boolean;
205
voiceInputActive?: boolean;
206
isSendBusy: boolean;
207
sendDisabledReason: string | null;
@@ -279,27 +214,12 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
214
onResume: () => void;
215
onPreviousPendingQuestion: () => void;
216
onInterrupt: () => void;
282
- onImplementPlanInNewThread: () => void;
283
- onCompactContext?: (() => void) | undefined;
284
- compactDisabled: boolean;
285
- compactDisabledReason: string | null;
217
compactBeforeSendTokens: number | null;
218
keepFullHistory: boolean;
219
onToggleKeepFullHistory: () => void;
220
}) {
221
return (
222
<>
292
- {props.activeContextWindow ? (
293
- <ContextWindowMeter
294
- usage={props.activeContextWindow}
295
- modelDisplayName={props.activeThreadModelDisplayName}
296
- onCompact={props.onCompactContext}
297
- compactDisabled={props.compactDisabled}
298
- compactDisabledReason={props.compactDisabledReason}
299
- />
300
- ) : props.reserveContextWindowMeter ? (
301
- <ContextWindowMeterPlaceholder />
302
- ) : null}
223
<ComposerPrimaryActions
224
compact={props.compact}
225
canOperateThread={props.canOperateThread}
@@ -309,8 +229,6 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
229
followUpBehavior={props.followUpBehavior}
230
canSteer={props.canSteer}
231
alternateShortcutLabel={props.alternateShortcutLabel}
312
- showPlanFollowUpPrompt={props.showPlanFollowUpPrompt}
313
- promptHasText={props.promptHasText}
232
voiceInputActive={props.voiceInputActive ?? false}
233
isSendBusy={props.isSendBusy}
234
sendDisabledReason={props.sendDisabledReason}
@@ -324,7 +242,6 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
242
onResume={props.onResume}
243
onPreviousPendingQuestion={props.onPreviousPendingQuestion}
244
onInterrupt={props.onInterrupt}
327
- onImplementPlanInNewThread={props.onImplementPlanInNewThread}
245
compactBeforeSendTokens={props.compactBeforeSendTokens}
246
keepFullHistory={props.keepFullHistory}
247
onToggleKeepFullHistory={props.onToggleKeepFullHistory}
apps/web/src/components/chat/ComposerModelEffort.browser.test.tsx
-1
@@ -70,7 +70,6 @@ function traitsInput(
70
models,
71
model: "fusion",
72
modelOptions,
73
- planModeEnabled: false,
73
onModelOptionsChange,
74
};
75
}
apps/web/src/components/chat/ComposerPermissionsSection.browser.test.tsx
+6
-20
@@ -6,7 +6,7 @@ import { page, userEvent } from "vite-plus/test/browser";
6
import { render } from "../../../test/render";
7
import { ComposerHandleContext, type ComposerHandleRef } from "../../composerHandleContext";
8
import { ComposerContextPermissions } from "../ComposerContextPermissions";
9
-import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";
9
+import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
10
import {
11
focusRequestedPermission,
12
markOpenToPermissions,
@@ -17,9 +17,8 @@ import { runtimeModeConfig, runtimeModeOptions } from "./runtimeModeConfig";
17
18
const options = runtimeModeOptions.map((mode) => ({ mode, ...runtimeModeConfig[mode] }));
19
20
-// Mirrors the overflow menu: mode radio items first, then the Permissions section.
20
+// Mirrors the overflow menu, which holds the Permissions section.
21
function OverflowMenu() {
22
- const [interaction, setInteraction] = useState("plan");
22
const [mode, setMode] = useState<RuntimeMode>("full-access");
23
const composerMenuProps = useComposerMenuProps();
24
const triggerRef = useRef<HTMLButtonElement>(null);
@@ -28,10 +27,6 @@ function OverflowMenu() {
27
<Menu onOpenChangeComplete={(open) => focusRequestedPermission(open, triggerRef.current)}>
28
<MenuTrigger ref={triggerRef}>More</MenuTrigger>
29
<MenuPopup {...composerMenuProps}>
31
- <MenuRadioGroup value={interaction} onValueChange={setInteraction}>
32
- <MenuRadioItem value="default">Chat</MenuRadioItem>
33
- <MenuRadioItem value="plan">Plan</MenuRadioItem>
34
- </MenuRadioGroup>
30
<ComposerPermissionsSection
31
runtimeMode={mode}
32
runtimeModeOptions={options}
@@ -44,15 +39,12 @@ function OverflowMenu() {
39
);
40
}
41
47
-it("reaches Permissions from the mode items with arrow keys, previews, and picks with Enter", async () => {
42
+it("reaches Permissions with arrow keys, previews, and picks with Enter", async () => {
43
await using screen = await render(<OverflowMenu />, { router: false }); // no routes involved
44
const trigger = screen.getByRole("button", { name: "More" });
45
await userEvent.tab();
46
await expect.element(trigger).toHaveFocus();
47
await userEvent.keyboard("{ArrowDown}");
53
- await expect.element(page.getByRole("menuitemradio", { name: "Chat" })).toHaveFocus();
54
-
55
- await userEvent.keyboard("{ArrowDown}{ArrowDown}");
48
const supervised = page.getByRole("menuitemradio", { name: "Supervised" });
49
await expect.element(supervised).toHaveFocus();
50
await expect
@@ -66,10 +58,7 @@ it("reaches Permissions from the mode items with arrow keys, previews, and picks
58
await userEvent.keyboard("{ArrowLeft}{ArrowLeft}");
59
await expect.element(page.getByRole("menuitemradio", { name: "Supervised" })).toHaveFocus();
60
69
- await userEvent.keyboard("{ArrowUp}");
70
- await expect.element(page.getByRole("menuitemradio", { name: "Plan" })).toHaveFocus();
71
-
72
- await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
61
+ await userEvent.keyboard("{ArrowDown}{Enter}");
62
await expect.element(screen.getByRole("status")).toHaveTextContent("auto-accept-edits");
63
await expect
64
.element(page.getByRole("menuitemradio", { name: "Supervised" }))
@@ -100,8 +89,8 @@ it("returns focus to the editor after a pick", async () => {
89
await using screen = await render(ui, { router: false }); // no routes involved
90
await userEvent.tab();
91
await userEvent.keyboard("{ArrowDown}");
103
- await expect.element(page.getByRole("menuitemradio", { name: "Chat" })).toHaveFocus();
104
- await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
92
+ await expect.element(page.getByRole("menuitemradio", { name: "Supervised" })).toHaveFocus();
93
+ await userEvent.keyboard("{Enter}");
94
await expect.element(screen.getByRole("status")).toHaveTextContent("approval-required");
95
await vi.waitFor(() => expect(handle.focusAtEnd).toHaveBeenCalled());
96
});
@@ -129,12 +118,9 @@ function PermissionsChip() {
118
</button>
119
{mode === "full-access" ? null : (
120
<ComposerFooterModeControls
132
- showInteractionModeToggle={false}
133
- interactionMode="default"
121
runtimeMode={mode}
122
runtimeModeOptions={options}
123
accessDisplay="label"
137
- onToggleInteractionMode={() => {}}
124
onRuntimeModeChange={setMode}
125
/>
126
)}
apps/web/src/components/chat/ComposerPlanFollowUpBanner.tsx
deleted
-20
@@ -1,20 +0,0 @@
1
-import { memo } from "react";
2
-import { ComposerBanner } from "./ComposerBanner";
3
-
4
-export const ComposerPlanFollowUpBanner = memo(function ComposerPlanFollowUpBanner({
5
- planTitle,
6
-}: {
7
- planTitle: string | null;
8
-}) {
9
- return (
10
- <ComposerBanner.Row>
11
- <ComposerBanner.Icon />
12
- <ComposerBanner.Content>
13
- <span className="shrink-0 font-medium text-muted-foreground">Plan ready</span>
14
- {planTitle ? (
15
- <span className="min-w-0 flex-1 truncate text-foreground/85">{planTitle}</span>
16
- ) : null}
17
- </ComposerBanner.Content>
18
- </ComposerBanner.Row>
19
- );
20
-});
apps/web/src/components/chat/ComposerPrimaryActions.tsx
+1
-75
@@ -1,5 +1,5 @@
1
import { memo, type MouseEventHandler, type PointerEventHandler, type ReactNode } from "react";
2
-import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, Minimize2Icon, PlayIcon } from "lucide-react";
2
+import { CheckIcon, ChevronLeftIcon, Minimize2Icon, PlayIcon } from "lucide-react";
3
import { CornerUpRight, ListPlus } from "lucide";
4
import { MorphIcon } from "~/components/MorphIcon";
5
import { useEnvironmentIdentificationMode } from "~/hooks/useSettings";
@@ -8,10 +8,8 @@ import { cn, isMacPlatform } from "~/lib/utils";
8
import { useShortcutModifierState } from "../../shortcutModifierState";
9
import { StageBackdropButtonArt, useSidebarStageBackdropVariant } from "../SidebarStageBackdrop";
10
import { Button } from "../ui/button";
11
-import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
11
import { Spinner } from "../ui/spinner";
12
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
14
-import { composerFloatingLayerProps } from "./composerEventScope";
13
import {
14
alternateComposerDispatchAction,
15
resolveComposerDispatchMode,
@@ -36,8 +34,6 @@ interface ComposerPrimaryActionsProps {
34
followUpBehavior?: "queue" | "steer";
35
canSteer?: boolean;
36
alternateShortcutLabel?: string | null;
39
- showPlanFollowUpPrompt: boolean;
40
- promptHasText: boolean;
37
/** Dictation is running; Send finishes it and submits once the transcript lands. */
38
voiceInputActive?: boolean;
39
isSendBusy: boolean;
@@ -52,7 +48,6 @@ interface ComposerPrimaryActionsProps {
48
onResume?: () => void;
49
onPreviousPendingQuestion: () => void;
50
onInterrupt: () => void;
55
- onImplementPlanInNewThread: () => void;
51
compactBeforeSendTokens?: number | null;
52
keepFullHistory?: boolean;
53
onToggleKeepFullHistory?: () => void;
@@ -93,8 +88,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
88
followUpBehavior = "steer",
89
canSteer = true,
90
alternateShortcutLabel = null,
96
- showPlanFollowUpPrompt,
97
- promptHasText,
91
voiceInputActive = false,
92
isSendBusy,
93
sendDisabledReason,
@@ -108,7 +101,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
101
onResume,
102
onPreviousPendingQuestion,
103
onInterrupt,
111
- onImplementPlanInNewThread,
104
compactBeforeSendTokens = null,
105
keepFullHistory = false,
106
onToggleKeepFullHistory,
@@ -212,72 +204,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
204
);
205
}
206
215
- if (showPlanFollowUpPrompt && (promptHasText || !canResume)) {
216
- if (promptHasText) {
217
- return (
218
- <>
219
- {children}
220
- <button
221
- type="submit"
222
- className={cn(messageActionPillClassName, "h-9 sm:h-8", compact ? "px-3" : "px-4")}
223
- {...pointerFocusProps}
224
- disabled={isSendBusy || isSendDisabled || isEnvironmentUnavailable}
225
- >
226
- {isSendBusy ? "Sending..." : "Refine"}
227
- </button>
228
- </>
229
- );
230
- }
231
-
232
- return (
233
- <>
234
- {children}
235
- <div data-chat-composer-implement-actions="true" className="flex items-center justify-end">
236
- <button
237
- type="submit"
238
- className={cn(messageActionPillClassName, "h-9 rounded-r-none px-4 sm:h-8")}
239
- {...pointerFocusProps}
240
- disabled={isSendBusy || isSendDisabled || isEnvironmentUnavailable}
241
- >
242
- {isSendBusy ? "Sending..." : "Implement"}
243
- </button>
244
- <Menu>
245
- <MenuTrigger
246
- render={
247
- <button
248
- type="button"
249
- className={cn(
250
- messageActionPillClassName,
251
- "h-9 rounded-l-none border-l border-message-action-foreground/20 px-2 sm:h-8",
252
- )}
253
- aria-label="Implementation actions"
254
- onMouseDown={
255
- preserveComposerFocusOnPointerDown
256
- ? (event) => event.preventDefault()
257
- : undefined
258
- }
259
- disabled={isSendBusy || isSendDisabled || isEnvironmentUnavailable}
260
- />
261
- }
262
- >
263
- <ChevronDownIcon className="size-3.5" />
264
- </MenuTrigger>
265
- <MenuPopup align="end" side="top" {...composerFloatingLayerProps}>
266
- <MenuItem
267
- disabled={isSendBusy || isSendDisabled || isEnvironmentUnavailable}
268
- onClick={() => {
269
- if (canOperateThread) onImplementPlanInNewThread();
270
- }}
271
- >
272
- Implement in a new thread
273
- </MenuItem>
274
- </MenuPopup>
275
- </Menu>
276
- </div>
277
- </>
278
- );
279
- }
280
-
207
if (canInterrupt && !hasSendableContent && !isEditingQueuedMessage) {
208
return (
209
<>
apps/web/src/components/chat/ContextWindowMeter.logic.ts
deleted
-85
@@ -1,85 +0,0 @@
1
-import type { ModelSelection, ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
2
-import {
3
- resolveSelectableProviderInstanceEntry,
4
- type ProviderInstanceEntry,
5
-} from "../../providerInstances";
6
-import { getDisplayModelName, type ModelEsque } from "./providerIconUtils";
7
-
8
-export function providerSupportsManualCompaction(
9
- provider: ProviderInstanceEntry | null | undefined,
10
-): boolean {
11
- return provider?.snapshot.slashCommands.some((command) => command.name === "compact") ?? false;
12
-}
13
-
14
-export function hasAvailableCompactionProvider(input: {
15
- readonly providers: ReadonlyArray<ProviderInstanceEntry>;
16
- readonly driverKind: ProviderDriverKind;
17
- readonly instanceId: ProviderInstanceId | null;
18
- readonly lockedInstanceId: ProviderInstanceId | null;
19
-}): boolean {
20
- const driverProviders = input.providers.filter(
21
- (provider) => provider.driverKind === input.driverKind,
22
- );
23
- const lockedContinuationGroupKey = input.lockedInstanceId
24
- ? driverProviders.find((provider) => provider.instanceId === input.lockedInstanceId)
25
- ?.continuationGroupKey
26
- : undefined;
27
- const compatibleProviders = lockedContinuationGroupKey
28
- ? driverProviders.filter(
29
- (provider) => provider.continuationGroupKey === lockedContinuationGroupKey,
30
- )
31
- : driverProviders;
32
-
33
- return providerSupportsManualCompaction(
34
- resolveSelectableProviderInstanceEntry(compatibleProviders, input.instanceId ?? undefined),
35
- );
36
-}
37
-
38
-export function resolveContextWindowModelDisplayName(
39
- selection: ModelSelection | null | undefined,
40
- modelOptionsByInstance: ReadonlyMap<ProviderInstanceId, ReadonlyArray<ModelEsque>>,
41
-): string | null {
42
- if (!selection) {
43
- return null;
44
- }
45
-
46
- const selectedModel = modelOptionsByInstance
47
- .get(selection.instanceId)
48
- ?.find((model) => model.slug === selection.model);
49
-
50
- return selectedModel ? getDisplayModelName(selectedModel) : selection.model;
51
-}
52
-
53
-export function formatContextWindowCompactionMessage(
54
- modelDisplayName: string | null | undefined,
55
- autoCompactThreshold?: number | null,
56
-): string {
57
- if (typeof autoCompactThreshold === "number" && autoCompactThreshold > 0) {
58
- return `Compacts automatically at about ${autoCompactThreshold.toLocaleString("en-US")} tokens.`;
59
- }
60
- return modelDisplayName
61
- ? `Context for ${modelDisplayName} compacts automatically when needed.`
62
- : "Context compacts automatically when needed.";
63
-}
64
-
65
-export function shouldReserveContextWindowMeter(input: {
66
- readonly meterEnabled: boolean;
67
- readonly detailLoading: boolean;
68
- readonly threadStarted: boolean;
69
- readonly providerReportsContextWindow: boolean | null;
70
-}): boolean {
71
- return (
72
- input.meterEnabled &&
73
- input.detailLoading &&
74
- input.threadStarted &&
75
- input.providerReportsContextWindow !== false
76
- );
77
-}
78
-
79
-export function formatContextWindowCost(cost: {
80
- readonly amount: number;
81
- readonly currency: string;
82
-}): string {
83
- const fractionDigits = Math.abs(cost.amount) > 0 && Math.abs(cost.amount) < 0.01 ? 4 : 2;
84
- return `${cost.currency} ${cost.amount.toFixed(fractionDigits)}`;
85
-}
apps/web/src/components/chat/ContextWindowMeter.tsx
deleted
-180
@@ -1,180 +0,0 @@
1
-import { Button } from "../ui/button";
2
-import type { ContextWindowSnapshot } from "@t3tools/client-runtime/state/context-window";
3
-import { formatContextWindowTokens } from "~/lib/contextWindow";
4
-import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
5
-import {
6
- formatContextWindowCompactionMessage,
7
- formatContextWindowCost,
8
-} from "./ContextWindowMeter.logic";
9
-import { Minimize2Icon } from "lucide-react";
10
-import { composerFloatingLayerProps } from "./composerEventScope";
11
-
12
-function formatPercentage(value: number | null): string | null {
13
- if (value === null || !Number.isFinite(value)) {
14
- return null;
15
- }
16
- if (value < 10) {
17
- return `${value.toFixed(1).replace(/\.0$/, "")}%`;
18
- }
19
- return `${Math.round(value)}%`;
20
-}
21
-
22
-export function ContextWindowMeter(props: {
23
- usage: ContextWindowSnapshot;
24
- modelDisplayName?: string | null;
25
- onCompact?: (() => void) | undefined;
26
- compactDisabled?: boolean | undefined;
27
- compactDisabledReason?: string | null | undefined;
28
-}) {
29
- const { usage, modelDisplayName, onCompact, compactDisabled, compactDisabledReason } = props;
30
- const usedPercentage = formatPercentage(usage.usedPercentage);
31
- const normalizedPercentage = Math.max(0, Math.min(100, usage.usedPercentage ?? 0));
32
- const radius = 9.75;
33
- const circumference = 2 * Math.PI * radius;
34
- const dashOffset = circumference * (1 - normalizedPercentage / 100);
35
- const totalProcessedTokens = usage.totalProcessedTokens ?? null;
36
- const showTotalProcessed = totalProcessedTokens !== null && totalProcessedTokens > 0;
37
- const isOverloaded = normalizedPercentage > 90;
38
- const usageColor = isOverloaded
39
- ? "var(--color-error)"
40
- : "color-mix(in oklab, var(--color-muted-foreground) 72%, transparent)";
41
-
42
- return (
43
- <Popover>
44
- <PopoverTrigger
45
- openOnHover
46
- delay={150}
47
- closeDelay={onCompact ? 150 : 0}
48
- render={
49
- <Button
50
- size="icon-sm"
51
- variant="ghost-muted"
52
- className="size-7"
53
- aria-label={
54
- usage.maxTokens !== null && usedPercentage
55
- ? `Context window ${usedPercentage} used`
56
- : `Context window ${formatContextWindowTokens(usage.usedTokens)} tokens used`
57
- }
58
- >
59
- <span className="relative flex size-5 items-center justify-center">
60
- <svg
61
- viewBox="0 0 24 24"
62
- className="-rotate-90 absolute inset-0 size-full transform-gpu mx-0!"
63
- aria-hidden="true"
64
- >
65
- <circle
66
- cx="12"
67
- cy="12"
68
- r={radius}
69
- fill="none"
70
- className="stroke-muted-foreground/24"
71
- strokeWidth="3"
72
- />
73
- <circle
74
- cx="12"
75
- cy="12"
76
- r={radius}
77
- fill="none"
78
- stroke={usageColor}
79
- strokeWidth="3"
80
- strokeLinecap="round"
81
- strokeDasharray={circumference}
82
- strokeDashoffset={dashOffset}
83
- className="transition-[stroke-dashoffset,stroke] duration-500 ease-out motion-reduce:transition-none"
84
- />
85
- </svg>
86
- </span>
87
- </Button>
88
- }
89
- />
90
- <PopoverPopup
91
- {...composerFloatingLayerProps}
92
- tooltipStyle
93
- side="top"
94
- align="end"
95
- padding="none"
96
- width="sm"
97
- className="text-left whitespace-normal"
98
- >
99
- <div className="flex flex-col gap-2 p-(--floating-content-inset)">
100
- <div className="flex items-center justify-between gap-3">
101
- <div className="font-medium text-muted-foreground text-xs">Context Window</div>
102
- {usage.maxTokens !== null && usedPercentage ? (
103
- <div className="text-secondary-label text-2xs tabular-nums">
104
- <span>{usedPercentage}</span>
105
- <span className="mx-1">·</span>
106
- <span>
107
- {formatContextWindowTokens(usage.usedTokens)}/
108
- {formatContextWindowTokens(usage.maxTokens ?? null)}
109
- </span>
110
- </div>
111
- ) : (
112
- <div className="text-secondary-label text-2xs tabular-nums">
113
- {formatContextWindowTokens(usage.usedTokens)}
114
- </div>
115
- )}
116
- </div>
117
- {usage.maxTokens !== null ? (
118
- <div
119
- className="h-1.5 w-full overflow-hidden rounded-full bg-muted/60"
120
- role="progressbar"
121
- aria-valuemin={0}
122
- aria-valuemax={100}
123
- aria-valuenow={Math.round(normalizedPercentage)}
124
- aria-label="Context window usage"
125
- >
126
- <div
127
- className="h-full rounded-full transition-[width,background-color] duration-500 ease-out motion-reduce:transition-none"
128
- style={{ width: `${normalizedPercentage}%`, backgroundColor: usageColor }}
129
- />
130
- </div>
131
- ) : null}
132
- {showTotalProcessed ? (
133
- <div className="flex items-center justify-between gap-3 text-2xs leading-4">
134
- <span className="text-secondary-label">Total processed</span>
135
- <span className="font-medium tabular-nums text-secondary-label">
136
- {formatContextWindowTokens(totalProcessedTokens)}
137
- </span>
138
- </div>
139
- ) : null}
140
- {usage.cost != null ? (
141
- <div className="flex items-center justify-between gap-3 text-2xs leading-4">
142
- <span className="text-secondary-label">Cost</span>
143
- <span className="font-medium tabular-nums text-secondary-label">
144
- {formatContextWindowCost(usage.cost)}
145
- </span>
146
- </div>
147
- ) : null}
148
- {usage.compactsAutomatically ? (
149
- <div className="mt-1 text-pretty text-secondary-label text-2xs font-medium">
150
- {formatContextWindowCompactionMessage(modelDisplayName, usage.autoCompactThreshold)}
151
- </div>
152
- ) : null}
153
- {onCompact ? (
154
- <>
155
- <Button
156
- size="xs"
157
- variant="outline"
158
- className="mt-1 w-full justify-center"
159
- disabled={compactDisabled}
160
- onClick={onCompact}
161
- >
162
- <Minimize2Icon aria-hidden="true" />
163
- Compact context
164
- </Button>
165
- {compactDisabled && compactDisabledReason ? (
166
- <div className="text-pretty text-secondary-label text-2xs">
167
- {compactDisabledReason}
168
- </div>
169
- ) : null}
170
- </>
171
- ) : null}
172
- </div>
173
- </PopoverPopup>
174
- </Popover>
175
- );
176
-}
177
-
178
-export function ContextWindowMeterPlaceholder() {
179
- return <span aria-hidden="true" className="size-7 shrink-0" />;
180
-}
apps/web/src/components/chat/ThreadDetailsUsage.tsx
+2
-2
@@ -21,7 +21,7 @@ import { formatContextWindowTokens } from "../../lib/contextWindow";
21
import { cn } from "../../lib/utils";
22
import { formatUpcomingTimestamp } from "../../timestampFormat";
23
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
24
-import { formatContextWindowCompactionMessage } from "./ContextWindowMeter.logic";
24
+import { formatContextWindowCompactionMessage } from "./compaction.logic";
25
import { ThreadDetailsSection } from "./ThreadDetailsSection";
26
27
const PACE_LABEL: Record<LimitPace, string> = {
@@ -127,7 +127,7 @@ export function ThreadDetailsContext({ usage }: { readonly usage: ContextWindowS
127
) : null}
128
{threshold !== null && threshold > 0 ? (
129
<span className="text-muted-foreground">
130
- {formatContextWindowCompactionMessage(null, threshold)}
130
+ {formatContextWindowCompactionMessage(threshold)}
131
</span>
132
) : null}
133
</>
apps/web/src/components/chat/TraitsPicker.tsx
+10
-10
@@ -115,15 +115,15 @@ function getSelectedTraits(
115
promptUltrathink: PromptUltrathink,
116
modelOptions: ProviderOptions | null | undefined,
117
allowPromptInjectedEffort: boolean,
118
- planModeEnabled: boolean,
118
+ includePlanAgent: boolean | undefined,
119
) {
120
- const caps = getProviderModelCapabilities(models, model, provider, planModeEnabled);
120
+ const caps = getProviderModelCapabilities(models, model, provider, includePlanAgent);
121
const modelIsUnavailable =
122
provider === "opencode" &&
123
!models.some((candidate) => candidate.slug === normalizeModelSlug(model, provider));
124
const descriptors = modelIsUnavailable
125
? buildUnavailableModelOptionDescriptors(
126
- planModeEnabled
126
+ includePlanAgent
127
? modelOptions
128
: modelOptions?.filter((option) => option.id !== "agent" || option.value !== "plan"),
129
)
@@ -193,7 +193,7 @@ export function getTraitsSectionVisibility(input: {
193
promptUltrathink?: PromptUltrathink | undefined;
194
modelOptions?: ProviderOptions | null | undefined;
195
allowPromptInjectedEffort?: boolean;
196
- planModeEnabled: boolean;
196
+ includePlanAgent?: boolean | undefined;
197
}) {
198
const selected = getSelectedTraits(
199
input.provider,
@@ -202,7 +202,7 @@ export function getTraitsSectionVisibility(input: {
202
input.promptUltrathink ?? "none",
203
input.modelOptions,
204
input.allowPromptInjectedEffort ?? true,
205
- input.planModeEnabled,
205
+ input.includePlanAgent,
206
);
207
208
const showEffort = selected.primarySelectDescriptor !== null;
@@ -241,7 +241,7 @@ export function getReasoningTraitStep(input: {
241
modelOptions: ProviderOptions | undefined;
242
reportedModelSelection: ModelSelection | null | undefined;
243
prompt: string;
244
- planModeEnabled: boolean;
244
+ includePlanAgent?: boolean | undefined;
245
direction: 1 | -1;
246
}) {
247
const selected = getSelectedTraits(
@@ -251,7 +251,7 @@ export function getReasoningTraitStep(input: {
251
readPromptUltrathink(input.prompt),
252
input.modelOptions,
253
true,
254
- input.planModeEnabled,
254
+ input.includePlanAgent,
255
);
256
if (selected.modelIsUnavailable || selected.ultrathinkInBodyText) return null;
257
const descriptor = selected.selectDescriptors.find(isReasoningSelect);
@@ -290,7 +290,7 @@ export interface TraitsMenuContentProps {
290
modelOptions?: ProviderOptions | null | undefined;
291
reportedModelSelection?: ModelSelection | null | undefined;
292
allowPromptInjectedEffort?: boolean;
293
- planModeEnabled: boolean;
293
+ includePlanAgent?: boolean | undefined;
294
triggerClassName?: string;
295
}
296
@@ -307,7 +307,7 @@ export function useTraitsSelection({
307
modelOptions,
308
reportedModelSelection,
309
allowPromptInjectedEffort = true,
310
- planModeEnabled,
310
+ includePlanAgent,
311
triggerClassName: _triggerClassName,
312
...persistence
313
}: TraitsSelectionInput) {
@@ -336,7 +336,7 @@ export function useTraitsSelection({
336
promptUltrathink,
337
modelOptions,
338
allowPromptInjectedEffort,
339
- planModeEnabled,
339
+ includePlanAgent,
340
});
341
return {
342
...selected,
apps/web/src/components/chat/chatViewSend.ts
+1
-12
@@ -2,7 +2,6 @@ import {
2
CommandId,
3
type EnvironmentId,
4
type ModelSelection,
5
- type ProviderInteractionMode,
5
type ScopedThreadRef,
6
type ThreadId,
7
PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
@@ -36,7 +35,6 @@ import { getComposerPromptInjectionState, getComposerProviderState } from "./com
35
import {
36
formatOutgoingPrompt,
37
getAntigravitySendBlockReason,
39
- resolveComposerInteractionMode,
38
cloneComposerImageForRetry,
39
type ComposerSendSnapshot,
40
readFileAsDataUrl,
@@ -276,7 +274,6 @@ export function restoreComposerDraft(
274
export interface MultipleModelTarget {
275
readonly selection: ModelSelection;
276
readonly text: string;
279
- readonly interactionMode: ProviderInteractionMode;
277
}
278
279
/**
@@ -287,10 +284,8 @@ export function resolveMultipleModelTargets(input: {
284
readonly selections: ReadonlyArray<ModelSelection>;
285
readonly providerInstanceEntries: ReadonlyArray<ProviderInstanceEntry>;
286
readonly messageText: string;
290
- readonly planModeEnabled: boolean;
291
- readonly interactionMode: ProviderInteractionMode;
287
}): Array<MultipleModelTarget | { readonly error: string }> {
293
- const { messageText, planModeEnabled } = input;
288
+ const { messageText } = input;
289
return input.selections.map((selection) => {
290
const provider = input.providerInstanceEntries.find(
291
(entry) => entry.instanceId === selection.instanceId,
@@ -306,7 +301,6 @@ export function resolveMultipleModelTargets(input: {
301
models: provider.models,
302
modelOptions: selection.options,
303
promptInjectionState: getComposerPromptInjectionState(messageText),
309
- planModeEnabled,
304
});
305
return {
306
selection: createModelSelection(
@@ -321,11 +315,6 @@ export function resolveMultipleModelTargets(input: {
315
effort: providerState.promptEffort,
316
text: messageText || ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
317
}),
324
- interactionMode: resolveComposerInteractionMode({
325
- planModeEnabled,
326
- provider: provider.snapshot,
327
- interactionMode: input.interactionMode,
328
- }).interactionMode,
318
};
319
});
320
}
apps/web/src/components/chat/compaction.logic.test.ts
renamed
+1
-51
@@ -2,11 +2,7 @@ import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3
2
import { describe, expect, it } from "vite-plus/test";
3
import { deriveProviderInstanceEntries } from "../../providerInstances";
4
import { hasDismissedResumeCompaction } from "@t3tools/client-runtime/state/context-window";
5
-import {
6
- hasAvailableCompactionProvider,
7
- resolveContextWindowModelDisplayName,
8
- shouldReserveContextWindowMeter,
9
-} from "./ContextWindowMeter.logic";
5
+import { hasAvailableCompactionProvider } from "./compaction.logic";
6
7
function claudeProvider(input: {
8
instanceId: string;
@@ -79,30 +75,6 @@ describe("hasAvailableCompactionProvider", () => {
75
});
76
});
77
82
-describe("resolveContextWindowModelDisplayName", () => {
83
- it("uses the selected model from the exact provider instance", () => {
84
- const primaryInstanceId = ProviderInstanceId.make("codex");
85
- const selectedInstanceId = ProviderInstanceId.make("codex-work");
86
- const modelOptionsByInstance = new Map([
87
- [
88
- primaryInstanceId,
89
- [{ slug: "gpt-5.6-sol", name: "Primary profile model", shortName: "Primary" }],
90
- ],
91
- [selectedInstanceId, [{ slug: "gpt-5.6-sol", name: "GPT-5.6 Sol", shortName: "5.6 Sol" }]],
92
- ]);
93
-
94
- expect(
95
- resolveContextWindowModelDisplayName(
96
- {
97
- instanceId: selectedInstanceId,
98
- model: "gpt-5.6-sol",
99
- },
100
- modelOptionsByInstance,
101
- ),
102
- ).toBe("GPT-5.6 Sol");
103
- });
104
-});
105
-
78
describe("hasDismissedResumeCompaction", () => {
79
it("recognizes the native resume dialog's permanent dismissal", () => {
80
expect(
@@ -135,25 +107,3 @@ describe("hasDismissedResumeCompaction", () => {
107
).toBe(false);
108
});
109
});
138
-
139
-describe("shouldReserveContextWindowMeter", () => {
140
- const loadingStartedThread = {
141
- meterEnabled: true,
142
- detailLoading: true,
143
- threadStarted: true,
144
- providerReportsContextWindow: true,
145
- };
146
-
147
- it("holds the meter's slot while a started thread's detail loads", () => {
148
- expect(shouldReserveContextWindowMeter(loadingStartedThread)).toBe(true);
149
- });
150
-
151
- it("reserves while the thread's provider is not in the catalog yet", () => {
152
- expect(
153
- shouldReserveContextWindowMeter({
154
- ...loadingStartedThread,
155
- providerReportsContextWindow: null,
156
- }),
157
- ).toBe(true);
158
- });
159
-});
apps/web/src/components/chat/compaction.logic.ts
new
+42
@@ -0,0 +1,42 @@
1
+import type { ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
2
+import {
3
+ resolveSelectableProviderInstanceEntry,
4
+ type ProviderInstanceEntry,
5
+} from "../../providerInstances";
6
+
7
+function providerSupportsManualCompaction(
8
+ provider: ProviderInstanceEntry | null | undefined,
9
+): boolean {
10
+ return provider?.snapshot.slashCommands.some((command) => command.name === "compact") ?? false;
11
+}
12
+
13
+export function hasAvailableCompactionProvider(input: {
14
+ readonly providers: ReadonlyArray<ProviderInstanceEntry>;
15
+ readonly driverKind: ProviderDriverKind;
16
+ readonly instanceId: ProviderInstanceId | null;
17
+ readonly lockedInstanceId: ProviderInstanceId | null;
18
+}): boolean {
19
+ const driverProviders = input.providers.filter(
20
+ (provider) => provider.driverKind === input.driverKind,
21
+ );
22
+ const lockedContinuationGroupKey = input.lockedInstanceId
23
+ ? driverProviders.find((provider) => provider.instanceId === input.lockedInstanceId)
24
+ ?.continuationGroupKey
25
+ : undefined;
26
+ const compatibleProviders = lockedContinuationGroupKey
27
+ ? driverProviders.filter(
28
+ (provider) => provider.continuationGroupKey === lockedContinuationGroupKey,
29
+ )
30
+ : driverProviders;
31
+
32
+ return providerSupportsManualCompaction(
33
+ resolveSelectableProviderInstanceEntry(compatibleProviders, input.instanceId ?? undefined),
34
+ );
35
+}
36
+
37
+export function formatContextWindowCompactionMessage(autoCompactThreshold?: number | null): string {
38
+ if (typeof autoCompactThreshold === "number" && autoCompactThreshold > 0) {
39
+ return `Compacts automatically at about ${autoCompactThreshold.toLocaleString("en-US")} tokens.`;
40
+ }
41
+ return "Context compacts automatically when needed.";
42
+}
apps/web/src/components/chat/composerCommandKey.ts
+1
-8
@@ -41,7 +41,6 @@ export function composerCommandKeyHandler(input: {
41
readonly isCompacting: boolean;
42
readonly followUpBehavior: ChatComposerProps["settings"]["followUpBehavior"];
43
readonly isSoftwareKeyboardOpen: boolean;
44
- readonly planModeUiEnabled: boolean;
44
readonly isLiteralPendingAnswer: boolean;
45
readonly pendingUserInputs: ReadonlyArray<PendingUserInput>;
46
readonly promptHistoryEntries: ChatComposerProps["promptHistoryEntries"];
@@ -68,7 +67,6 @@ export function composerCommandKeyHandler(input: {
67
readonly setComposerTrigger: (trigger: ComposerTrigger | null) => void;
68
readonly setComposerHighlightedItemId: Dispatch<SetStateAction<string | null>>;
69
readonly dismissComposerTrigger: (trigger: ComposerTrigger | null) => void;
71
- readonly toggleInteractionMode: () => void;
70
readonly nudgeComposerMenuHighlight: (key: "ArrowDown" | "ArrowUp") => void;
71
readonly onSelectComposerItem: (item: ComposerCommandItem) => void;
72
readonly resolveActiveComposerTrigger: () => { trigger: ComposerTrigger | null };
@@ -93,7 +91,6 @@ export function composerCommandKeyHandler(input: {
91
isCompacting,
92
followUpBehavior,
93
isSoftwareKeyboardOpen,
96
- planModeUiEnabled,
94
isLiteralPendingAnswer,
95
pendingUserInputs,
96
promptHistoryEntries,
@@ -114,7 +111,6 @@ export function composerCommandKeyHandler(input: {
111
setComposerTrigger,
112
setComposerHighlightedItemId,
113
dismissComposerTrigger,
117
- toggleInteractionMode,
114
nudgeComposerMenuHighlight,
115
onSelectComposerItem,
116
resolveActiveComposerTrigger,
@@ -209,10 +205,7 @@ export function composerCommandKeyHandler(input: {
205
prompt: promptRef.current,
206
});
207
if (key === "Tab" && event.shiftKey && submissionIntent === null) {
212
- if (applyListEdit(event, listOutdentForTab)) return true;
213
- if (!planModeUiEnabled) return false;
214
- toggleInteractionMode();
215
- return true;
208
+ return applyListEdit(event, listOutdentForTab);
209
}
210
const { trigger } = resolveActiveComposerTrigger();
211
const menuIsActive =
apps/web/src/components/chat/composerControlsOwnership.test.ts
+1
-27
@@ -4,7 +4,6 @@ import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
4
5
const base = {
6
matchesDefault: true,
7
- planModeUiEnabled: false,
7
collapsed: false,
8
measuredHiddenBlockCount: 0,
9
};
@@ -29,7 +28,7 @@ describe("resolveComposerControlsOwnership", () => {
28
});
29
});
30
32
- it("gives an overflowed chip's Permissions to the overflow menu when it has no Plan toggle", () => {
31
+ it("gives an overflowed chip's Permissions to the overflow menu", () => {
32
const result = resolveComposerControlsOwnership({
33
...base,
34
matchesDefault: false,
@@ -40,31 +39,6 @@ describe("resolveComposerControlsOwnership", () => {
39
expect(result.pickerOwnsModeShortcut).toBe(false);
40
});
41
43
- it("keeps the Plan toggle block at the default and leaves Permissions with the picker", () => {
44
- const result = resolveComposerControlsOwnership({
45
- ...base,
46
- planModeUiEnabled: true,
47
- measuredHiddenBlockCount: 1,
48
- });
49
- expect(result.showModeBlock).toBe(true);
50
- expect(result.hiddenBlockIds).toEqual(["mode"]);
51
- expect(result.overflowShowsPermissions).toBe(false);
52
- expect(result.pickerOwnsModeShortcut).toBe(true);
53
- });
54
-
55
- it("overflows only the chip when the Plan toggle gives the overflow menu content", () => {
56
- const result = resolveComposerControlsOwnership({
57
- ...base,
58
- matchesDefault: false,
59
- planModeUiEnabled: true,
60
- measuredHiddenBlockCount: 1,
61
- });
62
- expect(result.hiddenBlockIds).toEqual(["mode"]);
63
- // Permissions stay in the model picker, which now answers composer.mode.
64
- expect(result.overflowShowsPermissions).toBe(false);
65
- expect(result.pickerOwnsModeShortcut).toBe(true);
66
- });
67
-
42
it("shows the non-default chip as an icon in the compacted row", () => {
43
const result = resolveComposerControlsOwnership({
44
...base,
apps/web/src/components/chat/composerControlsOwnership.ts
+2
-6
@@ -6,7 +6,6 @@
6
export function resolveComposerControlsOwnership(input: {
7
/** Permissions hide while the mode is the default, or while the new-thread strip names it. */
8
readonly matchesDefault: boolean;
9
- readonly planModeUiEnabled: boolean;
9
readonly collapsed: boolean;
10
/** How many trailing blocks the width measurement moved into the overflow menu. */
11
readonly measuredHiddenBlockCount: number;
@@ -16,13 +15,10 @@ export function resolveComposerControlsOwnership(input: {
15
: input.collapsed
16
? ("icon" as const)
17
: ("label" as const);
19
- const showModeBlock = accessDisplay !== "hidden" || input.planModeUiEnabled;
18
+ const showModeBlock = accessDisplay !== "hidden";
19
const modeHidden = showModeBlock && input.measuredHiddenBlockCount > 0;
20
const hiddenBlockIds = modeHidden ? (["mode"] as const) : ([] as const);
22
- // An overflowed chip needs a home for Permissions only when the Plan toggle is not there to fill
23
- // the overflow menu; otherwise Permissions stay in the model picker.
24
- const overflowShowsPermissions =
25
- modeHidden && accessDisplay !== "hidden" && !input.planModeUiEnabled;
21
+ const overflowShowsPermissions = modeHidden;
22
return {
23
accessDisplay,
24
showModeBlock,
apps/web/src/components/chat/composerProviderState.test.tsx
+2
-10
@@ -72,7 +72,6 @@ describe("getComposerProviderState", () => {
72
]),
73
]),
74
modelOptions: undefined,
75
- planModeEnabled: true,
75
});
76
77
expect(state).toEqual({
@@ -91,7 +90,6 @@ describe("getComposerProviderState", () => {
90
booleanDescriptor("fastMode"),
91
]),
92
modelOptions: selections(["effort", "high"], ["fastMode", false]),
94
- planModeEnabled: true,
93
});
94
95
expect(state.modelOptionsForDispatch).toEqual(
@@ -105,7 +103,6 @@ describe("getComposerProviderState", () => {
103
model: MODEL,
104
models: modelWith([booleanDescriptor("thinking")]),
105
modelOptions: selections(["effort", "max"], ["thinking", false]),
108
- planModeEnabled: true,
106
});
107
108
expect(state).toEqual({
@@ -131,14 +128,14 @@ describe("getComposerProviderState", () => {
128
]),
129
]),
130
modelOptions: selections(["agent", "plan"]),
134
- planModeEnabled: true,
131
+ includePlanAgent: true,
132
});
133
134
expect(state.promptEffort).toBe("high");
135
expect(state.modelOptionsForDispatch).toEqual(selections(["agent", "plan"]));
136
});
137
141
- it("drops the plan agent from dispatch when legacy plan mode is disabled", () => {
138
+ it("drops the plan agent from dispatch unless it is included", () => {
139
const state = getComposerProviderState({
140
provider: PROVIDER,
141
model: MODEL,
@@ -149,7 +146,6 @@ describe("getComposerProviderState", () => {
146
]),
147
]),
148
modelOptions: selections(["agent", "plan"]),
152
- planModeEnabled: false,
149
});
150
151
expect(state.modelOptionsForDispatch).toEqual(selections(["agent", "build"]));
@@ -168,7 +164,6 @@ describe("getComposerProviderState", () => {
164
},
165
],
166
modelOptions: selections(["variant", "max"], ["agent", "build"]),
171
- planModeEnabled: false,
167
});
168
169
expect(state.modelOptionsForDispatch).toEqual(
@@ -197,7 +192,6 @@ describe("getComposerProviderState", () => {
192
},
193
],
194
modelOptions: selections(["effort", "low"], ["unknown", "value"]),
200
- planModeEnabled: false,
195
});
196
197
expect(state.modelOptionsForDispatch).toEqual(selections(["effort", "low"]));
@@ -209,7 +203,6 @@ describe("getComposerProviderState", () => {
203
model: MODEL,
204
models: modelWith([booleanDescriptor("fastMode", true)]),
205
modelOptions: undefined,
212
- planModeEnabled: true,
206
});
207
208
expect(state.modelOptionsForDispatch).toEqual(selections(["fastMode", false]));
@@ -280,7 +273,6 @@ describe("getComposerReasoningStep", () => {
273
modelOptions: undefined,
274
prompt: "Fix the bug",
275
cursor: 0,
283
- planModeEnabled: true,
276
direction: 1,
277
...input,
278
});
apps/web/src/components/chat/composerProviderState.tsx
+11
-11
@@ -29,7 +29,7 @@ type ComposerProviderStateInput = {
29
models: ReadonlyArray<ServerProviderModel>;
30
promptInjectionState?: ComposerPromptInjectionState;
31
modelOptions: ReadonlyArray<ProviderOptionSelection> | null | undefined;
32
- planModeEnabled: boolean;
32
+ includePlanAgent?: boolean | undefined;
33
};
34
35
type ComposerPromptInjectionState = "none" | "ultrathink";
@@ -54,7 +54,7 @@ type ComposerTraitsTarget = {
54
reportedModelSelection?: ModelSelection | null | undefined;
55
promptUltrathink: PromptUltrathink;
56
onPromptEdit: (edit: (prompt: string) => string) => void;
57
- planModeEnabled: boolean;
57
+ includePlanAgent?: boolean | undefined;
58
};
59
60
export function getComposerPromptInjectionState(prompt: string): ComposerPromptInjectionState {
@@ -84,12 +84,12 @@ function resolveComposerOptionSelections(
84
model: string,
85
provider: ProviderDriverKind,
86
modelOptions: ReadonlyArray<ProviderOptionSelection> | null | undefined,
87
- planModeEnabled: boolean,
87
+ includePlanAgent: boolean | undefined,
88
): {
89
caps: ModelCapabilities;
90
selections: ReadonlyArray<ProviderOptionSelection> | undefined;
91
} {
92
- const caps = getProviderModelCapabilities(models, model, provider, planModeEnabled);
92
+ const caps = getProviderModelCapabilities(models, model, provider, includePlanAgent);
93
return { caps, selections: withImplicitFastModeDefault(caps, modelOptions) };
94
}
95
@@ -100,14 +100,14 @@ export function getComposerProviderState(input: ComposerProviderStateInput): Com
100
models,
101
modelOptions,
102
promptInjectionState = "none",
103
- planModeEnabled,
103
+ includePlanAgent,
104
} = input;
105
if (provider === "opencode") {
106
const normalizedModel = normalizeModelSlug(model, provider);
107
const modelIsInCatalog = models.some((candidate) => candidate.slug === normalizedModel);
108
if (!modelIsInCatalog) {
109
const preservedOptions = modelOptions?.filter(
110
- (option) => planModeEnabled || option.id !== "agent" || option.value !== "plan",
110
+ (option) => includePlanAgent || option.id !== "agent" || option.value !== "plan",
111
);
112
return {
113
provider,
@@ -122,7 +122,7 @@ export function getComposerProviderState(input: ComposerProviderStateInput): Com
122
model,
123
provider,
124
modelOptions,
125
- planModeEnabled,
125
+ includePlanAgent,
126
);
127
const descriptors = getProviderOptionDescriptors({ caps, selections });
128
const primarySelectDescriptor = descriptors.find(
@@ -162,7 +162,7 @@ export function getComposerReasoningStep(input: {
162
reportedModelSelection?: ModelSelection | null | undefined;
163
prompt: string;
164
cursor: number;
165
- planModeEnabled: boolean;
165
+ includePlanAgent?: boolean | undefined;
166
direction: 1 | -1;
167
}): {
168
prompt: string;
@@ -175,7 +175,7 @@ export function getComposerReasoningStep(input: {
175
input.model,
176
input.provider,
177
input.modelOptions,
178
- input.planModeEnabled,
178
+ input.includePlanAgent,
179
);
180
const step = getReasoningTraitStep({
181
provider: input.provider,
@@ -185,7 +185,7 @@ export function getComposerReasoningStep(input: {
185
modelOptions: selections,
186
reportedModelSelection: input.reportedModelSelection,
187
prompt,
188
- planModeEnabled: input.planModeEnabled,
188
+ includePlanAgent: input.includePlanAgent,
189
direction: input.direction,
190
});
191
if (!step) return null;
@@ -209,7 +209,7 @@ export function resolveComposerTraitsInput(
209
input.model,
210
input.provider,
211
input.modelOptions,
212
- input.planModeEnabled,
212
+ input.includePlanAgent,
213
);
214
const persistence = threadRef ? { threadRef } : draftId ? { draftId } : null;
215
if (!persistence) return null;
apps/web/src/components/chat/useComposerMenuItems.ts
-20
@@ -63,7 +63,6 @@ export function useComposerMenuItems({
63
pullRequestProjectId,
64
pullRequestRepository,
65
threadPullRequests,
66
- planModeUiEnabled,
66
sideChatAvailable,
67
sideChatDisabledReason,
68
freshSessionAvailable,
@@ -83,7 +82,6 @@ export function useComposerMenuItems({
82
readonly pullRequestProjectId: ProjectId | null;
83
readonly pullRequestRepository: string | null;
84
readonly threadPullRequests: ReadonlyArray<ThreadPullRequestLink> | undefined;
86
- readonly planModeUiEnabled: boolean;
85
readonly sideChatAvailable: boolean;
86
readonly sideChatDisabledReason: string | null;
87
readonly freshSessionAvailable: boolean;
@@ -226,24 +224,6 @@ export function useComposerMenuItems({
224
label: "/model",
225
description: "Switch response model for this thread",
226
},
229
- ...(planModeUiEnabled
230
- ? ([
231
- {
232
- id: "slash:plan",
233
- type: "slash-command",
234
- command: "plan",
235
- label: "/plan",
236
- description: "Switch this thread into plan mode",
237
- },
238
- {
239
- id: "slash:default",
240
- type: "slash-command",
241
- command: "default",
242
- label: "/default",
243
- description: "Switch this thread back to normal build mode",
244
- },
245
- ] as const)
246
- : []),
227
...(sideChatAvailable
228
? ([
229
{
apps/web/src/components/chat/useComposerProviderModel.ts
-1
@@ -82,7 +82,6 @@ export function useComposerProviderModel(
82
models: selectedProviderModels,
83
promptInjectionState,
84
modelOptions: modelState.modelOptions?.[selectedInstanceId],
85
- planModeEnabled: settings.planModeEnabled,
85
});
86
return {
87
providerInstanceEntries,
apps/web/src/components/chat/useComposerResume.browser.test.tsx
-1
@@ -57,7 +57,6 @@ function ResumeButton(props: {
57
threadDetailLoading: false,
58
activeEnvironmentUnavailable: false,
59
runtimeMode: "full-access",
60
- interactionMode: "default",
60
localCheckoutBranchMismatch: null,
61
composerRef: props.composerRef,
62
persistThreadSettingsForNextTurn: props.persistSettings,
apps/web/src/components/chat/useComposerResume.ts
+3
-4
@@ -13,6 +13,7 @@ import {
13
import { useState } from "react";
14
import { newMessageId } from "~/lib/utils";
15
import type { ComposerHandleRef } from "../../composerHandleContext";
16
+import { DEFAULT_INTERACTION_MODE } from "../../types";
17
import { threadEnvironment } from "../../state/threads";
18
import { useOrchestrationCommand } from "../../state/use-orchestration-command";
19
import type { makeThreadErrorSetter } from "../ChatView.logic";
@@ -32,7 +33,6 @@ interface ComposerResumeInput {
33
readonly threadDetailLoading: boolean;
34
readonly activeEnvironmentUnavailable: boolean;
35
readonly runtimeMode: RuntimeMode;
35
- readonly interactionMode: ProviderInteractionMode;
36
readonly localCheckoutBranchMismatch: { readonly currentBranch: string } | null;
37
readonly composerRef: ComposerHandleRef;
38
readonly persistThreadSettingsForNextTurn: (input: {
@@ -64,7 +64,6 @@ export function useComposerResume(input: ComposerResumeInput) {
64
threadDetailLoading,
65
activeEnvironmentUnavailable,
66
runtimeMode,
67
- interactionMode,
67
localCheckoutBranchMismatch,
68
composerRef,
69
persistThreadSettingsForNextTurn,
@@ -117,7 +116,7 @@ export function useComposerResume(input: ComposerResumeInput) {
116
? { branch: localCheckoutBranchMismatch.currentBranch }
117
: {}),
118
runtimeMode,
120
- interactionMode,
119
+ interactionMode: DEFAULT_INTERACTION_MODE,
120
});
121
if (settingsResult._tag === "Failure") return settingsResult;
122
const turnResult = await startThreadTurn({
@@ -133,7 +132,7 @@ export function useComposerResume(input: ComposerResumeInput) {
132
attachments: [],
133
},
134
runtimeMode,
136
- interactionMode,
135
+ interactionMode: DEFAULT_INTERACTION_MODE,
136
dispatchMode: "start",
137
},
138
});
apps/web/src/components/chat/useComposerSelection.ts
+1
-27
@@ -9,7 +9,6 @@ import {
9
ProviderInstanceId,
10
type ServerProvider,
11
type ThreadId,
12
- ProviderInteractionMode,
12
RuntimeMode,
13
} from "@t3tools/contracts";
14
import type { deriveThreadStructureRuntime } from "@t3tools/client-runtime/state/thread-execution";
@@ -40,8 +39,6 @@ interface ComposerSelectionInput {
39
readonly supportsProviderSwitchingViaHandoff: boolean;
40
readonly multipleModelSelections: ReadonlyArray<ModelSelection> | null;
41
readonly runtimeMode: RuntimeMode;
43
- readonly interactionMode: ProviderInteractionMode;
44
- readonly interactionModeEnabled: boolean;
42
readonly isLocalDraftThread: boolean;
43
readonly canOverrideServerThreadEnvMode: boolean;
44
readonly setPendingServerThreadEnvModeEntry: Dispatch<
@@ -54,7 +51,7 @@ interface ComposerSelectionInput {
51
}
52
53
/**
57
- * The composer's choices for the next turn: provider and model, runtime and interaction mode,
54
+ * The composer's choices for the next turn: provider and model, runtime mode,
55
* and where a new thread runs (local or a new worktree, from the remote's tip or not).
56
*/
57
export function useComposerSelection(input: ComposerSelectionInput) {
@@ -71,8 +68,6 @@ export function useComposerSelection(input: ComposerSelectionInput) {
68
supportsProviderSwitchingViaHandoff,
69
multipleModelSelections,
70
runtimeMode,
74
- interactionMode,
75
- interactionModeEnabled,
71
isLocalDraftThread,
72
canOverrideServerThreadEnvMode,
73
setPendingServerThreadEnvModeEntry,
@@ -85,9 +80,6 @@ export function useComposerSelection(input: ComposerSelectionInput) {
80
);
81
const setComposerDraftModelSelection = useComposerDraftStore((store) => store.setModelSelection);
82
const setComposerDraftRuntimeMode = useComposerDraftStore((store) => store.setRuntimeMode);
88
- const setComposerDraftInteractionMode = useComposerDraftStore(
89
- (store) => store.setInteractionMode,
90
- );
83
const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext);
84
85
const handleRuntimeModeChange = (mode: RuntimeMode) => {
@@ -100,21 +92,6 @@ export function useComposerSelection(input: ComposerSelectionInput) {
92
};
93
const handleRuntimeModeChangeStable = useStableCallback(handleRuntimeModeChange);
94
103
- const handleInteractionModeChange = (mode: ProviderInteractionMode) => {
104
- if (mode === "plan" && !interactionModeEnabled) return;
105
- if (mode === interactionMode) return;
106
- setComposerDraftInteractionMode(composerDraftTarget, mode);
107
- if (isLocalDraftThread) {
108
- setDraftThreadContext(composerDraftTarget, { interactionMode: mode });
109
- }
110
- scheduleComposerFocus();
111
- };
112
- const handleInteractionModeChangeStable = useStableCallback(handleInteractionModeChange);
113
- const toggleInteractionMode = () => {
114
- if (!interactionModeEnabled) return;
115
- handleInteractionModeChange(interactionMode === "plan" ? "default" : "plan");
116
- };
117
- const toggleInteractionModeStable = useStableCallback(toggleInteractionMode);
95
const openProviderSetup = (instanceId: ProviderInstanceId) => {
96
void navigate({
97
to: "/settings/providers",
@@ -255,13 +232,10 @@ export function useComposerSelection(input: ComposerSelectionInput) {
232
};
233
return {
234
getModelDisabledReason,
258
- handleInteractionModeChange,
259
- handleInteractionModeChangeStable,
235
handleRuntimeModeChangeStable,
236
onEnvModeChangeStable,
237
onProviderModelSelectStable,
238
onStartFromOriginChange,
239
openProviderSetupStable,
265
- toggleInteractionModeStable,
240
};
241
}
apps/web/src/components/chat/useComposerSend.ts
+6
-147
@@ -4,7 +4,6 @@ import {
4
mergeDirectPreviewAnnotation,
5
resolveBackgroundDraftWorkspaceOptions,
6
shouldDockDraftHeroForSubmission,
7
- restorePlanFollowUpComposer,
7
buildExpiredTerminalContextToastCopy,
8
deriveComposerSendState,
9
boundAttachmentIds,
@@ -56,10 +55,8 @@ import {
55
import {
56
type ComposerSubmissionIntent,
57
collapseExpandedComposerCursor,
59
- parseStandaloneComposerSlashCommand,
58
} from "../../composer-logic";
61
-import { resolvePlanFollowUpSubmission } from "../../proposedPlan";
62
-import { type ChatMessage } from "../../types";
59
+import { type ChatMessage, DEFAULT_INTERACTION_MODE } from "../../types";
60
import { recordPromptSent } from "../GitHubStarPrompt";
61
import { stackedThreadToast, toastManager } from "../ui/toast";
62
import { newMessageId, newThreadId } from "~/lib/utils";
@@ -90,7 +87,7 @@ import {
87
import { environmentServerConfigsAtom } from "../../state/server";
88
import { threadEnvironment } from "../../state/threads";
89
import { runMobileComposerTransition } from "./draftHeroTransition";
93
-import { useClientSettingsHydrated, useEnvironmentSettings } from "../../hooks/useSettings";
90
+import { useClientSettingsHydrated } from "../../hooks/useSettings";
91
import { environmentPresentations } from "../../state/presentation";
92
import {
93
approvalRedirectNotice,
@@ -98,7 +95,6 @@ import {
95
multipleModelSendBlock,
96
referencedThreadContexts,
97
} from "./composerSend.logic";
101
-import { usePlanFollowUpSend } from "./useProposedPlanSend";
98
import { useMultipleModelSend } from "./useMultipleModelSend";
99
import { type ComposerDispatchMode } from "@t3tools/client-runtime/state/composer-dispatch";
100
import {
@@ -129,7 +125,6 @@ import type {
125
EnvironmentProject,
126
EnvironmentThreadShell,
127
} from "@t3tools/client-runtime/state/shell";
132
-import type { UnifiedSettings } from "@t3tools/contracts";
128
import type { Dispatch } from "react";
129
import type { ComposerThreadTarget } from "../../composerDraftStore";
130
import type { ProviderInstanceEntry } from "../../providerInstances";
@@ -137,7 +132,6 @@ import type { SessionPhase } from "../../types";
132
import type { DraftSessionState } from "../../composerDraftStore";
133
import type { ComposerHandleRef } from "../../composerHandleContext";
134
import type { useLogicalProjectEnvironments } from "../../hooks/useLogicalProjectEnvironments";
140
-import type { LatestProposedPlanState } from "../../session-logic";
135
import type { useDraftEnvironmentRouting } from "./useDraftEnvironmentRouting";
136
import type { useLocalDispatchState } from "./useLocalDispatchState";
137
import type { usePendingThreadRequests } from "./usePendingThreadRequests";
@@ -148,8 +142,6 @@ import type { useWorktreeSetup } from "./useWorktreeSetup";
142
143
const ENVIRONMENT_UNAVAILABLE_SEND_TOAST_TRAIL_SIZE = 3;
144
151
-const selectPlanModeEnabled = (settings: UnifiedSettings) => settings.planModeEnabled;
152
-
145
function readEnvironmentPresentation(environmentId: EnvironmentId) {
146
return appAtomRegistry.get(environmentPresentations.presentationsAtom).get(environmentId);
147
}
@@ -176,7 +168,6 @@ interface ComposerSendInput {
168
readonly activeThreadBranch: string | null;
169
readonly activeProject: EnvironmentProject | null;
170
readonly activeProjectDefaultModelSelection: ModelSelection | null;
179
- readonly activeProposedPlan: LatestProposedPlanState | null;
171
readonly activeMessageCount: number;
172
readonly isServerThread: boolean;
173
readonly isLocalDraftThread: boolean;
@@ -211,7 +202,6 @@ interface ComposerSendInput {
202
/** `/clear` can arm a fresh session on this thread. */
203
readonly freshSessionAvailable: boolean;
204
readonly resumeCompactionTokens: number | null;
214
- readonly showPlanFollowUpPrompt: boolean;
205
readonly usageLimitsKey: string | null;
206
readonly usageLimitsOffered: boolean;
207
readonly openUsageLimits: UsageLimitsPanel["open"];
@@ -243,7 +233,6 @@ interface ComposerSendInput {
233
readonly setKeepFullHistory: (threadKey: string, keep: boolean) => void;
234
readonly anchorNewTurn: TimelineFollow["anchorNewTurn"];
235
readonly acknowledgeActiveThreadWoke: () => void;
246
- readonly handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
236
/** Resolves true once the side chat started and got the prompt. */
237
readonly onSideChat?: ((prompt: string) => Promise<boolean>) | undefined;
238
/** Refuses `/side` with this reason and keeps the draft. */
@@ -276,7 +265,6 @@ export function useComposerSend(input: ComposerSendInput) {
265
activeThreadBranch,
266
activeProject,
267
activeProjectDefaultModelSelection,
279
- activeProposedPlan,
268
activeMessageCount,
269
isServerThread,
270
isLocalDraftThread,
@@ -307,7 +295,6 @@ export function useComposerSend(input: ComposerSendInput) {
295
keepFullHistory,
296
freshSessionAvailable,
297
resumeCompactionTokens,
310
- showPlanFollowUpPrompt,
298
usageLimitsKey,
299
usageLimitsOffered,
300
openUsageLimits,
@@ -333,7 +320,6 @@ export function useComposerSend(input: ComposerSendInput) {
320
setKeepFullHistory,
321
anchorNewTurn,
322
acknowledgeActiveThreadWoke,
336
- handleInteractionModeChange,
323
onSideChat,
324
sideChatDisabledReason,
325
handleNewThreadInActiveProject,
@@ -343,7 +329,6 @@ export function useComposerSend(input: ComposerSendInput) {
329
const handleNewThread = useNewThreadHandler();
330
const navigate = useNavigate();
331
const clientSettingsHydrated = useClientSettingsHydrated();
346
- const planModeEnabled = useEnvironmentSettings(environmentId, selectPlanModeEnabled);
332
const startThreadTurn = useOrchestrationCommand(threadEnvironment.startTurn, {
333
reportFailure: false,
334
});
@@ -351,17 +336,6 @@ export function useComposerSend(input: ComposerSendInput) {
336
reportFailure: false,
337
});
338
const setComposerDraftPrompt = useComposerDraftStore((store) => store.setPrompt);
354
- const setComposerDraftTerminalContexts = useComposerDraftStore(
355
- (store) => store.setTerminalContexts,
356
- );
357
- const setComposerDraftPreviewAnnotations = useComposerDraftStore(
358
- (store) => store.setPreviewAnnotations,
359
- );
360
- const setComposerDraftReviewComments = useComposerDraftStore((store) => store.setReviewComments);
361
- const setComposerDraftThreadContexts = useComposerDraftStore((store) => store.setThreadContexts);
362
- const setComposerDraftEnvironmentContexts = useComposerDraftStore(
363
- (store) => store.setEnvironmentContexts,
364
- );
339
const clearComposerDraftContent = useComposerDraftStore((store) => store.clearComposerContent);
340
const sendToMultipleModels = useMultipleModelSend({
341
environmentId,
@@ -376,24 +350,6 @@ export function useComposerSend(input: ComposerSendInput) {
350
resetLocalDispatch,
351
setThreadError,
352
});
379
- const submitPlanFollowUp = usePlanFollowUpSend({
380
- environmentId,
381
- routeThreadKey,
382
- activeThread,
383
- activeThreadBranch,
384
- activeProposedPlan,
385
- isServerThread,
386
- isSendBusy,
387
- composerRef,
388
- beginLocalDispatch,
389
- resetLocalDispatch,
390
- runtimeMode,
391
- localCheckoutBranchMismatch,
392
- setOptimisticUserMessages,
393
- setThreadError,
394
- anchorNewTurn,
395
- persistThreadSettingsForNextTurn,
396
- });
353
const { sendInFlight: sendInFlightRef } = draftSendState(routeThreadKey);
354
const composerSendGenerationRef = useRef(0);
355
const environmentUnavailableSendToastSlotRef = useRef(0);
@@ -594,8 +550,6 @@ export function useComposerSend(input: ComposerSendInput) {
550
selectedProviderModels: ctxSelectedProviderModels,
551
selectedPromptEffort: ctxSelectedPromptEffort,
552
selectedModelSelection: ctxSelectedModelSelection,
597
- interactionMode: sendInteractionMode,
598
- interactionModeEnabled: sendInteractionModeEnabled,
553
} = sendCtx;
554
const { images: composerImages, previewAnnotations: composerPreviewAnnotations } =
555
mergeDirectPreviewAnnotation({
@@ -737,99 +691,6 @@ export function useComposerSend(input: ComposerSendInput) {
691
}
692
// Read once: an arm made while this send is in flight belongs to the next message.
693
const freshArm = freshSessionAvailable ? readFreshSessionArm(routeThreadKey) : undefined;
740
- if (
741
- !directAnnotation &&
742
- freshArm === undefined &&
743
- sendInteractionModeEnabled &&
744
- showPlanFollowUpPrompt &&
745
- activeProposedPlan &&
746
- composerImages.length === 0 &&
747
- composerFiles.length === 0
748
- ) {
749
- const followUp = resolvePlanFollowUpSubmission({
750
- draftText: promptForSend,
751
- planMarkdown: activeProposedPlan.planMarkdown,
752
- });
753
- const outgoingFollowUpText = formatOutgoingPrompt({
754
- provider: ctxSelectedProvider,
755
- model: ctxSelectedModel,
756
- models: ctxSelectedProviderModels,
757
- effort: ctxSelectedPromptEffort,
758
- text: followUp.text.trim(),
759
- });
760
- if (composerRef.current?.validateProviderInput(outgoingFollowUpText) === false) {
761
- return;
762
- }
763
- const followUpPromptSnapshot = promptRef.current;
764
- const followUpTerminalContexts = [...sendableComposerTerminalContexts];
765
- const followUpReviewComments = [...composerReviewComments];
766
- const followUpPreviewAnnotations = [...composerPreviewAnnotations];
767
- const followUpThreadContexts = [...composerThreadContexts];
768
- const followUpEnvironmentContexts = [...composerEnvironmentContexts];
769
- promptRef.current = "";
770
- clearComposerDraftContent(composerDraftTarget);
771
- composerRef.current?.resetCursorState();
772
- const followUpSent = await submitPlanFollowUp({
773
- text: followUp.text,
774
- context: buildMessageContext({
775
- terminalContexts: sendableComposerTerminalContexts,
776
- reviewComments: composerReviewComments,
777
- previewAnnotations: composerPreviewAnnotations,
778
- threadContexts: composerThreadContexts,
779
- environmentContexts: composerEnvironmentContexts,
780
- }),
781
- interactionMode: followUp.interactionMode,
782
- });
783
- if (!followUpSent) {
784
- restorePlanFollowUpComposer({
785
- snapshot: {
786
- prompt: followUpPromptSnapshot,
787
- terminalContexts: followUpTerminalContexts,
788
- reviewComments: followUpReviewComments,
789
- previewAnnotations: followUpPreviewAnnotations,
790
- threadContexts: followUpThreadContexts,
791
- environmentContexts: followUpEnvironmentContexts,
792
- },
793
- draftHasUserContent: composerDraftHasUserContent(
794
- useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
795
- ),
796
- routeIsCurrent: currentRouteThreadKeyRef.current === routeThreadKey,
797
- writeComposerRefs: (snapshot) => {
798
- promptRef.current = snapshot.prompt;
799
- composerTerminalContextsRef.current = [...snapshot.terminalContexts];
800
- },
801
- writePrompt: (prompt) => setComposerDraftPrompt(composerDraftTarget, prompt),
802
- writeTerminalContexts: (contexts) =>
803
- setComposerDraftTerminalContexts(composerDraftTarget, [...contexts]),
804
- writeReviewComments: (comments) =>
805
- setComposerDraftReviewComments(composerDraftTarget, [...comments]),
806
- writePreviewAnnotations: (annotations) =>
807
- setComposerDraftPreviewAnnotations(composerDraftTarget, [...annotations]),
808
- writeThreadContexts: (records) =>
809
- setComposerDraftThreadContexts(composerDraftTarget, [...records]),
810
- writeEnvironmentContexts: (records) =>
811
- setComposerDraftEnvironmentContexts(composerDraftTarget, [...records]),
812
- resetCursor: (options) => composerRef.current?.resetCursorState(options),
813
- });
814
- } else if (
815
- submissionIntent === "background" &&
816
- currentRouteThreadKeyRef.current === routeThreadKey
817
- ) {
818
- handleNewThreadInActiveProject();
819
- }
820
- return;
821
- }
822
- const standaloneSlashCommand =
823
- sendInteractionModeEnabled && composerHoldsOnlyText
824
- ? parseStandaloneComposerSlashCommand(trimmed)
825
- : null;
826
- if (standaloneSlashCommand && multipleModelSelections === null) {
827
- handleInteractionModeChange(standaloneSlashCommand);
828
- promptRef.current = "";
829
- clearComposerDraftContent(composerDraftTarget);
830
- composerRef.current?.resetCursorState();
831
- return;
832
- }
694
if (!hasSendableContent) {
695
if (expiredTerminalContextCount > 0) {
696
const toastCopy = buildExpiredTerminalContextToastCopy(
@@ -953,8 +814,6 @@ export function useComposerSend(input: ComposerSendInput) {
814
selections: multipleModelSelections ?? [],
815
providerInstanceEntries,
816
messageText: messageTextForSend,
956
- planModeEnabled,
957
- interactionMode: sendInteractionMode,
817
})) {
818
if ("error" in resolved) {
819
setThreadError(threadIdForSend, resolved.error);
@@ -1282,7 +1141,7 @@ export function useComposerSend(input: ComposerSendInput) {
1141
? { branch: localCheckoutBranchMismatch.currentBranch }
1142
: {}),
1143
runtimeMode,
1285
- interactionMode: sendInteractionMode,
1144
+ interactionMode: DEFAULT_INTERACTION_MODE,
1145
});
1146
if (settingsResult._tag === "Failure") {
1147
failure = settingsResult;
@@ -1315,7 +1174,7 @@ export function useComposerSend(input: ComposerSendInput) {
1174
},
1175
modelSelection: ctxSelectedModelSelection,
1176
runtimeMode,
1318
- interactionMode: sendInteractionMode,
1177
+ interactionMode: DEFAULT_INTERACTION_MODE,
1178
},
1179
});
1180
if (compactResult._tag === "Failure") {
@@ -1336,7 +1195,7 @@ export function useComposerSend(input: ComposerSendInput) {
1195
title,
1196
modelSelection: threadCreateModelSelection,
1197
runtimeMode,
1339
- interactionMode: sendInteractionMode,
1198
+ interactionMode: DEFAULT_INTERACTION_MODE,
1199
branch: activeThreadBranch,
1200
worktreePath: activeThread.worktreePath,
1201
createdAt: activeThread.createdAt,
@@ -1378,7 +1237,7 @@ export function useComposerSend(input: ComposerSendInput) {
1237
modelSelection: ctxSelectedModelSelection,
1238
titleSeed: title,
1239
runtimeMode,
1381
- interactionMode: sendInteractionMode,
1240
+ interactionMode: DEFAULT_INTERACTION_MODE,
1241
dispatchMode: turnDispatchMode,
1242
...(freshArm === undefined ? {} : { freshContext: true }),
1243
...(bootstrap ? { bootstrap } : {}),
apps/web/src/components/chat/useMultipleModelSend.ts
+3
-2
@@ -24,6 +24,7 @@ import { appAtomRegistry } from "../../rpc/atomRegistry";
24
import { threadEnvironment } from "../../state/threads";
25
import { useOrchestrationCommand } from "../../state/use-orchestration-command";
26
import { buildThreadRouteParams } from "../../threadRoutes";
27
+import { DEFAULT_INTERACTION_MODE } from "../../types";
28
import { stackedThreadToast, toastManager } from "../ui/toast";
29
import {
30
boundAttachmentIds,
@@ -174,14 +175,14 @@ export function useMultipleModelSend(input: MultipleModelSendInput) {
175
modelSelection: target.selection,
176
titleSeed: title,
177
runtimeMode,
177
- interactionMode: target.interactionMode,
178
+ interactionMode: DEFAULT_INTERACTION_MODE,
179
bootstrap: {
180
createThread: {
181
projectId: project.id,
182
title,
183
modelSelection: target.selection,
184
runtimeMode,
184
- interactionMode: target.interactionMode,
185
+ interactionMode: DEFAULT_INTERACTION_MODE,
186
branch,
187
worktreePath: null,
188
createdAt: createdAt,
apps/web/src/components/chat/useProposedPlanSend.ts
deleted
-397
@@ -1,397 +0,0 @@
1
-import {
2
- AuthOrchestrationOperateScope,
3
- type EnvironmentId,
4
- type ModelSelection,
5
- type ProviderInteractionMode,
6
- type RuntimeMode,
7
-} from "@t3tools/contracts";
8
-import { scopeThreadRef } from "@t3tools/client-runtime/environment";
9
-import {
10
- isAtomCommandInterrupted,
11
- settlePromise,
12
- squashAtomCommandFailure,
13
- type AtomCommandResult,
14
-} from "@t3tools/client-runtime/state/runtime";
15
-import type {
16
- EnvironmentProject,
17
- EnvironmentThreadShell,
18
-} from "@t3tools/client-runtime/state/shell";
19
-import { scopedThreadKey } from "@t3tools/client-runtime/environment";
20
-import { truncate } from "@t3tools/shared/String";
21
-import { useNavigate } from "@tanstack/react-router";
22
-import type { Dispatch, SetStateAction } from "react";
23
-import { newMessageId, newThreadId } from "~/lib/utils";
24
-import { useComposerDraftStore } from "../../composerDraftStore";
25
-import type { ComposerHandleRef } from "../../composerHandleContext";
26
-import type { buildMessageContext } from "../../lib/composerContextRecords";
27
-import {
28
- buildPlanImplementationPrompt,
29
- buildPlanImplementationThreadTitle,
30
-} from "../../proposedPlan";
31
-import type { LatestProposedPlanState } from "../../session-logic";
32
-import { readEnvironmentScope } from "../../state/session";
33
-import { threadEnvironment } from "../../state/threads";
34
-import { useOrchestrationCommand } from "../../state/use-orchestration-command";
35
-import type { ChatMessage } from "../../types";
36
-import { stackedThreadToast, toastManager } from "../ui/toast";
37
-import {
38
- formatOutgoingPrompt,
39
- type makeThreadErrorSetter,
40
- waitForStartedServerThread,
41
-} from "../ChatView.logic";
42
-import { draftSendState } from "./chatViewSend";
43
-import type { useLocalDispatchState } from "./useLocalDispatchState";
44
-import type { useTimelineFollow } from "./useTimelineFollow";
45
-
46
-type LocalDispatchState = ReturnType<typeof useLocalDispatchState>;
47
-
48
-interface PlanSendBase {
49
- readonly environmentId: EnvironmentId;
50
- readonly routeThreadKey: string;
51
- readonly activeThread: EnvironmentThreadShell | undefined;
52
- readonly activeThreadBranch: string | null;
53
- readonly activeProposedPlan: LatestProposedPlanState | null;
54
- readonly isServerThread: boolean;
55
- readonly isSendBusy: boolean;
56
- readonly composerRef: ComposerHandleRef;
57
- readonly beginLocalDispatch: LocalDispatchState["beginLocalDispatch"];
58
- readonly resetLocalDispatch: LocalDispatchState["resetLocalDispatch"];
59
-}
60
-
61
-interface PlanFollowUpSendInput extends PlanSendBase {
62
- readonly runtimeMode: RuntimeMode;
63
- readonly localCheckoutBranchMismatch: { readonly currentBranch: string } | null;
64
- readonly setOptimisticUserMessages: Dispatch<SetStateAction<ChatMessage[]>>;
65
- readonly setThreadError: ReturnType<typeof makeThreadErrorSetter>;
66
- readonly anchorNewTurn: ReturnType<typeof useTimelineFollow>["anchorNewTurn"];
67
- readonly persistThreadSettingsForNextTurn: (input: {
68
- threadId: EnvironmentThreadShell["id"];
69
- createdAt: string;
70
- branch?: string;
71
- runtimeMode: RuntimeMode;
72
- interactionMode: ProviderInteractionMode;
73
- }) => Promise<AtomCommandResult<void, unknown>>;
74
-}
75
-
76
-/**
77
- * Answers a proposed plan on this thread: refine it in plan mode, or implement it here
78
- * (which links the turn to the plan). Resolves whether the turn started.
79
- */
80
-export function usePlanFollowUpSend(input: PlanFollowUpSendInput) {
81
- const {
82
- environmentId,
83
- routeThreadKey,
84
- activeThread,
85
- activeProposedPlan,
86
- isServerThread,
87
- isSendBusy,
88
- composerRef,
89
- beginLocalDispatch,
90
- resetLocalDispatch,
91
- runtimeMode,
92
- localCheckoutBranchMismatch,
93
- setOptimisticUserMessages,
94
- setThreadError,
95
- anchorNewTurn,
96
- persistThreadSettingsForNextTurn,
97
- } = input;
98
- const startThreadTurn = useOrchestrationCommand(threadEnvironment.startTurn, {
99
- reportFailure: false,
100
- });
101
- const setComposerDraftInteractionMode = useComposerDraftStore(
102
- (store) => store.setInteractionMode,
103
- );
104
- const { sendInFlight: sendInFlightRef } = draftSendState(routeThreadKey);
105
-
106
- return async function submitPlanFollowUp({
107
- text,
108
- context,
109
- interactionMode: nextInteractionMode,
110
- }: {
111
- text: string;
112
- context?: ReturnType<typeof buildMessageContext>;
113
- interactionMode: "default" | "plan";
114
- }) {
115
- if (
116
- !readEnvironmentScope(environmentId, AuthOrchestrationOperateScope) ||
117
- !activeThread ||
118
- !isServerThread ||
119
- isSendBusy ||
120
- sendInFlightRef.current
121
- ) {
122
- return false;
123
- }
124
-
125
- const trimmed = text.trim();
126
- if (!trimmed) {
127
- return false;
128
- }
129
-
130
- const sendCtx = composerRef.current?.getSendContext();
131
- if (!sendCtx?.providerAvailable || !sendCtx.interactionModeEnabled) {
132
- return false;
133
- }
134
-
135
- const threadIdForSend = activeThread.id;
136
- const messageIdForSend = newMessageId();
137
- const messageCreatedAt = new Date().toISOString();
138
- const outgoingMessageText = formatOutgoingPrompt({
139
- provider: sendCtx.selectedProvider,
140
- model: sendCtx.selectedModel,
141
- models: sendCtx.selectedProviderModels,
142
- effort: sendCtx.selectedPromptEffort,
143
- text: trimmed,
144
- });
145
-
146
- sendInFlightRef.current = true;
147
- beginLocalDispatch({ preparingWorktree: false });
148
- setThreadError(threadIdForSend, null);
149
-
150
- anchorNewTurn(
151
- scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
152
- messageIdForSend,
153
- );
154
-
155
- setOptimisticUserMessages((existing) => [
156
- ...existing,
157
- {
158
- id: messageIdForSend,
159
- role: "user",
160
- text: outgoingMessageText,
161
- ...(context ? { context } : {}),
162
- runId: null,
163
- createdAt: messageCreatedAt,
164
- updatedAt: messageCreatedAt,
165
- streaming: false,
166
- },
167
- ]);
168
-
169
- const settingsResult = await persistThreadSettingsForNextTurn({
170
- threadId: threadIdForSend,
171
- createdAt: messageCreatedAt,
172
- ...(localCheckoutBranchMismatch ? { branch: localCheckoutBranchMismatch.currentBranch } : {}),
173
- runtimeMode,
174
- interactionMode: nextInteractionMode,
175
- });
176
- let failure: AtomCommandResult<unknown, unknown> | null =
177
- settingsResult._tag === "Failure" ? settingsResult : null;
178
-
179
- if (failure === null) {
180
- setComposerDraftInteractionMode(
181
- scopeThreadRef(activeThread.environmentId, threadIdForSend),
182
- nextInteractionMode,
183
- );
184
-
185
- const startResult = await startThreadTurn({
186
- environmentId,
187
- input: {
188
- threadId: threadIdForSend,
189
- message: {
190
- messageId: messageIdForSend,
191
- role: "user",
192
- text: outgoingMessageText,
193
- ...(context ? { context } : {}),
194
- attachments: [],
195
- },
196
- modelSelection: sendCtx.selectedModelSelection,
197
- titleSeed: activeThread.title,
198
- runtimeMode,
199
- interactionMode: nextInteractionMode,
200
- ...(nextInteractionMode === "default" && activeProposedPlan
201
- ? {
202
- sourceProposedPlan: {
203
- threadId: activeThread.id,
204
- planId: activeProposedPlan.id,
205
- },
206
- }
207
- : {}),
208
- createdAt: messageCreatedAt,
209
- },
210
- });
211
- failure = startResult._tag === "Failure" ? startResult : null;
212
- }
213
-
214
- if (failure === null) {
215
- sendInFlightRef.current = false;
216
- resetLocalDispatch();
217
- return true;
218
- }
219
-
220
- setOptimisticUserMessages((existing) =>
221
- existing.filter((message) => message.id !== messageIdForSend),
222
- );
223
- if (!isAtomCommandInterrupted(failure)) {
224
- const error = squashAtomCommandFailure(failure);
225
- setThreadError(
226
- threadIdForSend,
227
- error instanceof Error ? error.message : "Failed to send plan follow-up.",
228
- );
229
- }
230
- sendInFlightRef.current = false;
231
- resetLocalDispatch();
232
- return false;
233
- };
234
-}
235
-
236
-interface ImplementPlanInNewThreadInput extends PlanSendBase {
237
- readonly activeProject: EnvironmentProject | null;
238
- readonly activeEnvironmentUnavailable: boolean;
239
- readonly defaultRuntimeMode: RuntimeMode;
240
-}
241
-
242
-/**
243
- * Starts a fresh thread that implements the active proposed plan, then opens it. The new
244
- * thread is deleted again if it cannot be started or opened.
245
- */
246
-export function useImplementPlanInNewThread(input: ImplementPlanInNewThreadInput) {
247
- const {
248
- environmentId,
249
- routeThreadKey,
250
- activeThread,
251
- activeThreadBranch,
252
- activeProposedPlan,
253
- isServerThread,
254
- isSendBusy,
255
- composerRef,
256
- beginLocalDispatch,
257
- resetLocalDispatch,
258
- activeProject,
259
- activeEnvironmentUnavailable,
260
- defaultRuntimeMode,
261
- } = input;
262
- const navigate = useNavigate();
263
- const createThread = useOrchestrationCommand(threadEnvironment.create, { reportFailure: false });
264
- const deleteThread = useOrchestrationCommand(threadEnvironment.delete, { reportFailure: false });
265
- const startThreadTurn = useOrchestrationCommand(threadEnvironment.startTurn, {
266
- reportFailure: false,
267
- });
268
- const { sendInFlight: sendInFlightRef } = draftSendState(routeThreadKey);
269
-
270
- return async () => {
271
- if (
272
- !readEnvironmentScope(environmentId, AuthOrchestrationOperateScope) ||
273
- !activeThread ||
274
- !activeProject ||
275
- !activeProposedPlan ||
276
- !isServerThread ||
277
- isSendBusy ||
278
- activeEnvironmentUnavailable ||
279
- sendInFlightRef.current
280
- ) {
281
- return;
282
- }
283
-
284
- const sendCtx = composerRef.current?.getSendContext();
285
- if (!sendCtx?.providerAvailable || !sendCtx.interactionModeEnabled) {
286
- return;
287
- }
288
-
289
- const createdAt = new Date().toISOString();
290
- const nextThreadId = newThreadId();
291
- const planMarkdown = activeProposedPlan.planMarkdown;
292
- const outgoingImplementationPrompt = formatOutgoingPrompt({
293
- provider: sendCtx.selectedProvider,
294
- model: sendCtx.selectedModel,
295
- models: sendCtx.selectedProviderModels,
296
- effort: sendCtx.selectedPromptEffort,
297
- text: buildPlanImplementationPrompt(planMarkdown),
298
- });
299
- const nextThreadTitle = truncate(buildPlanImplementationThreadTitle(planMarkdown));
300
- const nextThreadModelSelection: ModelSelection = sendCtx.selectedModelSelection;
301
-
302
- sendInFlightRef.current = true;
303
- beginLocalDispatch({ preparingWorktree: false });
304
-
305
- const createResult = await createThread({
306
- environmentId,
307
- input: {
308
- threadId: nextThreadId,
309
- projectId: activeProject.id,
310
- title: nextThreadTitle,
311
- modelSelection: nextThreadModelSelection,
312
- runtimeMode: defaultRuntimeMode,
313
- interactionMode: "default",
314
- branch: activeThreadBranch,
315
- worktreePath: activeThread.worktreePath,
316
- createdAt,
317
- },
318
- });
319
- let failure: AtomCommandResult<unknown, unknown> | null =
320
- createResult._tag === "Failure" ? createResult : null;
321
-
322
- if (failure === null) {
323
- const startResult = await startThreadTurn({
324
- environmentId,
325
- input: {
326
- threadId: nextThreadId,
327
- message: {
328
- messageId: newMessageId(),
329
- role: "user",
330
- text: outgoingImplementationPrompt,
331
- attachments: [],
332
- },
333
- modelSelection: nextThreadModelSelection,
334
- titleSeed: nextThreadTitle,
335
- runtimeMode: defaultRuntimeMode,
336
- interactionMode: "default",
337
- sourceProposedPlan: {
338
- threadId: activeThread.id,
339
- planId: activeProposedPlan.id,
340
- },
341
- createdAt,
342
- },
343
- });
344
- failure = startResult._tag === "Failure" ? startResult : null;
345
- }
346
-
347
- if (failure === null) {
348
- const startedResult = await settlePromise(() =>
349
- waitForStartedServerThread(scopeThreadRef(activeThread.environmentId, nextThreadId)),
350
- );
351
- failure = startedResult._tag === "Failure" ? startedResult : null;
352
- }
353
-
354
- if (failure === null) {
355
- const navigateResult = await settlePromise(() =>
356
- navigate({
357
- to: "/$environmentId/$threadId",
358
- params: {
359
- environmentId: activeThread.environmentId,
360
- threadId: nextThreadId,
361
- },
362
- }),
363
- );
364
- failure = navigateResult._tag === "Failure" ? navigateResult : null;
365
- }
366
-
367
- if (failure !== null) {
368
- const cleanupResult = await deleteThread({
369
- environmentId,
370
- input: {
371
- threadId: nextThreadId,
372
- },
373
- });
374
- if (cleanupResult._tag === "Failure" && !isAtomCommandInterrupted(cleanupResult)) {
375
- console.warn(
376
- "Failed to clean up implementation thread after start failure.",
377
- squashAtomCommandFailure(cleanupResult),
378
- );
379
- }
380
- if (!isAtomCommandInterrupted(failure)) {
381
- const error = squashAtomCommandFailure(failure);
382
- toastManager.add(
383
- stackedThreadToast({
384
- type: "error",
385
- title: "Could not start implementation thread",
386
- description:
387
- error instanceof Error
388
- ? error.message
389
- : "An error occurred while creating the new thread.",
390
- }),
391
- );
392
- }
393
- }
394
- sendInFlightRef.current = false;
395
- resetLocalDispatch();
396
- };
397
-}
apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
-3
@@ -111,8 +111,6 @@ function Harness(props: {
111
pendingAction={null}
112
isRunning={false}
113
canInterrupt={false}
114
- showPlanFollowUpPrompt={false}
115
- promptHasText={draft.prompt.trim().length > 0}
114
isSendBusy={result.isSaving}
115
sendDisabledReason={null}
116
isEnvironmentUnavailable={false}
@@ -122,7 +120,6 @@ function Harness(props: {
120
onSubmitMessage={() => void result.saveEdit(savedContent(draft.prompt), () => {})}
121
onPreviousPendingQuestion={() => {}}
122
onInterrupt={() => {}}
125
- onImplementPlanInNewThread={() => {}}
123
/>
124
) : null;
125
}
apps/web/src/components/chat/useThreadLifecycle.tsx
+3
-3
@@ -46,7 +46,7 @@ import {
46
type AtomCommandResult,
47
} from "@t3tools/client-runtime/state/runtime";
48
import { useUiStateStore } from "../../uiStateStore";
49
-import { type ChatMessage } from "../../types";
49
+import { type ChatMessage, DEFAULT_INTERACTION_MODE } from "../../types";
50
import { AlarmClockIcon, CheckCircle2Icon } from "lucide-react";
51
import { stackedThreadToast, toastManager } from "../ui/toast";
52
import { newMessageId } from "~/lib/utils";
@@ -536,7 +536,7 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
536
createdAt,
537
...(localCheckoutBranchMismatch ? { branch: localCheckoutBranchMismatch.currentBranch } : {}),
538
runtimeMode,
539
- interactionMode: context.interactionMode,
539
+ interactionMode: DEFAULT_INTERACTION_MODE,
540
});
541
const result =
542
settingsResult._tag === "Failure"
@@ -548,7 +548,7 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
548
message: { messageId, role: "user", text, attachments: [] },
549
modelSelection: context.selectedModelSelection,
550
runtimeMode,
551
- interactionMode: context.interactionMode,
551
+ interactionMode: DEFAULT_INTERACTION_MODE,
552
createdAt,
553
},
554
});
apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
+1
-21
@@ -1,5 +1,4 @@
1
import { SourceControlProviderKind } from "@t3tools/contracts";
2
-import { resolvePlanFollowUpSubmission } from "../../proposedPlan";
2
import {
3
GitCommandError,
4
ProjectId,
@@ -14,12 +13,7 @@ import {
13
type ThreadPullRequestLink,
14
} from "@t3tools/contracts";
15
import { describe, expect, it } from "vite-plus/test";
17
-import { formatInlineContextReference } from "~/lib/composerContextReferences";
18
-import {
19
- buildMessageContext,
20
- reviewCommentContextLabel,
21
- reviewCommentContextReference,
22
-} from "~/lib/composerContextRecords";
16
+import { reviewCommentContextLabel } from "~/lib/composerContextRecords";
17
18
import {
19
buildAddSelectionToAgentHandoff,
@@ -28,7 +22,6 @@ import {
22
buildResolveConflictsPrompt,
23
resolveThreadPanelPullRequestAction,
24
buildPullRequestCommentContext,
31
- buildPullRequestReferenceContext,
25
buildFixFindingHandoff,
26
canDeletePullRequestBranch,
27
buildFixFindingsHandoff,
@@ -920,19 +913,6 @@ describe("asking about a change rather than working on it", () => {
913
isDraft: false,
914
};
915
923
- it.each(["", "Please consider "])("preserves PR plan feedback with prose %j", (prose) => {
924
- const comment = buildPullRequestReferenceContext(base);
925
- const draftText = prose + formatInlineContextReference(reviewCommentContextReference(comment));
926
- const submission = resolvePlanFollowUpSubmission({ draftText, planMarkdown: "# Plan" });
927
- const context = buildMessageContext({
928
- terminalContexts: [],
929
- previewAnnotations: [],
930
- reviewComments: [comment],
931
- });
932
- expect(submission).toEqual({ text: draftText, interactionMode: "plan" });
933
- expect(context?.records[0]).toMatchObject({ pullRequest: base });
934
- });
935
-
916
it("puts the reader's request in the composer and the selected lines in chips", () => {
917
const comment = {
918
id: "pull-request-selection:page.tsx:12:18",
apps/web/src/components/settings/LabsSettingsPanel.tsx
+12
-55
@@ -1,37 +1,30 @@
1
import { useAuth } from "@clerk/react";
2
import { Link } from "@tanstack/react-router";
3
import { managedCapabilityDenial } from "@t3tools/contracts";
4
-import { ToolCallVisibility } from "@t3tools/contracts/settings";
5
-import * as Schema from "effect/Schema";
4
5
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
6
import { useT3ConnectAuthPrompt } from "../clerk/useT3ConnectAuthPrompt";
7
import { Button } from "../ui/button";
10
-import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
8
import { Switch } from "../ui/switch";
9
import { ScopedSwitch } from "./ScopedSwitch";
10
import { SettingsPageContainer, SettingsRow, SettingsSection } from "./settingsLayout";
11
import { searchableSetting } from "./settingsSearch";
15
-import { LegacyFeaturesSection } from "./SettingsPanels";
12
import { useScopedSettings, useUpdateScopedSettings } from "./useScopedSettings";
13
import { useOptionalSettingsScope, useSettingsScope } from "./SettingsScopeContext";
14
import { firstManagedDenial, usePrimaryManagedPolicy } from "~/state/managedPolicy";
15
20
-/** Features still settling in, and legacy behavior kept for people who rely on it. */
16
+/** Features still settling in. */
17
export function LabsSettingsPanel() {
18
return (
19
<SettingsPageContainer>
20
<SettingsSection id="beta" title="Beta">
21
<BoringSidebarRow />
26
- <BoringSidebarMultilineRow />
27
- <ToolCallVisibilityRow />
22
{/* Clerk is only mounted when this build has T3 Connect. */}
23
{hasCloudPublicConfig() ? <GuestLinksRowWithSignIn /> : <GuestLinksRow />}
24
<LinkedEnvironmentsRow />
25
<SimlockHostsRow />
26
<FastWorktreeCheckoutRow />
27
</SettingsSection>
34
- <LegacyFeaturesSection />
28
</SettingsPageContainer>
29
);
30
}
@@ -45,15 +38,18 @@ function BoringSidebarRow() {
38
description="Group sidebar threads into project folders. Pinned threads stay on top, and Snoozed and Settled stay below the folders."
39
control={
40
<Switch
48
- checked={settings.boringSidebarEnabled || settings.legacySidebarEnabled}
49
- // Turning it off also clears the opt-in of the removed legacy sidebar.
50
- onCheckedChange={(checked) =>
51
- updateSettings({ boringSidebarEnabled: Boolean(checked), legacySidebarEnabled: false })
52
- }
41
+ checked={settings.boringSidebarEnabled}
42
+ onCheckedChange={(checked) => updateSettings({ boringSidebarEnabled: Boolean(checked) })}
43
aria-label="Boring sidebar (group by project)"
44
/>
45
}
56
- />
46
+ >
47
+ {settings.boringSidebarEnabled ? (
48
+ <div className="mt-2 mb-2 border-l-2 border-border/60 ps-3">
49
+ <BoringSidebarMultilineRow />
50
+ </div>
51
+ ) : null}
52
+ </SettingsRow>
53
);
54
}
55
@@ -63,7 +59,8 @@ function BoringSidebarMultilineRow() {
59
return (
60
<SettingsRow
61
{...searchableSetting("boring-sidebar-multiline")}
66
- description="In the boring sidebar, show folder threads on two lines: the title, then the branch, pull request, and agent."
62
+ className="px-0 py-2 sm:px-0"
63
+ description="Show folder threads on two lines: the title, then the branch, pull request, and agent."
64
control={
65
<Switch
66
checked={settings.boringSidebarMultilineRows}
@@ -77,46 +74,6 @@ function BoringSidebarMultilineRow() {
74
);
75
}
76
80
-const TOOL_CALL_VISIBILITY_LABELS: Record<ToolCallVisibility, string> = {
81
- showAll: "Show all",
82
- hideSuccessful: "Hide successful",
83
- hideAll: "Hide all",
84
- zen: "Zen",
85
-};
86
-
87
-const isToolCallVisibility = Schema.is(ToolCallVisibility);
88
-
89
-function ToolCallVisibilityRow() {
90
- const settings = useScopedSettings();
91
- const updateSettings = useUpdateScopedSettings();
92
- return (
93
- <SettingsRow
94
- {...searchableSetting("tool-call-visibility")}
95
- description="Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show."
96
- control={
97
- <div className="w-full sm:w-40">
98
- <Select
99
- value={settings.toolCallVisibility}
100
- onValueChange={(value) => {
101
- if (isToolCallVisibility(value)) updateSettings({ toolCallVisibility: value });
102
- }}
103
- >
104
- <SelectTrigger size="sm" className="w-full min-w-0" aria-label="Tool calls in chat">
105
- <SelectValue>{TOOL_CALL_VISIBILITY_LABELS[settings.toolCallVisibility]}</SelectValue>
106
- </SelectTrigger>
107
- <SelectPopup align="end" alignItemWithTrigger={false}>
108
- <SelectItem value="showAll">Show all</SelectItem>
109
- <SelectItem value="hideSuccessful">Hide successful</SelectItem>
110
- <SelectItem value="hideAll">Hide all</SelectItem>
111
- <SelectItem value="zen">Zen</SelectItem>
112
- </SelectPopup>
113
- </Select>
114
- </div>
115
- }
116
- />
117
- );
118
-}
119
-
77
/** Signed out of T3 Connect, the row offers to sign in instead of its switch. */
78
function GuestLinksRowWithSignIn() {
79
const { isSignedIn } = useAuth();
apps/web/src/components/settings/ProjectDefaultsSettings.tsx
-2
@@ -186,7 +186,6 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
186
model={selection.model}
187
modelOptions={selection.options ?? []}
188
allowPromptInjectedEffort={false}
189
- planModeEnabled={settings.planModeEnabled}
189
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
190
onModelOptionsChange={(options) =>
191
setModel(createModelSelection(selection.instanceId, selection.model, options))
@@ -303,7 +302,6 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
302
model={fallbackSelection.model}
303
modelOptions={fallbackSelection.options ?? []}
304
allowPromptInjectedEffort={false}
306
- planModeEnabled={settings.planModeEnabled}
305
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
306
onModelOptionsChange={(options) =>
307
updateSettings({
apps/web/src/components/settings/SettingsPanels.tsx
+58
-42
@@ -22,6 +22,7 @@ import {
22
type ResponseStreamingMode,
23
type QuitConfirmationMode,
24
SidebarProjectSortOrder,
25
+ ToolCallVisibility,
26
} from "@t3tools/contracts/settings";
27
import { desktopUpdateChannelOf } from "@t3tools/shared/cliRelease";
28
import { createModelSelection } from "@t3tools/shared/model";
@@ -528,8 +529,8 @@ export function useSettingsRestore(onRestored?: () => void) {
529
...(settings.followUpBehavior !== DEFAULT_UNIFIED_SETTINGS.followUpBehavior
530
? ["Follow-up behavior"]
531
: []),
531
- ...(settings.contextWindowMeterEnabled !== DEFAULT_UNIFIED_SETTINGS.contextWindowMeterEnabled
532
- ? ["Context window indicator"]
532
+ ...(settings.toolCallVisibility !== DEFAULT_UNIFIED_SETTINGS.toolCallVisibility
533
+ ? ["Tool calls in chat"]
534
: []),
535
...(settings.responseStreamingMode !== DEFAULT_UNIFIED_SETTINGS.responseStreamingMode
536
? ["Response streaming"]
@@ -645,7 +646,7 @@ export function useSettingsRestore(onRestored?: () => void) {
646
composerRichTextEnabled: DEFAULT_UNIFIED_SETTINGS.composerRichTextEnabled,
647
sendShortcut: DEFAULT_UNIFIED_SETTINGS.sendShortcut,
648
followUpBehavior: DEFAULT_UNIFIED_SETTINGS.followUpBehavior,
648
- contextWindowMeterEnabled: DEFAULT_UNIFIED_SETTINGS.contextWindowMeterEnabled,
649
+ toolCallVisibility: DEFAULT_UNIFIED_SETTINGS.toolCallVisibility,
650
environmentIdentificationMode: DEFAULT_UNIFIED_SETTINGS.environmentIdentificationMode,
651
glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
652
panelAnimationDurationMs: DEFAULT_UNIFIED_SETTINGS.panelAnimationDurationMs,
@@ -746,42 +747,6 @@ function AutoSettleDaysInput({
747
);
748
}
749
749
-export function LegacyFeaturesSection() {
750
- const settings = useScopedSettings();
751
- const updateSettings = useUpdateScopedSettings();
752
-
753
- return (
754
- <SettingsSection id="legacy-features" title="Legacy">
755
- <SettingsRow
756
- {...searchableSetting("legacy-plan-mode")}
757
- description="Restore Build/Plan, /plan, /default, and Shift+Tab. Off uses build mode."
758
- control={
759
- <Switch
760
- checked={settings.planModeEnabled}
761
- onCheckedChange={(checked) => {
762
- updateSettings({ planModeEnabled: Boolean(checked) });
763
- }}
764
- aria-label="Plan mode (legacy)"
765
- />
766
- }
767
- />
768
- <SettingsRow
769
- {...searchableSetting("legacy-context-window-indicator")}
770
- description="Shows context window usage as a circular indicator in the composer."
771
- control={
772
- <Switch
773
- checked={settings.contextWindowMeterEnabled}
774
- onCheckedChange={(checked) =>
775
- updateSettings({ contextWindowMeterEnabled: Boolean(checked) })
776
- }
777
- aria-label="Context window indicator (legacy)"
778
- />
779
- }
780
- />
781
- </SettingsSection>
782
- );
783
-}
784
-
750
export function GeneralSettingsPanel() {
751
const settings = useScopedSettings();
752
const updateSettings = useUpdateScopedSettings();
@@ -1233,10 +1198,63 @@ export function ChatSettingsPanel() {
1198
}
1199
/>
1200
</SettingsSection>
1201
+
1202
+ <SettingsSection id="activity" title="Activity">
1203
+ <ToolCallVisibilityRow />
1204
+ </SettingsSection>
1205
</SettingsPageContainer>
1206
);
1207
}
1208
1209
+const TOOL_CALL_VISIBILITY_LABELS: Record<ToolCallVisibility, string> = {
1210
+ showAll: "Show all",
1211
+ hideSuccessful: "Hide successful",
1212
+ hideAll: "Hide all",
1213
+ zen: "Zen",
1214
+};
1215
+
1216
+const isToolCallVisibility = Schema.is(ToolCallVisibility);
1217
+
1218
+function ToolCallVisibilityRow() {
1219
+ const settings = useScopedSettings();
1220
+ const updateSettings = useUpdateScopedSettings();
1221
+ return (
1222
+ <SettingsRow
1223
+ {...searchableSetting("tool-call-visibility")}
1224
+ description="Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show."
1225
+ resetAction={
1226
+ settings.toolCallVisibility !== DEFAULT_UNIFIED_SETTINGS.toolCallVisibility ? (
1227
+ <SettingResetButton
1228
+ label="tool calls in chat"
1229
+ onClick={() =>
1230
+ updateSettings({ toolCallVisibility: DEFAULT_UNIFIED_SETTINGS.toolCallVisibility })
1231
+ }
1232
+ />
1233
+ ) : null
1234
+ }
1235
+ control={
1236
+ <Select
1237
+ value={settings.toolCallVisibility}
1238
+ onValueChange={(value) => {
1239
+ if (isToolCallVisibility(value)) updateSettings({ toolCallVisibility: value });
1240
+ }}
1241
+ >
1242
+ <SelectTrigger size="sm" className="w-full sm:w-40" aria-label="Tool calls in chat">
1243
+ <SelectValue>{TOOL_CALL_VISIBILITY_LABELS[settings.toolCallVisibility]}</SelectValue>
1244
+ </SelectTrigger>
1245
+ <SelectPopup align="end" alignItemWithTrigger={false}>
1246
+ {ToolCallVisibility.literals.map((value) => (
1247
+ <SelectItem key={value} value={value}>
1248
+ {TOOL_CALL_VISIBILITY_LABELS[value]}
1249
+ </SelectItem>
1250
+ ))}
1251
+ </SelectPopup>
1252
+ </Select>
1253
+ }
1254
+ />
1255
+ );
1256
+}
1257
+
1258
function DiffColorsSettingsRow() {
1259
const settings = useScopedSettings();
1260
const updateSettings = useUpdateScopedSettings();
@@ -1835,9 +1853,7 @@ export function ThreadsSettingsPanel() {
1853
model={textGenModel}
1854
modelOptions={textGenModelOptions}
1855
allowPromptInjectedEffort={false}
1838
- planModeEnabled={
1839
- settings.planModeEnabled || selectsPlanAgent(textGenModelOptions)
1840
- }
1856
+ includePlanAgent={selectsPlanAgent(textGenModelOptions)}
1857
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
1858
onModelOptionsChange={(nextOptions) => {
1859
updateSettings({
apps/web/src/components/settings/SourceControlWritingSettings.tsx
+2
-6
@@ -358,9 +358,7 @@ export function SourceControlWritingSettingsSection() {
358
model={reviewGuideSelection.model}
359
modelOptions={reviewGuideSelection.options ?? []}
360
allowPromptInjectedEffort={false}
361
- planModeEnabled={
362
- settings.planModeEnabled || selectsPlanAgent(reviewGuideSelection.options)
363
- }
361
+ includePlanAgent={selectsPlanAgent(reviewGuideSelection.options)}
362
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
363
onModelOptionsChange={(options) =>
364
updateSettings({
@@ -559,9 +557,7 @@ export function SourceControlWritingSettingsSection() {
557
model={activeSelection.model}
558
modelOptions={activeSelection.options ?? []}
559
allowPromptInjectedEffort={false}
562
- planModeEnabled={
563
- settings.planModeEnabled || selectsPlanAgent(activeSelection.options)
564
- }
560
+ includePlanAgent={selectsPlanAgent(activeSelection.options)}
561
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
562
onModelOptionsChange={(options) =>
563
updateSettings({
apps/web/src/components/settings/VoiceSettingsPanel.tsx
-1
@@ -538,7 +538,6 @@ function CleanupModelRow() {
538
model={selection.model}
539
modelOptions={selection.options ?? []}
540
allowPromptInjectedEffort={false}
541
- planModeEnabled={settings.planModeEnabled}
541
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
542
onModelOptionsChange={(options) =>
543
setModel(createModelSelection(selection.instanceId, selection.model, options))
apps/web/src/components/settings/settingsSearch.test.ts
+1
-1
@@ -235,7 +235,7 @@ describe("settings search targets", () => {
235
for (const scope of ["all", "environment", "project"] as const) {
236
expect(isSettingsSearchScopeAvailable("project-defaults", scope)).toBe(true);
237
}
238
- for (const id of ["legacy-plan-mode", "legacy-context-window-indicator", "boring-sidebar"]) {
238
+ for (const id of ["tool-call-visibility", "boring-sidebar"]) {
239
expect(getSettingsSearchTargetScope(id)!.scope).toBeNull();
240
}
241
});
apps/web/src/components/settings/settingsSearch.ts
+5
-16
@@ -460,20 +460,22 @@ export const SETTINGS_SEARCH_ITEMS = [
460
id: "boring-sidebar",
461
title: "Boring sidebar (group by project)",
462
to: "/settings/labs",
463
- searchTerms: ["beta folders project tree legacy old classic sidebar"],
463
+ searchTerms: ["beta folders project tree classic sidebar"],
464
},
465
{
466
id: "boring-sidebar-multiline",
467
title: "Two-line folder rows",
468
to: "/settings/labs",
469
+ // Shown inside the boring sidebar row only while it is on, so search lands on the parent.
470
+ targetId: "boring-sidebar",
471
searchTerms: ["beta boring sidebar folder rows multiline branch pull request details"],
472
},
473
{
474
id: "tool-call-visibility",
475
title: "Tool calls in chat",
474
- to: "/settings/labs",
476
+ to: "/settings/chat",
477
searchTerms: [
476
- "beta hide tool calls commands edits searches work log activity quiet chat zen final answers only",
478
+ "hide tool calls commands edits searches work log activity quiet chat zen final answers only",
479
],
480
},
481
{
@@ -869,18 +871,6 @@ export const SETTINGS_SEARCH_ITEMS = [
871
title: "Open source licenses",
872
to: "/settings/about",
873
},
872
- {
873
- id: "legacy-plan-mode",
874
- title: "Plan mode (legacy)",
875
- to: "/settings/labs",
876
- searchTerms: ["build plan composer old"],
877
- },
878
- {
879
- id: "legacy-context-window-indicator",
880
- title: "Context window indicator (legacy)",
881
- to: "/settings/labs",
882
- searchTerms: ["composer meter usage tokens circle old"],
883
- },
874
{
875
id: "keybindings",
876
title: "Keybindings",
@@ -1348,7 +1338,6 @@ const SPLIT_SETTINGS_PATHS: ReadonlySet<string> = new Set([
1338
// Section anchors that moved but are not search results themselves.
1339
const MOVED_SECTION_ANCHORS: Readonly<Record<string, SettingsPath>> = {
1340
"authorized-clients": "/settings/access",
1351
- "legacy-features": "/settings/labs",
1341
"text-generation": "/settings/threads",
1342
about: "/settings/about",
1343
};
apps/web/src/composer-list-continuation.test.ts
+1
-1
@@ -108,7 +108,7 @@ describe("composer list indentation", () => {
108
expect(applyEdit(value, edit)).toBe(expected);
109
});
110
111
- it("leaves a top-level item alone so Shift+Tab can still switch Build/Plan", () => {
111
+ it("leaves a top-level item alone", () => {
112
expect(listOutdentForTab("- item", 6, 6)).toBeNull();
113
});
114
});
apps/web/src/composer-logic.test.ts
+2
-2
@@ -552,7 +552,7 @@ describe("extendReplacementRangeForTrailingSpace", () => {
552
553
describe("side chat slash commands", () => {
554
it("are not offered after the start of a message", () => {
555
- const items = (["side", "btw", "clear", "plan"] as const).map((command) => ({
555
+ const items = (["side", "btw", "clear", "model"] as const).map((command) => ({
556
id: `slash:${command}`,
557
type: "slash-command" as const,
558
command,
@@ -560,7 +560,7 @@ describe("side chat slash commands", () => {
560
description: "",
561
}));
562
expect(slashCommandItemsForPromptPosition(items, false).map((item) => item.id)).toEqual([
563
- "slash:plan",
563
+ "slash:model",
564
]);
565
});
566
});
apps/web/src/composer-logic.ts
+1
-13
@@ -18,7 +18,7 @@ import {
18
import { resolveShortcutCommand, type ShortcutEventLike } from "./keybindings";
19
20
export type ComposerTriggerKind = "path" | "pull-request" | "slash-command" | "skill";
21
-export type ComposerSlashCommand = "model" | "plan" | "default" | "side" | "btw" | "clear";
21
+export type ComposerSlashCommand = "model" | "side" | "btw" | "clear";
22
export type ComposerSubmissionIntent = "foreground" | "background" | "alternate";
23
24
export interface ComposerTrigger {
@@ -318,18 +318,6 @@ export function composerStateAtPromptEnd(
318
};
319
}
320
321
-export function parseStandaloneComposerSlashCommand(
322
- text: string,
323
-): Exclude<ComposerSlashCommand, "model" | "side" | "btw" | "clear"> | null {
324
- const match = /^\/(plan|default)\s*$/i.exec(text.trim());
325
- if (!match) {
326
- return null;
327
- }
328
- const command = match[1]?.toLowerCase();
329
- if (command === "plan") return "plan";
330
- return "default";
331
-}
332
-
321
/**
322
* A replacement ending in a space swallows one space already after the range, so inserting
323
* `@file ` before existing text does not leave a double space.
apps/web/src/hooks/useSettings.ts
-7
@@ -415,13 +415,6 @@ export function useEnvironmentIdentificationMode(): EnvironmentIdentificationMod
415
});
416
}
417
418
-/** Legacy sidebar opt-ins still count, so those users land in the boring sidebar. */
419
-export function useBoringSidebarEnabled(): boolean {
420
- return useClientSettings(
421
- (settings) => settings.boringSidebarEnabled || settings.legacySidebarEnabled,
422
- );
423
-}
424
-
418
export async function prepareModelPreferencesPatch(
419
settings: ServerSettings,
420
patch: ServerSettingsPatch,
apps/web/src/lib/contextWindow.test.ts
+4
-4
@@ -1,7 +1,7 @@
1
import { describe, expect, it } from "vite-plus/test";
2
import { OrchestrationV2ProviderTurnTokenUsage } from "@t3tools/contracts";
3
import * as Schema from "effect/Schema";
4
-import { formatContextWindowCompactionMessage } from "../components/chat/ContextWindowMeter.logic";
4
+import { formatContextWindowCompactionMessage } from "../components/chat/compaction.logic";
5
import * as DateTime from "effect/DateTime";
6
import {
7
ContextTransferId,
@@ -67,9 +67,9 @@ describe("live provider-turn usage (#8144)", () => {
67
expect(snapshot?.remainingTokens).toBe(158_000);
68
expect(snapshot?.usedPercentage).toBe(21);
69
expect(snapshot?.autoCompactThreshold).toBe(150_000);
70
- expect(
71
- formatContextWindowCompactionMessage("Claude Sonnet 4.6", snapshot?.autoCompactThreshold),
72
- ).toBe("Compacts automatically at about 150,000 tokens.");
70
+ expect(formatContextWindowCompactionMessage(snapshot?.autoCompactThreshold)).toBe(
71
+ "Compacts automatically at about 150,000 tokens.",
72
+ );
73
});
74
});
75
apps/web/src/modelSelection.test.ts
-6
@@ -502,7 +502,6 @@ describe("instance-scoped model selection", () => {
502
model: state.selectedModel,
503
models: providers[0]!.models,
504
modelOptions: state.modelOptions?.[instanceId],
505
- planModeEnabled: false,
505
});
506
507
expect(state.selectedModel).toBe("gpt-5.6-sol");
@@ -706,7 +705,6 @@ describe("instance-scoped model selection", () => {
705
model: state.selectedModel,
706
models: providers[0]!.models,
707
modelOptions: state.modelOptions?.[instanceId],
709
- planModeEnabled: false,
708
});
709
710
expect(
@@ -744,7 +742,6 @@ describe("instance-scoped model selection", () => {
742
model: state.selectedModel,
743
models: providers[1]!.models,
744
modelOptions: state.modelOptions?.[instanceId],
747
- planModeEnabled: false,
745
});
746
747
expect(
@@ -880,7 +877,6 @@ describe("resolveAppModelSelectionState with the opencode plan agent", () => {
877
};
878
const settings: UnifiedSettings = {
879
...DEFAULT_UNIFIED_SETTINGS,
883
- planModeEnabled: false,
880
textGenerationModelSelection: createModelSelection(instanceId, model, [
881
{ id: "agent", value: "plan" },
882
]),
@@ -948,7 +944,6 @@ describe("default model settings and new-thread composer parity", () => {
944
model,
945
models,
946
modelOptions,
951
- planModeEnabled: settings.planModeEnabled,
947
});
948
const composerTraits = traits(composer.selectedModel, composer.modelOptions?.[instanceId]);
949
@@ -1047,7 +1042,6 @@ describe("composer fallback to another instance of the same driver", () => {
1042
model: state.selectedModel,
1043
models: selection.selectedProviderEntry!.models,
1044
modelOptions: state.modelOptions?.[selectedInstanceId],
1050
- planModeEnabled: false,
1045
});
1046
return { selectedInstanceId, state, traits };
1047
}
apps/web/src/modelSelection.ts
+1
-1
@@ -415,7 +415,7 @@ export function resolveAppModelSelectionState(
415
model,
416
models: entry.models,
417
modelOptions: selectedEntry ? selection.options : undefined,
418
- planModeEnabled: settings.planModeEnabled || selectsPlanAgent(selection.options),
418
+ includePlanAgent: selectsPlanAgent(selection.options),
419
});
420
421
return createModelSelection(entry.instanceId, model, modelOptionsForDispatch);
apps/web/src/proposedPlan.test.ts
deleted
-27
@@ -1,27 +0,0 @@
1
-import { describe, expect, it } from "vite-plus/test";
2
-
3
-import { resolvePlanFollowUpSubmission } from "./proposedPlan";
4
-
5
-describe("resolvePlanFollowUpSubmission", () => {
6
- it.each(["", "Consider this "])(
7
- "keeps context-bearing feedback in plan mode with prose %j",
8
- (prose) => {
9
- const draftText = `${prose}[PR #42](t3-context://v1/review-comment/pr-42)`;
10
- expect(resolvePlanFollowUpSubmission({ draftText, planMarkdown: "# Plan" })).toEqual({
11
- text: draftText,
12
- interactionMode: "plan",
13
- });
14
- },
15
- );
16
- it("switches to default mode when implementing the ready plan without extra text", () => {
17
- expect(
18
- resolvePlanFollowUpSubmission({
19
- draftText: " ",
20
- planMarkdown: "## Ship it\n\n- step 1\n",
21
- }),
22
- ).toEqual({
23
- text: "PLEASE IMPLEMENT THIS PLAN:\n## Ship it\n\n- step 1",
24
- interactionMode: "default",
25
- });
26
- });
27
-});
apps/web/src/proposedPlan.ts
-30
@@ -53,36 +53,6 @@ function sanitizePlanFileSegment(input: string): string {
53
54
export const PLAN_IMPLEMENTATION_PROMPT_PREFIX = "PLEASE IMPLEMENT THIS PLAN:\n";
55
56
-export function buildPlanImplementationPrompt(planMarkdown: string): string {
57
- return `${PLAN_IMPLEMENTATION_PROMPT_PREFIX}${planMarkdown.trim()}`;
58
-}
59
-
60
-export function resolvePlanFollowUpSubmission(input: { draftText: string; planMarkdown: string }): {
61
- text: string;
62
- interactionMode: "default" | "plan";
63
-} {
64
- const trimmedDraftText = input.draftText.trim();
65
- if (trimmedDraftText.length > 0) {
66
- return {
67
- text: trimmedDraftText,
68
- interactionMode: "plan",
69
- };
70
- }
71
-
72
- return {
73
- text: buildPlanImplementationPrompt(input.planMarkdown),
74
- interactionMode: "default",
75
- };
76
-}
77
-
78
-export function buildPlanImplementationThreadTitle(planMarkdown: string): string {
79
- const title = proposedPlanTitle(planMarkdown);
80
- if (!title) {
81
- return "Implement plan";
82
- }
83
- return `Implement ${title}`;
84
-}
85
-
56
export function buildProposedPlanMarkdownFilename(planMarkdown: string): string {
57
const title = proposedPlanTitle(planMarkdown);
58
return `${sanitizePlanFileSegment(title ?? "plan")}.md`;
apps/web/src/providerModels.ts
+2
-2
@@ -53,12 +53,12 @@ export function getProviderModelCapabilities(
53
models: ReadonlyArray<ServerProviderModel>,
54
model: string | null | undefined,
55
provider: ProviderDriverKind,
56
- planModeEnabled = true,
56
+ includePlanAgent = false,
57
): ModelCapabilities {
58
const slug = resolveSelectableModel(provider, model, models);
59
const selectedModel = models.find((candidate) => candidate.slug === slug);
60
const caps = selectedModel?.capabilities ?? EMPTY_CAPABILITIES;
61
- if (planModeEnabled) {
61
+ if (includePlanAgent) {
62
return caps;
63
}
64
return withoutPlanAgentOption(caps);
apps/web/src/session-logic.ts
+1
-66
@@ -1,4 +1,4 @@
1
-import type { ThreadStructure, ThreadStructureRuntime } from "@t3tools/client-runtime/state/shell";
1
+import type { ThreadStructureRuntime } from "@t3tools/client-runtime/state/shell";
2
import { resolveThreadWorkingStartedAt } from "@t3tools/client-runtime/state/models";
3
import {
4
type AssetResource,
@@ -8,7 +8,6 @@ import {
8
type OrchestrationV2ProjectedTurnItem,
9
type OrchestrationV2RunAttempt,
10
type OrchestrationV2TurnItem,
11
- type PlanId,
11
type RunId,
12
type ToolActivitySurface,
13
type ToolActivityIcon,
@@ -98,15 +97,6 @@ export interface WorkLogEntry {
97
export type PendingApproval = ThreadPendingApproval;
98
export type PendingUserInput = ThreadPendingUserInput;
99
101
-export interface LatestProposedPlanState {
102
- readonly id: PlanId;
103
- readonly createdAt: string;
104
- readonly updatedAt: string;
105
- readonly runId: RunId | null;
106
- readonly planMarkdown: string;
107
- readonly status: OrchestrationV2PlanArtifact["status"];
108
-}
109
-
100
export type TimelineAttempt = Pick<
101
OrchestrationV2RunAttempt,
102
"id" | "runId" | "attemptOrdinal" | "rootNodeId" | "status" | "completedAt"
@@ -239,61 +229,6 @@ export function derivePendingUserInputs(
229
return [...inputs].toSorted((left, right) => left.createdAt.localeCompare(right.createdAt));
230
}
231
242
-function planItemTime(
243
- projection: ThreadStructure,
244
- plan: Pick<OrchestrationV2PlanArtifact, "id" | "runId">,
245
-): string {
246
- const item = projection.turnItems.findLast(
247
- (candidate) =>
248
- (candidate.type === "proposed_plan" || candidate.type === "todo_list") &&
249
- candidate.planId === plan.id,
250
- );
251
- if (item?.type === "proposed_plan" || item?.type === "todo_list") {
252
- return DateTime.formatIso(item.updatedAt);
253
- }
254
- // Without a plan item, the plan's run dates it; the thread's own timestamps move while a reply streams.
255
- const run = projection.runs.find((candidate) => candidate.id === plan.runId);
256
- return DateTime.formatIso(
257
- run?.completedAt ?? run?.startedAt ?? run?.requestedAt ?? projection.thread.createdAt,
258
- );
259
-}
260
-
261
-function toLatestProposedPlanState(
262
- projection: ThreadStructure,
263
- plan: Extract<OrchestrationV2PlanArtifact, { readonly kind: "proposed_plan" }>,
264
-): LatestProposedPlanState {
265
- const updatedAt = planItemTime(projection, plan);
266
- return {
267
- id: plan.id,
268
- createdAt: updatedAt,
269
- updatedAt,
270
- runId: plan.runId,
271
- planMarkdown: plan.markdown,
272
- status: plan.status,
273
- };
274
-}
275
-
276
-export function findLatestProposedPlan(
277
- projection: ThreadStructure | null,
278
- latestRunId: RunId | string | null | undefined,
279
-): LatestProposedPlanState | null {
280
- if (projection === null) return null;
281
- const plans = projection.plans.filter((plan) => plan.kind === "proposed_plan");
282
- const candidates = latestRunId ? plans.filter((plan) => plan.runId === latestRunId) : plans;
283
- const plan = [...(candidates.length > 0 ? candidates : plans)]
284
- .toSorted(
285
- (left, right) =>
286
- planItemTime(projection, left).localeCompare(planItemTime(projection, right)) ||
287
- left.id.localeCompare(right.id),
288
- )
289
- .at(-1);
290
- return plan === undefined ? null : toLatestProposedPlanState(projection, plan);
291
-}
292
-
293
-export function hasActionableProposedPlan(plan: LatestProposedPlanState | null): boolean {
294
- return plan?.status === "active";
295
-}
296
-
232
const STANDALONE_V2_ITEM_TYPES = new Set<OrchestrationV2ProjectedTurnItem["item"]["type"]>([
233
"fork",
234
"handoff",
apps/web/src/shortcuts/chatRouteCommands.test.ts
-2
@@ -29,13 +29,11 @@ describe("new thread commands", () => {
29
{ mode: "normal", count: 2, command: "chat.new", picker: true },
30
{ mode: "boring", count: 2, command: "chat.new", picker: true },
31
{ mode: "boring", count: 1, command: "chat.new", picker: false },
32
- { mode: "legacy", count: 2, command: "chat.new", picker: false },
32
{ mode: "boring", count: 2, command: "chat.newLocal", picker: false },
33
] as const)("$mode sidebar, $count projects, $command: picker=$picker", (scenario) => {
34
using _settings = vi.spyOn(settings, "getClientSettings").mockReturnValue({
35
...DEFAULT_CLIENT_SETTINGS,
36
boringSidebarEnabled: scenario.mode === "boring",
38
- legacySidebarEnabled: scenario.mode === "legacy",
37
});
38
using _projects = vi
39
.spyOn(entities, "readProjects")
apps/web/src/shortcuts/chatRouteCommands.ts
-2
@@ -123,10 +123,8 @@ export function installChatRouteCommands(router: AnyRouter): () => void {
123
void scratch.startScratchThread(environmentId);
124
},
125
"chat.new": (event) => {
126
- const { legacySidebarEnabled } = getClientSettings();
126
const groups = readProjectGroups();
127
if (
129
- !legacySidebarEnabled &&
128
!shouldCreateNewThreadInCurrentProject(
129
false,
130
groups.filter((group) => !group.archived).length,
docs/user/activity-log.md
+2
-1
@@ -20,7 +20,8 @@ were affected.
20
21
## Hide tool calls
22
23
-**Settings → Labs → Tool calls in chat** hides commands, file edits, searches, and MCP tool calls
23
+**Tool calls in chat** in **Settings → Chat** (web and desktop) or **Settings → Appearance**
24
+(mobile) hides commands, file edits, searches, and MCP tool calls
25
from the conversation. **Hide successful** shows a call while it runs and keeps
26
it only if it fails. **Hide all** hides every call and shows **Thinking** while the agent works.
27
**Zen** also hides the agent's in-between messages, so each turn shows your message
docs/user/composer.md
+5
-6
@@ -272,10 +272,10 @@ session** in the command palette on web and desktop. The conversation continues,
272
and your next message starts the agent again with the new setup.
273
274
Provider commands must start the message to run. T3 Code commands such as
275
-`/model` and `/plan`, and skill mentions, work on any line.
275
+`/model` and skill mentions work on any line.
276
277
Send `/compact` in an existing conversation to reduce context usage when the
278
-provider supports it, even with the context meter turned off.
278
+provider supports it.
279
280
Send `/clear` on its own, or pick it from the slash menu, to start a fresh session
281
in the same thread. Your next message goes to a new provider session that doesn't see the
@@ -283,10 +283,9 @@ earlier messages, and the thread marks where it began with **New session**.
283
Earlier messages and diffs stay in the thread. Dismiss the notice above the
284
composer to keep the current session instead.
285
286
-On web and desktop, turn on **Settings → Labs → Legacy → Context
287
-window indicator (legacy)** to see context usage. The meter is off by default
288
-and appears once the provider reports usage. Open it for usage details and
289
-**Compact context** when the provider supports compaction.
286
+On web and desktop, turn on **Context window** in **Settings → Appearance →
287
+Thread details** to see context usage in the thread details card. It appears
288
+once the provider reports usage.
289
290
Claude instances can also compact idle threads for you. See
291
[compact long conversations](./providers-claude.md#compact-long-conversations).
docs/user/providers-acp.md
+4
-5
@@ -82,8 +82,7 @@ The model picker lists the models the agent reports. If the agent reports none,
82
your own model IDs under **Custom models** in the instance settings.
83
84
Other settings the agent offers, such as reasoning effort or approval mode, appear in the
85
-composer's model picker, beside the model list, like they do for built-in providers. Agents with their own plan and
86
-build modes follow T3 Code's Plan and Build toggle. Models and options that change while an agent
85
+composer's model picker, beside the model list, like they do for built-in providers. Models and options that change while an agent
86
is running update the picker without waiting for another provider probe.
87
88
## Commands and skills
@@ -99,9 +98,9 @@ backed by that native session. Importing the same agent session again returns th
98
including when another client performs the import.
99
100
The thread keeps the native session's title and last-update value as provider metadata without
102
-overwriting a title you set in T3 Code. Agents that report ACP context usage drive the composer's
103
-context meter and cumulative cost metadata. The meter is off by default; see
104
-[commands and skills](./composer.md#commands-and-skills) to enable it on web and desktop.
101
+overwriting a title you set in T3 Code. Agents that report ACP context usage drive the thread details
102
+context window and cumulative cost metadata. See
103
+[commands and skills](./composer.md#commands-and-skills) to show it on web and desktop.
104
Text resources and links render as assistant output;
105
binary resources, images, and audio that T3 Code cannot render yet appear as explicit placeholders
106
instead of disappearing.
docs/user/providers-antigravity.md
+1
-2
@@ -78,8 +78,7 @@ Antigravity creates empty `.gemini/skills` and `.agents/skills` folders in the
78
workspace when a session starts. Git does not track empty folders, so they never
79
appear in commits.
80
81
-Use Antigravity's native `/plan` command for planning. T3 Code's separate Plan mode
82
-is unavailable. Tool approvals follow [Permission modes](./permission-modes.md).
81
+Use Antigravity's native `/plan` command for planning. Tool approvals follow [Permission modes](./permission-modes.md).
82
Questions with fixed choices still need one of the offered answers, even in
83
**Full access**.
84
docs/user/providers-claude.md
+3
-4
@@ -51,10 +51,9 @@ Set **Auto-compact after** in the Claude provider settings to an integer between
51
300,000 tokens. This changes when compaction happens, not the model's context
52
window. Leave it empty for Claude Code's default.
53
54
-You can also send `/compact` in an existing conversation. Web and desktop offer
55
-**Compact context** from the context meter. The meter is off by default; see
56
-[commands and skills](./composer.md#commands-and-skills) to enable it. Claude Code
57
-compacts automatically whether the meter is on or off.
54
+You can also send `/compact` in an existing conversation. Claude Code also
55
+compacts automatically. To see context usage, see
56
+[commands and skills](./composer.md#commands-and-skills).
57
58
When you return to a large thread after Claude's prompt cache expires, a
59
**Compact** chip with the thread's token count shows
docs/user/providers-fx.md
-1
@@ -50,7 +50,6 @@ fx doesn't pass on a sub-agent's permission requests, so a sub-agent that needs
50
51
## Not supported yet
52
53
-- Plan mode.
53
- **Full access**.
54
- **Auto-accept edits**.
55
- Commit messages, pull request text, branch names, and thread titles. Pick another provider for those.
docs/user/providers-muse.md
+1
-2
@@ -47,8 +47,7 @@ can use under **Custom models** in the instance settings.
47
48
Muse offers two [permission modes](./permission-modes.md): **Supervised** asks
49
before commands and edits, and **Full access** runs them without asking. Muse has
50
-no equivalent of **Auto-accept edits** or **Auto**, so they are not offered. Muse
51
-does not offer a separate Plan mode in T3 Code.
50
+no equivalent of **Auto-accept edits** or **Auto**, so they are not offered.
51
52
Muse can use T3 Code's tools. If Muse cannot reach them, the turn continues
53
without them. Switching providers can pass conversation context as a handoff.
docs/user/providers-opencode.md
-2
@@ -20,8 +20,6 @@ OpenCode 2 converts the shared OpenCode database to its own format the first tim
20
runs. Don't run OpenCode 1.x and 2.x side by side on the same machine. Threads you
21
started on 1.x continue on 2.x.
22
23
-Plan mode uses OpenCode's `plan` agent.
24
-
23
## Compaction
24
25
OpenCode compacts long conversations itself, and T3 Code has no setting for it. On
docs/user/providers-pi.md
+4
-4
@@ -41,7 +41,7 @@ overriding it. Other models keep their Pi defaults when no level is selected. Th
41
use Pi's native session files for resume, rollback, and forks within the same Pi instance. Forks
42
preserve the native conversation through the selected turn in the destination workspace.
43
Switching providers uses portable conversation context. Extension
44
-dialogs appear in the T3 Code composer, and the composer context meter follows Pi's own usage
44
+dialogs appear in the T3 Code composer, and the thread details context window follows Pi's own usage
45
reporting while a response streams and after it settles.
46
47
Pi skills appear in the composer's `$` menu. This includes user skills and project skills that Pi
@@ -86,6 +86,6 @@ threads.
86
environment, including `PI_CODING_AGENT_DIR` if set. Trust the folder or its parent with `/trust`,
87
then start a new thread using that same worktree. Launch arguments with `--no-approve` keep
88
project files off without the notice.
89
-- The context meter is off by default; see [commands and skills](./composer.md#commands-and-skills)
90
- to enable it on web and desktop. It appears once Pi reports usage for the thread. Some model
91
- providers only report usage when a response completes, so the meter can wait for the first reply.
89
+- To see context usage on web and desktop, turn on **Context window** in **Settings → Appearance →
90
+ Thread details**. It appears once Pi reports usage for the thread. Some model providers only
91
+ report usage when a response completes, so it can wait for the first reply.
docs/user/thread-sidebar.md
+2
-3
@@ -5,9 +5,8 @@ need a separate branch and working directory.
5
6
## Start a thread
7
8
-On web and desktop, **New thread** opens the project picker when you have multiple
9
-projects in the default or project-grouped sidebar. The legacy sidebar always
10
-starts in the current project. **Shift-click** to start in
8
+On web and desktop, **New thread** opens the project picker when you have more than one
9
+open project in the default or project-grouped sidebar. Archived projects don't count. **Shift-click** to start in
10
the current project, or use a project's own new-thread action. A new thread carries
11
your model and mode selections, unless the destination project has its own model default.
12
Its branch and workspace mode come from your configured defaults. To continue in
packages/contracts/src/settings.ts
-8
@@ -501,8 +501,6 @@ export const ClientSettingsSchema = Schema.Struct({
501
502
pullRequestLinksOpenInApp: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
503
504
- planModeEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
505
- contextWindowMeterEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
504
composerRichTextEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
505
sendShortcut: Schema.Literals(["enter", "mod-enter-multiline", "mod-enter"]).pipe(
506
Schema.withDecodingDefault(Effect.succeed("enter")),
@@ -526,9 +524,6 @@ export const ClientSettingsSchema = Schema.Struct({
524
threadDetailsItems: Schema.Record(Schema.String, Schema.Boolean).pipe(
525
Schema.withDecodingDefault(Effect.succeed({})),
526
),
529
- // Opt-in for the removed legacy sidebar. Still read so those users land in
530
- // the boring sidebar; the boring sidebar toggle clears it.
531
- legacySidebarEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
527
sidebarWorkingShelfEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
528
sidebarProjectGroupingMode: SidebarProjectGroupingMode.pipe(
529
Schema.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_PROJECT_GROUPING_MODE)),
@@ -1925,8 +1920,6 @@ export const ClientSettingsPatch = Schema.Struct({
1920
Schema.Record(TrimmedNonEmptyString, PullRequestMergeMethod),
1921
),
1922
pullRequestLinksOpenInApp: Schema.optionalKey(Schema.Boolean),
1928
- planModeEnabled: Schema.optionalKey(Schema.Boolean),
1929
- contextWindowMeterEnabled: Schema.optionalKey(Schema.Boolean),
1923
composerRichTextEnabled: Schema.optionalKey(Schema.Boolean),
1924
sendShortcut: Schema.optionalKey(Schema.Literals(["enter", "mod-enter-multiline", "mod-enter"])),
1925
followUpBehavior: Schema.optionalKey(Schema.Literals(["queue", "steer"])),
@@ -1937,7 +1930,6 @@ export const ClientSettingsPatch = Schema.Struct({
1930
toolCallVisibility: Schema.optionalKey(ToolCallVisibility),
1931
threadDetailsUsageEnabled: Schema.optionalKey(Schema.Boolean),
1932
threadDetailsItems: Schema.optionalKey(Schema.Record(Schema.String, Schema.Boolean)),
1940
- legacySidebarEnabled: Schema.optionalKey(Schema.Boolean),
1933
sidebarWorkingShelfEnabled: Schema.optionalKey(Schema.Boolean),
1934
sidebarProjectGroupingMode: Schema.optionalKey(SidebarProjectGroupingMode),
1935
sidebarProjectGroupingOverrides: Schema.optionalKey(