dsh-super-code 0.3.11 → 0.4.0

package/client/index.js

@@ -14,6 +14,7 @@ const icons = require('@deepseek-ai/dsh-client-ui-primitives')
 const IconChevronDownOutline14 = icons.IconChevronDownOutlineRegular ?? icons.IconChevronDownOutline14
 const IconRefreshOutline16 = icons.IconRefreshOutlineRegular ?? icons.IconRefreshOutline16
 const { SessionEventStream } = require('@deepseek-ai/dsh-api-session-controller')
+const skillUi = require('@deepseek-ai/dsh-client-ui-skill')
 
 /* Shared controls use public React APIs without host-private dependencies. */
 let selectControlSequence = 0
@@ -44,10 +45,12 @@ function SelectControl({ id, label, value, choices, onChange, disabled = false }
     setOpen(true)
   }
   const choose = index => {
+    if (unavailable) return
     onChange(choices[index][0])
     setOpen(false)
     trigger.current.focus({ preventScroll: true })
   }
+  useLayoutEffect(() => { if (unavailable) setOpen(false) }, [unavailable])
   useLayoutEffect(() => {
     if (!open) return
     const place = () => setPlacement(selectControlPlacement(trigger.current.getBoundingClientRect(), choices.length))
@@ -301,6 +304,23 @@ const zh = {
   'feedback.agentsPartial': '任务条目超过显示上限，可在动作执行中查看其他 Agent。',
   'status.blocked': '受阻',
 
+  'settings.skillsTab': '预设 Skill',
+  'skills.title': '预设 Skill', 'skills.scope': '开启后同步到 DSH 的 Skill 目录，按需加载，自动保存并在当前对话实时生效。',
+  'skills.openDirectory': '打开 Skill 目录', 'skills.openFailed': '无法打开 Skill 目录，请确认 DSH 所在设备支持文件管理器。',
+  'skills.directoryUnavailable': '当前 DSH 所在环境不支持打开文件管理器。',
+  'skills.directoryError': '部分 Skill 未能同步。已有的用户文件和修改已保留，请打开 Skill 目录检查后重试。',
+  'skills.retry': '重试同步',
+  'skills.individual': 'Skill', 'skills.workflows': '工作流',
+  'skills.grillMeSkill': 'grill-me', 'skills.grillMeSkillHint': '需求还不清楚或想检验方案时，输入 /grill-me，通过逐轮追问理清关键决策。',
+  'skills.oilUiSkill': 'oil-ui', 'skills.oilUiSkillHint': '设计或改进页面时，输入 /oil-ui，获得布局、配色和交互方面的设计建议。',
+  'skills.openspecSkills': 'OpenSpec', 'skills.openspecSkillsHint': '需要先明确规范再开发时，输入 /openspec-propose，生成包含需求、设计和任务的变更提案。',
+  'skills.mattpocockSkills': 'Matt Pocock Skills', 'skills.mattpocockSkillsHint': '规划、开发、测试或排查代码问题时，输入 /mattpocock 搜索并选择对应工作流。',
+  'skills.pstackSkills': 'PStack', 'skills.pstackSkillsHint': '需要规划、协作开发或代码评审时，输入 /pstack 选择工作流，也可用 /poteto-mode 启用整套工作方式。',
+  'skills.commands': '输入 / 选择 Skill，也可输入 /pstack、/mattpocock 等包名查找，选择后使用真实 Skill 命令。开关保存后实时生效，不撤回已进入上下文的内容。',
+  'skills.pstackRequirement': 'PStack 已针对 DSH 0.2.1-alpha.1 及之后版本适配；部分流程仍需 Git、Bun 或模型检查器等外部工具。',
+  'skills.openspecRequirement': 'OpenSpec CLI 随插件安装就绪。开关不改动项目，仅在你明确要求时初始化项目。',
+  'skills.upgrade': '当前预设尚未接入 Skill 包开关，请在“预设配置”中重新安装预设后使用。',
+  'skills.missing': '安装 Super Code 预设后即可使用这些 Skill 包。',
   'settings.homeTab': '首页', 'settings.presetTab': '预设配置', 'settings.protectionTab': '删除保护',
   'shell.title': '命令环境', 'shell.enabled': '使用内置 Bash（Windows）',
   'shell.hint': '无需安装 Git。新启动的会话生效，子 Agent 继承。Windows 限权模式下需由 DSH 逐条审批，不自动修改会话权限。',
@@ -392,6 +412,7 @@ const zh = {
   'tree.collapsedLabel': '已收起', 'tree.organizeLabel': '自动整理',
   'detail.toolCall': '工具调用', 'detail.toolResult': '工具结果', 'detail.toolError': '工具失败',
   'detail.authError': '模型身份验证失败，请检查模型配置。',
+  'detail.maxTokens': '模型输出达到 Token 上限，可继续对话。',
   'detail.copy': '复制', 'detail.copied': '已复制', 'detail.footnotes': '脚注',
   'detail.cache': '缓存', 'detail.info': '详情', 'tree.countCompact': '{shown}/{total} · 运行 {running}',
   'memory.loading': '正在读取记忆…', 'memory.topics': '知识主题', 'memory.allTopics': '全部主题', 'memory.related': '同主题知识', 'preset.configuration': '预设配置',
@@ -495,6 +516,23 @@ const en = {
   'feedback.agentsPartial': 'The task list reached its limit; view other Agents in the execution tree.',
   'status.blocked': 'Blocked',
 
+  'settings.skillsTab': 'Preset Skills',
+  'skills.title': 'Preset Skills', 'skills.scope': 'Enabled packages sync to the DSH Skill directory. Skills load on demand; changes save automatically and apply to current conversations.',
+  'skills.openDirectory': 'Open Skill directory', 'skills.openFailed': 'Could not open the Skill directory. Check that the device running DSH supports a file manager.',
+  'skills.directoryUnavailable': 'The device running DSH does not support opening a file manager.',
+  'skills.directoryError': 'Some Skills could not be synced. Existing user files and edits were preserved. Check the Skill directory and retry.',
+  'skills.retry': 'Retry sync',
+  'skills.individual': 'Skills', 'skills.workflows': 'Workflows',
+  'skills.grillMeSkill': 'grill-me', 'skills.grillMeSkillHint': 'When requirements are unclear or a plan needs scrutiny, use /grill-me to clarify key decisions through focused questions.',
+  'skills.oilUiSkill': 'oil-ui', 'skills.oilUiSkillHint': 'When designing or improving a page, use /oil-ui for layout, color and interaction design guidance.',
+  'skills.openspecSkills': 'OpenSpec', 'skills.openspecSkillsHint': 'When a change needs a specification before development, use /openspec-propose to generate a proposal with requirements, design and tasks.',
+  'skills.mattpocockSkills': 'Matt Pocock Skills', 'skills.mattpocockSkillsHint': 'For planning, development, testing or debugging, type /mattpocock to search for and select the appropriate workflow.',
+  'skills.pstackSkills': 'PStack', 'skills.pstackSkillsHint': 'For planning, collaborative development or code review, type /pstack to select a workflow, or use /poteto-mode to adopt the full working approach.',
+  'skills.commands': 'Type / to select a Skill, or search by package with /pstack or /mattpocock. Picking inserts the real Skill command. Saved switches take effect immediately; instructions already in context remain.',
+  'skills.pstackRequirement': 'PStack is adapted for DSH 0.2.1-alpha.1 and later; some workflows still need external tools such as Git, Bun or a model checker.',
+  'skills.openspecRequirement': 'The OpenSpec CLI is installed with the plugin. Switches do not change projects; initialization runs only when you explicitly request it.',
+  'skills.upgrade': 'This preset does not support Skill package switches yet. Reinstall it in Preset configuration to apply these choices.',
+  'skills.missing': 'Install the Super Code preset to use these Skill packages.',
   'settings.homeTab': 'Home', 'settings.presetTab': 'Preset configuration', 'settings.protectionTab': 'Deletion protection',
   'shell.title': 'Command environment', 'shell.enabled': 'Use bundled Bash (Windows)',
   'shell.hint': 'No Git installation required. Takes effect when a conversation starts; child Agents inherit it. Confined Windows modes require DSH approval for each command without changing session permissions.',
@@ -586,6 +624,7 @@ const en = {
   'tree.collapsedLabel': 'Collapsed', 'tree.organizeLabel': 'Organize',
   'detail.toolCall': 'Tool call', 'detail.toolResult': 'Tool result', 'detail.toolError': 'Tool failed',
   'detail.authError': 'Model authentication failed. Check the model settings.',
+  'detail.maxTokens': 'The model reached its output token limit. Continue the conversation to proceed.',
   'detail.copy': 'Copy', 'detail.copied': 'Copied', 'detail.footnotes': 'Footnotes',
   'detail.cache': 'Cache', 'detail.info': 'Details', 'tree.countCompact': '{shown}/{total} · Running {running}',
   'memory.loading': 'Loading memories…', 'memory.topics': 'Knowledge topics', 'memory.allTopics': 'All topics', 'memory.related': 'More in this topic', 'preset.configuration': 'Preset configuration',
@@ -1254,9 +1293,13 @@ function TaskFeedback({ useSessions, useSessionStatus, sessionId, useTabInfo, tr
     if (!value || value.root !== view.root) { value = { root: view.root, limit: 200, focused: state.current, expanded: new Set(), collapsed: new Set() }; treeStates.set(tab.signal, value) }
     return value
   }, [treeStates, tab.signal, view.root])
+  const catalogs = state.subagentsByParent
+  return React.createElement(TaskFeedbackBody, { key: view.root, view, catalogs, saved, openDetail, refresh, watchCatalog, onToggle, t })
+}
+function TaskFeedbackBody({ view, catalogs, saved, openDetail, refresh, watchCatalog, onToggle, t }) {
   const [busy, setBusy] = useState(false), [error, setError] = useState(false)
   const model = useMemo(() => taskFeedbackRows(view), [view])
-  const partial = model.partial || Object.values(state.subagentsByParent || {}).some(value => value.state === 'error')
+  const partial = model.partial || [...view.nodes.keys()].some(id => catalogs?.[id]?.state === 'error')
   const items = useMemo(() => {
     const rows = feedbackListItems(model, view.root, partial)
     if (!view.root) rows.unshift({ kind: 'note', key: 'empty', label: 'tree.empty', signature: 'empty' })
@@ -1276,7 +1319,7 @@ function TaskFeedback({ useSessions, useSessionStatus, sessionId, useTabInfo, tr
     React.createElement('header', null,
       React.createElement(WorkspaceSectionToggle, { section: 'tasks', expanded: true, onToggle, t }),
       React.createElement(ActionButton, { type: 'button', className: 'dsh-super-code-icon-button', title: text(t, 'feedback.refresh'), 'aria-label': text(t, 'feedback.refresh'), disabled: busy || !view.root, onClick: () => void reload() }, React.createElement(IconRefreshOutline16))),
-    React.createElement(FeedbackVirtualList, { key: view.root, items, root: view.root, saved, openDetail, t, watchCatalog }))
+    React.createElement(FeedbackVirtualList, { items, root: view.root, saved, openDetail, t, watchCatalog }))
 }
 
 function WorkspaceSectionToggle({ section, expanded, onToggle, children, t }) {
@@ -1528,7 +1571,7 @@ function AgentTreeBody({ state, view, saved, openDetail, refresh, watchCatalog,
         const parent = positions.get(edge.parent), child = positions.get(edge.child)
         return React.createElement('path', { key: edge.child, d: `M ${parent.x} ${parent.y + agentTreeNodeHeight} V ${child.y - 16} H ${child.x} V ${child.y - 10}`, fill: 'none' })
       })),
-      rows.map(row => {
+      rows.map((row, index) => {
       const node = view.nodes.get(row.id)
       const title = node.title || node.displayTitle || text(t, 'main.agent')
       const { label: status, tone } = agentExecutionStatus(node, row.id === view.root, t)
@@ -1548,7 +1591,7 @@ function AgentTreeBody({ state, view, saved, openDetail, refresh, watchCatalog,
           onFocus: () => setFocused(row.id), onClick: () => { if (!node.unavailable) open(node) },
           onKeyDown: event => { if (event.target === event.currentTarget) keyDown(event, row) },
         },
-        React.createElement('span', { className: 'dsh-super-code-circle ' + tone, 'aria-hidden': true }, row.id === view.root ? text(t, 'main.agent').slice(0, 1) : String(rows.findIndex(item => item.id === row.id))),
+        React.createElement('span', { className: 'dsh-super-code-circle ' + tone, 'aria-hidden': true }, row.id === view.root ? text(t, 'main.agent').slice(0, 1) : String(index)),
         React.createElement('span', { className: 'dsh-super-code-tree-content' },
           React.createElement('span', { className: 'dsh-super-code-tree-title' }, title),
           React.createElement('span', { className: 'dsh-super-code-node-status', 'data-tone': tone }, React.createElement('i', { 'aria-hidden': true }), status),
@@ -1638,10 +1681,10 @@ function detailRecord(entry, t = key => zh[key] || key) {
       label: text(t, failed ? 'detail.toolError' : 'detail.toolResult'),
       text: contentText(direct ? data.message.content : blocks.flatMap(block => block.content || []), t) }
   }
-  if (event.type === 'turn/end' && data.reason?.kind === 'error') {
+  if (event.type === 'turn/end' && ['error', 'max-tokens'].includes(data.reason?.kind)) {
     const failure = data.reason.error
     // Match the host's AUTH handling: provider diagnostics can echo credentials.
-    const message = failure?.code === 'AUTH' ? text(t, 'detail.authError')
+    const message = data.reason.kind === 'max-tokens' ? text(t, 'detail.maxTokens') : failure?.code === 'AUTH' ? text(t, 'detail.authError')
       : (typeof failure?.message === 'string' && failure.message) || text(t, 'detail.incomplete')
     return { ...base, kind: 'error', format: 'text', label: text(t, 'detail.error'), text: message }
   }
@@ -1766,10 +1809,12 @@ function memoryLibraryTarget(address, current) {
 /** A repeated explicit navigation reopens its entry; ordinary remounts retain reading state. */
 function memoryLibraryNavigation(saved, tab, current) {
   const address = typeof tab.navigation?.params?.memory === 'string' ? tab.navigation.params.memory : tab.contentId
-  const navigationKey = `${address}/${tab.navigation?.revision || 0}`
-  if (saved.navigationKey === navigationKey) return saved
   const target = memoryLibraryTarget(address, current)
-  return { ...saved, navigationKey, ...(target.id ? {
+  const navigationKey = `${address}/${tab.navigation?.revision || 0}/${target.sessionId}`
+  if (saved.navigationKey === navigationKey) return saved
+  return { ...saved, navigationKey, sessionId: target.sessionId,
+    ...(!target.id && saved.sessionId && saved.sessionId !== target.sessionId && saved.scope !== 'global'
+      ? { selected: null, query: '', topicFilter: '', top: 0, detailTop: 0 } : {}), ...(target.id ? {
     scope: target.scope, selected: { topic: target.topic, id: target.id }, detailTop: 0,
     ...(saved.scope && saved.scope !== target.scope ? { topicFilter: '', top: 0 } : {}),
   } : {}) }
@@ -1872,7 +1917,8 @@ function MemoryLibrary({ useTabInfo, useSessions, sessionId: scopeSessionId, api
   const target = memoryLibraryTarget(address, current)
   const saved = useMemo(() => {
     const value = memoryStates.get(tab.signal) || {}
-    Object.assign(value, memoryLibraryNavigation(value, tab, current))
+    const editing = value.editorStore?.getSnapshot()
+    if (!editing?.draft && !editing?.confirmation && !editing?.busy) Object.assign(value, memoryLibraryNavigation(value, tab, current))
     memoryStates.set(tab.signal, value)
     return value
   }, [memoryStates, tab.signal])
@@ -1894,10 +1940,11 @@ function MemoryLibrary({ useTabInfo, useSessions, sessionId: scopeSessionId, api
     if (next === saved) return
     Object.assign(saved, next)
     setScope(saved.scope || target.scope); setSelected(saved.selected || null)
+    setQuery(saved.query || '')
     setTopicFilter(saved.topicFilter || '')
     setViewport(value => ({ ...value, top: saved.top || 0 }))
     if (detailBody.current) detailBody.current.scrollTop = 0
-  }, [saved, address, tab.navigation?.revision, editing.draft, editing.confirmation, editing.busy])
+  }, [saved, address, current, tab.navigation?.revision, editing.draft, editing.confirmation, editing.busy])
   useLayoutEffect(() => {
     if (!editing.refresh) return
     setScope(saved.scope); setSelected(saved.selected); setRevision(value => value + 1)
@@ -1922,13 +1969,13 @@ function MemoryLibrary({ useTabInfo, useSessions, sessionId: scopeSessionId, api
   }, [api, tab.visible, sessionId, scope, selectionKey, revision])
   useLayoutEffect(() => {
     const element = list.current
-    if (!element) return
+    if (!element || visibleState.loading) return
     element.scrollTop = saved.top || 0
     const resize = () => setViewport({ top: element.scrollTop, height: element.clientHeight || 600 })
     resize()
     const observer = new ResizeObserver(resize); observer.observe(element)
     return () => observer.disconnect()
-  }, [selected, key, tab.visible, Boolean(editing.draft)])
+  }, [selected, key, tab.visible, Boolean(editing.draft), visibleState])
   useLayoutEffect(() => {
     if (detailBody.current) detailBody.current.scrollTop = saved.detailTop || 0
   }, [selectionKey, detail?.key, tab.visible, Boolean(editing.draft)])
@@ -1991,7 +2038,7 @@ function MemoryLibrary({ useTabInfo, useSessions, sessionId: scopeSessionId, api
         React.createElement('div', { className: 'dsh-super-code-memory-results' },
           React.createElement('div', { className: 'dsh-super-code-memory-list-heading' }, React.createElement('strong', null, topicFilter || text(t, 'memory.allTopics')), React.createElement('small', null, text(t, 'memory.count', { count: page.count }))),
           React.createElement('div', { ref: list, className: 'dsh-super-code-memory-list', role: 'list', 'aria-busy': visibleState.loading, onScroll: event => { saved.top = event.currentTarget.scrollTop; setViewport(value => ({ ...value, top: saved.top })) } },
-            visibleState.loading && !visibleState.error && React.createElement('p', { role: 'status', className: 'dsh-super-code-memory-empty' }, text(t, 'memory.loading')),
+            visibleState.loading && !visibleState.error && !visibleState.items.length && React.createElement('p', { role: 'status', className: 'dsh-super-code-memory-empty' }, text(t, 'memory.loading')),
             visibleState.error && React.createElement('p', { role: 'alert' }, text(t, 'memory.error')),
             !visibleState.error && !visibleState.loading && !page.count && React.createElement('p', { className: 'dsh-super-code-memory-empty' }, text(t, query || topicFilter ? 'memory.noMatches' : 'memory.empty')),
             React.createElement('div', { 'aria-hidden': true, style: { height: page.before } }),
@@ -2054,7 +2101,7 @@ function AgentDetail({ useTabInfo, useSessions, useSessionStatus, sessionId, cre
   const input = totals ? (totals.uncachedInputTokens || 0) + (totals.cacheReadTokens || 0) + (totals.cacheWriteTokens || 0) : 0
   const format = value => value === undefined ? text(t, 'detail.unavailable') : value.toLocaleString(localeCode(t))
   const tasks = projections.superCodeTasks
-  const toolNames = new Map(snapshot.items.filter(item => item.toolName && item.callId).map(item => [item.callId, item.toolName]))
+  const toolNames = new Map()
   const task = tasks?.current?.kind === 'task' ? tasks.current : undefined
   const title = node?.title || node?.displayTitle || text(t, 'detail.title')
   const metrics = [
@@ -2094,7 +2141,12 @@ function AgentDetail({ useTabInfo, useSessions, useSessionStatus, sessionId, cre
       snapshot.hasMore && React.createElement(ActionButton, { type: 'button', disabled: snapshot.status === 'paging', onClick: inspector.older }, snapshot.status === 'paging' ? text(t, 'detail.read') : text(t, 'detail.older')),
       (snapshot.earlier || snapshot.truncated) && React.createElement(ActionButton, { type: 'button', onClick: latest }, text(t, 'detail.latest')),
       snapshot.status === 'ready' && !snapshot.items.length && React.createElement('p', null, text(t, 'detail.empty')),
-      snapshot.items.map(record => React.createElement(AgentMessage, { key: record.seq, record, saved, t, toolName: toolNames.get(record.callId) }))),
+      snapshot.items.map(record => {
+        const data = record.entry?.event?.data
+        const key = JSON.stringify([data?.turn, data?.step, record.callId])
+        if (record.toolName && record.callId) toolNames.set(key, record.toolName)
+        return React.createElement(AgentMessage, { key: record.seq, record, saved, t, toolName: toolNames.get(key) })
+      })),
     unread && React.createElement(ActionButton, { type: 'button', className: 'dsh-super-code-new-content', onClick: () => {
       saved.following = true; log.current.scrollTop = log.current.scrollHeight; markUnread(false)
     } }, text(t, 'detail.new')))
@@ -2128,7 +2180,7 @@ const memoryRemoteContribution = {
 
 // Budget settings use the same public Remote transport as the preset settings.
 const budgetRemoteContribution = {
-  package: 'dsh-super-code', descriptors: ['readConfig', 'saveConfig', 'resetConfig'].map(method => ({
+  package: 'dsh-super-code', descriptors: ['readConfig', 'saveConfig', 'resetConfig', 'openSkillsDirectory', 'syncSkills'].map(method => ({
     id: `dsh-super-code:superCodeBudgets/${method}`, service: 'superCodeBudgets', namespace: 'superCodeBudgets', method, invocation: { kind: 'direct' },
     parameters: (method === 'saveConfig' ? ['content', 'expected'] : method === 'resetConfig' ? ['expected'] : [])
       .map(name => ({ name, wire: name, source: 'json', codec: remoteStringCodec })), result: { mode: 'src-json' },
@@ -2143,6 +2195,11 @@ const connectionRemoteContribution = {
   })),
 }
 
+const skillGroups = [
+  { id: 'individual', keys: ['grillMeSkill', 'openspecSkills', 'oilUiSkill'] },
+  { id: 'workflows', keys: ['mattpocockSkills', 'pstackSkills'] },
+]
+const skillPackageKeys = skillGroups.flatMap(group => group.keys)
 const budgetFields = [
   { key: 'thresholdRatio', group: 'context', factor: 0.01, min: 1, max: 100, step: 'any' },
   { key: 'retainRatio', group: 'context', factor: 0.01, min: 0, max: 100, step: 'any' },
@@ -2156,14 +2213,15 @@ const budgetFields = [
 ]
 function budgetDraft(configuration) {
   const deletion = configuration.deletionProtection
-  return Object.fromEntries([['windowsBash', configuration.windowsBash ?? true], ['windowsBashForOfficialPresets', configuration.windowsBashForOfficialPresets ?? false], ['deletionProtection', deletion === true ? 'strict' : deletion === false ? 'off' : deletion ?? 'relaxed'], ['deletionProtectionForOfficialPresets', configuration.deletionProtectionForOfficialPresets ?? false], ['applyToOfficialPresets', configuration.applyToOfficialPresets ?? false], ['pressureBasis', configuration.budgets?.pressureBasis ?? ''],
+  return Object.fromEntries([...skillPackageKeys.map(key => [key, configuration[key] ?? false]), ['windowsBash', configuration.windowsBash ?? true], ['windowsBashForOfficialPresets', configuration.windowsBashForOfficialPresets ?? false], ['deletionProtection', deletion === true ? 'strict' : deletion === false ? 'off' : deletion ?? 'relaxed'], ['deletionProtectionForOfficialPresets', configuration.deletionProtectionForOfficialPresets ?? false], ['applyToOfficialPresets', configuration.applyToOfficialPresets ?? false], ['pressureBasis', configuration.budgets?.pressureBasis ?? ''],
     ...budgetFields.map(field => {
       const value = field.root ? configuration[field.key] : configuration.budgets?.[field.key]
       return [field.key, value === undefined ? '' : String(value / field.factor)]
     })])
 }
-function budgetConfiguration(draft) {
+function budgetConfiguration(draft, previous = {}) {
   const config = {}, budgets = {}
+  const before = budgetDraft(previous)
   if (draft.deletionProtection !== undefined) {
     if (!['off', 'relaxed', 'strict'].includes(draft.deletionProtection)) return { ok: false, error: 'invalid' }
     config.deletionProtection = draft.deletionProtection
@@ -2186,8 +2244,11 @@ function budgetConfiguration(draft) {
     const value = Number(input)
     if (!Number.isFinite(value) || value < field.min || (field.max !== undefined && value > field.max)) return { ok: false, error: 'invalid' }
     const scaled = value * field.factor
-    const selected = field.step === 'any' ? scaled : Math.round(scaled)
-    if (field.step !== 'any' && (Math.abs(selected - scaled) > 1e-7 || !Number.isSafeInteger(selected))) return { ok: false, error: 'invalid' }
+    const stored = field.root ? previous[field.key] : previous.budgets?.[field.key]
+    // Percent/seconds formatting must not change an untouched stored number.
+    const unchanged = stored !== undefined && input === before[field.key]
+    const selected = unchanged ? stored : field.step === 'any' ? scaled : Math.round(scaled)
+    if (field.step !== 'any' && ((!unchanged && Math.abs(selected - scaled) > 1e-7) || !Number.isSafeInteger(selected))) return { ok: false, error: 'invalid' }
     ;(field.root ? config : budgets)[field.key] = selected
   }
   if ((budgets.retainRatio ?? 0.16) >= (budgets.thresholdRatio ?? 0.8)) return { ok: false, error: 'retain' }
@@ -2241,20 +2302,152 @@ function ChoiceCards({ name, label, value, choices, onChange, disabled = false }
 
 /** Each budget tab writes only its own fields and carries the other tab's stored values through. */
 function budgetSectionConfiguration(section, draft, snapshot) {
+  if (section === 'skills') return skillPackageKeys.every(key => typeof draft[key] === 'boolean')
+    ? { ok: true, configuration: { ...snapshot.configuration, ...Object.fromEntries(skillPackageKeys.map(key => [key, draft[key]])) } }
+    : { ok: false, error: 'invalid' }
   if (section === 'shell') return typeof draft.windowsBash === 'boolean' && typeof draft.windowsBashForOfficialPresets === 'boolean'
     ? { ok: true, configuration: { ...snapshot.configuration, windowsBash: draft.windowsBash, windowsBashForOfficialPresets: draft.windowsBashForOfficialPresets } }
     : { ok: false, error: 'invalid' }
-  const parsed = budgetConfiguration(draft)
+  const parsed = budgetConfiguration(draft, snapshot.configuration)
   if (!parsed.ok) return parsed
   const current = snapshot.configuration
   return { ok: true, configuration: section === 'protection'
     ? { ...current, deletionProtection: draft.deletionProtection, deletionProtectionForOfficialPresets: draft.deletionProtectionForOfficialPresets }
-    : { ...parsed.configuration, windowsBash: current.windowsBash, windowsBashForOfficialPresets: current.windowsBashForOfficialPresets, deletionProtection: current.deletionProtection, deletionProtectionForOfficialPresets: current.deletionProtectionForOfficialPresets } }
+    : { ...parsed.configuration, ...Object.fromEntries(skillPackageKeys.map(key => [key, current[key]])), windowsBash: current.windowsBash, windowsBashForOfficialPresets: current.windowsBashForOfficialPresets, deletionProtection: current.deletionProtection, deletionProtectionForOfficialPresets: current.deletionProtectionForOfficialPresets } }
 }
 function createBudgetAutosave(api, section = 'context') {
   return createAutosave(api, { draft: budgetDraft({}), toDraft: budgetDraft,
     toConfiguration: (draft, snapshot) => budgetSectionConfiguration(section, draft, snapshot) })
 }
+
+/** All budget tabs edit one document; finish local writes before another tab reads it. */
+function createBudgetEditors(api) {
+  return { ...createSettingsEditors(api, Object.fromEntries(['context', 'shell', 'protection', 'skills']
+    .map(section => [section, source => createBudgetAutosave(source, section)]))),
+    openSkillsDirectory: () => api.openSkillsDirectory(), syncSkills: () => api.syncSkills() }
+}
+
+/** Recreate only the native Skill UI cache; Agent and input lifetimes stay owned by DSH. */
+async function refreshNativeSkillMenus(ctx, plugin, signal) {
+  for (const fiber of [...ctx.registry.get(plugin)?.fibers ?? []]) {
+    if (signal.aborted) return
+    await fiber.restart()
+  }
+  if (signal.aborted) return
+  for (const id of Object.keys(ctx.sessions.list.getSnapshot().byId)) {
+    const scope = ctx.sessions.scope(id)
+    if (scope) ctx.inputTriggers.sessionOf(scope).refreshOpenMenu()
+  }
+}
+
+/** Observe accepted host settings, including writes from other connected clients. */
+function synchronizeSkillMenus(ctx, api, plugin, onError) {
+  const lifetime = new AbortController()
+  let namespace, applied = '', dirty = false, running = false
+  const refresh = ns => {
+    if (lifetime.signal.aborted || (ns && namespace && ns !== namespace)) return
+    dirty = true
+    if (running) return
+    running = true
+    void (async () => {
+      while (dirty && !lifetime.signal.aborted) {
+        dirty = false
+        const response = await api.readConfig()
+        if (lifetime.signal.aborted) return
+        if (!response.ok) throw new Error('Skill settings could not be read')
+        if (dirty) continue
+        namespace = response.value.namespace
+        const draft = budgetDraft(response.value.configuration)
+        const next = JSON.stringify(skillPackageKeys.map(key => draft[key]))
+        if (next !== applied) {
+          await refreshNativeSkillMenus(ctx, plugin, lifetime.signal)
+          if (lifetime.signal.aborted) return
+          applied = next
+        }
+      }
+    })().catch(error => { if (!lifetime.signal.aborted) onError(error) })
+      .finally(() => { running = false; if (dirty && !lifetime.signal.aborted) refresh() })
+  }
+  const off = ctx.remote.$on('settings/document-updated', refresh)
+  const offReset = ctx.on('connection/reset', () => { namespace = undefined; refresh() })
+  refresh()
+  return () => { lifetime.abort(); off(); offReset() }
+}
+
+// 只补充包名搜索；真实命令、覆盖优先级和加载仍由宿主负责。
+function skillPackageSource(ctx) {
+  const packages = [
+    { name: 'grill-me', label: 'grill-me', directory: 'mattpocock/skills/', names: ['grill-me', 'grilling'] },
+    { name: 'openspec', label: 'OpenSpec', directory: 'openspec/skills/' },
+    { name: 'oil-ui', label: 'oil-ui', directory: '', names: ['oil-ui'] },
+    { name: 'mattpocock', label: 'Matt Pocock Skills', directory: 'mattpocock/skills/' },
+    { name: 'pstack', label: 'PStack', directory: 'pstack/dsh/skills/' },
+  ]
+  return {
+    trigger: '/', name: 'Super Code', order: 3,
+    async candidates(session, { query, signal }) {
+      if (!query || signal.aborted || ctx.sessions.subagentAddress(session.sessionId) !== undefined) return []
+      const matching = icons.rankByName(packages, query)
+      if (!matching.length) return []
+      const response = await ctx.remote.skills.list({ sessionId: session.sessionId }, signal)
+      if (signal.aborted) return []
+      if (!response.ok) throw new Error('Skill catalog could not be read')
+      const skills = response.value.skills
+      const native = new Set(icons.rankByName(skills, query).map(skill => skill.name))
+      return skills.flatMap(skill => {
+        if (native.has(skill.name)) return []
+        const relative = skill.path?.replaceAll('\\', '/').match(/(?:^|\/)(?:skills\/dsh-super-code|builtin\/skills)\/(.+)$/i)?.[1]
+        const pack = matching.find(pack => relative === `${pack.directory}${skill.name}/SKILL.md`
+          && (!pack.names || pack.names.includes(skill.name)))
+        return pack ? [{ name: skill.name, description: skill.description, section: pack.label }] : []
+      })
+    },
+    onPick({ candidate }) { return { text: `/${candidate.name} ` } },
+  }
+}
+
+function settingsRevision(snapshot) {
+  return snapshot.generation ? `${snapshot.revision}:${snapshot.generation}` : String(snapshot.revision)
+}
+function createSettingsEditors(api, factories) {
+  let writing = Promise.resolve(), saved, saveCount = 0, readCount = 0, latestRead
+  const saveConfig = (content, expected) => {
+    const result = api.saveConfig(content, expected).then(response => {
+      if (response.ok && response.value.ok) {
+        saved = response.value.snapshot; saveCount++
+        // Carry local, disjoint edits forward without rebasing an external conflict.
+        for (const editor of Object.values(editors)) {
+          const previous = editor.getSnapshot().snapshot
+          if (previous && settingsRevision(previous) === expected) editor.revision(saved)
+        }
+      }
+      return response
+    })
+    writing = Promise.allSettled([writing, result]).then(() => {})
+    return result
+  }
+  const editors = Object.fromEntries(Object.entries(factories)
+    .map(([section, create]) => [section, create({ saveConfig })]))
+  const flush = async () => {
+    await Promise.all(Object.values(editors).map(editor => editor.flush()))
+    await writing
+  }
+  return { editors, saveConfig, readConfig: async () => {
+    const sequence = ++readCount
+    await flush()
+    const before = saveCount, response = await api.readConfig()
+    await flush()
+    if (!response.ok) return response
+    // A newer read may already belong to a restarted service. Never let an
+    // older request bring the previous instance back into a form.
+    if (!latestRead || sequence > latestRead.sequence) latestRead = { sequence, snapshot: response.value }
+    const snapshot = latestRead.snapshot
+    // A read already in flight must not undo a newer local save. A fresh read
+    // still accepts a lower revision after the host restarts its settings service.
+    return { ...response, value: saveCount !== before && saved.generation === snapshot.generation && saved.revision > snapshot.revision
+      ? saved : snapshot }
+  } }
+}
 function budgetFieldValid(field, input) {
   const value = String(input ?? '').trim()
   if (!value) return true
@@ -2270,29 +2463,42 @@ function autosaveState(editing) {
     : editing.error ? 'error' : editing.notice === 'saved' ? 'saved' : 'idle'
 }
 
-function BudgetSettings({ api, t, active, section = 'context', onSaved = () => {} }) {
+function BudgetSettings({ api, t, active, section = 'context', presetStatus, onSaved = () => {} }) {
   const protection = section === 'protection'
-  const shell = section === 'shell'
-  const editor = useMemo(() => createBudgetAutosave(api, section), [api, section])
+  const shell = section === 'shell', skills = section === 'skills'
+  const editor = api.editors[section]
   const editing = useSyncExternalStore(editor.subscribe, editor.getSnapshot, editor.getSnapshot)
   const { snapshot, draft } = editing
   const [loading, setLoading] = useState(false), [failure, setFailure] = useState(''), [notice, setNotice] = useState('')
   const [confirmReset, setConfirmReset] = useState(false)
+  const [openingSkills, setOpeningSkills] = useState(false), [directoryError, setDirectoryError] = useState(false)
+  const openSkills = async () => {
+    if (openingSkills) return
+    setOpeningSkills(true); setDirectoryError(false)
+    try {
+      const result = await api.openSkillsDirectory()
+      if (!result.ok || !result.value?.opened) throw new Error('Open failed')
+    } catch { if (alive.current) setDirectoryError(true) }
+    finally { if (alive.current) setOpeningSkills(false) }
+  }
   const alive = useRef(false), pending = useRef(false)
   const load = async (discard = false) => {
-    if (pending.current || (!discard && editor.hasChanges())) return
+    if (pending.current) return
     pending.current = true; setLoading(true); setFailure('')
     try {
       const response = await api.readConfig()
       if (!response.ok) throw new Error('Remote unavailable')
-      if (alive.current) editor.receive(response.value)
+      if (alive.current) {
+        if (discard || !editor.hasChanges()) editor.receive(response.value)
+        else editor.permissions(response.value.writable)
+      }
     } catch { if (alive.current) setFailure('connection') }
     finally { pending.current = false; if (alive.current) setLoading(false) }
   }
   useEffect(() => { alive.current = true; return () => { alive.current = false; void editor.flush() } }, [editor])
   useEffect(() => { if (editing.saveCount) onSaved() }, [editing.saveCount])
   // Other tabs write the same document, so reread on every visit; leaving flushes pending input.
-  useEffect(() => { if (active) load(); else { setConfirmReset(false); void editor.flush() } }, [editor, active])
+  useLayoutEffect(() => { if (active) load(); else { setConfirmReset(false); void editor.flush() } }, [editor, active])
   const reset = async () => {
     setConfirmReset(false)
     if (pending.current) return
@@ -2305,8 +2511,8 @@ function BudgetSettings({ api, t, active, section = 'context', onSaved = () => {
       const base = current.configuration
       const configuration = protection
         ? { ...base, deletionProtection: 'relaxed', deletionProtectionForOfficialPresets: false }
-        : { windowsBash: base.windowsBash, windowsBashForOfficialPresets: base.windowsBashForOfficialPresets, deletionProtection: base.deletionProtection, deletionProtectionForOfficialPresets: base.deletionProtectionForOfficialPresets }
-      const response = await api.saveConfig(JSON.stringify(configuration), String(current.revision))
+        : { ...Object.fromEntries(skillPackageKeys.map(key => [key, base[key]])), windowsBash: base.windowsBash, windowsBashForOfficialPresets: base.windowsBashForOfficialPresets, deletionProtection: base.deletionProtection, deletionProtectionForOfficialPresets: base.deletionProtectionForOfficialPresets }
+      const response = await api.saveConfig(JSON.stringify(configuration), settingsRevision(current))
       if (!response.ok) throw new Error('Remote unavailable')
       if (!alive.current) return
       if (response.value.ok) { editor.receive(response.value.snapshot); onSaved(); setNotice('resetDone') }
@@ -2316,8 +2522,9 @@ function BudgetSettings({ api, t, active, section = 'context', onSaved = () => {
   }
   const disabled = loading || !snapshot?.writable
   const edit = (key, value, delay = 0) => { setNotice(''); setFailure(''); editor.change({ [key]: value }, delay) }
-  const parsed = budgetConfiguration(draft)
-  const fieldError = field => !budgetFieldValid(field, draft[field.key]) ? t('budget.error.range')
+  const parsed = budgetConfiguration(draft, snapshot?.configuration)
+  const storedDraft = budgetDraft(snapshot?.configuration ?? {})
+  const fieldError = field => draft[field.key] !== storedDraft[field.key] && !budgetFieldValid(field, draft[field.key]) ? t('budget.error.range')
     : field.key === 'retainRatio' && parsed.error === 'retain' ? t('budget.error.retain')
     : field.key === 'ptcTimeoutMs' && parsed.error === 'ptc-order' ? t('budget.error.ptc-order') : ''
   const defaultOf = field => {
@@ -2341,7 +2548,24 @@ function BudgetSettings({ api, t, active, section = 'context', onSaved = () => {
   const shellStatus = snapshot?.shell
   const windowsHost = shellStatus?.platform === 'win32'
   const shellTooltip = shellStatus && !windowsHost ? t('shell.windowsOnly') : undefined
-  const content = shell ? React.createElement(SettingsSection, { id: 'super-code-shell', title: t('shell.title') },
+  const content = skills ? React.createElement(React.Fragment, null,
+    React.createElement('div', { className: 'dsh-super-code-settings-footer-actions' },
+      button(t('skills.openDirectory'), openSkills, { disabled: openingSkills || !snapshot?.skills?.canOpen, title: snapshot?.skills?.canOpen ? t('skills.openDirectory') : t('skills.directoryUnavailable') })),
+    directoryError && React.createElement(Callout, { tone: 'error' }, React.createElement('p', null, t('skills.openFailed'))),
+    snapshot?.skills?.state === 'error' && React.createElement(Callout, { tone: 'warning', action: button(t('skills.retry'), async () => {
+      try { await editor.flush(); const result = await api.syncSkills(); if (!result.ok) throw new Error('Sync failed'); if (alive.current) await load() }
+      catch { if (alive.current) setDirectoryError(true) }
+    }) }, React.createElement('p', null, t('skills.directoryError'))),
+    ...skillGroups.map((group, index) => React.createElement(SettingsSection, { key: group.id, id: `super-code-skills-${group.id}`, title: t(`skills.${group.id}`), description: index === 0 ? t('skills.scope') : undefined },
+      ...group.keys.map(key => React.createElement(SettingRow, { key, id: `super-code-skill-${key}`,
+        label: React.createElement(React.Fragment, null, t(`skills.${key}`), snapshot?.skillPackages?.[key]?.version &&
+          React.createElement('span', { className: 'dsh-super-code-skill-version' }, `v${snapshot.skillPackages[key].version}`)), hint: t(`skills.${key}Hint`) }, described =>
+        React.createElement(ConnectionSwitch, { id: `super-code-skill-${key}`, checked: draft[key], disabled, 'aria-describedby': described, onChange: value => edit(key, value) }))))),
+    !snapshot?.skills && presetStatus && !presetStatus.skillPacks && React.createElement(Callout, { tone: 'warning' }, React.createElement('p', null, t(presetStatus.state === 'missing' ? 'skills.missing' : 'skills.upgrade'))),
+    React.createElement('div', { className: 'dsh-super-code-settings-guidance' },
+      ...['commands', 'openspecRequirement', 'pstackRequirement'].map(key =>
+        React.createElement('p', { key }, t(`skills.${key}`)))))
+    : shell ? React.createElement(SettingsSection, { id: 'super-code-shell', title: t('shell.title') },
     React.createElement(SettingRow, { id: 'super-code-windows-bash', label: t('shell.enabled'),
       hint: !windowsHost ? t('shell.otherPlatform') : t('shell.hint') }, described =>
       React.createElement(ConnectionSwitch, { id: 'super-code-windows-bash', checked: draft.windowsBash,
@@ -2384,18 +2608,18 @@ function BudgetSettings({ api, t, active, section = 'context', onSaved = () => {
           snapshot?.ptcMaxTimeoutMs && text(t, 'budget.ptcCeiling', { seconds: snapshot.ptcMaxTimeoutMs / 1000 })] }, ...rows('execution')),
       React.createElement(SettingsSection, { id: 'super-code-budget-exclusive', title: t('budget.superCode'), description: t('budget.superCodeHint') }, ...rows('superCode')))
   return React.createElement('section', { className: 'dsh-super-code-budgets' },
-    React.createElement('form', { className: 'dsh-super-code-stack', 'aria-label': t(shell ? 'shell.title' : protection ? 'delete.title' : 'budget.title'), 'aria-busy': loading || editing.saving,
+    React.createElement('form', { className: 'dsh-super-code-stack', 'aria-label': t(skills ? 'skills.title' : shell ? 'shell.title' : protection ? 'delete.title' : 'budget.title'), 'aria-busy': loading || editing.saving,
       onSubmit: event => { event.preventDefault(); void editor.flush() } },
       problem && React.createElement(Callout, { tone: 'error',
         action: failure === 'connection' || problem === 'conflict' ? button(t('budget.reload'), () => load(true))
-          : saveError ? button(t('save.retry'), () => { void editor.retry() }) : null },
+          : saveError ? button(t('save.retry'), () => { void editor.retry() }, { disabled }) : null },
         React.createElement('p', null, t(`budget.error.${problem}`))),
       snapshot && !snapshot.writable && React.createElement(Callout, { tone: 'warning' }, React.createElement('p', null, t('budget.error.read-only'))),
       notice && React.createElement(Callout, { tone: 'success' }, React.createElement('p', null, t(`budget.${notice}`))),
       content,
       React.createElement('div', { className: 'dsh-super-code-settings-footer' },
         React.createElement(SaveIndicator, { state: autosaveState(editing), t }),
-        !shell && React.createElement('div', { className: 'dsh-super-code-settings-footer-actions' },
+        !shell && !skills && React.createElement('div', { className: 'dsh-super-code-settings-footer-actions' },
           confirmReset ? React.createElement(React.Fragment, null,
             React.createElement('span', null, t('budget.resetQuestion')),
             button(t('preset.cancel'), () => setConfirmReset(false)),
@@ -2432,7 +2656,7 @@ function synchronizePresetDisplay(api, locale, reload, onError, preferenceScope)
           last = language
           needsReload ||= result.value.changed
         }
-        if (!disposed && settled && needsReload && pending === last) reload()
+        if (!disposed && settled && needsReload && pending === last) { reload(); needsReload = false }
       } catch (error) { if (!disposed) onError(error) }
       finally { running = false }
     })()
@@ -2472,7 +2696,7 @@ function createAutosave(api, { draft: initialDraft, toDraft, toConfiguration })
         while (acknowledged < version) {
           const sent = version, parsed = toConfiguration(state.draft, state.snapshot)
           if (!parsed.ok) { blocked = version; update({ error: parsed.error || 'invalid' }); break }
-          const result = await api.saveConfig(JSON.stringify(parsed.configuration), String(state.snapshot.revision))
+          const result = await api.saveConfig(JSON.stringify(parsed.configuration), settingsRevision(state.snapshot))
           if (!result.ok) throw new Error('Remote unavailable')
           if (!result.value.ok) { blocked = version; update({ error: result.value.error }); break }
           acknowledged = sent
@@ -2492,7 +2716,18 @@ function createAutosave(api, { draft: initialDraft, toDraft, toConfiguration })
       acknowledged = ++version
       update({ snapshot, draft, error: '', notice: '' })
     },
-    revision: snapshot => update({ snapshot }),
+    permissions: writable => {
+      // Keep the draft and its CAS baseline while reflecting current host permissions.
+      if (state.snapshot && state.snapshot.writable !== writable) update({ snapshot: { ...state.snapshot, writable } })
+    },
+    revision: snapshot => {
+      const previous = state.snapshot ? toDraft(state.snapshot.configuration) : initialDraft
+      const next = toDraft(snapshot.configuration)
+      // A local save may change an untouched field in this page (for example
+      // the Home switch). Carry it forward while preserving actual edits.
+      update({ snapshot, draft: Object.fromEntries(Object.entries(next).map(([key, value]) =>
+        [key, JSON.stringify(state.draft[key]) === JSON.stringify(previous[key]) ? value : state.draft[key]])) })
+    },
     change: (patch, delay = 0) => {
       version++
       update({ draft: { ...state.draft, ...patch }, error: '', notice: '' })
@@ -2554,22 +2789,27 @@ function connectionSessions(overview) {
 }
 function ConnectionActivity({ api, t, active, openSession }) {
   const [overview, setOverview] = useState(null), [busy, setBusy] = useState(false), [error, setError] = useState(false)
-  const alive = useRef(false), pending = useRef(false)
-  const load = async () => {
-    if (pending.current) return
-    pending.current = true
-    try { const result = await api.overview(); if (!result.ok) throw new Error(); if (alive.current) { setOverview(result.value); setError(false) } }
-    catch { if (alive.current) setError(true) }
-    finally { pending.current = false }
+  const alive = useRef(false), pending = useRef(false), disconnecting = useRef(false)
+  const load = () => {
+    if (pending.current || disconnecting.current) return pending.current
+    pending.current = (async () => {
+      try { const result = await api.overview(); if (!result.ok) throw new Error(); if (alive.current) { setOverview(result.value); setError(false) } }
+      catch { if (alive.current) setError(true) }
+    })().finally(() => { pending.current = false })
+    return pending.current
   }
   useEffect(() => { alive.current = true; return () => { alive.current = false } }, [api])
   useEffect(() => { if (!active) return; load(); const timer = setInterval(load, 2000); return () => clearInterval(timer) }, [active, api])
   const disconnect = async id => {
-    if (pending.current) return
-    pending.current = true; setBusy(true)
-    try { const result = await api.disconnectClient(id); if (!result.ok) throw new Error() }
+    if (disconnecting.current) return
+    disconnecting.current = true; setBusy(true)
+    try {
+      await pending.current
+      if (!alive.current) return
+      const result = await api.disconnectClient(id); if (!result.ok) throw new Error()
+    }
     catch { if (alive.current) setError(true); return }
-    finally { pending.current = false; if (alive.current) setBusy(false) }
+    finally { disconnecting.current = false; if (alive.current) setBusy(false) }
     if (alive.current) load()
   }
   const groups = overview ? connectionSessions(overview) : { connected: [], history: [] }
@@ -2588,8 +2828,8 @@ function ConnectionActivity({ api, t, active, openSession }) {
     error && React.createElement('p', { role: 'alert' }, t('home.error')))
 }
 
-function ConnectionSettings({ api, t, active, openSession, onSaved = () => {} }) {
-  const editor = useMemo(() => createConnectionAutosave(api), [api])
+function ConnectionSettings({ api, settings, t, active, openSession, onSaved = () => {} }) {
+  const editor = settings.editors.connection
   const editing = useSyncExternalStore(editor.subscribe, editor.getSnapshot, editor.getSnapshot)
   const { snapshot, draft, saving } = editing
   const [catalog, setCatalog] = useState({ items: [], picker: 'unavailable' }), [browser, setBrowser] = useState(false)
@@ -2606,30 +2846,39 @@ function ConnectionSettings({ api, t, active, openSession, onSaved = () => {} })
     if (pending.current || (discard && editor.getSnapshot().saving)) return
     pending.current = true; setBusy(true); setError('')
     try {
-      const [config, directories, credential] = await Promise.all([api.readConfig(), api.directories(), api.revealToken()])
-      if (!config.ok || !directories.ok || !credential.ok) throw new Error()
+      const [config, directories, credential] = await Promise.all([
+        settings.readConfig(), api.directories().catch(() => ({ ok: false })), api.revealToken().catch(() => ({ ok: false })),
+      ])
+      if (!config.ok) throw new Error()
       if (!alive.current) return
-      setCatalog(directories.value)
-      if (discard || !dirty) receive(config.value, directories.value)
-      if (visible.current) setToken(credential.value.token)
+      if (directories.ok) setCatalog(directories.value)
+      else setError('unavailable')
+      if (discard || !editor.hasChanges()) receive(config.value, directories.ok ? directories.value : catalog)
+      else editor.permissions(config.value.writable)
+      if (visible.current) {
+        setToken(credential.ok ? credential.value.token : '')
+        if (!credential.ok && config.value.url) setError('unavailable')
+      }
     } catch { if (alive.current) setError('unavailable') }
     finally { pending.current = false; if (alive.current) setBusy(false) }
   }
   const action = async kind => {
     if (pending.current) return
     pending.current = true; setBusy(true); setError(''); setNotice('')
+    if (kind === 'rotate') setToken('')
     try {
       const response = kind === 'rotate' ? await api.rotateToken(String(snapshot.revision)) : await api.revealToken()
       if (!response.ok) throw new Error()
       if (!alive.current) return
       if (kind === 'token') { if (visible.current) setToken(response.value.token) }
       else if (response.value.ok) {
-        if (kind === 'rotate') {
-          editor.revision(response.value.snapshot)
-          const credential = await api.revealToken()
-          if (credential.ok && alive.current && visible.current) setToken(credential.value.token)
-        } else receive(response.value.snapshot)
-        onSaved(); setNotice(kind === 'rotate' ? 'rotated' : 'saved')
+        editor.revision(response.value.snapshot)
+        onSaved()
+        const credential = await api.revealToken()
+        if (!credential.ok) throw new Error()
+        if (!alive.current) return
+        if (visible.current) setToken(credential.value.token)
+        setNotice('rotated')
       } else setError(response.value.error)
     } catch { if (alive.current) setError('unavailable') }
     finally { pending.current = false; if (alive.current) setBusy(false) }
@@ -2750,36 +2999,38 @@ function SegmentedControl({ label, value, choices, onChange, disabled = false, b
     ...choices.map(([choice, text], index) => React.createElement('button', { key: choice, type: 'button', role: 'radio',
       'aria-checked': index === selected, tabIndex: index === focusable ? 0 : -1, disabled, onClick: () => pick(choice) }, text)))
 }
-function SettingsHome({ budgetApi, connectionApi, t, active, revision, navigate, children }) {
+function SettingsHome({ budgetApi, connectionApi, connectionSettings, t, active, revision, navigate, children }) {
   const [budget, setBudget] = useState(null), [connection, setConnection] = useState(null), [overview, setOverview] = useState({ connections: [], sessions: [] })
   // Keep the choice visible until the save is acknowledged.
   const [saving, setSaving] = useState(null), [failure, setFailure] = useState('')
+  const [refreshing, setRefreshing] = useState(false)
   const alive = useRef(false), request = useRef(0), loading = useRef(false), writing = useRef(false)
-  const load = async (force = false) => {
+  const load = async (force = false, blockControls = false) => {
     if (!force && (loading.current || writing.current)) return
     const sequence = ++request.current
-    loading.current = true
+    loading.current = { blocking: blockControls }
+    if (blockControls) setRefreshing(true)
     try {
-      const [b, c, o] = await Promise.all([budgetApi.readConfig(), connectionApi.readConfig(), connectionApi.overview()])
+      const [b, c, o] = await Promise.all([budgetApi.readConfig(), connectionSettings.readConfig(), connectionApi.overview()])
       if (!b.ok || !c.ok || !o.ok) throw new Error()
       if (alive.current && sequence === request.current) {
         setBudget(b.value); setConnection(c.value); setOverview(o.value); setFailure(value => value === 'load' ? '' : value)
       }
     } catch { if (alive.current && sequence === request.current) setFailure('load') }
-    finally { if (sequence === request.current) loading.current = false }
+    finally { if (sequence === request.current) { loading.current = false; if (alive.current) setRefreshing(false) } }
   }
   useEffect(() => { alive.current = true; return () => { alive.current = false } }, [budgetApi, connectionApi])
-  useEffect(() => { if (!active) return; load(); const timer = setInterval(load, 2000); return () => clearInterval(timer) }, [active, revision, budgetApi, connectionApi])
+  useLayoutEffect(() => { if (!active) return; load(true, true); const timer = setInterval(load, 2000); return () => clearInterval(timer) }, [active, revision, budgetApi, connectionApi])
   const change = async (kind, value) => {
     const current = kind === 'protection' ? budget : connection
-    if (writing.current || !current?.writable) return
+    if (loading.current?.blocking || writing.current || !current?.writable) return
     // A save supersedes any poll in flight, so a stale read cannot undo the choice.
     writing.current = true; request.current++; loading.current = false
     setSaving({ kind, value }); setFailure('')
     let saved = false
     try {
       const configuration = kind === 'protection' ? { ...current.configuration, deletionProtection: value } : { ...current.configuration, enabled: value }
-      const response = await (kind === 'protection' ? budgetApi : connectionApi).saveConfig(JSON.stringify(configuration), String(current.revision))
+      const response = await (kind === 'protection' ? budgetApi : connectionSettings).saveConfig(JSON.stringify(configuration), settingsRevision(current))
       saved = Boolean(response.ok && response.value.ok)
       if (saved && alive.current) {
         if (kind === 'protection') setBudget(response.value.snapshot)
@@ -2811,7 +3062,7 @@ function SettingsHome({ budgetApi, connectionApi, t, active, revision, navigate,
       row({ key: 'protection', icon: 'shield', title: t('delete.title'), target: 'protection', on: Boolean(mode) && mode !== 'off',
         body: budget ? React.createElement('p', { id: 'super-code-home-protection-hint', className: 'dsh-super-code-home-row-hint' }, t(`delete.hint.${mode}`)) : placeholder('text'),
         control: budget ? React.createElement(SegmentedControl, { label: t('delete.mode'), value: mode, describedBy: 'super-code-home-protection-hint',
-          choices: ['off', 'relaxed', 'strict'].map(value => [value, t(`delete.${value}`)]), disabled: !budget.writable, busy: saving?.kind === 'protection',
+          choices: ['off', 'relaxed', 'strict'].map(value => [value, t(`delete.${value}`)]), disabled: refreshing || Boolean(saving) || !budget.writable, busy: saving?.kind === 'protection',
           onChange: value => change('protection', value) }) : placeholder('control') }),
       row({ key: 'connection', icon: 'plug', title: t('home.mcp'), target: 'connection', on: enabled,
         body: connection ? React.createElement('p', { className: 'dsh-super-code-home-row-status', 'data-tone': state === 'listening' ? 'success' : state === 'error' ? 'error' : 'idle' },
@@ -2820,7 +3071,7 @@ function SettingsHome({ budgetApi, connectionApi, t, active, revision, navigate,
           listening && React.createElement('span', null, t('home.connectionCount', { count: overview.connections.length, max: connection.configuration.maxConnections })),
           listening && React.createElement('span', null, t('home.activeSessions', { count: connectionSessions(overview).connected.length }))) : placeholder('text'),
         control: needsSetup ? React.createElement(ActionButton, { type: 'button', onClick: () => navigate('connection') }, t('home.setupConnection'))
-          : connection ? React.createElement(ConnectionSwitch, { checked: enabled, disabled: !connection.writable, 'aria-label': t('home.mcp'),
+          : connection ? React.createElement(ConnectionSwitch, { checked: enabled, disabled: refreshing || Boolean(saving) || !connection.writable, 'aria-label': t('home.mcp'),
             onChange: value => value && !connection.configuration.allowedDirectories.length ? navigate('connection') : change('connection', value) })
           : placeholder('control') })))
 }
@@ -2867,7 +3118,7 @@ function ConnectionConsent({ api, t }) {
       React.createElement(ActionButton, { type: 'button', disabled: busy, className: 'dsh-super-code-primary-button', onClick: () => resolve('approved') }, t('connection.approveDirectory'))))
 }
 
-function PresetSettings({ api, budgetApi, connectionApi, openSession = () => {}, t }) {
+function PresetSettings({ api, budgetApi: budgets, connectionApi, connectionSettings, openSession = () => {}, t }) {
   const [tab, setTab] = useState('home')
   const [status, setStatus] = useState(null), [customId, setCustomId] = useState(null)
   const reinstall = status?.reinstallable ?? status?.state === 'installed'
@@ -2914,7 +3165,7 @@ function PresetSettings({ api, budgetApi, connectionApi, openSession = () => {},
       if (!install || value.ok) {
         const synced = await api.synchronize(localeCode(t))
         if (!synced.ok) throw new Error('Preset display synchronization failed')
-        if (install || synced.value.changed) window.location.reload()
+        if (alive.current && (install || synced.value.changed)) window.location.reload()
       }
     } catch {
       if (alive.current) setError('preset.error.connection')
@@ -2937,7 +3188,7 @@ function PresetSettings({ api, budgetApi, connectionApi, openSession = () => {},
   const versionProblem = Boolean(status) && status.state !== 'missing' && versionState !== 'match'
   const [overviewRevision, setOverviewRevision] = useState(0)
   const onSaved = () => setOverviewRevision(value => value + 1)
-  const tabs = ['home', 'preset', 'context', 'protection', 'connection']
+  const tabs = ['home', 'preset', 'skills', 'context', 'protection', 'connection']
   return React.createElement('section', { className: 'dsh-super-code-settings' },
     React.createElement('div', { className: 'dsh-super-code-settings-tabs', role: 'tablist', 'aria-label': t('settings.tabs'), onKeyDown: event => {
       if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return
@@ -2950,7 +3201,7 @@ function PresetSettings({ api, budgetApi, connectionApi, openSession = () => {},
       tabIndex: tab === value ? 0 : -1, onClick: () => setTab(value) }, t(`settings.${value}Tab`)))),
     React.createElement('div', { className: 'dsh-super-code-settings-body' },
       React.createElement('div', { role: 'tabpanel', id: 'super-code-panel-home', 'aria-labelledby': 'super-code-tab-home', hidden: tab !== 'home' },
-        React.createElement(SettingsHome, { budgetApi, connectionApi, t, active: tab === 'home', revision: overviewRevision, navigate: setTab },
+        React.createElement(SettingsHome, { budgetApi: budgets, connectionApi, connectionSettings, t, active: tab === 'home', revision: overviewRevision, navigate: setTab },
       // Healthy state collapses to one status line; problems expand into a notice with its fix.
       React.createElement('header', { className: 'dsh-super-code-settings-header' },
         React.createElement('span', { className: 'dsh-super-code-settings-mark', 'aria-hidden': true }, React.createElement(Glyph, { type: 'code' })),
@@ -3000,13 +3251,15 @@ function PresetSettings({ api, budgetApi, connectionApi, openSession = () => {},
         status?.delivery === 'declaration' && !status.authorable && React.createElement('p', { role: 'note' }, t('preset.declaredReadonly')),
         status?.delivery === 'directory' && !status.authorable && React.createElement('p', { role: 'note' }, t('preset.readonly'))),
       error && React.createElement('p', { role: 'alert' }, t(error)),
-      React.createElement(BudgetSettings, { api: budgetApi, t, section: 'shell', active: tab === 'preset', onSaved })),
+      React.createElement(BudgetSettings, { api: budgets, t, section: 'shell', active: tab === 'preset', onSaved })),
+      React.createElement('div', { role: 'tabpanel', id: 'super-code-panel-skills', 'aria-labelledby': 'super-code-tab-skills', hidden: tab !== 'skills' },
+        React.createElement(BudgetSettings, { api: budgets, t, section: 'skills', presetStatus: status, active: tab === 'skills', onSaved })),
       React.createElement('div', { role: 'tabpanel', id: 'super-code-panel-context', 'aria-labelledby': 'super-code-tab-context', hidden: tab !== 'context' },
-        React.createElement(BudgetSettings, { api: budgetApi, t, active: tab === 'context', onSaved })),
+        React.createElement(BudgetSettings, { api: budgets, t, active: tab === 'context', onSaved })),
       React.createElement('div', { role: 'tabpanel', id: 'super-code-panel-protection', 'aria-labelledby': 'super-code-tab-protection', hidden: tab !== 'protection' },
-        React.createElement(BudgetSettings, { api: budgetApi, t, section: 'protection', active: tab === 'protection', onSaved })),
+        React.createElement(BudgetSettings, { api: budgets, t, section: 'protection', active: tab === 'protection', onSaved })),
       React.createElement('div', { role: 'tabpanel', id: 'super-code-panel-connection', 'aria-labelledby': 'super-code-tab-connection', hidden: tab !== 'connection' },
-        React.createElement(ConnectionSettings, { api: connectionApi, t, active: tab === 'connection', openSession, onSaved }))),
+        React.createElement(ConnectionSettings, { api: connectionApi, settings: connectionSettings, t, active: tab === 'connection', openSession, onSaved }))),
     confirmation && React.createElement('dialog', { ref: dialog, className: 'dsh-super-code-confirm',
       'aria-labelledby': 'super-code-confirm-title', 'aria-describedby': 'super-code-confirm-hint',
       onKeyDown: event => { if (event.key === 'Escape') event.stopPropagation() },
@@ -3055,6 +3308,13 @@ function apply(ctx) {
     }
     ready.effect(() => () => { navigation.openSession = () => {} })
   })
+  ctx.inject(['remote.superCodeBudgets', 'inputTriggers'], ready => {
+    ready.effect(() => synchronizeSkillMenus(ready, ready.remote.superCodeBudgets, skillUi,
+      error => console.warn('Super Code Skill menu refresh:', error)), 'super-code: live skill menus')
+  })
+  ctx.inject(['remote.skills', 'inputTriggers'], ready => {
+    ready.effect(() => ready.inputTriggers.registerSource(skillPackageSource(ready)), 'super-code: skill package search')
+  })
   ctx.inject(['remote.superCodeConnection'], ready => {
     ready.slots.inject('shell.overlay', () => ready.slots.register({
       name: 'shell.overlay', id: 'super-code-directory-consent', order: 180, locale: LOCALE_NS,
@@ -3065,13 +3325,17 @@ function apply(ctx) {
   // service here: Cordis rejects even optional reads without an injection.
   const preferenceService = 'configForms' in ctx ? 'configForms' : 'settingsScope'
   ctx.inject(['remote.superCodePresets', 'remote.superCodeBudgets', 'remote.superCodeConnection', preferenceService], ready => {
+    // Settings windows may close while a save is pending. Keep each document's
+    // editor with its Remote service so reopening waits for that same save.
+    const budgets = createBudgetEditors(ready.remote.superCodeBudgets)
+    const connections = createSettingsEditors(ready.remote.superCodeConnection, { connection: createConnectionAutosave })
     const preferenceScope = preferenceService === 'configForms'
       ? ready.configForms.get('locale') : ready.settingsScope.bind({ namespace: 'locale' })
     ready.effect(() => synchronizePresetDisplay(ready.remote.superCodePresets, locale,
       () => window.location.reload(), error => console.warn('Super Code preset display:', error), preferenceScope), 'super-code: preset display')
     ready.slots.inject('settings.section', () => ready.slots.register({
       name: 'settings.section', id: 'super-code', order: 120, label: () => t('preset.title'), locale: LOCALE_NS,
-      inject: () => ({ api: ready.remote.superCodePresets, budgetApi: ready.remote.superCodeBudgets, connectionApi: ready.remote.superCodeConnection, openSession: id => navigation.openSession(id) }),
+      inject: () => ({ api: ready.remote.superCodePresets, budgetApi: budgets, connectionApi: ready.remote.superCodeConnection, connectionSettings: connections, openSession: id => navigation.openSession(id) }),
     }, PresetSettings))
   })
   ctx.effect(() => {
@@ -3125,6 +3389,7 @@ function apply(ctx) {
 .dsh-super-code-settings-mark svg{width:22px;height:22px;color:var(--sc-text)}
 .dsh-super-code-settings-head-text{display:grid;gap:4px;min-width:0}
 .dsh-super-code-settings-name{font-size:16px;font-weight:600;line-height:1.4;margin:0}
+.dsh-super-code-skill-version{margin-left:8px;font-size:12px;font-weight:400;color:var(--sc-muted);font-variant-numeric:tabular-nums}
 .dsh-super-code-settings-body{padding:20px 24px 24px}
 .dsh-super-code-settings-status-row{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex-wrap:wrap}
 .dsh-super-code-preset-status{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin:4px 0;font-size:13px;min-width:0;flex:1}
@@ -3153,7 +3418,7 @@ function apply(ctx) {
 .dsh-super-code-settings-guidance{margin-top:20px;padding-top:12px;border-top:1px solid var(--sc-line);color:var(--sc-muted);font-size:12px}
 .dsh-super-code-settings-guidance p{margin:0 0 4px}
 .dsh-super-code-settings-tabs{display:flex;gap:24px;padding:0 24px;border-bottom:1px solid var(--sc-line)}
-.dsh-super-code-settings-tabs>[role=tab]{border:0;border-bottom:2px solid transparent;background:none;color:var(--sc-muted);padding:12px 0;font-size:13px;cursor:pointer}
+.dsh-super-code-settings-tabs>[role=tab]{flex:none;border:0;border-bottom:2px solid transparent;background:none;color:var(--sc-muted);padding:12px 0;font-size:13px;cursor:pointer}
 .dsh-super-code-settings-tabs>[role=tab][aria-selected=true]{border-bottom-color:var(--sc-text);color:var(--sc-text);font-weight:600}
 .dsh-super-code-settings-tabs>[role=tab]:focus-visible{outline:2px solid var(--sc-active);outline-offset:3px;border-radius:2px}
 .dsh-super-code-settings [role=tabpanel][hidden]{display:none}
@@ -3799,5 +4064,5 @@ function apply(ctx) {
   ctx.effect(() => disposeMemoryType, 'super-code: memory library tab')
 }
 
-return { inject, apply, taskFeedbackRows, feedbackStatus, feedbackListItems, feedbackListLayout, feedbackListIndex, feedbackListWindow, feedbackListAnchor, connectionSessions, createConnectionAutosave, createBudgetAutosave, connectionDraft, connectionConfiguration, budgetDraft, budgetConfiguration, synchronizePresetDisplay, agentSessionState, buildAgentView, visibleAgentRows, agentTreeDisplay, agentTreeTotals, agentTreeLayout, agentExecutionStatus, agentDetailAddress, agentDetailTarget, agentPath, detailRecord, createAgentInspector, agentHistoryRange, agentHistoryRows, agentHistoryWindow, memoryLibraryAddress, memoryLibraryTarget, memoryLibraryNavigation, memoryLibraryWindow, createMemoryEditor, MemoryLibrary }
+return { inject, apply, skillPackageSource, synchronizeSkillMenus, refreshNativeSkillMenus, taskFeedbackRows, feedbackStatus, feedbackListItems, feedbackListLayout, feedbackListIndex, feedbackListWindow, feedbackListAnchor, connectionSessions, createConnectionAutosave, createBudgetAutosave, createBudgetEditors, connectionDraft, connectionConfiguration, budgetDraft, budgetConfiguration, synchronizePresetDisplay, agentSessionState, buildAgentView, visibleAgentRows, agentTreeDisplay, agentTreeTotals, agentTreeLayout, agentExecutionStatus, agentDetailAddress, agentDetailTarget, agentPath, detailRecord, createAgentInspector, agentHistoryRange, agentHistoryRows, agentHistoryWindow, memoryLibraryAddress, memoryLibraryTarget, memoryLibraryNavigation, memoryLibraryWindow, createMemoryEditor, MemoryLibrary }
 } })