@bibobonking/opensol 3.1.4 → 3.1.5

package/src/lib/boot.ts

@@ -4,6 +4,7 @@ import { ensureSession, getState, migrateLegacy } from './daemon'
 import { enableChatPersistence, useChats } from '../store/chats'
 import { enableSettingsPersistence, useSettings } from '../store/settings'
 import { useWorkspace } from '../store/workspace'
+import { useSkills } from '../store/skills'
 
 const LEGACY_KEYS = {
   settings: 'maxcode-settings-v1',
@@ -59,6 +60,7 @@ export async function applySnapshot(snapshot: DaemonSnapshot): Promise<void> {
   useSettings.getState().hydrate(snapshot)
   useChats.getState().hydrate(snapshot.chats)
   await useWorkspace.getState().hydrate(snapshot.workspace)
+  void useSkills.getState().load()
 }
 
 function parseLegacy(value: string | null): unknown {

package/src/lib/credits.ts

@@ -0,0 +1,33 @@
+import type { Message, ModelInfo, Usage } from '../types'
+
+/**
+ * Credits for one reply. Providers that report their own cost win; otherwise the cost is
+ * tokens × the model's published price (USD per 1M tokens). Unknown or free models give
+ * undefined, so nothing is shown for them.
+ */
+export function messageCost(
+  usage: Usage | undefined,
+  model: Pick<ModelInfo, 'pricing'> | null | undefined,
+): number | undefined {
+  if (!usage) return undefined
+  if (typeof usage.cost === 'number' && Number.isFinite(usage.cost) && usage.cost > 0) return usage.cost
+  const pricing = model?.pricing
+  if (!pricing) return undefined
+  const cost = ((usage.input ?? 0) * pricing.input + (usage.output ?? 0) * pricing.output) / 1_000_000
+  return cost > 0 ? cost : undefined
+}
+
+export function sumCost(messages: Message[]): number {
+  let total = 0
+  for (const message of messages) {
+    if (message.role === 'assistant' && typeof message.cost === 'number') total += message.cost
+  }
+  return total
+}
+
+export function formatCredits(value: number): string {
+  if (value <= 0) return '$0.00'
+  if (value < 0.01) return `$${value.toFixed(4)}`
+  if (value < 1) return `$${value.toFixed(3)}`
+  return `$${value.toFixed(2)}`
+}

package/src/lib/daemon.ts

@@ -3,6 +3,7 @@ import type {
   AppSettings,
   ChatSession,
   DaemonSnapshot,
+  DeployDetection,
   DeployEvent,
   DeployProviderId,
   DeployRequest,
@@ -12,10 +13,10 @@ import type {
   ProviderId,
   ProviderStatus,
   SecretsSummary,
-  Skill,
   WorkspaceFile,
   WorkspaceInfo,
 } from '../types'
+import type { InstalledSkill } from '../types'
 import type { PluginManifest, PluginCapability } from '../../shared/plugin-package.mjs'
 
 export interface InstalledPlugin {
@@ -264,10 +265,6 @@ export function setDeployCredentials(provider: DeployProviderId, fields: Record<
   })
 }
 
-export function installSkillFromNpmRequest(packageName: string) {
-  return api<{ skill: Skill }>('/api/skills/install', { method: 'POST', body: JSON.stringify({ package: packageName }) })
-}
-
 export function resetScope(scope: 'history' | 'secrets' | 'settings' | 'all'): Promise<DaemonSnapshot> {
   return api('/api/reset', jsonBody({ scope }))
 }
@@ -457,20 +454,6 @@ export async function requestLLM(
   return response
 }
 
-export interface DeployInspection {
-  path: string
-  name: string
-  hasPackageJson: boolean
-  framework: string
-  buildCommand: string
-  outputDir: string
-  existingOutputs: string[]
-}
-
-export function inspectDeploy(path: string): Promise<DeployInspection> {
-  return api('/api/deploy/inspect', { method: 'POST', body: JSON.stringify({ path }) })
-}
-
 export async function* streamDeploy(
   request: DeployRequest,
   signal?: AbortSignal,
@@ -530,3 +513,41 @@ export async function* streamDeploy(
 }
 
 export type { DeployResult, SecretsSummary }
+
+export interface SkillUploadFile {
+  path: string
+  /** base64 */
+  data: string
+}
+
+export function listSkillsApi(): Promise<{ skills: InstalledSkill[] }> {
+  return api('/api/skills')
+}
+
+export function uploadSkillFiles(files: SkillUploadFile[]): Promise<{ installed: string[]; skills: InstalledSkill[] }> {
+  return api('/api/skills/upload', jsonBody({ files }))
+}
+
+export function installSkillNpm(spec: string): Promise<{ installed: string[]; skills: InstalledSkill[] }> {
+  return api('/api/skills/npm', jsonBody({ spec }))
+}
+
+export function setSkillEnabledApi(name: string, enabled: boolean): Promise<{ skills: InstalledSkill[] }> {
+  return api(`/api/skills/${encodeURIComponent(name)}/enabled`, { method: 'PUT', body: JSON.stringify({ enabled }) })
+}
+
+export function removeSkillApi(name: string): Promise<{ skills: InstalledSkill[] }> {
+  return api(`/api/skills/${encodeURIComponent(name)}`, { method: 'DELETE' })
+}
+
+export function readSkillApi(
+  name: string,
+  file?: string,
+): Promise<{ name: string; file: string; directory: string; content: string; files?: string[] }> {
+  return api('/api/skills/read', jsonBody({ name, file }))
+}
+
+export async function detectDeployProject(path: string): Promise<DeployDetection> {
+  const result = await api<{ project: DeployDetection }>('/api/deploy/detect', jsonBody({ path }))
+  return result.project
+}

package/src/lib/permissions.ts

@@ -21,7 +21,7 @@ export const PERMISSION_MODES: Array<{ value: PermissionMode; label: string; des
 ]
 
 const WRITE_TOOLS: BuiltinToolName[] = ['write_file', 'edit_file', 'rewrite_file']
-const GUARDED_TOOLS: BuiltinToolName[] = ['shell', 'git', 'subagent', 'skill']
+const GUARDED_TOOLS: BuiltinToolName[] = ['shell', 'git', 'subagent']
 
 export function permissionMode(tools: AppSettings['tools']): PermissionMode {
   const writesAuto = WRITE_TOOLS.every((tool) => tools[tool]?.approval === 'auto')

package/src/lib/retry.test.mjs

@@ -1,17 +1,45 @@
-import test from 'node:test'
 import assert from 'node:assert/strict'
-import { MAX_PROVIDER_RETRIES, isRetryableProviderError, retryDelayMs } from './retry.ts'
+import test from 'node:test'
+import { backoffMs, classifyProviderError, retryAfterMs } from './retry.ts'
+
+test('retries transient errors', () => {
+  for (const message of [
+    'OpenAI returned 429: Rate limit reached for requests per minute. Please retry in 6s.',
+    'Anthropic is overloaded (529)',
+    '503 Service Unavailable',
+    'The request timed out',
+    'Lost the connection to the local daemon',
+    '500 Internal Server Error',
+  ]) {
+    assert.equal(classifyProviderError(message).retry, true, message)
+  }
+})
+
+test('never retries limits that were reached or other permanent errors', () => {
+  for (const message of [
+    'You exceeded your current quota, please check your plan and billing details. (429)',
+    'Usage limit reached for this month',
+    'insufficient_quota',
+    'Insufficient credits. Add credits to continue (402)',
+    '401 Invalid API key',
+    '403 Forbidden',
+    '400 invalid_request_error: context length exceeded',
+    '404 model not found',
+    'Daily limit reached',
+  ]) {
+    assert.equal(classifyProviderError(message).retry, false, message)
+  }
+})
 
-test('provider hiccups are retried, auth and validation errors are not', () => {
-  assert.equal(isRetryableProviderError('429 Too Many Requests'), true)
-  assert.equal(isRetryableProviderError('503 Service Unavailable'), true)
-  assert.equal(isRetryableProviderError('socket hang up: ECONNRESET'), true)
-  assert.equal(isRetryableProviderError('401 Unauthorized: invalid api key'), false)
-  assert.equal(isRetryableProviderError('400 invalid request: unknown field'), false)
+test('unknown errors are not retried', () => {
+  assert.equal(classifyProviderError('Something odd happened').retry, false)
 })
 
-test('five retries with a capped backoff', () => {
-  assert.equal(MAX_PROVIDER_RETRIES, 5)
-  assert.equal(retryDelayMs(1), 1200)
-  assert.equal(retryDelayMs(5), 8000)
+test('reads provider retry hints and backs off with a floor', () => {
+  assert.equal(retryAfterMs('Please retry in 6s'), 6000)
+  assert.equal(retryAfterMs('retry-after: 2'), 2000)
+  assert.equal(retryAfterMs('nothing here'), undefined)
+  assert.equal(backoffMs(1, '', () => 0.5), 1500)
+  assert.equal(backoffMs(3, '', () => 0.5), 6000)
+  assert.equal(backoffMs(1, 'retry in 10s', () => 0.5), 10000)
 })

package/src/lib/retry.ts

@@ -1,13 +1,46 @@
-/** Automatic retries for provider hiccups: overload, rate limits, 5xx and dropped connections. */
-export const MAX_PROVIDER_RETRIES = 5
+/**
+ * Decides whether a provider error is worth retrying.
+ *
+ * Transient problems (rate-limit bursts, overload, 5xx, dropped connections) are retried.
+ * Permanent ones (quota or credits exhausted, bad key, bad request, context too long) never are,
+ * because waiting cannot fix them. A 429 that says the quota or limit was *reached* is permanent too.
+ */
+export const MAX_RETRIES = 5
 
-const RETRYABLE =
-  /\b(408|409|425|429|500|502|503|504|522|524|529)\b|rate.?limit|overloaded|temporar|timed out|could not be reached|lost the connection|failed to fetch|networkerror|econnreset|etimedout|enotfound|eai_again/i
+const PERMANENT =
+  /quota|insufficient[_ ]?(funds|credit|balance)|out of credits?|no credits?|billing|payment required|\b402\b|credit balance|limit (has been )?(reached|exceeded)|reached (the |your )?(\w+ )?limit|exceeded (your |the )?(current )?(quota|limit|plan)|usage limit|monthly limit|daily limit|spend(ing)? limit|invalid[_ ]?(api[_ ]?)?key|incorrect api key|unauthori[sz]ed|\b401\b|\b403\b|forbidden|permission|not found|\b404\b|invalid[_ ]request|\b400\b|context (length|window)|too many tokens|maximum context|content[_ ]policy|safety|model .*(not|does not)|credentials|deprecated/i
 
-export function isRetryableProviderError(message: string): boolean {
-  return RETRYABLE.test(message)
+const TRANSIENT =
+  /\b(429|500|502|503|504|520|521|522|523|524|529)\b|rate.?limit|too many requests|overloaded|capacity|temporar|try again|unavailable|timed? ?out|timeout|could not be reached|lost the connection|failed to fetch|networkerror|network error|econnreset|etimedout|socket hang up|bad gateway|gateway|stream (ended|closed)|internal server error|server error/i
+
+export type RetryDecision = { retry: boolean; reason: 'transient' | 'permanent' | 'unknown' }
+
+export function classifyProviderError(message: string): RetryDecision {
+  const text = message || ''
+  // Short-window throttling ("rate limit … per minute", "retry in 6s") clears by itself, even when it says
+  // "reached". Anything about quota, credits, billing or a monthly/daily cap does not.
+  const burst = /rate.?limit|too many requests|slow down|per[- ]minute|per[- ]second|requests? per|retry (in|after)|try again (in|later)/i.test(text)
+  const hardCap = /quota|credit|billing|balance|usage limit|monthly|daily|spend(ing)? limit|exceeded your (current )?(plan|limit)|payment|\b402\b/i.test(text)
+  if (burst && !hardCap && !/invalid|unauthori|forbidden|\b40[0134]\b/i.test(text)) return { retry: true, reason: 'transient' }
+  if (PERMANENT.test(text)) return { retry: false, reason: 'permanent' }
+  if (TRANSIENT.test(text)) return { retry: true, reason: 'transient' }
+  return { retry: false, reason: 'unknown' }
+}
+
+/** Seconds the provider asked us to wait ("retry in 12s", "retry-after: 30"), if it said. */
+export function retryAfterMs(message: string): number | undefined {
+  const match = /(?:retry[- ]after|retry in|try again in|wait)\D{0,6}(\d+(?:\.\d+)?)\s*(ms|milliseconds?|s|sec|seconds?|m|min)?/i.exec(message || '')
+  if (!match) return undefined
+  const value = Number(match[1])
+  if (!Number.isFinite(value)) return undefined
+  const unit = (match[2] ?? 's').toLowerCase()
+  const ms = unit.startsWith('ms') || unit.startsWith('milli') ? value : unit.startsWith('m') && unit !== 'ms' && !unit.startsWith('milli') ? value * 60_000 : value * 1000
+  return Math.min(Math.max(ms, 500), 60_000)
 }
 
-export function retryDelayMs(attempt: number): number {
-  return Math.min(1200 * attempt * attempt, 8000)
+/** Exponential backoff (1.5s, 3s, 6s, 12s, 24s) with jitter, never shorter than the provider's hint. */
+export function backoffMs(attempt: number, message = '', random = Math.random): number {
+  const base = Math.min(1500 * 2 ** (attempt - 1), 24_000)
+  const jittered = base * (0.8 + random() * 0.4)
+  return Math.round(Math.max(jittered, retryAfterMs(message) ?? 0))
 }

package/src/lib/system-prompt.ts

@@ -0,0 +1,23 @@
+import type { AppSettings, ChatSession } from '../types'
+
+export type PromptSource = 'session' | 'workspace' | 'app'
+
+/** The prompt a scope would fall back to when it is set to "shared". */
+export function inheritedPrompt(settings: Pick<AppSettings, 'systemPrompt' | 'workspacePrompts'>, root: string): {
+  text: string
+  source: Exclude<PromptSource, 'session'>
+} {
+  const custom = root ? settings.workspacePrompts?.[root] : undefined
+  if (typeof custom === 'string') return { text: custom, source: 'workspace' }
+  return { text: settings.systemPrompt, source: 'app' }
+}
+
+/** Session custom → workspace custom → app-wide prompt. */
+export function resolveBasePrompt(
+  settings: Pick<AppSettings, 'systemPrompt' | 'workspacePrompts'>,
+  session: Pick<ChatSession, 'systemPrompt'> | null | undefined,
+  root: string,
+): { text: string; source: PromptSource } {
+  if (typeof session?.systemPrompt === 'string') return { text: session.systemPrompt, source: 'session' }
+  return inheritedPrompt(settings, root)
+}

package/src/lib/usage.ts

@@ -6,6 +6,7 @@ export interface ModelUsage {
   model: string
   messages: number
   tokens: number
+  cost: number
 }
 
 export interface HeatmapDay {
@@ -18,7 +19,7 @@ export interface UsageStats {
   sessions: number
   messages: number
   tokens: number
-  credits: number
+  cost: number
   activeDays: number
   peakHour: string
   favoriteModel: string
@@ -82,7 +83,7 @@ export function computeUsage(sessions: ChatSession[], range: UsageRange, now = D
   const days = new Map<string, HeatmapDay>()
   const models = new Map<string, ModelUsage>()
   let tokens = 0
-  let credits = 0
+  let cost = 0
 
   for (const { message, session } of messages) {
     const at = messageTime(message, session.updatedAt)
@@ -95,14 +96,14 @@ export function computeUsage(sessions: ChatSession[], range: UsageRange, now = D
     if (message.role !== 'assistant') continue
     const messageTokens = estimateTokens(message)
     tokens += messageTokens
-    if (typeof message.usage?.cost === 'number' && Number.isFinite(message.usage.cost)) {
-      credits += Math.max(0, message.usage.cost)
-    }
+    const messageCredits = typeof message.cost === 'number' ? message.cost : 0
+    cost += messageCredits
     const model = typeof message.model === 'string' ? message.model.trim() : ''
     if (!model) continue
-    const entry = models.get(model) ?? { model, messages: 0, tokens: 0 }
+    const entry = models.get(model) ?? { model, messages: 0, tokens: 0, cost: 0 }
     entry.messages += 1
     entry.tokens += messageTokens
+    entry.cost += messageCredits
     models.set(model, entry)
   }
 
@@ -124,7 +125,7 @@ export function computeUsage(sessions: ChatSession[], range: UsageRange, now = D
     sessions: filteredSessions.length,
     messages: messages.length,
     tokens,
-    credits,
+    cost,
     activeDays: days.size,
     peakHour: messages.length ? hourLabel(peak) : '—',
     favoriteModel: favorite?.model ?? '—',
@@ -154,12 +155,6 @@ export function formatTokens(value: number): string {
   return String(value)
 }
 
-export function formatCredits(value: number): string {
-  if (!value) return '—'
-  if (value < 0.01) return `$${value.toFixed(4)}`
-  return `$${value.toFixed(2)}`
-}
-
 export function shortModelName(model: string): string {
   if (!model || model === '—') return model
   const parts = model.split('/')

package/src/store/chats.ts

@@ -48,7 +48,6 @@ function normalizeSession(session: ChatSession): ChatSession {
     updatedAt: typeof session.updatedAt === 'number' ? session.updatedAt : Date.now(),
     mode: session.mode === 'plan' ? 'plan' : session.mode === 'build' ? 'build' : undefined,
     workspace: typeof session.workspace === 'string' ? session.workspace : undefined,
-    systemPrompt: typeof session.systemPrompt === 'string' ? session.systemPrompt : undefined,
     titleSource:
       session.titleSource === 'ai' || session.titleSource === 'user' || session.titleSource === 'auto'
         ? session.titleSource

package/src/store/settings.ts

@@ -9,7 +9,6 @@ import type {
   ProviderId,
   SecretEntry,
   SecretsSummary,
-  Skill,
   BuiltinToolName,
   ToolSetting,
 } from '../types'
@@ -58,7 +57,7 @@ const DEFAULT_TOOLS: Record<BuiltinToolName, ToolSetting> = {
   read_url: { enabled: true, approval: 'auto' },
   git: { enabled: true, approval: 'ask' },
   subagent: { enabled: true, approval: 'ask' },
-  skill: { enabled: true, approval: 'ask' },
+  skill: { enabled: true, approval: 'auto' },
 }
 
 const DEFAULTS: AppSettings = {
@@ -73,7 +72,6 @@ const DEFAULTS: AppSettings = {
   providers: {},
   searchProvider: 'duckduckgo',
   tools: DEFAULT_TOOLS,
-  skills: [],
   theme: 'system',
   showTokenEstimate: true,
   mode: 'build',
@@ -102,9 +100,6 @@ interface SettingsStore extends AppSettings {
   saveDeployCredentials: (provider: DeployProviderId, fields: Record<string, string>) => Promise<void>
   refreshProviders: () => Promise<void>
   updateTool: (tool: BuiltinToolName, patch: Partial<ToolSetting>) => void
-  addSkill: (skill: Skill) => void
-  updateSkill: (id: string, patch: Partial<Skill>) => void
-  removeSkill: (id: string) => void
   setMode: (mode: AppSettings['mode']) => void
   flush: () => Promise<void>
 }
@@ -122,18 +117,6 @@ function mergeTools(saved?: Partial<Record<BuiltinToolName, Partial<ToolSetting>
   return merged
 }
 
-function mergeSkills(saved?: Skill[]) {
-  // Built-in skills were removed; drop any leftovers persisted by older versions.
-  return (saved ?? [])
-    .filter((skill): skill is Skill => Boolean(skill) && typeof skill.id === 'string' && typeof skill.name === 'string' && !skill.builtIn)
-    .map((skill) => ({
-      ...skill,
-      description: typeof skill.description === 'string' ? skill.description : '',
-      instructions: typeof skill.instructions === 'string' ? skill.instructions : '',
-      enabled: skill.enabled !== false,
-    }))
-}
-
 function upgradePrompt(value: unknown) {
   if (typeof value !== 'string' || !value.trim()) return DEFAULT_SYSTEM_PROMPT
   const legacy =
@@ -143,6 +126,15 @@ function upgradePrompt(value: unknown) {
   return legacy ? DEFAULT_SYSTEM_PROMPT : value
 }
 
+function sanitizeWorkspacePrompts(value: unknown): Record<string, string> {
+  const out: Record<string, string> = {}
+  if (!value || typeof value !== 'object') return out
+  for (const [root, prompt] of Object.entries(value as Record<string, unknown>)) {
+    if (root && typeof prompt === 'string') out[root] = prompt
+  }
+  return out
+}
+
 function sanitizeBaseUrls(saved: AppSettings['providers'] | undefined) {
   const providers: AppSettings['providers'] = {}
   for (const [id, value] of Object.entries(saved ?? {})) {
@@ -181,21 +173,12 @@ function buildSettings(persisted?: Partial<AppSettings>): AppSettings {
         ? Math.max(256, Math.min(200_000, Math.round(saved.maxTokens)))
         : DEFAULTS.maxTokens,
     systemPrompt: upgradePrompt(saved.systemPrompt),
-    workspacePrompts:
-      saved.workspacePrompts && typeof saved.workspacePrompts === 'object'
-        ? Object.fromEntries(
-            Object.entries(saved.workspacePrompts).filter(
-              ([key, value]) => key.startsWith('/') && typeof value === 'string',
-            ),
-          )
-        : {},
     providers: sanitizeBaseUrls(saved.providers),
     searchProvider:
       saved.searchProvider && ['duckduckgo', 'tavily', 'brave', 'serper'].includes(saved.searchProvider)
         ? saved.searchProvider
         : DEFAULTS.searchProvider,
     tools: mergeTools(saved.tools),
-    skills: mergeSkills(saved.skills),
     theme: normalizeTheme(saved.theme),
     chatFontSize:
       typeof saved.chatFontSize === 'number' && Number.isFinite(saved.chatFontSize)
@@ -204,6 +187,7 @@ function buildSettings(persisted?: Partial<AppSettings>): AppSettings {
     workDetail: saved.workDetail === 'concise' ? 'concise' : 'detailed',
     autoCollapseWork: saved.autoCollapseWork !== false,
     aiSessionTitles: saved.aiSessionTitles !== false,
+    workspacePrompts: sanitizeWorkspacePrompts(saved.workspacePrompts),
   }
 }
 
@@ -222,11 +206,9 @@ function persistedPatch(patch: Partial<AppSettings>): Partial<AppSettings> {
     'temperature',
     'maxTokens',
     'systemPrompt',
-    'workspacePrompts',
     'providers',
     'searchProvider',
     'tools',
-    'skills',
     'theme',
     'showTokenEstimate',
     'mode',
@@ -234,6 +216,7 @@ function persistedPatch(patch: Partial<AppSettings>): Partial<AppSettings> {
     'workDetail',
     'autoCollapseWork',
     'aiSessionTitles',
+    'workspacePrompts',
   ]
   for (const key of keys) {
     if (key in patch) out[key] = patch[key]
@@ -382,21 +365,6 @@ export const useSettings = create<SettingsStore>()((set, get) => ({
     set(next)
     queueSave(next)
   },
-  addSkill: (skill) => {
-    const next = { skills: [...get().skills, skill] }
-    set(next)
-    queueSave(next)
-  },
-  updateSkill: (id, patch) => {
-    const next = { skills: get().skills.map((skill) => (skill.id === id ? { ...skill, ...patch } : skill)) }
-    set(next)
-    queueSave(next)
-  },
-  removeSkill: (id) => {
-    const next = { skills: get().skills.filter((skill) => skill.id !== id) }
-    set(next)
-    queueSave(next)
-  },
   setMode: (mode) => {
     const patch = { mode }
     set(patch)

package/src/store/skills.ts

@@ -0,0 +1,79 @@
+import { create } from 'zustand'
+import type { InstalledSkill } from '../types'
+import {
+  installSkillNpm,
+  listSkillsApi,
+  removeSkillApi,
+  setSkillEnabledApi,
+  uploadSkillFiles,
+  type SkillUploadFile,
+} from '../lib/daemon'
+
+interface SkillsState {
+  skills: InstalledSkill[]
+  loaded: boolean
+  loading: boolean
+  error: string
+  load: () => Promise<void>
+  upload: (files: SkillUploadFile[]) => Promise<string[]>
+  installNpm: (spec: string) => Promise<string[]>
+  setEnabled: (name: string, enabled: boolean) => Promise<void>
+  remove: (name: string) => Promise<void>
+}
+
+export const useSkills = create<SkillsState>()((set) => ({
+  skills: [],
+  loaded: false,
+  loading: false,
+  error: '',
+  load: async () => {
+    set({ loading: true })
+    try {
+      const { skills } = await listSkillsApi()
+      set({ skills, loaded: true, loading: false, error: '' })
+    } catch (error) {
+      set({ loading: false, error: error instanceof Error ? error.message : 'Could not load skills.' })
+    }
+  },
+  upload: async (files) => {
+    const result = await uploadSkillFiles(files)
+    set({ skills: result.skills, loaded: true })
+    return result.installed
+  },
+  installNpm: async (spec) => {
+    const result = await installSkillNpm(spec)
+    set({ skills: result.skills, loaded: true })
+    return result.installed
+  },
+  setEnabled: async (name, enabled) => {
+    set((state) => ({ skills: state.skills.map((skill) => (skill.name === name ? { ...skill, enabled } : skill)) }))
+    try {
+      const result = await setSkillEnabledApi(name, enabled)
+      set({ skills: result.skills })
+    } catch (error) {
+      set((state) => ({
+        skills: state.skills.map((skill) => (skill.name === name ? { ...skill, enabled: !enabled } : skill)),
+        error: error instanceof Error ? error.message : 'Could not update the skill.',
+      }))
+    }
+  },
+  remove: async (name) => {
+    const result = await removeSkillApi(name)
+    set({ skills: result.skills })
+  },
+}))
+
+export function enabledSkills(): InstalledSkill[] {
+  return useSkills.getState().skills.filter((skill) => skill.enabled)
+}
+
+/** Catalog section for the system prompt: names and descriptions only; bodies load through the skill tool. */
+export function skillCatalogPrompt(): string {
+  const skills = enabledSkills()
+  if (skills.length === 0) return ''
+  return [
+    '## Skills',
+    'Skills are folders of expert instructions. When a task matches a skill below, call the `skill` tool with its name BEFORE starting, then follow what it returns. Load bundled files (scripts, references) with the same tool via `file`. Do not guess a skill\'s contents.',
+    ...skills.map((skill) => `- ${skill.name}: ${skill.description || 'No description.'}`),
+  ].join('\n')
+}

package/src/store/ui.ts

@@ -117,7 +117,9 @@ export const useUi = create<UiState>()((set, get) => ({
   setMcpOpen: (open) => set({ mcpOpen: open, ...(open ? { mobileSidebarOpen: false, settingsOpen: false } : {}) }),
   settingsOpen: false,
   settingsTab: 'general',
-  openSettings: (tab = 'general') => set({ settingsOpen: true, settingsTab: tab, mobileSidebarOpen: false }),
+  // Plugins are paused for maintenance: any request for that tab lands on General instead.
+  openSettings: (tab = 'general') =>
+    set({ settingsOpen: true, settingsTab: tab === 'plugins' ? 'general' : tab, mobileSidebarOpen: false }),
   closeSettings: () => set({ settingsOpen: false }),
   deployOpen: false,
   setDeployOpen: (open) => set({ deployOpen: open }),