@swarmclawai/swarmclaw 1.5.36 → 1.5.37

package/README.md

@@ -40,6 +40,7 @@ Extension tutorial: https://swarmclaw.ai/docs/extension-tutorial
   <td align="center"><img src="doc/assets/logos/gemini-cli.svg" width="32" alt="Gemini CLI"><br><sub>Gemini CLI</sub></td>
   <td align="center"><img src="doc/assets/logos/opencode.svg" width="32" alt="OpenCode"><br><sub>OpenCode</sub></td>
   <td align="center"><img src="doc/assets/logos/copilot-cli.svg" width="32" alt="Copilot CLI"><br><sub>Copilot</sub></td>
+  <td align="center"><img src="public/provider-logos/droid-cli.svg" width="32" alt="Factory Droid CLI"><br><sub>Droid</sub></td>
   <td align="center"><img src="doc/assets/logos/cursor-cli.svg" width="32" alt="Cursor Agent CLI"><br><sub>Cursor</sub></td>
   <td align="center"><img src="doc/assets/logos/qwen-code-cli.svg" width="32" alt="Qwen Code CLI"><br><sub>Qwen Code</sub></td>
   <td align="center"><img src="doc/assets/logos/goose.svg" width="32" alt="Goose"><br><sub>Goose</sub></td>
@@ -65,7 +66,7 @@ Extension tutorial: https://swarmclaw.ai/docs/extension-tutorial
 - Node.js 22.6+ (`nvm use` will pick up the repo's `.nvmrc`, which matches CI)
 - npm 10+ or another supported package manager
 - Docker Desktop is recommended for sandbox browser execution
-- Optional provider CLIs if you want delegated CLI backends such as Claude Code, Codex, OpenCode, Gemini, Copilot, Cursor Agent, Qwen Code, or Goose
+- Optional provider CLIs if you want delegated CLI backends such as Claude Code, Codex, OpenCode, Gemini, Copilot, Factory Droid, Cursor Agent, Qwen Code, or Goose
 
 ## Quick Start
 
@@ -388,6 +389,14 @@ Operational docs: https://swarmclaw.ai/docs/observability
 
 ## Releases
 
+### v1.5.37 Highlights
+
+- **Factory Droid CLI as a provider and delegation backend**: adds [`droid`](https://docs.factory.ai/cli/droid-exec/overview) as a first-class chat provider and `delegate` backend with streaming JSON output, session resume, and a conservative `--auto low` autonomy pin on the delegate path. Install `droid` and sign in via browser (or set `FACTORY_API_KEY`), then pick **Factory Droid CLI** in the setup wizard. Resolves #38.
+- **Desktop Release CI hardening**: v1.5.36's Electron build workflow failed on all three platforms. This release:
+  - Adds a proper `author` with email to `package.json` and a `linux.maintainer` entry in `electron-builder.yml` so the Linux `.deb` target stops rejecting the build.
+  - Pins `outputFileTracingRoot` in `next.config.ts` to the project root so the Next.js build no longer walks `C:\Users\<user>\Application Data` (a legacy NTFS junction that throws EPERM on Windows runners).
+  - Pins Python 3.11 in the desktop-release workflow so `node-gyp` rebuilds of native modules (`node-liblzma`, etc.) succeed on Python 3.12+ runners where `distutils` was removed from the stdlib.
+
 ### v1.5.36 Highlights
 
 - **Desktop app (Electron)**: SwarmClaw now ships as a native desktop app for macOS (Apple Silicon + Intel), Windows, and Linux (AppImage + .deb). Download from [swarmclaw.ai/downloads](https://swarmclaw.ai/downloads). The app wraps the existing standalone server inside an Electron shell, stores data in the OS app-data directory, and auto-updates via GitHub Releases (notify-only on unsigned macOS builds).

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.5.36",
+  "version": "1.5.37",
   "description": "Build and run autonomous AI agents with OpenClaw, Hermes, multiple model providers, orchestration, delegation, memory, skills, schedules, and chat connectors.",
   "main": "electron-dist/main.js",
   "license": "MIT",
+  "author": {
+    "name": "SwarmClaw",
+    "email": "noreply@swarmclaw.ai",
+    "url": "https://swarmclaw.ai"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/public/provider-logos/droid-cli.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64" role="img" aria-label="Factory Droid CLI">
+  <rect x="2" y="2" width="60" height="60" rx="14" fill="#0f172a"/>
+  <rect x="2" y="2" width="60" height="60" rx="14" fill="none" stroke="#38bdf8" stroke-width="2"/>
+  <path d="M20 22 h24 v6 h-9 v16 h-6 v-16 h-9 z" fill="#e2e8f0"/>
+  <circle cx="16" cy="48" r="2.5" fill="#38bdf8"/>
+  <circle cx="48" cy="48" r="2.5" fill="#38bdf8"/>
+</svg>

package/src/app/api/setup/check-provider/route.ts

@@ -12,6 +12,7 @@ type SetupProvider =
   | 'opencode-cli'
   | 'gemini-cli'
   | 'copilot-cli'
+  | 'droid-cli'
   | 'cursor-cli'
   | 'qwen-code-cli'
   | 'goose'
@@ -31,7 +32,7 @@ type SetupProvider =
   | 'openclaw'
   | 'hermes'
 
-type CliSetupProvider = 'claude-cli' | 'codex-cli' | 'opencode-cli' | 'gemini-cli' | 'copilot-cli' | 'cursor-cli' | 'qwen-code-cli' | 'goose'
+type CliSetupProvider = 'claude-cli' | 'codex-cli' | 'opencode-cli' | 'gemini-cli' | 'copilot-cli' | 'droid-cli' | 'cursor-cli' | 'qwen-code-cli' | 'goose'
 
 interface SetupCheckBody {
   provider?: string
@@ -285,6 +286,7 @@ function checkCliProvider(provider: CliSetupProvider): { ok: boolean; message: s
     'opencode-cli': { binary: 'opencode', backend: 'opencode' as const, label: 'OpenCode CLI' },
     'gemini-cli': { binary: 'gemini', backend: 'gemini' as const, label: 'Gemini CLI' },
     'copilot-cli': { binary: 'copilot', backend: 'copilot' as const, label: 'GitHub Copilot CLI' },
+    'droid-cli': { binary: 'droid', backend: 'droid' as const, label: 'Factory Droid CLI' },
     'cursor-cli': { binary: 'cursor-agent', backend: 'cursor' as const, label: 'Cursor Agent CLI' },
     'qwen-code-cli': { binary: 'qwen', backend: 'qwen' as const, label: 'Qwen Code CLI' },
     goose: { binary: 'goose', backend: 'goose' as const, label: 'Goose CLI' },
@@ -312,7 +314,7 @@ export async function POST(req: Request) {
   const credentialId = clean(body.credentialId)
   const endpoint = clean(body.endpoint)
   const model = clean(body.model)
-  const CLI_PROVIDERS = new Set<CliSetupProvider>(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose'])
+  const CLI_PROVIDERS = new Set<CliSetupProvider>(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose'])
 
   // Resolve credentialId to an API key if no raw key was provided
   if (!apiKey && credentialId) {

package/src/app/api/setup/doctor/route.ts

@@ -203,6 +203,7 @@ export async function GET(req: Request) {
     { id: 'opencode-cli', label: 'OpenCode CLI', command: 'opencode' },
     { id: 'gemini-cli', label: 'Gemini CLI', command: 'gemini' },
     { id: 'copilot-cli', label: 'GitHub Copilot CLI', command: 'copilot' },
+    { id: 'droid-cli', label: 'Factory Droid CLI', command: 'droid' },
     { id: 'cursor-cli', label: 'Cursor Agent CLI', command: 'cursor-agent' },
     { id: 'qwen-code-cli', label: 'Qwen Code CLI', command: 'qwen' },
     { id: 'goose', label: 'Goose CLI', command: 'goose' },

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

@@ -2513,7 +2513,9 @@ export function AgentSheet() {
                     ? 'Gemini CLI uses its own built-in tools and runtime — SwarmClaw does not inject local platform tools for it.'
                     : provider === 'copilot-cli'
                       ? 'GitHub Copilot CLI uses its own built-in tools and runtime — SwarmClaw does not inject local platform tools for it.'
-                      : provider === 'cursor-cli'
+                      : provider === 'droid-cli'
+                        ? 'Factory Droid CLI uses its own built-in tools and autonomy controls — SwarmClaw does not inject local platform tools for it.'
+                        : provider === 'cursor-cli'
                         ? 'Cursor Agent CLI runs with its own native tool/runtime layer — SwarmClaw sends prompts directly without injecting local platform tools.'
                         : provider === 'qwen-code-cli'
                           ? 'Qwen Code CLI uses its own native tools and runtime — SwarmClaw does not inject local platform tools for it.'

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

@@ -53,6 +53,7 @@ const PROVIDER_LABELS: Record<string, string> = {
   'opencode-cli': 'OpenCode CLI',
   'gemini-cli': 'Gemini CLI',
   'copilot-cli': 'Copilot CLI',
+  'droid-cli': 'Droid CLI',
   'cursor-cli': 'Cursor CLI',
   'qwen-code-cli': 'Qwen Code CLI',
   goose: 'Goose',

package/src/components/chat/activity-moment.tsx

@@ -14,6 +14,7 @@ const NOTABLE_TOOLS: Record<string, { label: string; color: string; icon: 'brain
   delegate_to_opencode_cli: { label: 'Delegated to OpenCode', color: '#38BDF8', icon: 'delegate' },
   delegate_to_gemini_cli: { label: 'Delegated to Gemini CLI', color: '#38BDF8', icon: 'delegate' },
   delegate_to_cursor_cli: { label: 'Delegated to Cursor CLI', color: '#38BDF8', icon: 'delegate' },
+  delegate_to_droid_cli: { label: 'Delegated to Factory Droid', color: '#38BDF8', icon: 'delegate' },
   delegate_to_qwen_code_cli: { label: 'Delegated to Qwen Code', color: '#38BDF8', icon: 'delegate' },
   delegate_to_agent: { label: 'Delegating task', color: '#6366F1', icon: 'delegate' },
   check_delegation_status: { label: 'Checking delegation', color: '#6366F1', icon: 'delegate' },

package/src/components/chat/chat-header.tsx

@@ -220,10 +220,11 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
         opencodeSessionId: null,
         geminiSessionId: null,
         copilotSessionId: null,
+        droidSessionId: null,
         cursorSessionId: null,
         qwenSessionId: null,
         acpSessionId: null,
-        delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null, copilot: null, cursor: null, qwen: null },
+        delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null, copilot: null, droid: null, cursor: null, qwen: null },
       })
       await refreshSession(session.id)
     } catch { /* best-effort */ }

package/src/components/chat/tool-call-bubble.tsx

@@ -28,6 +28,7 @@ const TOOL_COLORS: Record<string, string> = {
   delegate_to_opencode_cli: '#14B8A6',
   delegate_to_gemini_cli: '#2563EB',
   delegate_to_copilot_cli: '#6366F1',
+  delegate_to_droid_cli: '#A855F7',
   delegate_to_cursor_cli: '#F97316',
   delegate_to_qwen_code_cli: '#22C55E',
   whoami_tool: '#8B5CF6',
@@ -81,6 +82,7 @@ export const TOOL_LABELS: Record<string, string> = {
   opencode_cli: 'OpenCode CLI',
   gemini_cli: 'Gemini CLI',
   copilot_cli: 'Copilot CLI',
+  droid_cli: 'Factory Droid',
   cursor_cli: 'Cursor CLI',
   qwen_code_cli: 'Qwen Code CLI',
   spawn_subagent: 'Subagent',
@@ -91,6 +93,7 @@ export const TOOL_LABELS: Record<string, string> = {
   delegate_to_opencode_cli: 'OpenCode CLI',
   delegate_to_gemini_cli: 'Gemini CLI',
   delegate_to_copilot_cli: 'Copilot CLI',
+  delegate_to_droid_cli: 'Factory Droid',
   delegate_to_cursor_cli: 'Cursor CLI',
   delegate_to_qwen_code_cli: 'Qwen Code CLI',
   whoami_tool: 'Who Am I',
@@ -129,6 +132,7 @@ export const TOOL_DESCRIPTIONS: Record<string, string> = {
   opencode_cli: 'Enable delegation to OpenCode CLI',
   gemini_cli: 'Enable delegation to Gemini CLI',
   copilot_cli: 'Enable delegation to GitHub Copilot CLI',
+  droid_cli: 'Enable delegation to Factory Droid CLI',
   cursor_cli: 'Enable delegation to Cursor Agent CLI',
   qwen_code_cli: 'Enable delegation to Qwen Code CLI',
   spawn_subagent: 'Spawn native subagents with lineage tracking and batch support',
@@ -139,6 +143,7 @@ export const TOOL_DESCRIPTIONS: Record<string, string> = {
   delegate_to_opencode_cli: 'Delegate complex coding tasks to OpenCode CLI',
   delegate_to_gemini_cli: 'Delegate complex coding tasks to Gemini CLI',
   delegate_to_copilot_cli: 'Delegate complex coding tasks to GitHub Copilot CLI',
+  delegate_to_droid_cli: 'Delegate complex coding tasks to Factory Droid CLI',
   delegate_to_cursor_cli: 'Delegate complex coding tasks to Cursor Agent CLI',
   delegate_to_qwen_code_cli: 'Delegate complex coding tasks to Qwen Code CLI',
   whoami_tool: 'Reveal the current agent and chat context',

package/src/lib/orchestrator-config.ts

@@ -6,6 +6,7 @@ export const NON_ORCHESTRATOR_PROVIDERS = new Set([
   'opencode-cli',
   'gemini-cli',
   'copilot-cli',
+  'droid-cli',
   'cursor-cli',
   'qwen-code-cli',
   'goose',

package/src/lib/provider-sets.ts

@@ -1,11 +1,11 @@
 /** CLI providers that use their own tool execution outside the shared tool-runtime path. */
-export const NON_LANGGRAPH_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli'])
+export const NON_LANGGRAPH_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli'])
 
 /** Providers that manage their own runtime/tool loop even when reached over an API endpoint. */
 export const RUNTIME_MANAGED_PROVIDER_IDS = new Set(['hermes', 'goose'])
 
 /** Providers with native tool/capability support (CLI providers + OpenClaw + Hermes). */
-export const NATIVE_CAPABILITY_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'openclaw', 'hermes'])
+export const NATIVE_CAPABILITY_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'openclaw', 'hermes'])
 
 /** Providers that can only act as workers — no coordinator role, no heartbeat, no advanced settings. */
-export const WORKER_ONLY_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'openclaw', 'hermes'])
+export const WORKER_ONLY_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose', 'openclaw', 'hermes'])

package/src/lib/providers/cli-utils.test.ts

@@ -94,6 +94,7 @@ describe('isCliProvider', () => {
     assert.equal(isCliProvider('opencode-cli'), true)
     assert.equal(isCliProvider('gemini-cli'), true)
     assert.equal(isCliProvider('copilot-cli'), true)
+    assert.equal(isCliProvider('droid-cli'), true)
     assert.equal(isCliProvider('cursor-cli'), true)
     assert.equal(isCliProvider('qwen-code-cli'), true)
     assert.equal(isCliProvider('goose'), true)
@@ -118,6 +119,7 @@ describe('CLI_PROVIDER_CAPABILITIES', () => {
     assert.ok('opencode-cli' in CLI_PROVIDER_CAPABILITIES)
     assert.ok('gemini-cli' in CLI_PROVIDER_CAPABILITIES)
     assert.ok('copilot-cli' in CLI_PROVIDER_CAPABILITIES)
+    assert.ok('droid-cli' in CLI_PROVIDER_CAPABILITIES)
     assert.ok('cursor-cli' in CLI_PROVIDER_CAPABILITIES)
     assert.ok('qwen-code-cli' in CLI_PROVIDER_CAPABILITIES)
     assert.ok('goose' in CLI_PROVIDER_CAPABILITIES)

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

@@ -45,6 +45,13 @@ const KNOWN_BINARY_PATHS: Record<string, string[]> = {
     '/opt/homebrew/bin/copilot',
     path.join(os.homedir(), '.npm-global/bin/copilot'),
   ],
+  droid: [
+    path.join(os.homedir(), '.local/bin/droid'),
+    '/usr/local/bin/droid',
+    '/opt/homebrew/bin/droid',
+    path.join(os.homedir(), '.npm-global/bin/droid'),
+    path.join(os.homedir(), '.factory/bin/droid'),
+  ],
   'cursor-agent': [
     path.join(os.homedir(), '.local/bin/cursor-agent'),
     '/usr/local/bin/cursor-agent',
@@ -166,7 +173,7 @@ export interface AuthProbeResult {
  */
 export function probeCliAuth(
   binary: string,
-  backend: 'claude' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'cursor' | 'qwen' | 'goose',
+  backend: 'claude' | 'codex' | 'opencode' | 'gemini' | 'copilot' | 'droid' | 'cursor' | 'qwen' | 'goose',
   env: NodeJS.ProcessEnv,
   cwd?: string,
 ): AuthProbeResult {
@@ -277,6 +284,25 @@ export function probeCliAuth(
     return { authenticated: true }
   }
 
+  if (backend === 'droid') {
+    if (process.env.FACTORY_API_KEY || env.FACTORY_API_KEY) {
+      return { authenticated: true }
+    }
+    const configPaths = [
+      path.join(os.homedir(), '.factory', 'config.json'),
+      path.join(os.homedir(), '.config', 'factory', 'config.json'),
+      path.join(os.homedir(), '.factory', 'auth.json'),
+    ]
+    const hasConfig = configPaths.some((p) => fs.existsSync(p))
+    if (!hasConfig) {
+      return {
+        authenticated: false,
+        errorMessage: 'Factory Droid CLI is not authenticated. Run `droid` once to sign in via browser, or set FACTORY_API_KEY and try again.',
+      }
+    }
+    return { authenticated: true }
+  }
+
   if (backend === 'cursor') {
     try {
       const probe = spawnSync(binary, ['status'], {
@@ -427,6 +453,7 @@ export const CLI_PROVIDER_CAPABILITIES: Record<string, string> = {
   'opencode-cli': 'code analysis, generation across multiple LLM backends',
   'gemini-cli': 'code generation, analysis with Gemini models',
   'copilot-cli': 'code generation, analysis, multi-model support via GitHub Copilot',
+  'droid-cli': 'code generation, refactoring, and automation via Factory Droid with configurable autonomy',
   'cursor-cli': 'full-agent coding workflows, multi-file edits, project-aware code changes',
   'qwen-code-cli': 'terminal-native coding workflows, code generation, review, and automation',
   goose: 'agentic coding workflows with extensions, tools, and runtime-managed execution',

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