@bibobonking/opensol 3.0.2 → 3.1.0

package/server/lib/mcp.test.mjs

@@ -0,0 +1,46 @@
+import assert from 'node:assert/strict'
+import { mkdtemp, writeFile } from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+import test from 'node:test'
+import { McpManager, functionName, sanitizeServerConfig } from './mcp.mjs'
+import { lineDiffStats } from './tools.mjs'
+
+const SERVER = `
+import readline from 'node:readline'
+const send = (m) => process.stdout.write(JSON.stringify({ jsonrpc: '2.0', ...m }) + '\\n')
+readline.createInterface({ input: process.stdin }).on('line', (line) => {
+  const m = JSON.parse(line)
+  if (m.method === 'initialize') send({ id: m.id, result: { protocolVersion: '2025-03-26', capabilities: {}, serverInfo: { name: 'echo', version: '1' } } })
+  else if (m.method === 'tools/list') send({ id: m.id, result: { tools: [{ name: 'echo', description: 'Echo', inputSchema: { type: 'object', properties: {} } }] } })
+  else if (m.method === 'tools/call') send({ id: m.id, result: { content: [{ type: 'text', text: 'echo: ' + m.params.arguments.text }] } })
+})`
+
+test('an stdio MCP server connects, lists tools and answers a call', async () => {
+  const dir = await mkdtemp(path.join(os.tmpdir(), 'opensol-mcp-'))
+  const file = path.join(dir, 'server.mjs')
+  await writeFile(file, SERVER)
+  const manager = new McpManager()
+  const config = sanitizeServerConfig({ name: 'Echo Server', command: process.execPath, args: [file] })
+  await manager.setConfigs([config])
+  const view = await manager.connect(config.id)
+  assert.equal(view.status, 'connected', view.error)
+  assert.equal(view.tools[0].fn, functionName(config.id, 'echo'))
+  const result = await manager.callTool(config.id, 'echo', { text: 'hi' })
+  assert.deepEqual(result, { text: 'echo: hi', isError: false })
+  await manager.shutdown()
+})
+
+test('secrets are masked in the public view and kept on save', () => {
+  const manager = new McpManager()
+  const config = sanitizeServerConfig({ name: 'x', command: 'node', env: { TOKEN: 'secret' } })
+  manager.configs.set(config.id, config)
+  assert.equal(manager.list()[0].env.TOKEN.includes('secret'), false)
+  const again = sanitizeServerConfig({ ...manager.list()[0] }, config)
+  assert.equal(again.env.TOKEN, 'secret')
+})
+
+test('line diff stats count added and removed lines', () => {
+  assert.deepEqual(lineDiffStats('a\nb\nc', 'a\nB\nc\nd'), { added: 2, removed: 1 })
+  assert.deepEqual(lineDiffStats('same', 'same'), { added: 0, removed: 0 })
+})

package/server/lib/store.mjs

@@ -31,6 +31,7 @@ const DEFAULT_STATE = () => ({
   chats: { sessions: [], activeId: null },
   workspaces: [],
   activeWorkspace: null,
+  mcpServers: [],
   legacyMigratedAt: null,
 })
 
@@ -130,6 +131,7 @@ export async function loadState() {
           .slice(0, 20)
       : [],
     activeWorkspace: typeof parsed.activeWorkspace === 'string' ? parsed.activeWorkspace : null,
+    mcpServers: Array.isArray(parsed.mcpServers) ? parsed.mcpServers.filter((item) => item && typeof item.id === 'string') : [],
   }
   return stateCache
 }
@@ -348,6 +350,26 @@ export async function addWorkspace(rawPath) {
   return entry
 }
 
+/** Drop one folder from the saved list. The folder itself is never touched on disk. */
+export async function removeWorkspace(rawPath) {
+  const state = await loadState()
+  const resolved = path.resolve(rawPath)
+  const workspaces = state.workspaces.filter((item) => item.path !== resolved)
+  const activeWorkspace = state.activeWorkspace === resolved ? null : state.activeWorkspace
+  await saveState({ ...state, workspaces, activeWorkspace })
+  return workspaces.length !== state.workspaces.length
+}
+
+export async function getMcpServers() {
+  const state = await loadState()
+  return state.mcpServers ?? []
+}
+
+export async function saveMcpServers(mcpServers) {
+  const state = await loadState()
+  await saveState({ ...state, mcpServers })
+}
+
 export async function forgetWorkspace() {
   const state = await loadState()
   await saveState({ ...state, activeWorkspace: null })

package/server/lib/tools.mjs

@@ -207,6 +207,45 @@ export async function readWorkspaceFile(input, { maxBytes = MAX_READ } = {}) {
   }
 }
 
+
+/** Line-level diff counts (LCS) used to report +added / -removed after a file change. */
+export function lineDiffStats(before, after) {
+  if (before === after) return { added: 0, removed: 0 }
+  const a = before === '' ? [] : before.split('\n')
+  const b = after === '' ? [] : after.split('\n')
+  let start = 0
+  while (start < a.length && start < b.length && a[start] === b[start]) start += 1
+  let endA = a.length
+  let endB = b.length
+  while (endA > start && endB > start && a[endA - 1] === b[endB - 1]) {
+    endA -= 1
+    endB -= 1
+  }
+  const x = a.slice(start, endA)
+  const y = b.slice(start, endB)
+  if (x.length === 0 || y.length === 0 || x.length * y.length > 4_000_000) {
+    return { added: y.length, removed: x.length }
+  }
+  let previous = new Uint32Array(y.length + 1)
+  for (let i = 1; i <= x.length; i += 1) {
+    const row = new Uint32Array(y.length + 1)
+    for (let j = 1; j <= y.length; j += 1) {
+      row[j] = x[i - 1] === y[j - 1] ? previous[j - 1] + 1 : Math.max(previous[j], row[j - 1])
+    }
+    previous = row
+  }
+  const common = previous[y.length]
+  return { added: y.length - common, removed: x.length - common }
+}
+
+/** 1-based line and column of a character offset. */
+function positionOf(text, offset) {
+  const head = text.slice(0, offset)
+  const line = head.split('\n').length
+  const column = offset - (head.lastIndexOf('\n') + 1) + 1
+  return { line, column }
+}
+
 export async function writeWorkspaceFile(input, content, { create = true } = {}) {
   const { root, absolute, relative } = await resolveWorkspacePath(input, { allowRoot: false })
   if (typeof content !== 'string') throw new HttpError(400, 'File content must be text.', 'bad_content')
@@ -216,6 +255,10 @@ export async function writeWorkspaceFile(input, content, { create = true } = {})
   const existing = await stat(absolute).catch(() => null)
   if (!existing && !create) throw new HttpError(404, `File not found: ${relative}`, 'not_found')
   if (existing?.isDirectory()) throw new HttpError(400, `${relative} is a folder.`, 'is_directory')
+  let previousText = ''
+  if (existing && existing.size <= MAX_READ) {
+    previousText = await readFile(absolute, 'utf8').catch(() => '')
+  }
   await mkdir(path.dirname(absolute), { recursive: true })
   const temp = `${absolute}.${process.pid}.maxcode.tmp`
   await writeFile(temp, content, 'utf8')
@@ -235,9 +278,17 @@ export async function writeWorkspaceFile(input, content, { create = true } = {})
     created: !existing,
     bytes: info.size,
     hash: snapshot(Buffer.from(content, 'utf8')).hash,
+    diff: { ...lineDiffStats(previousText, content), ...positionOfFirstChange(previousText, content) },
   }
 }
 
+function positionOfFirstChange(before, after) {
+  let index = 0
+  const limit = Math.min(before.length, after.length)
+  while (index < limit && before[index] === after[index]) index += 1
+  return positionOf(after, index)
+}
+
 export async function editWorkspaceFile(input, oldText, newText, { replaceAll = false } = {}) {
   if (typeof oldText !== 'string' || !oldText) {
     throw new HttpError(400, 'The text to replace is empty.', 'bad_edit')
@@ -261,7 +312,14 @@ export async function editWorkspaceFile(input, oldText, newText, { replaceAll =
     ? file.content.split(oldText).join(newText)
     : file.content.replace(oldText, () => newText)
   const written = await writeWorkspaceFile(input, next)
-  return { ...written, replacements: replaceAll ? occurrences : 1 }
+  const count = replaceAll ? occurrences : 1
+  const per = lineDiffStats(oldText, newText)
+  const first = positionOf(file.content, file.content.indexOf(oldText))
+  return {
+    ...written,
+    replacements: count,
+    diff: { added: per.added * count, removed: per.removed * count, line: first.line, column: first.column },
+  }
 }
 
 export async function createWorkspaceEntry(input, type = 'file', content = '') {

package/src/agent/tools.ts

@@ -1,4 +1,4 @@
-import type { AgentMode, AppSettings, ToolName } from '../types'
+import type { AgentMode, AppSettings, BuiltinToolName, ToolName } from '../types'
 import { executeDaemonTool } from '../lib/daemon'
 import { useWorkspace } from '../store/workspace'
 import { kernel } from '../core/kernel'
@@ -239,7 +239,7 @@ export function getToolSchemas(
   }
 
   return tools.filter((tool) => {
-    if (!settings.tools[tool.name]?.enabled) return false
+    if (!settings.tools[tool.name as BuiltinToolName]?.enabled) return false
     if (!toolAllowedInMode(tool.name, mode)) return false
     if ((tool.name === 'web_search' || tool.name === 'read_url') && !settings.webSearchEnabled) return false
     return true
@@ -481,7 +481,7 @@ export async function executeTool(
   if (kernel.tools) {
     return await kernel.tools.execute(name, args, settings, mode, signal)
   }
-  if (!settings.tools[name]?.enabled) {
+  if (!settings.tools[name as BuiltinToolName]?.enabled) {
     return { output: 'This tool is disabled in Settings → Tools.', isError: true }
   }
   if (!toolAllowedInMode(name, mode)) {
@@ -506,7 +506,8 @@ export async function executeTool(
 }
 
 export function toolLabel(name: ToolName): string {
-  const labels: Record<ToolName, string> = {
+  if (name.startsWith('mcp__')) return name.split('__').slice(2).join(' ').replace(/_/g, ' ') || 'MCP tool'
+  const labels: Record<BuiltinToolName, string> = {
     shell: 'Shell',
     read_file: 'Read file',
     list_files: 'List files',
@@ -519,7 +520,7 @@ export function toolLabel(name: ToolName): string {
     git: 'Git',
     subagent: 'Subagent',
   }
-  return labels[name] ?? 'Tool'
+  return labels[name as BuiltinToolName] ?? 'Tool'
 }
 
 export function toolSummary(name: ToolName, args: Record<string, unknown>): string {

package/src/components/Composer.tsx

@@ -9,10 +9,8 @@ import {
   type KeyboardEvent,
 } from 'react'
 import {
-  Brain,
   Check,
   ChevronDown,
-  Cpu,
   FileText,
   FolderOpen,
   Globe2,
@@ -25,17 +23,16 @@ import {
   Upload,
   X,
 } from 'lucide-react'
-import type { Attachment, Effort } from '../types'
+import type { Attachment } from '../types'
 import { activeModelId, hasCredentials, useSettings } from '../store/settings'
 import { useActiveModel, useProviderModels } from '../store/models'
 import { useUi } from '../store/ui'
 import { useWorkspace } from '../store/workspace'
-import { effortLabel } from '../data/providers'
 import { effortOptions } from '../lib/reasoning'
 import { PERMISSION_MODES, permissionLabel, permissionMode, permissionTools } from '../lib/permissions'
 import { useClickOutside } from '../lib/hooks'
 import { cn, formatBytes, readFileAsDataUrl, readFileAsText } from '../lib/utils'
-import { ModelPicker } from './ModelPicker'
+import { ModelDeck, ModelDeckTrigger } from './ModelDeck'
 import { PixleSol } from './PixleSol'
 import type { PixleMood } from '../lib/pixlesol'
 
@@ -109,6 +106,17 @@ export function Composer({
   const permissionRef = useRef<HTMLDivElement>(null)
   const permissionTriggerRef = useRef<HTMLButtonElement>(null)
 
+  useEffect(() => {
+    const onKey = (event: globalThis.KeyboardEvent) => {
+      if ((event.metaKey || event.ctrlKey) && !event.shiftKey && !event.altKey && event.key.toLowerCase() === 'm') {
+        event.preventDefault()
+        setPickerOpen((open) => !open)
+      }
+    }
+    window.addEventListener('keydown', onKey)
+    return () => window.removeEventListener('keydown', onKey)
+  }, [])
+
   useClickOutside(permissionRef, () => setPermissionOpen(false), permissionOpen, permissionTriggerRef)
 
   const modelId = activeModelId(settings)
@@ -341,7 +349,7 @@ export function Composer({
 
   return (
     <div className="relative w-full">
-      <ModelPicker open={pickerOpen && connected} onClose={() => setPickerOpen(false)} triggerRef={modelTriggerRef} />
+      <ModelDeck open={pickerOpen && connected} onClose={() => setPickerOpen(false)} />
 
       {commandMatches.length > 0 && (
         <div className="absolute bottom-[calc(100%+8px)] left-0 z-40 w-[min(94vw,360px)] overflow-hidden rounded-xl border border-line surface-lift shadow-float">
@@ -401,25 +409,6 @@ export function Composer({
           <Globe2 size={12} />
           Search
         </button>
-        <label
-          className={cn('chip h-7 cursor-pointer gap-1 px-2', !efforts.length && 'cursor-not-allowed opacity-45')}
-          title={efforts.length ? 'Reasoning effort sent to the model' : 'This model advertises no effort levels'}
-        >
-          <Brain size={12} />
-          <select
-            value={settings.effort}
-            disabled={!efforts.length}
-            onChange={(event) => update({ effort: event.target.value as Effort })}
-            className="bg-transparent text-[11px] font-medium text-ink outline-none disabled:cursor-not-allowed"
-            aria-label="Reasoning effort"
-          >
-            {(efforts.length ? efforts : [settings.effort]).map((effort) => (
-              <option key={effort} value={effort}>
-                {effortLabel(effort)}
-              </option>
-            ))}
-          </select>
-        </label>
         {activeSkills > 0 && (
           <button
             type="button"
@@ -592,21 +581,16 @@ export function Composer({
                 {contextPct}%
               </span>
             )}
-            <button
-              ref={modelTriggerRef}
-              type="button"
+            <ModelDeckTrigger
+              triggerRef={modelTriggerRef}
+              label={modelLabel}
+              open={pickerOpen}
               disabled={!connected}
               onClick={() => setPickerOpen((open) => !open)}
-              className="flex h-8 max-w-[190px] items-center gap-1.5 rounded-lg px-2 text-[11px] font-medium text-muted transition-colors hover:bg-raised hover:text-ink disabled:cursor-not-allowed disabled:opacity-45 sm:max-w-[260px]"
-              title={connected ? 'Choose model and reasoning effort' : 'Add a provider key in Settings first'}
-            >
-              <Cpu size={12} className="shrink-0 text-faint" />
-              <span className="truncate">{modelLabel}</span>
-              <ChevronDown
-                size={11}
-                className={cn('shrink-0 text-faint transition-transform duration-150', pickerOpen && 'rotate-180')}
-              />
-            </button>
+              efforts={efforts}
+              effort={settings.effort}
+              title={connected ? 'Model deck: choose model and reasoning effort (Ctrl M)' : 'Add a provider key in Settings first'}
+            />
             {streaming ? (
               <button
                 type="button"

package/src/components/DiffView.tsx

@@ -0,0 +1,98 @@
+import { useMemo } from 'react'
+import { diffLines } from '../lib/diff'
+import { cn } from '../lib/utils'
+
+const MAX_ROWS = 120
+
+/** Compact unified diff: only the changed lines plus two lines of context, numbered from `startLine`. */
+export function DiffView({ before, after, startLine = 1 }: { before: string; after: string; startLine?: number }) {
+  const rows = useMemo(() => {
+    const ops = diffLines(before, after)
+    const keep = new Array<boolean>(ops.length).fill(false)
+    ops.forEach((op, index) => {
+      if (op.type === 'ctx') return
+      for (let k = Math.max(0, index - 2); k <= Math.min(ops.length - 1, index + 2); k += 1) keep[k] = true
+    })
+    let oldNo = startLine
+    let newNo = startLine
+    const out: Array<{ key: number; type: string; text: string; no: number | null; gap?: boolean }> = []
+    let skipped = false
+    ops.forEach((op, index) => {
+      const no = op.type === 'add' ? newNo : oldNo
+      if (op.type !== 'add') oldNo += 1
+      if (op.type !== 'del') newNo += 1
+      if (!keep[index]) {
+        skipped = true
+        return
+      }
+      if (skipped && out.length > 0) out.push({ key: -index, type: 'gap', text: '', no: null, gap: true })
+      skipped = false
+      out.push({ key: index, type: op.type, text: op.text, no })
+    })
+    return out
+  }, [before, after, startLine])
+
+  const shown = rows.slice(0, MAX_ROWS)
+  return (
+    <div className="diff-view thin-scroll max-h-64 overflow-auto rounded-lg border border-line bg-canvas/60 font-mono text-[11px] leading-[1.6]">
+      {shown.map((row, index) =>
+        row.gap ? (
+          <div key={row.key} className="px-2 text-center text-[10px] text-faint">⋯</div>
+        ) : (
+          <div
+            key={row.key}
+            style={{ animationDelay: `${Math.min(index * 14, 260)}ms` }}
+            className={cn(
+              'diff-row flex min-w-max',
+              row.type === 'add' && 'bg-success/[0.11] text-ink',
+              row.type === 'del' && 'bg-danger/[0.10] text-ink',
+              row.type === 'ctx' && 'text-faint',
+            )}
+          >
+            <span className="w-9 shrink-0 select-none pr-2 text-right text-[10px] tabular-nums text-faint/70">{row.no}</span>
+            <span
+              className={cn(
+                'w-4 shrink-0 select-none text-center',
+                row.type === 'add' && 'text-success',
+                row.type === 'del' && 'text-danger',
+              )}
+            >
+              {row.type === 'add' ? '+' : row.type === 'del' ? '−' : ' '}
+            </span>
+            <span className="whitespace-pre pr-3">{row.text || ' '}</span>
+          </div>
+        ),
+      )}
+      {rows.length > MAX_ROWS && (
+        <div className="px-3 py-1 text-[10px] text-faint">… {rows.length - MAX_ROWS} more rows</div>
+      )}
+    </div>
+  )
+}
+
+export function DiffBadge({
+  added,
+  removed,
+  line,
+  column,
+  className,
+}: {
+  added: number
+  removed: number
+  line?: number
+  column?: number
+  className?: string
+}) {
+  return (
+    <span className={cn('diff-badge inline-flex items-center gap-1.5 font-mono text-[11px] tabular-nums', className)}>
+      <span className="text-success">+{added}</span>
+      <span className="text-danger">−{removed}</span>
+      {line ? (
+        <span className="text-faint">
+          L{line}
+          {column ? `:${column}` : ''}
+        </span>
+      ) : null}
+    </span>
+  )
+}