Skip to content

Commit bc2876a

Browse files
committed
fix(provider): retain workspace skills when command discovery fails
1 parent 1ef21d6 commit bc2876a

11 files changed

Lines changed: 182 additions & 36 deletions

File tree

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {
3636
getProviderSkillsForSlashMenu,
3737
getProviderSlashCommandsForSlashMenu,
3838
isProviderSkillUserInvocable,
39+
hasCompleteProviderWorkspaceSnapshot,
3940
resolveProviderSkillsForCwd,
4041
resolveProviderSlashCommandsForCwd,
4142
} from "@t3tools/client-runtime/providerSkills";
@@ -245,9 +246,9 @@ export function useComposerCommandMenu({
245246
reportFailure: false,
246247
});
247248
const selectedProviderInstanceId = selectedProviderStatus?.instanceId;
248-
const hasWorkspaceSnapshot = Boolean(
249-
projectCwd &&
250-
selectedProviderStatus?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === projectCwd),
249+
const hasWorkspaceSnapshot = hasCompleteProviderWorkspaceSnapshot(
250+
selectedProviderStatus,
251+
projectCwd,
251252
);
252253
const workspaceRefreshKeyRef = useRef<string | null>(null);
253254
const workspaceRefreshRetryRef = useRef<{ key: string; notBefore: number } | null>(null);
@@ -285,9 +286,12 @@ export function useComposerCommandMenu({
285286
}).then((result) => {
286287
const refreshed =
287288
result._tag === "Success" &&
288-
result.value.providers
289-
.find((provider) => provider.instanceId === selectedProviderInstanceId)
290-
?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === projectCwd);
289+
hasCompleteProviderWorkspaceSnapshot(
290+
result.value.providers.find(
291+
(provider) => provider.instanceId === selectedProviderInstanceId,
292+
),
293+
projectCwd,
294+
);
291295
if (!refreshed && workspaceRefreshKeyRef.current === key) {
292296
retryLater();
293297
}

‎apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
125125
);
126126
assert.deepEqual(scoped, {
127127
...machineSnapshot,
128+
slashCommandsPending: false,
128129
slashCommands: [
129130
COMPACT_SLASH_COMMAND,
130131
{
@@ -154,10 +155,17 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
154155
}).pipe(Effect.scoped),
155156
);
156157

157-
it.effect("keeps failed workspace probes retryable and skips disabled providers", () =>
158+
it.effect("keeps readable skills during failed command discovery and recovers on retry", () =>
158159
Effect.gen(function* () {
159160
const fs = yield* FileSystem.FileSystem;
161+
const path = yield* Path.Path;
160162
const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-claude-workspace-retry-" });
163+
const skillDir = path.join(cwd, ".claude", "skills", "existing-skill");
164+
yield* fs.makeDirectory(skillDir, { recursive: true });
165+
yield* fs.writeFileString(
166+
path.join(skillDir, "SKILL.md"),
167+
"---\nname: existing-skill\ndescription: Existing project skill\n---\nUse this skill.",
168+
);
161169
const machineSnapshot = {
162170
instanceId: ProviderInstanceId.make("claude"),
163171
driver: ProviderDriverKind.make("claudeAgent"),
@@ -168,7 +176,7 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
168176
checkedAt: "2026-03-25T00:00:00.000Z",
169177
version: "2.1.288",
170178
models: [],
171-
slashCommands: [COMPACT_SLASH_COMMAND],
179+
slashCommands: [{ name: "server-cwd-only" }],
172180
skills: [],
173181
} satisfies ServerProvider;
174182
const query = vi.spyOn(ClaudeSdk, "query").mockImplementation(
@@ -187,7 +195,20 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
187195
yield* Effect.addFinalizer(() => Effect.sync(() => query.mockRestore()));
188196
const settings = decodeClaudeSettings({ homePath: cwd });
189197
const failed = yield* probeClaudeWorkspaceSnapshot(settings, machineSnapshot, cwd);
190-
assert.deepEqual(failed, { ...machineSnapshot, status: "error" });
198+
assert.deepEqual(failed, {
199+
...machineSnapshot,
200+
slashCommands: [COMPACT_SLASH_COMMAND],
201+
slashCommandsPending: true,
202+
skills: [
203+
{
204+
name: "existing-skill",
205+
path: path.join(skillDir, "SKILL.md"),
206+
enabled: true,
207+
scope: "project",
208+
description: "Existing project skill",
209+
},
210+
],
211+
});
191212
query.mockImplementation(
192213
() =>
193214
({
@@ -203,6 +224,8 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
203224
const recovered = yield* probeClaudeWorkspaceSnapshot(settings, machineSnapshot, cwd);
204225
assert.deepEqual(recovered.slashCommands, [COMPACT_SLASH_COMMAND, { name: "recovered" }]);
205226
assert.equal(recovered.status, "ready");
227+
assert.equal(recovered.slashCommandsPending, false);
228+
assert.deepEqual(recovered.skills, failed.skills);
206229
const disabled = yield* probeClaudeWorkspaceSnapshot(
207230
{ ...settings, enabled: false },
208231
machineSnapshot,

‎apps/server/src/provider/Layers/ClaudeProvider.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
import { resolveClaudeSdkExecutablePath } from "../Drivers/ClaudeExecutable.ts";
3838
import { makeClaudeEnvironment } from "../Drivers/ClaudeHome.ts";
3939
import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
40+
import type { ProviderWorkspaceSnapshot } from "../ProviderDriver.ts";
4041
import { makeUnavailableUsageLimits } from "../providerUsageLimits.ts";
4142
import {
4243
type ClaudeScopedLimitNames,
@@ -428,18 +429,18 @@ export const probeClaudeWorkspaceSnapshot = Effect.fn("probeClaudeWorkspaceSnaps
428429
machineSnapshot: ServerProvider,
429430
cwd: string,
430431
environment?: NodeJS.ProcessEnv,
431-
): Effect.fn.Return<ServerProvider, never, FileSystem.FileSystem | Path.Path> {
432+
): Effect.fn.Return<ProviderWorkspaceSnapshot, never, FileSystem.FileSystem | Path.Path> {
432433
if (!claudeSettings.enabled) return machineSnapshot;
433-
const capabilities = yield* probeClaudeCapabilities(claudeSettings, environment, cwd, false);
434-
if (!capabilities) {
435-
// The registry skips failed workspace snapshots, leaving discovery retryable.
436-
return { ...machineSnapshot, status: "error" };
437-
}
438434
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, environment);
435+
const capabilities = yield* probeClaudeCapabilities(claudeSettings, environment, cwd, false);
439436
return {
440437
...machineSnapshot,
441438
skills,
442-
slashCommands: dedupeSlashCommands([COMPACT_SLASH_COMMAND, ...capabilities.slashCommands]),
439+
slashCommands: dedupeSlashCommands([
440+
COMPACT_SLASH_COMMAND,
441+
...(capabilities?.slashCommands ?? []),
442+
]),
443+
slashCommandsPending: !capabilities,
443444
};
444445
});
445446

‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import {
6363
writeProviderStatusCache,
6464
} from "../providerStatusCache.ts";
6565
import { COMPACT_SLASH_COMMAND } from "../providerSnapshot.ts";
66-
import type { ProviderInstance } from "../ProviderDriver.ts";
66+
import type { ProviderInstance, ProviderWorkspaceSnapshot } from "../ProviderDriver.ts";
6767
import * as ProviderInstanceRegistry from "../Services/ProviderInstanceRegistry.ts";
6868
import * as ProviderRegistry from "../Services/ProviderRegistry.ts";
6969
import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
@@ -641,6 +641,34 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
641641
skills: scopedSnapshot.skills,
642642
},
643643
]);
644+
645+
const pendingSnapshot = {
646+
...scopedSnapshot,
647+
slashCommands: [COMPACT_SLASH_COMMAND],
648+
slashCommandsPending: true,
649+
} satisfies ProviderWorkspaceSnapshot;
650+
const partial = upsertProviderWorkspaceSnapshot(result, "/project", pendingSnapshot);
651+
assert.deepStrictEqual(partial.workspaceSnapshots?.[0]?.slashCommands, [
652+
{ name: "project" },
653+
]);
654+
assert.strictEqual(partial.workspaceSnapshots?.[0]?.slashCommandsPending, true);
655+
const otherProject = upsertProviderWorkspaceSnapshot(
656+
partial,
657+
"/other-project",
658+
pendingSnapshot,
659+
);
660+
assert.deepStrictEqual(otherProject.workspaceSnapshots?.[1]?.slashCommands, [
661+
COMPACT_SLASH_COMMAND,
662+
]);
663+
const recovered = upsertProviderWorkspaceSnapshot(partial, "/project", {
664+
...scopedSnapshot,
665+
slashCommands: [COMPACT_SLASH_COMMAND, { name: "replacement" }],
666+
});
667+
assert.deepStrictEqual(recovered.workspaceSnapshots?.[0]?.slashCommands, [
668+
COMPACT_SLASH_COMMAND,
669+
{ name: "replacement" },
670+
]);
671+
assert.strictEqual(recovered.workspaceSnapshots?.[0]?.slashCommandsPending, undefined);
644672
});
645673

646674
it("preserves previously discovered provider models when a refresh returns none", () => {
@@ -1573,7 +1601,12 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
15731601
slashCommands: [],
15741602
} as const satisfies ServerProvider;
15751603
const snapshotCalls = yield* Ref.make(0);
1576-
const scopedResult = yield* Ref.make<ServerProvider>(scopedProvider);
1604+
const scopedResult = yield* Ref.make<ProviderWorkspaceSnapshot>({
1605+
...scopedProvider,
1606+
status: "error",
1607+
slashCommands: [COMPACT_SLASH_COMMAND],
1608+
slashCommandsPending: true,
1609+
});
15771610
const cacheInvalidations = yield* Ref.make(0);
15781611
const scanGate = yield* Ref.make<{
15791612
readonly started: Deferred.Deferred<void>;
@@ -1698,8 +1731,27 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
16981731
providers[0]?.workspaceSnapshots?.[0]?.skills,
16991732
scopedProvider.skills,
17001733
);
1734+
assert.deepStrictEqual(providers[0]?.workspaceSnapshots?.[0]?.slashCommands, [
1735+
COMPACT_SLASH_COMMAND,
1736+
]);
1737+
assert.strictEqual(providers[0]?.workspaceSnapshots?.[0]?.slashCommandsPending, true);
1738+
yield* Ref.set(scopedResult, {
1739+
...scopedProvider,
1740+
status: "error",
1741+
slashCommandsPending: false,
1742+
});
1743+
yield* registry.refreshWorkspaceSnapshot({ instanceId, cwd: "/workspace" });
1744+
assert.strictEqual(yield* Ref.get(snapshotCalls), 3);
1745+
assert.deepStrictEqual(
1746+
(yield* registry.getProviders)[0]?.workspaceSnapshots?.[0]?.slashCommands,
1747+
scopedProvider.slashCommands,
1748+
);
1749+
assert.strictEqual(
1750+
(yield* registry.getProviders)[0]?.workspaceSnapshots?.[0]?.slashCommandsPending,
1751+
undefined,
1752+
);
17011753
yield* registry.refreshWorkspaceSnapshot({ instanceId, cwd: "/workspace" });
1702-
assert.strictEqual(yield* Ref.get(snapshotCalls), 2);
1754+
assert.strictEqual(yield* Ref.get(snapshotCalls), 3);
17031755
const newSkills = [
17041756
...scopedProvider.skills,
17051757
{ name: "added", path: "/workspace/added/SKILL.md", enabled: true },
@@ -1710,7 +1762,7 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
17101762
cwd: "/workspace",
17111763
fresh: true,
17121764
});
1713-
assert.strictEqual(yield* Ref.get(snapshotCalls), 3);
1765+
assert.strictEqual(yield* Ref.get(snapshotCalls), 4);
17141766
assert.strictEqual(yield* Ref.get(cacheInvalidations), 1);
17151767
assert.deepStrictEqual(
17161768
(yield* registry.getProviders)[0]?.workspaceSnapshots?.map((s) => s.skills),

‎apps/server/src/provider/Layers/ProviderRegistry.ts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import {
5353
resolveProviderStatusCachePath,
5454
writeProviderStatusCache,
5555
} from "../providerStatusCache.ts";
56-
import type { ProviderInstance } from "../ProviderDriver.ts";
56+
import type { ProviderInstance, ProviderWorkspaceSnapshot } from "../ProviderDriver.ts";
5757
import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
5858
import type { ProviderSnapshotSource } from "../builtInProviderCatalog.ts";
5959

@@ -94,12 +94,16 @@ function dropProviderWorkspaceSnapshot(provider: ServerProvider, cwd: string): S
9494
export function upsertProviderWorkspaceSnapshot(
9595
provider: ServerProvider,
9696
cwd: string,
97-
scopedSnapshot: ServerProvider,
97+
scopedSnapshot: ProviderWorkspaceSnapshot,
9898
): ServerProvider {
9999
const workspaceSnapshot = {
100100
cwd,
101101
checkedAt: scopedSnapshot.checkedAt,
102-
slashCommands: scopedSnapshot.slashCommands,
102+
slashCommands: scopedSnapshot.slashCommandsPending
103+
? (provider.workspaceSnapshots?.find((snapshot) => snapshot.cwd === cwd)?.slashCommands ??
104+
scopedSnapshot.slashCommands)
105+
: scopedSnapshot.slashCommands,
106+
...(scopedSnapshot.slashCommandsPending ? { slashCommandsPending: true } : {}),
103107
skills: scopedSnapshot.skills,
104108
} satisfies NonNullable<ServerProvider["workspaceSnapshots"]>[number];
105109
return {
@@ -918,7 +922,11 @@ export const ProviderRegistryLive = Layer.effect(
918922
const workspaceSnapshotOf = (candidate: ServerProvider | undefined) =>
919923
candidate?.workspaceSnapshots?.find((s) => s.cwd === input.cwd);
920924
const scannedFrom = workspaceSnapshotOf(provider);
921-
if (!provider || !provider.enabled || (!input.fresh && scannedFrom)) {
925+
if (
926+
!provider ||
927+
!provider.enabled ||
928+
(!input.fresh && scannedFrom && !scannedFrom.slashCommandsPending)
929+
) {
922930
return providers;
923931
}
924932
const instance = yield* instanceRegistry.getInstance(input.instanceId);
@@ -932,8 +940,7 @@ export const ProviderRegistryLive = Layer.effect(
932940
});
933941
// A fresh scan never joins a running one, which may predate the change.
934942
if (!claimed && !input.fresh) return yield* Ref.get(providersRef);
935-
// Fresh scans also re-read the machine snapshot: Claude's plugin
936-
// commands come from it, not from the cwd scan.
943+
// Fresh scans also re-read the machine snapshot after invalidating caches.
937944
const refreshMachineSnapshot = input.fresh
938945
? (instance.invalidateCaches ?? Effect.void).pipe(
939946
Effect.andThen(refreshInstance(input.instanceId)),
@@ -942,7 +949,7 @@ export const ProviderRegistryLive = Layer.effect(
942949
return yield* refreshMachineSnapshot.pipe(
943950
Effect.andThen(instance.snapshotForCwd(input.cwd)),
944951
Effect.flatMap((scopedSnapshot) =>
945-
scopedSnapshot.status === "error"
952+
scopedSnapshot.status === "error" && scopedSnapshot.slashCommandsPending === undefined
946953
? Ref.get(providersRef)
947954
: instanceRegistry.getInstance(input.instanceId).pipe(
948955
Effect.flatMap((currentInstance) => {

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import type {
3131
ProviderInstanceEnvironment,
3232
ProviderInstanceId,
3333
ServerProvider,
34+
ServerProviderWorkspaceSnapshot,
3435
} from "@t3tools/contracts";
3536
import type * as Effect from "effect/Effect";
3637
import type * as Schema from "effect/Schema";
@@ -59,6 +60,9 @@ export interface ProviderDriverMetadata {
5960
readonly supportsMultipleInstances?: boolean;
6061
}
6162

63+
export type ProviderWorkspaceSnapshot = ServerProvider &
64+
Pick<ServerProviderWorkspaceSnapshot, "slashCommandsPending">;
65+
6266
/**
6367
* One materialized provider instance. Held by the registry, looked up by
6468
* `instanceId`, torn down by closing the scope it was created in.
@@ -76,7 +80,9 @@ export interface ProviderInstance {
7680
readonly accentColor?: string | undefined;
7781
readonly enabled: boolean;
7882
readonly snapshot: ServerProviderShape;
79-
readonly snapshotForCwd?: (cwd: string) => Effect.Effect<ServerProvider, ProviderDriverError>;
83+
readonly snapshotForCwd?: (
84+
cwd: string,
85+
) => Effect.Effect<ProviderWorkspaceSnapshot, ProviderDriverError>;
8086
readonly refreshModels?: () => Effect.Effect<void, ProviderDriverError>;
8187
/** Invalidate T3-owned discovery caches before an explicit provider refresh. */
8288
readonly invalidateCaches?: Effect.Effect<void>;

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,7 @@ import {
11211121
formatProviderSkillDisplayName,
11221122
getProviderSlashCommandsForSlashMenu,
11231123
getProviderSkillsForSlashMenu,
1124+
hasCompleteProviderWorkspaceSnapshot,
11241125
resolveProviderSkillsForCwd,
11251126
resolveProviderSlashCommandsForCwd,
11261127
} from "@t3tools/client-runtime/providerSkills";
@@ -2182,9 +2183,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
21822183
const workspaceRefreshRetryRef = useRef<{ key: string; notBefore: number } | null>(null);
21832184
const hadWorkspaceSnapshotRef = useRef(false);
21842185
useEffect(() => {
2185-
const hasWorkspaceSnapshot = Boolean(
2186-
gitCwd &&
2187-
selectedProviderStatus?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === gitCwd),
2186+
const hasWorkspaceSnapshot = hasCompleteProviderWorkspaceSnapshot(
2187+
selectedProviderStatus,
2188+
gitCwd,
21882189
);
21892190
if (hadWorkspaceSnapshotRef.current && !hasWorkspaceSnapshot) {
21902191
workspaceRefreshKeyRef.current = null;
@@ -2195,8 +2196,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
21952196
useEffect(() => {
21962197
if (!gitCwd || !selectedProviderEntry) return;
21972198
const key = `${environmentId}:${selectedProviderEntry.instanceId}:${gitCwd}`;
2198-
const hasWorkspaceSnapshot = selectedProviderStatus?.workspaceSnapshots?.some(
2199-
(snapshot) => snapshot.cwd === gitCwd,
2199+
const hasWorkspaceSnapshot = hasCompleteProviderWorkspaceSnapshot(
2200+
selectedProviderStatus,
2201+
gitCwd,
22002202
);
22012203
if (workspaceRefreshKeyRef.current === key) return;
22022204
if (hasWorkspaceSnapshot) {
@@ -2221,9 +2223,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
22212223
}).then((result) => {
22222224
const hasWorkspaceSnapshot =
22232225
result._tag === "Success" &&
2224-
result.value.providers
2225-
.find((provider) => provider.instanceId === selectedProviderEntry.instanceId)
2226-
?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === gitCwd);
2226+
hasCompleteProviderWorkspaceSnapshot(
2227+
result.value.providers.find(
2228+
(provider) => provider.instanceId === selectedProviderEntry.instanceId,
2229+
),
2230+
gitCwd,
2231+
);
22272232
if (!hasWorkspaceSnapshot && workspaceRefreshKeyRef.current === key) {
22282233
retryLater();
22292234
}

0 commit comments

Comments
 (0)