farming-code 2.2.27 → 2.2.29

package/backend/provider-adapters.js

@@ -201,12 +201,26 @@ function codexAcpEnvironment(options = {}) {
   if (options.model && options.model !== 'config') config.model = options.model;
   if (options.reasoningEffort && options.reasoningEffort !== 'config') config.model_reasoning_effort = options.reasoningEffort;
   if (options.serviceTier && !['config', 'default'].includes(options.serviceTier)) config.service_tier = options.serviceTier;
+  if (typeof options.farmingSystemPrompt === 'string' && options.farmingSystemPrompt.trim()) {
+    config.developer_instructions = [
+      typeof config.developer_instructions === 'string' ? config.developer_instructions.trim() : '',
+      options.farmingSystemPrompt.trim(),
+    ].filter(Boolean).join('\n\n');
+  }
   if (Object.keys(config).length > 0) env.CODEX_CONFIG = JSON.stringify(config);
   const initialMode = { ask: 'read-only', approve: 'agent', full: 'agent-full-access' }[options.approvalMode];
   if (initialMode) env.INITIAL_AGENT_MODE = initialMode;
   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',
@@ -221,7 +235,13 @@ const PROVIDER_ADAPTERS = Object.freeze([
     terminalResumeArgs: (args, sessionId) => ['resume', sessionId, ...args],
     acp: { packageName: '@agentclientprotocol/codex-acp', version: '1.1.4' },
     prepareAcpEnvironment: codexAcpEnvironment,
-    capabilities: { runtimeSwitch: true, terminalProfile: true, goals: false, sessionFork: true },
+    capabilities: {
+      runtimeSwitch: true,
+      terminalProfile: true,
+      goals: false,
+      goalSubmission: { terminal: { kind: 'prompt' }, acp: { kind: 'prompt' } },
+      sessionFork: true,
+    },
   },
   {
     id: 'claude',
@@ -238,7 +258,14 @@ const PROVIDER_ADAPTERS = Object.freeze([
       version: '0.59.0',
       forkMode: 'target-process',
     },
-    capabilities: { runtimeSwitch: true, terminalProfile: false, goals: false, sessionFork: true },
+    prepareAcpEnvironment: claudeAcpEnvironment,
+    capabilities: {
+      runtimeSwitch: true,
+      terminalProfile: false,
+      goals: false,
+      goalSubmission: { terminal: { kind: 'command', prefix: '/goal' }, acp: { kind: 'prompt' } },
+      sessionFork: true,
+    },
   },
   {
     id: 'opencode',
@@ -267,7 +294,13 @@ const PROVIDER_ADAPTERS = Object.freeze([
         args: ['acp', '--cwd', path.resolve(options.cwd || process.cwd())],
       }),
     },
-    capabilities: { runtimeSwitch: true, terminalProfile: false, goals: false, sessionFork: true },
+    capabilities: {
+      runtimeSwitch: true,
+      terminalProfile: false,
+      goals: false,
+      goalSubmission: { terminal: { kind: 'prompt' }, acp: { kind: 'prompt' } },
+      sessionFork: true,
+    },
   },
   {
     id: 'qoder',
@@ -281,9 +314,23 @@ const PROVIDER_ADAPTERS = Object.freeze([
     planSession: (rawArgs, launchArgs) => explicitSessionPlan('qoder', rawArgs, launchArgs),
     acp: {
       version: 'native',
-      launch: options => ({ command: options.executable || 'qodercli', args: ['--acp'] }),
+      launch: options => ({
+        command: options.executable || 'qodercli',
+        args: [
+          ...(typeof options.farmingSystemPrompt === 'string' && options.farmingSystemPrompt.trim()
+            ? ['--append-system-prompt', options.farmingSystemPrompt.trim()]
+            : []),
+          '--acp',
+        ],
+      }),
+    },
+    capabilities: {
+      runtimeSwitch: true,
+      terminalProfile: false,
+      goals: false,
+      goalSubmission: { terminal: { kind: 'command', prefix: '/goal set' }, acp: { kind: 'prompt' } },
+      sessionFork: true,
     },
-    capabilities: { runtimeSwitch: true, terminalProfile: false, goals: false, sessionFork: true },
   },
 ]);
 
@@ -313,6 +360,7 @@ function providerCapabilities(provider) {
     runtimeSwitch: adapter?.capabilities?.runtimeSwitch === true,
     terminalProfile: adapter?.capabilities?.terminalProfile === true,
     goals: adapter?.capabilities?.goals === true,
+    goalSubmission: adapter?.capabilities?.goalSubmission || null,
     sessionFork: adapter?.capabilities?.sessionFork === true,
     ...(adapter
       ? chatCapabilitiesForProvider(provider)
@@ -339,6 +387,7 @@ function isFreshAcpSessionSource(provider, source) {
 }
 
 module.exports = {
+  claudeAcpEnvironment,
   getProviderAdapter,
   applyProviderHomeEnvironment,
   isFreshAcpSessionSource,

package/backend/review-session-store.js

@@ -1,6 +1,7 @@
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
+const { atomicWriteJson } = require('./atomic-json-store');
 const storageLayout = require('./storage-layout');
 
 const REVIEW_ID_PATTERN = /^review-[a-f0-9]{32}$/;
@@ -10,13 +11,6 @@ function clone(value) {
   return JSON.parse(JSON.stringify(value));
 }
 
-function atomicWriteJson(file, value) {
-  fs.mkdirSync(path.dirname(file), { recursive: true });
-  const temporaryFile = `${file}.${process.pid}.${Date.now()}.tmp`;
-  fs.writeFileSync(temporaryFile, `${JSON.stringify(value, null, 2)}\n`);
-  fs.renameSync(temporaryFile, file);
-}
-
 function validRevision(value) {
   return value
     && typeof value === 'object'
@@ -70,6 +64,9 @@ function normalizeState(value) {
 class ReviewSessionStore {
   constructor(configDir, options = {}) {
     this.file = options.file || storageLayout.reviewSessionsFile(configDir);
+    this.writeJson = typeof options.writeJson === 'function'
+      ? options.writeJson
+      : (file, value) => atomicWriteJson(file, value, { trailingNewline: true });
     this.state = null;
   }
 
@@ -100,8 +97,8 @@ class ReviewSessionStore {
     if (!REVIEW_ID_PATTERN.test(id) || !path.isAbsolute(root) || !OBJECT_ID_PATTERN.test(base) || !OBJECT_ID_PATTERN.test(tree)) {
       throw new TypeError('invalid review session');
     }
-    const state = this.ensureState();
-    if (state.sessions[id]) throw new TypeError('review session already exists');
+    const currentState = this.ensureState();
+    if (currentState.sessions[id]) throw new TypeError('review session already exists');
     const session = {
       base,
       createdAt,
@@ -113,27 +110,37 @@ class ReviewSessionStore {
       ...(Array.isArray(paths) ? { paths: [...paths] } : {}),
       updatedAt: createdAt,
     };
-    state.sessions[id] = session;
-    atomicWriteJson(this.file, state);
+    const nextState = {
+      sessions: { ...currentState.sessions, [id]: session },
+    };
+    this.writeJson(this.file, nextState);
+    this.state = nextState;
     return clone(session);
   }
 
   appendRevision(reviewId, tree, createdAt = new Date().toISOString()) {
     if (!OBJECT_ID_PATTERN.test(tree)) throw new TypeError('invalid review revision');
-    const state = this.ensureState();
-    const session = state.sessions[reviewId];
-    if (!session) throw new TypeError('review session not found');
-    const previous = session.revisions[session.revisions.length - 1];
-    if (previous.tree === tree) return { added: false, session: clone(session) };
-    session.revisions.push({
-      createdAt,
-      number: previous.number + 1,
-      previousTree: previous.tree,
-      tree,
-    });
-    session.updatedAt = createdAt;
-    atomicWriteJson(this.file, state);
-    return { added: true, session: clone(session) };
+    const currentState = this.ensureState();
+    const currentSession = currentState.sessions[reviewId];
+    if (!currentSession) throw new TypeError('review session not found');
+    const previous = currentSession.revisions[currentSession.revisions.length - 1];
+    if (previous.tree === tree) return { added: false, session: clone(currentSession) };
+    const nextSession = {
+      ...currentSession,
+      revisions: [...currentSession.revisions, {
+        createdAt,
+        number: previous.number + 1,
+        previousTree: previous.tree,
+        tree,
+      }],
+      updatedAt: createdAt,
+    };
+    const nextState = {
+      sessions: { ...currentState.sessions, [reviewId]: nextSession },
+    };
+    this.writeJson(this.file, nextState);
+    this.state = nextState;
+    return { added: true, session: clone(nextSession) };
   }
 }
 

package/backend/review-state-store.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const path = require('path');
+const { atomicWriteJson } = require('./atomic-json-store');
 const storageLayout = require('./storage-layout');
 
 const MAX_KEY_LENGTH = 200;
@@ -11,13 +11,6 @@ function ownValue(object, key) {
   return object && Object.prototype.hasOwnProperty.call(object, key) ? object[key] : undefined;
 }
 
-function atomicWriteJson(file, value) {
-  fs.mkdirSync(path.dirname(file), { recursive: true });
-  const temporaryFile = `${file}.${process.pid}.${Date.now()}.tmp`;
-  fs.writeFileSync(temporaryFile, `${JSON.stringify(value, null, 2)}\n`);
-  fs.renameSync(temporaryFile, file);
-}
-
 function isSafeKey(value) {
   return typeof value === 'string'
     && value.length > 0
@@ -141,6 +134,9 @@ class ReviewStateStore {
   constructor(configDir, options = {}) {
     this.file = options.file || storageLayout.reviewStateFile(configDir);
     this.seedReviews = normalizeReviews(options.seedReviews);
+    this.writeJson = typeof options.writeJson === 'function'
+      ? options.writeJson
+      : (file, value) => atomicWriteJson(file, value, { trailingNewline: true });
     this.state = null;
   }
 
@@ -270,13 +266,16 @@ class ReviewStateStore {
   }
 
   writePatchsetState(reviewId, patchset, patchsetState) {
-    const state = this.ensureState();
-    const review = ownValue(state.reviews, reviewId) || { patchsets: {} };
-    state.reviews[reviewId] = {
-      ...review,
-      patchsets: { ...review.patchsets, [patchset]: patchsetState },
+    const currentState = this.ensureState();
+    const review = ownValue(currentState.reviews, reviewId) || { patchsets: {} };
+    const nextState = {
+      reviews: { ...currentState.reviews, [reviewId]: {
+        ...review,
+        patchsets: { ...review.patchsets, [patchset]: patchsetState },
+      } },
     };
-    atomicWriteJson(this.file, state);
+    this.writeJson(this.file, nextState);
+    this.state = nextState;
   }
 }
 

package/backend/run-history-store.js

@@ -1,14 +1,7 @@
 const fs = require('fs');
-const path = require('path');
+const { atomicWriteJson } = require('./atomic-json-store');
 const storageLayout = require('./storage-layout');
 
-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.renameSync(tmpFile, file);
-}
-
 class RunHistoryStore {
   constructor(configDir, options = {}) {
     this.configDir = configDir;
@@ -17,16 +10,18 @@ class RunHistoryStore {
     this.normalizeTaskHistory = typeof options.normalizeTaskHistory === 'function'
       ? options.normalizeTaskHistory
       : entries => (Array.isArray(entries) ? entries.slice(0, 200) : []);
+    this.writeJson = typeof options.writeJson === 'function' ? options.writeJson : atomicWriteJson;
     this.entries = null;
   }
 
   init({ legacyTaskHistory = [] } = {}) {
     fs.mkdirSync(this.historyDir, { recursive: true });
     const current = this.readEntries();
-    this.entries = current.length > 0
+    const nextEntries = current.length > 0
       ? current
       : this.normalizeTaskHistory(legacyTaskHistory);
-    this.writeEntries();
+    this.writeEntries(nextEntries);
+    this.entries = nextEntries;
   }
 
   readEntries() {
@@ -44,8 +39,8 @@ class RunHistoryStore {
     return this.entries;
   }
 
-  writeEntries() {
-    atomicWriteJson(this.runsFile, this.ensureEntries());
+  writeEntries(entries = this.ensureEntries()) {
+    this.writeJson(this.runsFile, entries);
   }
 
   getEntries() {
@@ -53,14 +48,16 @@ class RunHistoryStore {
   }
 
   setEntries(entries) {
-    this.entries = this.normalizeTaskHistory(entries);
-    this.writeEntries();
+    const nextEntries = this.normalizeTaskHistory(entries);
+    this.writeEntries(nextEntries);
+    this.entries = nextEntries;
     return this.getEntries();
   }
 
   appendEntry(entry) {
-    this.entries = this.normalizeTaskHistory([entry, ...this.ensureEntries()]);
-    this.writeEntries();
+    const nextEntries = this.normalizeTaskHistory([entry, ...this.ensureEntries()]);
+    this.writeEntries(nextEntries);
+    this.entries = nextEntries;
     return this.getEntries();
   }
 }