farming-code 2.2.17 → 2.2.19

package/backend/config-manager.js

@@ -222,13 +222,14 @@ class ConfigManager {
       if (!expanded) continue;
       const resolved = path.resolve(expanded);
       if (resolved === path.parse(resolved).root || this.isInternalWorkspace(resolved)) continue;
-      let canonical;
+      let canonical = resolved;
       try {
         canonical = fs.realpathSync(resolved);
-        if (!fs.statSync(canonical).isDirectory()) continue;
       } catch {
-        continue;
+        // Project membership is durable. A temporarily unavailable path remains
+        // until the user explicitly removes it.
       }
+      if (this.isInternalWorkspace(canonical)) continue;
       if (seen.has(canonical)) continue;
       seen.add(canonical);
       result.push(canonical);
@@ -752,6 +753,97 @@ class ConfigManager {
     };
   }
 
+  mountProjectWorkspace(workspace) {
+    const expanded = this.expandWorkspacePath(workspace);
+    const resolved = expanded ? path.resolve(expanded) : '';
+    let canonicalWorkspace = '';
+    if (resolved) {
+      try {
+        canonicalWorkspace = fs.realpathSync(resolved);
+        if (!fs.statSync(canonicalWorkspace).isDirectory()) canonicalWorkspace = '';
+      } catch {
+        canonicalWorkspace = '';
+      }
+    }
+    if (
+      !canonicalWorkspace
+      || canonicalWorkspace === path.parse(canonicalWorkspace).root
+      || this.isInternalWorkspace(canonicalWorkspace)
+    ) {
+      throw new Error('Project workspace is invalid or unavailable');
+    }
+    const current = this.settings.projectWorkspaces || [];
+    if (!current.includes(canonicalWorkspace)) {
+      this.commitProjectMembership({
+        projectWorkspaces: [canonicalWorkspace, ...current],
+      });
+    }
+    return {
+      workspace: canonicalWorkspace,
+      projectWorkspaces: [...(this.settings.projectWorkspaces || [])],
+      pinnedProjectWorkspaces: [...(this.settings.pinnedProjectWorkspaces || [])],
+    };
+  }
+
+  removeProjectWorkspace(workspace) {
+    const expanded = this.expandWorkspacePath(workspace);
+    if (!expanded) throw new Error('Project workspace is required');
+    const resolved = path.resolve(expanded);
+    const candidates = new Set([expanded, resolved]);
+    try {
+      candidates.add(fs.realpathSync(resolved));
+    } catch {
+      // A deleted worktree can still be removed by its last canonical path.
+    }
+    const current = this.settings.projectWorkspaces || [];
+    const nextProjects = current.filter(entry => !candidates.has(entry));
+    const currentPinned = this.settings.pinnedProjectWorkspaces || [];
+    const nextPinned = currentPinned.filter(entry => !candidates.has(entry));
+    if (nextProjects.length !== current.length || nextPinned.length !== currentPinned.length) {
+      this.commitProjectMembership({
+        projectWorkspaces: nextProjects,
+        pinnedProjectWorkspaces: nextPinned,
+      });
+    }
+    return {
+      workspace: current.find(entry => candidates.has(entry)) || resolved,
+      projectWorkspaces: [...(this.settings.projectWorkspaces || [])],
+      pinnedProjectWorkspaces: [...(this.settings.pinnedProjectWorkspaces || [])],
+    };
+  }
+
+  setProjectWorkspacePinned(workspace, pinned) {
+    const [canonicalWorkspace] = this.normalizeProjectWorkspaces([workspace]);
+    if (!canonicalWorkspace || !(this.settings.projectWorkspaces || []).includes(canonicalWorkspace)) {
+      throw new Error('Project does not exist');
+    }
+    const current = this.settings.pinnedProjectWorkspaces || [];
+    const nextPinned = pinned
+      ? [...current.filter(entry => entry !== canonicalWorkspace), canonicalWorkspace]
+      : current.filter(entry => entry !== canonicalWorkspace);
+    if (
+      nextPinned.length !== current.length
+      || nextPinned.some((entry, index) => entry !== current[index])
+    ) {
+      this.commitProjectMembership({ pinnedProjectWorkspaces: nextPinned });
+    }
+    return {
+      workspace: canonicalWorkspace,
+      projectWorkspaces: [...(this.settings.projectWorkspaces || [])],
+      pinnedProjectWorkspaces: [...(this.settings.pinnedProjectWorkspaces || [])],
+    };
+  }
+
+  commitProjectMembership(settingsPatch) {
+    const previousSettings = this.settings;
+    try {
+      this.updateSettings(settingsPatch);
+    } catch (error) {
+      this.settings = previousSettings;
+      throw error;
+    }
+  }
+
   getMainPageSessionKeys() {
     return this.sessionStore ? this.sessionStore.getMainPageSessionKeys() : [];
   }
@@ -776,6 +868,10 @@ class ConfigManager {
     return this.sessionStore ? this.sessionStore.ensureRecordForAgent(agent, patch) : '';
   }
 
+  getAgentSessionRecordForProviderSessionKey(sessionKey) {
+    return this.sessionStore ? this.sessionStore.getRecordForProviderSessionKey(sessionKey) : null;
+  }
+
   setProviderSessionDisplayState(sessionKey, patch = {}) {
     return this.sessionStore ? this.sessionStore.setProviderSessionDisplayState(sessionKey, patch) : '';
   }
@@ -794,7 +890,17 @@ class ConfigManager {
 
   writeSettingsFile() {
     fs.mkdirSync(this.farmingDir, { recursive: true });
-    fs.writeFileSync(this.settingsFile, JSON.stringify(this.settings, null, 2));
+    const tempFile = `${this.settingsFile}.${process.pid}.${Date.now()}.tmp`;
+    try {
+      fs.writeFileSync(tempFile, JSON.stringify(this.settings, null, 2));
+      fs.renameSync(tempFile, this.settingsFile);
+    } finally {
+      try {
+        fs.unlinkSync(tempFile);
+      } catch {
+        // A successful rename already removed the temporary path.
+      }
+    }
   }
 
   appendTaskHistory(entry) {

package/backend/farming-session-store.js

@@ -6,6 +6,24 @@ const storageLayout = require('./storage-layout');
 
 const SESSION_ID_PREFIX = 'fsess';
 const MAX_MAIN_PAGE_SESSION_KEYS = 50;
+const PRODUCT_STATE_FIELDS = [
+  'projectWorkspace',
+  'task',
+  'workflowTemplate',
+  'pinned',
+  'projectOrder',
+  'pinnedOrder',
+  'attentionSeq',
+  'readAttentionSeq',
+  'attentionUpdatedAt',
+  'readAttentionAt',
+  'attentionReason',
+  'attentionOutputEpoch',
+  'attentionOutputSeq',
+  'readOutputEpoch',
+  'readOutputSeq',
+  'customTitle',
+];
 
 function now() {
   return Date.now();
@@ -184,10 +202,15 @@ class FarmingSessionStore {
       attentionUpdatedAt: typeof agent.attentionUpdatedAt === 'number' ? agent.attentionUpdatedAt : null,
       readAttentionAt: typeof agent.readAttentionAt === 'number' ? agent.readAttentionAt : null,
       attentionReason: typeof agent.attentionReason === 'string' ? agent.attentionReason : '',
+      attentionOutputEpoch: typeof agent.attentionOutputEpoch === 'string' ? agent.attentionOutputEpoch : '',
       attentionOutputSeq: typeof agent.attentionOutputSeq === 'number' ? agent.attentionOutputSeq : null,
+      readOutputEpoch: typeof agent.readOutputEpoch === 'string' ? agent.readOutputEpoch : '',
+      readOutputSeq: typeof agent.readOutputSeq === 'number' ? agent.readOutputSeq : null,
       archived: agent.archived === true,
       archivedAt: typeof agent.archivedAt === 'number' ? agent.archivedAt : null,
-      customTitle: typeof agent.customTitle === 'string' ? agent.customTitle : '',
+      ...(typeof agent.customTitle === 'string' && agent.customTitle
+        ? { customTitle: agent.customTitle }
+        : {}),
       title: typeof agent.customTitle === 'string' && agent.customTitle
         ? agent.customTitle
         : (typeof agent.providerSessionTitle === 'string' && agent.providerSessionTitle
@@ -222,6 +245,9 @@ class FarmingSessionStore {
       providerSessionTemporary: false,
       updatedAt: now(),
     };
+    if (typeof record.customTitle === 'string' && record.customTitle) {
+      record.title = record.customTitle;
+    }
     index.providerSessionRecords[sessionKey] = id;
     this.writeRecord(record);
     this.writeIndex();
@@ -231,10 +257,38 @@ class FarmingSessionStore {
   ensureRecordForAgent(agent, patch = {}) {
     const providerSessionKey = this.providerSessionKeyForAgent(agent);
     if (providerSessionKey) {
+      const previousId = safeSessionFileName(agent?.persistentSessionId)
+        ? agent.persistentSessionId
+        : '';
+      const previous = previousId ? this.readRecord(previousId) : null;
+      const canonical = this.getRecordForProviderSessionKey(providerSessionKey);
+      const agentPatch = this.recordPatchFromAgent(agent);
+      if (canonical && previousId && canonical.id !== previousId) {
+        PRODUCT_STATE_FIELDS.forEach(field => {
+          if (Object.prototype.hasOwnProperty.call(canonical, field)) {
+            agentPatch[field] = canonical[field];
+          } else if (previous && Object.prototype.hasOwnProperty.call(previous, field)) {
+            agentPatch[field] = previous[field];
+          }
+        });
+      }
       const id = this.ensureRecordForProviderSessionKey(providerSessionKey, {
-        ...this.recordPatchFromAgent(agent),
+        ...agentPatch,
         ...patch,
       }, agent?.persistentSessionId || '');
+      if (previousId && previousId !== id) {
+        if (previous && (previous.providerSessionTemporary === true || !previous.providerSessionKey)) {
+          this.writeRecord({
+            ...previous,
+            runtimeAgentId: '',
+            visibleOnMainPage: false,
+            archived: true,
+            archivedAt: now(),
+            mergedInto: id,
+            updatedAt: now(),
+          });
+        }
+      }
       return id;
     }
 
@@ -345,6 +399,12 @@ class FarmingSessionStore {
     return this.ensureIndex().mainPageSessionKeys.slice();
   }
 
+  getRecordForProviderSessionKey(sessionKey) {
+    const index = this.ensureIndex();
+    const id = index.providerSessionRecords[sessionKey];
+    return safeSessionFileName(id) ? this.readRecord(id) : null;
+  }
+
   listAgentRecords() {
     this.ensureIndex();
     let names = [];