@@ -669,6 +669,39 @@ it.layer(
         { name: "replacement" },
       ]);
       assert.strictEqual(recovered.workspaceSnapshots?.[0]?.slashCommandsPending, undefined);
+
+      const skillOnlySnapshot = {
+        ...scopedSnapshot,
+        status: "error",
+        slashCommands: [],
+        skills: [{ name: "updated", path: "/project/updated/SKILL.md", enabled: true }],
+        workspaceDiscoverySucceeded: true,
+      } satisfies ProviderWorkspaceSnapshot;
+      const skillOnly = ProviderRegistry.upsertProviderWorkspaceSnapshot(
+        recovered,
+        "/project",
+        skillOnlySnapshot,
+      );
+      assert.deepStrictEqual(
+        skillOnly.workspaceSnapshots?.[0]?.slashCommands,
+        recovered.workspaceSnapshots?.[0]?.slashCommands,
+      );
+      assert.deepStrictEqual(skillOnly.workspaceSnapshots?.[0]?.skills, skillOnlySnapshot.skills);
+      const emptied = ProviderRegistry.upsertProviderWorkspaceSnapshot(skillOnly, "/project", {
+        ...skillOnlySnapshot,
+        skills: [],
+      });
+      assert.deepStrictEqual(
+        emptied.workspaceSnapshots?.[0]?.slashCommands,
+        recovered.workspaceSnapshots?.[0]?.slashCommands,
+      );
+      assert.deepStrictEqual(emptied.workspaceSnapshots?.[0]?.skills, []);
+      const healthyEmpty = ProviderRegistry.upsertProviderWorkspaceSnapshot(emptied, "/project", {
+        ...skillOnlySnapshot,
+        status: "ready",
+        skills: [],
+      });
+      assert.deepStrictEqual(healthyEmpty.workspaceSnapshots?.[0]?.slashCommands, []);
     });
 
     it("preserves previously discovered provider models when a refresh returns none", () => {
 
@@ -186,10 +186,13 @@ export function upsertProviderWorkspaceSnapshot(
   cwd: string,
   scopedSnapshot: ProviderWorkspaceSnapshot,
 ): ServerProvider {
+  const preserveSlashCommands =
+    scopedSnapshot.slashCommandsPending ||
+    (scopedSnapshot.status === "error" && scopedSnapshot.workspaceDiscoverySucceeded);
   const workspaceSnapshot = {
     cwd,
     checkedAt: scopedSnapshot.checkedAt,
-    slashCommands: scopedSnapshot.slashCommandsPending
+    slashCommands: preserveSlashCommands
       ? (provider.workspaceSnapshots?.find((snapshot) => snapshot.cwd === cwd)?.slashCommands ??
         scopedSnapshot.slashCommands)
       : scopedSnapshot.slashCommands,