farming-code 2.2.7 → 2.2.11

package/backend/agent-provider-session.js

@@ -1,42 +1,10 @@
-const path = require('path');
 const { parseCommand } = require('./cli-agents');
-const {
-  createProviderSessionId,
-  createTemporaryProviderSessionId,
-  isSafeProviderSessionId,
-} = require('./provider-session-id');
-
-const CODING_SESSION_PROVIDERS = new Set(['codex', 'claude', 'opencode', 'qoder']);
-const CODEX_VALUE_OPTIONS = new Set([
-  '-a',
-  '-c',
-  '-C',
-  '-m',
-  '-s',
-  '--ask-for-approval',
-  '--cd',
-  '--config',
-  '--config-profile',
-  '--model',
-  '--profile',
-  '--sandbox',
-]);
-
-function normalizeProvider(provider) {
-  const value = String(provider || '').trim().toLowerCase();
-  return CODING_SESSION_PROVIDERS.has(value) ? value : '';
-}
-
-function providerForProgram(program) {
-  const basename = path.basename(String(program || '').trim());
-  if (basename === 'qodercli') return 'qoder';
-  return normalizeProvider(basename);
-}
+const { getProviderAdapter, providerForProgram } = require('./provider-adapters');
+const { isSafeProviderSessionId } = require('./provider-session-id');
 
 function sessionFromExactResumeSource(source) {
-  const match = String(source || '').match(/^(codex|claude|opencode|qoder)-history:(?:home:([A-Za-z0-9._-]+):)?([A-Za-z0-9._:-]+)$/);
-  if (!match) return null;
-  if (!isSafeProviderSessionId(match[3])) return null;
+  const match = String(source || '').match(/^([a-z0-9_-]+)-history:(?:home:([A-Za-z0-9._-]+):)?([A-Za-z0-9._:-]+)$/);
+  if (!match || !getProviderAdapter(match[1]) || !isSafeProviderSessionId(match[3])) return null;
   return {
     provider: match[1],
     providerHomeId: match[2] || 'default',
@@ -44,202 +12,30 @@ function sessionFromExactResumeSource(source) {
   };
 }
 
-function optionTakesValue(option, valueOptions) {
-  if (!option || option.includes('=')) return false;
-  return valueOptions.has(option);
-}
-
-function firstCodexSubcommand(args) {
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    if (!arg) continue;
-    if (arg.startsWith('-')) {
-      if (optionTakesValue(arg, CODEX_VALUE_OPTIONS)) index += 1;
-      continue;
-    }
-    return { value: arg, index };
-  }
-  return null;
-}
-
-function codexSessionIdAfterSubcommand(args, subcommandIndex) {
-  const positional = [];
-  for (let index = subcommandIndex + 1; index < args.length; index += 1) {
-    const arg = args[index];
-    if (!arg) continue;
-    if (arg.startsWith('-')) {
-      if (optionTakesValue(arg, CODEX_VALUE_OPTIONS)) index += 1;
-      continue;
-    }
-    positional.push(arg);
-  }
-  const sessionId = positional.at(-1) || '';
-  return isSafeProviderSessionId(sessionId) ? sessionId : '';
-}
-
-function argValue(args, names) {
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    for (const name of names) {
-      if (arg === name) return args[index + 1] || '';
-      if (arg.startsWith(`${name}=`)) return arg.slice(name.length + 1);
-    }
-  }
-  return '';
-}
-
-function hasArg(args, names) {
-  return args.some(arg => names.includes(arg) || names.some(name => arg.startsWith(`${name}=`)));
-}
-
-function codexProviderSessionPlan(rawArgs) {
-  const subcommand = firstCodexSubcommand(rawArgs);
-  if (subcommand && subcommand.value === 'resume') {
-    const sessionId = codexSessionIdAfterSubcommand(rawArgs, subcommand.index);
-    if (sessionId) {
-      return {
-        id: sessionId,
-        temporary: false,
-        source: 'resume',
-      };
-    }
-  }
-
-  if (subcommand && subcommand.value === 'fork') {
-    return {
-      id: createTemporaryProviderSessionId(),
-      temporary: true,
-      source: 'codex-fork-temporary',
-      forkedFromProviderSessionId: codexSessionIdAfterSubcommand(rawArgs, subcommand.index),
-    };
-  }
-
-  if (subcommand && subcommand.value) {
-    return null;
-  }
-
-  return {
-    id: createTemporaryProviderSessionId(),
-    temporary: true,
-    source: 'codex-temporary',
-  };
-}
-
-function claudeProviderSessionPlan(rawArgs, launchArgs) {
-  const explicitSessionId = argValue(rawArgs, ['--session-id']);
-  const resumeSessionId = argValue(rawArgs, ['--resume']);
-  const isFork = hasArg(rawArgs, ['--fork-session']);
-  const isContinue = hasArg(rawArgs, ['--continue', '-c']);
-
-  if (explicitSessionId && isSafeProviderSessionId(explicitSessionId)) {
-    return {
-      id: explicitSessionId,
-      temporary: false,
-      source: 'launch-session-id',
-      forkedFromProviderSessionId: isFork && isSafeProviderSessionId(resumeSessionId) ? resumeSessionId : '',
-    };
-  }
-
-  if (resumeSessionId && isSafeProviderSessionId(resumeSessionId) && !isFork) {
-    return {
-      id: resumeSessionId,
-      temporary: false,
-      source: 'resume',
-    };
-  }
-
-  if (isContinue) {
-    return null;
-  }
-
-  const sessionId = createProviderSessionId();
+function emptyPlan(args) {
   return {
-    id: sessionId,
+    provider: '',
+    id: '',
     temporary: false,
-    source: isFork ? 'claude-fork-session-id' : 'claude-session-id',
-    forkedFromProviderSessionId: isFork && isSafeProviderSessionId(resumeSessionId) ? resumeSessionId : '',
-    args: ['--session-id', sessionId, ...launchArgs],
-  };
-}
-
-function qoderProviderSessionPlan(rawArgs, launchArgs) {
-  const explicitSessionId = argValue(rawArgs, ['--session-id']);
-  const resumeSessionId = argValue(rawArgs, ['--resume']);
-  const isFork = hasArg(rawArgs, ['--fork-session']);
-  const isContinue = hasArg(rawArgs, ['--continue']);
-
-  if (explicitSessionId && isSafeProviderSessionId(explicitSessionId)) {
-    return {
-      id: explicitSessionId,
-      temporary: false,
-      source: 'launch-session-id',
-      forkedFromProviderSessionId: isFork && isSafeProviderSessionId(resumeSessionId) ? resumeSessionId : '',
-    };
-  }
-
-  if (resumeSessionId && isSafeProviderSessionId(resumeSessionId) && !isFork) {
-    return {
-      id: resumeSessionId,
-      temporary: false,
-      source: 'resume',
-    };
-  }
-
-  if (isContinue) {
-    return null;
-  }
-
-  const sessionId = createProviderSessionId();
-  return {
-    id: sessionId,
-    temporary: false,
-    source: isFork ? 'qoder-fork-session-id' : 'qoder-session-id',
-    forkedFromProviderSessionId: isFork && isSafeProviderSessionId(resumeSessionId) ? resumeSessionId : '',
-    args: ['--session-id', sessionId, ...launchArgs],
-  };
-}
-
-function openCodeProviderSessionPlan(rawArgs) {
-  const sessionId = argValue(rawArgs, ['--session', '-s']);
-  if (!sessionId || !isSafeProviderSessionId(sessionId)) return null;
-  if (hasArg(rawArgs, ['--fork'])) {
-    return {
-      id: createTemporaryProviderSessionId(),
-      temporary: true,
-      source: 'opencode-fork-temporary',
-      forkedFromProviderSessionId: sessionId,
-    };
-  }
-  return {
-    id: sessionId,
-    temporary: false,
-    source: 'resume',
+    source: '',
+    forkedFromProviderSessionId: '',
+    args,
   };
 }
 
 function buildAgentProviderSessionPlan({ command, program, args, source } = {}) {
   const sourceSession = sessionFromExactResumeSource(source);
   const rawParts = parseCommand(command);
-  const rawProgram = rawParts[0] || program || '';
-  const provider = sourceSession ? sourceSession.provider : providerForProgram(rawProgram || program);
-  if (!provider) {
-    return {
-      provider: '',
-      id: '',
-      key: '',
-      temporary: false,
-      source: '',
-      forkedFromProviderSessionId: '',
-      args: Array.isArray(args) ? args : [],
-    };
-  }
-
+  const provider = sourceSession?.provider || providerForProgram(rawParts[0] || program);
   const launchArgs = Array.isArray(args) ? args : [];
+  const adapter = getProviderAdapter(provider);
+  if (!adapter) return emptyPlan(launchArgs);
+
   if (sourceSession) {
     return {
       provider,
       id: sourceSession.sessionId,
-      providerHomeId: sourceSession.providerHomeId || 'default',
+      providerHomeId: sourceSession.providerHomeId,
       temporary: false,
       source: 'resume-source',
       forkedFromProviderSessionId: '',
@@ -247,29 +43,8 @@ function buildAgentProviderSessionPlan({ command, program, args, source } = {})
     };
   }
 
-  const rawArgs = rawParts.slice(1);
-  let plan = null;
-  if (provider === 'codex') {
-    plan = codexProviderSessionPlan(rawArgs);
-  } else if (provider === 'claude') {
-    plan = claudeProviderSessionPlan(rawArgs, launchArgs);
-  } else if (provider === 'qoder') {
-    plan = qoderProviderSessionPlan(rawArgs, launchArgs);
-  } else if (provider === 'opencode') {
-    plan = openCodeProviderSessionPlan(rawArgs);
-  }
-
-  if (!plan || !plan.id) {
-    return {
-      provider: '',
-      id: '',
-      temporary: false,
-      source: '',
-      forkedFromProviderSessionId: '',
-      args: launchArgs,
-    };
-  }
-
+  const plan = adapter.planSession(rawParts.slice(1), launchArgs);
+  if (!plan?.id) return emptyPlan(launchArgs);
   return {
     provider,
     id: plan.id,

package/backend/agent-runtime-binding.js

@@ -0,0 +1,219 @@
+const RUNTIME_KINDS = new Set(['terminal', 'acp', 'json', 'app-server']);
+
+function terminalBinding() {
+  return { kind: 'terminal' };
+}
+
+function acpBinding(source = {}) {
+  return {
+    kind: 'acp',
+    state: source.state || source.acpState || '',
+    error: source.error || source.acpError || '',
+    stopReason: source.stopReason || source.acpStopReason || '',
+    pendingPermission: source.pendingPermission || source.acpPendingPermission || null,
+    pendingPermissions: source.pendingPermissions || source.acpPendingPermissions || [],
+    pendingElicitation: source.pendingElicitation || source.acpPendingElicitation || null,
+    pendingElicitations: source.pendingElicitations || source.acpPendingElicitations || [],
+    activeElicitations: source.activeElicitations || source.acpActiveElicitations || [],
+    sessionUpdatedAt: source.sessionUpdatedAt || source.acpSessionUpdatedAt || '',
+    sessionRevision: Number(source.sessionRevision ?? source.acpSessionRevision) || 0,
+  };
+}
+
+function jsonBinding(source = {}) {
+  return {
+    kind: 'json',
+    state: source.state || source.jsonCliState || '',
+    error: source.error || source.jsonCliError || '',
+    transcriptUpdatedAt: source.transcriptUpdatedAt || source.jsonCliTranscriptUpdatedAt || '',
+    events: source.events || source.jsonCliEvents || [],
+  };
+}
+
+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;
+  if (agent?.agentRuntimeMode === 'acp') return 'acp';
+  if (agent?.agentRuntimeMode === 'json') return 'json';
+  return agent?.codexRuntimeMode === 'app-server' ? 'app-server' : 'terminal';
+}
+
+function bindingFromLegacy(agent) {
+  if (RUNTIME_KINDS.has(agent?.runtimeBinding?.kind)) return agent.runtimeBinding;
+  switch (runtimeKind(agent)) {
+    case 'acp': return acpBinding(agent);
+    case 'json': return jsonBinding(agent);
+    case 'app-server': return appServerBinding(agent);
+    default: return terminalBinding();
+  }
+}
+
+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();
+  }
+}
+
+function runtimeBindingOf(agent, expectedKind) {
+  const binding = bindingFromLegacy(agent);
+  return !expectedKind || binding.kind === expectedKind ? binding : null;
+}
+
+function replaceRuntimeBinding(agent, kind, source = {}) {
+  const binding = runtimeBindingFor(kind, source);
+  agent.runtimeBinding = binding;
+  return binding;
+}
+
+const LEGACY_RUNTIME_FIELDS = [
+  'acpState', 'acpError', 'acpStopReason', 'acpPendingPermission', 'acpPendingPermissions',
+  'acpPendingElicitation', 'acpPendingElicitations', 'acpActiveElicitations',
+  'acpSessionUpdatedAt', 'acpSessionRevision', 'jsonCliState', 'jsonCliError',
+  'jsonCliTranscriptUpdatedAt', 'codexAppServerState', 'codexAppServerEndpoint',
+  'codexAppServerThreadId', 'codexAppServerTurnId', 'codexAppServerError',
+  'codexAppServerPendingRequestId', 'codexAppServerPendingRequestMethod',
+  'codexAppServerPendingRequest', 'codexAppServerNotice', 'codexAppServerGoal',
+  'codexCliObserverDeferred', 'codexAppServerHomePath', 'codexAppServerTranscriptUpdatedAt',
+];
+
+function installRuntimeBinding(agent) {
+  if (!agent || typeof agent !== 'object') return agent;
+  const jsonResumeEvents = Array.isArray(agent.runtimeBinding?.events)
+    ? agent.runtimeBinding.events
+    : (Array.isArray(agent.jsonCliEvents) ? agent.jsonCliEvents : []);
+  const binding = bindingFromLegacy(agent);
+  agent.runtimeBinding = binding;
+  agent.runtimeResumeState = {
+    ...(agent.runtimeResumeState || {}),
+    jsonEvents: jsonResumeEvents,
+  };
+  for (const name of ['agentRuntimeMode', 'codexRuntimeMode', 'jsonCliEvents', ...LEGACY_RUNTIME_FIELDS]) {
+    delete agent[name];
+  }
+  return agent;
+}
+
+class RuntimeAgentMap extends Map {
+  set(key, agent) {
+    return super.set(key, installRuntimeBinding(agent));
+  }
+}
+
+function publicRuntimeBinding(agent) {
+  const binding = RUNTIME_KINDS.has(agent?.runtimeBinding?.kind)
+    ? agent.runtimeBinding
+    : bindingFromLegacy(agent);
+  if (binding.kind === 'terminal') return terminalBinding();
+  if (binding.kind === 'json') {
+    return {
+      kind: 'json',
+      state: binding.state,
+      error: binding.error,
+      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 };
+}
+
+function runtimeState(agent) {
+  const binding = RUNTIME_KINDS.has(agent?.runtimeBinding?.kind)
+    ? agent.runtimeBinding
+    : bindingFromLegacy(agent);
+  return binding.kind === 'terminal' ? '' : binding.state || '';
+}
+
+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') {
+    return {
+      ...metadata,
+      acpState: binding.state,
+      acpError: binding.error,
+      acpStopReason: binding.stopReason,
+      acpPendingPermission: binding.pendingPermission,
+      acpPendingPermissions: binding.pendingPermissions,
+      acpPendingElicitation: binding.pendingElicitation,
+      acpPendingElicitations: binding.pendingElicitations,
+      acpActiveElicitations: binding.activeElicitations,
+      acpSessionUpdatedAt: binding.sessionUpdatedAt,
+      acpSessionRevision: binding.sessionRevision,
+    };
+  }
+  if (binding.kind === 'json') {
+    return {
+      ...metadata,
+      jsonCliState: binding.state,
+      jsonCliError: binding.error,
+      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;
+}
+
+module.exports = {
+  RuntimeAgentMap,
+  installRuntimeBinding,
+  legacyRuntimeMetadata,
+  publicRuntimeBinding,
+  replaceRuntimeBinding,
+  runtimeBindingFor,
+  runtimeBindingOf,
+  runtimeKind,
+  runtimeState,
+};

package/backend/agent-session-history.js

@@ -25,6 +25,61 @@ function quoteCommandArg(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
 
+function tomlStringAssignment(line, key) {
+  const match = String(line || '').match(new RegExp(`^\\s*${key}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*"|'[^']*')\\s*(?:#.*)?$`));
+  if (!match) return '';
+  const literal = match[1];
+  if (literal.startsWith('"')) {
+    try {
+      return JSON.parse(literal).trim();
+    } catch {
+      return '';
+    }
+  }
+  return literal.slice(1, -1).trim();
+}
+
+function codexProfileNameForSection(section) {
+  const match = String(section || '').trim().match(/^profiles\.(?:"([^"]+)"|'([^']+)'|([A-Za-z0-9_-]+))$/);
+  return match ? (match[1] || match[2] || match[3] || '') : '';
+}
+
+function resolveCodexResumeModelProvider(codexHome) {
+  const home = normalizePathValue(codexHome)
+    || normalizePathValue(process.env.CODEX_HOME)
+    || path.join(os.homedir(), '.codex');
+  let config = '';
+  try {
+    config = fs.readFileSync(path.join(home, 'config.toml'), 'utf8');
+  } catch {
+    return 'openai';
+  }
+
+  let section = '';
+  let activeProfile = '';
+  let topLevelProvider = '';
+  const profileProviders = new Map();
+  for (const line of config.split(/\r?\n/)) {
+    const sectionMatch = line.match(/^\s*\[([^\]]+)]\s*(?:#.*)?$/);
+    if (sectionMatch) {
+      section = sectionMatch[1].trim();
+      continue;
+    }
+    if (!section) {
+      activeProfile = tomlStringAssignment(line, 'profile') || activeProfile;
+      topLevelProvider = tomlStringAssignment(line, 'model_provider') || topLevelProvider;
+      continue;
+    }
+    const profileName = codexProfileNameForSection(section);
+    if (profileName) {
+      const provider = tomlStringAssignment(line, 'model_provider');
+      if (provider) profileProviders.set(profileName, provider);
+    }
+  }
+
+  return (activeProfile && profileProviders.get(activeProfile)) || topLevelProvider || 'openai';
+}
+
 function normalizePathValue(value) {
   if (typeof value !== 'string') return '';
   const trimmed = value.trim();
@@ -752,8 +807,17 @@ function buildAgentSessionResumeCommand(provider, sessionId, options = {}) {
 
   if (normalizedProvider === 'codex') {
     const cwd = normalizePathValue(options.cwd);
+    const modelProvider = String(
+      options.modelProvider
+      || (Object.prototype.hasOwnProperty.call(options, 'providerHomePath')
+        ? resolveCodexResumeModelProvider(options.providerHomePath)
+        : '')
+    ).trim();
+    const providerArgs = modelProvider
+      ? ` -c ${quoteCommandArg(`model_provider=${JSON.stringify(modelProvider)}`)}`
+      : '';
     const cwdArgs = cwd ? ` -C ${quoteCommandArg(cwd)}` : '';
-    return `codex ${options.fork === true ? 'fork' : 'resume'}${cwdArgs} ${normalizedSessionId}`;
+    return `codex ${options.fork === true ? 'fork' : 'resume'}${providerArgs}${cwdArgs} ${normalizedSessionId}`;
   }
 
   if (normalizedProvider === 'claude') {
@@ -884,5 +948,6 @@ module.exports = {
   listQoderSessions,
   normalizeProvider,
   paginateAgentSessions,
+  resolveCodexResumeModelProvider,
   searchAgentSessions,
 };