Skip to content

Commit 14c90d0

Browse files
t3dotggclaude
andcommitted
fix(web): a server retry keeps the machine's provider failure
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3bd8189 commit 14c90d0

4 files changed

Lines changed: 24 additions & 6 deletions

File tree

‎apps/web/src/components/sidebar/updateEverything.logic.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const runMachine = (overrides: Partial<UpdateRunMachine> = {}): UpdateRunMachine
3232
startedAt: 0,
3333
result: null,
3434
failure: null,
35+
providerFailure: null,
3536
...overrides,
3637
});
3738

‎apps/web/src/components/sidebar/updateEverything.logic.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ export interface UpdateRunMachine {
199199
readonly result: "done" | "failed" | null;
200200
/** Why it failed, when `result` is "failed". */
201201
readonly failure: string | null;
202+
/** This machine's provider failure, kept apart so a server retry does not clear it. */
203+
readonly providerFailure: string | null;
202204
}
203205

204206
/**

‎apps/web/src/components/sidebar/updateEverythingRun.tsx‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ function updateRunMachines(update: (machine: UpdateRunMachine) => UpdateRunMachi
5050
export function settleUpdateRunMachine(
5151
environmentId: EnvironmentId,
5252
failure: string | null,
53-
{ serverUpdated = false }: { readonly serverUpdated?: boolean } = {},
53+
{
54+
serverUpdated = false,
55+
providerFailure,
56+
}: { readonly serverUpdated?: boolean; readonly providerFailure?: string | null } = {},
5457
): void {
5558
updateRunMachines((machine) =>
5659
machine.environmentId === environmentId
@@ -59,6 +62,7 @@ export function settleUpdateRunMachine(
5962
result: failure === null ? "done" : "failed",
6063
failure,
6164
...(serverUpdated ? { server: null } : {}),
65+
...(providerFailure === undefined ? {} : { providerFailure }),
6266
}
6367
: machine,
6468
);
@@ -71,26 +75,31 @@ export function retryFailedUpdateRunServers(
7175
options: { readonly quiet: boolean },
7276
) => Promise<ServerUpdateOutcome>,
7377
): void {
74-
const targets = (appAtomRegistry.get(updateEverythingRunAtom)?.machines ?? []).flatMap(
75-
(machine) => (machine.result === "failed" && machine.server !== null ? [machine.server] : []),
78+
const failed = (appAtomRegistry.get(updateEverythingRunAtom)?.machines ?? []).flatMap(
79+
(machine) =>
80+
machine.result === "failed" && machine.server !== null
81+
? [{ target: machine.server, providerFailure: machine.providerFailure }]
82+
: [],
7683
);
84+
const targets = failed.map(({ target }) => target);
7785
const retried = new Set(targets.map((target) => target.environmentId));
7886
const startedAt = Date.now();
7987
updateRunMachines((machine) =>
8088
retried.has(machine.environmentId)
8189
? { ...machine, result: null, failure: null, startedAt }
8290
: machine,
8391
);
84-
for (const target of targets) {
92+
for (const { target, providerFailure } of failed) {
8593
void update(target, { quiet: true }).then((outcome) =>
8694
settleUpdateRunMachine(
8795
target.environmentId,
8896
// A skipped retry (no permission, disconnected, interrupted) did not update.
8997
outcome.status === "updated"
90-
? null
98+
? providerFailure
9199
: outcome.status === "failed"
92100
? outcome.message
93101
: "Could not start the update",
102+
{ serverUpdated: outcome.status === "updated" },
94103
),
95104
);
96105
}
@@ -285,6 +294,7 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
285294
startedAt: server.startedAt,
286295
result: null,
287296
failure: null,
297+
providerFailure: null,
288298
})),
289299
}));
290300
let remaining = servers.length;

‎apps/web/src/components/sidebar/useUpdateEverything.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ export function useUpdateEverything(localUpdateVersion: string | null) {
146146
startedAt,
147147
result: null,
148148
failure: null,
149+
providerFailure: null,
149150
});
150151
}
151152
for (const server of servers) {
@@ -159,6 +160,7 @@ export function useUpdateEverything(localUpdateVersion: string | null) {
159160
startedAt,
160161
result: null,
161162
failure: null,
163+
providerFailure: null,
162164
});
163165
}
164166
const localVersion = installLocal ? localUpdateVersion : null;
@@ -215,7 +217,10 @@ export function useUpdateEverything(localUpdateVersion: string | null) {
215217
serverOutcome.status === "failed"
216218
? serverOutcome.message
217219
: (providerFailures.get(server.environmentId) ?? null),
218-
{ serverUpdated: serverOutcome.status !== "failed" },
220+
{
221+
serverUpdated: serverOutcome.status !== "failed",
222+
providerFailure: providerFailures.get(server.environmentId) ?? null,
223+
},
219224
);
220225
const finished = { label: server.serverLabel, outcome: serverOutcome };
221226
finishedServers.push(finished);

0 commit comments

Comments
 (0)