Skip to content

Commit 94b1a07

Browse files
authored
Merge branch 'main' into fix/diff-palette-counts-verified
2 parents 2031fbf + 8ac6846 commit 94b1a07

88 files changed

Lines changed: 3648 additions & 398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ export function ScheduledTaskModelPickerRouteScreen() {
2525
const { editor, setEditor } = useScheduledTaskEditor();
2626
const config = useEnvironmentServerConfig(editor?.environmentId ?? null);
2727
const selectedModel = editor?.draft.modelSelection ?? null;
28-
const models = useMemo(() => buildModelOptions(config, selectedModel), [config, selectedModel]);
28+
const projectId = editor?.draft.projectId ?? null;
29+
const models = useMemo(
30+
() => buildModelOptions(config, selectedModel, undefined, projectId),
31+
[config, selectedModel, projectId],
32+
);
2933
const providerGroups = useMemo(() => groupByProvider(models), [models]);
3034
const selectedOption = models.find(
3135
(option) =>
@@ -46,6 +50,7 @@ export function ScheduledTaskModelPickerRouteScreen() {
4650
return (
4751
<ThreadSettingsPickerScreen
4852
environmentId={editor.environmentId}
53+
projectId={projectId}
4954
providerGroups={providerGroups}
5055
selectedModel={selectedModel}
5156
onSelectModel={(option) =>

‎apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { useAtomValue } from "@effect/atom-react";
2-
import { AuthOrchestrationOperateScope } from "@t3tools/contracts";
2+
import {
3+
AuthOrchestrationOperateScope,
4+
resolveProjectProviderInstanceEnabled,
5+
} from "@t3tools/contracts";
36
import { readEnvironmentScope } from "../../state/session";
47
import type {
58
EnvironmentId,
@@ -582,7 +585,10 @@ function TaskForm({
582585
);
583586
const projects = useProjects().filter((project) => project.environmentId === environmentId);
584587
const config = useEnvironmentServerConfig(environmentId);
585-
const modelOptions = useMemo(() => buildModelOptions(config, null), [config]);
588+
const modelOptions = useMemo(
589+
() => buildModelOptions(config, null, undefined, draft.projectId),
590+
[config, draft.projectId],
591+
);
586592
const canOperate = useAtomValue(
587593
serverEnvironment.upsertScheduledTask.permissionAtom(environmentId),
588594
);
@@ -757,14 +763,24 @@ function TaskForm({
757763
}))}
758764
onSelect={(id) => {
759765
const project = projects.find((item) => item.id === id);
760-
if (project)
761-
setDraft({
762-
...draft,
763-
projectId: project.id,
764-
modelSelection: draft.modelSelectionIsExplicit
765-
? draft.modelSelection
766-
: scheduledTaskDefaultModel(config, project),
767-
});
766+
if (!project) return;
767+
const keepsExplicitModel =
768+
draft.modelSelectionIsExplicit &&
769+
(draft.modelSelection === null ||
770+
!config?.settings ||
771+
resolveProjectProviderInstanceEnabled(
772+
config.settings,
773+
project.id,
774+
draft.modelSelection.instanceId,
775+
));
776+
setDraft({
777+
...draft,
778+
projectId: project.id,
779+
modelSelection: keepsExplicitModel
780+
? draft.modelSelection
781+
: scheduledTaskDefaultModel(config, project),
782+
modelSelectionIsExplicit: keepsExplicitModel,
783+
});
768784
}}
769785
/>
770786
<PickerRow

‎apps/mobile/src/features/settings/scheduledTaskDraft.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vite-plus/test";
22
import {
33
DEFAULT_SERVER_SETTINGS,
44
type ServerConfig,
5+
ProviderDriverKind,
56
ProviderInstanceId,
67
ProjectId,
78
ScheduledTaskId,
@@ -339,6 +340,12 @@ describe("scheduled task model defaults", () => {
339340
resolve(
340341
{
341342
...config,
343+
settings: {
344+
...config.settings,
345+
providerInstances: {
346+
[instanceId]: { driver: ProviderDriverKind.make("codex"), enabled: false },
347+
},
348+
},
342349
providers: config.providers.map((provider) => ({ ...provider, enabled: false })),
343350
},
344351
null,

‎apps/mobile/src/features/settings/scheduledTaskDraft.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,18 @@ export function scheduledTaskDefaultModel(
2828
const configured = resolveProjectSettings(settings, project?.id ?? null, project).settings
2929
.defaultModelSelection;
3030
const projectDefaultSelection =
31-
resolveDefaultableModelSelection(config, configured) ??
32-
resolveDefaultableModelSelection(config, settings.defaultModelSelection);
31+
resolveDefaultableModelSelection(config, configured, project?.id ?? null) ??
32+
resolveDefaultableModelSelection(config, settings.defaultModelSelection, project?.id ?? null);
3333
return resolveNewTaskModelSelection({
3434
draftSelection: null,
3535
projectDefaultSelection,
3636
stickySelection: null,
37-
modelOptions: buildModelOptions(config, projectDefaultSelection),
37+
modelOptions: buildModelOptions(
38+
config,
39+
projectDefaultSelection,
40+
undefined,
41+
project?.id ?? null,
42+
),
3843
});
3944
}
4045

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ import { sourceControlEnvironment } from "../../state/sourceControl";
112112
import { useAtomCommand } from "../../state/use-atom-command";
113113
import { ProjectCloneBanner } from "../../components/ProjectCloneBanner";
114114
import {
115+
describeUnavailableModelSelection,
115116
isModelSelectionUnavailable,
116117
resolveSelectableModelSelection,
117118
} from "../../lib/modelOptions";
@@ -1236,6 +1237,7 @@ export function NewTaskDraftScreen(props: {
12361237
resolveSelectableModelSelection(
12371238
selectedEnvironmentServerConfig,
12381239
draft.modelSelection ?? null,
1240+
selectedProject.id,
12391241
) ?? flow.selectedModel;
12401242
const workspaceMode = draft.workspaceSelection?.mode ?? flow.workspaceMode;
12411243
const selectedBranchName = draft.workspaceSelection?.branch ?? flow.selectedBranchName;
@@ -1252,12 +1254,18 @@ export function NewTaskDraftScreen(props: {
12521254
}
12531255
if (
12541256
environmentConnected &&
1255-
isModelSelectionUnavailable(selectedEnvironmentServerConfig, modelSelection)
1257+
isModelSelectionUnavailable(
1258+
selectedEnvironmentServerConfig,
1259+
modelSelection,
1260+
selectedProject.id,
1261+
)
12561262
) {
1257-
Alert.alert(
1258-
"Antigravity model unavailable",
1259-
"Set up Antigravity on web or desktop, or choose another model.",
1263+
const { title, detail } = describeUnavailableModelSelection(
1264+
selectedEnvironmentServerConfig,
1265+
modelSelection,
1266+
selectedProject.id,
12601267
);
1268+
Alert.alert(title, detail);
12611269
return;
12621270
}
12631271
// T3's own limits command is answered by the thread composer; a new task would

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,11 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
435435
const currentRuntimeMode = props.selectedThread.runtimeMode;
436436
const modelUnavailable =
437437
props.connectionState === "connected" &&
438-
isModelSelectionUnavailable(props.serverConfig, currentModelSelection);
438+
isModelSelectionUnavailable(
439+
props.serverConfig,
440+
currentModelSelection,
441+
props.selectedThread.projectId,
442+
);
439443
const selectedProviderStatus = useMemo(() => {
440444
if (!props.serverConfig) return null;
441445
return (
@@ -651,8 +655,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
651655
? undefined
652656
: currentModelSelection.instanceId;
653657
const modelOptions = useMemo(
654-
() => buildModelOptions(props.serverConfig, currentModelSelection, lockedProviderInstanceId),
655-
[props.serverConfig, currentModelSelection, lockedProviderInstanceId],
658+
() =>
659+
buildModelOptions(
660+
props.serverConfig,
661+
currentModelSelection,
662+
lockedProviderInstanceId,
663+
props.selectedThread.projectId,
664+
),
665+
[
666+
props.serverConfig,
667+
currentModelSelection,
668+
lockedProviderInstanceId,
669+
props.selectedThread.projectId,
670+
],
656671
);
657672
const threadProviderGroups = useMemo(() => groupByProvider(modelOptions), [modelOptions]);
658673
const currentModelOption =
@@ -674,6 +689,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
674689
() => ({
675690
ownerId: settingsOwnerId,
676691
environmentId: props.environmentId,
692+
projectId: props.selectedThread.projectId,
677693
providerInstanceId: currentModelSelection.instanceId,
678694
...(lockedProviderInstanceId ? { lockedProviderInstanceId } : {}),
679695
providerGroups: threadProviderGroups,
@@ -703,6 +719,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
703719
settingsOwnerId,
704720
lockedProviderInstanceId,
705721
threadProviderGroups,
722+
props.selectedThread.projectId,
706723
],
707724
);
708725
const openSettings = useCallback(() => {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
import type {
88
EnvironmentId,
99
ModelSelection,
10+
ProjectId,
1011
ProviderInstanceId,
1112
ProviderOptionDescriptor,
1213
ProviderOptionSelection,
@@ -252,6 +253,7 @@ type ThreadSettingsSubmenuPage =
252253

253254
type ThreadSettingsSessionProps = {
254255
readonly environmentId: EnvironmentId | null;
256+
readonly projectId: ProjectId | null;
255257
readonly providerInstanceId?: ProviderInstanceId;
256258
readonly lockedProviderInstanceId?: ProviderInstanceId;
257259
readonly providerGroups: ReadonlyArray<ProviderGroup>;
@@ -360,7 +362,13 @@ function ThreadSettingsSessionProvider(
360362
() =>
361363
manageHidden && config
362364
? groupByProvider(
363-
buildModelOptions(config, props.selectedModel, props.lockedProviderInstanceId, true),
365+
buildModelOptions(
366+
config,
367+
props.selectedModel,
368+
props.lockedProviderInstanceId,
369+
props.projectId,
370+
true,
371+
),
364372
)
365373
: props.providerGroups,
366374
[
@@ -369,6 +377,7 @@ function ThreadSettingsSessionProvider(
369377
props.providerGroups,
370378
props.selectedModel,
371379
props.lockedProviderInstanceId,
380+
props.projectId,
372381
],
373382
);
374383
const legacyFavorites = AsyncResult.isSuccess(preferences)
@@ -1605,6 +1614,7 @@ export function NewTaskThreadSettingsRouteScreen() {
16051614
return (
16061615
<ThreadSettingsPickerScreen
16071616
environmentId={flow.selectedEnvironmentId}
1617+
projectId={flow.selectedProject?.id ?? null}
16081618
{...(flow.selectedModel ? { providerInstanceId: flow.selectedModel.instanceId } : {})}
16091619
providerGroups={flow.providerGroups}
16101620
selectedModel={flow.selectedModel}

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,27 +581,33 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
581581
const draftModelSelection = resolveSelectableModelSelection(
582582
selectedEnvironmentServerConfig,
583583
selectedProjectDraft.modelSelection ?? null,
584+
selectedProject?.id ?? null,
584585
);
585586
const projectDefaultModelSelection = resolveDefaultableModelSelection(
586587
selectedEnvironmentServerConfig,
587588
projectSettings.settings.defaultModelSelection,
589+
selectedProject?.id ?? null,
588590
);
589591
const storedStickyModelSelection = useStickyComposerModelSelection();
590592
const stickyModelSelection = resolveDefaultableModelSelection(
591593
selectedEnvironmentServerConfig,
592594
storedStickyModelSelection,
595+
selectedProject?.id ?? null,
593596
);
594597
const modelOptions = useMemo(
595598
() =>
596599
buildModelOptions(
597600
selectedEnvironmentServerConfig,
598601
draftModelSelection ?? projectDefaultModelSelection ?? stickyModelSelection,
602+
undefined,
603+
selectedProject?.id ?? null,
599604
),
600605
[
601606
selectedEnvironmentServerConfig,
602607
draftModelSelection,
603608
projectDefaultModelSelection,
604609
stickyModelSelection,
610+
selectedProject?.id,
605611
],
606612
);
607613

@@ -1117,6 +1123,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
11171123
resolveSelectableModelSelection(
11181124
selectedEnvironmentServerConfig,
11191125
draft.modelSelection ?? null,
1126+
selectedProject.id,
11201127
) ?? selectedModel;
11211128
// A shared image or file is a task on its own; text is optional.
11221129
if ((text.length === 0 && draft.attachments.length === 0) || !draftModelSelection) {

0 commit comments

Comments
 (0)