@usulpro/codex-bee 0.1.2 → 0.1.3

package/dist/cli.js

@@ -2929,18 +2929,19 @@ function getDisplayedRunState(snapshot, now = Date.now()) {
   }
   return "idle";
 }
-function formatSessionInfo(snapshot, now = Date.now()) {
+function formatSessionInfo(snapshot, mode, now = Date.now()) {
+  if (mode === "off") {
+    return "Bee is in Off mode. Codex-bee stays passive and only records session stats and turn history.";
+  }
   const parts = [];
   if (snapshot.session.currentTurn !== null && snapshot.session.totalTurns !== null) {
     parts.push(`${snapshot.session.currentTurn}/${snapshot.session.totalTurns} turns`);
-  } else if (snapshot.session.currentTurn !== null) {
-    parts.push(`${snapshot.session.currentTurn} turns`);
   }
   const timeLeftLabel = formatTimeLeft(snapshot.session.stopAt, now);
   if (timeLeftLabel) {
     parts.push(timeLeftLabel);
   }
-  const hookStatusLabel = formatHookStatus(snapshot);
+  const hookStatusLabel = snapshot.session.stopScript ? formatHookStatus(snapshot) : null;
   if (hookStatusLabel) {
     parts.push(hookStatusLabel);
   }
@@ -3317,41 +3318,6 @@ function buildFigletLines(title, maxWidth) {
   }
   return [title];
 }
-function buildAnnouncementPanelLines(state, width, palette) {
-  if (!state.runtime.announcement || width < 8) {
-    return [];
-  }
-  const innerWidth = Math.max(width - 4, 4);
-  const contentLines = wrapText(state.runtime.announcement.message, innerWidth);
-  const borderColor = palette.announcementBorder ?? palette.accent ?? palette.primary;
-  return [
-    createTextLine("announcement-top", `\u256D${"\u2500".repeat(Math.max(width - 2, 0))}\u256E`, {
-      backgroundColor: palette.announcementBackground,
-      color: borderColor
-    }),
-    ...contentLines.map((line, index) => createLine(`announcement-${index}`, [
-      {
-        backgroundColor: palette.announcementBackground,
-        color: borderColor,
-        text: "\u2502 "
-      },
-      {
-        backgroundColor: palette.announcementBackground,
-        color: palette.announcementText ?? palette.bodyText,
-        text: padDisplayWidth(line, innerWidth)
-      },
-      {
-        backgroundColor: palette.announcementBackground,
-        color: borderColor,
-        text: " \u2502"
-      }
-    ], palette.announcementBackground)),
-    createTextLine("announcement-bottom", `\u2570${"\u2500".repeat(Math.max(width - 2, 0))}\u256F`, {
-      backgroundColor: palette.announcementBackground,
-      color: borderColor
-    })
-  ];
-}
 function buildHeaderColumnLines(state, title, width, palette) {
   const titleLines = buildFigletLines(title.toUpperCase(), Math.max(width, 16));
   return [
@@ -3359,8 +3325,7 @@ function buildHeaderColumnLines(state, title, width, palette) {
     createTextLine("versions", `codex-bee v${state.runtime.beeVersion} \u2022 codex v${state.runtime.codexVersion}`, {
       color: palette.muted,
       dimColor: !palette.muted
-    }),
-    ...buildAnnouncementPanelLines(state, width, palette)
+    })
   ];
 }
 function buildHeaderLines(state, title, width, palette) {
@@ -3382,7 +3347,7 @@ function getLogColor(kind, palette) {
   return palette.muted;
 }
 function buildDividerLabel(turn, totalTurns, durationMs, width) {
-  const parts = [totalTurns === null ? `${turn} turns` : `${turn}/${totalTurns} turns`];
+  const parts = [totalTurns === null ? `turn ${turn}` : `turn ${turn}/${totalTurns}`];
   if (durationMs !== null) {
     parts.push(formatCompactDuration(durationMs));
   }
@@ -3503,17 +3468,17 @@ function buildLogLines(state, width, palette) {
   state.runtime.logs.forEach((group, groupIndex) => {
     if (groupIndex > 0) {
       logLines.push(createSpacerLine(`divider-gap-${group.id}`, palette.logBackground));
-      logLines.push(createTextLine(`divider-${group.id}`, buildDividerLabel(
-        group.turn,
-        group.totalTurns,
-        group.durationMs,
-        width
-      ), {
-        backgroundColor: palette.logBackground,
-        color: palette.muted,
-        dimColor: !palette.muted
-      }));
     }
+    logLines.push(createTextLine(`divider-${group.id}`, buildDividerLabel(
+      group.turn,
+      group.totalTurns,
+      group.durationMs,
+      width
+    ), {
+      backgroundColor: palette.logBackground,
+      color: palette.muted,
+      dimColor: !palette.muted
+    }));
     group.entries.forEach((entry) => {
       const previewLines = wrapAndLimit(normalizeLogEntryText(entry), contentWidth, 3);
       previewLines.forEach((line, lineIndex) => {
@@ -3574,20 +3539,6 @@ function buildStatusTokens(state, palette, animationTick, now, width) {
       text: connectionSpec.compactLabel
     }
   ];
-  const versionToken = [
-    {
-      color: palette.muted,
-      dimColor: !palette.muted,
-      text: `codex v${state.runtime.codexVersion}`
-    }
-  ];
-  const shortVersionToken = [
-    {
-      color: palette.muted,
-      dimColor: !palette.muted,
-      text: `v${state.runtime.codexVersion}`
-    }
-  ];
   const runStateToken = [
     {
       color: displayedRunState === "running" ? palette.primary : displayedRunState === "quiet" ? palette.warning : palette.muted,
@@ -3623,9 +3574,8 @@ function buildStatusTokens(state, palette, animationTick, now, width) {
     }
   ];
   const variants = [
-    [loaderToken, connectionToken, versionToken, runStateToken, hotkeyToken, commandsToken],
-    [loaderToken, connectionToken, shortVersionToken, runStateToken, hotkeyToken, commandsToken],
-    [loaderToken, connectionToken, shortVersionToken, runStateToken, hotkeyToken, shortCommandsToken],
+    [loaderToken, connectionToken, runStateToken, hotkeyToken, commandsToken],
+    [loaderToken, compactConnectionToken, runStateToken, hotkeyToken, commandsToken],
     [loaderToken, compactConnectionToken, runStateToken, shortHotkeyToken, shortCommandsToken]
   ];
   for (const variant of variants) {
@@ -3721,30 +3671,42 @@ function buildDropdownLines(state, width, palette) {
     ], backgroundColor);
   });
 }
-function buildNoticeLine(state, palette) {
-  if (!state.notice) {
-    return null;
+function buildPromptPreviewLines(state, width) {
+  if (state.activeMode === "off") {
+    const lengths = [
+      Math.max(Math.floor(width * 0.68), 18),
+      Math.max(Math.floor(width * 0.52), 14),
+      Math.max(Math.floor(width * 0.6), 16)
+    ];
+    return lengths.map((length, index) => ({
+      colorKind: "muted",
+      text: "\u2591".repeat(Math.max(Math.min(length - index, width), 8))
+    }));
   }
-  return createTextLine(`notice-${state.notice.id}`, `\u26A0 ${state.notice.message}`, {
-    backgroundColor: palette.statusBottomBackground,
-    color: state.notice.kind === "error" ? palette.error : state.notice.kind === "warning" ? palette.warning : palette.primary
-  });
+  return formatPromptPreview(getActivePrompt(state), 5).flatMap((line) => wrapAndLimit(line, width, 5)).slice(0, 5).map((line) => ({
+    colorKind: "body",
+    text: line
+  }));
 }
 function buildPromptFooterLines(state, width, palette, cursorVisible, animationTick, now) {
   const lines = [];
   const modeColor = getModeColor(state.activeMode, palette);
   const promptPreviewWidth = Math.max(width - 2, 16);
-  const promptLines = formatPromptPreview(getActivePrompt(state), 5).flatMap((line) => wrapAndLimit(line, promptPreviewWidth, 5)).slice(0, 5);
+  const promptLines = buildPromptPreviewLines(state, promptPreviewWidth);
   const inputFieldWidth = Math.max(width - 2, 12);
   const inputContentWidth = Math.max(inputFieldWidth - 1, 8);
   const composerLines = buildComposerVisualLines(state.composerText, inputContentWidth);
   const cursorLineIndex = getComposerCursorLineIndex(composerLines, state.composerCursorOffset);
   const placeholder = getVisibleSlashPlaceholder(state);
-  lines.push(createTextLine("session-info", formatSessionInfo(state.runtime, now) || "Session metadata will appear after the first turn.", {
-    backgroundColor: palette.statusTopBackground,
-    color: palette.bodyText
-  }));
-  lines.push(createSpacerLine("session-gap", palette.footerBase));
+  const sessionInfoText = formatSessionInfo(state.runtime, state.activeMode, now);
+  if (sessionInfoText) {
+    lines.push(createTextLine("session-info", sessionInfoText, {
+      backgroundColor: palette.statusTopBackground,
+      color: state.activeMode === "off" ? palette.muted : palette.bodyText,
+      dimColor: state.activeMode === "off" && !palette.muted
+    }));
+    lines.push(createSpacerLine("session-gap", palette.footerBase));
+  }
   lines.push(createTextLine("prompt-top-border", "\u2500".repeat(width), {
     backgroundColor: palette.promptBackground,
     color: palette.promptBorder ?? palette.muted
@@ -3763,8 +3725,9 @@ function buildPromptFooterLines(state, width, palette, cursorVisible, animationT
       },
       {
         backgroundColor: palette.promptBackground,
-        color: palette.bodyText,
-        text: padDisplayWidth(line, width - 2)
+        color: line.colorKind === "muted" ? palette.muted : palette.bodyText,
+        dimColor: line.colorKind === "muted",
+        text: padDisplayWidth(line.text, width - 2)
       }
     ], palette.promptBackground));
   });
@@ -3848,8 +3811,7 @@ function buildPromptFooterLines(state, width, palette, cursorVisible, animationT
 function buildBeeScreenLines(state, title, columns, cursorVisible, palette, animationTick, now) {
   const bodyLines = buildBodyLines(state, title, columns, palette);
   const footerLines = buildPromptFooterLines(state, columns, palette, cursorVisible, animationTick, now);
-  const noticeLine = buildNoticeLine(state, palette);
-  return noticeLine ? [...bodyLines, createSpacerLine("body-footer-gap"), ...footerLines, createSpacerLine("notice-gap", palette.footerBase), noticeLine] : [...bodyLines, createSpacerLine("body-footer-gap"), ...footerLines];
+  return [...bodyLines, createSpacerLine("body-footer-gap"), ...footerLines];
 }
 function buildCodexScreenLines(state, columns, palette) {
   const bodyLines = state.runtime.codexBufferLines.map((line, index) => createTextLine(`codex-${index}`, line, {
@@ -3871,8 +3833,7 @@ function buildCodexScreenLines(state, columns, palette) {
       dimColor: !palette.muted
     })
   ];
-  const noticeLine = buildNoticeLine(state, palette);
-  return noticeLine ? [...bodyLines, createSpacerLine("codex-gap"), ...footerLines, createSpacerLine("codex-notice-gap", palette.footerBase), noticeLine] : [...bodyLines, createSpacerLine("codex-gap"), ...footerLines];
+  return [...bodyLines, createSpacerLine("codex-gap"), ...footerLines];
 }
 function buildNarrowScreenLines(columns, palette) {
   return [
@@ -4458,6 +4419,7 @@ var LiveUiRuntimeHost = class {
   #listeners = /* @__PURE__ */ new Set();
   #recentEvents = [];
   #entryCounter = 0;
+  #handledStopFingerprints = /* @__PURE__ */ new Set();
   #lastOutputActivityNotificationAt = 0;
   #pendingPrompts = [];
   #snapshot;
@@ -4508,6 +4470,8 @@ var LiveUiRuntimeHost = class {
     const eventName = capture.payload?.hook_event_name ?? null;
     if (eventName === "SessionStart") {
       const source = capture.payload?.source;
+      this.#handledStopFingerprints.clear();
+      this.#pendingPrompts = [];
       this.#snapshot = {
         ...this.#snapshot,
         connectionState: "connected"
@@ -4557,6 +4521,8 @@ var LiveUiRuntimeHost = class {
   async executeCommand(command) {
     switch (command.id) {
       case "clear-log":
+        this.#handledStopFingerprints.clear();
+        this.#pendingPrompts = [];
         this.#snapshot = {
           ...this.#snapshot,
           logs: [],
@@ -4601,13 +4567,13 @@ var LiveUiRuntimeHost = class {
       case "steps-count": {
         const currentContinuation = this.#continuation.getSnapshot();
         const updatedSnapshot = this.#continuation.updateInteractiveDraft({
-          maxContinues: command.steps,
+          maxContinues: currentContinuation.injectionsUsed + command.steps,
           maxDurationMs: currentContinuation.maxDurationMs,
           prompt: currentContinuation.promptText
         });
         this.#syncContinuationState(updatedSnapshot);
-        this.#pushEventLine(`Updated the max turns count to ${command.steps}.`);
-        return this.#createUpdate(`Updated the live max turns count to ${command.steps}.`);
+        this.#pushEventLine(`Updated the remaining max turns count to ${command.steps}.`);
+        return this.#createUpdate(`Updated the live remaining max turns count to ${command.steps}.`);
       }
       case "stop-script":
         this.#verificationCommand = command.command;
@@ -4692,6 +4658,12 @@ var LiveUiRuntimeHost = class {
   }
   recordStopCaptureHandled(event) {
     const completedAt = Date.now();
+    const terminalStatusMessage = buildTerminalStatusMessage(event);
+    const stopFingerprint = this.#buildStopFingerprint(event, terminalStatusMessage);
+    if (this.#handledStopFingerprints.has(stopFingerprint)) {
+      return;
+    }
+    this.#handledStopFingerprints.add(stopFingerprint);
     const pendingPrompt = this.#pendingPrompts.shift() ?? null;
     const transcriptUserMessage = readUserMessageFromCapture(event.capture);
     const existingGroupIndex = event.capture.payload?.turn_id ? this.#snapshot.logs.findIndex((group) => group.id === event.capture.payload?.turn_id) : -1;
@@ -4714,7 +4686,6 @@ var LiveUiRuntimeHost = class {
       );
     }
     entries.push(this.#nextLogEntry("hook", hookSummary.text, completedAt));
-    const terminalStatusMessage = buildTerminalStatusMessage(event);
     if (terminalStatusMessage) {
       entries.push(this.#nextLogEntry("status", terminalStatusMessage, completedAt));
     }
@@ -4724,24 +4695,26 @@ var LiveUiRuntimeHost = class {
       durationMs: turnStartedAt !== null ? Math.max(completedAt - turnStartedAt, 0) : existingGroup?.durationMs ?? null,
       entries,
       id: groupId,
-      totalTurns: toUiTotalTurns(continuationSnapshot.maxContinues),
+      totalTurns: null,
       turn: turnNumber
     };
     const nextLogs = existingGroupIndex >= 0 ? this.#snapshot.logs.map((group, index) => index === existingGroupIndex ? nextGroup : group) : [...this.#snapshot.logs, nextGroup];
+    const nextTotalTurns = this.#getUiTotalTurns(continuationSnapshot, nextLogs);
+    const finalizedLogs = this.#applyTotalTurns(nextLogs, nextTotalTurns);
     this.#snapshot = {
       ...this.#snapshot,
       connectionState: "connected",
       announcement: this.#buildAnnouncement(event, terminalStatusMessage),
-      logs: nextLogs,
+      logs: finalizedLogs,
       runState: "idle",
       session: {
         ...this.#snapshot.session,
-        currentTurn: nextLogs.length,
+        currentTurn: finalizedLogs.length,
         hookStatus: hookSummary.hookStatus,
         lastCodexOutputAt: completedAt,
         stopAt: getStopAt(continuationSnapshot),
         stopScript: this.#verificationCommand,
-        totalTurns: toUiTotalTurns(continuationSnapshot.maxContinues)
+        totalTurns: nextTotalTurns
       }
     };
     this.#pushEventLine(
@@ -4783,8 +4756,8 @@ var LiveUiRuntimeHost = class {
       if (!promptText || targetGroup.entries.some((entry) => entry.kind === "user")) {
         return;
       }
-      const nextLogs = [...this.#snapshot.logs];
-      nextLogs[targetIndex] = {
+      const nextLogs2 = [...this.#snapshot.logs];
+      nextLogs2[targetIndex] = {
         ...targetGroup,
         entries: [
           this.#nextLogEntry("user", promptText, startedAt),
@@ -4793,7 +4766,10 @@ var LiveUiRuntimeHost = class {
       };
       this.#snapshot = {
         ...this.#snapshot,
-        logs: nextLogs
+        logs: this.#applyTotalTurns(
+          nextLogs2,
+          this.#getUiTotalTurns(this.#continuation.getSnapshot(), nextLogs2)
+        )
       };
       return;
     }
@@ -4807,12 +4783,14 @@ var LiveUiRuntimeHost = class {
         this.#nextLogEntry("user", promptText, startedAt)
       ],
       id: turnId,
-      totalTurns: toUiTotalTurns(this.#continuation.getSnapshot().maxContinues),
+      totalTurns: null,
       turn: turnNumber
     };
+    const nextLogs = [...this.#snapshot.logs, nextGroup];
+    const nextTotalTurns = this.#getUiTotalTurns(this.#continuation.getSnapshot(), nextLogs);
     this.#snapshot = {
       ...this.#snapshot,
-      logs: [...this.#snapshot.logs, nextGroup]
+      logs: this.#applyTotalTurns(nextLogs, nextTotalTurns)
     };
   }
   #buildAnnouncement(event, terminalStatusMessage) {
@@ -4872,10 +4850,13 @@ var LiveUiRuntimeHost = class {
   }
   #syncContinuationState(snapshot) {
     const connectionState = this.#snapshot.connectionState;
-    const currentTurn = this.#snapshot.logs.length;
+    const nextTotalTurns = this.#getUiTotalTurns(snapshot, this.#snapshot.logs);
+    const nextLogs = this.#applyTotalTurns(this.#snapshot.logs, nextTotalTurns);
+    const currentTurn = nextLogs.length;
     this.#snapshot = {
       ...this.#snapshot,
       connectionState,
+      logs: nextLogs,
       prompts: {
         ...this.#snapshot.prompts,
         static: snapshot.promptText
@@ -4886,10 +4867,37 @@ var LiveUiRuntimeHost = class {
         currentTurn,
         stopAt: getStopAt(snapshot),
         stopScript: this.#verificationCommand,
-        totalTurns: toUiTotalTurns(snapshot.maxContinues)
+        totalTurns: nextTotalTurns
       }
     };
   }
+  #buildStopFingerprint(event, terminalStatusMessage) {
+    const turnId = event.capture.payload?.turn_id?.trim();
+    if (turnId) {
+      return `turn:${turnId}`;
+    }
+    return [
+      event.capture.payload?.session_id ?? "session",
+      event.capture.payload?.transcript_path ?? "",
+      event.capture.payload?.last_assistant_message ?? "",
+      terminalStatusMessage ?? ""
+    ].join("::");
+  }
+  #getCompletedTurnCount(logs = this.#snapshot.logs) {
+    return logs.filter((group) => group.entries.some((entry) => entry.kind !== "user")).length;
+  }
+  #getUiTotalTurns(snapshot, logs = this.#snapshot.logs) {
+    if (!Number.isFinite(snapshot.maxContinues)) {
+      return null;
+    }
+    return Math.max(this.#getCompletedTurnCount(logs) - snapshot.injectionsUsed + snapshot.maxContinues, 0);
+  }
+  #applyTotalTurns(logs, totalTurns) {
+    return logs.map((group) => ({
+      ...group,
+      totalTurns
+    }));
+  }
 };
 
 // src/cli.ts