Skip to content

Commit c7c7e9e

Browse files
committed
fix(client): retry only pending workspace discovery
1 parent e0b2bdf commit c7c7e9e

3 files changed

Lines changed: 112 additions & 6 deletions

File tree

‎apps/mobile/src/features/threads/use-composer-command-menu.test.ts‎

Lines changed: 90 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ describe("workspace command discovery retry", () => {
140140
],
141141
} satisfies ServerProvider;
142142

143-
function Probe({ cwd }: { cwd: string }) {
143+
function Probe({ cwd, status = provider }: { cwd: string; status?: ServerProvider }) {
144144
useComposerCommandMenu({
145145
draftMessage: "/project",
146146
ownerKey: null,
147147
environmentId,
148148
projectCwd: cwd,
149-
selectedProviderStatus: provider,
149+
selectedProviderStatus: status,
150150
hasThread: false,
151151
hasCompactableConversation: false,
152152
onChangeDraftMessage: () => {},
@@ -204,6 +204,94 @@ describe("workspace command discovery retry", () => {
204204
expect(refreshProviders).toHaveBeenCalledTimes(2);
205205
});
206206

207+
it.each(["pi", "acpRegistry"])(
208+
"does not poll a healthy %s workspace without discovery",
209+
async (driver) => {
210+
const unsupported = {
211+
...provider,
212+
driver: ProviderDriverKind.make(driver),
213+
workspaceSnapshots: [],
214+
};
215+
refreshProviders.mockResolvedValue({ _tag: "Success", value: { providers: [unsupported] } });
216+
await act(async () => {
217+
root.render(createElement(Probe, { cwd: "/project-a", status: unsupported }));
218+
});
219+
expect(refreshProviders).toHaveBeenCalledTimes(1);
220+
await act(() => vi.advanceTimersByTimeAsync(30_000));
221+
expect(refreshProviders).toHaveBeenCalledTimes(1);
222+
expect(vi.getTimerCount()).toBe(0);
223+
},
224+
);
225+
226+
it("arms the remaining cooldown when a concurrent scan publishes partial commands", async () => {
227+
const missing = { ...provider, workspaceSnapshots: [] };
228+
const recovered = {
229+
...provider,
230+
workspaceSnapshots: provider.workspaceSnapshots.map((snapshot) => ({
231+
...snapshot,
232+
slashCommandsPending: false,
233+
})),
234+
};
235+
refreshProviders.mockResolvedValueOnce({ _tag: "Success", value: { providers: [missing] } });
236+
refreshProviders.mockResolvedValue({ _tag: "Success", value: { providers: [recovered] } });
237+
await act(async () => {
238+
root.render(createElement(Probe, { cwd: "/project-a", status: missing }));
239+
});
240+
await act(() => vi.advanceTimersByTimeAsync(5_000));
241+
expect(refreshProviders).toHaveBeenCalledTimes(1);
242+
expect(vi.getTimerCount()).toBe(0);
243+
await act(async () => {
244+
root.render(createElement(Probe, { cwd: "/project-a", status: provider }));
245+
});
246+
await act(() => vi.advanceTimersByTimeAsync(4_999));
247+
expect(refreshProviders).toHaveBeenCalledTimes(1);
248+
await act(() => vi.advanceTimersByTimeAsync(1));
249+
expect(refreshProviders).toHaveBeenCalledTimes(2);
250+
await act(() => vi.advanceTimersByTimeAsync(20_000));
251+
expect(refreshProviders).toHaveBeenCalledTimes(2);
252+
});
253+
254+
it("does not retry when a concurrent scan publishes a complete workspace", async () => {
255+
const missing = { ...provider, workspaceSnapshots: [] };
256+
const recovered = {
257+
...provider,
258+
workspaceSnapshots: provider.workspaceSnapshots.map((snapshot) => ({
259+
...snapshot,
260+
slashCommandsPending: false,
261+
})),
262+
};
263+
refreshProviders.mockResolvedValue({ _tag: "Success", value: { providers: [missing] } });
264+
await act(async () => {
265+
root.render(createElement(Probe, { cwd: "/project-a", status: missing }));
266+
});
267+
await act(() => vi.advanceTimersByTimeAsync(5_000));
268+
await act(async () => {
269+
root.render(createElement(Probe, { cwd: "/project-a", status: recovered }));
270+
});
271+
await act(() => vi.advanceTimersByTimeAsync(30_000));
272+
expect(refreshProviders).toHaveBeenCalledTimes(1);
273+
expect(vi.getTimerCount()).toBe(0);
274+
});
275+
276+
it("retries a rejected refresh while published discovery remains pending", async () => {
277+
const recovered = {
278+
...provider,
279+
workspaceSnapshots: provider.workspaceSnapshots.map((snapshot) => ({
280+
...snapshot,
281+
slashCommandsPending: false,
282+
})),
283+
};
284+
refreshProviders.mockRejectedValueOnce(new Error("Connection lost"));
285+
refreshProviders.mockResolvedValue({ _tag: "Success", value: { providers: [recovered] } });
286+
await act(async () => {
287+
root.render(createElement(Probe, { cwd: "/project-a" }));
288+
});
289+
await act(() => vi.advanceTimersByTimeAsync(10_000));
290+
expect(refreshProviders).toHaveBeenCalledTimes(2);
291+
await act(() => vi.advanceTimersByTimeAsync(20_000));
292+
expect(refreshProviders).toHaveBeenCalledTimes(2);
293+
});
294+
207295
it("cancels the old workspace retry and does not duplicate an in-flight request", async () => {
208296
await act(async () => {
209297
root.render(createElement(Probe, { cwd: "/project-a" }));

‎apps/mobile/src/features/threads/use-composer-command-menu.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,16 +259,25 @@ export function useComposerCommandMenu({
259259
environmentId && projectCwd && selectedProviderInstanceId
260260
? `${environmentId}:${selectedProviderInstanceId}:${projectCwd}`
261261
: null;
262+
const workspaceSlashCommandsPending =
263+
selectedProviderStatus?.workspaceSnapshots?.some(
264+
(snapshot) => snapshot.cwd === projectCwd && snapshot.slashCommandsPending === true,
265+
) ?? false;
262266
useEffect(() => {
263-
if (!workspaceRefreshRetry || workspaceRefreshRetry.key !== workspaceRefreshScopeKey) return;
267+
if (
268+
!workspaceSlashCommandsPending ||
269+
!workspaceRefreshRetry ||
270+
workspaceRefreshRetry.key !== workspaceRefreshScopeKey
271+
)
272+
return;
264273
const timeout = setTimeout(
265274
() => {
266275
setWorkspaceRefreshRetry((current) => (current === workspaceRefreshRetry ? null : current));
267276
},
268277
Math.max(0, workspaceRefreshRetry.notBefore - Date.now()),
269278
);
270279
return () => clearTimeout(timeout);
271-
}, [workspaceRefreshRetry, workspaceRefreshScopeKey]);
280+
}, [workspaceRefreshRetry, workspaceRefreshScopeKey, workspaceSlashCommandsPending]);
272281
const hadWorkspaceSnapshotRef = useRef(false);
273282
useEffect(() => {
274283
if (hadWorkspaceSnapshotRef.current && !hasWorkspaceSnapshot) {

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,16 +2188,25 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
21882188
gitCwd && selectedProviderEntry
21892189
? `${environmentId}:${selectedProviderEntry.instanceId}:${gitCwd}`
21902190
: null;
2191+
const workspaceSlashCommandsPending =
2192+
selectedProviderStatus?.workspaceSnapshots?.some(
2193+
(snapshot) => snapshot.cwd === gitCwd && snapshot.slashCommandsPending === true,
2194+
) ?? false;
21912195
useEffect(() => {
2192-
if (!workspaceRefreshRetry || workspaceRefreshRetry.key !== workspaceRefreshScopeKey) return;
2196+
if (
2197+
!workspaceSlashCommandsPending ||
2198+
!workspaceRefreshRetry ||
2199+
workspaceRefreshRetry.key !== workspaceRefreshScopeKey
2200+
)
2201+
return;
21932202
const timeout = setTimeout(
21942203
() => {
21952204
setWorkspaceRefreshRetry((current) => (current === workspaceRefreshRetry ? null : current));
21962205
},
21972206
Math.max(0, workspaceRefreshRetry.notBefore - Date.now()),
21982207
);
21992208
return () => clearTimeout(timeout);
2200-
}, [workspaceRefreshRetry, workspaceRefreshScopeKey]);
2209+
}, [workspaceRefreshRetry, workspaceRefreshScopeKey, workspaceSlashCommandsPending]);
22012210
const hadWorkspaceSnapshotRef = useRef(false);
22022211
useEffect(() => {
22032212
const hasWorkspaceSnapshot = hasCompleteProviderWorkspaceSnapshot(

0 commit comments

Comments
 (0)