farming-code 2.2.28 → 2.2.30

package/backend/acp-session-state.js

@@ -1,21 +1,9 @@
-const fsp = require('fs/promises');
-const path = require('path');
-const { fileURLToPath } = require('url');
-
 const MAX_ACP_UPDATES = 2_000;
 const MAX_ACP_UPDATE_LOG_VALUE_CHARS = 32 * 1024;
-const MAX_CODEX_HISTORY_IMAGES_PER_MESSAGE = 6;
-const MAX_CODEX_HISTORY_IMAGE_BYTES = 5 * 1024 * 1024;
-const CODEX_HISTORY_IMAGE_MIME_BY_EXT = Object.freeze({
-  '.gif': 'image/gif',
-  '.jpeg': 'image/jpeg',
-  '.jpg': 'image/jpeg',
-  '.png': 'image/png',
-  '.svg': 'image/svg+xml',
-  '.webp': 'image/webp',
-});
+const MAX_CODEX_SUBAGENTS = 128;
+const MAX_CODEX_SUBAGENT_ID_CHARS = 160;
+const MAX_CODEX_SUBAGENT_NAME_CHARS = 120;
 const {
-  codexHistoryImageTargets,
   visibleUserMessageText,
 } = require('./codex-transcript');
 const {
@@ -27,6 +15,54 @@ function clone(value) {
   return value === undefined ? undefined : JSON.parse(JSON.stringify(value));
 }
 
+function boundedSubagentId(value) {
+  return String(value || '').trim().slice(0, MAX_CODEX_SUBAGENT_ID_CHARS);
+}
+
+function normalizeCodexSubagentStatus(value) {
+  const status = String(value || '');
+  return [
+    'pendingInit',
+    'running',
+    'completed',
+    'interrupted',
+    'errored',
+    'shutdown',
+    'notFound',
+  ].includes(status) ? status : '';
+}
+
+function normalizeCodexSubagentUpdate(raw, sessionId) {
+  if (!raw || raw.version !== 1 || !Array.isArray(raw.agents)) return null;
+  const rootThreadId = boundedSubagentId(raw.rootThreadId);
+  if (!rootThreadId || rootThreadId !== sessionId) return null;
+  const agents = [];
+  const seen = new Set();
+  for (const candidate of raw.agents.slice(0, MAX_CODEX_SUBAGENTS)) {
+    const threadId = boundedSubagentId(candidate?.threadId);
+    const status = normalizeCodexSubagentStatus(candidate?.status);
+    if (!threadId || threadId === rootThreadId || !status || seen.has(threadId)) continue;
+    seen.add(threadId);
+    const parentThreadId = boundedSubagentId(candidate?.parentThreadId);
+    const name = String(candidate?.name || '').trim().slice(0, MAX_CODEX_SUBAGENT_NAME_CHARS);
+    agents.push({
+      threadId,
+      parentThreadId: parentThreadId && parentThreadId !== threadId ? parentThreadId : null,
+      ...(name ? { name } : {}),
+      status,
+    });
+  }
+  return {
+    version: 1,
+    rootThreadId,
+    revision: Number.isFinite(Number(raw.revision))
+      ? Math.max(0, Math.floor(Number(raw.revision)))
+      : 0,
+    kind: raw.kind === 'delta' ? 'delta' : 'snapshot',
+    agents,
+  };
+}
+
 function compactUpdateForLog(update) {
   let serialized = '';
   try {
@@ -62,40 +98,6 @@ function contentText(content) {
     .join('');
 }
 
-function localPathFromHistoryImageTarget(value) {
-  const target = String(value || '').trim();
-  if (!target || target.includes('\0') || /^data:/i.test(target)) return '';
-  if (/^file:\/\//i.test(target)) {
-    try {
-      return fileURLToPath(target);
-    } catch {
-      return '';
-    }
-  }
-  return path.isAbsolute(target) ? target : '';
-}
-
-function imageBlockFromDataUrl(value) {
-  const match = String(value || '').match(/^data:(image\/(?:gif|jpe?g|png|svg\+xml|webp));base64,([a-z0-9+/=]+)$/i);
-  if (!match) return null;
-  const data = match[2];
-  if (!data || Math.ceil(data.length * 3 / 4) > MAX_CODEX_HISTORY_IMAGE_BYTES) return null;
-  return { type: 'image', mimeType: match[1].toLowerCase(), data };
-}
-
-async function imageBlockFromLocalPath(filePath) {
-  const ext = path.extname(filePath).toLowerCase();
-  const mimeType = CODEX_HISTORY_IMAGE_MIME_BY_EXT[ext];
-  if (!mimeType) return null;
-  try {
-    const stat = await fsp.stat(filePath);
-    if (!stat.isFile() || stat.size <= 0 || stat.size > MAX_CODEX_HISTORY_IMAGE_BYTES) return null;
-    return { type: 'image', mimeType, data: (await fsp.readFile(filePath)).toString('base64') };
-  } catch {
-    return null;
-  }
-}
-
 function isContextCompactionText(content) {
   const text = contentText(content).trim();
   return /^\*?Context compacted(?: to fit the model's context window)?\.?\*?$/i.test(text)
@@ -157,6 +159,7 @@ class AcpSessionState {
     this.configOptions = [];
     this.title = '';
     this.updatedAt = '';
+    this.codexSubagents = null;
     this.truncated = false;
     this.sequence = 0;
     this.revision = Number.isFinite(Number(options.revisionBase))
@@ -202,6 +205,7 @@ class AcpSessionState {
     state.configOptions = clone(checkpoint.configOptions || []);
     state.title = String(checkpoint.title || '');
     state.updatedAt = String(checkpoint.updatedAt || '');
+    state.codexSubagents = clone(checkpoint.codexSubagents ?? null);
     state.truncated = checkpoint.truncated === true;
     return state;
   }
@@ -282,44 +286,6 @@ class AcpSessionState {
     // History replay uses the same reducer as live updates; nothing to close.
   }
 
-  hasCodexHistoryImageReferences() {
-    return this.provider === 'codex' && this.entries.some(entry => (
-      entry?.type === 'message'
-      && entry.role === 'user'
-      && codexHistoryImageTargets(contentText(entry.content)).length > 0
-    ));
-  }
-
-  async hydrateCodexHistoryAttachments(options = {}) {
-    if (this.provider !== 'codex') return 0;
-    const imageDataByPath = options.imageDataByPath instanceof Map ? options.imageDataByPath : new Map();
-    let hydrated = 0;
-    for (const entry of this.entries) {
-      if (entry?.type !== 'message' || entry.role !== 'user') continue;
-      const existingImages = (entry.content || []).filter(content => content?.type === 'image');
-      const remaining = MAX_CODEX_HISTORY_IMAGES_PER_MESSAGE - existingImages.length;
-      if (remaining <= 0) continue;
-      const targets = codexHistoryImageTargets(contentText(entry.content));
-      const seenPaths = new Set();
-      const blocks = [];
-      for (const target of targets) {
-        const filePath = localPathFromHistoryImageTarget(target);
-        if (!filePath || seenPaths.has(filePath)) continue;
-        seenPaths.add(filePath);
-        const fallback = imageDataByPath.get(filePath);
-        const block = await imageBlockFromLocalPath(filePath) || imageBlockFromDataUrl(fallback);
-        if (!block) continue;
-        blocks.push(block);
-        if (blocks.length >= remaining) break;
-      }
-      if (blocks.length === 0) continue;
-      entry.content.push(...blocks);
-      this.touchEntry(entry);
-      hydrated += blocks.length;
-    }
-    return hydrated;
-  }
-
   apply(notification) {
     if (!notification || notification.sessionId !== this.sessionId) return false;
     const update = notification.update;
@@ -360,10 +326,31 @@ class AcpSessionState {
     } else if (kind === 'session_info_update') {
       if (Object.prototype.hasOwnProperty.call(update, 'title')) this.title = String(update.title || '');
       if (Object.prototype.hasOwnProperty.call(update, 'updatedAt')) this.updatedAt = String(update.updatedAt || '');
+      this.applyCodexSubagentUpdate(update?._meta?.codex?.subagents);
     }
     return true;
   }
 
+  applyCodexSubagentUpdate(raw) {
+    const update = normalizeCodexSubagentUpdate(raw, this.sessionId);
+    if (!update) return false;
+    const agentsById = update.kind === 'delta' && this.codexSubagents?.rootThreadId === update.rootThreadId
+      ? new Map(this.codexSubagents.agents.map(agent => [agent.threadId, agent]))
+      : new Map();
+    for (const agent of update.agents) agentsById.set(agent.threadId, agent);
+    this.codexSubagents = {
+      version: 1,
+      rootThreadId: update.rootThreadId,
+      revision: update.revision,
+      agents: [...agentsById.values()].slice(0, MAX_CODEX_SUBAGENTS),
+    };
+    // Session metadata changes are visible transcript state even when no
+    // message/tool entry changed. Advance the reducer revision so the existing
+    // revision-driven transcript read reconciles this snapshot without polling.
+    this.revision += 1;
+    return true;
+  }
+
   applyMessageChunk(update, kind) {
     const role = kind === 'user_message_chunk' ? 'user' : 'assistant';
     const type = kind === 'agent_thought_chunk' ? 'thought' : 'message';
@@ -523,6 +510,7 @@ class AcpSessionState {
       revision: this.revision,
       delta,
       hasMoreBefore: startIndex > 0,
+      codexSubagents: clone(this.codexSubagents),
     };
   }
 
@@ -564,7 +552,7 @@ class AcpSessionState {
       if (
         entry.type === 'message'
         && entry.role === 'user'
-        && ((entry.content || []).some(content => content?.type === 'image') || codexHistoryImageTargets(contentText(entry.content)).length > 0)
+        && (entry.content || []).some(content => content?.type === 'image')
       ) {
         renderedAttachmentKinds.push('image');
       }
@@ -608,6 +596,7 @@ class AcpSessionState {
       availableCommands: clone(this.availableCommands),
       currentModeId: this.currentModeId,
       configOptions: clone(this.configOptions),
+      codexSubagents: clone(this.codexSubagents),
       ...clone(extra),
     };
     if (options.includeUpdates === true) snapshot.updates = clone(this.updates);
@@ -632,6 +621,7 @@ class AcpSessionState {
       configOptions: clone(this.configOptions),
       title: this.title,
       updatedAt: this.updatedAt,
+      codexSubagents: clone(this.codexSubagents),
       truncated: this.truncated,
     };
   }

package/backend/acp-transcript.js

@@ -1,12 +1,31 @@
+const crypto = require('crypto');
 const { createTwoFilesPatch, diffLines } = require('diff');
 
 const MAX_RENDERED_DIFF_CHARS = 64 * 1024;
 const MAX_INLINE_TOOL_DETAIL_CHARS = 4 * 1024;
+const MAX_TRANSCRIPT_INLINE_TOOL_DETAIL_CHARS = 64 * 1024;
+const MAX_TRANSCRIPT_MEDIA_BYTES = 25 * 1024 * 1024;
+const MAX_TRANSCRIPT_MEDIA_BASE64_CHARS = Math.ceil(MAX_TRANSCRIPT_MEDIA_BYTES / 3) * 4;
 const MAX_EMBEDDED_RESOURCE_TEXT_CHARS = 4 * 1024;
 const MAX_COLLABORATION_AGENTS = 16;
 const MAX_COLLABORATION_ID_CHARS = 160;
 const MAX_COLLABORATION_PATH_CHARS = 512;
 const MAX_COLLABORATION_MESSAGE_CHARS = 160;
+const TRANSCRIPT_MEDIA_MIME_TYPES = new Set([
+  'audio/aac',
+  'audio/flac',
+  'audio/mp4',
+  'audio/mpeg',
+  'audio/ogg',
+  'audio/wav',
+  'audio/wave',
+  'audio/webm',
+  'audio/x-wav',
+  'image/gif',
+  'image/jpeg',
+  'image/png',
+  'image/webp',
+]);
 
 function diffBlocks(content) {
   return (Array.isArray(content) ? content : [])
@@ -184,7 +203,92 @@ function transcriptResource(resourceValue) {
   };
 }
 
-function transcriptMediaBlocks(entry) {
+function transcriptMediaValue(block) {
+  if (!block || typeof block !== 'object') return null;
+  if (['image', 'audio'].includes(block.type)) return block;
+  if (
+    block.type === 'content'
+    && block.content
+    && typeof block.content === 'object'
+    && ['image', 'audio'].includes(block.content.type)
+  ) {
+    return block.content;
+  }
+  return null;
+}
+
+function validatedTranscriptMedia(block) {
+  const type = String(block?.type || '');
+  const data = typeof block?.data === 'string' ? block.data : '';
+  const mimeType = String(block?.mimeType || '').trim().toLowerCase();
+  if (
+    !['image', 'audio'].includes(type)
+    || !data
+    || data.length > MAX_TRANSCRIPT_MEDIA_BASE64_CHARS
+    || data.length % 4 !== 0
+    || !TRANSCRIPT_MEDIA_MIME_TYPES.has(mimeType)
+    || !/^[a-z0-9+/]*={0,2}$/i.test(data)
+  ) return null;
+  const paddingChars = data.endsWith('==') ? 2 : (data.endsWith('=') ? 1 : 0);
+  const decodedBytes = (data.length / 4) * 3 - paddingChars;
+  if (decodedBytes <= 0 || decodedBytes > MAX_TRANSCRIPT_MEDIA_BYTES) return null;
+  return { data, decodedBytes, mimeType, type };
+}
+
+function transcriptMediaId(block) {
+  const media = validatedTranscriptMedia(block);
+  if (!media) return '';
+  return crypto.createHash('sha256')
+    .update(media.type)
+    .update('\0')
+    .update(media.mimeType)
+    .update('\0')
+    .update(media.data)
+    .digest('hex');
+}
+
+function decodeAcpTranscriptMedia(block) {
+  const media = validatedTranscriptMedia(block);
+  if (!media) return null;
+  const content = Buffer.from(media.data, 'base64');
+  if (content.length !== media.decodedBytes) return null;
+  return {
+    content,
+    mimeType: media.mimeType,
+  };
+}
+
+function compactTranscriptMedia(block, entry, options = {}) {
+  const mediaPathPrefix = String(options.mediaPathPrefix || '').replace(/\/+$/, '');
+  if (!mediaPathPrefix) return JSON.parse(JSON.stringify(block));
+  const hasInlineData = typeof block?.data === 'string' && block.data.length > 0;
+  if (!hasInlineData) return JSON.parse(JSON.stringify(block));
+  const mediaId = transcriptMediaId(block);
+  const projected = { ...block };
+  delete projected.data;
+  if (!mediaId) return projected;
+  projected.url = `${mediaPathPrefix}/${encodeURIComponent(String(entry?.id || ''))}/${mediaId}`;
+  return projected;
+}
+
+function acpTranscriptMedia(entry, requestedMediaId) {
+  const mediaId = String(requestedMediaId || '').trim().toLowerCase();
+  if (!/^[a-f0-9]{64}$/.test(mediaId)) return null;
+  const direct = Array.isArray(entry?.content) ? entry.content : [];
+  const output = entry?.rawOutput && typeof entry.rawOutput === 'object' ? entry.rawOutput : {};
+  const result = output?.result && typeof output.result === 'object' ? output.result : {};
+  const raw = Array.isArray(result.content)
+    ? result.content
+    : (Array.isArray(output.content) ? output.content : []);
+  for (const block of [...direct, ...raw]) {
+    const media = transcriptMediaValue(block);
+    if (!media) continue;
+    if (transcriptMediaId(media) === mediaId) return media;
+  }
+  return null;
+}
+
+function transcriptMediaBlocks(entry, options = {}) {
   const direct = Array.isArray(entry?.content) ? entry.content : [];
   const output = entry?.rawOutput && typeof entry.rawOutput === 'object' ? entry.rawOutput : {};
   const result = output?.result && typeof output.result === 'object' ? output.result : {};
@@ -194,7 +298,10 @@ function transcriptMediaBlocks(entry) {
   const blocks = [...direct, ...raw].flatMap(block => {
     if (!block || typeof block !== 'object') return [];
     if (block.type === 'terminal') return [{ type: 'terminal', terminalId: String(block.terminalId || '') }];
-    if (['image', 'audio', 'resource_link'].includes(block.type)) return [JSON.parse(JSON.stringify(block))];
+    if (['image', 'audio'].includes(block.type)) {
+      return [compactTranscriptMedia(block, entry, options)];
+    }
+    if (block.type === 'resource_link') return [JSON.parse(JSON.stringify(block))];
     if (block.type === 'resource') {
       return [{
         type: 'resource',
@@ -203,7 +310,11 @@ function transcriptMediaBlocks(entry) {
     }
     if (block.type !== 'content' || !block.content || typeof block.content !== 'object') return [];
     const content = block.content;
-    if (['image', 'audio', 'resource_link'].includes(content.type)) {
+    if (['image', 'audio'].includes(content.type)) {
+      const projected = compactTranscriptMedia(content, entry, options);
+      return [{ type: 'content', content: projected }];
+    }
+    if (content.type === 'resource_link') {
       return [{ type: 'content', content: JSON.parse(JSON.stringify(content)) }];
     }
     if (content.type === 'resource') {
@@ -226,6 +337,20 @@ function transcriptMediaBlocks(entry) {
   });
 }
 
+function transcriptEntryWithCompactMedia(entry, options = {}) {
+  const mediaPathPrefix = String(options.mediaPathPrefix || '').trim();
+  if (!mediaPathPrefix || !Array.isArray(entry?.content)) return entry;
+  const content = entry.content.map(block => {
+    const media = transcriptMediaValue(block);
+    if (!media) return block;
+    const projected = compactTranscriptMedia(media, entry, options);
+    return block?.type === 'content'
+      ? { ...block, content: projected }
+      : projected;
+  });
+  return { ...entry, content };
+}
+
 function generatedMediaTool(entry) {
   const title = String(entry?.title || '').trim().toLowerCase();
   const id = String(entry?.id || '').trim().toLowerCase();
@@ -296,9 +421,13 @@ function transcriptCodexToolMeta(entry) {
   return Object.keys(compact).length > 0 ? compact : null;
 }
 
-function acpTranscriptToolEntry(entry) {
+function acpTranscriptToolEntry(entry, options = {}) {
   if (!entry || entry.type !== 'tool') return entry;
   const detail = detailForTool(entry);
+  const requestedInlineDetailChars = Number(options.maxInlineDetailChars);
+  const inlineDetailChars = Number.isFinite(requestedInlineDetailChars)
+    ? Math.max(0, Math.min(MAX_INLINE_TOOL_DETAIL_CHARS, Math.floor(requestedInlineDetailChars)))
+    : MAX_INLINE_TOOL_DETAIL_CHARS;
   const changes = patchChanges(entry.content).map(change => ({
     path: change.path,
     kind: change.kind,
@@ -313,7 +442,11 @@ function acpTranscriptToolEntry(entry) {
     .join('\n');
   const meta = {};
   if (entry?._meta?.subagent_session_info) {
-    meta.subagent_session_info = JSON.parse(JSON.stringify(entry._meta.subagent_session_info));
+    const sessionId = boundedCollaborationString(
+      entry._meta.subagent_session_info.session_id,
+      MAX_COLLABORATION_ID_CHARS
+    );
+    if (sessionId) meta.subagent_session_info = { session_id: sessionId };
   }
   if (entry?._meta?.farming_patch_decisions) {
     meta.farming_patch_decisions = JSON.parse(JSON.stringify(entry._meta.farming_patch_decisions));
@@ -326,12 +459,12 @@ function acpTranscriptToolEntry(entry) {
     title: String(entry.title || ''),
     kind: String(entry.kind || 'other'),
     status: String(entry.status || ''),
-    content: transcriptMediaBlocks(entry),
+    content: transcriptMediaBlocks(entry, options),
     ...(Object.keys(meta).length > 0 ? { _meta: meta } : {}),
-    transcriptDetail: detail.length <= MAX_INLINE_TOOL_DETAIL_CHARS
+    transcriptDetail: detail.length <= inlineDetailChars
       ? detail
-      : `${detail.slice(0, MAX_INLINE_TOOL_DETAIL_CHARS)}\n\n[Open to load full detail]`,
-    transcriptDetailTruncated: detail.length > MAX_INLINE_TOOL_DETAIL_CHARS,
+      : `${detail.slice(0, inlineDetailChars)}${inlineDetailChars > 0 ? '\n\n' : ''}[Open to load full detail]`,
+    transcriptDetailTruncated: detail.length > inlineDetailChars,
     transcriptPatchSummary: patchSummary,
     transcriptChanges: changes,
     generatedMedia: generatedMediaTool(entry),
@@ -339,9 +472,41 @@ function acpTranscriptToolEntry(entry) {
   };
 }
 
+function acpTranscriptEntries(entries, options = {}) {
+  const requestedBudget = Number(options.maxInlineToolDetailChars);
+  let remainingInlineDetailChars = Number.isFinite(requestedBudget)
+    ? Math.max(0, Math.floor(requestedBudget))
+    : MAX_TRANSCRIPT_INLINE_TOOL_DETAIL_CHARS;
+  const source = Array.isArray(entries) ? entries : [];
+  const projected = new Array(source.length);
+
+  // The transcript page owns only a bounded summary. Exact tool and subagent
+  // detail remains backend-owned and is loaded on explicit expansion.
+  for (let index = source.length - 1; index >= 0; index -= 1) {
+    const entry = source[index];
+    if (entry?.type !== 'tool') {
+      projected[index] = transcriptEntryWithCompactMedia(entry, options);
+      continue;
+    }
+    const projectedEntry = acpTranscriptToolEntry(entry, {
+      maxInlineDetailChars: remainingInlineDetailChars,
+      mediaPathPrefix: options.mediaPathPrefix,
+    });
+    remainingInlineDetailChars = Math.max(
+      0,
+      remainingInlineDetailChars - String(projectedEntry.transcriptDetail || '').length
+    );
+    projected[index] = projectedEntry;
+  }
+  return projected;
+}
+
 module.exports = {
+  acpTranscriptEntries,
+  acpTranscriptMedia,
   acpToolChanges: entry => patchChanges(entry?.content, { includeDiff: true }),
   acpToolDetail: detailForTool,
   acpToolReviewChanges: entry => patchReviewChanges(entry?.content),
   acpTranscriptToolEntry,
+  decodeAcpTranscriptMedia,
 };

package/backend/agent-manager.js

@@ -50,7 +50,13 @@ const {
   stopPersistedAcpProcessGroup,
 } = require('./acp-runtime');
 const { chatRuntimeForProvider, isChatMode } = require('./chat-runtime');
-const { acpToolChanges, acpToolDetail, acpToolReviewChanges, acpTranscriptToolEntry } = require('./acp-transcript');
+const {
+  acpTranscriptEntries,
+  acpTranscriptMedia,
+  acpToolChanges,
+  acpToolDetail,
+  acpToolReviewChanges,
+} = require('./acp-transcript');
 const {
   applyCodexTerminalProfile,
   codexTerminalProfileFromOutput,
@@ -5085,10 +5091,21 @@ class AgentManager extends EventEmitter {
     const transcript = this.acpRuntime.getTranscriptSession(agentId, options);
     return {
       ...transcript,
-      entries: transcript.entries.map(entry => entry?.type === 'tool' ? acpTranscriptToolEntry(entry) : entry),
+      entries: acpTranscriptEntries(transcript.entries, {
+        mediaPathPrefix: options.mediaPathPrefix,
+      }),
     };
   }
 
+  getAcpTranscriptMedia(agentId, entryId, mediaId) {
+    this.requireLiveAcpAgent(agentId);
+    const entry = this.acpRuntime.getTranscriptEntry(agentId, entryId);
+    if (!entry) throw new Error('ACP transcript entry not found');
+    const media = acpTranscriptMedia(entry, mediaId);
+    if (!media) throw new Error('ACP transcript media not found');
+    return media;
+  }
+
   getAcpToolDetail(agentId, toolCallId) {
     this.requireLiveAcpAgent(agentId);
     const entry = this.acpRuntime.getToolEntry(agentId, toolCallId);
@@ -5661,6 +5678,14 @@ class AgentManager extends EventEmitter {
     if (admission) {
       transitionLifecycleOperation(staged, admission.operation.id, 'succeeded');
     }
+    if (!admission && !structuralUpdateChanged && !readUpdateChanged) {
+      return {
+        agentId,
+        ...updates,
+        changed: false,
+        requiresState: false,
+      };
+    }
     try {
       this.ensurePersistentAgentSession(staged);
     } catch (error) {