farming-code 2.2.29 → 2.2.30

package/README.md

@@ -25,19 +25,16 @@ Farming Code runs on the same development machine as your repositories and codin
 
 ## Quick Start
 
-With Node.js 22.13 LTS (22.x) or Node.js 24+ and at least one supported coding CLI installed and signed in:
+With Node.js 22.13 LTS (22.x) or Node.js 24+ and access to a supported coding
+Agent provider:
 
 ```bash
 npm install --global farming-code@latest && farming daemon
 ```
 
-Open one of the authenticated URLs printed by the command, choose **New Agent**, then select a CLI, workspace, and Chat or Terminal. Closing the browser does not stop the Agent. In the same browser, revisit that address; on the development machine, this command prints the local address again:
-
-```bash
-farming url
-```
-
-For a new remote browser, use the authenticated **Network** URL printed when `farming daemon` starts. A VPN, SSH tunnel, or HTTPS reverse proxy can provide a stable reachable address, but the first visit still needs the Farming startup token.
+Open one of the authenticated URLs printed by the command, choose **New Agent**,
+and start a task. See [Getting started](./docs/getting-started.md) for the complete
+first-run flow.
 
 ![Start an Agent](./docs/products/code/assets/02-start-agent-picker.png)
 
@@ -47,26 +44,23 @@ Farming Code is the default desktop and mobile interface. It groups work by proj
 
 ### Agents, Chat, and Terminal
 
-Start or resume Codex, Claude Code, OpenCode, Qoder, and other detected coding CLIs. Supported Agents offer structured Chat for reading results and inspecting tool activity, plus a real Terminal for working directly with the CLI. Search and History cover both current work and resumable sessions.
+Start or resume Codex, Claude Code, OpenCode, Qoder, and other detected coding
+Agents. Use structured Chat to read results and inspect the process, or Terminal
+to work directly with the CLI.
 
 ![Farming Code structured Agent process](./docs/products/code/assets/11-code-agent-process.png)
 
 ### Files and Review
 
-Browse, search, and lightly edit Project Files without leaving the current task. Inspect Git Changes, History, Diff, and Blame, then open a commit or working-copy change in Review.
+Browse, search, and lightly edit Project Files without leaving the current task.
+Inspect changes and open Review when you need evidence.
 
 ### Browser Resources
 
-Each Project can own multiple named Browser Resources. In **Plugins → Browser**, users choose a discovered Chromium-based system browser or an external loopback CDP endpoint. Farming prepares a pinned `agent-browser` runtime during installation or update, verifies the cache again before startup, and sends both human input and Agent actions to the same session. Farming does not download Chromium or depend on Playwright. Agents discover the live capability with `farming capabilities`, then use the progressively disclosed `farming browser` CLI for navigation, interaction, inspection, debugging, page state, frames/dialogs, and Project-scoped file transfer; npm installations also expose the `farming-browser` alias. See [Farming Browser for Agents](docs/products/code/browser-agent-cli.md).
-
-Farming can also connect to an externally managed Chromium CDP endpoint, including one exposed by Docker; see [external CDP browser setup](./docs/products/code/external-cdp-browser.md).
-
-This first Browser Viewer targets web pages and simple Agent interaction. It is not a replacement for the browser's full window chrome, DevTools, downloads UI, extensions, or Computer Use.
+Farming lets people and Agents use the same project browser. See [Farming Browser](docs/products/code/browser-agent-cli.md).
 
 ## Supported Agents
 
-Farming prepares the pinned Codex and Claude executables needed by its structured runtimes during installation or update and verifies them again before startup, while continuing to discover other installed CLIs on the host. Codex, Claude Code, OpenCode, and Qoder support both structured Chat and a native Terminal; other detected coding agents use the Terminal path.
-
 | Agent | Structured Chat | Terminal | History / resume |
 | --- | --- | --- | --- |
 | Codex | Yes | Yes | Yes |
@@ -75,25 +69,15 @@ Farming prepares the pinned Codex and Claude executables needed by its structure
 | Qoder | Yes | Yes | Yes |
 | bash / zsh | — | Yes | No |
 
-Farming hosts CLIs that already work on the same machine. It does not replace provider installation, login, or account configuration.
+Provider-backed Agents still require a valid provider login. Other detected CLIs
+must be able to run on the Farming host.
 
 ## Remote Use
 
-Run Farming on the development machine and open its authenticated URL from any desktop or phone that can reach that machine:
-
-```text
-Desktop or phone browser
-          │ HTTP / WebSocket
-          ▼
-Development machine
-  Farming server
-  ├── coding Agent processes
-  ├── real terminals
-  ├── repositories and project files
-  └── optional agent-browser sessions
-```
-
-The browser can disconnect and reconnect without stopping an Agent. A normal Farming server restart can also reconnect supported live terminal sessions. The desktop layout keeps projects, conversations, files, and review together; the mobile layout focuses one conversation, terminal, or file at a time.
+Run Farming on the development machine and open its authenticated URL from a
+desktop or phone that can reach it. Agents keep running when the browser
+disconnects. See [Operations](./docs/operations/README.md) for remote-access and
+security guidance.
 
 ## Farming CRT
 
@@ -109,51 +93,26 @@ Farming Net is a separate, token-protected directory for Farming deployments. It
 
 ## Installation And Updates
 
-Install with the Quick Start command above. For npm installations, **Settings → Updates** prepares a selected release while the current Server keeps running, then applies it after confirmation. The existing startup token is retained.
+Install with the Quick Start command above. npm installations can update from
+**Settings → Updates**.
 
 ![Farming npm update settings](./docs/products/code/assets/14-code-settings.png)
 
-Standalone CLI and directory bundles remain available from [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases).
+Standalone CLI and directory bundles remain available from [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases) for manual installation. The in-app updater never reads GitHub Releases; it is available only to npm installations.
 
 ## Security
 
 Farming controls real terminals and files on the development machine. Run it on a trusted host and network. Do not expose it directly to the public internet without a VPN, SSH tunnel, HTTPS reverse proxy, or equivalent access control.
 
-Token authentication protects HTTP and WebSocket traffic. `FARMING_DISABLE_AUTH=1` is only for trusted local development. Workspace file APIs validate paths against the selected project root. See [SECURITY.md](./SECURITY.md) for reporting and deployment guidance.
+See [SECURITY.md](./SECURITY.md) for deployment and reporting guidance.
 
 ## Documentation
 
-- [Farming 2 product overview and capability map](./docs/products/README.md)
-- [Farming Code guide](./docs/products/code/README.md)
-- [Farming CRT guide](./docs/products/crt/README.md)
-- [Farming Net deployment portal](./docs/products/net/README.md)
-- [Mobile guide](./docs/products/code/mobile-guide.md)
-- [ACP runtime](./docs/products/code/acp-runtime.md)
-- [Review foundation](./docs/products/code/review-foundation.md)
+- [Documentation home](./docs/README.md)
+- [Getting started](./docs/getting-started.md)
+- [Operations](./docs/operations/README.md)
 - [Release history](https://github.com/zhuwenzhuang/farming/releases)
-- [Contributor instructions](./AGENTS.md)
-
-## Development Checks
-
-```bash
-npm test
-npm run typecheck
-npm run lint
-FARMING_BASE_PATH=/farming npm run build
-npm run test:e2e:playwright
-```
-
-Product screenshots are generated from an anonymous demo workspace with real browser flows:
-
-```bash
-npm run docs:product:screenshots
-```
-
-To refresh only selected files, pass a comma-separated list:
-
-```bash
-FARMING_SCREENSHOT_FILES=01-code-workspace.png npm run docs:product:screenshots
-```
+- [Contributing](./CONTRIBUTING.md)
 
 ## License
 

package/README.zh_cn.md

@@ -25,19 +25,14 @@ Farming Code 与代码仓库和 Coding CLI 运行在同一台开发机上。Agen
 
 ## 快速开始
 
-准备好 Node.js 22.13 LTS（22.x）或 Node.js 24+，以及至少一个已安装、已登录的受支持 Coding CLI：
+准备好 Node.js 22.13 LTS（22.x）或 Node.js 24+，并确保至少有一个可用的
+Coding Agent Provider：
 
 ```bash
 npm install --global farming-code@latest && farming daemon
 ```
 
-打开命令输出的任意一个带鉴权 URL，选择 **New Agent**，再选择 CLI、Workspace 和 Chat 或 Terminal。关闭浏览器不会停止 Agent；同一个浏览器可以再次打开该地址。在开发机上，下面的命令会重新输出本机地址：
-
-```bash
-farming url
-```
-
-新的远程浏览器应使用 `farming daemon` 启动时输出的带鉴权 **Network** URL。VPN、SSH Tunnel 或 HTTPS Reverse Proxy 可以提供稳定且可达的地址，但第一次访问仍需要 Farming 启动 Token。
+打开命令输出的任意一个带鉴权 URL，选择 **New Agent**，然后启动任务。完整首次使用流程见[快速开始](./docs/getting-started.zh_cn.md)。
 
 ![启动 Agent](./docs/products/code/assets/02-start-agent-picker.png)
 
@@ -47,26 +42,20 @@ Farming Code 是默认的桌面与手机界面。它按项目组织工作，把
 
 ### Agent、Chat 与 Terminal
 
-启动或恢复 Codex、Claude Code、OpenCode、Qoder 以及其他检测到的 Coding CLI。受支持的 Agent 提供结构化 Chat，用来阅读结果和检查工具活动；也可以打开真实 Terminal，直接操作 CLI。Search 和 History 同时覆盖当前工作与可恢复 Session。
+启动或恢复 Codex、Claude Code、OpenCode、Qoder 以及其他检测到的 Coding Agent。使用结构化 Chat 阅读结果和检查过程，或使用 Terminal 直接操作 CLI。
 
 ![Farming Code 结构化 Agent 过程](./docs/products/code/assets/11-code-agent-process.png)
 
 ### Files 与 Review
 
-浏览、搜索并轻量编辑 Project Files，不需要离开当前任务。检查 Git Changes、History、Diff 和 Blame，再把 Commit 或 Working Copy 修改打开到 Review。
+浏览、搜索并轻量编辑 Project Files，不需要离开当前任务。需要证据时可以检查修改并打开 Review。
 
 ### Browser Resource
 
-每个 Project 可以拥有多个可命名的 Browser Resource。用户在**插件 → 浏览器**中选择已发现的 Chromium 系统浏览器，或填写外部回环 CDP Endpoint。Farming 在安装或更新阶段准备锁定版本的 `agent-browser` Runtime，并在启动前再次校验 Cache，然后把人的输入和 Agent 操作发送给同一个 Session。Farming 不下载 Chromium，也不依赖 Playwright。Agent 先用 `farming capabilities` 发现实时能力，再通过渐进式披露的 `farming browser` CLI 使用导航、交互、检查、调试、页面状态、Frame/Dialog 与 Project 级文件传输；npm 安装还会提供 `farming-browser` 别名。详见 [Farming Browser Agent CLI](docs/products/code/browser-agent-cli.zh_cn.md)。
-
-Farming 也可以连接由管理员独立管理的 Chromium CDP Endpoint，包括 Docker 中暴露的 Chromium；配置方式见[外部 CDP 浏览器指南](./docs/products/code/external-cdp-browser.zh_cn.md)。
-
-第一版 Browser Viewer 面向网页展示与简单 Agent 操作，不替代浏览器完整窗口、DevTools、下载界面、浏览器扩展或 Computer Use。
+Farming 让人和 Agent 使用同一个 Project Browser。详见 [Farming Browser](docs/products/code/browser-agent-cli.zh_cn.md)。
 
 ## 支持的 Agent
 
-Farming 在安装或更新阶段准备结构化 Runtime 所需的锁定版本 Codex 与 Claude Executable，并在启动前再次校验，同时继续发现开发机上安装的其他 CLI。Codex、Claude Code、OpenCode 和 Qoder 同时支持结构化 Chat 与原生 Terminal；其他检测到的 Coding Agent 使用 Terminal 路径。
-
 | Agent | 结构化 Chat | Terminal | History / Resume |
 | --- | --- | --- | --- |
 | Codex | 是 | 是 | 是 |
@@ -75,25 +64,11 @@ Farming 在安装或更新阶段准备结构化 Runtime 所需的锁定版本 Co
 | Qoder | 是 | 是 | 是 |
 | bash / zsh | — | 是 | 否 |
 
-Farming 承载的是已经能在同一台机器正常工作的 CLI，不替代 Provider 的安装、登录和账户配置。
+使用 Provider 的 Agent 仍需要有效登录；其他被发现的 CLI 必须能在 Farming Host 上正常运行。
 
 ## 远程使用
 
-在开发机上运行 Farming，再从能够访问这台机器的电脑或手机打开带鉴权 URL：
-
-```text
-电脑或手机浏览器
-       │ HTTP / WebSocket
-       ▼
-开发机
-  Farming Server
-  ├── Coding Agent 进程
-  ├── 真实 Terminal
-  ├── 代码仓库与项目文件
-  └── 可选的系统浏览器进程
-```
-
-浏览器断开或重新连接不会停止 Agent。Farming Server 正常重启后也可以重新连接受支持的实时 Terminal Session。桌面布局把项目、对话、文件和 Review 放在一起；手机布局一次聚焦一段对话、一个 Terminal 或一个文件。
+在开发机上运行 Farming，再从能够访问这台机器的电脑或手机打开带鉴权 URL。浏览器断开后 Agent 仍会继续运行。远程访问和安全说明见[运行与维护](./docs/operations/README.zh_cn.md)。
 
 ## Farming CRT
 
@@ -109,51 +84,25 @@ Farming Net 是独立、带 Token 鉴权的 Farming 部署目录。它提供一
 
 ## 安装与更新
 
-按上面的快速开始命令安装即可。对于 npm 安装，**Settings → Updates** 会在当前 Server 继续运行时准备所选版本，确认后再应用更新；原有启动 Token 保持不变。
+按上面的快速开始命令安装即可。npm 安装可以从 **Settings → Updates** 更新。
 
 ![Farming npm 更新设置](./docs/products/code/assets/14-code-settings.png)
 
-独立 CLI 和目录 Bundle 仍可从 [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases) 下载。
+独立 CLI 和目录 Bundle 仍可从 [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases) 手动下载安装。应用内更新不会读取 GitHub Releases，只对 npm 安装开放。
 
 ## 安全
 
 Farming 会控制开发机上的真实终端和文件。请只运行在可信主机和可信网络中，不要在没有 VPN、SSH Tunnel、HTTPS Reverse Proxy 或等价访问控制时直接暴露到公网。
 
-Token 鉴权同时保护 HTTP 和 WebSocket。`FARMING_DISABLE_AUTH=1` 只适合可信本地开发；Workspace 文件 API 会校验所有路径都位于所选项目根目录内。报告和部署说明见 [SECURITY.zh_cn.md](./SECURITY.zh_cn.md)。
+部署与报告说明见 [SECURITY.zh_cn.md](./SECURITY.zh_cn.md)。
 
 ## 文档
 
-- [Farming 2 产品总览与能力矩阵](./docs/products/README.zh_cn.md)
-- [Farming Code 指南](./docs/products/code/README.zh_cn.md)
-- [Farming CRT 指南](./docs/products/crt/README.zh_cn.md)
-- [Farming Net 部署门户](./docs/products/net/README.zh_cn.md)
-- [移动端指南](./docs/products/code/mobile-guide.zh_cn.md)
-- [ACP 运行时](./docs/products/code/acp-runtime.zh_cn.md)
-- [Review 基础](./docs/products/code/review-foundation.zh_cn.md)
+- [文档首页](./docs/README.zh_cn.md)
+- [快速开始](./docs/getting-started.zh_cn.md)
+- [运行与维护](./docs/operations/README.zh_cn.md)
 - [版本历史](https://github.com/zhuwenzhuang/farming/releases)
-- [贡献者说明](./AGENTS.zh_cn.md)
-
-## 开发检查
-
-```bash
-npm test
-npm run typecheck
-npm run lint
-FARMING_BASE_PATH=/farming npm run build
-npm run test:e2e:playwright
-```
-
-产品截图由匿名 Demo Workspace 和真实浏览器流程生成：
-
-```bash
-npm run docs:product:screenshots
-```
-
-只更新指定截图时，可以传入逗号分隔的文件名：
-
-```bash
-FARMING_SCREENSHOT_FILES=01-code-workspace.png npm run docs:product:screenshots
-```
+- [参与贡献](./CONTRIBUTING.zh_cn.md)
 
 ## License
 

package/backend/acp-runtime.js

@@ -9,7 +9,6 @@ const { promisify } = require('util');
 const packageJson = require('../package.json');
 const { AcpCheckpointStore } = require('./acp-checkpoint-store');
 const { AcpSessionState } = require('./acp-session-state');
-const { readCodexHistoryImageData } = require('./codex-transcript');
 const { AcpClientFileSystem, AcpClientTerminalManager } = require('./acp/client-services');
 const { PACKAGED_CODEX_ACP_ARG } = require('./acp/packaged-codex-acp');
 const { PACKAGED_CLAUDE_ACP_ARG } = require('./acp/packaged-claude-acp');
@@ -36,7 +35,7 @@ const CODEX_SET_SESSION_MODEL_METHOD = 'session/set_model';
 const CODEX_STEER_METHOD = '_codex/session/steer';
 const CODEX_ACP_PACKAGE = '@agentclientprotocol/codex-acp';
 const CODEX_ACP_VERSION = '1.1.4';
-const CODEX_ACP_SHA256 = 'e36876cc2250737c719644e6c69ab054a3f8b58071fad45c44407013082942ff';
+const CODEX_ACP_SHA256 = '75e70159692a7889d496651074cd3476687bafb9dc7d4eb3e9590509ad687611';
 const CLAUDE_ACP_PACKAGE = '@agentclientprotocol/claude-agent-acp';
 const CLAUDE_ACP_VERSION = '0.59.0';
 const CLAUDE_ACP_SHA256 = 'a6aa515dd02382617bf46d9eac47b8a1022c6835bcf7a8d61e2c63939be2e49c';
@@ -857,19 +856,6 @@ class AcpRuntime extends EventEmitter {
             binding.historyReplayActive = false;
           }
           binding.sessionState.finishHistoryReplay();
-          if (provider === 'codex' && binding.sessionState.hasCodexHistoryImageReferences()) {
-            let imageDataByPath = new Map();
-            try {
-              imageDataByPath = await readCodexHistoryImageData(requestedSessionId, {
-                codexHome: binding.env.CODEX_HOME,
-              });
-            } catch {
-              // Local history images can still be restored from their adapter paths.
-            }
-            this.requireOpenBinding(binding);
-            await binding.sessionState.hydrateCodexHistoryAttachments({ imageDataByPath });
-            this.requireOpenBinding(binding);
-          }
           this.restorePatchDecisions(binding, restoredCheckpoint?.patchDecisions);
           historyMode = 'load';
           opened = true;

package/backend/acp-session-state.js

@@ -1,21 +1,9 @@
-const fsp = require('fs/promises');
-const path = require('path');
-const { fileURLToPath } = require('url');
-
 const MAX_ACP_UPDATES = 2_000;
 const MAX_ACP_UPDATE_LOG_VALUE_CHARS = 32 * 1024;
-const MAX_CODEX_HISTORY_IMAGES_PER_MESSAGE = 6;
-const MAX_CODEX_HISTORY_IMAGE_BYTES = 5 * 1024 * 1024;
-const CODEX_HISTORY_IMAGE_MIME_BY_EXT = Object.freeze({
-  '.gif': 'image/gif',
-  '.jpeg': 'image/jpeg',
-  '.jpg': 'image/jpeg',
-  '.png': 'image/png',
-  '.svg': 'image/svg+xml',
-  '.webp': 'image/webp',
-});
+const MAX_CODEX_SUBAGENTS = 128;
+const MAX_CODEX_SUBAGENT_ID_CHARS = 160;
+const MAX_CODEX_SUBAGENT_NAME_CHARS = 120;
 const {
-  codexHistoryImageTargets,
   visibleUserMessageText,
 } = require('./codex-transcript');
 const {
@@ -27,6 +15,54 @@ function clone(value) {
   return value === undefined ? undefined : JSON.parse(JSON.stringify(value));
 }
 
+function boundedSubagentId(value) {
+  return String(value || '').trim().slice(0, MAX_CODEX_SUBAGENT_ID_CHARS);
+}
+
+function normalizeCodexSubagentStatus(value) {
+  const status = String(value || '');
+  return [
+    'pendingInit',
+    'running',
+    'completed',
+    'interrupted',
+    'errored',
+    'shutdown',
+    'notFound',
+  ].includes(status) ? status : '';
+}
+
+function normalizeCodexSubagentUpdate(raw, sessionId) {
+  if (!raw || raw.version !== 1 || !Array.isArray(raw.agents)) return null;
+  const rootThreadId = boundedSubagentId(raw.rootThreadId);
+  if (!rootThreadId || rootThreadId !== sessionId) return null;
+  const agents = [];
+  const seen = new Set();
+  for (const candidate of raw.agents.slice(0, MAX_CODEX_SUBAGENTS)) {
+    const threadId = boundedSubagentId(candidate?.threadId);
+    const status = normalizeCodexSubagentStatus(candidate?.status);
+    if (!threadId || threadId === rootThreadId || !status || seen.has(threadId)) continue;
+    seen.add(threadId);
+    const parentThreadId = boundedSubagentId(candidate?.parentThreadId);
+    const name = String(candidate?.name || '').trim().slice(0, MAX_CODEX_SUBAGENT_NAME_CHARS);
+    agents.push({
+      threadId,
+      parentThreadId: parentThreadId && parentThreadId !== threadId ? parentThreadId : null,
+      ...(name ? { name } : {}),
+      status,
+    });
+  }
+  return {
+    version: 1,
+    rootThreadId,
+    revision: Number.isFinite(Number(raw.revision))
+      ? Math.max(0, Math.floor(Number(raw.revision)))
+      : 0,
+    kind: raw.kind === 'delta' ? 'delta' : 'snapshot',
+    agents,
+  };
+}
+
 function compactUpdateForLog(update) {
   let serialized = '';
   try {
@@ -62,40 +98,6 @@ function contentText(content) {
     .join('');
 }
 
-function localPathFromHistoryImageTarget(value) {
-  const target = String(value || '').trim();
-  if (!target || target.includes('\0') || /^data:/i.test(target)) return '';
-  if (/^file:\/\//i.test(target)) {
-    try {
-      return fileURLToPath(target);
-    } catch {
-      return '';
-    }
-  }
-  return path.isAbsolute(target) ? target : '';
-}
-
-function imageBlockFromDataUrl(value) {
-  const match = String(value || '').match(/^data:(image\/(?:gif|jpe?g|png|svg\+xml|webp));base64,([a-z0-9+/=]+)$/i);
-  if (!match) return null;
-  const data = match[2];
-  if (!data || Math.ceil(data.length * 3 / 4) > MAX_CODEX_HISTORY_IMAGE_BYTES) return null;
-  return { type: 'image', mimeType: match[1].toLowerCase(), data };
-}
-
-async function imageBlockFromLocalPath(filePath) {
-  const ext = path.extname(filePath).toLowerCase();
-  const mimeType = CODEX_HISTORY_IMAGE_MIME_BY_EXT[ext];
-  if (!mimeType) return null;
-  try {
-    const stat = await fsp.stat(filePath);
-    if (!stat.isFile() || stat.size <= 0 || stat.size > MAX_CODEX_HISTORY_IMAGE_BYTES) return null;
-    return { type: 'image', mimeType, data: (await fsp.readFile(filePath)).toString('base64') };
-  } catch {
-    return null;
-  }
-}
-
 function isContextCompactionText(content) {
   const text = contentText(content).trim();
   return /^\*?Context compacted(?: to fit the model's context window)?\.?\*?$/i.test(text)
@@ -157,6 +159,7 @@ class AcpSessionState {
     this.configOptions = [];
     this.title = '';
     this.updatedAt = '';
+    this.codexSubagents = null;
     this.truncated = false;
     this.sequence = 0;
     this.revision = Number.isFinite(Number(options.revisionBase))
@@ -202,6 +205,7 @@ class AcpSessionState {
     state.configOptions = clone(checkpoint.configOptions || []);
     state.title = String(checkpoint.title || '');
     state.updatedAt = String(checkpoint.updatedAt || '');
+    state.codexSubagents = clone(checkpoint.codexSubagents ?? null);
     state.truncated = checkpoint.truncated === true;
     return state;
   }
@@ -282,44 +286,6 @@ class AcpSessionState {
     // History replay uses the same reducer as live updates; nothing to close.
   }
 
-  hasCodexHistoryImageReferences() {
-    return this.provider === 'codex' && this.entries.some(entry => (
-      entry?.type === 'message'
-      && entry.role === 'user'
-      && codexHistoryImageTargets(contentText(entry.content)).length > 0
-    ));
-  }
-
-  async hydrateCodexHistoryAttachments(options = {}) {
-    if (this.provider !== 'codex') return 0;
-    const imageDataByPath = options.imageDataByPath instanceof Map ? options.imageDataByPath : new Map();
-    let hydrated = 0;
-    for (const entry of this.entries) {
-      if (entry?.type !== 'message' || entry.role !== 'user') continue;
-      const existingImages = (entry.content || []).filter(content => content?.type === 'image');
-      const remaining = MAX_CODEX_HISTORY_IMAGES_PER_MESSAGE - existingImages.length;
-      if (remaining <= 0) continue;
-      const targets = codexHistoryImageTargets(contentText(entry.content));
-      const seenPaths = new Set();
-      const blocks = [];
-      for (const target of targets) {
-        const filePath = localPathFromHistoryImageTarget(target);
-        if (!filePath || seenPaths.has(filePath)) continue;
-        seenPaths.add(filePath);
-        const fallback = imageDataByPath.get(filePath);
-        const block = await imageBlockFromLocalPath(filePath) || imageBlockFromDataUrl(fallback);
-        if (!block) continue;
-        blocks.push(block);
-        if (blocks.length >= remaining) break;
-      }
-      if (blocks.length === 0) continue;
-      entry.content.push(...blocks);
-      this.touchEntry(entry);
-      hydrated += blocks.length;
-    }
-    return hydrated;
-  }
-
   apply(notification) {
     if (!notification || notification.sessionId !== this.sessionId) return false;
     const update = notification.update;
@@ -360,10 +326,31 @@ class AcpSessionState {
     } else if (kind === 'session_info_update') {
       if (Object.prototype.hasOwnProperty.call(update, 'title')) this.title = String(update.title || '');
       if (Object.prototype.hasOwnProperty.call(update, 'updatedAt')) this.updatedAt = String(update.updatedAt || '');
+      this.applyCodexSubagentUpdate(update?._meta?.codex?.subagents);
     }
     return true;
   }
 
+  applyCodexSubagentUpdate(raw) {
+    const update = normalizeCodexSubagentUpdate(raw, this.sessionId);
+    if (!update) return false;
+    const agentsById = update.kind === 'delta' && this.codexSubagents?.rootThreadId === update.rootThreadId
+      ? new Map(this.codexSubagents.agents.map(agent => [agent.threadId, agent]))
+      : new Map();
+    for (const agent of update.agents) agentsById.set(agent.threadId, agent);
+    this.codexSubagents = {
+      version: 1,
+      rootThreadId: update.rootThreadId,
+      revision: update.revision,
+      agents: [...agentsById.values()].slice(0, MAX_CODEX_SUBAGENTS),
+    };
+    // Session metadata changes are visible transcript state even when no
+    // message/tool entry changed. Advance the reducer revision so the existing
+    // revision-driven transcript read reconciles this snapshot without polling.
+    this.revision += 1;
+    return true;
+  }
+
   applyMessageChunk(update, kind) {
     const role = kind === 'user_message_chunk' ? 'user' : 'assistant';
     const type = kind === 'agent_thought_chunk' ? 'thought' : 'message';
@@ -523,6 +510,7 @@ class AcpSessionState {
       revision: this.revision,
       delta,
       hasMoreBefore: startIndex > 0,
+      codexSubagents: clone(this.codexSubagents),
     };
   }
 
@@ -564,7 +552,7 @@ class AcpSessionState {
       if (
         entry.type === 'message'
         && entry.role === 'user'
-        && ((entry.content || []).some(content => content?.type === 'image') || codexHistoryImageTargets(contentText(entry.content)).length > 0)
+        && (entry.content || []).some(content => content?.type === 'image')
       ) {
         renderedAttachmentKinds.push('image');
       }
@@ -608,6 +596,7 @@ class AcpSessionState {
       availableCommands: clone(this.availableCommands),
       currentModeId: this.currentModeId,
       configOptions: clone(this.configOptions),
+      codexSubagents: clone(this.codexSubagents),
       ...clone(extra),
     };
     if (options.includeUpdates === true) snapshot.updates = clone(this.updates);
@@ -632,6 +621,7 @@ class AcpSessionState {
       configOptions: clone(this.configOptions),
       title: this.title,
       updatedAt: this.updatedAt,
+      codexSubagents: clone(this.codexSubagents),
       truncated: this.truncated,
     };
   }