diff --git a/scripts/defines.ts b/scripts/defines.ts
index 388616597..804935419 100644
--- a/scripts/defines.ts
+++ b/scripts/defines.ts
@@ -46,7 +46,7 @@ export const DEFAULT_BUILD_FEATURES = [
     'KAIROS_BRIEF',                // Kairos 定时摘要（定时汇报当前状态）
     'AWAY_SUMMARY',                // 离线摘要（用户离开后生成总结）
     'ULTRAPLAN',                   // 超级规划模式，深度分析后生成实施计划
-    'DAEMON',                      // 守护进程模式，长驻 supervisor 管理后台 worker
+    // 'DAEMON',                   // 守护进程模式，长驻 supervisor 管理后台 worker（已禁用：内存占用过高）
     'ACP',                         // ACP 代理协议，支持外部 agent 接入
     'WORKFLOW_SCRIPTS',            // 工作流脚本（.claude/workflows/ 中的 YAML/MD）
     'HISTORY_SNIP',                // 历史消息裁剪，压缩上下文窗口
diff --git a/src/commands.ts b/src/commands.ts
index 12f5f2595..3f3279679 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -75,7 +75,7 @@ const bridge = feature('BRIDGE_MODE')
   ? require('./commands/bridge/index.js').default
   : null
 const remoteControlServerCommand =
-  feature('DAEMON') && feature('BRIDGE_MODE')
+  feature('BRIDGE_MODE')
     ? require('./commands/remoteControlServer/index.js').default
     : null
 const voiceCommand = feature('VOICE_MODE')
diff --git a/src/commands/remoteControlServer/index.ts b/src/commands/remoteControlServer/index.ts
index 6c78d7ef3..5ec6652d9 100644
--- a/src/commands/remoteControlServer/index.ts
+++ b/src/commands/remoteControlServer/index.ts
@@ -3,9 +3,14 @@ import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js'
 import type { Command } from '../../commands.js'
 
 function isEnabled(): boolean {
-  if (!feature('DAEMON') || !feature('BRIDGE_MODE')) {
+  if (!feature('BRIDGE_MODE')) {
     return false
   }
+  if (feature('DAEMON')) {
+    return isBridgeEnabled()
+  }
+  // DAEMON feature disabled — still allow the command but warn at runtime
+  // that headless/daemon worker mode is unavailable.
   return isBridgeEnabled()
 }
 
diff --git a/src/entrypoints/cli.tsx b/src/entrypoints/cli.tsx
index c519e6572..2ea7f3a70 100644
--- a/src/entrypoints/cli.tsx
+++ b/src/entrypoints/cli.tsx
@@ -170,7 +170,12 @@ async function main(): Promise<void> {
   // perf-sensitive. No enableConfigs(), no analytics sinks at this layer —
   // workers are lean. If a worker kind needs configs/auth (assistant will),
   // it calls them inside its run() fn.
-  if (feature('DAEMON') && (args[0] === '--daemon-worker' || args[0]?.startsWith('--daemon-worker='))) {
+  if (args[0] === '--daemon-worker' || args[0]?.startsWith('--daemon-worker=')) {
+    if (!feature('DAEMON')) {
+      console.error('Error: --daemon-worker requires DAEMON feature to be enabled. Set FEATURE_DAEMON=1 or add DAEMON to DEFAULT_BUILD_FEATURES.')
+      process.exitCode = 1
+      return
+    }
     const kind = args[0] === '--daemon-worker' ? args[1] : args[0].split('=')[1]
     const { runDaemonWorker } = await import('../daemon/workerRegistry.js')
     await runDaemonWorker(kind)