@swarmclawai/swarmclaw 1.5.35 → 1.5.37

package/src/lib/providers/droid-cli.ts

@@ -0,0 +1,220 @@
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+import { spawn } from 'child_process'
+import type { StreamChatOptions } from './index'
+import { log } from '../server/logger'
+import { loadRuntimeSettings } from '@/lib/server/runtime/runtime-settings'
+import { resolveCliBinary, buildCliEnv, probeCliAuth, attachAbortHandler, symlinkConfigFiles, isStderrNoise } from './cli-utils'
+
+/**
+ * Factory Droid CLI provider — spawns `droid exec <message> --output-format stream-json`.
+ * Tracks `session.droidSessionId` from streamed events to support multi-turn continuity.
+ */
+export function streamDroidCliChat({ session, message, imagePath, systemPrompt, write, active, signal }: StreamChatOptions): Promise<string> {
+  const processTimeoutMs = loadRuntimeSettings().cliProcessTimeoutMs
+  const binary = resolveCliBinary('droid')
+  if (!binary) {
+    const msg = 'Factory Droid CLI not found. Install it (brew install --cask droid, npm i -g droid, or https://docs.factory.ai/cli/getting-started/quickstart) and ensure it is on your PATH.'
+    write(`data: ${JSON.stringify({ t: 'err', text: msg })}\n\n`)
+    return Promise.resolve('')
+  }
+
+  const env = buildCliEnv()
+
+  if (session.apiKey) {
+    env.FACTORY_API_KEY = session.apiKey
+  }
+
+  if (!session.apiKey) {
+    const auth = probeCliAuth(binary, 'droid', env, session.cwd)
+    if (!auth.authenticated) {
+      log.error('droid-cli', auth.errorMessage || 'Auth failed')
+      write(`data: ${JSON.stringify({ t: 'err', text: auth.errorMessage || 'Factory Droid CLI is not authenticated.' })}\n\n`)
+      return Promise.resolve('')
+    }
+  }
+
+  const promptParts: string[] = []
+  if (imagePath) {
+    promptParts.push(`[The user has shared an image at: ${imagePath}]`)
+  }
+  promptParts.push(message)
+  const prompt = promptParts.join('\n\n')
+
+  const args = ['exec', prompt, '--output-format', 'stream-json']
+  if (session.droidSessionId) args.push('-s', session.droidSessionId)
+  if (session.model) args.push('-m', session.model)
+
+  let tempFactoryHome: string | null = null
+  if (systemPrompt && !session.droidSessionId) {
+    const realFactoryHome = process.env.FACTORY_HOME || path.join(os.homedir(), '.factory')
+    tempFactoryHome = path.join(os.tmpdir(), `swarmclaw-droid-${session.id}`)
+    fs.mkdirSync(tempFactoryHome, { recursive: true })
+    symlinkConfigFiles(realFactoryHome, tempFactoryHome)
+    fs.writeFileSync(path.join(tempFactoryHome, 'AGENTS.override.md'), systemPrompt)
+    env.FACTORY_HOME = tempFactoryHome
+  }
+
+  log.info('droid-cli', `Spawning: ${binary}`, {
+    args: args.map((a) => a.length > 100 ? a.slice(0, 100) + '...' : a),
+    cwd: session.cwd,
+    promptLen: prompt.length,
+    hasSystemPrompt: !!systemPrompt,
+    resumeSessionId: session.droidSessionId || null,
+  })
+
+  const proc = spawn(binary, args, {
+    cwd: session.cwd,
+    env,
+    stdio: ['ignore', 'pipe', 'pipe'],
+    timeout: processTimeoutMs,
+  })
+
+  log.info('droid-cli', `Process spawned: pid=${proc.pid}`)
+  active.set(session.id, proc)
+  attachAbortHandler(proc, signal)
+
+  let fullResponse = ''
+  let buf = ''
+  let eventCount = 0
+  let stderrText = ''
+
+  proc.stdout!.on('data', (chunk: Buffer) => {
+    const raw = chunk.toString()
+    buf += raw
+
+    if (eventCount === 0) {
+      log.debug('droid-cli', `First stdout chunk (${raw.length} bytes)`, raw.slice(0, 500))
+    }
+
+    const lines = buf.split('\n')
+    buf = lines.pop()!
+
+    for (const line of lines) {
+      if (!line.trim()) continue
+      try {
+        const ev = JSON.parse(line) as Record<string, unknown>
+        eventCount++
+
+        const data = ev.data as Record<string, unknown> | undefined
+
+        if (typeof ev.session_id === 'string') {
+          session.droidSessionId = ev.session_id
+        } else if (typeof ev.sessionId === 'string') {
+          session.droidSessionId = ev.sessionId
+        }
+
+        if (ev.type === 'assistant.message_delta' && typeof data?.deltaContent === 'string') {
+          fullResponse += data.deltaContent
+          write(`data: ${JSON.stringify({ t: 'd', text: data.deltaContent })}\n\n`)
+        }
+
+        else if (ev.type === 'assistant.message' && typeof data?.content === 'string') {
+          if (!fullResponse) {
+            fullResponse = data.content
+            write(`data: ${JSON.stringify({ t: 'r', text: data.content })}\n\n`)
+          }
+          log.debug('droid-cli', `Assistant message (${data.content.length} chars)`)
+        }
+
+        else if (ev.type === 'content_block_delta') {
+          const delta = ev.delta as Record<string, unknown> | undefined
+          if (typeof delta?.text === 'string') {
+            fullResponse += delta.text
+            write(`data: ${JSON.stringify({ t: 'd', text: delta.text })}\n\n`)
+          }
+        }
+
+        else if (ev.type === 'agent_message_chunk' && typeof ev.text === 'string') {
+          fullResponse += ev.text
+          write(`data: ${JSON.stringify({ t: 'd', text: ev.text })}\n\n`)
+        }
+
+        else if (ev.type === 'message' && ev.role === 'assistant' && typeof ev.content === 'string') {
+          fullResponse += ev.content
+          write(`data: ${JSON.stringify({ t: 'd', text: ev.content })}\n\n`)
+        }
+
+        else if (ev.type === 'item.completed' && (ev.item as Record<string, unknown>)?.type === 'agent_message') {
+          const item = ev.item as Record<string, unknown>
+          if (typeof item.text === 'string') {
+            fullResponse = item.text
+            write(`data: ${JSON.stringify({ t: 'r', text: item.text })}\n\n`)
+            log.debug('droid-cli', `Agent message (${item.text.length} chars)`)
+          }
+        }
+
+        else if (ev.type === 'result' && typeof ev.result === 'string') {
+          fullResponse = ev.result
+          write(`data: ${JSON.stringify({ t: 'r', text: ev.result })}\n\n`)
+          log.debug('droid-cli', `Result event (${ev.result.length} chars)`)
+        }
+
+        else if (ev.type === 'result' && ev.status === 'error') {
+          const errMsg = typeof ev.error === 'string' ? ev.error : 'Droid error'
+          write(`data: ${JSON.stringify({ t: 'err', text: errMsg })}\n\n`)
+          log.warn('droid-cli', `Error result: ${errMsg}`)
+        }
+
+        else if (ev.type === 'error') {
+          const errMsg = typeof ev.message === 'string'
+            ? ev.message
+            : typeof ev.error === 'string'
+              ? ev.error
+              : 'Unknown Droid error'
+          write(`data: ${JSON.stringify({ t: 'err', text: errMsg })}\n\n`)
+          log.warn('droid-cli', `Event error: ${errMsg}`)
+        }
+
+        else if (eventCount <= 10) {
+          log.debug('droid-cli', `Event: ${String(ev.type)}`)
+        }
+      } catch {
+        if (line.trim()) {
+          log.debug('droid-cli', `Non-JSON stdout line`, line.slice(0, 300))
+          fullResponse += line + '\n'
+          write(`data: ${JSON.stringify({ t: 'd', text: line + '\n' })}\n\n`)
+        }
+      }
+    }
+  })
+
+  proc.stderr!.on('data', (chunk: Buffer) => {
+    const text = chunk.toString()
+    stderrText += text
+    if (stderrText.length > 16_000) stderrText = stderrText.slice(-16_000)
+    if (isStderrNoise(text)) {
+      log.debug('droid-cli', `stderr noise [${session.id}]`, text.slice(0, 500))
+    } else {
+      log.warn('droid-cli', `stderr [${session.id}]`, text.slice(0, 500))
+    }
+  })
+
+  return new Promise((resolve) => {
+    proc.on('close', (code, sig) => {
+      log.info('droid-cli', `Process closed: code=${code} signal=${sig} events=${eventCount} response=${fullResponse.length}chars`)
+      active.delete(session.id)
+      if (tempFactoryHome) {
+        try { fs.rmSync(tempFactoryHome, { recursive: true }) } catch { /* ignore */ }
+      }
+      if ((code ?? 0) !== 0 && !fullResponse.trim()) {
+        const msg = stderrText.trim()
+          ? `Factory Droid CLI exited with code ${code ?? 'unknown'}${sig ? ` (${sig})` : ''}: ${stderrText.trim().slice(0, 1200)}`
+          : `Factory Droid CLI exited with code ${code ?? 'unknown'}${sig ? ` (${sig})` : ''} and returned no output.`
+        write(`data: ${JSON.stringify({ t: 'err', text: msg })}\n\n`)
+      }
+      resolve(fullResponse)
+    })
+
+    proc.on('error', (e) => {
+      log.error('droid-cli', `Process error: ${e.message}`)
+      active.delete(session.id)
+      if (tempFactoryHome) {
+        try { fs.rmSync(tempFactoryHome, { recursive: true }) } catch { /* ignore */ }
+      }
+      write(`data: ${JSON.stringify({ t: 'err', text: e.message })}\n\n`)
+      resolve(fullResponse)
+    })
+  })
+}

package/src/lib/providers/index.ts

@@ -3,6 +3,7 @@ import { streamCodexCliChat } from './codex-cli'
 import { streamOpenCodeCliChat } from './opencode-cli'
 import { streamGeminiCliChat } from './gemini-cli'
 import { streamCopilotCliChat } from './copilot-cli'
+import { streamDroidCliChat } from './droid-cli'
 import { streamCursorCliChat } from './cursor-cli'
 import { streamQwenCodeCliChat } from './qwen-code-cli'
 import { streamGooseChat } from './goose'
@@ -151,6 +152,15 @@ export const PROVIDERS: Record<string, BuiltinProviderConfig> = {
     requiresEndpoint: false,
     handler: { streamChat: streamCopilotCliChat },
   },
+  'droid-cli': {
+    id: 'droid-cli',
+    name: 'Factory Droid CLI',
+    models: ['default'],
+    requiresApiKey: false,
+    optionalApiKey: true,
+    requiresEndpoint: false,
+    handler: { streamChat: streamDroidCliChat },
+  },
   'cursor-cli': {
     id: 'cursor-cli',
     name: 'Cursor Agent CLI',
@@ -383,7 +393,7 @@ export function getProviderList(): ProviderInfo[] {
         ...info,
         models: overrides[info.id] || info.models,
         defaultModels: info.models,
-        supportsModelDiscovery: !['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'fireworks'].includes(info.id),
+        supportsModelDiscovery: !['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'fireworks'].includes(info.id),
       }
     })
   

package/src/lib/server/agents/agent-availability.test.ts

@@ -4,7 +4,7 @@ import type { Agent, ProviderType } from '@/types'
 import { isWorkerOnlyAgent, buildWorkerOnlyAgentMessage } from './agent-availability'
 
 describe('isWorkerOnlyAgent', () => {
-  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'openclaw'] satisfies ProviderType[]
+  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'openclaw'] satisfies ProviderType[]
   const NON_CLI_PROVIDERS = ['openai', 'anthropic', 'google', 'deepseek', 'groq', 'together'] satisfies ProviderType[]
 
   function withProvider(provider: unknown): Pick<Agent, 'provider'> {

package/src/lib/server/agents/agent-thread-session.ts

@@ -45,6 +45,7 @@ function buildThreadSession(agent: Agent, sessionId: string, user: string, creat
     opencodeSessionId: existing?.opencodeSessionId || null,
     geminiSessionId: existing?.geminiSessionId || null,
     copilotSessionId: existing?.copilotSessionId || null,
+    droidSessionId: existing?.droidSessionId || null,
     cursorSessionId: existing?.cursorSessionId || null,
     qwenSessionId: existing?.qwenSessionId || null,
     acpSessionId: existing?.acpSessionId || null,

package/src/lib/server/agents/task-session.ts

@@ -42,6 +42,7 @@ export function createAgentTaskSession(
     opencodeSessionId: null,
     geminiSessionId: null,
     copilotSessionId: null,
+    droidSessionId: null,
     cursorSessionId: null,
     qwenSessionId: null,
     acpSessionId: null,
@@ -51,6 +52,7 @@ export function createAgentTaskSession(
       opencode: null,
       gemini: null,
       copilot: null,
+      droid: null,
       cursor: null,
       qwen: null,
     },

package/src/lib/server/capability-router.ts

@@ -19,7 +19,7 @@ export interface CapabilityRoutingDecision {
   primaryUrl?: string
 }
 
-type DelegateTool = 'delegate_to_claude_code' | 'delegate_to_codex_cli' | 'delegate_to_opencode_cli' | 'delegate_to_gemini_cli' | 'delegate_to_copilot_cli' | 'delegate_to_cursor_cli' | 'delegate_to_qwen_code_cli'
+type DelegateTool = 'delegate_to_claude_code' | 'delegate_to_codex_cli' | 'delegate_to_opencode_cli' | 'delegate_to_gemini_cli' | 'delegate_to_copilot_cli' | 'delegate_to_droid_cli' | 'delegate_to_cursor_cli' | 'delegate_to_qwen_code_cli'
 
 function findFirstUrl(text: string): string | undefined {
   const m = text.match(/https?:\/\/[^\s<>"')]+/i)
@@ -42,6 +42,7 @@ function normalizeDelegateOrder(value: unknown): DelegateTool[] {
     'delegate_to_opencode_cli',
     'delegate_to_gemini_cli',
     'delegate_to_copilot_cli',
+    'delegate_to_droid_cli',
     'delegate_to_cursor_cli',
     'delegate_to_qwen_code_cli',
   ]
@@ -54,6 +55,7 @@ function normalizeDelegateOrder(value: unknown): DelegateTool[] {
     else if (raw === 'opencode') mapped.push('delegate_to_opencode_cli')
     else if (raw === 'gemini') mapped.push('delegate_to_gemini_cli')
     else if (raw === 'copilot') mapped.push('delegate_to_copilot_cli')
+    else if (raw === 'droid') mapped.push('delegate_to_droid_cli')
     else if (raw === 'cursor') mapped.push('delegate_to_cursor_cli')
     else if (raw === 'qwen') mapped.push('delegate_to_qwen_code_cli')
   }

package/src/lib/server/chat-execution/chat-execution-utils.ts

@@ -31,6 +31,7 @@ export type DelegateTool =
   | 'delegate_to_opencode_cli'
   | 'delegate_to_gemini_cli'
   | 'delegate_to_copilot_cli'
+  | 'delegate_to_droid_cli'
   | 'delegate_to_cursor_cli'
   | 'delegate_to_qwen_code_cli'
 
@@ -138,6 +139,12 @@ export function translateRequestedToolInvocation(
   if (requestedName === 'delegate_to_gemini_cli') {
     return { toolName: 'delegate', args: { ...rawArgs, backend: 'gemini' } }
   }
+  if (requestedName === 'delegate_to_copilot_cli') {
+    return { toolName: 'delegate', args: { ...rawArgs, backend: 'copilot' } }
+  }
+  if (requestedName === 'delegate_to_droid_cli') {
+    return { toolName: 'delegate', args: { ...rawArgs, backend: 'droid' } }
+  }
   if (requestedName === 'delegate_to_cursor_cli') {
     return { toolName: 'delegate', args: { ...rawArgs, backend: 'cursor' } }
   }
@@ -306,6 +313,8 @@ export function requestedToolNamesFromMessage(message: string): string[] {
     'delegate_to_codex_cli',
     'delegate_to_opencode_cli',
     'delegate_to_gemini_cli',
+    'delegate_to_copilot_cli',
+    'delegate_to_droid_cli',
     'delegate_to_cursor_cli',
     'delegate_to_qwen_code_cli',
     'connector_message_tool',
@@ -372,6 +381,8 @@ export function enabledDelegationTools(session: SessionWithTools): DelegateTool[
   if (hasToolEnabled(session, 'codex_cli')) tools.push('delegate_to_codex_cli')
   if (hasToolEnabled(session, 'opencode_cli')) tools.push('delegate_to_opencode_cli')
   if (hasToolEnabled(session, 'gemini_cli')) tools.push('delegate_to_gemini_cli')
+  if (hasToolEnabled(session, 'copilot_cli')) tools.push('delegate_to_copilot_cli')
+  if (hasToolEnabled(session, 'droid_cli')) tools.push('delegate_to_droid_cli')
   if (hasToolEnabled(session, 'cursor_cli')) tools.push('delegate_to_cursor_cli')
   if (hasToolEnabled(session, 'qwen_code_cli')) tools.push('delegate_to_qwen_code_cli')
   return tools

package/src/lib/server/chat-execution/chat-turn-finalization.ts

@@ -398,6 +398,7 @@ export async function finalizeChatTurn(params: {
     persistField('opencodeSessionId', session.opencodeSessionId)
     persistField('geminiSessionId', session.geminiSessionId)
     persistField('copilotSessionId', session.copilotSessionId)
+    persistField('droidSessionId', session.droidSessionId)
     persistField('cursorSessionId', session.cursorSessionId)
     persistField('qwenSessionId', session.qwenSessionId)
     persistField('acpSessionId', session.acpSessionId)
@@ -415,6 +416,7 @@ export async function finalizeChatTurn(params: {
         opencode: normalizeResumeId(sr.opencode ?? cr.opencode),
         gemini: normalizeResumeId(sr.gemini ?? cr.gemini),
         copilot: normalizeResumeId(sr.copilot ?? cr.copilot),
+        droid: normalizeResumeId(sr.droid ?? cr.droid),
         cursor: normalizeResumeId(sr.cursor ?? cr.cursor),
         qwen: normalizeResumeId(sr.qwen ?? cr.qwen),
       }

package/src/lib/server/chat-execution/chat-turn-tool-routing.ts

@@ -506,6 +506,7 @@ const FORCED_DELEGATION_TOOLS: DelegateTool[] = [
   'delegate_to_opencode_cli',
   'delegate_to_gemini_cli',
   'delegate_to_copilot_cli',
+  'delegate_to_droid_cli',
   'delegate_to_cursor_cli',
   'delegate_to_qwen_code_cli',
 ]

package/src/lib/server/chat-execution/prompt-sections.ts

@@ -120,6 +120,8 @@ function normalizeRuntimeExtensionId(extensionId: string): string {
   if (normalized === 'delegate_to_codex_cli' || normalized === 'codex_cli') return 'codex_cli'
   if (normalized === 'delegate_to_opencode_cli' || normalized === 'opencode_cli') return 'opencode_cli'
   if (normalized === 'delegate_to_gemini_cli' || normalized === 'gemini_cli') return 'gemini_cli'
+  if (normalized === 'delegate_to_copilot_cli' || normalized === 'copilot_cli') return 'copilot_cli'
+  if (normalized === 'delegate_to_droid_cli' || normalized === 'droid_cli') return 'droid_cli'
   if (normalized === 'delegate_to_cursor_cli' || normalized === 'cursor_cli') return 'cursor_cli'
   if (normalized === 'delegate_to_qwen_code_cli' || normalized === 'qwen_code_cli') return 'qwen_code_cli'
   if (['session_info', 'sessions_tool', 'whoami_tool', 'search_history_tool'].includes(normalized)) return 'manage_sessions'

package/src/lib/server/chatrooms/chatroom-helpers.ts

@@ -282,6 +282,7 @@ function buildEmptyDelegateResumeIds(): NonNullable<Session['delegateResumeIds']
     opencode: null,
     gemini: null,
     copilot: null,
+    droid: null,
     cursor: null,
     qwen: null,
   }
@@ -307,6 +308,7 @@ export function buildSyntheticSession(agent: Agent, chatroomId: string): Session
     opencodeSessionId: null,
     geminiSessionId: null,
     copilotSessionId: null,
+    droidSessionId: null,
     cursorSessionId: null,
     qwenSessionId: null,
     acpSessionId: null,
@@ -362,6 +364,7 @@ export function ensureSyntheticSession(agent: Agent, chatroomId: string): Sessio
   if (session.opencodeSessionId === undefined) session.opencodeSessionId = null
   if (session.geminiSessionId === undefined) session.geminiSessionId = null
   if (session.copilotSessionId === undefined) session.copilotSessionId = null
+  if (session.droidSessionId === undefined) session.droidSessionId = null
   if (session.cursorSessionId === undefined) session.cursorSessionId = null
   if (session.qwenSessionId === undefined) session.qwenSessionId = null
   if (session.acpSessionId === undefined) session.acpSessionId = null

package/src/lib/server/chats/chat-session-service.ts

@@ -47,6 +47,7 @@ function emptyDelegateResumeIds() {
     opencode: null,
     gemini: null,
     copilot: null,
+    droid: null,
     cursor: null,
     qwen: null,
   }
@@ -129,6 +130,7 @@ export function createChatSession(input: Record<string, unknown>): ServiceResult
     opencodeSessionId: null,
     geminiSessionId: null,
     copilotSessionId: null,
+    droidSessionId: null,
     cursorSessionId: null,
     qwenSessionId: null,
     acpSessionId: null,
@@ -289,6 +291,7 @@ export function updateChatSession(sessionId: string, updates: Record<string, unk
   if (updates.opencodeSessionId !== undefined) session.opencodeSessionId = updates.opencodeSessionId
   if (updates.geminiSessionId !== undefined) session.geminiSessionId = updates.geminiSessionId
   if (updates.copilotSessionId !== undefined) session.copilotSessionId = updates.copilotSessionId
+  if (updates.droidSessionId !== undefined) session.droidSessionId = updates.droidSessionId
   if (updates.cursorSessionId !== undefined) session.cursorSessionId = updates.cursorSessionId
   if (updates.qwenSessionId !== undefined) session.qwenSessionId = updates.qwenSessionId
   if (updates.acpSessionId !== undefined) session.acpSessionId = updates.acpSessionId
@@ -375,6 +378,7 @@ export function clearChatMessages(sessionId: string): boolean {
   session.opencodeSessionId = null
   session.geminiSessionId = null
   session.copilotSessionId = null
+  session.droidSessionId = null
   session.cursorSessionId = null
   session.qwenSessionId = null
   session.acpSessionId = null

package/src/lib/server/connectors/session.ts

@@ -343,6 +343,7 @@ export function resolveDirectSession(params: {
       opencodeSessionId: null,
       geminiSessionId: null,
       copilotSessionId: null,
+      droidSessionId: null,
       cursorSessionId: null,
       qwenSessionId: null,
       acpSessionId: null,
@@ -352,6 +353,7 @@ export function resolveDirectSession(params: {
         opencode: null,
         gemini: null,
         copilot: null,
+        droid: null,
         cursor: null,
         qwen: null,
       },

package/src/lib/server/context-manager.ts

@@ -79,6 +79,7 @@ const PROVIDER_DEFAULT_WINDOWS: Record<string, number> = {
   'opencode-cli': 200_000,
   'gemini-cli': 1_048_576,
   'copilot-cli': 200_000,
+  'droid-cli': 200_000,
   'cursor-cli': 200_000,
   'qwen-code-cli': 1_048_576,
   google: 1_048_576,

package/src/lib/server/provider-health.ts

@@ -5,7 +5,7 @@ import { log } from './logger'
 
 const TAG = 'provider-health'
 
-type DelegateTool = 'delegate_to_claude_code' | 'delegate_to_codex_cli' | 'delegate_to_opencode_cli' | 'delegate_to_gemini_cli' | 'delegate_to_copilot_cli' | 'delegate_to_cursor_cli' | 'delegate_to_qwen_code_cli'
+type DelegateTool = 'delegate_to_claude_code' | 'delegate_to_codex_cli' | 'delegate_to_opencode_cli' | 'delegate_to_gemini_cli' | 'delegate_to_copilot_cli' | 'delegate_to_droid_cli' | 'delegate_to_cursor_cli' | 'delegate_to_qwen_code_cli'
 
 interface ProviderHealthState {
   failures: number
@@ -120,6 +120,7 @@ function delegateBinary(delegateTool: DelegateTool): string {
   if (delegateTool === 'delegate_to_codex_cli') return 'codex'
   if (delegateTool === 'delegate_to_gemini_cli') return 'gemini'
   if (delegateTool === 'delegate_to_copilot_cli') return 'copilot'
+  if (delegateTool === 'delegate_to_droid_cli') return 'droid'
   if (delegateTool === 'delegate_to_cursor_cli') return 'cursor-agent'
   if (delegateTool === 'delegate_to_qwen_code_cli') return 'qwen'
   return 'opencode'
@@ -164,6 +165,7 @@ function delegateProviderId(delegateTool: DelegateTool): string {
   if (delegateTool === 'delegate_to_codex_cli') return 'codex-cli'
   if (delegateTool === 'delegate_to_gemini_cli') return 'gemini-cli'
   if (delegateTool === 'delegate_to_copilot_cli') return 'copilot-cli'
+  if (delegateTool === 'delegate_to_droid_cli') return 'droid-cli'
   if (delegateTool === 'delegate_to_cursor_cli') return 'cursor-cli'
   if (delegateTool === 'delegate_to_qwen_code_cli') return 'qwen-code-cli'
   return 'opencode-cli'
@@ -350,7 +352,7 @@ export async function pingProvider(
   apiKey: string | undefined,
   endpoint: string | undefined,
 ): Promise<{ ok: boolean; message: string }> {
-  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose']
+  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose']
   const OPTIONAL_OPENAI_COMPATIBLE_KEY_PROVIDERS = new Set(['hermes'])
   if (CLI_PROVIDERS.includes(provider)) return { ok: true, message: 'CLI provider — skipped.' }
 

package/src/lib/server/provider-model-discovery.test.ts

@@ -229,7 +229,7 @@ test('resolveDescriptor uses Hermes as an OpenAI-compatible provider with option
 })
 
 test('resolveDescriptor disables model discovery for local CLI-backed providers without live model catalogs', () => {
-  for (const providerId of ['copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose']) {
+  for (const providerId of ['copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose']) {
     const descriptor = resolveDescriptor({ providerId })
     assert.equal(descriptor?.supportsDiscovery, false, `${providerId} should not support discovery`)
     assert.equal(descriptor?.endpoint, undefined, `${providerId} should not expose a discovery endpoint`)

package/src/lib/server/provider-model-discovery.ts

@@ -55,7 +55,7 @@ function toOpenAiCompatibleEndpoint(raw: string | null | undefined, fallback: st
 }
 
 function supportsBuiltInModelDiscovery(providerId: string): boolean {
-  return !['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(providerId)
+  return !['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(providerId)
 }
 
 function normalizeGoogleModelsEndpoint(raw: string | null | undefined): string {

package/src/lib/server/runtime/daemon-state/core.ts

@@ -704,7 +704,7 @@ async function runProviderHealthChecks() {
     if (!agent?.id || typeof agent.id !== 'string') continue
     if (shouldSuppressSyntheticAgentHealthAlert(agent.id)) continue
     const provider = typeof agent.provider === 'string' ? agent.provider : ''
-    if (!provider || ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(provider)) continue
+    if (!provider || ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(provider)) continue
 
     const credentialId = typeof agent.credentialId === 'string' ? agent.credentialId : ''
     const apiEndpoint = typeof agent.apiEndpoint === 'string' ? agent.apiEndpoint : ''
@@ -1508,7 +1508,7 @@ export function getDaemonHealthSummary(): {
   for (const agent of agentEntries) {
     if (!agent?.id || typeof agent.id !== 'string') continue
     const provider = typeof agent.provider === 'string' ? agent.provider : ''
-    if (!provider || ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(provider)) continue
+    if (!provider || ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose'].includes(provider)) continue
     const credentialId = typeof agent.credentialId === 'string' ? agent.credentialId : ''
     const apiEndpoint = typeof agent.apiEndpoint === 'string' ? agent.apiEndpoint : ''
     providerKeys.add(`${provider}:${credentialId || 'no-cred'}:${apiEndpoint}`)

package/src/lib/server/session-reset-policy.ts

@@ -284,6 +284,7 @@ export function resetSessionRuntime(
   session.opencodeSessionId = null
   session.geminiSessionId = null
   session.copilotSessionId = null
+  session.droidSessionId = null
   session.cursorSessionId = null
   session.qwenSessionId = null
   session.acpSessionId = null
@@ -293,6 +294,7 @@ export function resetSessionRuntime(
     opencode: null,
     gemini: null,
     copilot: null,
+    droid: null,
     cursor: null,
     qwen: null,
   }

package/src/lib/server/session-tools/context.ts

@@ -86,8 +86,8 @@ export interface ToolBuildContext {
   commandTimeoutMs: number
   claudeTimeoutMs: number
   cliProcessTimeoutMs: number
-  persistDelegateResumeId: (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'cursor' | 'qwen', id: string | null | undefined) => void
-  readStoredDelegateResumeId: (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'cursor' | 'qwen') => string | null
+  persistDelegateResumeId: (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'droid' | 'cursor' | 'qwen', id: string | null | undefined) => void
+  readStoredDelegateResumeId: (key: 'claudeCode' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'droid' | 'cursor' | 'qwen') => string | null
   resolveCurrentSession: () => any | null
   activeExtensions: string[]
   /** Agent's file access policy — passed to shell for command-level enforcement */

package/src/lib/server/session-tools/delegate-droid.test.ts

@@ -0,0 +1,24 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+
+describe('droid delegate backend wiring', () => {
+  it('coerces Factory Droid aliases to the droid backend', async () => {
+    const mod = await import('./delegate')
+    const anyMod = mod as unknown as Record<string, unknown>
+    const coerceDelegateBackend = anyMod.coerceDelegateBackend as ((value: unknown) => string | null) | undefined
+    if (typeof coerceDelegateBackend !== 'function') return
+
+    for (const alias of ['droid', 'droid cli', 'droid-cli', 'droid_cli', 'factory', 'factory droid', 'factory-droid']) {
+      assert.equal(coerceDelegateBackend(alias), 'droid', `alias ${alias} should coerce to droid`)
+    }
+  })
+
+  it('includes droid in the delegation JSON-schema enum', async () => {
+    const { default: fs } = await import('node:fs')
+    const { default: path } = await import('node:path')
+    const delegatePath = path.resolve(process.cwd(), 'src/lib/server/session-tools/delegate.ts')
+    const source = fs.readFileSync(delegatePath, 'utf-8')
+    assert.match(source, /enum: \[[^\]]*'droid'[^\]]*\]/, 'droid must appear in the delegate backend enum')
+    assert.match(source, /DELEGATE_BACKEND_ORDER[\s\S]{0,200}'droid'/, 'droid must appear in DELEGATE_BACKEND_ORDER')
+  })
+})