Merge pull request #152 from laststance/codex/add-gstack-filters

[codex] Add G-Stack skill filter

Author: ryota-murakami

.gitignore

@@ -7,6 +7,7 @@ out/
 build/
 .vite/
 storybook-static/
+static-storybook/
 
 # Logs
 logs/

e2e/spec/hide-agents.e2e.ts

@@ -5,8 +5,8 @@ import { _electron } from '@playwright/test'
 
 import { test, expect } from '../fixtures/electron-app'
 import { isSnapshotOffline } from '../fixtures/isolated-home'
-import { readSettingsFile, writeSettingsFile } from '../helpers/settings-file'
 import { getStoreState, waitForInitialScan } from '../helpers/redux'
+import { readSettingsFile, writeSettingsFile } from '../helpers/settings-file'
 
 /**
  * PR #144 — Hide unused agents from the sidebar.

e2e/spec/regression.e2e.ts

@@ -872,10 +872,9 @@ test('skills list scroll position survives a background refetch (regression 5619
   // ABSENCE of unmount — there's nothing positive to poll for, only the
   // STABILITY of `scrollTop`. requestAnimationFrame is the synchronous
   // analogue: dispatch → reducer → React commit → next paint.
-  await appWindow.evaluate(
-    () =>
-      new Promise<void>((resolve) => requestAnimationFrame(() => resolve())),
-  )
+  await appWindow.evaluate(async () => {
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
+  })
 
   const scrollTopAfter = await appWindow.evaluate(() => {
     const scroller = document.querySelector<HTMLElement>(

e2e/spec/sync.e2e.ts

@@ -157,7 +157,7 @@ test('per-agent preview narrows scope and echoes forAgent', async ({
   // `{ agentId }` from the renderer, so wiring this through a click
   // would test more than the boundary we care about. The thunk + slice
   // path is already covered by the global test above.
-  const previewRaw = await appWindow.evaluate(() =>
+  const previewRaw = await appWindow.evaluate(async () =>
     window.electron.sync.preview({ agentId: 'cursor' }),
   )
   const preview = previewRaw as {

package.json

@@ -21,7 +21,7 @@
     "storybook": "storybook dev -p 6006",
     "storybook:build": "storybook build",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint .",
+    "lint": "eslint . --max-warnings 0",
     "lint:fix": "eslint . --fix",
     "fallow:dead-code": "pnpm exec fallow dead-code",
     "validate": "run-p lint test typecheck fallow:dead-code storybook:build",

src/renderer/src/components/layout/MainContent.browser.test.tsx

@@ -469,10 +469,10 @@ describe('MainContent handleConfirmBulk — uniform delete pipeline', () => {
   })
 })
 
-describe('MainContent SkillTypeFilter dropdown (Orphan option)', () => {
-  // Pins the agent-only Orphan affordance contract: the dropdown is gated by
-  // `selectedAgentId` (source view never offers it), and selecting Orphan
-  // narrows the visible list to skills whose source dir vanished.
+describe('MainContent SkillTypeFilter dropdown options', () => {
+  // Pins agent-only type filters: the dropdown is gated by `selectedAgentId`
+  // (source view never offers it), and each option writes the Redux state that
+  // selectors use to narrow the visible list.
 
   it('renders the Orphan radio item with a destructive dot when an agent is selected', async () => {
     const { screen, store } = await renderMainContent()
@@ -513,6 +513,41 @@ describe('MainContent SkillTypeFilter dropdown (Orphan option)', () => {
     ).not.toBeNull()
   })
 
+  it('renders the G-Stack radio item with a sky dot when an agent is selected', async () => {
+    const { screen, store } = await renderMainContent()
+    const { fetchAgents } =
+      await import('@/renderer/src/redux/slices/agentsSlice')
+    const { selectAgent } = await import('@/renderer/src/redux/slices/uiSlice')
+
+    store.dispatch(
+      fetchAgents.fulfilled(
+        [
+          {
+            id: 'cursor',
+            name: 'Cursor',
+            path: '/Users/me/.cursor/skills' as never,
+            exists: true,
+            skillCount: 0,
+            localSkillCount: 0,
+          },
+        ],
+        'req-id',
+      ),
+    )
+    store.dispatch(selectAgent('cursor'))
+
+    // Open the dropdown — G-Stack sits beside Symlinked/Local as a type filter.
+    await screen.getByRole('button', { name: /^All$/ }).click()
+
+    const gstackItem = screen.getByRole('menuitemradio', { name: /G-Stack/i })
+    await expect.element(gstackItem).toBeInTheDocument()
+    const dot = gstackItem.element().querySelector('.bg-gstack')
+    expect(
+      dot,
+      'G-Stack menu item should contain a span with bg-gstack',
+    ).not.toBeNull()
+  })
+
   it('selecting Orphan narrows visible list to skills with isOrphan=true', async () => {
     const { screen, store } = await renderMainContent()
     const { fetchAgents } =

src/renderer/src/components/layout/MainContent.tsx

@@ -108,6 +108,7 @@ const SKILL_TYPE_FILTER_OPTIONS: {
   { value: 'all', label: 'All' },
   { value: 'symlinked', label: 'Symlinked', dotClass: 'bg-success' },
   { value: 'local', label: 'Local', dotClass: 'bg-emerald-400' },
+  { value: 'gstack', label: 'G-Stack', dotClass: 'bg-gstack' },
   { value: 'orphan', label: 'Orphan', dotClass: 'bg-destructive' },
 ]
 

src/renderer/src/components/skills/skillItemHelpers.ts

@@ -1,4 +1,4 @@
-import { GSTACK_BADGE_AGENT_IDS } from '@/shared/constants'
+import { isGStackManagedForAgent } from '@/renderer/src/utils/gstackSkill'
 import type { AgentId, Skill, SymlinkInfo } from '@/shared/types'
 
 /**
@@ -37,31 +37,6 @@ export interface SkillItemVisibility {
  */
 export type SkillVisibilityInput = Pick<Skill, 'symlinks' | 'isOrphan'>
 
-/**
- * Path-segment matcher for `.../skills/gstack/...` on both POSIX and Windows
- * paths. Requires a `skills/` parent so a user-created directory literally
- * named `gstack` outside any agent's skills tree (e.g. `~/projects/gstack/foo`)
- * cannot trigger the badge — a finding raised by the Codex review.
- */
-const GSTACK_SEGMENT_PATTERN = /[\\/]skills[\\/]gstack([\\/]|$)/i
-
-/**
- * Detect whether a filesystem-like path points to a G-Stack-managed location.
- * @param candidatePath - Path candidate from symlink target or link path.
- * @returns
- * - `true`: Path contains a `skills/gstack/` segment.
- * - `false`: Empty path, or `gstack/` lives outside any `skills/` parent.
- * @example
- * isGStackBundlePath('/Users/me/.claude/skills/gstack/skill-a') // => true
- * @example
- * isGStackBundlePath('/Users/me/.agents/skills/task') // => false
- * @example
- * isGStackBundlePath('/Users/me/projects/gstack/skill-a') // => false
- */
-function isGStackBundlePath(candidatePath: string): boolean {
-  return GSTACK_SEGMENT_PATTERN.test(candidatePath)
-}
-
 /**
  * Compute which action buttons to show on a SkillItem card.
  *
@@ -128,23 +103,7 @@ export function getSkillItemVisibility(
   const hasSkillInSelectedAgent = !!selectedAgentSymlink || isLocalSkill
   // Orphan handling — see Skill.isOrphan for why the Add button is gated.
   // Source: scanOrphanSymlinks() in src/main/services/skillScanner.ts.
-  //
-  // gStackPathCandidates — paths inspected for the `skills/gstack/` segment
-  // that identifies a gstack-managed skill. `skillMdSymlinkTarget` is read
-  // ONLY from the selected agent's slot (per-agent attribution): a sibling
-  // agent's gstack-managed twin must not flip the badge on this agent's
-  // unrelated local skill that happens to share a name.
-  const gStackPathCandidates = [
-    selectedAgentSymlink?.targetPath ?? '',
-    selectedAgentSymlink?.linkPath ?? '',
-    selectedLocalSkillInfo?.linkPath ?? '',
-    selectedLocalSkillInfo?.skillMdSymlinkTarget ?? '',
-  ]
-  const isGStackEligibleAgent =
-    selectedAgentId !== null &&
-    GSTACK_BADGE_AGENT_IDS.some((agentId) => agentId === selectedAgentId)
-  const showGStackBadge =
-    isGStackEligibleAgent && gStackPathCandidates.some(isGStackBundlePath)
+  const showGStackBadge = isGStackManagedForAgent(skill, selectedAgentId)
 
   return {
     // Delete is the primary cleanup action for orphans in global view —

src/renderer/src/components/skills/skillsListHelpers.test.ts

@@ -64,6 +64,17 @@ describe('getEmptyListMessage', () => {
     ).toBe('No symlinked skills for this agent')
   })
 
+  it('returns the G-Stack variant when type filter is gstack', () => {
+    expect(
+      getEmptyListMessage({
+        searchQuery: '',
+        selectedSource: null,
+        selectedAgentId: 'cursor',
+        skillTypeFilter: 'gstack',
+      }),
+    ).toBe('No G-Stack skills for this agent')
+  })
+
   it('returns the agent-only message when selectedAgentId is set and type is all', () => {
     expect(
       getEmptyListMessage({

src/renderer/src/components/skills/skillsListHelpers.ts

@@ -10,6 +10,14 @@ interface EmptyMessageContext {
   skillTypeFilter: SkillTypeFilter
 }
 
+const SKILL_TYPE_FILTER_LABELS = {
+  all: 'all',
+  symlinked: 'symlinked',
+  local: 'local',
+  gstack: 'G-Stack',
+  orphan: 'orphan',
+} as const satisfies Record<SkillTypeFilter, string>
+
 /**
  * Compute the empty-state message for SkillsList based on which filters are
  * currently narrowing the result. The skills list participates in four
@@ -34,7 +42,7 @@ interface EmptyMessageContext {
  * - When `searchQuery` is non-empty: `"No skills match your search"`
  * - When only `selectedSource` is set: `"No skills from <repo>"`
  * - When `selectedAgentId` is set AND `skillTypeFilter !== 'all'`:
- *   `"No <symlinked|local> skills for this agent"`
+ *   `"No <symlinked|local|G-Stack|orphan> skills for this agent"`
  * - When only `selectedAgentId` is set: `"No skills installed for this agent"`
  * - Otherwise: `"No skills match your filter"`
  *
@@ -70,7 +78,8 @@ export function getEmptyListMessage(ctx: EmptyMessageContext): string {
     )
     .with(
       { hasSelectedAgent: true, hasTypeNarrow: true },
-      () => `No ${ctx.skillTypeFilter} skills for this agent`,
+      () =>
+        `No ${SKILL_TYPE_FILTER_LABELS[ctx.skillTypeFilter]} skills for this agent`,
     )
     .with(
       { hasSelectedAgent: true },