very-happy-cli 0.2.181 → 0.2.183

package/dist/{client-D_U2VjO3.cjs → client-DYGDBD0M.cjs}

@@ -1,21 +1,29 @@
 'use strict';
 
-var configuration = require('./configuration-C8JgseHy.cjs');
-var persistence = require('./persistence-BY-D00wT.cjs');
+var configuration = require('./configuration-K3I6yOjZ.cjs');
+var persistence = require('./persistence-DZRMUZZS.cjs');
 
 class AutomationsRequestError extends Error {
-  constructor(status, code, runStatus) {
-    super(describeAutomationError(status, code, runStatus));
+  constructor(status, code, runStatus, invalidFields = []) {
+    super(describeAutomationError(status, code, runStatus, invalidFields));
     this.status = status;
     this.code = code;
     this.runStatus = runStatus;
+    this.invalidFields = invalidFields;
   }
 }
 function isAutomationsUnavailable(error) {
   return error instanceof AutomationsRequestError && error.status === 404 && !error.code.endsWith("_not_found");
 }
 const AUTOMATIONS_UNAVAILABLE_MESSAGE = "Automations are not enabled on this server (set VH_AUTOMATIONS_ENABLED=true on the server, or upgrade it).";
-function describeAutomationError(status, code, runStatus) {
+function validationFieldPaths(body) {
+  const message = body?.message;
+  if (typeof message !== "string") return [];
+  const fields = /* @__PURE__ */ new Set();
+  for (const match of message.matchAll(/(?:^|, )body\/([A-Za-z0-9_./]{1,64}) /g)) fields.add(match[1].replace(/\//g, "."));
+  return [...fields];
+}
+function describeAutomationError(status, code, runStatus, invalidFields = []) {
   if (status === 404 && !code.endsWith("_not_found")) return AUTOMATIONS_UNAVAILABLE_MESSAGE;
   const known = {
     automation_not_found: "No automation with that name or id.",
@@ -37,7 +45,7 @@ function describeAutomationError(status, code, runStatus) {
     invalid_timezone: "The time zone is not a valid IANA zone."
   };
   if (known[code]) return known[code];
-  if (status === 400) return "The server rejected the request (HTTP 400): check the arguments, or the server may expect a newer request shape.";
+  if (status === 400) return `The server rejected the request (HTTP 400${invalidFields.length ? `; invalid: ${invalidFields.join(", ")}` : ""}): check the arguments, or the server may expect a newer request shape.`;
   return `Automations request failed (HTTP ${status}${code ? `, ${code}` : ""}).`;
 }
 function createAutomationsClient(options) {
@@ -66,7 +74,7 @@ function createAutomationsClient(options) {
     }
     if (!response.ok) {
       const code = typeof parsed?.error === "string" ? parsed.error : "";
-      throw new AutomationsRequestError(response.status, code, typeof parsed?.status === "string" ? parsed.status : void 0);
+      throw new AutomationsRequestError(response.status, code, typeof parsed?.status === "string" ? parsed.status : void 0, response.status === 400 ? validationFieldPaths(parsed) : []);
     }
     return parsed;
   }

package/dist/{client-DWs6k041.cjs → client-DcKJ0ul_.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var configuration = require('./configuration-C8JgseHy.cjs');
-var persistence = require('./persistence-BY-D00wT.cjs');
+var configuration = require('./configuration-K3I6yOjZ.cjs');
+var persistence = require('./persistence-DZRMUZZS.cjs');
 
 const UNSUPPORTED_BACKOFF_MS = 10 * 6e4;
 class ProjectsUnsupportedError extends Error {

package/dist/{client-DsQcxVUV.mjs → client-DfDyE322.mjs}

@@ -1,7 +1,11 @@
 import { randomUUID } from 'node:crypto';
-import { c as configuration } from './configuration-BPrfb17M.mjs';
-import { r as readSettings, c as readPersistedSessions, b as readCredentialsForConfiguredRelay } from './persistence-D2Djrf7t.mjs';
-import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-_YGq8xdH.mjs';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { basename, dirname } from 'node:path';
+import { f as isInsideTeamWorktree, r as rebaseTeamWorktreePath } from './index-BptfFoXM.mjs';
+import { c as configuration } from './configuration-elzht62L.mjs';
+import { r as readSettings, c as readPersistedSessions, b as readCredentialsForConfiguredRelay } from './persistence-zJo4r7YI.mjs';
+import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-CLj1_RYF.mjs';
 
 async function teamRequest(path, method, token, scoped, body) {
   const response = await fetch(`${configuration.serverUrl}${path}`, {
@@ -59,6 +63,12 @@ function teamCreateBody(input, machineId, sessionId, directory) {
   if (input.projectId) return { ...body, project: { projectId: input.projectId } };
   return { ...body, project: { inheritFromSessionId: sessionId, ...directory ? { directory } : {} } };
 }
+const gitCommonDir = async (directory) => (await promisify(execFile)("git", ["-C", directory, "rev-parse", "--path-format=absolute", "--git-common-dir"], { timeout: 1e4 })).stdout.trim();
+async function teamProjectDirectory(path, commonDir = gitCommonDir) {
+  if (!path || !isInsideTeamWorktree(path)) return path;
+  const common = await commonDir(path).catch(() => null);
+  return common && basename(common) === ".git" ? rebaseTeamWorktreePath(path, dirname(common)) : path;
+}
 function createTeamsClient(sessionId) {
   const scopePath = () => teamScopePath(sessionId ?? process.env.HAPPY_SESSION_ID);
   return {
@@ -80,7 +90,7 @@ function createTeamsClient(sessionId) {
         if (priorScope && !options?.expectedTeamId) throw new Error("This session already belongs to another team scope");
         let teamId = input.teamId ?? options?.expectedTeamId;
         if (!teamId) {
-          const created = await teamRequest("/v1/teams", "POST", credentials.token, false, teamCreateBody(input, machineId, sid, persisted.metadata.path));
+          const created = await teamRequest("/v1/teams", "POST", credentials.token, false, teamCreateBody(input, machineId, sid, await teamProjectDirectory(persisted.metadata.path)));
           teamId = created.team.id;
         } else {
           const existing = await teamRequest(`/v1/teams/${encodeURIComponent(teamId)}`, "GET", credentials.token, false);

package/dist/codex/happyMcpStdioBridge.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var tools = require('../tools-DiCXnAC5.cjs');
-var reportProgressTool = require('../reportProgressTool-th4trcET.cjs');
-var peerTools = require('../peerTools-CP-x-Peu.cjs');
+var tools = require('../tools-C8rpwyIl.cjs');
+var reportProgressTool = require('../reportProgressTool-Be-8ADI4.cjs');
+var peerTools = require('../peerTools-Dxe7iCi_.cjs');
 var agentGuidance = require('../agentGuidance-BtBx2xxE.cjs');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
@@ -10,35 +10,36 @@ var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/client/streamableHttp.js');
 var z = require('zod');
 var limits = require('../limits-C-a7gr04.cjs');
-require('../client-CUO3ItoB.cjs');
+require('../client--vZueZYF.cjs');
 require('node:crypto');
-require('../configuration-C8JgseHy.cjs');
+require('node:child_process');
+require('node:util');
+require('node:path');
+require('../index-Fq-jxjsB.cjs');
+require('@paralleldrive/cuid2');
+require('../configuration-K3I6yOjZ.cjs');
 require('node:fs');
 require('node:os');
-require('node:path');
-require('../package-NoD8QOOM.cjs');
+require('../package-3aPiSpZj.cjs');
 require('node:fs/promises');
-require('../persistence-BY-D00wT.cjs');
+require('../persistence-DZRMUZZS.cjs');
 require('../authRelay-Dy1qU9td.cjs');
 require('tweetnacl');
-require('../logger-DgBwUSgS.cjs');
+require('../logger-Cgwz30rK.cjs');
 require('chalk');
-require('node:util');
-require('../context-D1lgQTJC.cjs');
-require('../index-Df2eHm3O.cjs');
-require('@paralleldrive/cuid2');
-require('../client-D_U2VjO3.cjs');
+require('../context-DNKNF8Yh.cjs');
+require('../client-DYGDBD0M.cjs');
 require('../precheckCompat-CWOi5c9L.cjs');
-require('../client-DWs6k041.cjs');
+require('../client-DcKJ0ul_.cjs');
 require('../prompt-Bof2aQkI.cjs');
 require('../ids-B6ZC0HGt.cjs');
-require('../controlClient-D68Zj7Q-.cjs');
-require('../sessionOps-DVA-00nR.cjs');
+require('../controlClient-ChqmxgbB.cjs');
+require('../sessionOps-BWlDlFYP.cjs');
 require('axios');
-require('../time-nqa9shu8.cjs');
+require('../time-CdCotzKU.cjs');
 require('socket.io-client');
 require('../backgroundTaskActivity-CBvUdj39.cjs');
-require('../remoteSessionClient-CFCn42bs.cjs');
+require('../remoteSessionClient-HQAKAvVd.cjs');
 require('../trimIdent-4gvk9Wk6.cjs');
 
 function parseArgs(argv) {

package/dist/codex/happyMcpStdioBridge.mjs

@@ -1,6 +1,6 @@
-import { r as registerTeamsTools } from '../tools-D2E--n1x.mjs';
-import { r as registerAutomationTools, a as registerProjectTools, b as registerReportProgressTool } from '../reportProgressTool-tPxEvh6x.mjs';
-import { r as registerSessionPeerTools } from '../peerTools-CK3JYu1k.mjs';
+import { r as registerTeamsTools } from '../tools-DUjkqSQL.mjs';
+import { r as registerAutomationTools, a as registerProjectTools, b as registerReportProgressTool } from '../reportProgressTool-CcZ32nrd.mjs';
+import { r as registerSessionPeerTools } from '../peerTools-DIPOX033.mjs';
 import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, c as PREVIEW_DOWNLOAD_PARAM_DESCRIPTION, R as REPORT_PROGRESS_TOOL_NAME } from '../agentGuidance-BDYt2Qy2.mjs';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -8,35 +8,36 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 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 '../client-DsQcxVUV.mjs';
+import '../client-DfDyE322.mjs';
 import 'node:crypto';
-import '../configuration-BPrfb17M.mjs';
+import 'node:child_process';
+import 'node:util';
+import 'node:path';
+import '../index-BptfFoXM.mjs';
+import '@paralleldrive/cuid2';
+import '../configuration-elzht62L.mjs';
 import 'node:fs';
 import 'node:os';
-import 'node:path';
-import '../package-DYGwlmXl.mjs';
+import '../package-CTrz6U3C.mjs';
 import 'node:fs/promises';
-import '../persistence-D2Djrf7t.mjs';
+import '../persistence-zJo4r7YI.mjs';
 import '../authRelay-DhQhkBvX.mjs';
 import 'tweetnacl';
-import '../logger-LFr8iPgl.mjs';
+import '../logger-RMPh5aqe.mjs';
 import 'chalk';
-import 'node:util';
-import '../context-_YGq8xdH.mjs';
-import '../index-CeRXrGnH.mjs';
-import '@paralleldrive/cuid2';
-import '../client-CXOnzuOy.mjs';
+import '../context-CLj1_RYF.mjs';
+import '../client-BgHvK7lo.mjs';
 import '../precheckCompat-DeEbilbr.mjs';
-import '../client-BKyU66lg.mjs';
+import '../client-5_zDNdOh.mjs';
 import '../prompt-QHuFx9j6.mjs';
 import '../ids-DU6sLx4C.mjs';
-import '../controlClient-CkNpT5zS.mjs';
-import '../sessionOps-DqlftXxe.mjs';
+import '../controlClient-CuYQs2aZ.mjs';
+import '../sessionOps-ByVggB_q.mjs';
 import 'axios';
-import '../time-BcoJaG8E.mjs';
+import '../time-B2KKdAym.mjs';
 import 'socket.io-client';
 import '../backgroundTaskActivity-8PdPxrvy.mjs';
-import '../remoteSessionClient-B2POSKFT.mjs';
+import '../remoteSessionClient-Cwrddscy.mjs';
 import '../trimIdent-BAjmv_TG.mjs';
 
 function parseArgs(argv) {

package/dist/{codexAppServerClient-BRX3JZ_5.cjs → codexAppServerClient-C3nrTfwY.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-DgBwUSgS.cjs');
+var logger = require('./logger-Cgwz30rK.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-NoD8QOOM.cjs');
-var rateLimitWindows = require('./rateLimitWindows-OpAmdOtC.cjs');
+var _package = require('./package-3aPiSpZj.cjs');
+var rateLimitWindows = require('./rateLimitWindows-CPV0nLeq.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;

package/dist/{codexAppServerClient-C3JO3pwM.mjs → codexAppServerClient-DvBg4hGc.mjs}

@@ -1,11 +1,11 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-LFr8iPgl.mjs';
+import { l as logger } from './logger-RMPh5aqe.mjs';
 import { e as errorLogMetadata, c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BEsI4qt3.mjs';
-import { p as packageJson } from './package-DYGwlmXl.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-ZtHZHe-l.mjs';
+import { p as packageJson } from './package-CTrz6U3C.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-HlHATOQ0.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;

package/dist/{codexCommand-BZIAAqKS.mjs → codexCommand-Bqp2--g_.mjs}

@@ -1,104 +1,105 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-DZsthtSk.mjs';
-import { d as createEnvelope, f as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, C as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-CeRXrGnH.mjs';
-import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-BcBIKKf1.mjs';
-import { s as sharedProjectsClient } from './client-BKyU66lg.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-xT70IYMx.mjs';
+import { g as createEnvelope, j as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, I as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-BptfFoXM.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-BixlyPWV.mjs';
+import { s as sharedProjectsClient } from './client-5_zDNdOh.mjs';
 import { unlink } from 'node:fs/promises';
 import { p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-DYIjlN1Z.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-C29WLYkW.mjs';
 import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-1YwtKgWl.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-DwY0uIg6.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-JIfwCqMk.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-CXOOX-VD.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { c as connectionState, A as ApiClient } from './api-Dr3wXL_7.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-C3JO3pwM.mjs';
-import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-CcyZ1hGA.mjs';
-import { l as logger } from './logger-LFr8iPgl.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-Uo-GUjbb.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-ztFkwHrG.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-DvBg4hGc.mjs';
+import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-yMnFvS-W.mjs';
+import { l as logger } from './logger-RMPh5aqe.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-BJ1ID_Br.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-DsliWl_s.mjs';
 import { execSync } from 'node:child_process';
-import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-D2Djrf7t.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-BglCsfvf.mjs';
-import { c as configuration } from './configuration-BPrfb17M.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-DDCKL3wf.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-zJo4r7YI.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-BTUtPRth.mjs';
+import { c as configuration } from './configuration-elzht62L.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Bp-fuH-w.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-3WAj3_xl.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-C1MbLQnh.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-CkNpT5zS.mjs';
-import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-DXMznl8v.mjs';
+import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-CuYQs2aZ.mjs';
+import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-U9LuUeQh.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-DgJK_4m1.mjs';
-import { c as createSessionForStartup } from './startupSessionCreate-BfByJ16A.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-Bl3DuakT.mjs';
+import { c as createSessionForStartup } from './startupSessionCreate-BcAGYo51.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning--98j7-17.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-khb8Nr1n.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-BcoJaG8E.mjs';
-import './browser-C2qhUHSE.mjs';
+import './time-B2KKdAym.mjs';
+import './browser-1j9gdZoD.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-tPxEvh6x.mjs';
-import './client-CXOnzuOy.mjs';
+import './reportProgressTool-CcZ32nrd.mjs';
+import './client-BgHvK7lo.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import 'node:fs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-DsQcxVUV.mjs';
-import './context-_YGq8xdH.mjs';
-import './sessionOps-DqlftXxe.mjs';
+import './client-DfDyE322.mjs';
+import 'node:util';
+import './context-CLj1_RYF.mjs';
+import './sessionOps-ByVggB_q.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
-import './resources-CH1iP6Cv.mjs';
-import './tools-D2E--n1x.mjs';
-import './peerTools-CK3JYu1k.mjs';
+import './resources-CLdQfe3b.mjs';
+import './tools-DUjkqSQL.mjs';
+import './peerTools-DIPOX033.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-B2POSKFT.mjs';
+import './remoteSessionClient-Cwrddscy.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-CeaAXdJj.mjs';
+import './downloadTarget-VUTd9lEO.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-B6EkZh4u.mjs';
-import './package-DYGwlmXl.mjs';
+import './bootstrap-DS8Acdhm.mjs';
+import './package-CTrz6U3C.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-DXGIhE-A.mjs';
+import './pushNotifications-C4R9-1hU.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './processTreeSnapshot-CuLJDNC-.mjs';
-import './lidState-DghbfRbr.mjs';
+import './lidState-DXeYTsrm.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-DF6bdDtd.mjs';
+import './registerCommonHandlers-a9lHojSV.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-DO-2PU45.mjs';
+import './sync--QUIOuf8.mjs';
 import 'chalk';
+import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-ZtHZHe-l.mjs';
+import './rateLimitWindows-HlHATOQ0.mjs';
 import './processTree-CP5IvQ2Z.mjs';
-import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-IKmeRpuQ.mjs';
+import './localHappyAgentAuth-C1A4ChCR.mjs';
+import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './spawnHappyCLI-Dq3LLXLb.mjs';
+import './spawnHappyCLI-v_bJwZ4Z.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -234,7 +235,32 @@ function turnStatus(turn) {
   }
   return "completed";
 }
-function emitHistoricalToolCall(envelopes, turn, item, name, title, args, output) {
+function commandFailed(exitCode, status) {
+  return typeof exitCode === "number" && exitCode !== 0 || status === "failed" || status === "declined";
+}
+function commandResult(message) {
+  const raw = [message.output, message.aggregated_output, message.formatted_output].find((v) => typeof v === "string");
+  const output = typeof raw === "string" ? raw : "";
+  const exitCode = message.exit_code;
+  const failed = commandFailed(exitCode, message.status);
+  const text = typeof exitCode === "number" && exitCode !== 0 ? `${output}${output === "" || output.endsWith("\n") ? "" : "\n"}[exit code ${exitCode}]` : output;
+  return textResultPayload(text, failed);
+}
+function errorText(error) {
+  if (typeof error === "string") return error;
+  if (error && typeof error === "object" && typeof error.message === "string") return error.message;
+  return JSON.stringify(error) ?? String(error);
+}
+function mcpResultText(result) {
+  if (result === void 0 || result === null) return null;
+  if (typeof result === "string") return result;
+  const content = result.content;
+  const text = Array.isArray(content) ? toolResultContentText(content) : "";
+  if (text) return text;
+  const structured = result.structuredContent;
+  return JSON.stringify(structured ?? result, null, 2) ?? null;
+}
+function emitHistoricalToolCall(envelopes, turn, item, name, title, args, output, isError = false) {
   const time = turnTimestampMs(turn);
   const opts = { turn: turn.id, time, codexItemId: item.id };
   envelopes.push(createEnvelope("agent", {
@@ -248,20 +274,25 @@ function emitHistoricalToolCall(envelopes, turn, item, name, title, args, output
     ...opts,
     id: `${item.id}:start`
   }));
-  if (output && output.trim().length > 0) {
-    envelopes.push(createEnvelope("agent", {
-      t: "text",
-      text: output,
-      thinking: true
-    }, {
-      ...opts,
-      id: `${item.id}:output`
-    }));
+  const running = "status" in item && (item.status === "inProgress" || item.status === "running");
+  if (running) {
+    if (output && output.trim().length > 0) {
+      envelopes.push(createEnvelope("agent", {
+        t: "text",
+        text: output,
+        thinking: true
+      }, {
+        ...opts,
+        id: `${item.id}:output`
+      }));
+    }
+    return;
   }
-  if ("status" in item && (item.status === "inProgress" || item.status === "running")) return;
+  const result = textResultPayload(output ?? "", isError);
   envelopes.push(createEnvelope("agent", {
     t: "tool-call-end",
-    call: item.id
+    call: item.id,
+    ...result ? { result } : {}
   }, {
     ...opts,
     id: `${item.id}:end`,
@@ -359,7 +390,8 @@ function mapCodexThreadToSessionEnvelopes(thread) {
             "CodexBash",
             commandToTitle(command),
             { command, cwd: item.cwd },
-            typeof item.aggregatedOutput === "string" ? item.aggregatedOutput : null
+            typeof item.aggregatedOutput === "string" ? item.aggregatedOutput : null,
+            commandFailed(item.exitCode, item.status)
           );
           break;
         }
@@ -378,7 +410,8 @@ function mapCodexThreadToSessionEnvelopes(thread) {
         }
         case "mcpToolCall": {
           const title = `${item.server}.${item.tool}`;
-          const output = item.error !== void 0 && item.error !== null ? String(item.error) : item.result !== void 0 && item.result !== null ? String(item.result) : null;
+          const failed = item.error !== void 0 && item.error !== null;
+          const output = failed ? errorText(item.error) : mcpResultText(item.result);
           emitHistoricalToolCall(
             envelopes,
             turn,
@@ -390,7 +423,8 @@ function mapCodexThreadToSessionEnvelopes(thread) {
               tool: item.tool,
               arguments: item.arguments
             },
-            output
+            output,
+            failed
           );
           break;
         }
@@ -594,7 +628,8 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     const call = pickCallId(message);
     const envelopes = [];
     maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
-    envelopes.push(createEnvelope("agent", { t: "tool-call-end", call }, opts));
+    const result = commandResult(message);
+    envelopes.push(createEnvelope("agent", { t: "tool-call-end", call, ...result ? { result } : {} }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,