remcodex 0.1.0-beta.1 → 0.1.0-beta.11

package/web/app.js

@@ -15,6 +15,7 @@ import {
   getSessionTimelineEvents,
   getSessions,
   resolveSessionApproval,
+  retrySessionApproval,
   sendMessage,
   stopSession,
   syncImportedSession,
@@ -589,6 +590,7 @@ function getPendingApprovalFromTimelineState(timelineState) {
     .filter(
       (item) =>
         item?.status === "pending" &&
+        !isApprovalDismissed(sessionId, item?.requestId) &&
         !isApprovalSuppressed(sessionId, item?.requestId),
     )
     .sort((left, right) => Number(right?.seq || 0) - Number(left?.seq || 0))[0];
@@ -613,14 +615,11 @@ function resolveDetailPendingApproval(session, timelineState) {
   const sessionPending = session?.pendingApproval || null;
   const liveBusy = session?.liveBusy === true;
   const sessionId = String(session?.sessionId || "").trim();
-
-  if (!liveBusy) {
-    return null;
-  }
+  const canResolve = liveBusy && sessionPending?.resumable !== false;
 
   if (!timelinePending) {
     return sessionPending &&
-      sessionPending.resumable !== false &&
+      !isApprovalDismissed(sessionId, sessionPending.requestId, sessionPending.callId) &&
       !isApprovalSuppressed(sessionId, sessionPending.requestId, sessionPending.callId)
       ? sessionPending
       : null;
@@ -629,7 +628,7 @@ function resolveDetailPendingApproval(session, timelineState) {
   return {
     ...timelinePending,
     ...(sessionPending && sessionPending.requestId === timelinePending.requestId ? sessionPending : {}),
-    resumable: true,
+    resumable: canResolve,
   };
 }
 
@@ -653,6 +652,37 @@ function isApprovalSuppressed(sessionId, requestId, callId = "") {
   return true;
 }
 
+function getApprovalDismissalKey(sessionId, requestId) {
+  return `${String(sessionId || "").trim()}:${String(requestId || "").trim()}`;
+}
+
+function isApprovalDismissed(sessionId, requestId) {
+  const key = getApprovalDismissalKey(sessionId, requestId);
+  if (!key || key === ":") {
+    return false;
+  }
+  return Boolean(state.detail.dismissedApprovalKeys?.[key]);
+}
+
+function dismissApproval(sessionId, requestId) {
+  const key = getApprovalDismissalKey(sessionId, requestId);
+  if (!key || key === ":") {
+    return;
+  }
+  state.detail.dismissedApprovalKeys = {
+    ...(state.detail.dismissedApprovalKeys || {}),
+    [key]: true,
+  };
+}
+
+function isTerminalApprovalError(error) {
+  const message = messageOf(error);
+  return (
+    message === "Approval request not found." ||
+    message === "Approval request can no longer be resumed."
+  );
+}
+
 function clearResolvingApprovalState() {
   state.detail.resolvingApprovalRequestId = "";
   state.detail.resolvingApprovalSessionId = "";
@@ -671,7 +701,10 @@ function syncDetailPendingApproval(session = state.detail.session, timelineState
   const sessionPending = session?.pendingApproval || null;
   const timelinePending = timelineState?.approvalsByRequestId
     ? Object.values(timelineState.approvalsByRequestId).some(
-        (item) => item?.status === "pending" && isApprovalSuppressed(session?.sessionId, item?.requestId),
+        (item) =>
+          item?.status === "pending" &&
+          !isApprovalDismissed(session?.sessionId, item?.requestId) &&
+          isApprovalSuppressed(session?.sessionId, item?.requestId),
       )
     : false;
   const detailPending =
@@ -683,6 +716,7 @@ function syncDetailPendingApproval(session = state.detail.session, timelineState
     );
   const sessionStillPending =
     sessionPending &&
+    !isApprovalDismissed(session?.sessionId, sessionPending.requestId, sessionPending.callId) &&
     isApprovalSuppressed(session?.sessionId, sessionPending.requestId, sessionPending.callId);
 
   if (!timelinePending && !detailPending && !sessionStillPending) {
@@ -697,6 +731,20 @@ function mergeDetailTimelineRawEvents(nextRawEvents) {
     return;
   }
 
+  const activeSessionId = getActiveDetailSessionId();
+  if (!activeSessionId) {
+    return;
+  }
+
+  const filteredRawEvents = nextRawEvents.filter((rawEvent) => {
+    const eventSessionId = String(rawEvent?.sessionId || rawEvent?.session_id || "").trim();
+    return !eventSessionId || eventSessionId === activeSessionId;
+  });
+
+  if (filteredRawEvents.length === 0) {
+    return;
+  }
+
   const existingIds = new Set(state.detail.rawEvents.map((event) => event.id));
   const currentMaxSeq = state.detail.rawEvents.reduce(
     (maxSeq, event) => Math.max(maxSeq, Number(event?.seq || 0)),
@@ -705,7 +753,7 @@ function mergeDetailTimelineRawEvents(nextRawEvents) {
   const appended = [];
   let canApplyIncrementally = true;
 
-  nextRawEvents.forEach((rawEvent) => {
+  filteredRawEvents.forEach((rawEvent) => {
     if (!rawEvent?.id || existingIds.has(rawEvent.id)) {
       return;
     }
@@ -740,19 +788,41 @@ function mergeDetailTimelineRawEvents(nextRawEvents) {
   syncDetailPendingApproval(state.detail.session, state.detail.timelineState);
 }
 
+function getActiveDetailSessionId() {
+  return String(state.workspace.activeSessionId || state.detail.session?.sessionId || "").trim();
+}
+
+function isActiveDetailSession(sessionId) {
+  const normalizedSessionId = String(sessionId || "").trim();
+  return Boolean(normalizedSessionId) && getActiveDetailSessionId() === normalizedSessionId;
+}
+
 async function catchUpSessionEvents(sessionId, afterSeq) {
+  const normalizedSessionId = String(sessionId || "").trim();
   let nextAfter = Number(afterSeq || 0);
-  if (!nextAfter) {
+  if (!normalizedSessionId || !nextAfter || !isActiveDetailSession(normalizedSessionId)) {
     return;
   }
 
   for (let page = 0; page < 10; page += 1) {
-    const payload = await getSessionEvents(sessionId, {
+    if (!isActiveDetailSession(normalizedSessionId)) {
+      return;
+    }
+
+    const payload = await getSessionEvents(normalizedSessionId, {
       after: nextAfter,
       limit: 200,
     });
+    if (!isActiveDetailSession(normalizedSessionId)) {
+      return;
+    }
 
-    const items = Array.isArray(payload?.items) ? payload.items : [];
+    const items = Array.isArray(payload?.items)
+      ? payload.items.filter((item) => {
+          const eventSessionId = String(item?.sessionId || item?.session_id || "").trim();
+          return !eventSessionId || eventSessionId === normalizedSessionId;
+        })
+      : [];
     if (items.length === 0) {
       return;
     }
@@ -1326,6 +1396,7 @@ const state = {
     codexStatus: null,
     codexQuota: null,
     pendingApproval: null,
+    dismissedApprovalKeys: {},
     resolvingApprovalRequestId: "",
     resolvingApprovalSessionId: "",
     resolvingApprovalCallId: "",
@@ -1347,6 +1418,7 @@ const state = {
     inspectDrawerOpen: false,
     inspectSelectionKey: "",
     renderTimerId: 0,
+    loadRequestId: 0,
     resumeSyncInFlight: false,
     lastResumeSyncAt: 0,
     ...DEFAULT_DETAIL_VIEW,
@@ -1369,6 +1441,7 @@ window.addEventListener("pageshow", () => {
 });
 
 function renderRoute() {
+  state.detail.loadRequestId = Number(state.detail.loadRequestId || 0) + 1;
   cleanupSocket();
   cleanupDetailClock();
   cleanupLiveResumeSync();
@@ -3048,30 +3121,50 @@ function renderSessionsList() {
 }
 
 async function renderSessionDetailPage(sessionId) {
-  state.workspace.activeSessionId = sessionId;
+  const normalizedSessionId = String(sessionId || "").trim();
+  if (!normalizedSessionId) {
+    return;
+  }
+
+  const previousSessionId = String(state.detail.session?.sessionId || "").trim();
+  if (previousSessionId !== normalizedSessionId) {
+    state.detail.dismissedApprovalKeys = {};
+  }
+
+  state.workspace.activeSessionId = normalizedSessionId;
+  const loadRequestId = Number(state.detail.loadRequestId || 0) + 1;
+  state.detail.loadRequestId = loadRequestId;
+  const isStaleDetailLoad = () =>
+    state.detail.loadRequestId !== loadRequestId || state.workspace.activeSessionId !== normalizedSessionId;
   const mainSlot = document.querySelector("#workspace-main-slot");
   if (mainSlot) {
     mainSlot.innerHTML = loadingCard(t("workspace.loading.session"));
   } else {
     app.innerHTML = renderWorkspaceShell({
-      sidebarHtml: renderWorkspaceSidebar(sessionId),
+      sidebarHtml: renderWorkspaceSidebar(normalizedSessionId),
       mainHtml: loadingCard(t("workspace.loading.session")),
     });
     syncWorkspaceShellState();
     bindWorkspaceCreateDialogControls();
     bindWorkspaceImportDialogControls();
-    bindWorkspaceSidebarControls(sessionId);
+    bindWorkspaceSidebarControls(normalizedSessionId);
   }
 
   try {
-    await syncImportedSession(sessionId).catch(() => null);
+    await syncImportedSession(normalizedSessionId).catch(() => null);
+    if (isStaleDetailLoad()) {
+      return;
+    }
 
     const [session, eventData, uiOptionsResult, hostsResult] = await Promise.all([
-      getSession(sessionId),
-      loadInitialSessionEvents(sessionId),
+      getSession(normalizedSessionId),
+      loadInitialSessionEvents(normalizedSessionId),
       getCodexUiOptions().catch(() => null),
       getCodexHosts().catch(() => null),
     ]);
+    if (isStaleDetailLoad()) {
+      return;
+    }
 
     const uiOptions =
       uiOptionsResult &&
@@ -3081,6 +3174,14 @@ async function renderSessionDetailPage(sessionId) {
       uiOptionsResult.reasoningLevels.length > 0
         ? uiOptionsResult
         : CLIENT_FALLBACK_CODEX_UI_OPTIONS;
+    const codexStatus = await getCodexStatus({
+      sessionId: normalizedSessionId,
+      threadId: session.codexThreadId || "",
+      cwd: session.projectPath || "",
+    }).catch(() => null);
+    if (isStaleDetailLoad()) {
+      return;
+    }
 
     state.detail.session = session;
     replaceDetailTimelineRawEvents(eventData.items);
@@ -3124,12 +3225,8 @@ async function renderSessionDetailPage(sessionId) {
     state.detail.inspectDrawerOpen = false;
     state.detail.inspectSelectionKey = "";
     state.detail.optimisticSend = null;
-    state.detail.codexQuota = readCachedCodexQuota(sessionId);
-    state.detail.codexStatus = await getCodexStatus({
-      sessionId,
-      threadId: session.codexThreadId || "",
-      cwd: session.projectPath || "",
-    }).catch(() => null);
+    state.detail.codexQuota = readCachedCodexQuota(normalizedSessionId);
+    state.detail.codexStatus = codexStatus;
     state.socketState = "connecting";
 
     const detailQuery = parseHashRoute(window.location.hash || "").query || "";
@@ -3139,26 +3236,36 @@ async function renderSessionDetailPage(sessionId) {
     }
 
     renderSessionDetail();
-    attachSessionSocket(sessionId);
-    void catchUpSessionEvents(sessionId, state.detail.cursor)
+    if (isStaleDetailLoad()) {
+      return;
+    }
+
+    attachSessionSocket(normalizedSessionId);
+    void catchUpSessionEvents(normalizedSessionId, state.detail.cursor)
       .then(() => {
-        scheduleSessionDetailRender();
+        if (!isStaleDetailLoad()) {
+          scheduleSessionDetailRender();
+        }
       })
       .catch(() => null);
-    scheduleImportedSessionSync(sessionId);
+    scheduleImportedSessionSync(normalizedSessionId);
   } catch (error) {
+    if (isStaleDetailLoad()) {
+      return;
+    }
+
     const nextMainSlot = document.querySelector("#workspace-main-slot");
     if (nextMainSlot) {
       nextMainSlot.innerHTML = errorCard(messageOf(error));
     } else {
       app.innerHTML = renderWorkspaceShell({
-        sidebarHtml: renderWorkspaceSidebar(sessionId),
+        sidebarHtml: renderWorkspaceSidebar(normalizedSessionId),
         mainHtml: errorCard(messageOf(error)),
       });
       syncWorkspaceShellState();
       bindWorkspaceCreateDialogControls();
       bindWorkspaceImportDialogControls();
-      bindWorkspaceSidebarControls(sessionId);
+      bindWorkspaceSidebarControls(normalizedSessionId);
     }
   }
 }
@@ -3674,14 +3781,33 @@ function scheduleSessionDetailRender(options = {}) {
 }
 
 function attachSessionSocket(sessionId) {
-  state.ws = connectSessionSocket(sessionId, {
+  const normalizedSessionId = String(sessionId || "").trim();
+  if (!normalizedSessionId) {
+    return;
+  }
+
+  cleanupSocket();
+  const socket = connectSessionSocket(normalizedSessionId, {
     onStateChange(nextState) {
+      if (state.ws !== socket || !isActiveDetailSession(normalizedSessionId)) {
+        return;
+      }
+
       state.socketState = nextState;
       if (state.detail.session) {
         scheduleSessionDetailRender();
       }
     },
     onEvent(event) {
+      const eventSessionId = String(event?.sessionId || event?.session_id || "").trim();
+      if (
+        state.ws !== socket ||
+        !isActiveDetailSession(normalizedSessionId) ||
+        (eventSessionId && eventSessionId !== normalizedSessionId)
+      ) {
+        return;
+      }
+
       if (state.detail.session) {
         state.detail.session.updatedAt = new Date().toISOString();
         if (event.type === "turn.started") {
@@ -3705,12 +3831,12 @@ function attachSessionSocket(sessionId) {
           event.content.startsWith("Codex thread started: ")
         ) {
           state.detail.session.codexThreadId = event.content.slice("Codex thread started: ".length);
-          refreshCodexStatus(sessionId);
+          refreshCodexStatus(normalizedSessionId);
         }
       }
 
       if ((event.type === "token_count" || event.type === "codex.quota") && state.detail.session) {
-        setDetailCodexQuota(state.detail.session.sessionId, event.payload);
+        setDetailCodexQuota(normalizedSessionId, event.payload);
       }
 
       trackUnseenEvents([event]);
@@ -3719,6 +3845,7 @@ function attachSessionSocket(sessionId) {
       scheduleSessionDetailRender();
     },
   });
+  state.ws = socket;
 }
 
 async function refreshCodexStatus(sessionId) {
@@ -7041,6 +7168,15 @@ function renderPendingApprovalBar(detailState) {
   const restoreHint = !canResolve
     ? `<p class="approval-banner-meta approval-banner-meta--warning">${escapeHtml(t("approval.restoreHint"))}</p>`
     : "";
+  const actionHtml = canResolve
+    ? `
+        <button type="button" class="secondary-button" data-approval-decision="decline">${escapeHtml(t("approval.deny"))}</button>
+        <button type="button" class="secondary-button" data-approval-decision="accept">${escapeHtml(t("approval.allowOnce"))}</button>
+        <button type="button" class="primary-button" data-approval-decision="acceptForSession">${escapeHtml(t("approval.allowForTurn"))}</button>
+      `
+    : `
+        <button type="button" class="primary-button" data-approval-retry="true">${escapeHtml(t("approval.retryAction"))}</button>
+      `;
 
   return `
     <section class="approval-banner" data-approval-id="${escapeHtml(approval.requestId)}" data-approval-resumable="${canResolve ? "true" : "false"}">
@@ -7073,9 +7209,7 @@ function renderPendingApprovalBar(detailState) {
         ${restoreHint}
       </div>
       <div class="approval-banner-actions">
-        <button type="button" class="secondary-button" data-approval-decision="decline" ${canResolve ? "" : "disabled"}>${escapeHtml(t("approval.deny"))}</button>
-        <button type="button" class="secondary-button" data-approval-decision="accept" ${canResolve ? "" : "disabled"}>${escapeHtml(t("approval.allowOnce"))}</button>
-        <button type="button" class="primary-button" data-approval-decision="acceptForSession" ${canResolve ? "" : "disabled"}>${escapeHtml(t("approval.allowForTurn"))}</button>
+        ${actionHtml}
       </div>
     </section>
   `;
@@ -7083,7 +7217,66 @@ function renderPendingApprovalBar(detailState) {
 
 function bindPendingApprovalControls(sessionId) {
   const banner = document.querySelector("#session-approval-slot .approval-banner");
-  if (!banner || banner.getAttribute("data-approval-resumable") === "false") {
+  if (!banner) {
+    return;
+  }
+
+  const retryButton = banner.querySelector("[data-approval-retry]");
+  if (retryButton instanceof HTMLButtonElement) {
+    retryButton.onclick = async () => {
+      const approval = state.detail.pendingApproval;
+      const requestId = banner.getAttribute("data-approval-id");
+      if (!approval || !requestId) {
+        return;
+      }
+
+      const previousPendingApproval = { ...approval };
+      const previousStatus = state.detail.session?.status || "waiting_input";
+      const previousLiveBusy = Boolean(state.detail.session?.liveBusy);
+      retryButton.disabled = true;
+      banner.setAttribute("aria-busy", "true");
+      state.detail.pendingApproval = null;
+      if (state.detail.session?.sessionId === sessionId) {
+        state.detail.session.status = "running";
+        state.detail.session.liveBusy = true;
+      }
+      scheduleSessionDetailRender({ immediate: true });
+
+      try {
+        const codex = buildCodexLaunchPayload(
+          state.detail.codexLaunch,
+          state.detail.codexUiOptions,
+        );
+        const payload = codex ? { codex } : {};
+        await retrySessionApproval(sessionId, requestId, payload);
+        await resumeActiveSessionDetail("approval-retry");
+      } catch (error) {
+        if (isTerminalApprovalError(error)) {
+          dismissApproval(sessionId, requestId);
+          state.detail.pendingApproval = null;
+          const refreshedSession = await getSession(sessionId).catch(() => null);
+          if (refreshedSession && state.detail.session?.sessionId === sessionId) {
+            state.detail.session = refreshedSession;
+            updateSessionListItem(refreshedSession);
+          } else if (state.detail.session?.sessionId === sessionId) {
+            state.detail.session.status = previousStatus;
+            state.detail.session.liveBusy = previousLiveBusy;
+          }
+          syncDetailPendingApproval(state.detail.session, state.detail.timelineState);
+        } else {
+          state.detail.pendingApproval = previousPendingApproval;
+          if (state.detail.session?.sessionId === sessionId) {
+            state.detail.session.status = previousStatus;
+            state.detail.session.liveBusy = previousLiveBusy;
+          }
+        }
+        scheduleSessionDetailRender({ immediate: true });
+        showToast(messageOf(error));
+      }
+    };
+  }
+
+  if (banner.getAttribute("data-approval-resumable") === "false") {
     return;
   }
 
@@ -7125,7 +7318,18 @@ function bindPendingApprovalControls(sessionId) {
         if (isApprovalSuppressed(sessionId, requestId, previousPendingApproval?.callId)) {
           clearResolvingApprovalState();
         }
-        state.detail.pendingApproval = previousPendingApproval;
+        if (isTerminalApprovalError(error)) {
+          dismissApproval(sessionId, requestId);
+          state.detail.pendingApproval = null;
+          const refreshedSession = await getSession(sessionId).catch(() => null);
+          if (refreshedSession && state.detail.session?.sessionId === sessionId) {
+            state.detail.session = refreshedSession;
+            updateSessionListItem(refreshedSession);
+          }
+          syncDetailPendingApproval(state.detail.session, state.detail.timelineState);
+        } else {
+          state.detail.pendingApproval = previousPendingApproval;
+        }
         showToast(messageOf(error));
         scheduleSessionDetailRender({ immediate: true });
       }

package/web/i18n/locales/en.js

@@ -64,9 +64,9 @@ export default {
   "projects.registryEyebrow": "Project registry",
   "projects.addTitle": "Add project",
   "projects.name": "Project name",
-  "projects.namePlaceholder": "e.g. easygo-service",
+  "projects.namePlaceholder": "e.g. my-service",
   "projects.path": "Local path",
-  "projects.pathPlaceholder": "/workspace/easygo-service",
+  "projects.pathPlaceholder": "/workspace/my-service",
   "projects.register": "Register project",
   "projects.listTitle": "Projects",
   "projects.count": ({ count }) => (count === 1 ? "1 project" : `${count} projects`),
@@ -198,6 +198,7 @@ export default {
   "approval.restore": "Restart required",
   "approval.continueHint": "This step needs your approval before execution can continue.",
   "approval.restoreHint": "This approval request was restored from history and the runtime is no longer active. Send the task again to request approval one more time.",
+  "approval.retryAction": "Request again",
   "approval.deny": "Deny",
   "approval.allowOnce": "Allow once",
   "approval.allowForTurn": "Allow for turn",

package/web/i18n/locales/zh-CN.js

@@ -64,9 +64,9 @@ export default {
   "projects.registryEyebrow": "项目登记",
   "projects.addTitle": "新增项目",
   "projects.name": "项目名",
-  "projects.namePlaceholder": "例如 easygo-service",
+  "projects.namePlaceholder": "例如 my-service",
   "projects.path": "本地路径",
-  "projects.pathPlaceholder": "/workspace/easygo-service",
+  "projects.pathPlaceholder": "/workspace/my-service",
   "projects.register": "登记项目",
   "projects.listTitle": "项目列表",
   "projects.count": ({ count }) => `${count} 个项目`,
@@ -198,6 +198,7 @@ export default {
   "approval.restore": "需重新发起",
   "approval.continueHint": "这一步需要你的确认后才能继续执行。",
   "approval.restoreHint": "这条授权请求是从历史事件恢复的，当前运行已经结束。请重新发送这轮任务以再次发起授权。",
+  "approval.retryAction": "重新发起授权",
   "approval.deny": "拒绝",
   "approval.allowOnce": "允许一次",
   "approval.allowForTurn": "本轮允许",

package/web/session-timeline-reducer.js

@@ -8,11 +8,35 @@ const TURN_STATUS_PRIORITY = {
   failed: 3,
   aborted: 4,
 };
+const MAX_COMMAND_OUTPUT_CHARS = 80 * 1024;
+const MAX_PATCH_OUTPUT_CHARS = 48 * 1024;
+const OUTPUT_TRUNCATION_NOTICE = "\n\n[output truncated]\n";
 
 function createItemIndex() {
   return new Map();
 }
 
+function clampOutputText(text, maxChars = MAX_COMMAND_OUTPUT_CHARS) {
+  const safeText = String(text || "");
+  if (!safeText) {
+    return "";
+  }
+  if (safeText.endsWith(OUTPUT_TRUNCATION_NOTICE)) {
+    return safeText;
+  }
+
+  const contentLimit = Math.max(0, maxChars - OUTPUT_TRUNCATION_NOTICE.length);
+  if (safeText.length <= contentLimit) {
+    return safeText;
+  }
+
+  return `${safeText.slice(0, contentLimit)}${OUTPUT_TRUNCATION_NOTICE}`;
+}
+
+function appendClampedOutput(currentText, textDelta, maxChars = MAX_COMMAND_OUTPUT_CHARS) {
+  return clampOutputText(`${String(currentText || "")}${String(textDelta || "")}`, maxChars);
+}
+
 function nextTurnFallbackId(event) {
   return event?.turnId || `turn:${event?.id || crypto.randomUUID?.() || Date.now()}`;
 }
@@ -526,10 +550,18 @@ export function reduceTimeline(state, event) {
       const nextStdout =
         event.payload?.stream === "stderr"
           ? currentCommand?.stdout || ""
-          : appendDeltaText(currentCommand?.stdout, event.payload?.textDelta);
+          : appendClampedOutput(
+              currentCommand?.stdout,
+              event.payload?.textDelta,
+              MAX_COMMAND_OUTPUT_CHARS,
+            );
       const nextStderr =
         event.payload?.stream === "stderr"
-          ? appendDeltaText(currentCommand?.stderr, event.payload?.textDelta)
+          ? appendClampedOutput(
+              currentCommand?.stderr,
+              event.payload?.textDelta,
+              MAX_COMMAND_OUTPUT_CHARS,
+            )
           : currentCommand?.stderr || "";
       upsertCommand(state, event, turnId, {
         status: currentCommand?.status === "awaiting_approval" ? "awaiting_approval" : "running",
@@ -552,14 +584,22 @@ export function reduceTimeline(state, event) {
         status: completedStatus,
         command: event.payload?.command || state.commandsByCallId[event.callId]?.command || "",
         cwd: event.payload?.cwd || state.commandsByCallId[event.callId]?.cwd || null,
-        stdout: event.payload?.stdout || state.commandsByCallId[event.callId]?.stdout || "",
-        stderr: event.payload?.stderr || state.commandsByCallId[event.callId]?.stderr || "",
-        output:
+        stdout: clampOutputText(
+          event.payload?.stdout || state.commandsByCallId[event.callId]?.stdout || "",
+          MAX_COMMAND_OUTPUT_CHARS,
+        ),
+        stderr: clampOutputText(
+          event.payload?.stderr || state.commandsByCallId[event.callId]?.stderr || "",
+          MAX_COMMAND_OUTPUT_CHARS,
+        ),
+        output: clampOutputText(
           event.payload?.aggregatedOutput ||
-          event.payload?.formattedOutput ||
-          event.payload?.output ||
-          state.commandsByCallId[event.callId]?.output ||
-          "",
+            event.payload?.formattedOutput ||
+            event.payload?.output ||
+            state.commandsByCallId[event.callId]?.output ||
+            "",
+          MAX_COMMAND_OUTPUT_CHARS,
+        ),
         exitCode:
           event.payload?.exitCode ?? state.commandsByCallId[event.callId]?.exitCode ?? null,
         duration: event.payload?.duration || state.commandsByCallId[event.callId]?.duration || null,
@@ -583,7 +623,11 @@ export function reduceTimeline(state, event) {
       const currentPatch = state.patchesByCallId[patchId];
       upsertPatch(state, event, turnId, {
         status: currentPatch?.status || "running",
-        output: appendDeltaText(currentPatch?.output, event.payload?.textDelta),
+        output: appendClampedOutput(
+          currentPatch?.output,
+          event.payload?.textDelta,
+          MAX_PATCH_OUTPUT_CHARS,
+        ),
         outputStatus: "streaming",
       });
       setTurnStatus(turn, "running");
@@ -598,9 +642,18 @@ export function reduceTimeline(state, event) {
         status: patchStatus,
         patchText:
           event.payload?.patchText || state.patchesByCallId[event.callId]?.patchText || "",
-        output: event.payload?.output || state.patchesByCallId[event.callId]?.output || "",
-        stdout: event.payload?.stdout || state.patchesByCallId[event.callId]?.stdout || "",
-        stderr: event.payload?.stderr || state.patchesByCallId[event.callId]?.stderr || "",
+        output: clampOutputText(
+          event.payload?.output || state.patchesByCallId[event.callId]?.output || "",
+          MAX_PATCH_OUTPUT_CHARS,
+        ),
+        stdout: clampOutputText(
+          event.payload?.stdout || state.patchesByCallId[event.callId]?.stdout || "",
+          MAX_PATCH_OUTPUT_CHARS,
+        ),
+        stderr: clampOutputText(
+          event.payload?.stderr || state.patchesByCallId[event.callId]?.stderr || "",
+          MAX_PATCH_OUTPUT_CHARS,
+        ),
         changes: event.payload?.changes || state.patchesByCallId[event.callId]?.changes || {},
         success:
           event.payload?.success ?? state.patchesByCallId[event.callId]?.success ?? null,