@bibobonking/opensol 3.1.4 → 3.1.5

package/src/components/ToolCallCard.tsx

@@ -52,6 +52,8 @@ function approvalCopy(name: ToolName) {
       return 'OpenSol wants to change the Git state of this repository.'
     case 'subagent':
       return 'OpenSol wants to start a read-only subagent to investigate.'
+    case 'skill':
+      return 'OpenSol wants to load an installed skill.'
     case 'web_search':
       return 'OpenSol wants to search the web.'
     case 'read_url':

package/src/components/TopBar.tsx

@@ -2,7 +2,6 @@ import {
   FolderOpen,
   ListChecks,
   Menu,
-  MessageSquareCode,
   Moon,
   PanelLeftOpen,
   Rocket,
@@ -20,8 +19,7 @@ import { cn } from '../lib/utils'
 import { themeIsDark } from '../lib/themes'
 import { LogoMark } from './Logo'
 import { ContextBar } from './ContextBar'
-import { SystemPromptModal } from './SystemPromptModal'
-import { useState } from 'react'
+import { SystemPromptButton } from './SystemPromptButton'
 
 export type ChatViewMode = 'chat' | 'trajectory'
 
@@ -47,11 +45,7 @@ export function TopBar({
   const setWorkspaceOpen = useUi((state) => state.setWorkspaceOpen)
   const setDeployOpen = useUi((state) => state.setDeployOpen)
   const workspace = useWorkspace((state) => state.info)
-  const workspaceRoot = useWorkspace((state) => state.root)
   const activeModel = useActiveModel()
-  const [promptOpen, setPromptOpen] = useState(false)
-  const root = session?.workspace || workspaceRoot || ''
-  const promptIsCustom = Boolean(session?.systemPrompt?.trim() || (root && settings.workspacePrompts[root]?.trim()))
 
   // Go through the theme registry so Night Owl, Claude Code, Solar and plugin themes count as dark.
   const isDark = themeIsDark(
@@ -133,17 +127,6 @@ export function TopBar({
             <ContextBar messages={session?.messages ?? []} model={activeModel} sessionId={session?.id ?? null} />
           </div>
         )}
-        <button
-          type="button"
-          className={cn('icon-button relative hidden sm:inline-flex', promptIsCustom && 'text-accent')}
-          onClick={() => setPromptOpen(true)}
-          disabled={!session}
-          title={promptIsCustom ? 'Custom system prompt for this session or workspace' : 'Edit the system prompt for this session'}
-          aria-label="Edit system prompt"
-        >
-          <MessageSquareCode size={16} />
-          {promptIsCustom && <span className="absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-accent" />}
-        </button>
         <button
           type="button"
           onClick={() => setWorkspaceOpen(!workspaceOpen)}
@@ -158,6 +141,7 @@ export function TopBar({
           <FolderOpen size={13} className="shrink-0" />
           <span className="max-w-[140px] truncate">{workspace.available ? workspace.name : 'No folder'}</span>
         </button>
+        <SystemPromptButton session={session} />
         <button
           type="button"
           className="icon-button hidden sm:inline-flex"
@@ -195,7 +179,6 @@ export function TopBar({
           <Settings size={16} />
         </button>
       </div>
-      <SystemPromptModal session={session} open={promptOpen} onClose={() => setPromptOpen(false)} />
     </header>
   )
 }

package/src/components/WorkspacePanel.tsx

@@ -26,9 +26,9 @@ import { cn, formatBytes } from '../lib/utils'
 import { useUi } from '../store/ui'
 import { useWorkspace } from '../store/workspace'
 import { PreviewPane } from './PreviewPane'
+import { FileIcon, FolderIcon } from './FileIcon'
 import { SessionsTab } from './SessionsTab'
 import { useChats } from '../store/chats'
-import { FileIcon } from './FileIcon'
 import { Spinner } from './ui'
 
 interface TreeNode {
@@ -249,9 +249,6 @@ export function WorkspacePanel() {
     return entries.filter((entry) => entry.path.toLowerCase().includes(clean)).slice(0, 300)
   }, [entries, query])
   const lineCount = content ? content.split('\n').length : 0
-  const dirCount = entries.filter((entry) => entry.type === 'dir').length
-  const fileCount = entries.length - dirCount
-  const dirPaths = useMemo(() => entries.filter((entry) => entry.type === 'dir').map((entry) => entry.path), [entries])
 
   useEffect(() => {
     if (editor) editorRef.current?.focus()
@@ -272,6 +269,20 @@ export function WorkspacePanel() {
     return () => window.removeEventListener('keydown', onKey)
   }, [])
 
+  const gitStatus = useMemo(() => {
+    const files = new Map<string, string>()
+    const dirs = new Set<string>()
+    for (const change of git.entries) {
+      files.set(change.path, change.status.trim() || 'M')
+      let slash = change.path.lastIndexOf('/')
+      while (slash > 0) {
+        dirs.add(change.path.slice(0, slash))
+        slash = change.path.lastIndexOf('/', slash - 1)
+      }
+    }
+    return { files, dirs }
+  }, [git.entries])
+
   if (!open) return null
 
   const submitEditor = async () => {
@@ -316,87 +327,82 @@ export function WorkspacePanel() {
     }
   }
 
+  const statusTone = (status: string) =>
+    status.includes('?') || status.includes('A') ? 'text-success' : status.includes('D') ? 'text-danger' : 'text-warning'
+
   const renderNode = (node: TreeNode, depth: number): ReactNode => {
     const path = node.entry.path
+    const indent = 10 + depth * 14
     if (node.entry.type === 'dir') {
       const closed = collapsed.has(path)
+      const touched = gitStatus.dirs.has(path)
       return (
         <div key={path}>
-          <div
-            className="group/row relative flex h-7 items-center rounded-lg transition-colors hover:bg-raised/80"
-            style={{ paddingLeft: 6 + depth * 14 }}
+          <button
+            type="button"
+            onClick={() =>
+              setCollapsed((current) => {
+                const next = new Set(current)
+                if (next.has(path)) next.delete(path)
+                else next.add(path)
+                return next
+              })
+            }
+            className="group flex h-[26px] w-full items-center gap-1.5 rounded-md pr-1.5 text-left text-[12px] font-medium text-ink/85 transition-colors hover:bg-raised hover:text-ink"
+            style={{ paddingLeft: indent }}
+            title={path}
+            aria-expanded={!closed}
           >
-            <button
-              type="button"
-              onClick={() =>
-                setCollapsed((current) => {
-                  const next = new Set(current)
-                  if (next.has(path)) next.delete(path)
-                  else next.add(path)
-                  return next
-                })
-              }
-              className="flex min-w-0 flex-1 items-center gap-1.5 pr-1 text-left text-[11.5px] font-medium text-muted transition-colors hover:text-ink"
-              title={path}
-              aria-expanded={!closed}
-            >
-              <ChevronRight
-                size={10}
-                className={cn('shrink-0 text-faint transition-transform duration-150', !closed && 'rotate-90')}
-              />
-              <FileIcon path={path} type="dir" open={!closed} size={13} />
-              <span className="min-w-0 flex-1 truncate">{node.entry.name}</span>
-              <span className="shrink-0 pr-1 font-mono text-[8.5px] tabular-nums text-faint opacity-0 transition-opacity group-hover/row:opacity-100">
-                {node.children.length}
-              </span>
-            </button>
-            <button
-              type="button"
-              onClick={() => void removeEntry(path)}
-              className="mr-1 flex h-5 w-5 shrink-0 items-center justify-center rounded text-faint opacity-0 transition-all hover:bg-danger/10 hover:text-danger focus-visible:opacity-100 group-hover/row:opacity-100"
+            <ChevronRight size={11} strokeWidth={2.2} className={cn('shrink-0 text-faint transition-transform duration-150', !closed && 'rotate-90')} />
+            <FolderIcon name={node.entry.name} open={!closed} size={16} />
+            <span className="min-w-0 flex-1 truncate">{node.entry.name}</span>
+            {touched && closed && <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-warning" title="Contains changes" />}
+            {closed && node.children.length > 0 && (
+              <span className="shrink-0 rounded-full bg-raised px-1.5 text-[9px] tabular-nums text-faint group-hover:hidden">{node.children.length}</span>
+            )}
+            <span
+              role="button"
+              tabIndex={0}
+              onClick={(event) => {
+                event.stopPropagation()
+                void removeEntry(path)
+              }}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') void removeEntry(path)
+              }}
+              className="hidden h-5 w-5 items-center justify-center rounded text-faint hover:text-danger group-hover:flex"
               aria-label={`Delete ${path}`}
-              title={`Delete ${path}`}
             >
-              <Trash2 size={10} />
-            </button>
-          </div>
-          {!closed && (
+              <Trash2 size={11} />
+            </span>
+          </button>
+          {!closed && node.children.length > 0 && (
             <div className="relative">
-              <span
-                aria-hidden
-                className="pointer-events-none absolute bottom-0.5 top-0 w-px bg-line/60"
-                style={{ left: 11 + depth * 14 }}
-              />
+              <span aria-hidden className="pointer-events-none absolute bottom-0.5 top-0 w-px bg-line/70" style={{ left: indent + 5 }} />
               {node.children.map((child) => renderNode(child, depth + 1))}
             </div>
           )}
         </div>
       )
     }
+    const active = activeFile === path
+    const status = gitStatus.files.get(path)
     return (
       <button
         key={path}
         type="button"
         onClick={() => setActiveFile(path)}
         className={cn(
-          'group/row relative flex h-7 w-full items-center gap-1.5 rounded-lg pr-1.5 text-left font-mono text-[10.5px] transition-colors',
-          activeFile === path
-            ? 'bg-accent-soft/80 font-medium text-accent'
-            : 'text-muted hover:bg-raised/80 hover:text-ink',
+          'group relative flex h-[26px] w-full items-center gap-1.5 rounded-md pr-2 text-left text-[11.5px] transition-colors',
+          active ? 'bg-accent-soft font-medium text-ink' : 'text-muted hover:bg-raised hover:text-ink',
         )}
-        style={{ paddingLeft: 22 + depth * 14 }}
+        style={{ paddingLeft: indent + 13 }}
         title={path}
       >
-        {activeFile === path && (
-          <span aria-hidden className="absolute left-0 top-1 bottom-1 w-[2px] rounded-full bg-accent" />
-        )}
-        <FileIcon path={path} size={12} className={cn(activeFile === path && 'text-accent')} />
-        <span className="min-w-0 flex-1 truncate">{node.entry.name}</span>
-        {node.entry.size > 0 && (
-          <span className="shrink-0 font-mono text-[8.5px] tabular-nums text-faint opacity-0 transition-opacity group-hover/row:opacity-100">
-            {formatBytes(node.entry.size)}
-          </span>
-        )}
+        {active && <span aria-hidden className="absolute inset-y-1 left-0 w-[3px] rounded-r-full bg-accent" />}
+        <FileIcon name={node.entry.name} size={15} />
+        <span className={cn('min-w-0 flex-1 truncate', status && statusTone(status))}>{node.entry.name}</span>
+        {status && <span className={cn('shrink-0 font-mono text-[9px] font-semibold', statusTone(status))}>{status.slice(0, 1)}</span>}
       </button>
     )
   }
@@ -539,20 +545,6 @@ export function WorkspacePanel() {
                       aria-label="Find a file"
                     />
                   </div>
-                  <div className="flex items-center justify-between gap-2 px-1 pt-1.5 text-[8.5px] text-faint">
-                    <span className="truncate">
-                      {filtered ? `${filtered.length} matches` : `${fileCount} files · ${dirCount} folders`}
-                    </span>
-                    {!filtered && dirCount > 0 && (
-                      <button
-                        type="button"
-                        onClick={() => setCollapsed(collapsed.size > 0 ? new Set() : new Set(dirPaths))}
-                        className="shrink-0 font-medium hover:text-ink"
-                      >
-                        {collapsed.size > 0 ? 'Expand all' : 'Collapse all'}
-                      </button>
-                    )}
-                  </div>
                   {editor && (
                     <div className="mt-1.5 flex items-center gap-1">
                       <input
@@ -587,34 +579,24 @@ export function WorkspacePanel() {
                       <Spinner size={11} /> Reading folder…
                     </p>
                   )}
-                  {filtered ? (
-                    <>
-                      {filtered.map((entry) => (
+                  {filtered
+                    ? filtered.map((entry) => (
                         <button
                           key={entry.path}
                           type="button"
                           onClick={() => entry.type === 'file' && setActiveFile(entry.path)}
                           className={cn(
-                            'group/row relative flex h-7 w-full items-center gap-1.5 rounded-lg px-2 text-left font-mono text-[10.5px] transition-colors',
+                            'flex h-7 w-full items-center gap-1.5 rounded-md px-2 text-left font-mono text-[10.5px]',
                             activeFile === entry.path
-                              ? 'bg-accent-soft/80 font-medium text-accent'
-                              : 'text-muted hover:bg-raised/80 hover:text-ink',
+                              ? 'bg-accent-soft font-medium text-accent'
+                              : 'text-muted hover:bg-raised hover:text-ink',
                           )}
                         >
-                          {activeFile === entry.path && (
-                            <span aria-hidden className="absolute left-0 top-1 bottom-1 w-[2px] rounded-full bg-accent" />
-                          )}
-                          <FileIcon path={entry.path} type={entry.type === 'dir' ? 'dir' : 'file'} size={12} />
+                          {entry.type === 'dir' ? <FolderIcon name={entry.name} size={15} /> : <FileIcon name={entry.name} size={15} />}
                           <span className="truncate">{entry.path}</span>
                         </button>
-                      ))}
-                      {filtered.length === 0 && (
-                        <p className="px-2 py-4 text-center text-[10.5px] text-faint">No matches in this folder.</p>
-                      )}
-                    </>
-                  ) : (
-                    tree.map((node) => renderNode(node, 0))
-                  )}
+                      ))
+                    : tree.map((node) => renderNode(node, 0))}
                   {!loadingTree && !treeError && entries.length === 0 && (
                     <p className="px-2 py-4 text-center text-[10.5px] text-faint">This folder is empty.</p>
                   )}
@@ -734,7 +716,8 @@ export function WorkspacePanel() {
                       className="flex w-full items-center gap-2 px-3 py-1.5 text-left font-mono text-[10px] hover:bg-raised"
                       title={entry.path}
                     >
-                      <span className="w-6 shrink-0 text-warning">{entry.status}</span>
+                      <span className="w-6 shrink-0 font-mono font-semibold text-warning">{entry.status}</span>
+                      <FileIcon name={entry.path.split('/').pop() ?? entry.path} size={14} />
                       <span className="truncate text-muted">{entry.path}</span>
                     </button>
                   ))

package/src/core/plugins/tools/skill.ts

@@ -1,101 +1,44 @@
 import type { Context } from 'cordis'
-import { executeDaemonTool } from '../../../lib/daemon'
-import type { Skill } from '../../../types'
+import { readSkillApi } from '../../../lib/daemon'
 import type { ToolResult } from '../../types'
 
-function findSkill(skills: Skill[], name: string): Skill | undefined {
-  const clean = name.trim().toLowerCase()
-  return skills.find((skill) => skill.id.toLowerCase() === clean || skill.name.toLowerCase() === clean)
-}
-
-function text(args: Record<string, unknown>, key: string): string {
-  return typeof args[key] === 'string' ? String(args[key]).trim() : ''
-}
+const MAX_TOOL_OUTPUT = 60_000
 
 export const name = 'tool-skill'
 export const inject = ['tools']
 
 export function apply(ctx: Context) {
-  const unregister = ctx.tools.register({
+  return ctx.tools.register({
     name: 'skill',
     description:
-      'Work with installed skills. Use action "list" to see them, "read" to load a skill’s SKILL.md, and "run" to execute a command inside the skill folder.',
+      'Load an installed skill by name. With only `name` it returns the skill\'s SKILL.md instructions and the list of bundled files. Pass `file` (relative path, e.g. "references/api.md") to read one bundled file. Skill scripts can be run with the shell tool from the returned directory.',
     parameters: {
       type: 'object',
       properties: {
-        action: { type: 'string', enum: ['list', 'read', 'run'], description: 'What to do.' },
-        name: { type: 'string', description: 'Skill id or name. Required for read and run.' },
-        command: { type: 'string', description: 'Shell command to run inside the skill folder. Required for run.' },
+        name: { type: 'string', description: 'Skill name from the Skills list in the system prompt.' },
+        file: { type: 'string', description: 'Optional bundled file to read, relative to the skill folder.' },
       },
-      required: ['action'],
+      required: ['name'],
       additionalProperties: false,
     },
     allowedInMode: () => true,
-    async execute(args, exec): Promise<ToolResult> {
-      const skills = exec.settings.skills.filter((skill) => skill.enabled)
-      const action = text(args, 'action') || 'list'
-
-      if (action === 'list') {
-        if (skills.length === 0) return { output: 'No skills are installed.', isError: false }
-        return {
-          output: skills
-            .map((skill) => `${skill.name} (${skill.id})${skill.package ? ` · ${skill.package}` : ''}\n  ${skill.description}`)
-            .join('\n'),
-          isError: false,
-        }
-      }
-
-      const target = findSkill(skills, text(args, 'name'))
-      if (!target) {
-        return {
-          output: `No enabled skill matches "${text(args, 'name')}". Call action "list" to see the available skills.`,
-          isError: true,
+    async execute(args): Promise<ToolResult> {
+      const skillName = typeof args.name === 'string' ? args.name.trim() : ''
+      if (!skillName) return { output: 'Missing string argument "name".', isError: true }
+      try {
+        const result = await readSkillApi(skillName, typeof args.file === 'string' ? args.file : undefined)
+        const parts = [`Skill: ${result.name} · ${result.file}`, `Directory: ${result.directory}`, '────', result.content]
+        if (result.files && result.files.length > 0) {
+          parts.push('────', `Bundled files (read with this tool's "file" argument):\n${result.files.map((item) => `- ${item}`).join('\n')}`)
         }
-      }
-
-      if (action === 'read') {
-        const files = Object.keys(target.files ?? {})
+        const text = parts.join('\n')
         return {
-          output: [
-            `# ${target.name}`,
-            target.description,
-            target.package ? `Package: ${target.package}` : '',
-            files.length > 0 ? `Files:\n${files.map((file) => `- ${file}`).join('\n')}` : '',
-            '---',
-            target.instructions.trim() || 'This skill has no instructions.',
-          ]
-            .filter(Boolean)
-            .join('\n\n'),
+          output: text.length > MAX_TOOL_OUTPUT ? `${text.slice(0, MAX_TOOL_OUTPUT)}\n… truncated` : text,
           isError: false,
         }
+      } catch (error) {
+        return { output: error instanceof Error ? error.message : 'Could not load the skill.', isError: true }
       }
-
-      if (action === 'run') {
-        if (exec.mode === 'plan') {
-          return { output: 'Plan mode is read-only: skill scripts may change the machine, so they cannot run here.', isError: true }
-        }
-        const command = text(args, 'command')
-        if (!command) return { output: 'Pass the command to run inside the skill folder.', isError: true }
-        if (!target.files || Object.keys(target.files).length === 0) {
-          return { output: `"${target.name}" has no files to run. Install it from a folder or npm.`, isError: true }
-        }
-        const result = (await executeDaemonTool(
-          'skill_run',
-          { name: target.id, files: target.files, command },
-          exec.mode,
-          exec.signal,
-        )).result as { stdout?: string; stderr?: string; code?: number }
-        const code = typeof result.code === 'number' ? result.code : 1
-        const body = `${result.stdout ?? ''}${result.stderr ?? ''}`.trim()
-        return {
-          output: body || `The skill command exited with code ${code} and printed nothing.`,
-          isError: code !== 0,
-        }
-      }
-
-      return { output: `Unknown skill action "${action}". Use list, read or run.`, isError: true }
     },
   })
-
-  return () => unregister()
 }

package/src/core/services/agent-loop.ts

@@ -4,17 +4,15 @@ import { activeModelId, useSettings } from '../../store/settings'
 import { createId } from '../../store/chats'
 import { findModel } from '../../store/models'
 import { useRuntime } from '../../store/ui'
-import { useWorkspace } from '../../store/workspace'
 import { getProviderName } from '../../data/providers'
 import { describeRequestError } from '../../lib/sse'
-import { MAX_PROVIDER_RETRIES, isRetryableProviderError, retryDelayMs } from '../../lib/retry'
+import { messageCost } from '../../lib/credits'
+import { MAX_RETRIES, backoffMs, classifyProviderError } from '../../lib/retry'
 import type { AdapterResult } from '../../agent/adapters/shared'
 import { createTurnQueue, lastUserMessageId } from '../../agent/queue'
 import { resolveToolSetting } from '../mcp-tools'
 import type { StepContext, StepResult, TurnResult } from '../types'
 
-const MAX_RETRIES = MAX_PROVIDER_RETRIES
-
 function sleep(ms: number, signal: AbortSignal): Promise<void> {
   return new Promise((resolve) => {
     const finish = () => {
@@ -111,7 +109,7 @@ export class AgentLoopService extends Service {
     let turnError: string | undefined
 
     try {
-      // No round cap: the turn ends when the model stops calling tools or the user stops it.
+      // No round cap: the turn ends when the model stops calling tools, errors, or the user stops it.
       rounds: for (let round = 0; ; round += 1) {
         totalRounds = round + 1
         if (controller.signal.aborted) break
@@ -188,12 +186,7 @@ export class AgentLoopService extends Service {
               settings,
               model: findModel(settings.provider, activeModelId(settings)),
               history,
-              system: this.ctx.systemPrompt.assemble(settings, mode, {
-                sessionPrompt: current.systemPrompt,
-                workspacePrompt: current.workspace
-                  ? settings.workspacePrompts[current.workspace]
-                  : settings.workspacePrompts[useWorkspace.getState().root ?? ''],
-              }),
+              system: this.ctx.systemPrompt.assemble(settings, mode, sessionId),
               mode,
               signal: controller.signal,
               handlers: {
@@ -215,39 +208,26 @@ export class AgentLoopService extends Service {
           } catch (error) {
             const stopped = isAbortError(error) || controller.signal.aborted
             // Only retry when nothing reached the screen yet, so a retry never duplicates text.
+            const message = error instanceof Error ? error.message : ''
+            const decision = classifyProviderError(message)
             const retryable =
-              !stopped &&
-              attempt < MAX_RETRIES &&
-              !streamedContent &&
-              !streamedReasoning &&
-              isRetryableProviderError(error instanceof Error ? error.message : '')
+              !stopped && decision.retry && attempt < MAX_RETRIES && !streamedContent && !streamedReasoning
             if (retryable) {
               attempt += 1
-              const reason = (error instanceof Error ? error.message : 'provider error').replace(/\s+/g, ' ').slice(0, 240)
+              const wait = backoffMs(attempt, message)
               window.dispatchEvent(
                 new CustomEvent('maxcode:notice', {
                   detail: {
-                    message: `${providerName}: ${reason} — retrying ${attempt}/${MAX_RETRIES}…`,
+                    message: `${providerName} had a temporary error. Retrying in ${Math.round(wait / 1000)}s (${attempt}/${MAX_RETRIES})…`,
                     tone: 'info',
                   },
                 }),
               )
-              await sleep(retryDelayMs(attempt), controller.signal)
-              if (controller.signal.aborted) continue
+              await sleep(wait, controller.signal)
               continue
             }
             if (flushTimer !== undefined) window.clearTimeout(flushTimer)
             turnError = stopped ? undefined : describeRequestError(error, providerName)
-            if (turnError) {
-              window.dispatchEvent(
-                new CustomEvent('maxcode:notice', {
-                  detail: {
-                    message: `${providerName} failed after ${attempt + 1} attempt${attempt === 0 ? '' : 's'}: ${turnError}`,
-                    tone: 'error',
-                  },
-                }),
-              )
-            }
             this.ctx.sessions.updateMessage(sessionId, assistantId, {
               content: streamedContent,
               reasoning: streamedReasoning,
@@ -266,7 +246,11 @@ export class AgentLoopService extends Service {
           reasoning: result.reasoning,
           thinkingBlocks: result.thinkingBlocks,
           toolCalls: result.toolCalls,
-          usage: usage.input || usage.output || usage.cost ? usage : result.usage,
+          usage: usage.input || usage.output ? usage : result.usage,
+          cost: messageCost(
+            usage.input || usage.output ? usage : result.usage,
+            findModel(settings.provider, activeModelId(settings)),
+          ),
           durationMs: Date.now() - startedAt,
           stopped: controller.signal.aborted || undefined,
         })
@@ -331,6 +315,7 @@ export class AgentLoopService extends Service {
                         typeof call.args.task === 'string' ? call.args.task : '',
                         typeof call.args.context === 'string' ? call.args.context : '',
                         controller.signal,
+                        sessionId,
                       ),
                     ),
                     isError: false,

package/src/core/services/subagents.ts

@@ -9,7 +9,7 @@ export class SubagentService extends Service {
     super(ctx, 'subagents')
   }
 
-  async run(task: string, context: string, signal: AbortSignal): Promise<string> {
-    return await runSubagent(task, context, signal)
+  async run(task: string, context: string, signal: AbortSignal, sessionId?: string): Promise<string> {
+    return await runSubagent(task, context, signal, sessionId)
   }
 }

package/src/core/services/system-prompt.ts

@@ -2,6 +2,8 @@ import { Service, type Context } from 'cordis'
 import type { AgentMode, AppSettings } from '../../types'
 import { activeModelId } from '../../store/settings'
 import { useWorkspace } from '../../store/workspace'
+import { skillCatalogPrompt } from '../../store/skills'
+import { resolveBasePrompt } from '../../lib/system-prompt'
 import type { PromptSection } from '../types'
 
 function workspaceContext(): string {
@@ -43,31 +45,22 @@ export class SystemPromptService extends Service {
     return () => this.customSections.delete(name)
   }
 
-  assemble(
-    settings: AppSettings,
-    mode: AgentMode = settings.mode,
-    overrides: { sessionPrompt?: string; workspacePrompt?: string } = {},
-  ): string {
+  assemble(settings: AppSettings, mode: AgentMode = settings.mode, sessionId?: string): string {
     const sections: PromptSection[] = []
 
-    // 1. Base instruction: session override, then workspace override, then the shared prompt.
-    const base = overrides.sessionPrompt?.trim() || overrides.workspacePrompt?.trim() || settings.systemPrompt?.trim()
-    if (base) {
-      sections.push({ name: 'base', priority: 10, content: base })
+    // 1. Base instruction
+    // Session prompt beats workspace prompt beats the app-wide one.
+    const workspaceState = useWorkspace.getState()
+    const session = sessionId ? this.ctx.sessions.current(sessionId) : undefined
+    const base = resolveBasePrompt(settings, session, workspaceState.root || workspaceState.info.root)
+    if (base.text.trim()) {
+      sections.push({ name: 'base', priority: 10, content: base.text.trim() })
     }
 
-    // 2. Skills are discovered, not pasted: the model loads one through the skill tool.
-    const skills = settings.tools.skill?.enabled === false ? [] : settings.skills.filter((skill) => skill.enabled)
-    if (skills.length > 0) {
-      sections.push({
-        name: 'skills',
-        priority: 20,
-        content: [
-          '## Available skills',
-          'Call the `skill` tool to load the full instructions (and run scripts from the skill folder) when a task matches one of these. Do not guess a skill’s contents.',
-          ...skills.map((skill) => `- ${skill.name} (${skill.id}): ${skill.description}`),
-        ].join('\n'),
-      })
+    // 2. Skill catalog (names + descriptions; bodies load on demand through the skill tool)
+    const catalog = skillCatalogPrompt()
+    if (catalog && settings.tools.skill?.enabled !== false) {
+      sections.push({ name: 'skills', priority: 20, content: catalog })
     }
 
     // 3. Workspace
@@ -163,9 +156,9 @@ export class SystemPromptService extends Service {
     })
   }
 
-  buildSubagentPrompt(settings: AppSettings): string {
+  buildSubagentPrompt(settings: AppSettings, sessionId?: string): string {
     return [
-      this.assemble(settings, 'plan'),
+      this.assemble(settings, 'plan', sessionId),
       [
         '## Subagent',
         'You are a focused read-only investigator. Work only on the assigned task.',

package/src/core/services/tools.ts

@@ -15,7 +15,6 @@ const READ_ONLY_TOOLS = new Set<ToolName>([
   'grep',
   'web_search',
   'read_url',
-  'skill',
 ])
 
 export function toolAllowedInMode(name: ToolName, mode: AgentMode): boolean {