farming-code 2.2.6 → 2.2.8

package/backend/agent-manager.js

@@ -328,6 +328,7 @@ class AgentManager extends EventEmitter {
     this.controlUrl = options.controlUrl || '';
     this.tokenFile = options.tokenFile || '';
     this.authDisabled = options.authDisabled === true;
+    this.skipExecutablePreflight = options.skipExecutablePreflight === true;
     this.cliBinDir = options.cliBinDir || path.join(__dirname, '..', 'bin');
     this.agentShellEnvProvider = typeof options.agentShellEnvProvider === 'function'
       ? options.agentShellEnvProvider
@@ -1041,6 +1042,7 @@ class AgentManager extends EventEmitter {
       providerSessionSource: metadata.providerSessionSource || '',
       providerSessionResolvedAt: metadata.providerSessionResolvedAt || null,
       providerSessionTitle: metadata.providerSessionTitle || '',
+      terminalInputReceived: metadata.terminalInputReceived === true,
       // Older persisted sessions predate App Server mode. Also, a Codex
       // App Server record without its isolated runtime home is not actually
       // attachable; recover it as terminal-owned CLI instead of leaving the
@@ -1227,6 +1229,7 @@ class AgentManager extends EventEmitter {
       providerSessionSource: agent.providerSessionSource || '',
       providerSessionResolvedAt: agent.providerSessionResolvedAt || null,
       providerSessionTitle: agent.providerSessionTitle || '',
+      terminalInputReceived: agent.terminalInputReceived === true,
       codexRuntimeMode: agent.codexRuntimeMode || '',
       agentRuntimeMode: agent.agentRuntimeMode || 'terminal',
       acpState: agent.acpState || '',
@@ -1881,6 +1884,7 @@ class AgentManager extends EventEmitter {
       providerSessionSource: agent.providerSessionSource,
       providerSessionResolvedAt: agent.providerSessionResolvedAt,
       providerSessionTitle: agent.providerSessionTitle,
+      terminalInputReceived: agent.terminalInputReceived === true,
       codexRuntimeMode: agent.codexRuntimeMode,
       agentRuntimeMode: agent.agentRuntimeMode || 'terminal',
       jsonCliState: agent.jsonCliState || '',
@@ -2005,7 +2009,8 @@ class AgentManager extends EventEmitter {
     const launchPathEnv = typeof userShellEnv?.PATH === 'string' && userShellEnv.PATH.trim()
       ? userShellEnv.PATH
       : (process.env.PATH || '');
-    let spawnProgram = resolveAgentExecutable(program, launchPathEnv) || program;
+    const resolvedExecutable = resolveAgentExecutable(program, launchPathEnv);
+    let spawnProgram = resolvedExecutable || program;
     if (path.basename(program) === 'codex') {
       const codexResolution = resolveCompatibleCodexExecutable(options.requiredCliVersion || '', launchPathEnv);
       if (!codexResolution.compatible) {
@@ -2014,6 +2019,24 @@ class AgentManager extends EventEmitter {
       }
       spawnProgram = codexResolution.path || spawnProgram;
     }
+    if (
+      launch.spec
+      && path.basename(program) === program
+      && !resolvedExecutable
+      && !this.skipExecutablePreflight
+      && process.env.FARMING_E2E_FAKE_EXECUTABLES !== '1'
+    ) {
+      const displayName = launch.spec.name === 'opencode'
+        ? 'OpenCode'
+        : launch.spec.name.charAt(0).toUpperCase() + launch.spec.name.slice(1);
+      if (callback) {
+        callback(
+          null,
+          `${displayName} executable "${program}" was not found in the user shell PATH. Install it or refresh the Agent list, then try again.`
+        );
+      }
+      return null;
+    }
 
     const parentAgentId = typeof options.parentAgentId === 'string' ? options.parentAgentId : '';
     const parentAgent = parentAgentId ? this.agents.get(parentAgentId) : null;
@@ -2117,6 +2140,16 @@ class AgentManager extends EventEmitter {
         resolvedProviderHomeId = defaultCodexHome.id || 'default';
       }
     }
+    const requestedAgentRuntimeMode = ['json', 'acp'].includes(options.agentRuntimeMode)
+      ? options.agentRuntimeMode
+      : 'terminal';
+    // A fresh structured runtime does not need a provider CLI resume id yet:
+    // ACP/JSON creates the provider session and writes the resulting id back
+    // after connecting. OpenCode is the important case here because its
+    // terminal CLI does not accept a pre-generated id for a fresh session.
+    const structuredRuntimeProvider = ['json', 'acp'].includes(requestedAgentRuntimeMode)
+      ? homeProvider
+      : providerSessionPlan.provider;
     const requestedCodexRuntimeMode = options.codexRuntimeMode === 'app-server' || options.codexRuntimeMode === 'cli'
       ? options.codexRuntimeMode
       : (this.configManager && typeof this.configManager.getCodexRuntimeMode === 'function'
@@ -2131,15 +2164,12 @@ class AgentManager extends EventEmitter {
       // on the path they are designed to exercise.
       && process.env.FARMING_E2E_FAKE_EXECUTABLES !== '1'
       && normalizeCodexRuntimeMode(requestedCodexRuntimeMode) === 'app-server';
-    const requestedAgentRuntimeMode = ['json', 'acp'].includes(options.agentRuntimeMode)
-      ? options.agentRuntimeMode
-      : 'terminal';
     const useJsonCli = requestedAgentRuntimeMode === 'json'
-      && ['codex', 'opencode'].includes(providerSessionPlan.provider)
+      && ['codex', 'opencode'].includes(structuredRuntimeProvider)
       && !useCodexAppServer
       && process.env.FARMING_E2E_FAKE_EXECUTABLES !== '1';
     const useAcp = requestedAgentRuntimeMode === 'acp'
-      && ['codex', 'claude', 'opencode', 'qoder'].includes(providerSessionPlan.provider)
+      && ['codex', 'claude', 'opencode', 'qoder'].includes(structuredRuntimeProvider)
       && !useCodexAppServer
       && (
         process.env.FARMING_E2E_FAKE_EXECUTABLES !== '1'
@@ -2180,7 +2210,7 @@ class AgentManager extends EventEmitter {
       task: typeof options.task === 'string' ? options.task : '',
       workflowTemplate: typeof options.workflowTemplate === 'string' ? options.workflowTemplate : '',
       source: typeof options.source === 'string' ? options.source : 'ui',
-      providerSessionProvider: providerSessionPlan.provider || '',
+      providerSessionProvider: useAcp || useJsonCli ? structuredRuntimeProvider : (providerSessionPlan.provider || ''),
       providerHomeId: resolvedProviderHomeId,
       providerHomePath,
       providerSessionId: providerSessionPlan.id || '',
@@ -2189,7 +2219,8 @@ class AgentManager extends EventEmitter {
       providerSessionSource: providerSessionPlan.source || '',
       providerSessionResolvedAt: providerSessionPlan.temporary === true ? null : Date.now(),
       providerSessionTitle: typeof options.providerSessionTitle === 'string' ? options.providerSessionTitle.trim().slice(0, 160) : '',
-      codexRuntimeMode: providerSessionPlan.provider === 'codex'
+      terminalInputReceived: false,
+      codexRuntimeMode: structuredRuntimeProvider === 'codex'
         ? (useCodexAppServer ? 'app-server' : 'cli')
         : '',
       agentRuntimeMode: useAcp ? 'acp' : (useJsonCli ? 'json' : 'terminal'),
@@ -2320,7 +2351,7 @@ class AgentManager extends EventEmitter {
       if (useJsonCli) {
         this.jsonCliRuntime.registerAgent({
           agentId,
-          provider: providerSessionPlan.provider,
+          provider: structuredRuntimeProvider,
           executable: spawnProgram,
           env: this.buildAgentEnv(agentId, agentRecord),
           cwd: workspace,
@@ -2334,11 +2365,13 @@ class AgentManager extends EventEmitter {
       if (useAcp) {
         const prepared = await this.acpRuntime.prepareAgent({
           agentId,
-          provider: providerSessionPlan.provider,
+          provider: structuredRuntimeProvider,
           executable: spawnProgram,
           env: this.buildAgentEnv(agentId, agentRecord),
           cwd: workspace,
-          sessionId: agentRecord.providerSessionTemporary ? '' : agentRecord.providerSessionId,
+          sessionId: options.acpStartFresh === true || agentRecord.providerSessionTemporary
+            ? ''
+            : agentRecord.providerSessionId,
           historyMode: options.acpHistoryMode === 'resume' ? 'resume' : 'load',
           approvalMode: agentRecord.launchPermissionMode || 'approve',
           model: this.configManager && this.configManager.getCodexModel
@@ -2353,7 +2386,7 @@ class AgentManager extends EventEmitter {
         });
         agentRecord.providerSessionId = prepared.sessionId;
         agentRecord.providerSessionKey = this.providerSessionKey(
-          providerSessionPlan.provider,
+          structuredRuntimeProvider,
           prepared.sessionId,
           agentRecord.providerHomeId || 'default'
         );
@@ -2721,6 +2754,11 @@ class AgentManager extends EventEmitter {
     return this.acpRuntime.setSessionConfigOption(agentId, configId, value);
   }
 
+  setAcpSessionConfigOptions(agentId, changes) {
+    this.getAcpSession(agentId);
+    return this.acpRuntime.setSessionConfigOptions(agentId, changes);
+  }
+
   async setCodexAppServerGoal(agentId, patch = {}) {
     const agent = this.assertCodexAppServerGoalAgent(agentId);
     const objective = typeof patch.objective === 'string' ? patch.objective.trim().slice(0, 4000) : undefined;
@@ -2763,6 +2801,12 @@ class AgentManager extends EventEmitter {
     const engine = this.engineBridge.getEngine(agent.engineName);
     if (!engine) return;
 
+    if (agent.terminalInputReceived !== true) {
+      agent.terminalInputReceived = true;
+      this.ensurePersistentAgentSession(agent);
+      this.updateEngineProviderSessionMetadata(agent);
+    }
+
     for (let attempt = 0; ; attempt += 1) {
       try {
         await engine.sendInput(agentId, input);
@@ -3158,7 +3202,14 @@ class AgentManager extends EventEmitter {
       return { error: `Agent does not support the ${nextMode.toUpperCase()} runtime` };
     }
     const sessionId = String(agent.providerSessionId || '').trim();
-    if (!isSafeProviderSessionId(sessionId)) {
+    const canStartFreshAcpSession = nextMode === 'acp'
+      && agent.agentRuntimeMode === 'terminal'
+      && agent.terminalInputReceived !== true
+      && (
+        agent.providerSessionTemporary === true
+        || ['codex-temporary', 'claude-session-id', 'qoder-session-id'].includes(agent.providerSessionSource || '')
+      );
+    if (!isSafeProviderSessionId(sessionId) && !canStartFreshAcpSession) {
       return { error: 'Runtime switching requires a resumable provider session. Send the first message and try again.' };
     }
     // A live ACP binding is the authoritative owner of a newly-created
@@ -3177,15 +3228,19 @@ class AgentManager extends EventEmitter {
       }
     }
     const previouslyVerifiedSession = String(agent.runtimeSwitchVerifiedSessionId || '') === sessionId;
-    if (!liveAcpSession && !previouslyVerifiedSession) {
+    let startsFreshAcpSession = canStartFreshAcpSession && !isSafeProviderSessionId(sessionId);
+    if (!startsFreshAcpSession && !liveAcpSession && !previouslyVerifiedSession) {
       const providerSession = await this.findRuntimeSwitchSession(agent);
       if (!providerSession) {
-        return { error: 'The saved Agent session is no longer available in the selected Agent Home.' };
+        if (canStartFreshAcpSession) startsFreshAcpSession = true;
+        else return { error: 'The saved Agent session is no longer available in the selected Agent Home.' };
       }
     }
-    const command = buildAgentSessionResumeCommand(provider, sessionId, {
-      cwd: agent.cwd || agent.projectWorkspace || '',
-    });
+    const command = startsFreshAcpSession
+      ? (agent.forkCommand || agent.command)
+      : buildAgentSessionResumeCommand(provider, sessionId, {
+          cwd: agent.cwd || agent.projectWorkspace || '',
+        });
     if (!command) return { error: 'Failed to build provider resume command' };
     const preserved = {
       pinned: agent.pinned === true,
@@ -3202,7 +3257,9 @@ class AgentManager extends EventEmitter {
       task: agent.task || agent.providerSessionTitle || '',
       workflowTemplate: agent.workflowTemplate || '',
       projectWorkspace: agent.projectWorkspace || agent.cwd || '',
-      source: resumedAgentSource(provider, sessionId, agent.providerHomeId || ''),
+      source: startsFreshAcpSession
+        ? 'ui-runtime-switch-fresh'
+        : resumedAgentSource(provider, sessionId, agent.providerHomeId || ''),
       providerHomeId: agent.providerHomeId || '',
       providerHomePath: agent.providerHomePath || '',
       providerSessionTitle: agent.providerSessionTitle || '',
@@ -3215,16 +3272,18 @@ class AgentManager extends EventEmitter {
       projectOrder: preserved.projectOrder,
       pinnedOrder: preserved.pinnedOrder,
       agentRuntimeMode: nextMode,
+      acpStartFresh: startsFreshAcpSession,
       codexRuntimeMode: 'cli',
       codexApprovalMode: agent.launchPermissionMode || undefined,
       jsonCliEvents: preserved.jsonCliEvents,
-      runtimeSwitchVerifiedSessionId: sessionId,
+      runtimeSwitchVerifiedSessionId: startsFreshAcpSession ? '' : sessionId,
     };
     const originalMode = agent.agentRuntimeMode || 'terminal';
     const originalOptions = {
       ...restartOptions,
       agentRuntimeMode: originalMode,
       codexRuntimeMode: agent.codexRuntimeMode || 'cli',
+      acpStartFresh: false,
     };
     const startReplacement = options => new Promise(resolve => {
       let settled = false;
@@ -3930,6 +3989,7 @@ class AgentManager extends EventEmitter {
       providerSessionSource: agent.providerSessionSource || '',
       providerSessionResolvedAt: agent.providerSessionResolvedAt || null,
       providerSessionTitle: agent.providerSessionTitle || '',
+      terminalInputReceived: agent.terminalInputReceived === true,
       codexRuntimeMode: agent.codexRuntimeMode || '',
       agentRuntimeMode: agent.agentRuntimeMode || 'terminal',
       acpState: agent.acpState || '',
@@ -4095,6 +4155,7 @@ class AgentManager extends EventEmitter {
         providerSessionSource: agent.providerSessionSource || '',
         providerSessionResolvedAt: agent.providerSessionResolvedAt || null,
         providerSessionTitle: agent.providerSessionTitle || '',
+        terminalInputReceived: agent.terminalInputReceived === true,
         codexRuntimeMode: agent.codexRuntimeMode || '',
         agentRuntimeMode: agent.agentRuntimeMode || 'terminal',
         jsonCliState: agent.jsonCliState || '',

package/backend/cli-agents.js

@@ -417,7 +417,7 @@ function resolveLaunchCommand(command, options = {}) {
     if (effort && effort !== 'config' && shouldApplyModelProfile && !hasCodexEffortOverride) {
       launchArgs.unshift('-c', `model_reasoning_effort="${effort}"`);
     }
-    if (codexServiceTier && codexServiceTier !== 'default' && codexServiceTier !== 'config' && shouldApplyModelProfile && !hasCodexServiceTierOverride) {
+    if (codexServiceTier && codexServiceTier !== 'config' && shouldApplyModelProfile && !hasCodexServiceTierOverride) {
       launchArgs.unshift('-c', `service_tier="${codexServiceTier}"`);
     }
   }

package/backend/farming-app-cli.js

@@ -15,6 +15,7 @@ const NATIVE_PTY_HOST_ARG = '--native-pty-host';
 const DEFAULT_PORT = '6694';
 const DEFAULT_BASE_PATH = '/farming';
 const DEFAULT_SERVER_START_TIMEOUT_MS = 30_000;
+const DEFAULT_SERVER_START_STABILITY_MS = 1_500;
 const SERVER_COMMANDS = new Set(['start', 'serve', 'daemon', 'stop', 'status', 'logs', 'url', 'help']);
 const CONTROL_COMMANDS = new Set(['skills', 'memory', 'report', 'list', 'spawn', 'output', 'send', 'kill']);
 const SERVER_BACKED_CONTROL_COMMANDS = new Set(['list', 'spawn', 'output', 'send', 'kill']);
@@ -416,7 +417,14 @@ function childInvocation(env = process.env) {
   if (process.pkg) {
     return { command: '/bin/sh', args: ['-c', buildCleanEnvExecCommand(env, process.execPath, ['--'])] };
   }
-  return { command: env.FARMING_NODE_BIN || process.execPath, args: [__filename] };
+  const nodePath = env.FARMING_NODE_BIN || process.execPath;
+  if (env.FARMING_NODE_LD && env.FARMING_NODE_LIBRARY_PATH) {
+    return {
+      command: env.FARMING_NODE_LD,
+      args: ['--library-path', env.FARMING_NODE_LIBRARY_PATH, nodePath, __filename],
+    };
+  }
+  return { command: nodePath, args: [__filename] };
 }
 
 function ensureConfigDir(configDir) {
@@ -500,6 +508,44 @@ function serverStartTimeoutMs(env) {
   return DEFAULT_SERVER_START_TIMEOUT_MS;
 }
 
+function serverStartStabilityMs(env) {
+  const parsed = Number(env.FARMING_START_STABILITY_MS || env.FARMING_SERVER_START_STABILITY_MS);
+  if (Number.isFinite(parsed) && parsed >= 0) return Math.min(parsed, 60_000);
+  return DEFAULT_SERVER_START_STABILITY_MS;
+}
+
+function waitForProcessStability(pid, durationMs = DEFAULT_SERVER_START_STABILITY_MS) {
+  const startedAt = Date.now();
+  return new Promise((resolve, reject) => {
+    const tick = () => {
+      if (!isRunning(pid)) {
+        reject(new Error('server process exited during startup stability check'));
+        return;
+      }
+      const remainingMs = durationMs - (Date.now() - startedAt);
+      if (remainingMs <= 0) {
+        resolve();
+        return;
+      }
+      setTimeout(tick, Math.min(100, remainingMs));
+    };
+    tick();
+  });
+}
+
+function cleanupFailedDaemonStart(configDir, childPid) {
+  if (isRunning(childPid)) {
+    try {
+      process.kill(childPid, 'SIGTERM');
+    } catch {
+      // The child may exit between the liveness check and the signal.
+    }
+  }
+  if (readPid(configDir) !== childPid) return;
+  fs.rmSync(pidFile(configDir), { force: true });
+  fs.rmSync(serverStateFile(configDir), { force: true });
+}
+
 function waitForServer(env, timeoutMs = serverStartTimeoutMs(env), childPid = 0) {
   const startedAt = Date.now();
   const port = Number(env.PORT || DEFAULT_PORT);
@@ -628,7 +674,10 @@ async function startDaemon(parsed) {
 
   try {
     await waitForServer(env, serverStartTimeoutMs(env), child.pid);
+    await waitForProcessStability(child.pid, serverStartStabilityMs(env));
+    await waitForServer(env, Math.min(serverStartTimeoutMs(env), 5_000), child.pid);
   } catch (error) {
+    cleanupFailedDaemonStart(configDir, child.pid);
     console.error(error.message);
     const logs = tailFile(logFile(configDir), 80);
     if (logs) console.error(logs);
@@ -773,6 +822,7 @@ module.exports = {
   NATIVE_PTY_HOST_ARG,
   buildCleanEnvExecCommand,
   childInvocation,
+  cleanupFailedDaemonStart,
   buildControlEnv,
   buildServerEnv,
   computeNodeHeapMb,
@@ -784,6 +834,7 @@ module.exports = {
   reviewUrl,
   readServerState,
   serverStartTimeoutMs,
+  serverStartStabilityMs,
   splitControlArgs,
   run,
   serverStateFile,

package/backend/farming-session-store.js

@@ -166,6 +166,7 @@ class FarmingSessionStore {
       providerSessionSource: typeof agent.providerSessionSource === 'string' ? agent.providerSessionSource : '',
       providerSessionResolvedAt: typeof agent.providerSessionResolvedAt === 'number' ? agent.providerSessionResolvedAt : null,
       providerSessionTitle: typeof agent.providerSessionTitle === 'string' ? agent.providerSessionTitle : '',
+      terminalInputReceived: agent.terminalInputReceived === true,
       codexRuntimeMode: typeof agent.codexRuntimeMode === 'string' ? agent.codexRuntimeMode : '',
       agentRuntimeMode: typeof agent.agentRuntimeMode === 'string' ? agent.agentRuntimeMode : 'terminal',
       acpState: typeof agent.acpState === 'string' ? agent.acpState : '',

package/backend/npm-update-helper.js

@@ -102,6 +102,8 @@ function startArguments(payload) {
 function commandEnvironment() {
   const env = { ...process.env };
   delete env.FARMING_NPM_UPDATE_PAYLOAD;
+  delete env.FARMING_RUN_SERVER;
+  delete env.FARMING_RUN_NATIVE_PTY_HOST;
   return env;
 }
 
@@ -112,6 +114,7 @@ async function installPackage(payload, version) {
   if (payload.npmPrefix) args.push('--prefix', payload.npmPrefix);
   args.push(packageSpec, '--no-audit', '--no-fund');
   await runCommand(payload.npmCommand || 'npm', args, {
+    cwd: payload.configDir,
     env: commandEnvironment(),
     logPath: payload.logPath,
   });
@@ -120,6 +123,7 @@ async function installPackage(payload, version) {
 async function startServer(payload, version = payload.targetVersion) {
   appendLog(payload.logPath, `Starting Farming ${version}`);
   await runCommand(payload.nodePath, startArguments(payload), {
+    cwd: payload.configDir,
     env: commandEnvironment(),
     logPath: payload.logPath,
   });

package/backend/server.js

@@ -1168,6 +1168,10 @@ app.patch(routePath(BASE_PATH, '/api/agents/:agentId/acp-session'), express.json
       res.json(await agentManager.setAcpSessionMode(req.params.agentId, req.body.modeId));
       return;
     }
+    if (Array.isArray(req.body?.configOptions)) {
+      res.json(await agentManager.setAcpSessionConfigOptions(req.params.agentId, req.body.configOptions));
+      return;
+    }
     if (typeof req.body?.configId === 'string' && Object.prototype.hasOwnProperty.call(req.body, 'value')) {
       res.json(await agentManager.setAcpSessionConfigOption(
         req.params.agentId,
@@ -1176,7 +1180,7 @@ app.patch(routePath(BASE_PATH, '/api/agents/:agentId/acp-session'), express.json
       ));
       return;
     }
-    res.status(400).json({ error: 'ACP modeId or configId/value is required' });
+    res.status(400).json({ error: 'ACP modeId, configOptions, or configId/value is required' });
   } catch (error) {
     const message = error && error.message ? error.message : 'Failed to update ACP session';
     res.status(message === 'Agent not found' ? 404 : 409).json({ error: message });

package/backend/update-service.js

@@ -666,6 +666,16 @@ function releaseInstallDir(rootDir, env = process.env) {
   return path.join(os.homedir(), 'farming');
 }
 
+function nodeScriptInvocation(nodePath, scriptPath, env = process.env) {
+  if (env.FARMING_NODE_LD && env.FARMING_NODE_LIBRARY_PATH) {
+    return {
+      command: env.FARMING_NODE_LD,
+      args: ['--library-path', env.FARMING_NODE_LIBRARY_PATH, nodePath, scriptPath],
+    };
+  }
+  return { command: nodePath, args: [scriptPath] };
+}
+
 function npmPackageMetadataUrl(registryUrl, packageName) {
   const registry = String(registryUrl || DEFAULT_NPM_REGISTRY).replace(/\/+$/, '');
   return `${registry}/${encodeURIComponent(packageName).replace(/^%40/, '@')}`;
@@ -739,7 +749,7 @@ class FarmingUpdateService {
       compatibilityProfile: String(release.compatibilityProfile || ''),
       bundledGlibcRuntime: release.bundledGlibcRuntime === true,
       type: this.installMethod,
-      installDir: releaseInstallDir(this.rootDir),
+      installDir: this.installMethod === 'npm' ? this.rootDir : releaseInstallDir(this.rootDir),
     };
   }
 
@@ -1081,7 +1091,9 @@ class FarmingUpdateService {
       serverHome: process.env.FARMING_SERVER_HOME || '',
       disableAuth: /^(1|true|yes|on)$/i.test(String(process.env.FARMING_DISABLE_AUTH || '')),
     };
-    const child = this.spawn(nodePath, [helperPath], {
+    const helperInvocation = nodeScriptInvocation(nodePath, helperPath);
+    const child = this.spawn(helperInvocation.command, helperInvocation.args, {
+      cwd: this.configDir,
       detached: true,
       stdio: 'ignore',
       env: {