Skip to content

Commit b8d0c0d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321
2 parents b879761 + cb49e5d commit b8d0c0d

42 files changed

Lines changed: 7983 additions & 675 deletions

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/threads/ThreadComposer.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
621621
const settingsRouteSession = useMemo<ExistingThreadSettingsRouteSession>(
622622
() => ({
623623
ownerId: settingsOwnerId,
624+
environmentId: props.environmentId,
624625
providerGroups: threadProviderGroups,
625626
selectedModel: currentModelSelection,
626627
onSelectModel: (option) => props.onUpdateModelSelection(option.selection),

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

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type {
2+
EnvironmentId,
23
ModelSelection,
34
ProviderOptionDescriptor,
45
ProviderOptionSelection,
@@ -27,7 +28,7 @@ import {
2728
useState,
2829
type ReactNode,
2930
} from "react";
30-
import { Platform, Pressable, ScrollView, TextInput, View } from "react-native";
31+
import { Alert, Platform, Pressable, ScrollView, TextInput, View } from "react-native";
3132
import Animated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanimated";
3233
import { useSafeAreaInsets } from "react-native-safe-area-context";
3334

@@ -47,7 +48,13 @@ import {
4748
nativeHeaderScrollEdgeEffects,
4849
} from "../../native/StackHeader";
4950
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
51+
import { serverEnvironment } from "../../state/server";
52+
import { useAtomCommand } from "../../state/use-atom-command";
5053
import { useNewTaskFlow } from "./new-task-flow-provider";
54+
import {
55+
createProviderCatalogRefreshRunner,
56+
providerCatalogRefreshError,
57+
} from "./provider-catalog-refresh";
5158
import {
5259
createNativeMailSearchToolbarItem,
5360
NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET,
@@ -293,6 +300,7 @@ type ThreadSettingsSubmenuPage =
293300
| { readonly kind: "runtime" };
294301

295302
type ThreadSettingsSessionProps = {
303+
readonly environmentId: EnvironmentId | null;
296304
readonly providerGroups: ReadonlyArray<ProviderGroup>;
297305
readonly selectedModel: ModelSelection | null;
298306
readonly onSelectModel: (option: ModelOption) => void;
@@ -344,6 +352,7 @@ export function useExistingThreadSettingsRoutePresentation() {
344352
}
345353

346354
type ThreadSettingsSessionValue = {
355+
readonly environmentId: EnvironmentId | null;
347356
readonly providerGroups: ReadonlyArray<ProviderGroup>;
348357
readonly runtimeMode: RuntimeMode;
349358
readonly onUpdateRuntimeMode: (mode: RuntimeMode) => void;
@@ -462,6 +471,7 @@ function ThreadSettingsSessionProvider(
462471

463472
const value = useMemo<ThreadSettingsSessionValue>(
464473
() => ({
474+
environmentId: props.environmentId,
465475
providerGroups: props.providerGroups,
466476
runtimeMode: props.runtimeMode,
467477
onUpdateRuntimeMode: props.onUpdateRuntimeMode,
@@ -490,6 +500,7 @@ function ThreadSettingsSessionProvider(
490500
hasLegacyModels,
491501
isApplied,
492502
isDisplayed,
503+
props.environmentId,
493504
pendingModel,
494505
pressModel,
495506
providerFilter,
@@ -958,6 +969,23 @@ function ThreadSettingsModelsScreen() {
958969
const navigation = useNavigation<NativeStackNavigationProp<ThreadSettingsPickerStackParams>>();
959970
const usesNativeMailSearchToolbar = Platform.OS === "ios" && NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED;
960971
const hasCustomCatalogFilter = session.providerFilter !== null || session.showLegacy;
972+
const refreshProvidersCommand = useAtomCommand(serverEnvironment.refreshProviders, {
973+
reportFailure: false,
974+
});
975+
const refreshProviderCatalog = useMemo(
976+
() => createProviderCatalogRefreshRunner(refreshProvidersCommand),
977+
[refreshProvidersCommand],
978+
);
979+
const [isRefreshingProviders, setIsRefreshingProviders] = useState(false);
980+
const refreshProviders = useCallback(() => {
981+
if (!session.environmentId || isRefreshingProviders) return;
982+
setIsRefreshingProviders(true);
983+
void refreshProviderCatalog(session.environmentId).then((result) => {
984+
setIsRefreshingProviders(false);
985+
const error = providerCatalogRefreshError(result);
986+
if (error) Alert.alert("Could not refresh models", error);
987+
});
988+
}, [isRefreshingProviders, refreshProviderCatalog, session.environmentId]);
961989
const commitAndClose = useCallback(() => {
962990
session.commitPendingModel();
963991
presentation.onClose();
@@ -1005,6 +1033,12 @@ function ThreadSettingsModelsScreen() {
10051033
{Platform.OS === "android" ? (
10061034
<AndroidScreenHeader
10071035
actions={[
1036+
{
1037+
accessibilityLabel: "Refresh models",
1038+
disabled: isRefreshingProviders || session.environmentId === null,
1039+
icon: "arrow.clockwise",
1040+
onPress: refreshProviders,
1041+
},
10081042
{
10091043
accessibilityLabel: session.pendingModel ? "Save thread settings" : "Done",
10101044
icon: "checkmark",
@@ -1070,6 +1104,13 @@ function ThreadSettingsModelsScreen() {
10701104
/>
10711105
</NativeHeaderToolbar>
10721106
<NativeHeaderToolbar placement="right">
1107+
<NativeHeaderToolbar.Button
1108+
accessibilityLabel="Refresh models"
1109+
disabled={isRefreshingProviders || session.environmentId === null}
1110+
icon="arrow.clockwise"
1111+
onPress={refreshProviders}
1112+
separateBackground
1113+
/>
10731114
<NativeHeaderToolbar.Button
10741115
accessibilityLabel={session.pendingModel ? "Save thread settings" : "Done"}
10751116
label={session.pendingModel ? "Save" : "Done"}
@@ -1230,6 +1271,7 @@ export function NewTaskThreadSettingsRouteScreen() {
12301271

12311272
return (
12321273
<ThreadSettingsSessionProvider
1274+
environmentId={flow.selectedEnvironmentId}
12331275
providerGroups={flow.providerGroups}
12341276
selectedModel={flow.selectedModel}
12351277
onSelectModel={(option) => flow.setSelectedModelKey(option.key, option.selection.options)}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import { EnvironmentId } from "@t3tools/contracts";
2+
import * as Cause from "effect/Cause";
3+
import { AsyncResult } from "effect/unstable/reactivity";
4+
import { describe, expect, it, vi } from "vite-plus/test";
5+
6+
import {
7+
createProviderCatalogRefreshRunner,
8+
providerCatalogRefreshError,
9+
} from "./provider-catalog-refresh";
10+
11+
describe("mobile provider catalog refresh", () => {
12+
it("calls server discovery for the selected environment and deduplicates pending taps", async () => {
13+
let resolveRefresh: ((value: "refreshed") => void) | undefined;
14+
const refreshProviders = vi.fn(
15+
() =>
16+
new Promise<"refreshed">((resolve) => {
17+
resolveRefresh = resolve;
18+
}),
19+
);
20+
const refresh = createProviderCatalogRefreshRunner(refreshProviders);
21+
const environmentId = EnvironmentId.make("environment-mobile");
22+
23+
const first = refresh(environmentId);
24+
const second = refresh(environmentId);
25+
26+
expect(second).toBe(first);
27+
expect(refreshProviders).toHaveBeenCalledOnce();
28+
expect(refreshProviders).toHaveBeenCalledWith({ environmentId, input: {} });
29+
30+
resolveRefresh?.("refreshed");
31+
await expect(first).resolves.toBe("refreshed");
32+
});
33+
34+
it("reports a discovery error and allows retry after the failed command settles", async () => {
35+
const failure = AsyncResult.failure<never, Error>(Cause.fail(new Error("discovery failed")));
36+
const success = AsyncResult.success("refreshed");
37+
let callCount = 0;
38+
const refreshProviders = vi.fn(async () => (callCount++ === 0 ? failure : success));
39+
const refresh = createProviderCatalogRefreshRunner(refreshProviders);
40+
const environmentId = EnvironmentId.make("environment-mobile");
41+
42+
expect(providerCatalogRefreshError(await refresh(environmentId))).toBe("discovery failed");
43+
expect(providerCatalogRefreshError(await refresh(environmentId))).toBeNull();
44+
expect(refreshProviders).toHaveBeenCalledTimes(2);
45+
});
46+
});
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import type { EnvironmentId } from "@t3tools/contracts";
2+
import type { AtomCommandResult } from "@t3tools/client-runtime/state/runtime";
3+
import {
4+
isAtomCommandInterrupted,
5+
squashAtomCommandFailure,
6+
} from "@t3tools/client-runtime/state/runtime";
7+
8+
type RefreshProvidersTarget = {
9+
readonly environmentId: EnvironmentId;
10+
readonly input: Record<never, never>;
11+
};
12+
13+
/** Deduplicates taps while the server refresh command is still running. */
14+
export function createProviderCatalogRefreshRunner<Result>(
15+
refreshProviders: (target: RefreshProvidersTarget) => Promise<Result>,
16+
) {
17+
let pending: Promise<Result> | null = null;
18+
19+
return (environmentId: EnvironmentId): Promise<Result> => {
20+
if (pending) return pending;
21+
pending = refreshProviders({ environmentId, input: {} }).finally(() => {
22+
pending = null;
23+
});
24+
return pending;
25+
};
26+
}
27+
28+
export function providerCatalogRefreshError(
29+
result: AtomCommandResult<unknown, unknown>,
30+
): string | null {
31+
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return null;
32+
const error = squashAtomCommandFailure(result);
33+
return error instanceof Error ? error.message : "Provider discovery failed.";
34+
}

‎apps/server/src/provider/Drivers/OpenCodeDriver.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
import { ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
3535
import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
3636
import { OpenCodeRuntime } from "../opencodeRuntime.ts";
37+
import * as OpenCodeServerOwner from "../OpenCodeServerOwner.ts";
3738
import {
3839
defaultProviderContinuationIdentity,
3940
type ProviderDriver,
@@ -141,13 +142,27 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
141142
environment: processEnv,
142143
...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
143144
});
144-
const textGeneration = yield* makeOpenCodeTextGeneration(effectiveConfig, processEnv);
145+
const serverOwner = yield* OpenCodeServerOwner.make({
146+
binaryPath: effectiveConfig.binaryPath,
147+
directory: serverConfig.cwd,
148+
...(effectiveConfig.serverPassword
149+
? { serverPassword: effectiveConfig.serverPassword }
150+
: {}),
151+
environment: processEnv,
152+
});
153+
const textGeneration = yield* makeOpenCodeTextGeneration(effectiveConfig).pipe(
154+
Effect.provideService(OpenCodeServerOwner.OpenCodeServerOwner, serverOwner),
155+
);
145156

146157
const checkProvider = checkOpenCodeProviderStatus(
147158
effectiveConfig,
148159
serverConfig.cwd,
149160
processEnv,
150-
).pipe(Effect.map(stampIdentity), Effect.provideService(OpenCodeRuntime, openCodeRuntime));
161+
).pipe(
162+
Effect.map(stampIdentity),
163+
Effect.provideService(OpenCodeServerOwner.OpenCodeServerOwner, serverOwner),
164+
Effect.provideService(OpenCodeRuntime, openCodeRuntime),
165+
);
151166

152167
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
153168
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<OpenCodeSettings>>(
@@ -156,6 +171,8 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
156171
getSettings: snapshotSettings.getSettings,
157172
streamSettings: snapshotSettings.streamSettings,
158173
haveSettingsChanged: haveProviderSnapshotSettingsChanged,
174+
checkProviderOnSettingsChange: () => false,
175+
refreshOnInterval: false,
159176
initialSnapshot: (settings) =>
160177
makePendingOpenCodeProvider(settings.provider).pipe(Effect.map(stampIdentity)),
161178
checkProvider,

0 commit comments

Comments
 (0)