Skip to content

Commit dc102e5

Browse files
fix(web): skill menus show loading while project skills arrive (#28209)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent f513369 commit dc102e5

6 files changed

Lines changed: 106 additions & 19 deletions

File tree

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -934,11 +934,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
934934
const selectedProviderSlashCommands = selectedProviderStatus
935935
? resolveProviderSlashCommandsForCwd(selectedProviderStatus, gitCwd)
936936
: NO_PROVIDER_SLASH_COMMANDS;
937-
const refreshWorkspaceSnapshotOnTyping = useProviderWorkspaceSnapshotRefresh({
938-
environmentId,
939-
gitCwd,
940-
instanceId: selectedProviderEntry?.instanceId,
941-
});
937+
const { refresh: refreshWorkspaceSnapshotOnTyping, scanning: workspaceSkillsScanning } =
938+
useProviderWorkspaceSnapshotRefresh({
939+
environmentId,
940+
gitCwd,
941+
instanceId: selectedProviderEntry?.instanceId,
942+
});
942943

943944
const selectedPromptEffort = composerProviderState.promptEffort;
944945
const selectedModelOptionsForDispatch = composerProviderState.modelOptionsForDispatch;
@@ -1139,6 +1140,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
11391140
selectedProviderSkills,
11401141
selectedProviderSlashCommands,
11411142
showSkillsInSlashMenu: settings.showSkillsInSlashMenu,
1143+
workspaceSkillsScanning,
11421144
questionAttachmentTarget,
11431145
});
11441146

@@ -3289,7 +3291,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
32893291
? isComposerMenuLoading
32903292
? composerTriggerKind === "pull-request"
32913293
? "Finding pull request..."
3292-
: "Searching workspace files..."
3294+
: composerTriggerKind === "skill" || composerTriggerKind === "slash-command"
3295+
? "Searching workspace skills..."
3296+
: "Searching workspace files..."
32933297
: composerMenuEmptyState
32943298
: ""}
32953299
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const ComposerCommandMenu = memo(function ComposerCommandMenu(props: {
152152
<div className="px-5 pt-3.5 pb-7">
153153
<p className="text-secondary-label text-xs">
154154
{props.isLoading
155-
? props.triggerKind === "skill"
155+
? props.triggerKind === "skill" || props.triggerKind === "slash-command"
156156
? "Searching workspace skills..."
157157
: props.triggerKind === "pull-request"
158158
? "Finding pull request..."

‎apps/web/src/components/chat/useComposerMenuItems.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ export function useComposerMenuItems({
7171
selectedProviderSkills,
7272
selectedProviderSlashCommands,
7373
showSkillsInSlashMenu,
74+
workspaceSkillsScanning,
7475
questionAttachmentTarget,
7576
}: {
7677
readonly composerTrigger: ComposerTrigger | null;
@@ -89,6 +90,7 @@ export function useComposerMenuItems({
8990
readonly selectedProviderSkills: ServerProvider["skills"];
9091
readonly selectedProviderSlashCommands: ServerProvider["slashCommands"];
9192
readonly showSkillsInSlashMenu: boolean;
93+
readonly workspaceSkillsScanning: boolean;
9294
readonly questionAttachmentTarget: DraftId | null;
9395
}) {
9496
// Thread mentions rank by recency as of when the composer mounted.
@@ -373,6 +375,8 @@ export function useComposerMenuItems({
373375
})();
374376
const isLoading =
375377
(composerTriggerKind === "path" && pathTriggerQuery.length > 0 && workspaceEntries.isPending) ||
378+
((composerTriggerKind === "skill" || composerTriggerKind === "slash-command") &&
379+
workspaceSkillsScanning) ||
376380
(composerTriggerKind === "pull-request" &&
377381
pullRequestProjectId !== null &&
378382
pullRequestRepository !== null &&
Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
import { useAtomRefresh } from "@effect/atom-react";
1+
import { useAtomRefresh, useAtomValue } from "@effect/atom-react";
22
import { type EnvironmentId, type ProviderInstanceId } from "@t3tools/contracts";
3-
import { createProviderWorkspaceSnapshotRefreshAtomFamily } from "@t3tools/client-runtime/providerSkills";
3+
import {
4+
createProviderWorkspaceSnapshotRefreshAtomFamily,
5+
isProviderWorkspaceSnapshotScanning,
6+
type ProviderWorkspaceSnapshotRefreshState,
7+
} from "@t3tools/client-runtime/providerSkills";
48
import { Atom } from "effect/reactivity";
59

610
import { serverEnvironment } from "../../state/server";
@@ -10,23 +14,27 @@ const providerWorkspaceSnapshotRefresh = createProviderWorkspaceSnapshotRefreshA
1014
refreshProviders: serverEnvironment.refreshProviders,
1115
});
1216

13-
const idleRefreshAtom: Atom.Atom<unknown> = Atom.make<void>(undefined).pipe(
14-
Atom.withLabel("provider-workspace-snapshot-refresh:idle"),
15-
);
17+
const idleRefreshAtom: Atom.Atom<ProviderWorkspaceSnapshotRefreshState | undefined> = Atom.make<
18+
ProviderWorkspaceSnapshotRefreshState | undefined
19+
>(undefined).pipe(Atom.withLabel("provider-workspace-snapshot-refresh:idle"));
1620

1721
/**
1822
* Keeps the selected provider's workspace snapshot fresh for the composer's
19-
* cwd while mounted. Returns a check to run when the user types.
23+
* cwd while mounted. Returns a check to run when the user types, and whether
24+
* the cwd's skills are still being scanned.
2025
*/
2126
export function useProviderWorkspaceSnapshotRefresh(input: {
2227
readonly environmentId: EnvironmentId;
2328
readonly gitCwd: string | null;
2429
readonly instanceId: ProviderInstanceId | undefined;
25-
}): () => void {
30+
}): { readonly refresh: () => void; readonly scanning: boolean } {
2631
const { environmentId, gitCwd, instanceId } = input;
2732
const atom =
2833
gitCwd && instanceId
2934
? providerWorkspaceSnapshotRefresh({ environmentId, instanceId, cwd: gitCwd })
3035
: idleRefreshAtom;
31-
return useAtomRefresh(atom);
36+
return {
37+
refresh: useAtomRefresh(atom),
38+
scanning: isProviderWorkspaceSnapshotScanning(useAtomValue(atom)),
39+
};
3240
}

‎packages/client-runtime/src/providerSkills.test.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
createProviderWorkspaceSnapshotRefreshAtomFamily,
1313
getProviderSkillsForSlashMenu,
1414
hasCompleteProviderWorkspaceSnapshot,
15+
isProviderWorkspaceSnapshotScanning,
1516
resolveProviderSkillsForCwd,
1617
resolveProviderSlashCommandsForCwd,
1718
} from "./providerSkills.ts";
@@ -298,6 +299,53 @@ describe("provider workspace snapshot refresh atom", () => {
298299
unmount();
299300
});
300301

302+
it("reports skills loading while a missing snapshot is scanned, until it arrives", async () => {
303+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
304+
const scanned = withSnapshot("2026-01-01T00:00:00.000Z");
305+
const { registry, atom, providersAtom, unmount } = setup(noSnapshot, [() => scanned]);
306+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(true);
307+
registry.set(providersAtom, scanned);
308+
await vi.advanceTimersByTimeAsync(0);
309+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(false);
310+
unmount();
311+
});
312+
313+
it("stops reporting skills loading when the scan fails", async () => {
314+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
315+
const { registry, atom, unmount } = setup(noSnapshot);
316+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(true);
317+
await vi.advanceTimersByTimeAsync(0);
318+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(false);
319+
unmount();
320+
});
321+
322+
it("keeps reporting skills loading while the scan returns a pending snapshot", async () => {
323+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
324+
const pending = withSnapshot("2026-01-01T00:00:00.000Z", true);
325+
const { registry, atom, providersAtom, unmount } = setup(pending, [() => pending]);
326+
await vi.advanceTimersByTimeAsync(0);
327+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(true);
328+
registry.set(providersAtom, withSnapshot("2026-01-01T00:00:00.000Z"));
329+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(false);
330+
unmount();
331+
});
332+
333+
it("stops reporting skills loading once a pending snapshot exhausts its retries", async () => {
334+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
335+
const { registry, atom, run, unmount } = setup(withSnapshot("2026-01-01T00:00:00.000Z", true));
336+
await vi.advanceTimersByTimeAsync(60_000);
337+
expect(run).toHaveBeenCalledTimes(3);
338+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(false);
339+
unmount();
340+
});
341+
342+
it("does not report skills loading for a current snapshot", () => {
343+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:01:00.000Z") });
344+
const { registry, atom, unmount } = setup(withSnapshot("2026-01-01T00:00:00.000Z"));
345+
expect(isProviderWorkspaceSnapshotScanning(registry.get(atom))).toBe(false);
346+
unmount();
347+
});
348+
301349
it("does not retry on a timer when the failed scan left no pending snapshot", async () => {
302350
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
303351
const { registry, atom, run, unmount } = setup(noSnapshot);

‎packages/client-runtime/src/providerSkills.ts‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const WORKSPACE_SNAPSHOT_RETRY_COOLDOWN_MS = 10_000;
136136
// A cwd that never scans, such as a deleted worktree, would otherwise retry forever.
137137
const WORKSPACE_SNAPSHOT_MAX_ATTEMPTS = 3;
138138

139-
interface ProviderWorkspaceSnapshotRefreshState {
139+
export interface ProviderWorkspaceSnapshotRefreshState {
140140
/**
141141
* When the last scan was requested. A request inside the TTL is not
142142
* repeated, so a client clock ahead of the server's cannot loop rescans.
@@ -147,13 +147,16 @@ interface ProviderWorkspaceSnapshotRefreshState {
147147
/** Failed scans within the current request TTL. */
148148
readonly failedAttempts: number;
149149
readonly hadSnapshot: boolean;
150+
/** The server published a partial snapshot and is still discovering. */
151+
readonly snapshotPending: boolean;
150152
}
151153

152154
const initialProviderWorkspaceSnapshotRefreshState: ProviderWorkspaceSnapshotRefreshState = {
153155
requestedAt: null,
154156
retryNotBefore: null,
155157
failedAttempts: 0,
156158
hadSnapshot: false,
159+
snapshotPending: false,
157160
};
158161

159162
/**
@@ -172,6 +175,8 @@ function planProviderWorkspaceSnapshotRefresh(
172175
readonly recheckAt: number | null;
173176
} {
174177
const hasSnapshot = hasCompleteProviderWorkspaceSnapshot(provider, cwd);
178+
const pending =
179+
(provider && resolveProviderWorkspaceSnapshot(provider, cwd)?.slashCommandsPending) === true;
175180
// Losing a snapshot (the server dropped it) lifts both the TTL and the retry
176181
// cooldown so the scan happens at once.
177182
const lost = previous.hadSnapshot && !hasSnapshot;
@@ -188,6 +193,7 @@ function planProviderWorkspaceSnapshotRefresh(
188193
? 0
189194
: previous.failedAttempts,
190195
hadSnapshot: hasSnapshot,
196+
snapshotPending: pending,
191197
};
192198
const refresh =
193199
(requestedAt === null || now - requestedAt >= PROVIDER_WORKSPACE_SNAPSHOT_TTL_MS) &&
@@ -196,8 +202,6 @@ function planProviderWorkspaceSnapshotRefresh(
196202
if (refresh) {
197203
return { state: { ...state, requestedAt: now }, refresh: true, recheckAt: null };
198204
}
199-
const pending =
200-
(provider && resolveProviderWorkspaceSnapshot(provider, cwd)?.slashCommandsPending) === true;
201205
return { state, refresh: false, recheckAt: pending ? retryNotBefore : null };
202206
}
203207

@@ -223,6 +227,23 @@ function failProviderWorkspaceSnapshotRefresh(
223227
};
224228
}
225229

230+
/**
231+
* A scan is in flight, or the server is still discovering, for a cwd without a
232+
* complete snapshot, so its skills and commands may still arrive. A failed scan
233+
* clears `requestedAt`, and exhausted attempts end it, so this cannot stay true
234+
* for a scan that will not finish.
235+
*/
236+
export function isProviderWorkspaceSnapshotScanning(
237+
state: ProviderWorkspaceSnapshotRefreshState | undefined,
238+
): boolean {
239+
return (
240+
state !== undefined &&
241+
(state.requestedAt !== null || state.snapshotPending) &&
242+
!state.hadSnapshot &&
243+
state.failedAttempts < WORKSPACE_SNAPSHOT_MAX_ATTEMPTS
244+
);
245+
}
246+
226247
type WorkspaceSnapshotStatus = "absent" | "pending" | "complete";
227248

228249
function resolveWorkspaceSnapshotStatus(
@@ -330,6 +351,8 @@ export function createProviderWorkspaceSnapshotRefreshAtomFamily(input: {
330351
).pipe(Atom.withLabel(`provider-workspace-snapshot-refresh:${key}`));
331352
return refreshAtom;
332353
});
333-
return (target: ProviderWorkspaceSnapshotRefreshTarget): Atom.Atom<unknown> =>
354+
return (
355+
target: ProviderWorkspaceSnapshotRefreshTarget,
356+
): Atom.Atom<ProviderWorkspaceSnapshotRefreshState> =>
334357
family({ environmentId: target.environmentId, instanceId: target.instanceId, cwd: target.cwd });
335358
}

0 commit comments

Comments
 (0)