farming-code 2.2.13 → 2.2.16

package/backend/agent-runtime-binding.js

@@ -1,4 +1,4 @@
-const RUNTIME_KINDS = new Set(['terminal', 'acp', 'json', 'app-server']);
+const RUNTIME_KINDS = new Set(['terminal', 'acp', 'json']);
 
 function terminalBinding() {
   return { kind: 'terminal' };
@@ -10,6 +10,7 @@ function acpBinding(source = {}) {
     state: source.state || source.acpState || '',
     error: source.error || source.acpError || '',
     stopReason: source.stopReason || source.acpStopReason || '',
+    supportsSteer: source.supportsSteer === true,
     pendingPermission: source.pendingPermission || source.acpPendingPermission || null,
     pendingPermissions: source.pendingPermissions || source.acpPendingPermissions || [],
     pendingElicitation: source.pendingElicitation || source.acpPendingElicitation || null,
@@ -30,38 +31,24 @@ function jsonBinding(source = {}) {
   };
 }
 
-function appServerBinding(source = {}) {
-  return {
-    kind: 'app-server',
-    state: source.state || source.codexAppServerState || '',
-    endpoint: source.endpoint || source.codexAppServerEndpoint || '',
-    threadId: source.threadId || source.codexAppServerThreadId || '',
-    turnId: source.turnId || source.codexAppServerTurnId || '',
-    error: source.error || source.codexAppServerError || '',
-    pendingRequestId: source.pendingRequestId || source.codexAppServerPendingRequestId || '',
-    pendingRequestMethod: source.pendingRequestMethod || source.codexAppServerPendingRequestMethod || '',
-    pendingRequest: source.pendingRequest || source.codexAppServerPendingRequest || null,
-    notice: source.notice || source.codexAppServerNotice || null,
-    goal: source.goal || source.codexAppServerGoal || null,
-    observerDeferred: source.observerDeferred === true || source.codexCliObserverDeferred === true,
-    homePath: source.homePath || source.codexAppServerHomePath || '',
-    transcriptUpdatedAt: source.transcriptUpdatedAt || source.codexAppServerTranscriptUpdatedAt || '',
-  };
-}
-
 function runtimeKind(agent) {
   if (RUNTIME_KINDS.has(agent?.runtimeBinding?.kind)) return agent.runtimeBinding.kind;
+  // App Server was an experimental Codex runtime. Persisted records migrate to
+  // ACP because codex-acp uses the same Codex thread id as its session id.
+  if (agent?.runtimeBinding?.kind === 'app-server' || agent?.codexRuntimeMode === 'app-server') return 'acp';
   if (agent?.agentRuntimeMode === 'acp') return 'acp';
   if (agent?.agentRuntimeMode === 'json') return 'json';
-  return agent?.codexRuntimeMode === 'app-server' ? 'app-server' : 'terminal';
+  return 'terminal';
 }
 
 function bindingFromLegacy(agent) {
   if (RUNTIME_KINDS.has(agent?.runtimeBinding?.kind)) return agent.runtimeBinding;
+  if (agent?.runtimeBinding?.kind === 'app-server' || agent?.codexRuntimeMode === 'app-server') {
+    return acpBinding({ state: 'connecting' });
+  }
   switch (runtimeKind(agent)) {
     case 'acp': return acpBinding(agent);
     case 'json': return jsonBinding(agent);
-    case 'app-server': return appServerBinding(agent);
     default: return terminalBinding();
   }
 }
@@ -70,7 +57,6 @@ function runtimeBindingFor(kind, source = {}) {
   switch (kind) {
     case 'acp': return acpBinding(source);
     case 'json': return jsonBinding(source);
-    case 'app-server': return appServerBinding(source);
     default: return terminalBinding();
   }
 }
@@ -133,22 +119,6 @@ function publicRuntimeBinding(agent) {
       transcriptUpdatedAt: binding.transcriptUpdatedAt,
     };
   }
-  if (binding.kind === 'app-server') {
-    return {
-      kind: 'app-server',
-      state: binding.state,
-      endpoint: binding.endpoint,
-      threadId: binding.threadId,
-      turnId: binding.turnId,
-      error: binding.error,
-      pendingRequestId: binding.pendingRequestId,
-      pendingRequestMethod: binding.pendingRequestMethod,
-      pendingRequest: binding.pendingRequest,
-      notice: binding.notice,
-      goal: binding.goal,
-      observerDeferred: binding.observerDeferred,
-    };
-  }
   return { ...binding };
 }
 
@@ -162,7 +132,6 @@ function runtimeState(agent) {
 function legacyRuntimeMetadata(agent) {
   const binding = bindingFromLegacy(agent);
   const metadata = {
-    codexRuntimeMode: binding.kind === 'app-server' ? 'app-server' : 'cli',
     agentRuntimeMode: ['acp', 'json'].includes(binding.kind) ? binding.kind : 'terminal',
   };
   if (binding.kind === 'acp') {
@@ -188,21 +157,6 @@ function legacyRuntimeMetadata(agent) {
       jsonCliTranscriptUpdatedAt: binding.transcriptUpdatedAt,
     };
   }
-  if (binding.kind === 'app-server') {
-    return {
-      ...metadata,
-      codexAppServerHomePath: binding.homePath,
-      codexAppServerState: binding.state,
-      codexAppServerEndpoint: binding.endpoint,
-      codexAppServerThreadId: binding.threadId,
-      codexAppServerTurnId: binding.turnId,
-      codexAppServerError: binding.error,
-      codexAppServerPendingRequestId: binding.pendingRequestId,
-      codexAppServerPendingRequestMethod: binding.pendingRequestMethod,
-      codexAppServerPendingRequest: binding.pendingRequest,
-      codexCliObserverDeferred: binding.observerDeferred,
-    };
-  }
   return metadata;
 }
 

package/backend/chat-runtime.js

@@ -0,0 +1,28 @@
+// Chat is a product-level intent. ACP is the single structured Chat runtime for
+// every supported coding agent, including Codex.
+const CHAT_MODE = 'chat';
+
+function chatRuntimeForProvider() {
+  return 'acp';
+}
+
+function isChatMode(mode) {
+  return mode === CHAT_MODE;
+}
+
+function chatCapabilitiesForProvider(provider) {
+  const runtime = chatRuntimeForProvider(provider);
+  return {
+    chatRuntime: runtime,
+    supportsChat: true,
+    // ACP does not currently define a turn-versioned steer operation.
+    supportsSteer: false,
+  };
+}
+
+module.exports = {
+  CHAT_MODE,
+  chatRuntimeForProvider,
+  chatCapabilitiesForProvider,
+  isChatMode,
+};

package/backend/codex-transcript.js

@@ -12,7 +12,8 @@ const {
 } = require('./codex-transcript-sanitizer');
 
 // @deprecated `readCodexTranscript` below is the legacy JSONL file reader.
-// App Server uses the generic event-to-turn projection exported here instead.
+// The generic event-to-turn projection remains for JSON compatibility feeds;
+// live structured Chat is reduced from ACP session updates instead.
 const DEFAULT_MAX_READ_BYTES = 32 * 1024 * 1024;
 const DEFAULT_MAX_TURNS = 240;
 const USER_MESSAGE_BEGIN = '## My request for Codex:';

package/backend/config-manager.js

@@ -67,6 +67,7 @@ const MAX_SEARCH_TIMEOUT_MS = 180000;
 const DEFAULT_CRT_TERMINAL_FONT_SIZE = 15;
 const MIN_CRT_TERMINAL_FONT_SIZE = 10;
 const MAX_CRT_TERMINAL_FONT_SIZE = 20;
+const MAX_INSTANCE_NAME_LENGTH = 80;
 
 const PERSISTED_SETTING_KEYS = new Set([
   'workspace',
@@ -75,6 +76,7 @@ const PERSISTED_SETTING_KEYS = new Set([
   'projectWorkspaces',
   'pinnedProjectWorkspaces',
   'projectNames',
+  'instanceName',
   'theme',
   'appearance',
   'language',
@@ -88,7 +90,6 @@ const PERSISTED_SETTING_KEYS = new Set([
   'agentHomes',
   'updateUrl',
   'searchTimeoutMs',
-  'codexRuntimeMode',
   'codexApprovalMode',
   'codexModel',
   'codexReasoningEffort',
@@ -183,6 +184,19 @@ class ConfigManager {
     return this.farmingDir;
   }
 
+  normalizeInstanceName(value) {
+    if (typeof value !== 'string') return '';
+    return value
+      .replace(/[\x00-\x1f\x7f]/g, ' ')
+      .replace(/\s+/g, ' ')
+      .trim()
+      .slice(0, MAX_INSTANCE_NAME_LENGTH);
+  }
+
+  getInstanceName() {
+    return this.settings?.instanceName || this.normalizeInstanceName(os.hostname()) || 'Farming';
+  }
+
   normalizeWorkspaceHistory(history) {
     const entries = Array.isArray(history) ? history : [];
     const result = [];
@@ -290,6 +304,7 @@ class ConfigManager {
         projectWorkspaces: [],
         pinnedProjectWorkspaces: [],
         projectNames: {},
+        instanceName: '',
         theme: 'terminal',
         appearance: 'light',
         language: 'en',
@@ -306,7 +321,6 @@ class ConfigManager {
         agentHomes: cloneAgentHomes(DEFAULT_AGENT_HOMES),
         updateUrl: DEFAULT_UPDATE_URL,
         searchTimeoutMs: DEFAULT_SEARCH_TIMEOUT_MS,
-        codexRuntimeMode: 'cli',
         codexApprovalMode: 'approve',
         codexModel: 'gpt-5.5',
         codexReasoningEffort: 'xhigh',
@@ -326,6 +340,7 @@ class ConfigManager {
       projectWorkspaces: [],
       pinnedProjectWorkspaces: [],
       projectNames: {},
+      instanceName: '',
       theme: 'terminal',
       appearance: 'light',
       language: 'en',
@@ -342,7 +357,6 @@ class ConfigManager {
       agentHomes: cloneAgentHomes(DEFAULT_AGENT_HOMES),
       updateUrl: DEFAULT_UPDATE_URL,
       searchTimeoutMs: DEFAULT_SEARCH_TIMEOUT_MS,
-      codexRuntimeMode: 'cli',
       codexApprovalMode: 'approve',
       codexModel: 'gpt-5.5',
       codexReasoningEffort: 'xhigh',
@@ -376,13 +390,14 @@ class ConfigManager {
     this.settings.projectWorkspaces = this.normalizeProjectWorkspaces(this.settings.projectWorkspaces);
     this.settings.pinnedProjectWorkspaces = this.normalizeProjectWorkspaces(this.settings.pinnedProjectWorkspaces);
     this.settings.projectNames = this.normalizeProjectNames(this.settings.projectNames);
+    this.settings.instanceName = this.normalizeInstanceName(this.settings.instanceName);
     this.settings.agentHomes = this.normalizeAgentHomes(this.settings.agentHomes);
     if (this.settings.updateUrl === LEGACY_DEFAULT_UPDATE_URL || this.settings.updateUrl === API_DEFAULT_UPDATE_URL) {
       this.settings.updateUrl = DEFAULT_UPDATE_URL;
     }
     this.settings.updateUrl = this.normalizeUpdateUrl(this.settings.updateUrl);
     this.settings.searchTimeoutMs = this.normalizeSearchTimeoutMs(this.settings.searchTimeoutMs);
-    this.settings.codexRuntimeMode = this.normalizeCodexRuntimeMode(this.settings.codexRuntimeMode);
+    delete this.settings.codexRuntimeMode;
     const legacyMainPageSessionKeys = this.normalizeMainPageSessionKeys(this.settings.mainPageSessionKeys);
     delete this.settings.mainPageSessionKeys;
     this.sessionStore.init({ legacyMainPageSessionKeys });
@@ -517,10 +532,6 @@ class ConfigManager {
     return ['ask', 'approve', 'full', 'custom'].includes(mode) ? mode : 'approve';
   }
 
-  normalizeCodexRuntimeMode(mode) {
-    return mode === 'app-server' ? 'app-server' : 'cli';
-  }
-
   normalizeCodexModelPreset(preset) {
     if (preset === 'config') return preset;
     if (typeof preset !== 'string') return 'gpt-5.5:xhigh';
@@ -676,11 +687,6 @@ class ConfigManager {
     return this.getAgentLaunchProfile('codex').approvalMode;
   }
 
-  getCodexRuntimeMode() {
-    if (!this.settings) return 'cli';
-    return this.normalizeCodexRuntimeMode(this.settings.codexRuntimeMode);
-  }
-
   getCodexModelPreset() {
     if (!this.settings) return 'gpt-5.5:xhigh';
     return this.getAgentLaunchProfile('codex').modelPreset;
@@ -739,6 +745,7 @@ class ConfigManager {
   getSettings() {
     return {
       ...this.settings,
+      instanceName: this.getInstanceName(),
       workspace: this.farmingDir,
       mainPageSessionKeys: this.getMainPageSessionKeys(),
       taskHistory: this.getTaskHistory(),
@@ -819,10 +826,11 @@ class ConfigManager {
     this.settings.projectWorkspaces = this.normalizeProjectWorkspaces(this.settings.projectWorkspaces);
     this.settings.pinnedProjectWorkspaces = this.normalizeProjectWorkspaces(this.settings.pinnedProjectWorkspaces);
     this.settings.projectNames = this.normalizeProjectNames(this.settings.projectNames);
+    this.settings.instanceName = this.normalizeInstanceName(this.settings.instanceName);
     this.settings.agentHomes = this.normalizeAgentHomes(this.settings.agentHomes);
     this.settings.updateUrl = this.normalizeUpdateUrl(this.settings.updateUrl);
     this.settings.searchTimeoutMs = this.normalizeSearchTimeoutMs(this.settings.searchTimeoutMs);
-    this.settings.codexRuntimeMode = this.normalizeCodexRuntimeMode(this.settings.codexRuntimeMode);
+    delete this.settings.codexRuntimeMode;
     delete this.settings.mainPageSessionKeys;
     delete this.settings.taskHistory;
     if (incomingMainPageSessionKeys !== undefined) {

package/backend/control-api.js

@@ -219,9 +219,11 @@ function createControlRouter(agentManager, options = {}) {
       parentAgentId: typeof body.parentAgentId === 'string' ? body.parentAgentId : '',
       task,
       source: 'control-cli',
-      agentRuntimeMode: ['json', 'acp'].includes(body.agentRuntimeMode) ? body.agentRuntimeMode : 'terminal',
+      agentRuntimeMode: ['json', 'acp', 'chat'].includes(body.agentRuntimeMode) ? body.agentRuntimeMode : 'terminal',
       acpHistoryMode: body.acpHistoryMode === 'resume' ? 'resume' : 'load',
       providerSessionTitle: typeof body.providerSessionTitle === 'string' ? body.providerSessionTitle : '',
+      ...(Array.isArray(body.additionalDirectories) ? { additionalDirectories: body.additionalDirectories } : {}),
+      ...(Array.isArray(body.mcpServers) ? { mcpServers: body.mcpServers } : {}),
       dangerouslySkipPermissions: body.dangerouslySkipPermissions === true,
     });
   });

package/backend/farming-app-cli.js

@@ -7,6 +7,7 @@ const path = require('path');
 const { URLSearchParams } = require('url');
 const { execFileSync, spawn } = require('child_process');
 const { run: runControlCli } = require('./farming-cli');
+const { PACKAGED_CODEX_ACP_ARG, runPackagedCodexAcp } = require('./acp/packaged-codex-acp');
 const storageLayout = require('./storage-layout');
 
 const SERVER_MODE_ARG = '--farming-server';
@@ -85,6 +86,13 @@ function appendNodeOption(existing, option) {
 function buildServerEnv(overrides = {}, baseEnv = process.env) {
   const env = { ...baseEnv, ...overrides };
   delete env.PKG_EXECPATH;
+  if (!process.pkg && !env.FARMING_MANAGED_PACKAGE_ROOT) {
+    try {
+      env.FARMING_MANAGED_PACKAGE_ROOT = fs.realpathSync(path.join(__dirname, '..'));
+    } catch {
+      // npm update verification will remain unavailable when the package root cannot be proven.
+    }
+  }
   const cliBinDir = process.pkg ? path.dirname(process.execPath) : path.join(__dirname, '..', 'bin');
   env.PORT = String(env.FARMING_PORT || env.PORT || DEFAULT_PORT);
   env.FARMING_BASE_PATH = env.FARMING_BASE_PATH || DEFAULT_BASE_PATH;
@@ -774,6 +782,11 @@ async function run(argv = process.argv.slice(2)) {
     return 0;
   }
 
+  if (argv[0] === PACKAGED_CODEX_ACP_ARG) {
+    runPackagedCodexAcp();
+    return 0;
+  }
+
   if (argv[0] === NATIVE_PTY_HOST_ARG || process.env.FARMING_RUN_NATIVE_PTY_HOST === '1') {
     runNativePtyHostInCurrentProcess();
     return 0;

package/backend/farming-session-store.js

@@ -25,8 +25,9 @@ function safeSessionFileName(id) {
 function atomicWriteJson(file, value) {
   fs.mkdirSync(path.dirname(file), { recursive: true });
   const tmpFile = `${file}.${process.pid}.${Date.now()}.tmp`;
-  fs.writeFileSync(tmpFile, JSON.stringify(value, null, 2));
+  fs.writeFileSync(tmpFile, JSON.stringify(value, null, 2), { mode: 0o600 });
   fs.renameSync(tmpFile, file);
+  fs.chmodSync(file, 0o600);
 }
 
 function parseProviderSessionKey(key) {

package/backend/npm-update-helper.js

@@ -64,12 +64,23 @@ function validatePayload(payload) {
   if (!/^[A-Za-z0-9@/._-]+$/.test(String(payload.packageName || ''))) throw new Error('Invalid npm package name');
   if (!/^[0-9A-Za-z.+-]+$/.test(String(payload.targetVersion || ''))) throw new Error('Invalid npm target version');
   if (!/^[0-9A-Za-z.+-]+$/.test(String(payload.previousVersion || ''))) throw new Error('Invalid npm previous version');
-  for (const key of ['stateFile', 'logPath', 'cliPath', 'configDir']) {
+  for (const key of ['stateFile', 'logPath', 'cliPath', 'packageRoot', 'configDir']) {
     if (!path.isAbsolute(String(payload[key] || ''))) throw new Error(`Invalid npm update ${key}`);
   }
   if (payload.npmPrefix && !path.isAbsolute(String(payload.npmPrefix))) {
     throw new Error('Invalid npm update npmPrefix');
   }
+  if (payload.npmFallbackRegistryUrl) {
+    let registry;
+    try {
+      registry = new URL(String(payload.npmFallbackRegistryUrl));
+    } catch {
+      throw new Error('Invalid npm update registry');
+    }
+    if (!['http:', 'https:'].includes(registry.protocol)) {
+      throw new Error('Invalid npm update registry');
+    }
+  }
   return payload;
 }
 
@@ -109,15 +120,59 @@ function commandEnvironment() {
 
 async function installPackage(payload, version) {
   const packageSpec = `${payload.packageName}@${version}`;
-  appendLog(payload.logPath, `Installing ${packageSpec}`);
+  return installPackageFromRegistry(payload, packageSpec);
+}
+
+function verifyInstalledVersion(payload, expectedVersion) {
+  const packageJsonPath = path.join(payload.packageRoot, 'package.json');
+  let metadata;
+  try {
+    metadata = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  } catch (error) {
+    throw new Error(`Installed ${payload.packageName} package metadata is unreadable: ${error.message || String(error)}`, { cause: error });
+  }
+  const actualVersion = String(metadata && metadata.version || '');
+  if (actualVersion !== expectedVersion) {
+    throw new Error(`Installed ${payload.packageName} version mismatch: expected ${expectedVersion}, found ${actualVersion || 'missing'}`);
+  }
+}
+
+function logSize(filePath) {
+  try {
+    return fs.statSync(filePath).size;
+  } catch {
+    return 0;
+  }
+}
+
+function logSince(filePath, offset) {
+  try {
+    return fs.readFileSync(filePath, 'utf8').slice(offset);
+  } catch {
+    return '';
+  }
+}
+
+async function installPackageFromRegistry(payload, packageSpec, registryUrl = '') {
+  appendLog(payload.logPath, `Installing ${packageSpec}${registryUrl ? ' from the update-status registry' : ''}`);
   const args = ['install', '--global'];
   if (payload.npmPrefix) args.push('--prefix', payload.npmPrefix);
+  if (registryUrl) args.push('--registry', registryUrl);
   args.push(packageSpec, '--no-audit', '--no-fund');
-  await runCommand(payload.npmCommand || 'npm', args, {
-    cwd: payload.configDir,
-    env: commandEnvironment(),
-    logPath: payload.logPath,
-  });
+  const offset = logSize(payload.logPath);
+  try {
+    await runCommand(payload.npmCommand || 'npm', args, {
+      cwd: payload.configDir,
+      env: commandEnvironment(),
+      logPath: payload.logPath,
+    });
+  } catch (error) {
+    if (!registryUrl && payload.npmFallbackRegistryUrl && /(?:ETARGET|No matching version found)/.test(logSince(payload.logPath, offset))) {
+      appendLog(payload.logPath, `Configured npm registry has no ${packageSpec}; retrying from the update-status registry`);
+      return installPackageFromRegistry(payload, packageSpec, payload.npmFallbackRegistryUrl);
+    }
+    throw error;
+  }
 }
 
 async function startServer(payload, version = payload.targetVersion) {
@@ -134,6 +189,7 @@ async function runNpmUpdate(rawPayload) {
   try {
     writeJsonAtomic(payload.stateFile, stateFor(payload, 'installing'));
     await installPackage(payload, payload.targetVersion);
+    verifyInstalledVersion(payload, payload.targetVersion);
 
     writeJsonAtomic(payload.stateFile, stateFor(payload, 'restarting'));
     await stopProcess(Number(payload.serverPid));
@@ -151,6 +207,7 @@ async function runNpmUpdate(rawPayload) {
       try {
         writeJsonAtomic(payload.stateFile, stateFor(payload, 'rolling-back', { error: message }));
         await installPackage(payload, payload.previousVersion);
+        verifyInstalledVersion(payload, payload.previousVersion);
         await startServer(payload, payload.previousVersion);
         writeJsonAtomic(payload.stateFile, stateFor(payload, 'rolled-back', {
           version: payload.previousVersion,
@@ -196,5 +253,6 @@ module.exports = {
   runNpmUpdate,
   stopProcess,
   validatePayload,
+  verifyInstalledVersion,
   writeJsonAtomic,
 };

package/backend/provider-adapters.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const { chatCapabilitiesForProvider } = require('./chat-runtime');
 const {
   createProviderSessionId,
   createTemporaryProviderSessionId,
@@ -145,11 +146,11 @@ const PROVIDER_ADAPTERS = Object.freeze([
     interruptInput: '\x1b',
     freshAcpSessionSources: ['codex-temporary'],
     commands: ['codex'],
-    supportedRuntimes: ['terminal', 'acp', 'json', 'app-server'],
+    supportedRuntimes: ['terminal', 'acp', 'json'],
     planSession: codexSessionPlan,
     acp: { packageName: '@agentclientprotocol/codex-acp', version: '1.1.4' },
     prepareAcpEnvironment: codexAcpEnvironment,
-    capabilities: { runtimeSwitch: true, terminalProfile: true, goals: true },
+    capabilities: { runtimeSwitch: true, terminalProfile: true, goals: false },
   },
   {
     id: 'claude',
@@ -225,6 +226,9 @@ function providerCapabilities(provider) {
     runtimeSwitch: adapter?.capabilities?.runtimeSwitch === true,
     terminalProfile: adapter?.capabilities?.terminalProfile === true,
     goals: adapter?.capabilities?.goals === true,
+    ...(adapter
+      ? chatCapabilitiesForProvider(provider)
+      : { chatRuntime: '', supportsChat: false, supportsSteer: false }),
   };
 }