fix(skills): match ClawHub entries by slug when gateway skillKey differs

src/stores/chat.ts

@@ -1386,6 +1386,23 @@ export const useChatStore = create<ChatState>((set, get) => ({
         }
       }
 
+      // Guard: during an active send, don't let a history poll replace the local
+      // conversation with fewer messages from the gateway. This can happen when
+      // the gateway is reconnecting after a brief disconnect or hasn't fully
+      // persisted the conversation yet. Without this guard, the history poll
+      // causes chat history to vanish mid-conversation (issue #709).
+      {
+        const preApplyState = get();
+        if (
+          preApplyState.sending &&
+          preApplyState.lastUserMessageAt &&
+          finalMessages.length < preApplyState.messages.length &&
+          preApplyState.messages.length > 1
+        ) {
+          finalMessages = preApplyState.messages;
+        }
+      }
+
       set({ messages: finalMessages, thinkingLevel, loading: false });
 
       // Extract first user message text as a session label for display in the toolbar.

src/stores/skills.ts

@@ -138,7 +138,7 @@ export const useSkillsStore = create<SkillsState>((set, get) => ({
       // Merge with ClawHub results
       if (clawhubResult.success && clawhubResult.results) {
         clawhubResult.results.forEach((cs: ClawHubListResult) => {
-          const existing = combinedSkills.find(s => s.id === cs.slug);
+          const existing = combinedSkills.find(s => s.id === cs.slug || s.slug === cs.slug);
           if (existing) {
             if (!existing.baseDir && cs.baseDir) {
               existing.baseDir = cs.baseDir;

tests/unit/skills-errors.test.ts

@@ -15,6 +15,34 @@ vi.mock('@/stores/gateway', () => ({
   },
 }));
 
+describe('skills store slug matching', () => {
+  beforeEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+  });
+
+  it('matches ClawHub skill to gateway skill when gateway slug differs from skillKey', async () => {
+    // Gateway returns skillKey "foo-v2" but slug "foo"
+    rpcMock.mockResolvedValueOnce({
+      skills: [{ skillKey: 'foo-v2', slug: 'foo', name: 'Foo Skill', description: 'A skill', disabled: false }],
+    });
+    // ClawHub lists "foo" as installed (matching by slug, not skillKey)
+    hostApiFetchMock
+      .mockResolvedValueOnce({ success: true, results: [{ slug: 'foo', version: '1.0.0' }] })
+      .mockResolvedValueOnce({});
+
+    const { useSkillsStore } = await import('@/stores/skills');
+    await useSkillsStore.getState().fetchSkills();
+
+    const skills = useSkillsStore.getState().skills;
+    // Should be exactly one skill, not two (no placeholder duplicate)
+    expect(skills).toHaveLength(1);
+    // The skill should be the gateway skill (not the "Recently installed" placeholder)
+    expect(skills[0].name).toBe('Foo Skill');
+    expect(skills[0].description).not.toBe('Recently installed, initializing...');
+  });
+});
+
 describe('skills store error mapping', () => {
   beforeEach(() => {
     vi.resetModules();