farming-code 2.2.16 → 2.2.17

package/README.md

@@ -15,7 +15,7 @@
   <a href="https://github.com/zhuwenzhuang/farming/releases"><img alt="Release" src="https://img.shields.io/github/v/release/zhuwenzhuang/farming?label=release"></a>
   <a href="https://www.npmjs.com/package/farming-code"><img alt="npm" src="https://img.shields.io/npm/v/farming-code?label=npm"></a>
   <a href="./LICENSE"><img alt="License" src="https://img.shields.io/github/license/zhuwenzhuang/farming"></a>
-  <img alt="Node.js 22+" src="https://img.shields.io/badge/node-%3E%3D22-339933?logo=nodedotjs&amp;logoColor=white">
+  <img alt="Node.js 22.13 LTS or 24+" src="https://img.shields.io/badge/node-22.13_LTS_%7C_24%2B-339933?logo=nodedotjs&amp;logoColor=white">
   <img alt="macOS and Linux" src="https://img.shields.io/badge/platform-macOS%20%7C%20Linux-555">
 </p>
 
@@ -25,7 +25,7 @@ Farming runs on the same development machine as your repositories and coding CLI
 
 ## Quick Start
 
-With Node.js 22 or newer and at least one supported coding CLI installed and signed in:
+With Node.js 22.13 LTS (22.x) or Node.js 24+ and at least one supported coding CLI installed and signed in:
 
 ```bash
 npm install --global farming-code@latest && farming daemon

package/README.zh_cn.md

@@ -15,7 +15,7 @@
   <a href="https://github.com/zhuwenzhuang/farming/releases"><img alt="Release" src="https://img.shields.io/github/v/release/zhuwenzhuang/farming?label=release"></a>
   <a href="https://www.npmjs.com/package/farming-code"><img alt="npm" src="https://img.shields.io/npm/v/farming-code?label=npm"></a>
   <a href="./LICENSE"><img alt="License" src="https://img.shields.io/github/license/zhuwenzhuang/farming"></a>
-  <img alt="Node.js 22+" src="https://img.shields.io/badge/node-%3E%3D22-339933?logo=nodedotjs&amp;logoColor=white">
+  <img alt="Node.js 22.13 LTS or 24+" src="https://img.shields.io/badge/node-22.13_LTS_%7C_24%2B-339933?logo=nodedotjs&amp;logoColor=white">
   <img alt="macOS and Linux" src="https://img.shields.io/badge/platform-macOS%20%7C%20Linux-555">
 </p>
 
@@ -25,7 +25,7 @@ Farming 与代码仓库和 Coding CLI 运行在同一台开发机上。Agent 进
 
 ## 快速开始
 
-准备好 Node.js 22 或更新版本，以及至少一个已安装、已登录的受支持 Coding CLI：
+准备好 Node.js 22.13 LTS（22.x）或 Node.js 24+，以及至少一个已安装、已登录的受支持 Coding CLI：
 
 ```bash
 npm install --global farming-code@latest && farming daemon

package/THIRD_PARTY_NOTICES.md

@@ -58,6 +58,22 @@ beside the vendored files at `frontend/vendor/ghostty-web/LICENSE`.
 If vendored assets are updated, keep this notice in sync with the package name,
 version, and license.
 
+Farming's TypeScript token-history scanner adapts the cumulative Codex
+accounting and copied-prefix classification semantics from
+[`CodexBar`](https://github.com/steipete/CodexBar) 0.45.2 at commit
+`91560ca98e776b96fdf910d4a0423c2f0c07a3b9` (MIT, Copyright (c) 2026 Peter
+Steinberger). It adapts Claude assistant usage extraction, streaming message-id
+deduplication, and cached-input normalization from
+[`cc-statistics`](https://github.com/androidZzT/cc-statistics) 1.1.0 at commit
+`c98be0af52bbc7f09a1f277747744ace48d9e014` (MIT, Copyright (c) 2026
+androidZzT).
+
+Farming does not bundle either application's runtime. The adapted TypeScript
+scanner, incremental filesystem checkpoints, SQLite schema, scan budgeting,
+and product result shape are maintained by Farming. Exact source files,
+adaptation scope, revisions, and both MIT licenses are retained under
+`backend/vendor/usage-parsers/`.
+
 The CRT skin bundles one font file under `frontend/skins/crt/fonts/`:
 
 | Font | License | Purpose |

package/backend/acp-runtime.js

@@ -2,9 +2,10 @@ const EventEmitter = require('events');
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
-const { spawn } = require('child_process');
+const { execFile, spawn } = require('child_process');
 const { Readable, Writable } = require('stream');
 const { createRequire } = require('module');
+const { promisify } = require('util');
 const packageJson = require('../package.json');
 const { AcpCheckpointStore } = require('./acp-checkpoint-store');
 const { AcpSessionState } = require('./acp-session-state');
@@ -14,6 +15,7 @@ const { PACKAGED_CODEX_ACP_ARG } = require('./acp/packaged-codex-acp');
 const { permissionSecurityWarnings } = require('./acp/permission-security');
 const { rejectPatch } = require('./acp/patch-decisions');
 const { getProviderAdapter, listProviderAdapters } = require('./provider-adapters');
+const { isSafeProviderSessionId } = require('./provider-session-id');
 
 const ADAPTER_VERSIONS = Object.freeze(Object.fromEntries(
   listProviderAdapters().filter(adapter => adapter.acp).map(adapter => [adapter.id, adapter.acp.version]),
@@ -26,6 +28,9 @@ const DEFAULT_CANCEL_TIMEOUT_MS = 15_000;
 const DEFAULT_HISTORY_REPLAY_MIN_WAIT_MS = 350;
 const DEFAULT_HISTORY_REPLAY_QUIET_MS = 150;
 const DEFAULT_HISTORY_REPLAY_MAX_WAIT_MS = 5_000;
+const IDENTITY_ADAPTER_GRACEFUL_EXIT_MS = 3_000;
+const IDENTITY_ADAPTER_TERMINATE_MS = 1_000;
+const IDENTITY_ADAPTER_KILL_MS = 1_000;
 const CODEX_SET_SESSION_MODEL_METHOD = 'session/set_model';
 const CODEX_STEER_METHOD = '_codex/session/steer';
 const CODEX_ACP_PACKAGE = '@agentclientprotocol/codex-acp';
@@ -38,6 +43,7 @@ const CODEX_ACP_VENDOR_ENTRY = path.join(
   'acp',
   `codex-acp-${CODEX_ACP_VERSION}.js`,
 );
+const execFileAsync = promisify(execFile);
 
 let sdkPromise;
 const runtimeRequire = createRequire(__filename);
@@ -290,6 +296,81 @@ function isCodexSteerUnavailableError(error) {
     || text.includes('cannot steer a compact turn');
 }
 
+function childHasExited(child) {
+  return !child
+    || (child.exitCode !== null && child.exitCode !== undefined)
+    || (child.signalCode !== null && child.signalCode !== undefined);
+}
+
+function processGroupHasExited(binding) {
+  if (!binding?.ownsProcessGroup || !binding.child?.pid || process.platform === 'win32') {
+    return childHasExited(binding?.child);
+  }
+  try {
+    process.kill(-binding.child.pid, 0);
+    return false;
+  } catch (error) {
+    return error?.code === 'ESRCH';
+  }
+}
+
+async function waitForProcessTreeExit(binding, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() <= deadline) {
+    if (processGroupHasExited(binding)) return true;
+    await new Promise(resolve => setTimeout(resolve, 25));
+  }
+  return processGroupHasExited(binding);
+}
+
+function signalProcessTree(binding, signal) {
+  if (!binding?.child || processGroupHasExited(binding)) return;
+  if (binding.ownsProcessGroup && binding.child.pid && process.platform !== 'win32') {
+    try {
+      process.kill(-binding.child.pid, signal);
+      return;
+    } catch (error) {
+      if (error?.code === 'ESRCH') return;
+    }
+  }
+  binding.child.kill(signal);
+}
+
+async function deleteProviderSessionIdentity(options = {}) {
+  const provider = String(options.provider || '').trim().toLowerCase();
+  const sessionId = String(options.sessionId || '').trim();
+  if (!isSafeProviderSessionId(sessionId)) {
+    throw new Error('Provider session rollback requires a safe exact session id');
+  }
+  let args;
+  if (provider === 'codex') args = ['delete', '--force', sessionId];
+  else if (provider === 'opencode') args = ['session', 'delete', sessionId];
+  else throw new Error(`${provider || 'Provider'} does not support identity rollback`);
+  await execFileAsync(options.executable || getProviderAdapter(provider)?.executable, args, {
+    cwd: options.cwd,
+    env: options.env,
+    timeout: 15_000,
+    maxBuffer: 1024 * 1024,
+  });
+}
+
+function attachProviderSessionIdentity(error, identity, rollbackError) {
+  const target = error instanceof Error ? error : new Error(String(error || 'Provider session identity failed'));
+  Object.defineProperty(target, 'providerSessionIdentity', {
+    value: identity,
+    enumerable: false,
+    configurable: true,
+  });
+  if (rollbackError) {
+    Object.defineProperty(target, 'providerSessionRollbackError', {
+      value: rollbackError,
+      enumerable: false,
+      configurable: true,
+    });
+  }
+  return target;
+}
+
 class AcpRuntime extends EventEmitter {
   constructor(options = {}) {
     super();
@@ -304,6 +385,7 @@ class AcpRuntime extends EventEmitter {
     this.historyReplayMinWaitMs = options.historyReplayMinWaitMs ?? DEFAULT_HISTORY_REPLAY_MIN_WAIT_MS;
     this.historyReplayQuietMs = options.historyReplayQuietMs ?? DEFAULT_HISTORY_REPLAY_QUIET_MS;
     this.historyReplayMaxWaitMs = options.historyReplayMaxWaitMs ?? DEFAULT_HISTORY_REPLAY_MAX_WAIT_MS;
+    this.deleteProviderSessionIdentity = options.deleteProviderSessionIdentity || deleteProviderSessionIdentity;
     this.checkpointStore = options.checkpointStore
       || (options.configDir ? new AcpCheckpointStore(options.configDir, options.checkpointOptions) : null);
     this.bindings = new Map();
@@ -331,10 +413,12 @@ class AcpRuntime extends EventEmitter {
       launch,
       restartOptions: { ...options, agentId, provider },
       approvalMode: options.approvalMode || 'approve',
+      ownsProcessGroup: options.identityOnly === true && process.platform !== 'win32',
       child: null,
       connection: null,
       initializeResponse: null,
       sessionId: '',
+      untrustedSessionId: '',
       state: 'connecting',
       error: '',
       stopReason: '',
@@ -366,6 +450,7 @@ class AcpRuntime extends EventEmitter {
         cwd: binding.cwd,
         env: binding.env,
         stdio: ['pipe', 'pipe', 'pipe'],
+        detached: binding.ownsProcessGroup,
       });
       binding.child = child;
       child.stderr.on('data', chunk => {
@@ -512,8 +597,12 @@ class AcpRuntime extends EventEmitter {
           this.sessionSetupTimeoutMs,
           'ACP session/new'
         );
-        binding.sessionId = String(sessionResponse.sessionId || '');
-        if (!binding.sessionId) throw new Error('ACP session/new did not return a session id');
+        const returnedSessionId = String(sessionResponse.sessionId || '').trim();
+        if (!isSafeProviderSessionId(returnedSessionId)) {
+          binding.untrustedSessionId = returnedSessionId;
+          throw new Error('ACP session/new returned an invalid resumable session id');
+        }
+        binding.sessionId = returnedSessionId;
         binding.sessionState = new AcpSessionState({ provider, sessionId: binding.sessionId, cwd: binding.cwd, maxUpdates: this.maxUpdates });
       }
       binding.modes = sessionResponse?.modes || null;
@@ -546,11 +635,109 @@ class AcpRuntime extends EventEmitter {
     } catch (error) {
       const runtimeError = new Error(acpErrorMessage(error), { cause: error });
       this.handleExit(binding, runtimeError);
-      this.unregisterAgent(agentId);
+      if (options.identityOnly === true) {
+        const returnedIdentity = binding.sessionId || binding.untrustedSessionId;
+        const identity = returnedIdentity
+          ? {
+              provider,
+              executable: options.executable || getProviderAdapter(provider)?.executable,
+              env: binding.env,
+              cwd: binding.cwd,
+              sessionId: returnedIdentity,
+              producerStopped: false,
+            }
+          : null;
+        let producerStopped = false;
+        try {
+          await this.unregisterAgentAndWait(agentId);
+          producerStopped = true;
+          if (identity) identity.producerStopped = true;
+        } catch (cleanupError) {
+          Object.defineProperty(runtimeError, 'adapterCleanupError', {
+            value: cleanupError,
+            enumerable: false,
+            configurable: true,
+          });
+          if (identity) attachProviderSessionIdentity(runtimeError, identity);
+        }
+        if (identity && producerStopped && isSafeProviderSessionId(identity.sessionId)) {
+          try {
+            await this.deleteProviderSessionIdentity(identity);
+          } catch (rollbackError) {
+            attachProviderSessionIdentity(runtimeError, identity, rollbackError);
+          }
+        } else if (identity && producerStopped) {
+          attachProviderSessionIdentity(runtimeError, identity);
+        }
+      } else {
+        this.unregisterAgent(agentId);
+      }
       throw runtimeError;
     }
   }
 
+  async createSessionIdentity(options = {}) {
+    const agentId = `provider-session-${crypto.randomUUID()}`;
+    let prepared = null;
+    let result = null;
+    let failure = null;
+    let identity = null;
+    try {
+      prepared = await this.prepareAgent({
+        ...options,
+        agentId,
+        identityOnly: true,
+        sessionId: '',
+      });
+      const binding = this.requireBinding(agentId);
+      identity = {
+        provider: String(options.provider || '').trim().toLowerCase(),
+        executable: options.executable || getProviderAdapter(options.provider)?.executable,
+        env: binding.env,
+        cwd: binding.cwd,
+        sessionId: prepared.sessionId,
+        producerStopped: false,
+      };
+      result = {
+        ...prepared,
+        sessionRequestOptions: this.getSessionRequestOptions(agentId),
+      };
+    } catch (error) {
+      failure = error instanceof Error ? error : new Error(String(error || 'Provider session identity failed'));
+    }
+
+    if (prepared) {
+      let producerStopped = false;
+      try {
+        await this.unregisterAgentAndWait(agentId);
+        producerStopped = true;
+        if (identity) identity.producerStopped = true;
+      } catch (cleanupError) {
+        if (!failure) {
+          failure = cleanupError instanceof Error
+            ? cleanupError
+            : new Error(String(cleanupError || 'ACP identity adapter cleanup failed'));
+        } else {
+          Object.defineProperty(failure, 'adapterCleanupError', {
+            value: cleanupError,
+            enumerable: false,
+            configurable: true,
+          });
+        }
+        if (identity) failure = attachProviderSessionIdentity(failure, identity);
+      }
+      if (failure && identity?.sessionId && producerStopped) {
+        try {
+          await this.deleteProviderSessionIdentity(identity);
+        } catch (rollbackError) {
+          failure = attachProviderSessionIdentity(failure, identity, rollbackError);
+        }
+      }
+    }
+    if (failure) throw failure;
+    return result;
+  }
+
   checkpointIdentity(binding, sessionId = binding?.sessionId) {
     if (!binding || !sessionId) return null;
     return {
@@ -1589,11 +1776,10 @@ class AcpRuntime extends EventEmitter {
     this.emitRuntime(binding);
   }
 
-  unregisterAgent(agentId) {
-    const binding = this.bindings.get(agentId);
-    if (!binding) return;
+  detachAgentBinding(binding) {
+    if (!binding || this.bindings.get(binding.agentId) !== binding) return false;
     if (binding.sessionState && !binding.promptActive) this.scheduleCheckpoint(binding, { exact: true });
-    this.bindings.delete(agentId);
+    this.bindings.delete(binding.agentId);
     for (const resolve of binding.permissionResolvers.values()) resolve({ outcome: { outcome: 'cancelled' } });
     for (const resolve of binding.elicitationResolvers.values()) resolve({ action: 'cancel' });
     binding.permissionResolvers.clear();
@@ -1607,9 +1793,33 @@ class AcpRuntime extends EventEmitter {
     try {
       binding.connection?.close();
     } catch {
-      // The adapter process is terminated below even if transport cleanup raced its exit.
+      // Process cleanup below remains authoritative if transport cleanup races.
+    }
+    if (binding.child?.stdin?.writable && !binding.child.stdin.destroyed) {
+      try {
+        binding.child.stdin.end();
+      } catch {
+        // Process cleanup below remains authoritative if stdin already closed.
+      }
     }
-    if (binding.child && !binding.child.killed) binding.child.kill('SIGTERM');
+    return true;
+  }
+
+  unregisterAgent(agentId) {
+    const binding = this.bindings.get(agentId);
+    if (!binding || !this.detachAgentBinding(binding)) return;
+    signalProcessTree(binding, 'SIGTERM');
+  }
+
+  async unregisterAgentAndWait(agentId) {
+    const binding = this.bindings.get(agentId);
+    if (!binding || !this.detachAgentBinding(binding)) return;
+    if (await waitForProcessTreeExit(binding, IDENTITY_ADAPTER_GRACEFUL_EXIT_MS)) return;
+    signalProcessTree(binding, 'SIGTERM');
+    if (await waitForProcessTreeExit(binding, IDENTITY_ADAPTER_TERMINATE_MS)) return;
+    signalProcessTree(binding, 'SIGKILL');
+    if (await waitForProcessTreeExit(binding, IDENTITY_ADAPTER_KILL_MS)) return;
+    throw new Error(`ACP identity adapter process tree ${binding.child?.pid || ''} did not exit`);
   }
 
   async dispose() {
@@ -1634,4 +1844,5 @@ module.exports = {
   supportsCodexSteer,
   isCodexSteerUnavailableError,
   CODEX_STEER_METHOD,
+  deleteProviderSessionIdentity,
 };