very-happy-cli 0.2.161 → 0.2.163

package/dist/{codexThreadFork-BZqF-9bX.cjs → claudeSessionFork-DdJFvxwf.cjs}

@@ -5,7 +5,7 @@ var promises = require('node:fs/promises');
 var node_fs = require('node:fs');
 var path = require('node:path');
 var node_readline = require('node:readline');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-Ca5eRZ2j.cjs');
 
 class ForkTruncateUuidNotFoundError extends Error {
   constructor(cutAfterUuid, sourcePath) {
@@ -205,146 +205,10 @@ async function forkBeforeUserMessage(projectDir, sourceClaudeSessionId, cutBefor
   return newId;
 }
 
-class CodexForkRewindPointNotFoundError extends Error {
-  constructor(itemId, threadId) {
-    super(`Codex rewind point ${itemId} not found in thread ${threadId}`);
-    this.itemId = itemId;
-    this.threadId = threadId;
-    this.name = "CodexForkRewindPointNotFoundError";
-  }
-}
-function hasUserAttachments(item) {
-  const content = item.content;
-  return Array.isArray(content) && content.some((part) => !part || typeof part !== "object" || part.type !== "text" || typeof part.text === "string" && part.text.includes("<attached_files>"));
-}
-function rejectAttachedTarget(thread, itemId) {
-  const item = thread.turns?.flatMap((turn) => turn.items ?? []).find((item2) => item2.id === itemId);
-  if (item && hasUserAttachments(item)) throw new Error("Cannot edit and rerun a message with attachments");
-}
-function textFromUserItem(item) {
-  if (item.type !== "userMessage") {
-    return null;
-  }
-  const content = item.content;
-  if (!Array.isArray(content)) {
-    return null;
-  }
-  const textParts = content.filter((part) => Boolean(part) && typeof part === "object" && part.type === "text" && typeof part.text === "string").map((part) => part.text).join("\n").trim();
-  return textParts.length > 0 ? textParts : null;
-}
-function timestampFromTurn(turn) {
-  const seconds = turn.startedAt ?? turn.completedAt;
-  return typeof seconds === "number" && Number.isFinite(seconds) ? seconds * 1e3 : Date.now();
-}
-function listCodexRewindPoints(thread) {
-  const points = [];
-  for (const turn of thread.turns ?? []) {
-    for (const item of turn.items ?? []) {
-      const text = textFromUserItem(item);
-      if (!text) {
-        continue;
-      }
-      points.push({
-        itemId: item.id,
-        text,
-        ...hasUserAttachments(item) ? { hasAttachments: true } : {},
-        timestamp: timestampFromTurn(turn)
-      });
-    }
-  }
-  return points;
-}
-function findCutTurn(thread, itemId) {
-  const turns = thread.turns ?? [];
-  for (let index = 0; index < turns.length; index++) {
-    const turn = turns[index];
-    const item = (turn.items ?? []).find((candidate) => candidate.id === itemId);
-    if (!item) {
-      continue;
-    }
-    const text = textFromUserItem(item);
-    if (text) {
-      return { index, text };
-    }
-  }
-  return null;
-}
-async function forkCodexThread(client, opts) {
-  const forked = await client.forkThread({
-    threadId: opts.threadId,
-    ...opts.cwd ? { cwd: opts.cwd } : {},
-    ...opts.model ? { model: opts.model } : {},
-    ...opts.approvalPolicy ? { approvalPolicy: opts.approvalPolicy } : {},
-    ...opts.sandbox ? { sandbox: opts.sandbox } : {},
-    ...opts.mcpServers ? { mcpServers: opts.mcpServers } : {}
-  });
-  if (opts.cutAfterItemId) {
-    const cutTurn = findCutTurn(forked.thread, opts.cutAfterItemId);
-    if (!cutTurn) {
-      throw new CodexForkRewindPointNotFoundError(opts.cutAfterItemId, opts.threadId);
-    }
-    const turns = forked.thread.turns ?? [];
-    const turnsToDrop = turns.length - cutTurn.index;
-    if (turnsToDrop > 0) {
-      await client.rollbackThread({
-        threadId: forked.threadId,
-        numTurns: turnsToDrop
-      });
-    }
-    await client.injectItems({
-      threadId: forked.threadId,
-      items: [{
-        type: "message",
-        role: "user",
-        content: [{ type: "input_text", text: cutTurn.text }]
-      }]
-    });
-  }
-  return {
-    type: "success",
-    newCodexThreadId: forked.threadId
-  };
-}
-async function forkCodexBeforeUserMessage(client, opts) {
-  const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
-  rejectAttachedTarget(source, opts.cutBeforeItemId);
-  const sourceCut = findCutTurn(source, opts.cutBeforeItemId);
-  if (!sourceCut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
-  if ((source.turns?.[sourceCut.index].items ?? []).findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
-    throw new Error("Cannot safely rewind a user message inside an existing turn");
-  }
-  if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd });
-  if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
-  rejectAttachedTarget(forked.thread, opts.cutBeforeItemId);
-  const cut = findCutTurn(forked.thread, opts.cutBeforeItemId);
-  if (!cut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
-  const turns = forked.thread.turns ?? [];
-  const items = turns[cut.index].items ?? [];
-  if (items.findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
-    throw new Error("Cannot safely rewind a user message inside an existing turn");
-  }
-  if (cut.index === 0) return { type: "success", startFresh: true };
-  const expectedTurnIds = turns.slice(0, cut.index).map((turn) => turn.id);
-  const { thread } = await client.rollbackThread({
-    threadId: forked.threadId,
-    numTurns: turns.length - cut.index
-  });
-  const remaining = thread.turns ?? [];
-  if (remaining.length !== cut.index || remaining.some((turn, index) => turn.id !== expectedTurnIds[index])) {
-    throw new Error("Codex rollback did not preserve the expected history");
-  }
-  return { type: "success", newCodexThreadId: forked.threadId };
-}
-
-exports.CodexForkRewindPointNotFoundError = CodexForkRewindPointNotFoundError;
 exports.ForkSourceMissingError = ForkSourceMissingError;
 exports.ForkTruncateUuidNotFoundError = ForkTruncateUuidNotFoundError;
 exports.discardForkedSession = discardForkedSession;
 exports.forkAndTruncateSession = forkAndTruncateSession;
 exports.forkBeforeUserMessage = forkBeforeUserMessage;
-exports.forkCodexBeforeUserMessage = forkCodexBeforeUserMessage;
-exports.forkCodexThread = forkCodexThread;
 exports.forkSession = forkSession;
 exports.listClaudeRewindPoints = listClaudeRewindPoints;
-exports.listCodexRewindPoints = listCodexRewindPoints;

package/dist/{client-Brn-UwVk.mjs → client-BbNFS1WW.mjs}

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
-import { readSettings, readPersistedSessions, readCredentialsForConfiguredRelay } from './persistence-oET5n61f.mjs';
-import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-C9GHPLEm.mjs';
+import { c as configuration } from './configuration-B0c-OP_h.mjs';
+import { readSettings, readPersistedSessions, readCredentialsForConfiguredRelay } from './persistence-DgBhXxu7.mjs';
+import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-mMg17HJv.mjs';
 
 async function teamRequest(path, method, token, scoped, body) {
   const response = await fetch(`${configuration.serverUrl}${path}`, {

package/dist/{client-DOBWJL3u.cjs → client-CQzHoynf.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var configuration = require('./configuration-v9f8LM9T.cjs');
-var persistence = require('./persistence-CBNMzSa8.cjs');
+var configuration = require('./configuration-CepfrPZ_.cjs');
+var persistence = require('./persistence-Ceb-BPk6.cjs');
 
 class AutomationsRequestError extends Error {
   constructor(status, code, runStatus) {

package/dist/{client-C_axwRry.cjs → client-CXvsRLAz.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var configuration = require('./configuration-v9f8LM9T.cjs');
-var persistence = require('./persistence-CBNMzSa8.cjs');
-var context = require('./context-B45vMtSZ.cjs');
+var configuration = require('./configuration-CepfrPZ_.cjs');
+var persistence = require('./persistence-Ceb-BPk6.cjs');
+var context = require('./context-BhZMRQho.cjs');
 
 async function teamRequest(path, method, token, scoped, body) {
   const response = await fetch(`${configuration.configuration.serverUrl}${path}`, {

package/dist/{client-CXb1VJui.mjs → client-CyUhxs-0.mjs}

@@ -1,5 +1,5 @@
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
-import { readCredentialsForConfiguredRelay, readSettings } from './persistence-oET5n61f.mjs';
+import { c as configuration } from './configuration-B0c-OP_h.mjs';
+import { readCredentialsForConfiguredRelay, readSettings } from './persistence-DgBhXxu7.mjs';
 
 class AutomationsRequestError extends Error {
   constructor(status, code, runStatus) {

package/dist/codex/happyMcpStdioBridge.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var tools = require('../tools-lMDra4Pv.cjs');
-var tools$1 = require('../tools-CsSovyNp.cjs');
-var peerTools = require('../peerTools-CIeiy9wn.cjs');
+var tools = require('../tools-xQ38ufgo.cjs');
+var tools$1 = require('../tools-GnqHEZHb.cjs');
+var peerTools = require('../peerTools-CADjnFDx.cjs');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
@@ -10,32 +10,32 @@ var streamableHttp_js = require('@modelcontextprotocol/sdk/client/streamableHttp
 var z = require('zod');
 var limits = require('../limits-C-a7gr04.cjs');
 var agentGuidance = require('../agentGuidance-B5NATuFa.cjs');
-require('../client-C_axwRry.cjs');
+require('../client-CXvsRLAz.cjs');
 require('node:crypto');
-require('../configuration-v9f8LM9T.cjs');
+require('../configuration-CepfrPZ_.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('../package-Cl5BEP5x.cjs');
+require('../package-BfnmIH4b.cjs');
 require('node:fs/promises');
-require('../persistence-CBNMzSa8.cjs');
+require('../persistence-Ceb-BPk6.cjs');
 require('../authRelay-BdYkC1Po.cjs');
 require('tweetnacl');
-require('../logger-Bc8-u1w0.cjs');
+require('../logger-Ca5eRZ2j.cjs');
 require('chalk');
 require('node:util');
-require('../context-B45vMtSZ.cjs');
-require('../index-DA7yINuk.cjs');
+require('../context-BhZMRQho.cjs');
+require('../index-DJ-oV52i.cjs');
 require('@paralleldrive/cuid2');
-require('../client-DOBWJL3u.cjs');
+require('../client-CQzHoynf.cjs');
 require('../ids-B6ZC0HGt.cjs');
-require('../controlClient-fEHE85bH.cjs');
-require('../sessionOps-DJdExmBy.cjs');
+require('../controlClient-HPMsyxLb.cjs');
+require('../sessionOps-DWsGWwfZ.cjs');
 require('axios');
-require('../time-CNRE4ChD.cjs');
+require('../time-xNkWLTSj.cjs');
 require('socket.io-client');
 require('../backgroundTaskActivity-CBvUdj39.cjs');
-require('../remoteSessionClient-BNx78NLb.cjs');
+require('../remoteSessionClient-DbnVs1Tv.cjs');
 require('../trimIdent-4gvk9Wk6.cjs');
 
 function parseArgs(argv) {

package/dist/codex/happyMcpStdioBridge.mjs

@@ -1,6 +1,6 @@
-import { r as registerTeamsTools } from '../tools-BmQQUATY.mjs';
-import { r as registerAutomationTools } from '../tools-BZabNIid.mjs';
-import { r as registerSessionPeerTools } from '../peerTools-Dz3_7Bkk.mjs';
+import { r as registerTeamsTools } from '../tools-sPgOmLr_.mjs';
+import { r as registerAutomationTools } from '../tools-BSzD246o.mjs';
+import { r as registerSessionPeerTools } from '../peerTools-C1cELmtZ.mjs';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
@@ -8,32 +8,32 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { z } from 'zod';
 import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION } from '../limits-DIo7rEBR.mjs';
 import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION } from '../agentGuidance-CQuNlNx8.mjs';
-import '../client-Brn-UwVk.mjs';
+import '../client-BbNFS1WW.mjs';
 import 'node:crypto';
-import '../configuration-DoWFJUPm.mjs';
+import '../configuration-B0c-OP_h.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import '../package-uOg9SCKi.mjs';
+import '../package-D-W_r_pd.mjs';
 import 'node:fs/promises';
-import '../persistence-oET5n61f.mjs';
+import '../persistence-DgBhXxu7.mjs';
 import '../authRelay-DSAvg1uv.mjs';
 import 'tweetnacl';
-import '../logger-fXoNzNuB.mjs';
+import '../logger-BIzr7JN0.mjs';
 import 'chalk';
 import 'node:util';
-import '../context-C9GHPLEm.mjs';
-import '../index-qdS1friN.mjs';
+import '../context-mMg17HJv.mjs';
+import '../index-BBg9j0XK.mjs';
 import '@paralleldrive/cuid2';
-import '../client-CXb1VJui.mjs';
+import '../client-CyUhxs-0.mjs';
 import '../ids-DU6sLx4C.mjs';
-import '../controlClient-DjoKTtgK.mjs';
-import '../sessionOps-C_f1wKOr.mjs';
+import '../controlClient-BKmjlbGs.mjs';
+import '../sessionOps-DJSwzwP-.mjs';
 import 'axios';
-import '../time-BZNdNiIV.mjs';
+import '../time-TxDyvAKk.mjs';
 import 'socket.io-client';
 import '../backgroundTaskActivity-8PdPxrvy.mjs';
-import '../remoteSessionClient-CO7qOjR0.mjs';
+import '../remoteSessionClient-N7JsQ0XS.mjs';
 import '../trimIdent-BAjmv_TG.mjs';
 
 function parseArgs(argv) {

package/dist/{codexAppServerClient-ZzhUTWPo.cjs → codexAppServerClient-5jNbTlE5.cjs}

@@ -3,10 +3,10 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-Ca5eRZ2j.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-Cly8xVIR.cjs');
-var _package = require('./package-Cl5BEP5x.cjs');
+var _package = require('./package-BfnmIH4b.cjs');
 
 function isAppServerAvailable() {
   try {

package/dist/{codexAppServerClient-oeQKD6Qf.mjs → codexAppServerClient-Dto99RVH.mjs}

@@ -1,10 +1,10 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-fXoNzNuB.mjs';
+import { l as logger } from './logger-BIzr7JN0.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BQ4flvQZ.mjs';
-import { p as packageJson } from './package-uOg9SCKi.mjs';
+import { p as packageJson } from './package-D-W_r_pd.mjs';
 
 function isAppServerAvailable() {
   try {

package/dist/{codexCommand-CJ82bl3l.mjs → codexCommand-BHfrAyds.mjs}

@@ -1,58 +1,59 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-CYHjQ8oQ.mjs';
-import { e as createEnvelope, l as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-qdS1friN.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-CRm8yNv6.mjs';
+import { e as createEnvelope, l as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-BBg9j0XK.mjs';
+import { p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-DYIjlN1Z.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
 import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CSGxr71v.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CCE0Y3gR.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-Cw6FmbMv.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-Dab6_dCd.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { c as connectionState, A as ApiClient } from './api-SffjRQ1b.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-oeQKD6Qf.mjs';
-import { l as logger } from './logger-fXoNzNuB.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-BvvhBTja.mjs';
-import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-DyhO1uoU.mjs';
+import { c as connectionState, A as ApiClient } from './api-D5kfP3JF.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-Dto99RVH.mjs';
+import { l as logger } from './logger-BIzr7JN0.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-Ng5h8JpY.mjs';
+import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-CM-ijU4F.mjs';
 import { execSync } from 'node:child_process';
-import { readSettings } from './persistence-oET5n61f.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-BHjehxJY.mjs';
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Cbc8Rgtd.mjs';
+import { readSettings } from './persistence-DgBhXxu7.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-DakW9c61.mjs';
+import { c as configuration } from './configuration-B0c-OP_h.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-BS5afGeA.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-mIeehclp.mjs';
-import { h as hashObject, s as startHappyServer } from './deterministicJson-p835AdAU.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-KOL67aSN.mjs';
+import { h as hashObject, s as startHappyServer } from './deterministicJson-CaWami7M.mjs';
 import { M as MessageBuffer } from './messageBuffer-BWlGgR3A.mjs';
-import { n as notifyDaemonSessionStarted, g as reportSessionEditToDaemon } from './controlClient-DjoKTtgK.mjs';
+import { n as notifyDaemonSessionStarted, g as reportSessionEditToDaemon } from './controlClient-BKmjlbGs.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DSAvg1uv.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-CVViqZft.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-rd1PCWiN.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
 import { p as parseSpecialCommand } from './specialCommands-BSqhYg5X.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
 import { a as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-BnxJPVHT.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CO7d1gOC.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CnWMrL5b.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-BZNdNiIV.mjs';
-import './browser-9pyhQr1R.mjs';
+import './time-TxDyvAKk.mjs';
+import './browser-DU9kI-Q-.mjs';
 import 'open';
 import 'zod';
 import 'node:fs/promises';
-import './attachmentLimits-yba1uHFO.mjs';
+import './attachmentLimits-D5pgmASK.mjs';
 import 'node:fs';
 import 'node:events';
 import 'socket.io-client';
 import './limits-DIo7rEBR.mjs';
-import './lidState-C2dI0FAN.mjs';
+import './lidState-X7iQg4y5.mjs';
 import 'os';
 import 'child_process';
-import './registerCommonHandlers-CrgvJsOy.mjs';
+import './registerCommonHandlers-t15dS7xt.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
-import './sync-CxD-w_40.mjs';
+import './sync-DnmsgL3w.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
@@ -60,34 +61,34 @@ import 'node:readline';
 import './manager-BQ4flvQZ.mjs';
 import '@anthropic-ai/sandbox-runtime';
 import 'node:os';
-import './package-uOg9SCKi.mjs';
+import './package-D-W_r_pd.mjs';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-DCsetiyG.mjs';
+import './localHappyAgentAuth-r83bTscW.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './client-Brn-UwVk.mjs';
-import './context-C9GHPLEm.mjs';
-import './sessionOps-C_f1wKOr.mjs';
+import './client-BbNFS1WW.mjs';
+import './context-mMg17HJv.mjs';
+import './sessionOps-DJSwzwP-.mjs';
 import './resources-BdFBQi8r.mjs';
-import './tools-BmQQUATY.mjs';
-import './tools-BZabNIid.mjs';
-import './client-CXb1VJui.mjs';
-import './peerTools-Dz3_7Bkk.mjs';
+import './tools-sPgOmLr_.mjs';
+import './tools-BSzD246o.mjs';
+import './client-CyUhxs-0.mjs';
+import './peerTools-C1cELmtZ.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-CO7qOjR0.mjs';
+import './remoteSessionClient-N7JsQ0XS.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import './assistantTools-CgiTbnWb.mjs';
+import './assistantTools-BvKH9eRc.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-BNQq05jR.mjs';
+import './bootstrap-DSWZAtGy.mjs';
 import './agentGuidance-CQuNlNx8.mjs';
 import './previewPath-CXN4Vag0.mjs';
-import './spawnHappyCLI-cqWQbwsb.mjs';
+import './spawnHappyCLI-wowHF2IL.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1051,10 +1052,10 @@ async function importCodexThread(opts) {
     });
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to import Codex thread ${opts.threadId}: ${reason}`);
+    throw failVisibly(opts.session, `Failed to import Codex thread ${opts.threadId}: ${reason}`);
   }
   if (!forked.threadId || forked.threadId === opts.threadId) {
-    throw new Error(`Failed to import Codex thread ${opts.threadId}: Codex did not create an independent copy`);
+    throw failVisibly(opts.session, `Failed to import Codex thread ${opts.threadId}: Codex did not create an independent copy`);
   }
   opts.session.updateMetadata((currentMetadata) => ({
     ...currentMetadata,
@@ -1072,10 +1073,15 @@ async function importCodexThread(opts) {
   opts.messageBuffer.addMessage(`Imported thread ${trimIdent(opts.threadId)} as ${trimIdent(forked.threadId)}`, "status");
   opts.session.sendSessionEvent({
     type: "message",
-    message: `Imported Codex thread ${opts.threadId} (continuing as ${forked.threadId})`
+    // B-529: an empty fork used to look like "the content never loaded".
+    message: envelopes.length > 0 ? `Imported Codex thread ${opts.threadId} (continuing as ${forked.threadId})` : `Imported Codex thread ${opts.threadId} (continuing as ${forked.threadId}), but Codex returned no history for it`
   });
   return { threadId: forked.threadId, model: forked.model, replayed: envelopes.length };
 }
+function failVisibly(session, message) {
+  session.sendSessionEvent({ type: "message", message });
+  return new Error(message);
+}
 
 function emitReadyIfIdle({ pending, queueSize, shouldExit, sendReady, notify }) {
   if (shouldExit) {
@@ -1271,7 +1277,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [PROMPT_QUEUE_CAPABILITY]
+    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY]
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
@@ -1830,8 +1836,10 @@ async function runCodex(opts) {
           codexThreadId: forkCodexThreadId
         }));
         logger.debug(`[CODEX FORK BACKFILL] Replayed ${envelopes.length} historical envelopes from thread ${forkCodexThreadId}`);
+        void publishForkBackfillWhenCommitted(session, { count: envelopes.length });
       } catch (error) {
         logger.debug(`[CODEX FORK BACKFILL] Failed to read thread ${forkCodexThreadId}`, safeCodexErrorMetadata(error));
+        void publishForkBackfillWhenCommitted(session, { count: 0, failed: true });
       }
     }
     let pending = null;