@bibobonking/opensol 3.1.4 → 3.1.5

package/src/agent/prompt.ts

@@ -2,6 +2,7 @@ import type { AgentMode, AppSettings } from '../types'
 import { activeModelId } from '../store/settings'
 import { useWorkspace } from '../store/workspace'
 import { kernel } from '../core/kernel'
+import { skillCatalogPrompt } from '../store/skills'
 
 function workspaceContext(): string {
   const state = useWorkspace.getState()
@@ -26,22 +27,14 @@ function workspaceContext(): string {
     .join('\n')
 }
 
-export function buildSystemPrompt(settings: AppSettings, mode: AgentMode = settings.mode): string {
+export function buildSystemPrompt(settings: AppSettings, mode: AgentMode = settings.mode, sessionId?: string): string {
   if (kernel.systemPrompt) {
-    return kernel.systemPrompt.assemble(settings, mode)
+    return kernel.systemPrompt.assemble(settings, mode, sessionId)
   }
   const chunks: string[] = [settings.systemPrompt.trim()]
 
-  const skills = settings.skills.filter((skill) => skill.enabled)
-  if (skills.length > 0) {
-    chunks.push(
-      [
-        '## 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'),
-    )
-  }
+  const catalog = skillCatalogPrompt()
+  if (catalog && settings.tools.skill?.enabled !== false) chunks.push(catalog)
 
   chunks.push(
     [
@@ -89,9 +82,9 @@ export function buildSystemPrompt(settings: AppSettings, mode: AgentMode = setti
   return chunks.filter(Boolean).join('\n\n')
 }
 
-export function buildSubagentPrompt(settings: AppSettings): string {
+export function buildSubagentPrompt(settings: AppSettings, sessionId?: string): string {
   return [
-    buildSystemPrompt(settings, 'plan'),
+    buildSystemPrompt(settings, 'plan', sessionId),
     [
       '## Subagent',
       'You are a focused read-only investigator. Work only on the assigned task.',

package/src/agent/subagent.ts

@@ -11,8 +11,6 @@ import { streamModel } from './model'
 import { buildSubagentPrompt } from './prompt'
 import { executeTool } from './tools'
 
-const MAX_SUBAGENT_ROUNDS = 6
-
 function id(prefix: string) {
   const raw =
     typeof crypto !== 'undefined' && 'randomUUID' in crypto
@@ -33,6 +31,7 @@ export async function runSubagent(
   task: string,
   context: string,
   signal: AbortSignal,
+  sessionId?: string,
 ): Promise<string> {
   const cleanTask = task.trim()
   if (!cleanTask) return 'The subagent was not given a task.'
@@ -40,7 +39,7 @@ export async function runSubagent(
 
   const settings = useSettings.getState()
   const model = findModel(settings.provider, settings.model)
-  const system = buildSubagentPrompt(settings)
+  const system = buildSubagentPrompt(settings, sessionId)
   const now = Date.now()
   const first: UserMessage = {
     id: id('sub'),
@@ -55,9 +54,8 @@ export async function runSubagent(
     createdAt: now,
   }
   const history: Message[] = [first]
-  let lastContent = ''
 
-  for (let round = 0; round < MAX_SUBAGENT_ROUNDS; round += 1) {
+  for (let round = 0; ; round += 1) {
     if (signal.aborted) throw abortError()
     const result = await streamModel({
       settings,
@@ -68,8 +66,6 @@ export async function runSubagent(
       signal,
       handlers: EMPTY_HANDLERS,
     })
-    if (result.content.trim()) lastContent = result.content.trim()
-
     const assistant: AssistantMessage = {
       id: id('submsg'),
       role: 'assistant',
@@ -99,11 +95,4 @@ export async function runSubagent(
       history.push(toolMessage)
     }
   }
-
-  return [
-    lastContent,
-    `The subagent stopped after ${MAX_SUBAGENT_ROUNDS} investigation rounds. Continue with the evidence above or ask a narrower question.`,
-  ]
-    .filter(Boolean)
-    .join('\n\n')
 }

package/src/agent/tools.ts

@@ -538,6 +538,8 @@ export function toolSummary(name: ToolName, args: Record<string, unknown>): stri
               ? args.action
               : name === 'subagent'
                 ? args.task
+                : name === 'skill'
+                  ? [args.name, args.file].filter(Boolean).join(' / ')
                 : (args.path ?? '')
   return typeof value === 'string' ? value : ''
 }

package/src/components/ChatView.tsx

@@ -1,3 +1,4 @@
+import { useSkills } from '../store/skills'
 import { useEffect, useRef, useState } from 'react'
 import { ArrowUp, Bug, FlaskConical, FolderSearch, Gamepad2, Globe2, KeyRound, LayoutTemplate, ListChecks, Sparkles } from 'lucide-react'
 import type { Attachment } from '../types'
@@ -86,7 +87,7 @@ export function ChatView() {
   const lastAssistantId = [...messages].reverse().find((message) => message.role === 'assistant')?.id
   const connected = hasCredentials(settings)
   const selectedModel = activeModelId(settings)
-  const activeSkills = settings.skills.filter((skill) => skill.enabled).length
+  const activeSkills = useSkills((state) => state.skills.filter((skill) => skill.enabled).length)
   const turns = groupConversationTurns(messages)
   const context = getContextUsage(messages, activeModel)
   const mood = pixleMood(messages, streaming)

package/src/components/Composer.tsx

@@ -24,6 +24,7 @@ import {
   X,
 } from 'lucide-react'
 import type { Attachment } from '../types'
+import { useSkills } from '../store/skills'
 import { activeModelId, hasCredentials, useSettings } from '../store/settings'
 import { useActiveModel, useProviderModels } from '../store/models'
 import { useUi } from '../store/ui'
@@ -124,7 +125,7 @@ export function Composer({
   const activeModel = useActiveModel()
   const connected = hasCredentials(settings)
   const efforts = effortOptions(activeModel)
-  const activeSkills = settings.skills.filter((skill) => skill.enabled).length
+  const activeSkills = useSkills((state) => state.skills.filter((skill) => skill.enabled).length)
   const permission = permissionMode(settings.tools)
   const modelLabel = !connected
     ? 'No provider'

package/src/components/ContextBar.tsx

@@ -10,6 +10,7 @@ import { useMemo } from 'react'
 import type { ModelInfo, Message } from '../types'
 import { getContextUsage, AUTO_COMPACT_THRESHOLD } from '../lib/context'
 import { isCompacting } from '../agent/compact'
+import { formatCredits, sumCost } from '../lib/credits'
 import { cn } from '../lib/utils'
 
 interface ContextBarProps {
@@ -26,6 +27,7 @@ function formatTokens(n: number): string {
 
 export function ContextBar({ messages, model, sessionId }: ContextBarProps) {
   const usage = useMemo(() => getContextUsage(messages, model), [messages, model])
+  const spent = useMemo(() => sumCost(messages), [messages])
   const compacting = sessionId ? isCompacting(sessionId) : false
 
   if (messages.length === 0) return null
@@ -51,6 +53,14 @@ export function ContextBar({ messages, model, sessionId }: ContextBarProps) {
           <span className="text-faint">/ {formatTokens(limit)} tokens</span>
           <span className="text-faint">·</span>
           <span>{pct}%</span>
+          {spent > 0 && (
+            <>
+              <span className="text-faint">·</span>
+              <span className="text-ink/80" title="Credits spent in this session (provider-reported, or tokens × model price)">
+                {formatCredits(spent)}
+              </span>
+            </>
+          )}
         </>
       )}
     </div>