@swarmclawai/swarmclaw 0.7.0 → 0.7.2

package/src/app/api/plugins/route.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server'
 import { getPluginManager } from '@/lib/server/plugins'
+import { notify } from '@/lib/server/ws-hub'
 
 // Ensure all builtin plugins are registered by importing their modules
 import '@/lib/server/session-tools/shell'
@@ -44,6 +45,7 @@ export async function POST(req: Request) {
 
   const manager = getPluginManager()
   manager.setEnabled(filename, enabled)
+  notify('plugins')
 
   return NextResponse.json({ ok: true })
 }
@@ -59,6 +61,7 @@ export async function DELETE(req: Request) {
   if (!deleted) {
     return NextResponse.json({ error: 'Cannot delete built-in or non-existent plugin' }, { status: 400 })
   }
+  notify('plugins')
   return NextResponse.json({ ok: true })
 }
 

package/src/app/api/plugins/settings/route.ts

@@ -0,0 +1,35 @@
+import { NextResponse } from 'next/server'
+import { loadSettings, saveSettings } from '@/lib/server/storage'
+
+export const dynamic = 'force-dynamic'
+
+/** GET /api/plugins/settings?pluginId=X — read per-plugin settings */
+export async function GET(req: Request) {
+  const { searchParams } = new URL(req.url)
+  const pluginId = searchParams.get('pluginId')
+  if (!pluginId) {
+    return NextResponse.json({ error: 'pluginId required' }, { status: 400 })
+  }
+
+  const settings = loadSettings()
+  const pluginSettings = (settings.pluginSettings as Record<string, Record<string, unknown>> | undefined) ?? {}
+  return NextResponse.json(pluginSettings[pluginId] ?? {})
+}
+
+/** PUT /api/plugins/settings?pluginId=X — write per-plugin settings */
+export async function PUT(req: Request) {
+  const { searchParams } = new URL(req.url)
+  const pluginId = searchParams.get('pluginId')
+  if (!pluginId) {
+    return NextResponse.json({ error: 'pluginId required' }, { status: 400 })
+  }
+
+  const body = await req.json() as Record<string, unknown>
+  const settings = loadSettings()
+  const pluginSettings = (settings.pluginSettings as Record<string, Record<string, unknown>> | undefined) ?? {}
+  pluginSettings[pluginId] = body
+  settings.pluginSettings = pluginSettings
+  saveSettings(settings)
+
+  return NextResponse.json({ ok: true })
+}

package/src/app/api/usage/route.ts

@@ -50,6 +50,7 @@ export async function GET(req: Request) {
   let totalCost = 0
   const byAgent: Record<string, { name: string; cost: number; tokens: number; count: number }> = {}
   const byProvider: Record<string, { tokens: number; cost: number }> = {}
+  const byPlugin: Record<string, { definitionTokens: number; invocationTokens: number; invocations: number; estimatedCost: number }> = {}
   const bucketMap: Record<string, { tokens: number; cost: number }> = {}
 
   for (const r of records) {
@@ -75,6 +76,26 @@ export async function GET(req: Request) {
     byAgent[agentId].tokens += tokens
     byAgent[agentId].count += 1
 
+    // by plugin — definition costs (context overhead per LLM call)
+    if (Array.isArray(r.pluginDefinitionCosts)) {
+      for (const dc of r.pluginDefinitionCosts) {
+        if (!dc.pluginId) continue
+        if (!byPlugin[dc.pluginId]) byPlugin[dc.pluginId] = { definitionTokens: 0, invocationTokens: 0, invocations: 0, estimatedCost: 0 }
+        byPlugin[dc.pluginId].definitionTokens += dc.estimatedTokens || 0
+      }
+    }
+
+    // by plugin — invocation costs (actual tool calls)
+    if (Array.isArray(r.pluginInvocations)) {
+      for (const inv of r.pluginInvocations) {
+        if (!inv.pluginId) continue
+        if (!byPlugin[inv.pluginId]) byPlugin[inv.pluginId] = { definitionTokens: 0, invocationTokens: 0, invocations: 0, estimatedCost: 0 }
+        const p = byPlugin[inv.pluginId]
+        p.invocationTokens += (inv.inputTokens || 0) + (inv.outputTokens || 0)
+        p.invocations += 1
+      }
+    }
+
     // time series bucketing
     const bk = bucketKey(r.timestamp || now, range)
     if (!bucketMap[bk]) bucketMap[bk] = { tokens: 0, cost: 0 }
@@ -82,6 +103,14 @@ export async function GET(req: Request) {
     bucketMap[bk].cost += cost
   }
 
+  // Estimate per-plugin cost using the average input token rate from total usage
+  if (totalTokens > 0 && totalCost > 0) {
+    const avgCostPerToken = totalCost / totalTokens
+    for (const p of Object.values(byPlugin)) {
+      p.estimatedCost = Math.round((p.definitionTokens + p.invocationTokens) * avgCostPerToken * 10000) / 10000
+    }
+  }
+
   // Sort time series
   const timeSeries = Object.entries(bucketMap)
     .sort(([a], [b]) => a.localeCompare(b))
@@ -144,6 +173,7 @@ export async function GET(req: Request) {
     totalCost: Math.round(totalCost * 10000) / 10000,
     byAgent,
     byProvider,
+    byPlugin,
     timeSeries,
     providerHealth,
   })

package/src/cli/index.js

@@ -345,6 +345,8 @@ const COMMAND_GROUPS = [
       cmd('update', 'PATCH', '/plugins', 'Update a plugin (use --query id=plugin.js or --query all=true)'),
       cmd('install', 'POST', '/plugins/install', 'Install plugin from URL', { expectsJsonBody: true }),
       cmd('marketplace', 'GET', '/plugins/marketplace', 'Get marketplace catalog'),
+      cmd('settings-get', 'GET', '/plugins/settings', 'Get plugin settings (use --query pluginId=plugin_name)'),
+      cmd('settings-set', 'PUT', '/plugins/settings', 'Set plugin settings (use --query pluginId=plugin_name and --data JSON)', { expectsJsonBody: true }),
       cmd('ui', 'GET', '/plugins/ui', 'List plugin UI extensions (use --query type=sidebar|header|chat_actions|connectors)'),
     ],
   },
@@ -369,7 +371,7 @@ const COMMAND_GROUPS = [
     name: 'search',
     description: 'Global search across app resources',
     commands: [
-      cmd('query', 'GET', '/search', 'Search agents/tasks/sessions/schedules/webhooks/skills (use --query q=term)'),
+      cmd('query', 'GET', '/search', 'Search agents/tasks/chats/schedules/webhooks/skills (use --query q=term)'),
     ],
   },
   {
@@ -404,56 +406,56 @@ const COMMAND_GROUPS = [
     ],
   },
   {
-    name: 'sessions',
-    description: 'Manage chat sessions and runtime controls',
+    name: 'chats',
+    description: 'Manage agent chats and runtime controls',
     commands: [
-      cmd('list', 'GET', '/sessions', 'List sessions'),
-      cmd('get', 'GET', '/sessions/:id', 'Get session by id', { virtual: true, clientGetRoute: '/sessions' }),
-      cmd('create', 'POST', '/sessions', 'Create session', { expectsJsonBody: true }),
-      cmd('update', 'PUT', '/sessions/:id', 'Update session', { expectsJsonBody: true }),
-      cmd('delete', 'DELETE', '/sessions/:id', 'Delete session'),
-      cmd('delete-many', 'DELETE', '/sessions', 'Delete multiple sessions (body: {"ids":[...]})', { expectsJsonBody: true }),
-      cmd('heartbeat-disable-all', 'POST', '/sessions/heartbeat', 'Disable all session heartbeats and cancel queued heartbeat runs', {
+      cmd('list', 'GET', '/chats', 'List chats'),
+      cmd('get', 'GET', '/chats/:id', 'Get chat by id', { virtual: true, clientGetRoute: '/chats' }),
+      cmd('create', 'POST', '/chats', 'Create chat', { expectsJsonBody: true }),
+      cmd('update', 'PUT', '/chats/:id', 'Update chat', { expectsJsonBody: true }),
+      cmd('delete', 'DELETE', '/chats/:id', 'Delete chat'),
+      cmd('delete-many', 'DELETE', '/chats', 'Delete multiple chats (body: {"ids":[...]})', { expectsJsonBody: true }),
+      cmd('heartbeat-disable-all', 'POST', '/chats/heartbeat', 'Disable all chat heartbeats and cancel queued heartbeat runs', {
         expectsJsonBody: true,
         defaultBody: { action: 'disable_all' },
       }),
-      cmd('messages', 'GET', '/sessions/:id/messages', 'Get session messages'),
-      cmd('messages-update', 'PUT', '/sessions/:id/messages', 'Update session message metadata (e.g. bookmark)', { expectsJsonBody: true }),
-      cmd('messages-send', 'POST', '/sessions/:id/messages', 'Append a user/system message to a session', { expectsJsonBody: true }),
-      cmd('messages-delete', 'DELETE', '/sessions/:id/messages', 'Delete a message from a session', { expectsJsonBody: true }),
-      cmd('fork', 'POST', '/sessions/:id/fork', 'Fork session from a specific message index', { expectsJsonBody: true }),
-      cmd('edit-resend', 'POST', '/sessions/:id/edit-resend', 'Edit and resend from a specific message index', { expectsJsonBody: true }),
-      cmd('main-loop', 'GET', '/sessions/:id/main-loop', 'Get main mission loop state'),
-      cmd('main-loop-action', 'POST', '/sessions/:id/main-loop', 'Control main mission loop (pause/resume/set_goal/set_mode/clear_events/nudge)', {
+      cmd('messages', 'GET', '/chats/:id/messages', 'Get chat messages'),
+      cmd('messages-update', 'PUT', '/chats/:id/messages', 'Update chat message metadata (e.g. bookmark)', { expectsJsonBody: true }),
+      cmd('messages-send', 'POST', '/chats/:id/messages', 'Append a user/system message to a chat', { expectsJsonBody: true }),
+      cmd('messages-delete', 'DELETE', '/chats/:id/messages', 'Delete a message from a chat', { expectsJsonBody: true }),
+      cmd('fork', 'POST', '/chats/:id/fork', 'Fork chat from a specific message index', { expectsJsonBody: true }),
+      cmd('edit-resend', 'POST', '/chats/:id/edit-resend', 'Edit and resend from a specific message index', { expectsJsonBody: true }),
+      cmd('main-loop', 'GET', '/chats/:id/main-loop', 'Get main mission loop state'),
+      cmd('main-loop-action', 'POST', '/chats/:id/main-loop', 'Control main mission loop (pause/resume/set_goal/set_mode/clear_events/nudge)', {
         expectsJsonBody: true,
       }),
-      cmd('chat', 'POST', '/sessions/:id/chat', 'Send chat message (streaming)', {
+      cmd('chat', 'POST', '/chats/:id/chat', 'Send chat message (streaming)', {
         expectsJsonBody: true,
         responseType: 'sse',
       }),
-      cmd('stop', 'POST', '/sessions/:id/stop', 'Stop session run(s)'),
-      cmd('clear', 'POST', '/sessions/:id/clear', 'Clear session messages'),
-      cmd('browser-status', 'GET', '/sessions/:id/browser', 'Check browser status'),
-      cmd('browser-close', 'DELETE', '/sessions/:id/browser', 'Close browser session'),
-      cmd('mailbox', 'GET', '/sessions/:id/mailbox', 'List session mailbox envelopes'),
-      cmd('mailbox-action', 'POST', '/sessions/:id/mailbox', 'Send/ack/clear mailbox envelopes', { expectsJsonBody: true }),
-      cmd('retry', 'POST', '/sessions/:id/retry', 'Retry last assistant message'),
-      cmd('deploy', 'POST', '/sessions/:id/deploy', 'Deploy current session branch', { expectsJsonBody: true }),
-      cmd('devserver', 'POST', '/sessions/:id/devserver', 'Dev server action via JSON body', { expectsJsonBody: true }),
-      cmd('devserver-start', 'POST', '/sessions/:id/devserver', 'Start session dev server', {
+      cmd('stop', 'POST', '/chats/:id/stop', 'Stop chat run(s)'),
+      cmd('clear', 'POST', '/chats/:id/clear', 'Clear chat messages'),
+      cmd('browser-status', 'GET', '/chats/:id/browser', 'Check browser status'),
+      cmd('browser-close', 'DELETE', '/chats/:id/browser', 'Close browser'),
+      cmd('mailbox', 'GET', '/chats/:id/mailbox', 'List chat mailbox envelopes'),
+      cmd('mailbox-action', 'POST', '/chats/:id/mailbox', 'Send/ack/clear mailbox envelopes', { expectsJsonBody: true }),
+      cmd('retry', 'POST', '/chats/:id/retry', 'Retry last assistant message'),
+      cmd('deploy', 'POST', '/chats/:id/deploy', 'Deploy current chat branch', { expectsJsonBody: true }),
+      cmd('devserver', 'POST', '/chats/:id/devserver', 'Dev server action via JSON body', { expectsJsonBody: true }),
+      cmd('devserver-start', 'POST', '/chats/:id/devserver', 'Start chat dev server', {
         expectsJsonBody: true,
         defaultBody: { action: 'start' },
       }),
-      cmd('devserver-stop', 'POST', '/sessions/:id/devserver', 'Stop session dev server', {
+      cmd('devserver-stop', 'POST', '/chats/:id/devserver', 'Stop chat dev server', {
         expectsJsonBody: true,
         defaultBody: { action: 'stop' },
       }),
-      cmd('devserver-status', 'POST', '/sessions/:id/devserver', 'Check session dev server status', {
+      cmd('devserver-status', 'POST', '/chats/:id/devserver', 'Check chat dev server status', {
         expectsJsonBody: true,
         defaultBody: { action: 'status' },
       }),
-      cmd('checkpoints', 'GET', '/sessions/:id/checkpoints', 'List checkpoint history for a session'),
-      cmd('restore', 'POST', '/sessions/:id/restore', 'Restore session to a previous checkpoint', { expectsJsonBody: true }),
+      cmd('checkpoints', 'GET', '/chats/:id/checkpoints', 'List checkpoint history for a chat'),
+      cmd('restore', 'POST', '/chats/:id/restore', 'Restore chat to a previous checkpoint', { expectsJsonBody: true }),
     ],
   },
   {

package/src/cli/index.ts

@@ -657,27 +657,28 @@ export function buildProgram(): Command {
       await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'GET', `/runs/${encodeURIComponent(id)}`))
     })
 
-  const sessions = program.command('sessions').description('Manage sessions')
+  const chats = program.command('chats').description('Manage chats')
+  program.command('sessions').description('Manage chats (alias)').action(() => chats.help())
 
-  sessions
+  chats
     .command('list')
-    .description('List sessions')
+    .description('List chats')
     .action(async function () {
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'GET', '/sessions'))
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'GET', '/chats'))
     })
 
-  sessions
+  chats
     .command('get')
-    .description('Get session by id')
-    .argument('<id>', 'Session id')
+    .description('Get chat by id')
+    .argument('<id>', 'Chat id')
     .action(async function (id: string) {
-      await runWithHandler(this as Command, (ctx) => resolveByIdFromCollection(ctx, '/sessions', id))
+      await runWithHandler(this as Command, (ctx) => resolveByIdFromCollection(ctx, '/chats', id))
     })
 
-  sessions
+  chats
     .command('create')
-    .description('Create session')
-    .option('--name <name>', 'Session name', 'New Session')
+    .description('Create chat')
+    .option('--name <name>', 'Chat name', 'New Chat')
     .option('--user <user>', 'User name')
     .option('--cwd <cwd>', 'Working directory')
     .option('--provider <provider>', 'Provider id')
@@ -706,7 +707,7 @@ export function buildProgram(): Command {
       if (opts.heartbeatIntervalSec && (!Number.isFinite(heartbeatIntervalSec) || heartbeatIntervalSec! < 0)) {
         throw new Error(`Invalid --heartbeat-interval-sec value: ${opts.heartbeatIntervalSec}`)
       }
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'POST', '/sessions', compactObject({
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'POST', '/chats', compactObject({
         name: opts.name,
         user: opts.user,
         cwd: opts.cwd,
@@ -720,14 +721,14 @@ export function buildProgram(): Command {
       })))
     })
 
-  sessions
+  chats
     .command('update')
-    .description('Update session')
-    .argument('<id>', 'Session id')
-    .option('--name <name>', 'Session name')
+    .description('Update chat')
+    .argument('<id>', 'Chat id')
+    .option('--name <name>', 'Chat name')
     .option('--cwd <cwd>', 'Working directory')
     .option('--agent-id <agentId>', 'Agent id')
-    .option('--tools <json>', 'Tools JSON array, e.g. ["shell","memory"]')
+    .option('--plugins <json>', 'Plugins JSON array, e.g. ["shell","memory"]')
     .option('--heartbeat-enabled <heartbeatEnabled>', 'Heartbeat enabled (true|false)')
     .option('--heartbeat-interval-sec <heartbeatIntervalSec>', 'Heartbeat interval seconds')
     .action(async function (
@@ -736,7 +737,7 @@ export function buildProgram(): Command {
         name?: string
         cwd?: string
         agentId?: string
-        tools?: string
+        plugins?: string
         heartbeatEnabled?: string
         heartbeatIntervalSec?: string
       },
@@ -748,40 +749,40 @@ export function buildProgram(): Command {
       if (opts.heartbeatIntervalSec && (!Number.isFinite(heartbeatIntervalSec) || heartbeatIntervalSec! < 0)) {
         throw new Error(`Invalid --heartbeat-interval-sec value: ${opts.heartbeatIntervalSec}`)
       }
-      const tools = parseJsonValue(opts.tools, '--tools')
-      if (tools !== undefined && !Array.isArray(tools)) {
-        throw new Error('--tools must be a JSON array')
+      const plugins = parseJsonValue(opts.plugins, '--plugins')
+      if (plugins !== undefined && !Array.isArray(plugins)) {
+        throw new Error('--plugins must be a JSON array')
       }
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'PUT', `/sessions/${encodeURIComponent(id)}`, compactObject({
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'PUT', `/chats/${encodeURIComponent(id)}`, compactObject({
         name: opts.name,
         cwd: opts.cwd,
         agentId: opts.agentId,
-        tools,
+        plugins,
         heartbeatEnabled: typeof opts.heartbeatEnabled === 'string' ? heartbeatEnabled : undefined,
         heartbeatIntervalSec,
       })))
     })
 
-  sessions
+  chats
     .command('delete')
-    .description('Delete session')
-    .argument('<id>', 'Session id')
+    .description('Delete chat')
+    .argument('<id>', 'Chat id')
     .action(async function (id: string) {
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'DELETE', `/sessions/${encodeURIComponent(id)}`))
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'DELETE', `/chats/${encodeURIComponent(id)}`))
     })
 
-  sessions
+  chats
     .command('history')
-    .description('Get session message history')
-    .argument('<id>', 'Session id')
+    .description('Get chat message history')
+    .argument('<id>', 'Chat id')
     .action(async function (id: string) {
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'GET', `/sessions/${encodeURIComponent(id)}/messages`))
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'GET', `/chats/${encodeURIComponent(id)}/messages`))
     })
 
-  sessions
+  chats
     .command('mailbox')
-    .description('List session mailbox envelopes')
-    .argument('<id>', 'Session id')
+    .description('List chat mailbox envelopes')
+    .argument('<id>', 'Chat id')
     .option('--limit <limit>', 'Max envelopes to return (default: 50)')
     .option('--include-acked', 'Include acknowledged envelopes')
     .action(async function (
@@ -799,16 +800,16 @@ export function buildProgram(): Command {
         const params = new URLSearchParams()
         if (typeof limit === 'number') params.set('limit', String(limit))
         if (opts.includeAcked) params.set('includeAcked', '1')
-        return apiRequest(ctx, 'GET', `/sessions/${encodeURIComponent(id)}/mailbox`, undefined, params)
+        return apiRequest(ctx, 'GET', `/chats/${encodeURIComponent(id)}/mailbox`, undefined, params)
       })
     })
 
-  sessions
+  chats
     .command('stop')
-    .description('Stop running work for a session')
-    .argument('<id>', 'Session id')
+    .description('Stop running work for a chat')
+    .argument('<id>', 'Chat id')
     .action(async function (id: string) {
-      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'POST', `/sessions/${encodeURIComponent(id)}/stop`))
+      await runWithHandler(this as Command, (ctx) => apiRequest(ctx, 'POST', `/chats/${encodeURIComponent(id)}/stop`))
     })
 
   const memory = program.command('memory').description('Manage memory')

package/src/cli/spec.js

@@ -228,6 +228,8 @@ const COMMAND_GROUPS = {
       update: { description: 'Enable/disable plugin (body: {"filename":"x.js","enabled":true})', method: 'POST', path: '/plugins' },
       marketplace: { description: 'Get plugin marketplace registry', method: 'GET', path: '/plugins/marketplace' },
       install: { description: 'Install plugin by URL', method: 'POST', path: '/plugins/install' },
+      'settings-get': { description: 'Read plugin settings (supports --query pluginId=...)', method: 'GET', path: '/plugins/settings' },
+      'settings-set': { description: 'Write plugin settings (supports --query pluginId=... and --data JSON)', method: 'PUT', path: '/plugins/settings' },
     },
   },
   providers: {
@@ -249,7 +251,7 @@ const COMMAND_GROUPS = {
   search: {
     description: 'Global search across app resources',
     commands: {
-      query: { description: 'Search agents/tasks/sessions/schedules/webhooks/skills (supports --query q=term)', method: 'GET', path: '/search' },
+      query: { description: 'Search agents/tasks/chats/schedules/webhooks/skills (supports --query q=term)', method: 'GET', path: '/search' },
     },
   },
   schedules: {
@@ -273,33 +275,33 @@ const COMMAND_GROUPS = {
       delete: { description: 'Delete secret', method: 'DELETE', path: '/secrets/:id', params: ['id'] },
     },
   },
-  sessions: {
-    description: 'Interactive chat sessions',
+  chats: {
+    description: 'Agent chats',
     commands: {
-      list: { description: 'List sessions', method: 'GET', path: '/sessions' },
-      create: { description: 'Create session', method: 'POST', path: '/sessions' },
-      get: { description: 'Get session by id (from list)', virtualGet: true, collectionPath: '/sessions', params: ['id'] },
-      update: { description: 'Update session fields', method: 'PUT', path: '/sessions/:id', params: ['id'] },
-      delete: { description: 'Delete one session', method: 'DELETE', path: '/sessions/:id', params: ['id'] },
-      'delete-many': { description: 'Delete multiple sessions (body: {"ids":[...]})', method: 'DELETE', path: '/sessions' },
-      'heartbeat-disable-all': { description: 'Disable all session heartbeats and cancel queued heartbeat runs', method: 'POST', path: '/sessions/heartbeat' },
-      messages: { description: 'Get session message history', method: 'GET', path: '/sessions/:id/messages', params: ['id'] },
-      'messages-update': { description: 'Update session message metadata (e.g. bookmark)', method: 'PUT', path: '/sessions/:id/messages', params: ['id'] },
-      'messages-send': { description: 'Append a user/system message to a session', method: 'POST', path: '/sessions/:id/messages', params: ['id'] },
-      'messages-delete': { description: 'Delete a message from a session', method: 'DELETE', path: '/sessions/:id/messages', params: ['id'] },
-      fork: { description: 'Fork session from a specific message index', method: 'POST', path: '/sessions/:id/fork', params: ['id'] },
-      'edit-resend': { description: 'Edit and resend from a specific message index', method: 'POST', path: '/sessions/:id/edit-resend', params: ['id'] },
-      'main-loop': { description: 'Get main mission loop state for a session', method: 'GET', path: '/sessions/:id/main-loop', params: ['id'] },
-      'main-loop-action': { description: 'Control main mission loop (pause/resume/set_goal/set_mode/clear_events/nudge)', method: 'POST', path: '/sessions/:id/main-loop', params: ['id'] },
-      chat: { description: 'Send chat message (SSE stream)', method: 'POST', path: '/sessions/:id/chat', params: ['id'], stream: true, waitable: true },
-      stop: { description: 'Cancel active/running session work', method: 'POST', path: '/sessions/:id/stop', params: ['id'] },
-      clear: { description: 'Clear session history', method: 'POST', path: '/sessions/:id/clear', params: ['id'] },
-      mailbox: { description: 'List mailbox envelopes for a session', method: 'GET', path: '/sessions/:id/mailbox', params: ['id'] },
-      'mailbox-action': { description: 'Send/ack/clear mailbox envelopes', method: 'POST', path: '/sessions/:id/mailbox', params: ['id'] },
-      deploy: { description: 'Deploy session workspace git changes', method: 'POST', path: '/sessions/:id/deploy', params: ['id'] },
-      devserver: { description: 'Start/stop/status dev server (body: {"action":"start|stop|status"})', method: 'POST', path: '/sessions/:id/devserver', params: ['id'] },
-      browser: { description: 'Check browser runtime for session', method: 'GET', path: '/sessions/:id/browser', params: ['id'] },
-      'browser-clear': { description: 'Close browser runtime for session', method: 'DELETE', path: '/sessions/:id/browser', params: ['id'] },
+      list: { description: 'List chats', method: 'GET', path: '/chats' },
+      create: { description: 'Create chat', method: 'POST', path: '/chats' },
+      get: { description: 'Get chat by id (from list)', virtualGet: true, collectionPath: '/chats', params: ['id'] },
+      update: { description: 'Update chat fields', method: 'PUT', path: '/chats/:id', params: ['id'] },
+      delete: { description: 'Delete one chat', method: 'DELETE', path: '/chats/:id', params: ['id'] },
+      'delete-many': { description: 'Delete multiple chats (body: {"ids":[...]})', method: 'DELETE', path: '/chats' },
+      'heartbeat-disable-all': { description: 'Disable all chat heartbeats and cancel queued heartbeat runs', method: 'POST', path: '/chats/heartbeat' },
+      messages: { description: 'Get chat message history', method: 'GET', path: '/chats/:id/messages', params: ['id'] },
+      'messages-update': { description: 'Update chat message metadata (e.g. bookmark)', method: 'PUT', path: '/chats/:id/messages', params: ['id'] },
+      'messages-send': { description: 'Append a user/system message to a chat', method: 'POST', path: '/chats/:id/messages', params: ['id'] },
+      'messages-delete': { description: 'Delete a message from a chat', method: 'DELETE', path: '/chats/:id/messages', params: ['id'] },
+      fork: { description: 'Fork chat from a specific message index', method: 'POST', path: '/chats/:id/fork', params: ['id'] },
+      'edit-resend': { description: 'Edit and resend from a specific message index', method: 'POST', path: '/chats/:id/edit-resend', params: ['id'] },
+      'main-loop': { description: 'Get main mission loop state for a chat', method: 'GET', path: '/chats/:id/main-loop', params: ['id'] },
+      'main-loop-action': { description: 'Control main mission loop (pause/resume/set_goal/set_mode/clear_events/nudge)', method: 'POST', path: '/chats/:id/main-loop', params: ['id'] },
+      chat: { description: 'Send chat message (SSE stream)', method: 'POST', path: '/chats/:id/chat', params: ['id'], stream: true, waitable: true },
+      stop: { description: 'Cancel active/running chat work', method: 'POST', path: '/chats/:id/stop', params: ['id'] },
+      clear: { description: 'Clear chat history', method: 'POST', path: '/chats/:id/clear', params: ['id'] },
+      mailbox: { description: 'List mailbox envelopes for a chat', method: 'GET', path: '/chats/:id/mailbox', params: ['id'] },
+      'mailbox-action': { description: 'Send/ack/clear mailbox envelopes', method: 'POST', path: '/chats/:id/mailbox', params: ['id'] },
+      deploy: { description: 'Deploy chat workspace git changes', method: 'POST', path: '/chats/:id/deploy', params: ['id'] },
+      devserver: { description: 'Start/stop/status dev server (body: {"action":"start|stop|status"})', method: 'POST', path: '/chats/:id/devserver', params: ['id'] },
+      browser: { description: 'Check browser runtime for chat', method: 'GET', path: '/chats/:id/browser', params: ['id'] },
+      'browser-clear': { description: 'Close browser runtime for chat', method: 'DELETE', path: '/chats/:id/browser', params: ['id'] },
     },
   },
   settings: {

package/src/components/agents/agent-card.tsx

@@ -220,7 +220,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
         <div className="text-[12px] text-text-3/70 mt-1.5 truncate">{agent.description}</div>
         <div className="flex items-center gap-2 mt-1.5">
           <span className="text-[11px] text-text-3/60 font-mono">{agent.model || agent.provider}</span>
-          {agent.tools?.includes('browser') && (
+          {agent.plugins?.includes('browser') && (
             <span className="text-[10px] font-600 uppercase tracking-wider text-sky-400/70 bg-sky-400/[0.08] px-1.5 py-0.5 rounded-[5px]">
               browser
             </span>

package/src/components/agents/agent-chat-list.tsx

@@ -4,7 +4,7 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import { useAppStore } from '@/stores/use-app-store'
 import { useChatStore } from '@/stores/use-chat-store'
 import { useChatroomStore } from '@/stores/use-chatroom-store'
-import { fetchMessages } from '@/lib/sessions'
+import { fetchMessages } from '@/lib/chats'
 import { api } from '@/lib/api-client'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
 import type { Agent, Session } from '@/types'
@@ -58,7 +58,7 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
       .filter(Boolean) as string[]
     if (!sessionIds.length) { toast.error('No chats to delete'); return }
     try {
-      await api('DELETE', '/sessions', { ids: sessionIds })
+      await api('DELETE', '/chats', { ids: sessionIds })
       await loadSessions()
       toast.success(`Deleted ${sessionIds.length} chat(s)`)
       setBulkMode(false)
@@ -262,7 +262,7 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
           const threadSession = agent.threadSessionId ? sessions[agent.threadSessionId] as Session | undefined : undefined
           const lastMsg = threadSession?.messages?.at(-1)
           const isActive = currentAgentId === agent.id
-          const heartbeatOn = agent.heartbeatEnabled === true && (agent.tools?.length ?? 0) > 0
+          const heartbeatOn = agent.heartbeatEnabled === true && (agent.plugins?.length ?? 0) > 0
           const recentlyActive = (threadSession?.lastActiveAt ?? 0) > Date.now() - 30 * 60 * 1000
           const isWorking = runningAgentIds.has(agent.id) || (threadSession?.active ?? false) || heartbeatOn || recentlyActive || chatroomActiveAgentIds.has(agent.id)
           const isTyping = streamingSessionId === agent.threadSessionId

package/src/components/agents/agent-list.tsx

@@ -2,7 +2,6 @@
 
 import { useEffect, useLayoutEffect, useMemo, useRef, useState, useCallback } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
-import { api } from '@/lib/api-client'
 import { AgentCard } from './agent-card'
 import { TrashList } from './trash-list'
 import { useApprovalStore } from '@/stores/use-approval-store'
@@ -17,8 +16,6 @@ export function AgentList({ inSidebar }: Props) {
   const agents = useAppStore((s) => s.agents)
   const loadAgents = useAppStore((s) => s.loadAgents)
   const sessions = useAppStore((s) => s.sessions)
-  const currentUser = useAppStore((s) => s.currentUser)
-  const loadSessions = useAppStore((s) => s.loadSessions)
   const setAgentSheetOpen = useAppStore((s) => s.setAgentSheetOpen)
   const activeProjectFilter = useAppStore((s) => s.activeProjectFilter)
   const showTrash = useAppStore((s) => s.showTrash)
@@ -37,19 +34,17 @@ export function AgentList({ inSidebar }: Props) {
   const currentSession = currentSessionId ? sessions[currentSessionId] : null
   const selectedAgentId = currentSession?.agentId
 
-  const mainSession = useMemo(() =>
-    Object.values(sessions).find((s: any) => s.name === '__main__' && s.user === currentUser),
-    [sessions, currentUser]
-  )
-  const defaultAgentId = mainSession?.agentId || 'default'
+  const appSettings = useAppStore((s) => s.appSettings)
+  const updateSettings = useAppStore((s) => s.updateSettings)
+  const defaultAgentId = (appSettings.defaultAgentId && agents[appSettings.defaultAgentId])
+    ? appSettings.defaultAgentId
+    : Object.values(agents)[0]?.id || 'default'
 
   const handleSetDefault = useCallback(async (agentId: string) => {
-    if (!mainSession) return
     try {
-      await api('PUT', `/sessions/${mainSession.id}`, { agentId })
-      await loadSessions()
+      await updateSettings({ defaultAgentId: agentId })
     } catch { /* ignore */ }
-  }, [mainSession, loadSessions])
+  }, [updateSettings])
 
   const [loaded, setLoaded] = useState(Object.keys(agents).length > 0)
   useEffect(() => { loadAgents().then(() => setLoaded(true)) }, [])
@@ -75,7 +70,7 @@ export function AgentList({ inSidebar }: Props) {
     const ids = new Set<string>()
     const recentThreshold = now - 30 * 60 * 1000
     for (const a of Object.values(agents)) {
-      if (a.heartbeatEnabled === true && (a.tools?.length ?? 0) > 0) { ids.add(a.id); continue }
+      if (a.heartbeatEnabled === true && (a.plugins?.length ?? 0) > 0) { ids.add(a.id); continue }
       // Check if any session for this agent was active in the last 30 minutes
       for (const s of Object.values(sessions)) {
         if (s.agentId === a.id && (s.lastActiveAt ?? 0) > recentThreshold) { ids.add(a.id); break }

package/src/components/agents/agent-sheet.tsx

@@ -183,7 +183,7 @@ export function AgentSheet() {
         setApiEndpoint(editing.apiEndpoint || null)
         setIsOrchestrator(editing.isOrchestrator || false)
         setAgentAgentIds(editing.subAgentIds || [])
-        setTools(editing.tools || [])
+        setTools(editing.plugins || [])
         setSkills(editing.skills || [])
         setSkillIds(editing.skillIds || [])
         setMcpServerIds(editing.mcpServerIds || [])
@@ -782,7 +782,7 @@ export function AgentSheet() {
             </div>
           </div>
         )}
-        <p className="text-[11px] text-text-3/70 mt-1.5">Periodic check-in runs on idle sessions using this agent. Processes pending events and monitors status.</p>
+        <p className="text-[11px] text-text-3/70 mt-1.5">Periodic check-in runs on idle chats using this agent. Processes pending events and monitors status.</p>
       </div>
 
       {/* Spend Limits */}

package/src/components/agents/cron-job-form.tsx

@@ -94,10 +94,10 @@ export function CronJobForm({ agentId, onSaved, onCancel }: Props) {
           </select>
         </div>
         <div>
-          <label className="block text-[11px] font-600 uppercase tracking-wider text-text-3/50 mb-1">Session</label>
+          <label className="block text-[11px] font-600 uppercase tracking-wider text-text-3/50 mb-1">Chat Target</label>
           <select value={sessionTarget} onChange={(e) => setSessionTarget(e.target.value as typeof sessionTarget)} className={inputClass}>
-            <option value="main">Main session</option>
-            <option value="isolated">Isolated session</option>
+            <option value="main">Main chat</option>
+            <option value="isolated">Isolated chat</option>
           </select>
         </div>
       </div>

package/src/components/agents/inspector-panel.tsx

@@ -171,11 +171,11 @@ function OverviewTab({ agent, onEditAgent, onClearHistory, onDeleteAgent, onDele
           </div>
         </div>
       )}
-      {agent.tools && agent.tools.length > 0 && (
+      {agent.plugins && agent.plugins.length > 0 && (
         <div>
           <label className="block text-[11px] font-600 uppercase tracking-wider text-text-3/50 mb-1">Plugins</label>
           <div className="flex flex-wrap gap-1">
-            {agent.tools.map((tool) => (
+            {agent.plugins.map((tool) => (
               <span key={tool} className="px-2 py-0.5 rounded-[6px] text-[11px] font-600 bg-sky-400/[0.08] text-sky-400/70">
                 {tool}
               </span>