refactor: 将 weixin 模块从 src/ 迁移至 packages/weixin 工作区包

将 src/services/weixin/ 中的纯业务逻辑迁入 @claude-code-best/weixin workspace 包，降低 src/ 耦合度。仅保留 server.ts 作为薄适配层。 - 迁移 7 个无修改的纯模块 (types/api/accounts/login/pairing/media/send) - monitor.ts 内联 PERMISSION_REPLY_RE 正则，解除对 src/ 的依赖 - permissions.ts 本地定义 ChannelPermissionRequestParams 接口 - cli.ts 拆分：serve 子命令通过回调注入，login/access 保留在包内 - server.ts 重写为从 @claude-code-best/weixin 导入 - 新增 cli-serve.ts 作为 serve 入口薄壳 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
chore: 删除临时规划文档 wx_channel.md 并还原 package.json 排序
2026-06-16 21:35:51 +00:00 · 2026-04-19 20:55:13 +08:00 · 2026-04-19 20:32:20 +08:00 · 2026-04-19 18:50:20 +08:00 · 2026-04-19 18:49:57 +08:00 · 2026-04-19 18:38:40 +08:00
66 changed files with 867 additions and 2243 deletions
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -0,0 +1,22 @@
+#!/bin/sh
+# pre-commit hook: 对暂存的文件运行 Biome 检查
+# 仅检查 src/ 下的 .ts/.tsx/.js/.jsx 文件
+
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '^src/.*\.(ts|tsx|js|jsx)$')
+
+if [ -z "$STAGED_FILES" ]; then
+  exit 0
+fi
+
+echo "Running Biome lint on staged files..."
+
+# 使用 biome lint 对暂存文件进行检查（仅 lint，不格式化，不自动修复）
+echo "$STAGED_FILES" | xargs bunx biome lint --no-errors-on-unmatched
+
+if [ $? -ne 0 ]; then
+  echo ""
+  echo "Biome lint failed. Fix errors or use --no-verify to bypass."
+  exit 1
+fi
+
+exit 0
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -58,9 +58,6 @@ bun run health
 # Check unused exports
 bun run check:unused

-# Full check (typecheck + lint + test) — run after completing any task
-bun run test:all
-
 bun run typecheck

 # Remote Control Server
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@
 [![GitHub License](https://img.shields.io/github/license/claude-code-best/claude-code?style=flat-square)](https://github.com/claude-code-best/claude-code/blob/main/LICENSE)
 [![Last Commit](https://img.shields.io/github/last-commit/claude-code-best/claude-code?style=flat-square&color=blue)](https://github.com/claude-code-best/claude-code/commits/main)
 [![Bun](https://img.shields.io/badge/runtime-Bun-black?style=flat-square&logo=bun)](https://bun.sh/)
-[![Discord](https://img.shields.io/badge/Discord-Join-5865F2?style=flat-square&logo=discord)](https://discord.gg/uApuzJWGKX)
+[![Discord](https://img.shields.io/badge/Discord-Join-5865F2?style=flat-square&logo=discord)](https://discord.gg/qZU6zS7Q)

 > Which Claude do you like? The open source one is the best.

 牢 A (Anthropic) 官方 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) CLI 工具的源码反编译/逆向还原项目。目标是将 Claude Code 大部分功能及工程化能力复现 (问就是老佛爷已经付过钱了)。虽然很难绷, 但是它叫做 CCB(踩踩背)... 而且, 我们实现了企业版或者需要登陆 Claude 账号才能使用的特性, 实现技术普惠

-[文档在这里, 支持投稿 PR](https://ccb.agent-aura.top/) | [留影文档在这里](./Friends.md) | [Discord 群组](https://discord.gg/uApuzJWGKX)
+[文档在这里, 支持投稿 PR](https://ccb.agent-aura.top/) | [留影文档在这里](./Friends.md) | [Discord 群组](https://discord.gg/qZU6zS7Q)

 | 特性 | 说明 | 文档 |
 |------|------|------|
@@ -41,12 +41,8 @@
 不用克隆仓库, 从 NPM 下载后, 直接使用

 ```sh
-npm i -g claude-code-best
-
-# bun 安装比较多问题, 推荐 npm 装
-# bun  i -g claude-code-best
-# bun pm -g trust claude-code-best
-
+bun  i -g claude-code-best
+bun pm -g trust claude-code-best
 ccb # 以 nodejs 打开 claude code
 ccb-bun # 以 bun 形态打开
 CLAUDE_BRIDGE_BASE_URL=https://remote-control.claude-code-best.win/ CLAUDE_BRIDGE_OAUTH_TOKEN=test-my-key ccb --remote-control # 我们有自部署的远程控制
--- a/build.ts
+++ b/build.ts
@@ -1,7 +1,6 @@
 import { readdir, readFile, writeFile, cp } from 'fs/promises'
 import { join } from 'path'
 import { getMacroDefines } from './scripts/defines.ts'
-import { DEFAULT_BUILD_FEATURES } from './scripts/defines.ts'

 const outdir = 'dist'

@@ -9,6 +8,48 @@ const outdir = 'dist'
 const { rmSync } = await import('fs')
 rmSync(outdir, { recursive: true, force: true })

+// Default features that match the official CLI build.
+// Additional features can be enabled via FEATURE_<NAME>=1 env vars.
+const DEFAULT_BUILD_FEATURES = [
+  'BUDDY', 'TRANSCRIPT_CLASSIFIER', 'BRIDGE_MODE',
+  'AGENT_TRIGGERS_REMOTE',
+  'CHICAGO_MCP',
+  'VOICE_MODE',
+  'SHOT_STATS',
+  'PROMPT_CACHE_BREAK_DETECTION',
+  'TOKEN_BUDGET',
+  // P0: local features
+  'AGENT_TRIGGERS',
+  'ULTRATHINK',
+  'BUILTIN_EXPLORE_PLAN_AGENTS',
+  'LODESTONE',
+  // P1: API-dependent features
+  'EXTRACT_MEMORIES',
+  'VERIFICATION_AGENT',
+  'KAIROS_BRIEF',
+  'AWAY_SUMMARY',
+  'ULTRAPLAN',
+  // P2: daemon + remote control server
+  'DAEMON',
+  // ACP (Agent Client Protocol) agent mode
+  'ACP',
+  // PR-package restored features
+  'WORKFLOW_SCRIPTS',
+  'HISTORY_SNIP',
+  'CONTEXT_COLLAPSE',
+  'MONITOR_TOOL',
+  'FORK_SUBAGENT',
+//   'UDS_INBOX',
+  'KAIROS',
+  'COORDINATOR_MODE',
+  'LAN_PIPES',
+  'BG_SESSIONS',
+  'TEMPLATES',
+  // 'REVIEW_ARTIFACT', // API 请求无响应，需进一步排查 schema 兼容性
+  // P3: poor mode (disable extract_memories + prompt_suggestion)
+  'POOR',
+]
+
 // Collect FEATURE_* env vars → Bun.build features
 const envFeatures = Object.keys(process.env)
  .filter(k => k.startsWith('FEATURE_'))
--- a/bun.lock
+++ b/bun.lock
@@ -195,10 +195,9 @@
    },
    "packages/acp-link": {
      "name": "acp-link",
-      "version": "1.1.0",
+      "version": "1.0.1",
      "bin": {
        "acp-link": "dist/cli/bin.js",
-        "acp-manager": "dist/manager/bin.js",
      },
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.19.0",
@@ -212,7 +211,6 @@
        "selfsigned": "^5.5.0",
      },
      "devDependencies": {
-        "@types/bun": "^1.3.12",
        "@types/selfsigned": "^2.0.4",
        "@types/ws": "^8.18.1",
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "claude-code-best",
-  "version": "1.6.0",
+  "version": "1.4.4",
  "description": "Reverse-engineered Anthropic Claude Code CLI — interactive AI coding assistant in the terminal",
  "type": "module",
  "author": "claude-code-best <claude-code-best@proton.me>",
@@ -58,7 +58,6 @@
    "postinstall": "node scripts/run-parallel.mjs scripts/postinstall.cjs scripts/setup-chrome-mcp.mjs",
    "docs:dev": "npx mintlify dev",
    "typecheck": "tsc --noEmit",
-    "test:all": "bun run typecheck && bun test",
    "rcs": "bun run scripts/rcs.ts"
  },
  "dependencies": {
--- a/packages/acp-link/README.md
+++ b/packages/acp-link/README.md
@@ -41,9 +41,6 @@ acp-link --https /path/to/agent
 # Disable authentication (dangerous)
 acp-link --no-auth /path/to/agent

-# Register to RCS with a specific channel group
-acp-link --group my-team /path/to/agent
-
 # Pass arguments to the agent (use -- to separate)
 acp-link /path/to/agent -- --verbose --model gpt-4
 ```
@@ -52,7 +49,7 @@ acp-link /path/to/agent -- --verbose --model gpt-4

 ```
 USAGE
-  acp-link [--port value] [--host value] [--debug] [--no-auth] [--https] [--group value] <command>...
+  acp-link [--port value] [--host value] [--debug] [--no-auth] [--https] <command>...
  acp-link --help
  acp-link --version

@@ -62,7 +59,6 @@ FLAGS
       [--debug]    Enable debug logging to file
       [--no-auth]  Disable authentication (dangerous)
       [--https]    Enable HTTPS with self-signed cert
-       [--group]    Channel group ID for RCS registration (letters, digits, hyphens, underscores only)
    -h  --help      Print help information and exit
    -v  --version   Print version information and exit

@@ -88,34 +84,6 @@ ws://localhost:9315/ws?token=<your-token>

 Set `ACP_AUTH_TOKEN` env var to use a fixed token, or use `--no-auth` to disable (not recommended).

-## RCS Upstream
-
-acp-link can register to a Remote Control Server (RCS) for remote access. Set the following environment variables:
-
-| Variable | Description |
-|----------|-------------|
-| `ACP_RCS_URL` | RCS server URL (e.g. `http://rcs.example.com:3000`) |
-| `ACP_RCS_TOKEN` | API token for RCS authentication |
-| `ACP_RCS_GROUP` | Channel group ID to lock the agent into (letters, digits, `-`, `_` only) |
-
-You can also use `--group <id>` on the CLI. The CLI flag takes priority over the env var.
-
-## Manager UI
-
-通过 `--manager` flag 启动独立的管理服务（不启动代理）：
-
-```bash
-# 启动 Manager（默认端口 9315）
-acp-link --manager
-
-# 指定端口
-acp-link --manager --port 3210
-```
-
-在浏览器打开 `http://localhost:<port>` 即可访问管理界面，创建、停止、删除多个 acp-link 子进程实例并实时查看日志。
-
-通过 Manager UI 创建的子进程会自动跳过 Manager UI。
-
 ## License

 MIT
--- a/packages/acp-link/package.json
+++ b/packages/acp-link/package.json
@@ -1,6 +1,6 @@
 {
  "name": "acp-link",
-  "version": "2.0.0",
+  "version": "1.0.1",
  "description": "ACP proxy server that bridges WebSocket clients to ACP agents",
  "author": "claude-code-best",
  "type": "module",
@@ -14,15 +14,12 @@
  ],
  "scripts": {
    "build": "tsc",
-    "dev": "ACP_RCS_URL=http://localhost:3000 ACP_RCS_TOKEN=test-my-key bun run src/cli/bin.ts ccb-bun -- --acp",
-    "dev:remote": "ACP_RCS_URL=https://remote-control.claude-code-best.win/ ACP_RCS_TOKEN=test-my-key bun run src/cli/bin.ts ccb-bun -- --acp",
-    "dev:manager": "ACP_RCS_URL=http://localhost:3000 ACP_RCS_TOKEN=test-my-key bun run src/cli/bin.ts --manager",
+    "dev": "bun run src/cli/bin.ts",
    "prepublishOnly": "bun run build"
  },
  "devDependencies": {
    "@types/selfsigned": "^2.0.4",
-    "@types/ws": "^8.18.1",
-    "@types/bun": "^1.3.12"
+    "@types/ws": "^8.18.1"
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "^0.19.0",
--- a/packages/acp-link/src/cli/command.ts
+++ b/packages/acp-link/src/cli/command.ts
@@ -9,8 +9,6 @@ export const command = buildCommand({
      "The agent command is spawned as a subprocess and communicates via stdin/stdout.\n\n" +
      "Use -- to pass arguments to the agent:\n" +
      "  acp-link /path/to/agent -- --verbose --model gpt-4\n\n" +
-      "Use --manager to start the Manager Web UI instead:\n" +
-      "  acp-link --manager\n\n" +
      "For remote access, set ACP_AUTH_TOKEN environment variable or let it auto-generate.",
  },
  parameters: {
@@ -42,22 +40,6 @@ export const command = buildCommand({
        brief: "Enable HTTPS with auto-generated self-signed certificate",
        default: false,
      },
-      manager: {
-        kind: "boolean",
-        brief: "Start Manager Web UI (no proxy)",
-        default: false,
-      },
-      group: {
-        kind: "parsed",
-        parse: (value: string) => {
-          if (!/^[a-zA-Z0-9_-]+$/.test(value)) {
-            throw new Error(`Invalid group "${value}": only letters, digits, hyphens, and underscores are allowed`);
-          }
-          return value;
-        },
-        brief: "Channel group ID for RCS registration (env: ACP_RCS_GROUP)",
-        optional: true,
-      },
    },
    positional: {
      kind: "array",
@@ -66,12 +48,12 @@ export const command = buildCommand({
        parse: String,
        placeholder: "command",
      },
-      minimum: 0,
+      minimum: 1,
    },
  },
  func: async function (
    this: LocalContext,
-    flags: { port: number; host: string; debug: boolean; "no-auth": boolean; https: boolean; manager: boolean; group: string | undefined },
+    flags: { port: number; host: string; debug: boolean; "no-auth": boolean; https: boolean },
    ...args: readonly string[]
  ) {
    const port = flags.port;
@@ -79,21 +61,6 @@ export const command = buildCommand({
    const debug = flags.debug;
    const noAuth = flags["no-auth"];
    const https = flags.https;
-    const manager = flags.manager;
-    const group = flags.group;
-
-    // Manager mode: start web UI only, no proxy
-    if (manager) {
-      const { startManager } = await import("../manager/index.js");
-      await startManager(port);
-      return;
-    }
-
-    // Proxy mode: agent command is required
-    if (args.length === 0) {
-      console.error("Error: agent command is required (or use --manager)");
-      process.exit(1);
-    }
    const [command, ...agentArgs] = args;
    const cwd = process.cwd();

@@ -118,6 +85,6 @@ export const command = buildCommand({

    // Import and run the server
    const { startServer } = await import("../server.js");
-    await startServer({ port, host, command: command!, args: [...agentArgs], cwd, debug, token, https, group });
+    await startServer({ port, host, command: command!, args: [...agentArgs], cwd, debug, token, https });
  },
 });
--- a/packages/acp-link/src/manager/html.ts
+++ b/packages/acp-link/src/manager/html.ts
@@ -1,345 +0,0 @@
-export const MANAGER_HTML = `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>ACP Manager</title>
-<style>
-* { margin: 0; padding: 0; box-sizing: border-box; }
-body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  background: #f8f7f5;
-  color: #1a1a1a;
-  padding: 24px;
-  min-height: 100vh;
-}
-h1 { font-size: 20px; font-weight: 600; margin-bottom: 20px; color: #1a1a1a; }
-.header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 24px; }
-.create-form {
-  background: #fff;
-  border: 1px solid #e5e2de;
-  border-radius: 8px;
-  padding: 16px;
-  margin-bottom: 24px;
-  display: flex;
-  gap: 10px;
-  align-items: flex-end;
-}
-.form-group { display: flex; flex-direction: column; gap: 4px; }
-.form-group label { font-size: 12px; color: #888; }
-.form-group input {
-  background: #fff;
-  border: 1px solid #d5d2ce;
-  border-radius: 4px;
-  padding: 8px 12px;
-  color: #1a1a1a;
-  font-size: 14px;
-  width: 200px;
-}
-.form-group input.wide { width: 400px; }
-button {
-  background: #d77757;
-  color: #fff;
-  border: none;
-  border-radius: 4px;
-  padding: 8px 16px;
-  font-size: 14px;
-  cursor: pointer;
-  white-space: nowrap;
-}
-button:hover { background: #c4694b; }
-button:disabled { opacity: 0.5; cursor: not-allowed; }
-button.danger { background: #a63d3d; }
-button.danger:hover { background: #c44a4a; }
-button.small { padding: 4px 10px; font-size: 12px; }
-.instances { display: flex; flex-direction: column; gap: 8px; }
-.instance-card {
-  background: #fff;
-  border: 1px solid #e5e2de;
-  border-radius: 8px;
-  overflow: hidden;
-}
-.instance-header {
-  display: flex;
-  align-items: center;
-  padding: 12px 16px;
-  gap: 12px;
-  cursor: pointer;
-  user-select: none;
-}
-.instance-header:hover { background: #f5f3f0; }
-.status-dot {
-  width: 10px; height: 10px;
-  border-radius: 50%;
-  flex-shrink: 0;
-}
-.status-dot.running { background: #4ade80; box-shadow: 0 0 6px #4ade8066; }
-.status-dot.stopped { background: #aaa; }
-.status-dot.failed { background: #f87171; box-shadow: 0 0 6px #f8717166; }
-.instance-info { flex: 1; display: flex; gap: 16px; align-items: center; font-size: 13px; }
-.instance-info .group { font-weight: 600; color: #d77757; }
-.instance-info .cmd { color: #888; max-width: 300px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.instance-info .pid { color: #999; font-size: 12px; }
-.instance-info .uptime { color: #999; font-size: 12px; }
-.instance-actions { display: flex; gap: 6px; }
-.expand-icon { color: #999; font-size: 12px; transition: transform 0.2s; }
-.expand-icon.open { transform: rotate(90deg); }
-.log-panel {
-  display: none;
-  border-top: 1px solid #e5e2de;
-  background: #faf9f7;
-  max-height: 300px;
-  overflow-y: auto;
-  padding: 12px 16px;
-  font-family: 'SF Mono', 'Fira Code', 'Consolas', monospace;
-  font-size: 12px;
-  line-height: 1.6;
-}
-.log-panel.visible { display: block; }
-.log-line { white-space: pre-wrap; word-break: break-all; }
-.log-line.stdout { color: #333; }
-.log-line.stderr { color: #d94040; }
-.empty { color: #999; text-align: center; padding: 40px; font-size: 14px; }
-
-@media (max-width: 640px) {
-  body { padding: 12px; }
-  .create-form { flex-wrap: wrap; }
-  .form-group input, .form-group input.wide { width: 100%; }
-  .form-group { flex: 1 1 120px; min-width: 0; }
-  .instance-header { flex-wrap: wrap; padding: 10px 12px; gap: 8px; }
-  .instance-info { flex-wrap: wrap; gap: 6px; font-size: 12px; }
-  .instance-info .cmd { max-width: 100%; }
-  button.small { padding: 8px 14px; min-height: 44px; font-size: 13px; }
-  .log-panel { max-height: 50vh; }
-}
-</style>
-</head>
-<body>
-<div class="header">
-  <h1>ACP Manager</h1>
-</div>
-
-<div class="create-form">
-  <div class="form-group">
-    <label>Group</label>
-    <input type="text" id="inp-group" placeholder="my-group" />
-  </div>
-  <div class="form-group">
-    <label>ACP Command</label>
-    <input type="text" id="inp-command" class="wide" placeholder="/path/to/agent --verbose" />
-  </div>
-  <button id="btn-create">Create</button>
-</div>
-
-<div class="instances" id="instance-list"></div>
-
-<script>
-var listEl = document.getElementById('instance-list');
-var esMap = {};
-var instances = [];
-var inpGroup = document.getElementById('inp-group');
-var inpCommand = document.getElementById('inp-command');
-var btnCreate = document.getElementById('btn-create');
-
-// localStorage persistence
-function loadForm() {
-  try {
-    inpGroup.value = localStorage.getItem('acp-mgr-group') || '';
-    inpCommand.value = localStorage.getItem('acp-mgr-command') || '';
-  } catch(e) {}
-}
-function saveForm() {
-  try {
-    localStorage.setItem('acp-mgr-group', inpGroup.value);
-    localStorage.setItem('acp-mgr-command', inpCommand.value);
-  } catch(e) {}
-}
-inpGroup.addEventListener('input', saveForm);
-inpCommand.addEventListener('input', saveForm);
-loadForm();
-
-btnCreate.addEventListener('click', function() {
-  var group = inpGroup.value.trim();
-  var command = inpCommand.value.trim();
-  if (!group || !command) return alert('Both fields required');
-  btnCreate.disabled = true;
-  fetch('/api/instances', {
-    method: 'POST',
-    headers: {'Content-Type': 'application/json'},
-    body: JSON.stringify({ group: group, command: command }),
-  }).then(function() { fetchInstances(); })
-   .finally(function() { btnCreate.disabled = false; });
-});
-
-// event delegation for instance actions
-listEl.addEventListener('click', function(e) {
-  var btn = e.target.closest('[data-action]');
-  if (btn) {
-    e.stopPropagation();
-    var id = btn.getAttribute('data-id');
-    var action = btn.getAttribute('data-action');
-    if (action === 'stop') stopInstance(id);
-    else if (action === 'delete') deleteInstance(id);
-    return;
-  }
-  var header = e.target.closest('.instance-header');
-  if (header) {
-    var cardId = header.closest('.instance-card').getAttribute('data-id');
-    toggleLog(cardId);
-  }
-});
-
-async function fetchInstances() {
-  var res = await fetch('/api/instances');
-  instances = await res.json();
-  render();
-}
-
-function uptime(start) {
-  var s = Math.floor((Date.now() - start) / 1000);
-  if (s < 60) return s + 's';
-  if (s < 3600) return Math.floor(s/60) + 'm ' + (s%60) + 's';
-  return Math.floor(s/3600) + 'h ' + Math.floor((s%3600)/60) + 'm';
-}
-
-function esc(s) {
-  return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
-}
-
-function render() {
-  if (instances.length === 0) {
-    listEl.innerHTML = '<div class="empty">No instances. Create one above.</div>';
-    return;
-  }
-  // Diff-based update: only rebuild cards whose status changed
-  var existingCards = {};
-  listEl.querySelectorAll('.instance-card').forEach(function(card) {
-    existingCards[card.getAttribute('data-id')] = card;
-  });
-
-  var newIds = new Set(instances.map(function(i) { return i.id; }));
-
-  // Remove cards that no longer exist
-  for (var eid in existingCards) {
-    if (!newIds.has(eid)) {
-      closeLog(eid);
-      existingCards[eid].remove();
-      delete existingCards[eid];
-    }
-  }
-
-  // Update or create cards in order
-  instances.forEach(function(inst) {
-    var card = existingCards[inst.id];
-    if (!card) {
-      // New instance — create card
-      card = document.createElement('div');
-      card.className = 'instance-card';
-      card.setAttribute('data-id', inst.id);
-      card.innerHTML =
-        '<div class="instance-header">' +
-        '<span class="expand-icon">&#9654;</span>' +
-        '<span class="status-dot"></span>' +
-        '<div class="instance-info">' +
-        '<span class="group"></span>' +
-        '<span class="cmd"></span>' +
-        '<span class="pid"></span>' +
-        '<span class="uptime"></span>' +
-        '</div>' +
-        '<div class="instance-actions"></div>' +
-        '</div>' +
-        '<div class="log-panel" id="log-' + inst.id + '"></div>';
-      listEl.appendChild(card);
-    }
-    // Update card content
-    card.querySelector('.status-dot').className = 'status-dot ' + inst.status;
-    card.querySelector('.group').textContent = inst.group;
-    card.querySelector('.cmd').textContent = inst.command;
-    card.querySelector('.pid').textContent = inst.pid ? 'PID ' + inst.pid : '';
-    card.querySelector('.uptime').textContent = inst.status === 'running' ? uptime(inst.startTime) : '';
-
-    // Update action buttons
-    var actions = card.querySelector('.instance-actions');
-    var prevStatus = card.getAttribute('data-status');
-    if (prevStatus !== inst.status) {
-      card.setAttribute('data-status', inst.status);
-      actions.innerHTML = inst.status === 'running'
-        ? '<button class="small danger" data-action="stop" data-id="' + inst.id + '">Stop</button>'
-        : '<button class="small danger" data-action="delete" data-id="' + inst.id + '">Delete</button>';
-    }
-  });
-}
-
-async function stopInstance(id) {
-  var btn = listEl.querySelector('[data-action="stop"][data-id="' + id + '"]');
-  if (btn) btn.disabled = true;
-  await fetch('/api/instances/' + id + '/stop', { method: 'POST' });
-  await fetchInstances();
-}
-
-async function deleteInstance(id) {
-  var btn = listEl.querySelector('[data-action="delete"][data-id="' + id + '"]');
-  if (btn) btn.disabled = true;
-  await fetch('/api/instances/' + id, { method: 'DELETE' });
-  closeLog(id);
-  await fetchInstances();
-}
-
-function toggleLog(id) {
-  var panel = document.getElementById('log-' + id);
-  if (!panel) return;
-  if (panel.classList.contains('visible')) {
-    closeLog(id);
-  } else {
-    openLog(id);
-  }
-  var icon = listEl.querySelector('[data-id="' + id + '"] .expand-icon');
-  if (icon) icon.classList.toggle('open', panel.classList.contains('visible'));
-}
-
-function openLog(id) {
-  var panel = document.getElementById('log-' + id);
-  if (!panel) return;
-  panel.classList.add('visible');
-  panel.innerHTML = '';
-  var es = new EventSource('/api/instances/' + id + '/logs');
-  esMap[id] = es;
-  var scrollPending = false;
-  es.onmessage = function(e) {
-    try {
-      var entry = JSON.parse(e.data);
-      var line = document.createElement('div');
-      line.className = 'log-line ' + entry.stream;
-      var time = new Date(entry.timestamp).toLocaleTimeString();
-      line.textContent = '[' + time + '] ' + entry.text;
-      panel.appendChild(line);
-      if (panel.children.length > 500) panel.removeChild(panel.firstChild);
-      if (!scrollPending) {
-        scrollPending = true;
-        requestAnimationFrame(function() {
-          panel.scrollTop = panel.scrollHeight;
-          scrollPending = false;
-        });
-      }
-    } catch(err) {}
-  };
-  es.onerror = function() {
-    es.close();
-    delete esMap[id];
-  };
-}
-
-function closeLog(id) {
-  if (esMap[id]) {
-    esMap[id].close();
-    delete esMap[id];
-  }
-  var panel = document.getElementById('log-' + id);
-  if (panel) panel.classList.remove('visible');
-}
-
-fetchInstances();
-setInterval(fetchInstances, 3000);
-</script>
-</body>
-</html>`;
--- a/packages/acp-link/src/manager/index.ts
+++ b/packages/acp-link/src/manager/index.ts
@@ -1,44 +0,0 @@
-import { Hono } from "hono";
-import { serve } from "@hono/node-server";
-import { ProcessManager } from "./manager.js";
-import { createApp } from "./routes.js";
-
-export async function startManager(port: number): Promise<void> {
-  const manager = new ProcessManager();
-  const app = createApp(manager);
-
-  // Health check
-  app.get("/health", (c) => c.json({ status: "ok" }));
-
-  let shuttingDown = false;
-  const shutdown = async () => {
-    if (shuttingDown) return;
-    shuttingDown = true;
-    console.log("Shutting down...");
-    await manager.shutdownAll();
-    process.exit(0);
-  };
-  process.on("SIGTERM", shutdown);
-  process.on("SIGINT", shutdown);
-
-  const server = serve({ fetch: app.fetch, port });
-  server.on("error", (err: NodeJS.ErrnoException) => {
-    if (err.code === "EADDRINUSE") {
-      console.error(`\n  Error: port ${port} is already in use. Use --port to specify a different port.\n`);
-    } else {
-      console.error(`\n  Error: ${err.message}\n`);
-    }
-    process.exit(1);
-  });
-
-  console.log();
-  console.log(`  🖥️  ACP Manager`);
-  console.log();
-  console.log(`    URL:   http://localhost:${port}`);
-  console.log();
-  console.log(`  Press Ctrl+C to stop`);
-  console.log();
-
-  // Keep running
-  await new Promise(() => {});
-}
--- a/packages/acp-link/src/manager/manager.ts
+++ b/packages/acp-link/src/manager/manager.ts
@@ -1,233 +0,0 @@
-import type { AcpInstance, InstanceSummary, LogEntry } from "./types.js";
-
-function log(tag: string, msg: string) {
-  const ts = new Date().toISOString();
-  console.log(`[${ts}] [${tag}] ${msg}`);
-}
-
-const MAX_LOG_LINES = 2000;
-const SHUTDOWN_TIMEOUT_MS = 5000;
-
-export class ProcessManager {
-  private instances = new Map<string, AcpInstance>();
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private processes = new Map<string, any>();
-
-  create(group: string, command: string): AcpInstance {
-    const id = crypto.randomUUID();
-    const instance: AcpInstance = {
-      id,
-      group,
-      command,
-      status: "running",
-      pid: undefined,
-      startTime: Date.now(),
-      exitCode: null,
-      logs: [],
-      subscribers: new Set(),
-    };
-
-    const args = this.parseCommand(command);
-    const fullArgs = ["--group", group, ...args];
-
-    const proc = Bun.spawn(["acp-link", ...fullArgs], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: { ...Bun.env, ACP_CHILD: "1" },
-    });
-
-    instance.pid = proc.pid;
-    this.instances.set(id, instance);
-    this.processes.set(id, proc);
-    log("manager", `created instance ${id.slice(0, 8)} group=${group} pid=${proc.pid} cmd="acp-link ${fullArgs.join(" ")}"`);
-
-    this.pipeStream(proc.stdout, id, "stdout");
-    this.pipeStream(proc.stderr, id, "stderr");
-
-    proc.exited.then((code) => {
-      instance.status = code === 0 ? "stopped" : "failed";
-      instance.exitCode = code;
-      instance.pid = undefined;
-      this.processes.delete(id);
-      log("manager", `instance ${id.slice(0, 8)} ${instance.status} exit=${code}`);
-      this.notifyStatus(instance);
-    });
-
-    return instance;
-  }
-
-  stop(id: string): boolean {
-    const proc = this.processes.get(id);
-    if (!proc) return false;
-    const inst = this.instances.get(id);
-    log("manager", `stopping instance ${id.slice(0, 8)} pid=${proc.pid}`);
-    proc.kill("SIGTERM");
-    // Immediately mark as stopped to prevent stale state
-    if (inst) {
-      inst.status = "stopped";
-    }
-    return true;
-  }
-
-  remove(id: string): boolean {
-    const instance = this.instances.get(id);
-    if (!instance) return false;
-    if (instance.status === "running") return false;
-    instance.subscribers.clear();
-    this.instances.delete(id);
-    log("manager", `removed instance ${id.slice(0, 8)} group=${instance.group}`);
-    return true;
-  }
-
-  list(): InstanceSummary[] {
-    return Array.from(this.instances.values()).map(this.toSummary);
-  }
-
-  get(id: string): AcpInstance | undefined {
-    return this.instances.get(id);
-  }
-
-  subscribe(id: string, callback: (entry: LogEntry) => void): () => void {
-    const instance = this.instances.get(id);
-    if (!instance) return () => {};
-    instance.subscribers.add(callback);
-    return () => instance.subscribers.delete(callback);
-  }
-
-  async shutdownAll(): Promise<void> {
-    const running = Array.from(this.processes.entries());
-    if (running.length === 0) return;
-
-    log("manager", `shutting down ${running.length} running instance(s)...`);
-    for (const [id, proc] of running) {
-      try {
-        proc.kill("SIGTERM");
-        log("manager", `sent SIGTERM to ${id.slice(0, 8)} pid=${proc.pid}`);
-      } catch {
-        // already dead
-      }
-    }
-
-    const timeout = new Promise<void>((resolve) => setTimeout(resolve, SHUTDOWN_TIMEOUT_MS));
-    await Promise.race([
-      Promise.all(running.map(([, proc]) => proc.exited.catch(() => {}))),
-      timeout,
-    ]);
-
-    for (const [id, proc] of running) {
-      try {
-        proc.kill("SIGKILL");
-        log("manager", `sent SIGKILL to ${id.slice(0, 8)}`);
-      } catch {
-        // already dead
-      }
-    }
-    log("manager", "all instances shut down");
-  }
-
-  private parseCommand(command: string): string[] {
-    const args: string[] = [];
-    let current = "";
-    let inQuote: string | null = null;
-
-    for (const ch of command) {
-      if (inQuote) {
-        if (ch === inQuote) {
-          inQuote = null;
-        } else {
-          current += ch;
-        }
-      } else if (ch === '"' || ch === "'") {
-        inQuote = ch;
-      } else if (ch === " " || ch === "\t") {
-        if (current) {
-          args.push(current);
-          current = "";
-        }
-      } else {
-        current += ch;
-      }
-    }
-    if (current) args.push(current);
-    return args;
-  }
-
-  private pipeStream(
-    readable: ReadableStream<Uint8Array>,
-    instanceId: string,
-    stream: "stdout" | "stderr",
-  ) {
-    const reader = readable.getReader();
-    const decoder = new TextDecoder();
-    let buffer = "";
-
-    const processChunk = () => {
-      reader
-        .read()
-        .then(({ done, value }) => {
-          if (done) {
-            if (buffer) this.appendLog(instanceId, buffer, stream);
-            return;
-          }
-          buffer += decoder.decode(value, { stream: true });
-          const lines = buffer.split("\n");
-          buffer = lines.pop() ?? "";
-          for (const line of lines) {
-            if (line) this.appendLog(instanceId, line, stream);
-          }
-          processChunk();
-        })
-        .catch(() => {
-          // stream ended or error
-        });
-    };
-    processChunk();
-  }
-
-  private appendLog(instanceId: string, text: string, stream: "stdout" | "stderr") {
-    const instance = this.instances.get(instanceId);
-    if (!instance) return;
-
-    const entry: LogEntry = { timestamp: Date.now(), stream, text };
-    instance.logs.push(entry);
-    if (instance.logs.length > MAX_LOG_LINES) {
-      instance.logs.splice(0, instance.logs.length - MAX_LOG_LINES);
-    }
-
-    for (const sub of instance.subscribers) {
-      try {
-        sub(entry);
-      } catch {
-        // subscriber error, remove it
-        instance.subscribers.delete(sub);
-      }
-    }
-  }
-
-  private notifyStatus(instance: AcpInstance) {
-    const statusEntry: LogEntry = {
-      timestamp: Date.now(),
-      stream: "stderr",
-      text: `[${instance.status}] exit code: ${instance.exitCode}`,
-    };
-    for (const sub of instance.subscribers) {
-      try {
-        sub(statusEntry);
-      } catch {
-        instance.subscribers.delete(sub);
-      }
-    }
-  }
-
-  private toSummary(inst: AcpInstance): InstanceSummary {
-    return {
-      id: inst.id,
-      group: inst.group,
-      command: inst.command,
-      status: inst.status,
-      pid: inst.pid,
-      startTime: inst.startTime,
-      exitCode: inst.exitCode,
-    };
-  }
-}
--- a/packages/acp-link/src/manager/routes.ts
+++ b/packages/acp-link/src/manager/routes.ts
@@ -1,153 +0,0 @@
-import { Hono } from "hono";
-import type { ProcessManager } from "./manager.js";
-import { MANAGER_HTML } from "./html.js";
-
-function logReq(method: string, path: string, status?: number) {
-  const ts = new Date().toISOString();
-  const suffix = status != null ? ` -> ${status}` : "";
-  console.log(`[${ts}] [http] ${method} ${path}${suffix}`);
-}
-
-export function createApp(manager: ProcessManager): Hono {
-  const app = new Hono();
-
-  app.get("/", (c) => {
-    logReq("GET", "/", 200);
-    return c.html(MANAGER_HTML);
-  });
-
-  app.get("/api/instances", (c) => {
-    const list = manager.list();
-    logReq("GET", "/api/instances", 200);
-    return c.json(list);
-  });
-
-  app.post("/api/instances", async (c) => {
-    let body: { group?: string; command?: string };
-    try {
-      body = await c.req.json<{ group?: string; command?: string }>();
-    } catch {
-      logReq("POST", "/api/instances", 400);
-      return c.json({ error: "invalid JSON body" }, 400);
-    }
-    if (!body.group?.trim() || !body.command?.trim()) {
-      logReq("POST", "/api/instances", 400);
-      return c.json({ error: "group and command are required" }, 400);
-    }
-    const instance = manager.create(body.group.trim(), body.command.trim());
-    logReq("POST", `/api/instances group=${body.group}`, 201);
-    return c.json(
-      {
-        id: instance.id,
-        group: instance.group,
-        command: instance.command,
-        status: instance.status,
-        pid: instance.pid,
-        startTime: instance.startTime,
-        exitCode: instance.exitCode,
-      },
-      201,
-    );
-  });
-
-  app.post("/api/instances/:id/stop", (c) => {
-    const id = c.req.param("id");
-    const inst = manager.get(id);
-    if (!inst) {
-      logReq("POST", `/api/instances/${id.slice(0, 8)}/stop`, 404);
-      return c.json({ error: "not found" }, 404);
-    }
-    if (inst.status !== "running") {
-      logReq("POST", `/api/instances/${id.slice(0, 8)}/stop`, 400);
-      return c.json({ error: "not running" }, 400);
-    }
-    manager.stop(inst.id);
-    logReq("POST", `/api/instances/${id.slice(0, 8)}/stop`, 200);
-    return c.json({ ok: true });
-  });
-
-  app.delete("/api/instances/:id", (c) => {
-    const id = c.req.param("id");
-    const inst = manager.get(id);
-    if (!inst) {
-      logReq("DELETE", `/api/instances/${id.slice(0, 8)}`, 404);
-      return c.json({ error: "not found" }, 404);
-    }
-    if (inst.status === "running") {
-      logReq("DELETE", `/api/instances/${id.slice(0, 8)}`, 400);
-      return c.json({ error: "still running" }, 400);
-    }
-    manager.remove(inst.id);
-    logReq("DELETE", `/api/instances/${id.slice(0, 8)}`, 200);
-    return c.json({ ok: true });
-  });
-
-  app.get("/api/instances/:id/logs", (c) => {
-    const id = c.req.param("id");
-    const inst = manager.get(id);
-    if (!inst) {
-      logReq("GET", `/api/instances/${id.slice(0, 8)}/logs`, 404);
-      return c.json({ error: "not found" }, 404);
-    }
-    logReq("GET", `/api/instances/${id.slice(0, 8)}/logs SSE`);
-
-    const stream = new ReadableStream({
-      start(controller) {
-        const encoder = new TextEncoder();
-
-        const send = (data: string) => {
-          try {
-            controller.enqueue(encoder.encode(data));
-          } catch {
-            // stream closed
-          }
-        };
-
-        // send historical logs
-        for (const log of inst.logs) {
-          send(`data: ${JSON.stringify(log)}\n\n`);
-        }
-
-        // subscribe to new logs
-        const unsub = manager.subscribe(inst.id, (entry) => {
-          send(`data: ${JSON.stringify(entry)}\n\n`);
-        });
-
-        // keepalive every 15s
-        const keepalive = setInterval(() => {
-          send(": keepalive\n\n");
-        }, 15000);
-
-        const cleanup = () => {
-          unsub();
-          clearInterval(keepalive);
-          logReq("SSE", `/api/instances/${id.slice(0, 8)}/logs closed`);
-          try {
-            controller.close();
-          } catch {
-            // already closed
-          }
-        };
-
-        c.req.raw.signal.addEventListener("abort", cleanup, { once: true });
-      },
-    });
-
-    return new Response(stream, {
-      headers: {
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive",
-        "X-Accel-Buffering": "no",
-      },
-    });
-  });
-
-  // Catch-all: log unmatched routes for debugging
-  app.all("*", (c) => {
-    logReq(c.req.method, c.req.path, 404);
-    return c.json({ error: "not found", path: c.req.path }, 404);
-  });
-
-  return app;
-}
--- a/packages/acp-link/src/manager/types.ts
+++ b/packages/acp-link/src/manager/types.ts
@@ -1,34 +0,0 @@
-export type InstanceStatus = "running" | "stopped" | "failed";
-
-export interface AcpInstance {
-  id: string;
-  group: string;
-  command: string;
-  status: InstanceStatus;
-  pid: number | undefined;
-  startTime: number;
-  exitCode: number | null;
-  logs: LogEntry[];
-  subscribers: Set<(entry: LogEntry) => void>;
-}
-
-export interface LogEntry {
-  timestamp: number;
-  stream: "stdout" | "stderr";
-  text: string;
-}
-
-export interface CreateInstanceRequest {
-  group: string;
-  command: string;
-}
-
-export interface InstanceSummary {
-  id: string;
-  group: string;
-  command: string;
-  status: InstanceStatus;
-  pid: number | undefined;
-  startTime: number;
-  exitCode: number | null;
-}
--- a/packages/acp-link/src/server.ts
+++ b/packages/acp-link/src/server.ts
@@ -22,8 +22,6 @@ export interface ServerConfig {
  https?: boolean;
  /** Default permission mode for new sessions (e.g. "auto", "default", "bypassPermissions") */
  permissionMode?: string;
-  /** Channel group ID for RCS registration */
-  group?: string;
 }

 // Pending permission request
@@ -610,16 +608,11 @@ export async function startServer(config: ServerConfig): Promise<void> {
  // Initialize RCS upstream client if configured
  const rcsUrl = process.env.ACP_RCS_URL;
  const rcsToken = process.env.ACP_RCS_TOKEN;
-  const rcsGroup = config.group || process.env.ACP_RCS_GROUP;
-  if (rcsGroup && !/^[a-zA-Z0-9_-]+$/.test(rcsGroup)) {
-    throw new Error(`Invalid ACP_RCS_GROUP "${rcsGroup}": only letters, digits, hyphens, and underscores are allowed`);
-  }
  if (rcsUrl) {
    rcsUpstream = new RcsUpstreamClient({
      rcsUrl,
      apiToken: rcsToken || "",
      agentName: command,
-      channelGroupId: rcsGroup || undefined,
      maxSessions: 1,
    });

@@ -883,16 +876,20 @@ export async function startServer(config: ServerConfig): Promise<void> {
    authEnabled: !!AUTH_TOKEN,
  }, "started");

-  // Graceful shutdown — close RCS upstream
-  const shutdown = async () => {
-    if (rcsUpstream) {
-      await rcsUpstream.close();
-    }
-    process.exit(0);
-  };
-  process.on("SIGINT", shutdown);
-  process.on("SIGTERM", shutdown);
-
  // Keep the server running
  await new Promise(() => {});
 }
+
+// Graceful shutdown — close RCS upstream on process exit
+process.on("SIGINT", async () => {
+  if (rcsUpstream) {
+    await rcsUpstream.close();
+  }
+  process.exit(0);
+});
+process.on("SIGTERM", async () => {
+  if (rcsUpstream) {
+    await rcsUpstream.close();
+  }
+  process.exit(0);
+});
--- a/packages/acp-link/tsconfig.json
+++ b/packages/acp-link/tsconfig.json
@@ -3,12 +3,12 @@
    // Environment setup & latest features
    "lib": ["ESNext"],
    "target": "ES2022",
-    "module": "esnext",
+    "module": "NodeNext",
    "moduleDetection": "force",
    "allowJs": true,

    // Node.js module resolution
-    "moduleResolution": "bundler",
+    "moduleResolution": "NodeNext",
    "verbatimModuleSyntax": true,

    // Output
@@ -30,8 +30,7 @@
    // Some stricter flags (disabled by default)
    "noUnusedLocals": false,
    "noUnusedParameters": false,
-    "noPropertyAccessFromIndexSignature": false,
-    "types": ["bun"],
+    "noPropertyAccessFromIndexSignature": false
  },
  "include": ["src/**/*"],
  "exclude": ["node_modules", "dist", "src/__tests__"]
--- a/packages/audio-capture-napi/src/index.ts
+++ b/packages/audio-capture-napi/src/index.ts
@@ -1,9 +1,3 @@
-import { createRequire } from 'node:module'
-
-// createRequire works in both Bun and Node.js ESM contexts.
-// Needed because this package is "type": "module" but uses require() for
-// loading native .node addons — bare require is not available in Node.js ESM.
-const nodeRequire = createRequire(import.meta.url)

 type AudioCaptureNapi = {
  startRecording(
@@ -47,7 +41,7 @@ function loadModule(): AudioCaptureNapi | null {
  if (process.env.AUDIO_CAPTURE_NODE_PATH) {
    try {
      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      cachedModule = nodeRequire(
+      cachedModule = require(
        process.env.AUDIO_CAPTURE_NODE_PATH,
      ) as AudioCaptureNapi
      return cachedModule
@@ -69,7 +63,7 @@ function loadModule(): AudioCaptureNapi | null {
  for (const p of fallbacks) {
    try {
      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      cachedModule = nodeRequire(p) as AudioCaptureNapi
+      cachedModule = require(p) as AudioCaptureNapi
      return cachedModule
    } catch {
      // try next
--- a/packages/color-diff-napi/src/index.ts
+++ b/packages/color-diff-napi/src/index.ts
@@ -17,16 +17,10 @@
 *   getSyntaxTheme always returns the default for the given Claude theme.
 */

-import { createRequire } from 'node:module'
 import { diffArrays } from 'diff'
 import type * as hljsNamespace from 'highlight.js'
 import { basename, extname } from 'path'

-// createRequire works in both Bun and Node.js ESM contexts.
-// Needed because this package is "type": "module" but uses require() for
-// lazy loading — bare require is not available in Node.js ESM.
-const nodeRequire = createRequire(import.meta.url)
-
 // Lazy: defers loading highlight.js until first render. The full bundle
 // registers 190+ language grammars at require time (~50MB, 100-200ms on
 // macOS, several× that on Windows). With a top-level import, any caller
@@ -40,7 +34,8 @@ type HLJSApi = typeof hljsNamespace.default
 let cachedHljs: HLJSApi | null = null
 function hljs(): HLJSApi {
  if (cachedHljs) return cachedHljs
-  const mod = nodeRequire('highlight.js')
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const mod = require('highlight.js')
  // highlight.js uses `export =` (CJS). Under bun/ESM the interop wraps it
  // in .default; under node CJS the module IS the API. Check at runtime.
  cachedHljs = 'default' in mod && mod.default ? mod.default : mod
--- a/packages/image-processor-napi/src/index.ts
+++ b/packages/image-processor-napi/src/index.ts
@@ -1,4 +1,3 @@
-import { readFileSync, unlinkSync } from 'node:fs'
 import sharpModule from 'sharp'

 export const sharp = sharpModule
@@ -63,11 +62,13 @@ return "${tmpPath}"
        }

        const file = Bun.file(tmpPath)
-        const buffer: Buffer = readFileSync(tmpPath)
+        // Use synchronous read via Node compat
+        const fs = require('fs')
+        const buffer: Buffer = fs.readFileSync(tmpPath)

        // Clean up temp file
        try {
-          unlinkSync(tmpPath)
+          fs.unlinkSync(tmpPath)
        } catch {
          // ignore cleanup errors
        }
--- a/packages/remote-control-server/src/auth/middleware.ts
+++ b/packages/remote-control-server/src/auth/middleware.ts
@@ -90,20 +90,9 @@ export function getUuidFromRequest(c: Context): string | undefined {

 /**
 * UUID-based auth for Web UI routes (no-login mode).
- * Accepts UUID in query param/header, OR a valid API key via Authorization header.
+ * Requires a UUID in query param or header, injects it into context as c.set("uuid").
 */
 export async function uuidAuth(c: Context, next: Next) {
-  // Try API key auth via Authorization header
-  const bearer = extractBearerToken(c);
-  if (bearer && validateApiKey(bearer)) {
-    // Valid API key — generate a stable UUID from the key for downstream use
-    const uuid = getUuidFromRequest(c);
-    c.set("uuid", uuid || bearer);
-    await next();
-    return;
-  }
-
-  // Fall back to UUID auth
  const uuid = getUuidFromRequest(c);
  if (!uuid) {
    return c.json({ error: { type: "unauthorized", message: "Missing UUID" } }, 401);
--- a/packages/remote-control-server/src/routes/v1/environments.ts
+++ b/packages/remote-control-server/src/routes/v1/environments.ts
@@ -1,7 +1,6 @@
 import { Hono } from "hono";
 import { registerEnvironment, deregisterEnvironment, reconnectEnvironment } from "../../services/environment";
 import { apiKeyAuth, acceptCliHeaders } from "../../auth/middleware";
-import { storeBindSession } from "../../store";

 const app = new Hono();

@@ -10,13 +9,6 @@ app.post("/bridge", acceptCliHeaders, apiKeyAuth, async (c) => {
  const body = await c.req.json();
  const username = c.get("username");
  const result = registerEnvironment({ ...body, username });
-  // Bind ACP session to the group ID so the web UI can find it by group
-  if (result.session_id) {
-    const groupId = body.bridge_id as string | undefined;
-    if (groupId) {
-      storeBindSession(result.session_id, groupId);
-    }
-  }
  return c.json(result, 200);
 });

--- a/packages/remote-control-server/src/services/environment.ts
+++ b/packages/remote-control-server/src/services/environment.ts
@@ -6,7 +6,6 @@ import {
  storeUpdateEnvironment,
  storeListActiveEnvironments,
  storeListActiveEnvironmentsByUsername,
-  storeListSessionsByEnvironment,
 } from "../store";
 import type { RegisterEnvironmentRequest, EnvironmentResponse } from "../types/api";
 import type { EnvironmentRecord } from "../store";
@@ -21,7 +20,6 @@ function toResponse(row: EnvironmentRecord): EnvironmentResponse {
    username: row.username,
    last_poll_at: row.lastPollAt ? row.lastPollAt.getTime() / 1000 : null,
    worker_type: row.workerType,
-    channel_group_id: row.bridgeId,
    capabilities: row.capabilities,
  };
 }
@@ -43,19 +41,14 @@ export function registerEnvironment(req: RegisterEnvironmentRequest & { metadata
  });

  let sessionId: string | undefined;
-  // ACP agents: reuse existing session or create one
+  // ACP agents: auto-create a session so they appear in the dashboard sessions list
  if (workerType === "acp") {
-    const existing = storeListSessionsByEnvironment(record.id);
-    if (existing.length > 0) {
-      sessionId = existing[0].id;
-    } else {
-      const session = storeCreateSession({
-        environmentId: record.id,
-        title: req.machine_name || "ACP Agent",
-        source: "acp",
-      });
-      sessionId = session.id;
-    }
+    const session = storeCreateSession({
+      environmentId: record.id,
+      title: req.machine_name || "ACP Agent",
+      source: "acp",
+    });
+    sessionId = session.id;
  }

  return { environment_id: record.id, environment_secret: record.secret, status: record.status as "active", session_id: sessionId };
--- a/packages/remote-control-server/src/store.ts
+++ b/packages/remote-control-server/src/store.ts
@@ -98,14 +98,13 @@ export function storeDeleteToken(token: string): boolean {

 // ---------- Environment ----------

-/** Find an active or offline environment by machineName (optionally filtered by workerType).
- *  Includes "offline" so ACP agents can be reused on reconnect. */
+/** Find an active environment by machineName (optionally filtered by workerType) */
 export function storeFindEnvironmentByMachineName(
  machineName: string,
  workerType?: string,
 ): EnvironmentRecord | undefined {
  for (const rec of environments.values()) {
-    if (rec.machineName === machineName && (rec.status === "active" || rec.status === "offline")) {
+    if (rec.machineName === machineName && rec.status === "active") {
      if (!workerType || rec.workerType === workerType) {
        return rec;
      }
@@ -314,32 +313,12 @@ export function storeGetSessionOwners(sessionId: string): Set<string> | undefine

 export function storeListSessionsByOwnerUuid(uuid: string): SessionRecord[] {
  const result: SessionRecord[] = [];
-  const resultIds = new Set<string>();
-
-  // Collect sessions already owned by this UUID
  for (const [sessionId, owners] of sessionOwners) {
    if (owners.has(uuid)) {
      const session = sessions.get(sessionId);
-      if (session) {
-        result.push(session);
-        resultIds.add(sessionId);
-      }
+      if (session) result.push(session);
    }
  }
-
-  // Auto-bind orphaned sessions (no owner — typically ACP agent sessions created via REST registration)
-  for (const [sessionId, session] of sessions) {
-    if (resultIds.has(sessionId)) continue;
-    const owners = sessionOwners.get(sessionId);
-    // No owners map entry at all, or empty owners set
-    const isOrphaned = !owners || owners.size === 0;
-    if (isOrphaned) {
-      storeBindSession(sessionId, uuid);
-      result.push(session);
-      resultIds.add(sessionId);
-    }
-  }
-
  return result;
 }

--- a/packages/remote-control-server/src/types/api.ts
+++ b/packages/remote-control-server/src/types/api.ts
@@ -107,7 +107,6 @@ export interface EnvironmentResponse {
  username: string | null;
  last_poll_at: number | null;
  worker_type?: string;
-  channel_group_id?: string | null;
  capabilities?: Record<string, unknown> | null;
 }

--- a/packages/remote-control-server/web/src/App.tsx
+++ b/packages/remote-control-server/web/src/App.tsx
@@ -1,11 +1,9 @@
 import { useState, useEffect, useCallback, lazy, Suspense } from "react";
 import { Navbar } from "./components/Navbar";
 import { IdentityPanel } from "./components/IdentityPanel";
-import { TokenManagerDialog } from "./components/TokenManagerDialog";
 import { ThemeProvider } from "./lib/theme";
-import { getUuid, setUuid, apiBind, setActiveApiToken } from "./api/client";
+import { getUuid, setUuid, apiBind } from "./api/client";
 import { ACPDirectView } from "./components/ACPDirectView";
-import { useTokens } from "./hooks/useTokens";

 const Dashboard = lazy(() => import("./pages/Dashboard").then((m) => ({ default: m.Dashboard })));
 const SessionDetail = lazy(() => import("./pages/SessionDetail").then((m) => ({ default: m.SessionDetail })));
@@ -13,18 +11,7 @@ const SessionDetail = lazy(() => import("./pages/SessionDetail").then((m) => ({
 export default function App() {
  const [currentSessionId, setCurrentSessionId] = useState<string | null>(null);
  const [identityOpen, setIdentityOpen] = useState(false);
-  const [tokenDialogOpen, setTokenDialogOpen] = useState(false);
  const [acpDirect, setAcpDirect] = useState<{ url: string; token: string } | null>(null);
-  const { tokens, activeTokenId, activeLabel, activeTokenValue, setActiveTokenId, addToken, removeToken, updateToken } = useTokens();
-
-  // Sync active token to API client
-  useEffect(() => {
-    setActiveApiToken(activeTokenValue);
-  }, [activeTokenValue]);
-
-  const handleSetActiveToken = useCallback((id: string) => {
-    setActiveTokenId(id);
-  }, [setActiveTokenId]);

  // Simple hash-based router
  const parseRoute = useCallback(() => {
@@ -110,8 +97,6 @@ export default function App() {
      <div className="flex h-screen flex-col bg-surface-0 text-text-primary">
        <Navbar
          onIdentityClick={() => setIdentityOpen(true)}
-          onTokenClick={() => setTokenDialogOpen(true)}
-          activeTokenLabel={currentSessionId ? undefined : activeLabel}
          sessionTitle={currentSessionId || (acpDirect ? "ACP" : undefined)}
          onBack={(currentSessionId || acpDirect) ? navigateToDashboard : undefined}
        />
@@ -129,17 +114,6 @@ export default function App() {
        </Suspense>

        <IdentityPanel open={identityOpen} onClose={() => setIdentityOpen(false)} />
-
-        <TokenManagerDialog
-          open={tokenDialogOpen}
-          onClose={() => setTokenDialogOpen(false)}
-          tokens={tokens}
-          activeTokenId={activeTokenId}
-          onSetActive={handleSetActiveToken}
-          onAdd={addToken}
-          onRemove={removeToken}
-          onUpdate={updateToken}
-        />
      </div>
    </ThemeProvider>
  );
--- a/packages/remote-control-server/web/src/api/client.ts
+++ b/packages/remote-control-server/web/src/api/client.ts
@@ -24,35 +24,11 @@ export function setUuid(uuid: string): void {
  localStorage.setItem("rcs_uuid", uuid);
 }

-/** Active API token for Authorization header (set by useTokens) */
-let _activeToken: string | null = null;
-
-export function setActiveApiToken(token: string | null): void {
-  _activeToken = token;
-}
-
-export function getActiveApiToken(): string | null {
-  return _activeToken;
-}
-
 async function api<T>(method: string, path: string, body?: unknown): Promise<T> {
  const headers: Record<string, string> = { "Content-Type": "application/json" };
-
-  if (_activeToken) {
-    headers["Authorization"] = `Bearer ${_activeToken}`;
-  }
-
-  // When using Bearer token auth, backend derives UUID from the token — no need to send query param.
-  // Otherwise fall back to UUID auth via query param.
-  let url: string;
-  if (_activeToken) {
-    const sep = path.includes("?") ? "&" : "?";
-    url = `${BASE}${path}${sep}uuid=${encodeURIComponent(_activeToken)}`;
-  } else {
-    const uuid = getUuid();
-    const sep = path.includes("?") ? "&" : "?";
-    url = `${BASE}${path}${sep}uuid=${encodeURIComponent(uuid)}`;
-  }
+  const uuid = getUuid();
+  const sep = path.includes("?") ? "&" : "?";
+  const url = `${BASE}${path}${sep}uuid=${encodeURIComponent(uuid)}`;
  const opts: RequestInit = { method, headers };
  if (body !== undefined) opts.body = JSON.stringify(body);

--- a/packages/remote-control-server/web/src/components/Navbar.tsx
+++ b/packages/remote-control-server/web/src/components/Navbar.tsx
@@ -1,16 +1,14 @@
 import { cn } from "../lib/utils";
 import { ThemeToggle } from "../../components/ui/theme-toggle";
-import { ChevronLeft, LayoutGrid, UserPlus, KeyRound } from "lucide-react";
+import { ChevronLeft, LayoutGrid, UserPlus } from "lucide-react";

 interface NavbarProps {
  onIdentityClick: () => void;
-  onTokenClick: () => void;
-  activeTokenLabel?: string | null;
  sessionTitle?: string;
  onBack?: () => void;
 }

-export function Navbar({ onIdentityClick, onTokenClick, activeTokenLabel, sessionTitle, onBack }: NavbarProps) {
+export function Navbar({ onIdentityClick, sessionTitle, onBack }: NavbarProps) {
  return (
    <nav className="sticky top-0 z-40 border-b border-border bg-surface-1/80 backdrop-blur-md">
      <div className="mx-auto flex h-11 sm:h-12 max-w-5xl items-center justify-between px-3 sm:px-4">
@@ -53,19 +51,6 @@ export function Navbar({ onIdentityClick, onTokenClick, activeTokenLabel, sessio
            </a>
          )}
          <ThemeToggle />
-          <button
-            onClick={onTokenClick}
-            className={cn(
-              "flex items-center gap-1 rounded-md px-2 sm:px-3 py-1.5 text-sm transition-colors",
-              activeTokenLabel
-                ? "bg-brand/10 text-brand hover:bg-brand/20"
-                : "text-text-secondary hover:bg-surface-2 hover:text-text-primary"
-            )}
-            title="Token Manager"
-          >
-            <KeyRound className="h-4 w-4" />
-            <span className="hidden sm:inline max-w-24 truncate">{activeTokenLabel || "No Token"}</span>
-          </button>
          <button
            onClick={onIdentityClick}
            className="flex items-center gap-1 rounded-md px-2 sm:px-3 py-1.5 text-sm text-text-secondary hover:bg-surface-2 hover:text-text-primary transition-colors"
--- a/packages/remote-control-server/web/src/components/TokenManagerDialog.tsx
+++ b/packages/remote-control-server/web/src/components/TokenManagerDialog.tsx
@@ -1,217 +0,0 @@
-import { useState } from "react";
-import type { TokenEntry } from "../hooks/useTokens";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-} from "../../components/ui/dialog";
-import { Check, Copy, Eye, EyeOff, Pencil, Plus, Trash2, X } from "lucide-react";
-
-interface TokenManagerDialogProps {
-  open: boolean;
-  onClose: () => void;
-  tokens: TokenEntry[];
-  activeTokenId: string | null;
-  onSetActive: (id: string) => void;
-  onAdd: (token: string, label: string) => string | null;
-  onRemove: (id: string) => void;
-  onUpdate: (id: string, label: string) => void;
-}
-
-export function TokenManagerDialog({
-  open,
-  onClose,
-  tokens,
-  activeTokenId,
-  onSetActive,
-  onAdd,
-  onRemove,
-  onUpdate,
-}: TokenManagerDialogProps) {
-  const [newToken, setNewToken] = useState("");
-  const [newLabel, setNewLabel] = useState("");
-  const [addError, setAddError] = useState("");
-  const [editingId, setEditingId] = useState<string | null>(null);
-  const [editLabel, setEditLabel] = useState("");
-  const [visibleTokenId, setVisibleTokenId] = useState<string | null>(null);
-  const [copiedId, setCopiedId] = useState<string | null>(null);
-
-  const handleCopy = (id: string, token: string) => {
-    navigator.clipboard.writeText(token).then(() => {
-      setCopiedId(id);
-      setTimeout(() => setCopiedId(null), 1500);
-    });
-  };
-
-  const handleAdd = () => {
-    const error = onAdd(newToken, newLabel);
-    if (error) {
-      setAddError(error);
-      return;
-    }
-    setNewToken("");
-    setNewLabel("");
-    setAddError("");
-  };
-
-  const handleStartEdit = (entry: TokenEntry) => {
-    setEditingId(entry.id);
-    setEditLabel(entry.label);
-  };
-
-  const handleSaveEdit = (id: string) => {
-    onUpdate(id, editLabel.trim() || "Unnamed");
-    setEditingId(null);
-  };
-
-  const handleSwitch = (id: string) => {
-    onSetActive(id);
-    onClose();
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(o) => { if (!o) onClose(); }}>
-      <DialogContent className="max-w-md rounded-2xl border-border bg-surface-1 p-6 shadow-2xl">
-        <DialogHeader>
-          <DialogTitle className="font-display text-lg font-semibold text-text-primary">
-            Token Manager
-          </DialogTitle>
-          <DialogDescription className="text-sm text-text-muted">
-            Manage API tokens for RCS authentication.
-          </DialogDescription>
-        </DialogHeader>
-
-        {/* Token list */}
-        <div className="space-y-1 max-h-64 overflow-y-auto">
-          {tokens.map((entry) => (
-            <div key={entry.id} className="group flex items-center gap-1">
-              {editingId === entry.id ? (
-                <div className="flex flex-1 items-center gap-2 rounded-lg bg-surface-2 px-3 py-1.5">
-                  <input
-                    value={editLabel}
-                    onChange={(e) => setEditLabel(e.target.value)}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter") handleSaveEdit(entry.id);
-                      if (e.key === "Escape") setEditingId(null);
-                    }}
-                    className="flex-1 rounded border border-border bg-surface-1 px-2 py-1 text-sm text-text-primary focus:border-brand focus:outline-none"
-                    autoFocus
-                  />
-                  <button
-                    onClick={() => handleSaveEdit(entry.id)}
-                    className="text-brand hover:text-brand-light transition-colors"
-                  >
-                    <Check className="h-4 w-4" />
-                  </button>
-                  <button
-                    onClick={() => setEditingId(null)}
-                    className="text-text-muted hover:text-text-primary transition-colors"
-                  >
-                    <X className="h-4 w-4" />
-                  </button>
-                </div>
-              ) : (
-                <>
-                  <button
-                    onClick={() => handleSwitch(entry.id)}
-                    className={`flex flex-1 items-center justify-between rounded-lg px-3 py-2 text-sm transition-colors ${
-                      activeTokenId === entry.id
-                        ? "bg-brand/10 text-brand"
-                        : "text-text-secondary hover:bg-surface-2"
-                    }`}
-                  >
-                    <div className="flex flex-col items-start min-w-0">
-                      <span className="font-medium truncate w-full">{entry.label}</span>
-                      <span className="text-xs text-text-muted font-mono">
-                        {visibleTokenId === entry.id
-                          ? entry.token
-                          : `${entry.token.slice(0, 6)}${"\u2022".repeat(6)}`}
-                      </span>
-                    </div>
-                    {activeTokenId === entry.id && <Check className="h-4 w-4 flex-shrink-0" />}
-                  </button>
-                  <button
-                    onClick={() => setVisibleTokenId(visibleTokenId === entry.id ? null : entry.id)}
-                    className="rounded p-1 text-text-muted opacity-0 group-hover:opacity-100 hover:text-text-primary transition-all"
-                    title="Toggle token visibility"
-                  >
-                    {visibleTokenId === entry.id ? <EyeOff className="h-3.5 w-3.5" /> : <Eye className="h-3.5 w-3.5" />}
-                  </button>
-                  <button
-                    onClick={() => handleCopy(entry.id, entry.token)}
-                    className="rounded p-1 text-text-muted opacity-0 group-hover:opacity-100 hover:text-text-primary transition-all"
-                    title="Copy token"
-                  >
-                    {copiedId === entry.id ? <Check className="h-3.5 w-3.5 text-status-active" /> : <Copy className="h-3.5 w-3.5" />}
-                  </button>
-                  <button
-                    onClick={() => handleStartEdit(entry)}
-                    className="rounded p-1 text-text-muted opacity-0 group-hover:opacity-100 hover:text-text-primary transition-all"
-                    title="Edit label"
-                  >
-                    <Pencil className="h-3.5 w-3.5" />
-                  </button>
-                  <button
-                    onClick={() => onRemove(entry.id)}
-                    className="rounded p-1 text-text-muted opacity-0 group-hover:opacity-100 hover:text-status-error transition-all"
-                    title="Delete token"
-                  >
-                    <Trash2 className="h-3.5 w-3.5" />
-                  </button>
-                </>
-              )}
-            </div>
-          ))}
-
-          {tokens.length === 0 && (
-            <div className="py-4 text-center text-sm text-text-muted">
-              No tokens saved yet. Add one below.
-            </div>
-          )}
-        </div>
-
-        {/* Add form */}
-        <div className="border-t border-border pt-4 space-y-3">
-          <div className="text-sm font-medium text-text-secondary">Add Token</div>
-          <div className="space-y-2">
-            <input
-              type="text"
-              value={newToken}
-              onChange={(e) => {
-                setNewToken(e.target.value);
-                setAddError("");
-              }}
-              placeholder="API Token"
-              className="w-full rounded-lg border border-border bg-surface-2 px-3 py-2 text-sm text-text-primary placeholder:text-text-muted focus:border-brand focus:outline-none font-mono"
-              onKeyDown={(e) => {
-                if (e.key === "Enter") handleAdd();
-              }}
-            />
-            <div className="flex gap-2">
-              <input
-                type="text"
-                value={newLabel}
-                onChange={(e) => setNewLabel(e.target.value)}
-                placeholder="Label (optional)"
-                className="flex-1 rounded-lg border border-border bg-surface-2 px-3 py-2 text-sm text-text-primary placeholder:text-text-muted focus:border-brand focus:outline-none"
-                onKeyDown={(e) => {
-                  if (e.key === "Enter") handleAdd();
-                }}
-              />
-              <button
-                onClick={handleAdd}
-                disabled={!newToken.trim()}
-                className="rounded-lg bg-brand px-3 py-2 text-white hover:bg-brand-light disabled:opacity-50 transition-colors"
-              >
-                <Plus className="h-4 w-4" />
-              </button>
-            </div>
-          </div>
-          {addError && <div className="text-xs text-status-error">{addError}</div>}
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
--- a/packages/remote-control-server/web/src/hooks/useTokens.ts
+++ b/packages/remote-control-server/web/src/hooks/useTokens.ts
@@ -1,120 +0,0 @@
-import { useState, useCallback } from "react";
-
-export interface TokenEntry {
-  id: string;
-  token: string;
-  label: string;
-}
-
-const TOKENS_KEY = "rcs_tokens";
-const ACTIVE_TOKEN_KEY = "rcs_uuid";
-const DEFAULT_ID = "__default__";
-
-function generateId(): string {
-  return `tk_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
-}
-
-/** Ensure the existing rcs_uuid is present as the default token entry */
-function ensureDefault(tokens: TokenEntry[]): TokenEntry[] {
-  if (tokens.some((t) => t.id === DEFAULT_ID)) return tokens;
-  let uuid: string | null = null;
-  try {
-    uuid = localStorage.getItem("rcs_uuid");
-  } catch {
-    // ignore
-  }
-  if (!uuid) return tokens;
-  return [{ id: DEFAULT_ID, token: uuid, label: "Default" }, ...tokens];
-}
-
-function loadTokens(): TokenEntry[] {
-  let tokens: TokenEntry[] = [];
-  try {
-    const raw = localStorage.getItem(TOKENS_KEY);
-    if (raw) {
-      const parsed = JSON.parse(raw);
-      if (Array.isArray(parsed)) tokens = parsed;
-    }
-  } catch {
-    // ignore
-  }
-  return ensureDefault(tokens);
-}
-
-function loadActiveTokenId(tokens: TokenEntry[]): string {
-  // Try saved active token
-  try {
-    const saved = localStorage.getItem(ACTIVE_TOKEN_KEY);
-    if (saved && tokens.some((t) => t.id === saved)) return saved;
-  } catch {
-    // ignore
-  }
-  // Fall back to default (rcs_uuid) entry
-  const defaultEntry = tokens.find((t) => t.id === DEFAULT_ID);
-  if (defaultEntry) return defaultEntry.id;
-  // Fall back to first entry
-  return tokens[0]?.id ?? DEFAULT_ID;
-}
-
-export function useTokens() {
-  const [tokens, setTokens] = useState<TokenEntry[]>(loadTokens);
-  const [activeTokenId, setActiveTokenIdState] = useState<string>(() => loadActiveTokenId(loadTokens()));
-
-  const persistTokens = useCallback((next: TokenEntry[]) => {
-    setTokens(next);
-    try {
-      localStorage.setItem(TOKENS_KEY, JSON.stringify(next));
-    } catch {
-      // ignore
-    }
-  }, []);
-
-  const setActiveTokenId = useCallback((id: string) => {
-    setActiveTokenIdState(id);
-    try {
-      localStorage.setItem(ACTIVE_TOKEN_KEY, id);
-	  location.reload(); // Reload to ensure api client picks up new token from localStorage
-    } catch {
-      // ignore
-    }
-  }, []);
-
-  const addToken = useCallback((token: string, label: string): string | null => {
-    const trimmed = token.trim();
-    if (!trimmed) return "Token is required";
-    const entry: TokenEntry = { id: generateId(), token: trimmed, label: label.trim() || trimmed.slice(0, 8) };
-    const next = [...tokens, entry];
-    persistTokens(next);
-    return null;
-  }, [tokens, persistTokens]);
-
-  const removeToken = useCallback((id: string) => {
-    if (id === DEFAULT_ID) return; // Cannot remove default
-    const next = tokens.filter((t) => t.id !== id);
-    persistTokens(next);
-    if (activeTokenId === id) {
-      setActiveTokenId(DEFAULT_ID);
-    }
-  }, [tokens, persistTokens, activeTokenId, setActiveTokenId]);
-
-  const updateToken = useCallback((id: string, label: string) => {
-    const next = tokens.map((t) => t.id === id ? { ...t, label } : t);
-    persistTokens(next);
-  }, [tokens, persistTokens]);
-
-  const activeToken = tokens.find((t) => t.id === activeTokenId) ?? tokens[0] ?? null;
-  const activeLabel = activeToken?.label ?? "Default";
-  const activeTokenValue = activeToken?.token ?? null;
-
-  return {
-    tokens,
-    activeTokenId,
-    activeToken,
-    activeLabel,
-    activeTokenValue,
-    setActiveTokenId,
-    addToken,
-    removeToken,
-    updateToken,
-  };
-}
--- a/packages/remote-control-server/web/src/types/index.ts
+++ b/packages/remote-control-server/web/src/types/index.ts
@@ -5,7 +5,6 @@ export interface Environment {
  status: string;
  branch?: string;
  worker_type?: string;
-  channel_group_id?: string | null;
  capabilities?: Record<string, unknown> | null;
 }

--- a/packages/weixin/src/cli.ts
+++ b/packages/weixin/src/cli.ts
@@ -1,8 +1,6 @@
 import { clearAccount, DEFAULT_BASE_URL, loadAccount, saveAccount } from './accounts.js'
 import { startLogin, waitForLogin } from './login.js'
 import { confirmPairing } from './pairing.js'
-import { runWeixinMcpServer } from './server.js'
-import type { WeixinServerDeps } from './server.js'

 function printUsage(): void {
  process.stdout.write(
@@ -94,18 +92,18 @@ function runAccess(args: string[]): void {

 export async function handleWeixinCli(
  args: string[],
-  serverDeps?: WeixinServerDeps,
-  version?: string,
+  serveHandler?: () => Promise<void>,
 ): Promise<void> {
  const [subcommand, ...rest] = args

  switch (subcommand) {
    case 'serve':
-      if (!serverDeps) {
+      if (serveHandler) {
+        await serveHandler()
+      } else {
        process.stderr.write('[weixin] serve handler not available in this context.\n')
        process.exit(1)
      }
-      await runWeixinMcpServer(version ?? '0.0.0', serverDeps)
      return
    case 'login':
      await runLogin(rest[0] === 'clear')
--- a/packages/weixin/src/index.ts
+++ b/packages/weixin/src/index.ts
@@ -96,20 +96,16 @@ export type {

 // Permission state
 export {
+  ChannelPermissionRequestParams,
  setActivePermissionChat,
  getActivePermissionChat,
  savePendingPermission,
  consumePendingPermission,
 } from './permissions.js'
 export type {
-  ChannelPermissionRequestParams,
  PendingPermissionRequest,
  ActivePermissionChat,
 } from './permissions.js'

-// Server (MCP)
-export { createWeixinMcpServer, runWeixinMcpServer } from './server.js'
-export type { WeixinServerDeps } from './server.js'
-
 // CLI
 export { handleWeixinCli } from './cli.js'
--- a/packages/weixin/src/send.ts
+++ b/packages/weixin/src/send.ts
@@ -4,45 +4,9 @@ import { sendMessage } from './api.js'
 import { guessMediaType, uploadFile } from './media.js'
 import { MessageItemType, MessageState, MessageType } from './types.js'

-function stripCodeBlocks(text: string): string {
-  // Non-regex approach to avoid ReDoS on inputs with many ``` sequences.
-  let result = ''
-  let i = 0
-  while (i < text.length) {
-    if (text.startsWith('```', i)) {
-      // Skip the opening fence (including optional language tag on same line)
-      let j = i + 3
-      // skip to end of first line (the fence line itself)
-      while (j < text.length && text[j] !== '\n') j++
-      if (j < text.length) j++ // skip the \n
-      // Collect content until closing ```
-      const contentStart = j
-      while (j < text.length) {
-        if (text.startsWith('```', j)) {
-          result += text.slice(contentStart, j)
-          // skip closing fence and its trailing newline
-          j += 3
-          while (j < text.length && text[j] !== '\n') j++
-          if (j < text.length) j++ // skip \n
-          break
-        }
-        j++
-      }
-      // If no closing fence found, include rest as-is
-      if (j >= text.length && !text.startsWith('```', j - 3)) {
-        result += text.slice(i)
-      }
-      i = j
-    } else {
-      result += text[i]
-      i++
-    }
-  }
-  return result
-}
-
 export function markdownToPlainText(text: string): string {
-  return stripCodeBlocks(text)
+  return text
+    .replace(/```[\s\S]*?\n([\s\S]*?)```/g, '$1')
    .replace(/`([^`]+)`/g, '$1')
    .replace(/\*\*\*(.+?)\*\*\*/g, '$1')
    .replace(/\*\*(.+?)\*\*/g, '$1')
--- a/scripts/defines.ts
+++ b/scripts/defines.ts
@@ -16,52 +16,3 @@ export function getMacroDefines(): Record<string, string> {
        "MACRO.VERSION_CHANGELOG": JSON.stringify(""),
    };
 }
-
-/**
- * Default feature flags enabled in both Bun.build and Vite builds.
- * Additional features can be enabled via FEATURE_<NAME>=1 env vars.
- *
- * Used by:
- *   - build.ts (Bun.build)
- *   - scripts/vite-plugin-feature-flags.ts (Vite/Rollup)
- *   - scripts/dev.ts (bun run dev)
- */
-export const DEFAULT_BUILD_FEATURES = [
-    'BUDDY', 'TRANSCRIPT_CLASSIFIER', 'BRIDGE_MODE',
-    'AGENT_TRIGGERS_REMOTE',
-    'CHICAGO_MCP',
-    'VOICE_MODE',
-    'SHOT_STATS',
-    'PROMPT_CACHE_BREAK_DETECTION',
-    'TOKEN_BUDGET',
-    // P0: local features
-    'AGENT_TRIGGERS',
-    'ULTRATHINK',
-    'BUILTIN_EXPLORE_PLAN_AGENTS',
-    'LODESTONE',
-    // P1: API-dependent features
-    'EXTRACT_MEMORIES',
-    'VERIFICATION_AGENT',
-    'KAIROS_BRIEF',
-    'AWAY_SUMMARY',
-    'ULTRAPLAN',
-    // P2: daemon + remote control server
-    'DAEMON',
-    // ACP (Agent Client Protocol) agent mode
-    'ACP',
-    // PR-package restored features
-    'WORKFLOW_SCRIPTS',
-    'HISTORY_SNIP',
-    'CONTEXT_COLLAPSE',
-    'MONITOR_TOOL',
-    'FORK_SUBAGENT',
-    // 'UDS_INBOX',
-    'KAIROS',
-    'COORDINATOR_MODE',
-    'LAN_PIPES',
-    'BG_SESSIONS',
-    'TEMPLATES',
-    // 'REVIEW_ARTIFACT', // API 请求无响应，需进一步排查 schema 兼容性
-    // P3: poor mode (disable extract_memories + prompt_suggestion)
-    'POOR',
-] as const;
--- a/scripts/dev.ts
+++ b/scripts/dev.ts
@@ -6,7 +6,7 @@
 */
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { getMacroDefines, DEFAULT_BUILD_FEATURES } from "./defines.ts";
+import { getMacroDefines } from "./defines.ts";

 // Resolve project root from this script's location
 const __filename = fileURLToPath(import.meta.url);
@@ -22,7 +22,39 @@ const defineArgs = Object.entries(defines).flatMap(([k, v]) => [
 ]);

 // Bun --feature flags: enable feature() gates at runtime.
-// Uses the shared DEFAULT_BUILD_FEATURES list from defines.ts.
+// Default features enabled in dev mode.
+const DEFAULT_FEATURES = [
+  "BUDDY", "TRANSCRIPT_CLASSIFIER", "BRIDGE_MODE",
+  "AGENT_TRIGGERS_REMOTE", "CHICAGO_MCP", "VOICE_MODE",
+  "SHOT_STATS", "PROMPT_CACHE_BREAK_DETECTION", "TOKEN_BUDGET",
+  // P0: local features
+  "AGENT_TRIGGERS",
+  "ULTRATHINK",
+  "BUILTIN_EXPLORE_PLAN_AGENTS",
+  "LODESTONE",
+  // P1: API-dependent features
+  "EXTRACT_MEMORIES", "VERIFICATION_AGENT",
+  "KAIROS_BRIEF", "AWAY_SUMMARY", "ULTRAPLAN",
+  // P2: daemon + remote control server
+  "DAEMON",
+  // ACP (Agent Client Protocol) agent mode
+  "ACP",
+  // PR-package restored features
+  "WORKFLOW_SCRIPTS",
+  "HISTORY_SNIP",
+  "CONTEXT_COLLAPSE",
+  "MONITOR_TOOL",
+  "FORK_SUBAGENT",
+  "UDS_INBOX",
+  "KAIROS",
+  "COORDINATOR_MODE",
+  "LAN_PIPES",
+  "BG_SESSIONS",
+  "TEMPLATES",
+  // "REVIEW_ARTIFACT", // API 请求无响应，需进一步排查 schema 兼容性
+  // P3: poor mode (disable extract_memories + prompt_suggestion)
+  "POOR",
+];

 // Any env var matching FEATURE_<NAME>=1 will also enable that feature.
 // e.g. FEATURE_PROACTIVE=1 bun run dev
@@ -30,7 +62,7 @@ const envFeatures = Object.entries(process.env)
    .filter(([k]) => k.startsWith("FEATURE_"))
    .map(([k]) => k.replace("FEATURE_", ""));

-const allFeatures = [...new Set([...DEFAULT_BUILD_FEATURES, ...envFeatures])];
+const allFeatures = [...new Set([...DEFAULT_FEATURES, ...envFeatures])];
 const featureArgs = allFeatures.flatMap((name) => ["--feature", name]);

 // If BUN_INSPECT is set, pass --inspect-wait to the child process
--- a/scripts/vite-plugin-feature-flags.ts
+++ b/scripts/vite-plugin-feature-flags.ts
@@ -1,5 +1,41 @@
 import type { Plugin } from "rollup";
-import { DEFAULT_BUILD_FEATURES } from "./defines.ts";
+
+/**
+ * Default features that match the official CLI build.
+ * Additional features can be enabled via FEATURE_<NAME>=1 env vars.
+ */
+const DEFAULT_BUILD_FEATURES = [
+  "AGENT_TRIGGERS_REMOTE",
+  "CHICAGO_MCP",
+  "VOICE_MODE",
+  "SHOT_STATS",
+  "PROMPT_CACHE_BREAK_DETECTION",
+  "TOKEN_BUDGET",
+  // P0: local features
+  "AGENT_TRIGGERS",
+  "ULTRATHINK",
+  "BUILTIN_EXPLORE_PLAN_AGENTS",
+  "LODESTONE",
+  // P1: API-dependent features
+  "EXTRACT_MEMORIES",
+  "VERIFICATION_AGENT",
+  "KAIROS_BRIEF",
+  "AWAY_SUMMARY",
+  "ULTRAPLAN",
+  // P2: daemon + remote control server
+  "DAEMON",
+  // PR-package restored features
+  "WORKFLOW_SCRIPTS",
+  "HISTORY_SNIP",
+  "CONTEXT_COLLAPSE",
+  "MONITOR_TOOL",
+  "FORK_SUBAGENT",
+  "KAIROS",
+  "COORDINATOR_MODE",
+  "LAN_PIPES",
+  // P3: poor mode
+  "POOR",
+];

 /**
 * Collect enabled feature flags from defaults + env vars.
--- a/src/Tool.ts
+++ b/src/Tool.ts
@@ -146,7 +146,7 @@ export const getEmptyToolPermissionContext: () => ToolPermissionContext =
    alwaysAllowRules: {},
    alwaysDenyRules: {},
    alwaysAskRules: {},
-    isBypassPermissionsModeAvailable: true,
+    isBypassPermissionsModeAvailable: false,
  })

 export type CompactProgressEvent =
--- a/src/tests/Tool.test.ts
+++ b/src/tests/Tool.test.ts
@@ -166,9 +166,9 @@ describe('getEmptyToolPermissionContext', () => {
    expect(ctx.alwaysAskRules).toEqual({})
  })

-  test('returns isBypassPermissionsModeAvailable as true', () => {
+  test('returns isBypassPermissionsModeAvailable as false', () => {
    const ctx = getEmptyToolPermissionContext()
-    expect(ctx.isBypassPermissionsModeAvailable).toBe(true)
+    expect(ctx.isBypassPermissionsModeAvailable).toBe(false)
  })
 })

--- a/src/commands/login/login.tsx
+++ b/src/commands/login/login.tsx
@@ -18,7 +18,9 @@ import type { LocalJSXCommandOnDone } from '../../types/command.js'
 import { stripSignatureBlocks } from '../../utils/messages.js'
 import {
  checkAndDisableAutoModeIfNeeded,
+  checkAndDisableBypassPermissionsIfNeeded,
  resetAutoModeGateCheck,
+  resetBypassPermissionsCheck,
 } from '../../utils/permissions/bypassPermissionsKillswitch.js'
 import { resetUserCache } from '../../utils/user.js'

@@ -52,13 +54,20 @@ export async function call(
          // Enroll as a trusted device for Remote Control (10-min fresh-session window)
          void enrollTrustedDevice()
          // Reset killswitch gate checks and re-run with new org
-          resetAutoModeGateCheck()
+          resetBypassPermissionsCheck()
          const appState = context.getAppState()
-          void checkAndDisableAutoModeIfNeeded(
+          void checkAndDisableBypassPermissionsIfNeeded(
            appState.toolPermissionContext,
            context.setAppState,
-            appState.fastMode,
          )
+          if (feature('TRANSCRIPT_CLASSIFIER')) {
+            resetAutoModeGateCheck()
+            void checkAndDisableAutoModeIfNeeded(
+              appState.toolPermissionContext,
+              context.setAppState,
+              appState.fastMode,
+            )
+          }
          // Increment authVersion to trigger re-fetching of auth-dependent data in hooks (e.g., MCP servers)
          context.setAppState(prev => ({
            ...prev,
--- a/src/components/PromptInput/PromptInput.tsx
+++ b/src/components/PromptInput/PromptInput.tsx
@@ -151,14 +151,16 @@ import {
  isOpus1mMergeEnabled,
  modelDisplayString,
 } from '../../utils/model/model.js'
+import { setAutoModeActive } from '../../utils/permissions/autoModeState.js'
 import {
  cyclePermissionMode,
  getNextPermissionMode,
 } from '../../utils/permissions/getNextPermissionMode.js'
+import { transitionPermissionMode } from '../../utils/permissions/permissionSetup.js'
 import { getPlatform } from '../../utils/platform.js'
 import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js'
 import { editPromptInEditor } from '../../utils/promptEditor.js'
-// hasAutoModeOptIn removed — auto mode is available to all users
+import { hasAutoModeOptIn } from '../../utils/settings/settings.js'
 import { findBtwTriggerPositions } from '../../utils/sideQuestion.js'
 import { findSlashCommandPositions } from '../../utils/suggestions/commandSuggestions.js'
 import {
@@ -185,7 +187,7 @@ import {
  findUltraplanTriggerPositions,
  findUltrareviewTriggerPositions,
 } from '../../utils/ultraplan/keyword.js'
-// AutoModeOptInDialog removed — auto mode is available to all users
+import { AutoModeOptInDialog } from '../AutoModeOptInDialog.js'
 import { BridgeDialog } from '../BridgeDialog.js'
 import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
 import {
@@ -569,6 +571,10 @@ function PromptInput({
  const [showHistoryPicker, setShowHistoryPicker] = useState(false)
  const [showFastModePicker, setShowFastModePicker] = useState(false)
  const [showThinkingToggle, setShowThinkingToggle] = useState(false)
+  const [showAutoModeOptIn, setShowAutoModeOptIn] = useState(false)
+  const [previousModeBeforeAuto, setPreviousModeBeforeAuto] =
+    useState<PermissionMode | null>(null)
+  const autoModeOptInTimeoutRef = useRef<NodeJS.Timeout | null>(null)

  // Check if cursor is on the first line of input
  const isCursorOnFirstLine = useMemo(() => {
@@ -1877,11 +1883,86 @@ function PromptInput({

    // Compute the next mode without triggering side effects first
    logForDebugging(
-      `[auto-mode] handleCycleMode: currentMode=${toolPermissionContext.mode}`,
+      `[auto-mode] handleCycleMode: currentMode=${toolPermissionContext.mode} isAutoModeAvailable=${toolPermissionContext.isAutoModeAvailable} showAutoModeOptIn=${showAutoModeOptIn} timeoutPending=${!!autoModeOptInTimeoutRef.current}`,
    )
    const nextMode = getNextPermissionMode(toolPermissionContext, teamContext)

-    // Call cyclePermissionMode to apply side effects (e.g. strip
+    // Check if user is entering auto mode for the first time. Gated on the
+    // persistent settings flag (hasAutoModeOptIn) rather than the broader
+    // hasAutoModeOptInAnySource so that --enable-auto-mode users still see
+    // the warning dialog once — the CLI flag should grant carousel access,
+    // not bypass the safety text.
+    let isEnteringAutoModeFirstTime = false
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      isEnteringAutoModeFirstTime =
+        nextMode === 'auto' &&
+        toolPermissionContext.mode !== 'auto' &&
+        !hasAutoModeOptIn() &&
+        !viewingAgentTaskId // Only show for primary agent, not subagents
+    }
+
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      if (isEnteringAutoModeFirstTime) {
+        // Store previous mode so we can revert if user declines
+        setPreviousModeBeforeAuto(toolPermissionContext.mode)
+
+        // Only update the UI mode label — do NOT call transitionPermissionMode
+        // or cyclePermissionMode yet; we haven't confirmed with the user.
+        setAppState(prev => ({
+          ...prev,
+          toolPermissionContext: {
+            ...prev.toolPermissionContext,
+            mode: 'auto',
+          },
+        }))
+        setToolPermissionContext({
+          ...toolPermissionContext,
+          mode: 'auto',
+        })
+
+        // Show opt-in dialog after 400ms debounce
+        if (autoModeOptInTimeoutRef.current) {
+          clearTimeout(autoModeOptInTimeoutRef.current)
+        }
+        autoModeOptInTimeoutRef.current = setTimeout(
+          (setShowAutoModeOptIn, autoModeOptInTimeoutRef) => {
+            setShowAutoModeOptIn(true)
+            autoModeOptInTimeoutRef.current = null
+          },
+          400,
+          setShowAutoModeOptIn,
+          autoModeOptInTimeoutRef,
+        )
+
+        if (helpOpen) {
+          setHelpOpen(false)
+        }
+        return
+      }
+    }
+
+    // Dismiss auto mode opt-in dialog if showing or pending (user is cycling away).
+    // Do NOT revert to previousModeBeforeAuto here — shift+tab means "advance the
+    // carousel", not "decline". Reverting causes a ping-pong loop: auto reverts to
+    // the prior mode, whose next mode is auto again, forever.
+    // The dialog's own decline button (handleAutoModeOptInDecline) handles revert.
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      if (showAutoModeOptIn || autoModeOptInTimeoutRef.current) {
+        if (showAutoModeOptIn) {
+          logEvent('tengu_auto_mode_opt_in_dialog_decline', {})
+        }
+        setShowAutoModeOptIn(false)
+        if (autoModeOptInTimeoutRef.current) {
+          clearTimeout(autoModeOptInTimeoutRef.current)
+          autoModeOptInTimeoutRef.current = null
+        }
+        setPreviousModeBeforeAuto(null)
+        // Fall through — mode is 'auto', cyclePermissionMode below goes to 'default'.
+      }
+    }
+
+    // Now that we know this is NOT the first-time auto mode path,
+    // call cyclePermissionMode to apply side effects (e.g. strip
    // dangerous permissions, activate classifier)
    const { context: preparedContext } = cyclePermissionMode(
      toolPermissionContext,
@@ -1926,10 +2007,91 @@ function PromptInput({
  }, [
    toolPermissionContext,
    teamContext,
+    viewingAgentTaskId,
    viewedTeammate,
    setAppState,
    setToolPermissionContext,
    helpOpen,
+    showAutoModeOptIn,
+  ])
+
+  // Handler for auto mode opt-in dialog acceptance
+  const handleAutoModeOptInAccept = useCallback(() => {
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      setShowAutoModeOptIn(false)
+      setPreviousModeBeforeAuto(null)
+
+      // Now that the user accepted, apply the full transition: activate the
+      // auto mode backend (classifier, beta headers) and strip dangerous
+      // permissions (e.g. Bash(*) always-allow rules).
+      const strippedContext = transitionPermissionMode(
+        previousModeBeforeAuto ?? toolPermissionContext.mode,
+        'auto',
+        toolPermissionContext,
+      )
+      setAppState(prev => ({
+        ...prev,
+        toolPermissionContext: {
+          ...strippedContext,
+          mode: 'auto',
+        },
+      }))
+      setToolPermissionContext({
+        ...strippedContext,
+        mode: 'auto',
+      })
+
+      // Close help tips if they're open when auto mode is enabled
+      if (helpOpen) {
+        setHelpOpen(false)
+      }
+    }
+  }, [
+    helpOpen,
+    setHelpOpen,
+    previousModeBeforeAuto,
+    toolPermissionContext,
+    setAppState,
+    setToolPermissionContext,
+  ])
+
+  // Handler for auto mode opt-in dialog decline
+  const handleAutoModeOptInDecline = useCallback(() => {
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      logForDebugging(
+        `[auto-mode] handleAutoModeOptInDecline: reverting to ${previousModeBeforeAuto}, setting isAutoModeAvailable=false`,
+      )
+      setShowAutoModeOptIn(false)
+      if (autoModeOptInTimeoutRef.current) {
+        clearTimeout(autoModeOptInTimeoutRef.current)
+        autoModeOptInTimeoutRef.current = null
+      }
+
+      // Revert to previous mode and remove auto from the carousel
+      // for the rest of this session
+      if (previousModeBeforeAuto) {
+        setAutoModeActive(false)
+        setAppState(prev => ({
+          ...prev,
+          toolPermissionContext: {
+            ...prev.toolPermissionContext,
+            mode: previousModeBeforeAuto,
+            isAutoModeAvailable: false,
+          },
+        }))
+        setToolPermissionContext({
+          ...toolPermissionContext,
+          mode: previousModeBeforeAuto,
+          isAutoModeAvailable: false,
+        })
+        setPreviousModeBeforeAuto(null)
+      }
+    }
+  }, [
+    previousModeBeforeAuto,
+    toolPermissionContext,
+    setAppState,
+    setToolPermissionContext,
  ])

  // Handler for chat:imagePaste - paste image from clipboard
@@ -2596,7 +2758,20 @@ function PromptInput({
  // Portal dialog to DialogOverlay in fullscreen so it escapes the bottom
  // slot's overflowY:hidden clip (same pattern as SuggestionsOverlay).
  // Must be called before early returns below to satisfy rules-of-hooks.
-  useSetPromptOverlayDialog(null)
+  // Memoized so the portal useEffect doesn't churn on every PromptInput render.
+  const autoModeOptInDialog = useMemo(
+    () =>
+      feature('TRANSCRIPT_CLASSIFIER') && showAutoModeOptIn ? (
+        <AutoModeOptInDialog
+          onAccept={handleAutoModeOptInAccept}
+          onDecline={handleAutoModeOptInDecline}
+        />
+      ) : null,
+    [showAutoModeOptIn, handleAutoModeOptInAccept, handleAutoModeOptInDecline],
+  )
+  useSetPromptOverlayDialog(
+    isFullscreenEnvEnabled() ? autoModeOptInDialog : null,
+  )

  if (showBashesDialog) {
    return (
@@ -2902,6 +3077,7 @@ function PromptInput({
          isFullscreenEnvEnabled() ? handleOpenTasksDialog : undefined
        }
      />
+      {isFullscreenEnvEnabled() ? null : autoModeOptInDialog}
      {isFullscreenEnvEnabled() ? (
        // position=absolute takes zero layout height so the spinner
        // doesn't shift when a notification appears/disappears. Yoga
@@ -2922,7 +3098,7 @@ function PromptInput({
        <Box
          position="absolute"
          marginTop={briefOwnsGap ? -2 : -1}
-          height={suggestions.length === 0 ? 1 : 0}
+          height={suggestions.length === 0 && !showAutoModeOptIn ? 1 : 0}
          width="100%"
          paddingLeft={2}
          paddingRight={1}
--- a/src/entrypoints/cli.tsx
+++ b/src/entrypoints/cli.tsx
@@ -143,25 +143,8 @@ async function main(): Promise<void> {
  if (args[0] === 'weixin') {
    profileCheckpoint('cli_weixin_path')
    const { handleWeixinCli } = await import('@claude-code-best/weixin')
-    const { enableConfigs } = await import('../utils/config.js')
-    const { initializeAnalyticsSink } = await import('../services/analytics/sink.js')
-    const { shutdownDatadog } = await import('../services/analytics/datadog.js')
-    const { shutdown1PEventLogging } = await import('../services/analytics/firstPartyEventLogger.js')
-    const { logForDebugging } = await import('../utils/debug.js')
-    const { ChannelPermissionRequestNotificationSchema } = await import('../services/mcp/channelNotification.js')
-    await handleWeixinCli(args.slice(1), {
-      enableConfigs,
-      initializeAnalyticsSink,
-      shutdownDatadog,
-      shutdown1PEventLogging,
-      logForDebugging,
-      registerPermissionHandler(server, handler) {
-        server.setNotificationHandler(
-          ChannelPermissionRequestNotificationSchema(),
-          async notification => handler(notification.params),
-        )
-      },
-    }, MACRO.VERSION)
+    const { runWeixinMcpServer } = await import('../services/weixin/cli-serve.js')
+    await handleWeixinCli(args.slice(1), runWeixinMcpServer)
    return
  }

--- a/src/interactiveHelpers.tsx
+++ b/src/interactiveHelpers.tsx
@@ -52,6 +52,7 @@ import type { PermissionMode } from './utils/permissions/PermissionMode.js'
 import { getBaseRenderOptions } from './utils/renderOptions.js'
 import { getSettingsWithAllErrors } from './utils/settings/allErrors.js'
 import {
+  hasAutoModeOptIn,
  hasSkipDangerousModePermissionPrompt,
 } from './utils/settings/settings.js'

@@ -308,6 +309,25 @@ export async function showSetupScreens(
    ))
  }

+  if (feature('TRANSCRIPT_CLASSIFIER')) {
+    // Only show the opt-in dialog if auto mode actually resolved — if the
+    // gate denied it (org not allowlisted, settings disabled), showing
+    // consent for an unavailable feature is pointless. The
+    // verifyAutoModeGateAccess notification will explain why instead.
+    if (permissionMode === 'auto' && !hasAutoModeOptIn()) {
+      const { AutoModeOptInDialog } = await import(
+        './components/AutoModeOptInDialog.js'
+      )
+      await showSetupDialog(root, done => (
+        <AutoModeOptInDialog
+          onAccept={done}
+          onDecline={() => gracefulShutdownSync(1)}
+          declineExits
+        />
+      ))
+    }
+  }
+
  // --dangerously-load-development-channels confirmation. On accept, append
  // dev channels to any --channels list already set in main.tsx. Org policy
  // is NOT bypassed — gateChannelServer() still runs; this flag only exists
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -242,6 +242,7 @@ import {
 import { ensureModelStringsInitialized } from "./utils/model/modelStrings.js";
 import { PERMISSION_MODES } from "./utils/permissions/PermissionMode.js";
 import {
+	checkAndDisableBypassPermissions,
 	getAutoModeEnabledStateIfCached,
 	initializeToolPermissionContext,
 	initialPermissionModeFromCLI,
@@ -3909,7 +3910,19 @@ async function run(): Promise<CommanderCommand> {
 					onChangeAppState,
 				);

+				// Check if bypassPermissions should be disabled based on Statsig gate
+				// This runs in parallel to the code below, to avoid blocking the main loop.
+				if (
+					toolPermissionContext.mode === "bypassPermissions" ||
+					allowDangerouslySkipPermissions
+				) {
+					void checkAndDisableBypassPermissions(
+						toolPermissionContext,
+					);
+				}
+
 				// Async check of auto mode gate — corrects state and disables auto if needed.
+				// Gated on TRANSCRIPT_CLASSIFIER (not USER_TYPE) so GrowthBook kill switch runs for external builds too.
 				if (feature("TRANSCRIPT_CLASSIFIER")) {
 					void verifyAutoModeGateAccess(
 						toolPermissionContext,
--- a/src/memdir/findRelevantMemories.ts
+++ b/src/memdir/findRelevantMemories.ts
@@ -3,7 +3,6 @@ import { logForDebugging } from '../utils/debug.js'
 import { errorMessage } from '../utils/errors.js'
 import { getDefaultSonnetModel } from '../utils/model/model.js'
 import { sideQuery } from '../utils/sideQuery.js'
-import type { LangfuseSpan } from '../services/langfuse/index.js'
 import { jsonParse } from '../utils/slowOperations.js'
 import {
  formatMemoryManifest,
@@ -43,7 +42,6 @@ export async function findRelevantMemories(
  signal: AbortSignal,
  recentTools: readonly string[] = [],
  alreadySurfaced: ReadonlySet<string> = new Set(),
-  parentSpan?: LangfuseSpan | null,
 ): Promise<RelevantMemory[]> {
  const memories = (await scanMemoryFiles(memoryDir, signal)).filter(
    m => !alreadySurfaced.has(m.filePath),
@@ -57,7 +55,6 @@ export async function findRelevantMemories(
    memories,
    signal,
    recentTools,
-    parentSpan,
  )
  const byFilename = new Map(memories.map(m => [m.filename, m]))
  const selected = selectedFilenames
@@ -82,7 +79,6 @@ async function selectRelevantMemories(
  memories: MemoryHeader[],
  signal: AbortSignal,
  recentTools: readonly string[],
-  parentSpan?: LangfuseSpan | null,
 ): Promise<string[]> {
  const validFilenames = new Set(memories.map(m => m.filename))

@@ -123,8 +119,6 @@ async function selectRelevantMemories(
      },
      signal,
      querySource: 'memdir_relevance',
-      optional: true,
-      parentSpan,
    })

    const textBlock = result.content.find(block => block.type === 'text')
--- a/src/screens/REPL.tsx
+++ b/src/screens/REPL.tsx
@@ -422,7 +422,9 @@ import { usePromptsFromClaudeInChrome } from 'src/hooks/usePromptsFromClaudeInCh
 import { getTipToShowOnSpinner, recordShownTip } from 'src/services/tips/tipScheduler.js';
 import type { Theme } from 'src/utils/theme.js';
 import {
+  checkAndDisableBypassPermissionsIfNeeded,
  checkAndDisableAutoModeIfNeeded,
+  useKickOffCheckAndDisableBypassPermissionsIfNeeded,
  useKickOffCheckAndDisableAutoModeIfNeeded,
 } from 'src/utils/permissions/bypassPermissionsKillswitch.js';
 import { SandboxManager } from 'src/utils/sandbox/sandbox-adapter.js';
@@ -432,6 +434,7 @@ import { SandboxPermissionRequest } from 'src/components/permissions/SandboxPerm
 import { SandboxViolationExpandedView } from 'src/components/SandboxViolationExpandedView.js';
 import { useSettingsErrors } from 'src/hooks/notifs/useSettingsErrors.js';
 import { useMcpConnectivityStatus } from 'src/hooks/notifs/useMcpConnectivityStatus.js';
+import { useAutoModeUnavailableNotification } from 'src/hooks/notifs/useAutoModeUnavailableNotification.js';
 import { AUTO_MODE_DESCRIPTION } from 'src/components/AutoModeOptInDialog.js';
 import { useLspInitializationNotification } from 'src/hooks/notifs/useLspInitializationNotification.js';
 import { useLspPluginRecommendation } from 'src/hooks/useLspPluginRecommendation.js';
@@ -945,6 +948,7 @@ export function REPL({
    [toolPermissionContext, proactiveActive, isBriefOnly],
  );

+  useKickOffCheckAndDisableBypassPermissionsIfNeeded();
  useKickOffCheckAndDisableAutoModeIfNeeded();

  const [dynamicMcpConfig, setDynamicMcpConfig] = useState<Record<string, ScopedMcpServerConfig> | undefined>(
@@ -1002,6 +1006,7 @@ export function REPL({
  useCanSwitchToExistingSubscription();
  useIDEStatusIndicator({ ideSelection, mcpClients, ideInstallationStatus });
  useMcpConnectivityStatus({ mcpClients });
+  useAutoModeUnavailableNotification();
  usePluginInstallationStatus();
  usePluginAutoupdateNotification();
  useSettingsErrors();
@@ -3309,8 +3314,8 @@ export function REPL({
      queryCheckpoint('query_context_loading_start');
      const [, , defaultSystemPrompt, baseUserContext, systemContext] = await Promise.all([
        // IMPORTANT: do this after setMessages() above, to avoid UI jank
-        undefined,
-        // Fast-mode circuit breaker check
+        checkAndDisableBypassPermissionsIfNeeded(toolPermissionContext, setAppState),
+        // Gated on TRANSCRIPT_CLASSIFIER so GrowthBook kill switch runs wherever auto mode is built in
        feature('TRANSCRIPT_CLASSIFIER')
          ? checkAndDisableAutoModeIfNeeded(toolPermissionContext, setAppState, store.getState().fastMode)
          : undefined,
--- a/src/services/acp/tests/agent.test.ts
+++ b/src/services/acp/tests/agent.test.ts
@@ -42,7 +42,7 @@ const mockGetDefaultAppState = mock(() => ({
    alwaysAllowRules: { user: [], project: [], local: [] },
    alwaysDenyRules: { user: [], project: [], local: [] },
    alwaysAskRules: { user: [], project: [], local: [] },
-    isBypassPermissionsModeAvailable: true,
+    isBypassPermissionsModeAvailable: false,
  },
  fastMode: false,
  settings: {},
@@ -627,23 +627,6 @@ describe('AcpAgent', () => {
        agent.setSessionMode({ sessionId: 'ghost', modeId: 'auto' } as any),
      ).rejects.toThrow('Session not found')
    })
-
-    test('availableModes includes bypassPermissions when not root', async () => {
-      const agent = new AcpAgent(makeConn())
-      const { sessionId } = await agent.newSession({ cwd: '/tmp' } as any)
-      const session = agent.sessions.get(sessionId)
-      const modeIds = session?.modes.availableModes.map((m: any) => m.id)
-      expect(modeIds).toContain('bypassPermissions')
-    })
-
-    test('can switch to bypassPermissions mode', async () => {
-      const agent = new AcpAgent(makeConn())
-      const { sessionId } = await agent.newSession({ cwd: '/tmp' } as any)
-      await agent.setSessionMode({ sessionId, modeId: 'bypassPermissions' } as any)
-      const session = agent.sessions.get(sessionId)
-      expect(session?.modes.currentModeId).toBe('bypassPermissions')
-      expect(session?.appState.toolPermissionContext.mode).toBe('bypassPermissions')
-    })
  })

  describe('setSessionConfigOption', () => {
--- a/src/services/acp/agent.ts
+++ b/src/services/acp/agent.ts
@@ -519,15 +519,12 @@ export class AcpAgent implements Agent {

    const queryEngine = new QueryEngine(engineConfig)

-    // Build modes — bypassPermissions only available when not running as root (or in sandbox)
+    // Build modes
    const availableModes = [
+      { id: 'auto', name: 'Auto', description: 'Use a model classifier to approve/deny permission prompts.' },
      { id: 'default', name: 'Default', description: 'Standard behavior, prompts for dangerous operations' },
      { id: 'acceptEdits', name: 'Accept Edits', description: 'Auto-accept file edit operations' },
      { id: 'plan', name: 'Plan Mode', description: 'Planning mode, no actual tool execution' },
-      { id: 'auto', name: 'Auto', description: 'Use a model classifier to approve/deny permission prompts.' },
-      ...(isBypassAvailable
-        ? [{ id: 'bypassPermissions' as const, name: 'Bypass Permissions', description: 'Skip all permission checks' }]
-        : []),
      { id: 'dontAsk', name: "Don't Ask", description: "Don't prompt for permissions, deny if not pre-approved" },
    ]

--- a/src/services/langfuse/index.ts
+++ b/src/services/langfuse/index.ts
@@ -1,4 +1,4 @@
 export { initLangfuse, shutdownLangfuse, isLangfuseEnabled, getLangfuseProcessor } from './client.js'
-export { createTrace, createSubagentTrace, createChildSpan, recordLLMObservation, recordToolObservation, endTrace, createToolBatchSpan, endToolBatchSpan } from './tracing.js'
+export { createTrace, createSubagentTrace, recordLLMObservation, recordToolObservation, endTrace, createToolBatchSpan, endToolBatchSpan } from './tracing.js'
 export type { LangfuseSpan } from './tracing.js'
 export { sanitizeToolInput, sanitizeToolOutput, sanitizeGlobal } from './sanitize.js'
--- a/src/services/langfuse/tracing.ts
+++ b/src/services/langfuse/tracing.ts
@@ -282,60 +282,6 @@ export function createSubagentTrace(params: {
  }
 }

-/**
- * Create a child span under a parent trace — used for side queries
- * that should be nested under the main agent trace in Langfuse.
- */
-export function createChildSpan(
-  parentSpan: LangfuseSpan | null,
-  params: {
-    name: string
-    sessionId: string
-    model: string
-    provider: string
-    input?: unknown
-    querySource?: string
-    username?: string
-  },
-): LangfuseSpan | null {
-  if (!parentSpan || !isLangfuseEnabled()) return null
-  try {
-    const span = startObservation(
-      params.name,
-      {
-        input: params.input,
-        metadata: {
-          provider: params.provider,
-          model: params.model,
-          querySource: params.querySource,
-        },
-      },
-      {
-        asType: 'span',
-        parentSpanContext: parentSpan.otelSpan.spanContext(),
-      },
-    ) as LangfuseSpan
-
-    // Propagate session ID and user ID from parent
-    const parent = parentSpan as unknown as RootTrace
-    const sessionId = parent._sessionId ?? params.sessionId
-    if (sessionId) {
-      span.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, sessionId)
-      ;(span as unknown as RootTrace)._sessionId = sessionId
-    }
-    const userId = parent._userId ?? resolveLangfuseUserId(params.username)
-    if (userId) {
-      span.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
-      ;(span as unknown as RootTrace)._userId = userId
-    }
-    logForDebugging(`[langfuse] Child span created: ${span.id} (parent=${parentSpan.id})`)
-    return span
-  } catch (e) {
-    logForDebugging(`[langfuse] createChildSpan failed: ${e}`, { level: 'error' })
-    return null
-  }
-}
-
 export function endTrace(
  rootSpan: LangfuseSpan | null,
  output?: unknown,
--- a/src/services/tips/tipRegistry.ts
+++ b/src/services/tips/tipRegistry.ts
@@ -109,6 +109,7 @@ const externalTips: Tip[] = [
      `Use Plan Mode to prepare for a complex request before making changes. Press ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} twice to enable.`,
    cooldownSessions: 5,
    isRelevant: async () => {
+      if (process.env.USER_TYPE === 'ant') return false
      const config = getGlobalConfig()
      // Show to users who haven't used plan mode recently (7+ days)
      const daysSinceLastUse = config.lastPlanModeUse
@@ -400,7 +401,9 @@ const externalTips: Tip[] = [
  {
    id: 'shift-tab',
    content: async () =>
-      `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default, accept edits, plan, auto, and bypass modes`,
+      process.env.USER_TYPE === 'ant'
+        ? `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default mode and auto mode`
+        : `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default mode, auto-accept edit mode, and plan mode`,
    cooldownSessions: 10,
    isRelevant: async () => true,
  },
--- a/src/services/weixin/cli-serve.ts
+++ b/src/services/weixin/cli-serve.ts
@@ -0,0 +1 @@
+export { runWeixinMcpServer } from './server.js'
--- a/src/services/weixin/server.ts
+++ b/src/services/weixin/server.ts
@@ -5,6 +5,15 @@ import {
  CallToolRequestSchema,
  ListToolsRequestSchema,
 } from '@modelcontextprotocol/sdk/types.js'
+import {
+  ChannelPermissionRequestNotificationSchema,
+  type ChannelPermissionRequestParams,
+} from '../mcp/channelNotification.js'
+import { initializeAnalyticsSink } from '../analytics/sink.js'
+import { shutdownDatadog } from '../analytics/datadog.js'
+import { shutdown1PEventLogging } from '../analytics/firstPartyEventLogger.js'
+import { enableConfigs } from '../../utils/config.js'
+import { logForDebugging } from '../../utils/debug.js'
 import {
  CDN_BASE_URL,
  DEFAULT_BASE_URL,
@@ -18,21 +27,8 @@ import {
  sendMediaFile,
  sendText,
  TypingStatus,
-} from './index.js'
-import type { ParsedMessage } from './monitor.js'
-import type { ChannelPermissionRequestParams } from './permissions.js'
-
-export interface WeixinServerDeps {
-  enableConfigs(): void
-  initializeAnalyticsSink(): void
-  shutdownDatadog(): Promise<void>
-  shutdown1PEventLogging(): Promise<void>
-  logForDebugging(message: string): void
-  registerPermissionHandler(
-    server: Server,
-    handler: (request: ChannelPermissionRequestParams) => Promise<void>,
-  ): void
-}
+} from '@claude-code-best/weixin'
+import type { ParsedMessage } from '@claude-code-best/weixin'

 function formatPermissionRequestMessage(
  request: ChannelPermissionRequestParams,
@@ -49,9 +45,9 @@ function formatPermissionRequestMessage(
  ].join('\n')
 }

-export function createWeixinMcpServer(version: string): Server {
+export function createWeixinMcpServer(): Server {
  const server = new Server(
-    { name: 'weixin', version },
+    { name: 'weixin', version: MACRO.VERSION },
    {
      capabilities: {
        experimental: {
@@ -228,60 +224,61 @@ export function createWeixinMcpServer(version: string): Server {
  return server
 }

-export async function runWeixinMcpServer(
-  version: string,
-  deps: WeixinServerDeps,
-): Promise<void> {
-  deps.enableConfigs()
-  deps.initializeAnalyticsSink()
+export async function runWeixinMcpServer(): Promise<void> {
+  enableConfigs()
+  initializeAnalyticsSink()

  const account = loadAccount()
  if (!account) {
    process.stderr.write(
      '[weixin] No account configured. Run `ccb weixin login` to connect your WeChat account.\n',
    )
-    await Promise.all([deps.shutdown1PEventLogging(), deps.shutdownDatadog()])
+    await Promise.all([shutdown1PEventLogging(), shutdownDatadog()])
    process.exit(1)
  }

-  const server = createWeixinMcpServer(version)
+  const server = createWeixinMcpServer()
  const transport = new StdioServerTransport()

-  deps.registerPermissionHandler(server, async request => {
-    const targetChatId = request.channel_context?.chat_id
-    const targetChat = targetChatId
-      ? {
-          chatId: targetChatId,
-          contextToken: getContextToken(targetChatId),
-        }
-      : getActivePermissionChat()
+  server.setNotificationHandler(
+    ChannelPermissionRequestNotificationSchema(),
+    async notification => {
+      const request = notification.params
+      const targetChatId = request.channel_context?.chat_id
+      const targetChat = targetChatId
+        ? {
+            chatId: targetChatId,
+            contextToken: getContextToken(targetChatId),
+          }
+        : getActivePermissionChat()

-    if (!targetChat) {
-      deps.logForDebugging(
-        `[Weixin MCP] No active chat available for permission request ${request.request_id}`,
-      )
-      return
-    }
+      if (!targetChat) {
+        logForDebugging(
+          `[Weixin MCP] No active chat available for permission request ${request.request_id}`,
+        )
+        return
+      }

-    try {
-      savePendingPermission(
-        request,
-        targetChat.chatId,
-        targetChat.contextToken,
-      )
-      await sendText({
-        to: targetChat.chatId,
-        text: formatPermissionRequestMessage(request),
-        baseUrl,
-        token: account.token,
-        contextToken: targetChat.contextToken || '',
-      })
-    } catch (error) {
-      process.stderr.write(
-        `[weixin] Failed to relay permission request ${request.request_id}: ${error}\n`,
-      )
-    }
-  })
+      try {
+        savePendingPermission(
+          request,
+          targetChat.chatId,
+          targetChat.contextToken,
+        )
+        await sendText({
+          to: targetChat.chatId,
+          text: formatPermissionRequestMessage(request),
+          baseUrl,
+          token: account.token,
+          contextToken: targetChat.contextToken || '',
+        })
+      } catch (error) {
+        process.stderr.write(
+          `[weixin] Failed to relay permission request ${request.request_id}: ${error}\n`,
+        )
+      }
+    },
+  )

  await server.connect(transport)

@@ -295,7 +292,7 @@ export async function runWeixinMcpServer(
    if (!controller.signal.aborted) {
      controller.abort()
    }
-    await Promise.all([deps.shutdown1PEventLogging(), deps.shutdownDatadog()])
+    await Promise.all([shutdown1PEventLogging(), shutdownDatadog()])
    process.exit(0)
  }

@@ -316,7 +313,7 @@ export async function runWeixinMcpServer(
    }
  }, 5000)

-  deps.logForDebugging('[Weixin MCP] Starting poll loop')
+  logForDebugging('[Weixin MCP] Starting poll loop')
  await startPollLoop({
    baseUrl,
    cdnBaseUrl: CDN_BASE_URL,
--- a/src/state/onChangeAppState.ts
+++ b/src/state/onChangeAppState.ts
@@ -17,6 +17,7 @@ import {
  notifySessionMetadataChanged,
  type SessionExternalMetadata,
 } from '../utils/sessionState.js'
+import { updateSettingsForSource } from '../utils/settings/settings.js'
 import type { AppState } from './AppStateStore.js'

 // Inverse of the push below — restore on worker restart.
@@ -90,11 +91,23 @@ export function onChangeAppState({
    notifyPermissionModeChanged(newMode)
  }

-  // mainLoopModel: session-scoped only (do NOT persist to userSettings).
-  // Writing to settings.json would leak model changes into other running
-  // sessions (anthropics/claude-code#37596). Each process keeps its own
-  // model override in memory via setMainLoopModelOverride.
-  if (newState.mainLoopModel !== oldState.mainLoopModel) {
+  // mainLoopModel: remove it from settings?
+  if (
+    newState.mainLoopModel !== oldState.mainLoopModel &&
+    newState.mainLoopModel === null
+  ) {
+    // Remove from settings
+    updateSettingsForSource('userSettings', { model: undefined })
+    setMainLoopModelOverride(null)
+  }
+
+  // mainLoopModel: add it to settings?
+  if (
+    newState.mainLoopModel !== oldState.mainLoopModel &&
+    newState.mainLoopModel !== null
+  ) {
+    // Save to settings
+    updateSettingsForSource('userSettings', { model: newState.mainLoopModel })
    setMainLoopModelOverride(newState.mainLoopModel)
  }

--- a/src/utils/attachments.ts
+++ b/src/utils/attachments.ts
@@ -2201,7 +2201,6 @@ async function getRelevantMemoryAttachments(
  recentTools: readonly string[],
  signal: AbortSignal,
  alreadySurfaced: ReadonlySet<string>,
-  parentSpan?: unknown,
 ): Promise<Attachment[]> {
  // If an agent is @-mentioned, search only its memory dir (isolation).
  // Otherwise search the auto-memory dir.
@@ -2222,7 +2221,6 @@ async function getRelevantMemoryAttachments(
        signal,
        recentTools,
        alreadySurfaced,
-        parentSpan as Parameters<typeof findRelevantMemories>[5],
      ).catch(() => []),
    ),
  )
@@ -2372,12 +2370,6 @@ export function startRelevantMemoryPrefetch(
    return undefined
  }

-  // Poor mode: skip the side-query to save tokens
-  const { isPoorModeActive } = require('../commands/poor/poorMode.js') as typeof import('../commands/poor/poorMode.js')
-  if (isPoorModeActive()) {
-    return undefined
-  }
-
  const lastUserMessage = messages.findLast(m => m.type === 'user' && !m.isMeta)
  if (!lastUserMessage) {
    return undefined
@@ -2405,7 +2397,6 @@ export function startRelevantMemoryPrefetch(
    collectRecentSuccessfulTools(messages, lastUserMessage),
    controller.signal,
    surfaced.paths,
-    toolUseContext.langfuseTrace,
  ).catch(e => {
    if (!isAbortError(e)) {
      logError(e)
--- a/src/utils/context.ts
+++ b/src/utils/context.ts
@@ -133,12 +133,6 @@ export function calculateContextPercentages(
    currentUsage.cache_creation_input_tokens +
    currentUsage.cache_read_input_tokens

-  // Treat zero input tokens the same as no usage data — avoids flashing
-  // "ctx:0%" when a third-party API omits usage from message_start.
-  if (totalInputTokens === 0) {
-    return { used: null, remaining: null }
-  }
-
  const usedPercentage = Math.round(
    (totalInputTokens / contextWindowSize) * 100,
  )
--- a/src/utils/model/model.ts
+++ b/src/utils/model/model.ts
@@ -126,12 +126,6 @@ export function getDefaultOpusModel(): ModelName {
  if (process.env.ANTHROPIC_DEFAULT_OPUS_MODEL) {
    return process.env.ANTHROPIC_DEFAULT_OPUS_MODEL
  }
-  // Fall back to user's configured model — custom providers may not
-  // recognize hardcoded Anthropic model IDs.
-  const userSpecifiedOpus = getUserSpecifiedModelSetting()
-  if (userSpecifiedOpus) {
-    return parseUserSpecifiedModel(userSpecifiedOpus)
-  }
  // 3P providers (Bedrock, Vertex, Foundry) — kept as a separate branch
  // even when values match, since 3P availability lags firstParty and
  // these will diverge again at the next model launch.
@@ -159,13 +153,6 @@ export function getDefaultSonnetModel(): ModelName {
  if (process.env.ANTHROPIC_DEFAULT_SONNET_MODEL) {
    return process.env.ANTHROPIC_DEFAULT_SONNET_MODEL
  }
-  // Fall back to user's configured model (ANTHROPIC_MODEL / settings) —
-  // custom providers (proxies, national clouds) may not recognize the
-  // hardcoded Anthropic model IDs.
-  const userSpecified = getUserSpecifiedModelSetting()
-  if (userSpecified) {
-    return parseUserSpecifiedModel(userSpecified)
-  }
  // Default to Sonnet 4.5 for 3P since they may not have 4.6 yet
  if (provider !== 'firstParty') {
    return getModelStrings().sonnet45
@@ -188,12 +175,6 @@ export function getDefaultHaikuModel(): ModelName {
  if (process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL) {
    return process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL
  }
-  // Fall back to user's configured model — custom providers may not
-  // recognize hardcoded Anthropic model IDs.
-  const userSpecifiedHaiku = getUserSpecifiedModelSetting()
-  if (userSpecifiedHaiku) {
-    return parseUserSpecifiedModel(userSpecifiedHaiku)
-  }

  // Haiku 4.5 is available on all platforms (first-party, Foundry, Bedrock, Vertex)
  return getModelStrings().haiku45
--- a/src/utils/permissions/tests/getNextPermissionMode.test.ts
+++ b/src/utils/permissions/tests/getNextPermissionMode.test.ts
@@ -1,204 +0,0 @@
-/**
- * Tests for src/utils/permissions/getNextPermissionMode.ts
- *
- * Covers the unified permission mode cycling logic:
- *   default → acceptEdits → plan → auto → bypassPermissions → default
- *
- * After the "open auto/bypass to all users" change, there is no USER_TYPE
- * distinction — all users share the same cycle order.
- */
-import { describe, expect, test } from 'bun:test'
-import type { ToolPermissionContext } from '../../../Tool.js'
-import type { PermissionMode } from '../PermissionMode.js'
-
-// Inline getNextPermissionMode to avoid importing the heavy permissionSetup
-// dependency chain (growthbook, settings, etc.).
-// The function under test is small and pure enough to copy for testing.
-import { getNextPermissionMode } from '../getNextPermissionMode.js'
-
-// ─── helpers ──────────────────────────────────────────────────────────────────
-
-function makeContext(
-  mode: PermissionMode,
-  overrides: Partial<ToolPermissionContext> = {},
-): ToolPermissionContext {
-  return {
-    mode,
-    additionalWorkingDirectories: new Map(),
-    alwaysAllowRules: {},
-    alwaysDenyRules: {},
-    alwaysAskRules: {},
-    isBypassPermissionsModeAvailable: true,
-    ...overrides,
-  }
-}
-
-// ─── tests ────────────────────────────────────────────────────────────────────
-
-describe('getNextPermissionMode', () => {
-  // ── Full cycle ──────────────────────────────────────────────────────────
-
-  describe('unified cycle order', () => {
-    test('default → acceptEdits', () => {
-      expect(getNextPermissionMode(makeContext('default'))).toBe('acceptEdits')
-    })
-
-    test('acceptEdits → plan', () => {
-      expect(getNextPermissionMode(makeContext('acceptEdits'))).toBe('plan')
-    })
-
-    test('plan → auto', () => {
-      expect(getNextPermissionMode(makeContext('plan'))).toBe('auto')
-    })
-
-    test('auto → bypassPermissions (when bypass available)', () => {
-      expect(getNextPermissionMode(makeContext('auto'))).toBe('bypassPermissions')
-    })
-
-    test('bypassPermissions → default', () => {
-      expect(getNextPermissionMode(makeContext('bypassPermissions'))).toBe('default')
-    })
-
-    test('full cycle completes back to default', () => {
-      const cycle: PermissionMode[] = []
-      let ctx = makeContext('default')
-      for (let i = 0; i < 5; i++) {
-        const next = getNextPermissionMode(ctx)
-        cycle.push(next)
-        ctx = makeContext(next)
-      }
-      expect(cycle).toEqual([
-        'acceptEdits',
-        'plan',
-        'auto',
-        'bypassPermissions',
-        'default',
-      ])
-    })
-  })
-
-  // ── auto → default when bypass unavailable ─────────────────────────────
-
-  describe('auto mode with bypass unavailable', () => {
-    test('auto → default when isBypassPermissionsModeAvailable is false', () => {
-      const ctx = makeContext('auto', {
-        isBypassPermissionsModeAvailable: false,
-      })
-      expect(getNextPermissionMode(ctx)).toBe('default')
-    })
-  })
-
-  // ── dontAsk mode ────────────────────────────────────────────────────────
-
-  describe('dontAsk mode', () => {
-    test('dontAsk → default', () => {
-      expect(getNextPermissionMode(makeContext('dontAsk'))).toBe('default')
-    })
-  })
-
-  // ── USER_TYPE independence ──────────────────────────────────────────────
-
-  describe('no USER_TYPE distinction', () => {
-    test('cycle order is the same regardless of USER_TYPE', () => {
-      // Save original
-      const originalUserType = process.env.USER_TYPE
-
-      // Test with no USER_TYPE
-      delete process.env.USER_TYPE
-      const cycleNoType: PermissionMode[] = []
-      let ctx = makeContext('default')
-      for (let i = 0; i < 5; i++) {
-        const next = getNextPermissionMode(ctx)
-        cycleNoType.push(next)
-        ctx = makeContext(next)
-      }
-
-      // Test with USER_TYPE=ant
-      process.env.USER_TYPE = 'ant'
-      const cycleAnt: PermissionMode[] = []
-      ctx = makeContext('default')
-      for (let i = 0; i < 5; i++) {
-        const next = getNextPermissionMode(ctx)
-        cycleAnt.push(next)
-        ctx = makeContext(next)
-      }
-
-      // Restore
-      if (originalUserType !== undefined) {
-        process.env.USER_TYPE = originalUserType
-      } else {
-        delete process.env.USER_TYPE
-      }
-
-      // Both should produce the same cycle
-      expect(cycleNoType).toEqual(cycleAnt)
-      expect(cycleNoType).toEqual([
-        'acceptEdits',
-        'plan',
-        'auto',
-        'bypassPermissions',
-        'default',
-      ])
-    })
-  })
-
-  // ── teamContext parameter ───────────────────────────────────────────────
-
-  describe('teamContext parameter', () => {
-    test('does not affect cycle when provided', () => {
-      const ctx = makeContext('default')
-      const teamCtx = { leadAgentId: 'agent-123' }
-      expect(getNextPermissionMode(ctx, teamCtx)).toBe('acceptEdits')
-    })
-
-    test('does not affect cycle for plan mode', () => {
-      const ctx = makeContext('plan')
-      const teamCtx = { leadAgentId: 'agent-456' }
-      expect(getNextPermissionMode(ctx, teamCtx)).toBe('auto')
-    })
-  })
-
-  // ── cycle stability (no infinite loops) ─────────────────────────────────
-
-  describe('cycle stability', () => {
-    test('all modes return to default within 6 steps', () => {
-      const modes: PermissionMode[] = [
-        'default',
-        'acceptEdits',
-        'plan',
-        'auto',
-        'bypassPermissions',
-        'dontAsk',
-      ]
-      for (const startMode of modes) {
-        let current = startMode
-        let returnedToDefault = false
-        for (let i = 0; i < 6; i++) {
-          current = getNextPermissionMode(makeContext(current))
-          if (current === 'default') {
-            returnedToDefault = true
-            break
-          }
-        }
-        expect(returnedToDefault).toBe(true)
-      }
-    })
-
-    test('cycling 100 times never produces an invalid mode', () => {
-      const validModes = new Set<string>([
-        'default',
-        'acceptEdits',
-        'plan',
-        'auto',
-        'bypassPermissions',
-        'dontAsk',
-      ])
-      let ctx = makeContext('default')
-      for (let i = 0; i < 100; i++) {
-        const next = getNextPermissionMode(ctx)
-        expect(validModes.has(next)).toBe(true)
-        ctx = makeContext(next)
-      }
-    })
-  })
-})
--- a/src/utils/permissions/tests/permissionSetup.test.ts
+++ b/src/utils/permissions/tests/permissionSetup.test.ts
@@ -1,148 +0,0 @@
-/**
- * Tests for the simplified permission gate functions.
- *
- * After the "open auto/bypass to all users" change, the key guarantees are:
- * - shouldDisableBypassPermissions() always returns false
- * - isBypassPermissionsModeDisabled() always returns false
- * - hasAutoModeOptInAnySource() always returns true
- * - isAutoModeGateEnabled() returns true unless fast-mode circuit breaker fires
- * - getAutoModeUnavailableReason() returns null when no breaker fires
- *
- * These functions are tested through the getNextPermissionMode cycle
- * and through direct unit tests of the gate functions.
- */
-import { describe, expect, test } from 'bun:test'
-import type { ToolPermissionContext } from '../../../Tool.js'
-import type { PermissionMode } from '../PermissionMode.js'
-import { getNextPermissionMode } from '../getNextPermissionMode.js'
-
-// ─── helpers ──────────────────────────────────────────────────────────────────
-
-function makeContext(
-  mode: PermissionMode,
-  overrides: Partial<ToolPermissionContext> = {},
-): ToolPermissionContext {
-  return {
-    mode,
-    additionalWorkingDirectories: new Map(),
-    alwaysAllowRules: {},
-    alwaysDenyRules: {},
-    alwaysAskRules: {},
-    isBypassPermissionsModeAvailable: true,
-    ...overrides,
-  }
-}
-
-// ─── tests ────────────────────────────────────────────────────────────────────
-
-describe('permission gate invariants (after opening auto/bypass)', () => {
-  // ── Bypass permissions is always available ──────────────────────────────
-
-  describe('bypass mode always reachable in cycle', () => {
-    test('auto → bypassPermissions when isBypassPermissionsModeAvailable is true', () => {
-      const ctx = makeContext('auto', { isBypassPermissionsModeAvailable: true })
-      expect(getNextPermissionMode(ctx)).toBe('bypassPermissions')
-    })
-
-    test('isBypassPermissionsModeAvailable true is the default from getEmptyToolPermissionContext', () => {
-      // This test verifies the Tool.ts default is true
-      // (imported indirectly through the cycle behavior)
-      const ctx = makeContext('auto')
-      expect(ctx.isBypassPermissionsModeAvailable).toBe(true)
-      expect(getNextPermissionMode(ctx)).toBe('bypassPermissions')
-    })
-  })
-
-  // ── Auto mode is always available in cycle ──────────────────────────────
-
-  describe('auto mode always reachable in cycle', () => {
-    test('plan → auto (always, no gate check)', () => {
-      expect(getNextPermissionMode(makeContext('plan'))).toBe('auto')
-    })
-
-    test('plan → auto even when isBypassPermissionsModeAvailable is false', () => {
-      const ctx = makeContext('plan', { isBypassPermissionsModeAvailable: false })
-      expect(getNextPermissionMode(ctx)).toBe('auto')
-    })
-
-    test('bypassPermissions → default (then default → acceptEdits → plan → auto)', () => {
-      // Verify that after bypass, you can reach auto by cycling through
-      const fromBypass = getNextPermissionMode(makeContext('bypassPermissions'))
-      expect(fromBypass).toBe('default')
-
-      const fromDefault = getNextPermissionMode(makeContext('default'))
-      expect(fromDefault).toBe('acceptEdits')
-
-      const fromAcceptEdits = getNextPermissionMode(makeContext('acceptEdits'))
-      expect(fromAcceptEdits).toBe('plan')
-
-      const fromPlan = getNextPermissionMode(makeContext('plan'))
-      expect(fromPlan).toBe('auto')
-    })
-  })
-
-  // ── No opt-in gate between modes ────────────────────────────────────────
-
-  describe('no opt-in gate between modes', () => {
-    test('cycling from default to auto completes in 3 steps without any opt-in check', () => {
-      let mode: PermissionMode = 'default'
-      const steps: PermissionMode[] = []
-
-      // default → acceptEdits → plan → auto
-      for (let i = 0; i < 3; i++) {
-        mode = getNextPermissionMode(makeContext(mode))
-        steps.push(mode)
-      }
-
-      expect(steps).toEqual(['acceptEdits', 'plan', 'auto'])
-    })
-
-    test('cycling from default to bypassPermissions completes in 4 steps', () => {
-      let mode: PermissionMode = 'default'
-      const steps: PermissionMode[] = []
-
-      for (let i = 0; i < 4; i++) {
-        mode = getNextPermissionMode(makeContext(mode))
-        steps.push(mode)
-      }
-
-      expect(steps).toEqual(['acceptEdits', 'plan', 'auto', 'bypassPermissions'])
-    })
-  })
-
-  // ── Mode ordering safety (most dangerous modes last) ────────────────────
-
-  describe('safety ordering', () => {
-    test('auto comes before bypassPermissions in the cycle', () => {
-      // Starting from plan, user must press Shift+Tab twice to reach bypass
-      // (plan → auto → bypassPermissions)
-      const fromPlan = getNextPermissionMode(makeContext('plan'))
-      expect(fromPlan).toBe('auto')
-
-      const fromAuto = getNextPermissionMode(makeContext('auto'))
-      expect(fromAuto).toBe('bypassPermissions')
-    })
-
-    test('default comes before any dangerous mode', () => {
-      // default → acceptEdits (safe, just auto-accept edits)
-      const fromDefault = getNextPermissionMode(makeContext('default'))
-      expect(fromDefault).toBe('acceptEdits')
-      // acceptEdits is the least dangerous mode
-    })
-  })
-})
-
-describe('Tool.ts default context', () => {
-  test('getEmptyToolPermissionContext has isBypassPermissionsModeAvailable = true', async () => {
-    const { getEmptyToolPermissionContext } = await import('../../../Tool.js')
-    const ctx = getEmptyToolPermissionContext()
-    expect(ctx.isBypassPermissionsModeAvailable).toBe(true)
-  })
-})
-
-describe('settings hasAutoModeOptIn', () => {
-  test('always returns true after change', async () => {
-    const { hasAutoModeOptIn } = await import('../../settings/settings.js')
-    expect(hasAutoModeOptIn()).toBe(true)
-  })
-})
--- a/src/utils/permissions/bypassPermissionsKillswitch.ts
+++ b/src/utils/permissions/bypassPermissionsKillswitch.ts
@@ -1,44 +1,79 @@
 import { feature } from 'bun:bundle'
 import { useEffect, useRef } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { toError } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { useAppState, useAppStateStore, useSetAppState } from '../../state/AppState.js'
-import type { ToolPermissionContext } from '../../Tool.js'
 import {
+  type AppState,
+  useAppState,
+  useAppStateStore,
+  useSetAppState,
+} from 'src/state/AppState.js'
+import type { ToolPermissionContext } from 'src/Tool.js'
+import { getIsRemoteMode } from '../../bootstrap/state.js'
+import {
+  createDisabledBypassPermissionsContext,
+  shouldDisableBypassPermissions,
  verifyAutoModeGateAccess,
 } from './permissionSetup.js'

-/**
- * No-op — bypass permissions is always available.
- */
+let bypassPermissionsCheckRan = false
+
 export async function checkAndDisableBypassPermissionsIfNeeded(
-  _toolPermissionContext: ToolPermissionContext,
-  _setAppState: (f: (prev: import('../../state/AppState.js').AppState) => import('../../state/AppState.js').AppState) => void,
+  toolPermissionContext: ToolPermissionContext,
+  setAppState: (f: (prev: AppState) => AppState) => void,
 ): Promise<void> {
-  // Bypass permissions is always available — no gate check needed
+  // Check if bypassPermissions should be disabled based on Statsig gate
+  // Do this only once, before the first query, to ensure we have the latest gate value
+  if (bypassPermissionsCheckRan) {
+    return
+  }
+  bypassPermissionsCheckRan = true
+
+  if (!toolPermissionContext.isBypassPermissionsModeAvailable) {
+    return
+  }
+
+  const shouldDisable = await shouldDisableBypassPermissions()
+  if (!shouldDisable) {
+    return
+  }
+
+  setAppState(prev => {
+    return {
+      ...prev,
+      toolPermissionContext: createDisabledBypassPermissionsContext(
+        prev.toolPermissionContext,
+      ),
+    }
+  })
 }

 /**
- * Reset stub — kept for interface compatibility.
+ * Reset the run-once flag for checkAndDisableBypassPermissionsIfNeeded.
+ * Call this after /login so the gate check re-runs with the new org.
 */
 export function resetBypassPermissionsCheck(): void {
-  // No-op
+  bypassPermissionsCheckRan = false
 }

-/**
- * No-op hook — bypass permissions is always available.
- */
 export function useKickOffCheckAndDisableBypassPermissionsIfNeeded(): void {
-  // No-op
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
+  const setAppState = useSetAppState()
+
+  // Run once, when the component mounts
+  useEffect(() => {
+    if (getIsRemoteMode()) return
+    void checkAndDisableBypassPermissionsIfNeeded(
+      toolPermissionContext,
+      setAppState,
+    )
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 }

 let autoModeCheckRan = false

 export async function checkAndDisableAutoModeIfNeeded(
  toolPermissionContext: ToolPermissionContext,
-  setAppState: (f: (prev: import('../../state/AppState.js').AppState) => import('../../state/AppState.js').AppState) => void,
+  setAppState: (f: (prev: AppState) => AppState) => void,
  fastMode?: boolean,
 ): Promise<void> {
  if (feature('TRANSCRIPT_CLASSIFIER')) {
@@ -52,6 +87,10 @@ export async function checkAndDisableAutoModeIfNeeded(
      fastMode,
    )
    setAppState(prev => {
+      // Apply the transform to CURRENT context, not the stale snapshot we
+      // passed to verifyAutoModeGateAccess. The async GrowthBook await inside
+      // can be outrun by a mid-turn shift-tab; spreading a stale context here
+      // would revert the user's mode change.
      const nextCtx = updateContext(prev.toolPermissionContext)
      const newState =
        nextCtx === prev.toolPermissionContext
@@ -94,6 +133,11 @@ export function useKickOffCheckAndDisableAutoModeIfNeeded(): void {
  const isFirstRunRef = useRef(true)

  // Runs on mount (startup check) AND whenever the model or fast mode changes
+  // (kick-out / carousel-restore). Watching both model fields covers /model,
+  // Cmd+P picker, /config, and bridge onSetModel paths; fastMode covers
+  // /fast on|off for the tengu_auto_mode_config.disableFastMode circuit
+  // breaker. The print.ts headless paths are covered by the sync
+  // isAutoModeGateEnabled() check.
  useEffect(() => {
    if (getIsRemoteMode()) return
    if (isFirstRunRef.current) {
@@ -105,9 +149,7 @@ export function useKickOffCheckAndDisableAutoModeIfNeeded(): void {
      store.getState().toolPermissionContext,
      setAppState,
      fastMode,
-    ).catch(error => {
-      logError(new Error('Auto mode gate check failed', { cause: toError(error) }))
-    })
+    )
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [mainLoopModel, mainLoopModelForSession, fastMode])
 }
--- a/src/utils/permissions/getNextPermissionMode.ts
+++ b/src/utils/permissions/getNextPermissionMode.ts
@@ -1,13 +1,35 @@
+import { feature } from 'bun:bundle'
 import type { ToolPermissionContext } from '../../Tool.js'
 import { logForDebugging } from '../debug.js'
 import type { PermissionMode } from './PermissionMode.js'
-import { transitionPermissionMode } from './permissionSetup.js'
+import {
+  getAutoModeUnavailableReason,
+  isAutoModeGateEnabled,
+  transitionPermissionMode,
+} from './permissionSetup.js'
+
+// Checks both the cached isAutoModeAvailable (set at startup by
+// verifyAutoModeGateAccess) and the live isAutoModeGateEnabled() — these can
+// diverge if the circuit breaker or settings change mid-session. The
+// live check prevents transitionPermissionMode from throwing
+// (permissionSetup.ts:~559), which would silently crash the shift+tab handler
+// and leave the user stuck at the current mode.
+function canCycleToAuto(ctx: ToolPermissionContext): boolean {
+  if (feature('TRANSCRIPT_CLASSIFIER')) {
+    const gateEnabled = isAutoModeGateEnabled()
+    const can = !!ctx.isAutoModeAvailable && gateEnabled
+    if (!can) {
+      logForDebugging(
+        `[auto-mode] canCycleToAuto=false: ctx.isAutoModeAvailable=${ctx.isAutoModeAvailable} isAutoModeGateEnabled=${gateEnabled} reason=${getAutoModeUnavailableReason()}`,
+      )
+    }
+    return can
+  }
+  return false
+}

 /**
 * Determines the next permission mode when cycling through modes with Shift+Tab.
- *
- * Unified cycle for all users (no USER_TYPE distinction):
- *   default → acceptEdits → plan → auto → bypassPermissions → default
 */
 export function getNextPermissionMode(
  toolPermissionContext: ToolPermissionContext,
@@ -15,29 +37,43 @@ export function getNextPermissionMode(
 ): PermissionMode {
  switch (toolPermissionContext.mode) {
    case 'default':
+      // Ants skip acceptEdits and plan — auto mode replaces them
+      if (process.env.USER_TYPE === 'ant') {
+        if (toolPermissionContext.isBypassPermissionsModeAvailable) {
+          return 'bypassPermissions'
+        }
+        if (canCycleToAuto(toolPermissionContext)) {
+          return 'auto'
+        }
+        return 'default'
+      }
      return 'acceptEdits'

    case 'acceptEdits':
      return 'plan'

    case 'plan':
-      return 'auto'
-
-    case 'auto':
      if (toolPermissionContext.isBypassPermissionsModeAvailable) {
        return 'bypassPermissions'
      }
+      if (canCycleToAuto(toolPermissionContext)) {
+        return 'auto'
+      }
      return 'default'

    case 'bypassPermissions':
+      if (canCycleToAuto(toolPermissionContext)) {
+        return 'auto'
+      }
      return 'default'

    case 'dontAsk':
      // Not exposed in UI cycle yet, but return default if somehow reached
      return 'default'

+
    default:
-      // Covers any future modes — always fall back to default
+      // Covers auto (when TRANSCRIPT_CLASSIFIER is enabled) and any future modes — always fall back to default
      return 'default'
  }
 }
--- a/src/utils/permissions/permissionSetup.ts
+++ b/src/utils/permissions/permissionSetup.ts
@@ -799,6 +799,10 @@ export function initialPermissionModeFromCLI({
    result = { mode: 'default', notification }
  }

+  if (!result) {
+    result = { mode: 'default', notification }
+  }
+
  if (feature('TRANSCRIPT_CLASSIFIER') && result.mode === 'auto') {
    autoModeStateModule?.setAutoModeActive(true)
  }
@@ -923,9 +927,20 @@ export async function initializeToolPermissionContext({
    })
  }

-  // Bypass permissions mode is available to all users
-  const isBypassPermissionsModeAvailable = true
+  // Check if bypassPermissions mode is available (not disabled by Statsig gate or settings)
+  // Use cached values to avoid blocking on startup
+  const growthBookDisableBypassPermissionsMode =
+    checkStatsigFeatureGate_CACHED_MAY_BE_STALE(
+      'tengu_disable_bypass_permissions_mode',
+    )
  const settings = getSettings_DEPRECATED() || {}
+  const settingsDisableBypassPermissionsMode =
+    settings.permissions?.disableBypassPermissionsMode === 'disable'
+  const isBypassPermissionsModeAvailable =
+    (permissionMode === 'bypassPermissions' ||
+      allowDangerouslySkipPermissions) &&
+    !growthBookDisableBypassPermissionsMode &&
+    !settingsDisableBypassPermissionsMode

  // Load all permission rules from disk
  const rulesFromDisk = loadAllPermissionRulesFromDisk()
@@ -969,7 +984,7 @@ export async function initializeToolPermissionContext({
      alwaysAskRules: {},
      isBypassPermissionsModeAvailable,
      ...(feature('TRANSCRIPT_CLASSIFIER')
-        ? { isAutoModeAvailable: true }
+        ? { isAutoModeAvailable: isAutoModeGateEnabled() }
        : {}),
    },
    rulesFromDisk,
@@ -1061,54 +1076,131 @@ export function getAutoModeUnavailableNotification(
 * kicking the user out of a mode they've already left during the await.
 */
 export async function verifyAutoModeGateAccess(
-  _currentContext: ToolPermissionContext,
+  currentContext: ToolPermissionContext,
  // Runtime AppState.fastMode — passed from callers with AppState access so
  // the disableFastMode circuit breaker reads current state, not stale
  // settings.fastMode (which is intentionally sticky across /model auto-
  // downgrades). Optional for callers without AppState (e.g. SDK init paths).
  fastMode?: boolean,
 ): Promise<AutoModeGateCheckResult> {
-  // Only fast-mode circuit breaker remains. All other gates (GrowthBook,
-  // settings, model support, opt-in) have been removed.
+  // Auto-mode config — runs in ALL builds (circuit breaker, carousel, kick-out)
+  // Fresh read of tengu_auto_mode_config.enabled — this async check runs once
+  // after GrowthBook initialization and is the authoritative source for
+  // isAutoModeAvailable. The sync startup path uses stale cache; this
+  // corrects it. Circuit breaker (enabled==='disabled') takes effect here.
  const autoModeConfig = await getDynamicConfig_BLOCKS_ON_INIT<{
    enabled?: AutoModeEnabledState
    disableFastMode?: boolean
  }>('tengu_auto_mode_config', {})
+  const enabledState = parseAutoModeEnabledState(autoModeConfig?.enabled)
+  const disabledBySettings = isAutoModeDisabledBySettings()
+  // Treat settings-disable the same as GrowthBook 'disabled' for circuit-breaker
+  // semantics — blocks SDK/explicit re-entry via isAutoModeGateEnabled().
+  autoModeStateModule?.setAutoModeCircuitBroken(
+    enabledState === 'disabled' || disabledBySettings,
+  )

+  // Carousel availability: not circuit-broken, not disabled-by-settings,
+  // model supports it, disableFastMode breaker not firing, and (enabled or opted-in)
  const mainModel = getMainLoopModel()
+  // Temp circuit breaker: tengu_auto_mode_config.disableFastMode blocks auto
+  // mode when fast mode is on. Checks runtime AppState.fastMode (if provided)
+  // and, for ants, model name '-fast' substring (ant-internal fast models
+  // like capybara-v2-fast[1m] encode speed in the model ID itself).
+  // Remove once auto+fast mode interaction is validated.
  const disableFastModeBreakerFires =
    !!autoModeConfig?.disableFastMode &&
    (!!fastMode ||
      (process.env.USER_TYPE === 'ant' &&
        mainModel.toLowerCase().includes('-fast')))
-
-  // If fast-mode breaker fires, circuit-break auto mode
-  autoModeStateModule?.setAutoModeCircuitBroken(disableFastModeBreakerFires)
-
+  const modelSupported =
+    modelSupportsAutoMode(mainModel) && !disableFastModeBreakerFires
+  let carouselAvailable = false
+  if (enabledState !== 'disabled' && !disabledBySettings && modelSupported) {
+    carouselAvailable =
+      enabledState === 'enabled' || hasAutoModeOptInAnySource()
+  }
+  // canEnterAuto gates explicit entry (--permission-mode auto, defaultMode: auto)
+  // — explicit entry IS an opt-in, so we only block on circuit breaker + settings + model
+  const canEnterAuto =
+    enabledState !== 'disabled' && !disabledBySettings && modelSupported
  logForDebugging(
-    `[auto-mode] verifyAutoModeGateAccess: disableFastModeBreakerFires=${disableFastModeBreakerFires}`,
+    `[auto-mode] verifyAutoModeGateAccess: enabledState=${enabledState} disabledBySettings=${disabledBySettings} model=${mainModel} modelSupported=${modelSupported} disableFastModeBreakerFires=${disableFastModeBreakerFires} carouselAvailable=${carouselAvailable} canEnterAuto=${canEnterAuto}`,
  )

-  if (!disableFastModeBreakerFires) {
-    // Auto mode available — no kick-out needed
-    return { updateContext: ctx => ctx }
+  // Capture CLI-flag intent now (doesn't depend on context).
+  const autoModeFlagCli = autoModeStateModule?.getAutoModeFlagCli() ?? false
+
+  // Return a transform function that re-evaluates context-dependent conditions
+  // against the CURRENT context at setAppState time. The async GrowthBook
+  // results above (canEnterAuto, carouselAvailable, enabledState, reason) are
+  // closure-captured — those don't depend on context. But mode, prePlanMode,
+  // and isAutoModeAvailable checks MUST use the fresh ctx or a mid-await
+  // shift-tab gets reverted (or worse, the user stays in auto despite the
+  // circuit breaker if they entered auto DURING the await — which is possible
+  // because setAutoModeCircuitBroken above runs AFTER the await).
+  const setAvailable = (
+    ctx: ToolPermissionContext,
+    available: boolean,
+  ): ToolPermissionContext => {
+    if (ctx.isAutoModeAvailable !== available) {
+      logForDebugging(
+        `[auto-mode] verifyAutoModeGateAccess setAvailable: ${ctx.isAutoModeAvailable} -> ${available}`,
+      )
+    }
+    return ctx.isAutoModeAvailable === available
+      ? ctx
+      : { ...ctx, isAutoModeAvailable: available }
  }

-  // Fast-mode breaker fired — kick out of auto if currently in it
-  const notification = getAutoModeUnavailableNotification('circuit-breaker')
+  if (canEnterAuto) {
+    return { updateContext: ctx => setAvailable(ctx, carouselAvailable) }
+  }

+  // Gate is off or circuit-broken — determine reason (context-independent).
+  let reason: AutoModeUnavailableReason
+  if (disabledBySettings) {
+    reason = 'settings'
+    logForDebugging('auto mode disabled: disableAutoMode in settings', {
+      level: 'warn',
+    })
+  } else if (enabledState === 'disabled') {
+    reason = 'circuit-breaker'
+    logForDebugging(
+      'auto mode disabled: tengu_auto_mode_config.enabled === "disabled" (circuit breaker)',
+      { level: 'warn' },
+    )
+  } else {
+    reason = 'model'
+    logForDebugging(
+      `auto mode disabled: model ${getMainLoopModel()} does not support auto mode`,
+      { level: 'warn' },
+    )
+  }
+  const notification = getAutoModeUnavailableNotification(reason)
+
+  // Unified kick-out transform. Re-checks the FRESH ctx and only fires
+  // side effects (setAutoModeActive(false), setNeedsAutoModeExitAttachment)
+  // when the kick-out actually applies. This keeps autoModeActive in sync
+  // with toolPermissionContext.mode even if the user changed modes during
+  // the await: if they already left auto on their own, handleCycleMode
+  // already deactivated the classifier and we don't fire again; if they
+  // ENTERED auto during the await (possible before setAutoModeCircuitBroken
+  // landed), we kick them out here.
  const kickOutOfAutoIfNeeded = (
    ctx: ToolPermissionContext,
  ): ToolPermissionContext => {
    const inAuto = ctx.mode === 'auto'
    logForDebugging(
-      `[auto-mode] kickOutOfAutoIfNeeded (fast-mode): ctx.mode=${ctx.mode}`,
+      `[auto-mode] kickOutOfAutoIfNeeded applying: ctx.mode=${ctx.mode} ctx.prePlanMode=${ctx.prePlanMode} reason=${reason}`,
    )
+    // Plan mode with auto active: either from prePlanMode='auto' (entered
+    // from auto) or from opt-in (strippedDangerousRules present).
    const inPlanWithAutoActive =
      ctx.mode === 'plan' &&
      (ctx.prePlanMode === 'auto' || !!ctx.strippedDangerousRules)
    if (!inAuto && !inPlanWithAutoActive) {
-      return { ...ctx, isAutoModeAvailable: false }
+      return setAvailable(ctx, false)
    }
    if (inAuto) {
      autoModeStateModule?.setAutoModeActive(false)
@@ -1122,6 +1214,8 @@ export async function verifyAutoModeGateAccess(
        isAutoModeAvailable: false,
      }
    }
+    // Plan with auto active: deactivate auto, restore permissions, defuse
+    // prePlanMode so ExitPlanMode goes to default.
    autoModeStateModule?.setAutoModeActive(false)
    setNeedsAutoModeExitAttachment(true)
    return {
@@ -1131,23 +1225,65 @@ export async function verifyAutoModeGateAccess(
    }
  }

-  return { updateContext: kickOutOfAutoIfNeeded, notification }
+  // Notification decisions use the stale context — that's OK: we're deciding
+  // WHETHER to notify based on what the user WAS doing when this check started.
+  // (Side effects and mode mutation are decided inside the transform above,
+  // against the fresh ctx.)
+  const wasInAuto = currentContext.mode === 'auto'
+  // Auto was used during plan: entered from auto or opt-in auto active
+  const autoActiveDuringPlan =
+    currentContext.mode === 'plan' &&
+    (currentContext.prePlanMode === 'auto' ||
+      !!currentContext.strippedDangerousRules)
+  const wantedAuto = wasInAuto || autoActiveDuringPlan || autoModeFlagCli
+
+  if (!wantedAuto) {
+    // User didn't want auto at call time — no notification. But still apply
+    // the full kick-out transform: if they shift-tabbed INTO auto during the
+    // await (before setAutoModeCircuitBroken landed), we need to evict them.
+    return { updateContext: kickOutOfAutoIfNeeded }
+  }
+
+  if (wasInAuto || autoActiveDuringPlan) {
+    // User was in auto or had auto active during plan — kick out + notify.
+    return { updateContext: kickOutOfAutoIfNeeded, notification }
+  }
+
+  // autoModeFlagCli only: defaultMode was auto but sync check rejected it.
+  // Suppress notification if isAutoModeAvailable is already false (already
+  // notified on a prior check; prevents repeat notifications on successive
+  // unsupported-model switches).
+  return {
+    updateContext: kickOutOfAutoIfNeeded,
+    notification: currentContext.isAutoModeAvailable ? notification : undefined,
+  }
 }

 /**
- * Bypass permissions is always available — no remote gate check needed.
+ * Core logic to check if bypassPermissions should be disabled based on Statsig gate
 */
 export function shouldDisableBypassPermissions(): Promise<boolean> {
-  return Promise.resolve(false)
+  return checkSecurityRestrictionGate('tengu_disable_bypass_permissions_mode')
+}
+
+function isAutoModeDisabledBySettings(): boolean {
+  const settings = getSettings_DEPRECATED() || {}
+  return (
+    (settings as { disableAutoMode?: 'disable' }).disableAutoMode ===
+      'disable' ||
+    (settings.permissions as { disableAutoMode?: 'disable' } | undefined)
+      ?.disableAutoMode === 'disable'
+  )
 }

 /**
- * Checks if auto mode can be entered: only fast-mode circuit breaker remains.
- * Synchronous.
+ * Checks if auto mode can be entered: circuit breaker is not active and settings
+ * have not disabled it. Synchronous.
 */
 export function isAutoModeGateEnabled(): boolean {
-  // Auto mode is available to all users — only fast-mode circuit breaker remains
  if (autoModeStateModule?.isAutoModeCircuitBroken() ?? false) return false
+  if (isAutoModeDisabledBySettings()) return false
+  if (!modelSupportsAutoMode(getMainLoopModel())) return false
  return true
 }

@@ -1156,9 +1292,11 @@ export function isAutoModeGateEnabled(): boolean {
 * Synchronous — uses state populated by verifyAutoModeGateAccess.
 */
 export function getAutoModeUnavailableReason(): AutoModeUnavailableReason | null {
+  if (isAutoModeDisabledBySettings()) return 'settings'
  if (autoModeStateModule?.isAutoModeCircuitBroken() ?? false) {
    return 'circuit-breaker'
  }
+  if (!modelSupportsAutoMode(getMainLoopModel())) return 'model'
  return null
 }

@@ -1172,7 +1310,8 @@ export function getAutoModeUnavailableReason(): AutoModeUnavailableReason | null
 */
 export type AutoModeEnabledState = 'enabled' | 'disabled' | 'opt-in'

-const AUTO_MODE_ENABLED_DEFAULT: AutoModeEnabledState = 'enabled'
+const AUTO_MODE_ENABLED_DEFAULT: AutoModeEnabledState =
+  feature('TRANSCRIPT_CLASSIFIER') ? 'enabled' : 'disabled'

 function parseAutoModeEnabledState(value: unknown): AutoModeEnabledState {
  if (value === 'enabled' || value === 'disabled' || value === 'opt-in') {
@@ -1222,15 +1361,27 @@ export function getAutoModeEnabledStateIfCached():
 *   dialog or by IDE/Desktop settings toggle)
 */
 export function hasAutoModeOptInAnySource(): boolean {
-  return true
+  if (autoModeStateModule?.getAutoModeFlagCli() ?? false) return true
+  return hasAutoModeOptIn()
 }

 /**
 * Checks if bypassPermissions mode is currently disabled by Statsig gate or settings.
- * Always returns false — bypass is available to all users.
+ * This is a synchronous version that uses cached Statsig values.
 */
 export function isBypassPermissionsModeDisabled(): boolean {
-  return false
+  const growthBookDisableBypassPermissionsMode =
+    checkStatsigFeatureGate_CACHED_MAY_BE_STALE(
+      'tengu_disable_bypass_permissions_mode',
+    )
+  const settings = getSettings_DEPRECATED() || {}
+  const settingsDisableBypassPermissionsMode =
+    settings.permissions?.disableBypassPermissionsMode === 'disable'
+
+  return (
+    growthBookDisableBypassPermissionsMode ||
+    settingsDisableBypassPermissionsMode
+  )
 }

 /**
@@ -1255,12 +1406,29 @@ export function createDisabledBypassPermissionsContext(
 }

 /**
- * No-op — bypass permissions is always available, no remote gate check needed.
+ * Asynchronously checks if the bypassPermissions mode should be disabled based on Statsig gate
+ * and returns an updated toolPermissionContext if needed
 */
 export async function checkAndDisableBypassPermissions(
-  _currentContext: ToolPermissionContext,
+  currentContext: ToolPermissionContext,
 ): Promise<void> {
-  // Bypass permissions is always available — no gate check needed
+  // Only proceed if bypassPermissions mode is available
+  if (!currentContext.isBypassPermissionsModeAvailable) {
+    return
+  }
+
+  const shouldDisable = await shouldDisableBypassPermissions()
+  if (!shouldDisable) {
+    return
+  }
+
+  // Gate is enabled, need to disable bypassPermissions mode
+  logForDebugging(
+    'bypassPermissions mode is being disabled by Statsig gate (async check)',
+    { level: 'warn' },
+  )
+
+  void gracefulShutdown(1, 'bypass_permissions_disabled')
 }

 export function isDefaultPermissionModeAuto(): boolean {
@@ -1278,7 +1446,11 @@ export function isDefaultPermissionModeAuto(): boolean {
 */
 export function shouldPlanUseAutoMode(): boolean {
  if (feature('TRANSCRIPT_CLASSIFIER')) {
-    return isAutoModeGateEnabled() && getUseAutoModeDuringPlan()
+    return (
+      hasAutoModeOptIn() &&
+      isAutoModeGateEnabled() &&
+      getUseAutoModeDuringPlan()
+    )
  }
  return false
 }
--- a/src/utils/permissions/permissions.ts
+++ b/src/utils/permissions/permissions.ts
@@ -696,7 +696,6 @@ export const hasPermissionsToUseTool: CanUseToolFn = async (
          context.options.tools,
          appState.toolPermissionContext,
          context.abortController.signal,
-          context.langfuseTrace,
        )
      } finally {
        clearClassifierChecking(toolUseID)
--- a/src/utils/permissions/yoloClassifier.ts
+++ b/src/utils/permissions/yoloClassifier.ts
@@ -31,7 +31,6 @@ import { resolveAntModel } from '../model/antModels.js'
 import { getMainLoopModel } from '../model/model.js'
 import { getAutoModeConfig } from '../settings/settings.js'
 import { sideQuery } from '../sideQuery.js'
-import type { LangfuseSpan } from '../../services/langfuse/index.js'
 import { jsonStringify } from '../slowOperations.js'
 import { tokenCountWithEstimation } from '../tokens.js'
 import {
@@ -732,7 +731,6 @@ async function classifyYoloActionXml(
    action: string
  },
  mode: TwoStageMode,
-  parentSpan?: LangfuseSpan | null,
 ): Promise<YoloClassifierResult> {
  const classifierType =
    mode === 'both'
@@ -793,7 +791,6 @@ async function classifyYoloActionXml(
        signal,
        ...(mode !== 'fast' && { stop_sequences: ['</block>'] }),
        querySource: 'auto_mode',
-        parentSpan,
      }
      const stage1Raw = await sideQuery(stage1Opts)
      stage1DurationMs = Date.now() - stage1Start
@@ -880,7 +877,6 @@ async function classifyYoloActionXml(
      maxRetries: getDefaultMaxRetries(),
      signal,
      querySource: 'auto_mode' as const,
-      parentSpan,
    }
    const stage2Raw = await sideQuery(stage2Opts)
    const stage2DurationMs = Date.now() - stage2Start
@@ -1019,7 +1015,6 @@ export async function classifyYoloAction(
  tools: Tools,
  context: ToolPermissionContext,
  signal: AbortSignal,
-  parentSpan?: LangfuseSpan | null,
 ): Promise<YoloClassifierResult> {
  const lookup = buildToolLookup(tools)
  const actionCompact = toCompact(action, lookup)
@@ -1131,7 +1126,6 @@ export async function classifyYoloAction(
        action: actionCompact,
      },
      getTwoStageMode(),
-      parentSpan,
    )
  }
  const [disableThinking, thinkingPadding] = getClassifierThinkingConfig(model)
@@ -1162,7 +1156,6 @@ export async function classifyYoloAction(
      maxRetries: getDefaultMaxRetries(),
      signal,
      querySource: 'auto_mode' as const,
-      parentSpan,
    }
    const result = await sideQuery(sideQueryOpts)
    void maybeDumpAutoMode(sideQueryOpts, result, start)
--- a/src/utils/settings/settings.ts
+++ b/src/utils/settings/settings.ts
@@ -894,8 +894,20 @@ export function hasSkipDangerousModePermissionPrompt(): boolean {
 * a malicious project could otherwise auto-bypass the dialog (RCE risk).
 */
 export function hasAutoModeOptIn(): boolean {
-  // Auto mode is available to all users — no opt-in needed
-  return true
+  if (feature('TRANSCRIPT_CLASSIFIER')) {
+    const user = getSettingsForSource('userSettings')?.skipAutoPermissionPrompt
+    const local =
+      getSettingsForSource('localSettings')?.skipAutoPermissionPrompt
+    const flag = getSettingsForSource('flagSettings')?.skipAutoPermissionPrompt
+    const policy =
+      getSettingsForSource('policySettings')?.skipAutoPermissionPrompt
+    const result = !!(user || local || flag || policy)
+    logForDebugging(
+      `[auto-mode] hasAutoModeOptIn=${result} skipAutoPermissionPrompt: user=${user} local=${local} flag=${flag} policy=${policy}`,
+    )
+    return result
+  }
+  return false
 }

 /**
--- a/src/utils/sideQuery.ts
+++ b/src/utils/sideQuery.ts
@@ -2,7 +2,6 @@ import type Anthropic from '@anthropic-ai/sdk'
 import type { BetaToolUnion } from '@anthropic-ai/sdk/resources/beta/messages.js'
 import {
  getLastApiCompletionTimestamp,
-  getSessionId,
  setLastApiCompletionTimestamp,
 } from '../bootstrap/state.js'
 import { STRUCTURED_OUTPUTS_BETA_HEADER } from '../constants/betas.js'
@@ -15,13 +14,8 @@ import { logEvent } from '../services/analytics/index.js'
 import type { AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS } from '../services/analytics/metadata.js'
 import { getAPIMetadata } from '../services/api/claude.js'
 import { getAnthropicClient } from '../services/api/client.js'
-import { createTrace, createChildSpan, endTrace, recordLLMObservation } from '../services/langfuse/index.js'
-import type { LangfuseSpan } from '../services/langfuse/index.js'
-import { convertMessagesToLangfuse, convertOutputToLangfuse, convertToolsToLangfuse } from '../services/langfuse/convert.js'
 import { getModelBetas, modelSupportsStructuredOutputs } from './betas.js'
-import { errorMessage } from './errors.js'
 import { computeFingerprint } from './fingerprint.js'
-import { getAPIProvider } from './model/providers.js'
 import { normalizeModelStringForAPI } from './model/model.js'

 type MessageParam = Anthropic.MessageParam
@@ -67,11 +61,6 @@ export type SideQueryOptions = {
  stop_sequences?: string[]
  /** Attributes this call in tengu_api_success for COGS joining against reporting.sampling_calls. */
  querySource: QuerySource
-  /** Parent Langfuse span to nest this side query under the main agent trace. */
-  parentSpan?: LangfuseSpan | null
-  /** When true, API failures are recorded as WARNING instead of ERROR in Langfuse.
-   *  Use for optional/best-effort queries where failure is expected and handled gracefully. */
-  optional?: boolean
 }

 /**
@@ -188,51 +177,25 @@ export async function sideQuery(opts: SideQueryOptions): Promise<BetaMessage> {
  }

  const normalizedModel = normalizeModelStringForAPI(model)
-  const provider = getAPIProvider()
  const start = Date.now()
-  const traceName = `side-query:${opts.querySource}`
-
-  // When parentSpan is provided, create a child span nested under the
-  // main agent trace; otherwise create a standalone root trace.
-  const langfuseTrace = opts.parentSpan
-    ? createChildSpan(opts.parentSpan, {
-        name: traceName,
-        sessionId: getSessionId(),
-        model: normalizedModel,
-        provider,
-        querySource: opts.querySource,
-      })
-    : createTrace({
-        sessionId: getSessionId(),
-        model: normalizedModel,
-        provider,
-        name: traceName,
-        querySource: opts.querySource,
-      })
-
-  let response: BetaMessage
-  try {
-    response = await client.beta.messages.create(
-      {
-        model: normalizedModel,
-        max_tokens,
-        system: systemBlocks,
-        messages,
-        ...(tools && { tools }),
-        ...(tool_choice && { tool_choice }),
-        ...(output_format && { output_config: { format: output_format } }),
-        ...(temperature !== undefined && { temperature }),
-        ...(stop_sequences && { stop_sequences }),
-        ...(thinkingConfig && { thinking: thinkingConfig }),
-        ...(betas.length > 0 && { betas }),
-        metadata: getAPIMetadata(),
-      },
-      { signal },
-    )
-  } catch (error) {
-    endTrace(langfuseTrace, { error: errorMessage(error) }, opts.optional ? 'interrupted' : 'error')
-    throw error
-  }
+  // biome-ignore lint/plugin: this IS the wrapper that handles OAuth attribution
+  const response = await client.beta.messages.create(
+    {
+      model: normalizedModel,
+      max_tokens,
+      system: systemBlocks,
+      messages,
+      ...(tools && { tools }),
+      ...(tool_choice && { tool_choice }),
+      ...(output_format && { output_config: { format: output_format } }),
+      ...(temperature !== undefined && { temperature }),
+      ...(stop_sequences && { stop_sequences }),
+      ...(thinkingConfig && { thinking: thinkingConfig }),
+      ...(betas.length > 0 && { betas }),
+      metadata: getAPIMetadata(),
+    },
+    { signal },
+  )

  const requestId =
    (response as { _request_id?: string | null })._request_id ?? undefined
@@ -255,32 +218,5 @@ export async function sideQuery(opts: SideQueryOptions): Promise<BetaMessage> {
  })
  setLastApiCompletionTimestamp(now)

-  // Record LLM observation in Langfuse (no-op if not configured).
-  // Wrap SDK types into the internal message format expected by converters.
-  const wrappedInput = messages.map(m => ({
-    type: m.role === 'assistant' ? 'assistant' as const : 'user' as const,
-    message: { role: m.role, content: m.content },
-  })) as unknown as Parameters<typeof convertMessagesToLangfuse>[0]
-  const wrappedOutput = [{
-    type: 'assistant' as const,
-    message: { role: 'assistant' as const, content: response.content },
-  }] as unknown as Parameters<typeof convertOutputToLangfuse>[0]
-  recordLLMObservation(langfuseTrace, {
-    model: normalizedModel,
-    provider,
-    input: convertMessagesToLangfuse(wrappedInput, systemBlocks.length > 0 ? systemBlocks.map(b => b.text) : undefined),
-    output: convertOutputToLangfuse(wrappedOutput),
-    usage: {
-      input_tokens: response.usage.input_tokens,
-      output_tokens: response.usage.output_tokens,
-      cache_creation_input_tokens: response.usage.cache_creation_input_tokens ?? undefined,
-      cache_read_input_tokens: response.usage.cache_read_input_tokens ?? undefined,
-    },
-    startTime: new Date(start),
-    endTime: new Date(),
-    ...(tools && { tools: convertToolsToLangfuse(tools as unknown[]) }),
-  })
-  endTrace(langfuseTrace)
-
  return response
 }
--- a/src/utils/tokens.ts
+++ b/src/utils/tokens.ts
@@ -150,17 +150,9 @@ export function getCurrentUsage(messages: Message[]): {
    const message = messages[i]
    const usage = message ? getTokenUsage(message) : undefined
    if (usage) {
-      const inputTokens =
-        (usage.input_tokens ?? 0) +
-        (usage.cache_creation_input_tokens ?? 0) +
-        (usage.cache_read_input_tokens ?? 0)
-      // Skip placeholder usage (all zeros) — third-party APIs may emit
-      // message_start without real usage data, causing the context counter
-      // to flash to 0. Fall through to the previous message instead.
-      if (inputTokens === 0 && (usage.output_tokens ?? 0) === 0) continue
      return {
-        input_tokens: usage.input_tokens ?? 0,
-        output_tokens: usage.output_tokens ?? 0,
+        input_tokens: usage.input_tokens,
+        output_tokens: usage.output_tokens,
        cache_creation_input_tokens: usage.cache_creation_input_tokens ?? 0,
        cache_read_input_tokens: usage.cache_read_input_tokens ?? 0,
      }
Author	SHA1	Message	Date
claude-code-best	5ed0e63095	refactor: 将 weixin 模块从 src/ 迁移至 packages/weixin 工作区包将 src/services/weixin/ 中的纯业务逻辑迁入 @claude-code-best/weixin workspace 包，降低 src/ 耦合度。仅保留 server.ts 作为薄适配层。 - 迁移 7 个无修改的纯模块 (types/api/accounts/login/pairing/media/send) - monitor.ts 内联 PERMISSION_REPLY_RE 正则，解除对 src/ 的依赖 - permissions.ts 本地定义 ChannelPermissionRequestParams 接口 - cli.ts 拆分：serve 子命令通过回调注入，login/access 保留在包内 - server.ts 重写为从 @claude-code-best/weixin 导入 - 新增 cli-serve.ts 作为 serve 入口薄壳 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-04-19 20:55:13 +08:00
claude-code-best	0201db55ac	chore: 删除临时规划文档 wx_channel.md 并还原 package.json 排序 wx_channel.md 内容已整合到 docs/features/channels.md，不再需要。 package.json 中 @ant/model-provider 位置从原始位置被无意移动，还原。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-04-19 20:32:20 +08:00
1111	7a9f53b63f	fix: 修正 vite 构建的 Windows 路径解析 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 18:50:20 +08:00
1111	dbc8a85cd7	fix: 改用 qrcode 生成 weixin 登录二维码 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 18:49:57 +08:00
1111	3b3e4fb1ea	fix: 延迟加载 weixin 登录二维码依赖 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 18:38:40 +08:00
1111	6607b13364	docs: 更新微信 channel 接入计划状态 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:40:30 +08:00
1111	cc09c304ec	docs: 补充内建 weixin channel 使用说明 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:39:29 +08:00
1111	3c2e046bf9	fix: 修复 builtin channel 的 ChannelsNotice 误报 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:37:45 +08:00
1111	bd6417c715	fix: 修正 channel permission relay 路由与能力判定 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:36:35 +08:00
1111	4bf9f04a4d	feat: 注册内建 weixin channel 插件 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:35:23 +08:00
1111	c0f7735110	feat: 接入 weixin 服务层与命令入口 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-04-19 14:34:33 +08:00
				`@@ -0,0 +1 @@`
				`export { runWeixinMcpServer } from './server.js'`