@bibobonking/opensol 3.1.6 → 3.2.1

package/server/lib/tools.mjs

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process'
+import { currentShell, describeShell, killTree, planShellAllowed } from './shell.mjs'
 import { createHash } from 'node:crypto'
 import { lookup } from 'node:dns/promises'
 import {
@@ -481,17 +482,13 @@ function runProcess(command, args, { cwd, env, timeoutMs = 120_000, maxOutput =
       cwd,
       env: { ...process.env, ...(env ?? {}) },
       shell: false,
+      windowsHide: true,
       detached: process.platform !== 'win32',
       stdio: ['pipe', 'pipe', 'pipe'],
     })
     const terminate = () => {
       killed = true
-      try {
-        if (process.platform !== 'win32' && child.pid) process.kill(-child.pid, 'SIGKILL')
-        else child.kill('SIGKILL')
-      } catch {
-        child.kill('SIGKILL')
-      }
+      killTree(child)
     }
     const timer = setTimeout(() => {
       timedOut = true
@@ -541,46 +538,13 @@ function runProcess(command, args, { cwd, env, timeoutMs = 120_000, maxOutput =
   })
 }
 
-function planShellAllowed(command) {
-  if (/[;&|><`$(){}[\]\n]/.test(command)) return false
-  const tokens = command.trim().split(/\s+/).filter(Boolean)
-  if (tokens.length === 0) return false
-  const head = tokens[0]
-  const safe = new Set([
-    'pwd',
-    'ls',
-    'cat',
-    'head',
-    'tail',
-    'wc',
-    'grep',
-    'rg',
-    'find',
-    'tree',
-    'file',
-    'stat',
-    'du',
-    'df',
-    'date',
-    'whoami',
-    'git',
-  ])
-  if (!safe.has(head)) return false
-  if (head === 'git') {
-    const sub = tokens[1] ?? ''
-    if (!['status', 'diff', 'log', 'show', 'branch', 'remote', 'rev-parse', 'ls-files'].includes(sub)) {
-      return false
-    }
-  }
-  return true
-}
-
 export async function runShell(command, { mode = 'build', timeoutMs = 120_000 } = {}) {
   if (typeof command !== 'string' || !command.trim()) {
     throw new HttpError(400, 'A command is required.', 'bad_command')
   }
   if (command.length > 20_000) throw new HttpError(400, 'That command is too long.', 'bad_command')
-  if (mode === 'plan' && !planShellAllowed(command)) {
+  const shell = currentShell()
+  if (mode === 'plan' && !planShellAllowed(command, shell)) {
     throw new HttpError(
       403,
       'Plan mode is read-only. Use read_file, list_files, grep or a read-only shell command.',
@@ -588,12 +552,12 @@ export async function runShell(command, { mode = 'build', timeoutMs = 120_000 }
     )
   }
   const root = await workspaceRoot()
-  const result = await runProcess('/bin/bash', ['-lc', command], {
+  const result = await runProcess(shell.file, shell.args(command), {
     cwd: root,
     timeoutMs: Math.max(1000, Math.min(Number(timeoutMs) || 120_000, 600_000)),
-    env: { MAXCODE: '1', MAXCODE_WORKSPACE: root },
+    env: { OPENSOL: '1', OPENSOL_WORKSPACE: root, MAXCODE: '1', MAXCODE_WORKSPACE: root },
   })
-  return { ...result, command, cwd: root }
+  return { ...result, command, cwd: root, shell: describeShell(shell) }
 }
 
 const GIT_ACTIONS = new Set(['status', 'diff', 'log', 'show', 'branch', 'add', 'commit', 'init', 'checkout'])

package/src/agent/adapters/anthropic.ts

@@ -2,7 +2,6 @@ import type { Message, ToolCall } from '../../types'
 import { requestLLM } from '../../lib/daemon'
 import { budgetForEffort, effortValues, hasBudget, normalizeEffort } from '../../lib/reasoning'
 import { readSSE } from '../../lib/sse'
-import { getToolSchemas } from '../tools'
 import {
   assistantHistory,
   imageAttachments,
@@ -73,7 +72,7 @@ function buildMessages(history: Message[]): AnthropicMessage[] {
 }
 
 export async function streamAnthropic(request: AdapterRequest): Promise<AdapterResult> {
-  const { settings, model, history, system, mode, signal, handlers } = request
+  const { settings, model, history, system, signal, handlers } = request
   const modelId = settings.model.trim()
   if (!modelId) throw new Error('Choose a model before sending a message.')
 
@@ -91,7 +90,7 @@ export async function streamAnthropic(request: AdapterRequest): Promise<AdapterR
     if (budget < 1024) budget = 0
   }
 
-  const tools = getToolSchemas(settings, mode).map((tool) => ({
+  const tools = request.tools.map((tool) => ({
     name: tool.name,
     description: tool.description,
     input_schema: tool.parameters,

package/src/agent/adapters/gemini.ts

@@ -2,7 +2,6 @@ import type { Message, ToolCall } from '../../types'
 import { requestLLM } from '../../lib/daemon'
 import { budgetForEffort, effortValues, hasBudget, normalizeEffort, hasToggle } from '../../lib/reasoning'
 import { readSSE } from '../../lib/sse'
-import { getToolSchemas } from '../tools'
 import {
   assistantHistory,
   imageAttachments,
@@ -83,7 +82,7 @@ function cleanSchema(value: unknown): unknown {
 }
 
 export async function streamGemini(request: AdapterRequest): Promise<AdapterResult> {
-  const { settings, model, history, system, mode, signal, handlers } = request
+  const { settings, model, history, system, signal, handlers } = request
   const modelId = settings.model.trim()
   if (!modelId) throw new Error('Choose a model before sending a message.')
 
@@ -97,7 +96,7 @@ export async function streamGemini(request: AdapterRequest): Promise<AdapterResu
     if (model?.maxOutput) maxOutputTokens = Math.min(maxOutputTokens, model.maxOutput)
   }
 
-  const tools = getToolSchemas(settings, mode)
+  const tools = request.tools
 
   const generationConfig: Record<string, unknown> = {
     maxOutputTokens,

package/src/agent/adapters/openai-responses.ts

@@ -2,7 +2,6 @@ import type { Message, ToolCall } from '../../types'
 import { requestLLM } from '../../lib/daemon'
 import { effortValues, normalizeEffort } from '../../lib/reasoning'
 import { readSSE } from '../../lib/sse'
-import { getToolSchemas } from '../tools'
 import {
   assistantHistory,
   imageAttachments,
@@ -71,10 +70,10 @@ function itemRecord(value: unknown): Record<string, unknown> {
 }
 
 export async function streamOpenAIResponses(request: AdapterRequest): Promise<AdapterResult> {
-  const { settings, model, history, system, mode, signal, handlers } = request
+  const { settings, model, history, system, signal, handlers } = request
   const modelId = settings.model.trim()
   if (!modelId) throw new Error('Choose a model before sending a message.')
-  const tools = getToolSchemas(settings, mode)
+  const tools = request.tools
   const availableTools = new Set<string>(tools.map((tool) => tool.name))
 
   const body: Record<string, unknown> = {

package/src/agent/adapters/openai.ts

@@ -2,7 +2,6 @@ import type { Message, ToolCall } from '../../types'
 import { requestLLM } from '../../lib/daemon'
 import { effortValues, normalizeEffort } from '../../lib/reasoning'
 import { readSSE } from '../../lib/sse'
-import { getToolSchemas } from '../tools'
 import {
   assistantHistory,
   imageAttachments,
@@ -69,10 +68,10 @@ function usesCompletionTokens(provider: string, modelId: string) {
 }
 
 export async function streamOpenAI(request: AdapterRequest): Promise<AdapterResult> {
-  const { settings, model, history, system, mode, signal, handlers } = request
+  const { settings, model, history, system, signal, handlers } = request
   const modelId = settings.model.trim()
   if (!modelId) throw new Error('Choose a model before sending a message.')
-  const tools = getToolSchemas(settings, mode)
+  const tools = request.tools
   const availableTools = new Set<string>(tools.map((tool) => tool.name))
   const modelTools = tools.map((tool) => ({
     type: 'function',

package/src/agent/adapters/shared.ts

@@ -8,6 +8,7 @@ import type {
   ToolCall,
   Usage,
 } from '../../types'
+import type { ToolSchema } from '../../core/types'
 
 export interface AdapterRequest {
   settings: AppSettings
@@ -17,6 +18,8 @@ export interface AdapterRequest {
   mode: AgentMode
   signal: AbortSignal
   handlers: StreamHandlers
+  /** Tools offered to the model. Empty for plain completions such as summaries. */
+  tools: ToolSchema[]
 }
 
 export interface AdapterResult {

package/src/components/ChatView.tsx

@@ -1,14 +1,13 @@
-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 { ArrowUp, Bug, Gamepad2, KeyRound, LayoutTemplate } from 'lucide-react'
 import type { Attachment } from '../types'
 import { createId, useChats } from '../store/chats'
 import { activeModelId, hasCredentials, useSettings } from '../store/settings'
 import { useActiveModel } from '../store/models'
 import { useRuntime, useUi } from '../store/ui'
-import { useWorkspace } from '../store/workspace'
 import { getProviderName } from '../data/providers'
 import { stopRun, runAgent } from '../agent'
+import { kernel } from '../core/kernel'
 import { getContextUsage } from '../lib/context'
 import { pixleMood } from '../lib/pixlesol'
 import { formatTokens } from '../lib/usage'
@@ -38,24 +37,6 @@ const STARTERS = [
     prompt:
       'Inspect this workspace for a real bug. Explain the root cause, make the smallest correct fix, and run the project checks.',
   },
-  {
-    icon: FolderSearch,
-    label: 'Audit this folder',
-    prompt:
-      'Audit this workspace. Read the key files first, then list the three most important improvements with file references and a short plan.',
-  },
-  {
-    icon: FlaskConical,
-    label: 'Write tests',
-    prompt:
-      'Find the least-tested, highest-risk module in this workspace, write focused tests for it, run them, and fix anything they reveal.',
-  },
-  {
-    icon: Globe2,
-    label: 'Research with sources',
-    prompt:
-      'Search the web for the current release notes of the main framework in this project, then summarise what matters and cite the pages you read.',
-  },
 ]
 
 export function ChatView() {
@@ -72,8 +53,6 @@ export function ChatView() {
   const setWorkspaceOpen = useUi((state) => state.setWorkspaceOpen)
   const setDeployOpen = useUi((state) => state.setDeployOpen)
   const askConfirm = useUi((state) => state.askConfirm)
-  const workspace = useWorkspace((state) => state.info)
-  const git = useWorkspace((state) => state.git)
   const activeModel = useActiveModel()
   const [draft, setDraft] = useState('')
   const [view, setView] = useState<ChatViewMode>('chat')
@@ -87,7 +66,6 @@ export function ChatView() {
   const lastAssistantId = [...messages].reverse().find((message) => message.role === 'assistant')?.id
   const connected = hasCredentials(settings)
   const selectedModel = activeModelId(settings)
-  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)
@@ -224,6 +202,19 @@ export function ChatView() {
         openSettings('models')
         return true
       }
+      case 'compact': {
+        const current = useChats.getState().sessions.find((item) => item.id === activeId)
+        if (!current || current.messages.length < 4) {
+          notify('There is not enough conversation to compact yet.', 'info')
+          return true
+        }
+        if (streaming) {
+          notify('Wait for the current answer to finish, then run /compact.', 'info')
+          return true
+        }
+        await kernel.compaction.compact(current.id, { focus: args.trim() || undefined, manual: true })
+        return true
+      }
       case 'clear': {
         const current = useChats.getState().sessions.find((item) => item.id === activeId)
         if (!current || current.messages.length === 0) return true
@@ -280,10 +271,9 @@ export function ChatView() {
                 hints
                 autoFocus
                 placeholder={connected ? 'How can I help you today?' : 'Add a provider key to start'}
-                pixleMood={connected ? 'idle' : 'sleepy'}
               />
-              <div className="stagger mt-5 grid grid-cols-2 gap-2 sm:grid-cols-3">
-                {STARTERS.slice(0, 6).map((starter) => (
+              <div className="stagger mt-4 grid grid-cols-1 gap-2 sm:grid-cols-3">
+                {STARTERS.map((starter) => (
                   <button
                     key={starter.label}
                     type="button"
@@ -297,17 +287,6 @@ export function ChatView() {
                   </button>
                 ))}
               </div>
-              <div className="mt-2.5 flex items-center justify-center gap-3 px-1 text-[11px] text-faint">
-                <span className="truncate">
-                  {workspace.available ? workspace.name : 'No folder open'}
-                  {workspace.available && git.available && git.branch ? ` · ${git.branch}` : ''}
-                </span>
-                <span aria-hidden="true">·</span>
-                <span className="shrink-0">
-                  {activeSkills} skill{activeSkills === 1 ? '' : 's'} ·{' '}
-                  {!connected ? 'Provider needed' : !selectedModel ? 'Model needed' : 'Ready'}
-                </span>
-              </div>
             </div>
 
             <div className="mt-10 animate-rise [animation-delay:420ms]">
@@ -379,22 +358,6 @@ export function ChatView() {
                 contextTitle={`Context: ~${formatTokens(context.used)} / ${formatTokens(context.limit)} tokens`}
                 pixleMood={mood}
               />
-              <div className="mt-2 flex items-center justify-between gap-3 px-2 text-[11px] text-faint">
-                <span className="flex items-center gap-1">
-                  {settings.mode === 'plan' ? <ListChecks size={10} /> : <Sparkles size={10} />}
-                  {settings.mode === 'plan'
-                    ? 'Plan mode · read-only tools'
-                    : activeSkills > 0
-                      ? `${activeSkills} skill${activeSkills === 1 ? '' : 's'} loaded`
-                      : 'Build mode · full tools'}
-                </span>
-                <span className="hidden sm:inline">
-                  {workspace.available ? `Working in ${workspace.name}` : 'No workspace open'}
-                </span>
-                <span className="sm:hidden">
-                  {settings.tools.shell.approval === 'ask' ? 'Shell asks first' : 'Shell auto-runs'}
-                </span>
-              </div>
             </div>
           </div>
         </>