Skip to content

Commit 477d01a

Browse files
committed
fix(providers): preserve appearance across saves and unavailable states
1 parent 6dbb8bb commit 477d01a

6 files changed

Lines changed: 48 additions & 12 deletions

File tree

‎apps/mobile/src/lib/modelOptions.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,23 @@ describe("mobile model options", () => {
245245
null,
246246
)[0]?.providerBadge?.showBadge,
247247
).toBe(false);
248+
for (const [appearance, showBadge] of [
249+
[{ icon: "initials", badgeLabel: "PX" }, false],
250+
[{ badgeLabel: "PX" }, true],
251+
[{ icon: "claudeAgent" }, false],
252+
] as const) {
253+
const providers = config.providers.map((provider, index) =>
254+
index === 0 ? { ...provider, ...appearance } : provider,
255+
);
256+
expect(
257+
buildModelOptions(
258+
{ ...config, providers: showBadge ? providers.slice(0, 1) : providers },
259+
null,
260+
undefined,
261+
null,
262+
)[0]?.providerBadge?.showBadge,
263+
).toBe(showBadge);
264+
}
248265
});
249266

250267
it("only badges ACP accounts that share the same agent", () => {

‎apps/mobile/src/lib/modelOptions.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ export function buildModelOptions(
273273
const badgeEntries = (config?.providers ?? []).map((provider) => ({
274274
driverKind: provider.driver,
275275
enabled: provider.enabled,
276+
icon: provider.icon,
276277
acpRegistryAgentId: registryAgentId(provider.instanceId),
277278
}));
278279
const providerBadgeFor = (instanceId: ModelSelection["instanceId"]) => {
@@ -294,6 +295,8 @@ export function buildModelOptions(
294295
{
295296
driverKind: driver,
296297
accentColor,
298+
icon: snapshot?.icon ?? instance?.icon,
299+
badgeLabel: snapshot?.badgeLabel ?? instance?.badgeLabel,
297300
acpRegistryAgentId: registryAgentId(instanceId),
298301
enabled: snapshot?.enabled ?? instance?.enabled ?? false,
299302
},

‎apps/server/src/provider/ProviderInstanceRegistry.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,8 @@ describe("ProviderInstanceRegistry secret environment", () => {
871871
const configMap: ProviderInstanceConfigMap = {
872872
[instanceId]: {
873873
driver: driverKind,
874+
icon: "initials",
875+
badgeLabel: "PX",
874876
config,
875877
environment: [
876878
{ name: "OPENAI_API_KEY", value: secret, sensitive: true },
@@ -917,6 +919,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
917919
const [unavailable] = yield* registry.listUnavailable;
918920
expect(unavailable?.instanceId).toBe(instanceId);
919921
expect(unavailable?.unavailableReason).toContain("OPENAI_API_KEY");
922+
expect(unavailable).toMatchObject({ icon: "initials", badgeLabel: "PX" });
920923
}).pipe(Effect.scoped);
921924
});
922925

@@ -1011,6 +1014,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
10111014
expect(yield* registry.getInstance(instanceId)).toBeUndefined();
10121015
const [pending] = yield* registry.listUnavailable;
10131016
expect(pending?.unavailableReason).toBe("Reading secrets…");
1017+
expect(pending).toMatchObject({ icon: "initials", badgeLabel: "PX" });
10141018

10151019
yield* Deferred.succeed(fixture.gate, undefined);
10161020
yield* PubSub.take(changes);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
222222
instanceId,
223223
displayName: entry.displayName,
224224
accentColor: entry.accentColor,
225+
icon: entry.icon,
226+
badgeLabel: entry.badgeLabel,
225227
reason: "Reading secrets…",
226228
}),
227229
};
@@ -242,6 +244,8 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
242244
instanceId,
243245
displayName: entry.displayName,
244246
accentColor: entry.accentColor,
247+
icon: entry.icon,
248+
badgeLabel: entry.badgeLabel,
245249
reason: `Could not read ${unreadable.join(", ")} from its secret provider. Unlock it, then refresh.`,
246250
}),
247251
};

‎apps/web/src/components/settings/ProviderSettingsPanel.environment.browser.test.tsx‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -355,17 +355,25 @@ describe("EnvironmentProviderSettings routing", () => {
355355
});
356356
});
357357

358-
it("starts the next edit from server state after a save fails", async () => {
359-
await setup();
360-
state.mutateProviderInstance.mockResolvedValueOnce(
361-
AsyncResult.failure(Cause.fail(new Error("settings write failed"))),
362-
);
363-
await using screen = await render(panel());
364-
await commitInstanceField(screen, "badge-label", "PX");
365-
await chooseInstanceIcon("Claude");
366-
expect(savedInstance(1)).toMatchObject({ icon: "claudeAgent" });
367-
expect(savedInstance(1)).not.toHaveProperty("badgeLabel");
368-
});
358+
it.each([false, true])(
359+
"starts the next edit from server state after a save fails (overlap: %s)",
360+
async (overlap) => {
361+
await setup();
362+
const finish = overlap ? holdFirstSave() : undefined;
363+
state.mutateProviderInstance.mockResolvedValueOnce(
364+
AsyncResult.failure(Cause.fail(new Error("settings write failed"))),
365+
);
366+
await using screen = await render(panel());
367+
if (overlap) await commitInstanceField(screen, "display-name", "Work");
368+
await commitInstanceField(screen, "badge-label", "PX");
369+
await finish?.();
370+
await chooseInstanceIcon("Claude");
371+
const saved = savedInstance(overlap ? 2 : 1);
372+
expect(saved).toMatchObject({ icon: "claudeAgent" });
373+
if (overlap) expect(saved.displayName).toBe("Work");
374+
expect(saved).not.toHaveProperty("badgeLabel");
375+
},
376+
);
369377

370378
it("does not substitute another account when the requested instance was removed", async () => {
371379
await setup();

‎apps/web/src/components/settings/ProviderSettingsPanel.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ export function EnvironmentProviderSettings({
798798
if (instanceEditsRef.current.get(instanceId) !== edits) return;
799799
edits.saving -= 1;
800800
if (succeeded) edits.confirmed = Math.max(edits.confirmed, carried);
801-
else if (edits.saving === 0) edits.updates.length = edits.confirmed;
801+
if (edits.saving === 0) edits.updates.length = edits.confirmed;
802802
};
803803

804804
const persistInstance = async (

0 commit comments

Comments
 (0)