very-happy-cli 0.2.161 → 0.2.162

package/dist/{AcpBackend-6U6pQgx1.mjs → AcpBackend--TmFHgRH.mjs}

@@ -1,10 +1,10 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-fXoNzNuB.mjs';
-import { d as delay } from './time-BZNdNiIV.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
+import { d as delay } from './time-CVvxdEDh.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
-import { p as packageJson } from './package-uOg9SCKi.mjs';
+import { p as packageJson } from './package-DQsvY1XN.mjs';
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpBackend-Ba98QDif.cjs → AcpBackend-9asD_DL7.cjs}

@@ -3,10 +3,10 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-Bc8-u1w0.cjs');
-var time = require('./time-CNRE4ChD.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
+var time = require('./time-CLwVAz6s.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
-var _package = require('./package-Cl5BEP5x.cjs');
+var _package = require('./package-D1A-8ZJy.cjs');
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpSessionManager-CoMWFVw3.mjs → AcpSessionManager-BSIBnWUb.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, e as createEnvelope } from './index-qdS1friN.mjs';
+import { s as streamKeyOf, e as createEnvelope } from './index-BBg9j0XK.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-BAY1Pggx.cjs → AcpSessionManager-BvIuBzoO.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var index = require('./index-DA7yINuk.cjs');
+var index = require('./index-DJ-oV52i.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{BasePermissionHandler-2R0uH2CI.cjs → BasePermissionHandler-D4B-NNu2.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{BasePermissionHandler-BvvhBTja.mjs → BasePermissionHandler-DUBySe0f.mjs}

@@ -1,4 +1,4 @@
-import { l as logger } from './logger-fXoNzNuB.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{BaseReasoningProcessor-DyhO1uoU.mjs → BaseReasoningProcessor-9TybUGTq.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-fXoNzNuB.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{BaseReasoningProcessor-fsVNmCEF.cjs → BaseReasoningProcessor-CqLl-ikP.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{agentHome-DvNnGphb.cjs → agentHome-BohNUYnE.cjs}

@@ -2,14 +2,14 @@
 
 var chalk = require('chalk');
 var os = require('node:os');
-var persistence = require('./persistence-CBNMzSa8.cjs');
+var persistence = require('./persistence-i0nQMLlk.cjs');
 require('node:fs');
-require('./logger-Bc8-u1w0.cjs');
+require('./logger-7ucWm9wp.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 require('node:fs/promises');
-require('./configuration-v9f8LM9T.cjs');
+require('./configuration-UsI0sxEv.cjs');
 require('node:path');
-require('./package-Cl5BEP5x.cjs');
+require('./package-D1A-8ZJy.cjs');
 require('zod');
 require('./authRelay-BdYkC1Po.cjs');
 require('node:crypto');

package/dist/{agentHome-Ck1i1TQB.mjs → agentHome-DQrq_FG1.mjs}

@@ -1,13 +1,13 @@
 import chalk from 'chalk';
 import { homedir } from 'node:os';
-import { readSettings, updateSettings } from './persistence-oET5n61f.mjs';
+import { readSettings, updateSettings } from './persistence-Cw8aLoyL.mjs';
 import 'node:fs';
-import './logger-fXoNzNuB.mjs';
+import './logger-CGE4C8ho.mjs';
 import { d as describeAgentHome, p as probeLoginShellEnv, r as resolveAgentHomes, e as expandHomePath, A as AGENT_HOME_ENV_NAMES } from './loginShellEnv-Dw8M7tkI.mjs';
 import 'node:fs/promises';
-import './configuration-DoWFJUPm.mjs';
+import './configuration-A5gW_0GE.mjs';
 import 'node:path';
-import './package-uOg9SCKi.mjs';
+import './package-DQsvY1XN.mjs';
 import 'zod';
 import './authRelay-DSAvg1uv.mjs';
 import 'node:crypto';

package/dist/{api-B2vLMS-z.cjs → api-CQnLOqRS.cjs}

@@ -1,22 +1,22 @@
 'use strict';
 
 var axios = require('axios');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
 var node_events = require('node:events');
 var socket_ioClient = require('socket.io-client');
-var attachmentLimits = require('./attachmentLimits-CzVrqgLR.cjs');
+var attachmentLimits = require('./attachmentLimits-DzlBPyJP.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-CNRE4ChD.cjs');
-var lidState = require('./lidState-KHHu1015.cjs');
-var configuration = require('./configuration-v9f8LM9T.cjs');
+var time = require('./time-CLwVAz6s.cjs');
+var lidState = require('./lidState-Ds-6ytZV.cjs');
+var configuration = require('./configuration-UsI0sxEv.cjs');
 var node_crypto = require('node:crypto');
-var index = require('./index-DA7yINuk.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-BjSV2Skz.cjs');
+var index = require('./index-DJ-oV52i.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-CMROPdJz.cjs');
 var cuid2 = require('@paralleldrive/cuid2');
-var sync = require('./sync-CVk4QERO.cjs');
+var sync = require('./sync-Dj92ZJ8Y.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var controlClient = require('./controlClient-fEHE85bH.cjs');
+var controlClient = require('./controlClient-BXktrQ4z.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var chalk = require('chalk');
 
@@ -3044,7 +3044,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-gFA54X7y.cjs'); });
+    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-fFFaWxYy.cjs'); });
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{api-SffjRQ1b.mjs → api-D57dsd6_.mjs}

@@ -1,20 +1,20 @@
 import axios from 'axios';
-import { l as logger, r as redactLogValue } from './logger-fXoNzNuB.mjs';
+import { l as logger, r as redactLogValue } from './logger-CGE4C8ho.mjs';
 import { EventEmitter } from 'node:events';
 import { io } from 'socket.io-client';
-import { A as AsyncLock, a as MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES, U as UserMessageSchema, F as FileEventMessageSchema } from './attachmentLimits-yba1uHFO.mjs';
+import { A as AsyncLock, a as MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES, U as UserMessageSchema, F as FileEventMessageSchema } from './attachmentLimits-D5pgmASK.mjs';
 import { h as decrypt, d as decodeBase64, i as decryptBlob, e as encodeBase64, g as encrypt, l as libsodiumEncryptForPublicKey, j as libsodiumPublicKeyFromSecretKey, k as getRandomBytes } from './authRelay-DSAvg1uv.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-BZNdNiIV.mjs';
-import { R as RpcHandlerManager, a as answerSocketRequest, d as describeSocketAckDrop, s as safeAck, i as isRateQuotaCode, p as pauseForRateQuota, b as shouldReconnect } from './lidState-C2dI0FAN.mjs';
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
+import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-CVvxdEDh.mjs';
+import { R as RpcHandlerManager, a as answerSocketRequest, d as describeSocketAckDrop, s as safeAck, i as isRateQuotaCode, p as pauseForRateQuota, b as shouldReconnect } from './lidState-CigXWxhe.mjs';
+import { c as configuration } from './configuration-A5gW_0GE.mjs';
 import { createHmac, randomUUID } from 'node:crypto';
-import { e as createEnvelope, s as streamKeyOf, R as ReleaseDrainNoticeSchema, m as RelayAssignmentResponseSchema } from './index-qdS1friN.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-CrgvJsOy.mjs';
+import { e as createEnvelope, s as streamKeyOf, R as ReleaseDrainNoticeSchema, m as RelayAssignmentResponseSchema } from './index-BBg9j0XK.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-Ckv5boQI.mjs';
 import { createId } from '@paralleldrive/cuid2';
-import { I as InvalidateSync } from './sync-CxD-w_40.mjs';
+import { I as InvalidateSync } from './sync-BpLasLu2.mjs';
 import { B as BackgroundTaskReporter } from './backgroundTaskActivity-8PdPxrvy.mjs';
-import { h as notifyDaemonTurnEvent, j as notifyDaemonBackgroundTasks } from './controlClient-DjoKTtgK.mjs';
+import { h as notifyDaemonTurnEvent, j as notifyDaemonBackgroundTasks } from './controlClient-CYzHrh3e.mjs';
 import { c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import chalk from 'chalk';
 
@@ -3042,7 +3042,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await import('./apiMachine-BpW9t8MO.mjs');
+    const { ApiMachineClient } = await import('./apiMachine-78Aqzg--.mjs');
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{apiMachine-BpW9t8MO.mjs → apiMachine-78Aqzg--.mjs}

@@ -1,36 +1,37 @@
 import { io } from 'socket.io-client';
-import { l as logger } from './logger-fXoNzNuB.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
 import { i as isClaudeSessionId, s as sanitizeTagList, p as pickMirrorForTerminal, l as liveSnapshotChanged, a as sanitizeLiveSnapshot, b as serializeLiveSnapshot, c as summarizeSpawnSessionForLog, d as parseMirrorSendParams } from './mirrorProtocol-BNLtoWjO.mjs';
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
+import { c as configuration } from './configuration-A5gW_0GE.mjs';
 import { w as withCurrentCliUpdateState } from './cliUpdate-Y34VGe9Y.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-CrgvJsOy.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-Ckv5boQI.mjs';
 import { stat, readdir, lstat, open, readFile } from 'node:fs/promises';
 import { join, isAbsolute, resolve } from 'node:path';
 import os, { homedir } from 'node:os';
 import { spawn, spawnSync } from 'node:child_process';
-import { readSettings, readPersistedSessions, readTrackedClaudeSessionIds, readTrackedCodexThreadIds } from './persistence-oET5n61f.mjs';
+import { readSettings, readPersistedSessions, readTrackedClaudeSessionIds, readTrackedCodexThreadIds } from './persistence-Cw8aLoyL.mjs';
 import { e as encodeBase64, g as encrypt, h as decrypt, d as decodeBase64 } from './authRelay-DSAvg1uv.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay } from './time-BZNdNiIV.mjs';
-import { R as RpcHandlerManager, i as isRateQuotaCode, p as pauseForRateQuota, a as answerSocketRequest, b as shouldReconnect, d as describeSocketAckDrop } from './lidState-C2dI0FAN.mjs';
+import { b as backoff, d as delay } from './time-CVvxdEDh.mjs';
+import { R as RpcHandlerManager, i as isRateQuotaCode, p as pauseForRateQuota, a as answerSocketRequest, b as shouldReconnect, d as describeSocketAckDrop } from './lidState-CigXWxhe.mjs';
 import * as pty from 'node-pty';
 import { a as attachStartupCommand, v as validateTerminalTags, d as deriveAutoTitle, T as TMUX_SESSION_ID_RE, i as isSafeTmuxSessionName, b as isVhSessionName, U as USER_SESSIONS_FORMAT, p as parseUserSessions, L as LIST_SESSIONS_FORMAT, c as parseSessionListLine, e as LIST_FIELD_SEP, s as sendToVhTerminal } from './terminals-Dlg0x3nY.mjs';
 import { t as tmuxArgs, V as VH_TMUX_SOCKET_ENV, a as scrubTmuxClientEnv } from './tmuxSocket-B8Yx20sT.mjs';
-import { locateClaudeConversation } from './index-SPGPenK5.mjs';
+import { locateClaudeConversation } from './index-DK2JpTJf.mjs';
 import { randomBytes } from 'node:crypto';
 import { existsSync, statSync, writeFileSync, unlinkSync, readFileSync, mkdirSync, accessSync, constants } from 'node:fs';
 import axios from 'axios';
 import { a as isValidTerminalId } from './ids-DU6sLx4C.mjs';
 import { d as detectCLIAvailability } from './detectCLI-CSGMlV51.mjs';
-import { d as detectResumeSupport } from './localHappyAgentAuth-DCsetiyG.mjs';
+import { d as detectResumeSupport } from './localHappyAgentAuth-CaCyKzYp.mjs';
 import { g as getProjectPath, a as getClaudeProjectsRoot } from './path-D2wdaNSk.mjs';
 import { i as isVeryHappyOneShotPrompt } from './oneShotPrompts-DT4p6RNd.mjs';
-import { f as forkSession, F as ForkSourceMissingError, d as discardForkedSession, l as listClaudeRewindPoints, b as forkAndTruncateSession, c as ForkTruncateUuidNotFoundError, a as forkCodexThread, C as CodexForkRewindPointNotFoundError, e as forkBeforeUserMessage, g as listCodexRewindPoints, h as forkCodexBeforeUserMessage } from './codexThreadFork-BCaEMBiM.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-oeQKD6Qf.mjs';
-import { o as RelayCandidatesResponseSchema, m as RelayAssignmentResponseSchema, R as ReleaseDrainNoticeSchema } from './index-qdS1friN.mjs';
+import { f as forkSession, F as ForkSourceMissingError, d as discardForkedSession, l as listClaudeRewindPoints, a as forkAndTruncateSession, b as ForkTruncateUuidNotFoundError, c as forkBeforeUserMessage } from './claudeSessionFork-_DUrXaqd.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-C2ybs2mZ.mjs';
+import { o as RelayCandidatesResponseSchema, m as RelayAssignmentResponseSchema, R as ReleaseDrainNoticeSchema } from './index-BBg9j0XK.mjs';
+import { f as forkCodexThread, C as CodexForkRewindPointNotFoundError, l as listCodexRewindPoints, a as forkCodexBeforeUserMessage } from './codexThreadFork-R76RU5H0.mjs';
 import 'chalk';
 import 'node:util';
-import './package-uOg9SCKi.mjs';
+import './package-DQsvY1XN.mjs';
 import 'child_process';
 import 'util';
 import 'fs/promises';
@@ -8103,10 +8104,10 @@ function parseTimestamp(raw) {
 }
 function isHarnessUserText(text) {
   const t = text.trimStart();
-  return t.startsWith("# AGENTS.md instructions") || t.startsWith("<environment_context>") || t.startsWith("<user_instructions>") || t.startsWith("<INSTRUCTIONS>");
+  return t.startsWith("# AGENTS.md instructions") || t.startsWith("<environment_context>") || t.startsWith("<user_instructions>") || t.startsWith("<INSTRUCTIONS>") || t.startsWith("<recommended_plugins>");
 }
 function stripHarnessBlocks(text) {
-  return text.replace(/<(environment_context|user_instructions|INSTRUCTIONS|turn_aborted|system-reminder)>[\s\S]*?<\/\1>/g, " ").replace(/^# AGENTS\.md instructions[^\n]*\n/m, " ");
+  return text.replace(/<(environment_context|user_instructions|INSTRUCTIONS|turn_aborted|system-reminder|recommended_plugins)>[\s\S]*?<\/\1>/g, " ").replace(/^# AGENTS\.md instructions[^\n]*\n/m, " ");
 }
 function textFromUserContent(content) {
   if (typeof content === "string") return content;
@@ -8120,6 +8121,11 @@ function textFromUserContent(content) {
   }
   return parts.length > 0 ? parts.join("\n") : null;
 }
+function isCodexSubThread(meta) {
+  if (meta.thread_source === "subagent") return true;
+  const source = meta.source;
+  return !!source && typeof source === "object" && "subagent" in source;
+}
 function parseCodexHistoryHead(head, promptChars) {
   let id;
   let cwd;
@@ -8142,6 +8148,7 @@ function parseCodexHistoryHead(head, promptChars) {
     if (!parsed || typeof parsed !== "object") continue;
     const payload = parsed.payload;
     if (parsed.type === "session_meta" && payload && typeof payload === "object") {
+      if (isCodexSubThread(payload)) return null;
       sawMeta = true;
       if (typeof payload.id === "string" && UUID_RE$1.test(payload.id)) id = payload.id.toLowerCase();
       if (typeof payload.cwd === "string" && payload.cwd) cwd = payload.cwd;

package/dist/{apiMachine-gFA54X7y.cjs → apiMachine-fFFaWxYy.cjs}

@@ -1,38 +1,39 @@
 'use strict';
 
 var socket_ioClient = require('socket.io-client');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
 var mirrorProtocol = require('./mirrorProtocol-BUtmg1ws.cjs');
-var configuration = require('./configuration-v9f8LM9T.cjs');
+var configuration = require('./configuration-UsI0sxEv.cjs');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-BjSV2Skz.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-CMROPdJz.cjs');
 var promises = require('node:fs/promises');
 var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-CBNMzSa8.cjs');
+var persistence = require('./persistence-i0nQMLlk.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-CNRE4ChD.cjs');
-var lidState = require('./lidState-KHHu1015.cjs');
+var time = require('./time-CLwVAz6s.cjs');
+var lidState = require('./lidState-Ds-6ytZV.cjs');
 var pty = require('node-pty');
 var terminals = require('./terminals-B_bfC9c2.cjs');
 var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var index = require('./index-Pf2cV9cn.cjs');
+var index = require('./index-CZWAiydF.cjs');
 var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var axios = require('axios');
 var ids = require('./ids-B6ZC0HGt.cjs');
 var detectCLI = require('./detectCLI-DR9ZaN6B.cjs');
-var localHappyAgentAuth = require('./localHappyAgentAuth-BXiHPXdC.cjs');
+var localHappyAgentAuth = require('./localHappyAgentAuth-l0Na-5Ys.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var codexThreadFork = require('./codexThreadFork-BZqF-9bX.cjs');
-var codexAppServerClient = require('./codexAppServerClient-ZzhUTWPo.cjs');
-var index$1 = require('./index-DA7yINuk.cjs');
+var claudeSessionFork = require('./claudeSessionFork-D9-mANmu.cjs');
+var codexAppServerClient = require('./codexAppServerClient-DlKv5TjG.cjs');
+var index$1 = require('./index-DJ-oV52i.cjs');
+var codexThreadFork = require('./codexThreadFork-DNekT4nQ.cjs');
 require('chalk');
 require('node:util');
-require('./package-Cl5BEP5x.cjs');
+require('./package-D1A-8ZJy.cjs');
 require('child_process');
 require('util');
 require('fs/promises');
@@ -8124,10 +8125,10 @@ function parseTimestamp(raw) {
 }
 function isHarnessUserText(text) {
   const t = text.trimStart();
-  return t.startsWith("# AGENTS.md instructions") || t.startsWith("<environment_context>") || t.startsWith("<user_instructions>") || t.startsWith("<INSTRUCTIONS>");
+  return t.startsWith("# AGENTS.md instructions") || t.startsWith("<environment_context>") || t.startsWith("<user_instructions>") || t.startsWith("<INSTRUCTIONS>") || t.startsWith("<recommended_plugins>");
 }
 function stripHarnessBlocks(text) {
-  return text.replace(/<(environment_context|user_instructions|INSTRUCTIONS|turn_aborted|system-reminder)>[\s\S]*?<\/\1>/g, " ").replace(/^# AGENTS\.md instructions[^\n]*\n/m, " ");
+  return text.replace(/<(environment_context|user_instructions|INSTRUCTIONS|turn_aborted|system-reminder|recommended_plugins)>[\s\S]*?<\/\1>/g, " ").replace(/^# AGENTS\.md instructions[^\n]*\n/m, " ");
 }
 function textFromUserContent(content) {
   if (typeof content === "string") return content;
@@ -8141,6 +8142,11 @@ function textFromUserContent(content) {
   }
   return parts.length > 0 ? parts.join("\n") : null;
 }
+function isCodexSubThread(meta) {
+  if (meta.thread_source === "subagent") return true;
+  const source = meta.source;
+  return !!source && typeof source === "object" && "subagent" in source;
+}
 function parseCodexHistoryHead(head, promptChars) {
   let id;
   let cwd;
@@ -8163,6 +8169,7 @@ function parseCodexHistoryHead(head, promptChars) {
     if (!parsed || typeof parsed !== "object") continue;
     const payload = parsed.payload;
     if (parsed.type === "session_meta" && payload && typeof payload === "object") {
+      if (isCodexSubThread(payload)) return null;
       sawMeta = true;
       if (typeof payload.id === "string" && UUID_RE$1.test(payload.id)) id = payload.id.toLowerCase();
       if (typeof payload.cwd === "string" && payload.cwd) cwd = payload.cwd;
@@ -8647,9 +8654,9 @@ class ApiMachineClient {
       const projectDir = path$1.getProjectPath(directory);
       let newClaudeSessionId;
       try {
-        newClaudeSessionId = await codexThreadFork.forkSession(projectDir, claudeSessionId);
+        newClaudeSessionId = await claudeSessionFork.forkSession(projectDir, claudeSessionId);
       } catch (error) {
-        if (error instanceof codexThreadFork.ForkSourceMissingError) {
+        if (error instanceof claudeSessionFork.ForkSourceMissingError) {
           throw new Error("Claude session file not found on this machine");
         }
         throw error;
@@ -8671,11 +8678,11 @@ class ApiMachineClient {
           importTitle: typeof title === "string" ? title : void 0
         });
       } catch (error) {
-        await codexThreadFork.discardForkedSession(projectDir, newClaudeSessionId);
+        await claudeSessionFork.discardForkedSession(projectDir, newClaudeSessionId);
         throw error;
       }
       if (result.type !== "success") {
-        await codexThreadFork.discardForkedSession(projectDir, newClaudeSessionId);
+        await claudeSessionFork.discardForkedSession(projectDir, newClaudeSessionId);
         return result;
       }
       logger.logger.debug(`[API MACHINE] Imported Claude conversation ${claudeSessionId} as session ${result.sessionId}`);
@@ -8815,10 +8822,10 @@ class ApiMachineClient {
         throw new Error("claudeSessionId must be a valid UUID");
       }
       try {
-        const newClaudeSessionId = await codexThreadFork.forkSession(path$1.getProjectPath(directory), claudeSessionId);
+        const newClaudeSessionId = await claudeSessionFork.forkSession(path$1.getProjectPath(directory), claudeSessionId);
         return { type: "success", newClaudeSessionId };
       } catch (error) {
-        if (error instanceof codexThreadFork.ForkSourceMissingError) {
+        if (error instanceof claudeSessionFork.ForkSourceMissingError) {
           throw new Error("Claude session file not found on this machine");
         }
         throw error;
@@ -8833,10 +8840,10 @@ class ApiMachineClient {
         throw new Error("claudeSessionId must be a valid UUID");
       }
       try {
-        const points = await codexThreadFork.listClaudeRewindPoints(path$1.getProjectPath(directory), claudeSessionId);
+        const points = await claudeSessionFork.listClaudeRewindPoints(path$1.getProjectPath(directory), claudeSessionId);
         return { type: "success", points };
       } catch (error) {
-        if (error instanceof codexThreadFork.ForkSourceMissingError) {
+        if (error instanceof claudeSessionFork.ForkSourceMissingError) {
           throw new Error("Claude session file not found on this machine");
         }
         throw error;
@@ -8854,17 +8861,17 @@ class ApiMachineClient {
         throw new Error("cutAfterUuid must be a valid UUID");
       }
       try {
-        const newClaudeSessionId = await codexThreadFork.forkAndTruncateSession(
+        const newClaudeSessionId = await claudeSessionFork.forkAndTruncateSession(
           path$1.getProjectPath(directory),
           claudeSessionId,
           cutAfterUuid
         );
         return { type: "success", newClaudeSessionId };
       } catch (error) {
-        if (error instanceof codexThreadFork.ForkSourceMissingError) {
+        if (error instanceof claudeSessionFork.ForkSourceMissingError) {
           throw new Error("Claude session file not found on this machine");
         }
-        if (error instanceof codexThreadFork.ForkTruncateUuidNotFoundError) {
+        if (error instanceof claudeSessionFork.ForkTruncateUuidNotFoundError) {
           throw new Error(
             "The chosen rewind point is no longer present in the source session \u2014 try forking without truncation"
           );
@@ -8976,7 +8983,7 @@ class ApiMachineClient {
       if (!UUID_RE.test(claudeSessionId) || !UUID_RE.test(cutBeforeUuid)) {
         throw new Error("claudeSessionId and cutBeforeUuid must be valid UUIDs");
       }
-      const newClaudeSessionId = await codexThreadFork.forkBeforeUserMessage(path$1.getProjectPath(directory), claudeSessionId, cutBeforeUuid);
+      const newClaudeSessionId = await claudeSessionFork.forkBeforeUserMessage(path$1.getProjectPath(directory), claudeSessionId, cutBeforeUuid);
       return newClaudeSessionId === null ? { type: "success", startFresh: true } : { type: "success", newClaudeSessionId };
     });
     this.rpcHandlerManager.registerHandler("codex-rewind-before-message", async (params) => {

package/dist/{assistantTools-BfA0R3_m.cjs → assistantTools-CwESq24n.cjs}

@@ -3,14 +3,14 @@
 var promises = require('node:fs/promises');
 var os = require('node:os');
 var z = require('zod');
-var logger = require('./logger-Bc8-u1w0.cjs');
-var persistence = require('./persistence-CBNMzSa8.cjs');
-var controlClient = require('./controlClient-fEHE85bH.cjs');
-var sessionOps = require('./sessionOps-DJdExmBy.cjs');
-var remoteSessionClient = require('./remoteSessionClient-BNx78NLb.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
+var persistence = require('./persistence-i0nQMLlk.cjs');
+var controlClient = require('./controlClient-BXktrQ4z.cjs');
+var sessionOps = require('./sessionOps-GsELm2PZ.cjs');
+var remoteSessionClient = require('./remoteSessionClient-DX9jHLeW.cjs');
 var ids = require('./ids-B6ZC0HGt.cjs');
 var terminals = require('./terminals-B_bfC9c2.cjs');
-var bootstrap = require('./bootstrap-CkgIq8N3.cjs');
+var bootstrap = require('./bootstrap-DvZjEa9_.cjs');
 var path = require('node:path');
 
 const PERSONAL_MEMORY_SOFT_LIMIT_CHARS = 2e3;

package/dist/{assistantTools-CgiTbnWb.mjs → assistantTools-mEz6uNqL.mjs}

@@ -1,14 +1,14 @@
 import { readFile, writeFile, appendFile } from 'node:fs/promises';
 import os from 'node:os';
 import { z } from 'zod';
-import { l as logger } from './logger-fXoNzNuB.mjs';
-import { readPersistedSessions } from './persistence-oET5n61f.mjs';
-import { e as spawnDaemonSession } from './controlClient-DjoKTtgK.mjs';
-import { a as listSessions, r as readSessionTranscript, s as sessionWebUrl, f as waitForSessionKey, g as sendUserMessage, b as stopSession, d as archiveSession } from './sessionOps-C_f1wKOr.mjs';
-import { r as readRemoteTranscript, s as sendRemoteMessage, d as deliverToSession, R as RemoteSessionOpsError } from './remoteSessionClient-CO7qOjR0.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
+import { readPersistedSessions } from './persistence-Cw8aLoyL.mjs';
+import { e as spawnDaemonSession } from './controlClient-CYzHrh3e.mjs';
+import { a as listSessions, r as readSessionTranscript, s as sessionWebUrl, f as waitForSessionKey, g as sendUserMessage, b as stopSession, d as archiveSession } from './sessionOps-CdwVPSZz.mjs';
+import { r as readRemoteTranscript, s as sendRemoteMessage, d as deliverToSession, R as RemoteSessionOpsError } from './remoteSessionClient-BMjsbuBh.mjs';
 import { i as isValidSessionId, a as isValidTerminalId } from './ids-DU6sLx4C.mjs';
 import { l as listVhTerminals, r as readVhTerminal, s as sendToVhTerminal } from './terminals-Dlg0x3nY.mjs';
-import { bootstrapAssistantHome, assistantPersonalMemoryPath } from './bootstrap-BNQq05jR.mjs';
+import { bootstrapAssistantHome, assistantPersonalMemoryPath } from './bootstrap-BKmsYSwh.mjs';
 import { join, isAbsolute, normalize } from 'node:path';
 
 const PERSONAL_MEMORY_SOFT_LIMIT_CHARS = 2e3;

package/dist/{attachmentContent-DMMZzevR.cjs → attachmentContent-GHOk6Muq.cjs}

@@ -3,8 +3,8 @@
 var node_crypto = require('node:crypto');
 var promises = require('node:fs/promises');
 var path = require('node:path');
-var attachmentLimits = require('./attachmentLimits-CzVrqgLR.cjs');
-var configuration = require('./configuration-v9f8LM9T.cjs');
+var attachmentLimits = require('./attachmentLimits-DzlBPyJP.cjs');
+var configuration = require('./configuration-UsI0sxEv.cjs');
 
 const CLAUDE_ATTACHMENT_KINDS = [
   "image/jpeg",

package/dist/{attachmentContent-CSGxr71v.mjs → attachmentContent-s1xPha4Q.mjs}

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
 import { writeFile, rename, unlink } from 'node:fs/promises';
 import { join, basename } from 'node:path';
-import { M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES } from './attachmentLimits-yba1uHFO.mjs';
-import { e as ensurePrivateDirectory, b as hardenPrivateFile } from './configuration-DoWFJUPm.mjs';
+import { M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES } from './attachmentLimits-D5pgmASK.mjs';
+import { e as ensurePrivateDirectory, b as hardenPrivateFile } from './configuration-A5gW_0GE.mjs';
 
 const CLAUDE_ATTACHMENT_KINDS = [
   "image/jpeg",

package/dist/{attachmentLimits-yba1uHFO.mjs → attachmentLimits-D5pgmASK.mjs}

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { k as AgentVersionsSchema } from './index-qdS1friN.mjs';
+import { k as AgentVersionsSchema } from './index-BBg9j0XK.mjs';
 
 z.object({
   teamsVersion: z.number().int().positive().optional(),

package/dist/{attachmentLimits-CzVrqgLR.cjs → attachmentLimits-DzlBPyJP.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var z = require('zod');
-var index = require('./index-DA7yINuk.cjs');
+var index = require('./index-DJ-oV52i.cjs');
 
 z.z.object({
   teamsVersion: z.z.number().int().positive().optional(),

package/dist/{auth-x4CEoysH.cjs → auth-B8EagV6G.cjs}

@@ -1,25 +1,25 @@
 'use strict';
 
 var chalk = require('chalk');
-var persistence = require('./persistence-CBNMzSa8.cjs');
-var auth = require('./auth-Bt4ceBBy.cjs');
-var configuration = require('./configuration-v9f8LM9T.cjs');
+var persistence = require('./persistence-i0nQMLlk.cjs');
+var auth = require('./auth-BbSdXMQ_.cjs');
+var configuration = require('./configuration-UsI0sxEv.cjs');
 var node_fs = require('node:fs');
 var node_readline = require('node:readline');
-var controlClient = require('./controlClient-fEHE85bH.cjs');
-var logger = require('./logger-Bc8-u1w0.cjs');
+var controlClient = require('./controlClient-BXktrQ4z.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
 var os = require('node:os');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 require('node:fs/promises');
 require('zod');
 require('node:path');
-require('./package-Cl5BEP5x.cjs');
+require('./package-D1A-8ZJy.cjs');
 require('node:crypto');
 require('tweetnacl');
 require('node:util');
 require('axios');
-require('./time-CNRE4ChD.cjs');
-require('./browser-BDOlKWYe.cjs');
+require('./time-CLwVAz6s.cjs');
+require('./browser-CBZj-1Wx.cjs');
 require('open');
 
 function localMachineIdentityStatus(machineId) {

package/dist/{auth-DdyVZSo6.mjs → auth-BOaHWquu.mjs}

@@ -1,23 +1,23 @@
 import chalk from 'chalk';
-import { readCredentials, readSettings, clearCredentials, clearMachineId } from './persistence-oET5n61f.mjs';
-import { a as authAndSetupMachineIfNeeded } from './auth-CYHjQ8oQ.mjs';
-import { c as configuration } from './configuration-DoWFJUPm.mjs';
+import { readCredentials, readSettings, clearCredentials, clearMachineId } from './persistence-Cw8aLoyL.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-C8V7-oUT.mjs';
+import { c as configuration } from './configuration-A5gW_0GE.mjs';
 import { existsSync, rmSync } from 'node:fs';
 import { createInterface } from 'node:readline';
-import { c as checkIfDaemonRunningAndCleanupStaleState, a as stopDaemon } from './controlClient-DjoKTtgK.mjs';
-import { l as logger } from './logger-fXoNzNuB.mjs';
+import { c as checkIfDaemonRunningAndCleanupStaleState, a as stopDaemon } from './controlClient-CYzHrh3e.mjs';
+import { l as logger } from './logger-CGE4C8ho.mjs';
 import os from 'node:os';
 import { c as credentialRelayProblem } from './authRelay-DSAvg1uv.mjs';
 import 'node:fs/promises';
 import 'zod';
 import 'node:path';
-import './package-uOg9SCKi.mjs';
+import './package-DQsvY1XN.mjs';
 import 'node:crypto';
 import 'tweetnacl';
 import 'node:util';
 import 'axios';
-import './time-BZNdNiIV.mjs';
-import './browser-9pyhQr1R.mjs';
+import './time-CVvxdEDh.mjs';
+import './browser-CrMAr5fI.mjs';
 import 'open';
 
 function localMachineIdentityStatus(machineId) {