farming-code 2.2.19 → 2.2.22

package/README.md

@@ -1,11 +1,11 @@
 <p align="center">
-  <img src="./public/farming-2/app-icon-v2-512.png" alt="Farming" width="112">
+  <img src="./public/farming-2/app-icon-v2-512.png" alt="Farming Code" width="112">
 </p>
 
-<h1 align="center">Farming</h1>
+<h1 align="center">Farming Code</h1>
 
 <p align="center">
-  Farming is an open-source remote web workbench for running and supervising AI coding agents on a development machine.
+  Farming Code is an open-source, self-hosted browser workspace for running and supervising Codex, Claude Code, OpenCode, and other AI coding agents.
 </p>
 
 <p align="center"><a href="./README.zh_cn.md">简体中文</a></p>
@@ -21,7 +21,7 @@
 
 ![Farming Code workbench](./docs/products/code/assets/01-code-workspace.png)
 
-Farming runs on the same development machine as your repositories and coding CLIs. Agent processes, terminals, and project files stay on that machine; a desktop or phone browser connects to those real sessions.
+Farming Code runs on the same development machine as your repositories and coding CLIs. Agent processes, terminals, and project files stay on that machine; a desktop or phone browser connects to those real sessions.
 
 ## Quick Start
 
@@ -119,7 +119,7 @@ farming logs
 farming stop
 ```
 
-The startup token is stored in `~/.farming/.session-token` and reused across restarts and upgrades. **Settings → Updates** can upgrade npm installations in place. npm updates first use the machine's configured registry and retry the registry shown in Settings only when that registry lacks the selected version. Before installing, Farming verifies that npm will update the same package root that launched the server. GitHub Releases also provide standalone CLI and directory bundles; see [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases) for current artifacts.
+The startup token is stored in `~/.farming/.session-token` and reused across restarts and upgrades. **Settings → Updates** uses a two-step flow for npm installations: **Prepare** installs the selected version into a separate staging directory while the current server keeps running, then **Restart to update** switches the package directory and restarts Farming only after the user clicks it. If the new server does not start, Farming restores the previous package directory. npm preparation first uses the machine's configured registry and retries the registry shown in Settings only when that registry lacks the selected version. Before preparing or applying an update, Farming verifies that npm targets the same package root that launched the server. GitHub Releases also provide standalone CLI and directory bundles; see [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases) for current artifacts.
 
 To run from source with the same port and base path:
 

package/README.zh_cn.md

@@ -1,11 +1,11 @@
 <p align="center">
-  <img src="./public/farming-2/app-icon-v2-512.png" alt="Farming" width="112">
+  <img src="./public/farming-2/app-icon-v2-512.png" alt="Farming Code" width="112">
 </p>
 
-<h1 align="center">Farming</h1>
+<h1 align="center">Farming Code</h1>
 
 <p align="center">
-  Farming 是一个开源的远程 Web 工作台，用于在开发机上启动和管理 AI Coding Agent。
+  Farming Code 是一个开源、自托管的浏览器工作区，用于启动和管理 Codex、Claude Code、OpenCode 及其他 AI Coding Agent。
 </p>
 
 <p align="center"><a href="./README.md">English</a></p>
@@ -21,7 +21,7 @@
 
 ![Farming Code 工作台](./docs/products/code/assets/01-code-workspace.png)
 
-Farming 与代码仓库和 Coding CLI 运行在同一台开发机上。Agent 进程、终端和项目文件都留在这台机器上；电脑或手机浏览器连接并操作这些真实 Session。
+Farming Code 与代码仓库和 Coding CLI 运行在同一台开发机上。Agent 进程、终端和项目文件都留在这台机器上；电脑或手机浏览器连接并操作这些真实 Session。
 
 ## 快速开始
 
@@ -119,7 +119,7 @@ farming logs
 farming stop
 ```
 
-启动 Token 存放在 `~/.farming/.session-token`，重启和升级会继续复用。**Settings → Updates** 可以原地升级 npm 安装。npm 升级会先使用机器配置的 registry；只有该 registry 缺少所选版本时，才会回退到 Settings 展示版本所用的 registry。安装前 Farming 会校验 npm 将更新的包根目录与启动当前服务的包根目录一致。GitHub Releases 也提供独立 CLI 和目录 Bundle；当前产物见 [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases)。
+启动 Token 存放在 `~/.farming/.session-token`，重启和升级会继续复用。**Settings → Updates** 为 npm 安装提供两阶段更新：点击**准备**后，所选版本会安装到独立 staging 目录，当前服务继续运行；准备完成后，只有用户点击**重启并应用**，Farming 才会切换包目录并重启。如果新服务启动失败，Farming 会恢复旧包目录。npm 准备阶段会先使用机器配置的 registry；只有该 registry 缺少所选版本时，才会回退到 Settings 展示版本所用的 registry。准备和应用更新前，Farming 都会校验 npm 目标包根目录与启动当前服务的包根目录一致。GitHub Releases 也提供独立 CLI 和目录 Bundle；当前产物见 [GitHub Releases](https://github.com/zhuwenzhuang/farming/releases)。
 
 从源码运行，并使用相同的端口与 Base Path：
 

package/THIRD_PARTY_NOTICES.md

@@ -121,11 +121,8 @@ Microsoft, or the maintainers of the third-party projects listed above.
 
 ## Design References
 
-Farming's interface is influenced by modern coding workbenches and agent tools,
-including Codex, Visual Studio Code, and browser IDEs. This notice covers
-software and assets used by Farming; design inspiration alone does not imply
-that those projects are bundled with Farming.
-
-The CRT skin also studies the visual behavior of cool-retro-term. Farming's
-browser shaders are an independent implementation and do not copy or bundle
-cool-retro-term source code.
+Farming Code's interface design references Visual Studio Code and Codex.
+Farming's browser-based approach to terminal and coding-agent sessions also
+draws on the idea explored by
+[VibeTunnel](https://github.com/amantus-ai/vibetunnel). These design references
+are separate from the software and assets identified above.

package/backend/acp/client-services.js

@@ -1,3 +1,4 @@
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { spawn } = require('child_process');
@@ -20,6 +21,10 @@ function requireMatchingSession(binding, params) {
   }
 }
 
+function requireOpenBinding(binding) {
+  if (binding?.exited === true) throw new Error('ACP Agent connection is closed');
+}
+
 async function resolveWorkspacePath(binding, requestedPath, options = {}) {
   const value = String(requestedPath || '');
   if (!path.isAbsolute(value)) throw new Error('ACP file and terminal paths must be absolute');
@@ -76,6 +81,7 @@ class AcpClientFileSystem {
       throw new Error('ACP text file is too large to write');
     }
     const target = await resolveWorkspacePath(binding, params.path, { allowMissing: true });
+    requireOpenBinding(binding);
     let mode = 0o666;
     try {
       const existing = await fsp.realpath(target);
@@ -87,9 +93,14 @@ class AcpClientFileSystem {
     } catch (error) {
       if (error?.code !== 'ENOENT') throw error;
     }
-    const temporary = path.join(path.dirname(target), `.${path.basename(target)}.farming-acp-${process.pid}-${Date.now()}.tmp`);
+    const temporary = path.join(
+      path.dirname(target),
+      `.${path.basename(target)}.farming-acp-${process.pid}-${crypto.randomUUID()}.tmp`,
+    );
     try {
+      requireOpenBinding(binding);
       await fsp.writeFile(temporary, content, { mode });
+      requireOpenBinding(binding);
       await fsp.rename(temporary, target);
     } catch (error) {
       await fsp.rm(temporary, { force: true }).catch(() => {});
@@ -120,8 +131,8 @@ class AcpClientTerminalManager {
       : typeof options.spawn === 'function'
         ? null
         : nodePty.spawn;
-    this.sequence = 0;
     this.terminals = new Map();
+    this.pendingCreates = new Map();
   }
 
   activeCount(agentId) {
@@ -132,23 +143,44 @@ class AcpClientTerminalManager {
     return count;
   }
 
+  reserveCreate(agentId) {
+    const pending = this.pendingCreates.get(agentId) || 0;
+    if (this.activeCount(agentId) + pending >= MAX_ACTIVE_TERMINALS_PER_AGENT) {
+      throw new Error('ACP terminal limit reached for this Agent');
+    }
+    this.pendingCreates.set(agentId, pending + 1);
+  }
+
+  releaseCreate(agentId) {
+    const pending = this.pendingCreates.get(agentId) || 0;
+    if (pending <= 1) this.pendingCreates.delete(agentId);
+    else this.pendingCreates.set(agentId, pending - 1);
+  }
+
   async create(binding, params) {
     requireMatchingSession(binding, params);
-    if (this.activeCount(binding.agentId) >= MAX_ACTIVE_TERMINALS_PER_AGENT) {
-      throw new Error('ACP terminal limit reached for this Agent');
+    this.reserveCreate(binding.agentId);
+    try {
+      return await this.createReserved(binding, params);
+    } finally {
+      this.releaseCreate(binding.agentId);
     }
+  }
+
+  async createReserved(binding, params) {
     const command = String(params.command || '').trim();
     if (!command) throw new Error('ACP terminal command is required');
     const cwd = params.cwd
       ? await resolveWorkspacePath(binding, params.cwd)
       : await fsp.realpath(binding.cwd);
+    requireOpenBinding(binding);
     const env = { ...binding.env };
     for (const item of Array.isArray(params.env) ? params.env : []) {
       const name = String(item?.name || '');
       if (!name || name.includes('=') || name.includes('\0')) throw new Error('Invalid ACP terminal environment variable');
       env[name] = String(item?.value ?? '');
     }
-    const terminalId = `acp-terminal-${++this.sequence}`;
+    const terminalId = `acp-terminal-${crypto.randomUUID()}`;
     const args = Array.isArray(params.args) ? params.args.map(String) : [];
     const child = this.ptySpawn
       ? this.ptySpawn(command, args, {

package/backend/acp/patch-decisions.js

@@ -1,3 +1,4 @@
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { resolveWorkspacePath } = require('./client-services');
@@ -91,7 +92,10 @@ async function missingTarget(root, requestedPath) {
 }
 
 async function atomicWrite(target, content, mode = 0o666) {
-  const temporary = path.join(path.dirname(target), `.${path.basename(target)}.farming-acp-revert-${process.pid}-${Date.now()}.tmp`);
+  const temporary = path.join(
+    path.dirname(target),
+    `.${path.basename(target)}.farming-acp-revert-${process.pid}-${crypto.randomUUID()}.tmp`,
+  );
   try {
     await fsp.writeFile(temporary, content, { mode });
     await fsp.rename(temporary, target);
@@ -111,14 +115,26 @@ async function rejectPatch({ entry, root, requestedPath }) {
   const current = await existingTarget(root, requestedPath);
 
   if (deleted) {
-    if (current.exists) throw new AcpPatchDecisionError('File changed after this ACP patch; it was not reverted', 409);
+    if (current.exists) {
+      const currentText = await fsp.readFile(current.target, 'utf8');
+      if (currentText === oldText) {
+        return { action: 'reverted', path: relativeWorkspacePath(root, current.logical) };
+      }
+      throw new AcpPatchDecisionError('File changed after this ACP patch; it was not reverted', 409);
+    }
     const target = await missingTarget(root, requestedPath);
     await atomicWrite(target.target, oldText);
     return { action: 'reverted', path: relativeWorkspacePath(root, target.logical) };
   }
 
-  if (!current.exists) throw new AcpPatchDecisionError('File changed after this ACP patch; it was not reverted', 409);
+  if (!current.exists) {
+    if (added) return { action: 'reverted', path: relativeWorkspacePath(root, current.logical) };
+    throw new AcpPatchDecisionError('File changed after this ACP patch; it was not reverted', 409);
+  }
   const currentText = await fsp.readFile(current.target, 'utf8');
+  if (!added && currentText === oldText) {
+    return { action: 'reverted', path: relativeWorkspacePath(root, current.logical) };
+  }
   if (currentText !== newText) throw new AcpPatchDecisionError('File changed after this ACP patch; it was not reverted', 409);
 
   if (added) {