Merge remote-tracking branch 'origin/main' into feat/gitlab-issues-mrs

# Conflicts:
#	packages/ui/src/components/chat/work-status/WorkStatusContextSection.tsx
#	packages/ui/src/components/chat/work-status/WorkStatusPrimaryGroup.tsx

packages/web/server/lib/opencode/feature-routes-runtime.js

@@ -48,12 +48,11 @@ import {
 import { SKILL_DIR, SKILL_SCOPE, readSkillSupportingFile, writeSkillSupportingFile, deleteSkillSupportingFile } from './shared.js';
 import { getSkillSources, discoverSkills, mergeDiscoveredSkills, createSkill, updateSkill, deleteSkill, renameSkill, isManagedSkillPath } from './skills.js';
 import { getCuratedSkillsSources } from '../skills-catalog/curated-sources.js';
-import { getCacheKey, getCachedScan, setCachedScan } from '../skills-catalog/cache.js';
-import { isClawdHubSource, parseSkillRepoSource } from '../skills-catalog/source.js';
+import { getCacheKey, scanWithCache } from '../skills-catalog/cache.js';
+import { parseSkillRepoSource } from '../skills-catalog/source.js';
 import { scanSkillsRepository } from '../skills-catalog/scan.js';
 import { installSkillsFromRepository } from '../skills-catalog/install.js';
-import { scanClawdHubPage } from '../skills-catalog/clawdhub/scan.js';
-import { installSkillsFromClawdHub } from '../skills-catalog/clawdhub/install.js';
+import { fetchGitHubRepoMetas } from '../skills-catalog/github-meta.js';
 
 export const createFeatureRoutesRuntime = (dependencies) => {
   const {
@@ -290,14 +289,11 @@ export const createFeatureRoutesRuntime = (dependencies) => {
       SKILL_DIR,
       getCuratedSkillsSources,
       getCacheKey,
-      getCachedScan,
-      setCachedScan,
+      scanWithCache,
       parseSkillRepoSource,
       scanSkillsRepository,
       installSkillsFromRepository,
-      scanClawdHubPage,
-      installSkillsFromClawdHub,
-      isClawdHubSource,
+      fetchGitHubRepoMetas,
       getProfiles,
       getProfile,
     });