@swarmclawai/swarmclaw 0.7.1 → 0.7.2

package/src/lib/server/tool-capability-policy.ts

@@ -8,13 +8,16 @@ export interface CapabilityPolicyBlock {
   source: 'safety' | 'policy'
 }
 
-export interface SessionToolPolicyDecision {
+export interface PluginPolicyDecision {
   mode: CapabilityPolicyMode
-  requestedTools: string[]
-  enabledTools: string[]
-  blockedTools: CapabilityPolicyBlock[]
+  requestedPlugins: string[]
+  enabledPlugins: string[]
+  blockedPlugins: CapabilityPolicyBlock[]
 }
 
+/** @deprecated Use PluginPolicyDecision */
+export type SessionToolPolicyDecision = PluginPolicyDecision
+
 type CapabilityCategory =
   | 'filesystem'
   | 'execution'
@@ -47,10 +50,11 @@ const TOOL_DESCRIPTORS: Record<string, ToolDescriptor> = {
   web_search: { categories: ['network'], concreteTools: ['web_search'] },
   web_fetch: { categories: ['network'], concreteTools: ['web_fetch'] },
   browser: { categories: ['browser', 'network'], concreteTools: ['browser', 'openclaw_browser'] },
-  delegate: { categories: ['delegation', 'execution'], concreteTools: ['delegate', 'delegate_to_claude_code', 'delegate_to_codex_cli', 'delegate_to_opencode_cli'] },
+  delegate: { categories: ['delegation', 'execution'], concreteTools: ['delegate', 'delegate_to_claude_code', 'delegate_to_codex_cli', 'delegate_to_opencode_cli', 'delegate_to_gemini_cli'] },
   claude_code: { categories: ['delegation', 'execution'], concreteTools: ['delegate_to_claude_code'] },
   codex_cli: { categories: ['delegation', 'execution'], concreteTools: ['delegate_to_codex_cli'] },
   opencode_cli: { categories: ['delegation', 'execution'], concreteTools: ['delegate_to_opencode_cli'] },
+  gemini_cli: { categories: ['delegation', 'execution'], concreteTools: ['delegate_to_gemini_cli'] },
   memory: { categories: ['memory'], concreteTools: ['memory', 'memory_tool', 'context_status', 'context_summarize'] },
   sandbox: { categories: ['execution', 'filesystem'], concreteTools: ['sandbox', 'sandbox_exec', 'sandbox_list_runtimes', 'openclaw_sandbox'] },
   git: { categories: ['execution', 'filesystem'], concreteTools: ['git'] },
@@ -144,6 +148,7 @@ function safetyMatchesTool(safetyBlocked: Set<string>, toolName: string, descrip
   if (toolName === 'claude_code' && safetyBlocked.has('delegate_to_claude_code')) return true
   if (toolName === 'codex_cli' && safetyBlocked.has('delegate_to_codex_cli')) return true
   if (toolName === 'opencode_cli' && safetyBlocked.has('delegate_to_opencode_cli')) return true
+  if (toolName === 'gemini_cli' && safetyBlocked.has('delegate_to_gemini_cli')) return true
   return false
 }
 
@@ -196,51 +201,51 @@ export function resolveSessionToolPolicy(
     blockedCategories,
   } = parsePolicyConfig(normalizedSettings)
 
-  const requestedTools = Array.isArray(sessionTools)
-    ? Array.from(new Set(sessionTools.map((tool) => normalizeName(tool)).filter(Boolean)))
+  const requestedPlugins = Array.isArray(sessionTools)
+    ? Array.from(new Set(sessionTools.map((id) => normalizeName(id)).filter(Boolean)))
     : []
 
-  const enabledTools: string[] = []
-  const blockedTools: CapabilityPolicyBlock[] = []
+  const enabledPlugins: string[] = []
+  const blockedPlugins: CapabilityPolicyBlock[] = []
 
-  for (const toolName of requestedTools) {
-    const descriptor = TOOL_DESCRIPTORS[toolName]
+  for (const pluginName of requestedPlugins) {
+    const descriptor = TOOL_DESCRIPTORS[pluginName]
 
-    if (safetyMatchesTool(safetyBlocked, toolName, descriptor)) {
-      blockedTools.push({ tool: toolName, reason: 'blocked by safety policy', source: 'safety' })
+    if (safetyMatchesTool(safetyBlocked, pluginName, descriptor)) {
+      blockedPlugins.push({ tool: pluginName, reason: 'blocked by safety policy', source: 'safety' })
       continue
     }
 
-    if (policyAllowedNames.has(toolName)) {
-      enabledTools.push(toolName)
+    if (policyAllowedNames.has(pluginName)) {
+      enabledPlugins.push(pluginName)
       continue
     }
 
-    if (policyMatchesTool(policyBlockedNames, toolName, descriptor)) {
-      blockedTools.push({ tool: toolName, reason: 'blocked by explicit policy rule', source: 'policy' })
+    if (policyMatchesTool(policyBlockedNames, pluginName, descriptor)) {
+      blockedPlugins.push({ tool: pluginName, reason: 'blocked by explicit policy rule', source: 'policy' })
       continue
     }
 
     const categoryReason = categoryBlockReason(blockedCategories, descriptor)
     if (categoryReason) {
-      blockedTools.push({ tool: toolName, reason: categoryReason, source: 'policy' })
+      blockedPlugins.push({ tool: pluginName, reason: categoryReason, source: 'policy' })
       continue
     }
 
-    const modeReason = modeBlocksTool(mode, toolName, descriptor)
+    const modeReason = modeBlocksTool(mode, pluginName, descriptor)
     if (modeReason) {
-      blockedTools.push({ tool: toolName, reason: modeReason, source: 'policy' })
+      blockedPlugins.push({ tool: pluginName, reason: modeReason, source: 'policy' })
       continue
     }
 
-    enabledTools.push(toolName)
+    enabledPlugins.push(pluginName)
   }
 
   return {
     mode,
-    requestedTools,
-    enabledTools,
-    blockedTools,
+    requestedPlugins,
+    enabledPlugins,
+    blockedPlugins,
   }
 }
 
@@ -270,11 +275,11 @@ export function resolveConcreteToolPolicyBlock(
   }
 
   if (mappedTool) {
-    const blockedRoot = decision.blockedTools.find((entry) => entry.tool === mappedTool)
+    const blockedRoot = decision.blockedPlugins.find((entry) => entry.tool === mappedTool)
     if (blockedRoot) return blockedRoot.reason
 
-    const enabledRoot = decision.enabledTools.includes(mappedTool)
-    if (!enabledRoot) return `tool family "${mappedTool}" is not enabled for this session`
+    const enabledRoot = decision.enabledPlugins.includes(mappedTool)
+    if (!enabledRoot) return `plugin family "${mappedTool}" is not enabled for this chat`
   }
 
   return null

package/src/lib/tool-definitions.ts

@@ -25,6 +25,10 @@ export const AVAILABLE_TOOLS: ToolDefinition[] = [
   { id: 'monitor', label: 'Monitor', description: 'System observability: check resource usage, watch logs, and ping endpoints' },
   { id: 'plugin_creator', label: 'Plugin Creator', description: 'Design, write, and test custom SwarmClaw plugins dynamically' },
   { id: 'sample_ui', label: 'Sample UI', description: 'Demonstration of dynamic UI injection into Sidebar and Chat Header' },
+  { id: 'image_gen', label: 'Image Generation', description: 'Generate images from text prompts using OpenAI, Stability AI, Replicate, fal.ai, and more' },
+  { id: 'email', label: 'Email', description: 'Send emails via SMTP with plain text and HTML support' },
+  { id: 'calendar', label: 'Calendar', description: 'Manage Google Calendar or Outlook events — list, create, update, delete' },
+  { id: 'replicate', label: 'Replicate', description: 'Run any AI model on Replicate — image generation, LLMs, audio, video, and more' },
 ]
 
 /**

package/src/lib/validation/schemas.ts

@@ -10,7 +10,9 @@ export const AgentCreateSchema = z.object({
   apiEndpoint: z.string().nullable().optional().default(null),
   isOrchestrator: z.boolean().optional().default(false),
   subAgentIds: z.array(z.string()).optional().default([]),
-  tools: z.array(z.string()).optional().default([]),
+  plugins: z.array(z.string()).optional().default([]),
+  /** @deprecated Use plugins */
+  tools: z.array(z.string()).optional(),
   capabilities: z.array(z.string()).optional().default([]),
   thinkingLevel: z.string().optional(),
   soul: z.string().optional(),

package/src/stores/use-app-store.ts

@@ -2,7 +2,7 @@
 
 import { create } from 'zustand'
 import type { Sessions, Session, NetworkInfo, Directory, ProviderInfo, Credentials, Agent, Schedule, AppView, BoardTask, AppSettings, OrchestratorSecret, ProviderConfig, Skill, Connector, Webhook, McpServerConfig, PluginMeta, Project, FleetFilter, ActivityEntry, AppNotification, ApprovalRequest } from '../types'
-import { fetchSessions, fetchDirs, fetchProviders, fetchCredentials } from '../lib/sessions'
+import { fetchChats, fetchDirs, fetchProviders, fetchCredentials } from '../lib/chats'
 import { fetchAgents } from '../lib/agents'
 import { fetchSchedules } from '../lib/schedules'
 import { fetchTasks } from '../lib/tasks'
@@ -235,7 +235,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   currentSessionId: null,
   loadSessions: async () => {
     try {
-      const sessions = await fetchSessions()
+      const sessions = await fetchChats()
       set({ sessions })
     } catch {
       // ignore
@@ -249,7 +249,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   },
   clearSessions: async (ids) => {
     if (!ids.length) return
-    await api('DELETE', '/sessions', { ids })
+    await api('DELETE', '/chats', { ids })
     const sessions = { ...get().sessions }
     for (const id of ids) delete sessions[id]
     set({ sessions, currentSessionId: ids.includes(get().currentSessionId!) ? null : get().currentSessionId })
@@ -260,7 +260,7 @@ export const useAppStore = create<AppState>((set, get) => ({
       sessions[id] = { ...sessions[id], pinned: !sessions[id].pinned }
       set({ sessions })
       // Persist to server
-      void api('PUT', `/sessions/${id}`, { pinned: sessions[id].pinned })
+      void api('PUT', `/chats/${id}`, { pinned: sessions[id].pinned })
     }
   },
   updateSessionInStore: (session) => {
@@ -268,7 +268,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   },
   forkSession: async (sessionId, messageIndex) => {
     try {
-      const forked = await api<Session>('POST', `/sessions/${sessionId}/fork`, { messageIndex })
+      const forked = await api<Session>('POST', `/chats/${sessionId}/fork`, { messageIndex })
       if (!forked?.id) return null
       await get().loadSessions()
       set({ currentSessionId: forked.id })

package/src/stores/use-chat-store.ts

@@ -407,7 +407,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (!sessionId) return
     try {
       const key = getStoredAccessKey()
-      const res = await fetch(`/api/sessions/${sessionId}/edit-resend`, {
+      const res = await fetch(`/api/chats/${sessionId}/edit-resend`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -417,7 +417,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       })
       if (!res.ok) return
       // Reload messages from server (truncated)
-      const msgsRes = await fetch(`/api/sessions/${sessionId}/messages`, {
+      const msgsRes = await fetch(`/api/chats/${sessionId}/messages`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (msgsRes.ok) {
@@ -437,7 +437,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (!sessionId) return
     try {
       const key = getStoredAccessKey()
-      const res = await fetch(`/api/sessions/${sessionId}/retry`, {
+      const res = await fetch(`/api/chats/${sessionId}/retry`, {
         method: 'POST',
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
@@ -445,7 +445,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const { message, imagePath } = await res.json()
       if (!message) return
       // Reload messages from server (without the popped ones)
-      const msgsRes = await fetch(`/api/sessions/${sessionId}/messages`, {
+      const msgsRes = await fetch(`/api/chats/${sessionId}/messages`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (msgsRes.ok) {
@@ -546,7 +546,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     set((s) => ({ messages: [...s.messages, marker] }))
     try {
       const key = getStoredAccessKey()
-      await fetch(`/api/sessions/${sessionId}/messages`, {
+      await fetch(`/api/chats/${sessionId}/messages`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', ...(key ? { 'X-Access-Key': key } : {}) },
         body: JSON.stringify({ kind: 'context-clear' }),
@@ -569,7 +569,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const key = getStoredAccessKey()
       // Find the earliest message's original index (startIndex tracked on initial load)
       const currentStartIndex = totalMessages - messages.length
-      const res = await fetch(`/api/sessions/${sessionId}/messages?limit=100&before=${currentStartIndex}`, {
+      const res = await fetch(`/api/chats/${sessionId}/messages?limit=100&before=${currentStartIndex}`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (res.ok) {
@@ -593,7 +593,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (sessionId) {
       try {
         const key = getStoredAccessKey()
-        await fetch(`/api/sessions/${sessionId}/stop`, {
+        await fetch(`/api/chats/${sessionId}/stop`, {
           method: 'POST',
           headers: key ? { 'X-Access-Key': key } : undefined,
         })

package/src/types/index.ts

@@ -63,15 +63,17 @@ export interface Session {
     claudeCode?: string | null
     codex?: string | null
     opencode?: string | null
+    gemini?: string | null
   }
   messages: Message[]
   createdAt: number
   lastActiveAt: number
   active?: boolean
-  mainSession?: boolean
   sessionType?: SessionType
   agentId?: string | null
   parentSessionId?: string | null
+  plugins?: string[]
+  /** @deprecated Use `plugins` instead. Kept for backward compat with stored data. */
   tools?: string[]
   heartbeatEnabled?: boolean | null
   heartbeatIntervalSec?: number | null
@@ -167,6 +169,18 @@ export interface ApprovalRequest {
 
 export type Approvals = Record<string, ApprovalRequest>
 
+export interface PluginInvocationRecord {
+  pluginId: string
+  toolName: string
+  inputTokens: number
+  outputTokens: number
+}
+
+export interface PluginDefinitionCost {
+  pluginId: string
+  estimatedTokens: number
+}
+
 export interface UsageRecord {
   sessionId: string
   messageIndex: number
@@ -178,6 +192,8 @@ export interface UsageRecord {
   estimatedCost: number
   timestamp: number
   durationMs?: number
+  pluginDefinitionCosts?: PluginDefinitionCost[]
+  pluginInvocations?: PluginInvocationRecord[]
 }
 
 // --- Plugin System ---
@@ -186,9 +202,12 @@ export interface PluginHooks {
   beforeAgentStart?: (ctx: { session: Session; message: string }) => Promise<void> | void
   afterAgentComplete?: (ctx: { session: Session; response: string }) => Promise<void> | void
   beforeToolExec?: (ctx: { toolName: string; input: Record<string, unknown> | null }) => Promise<Record<string, unknown> | void> | Record<string, unknown> | void
-  afterToolExec?: (ctx: { toolName: string; input: Record<string, unknown> | null; output: string }) => Promise<void> | void
+  afterToolExec?: (ctx: { session: Session; toolName: string; input: Record<string, unknown> | null; output: string }) => Promise<void> | void
   onMessage?: (ctx: { session: Session; message: Message }) => Promise<void> | void
 
+  // Post-turn hook — fires after a full chat exchange (user message → agent response)
+  afterChatTurn?: (ctx: { session: Session; message: string; response: string; source: string; internal: boolean }) => Promise<void> | void
+
   // Orchestration & Swarm Hooks
   onTaskComplete?: (ctx: { taskId: string; result: unknown }) => Promise<void> | void
   onAgentDelegation?: (ctx: { sourceAgentId: string; targetAgentId: string; task: string }) => Promise<void> | void
@@ -196,6 +215,15 @@ export interface PluginHooks {
   // Chat Middleware (Transform messages)
   transformInboundMessage?: (ctx: { session: Session; text: string }) => Promise<string> | string
   transformOutboundMessage?: (ctx: { session: Session; text: string }) => Promise<string> | string
+
+  // Context injection — return a markdown string to inject into the agent's state modifier, or null/undefined to skip
+  getAgentContext?: (ctx: { session: Session; enabledPlugins: string[]; message: string; history: Message[] }) => Promise<string | null | undefined> | string | null | undefined
+
+  // Self-description — returns a capability line for the system prompt (e.g., "I can remember things across conversations")
+  getCapabilityDescription?: () => string | null | undefined
+
+  // Operating guidance — returns operational hints for the agent when this plugin is active
+  getOperatingGuidance?: () => string | string[] | null | undefined
 }
 
 export interface PluginToolDef {
@@ -205,6 +233,17 @@ export interface PluginToolDef {
   execute: (args: Record<string, unknown>, ctx: { session: Session; message: string }) => Promise<string | object> | string | object
 }
 
+export interface PluginSettingsField {
+  key: string
+  label: string
+  type: 'text' | 'number' | 'boolean' | 'select' | 'secret'
+  placeholder?: string
+  help?: string
+  options?: Array<{ value: string; label: string }>
+  defaultValue?: string | number | boolean
+  required?: boolean
+}
+
 export interface PluginUIExtension {
   sidebarItems?: Array<{
     id: string
@@ -226,6 +265,22 @@ export interface PluginUIExtension {
     action: 'message' | 'link' | 'tool'
     value: string
   }>
+  /** Settings fields declared by the plugin, rendered in the plugin settings panel */
+  settingsFields?: PluginSettingsField[]
+  /** Chat panels the plugin provides (e.g., browser view, terminal) */
+  chatPanels?: Array<{
+    id: string
+    label: string
+    icon?: string
+    /** WS topic to subscribe to for updates (e.g., 'browser:{sessionId}') */
+    wsTopic?: string
+  }>
+  /** Badges to show on agent cards when this plugin is enabled */
+  agentBadges?: Array<{
+    id: string
+    label: string
+    icon?: string
+  }>
 }
 
 export interface PluginProviderExtension {
@@ -252,6 +307,7 @@ export interface Plugin {
   name: string
   version?: string
   description?: string
+  enabledByDefault?: boolean
   hooks?: PluginHooks
   tools?: PluginToolDef[]
   ui?: PluginUIExtension
@@ -279,6 +335,7 @@ export interface PluginMeta {
   providerCount?: number
   connectorCount?: number
   createdByAgentId?: string | null
+  settingsFields?: PluginSettingsField[]
 }
 export interface MarketplacePlugin {
   id: string
@@ -350,7 +407,9 @@ export interface Agent {
   apiEndpoint?: string | null
   isOrchestrator?: boolean
   subAgentIds?: string[]
-  tools?: string[]              // e.g. ['browser'] — available tool integrations
+  plugins?: string[]             // e.g. ['browser', 'memory'] — enabled plugin IDs
+  /** @deprecated Use `plugins` instead. Kept for backward compat with stored data. */
+  tools?: string[]
   skills?: string[]             // e.g. ['frontend-design'] — Claude Code skills to use
   skillIds?: string[]           // IDs of uploaded skills from the Skills manager
   mcpServerIds?: string[]       // IDs of configured MCP servers to inject tools from
@@ -784,6 +843,8 @@ export interface AppSettings {
   taskQualityGateRequireReport?: boolean
   // Integrity monitor
   integrityMonitorEnabled?: boolean
+  // Per-plugin settings (keyed by pluginId)
+  pluginSettings?: Record<string, Record<string, unknown>>
 }
 
 // --- Orchestrator Secrets ---
@@ -977,6 +1038,7 @@ export interface BoardTask {
   claudeResumeId?: string | null
   codexResumeId?: string | null
   opencodeResumeId?: string | null
+  geminiResumeId?: string | null
   checkpoint?: {
     lastRunId?: string | null
     lastSessionId?: string | null