Skip to content

Your lightweight open-source personal agent.

fix(webui): retain skill refreshes queued during pending requests

Xubin Ren1c451b5b5fea
diff --git a/webui/src/hooks/useSkills.ts b/webui/src/hooks/useSkills.ts
index 96fa86547..3db5cdd5e 100644
--- a/webui/src/hooks/useSkills.ts
+++ b/webui/src/hooks/useSkills.ts
@@ -11,9 +11,16 @@ export function useSkills(getToken: () => string): SkillSummary[] {
let cancelled = false;
let payloadVersion = 0;
let refreshing = false;
+ let refreshQueued = false;
const refresh = () => {
- if (cancelled || refreshing) return;
+ if (cancelled) return;
+ if (refreshing) {
+ // The in-flight response may predate installation. Keep one trailing refresh.
+ refreshQueued = true;
+ return;
+ }
refreshing = true;
+ refreshQueued = false;
const version = payloadVersion;
fetchSkills(getToken())
.then(({ skills: nextSkills }) => {
@@ -24,6 +31,7 @@ export function useSkills(getToken: () => string): SkillSummary[] {
})
.finally(() => {
refreshing = false;
+ if (refreshQueued) refresh();
});
};
const onSkillsChanged = (event: Event) => {
diff --git a/webui/src/tests/skills-marketplace.test.tsx b/webui/src/tests/skills-marketplace.test.tsx
index 809f0f4bd..329404e33 100644
--- a/webui/src/tests/skills-marketplace.test.tsx
+++ b/webui/src/tests/skills-marketplace.test.tsx
@@ -79,13 +79,19 @@ describe("useSkills", () => {
expect(screen.queryByRole("listbox", { name: "Slash commands" })).not.toBeInTheDocument();
});
- it("coalesces in-flight refreshes and stops listening after unmount", async () => {
+ it("coalesces opens during an older fetch into one trailing refresh", async () => {
let resolveSkills!: (value: Awaited<ReturnType<typeof fetchSkills>>) => void;
+ const installed = {
+ name: "simple-pr-review",
+ description: "Review pull requests.",
+ source: "workspace",
+ available: true,
+ };
vi.mocked(fetchSkills).mockReset().mockImplementationOnce(
() => new Promise((resolve) => {
resolveSkills = resolve;
}),
- );
+ ).mockResolvedValue({ skills: [installed] });
const getToken = () => "tok";
const { result, unmount } = renderHook(() => useSkills(getToken));
@@ -97,11 +103,13 @@ describe("useSkills", () => {
await act(async () => {
resolveSkills({ skills: [] });
});
- expect(result.current).toEqual([]);
+ // The old response was captured before installation; it cannot satisfy the new opens.
+ expect(fetchSkills).toHaveBeenCalledTimes(2);
+ expect(result.current).toEqual([installed]);
unmount();
requestSkillsRefresh();
- expect(fetchSkills).toHaveBeenCalledTimes(1);
+ expect(fetchSkills).toHaveBeenCalledTimes(2);
});
it("keeps existing skills on refresh failure and retries on the next open", async () => {
@@ -133,6 +141,27 @@ describe("useSkills", () => {
expect(result.current).toEqual([]);
});
+ it.each([false, true])("does not start a queued refresh after unmount (failure: %s)", async (fails) => {
+ let settle!: () => void;
+ vi.mocked(fetchSkills).mockReset().mockImplementationOnce(
+ () => new Promise((resolve, reject) => {
+ settle = () => fails ? reject(new Error("Offline")) : resolve({ skills: [] });
+ }),
+ );
+ const getToken = () => "tok";
+ const { unmount } = renderHook(() => useSkills(getToken));
+ act(() => {
+ requestSkillsRefresh();
+ });
+ unmount();
+
+ await act(async () => {
+ settle();
+ });
+ requestSkillsRefresh();
+ expect(fetchSkills).toHaveBeenCalledTimes(1);
+ });
+
it("does not let an older request overwrite a newer skill event", async () => {
let resolveSkills!: (value: Awaited<ReturnType<typeof fetchSkills>>) => void;
vi.mocked(fetchSkills).mockReset().mockImplementationOnce(