farming-code 2.2.28 → 2.2.30

package/backend/npm-update-helper.js

@@ -1,6 +1,10 @@
 const fs = require('fs');
 const path = require('path');
 const { spawn } = require('child_process');
+const {
+  matchingProcessIdentity,
+  readServerProcessIdentity,
+} = require('./server-process-identity');
 
 function writeJsonAtomic(filePath, value) {
   fs.mkdirSync(path.dirname(filePath), { recursive: true });
@@ -42,18 +46,37 @@ function isProcessRunning(pid) {
   try {
     process.kill(pid, 0);
     return true;
-  } catch {
+  } catch (error) {
+    if (error?.code === 'EPERM' || error?.code === 'EACCES') return true;
     return false;
   }
 }
 
-async function stopProcess(pid, timeoutMs = 15_000) {
+async function stopProcess(pid, expectedIdentity, timeoutMs = 15_000) {
   if (!isProcessRunning(pid)) return;
-  process.kill(pid, 'SIGTERM');
+  const currentIdentity = await readServerProcessIdentity(pid);
+  if (!matchingProcessIdentity(expectedIdentity, currentIdentity)) {
+    throw new Error(`Refusing to stop Farming server ${pid}: process identity changed`);
+  }
+  try {
+    process.kill(pid, 'SIGKILL');
+  } catch (error) {
+    if (error?.code === 'EPERM' || error?.code === 'EACCES') {
+      throw new Error(
+        `Farming cannot stop server ${pid} because the update helper lacks permission. `
+        + 'Use the operating-system user that owns this process (or an administrator) to stop and restart Farming, then retry the update.',
+        { cause: error },
+      );
+    }
+    if (error?.code !== 'ESRCH') throw error;
+  }
   const startedAt = Date.now();
-  while (isProcessRunning(pid)) {
+  while (matchingProcessIdentity(expectedIdentity, await readServerProcessIdentity(pid))) {
     if (Date.now() - startedAt >= timeoutMs) {
-      throw new Error(`Farming server ${pid} did not stop before timeout`);
+      throw new Error(
+        `Farming server ${pid} did not exit after SIGKILL. `
+        + 'Stop and restart Farming manually, then retry the update.',
+      );
     }
     await new Promise(resolve => setTimeout(resolve, 100));
   }
@@ -200,9 +223,23 @@ async function prepareNpmUpdate(payload) {
     fs.mkdirSync(payload.stagingPrefix, { recursive: true });
     await installPackage(payload, payload.targetVersion, payload.stagingPrefix);
     verifyInstalledVersion(payload, payload.targetVersion, payload.stagingPackageRoot);
+    writeJsonAtomic(payload.stateFile, stateFor(payload, 'preparing-runtimes'));
+    appendLog(payload.logPath, `Preparing Farming ${payload.targetVersion} startup dependencies`);
+    await runCommand(payload.nodePath, [
+      path.join(payload.stagingPackageRoot, 'bin', 'farming'),
+      'runtime',
+      'prepare',
+      '--config-dir',
+      payload.configDir,
+    ], {
+      cwd: payload.configDir,
+      env: commandEnvironment(),
+      logPath: payload.logPath,
+    });
     const preparedAt = new Date().toISOString();
     writeJsonAtomic(payload.stateFile, stateFor(payload, 'ready-to-restart', {
       preparedAt,
+      runtimePreparedAt: preparedAt,
     }));
     appendLog(payload.logPath, `Farming ${payload.targetVersion} is ready to restart`);
   } catch (error) {
@@ -237,7 +274,7 @@ async function applyNpmUpdate(payload) {
       preparedAt: payload.preparedAt,
     }));
     await new Promise(resolve => setTimeout(resolve, 1_000));
-    await stopProcess(Number(payload.serverPid));
+    await stopProcess(Number(payload.serverPid), payload.serverProcessIdentity);
     stoppedOldServer = true;
     fs.renameSync(payload.packageRoot, backupRoot);
     movedOldPackage = true;

package/backend/provider-adapters.js

@@ -213,6 +213,14 @@ function codexAcpEnvironment(options = {}) {
   return env;
 }
 
+function claudeAcpEnvironment(options = {}) {
+  const env = { ...(options.env || process.env) };
+  if (options.executable && !env.CLAUDE_CODE_EXECUTABLE) {
+    env.CLAUDE_CODE_EXECUTABLE = options.executable;
+  }
+  return env;
+}
+
 const PROVIDER_ADAPTERS = Object.freeze([
   {
     id: 'codex',
@@ -250,6 +258,7 @@ const PROVIDER_ADAPTERS = Object.freeze([
       version: '0.59.0',
       forkMode: 'target-process',
     },
+    prepareAcpEnvironment: claudeAcpEnvironment,
     capabilities: {
       runtimeSwitch: true,
       terminalProfile: false,
@@ -378,6 +387,7 @@ function isFreshAcpSessionSource(provider, source) {
 }
 
 module.exports = {
+  claudeAcpEnvironment,
   getProviderAdapter,
   applyProviderHomeEnvironment,
   isFreshAcpSessionSource,