@bibobonking/opensol 3.1.0 → 3.1.2

package/src/components/ModelDeck.tsx

@@ -181,6 +181,7 @@ export function ModelDeck({ open, onClose }: { open: boolean; onClose: () => voi
   const listRef = useRef<HTMLDivElement>(null)
   const searchRef = useRef<HTMLInputElement>(null)
 
+  const railRef = useRef<HTMLElement>(null)
   const provider = settings.provider
   const models = useModelCatalog((state) => state.byProvider[provider]) ?? NO_MODELS
   const loading = useModelCatalog((state) => Boolean(state.loading[provider]))
@@ -229,7 +230,7 @@ export function ModelDeck({ open, onClose }: { open: boolean; onClose: () => voi
   }, [query, provider])
 
   useEffect(() => {
-    listRef.current?.querySelector<HTMLElement>(`[data-row="${cursor}"]`)?.scrollIntoView({ block: 'nearest' })
+    listRef.current?.querySelector<HTMLElement>(`[data-row="${cursor}"]`)?.scrollIntoView({ block: 'center' })
   }, [cursor])
 
   const choose = (model: ModelInfo) => {
@@ -281,6 +282,13 @@ export function ModelDeck({ open, onClose }: { open: boolean; onClose: () => voi
     return () => document.removeEventListener('keydown', onKey)
   }, [open, onClose])
 
+  // Keep the active provider in view: the rail scrolls and the selected one can sit far down.
+  useEffect(() => {
+    if (!open) return
+    const frame = requestAnimationFrame(() => railRef.current?.querySelector('[aria-pressed="true"]')?.scrollIntoView({ block: 'center' }))
+    return () => cancelAnimationFrame(frame)
+  }, [open, provider])
+
   if (!open) return null
 
   const needsKey = !connectedNow && !keyless
@@ -355,12 +363,13 @@ export function ModelDeck({ open, onClose }: { open: boolean; onClose: () => voi
         <div className="relative flex min-h-0 flex-1 flex-col border-t border-line md:flex-row">
           {/* Provider rail */}
           <nav
+            ref={railRef}
             aria-label="Providers"
             className="thin-scroll relative flex shrink-0 gap-1.5 overflow-x-auto border-b border-line bg-canvas/70 p-2 md:w-[78px] md:flex-col md:overflow-y-auto md:overflow-x-hidden md:border-b-0 md:border-r md:p-2.5"
           >
             <span
               aria-hidden
-              className="deck-rail-glow pointer-events-none absolute left-2.5 hidden h-[46px] w-[calc(100%-20px)] rounded-2xl bg-accent-soft ring-1 ring-accent/40 transition-transform duration-500 ease-spring md:block"
+              className="deck-rail-glow pointer-events-none absolute left-2.5 top-2.5 hidden h-[46px] w-[calc(100%-20px)] rounded-2xl bg-accent-soft ring-1 ring-accent/40 transition-transform duration-500 ease-spring md:block"
               style={{ transform: `translateY(${railIndex * 52}px)` }}
             />
             {PROVIDERS.map((entry) => {
@@ -375,7 +384,7 @@ export function ModelDeck({ open, onClose }: { open: boolean; onClose: () => voi
                   title={`${entry.name}${ready ? '' : ' · connect to enable'}`}
                   aria-pressed={selected}
                   className={cn(
-                    'relative flex h-[46px] min-w-[58px] shrink-0 flex-col items-center justify-center gap-0.5 rounded-2xl transition-colors disabled:cursor-not-allowed disabled:opacity-40 md:mb-[6px] md:min-w-0',
+                    'relative flex h-[46px] min-w-[58px] shrink-0 flex-col items-center justify-center gap-0.5 rounded-2xl transition-colors disabled:cursor-not-allowed disabled:opacity-40 md:min-w-0',
                     selected ? 'text-accent max-md:bg-accent-soft' : 'text-muted hover:bg-raised hover:text-ink',
                   )}
                 >

package/src/components/SettingsModal.tsx

@@ -61,7 +61,7 @@ import { PERMISSION_MODES, permissionMode, permissionTools } from '../lib/permis
 import { cn, formatBytes, readFileAsText } from '../lib/utils'
 import { LogoMark } from './Logo'
 import { PluginManager } from './PluginManager'
-import { McpTab } from './McpTab'
+import { useMcp } from '../store/mcp'
 import { pluginRuntime } from '../plugins'
 import { Modal, Segmented, Spinner, Switch } from './ui'
 
@@ -72,7 +72,7 @@ const TABS = [
   { id: 'search', label: 'Search', icon: Globe2, description: 'Give the agent current web results with your own key.' },
   { id: 'skills', label: 'Skills', icon: Sparkles, description: 'Instructions added to every request when enabled.' },
   { id: 'plugins', label: 'Plugins', icon: Package, description: 'Install local plugin packages, review what they ask for, and run them once you trust the code.' },
-  { id: 'mcp', label: 'MCP', icon: Link2, description: 'Connect Model Context Protocol servers and choose which of their tools the agent may call.' },
+  { id: 'mcp', label: 'MCP', icon: Link2, description: 'Model Context Protocol servers now have their own panel, with OAuth sign-in and local, HTTP and SSE connections.' },
   { id: 'deploy', label: 'Deploy', icon: Rocket, description: 'Hosting credentials and command-line tools.' },
   { id: 'appearance', label: 'Appearance', icon: Palette, description: 'Theme and interface preferences.' },
   { id: 'about', label: 'About', icon: Info, description: 'Local storage, history and reset controls.' },
@@ -1792,10 +1792,10 @@ function AboutTab() {
               <h3 className="font-display text-[20px] font-semibold tracking-[-0.03em] text-ink">OpenSol</h3>
               <span className="text-[10px] text-faint">v{daemon?.version ?? '1.0.0'}</span>
             </div>
-            <p className="mt-0.5 text-[10.5px] font-medium text-muted">A OpenSoft product</p>
+            <p className="mt-0.5 text-[10.5px] font-medium text-muted">An OpenSoftX product</p>
             <p className="mt-2 max-w-[520px] text-[10.5px] leading-relaxed text-muted">
               A local-first coding agent with a real workspace, shell, git, web research, subagents and deploy flows.
-              No OpenSol account and no OpenSoft server. Your keys never leave this machine.
+              No OpenSol account and no OpenSoftX server. Your keys never leave this machine.
             </p>
           </div>
         </div>
@@ -1950,6 +1950,44 @@ function AboutTab() {
   )
 }
 
+function McpLauncher() {
+  const servers = useMcp((state) => state.servers)
+  const loaded = useMcp((state) => state.loaded)
+  const load = useMcp((state) => state.load)
+  const setMcpOpen = useUi((state) => state.setMcpOpen)
+  useEffect(() => {
+    void load()
+  }, [load])
+  const connected = servers.filter((server) => server.status === 'connected').length
+  const waiting = servers.filter((server) => server.status === 'needs_auth').length
+  return (
+    <div className="space-y-5 px-5 py-6 sm:px-8">
+      <div className="settings-card flex flex-wrap items-center gap-4">
+        <span className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-accent-soft text-accent">
+          <Link2 size={18} />
+        </span>
+        <div className="min-w-0 flex-1">
+          <p className="settings-label">MCP panel</p>
+          <p className="settings-hint">
+            {!loaded
+              ? 'Loading…'
+              : servers.length === 0
+                ? 'No servers yet. Add a local command or a remote URL, with OAuth where the service asks for it.'
+                : `${connected} of ${servers.length} server${servers.length === 1 ? '' : 's'} connected${waiting ? ` · ${waiting} waiting for sign-in` : ''}.`}
+          </p>
+        </div>
+        <button
+          type="button"
+          onClick={() => setMcpOpen(true)}
+          className="inline-flex h-9 shrink-0 items-center gap-1.5 rounded-full bg-ink px-4 text-[12px] font-medium text-panel transition-transform active:scale-95"
+        >
+          Open MCP panel
+        </button>
+      </div>
+    </div>
+  )
+}
+
 export function SettingsModal() {
   const open = useUi((state) => state.settingsOpen)
   const tab = useUi((state) => state.settingsTab)
@@ -2076,7 +2114,7 @@ export function SettingsModal() {
               {tab === 'search' && <SearchTab />}
               {tab === 'skills' && <SkillsTab />}
               {tab === 'plugins' && <PluginsTab />}
-              {tab === 'mcp' && <McpTab />}
+              {tab === 'mcp' && <McpLauncher />}
               {tab === 'deploy' && <DeployTab />}
               {tab === 'appearance' && <AppearanceTab />}
               {tab === 'about' && <AboutTab />}

package/src/components/Sidebar.tsx

@@ -56,6 +56,7 @@ export function Sidebar() {
   const openSettings = useUi((state) => state.openSettings)
   const setWorkspaceOpen = useUi((state) => state.setWorkspaceOpen)
   const setDeployOpen = useUi((state) => state.setDeployOpen)
+  const setMcpOpen = useUi((state) => state.setMcpOpen)
   const askConfirm = useUi((state) => state.askConfirm)
   const notify = useUi((state) => state.notify)
   const focusComposer = useUi((state) => state.focusComposer)
@@ -255,7 +256,7 @@ export function Sidebar() {
           type="button"
           onClick={() => {
             setMobileOpen(false)
-            openSettings('mcp')
+            setMcpOpen(true)
           }}
           className="nav-item"
         >

package/src/components/Splash.tsx

@@ -62,7 +62,7 @@ export function Splash({
           ))}
         </h1>
         <p className="mt-2 animate-fade text-[11px] font-medium uppercase tracking-[0.22em] text-faint [animation-delay:1s]">
-          by OpenSoft
+          by OpenSoftX
         </p>
 
         {phase === 'error' ? (

package/src/data/providers.ts

@@ -7,7 +7,7 @@ export const PROVIDERS: ProviderDef[] = [
     format: 'openai',
     baseUrl: 'https://api.openai.com/v1',
     keyHint: 'sk-…',
-    note: 'GPT and Codex models. Requests are made by your local daemon, never by OpenSoft.',
+    note: 'GPT and Codex models. Requests are made by your local daemon, never by OpenSoftX.',
   },
   {
     id: 'anthropic',

package/src/lib/daemon.ts

@@ -280,7 +280,8 @@ export function removeWorkspaceFromList(path: string): Promise<WorkspaceInfo> {
   return api(`/api/workspaces?path=${encodeURIComponent(path)}`, { method: 'DELETE' })
 }
 
-export type McpServerInput = Partial<McpServer> & { name: string }
+export type { McpServerInput } from './mcp-config'
+import type { McpServerInput } from './mcp-config'
 
 export function mcpList(): Promise<{ servers: McpServer[] }> {
   return api('/api/mcp')
@@ -294,6 +295,14 @@ export function mcpAction(id: string, action: 'connect' | 'disconnect' | 'refres
   return api(`/api/mcp/${encodeURIComponent(id)}/${action}`, { method: 'POST', body: '{}' })
 }
 
+export function mcpAuthorize(id: string): Promise<{ url: string }> {
+  return api(`/api/mcp/${encodeURIComponent(id)}/authorize`, { method: 'POST', body: '{}' })
+}
+
+export function mcpLogout(id: string): Promise<{ servers: McpServer[] }> {
+  return api(`/api/mcp/${encodeURIComponent(id)}/logout`, { method: 'POST', body: '{}' })
+}
+
 export function mcpCall(
   server: string,
   tool: string,

package/src/lib/mcp-config.test.mjs

@@ -0,0 +1,47 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { draftFromServer, inputFromDraft, joinArgs, parseMcpJson, splitArgs } from './mcp-config.ts'
+
+test('imports Claude Desktop style config with local and remote servers', () => {
+  const { servers, skipped } = parseMcpJson(
+    JSON.stringify({
+      mcpServers: {
+        files: { command: 'npx', args: ['-y', 'server-filesystem', '/my dir'], env: { TOKEN: 'x' } },
+        linear: { url: 'https://mcp.linear.app/mcp' },
+        legacy: { url: 'https://example.com/sse', type: 'sse' },
+        keyed: { url: 'https://example.com/mcp', headers: { Authorization: 'Bearer k' } },
+        broken: { nothing: true },
+      },
+    }),
+  )
+  assert.deepEqual(skipped, ['broken'])
+  const byName = Object.fromEntries(servers.map((server) => [server.name, server]))
+  assert.equal(byName.files.transport, 'stdio')
+  assert.deepEqual(byName.files.args, ['-y', 'server-filesystem', '/my dir'])
+  assert.equal(byName.linear.transport, 'http')
+  assert.equal(byName.linear.oauth?.enabled, true)
+  assert.equal(byName.legacy.transport, 'sse')
+  assert.equal(byName.keyed.oauth, null)
+})
+
+test('accepts a single server object and rejects junk', () => {
+  assert.equal(parseMcpJson('{"command":"node","args":["a.js"]}').servers[0].name, 'Imported')
+  assert.throws(() => parseMcpJson('nope'), /valid JSON/)
+  assert.throws(() => parseMcpJson('{"a":1}'), /No MCP servers/)
+})
+
+test('draft round-trip keeps secrets masked and quoting intact', () => {
+  assert.deepEqual(splitArgs('-y "my dir" x'), ['-y', 'my dir', 'x'])
+  assert.equal(joinArgs(['-y', 'my dir']), '-y "my dir"')
+  const server = {
+    id: 'a', name: 'A', transport: 'http', enabled: false, approval: 'auto', disabledTools: ['t'], status: 'connected',
+    error: '', serverInfo: null, connectedAt: null, tools: [], url: 'https://x.dev/mcp', headers: { 'X-Key': '••••••••' },
+    oauth: { enabled: true, clientId: 'cid', clientSecret: '••••••••', scope: 'read', authorized: true },
+  }
+  const input = inputFromDraft(draftFromServer(server), server)
+  assert.equal(input.enabled, false)
+  assert.equal(input.approval, 'auto')
+  assert.equal(input.headers['X-Key'], '••••••••')
+  assert.equal(input.oauth.clientSecret, '••••••••')
+  assert.deepEqual(input.disabledTools, ['t'])
+})

package/src/lib/mcp-config.ts

@@ -0,0 +1,203 @@
+// Pure helpers for the MCP panel: form <-> config conversion, presets and JSON import.
+// Keep `import type` only here: node --test loads this file directly (see CLAUDE.md).
+import type { McpServer, McpTransport } from '../types'
+
+export interface McpServerInput {
+  id?: string
+  name: string
+  transport?: McpTransport
+  enabled?: boolean
+  approval?: 'auto' | 'ask'
+  disabledTools?: string[]
+  command?: string
+  args?: string[]
+  env?: Record<string, string>
+  url?: string
+  headers?: Record<string, string>
+  oauth?: { enabled: boolean; clientId?: string; clientSecret?: string; scope?: string } | null
+}
+
+export interface McpDraft {
+  /** Present when editing an existing server. */
+  id?: string
+  name: string
+  transport: McpTransport
+  command: string
+  args: string
+  env: string
+  url: string
+  headers: string
+  oauth: boolean
+  clientId: string
+  clientSecret: string
+  scope: string
+}
+
+export const EMPTY_DRAFT: McpDraft = {
+  name: '',
+  transport: 'stdio',
+  command: '',
+  args: '',
+  env: '',
+  url: '',
+  headers: '',
+  oauth: false,
+  clientId: '',
+  clientSecret: '',
+  scope: '',
+}
+
+export interface McpPreset {
+  label: string
+  description: string
+  draft: Partial<McpDraft>
+}
+
+export const MCP_PRESETS: McpPreset[] = [
+  { label: 'Filesystem', description: 'Read and write files in a folder', draft: { name: 'Filesystem', command: 'npx', args: '-y @modelcontextprotocol/server-filesystem .' } },
+  { label: 'Memory', description: 'Knowledge-graph memory', draft: { name: 'Memory', command: 'npx', args: '-y @modelcontextprotocol/server-memory' } },
+  { label: 'Fetch', description: 'Fetch web pages as markdown', draft: { name: 'Fetch', command: 'uvx', args: 'mcp-server-fetch' } },
+  { label: 'Linear', description: 'Issues and projects · OAuth', draft: { name: 'Linear', transport: 'http', url: 'https://mcp.linear.app/mcp', oauth: true } },
+  { label: 'Notion', description: 'Pages and databases · OAuth', draft: { name: 'Notion', transport: 'http', url: 'https://mcp.notion.com/mcp', oauth: true } },
+  { label: 'Sentry', description: 'Errors and traces · OAuth', draft: { name: 'Sentry', transport: 'http', url: 'https://mcp.sentry.dev/mcp', oauth: true } },
+  { label: 'Atlassian', description: 'Jira and Confluence · SSE + OAuth', draft: { name: 'Atlassian', transport: 'sse', url: 'https://mcp.atlassian.com/v1/sse', oauth: true } },
+  { label: 'DeepWiki', description: 'Repo docs · no sign-in', draft: { name: 'DeepWiki', transport: 'http', url: 'https://mcp.deepwiki.com/mcp' } },
+]
+
+/** Shell-like split that keeps quoted segments together. */
+export function splitArgs(value: string): string[] {
+  const out: string[] = []
+  const pattern = /"([^"]*)"|'([^']*)'|(\S+)/g
+  let match: RegExpExecArray | null
+  while ((match = pattern.exec(value))) out.push(match[1] ?? match[2] ?? match[3])
+  return out
+}
+
+export function joinArgs(args: string[] = []): string {
+  return args.map((arg) => (/\s/.test(arg) ? `"${arg}"` : arg)).join(' ')
+}
+
+export function parsePairs(value: string, separator: string): Record<string, string> {
+  const out: Record<string, string> = {}
+  for (const line of value.split('\n')) {
+    const index = line.indexOf(separator)
+    if (index < 1) continue
+    out[line.slice(0, index).trim()] = line.slice(index + 1).trim()
+  }
+  return out
+}
+
+export function formatPairs(record: Record<string, string> | undefined, separator: string): string {
+  return Object.entries(record ?? {})
+    .map(([key, value]) => `${key}${separator === ':' ? ': ' : separator}${value}`)
+    .join('\n')
+}
+
+export function draftFromServer(server: McpServer): McpDraft {
+  return {
+    id: server.id,
+    name: server.name,
+    transport: server.transport,
+    command: server.command ?? '',
+    args: joinArgs(server.args),
+    env: formatPairs(server.env, '='),
+    url: server.url ?? '',
+    headers: formatPairs(server.headers, ':'),
+    oauth: Boolean(server.oauth?.enabled),
+    clientId: server.oauth?.clientId ?? '',
+    clientSecret: server.oauth?.clientSecret ?? '',
+    scope: server.oauth?.scope ?? '',
+  }
+}
+
+export function draftIsValid(draft: McpDraft): boolean {
+  if (!draft.name.trim()) return false
+  if (draft.transport === 'stdio') return Boolean(draft.command.trim())
+  return /^https?:\/\//i.test(draft.url.trim())
+}
+
+/** Builds the payload for PUT /api/mcp. `previous` keeps flags the form does not edit. */
+export function inputFromDraft(draft: McpDraft, previous?: McpServer): McpServerInput {
+  const base = {
+    ...(draft.id ? { id: draft.id } : {}),
+    name: draft.name.trim(),
+    transport: draft.transport,
+    enabled: previous?.enabled ?? true,
+    approval: previous?.approval ?? ('ask' as const),
+    disabledTools: previous?.disabledTools ?? [],
+  }
+  if (draft.transport === 'stdio') {
+    return { ...base, command: draft.command.trim(), args: splitArgs(draft.args), env: parsePairs(draft.env, '=') }
+  }
+  return {
+    ...base,
+    url: draft.url.trim(),
+    headers: parsePairs(draft.headers, ':'),
+    oauth: draft.oauth
+      ? { enabled: true, clientId: draft.clientId.trim(), clientSecret: draft.clientSecret.trim(), scope: draft.scope.trim() }
+      : null,
+  }
+}
+
+export function inputFromServer(server: McpServer): McpServerInput {
+  return inputFromDraft(draftFromServer(server), server)
+}
+
+type Json = Record<string, unknown>
+const isObject = (value: unknown): value is Json => typeof value === 'object' && value !== null && !Array.isArray(value)
+const strings = (value: unknown): Record<string, string> => {
+  const out: Record<string, string> = {}
+  if (isObject(value)) for (const [key, item] of Object.entries(value)) if (typeof item === 'string' || typeof item === 'number') out[key] = String(item)
+  return out
+}
+
+function entryToInput(name: string, raw: Json): McpServerInput | null {
+  const enabled = raw.disabled === true ? false : true
+  const url = [raw.url, raw.serverUrl, raw.httpUrl].find((item): item is string => typeof item === 'string')
+  if (url) {
+    const kind = String(raw.type ?? raw.transport ?? '').toLowerCase()
+    const transport: McpTransport = kind.includes('sse') || (!kind && /\/sse\/?$/i.test(url)) ? 'sse' : 'http'
+    const headers = strings(raw.headers)
+    const hasAuthHeader = Object.keys(headers).some((key) => key.toLowerCase() === 'authorization')
+    return { name, transport, enabled, url, headers, oauth: hasAuthHeader ? null : { enabled: true } }
+  }
+  if (typeof raw.command === 'string' && raw.command.trim()) {
+    const args = Array.isArray(raw.args) ? raw.args.filter((item): item is string => typeof item === 'string') : []
+    return { name, transport: 'stdio', enabled, command: raw.command, args, env: strings(raw.env) }
+  }
+  return null
+}
+
+const looksLikeServer = (value: unknown) => isObject(value) && (typeof value.command === 'string' || typeof value.url === 'string' || typeof value.serverUrl === 'string' || typeof value.httpUrl === 'string')
+
+/** Accepts Claude Desktop / Cursor / VS Code style JSON ({ mcpServers | servers: {...} }) or one server object. */
+export function parseMcpJson(text: string): { servers: McpServerInput[]; skipped: string[] } {
+  let data: unknown
+  try {
+    data = JSON.parse(text)
+  } catch {
+    throw new Error('That is not valid JSON.')
+  }
+  if (!isObject(data)) throw new Error('Expected a JSON object.')
+  let map: Json | null = null
+  for (const candidate of [data.mcpServers, data.servers, isObject(data.mcp) ? data.mcp.servers : undefined]) {
+    if (isObject(candidate)) {
+      map = candidate
+      break
+    }
+  }
+  if (!map) {
+    if (looksLikeServer(data)) map = { Imported: data }
+    else if (Object.values(data).length > 0 && Object.values(data).every(looksLikeServer)) map = data
+  }
+  if (!map) throw new Error('No MCP servers found. Expect {"mcpServers": {"name": {"command": …} or {"url": …}}}.')
+  const servers: McpServerInput[] = []
+  const skipped: string[] = []
+  for (const [name, raw] of Object.entries(map)) {
+    const input = isObject(raw) ? entryToInput(name.slice(0, 60), raw) : null
+    if (input) servers.push(input)
+    else skipped.push(name)
+  }
+  if (servers.length === 0) throw new Error('None of those entries has a "command" or a "url".')
+  return { servers, skipped }
+}

package/src/store/mcp.ts

@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import type { McpServer, McpTool, McpToolName } from '../types'
-import { mcpAction, mcpList, mcpSave, type McpServerInput } from '../lib/daemon'
+import { mcpAction, mcpAuthorize, mcpList, mcpLogout, mcpSave, type McpServerInput } from '../lib/daemon'
 
 interface McpState {
   servers: McpServer[]
@@ -10,6 +10,9 @@ interface McpState {
   load: () => Promise<void>
   save: (servers: McpServerInput[]) => Promise<void>
   act: (id: string, action: 'connect' | 'disconnect' | 'refresh') => Promise<void>
+  /** Opens the provider's consent page; resolves once the popup was opened. */
+  authorize: (id: string) => Promise<void>
+  logout: (id: string) => Promise<void>
   lookup: (fn: string) => { server: McpServer; tool: McpTool } | null
 }
 
@@ -52,6 +55,24 @@ export const useMcp = create<McpState>()((set, get) => {
       const result = await mcpAction(id, action)
       apply(result.servers)
     },
+    authorize: async (id) => {
+      const { url } = await mcpAuthorize(id)
+      const popup = window.open(url, 'opensol-mcp-oauth', 'popup=yes,width=520,height=720')
+      if (!popup) throw new Error('The browser blocked the sign-in window. Allow pop-ups for OpenSol and try again.')
+      // The callback page also broadcasts; polling covers browsers that drop BroadcastChannel.
+      const started = Date.now()
+      const watch = window.setInterval(() => {
+        void get().load()
+        const server = get().servers.find((item) => item.id === id)
+        if (popup.closed || server?.oauth?.authorized || Date.now() - started > 5 * 60_000) {
+          window.clearInterval(watch)
+          void get().load()
+        }
+      }, 1500)
+    },
+    logout: async (id) => {
+      apply((await mcpLogout(id)).servers)
+    },
     lookup: (fn) => {
       for (const server of get().servers) {
         const tool = server.tools.find((entry) => entry.fn === fn)
@@ -65,3 +86,9 @@ export const useMcp = create<McpState>()((set, get) => {
 export function isMcpToolName(name: string): name is McpToolName {
   return name.startsWith('mcp__')
 }
+
+try {
+  new BroadcastChannel('opensol-mcp-oauth').onmessage = () => void useMcp.getState().load()
+} catch {
+  // BroadcastChannel is optional; the authorize poll still refreshes the list.
+}

package/src/store/settings.ts

@@ -25,7 +25,7 @@ import {
 import { defaultEffort, normalizeEffort } from '../lib/reasoning'
 import { normalizeTheme } from '../lib/themes'
 
-export const DEFAULT_SYSTEM_PROMPT = `You are OpenSol, a senior web engineer and coding agent built by OpenSoft.
+export const DEFAULT_SYSTEM_PROMPT = `You are OpenSol, a senior web engineer and coding agent built by OpenSoftX.
 
 You work directly in the user's open folder through a local daemon. The shell, file, git, search and deploy tools are real. Never describe tool output you did not receive.
 

package/src/store/ui.ts

@@ -55,6 +55,8 @@ interface UiState {
   setMobileSidebarOpen: (open: boolean) => void
   workspaceOpen: boolean
   setWorkspaceOpen: (open: boolean) => void
+  mcpOpen: boolean
+  setMcpOpen: (open: boolean) => void
   settingsOpen: boolean
   settingsTab:
     | 'general'
@@ -111,6 +113,8 @@ export const useUi = create<UiState>()((set, get) => ({
   setMobileSidebarOpen: (open) => set({ mobileSidebarOpen: open }),
   workspaceOpen: false,
   setWorkspaceOpen: (open) => set({ workspaceOpen: open }),
+  mcpOpen: false,
+  setMcpOpen: (open) => set({ mcpOpen: open, ...(open ? { mobileSidebarOpen: false, settingsOpen: false } : {}) }),
   settingsOpen: false,
   settingsTab: 'general',
   openSettings: (tab = 'general') => set({ settingsOpen: true, settingsTab: tab, mobileSidebarOpen: false }),

package/src/types.ts

@@ -231,7 +231,18 @@ export interface ChatSession {
   titleSource?: 'auto' | 'ai' | 'user'
 }
 
-export type McpStatus = 'disabled' | 'disconnected' | 'connecting' | 'connected' | 'error'
+export type McpStatus = 'disabled' | 'disconnected' | 'connecting' | 'connected' | 'needs_auth' | 'error'
+
+export type McpTransport = 'stdio' | 'http' | 'sse'
+
+export interface McpOAuth {
+  enabled: boolean
+  clientId: string
+  /** Masked by the daemon; send the mask back to keep the stored secret. */
+  clientSecret: string
+  scope: string
+  authorized: boolean
+}
 
 export interface McpTool {
   name: string
@@ -244,7 +255,7 @@ export interface McpTool {
 export interface McpServer {
   id: string
   name: string
-  transport: 'stdio' | 'http'
+  transport: McpTransport
   enabled: boolean
   approval: 'auto' | 'ask'
   disabledTools: string[]
@@ -258,6 +269,7 @@ export interface McpServer {
   env?: Record<string, string>
   url?: string
   headers?: Record<string, string>
+  oauth?: McpOAuth | null
 }
 
 export interface Usage {

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/App.tsx","./src/main.tsx","./src/types.ts","./src/vite-env.d.ts","./src/agent/approval.ts","./src/agent/compact.ts","./src/agent/index.ts","./src/agent/model.ts","./src/agent/prompt.ts","./src/agent/queue.ts","./src/agent/subagent.ts","./src/agent/tools.ts","./src/agent/adapters/anthropic.ts","./src/agent/adapters/gemini.ts","./src/agent/adapters/openai-responses.ts","./src/agent/adapters/openai.ts","./src/agent/adapters/shared.ts","./src/components/ChatView.tsx","./src/components/CommandPalette.tsx","./src/components/Composer.tsx","./src/components/ContextBar.tsx","./src/components/DeployModal.tsx","./src/components/DiffView.tsx","./src/components/ErrorBoundary.tsx","./src/components/HomeDashboard.tsx","./src/components/Logo.tsx","./src/components/Markdown.tsx","./src/components/McpTab.tsx","./src/components/MessageItem.tsx","./src/components/ModelDeck.tsx","./src/components/PixleSol.tsx","./src/components/PluginBuilder.tsx","./src/components/PluginManager.tsx","./src/components/PreviewPane.tsx","./src/components/SessionsTab.tsx","./src/components/SettingsModal.tsx","./src/components/Sidebar.tsx","./src/components/Splash.tsx","./src/components/ToolCallCard.tsx","./src/components/TopBar.tsx","./src/components/TrajectoryView.tsx","./src/components/WorkspacePanel.tsx","./src/components/ui.tsx","./src/core/kernel.ts","./src/core/mcp-tools.ts","./src/core/types.ts","./src/core/plugins/tools/fs.ts","./src/core/plugins/tools/git.ts","./src/core/plugins/tools/grep.ts","./src/core/plugins/tools/shell.ts","./src/core/plugins/tools/subagent.ts","./src/core/plugins/tools/web.ts","./src/core/services/agent-loop.ts","./src/core/services/approval.ts","./src/core/services/compaction.ts","./src/core/services/llm.ts","./src/core/services/sessions.ts","./src/core/services/subagents.ts","./src/core/services/system-prompt.ts","./src/core/services/titles.ts","./src/core/services/tools.ts","./src/core/services/ui.ts","./src/data/providers.ts","./src/data/skills.ts","./src/lib/boot.ts","./src/lib/context.ts","./src/lib/conversation.ts","./src/lib/daemon.ts","./src/lib/diff.ts","./src/lib/hooks.ts","./src/lib/permissions.ts","./src/lib/pixlesol.ts","./src/lib/plugin-folder.ts","./src/lib/reasoning.ts","./src/lib/sse.ts","./src/lib/themes.ts","./src/lib/usage.ts","./src/lib/utils.ts","./src/plugins/api.ts","./src/plugins/bridge.d.mts","./src/plugins/index.ts","./src/plugins/preview.ts","./src/plugins/runtime.ts","./src/plugins/types.ts","./src/store/chats.ts","./src/store/mcp.ts","./src/store/models.ts","./src/store/settings.ts","./src/store/ui.ts","./src/store/workspace.ts"],"version":"5.9.3"}
+{"root":["./src/App.tsx","./src/main.tsx","./src/types.ts","./src/vite-env.d.ts","./src/agent/approval.ts","./src/agent/compact.ts","./src/agent/index.ts","./src/agent/model.ts","./src/agent/prompt.ts","./src/agent/queue.ts","./src/agent/subagent.ts","./src/agent/tools.ts","./src/agent/adapters/anthropic.ts","./src/agent/adapters/gemini.ts","./src/agent/adapters/openai-responses.ts","./src/agent/adapters/openai.ts","./src/agent/adapters/shared.ts","./src/components/ChatView.tsx","./src/components/CommandPalette.tsx","./src/components/Composer.tsx","./src/components/ContextBar.tsx","./src/components/DeployModal.tsx","./src/components/DiffView.tsx","./src/components/ErrorBoundary.tsx","./src/components/HomeDashboard.tsx","./src/components/Logo.tsx","./src/components/Markdown.tsx","./src/components/McpPanel.tsx","./src/components/MessageItem.tsx","./src/components/ModelDeck.tsx","./src/components/PixleSol.tsx","./src/components/PluginBuilder.tsx","./src/components/PluginManager.tsx","./src/components/PreviewPane.tsx","./src/components/SessionsTab.tsx","./src/components/SettingsModal.tsx","./src/components/Sidebar.tsx","./src/components/Splash.tsx","./src/components/ToolCallCard.tsx","./src/components/TopBar.tsx","./src/components/TrajectoryView.tsx","./src/components/WorkspacePanel.tsx","./src/components/ui.tsx","./src/core/kernel.ts","./src/core/mcp-tools.ts","./src/core/types.ts","./src/core/plugins/tools/fs.ts","./src/core/plugins/tools/git.ts","./src/core/plugins/tools/grep.ts","./src/core/plugins/tools/shell.ts","./src/core/plugins/tools/subagent.ts","./src/core/plugins/tools/web.ts","./src/core/services/agent-loop.ts","./src/core/services/approval.ts","./src/core/services/compaction.ts","./src/core/services/llm.ts","./src/core/services/sessions.ts","./src/core/services/subagents.ts","./src/core/services/system-prompt.ts","./src/core/services/titles.ts","./src/core/services/tools.ts","./src/core/services/ui.ts","./src/data/providers.ts","./src/data/skills.ts","./src/lib/boot.ts","./src/lib/context.ts","./src/lib/conversation.ts","./src/lib/daemon.ts","./src/lib/diff.ts","./src/lib/hooks.ts","./src/lib/mcp-config.ts","./src/lib/permissions.ts","./src/lib/pixlesol.ts","./src/lib/plugin-folder.ts","./src/lib/reasoning.ts","./src/lib/sse.ts","./src/lib/themes.ts","./src/lib/usage.ts","./src/lib/utils.ts","./src/plugins/api.ts","./src/plugins/bridge.d.mts","./src/plugins/index.ts","./src/plugins/preview.ts","./src/plugins/runtime.ts","./src/plugins/types.ts","./src/store/chats.ts","./src/store/mcp.ts","./src/store/models.ts","./src/store/settings.ts","./src/store/ui.ts","./src/store/workspace.ts"],"version":"5.9.3"}