@gemus/mcp-proxy 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gemus/mcp-proxy",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Local stdio<->HTTP MCP proxy for Codex desktop: transparent passthrough + execute tap + imagegen backfill (Issue #1751, P1).",
   "type": "module",
   "bin": {
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@gemus/codex-backfill-core": "0.1.2"
+    "@gemus/codex-backfill-core": "0.1.3"
   },
   "engines": {
     "node": ">=18"

package/src/__tests__/backfill.test.ts

@@ -74,7 +74,7 @@ beforeEach(() => {
   mocks.readRollout.mockReset().mockReturnValue('')
   mocks.findRolloutFile.mockReset().mockReturnValue('/fake/rollout.jsonl')
   // Default: generated_images unavailable → backfill falls back to the rollout source (existing tests).
-  mocks.readGeneratedImageFiles.mockReset().mockReturnValue({ available: false, images: [] })
+  mocks.readGeneratedImageFiles.mockReset().mockReturnValue({ available: false, images: [], failedCallIds: [] })
 })
 
 describe('normalizeToolName (tap → tracker)', () => {
@@ -353,4 +353,42 @@ describe('backfillTurn — Layer 2 file byte source (#1756)', () => {
     expect(mocks.readRollout).toHaveBeenCalledWith('/x')
     expect(r.delivered).toBe(1)
   })
+
+  it('exec-* file-source image (opaque call-id) is delivered exactly once (#1968)', async () => {
+    const bf = makeBackfiller()
+    observeExecuteAnchor(bf, 1, 't1', 's1', 'wf_real', 'nodeA')
+    mocks.readGeneratedImageFiles.mockReturnValue({
+      available: true,
+      images: [{ callId: 'exec-3eb2a29c', base64: 'iVBORw0KGgoAAAA1', mimeType: 'image/png' }],
+      failedCallIds: [],
+    })
+
+    const r = await bf.backfillTurn({ turnKey: 't1', sessionId: 's1', rolloutPath: '/x', salvageOnly: false })
+
+    expect(mocks.readRollout).not.toHaveBeenCalled()
+    expect(r.delivered).toBe(1)
+    expect(mocks.deliverImageToNode).toHaveBeenCalledTimes(1)
+    expect(mocks.deliverImageToNode.mock.calls[0][0]).toMatchObject({
+      nodeId: 'nodeA',
+      image: { callId: 'exec-3eb2a29c' },
+    })
+  })
+
+  it('unreadable fresh candidate is recovered from rollout by EXACT call-id only — no history bypass (#1968)', async () => {
+    const bf = makeBackfiller()
+    observeExecuteAnchor(bf, 1, 't1', 's1', 'wf_real', 'nodeA')
+    // File source: nothing readable, but one fresh candidate failed to read (torn write).
+    mocks.readGeneratedImageFiles.mockReturnValue({ available: true, images: [], failedCallIds: ['exec-torn'] })
+    // Rollout holds the failed id AND an unrelated historical image that must NOT be surfaced.
+    mocks.readRollout.mockReturnValue(rollout([['exec-torn', 'iVBORw0KGgoAAAA9'], ['ig_history', 'iVBORw0KGgoAAAA8']]))
+
+    const r = await bf.backfillTurn({ turnKey: 't1', sessionId: 's1', rolloutPath: '/x', salvageOnly: false })
+
+    expect(mocks.readRollout).toHaveBeenCalledWith('/x')
+    expect(r.delivered).toBe(1)
+    expect(mocks.deliverImageToNode).toHaveBeenCalledTimes(1)
+    expect(mocks.deliverImageToNode.mock.calls[0][0]).toMatchObject({ image: { callId: 'exec-torn' } })
+    // The historical image was in the rollout but is NOT in failedCallIds → never delivered or orphaned.
+    expect(mocks.addImageToCanvas).not.toHaveBeenCalled()
+  })
 })

package/src/backfill.mjs

@@ -137,17 +137,33 @@ export function createBackfiller({ server, apiKey, codexHome, call, log = () =>
   async function backfillTurnInner({ turnKey, sessionId, rolloutPath, salvageOnly }) {
     const t = turns.get(turnKey)
     const sid = sessionId || t?.sessionId
-    // #1756 Layer 2: 优先读 generated_images 落盘文件（去 rollout-scrape 脆化）。三态 fallback——
-    // 仅目录整体不可用（旧 codex 不落盘）才回退 rollout；目录可用即锁定文件源（即便过滤后空），
-    // 否则会绕过 mtime 守卫把历史图从 rollout 重新捞出重复交付。
+    // #1756 Layer 2: 优先读 generated_images 落盘文件（去 rollout-scrape 脆化）。仅目录整体不可用
+    // （旧 codex 不落盘）才整源回退 rollout；目录可用即锁定文件源，否则会绕过 mtime 守卫把历史图从
+    // rollout 重新捞出重复交付。#1968：文件源里「已确认 fresh 但读失败」的候选（torn/locked write）
+    // 按精确 call-id 定向从 rollout 恢复——只捞这几个 id，不换整源、不越 mtime 守卫。
     const fileResult = sid
       ? core.readGeneratedImageFiles(codexHome, sid, procStartMs)
-      : { available: false, images: [] }
+      : { available: false, images: [], failedCallIds: [] }
     let all
     let source
     if (fileResult.available) {
       all = fileResult.images
       source = 'generated_images'
+      const failedCallIds = fileResult.failedCallIds || []
+      if (failedCallIds.length) {
+        const path = rolloutPath || core.findRolloutFile(codexHome, sid)
+        const want = new Set(failedCallIds)
+        const recovered = core.extractImageOutputs(core.readRollout(path)).filter((img) => want.has(img.callId))
+        if (recovered.length) {
+          all = all.concat(recovered)
+          source = `${source}+rollout`
+        }
+        log('backfill: unreadable generated_images candidates', {
+          turnKey,
+          failed: failedCallIds.length,
+          recovered: recovered.length,
+        })
+      }
     } else {
       const path = rolloutPath || core.findRolloutFile(codexHome, sid)
       all = core.extractImageOutputs(core.readRollout(path))