tinker-agent 1.5.0 → 1.6.0

package/src/tui/app.tsx

@@ -1,5 +1,13 @@
-import { Box, Text, useApp, useInput } from "ink";
-import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { Box, Static, Text, useApp, useInput, useStdout, useWindowSize } from "ink";
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
+import { clearTerminal } from "ansi-escapes";
 import { TurnCancelledError } from "../agent/turn-cancellation";
 import { boundedMemoryError, type StoredMemorySummary } from "../memory/contracts";
 import {
@@ -11,11 +19,12 @@ import { ContextBudgetExceededError } from "../model/model-request-preflight";
 import { ModelRequestMediaAggregateError } from "../model/model-client";
 import type { SessionId } from "../ids/runtime-id";
 import { readLastAssistantResponse } from "../session/session-last-response-reader";
-import { visibleTimelineItems } from "./event-store";
 import type { PromptHistory } from "./prompt-history";
 import { Footer } from "./components/footer";
+import { AssistantMarkdownProvider } from "./components/assistant-markdown";
 import { ContextStatus } from "./components/context-status";
 import { BackgroundTasks } from "./components/background-tasks";
+import { BashConfirmation } from "./components/bash-confirmation";
 import { Header } from "./components/header";
 import { ModelPicker } from "./components/model-picker";
 import { FileViewer, FileViewerLoading } from "./components/file-viewer";
@@ -33,7 +42,11 @@ import {
   ResumeSessionPicker,
   ResumeSessionPickerLoading,
 } from "./components/resume-session-picker";
-import { Timeline } from "./components/timeline";
+import {
+  AssistantStreamSectionRow,
+  Timeline,
+  TimelineRow,
+} from "./components/timeline";
 import { parseSlashCommand, SLASH_COMMANDS } from "./slash-commands";
 import {
   resolveProjectSlashCommand,
@@ -45,6 +58,11 @@ import type { ModelProfile, ModelProfiles } from "../cli/model-profiles";
 import { loadViewFile, type ViewFile } from "./view-file";
 import { writeClipboardText } from "./clipboard";
 import type { WorkspaceFileLister } from "./workspace-file-search";
+import type { TurnUndoBarrierReason, TurnUndoResult } from "../tools/turn-undo-manager";
+import {
+  isAssistantStreamSectionItem,
+  type TuiCommittedItem,
+} from "./tui-projection-store";
 
 export type AppProps = {
   sessionController: TuiSessionController;
@@ -67,9 +85,10 @@ export type AppProps = {
 };
 
 type ResumePickerState =
-  | { status: "loading" }
+  | { status: "loading"; ownerSessionId: SessionId }
   | {
       status: "ready";
+      ownerSessionId: SessionId;
       sessions: readonly SessionSummary[];
       isResuming: boolean;
       error?: string;
@@ -84,8 +103,15 @@ type FileViewState =
   | { status: "loading"; filePath: string }
   | { status: "ready"; file: ViewFile };
 
+const STATIC_HEADER = Symbol("tui-static-header");
+const LIVE_TIMELINE_MAX_ROWS = 8;
+const LIVE_TIMELINE_WITH_TASKS_MAX_ROWS = 3;
+const BACKGROUND_TASKS_MAX_ROWS = 12;
+
 export function App(props: AppProps) {
   const { exit } = useApp();
+  const { write } = useStdout();
+  const windowSize = useWindowSize();
   const binding = useSyncExternalStore(
     props.sessionController.subscribe,
     props.sessionController.getBinding,
@@ -100,6 +126,16 @@ export function App(props: AppProps) {
     binding.projectionStore.getSnapshot,
     binding.projectionStore.getSnapshot,
   );
+  const log = useSyncExternalStore(
+    binding.projectionStore.subscribe,
+    binding.projectionStore.getLogSnapshot,
+    binding.projectionStore.getLogSnapshot,
+  );
+  const bashGuard = useSyncExternalStore(
+    (listener) => binding.subscribeBashGuard(listener),
+    () => binding.bashGuard(),
+    () => binding.bashGuard(),
+  );
   const [isRunning, setIsRunning] = useState(false);
   const [isSessionOperation, setIsSessionOperation] = useState(false);
   const [isCopying, setIsCopying] = useState(false);
@@ -120,18 +156,32 @@ export function App(props: AppProps) {
     readonly StoredMemorySummary[] | undefined
   >(undefined);
   const [viewError, setViewError] = useState<string | undefined>(undefined);
+  const [staticRenderEpoch, setStaticRenderEpoch] = useState(0);
   const [gitBranch, setGitBranch] = useState<string | undefined>(undefined);
   const [gitBranchRefresh, setGitBranchRefresh] = useState(0);
   const gitBranchReadQueue = useRef<Promise<void>>(Promise.resolve());
   const activeController = useRef<AbortController | undefined>(undefined);
   const resumePickerRequest = useRef(0);
   const fileViewRequest = useRef(0);
+  const beforeSessionCommit = useCallback(() => {
+    write(clearTerminal);
+  }, [write]);
+  const restoreStaticViewport = useCallback(() => {
+    write(clearTerminal);
+    setStaticRenderEpoch((current) => current + 1);
+  }, [write]);
+  const staticItems = useMemo<Array<typeof STATIC_HEADER | TuiCommittedItem>>(
+    () => [STATIC_HEADER, ...log.committed],
+    [log.committed],
+  );
 
   const canSwitchModel =
     state.recentTurns.length === 0 &&
     state.activeTurn === undefined &&
     props.profiles !== undefined &&
     props.profiles.profiles.size > 1;
+  const activeResumePicker =
+    resumePicker?.ownerSessionId === binding.sessionId ? resumePicker : undefined;
 
   const builtInCommands = canSwitchModel
     ? SLASH_COMMANDS
@@ -140,8 +190,6 @@ export function App(props: AppProps) {
 
   const profileList = props.profiles ? [...props.profiles.profiles.values()] : [];
 
-  const runningElapsedMs = useElapsedMs(state.activeTurn?.startedAt);
-
   useEffect(() => {
     if (readGitBranch === undefined) {
       return;
@@ -186,17 +234,22 @@ export function App(props: AppProps) {
   );
 
   const closeResumePicker = () => {
+    const shouldRestoreViewport = activeResumePicker !== undefined;
     resumePickerRequest.current += 1;
     setResumePicker(undefined);
     setIsSessionOperation(false);
     setNotice(undefined);
+    if (shouldRestoreViewport) {
+      restoreStaticViewport();
+    }
   };
 
   const openResumePicker = () => {
     const requestId = resumePickerRequest.current + 1;
+    const ownerSessionId = binding.sessionId;
     resumePickerRequest.current = requestId;
     setNotice(undefined);
-    setResumePicker({ status: "loading" });
+    setResumePicker({ status: "loading", ownerSessionId });
     setIsSessionOperation(true);
     void props.sessionController
       .listSessions()
@@ -207,14 +260,21 @@ export function App(props: AppProps) {
         if (sessions.length === 0) {
           setResumePicker(undefined);
           setNotice("No stored sessions found for this workspace.");
+          restoreStaticViewport();
           return;
         }
-        setResumePicker({ status: "ready", sessions, isResuming: false });
+        setResumePicker({
+          status: "ready",
+          ownerSessionId,
+          sessions,
+          isResuming: false,
+        });
       })
       .catch((error: unknown) => {
         if (resumePickerRequest.current === requestId) {
           setResumePicker(undefined);
           setNotice(`Session operation failed: ${errorMessage(error)}`);
+          restoreStaticViewport();
         }
       })
       .finally(() => {
@@ -232,7 +292,7 @@ export function App(props: AppProps) {
     );
     setIsSessionOperation(true);
     void props.sessionController
-      .resume(session.sessionId)
+      .resume(session.sessionId, beforeSessionCommit)
       .then(() => {
         setResumePicker(undefined);
         setNotice(`Resumed session ${session.sessionId}.`);
@@ -255,6 +315,7 @@ export function App(props: AppProps) {
     setShowModelPicker(false);
     setModelPickerState(undefined);
     setNotice(undefined);
+    restoreStaticViewport();
   };
 
   const doSwitchModel = (profile: ModelProfile) => {
@@ -263,7 +324,7 @@ export function App(props: AppProps) {
     setNotice(undefined);
     setIsSessionOperation(true);
     void props.sessionController
-      .switchModel(profile)
+      .switchModel(profile, beforeSessionCommit)
       .then(async () => {
         setGitBranchRefresh((current) => current + 1);
         try {
@@ -276,6 +337,7 @@ export function App(props: AppProps) {
         }
       })
       .catch((error: unknown) => {
+        restoreStaticViewport();
         setNotice(`Model switch failed: ${errorMessage(error)}`);
       })
       .finally(() => setIsSessionOperation(false));
@@ -284,6 +346,12 @@ export function App(props: AppProps) {
   const closeFileView = () => {
     fileViewRequest.current += 1;
     setFileView(undefined);
+    restoreStaticViewport();
+  };
+
+  const closeMemoryView = () => {
+    setMemoryView(undefined);
+    restoreStaticViewport();
   };
 
   const openMemoryView = () => {
@@ -318,6 +386,7 @@ export function App(props: AppProps) {
         if (fileViewRequest.current === requestId) {
           setFileView(undefined);
           setViewError(`View failed: ${errorMessage(error)}`);
+          restoreStaticViewport();
         }
       });
   };
@@ -432,7 +501,7 @@ export function App(props: AppProps) {
         setNotice(formatContextRetirementNotice(result));
         return;
       }
-      await props.sessionController.clear();
+      await props.sessionController.clear(beforeSessionCommit);
       signal.throwIfAborted();
       const sessionId = props.sessionController.getBinding().sessionId;
       setGitBranchRefresh((current) => current + 1);
@@ -450,10 +519,14 @@ export function App(props: AppProps) {
   ): PromptSubmissionOutcome | Promise<PromptSubmissionOutcome> => {
     const { userMessage } = submission;
     const trimmed = userMessage.content.trim();
+    const shouldRestoreViewport = showStatus || showSkills || showMcp;
     setShowStatus(false);
     setShowSkills(false);
     setShowMcp(false);
     setViewError(undefined);
+    if (shouldRestoreViewport) {
+      restoreStaticViewport();
+    }
 
     if (userMessage.attachments === undefined && trimmed.startsWith("/")) {
       try {
@@ -490,6 +563,19 @@ export function App(props: AppProps) {
           setShowStatus(true);
           return true;
         }
+        if (command.type === "yolo_status") {
+          setNotice(`Bash guard: ${bashGuard.mode} (source: ${bashGuard.source}).`);
+          return true;
+        }
+        if (command.type === "yolo") {
+          binding.setYoloMode(command.enabled);
+          setNotice(
+            command.enabled
+              ? "YOLO enabled for this session; dangerous Bash commands will run without confirmation."
+              : "YOLO disabled; dangerous Bash commands require confirmation.",
+          );
+          return true;
+        }
         if (command.type === "skills") {
           setShowSkills(true);
           return true;
@@ -520,10 +606,26 @@ export function App(props: AppProps) {
             .finally(() => setIsSessionOperation(false));
           return true;
         }
+        if (command.type === "undo") {
+          setIsSessionOperation(true);
+          void props.sessionController
+            .undo()
+            .then((result) => {
+              if (result.status === "restored" || result.status === "incomplete") {
+                setGitBranchRefresh((current) => current + 1);
+              }
+              setNotice(formatTurnUndoNotice(result));
+            })
+            .catch((error: unknown) => {
+              setNotice(errorMessage(error));
+            })
+            .finally(() => setIsSessionOperation(false));
+          return true;
+        }
         if (command.type === "clear") {
           setIsSessionOperation(true);
           void props.sessionController
-            .clear()
+            .clear(beforeSessionCommit)
             .then(() => {
               const sessionId = props.sessionController.getBinding().sessionId;
               setGitBranchRefresh((current) => current + 1);
@@ -540,7 +642,7 @@ export function App(props: AppProps) {
         if (command.type === "fork") {
           setIsSessionOperation(true);
           void props.sessionController
-            .fork()
+            .fork(beforeSessionCommit)
             .then((sessionId) => {
               setGitBranchRefresh((current) => current + 1);
               setNotice(
@@ -586,7 +688,7 @@ export function App(props: AppProps) {
         const operation =
           command.type === "resume"
             ? props.sessionController
-                .resume(command.sessionId)
+                .resume(command.sessionId, beforeSessionCommit)
                 .then(() => setNotice(`Resumed session ${command.sessionId}.`))
             : props.sessionController
                 .delete(command.sessionId)
@@ -606,94 +708,145 @@ export function App(props: AppProps) {
   };
 
   return (
-    <Box flexDirection="column">
-      {fileView?.status === "loading" ? (
-        <FileViewerLoading filePath={fileView.filePath} onCancel={closeFileView} />
-      ) : fileView?.status === "ready" ? (
-        <FileViewer file={fileView.file} onClose={closeFileView} />
-      ) : memoryView !== undefined ? (
-        <MemoryBrowser memories={memoryView} onClose={() => setMemoryView(undefined)} />
-      ) : resumePicker?.status === "loading" ? (
-        <ResumeSessionPickerLoading onCancel={closeResumePicker} />
-      ) : resumePicker?.status === "ready" ? (
-        <ResumeSessionPicker
-          sessions={resumePicker.sessions}
-          isResuming={resumePicker.isResuming}
-          error={resumePicker.error}
-          onCancel={closeResumePicker}
-          onSelect={resumeSelectedSession}
-        />
-      ) : (
-        <>
-          <Header
-            key={binding.sessionId}
-            modelName={binding.modelName}
-            workspaceRoot={binding.workspaceRoot}
-            sessionId={binding.sessionId}
+    <AssistantMarkdownProvider>
+      <Box flexDirection="column">
+        <Static key={`${binding.sessionId}:${staticRenderEpoch}`} items={staticItems}>
+          {(item) =>
+            item === STATIC_HEADER ? (
+              <Header
+                key={`header-${binding.sessionId}`}
+                modelName={binding.modelName}
+                workspaceRoot={binding.workspaceRoot}
+                sessionId={binding.sessionId}
+              />
+            ) : isAssistantStreamSectionItem(item) ? (
+              <AssistantStreamSectionRow key={item.id} item={item} />
+            ) : (
+              <TimelineRow key={item.id} item={item} />
+            )
+          }
+        </Static>
+        {fileView?.status === "loading" ? (
+          <FileViewerLoading filePath={fileView.filePath} onCancel={closeFileView} />
+        ) : fileView?.status === "ready" ? (
+          <FileViewer file={fileView.file} onClose={closeFileView} />
+        ) : memoryView !== undefined ? (
+          <MemoryBrowser memories={memoryView} onClose={closeMemoryView} />
+        ) : activeResumePicker?.status === "loading" ? (
+          <ResumeSessionPickerLoading onCancel={closeResumePicker} />
+        ) : activeResumePicker?.status === "ready" ? (
+          <ResumeSessionPicker
+            sessions={activeResumePicker.sessions}
+            isResuming={activeResumePicker.isResuming}
+            error={activeResumePicker.error}
+            onCancel={closeResumePicker}
+            onSelect={resumeSelectedSession}
           />
-          <Box marginTop={1} flexDirection="column">
-            <Timeline items={visibleTimelineItems(state)} />
-          </Box>
-          {state.backgroundTasks.length === 0 ? null : (
-            <Box marginTop={1}>
-              <BackgroundTasks tasks={state.backgroundTasks} />
-            </Box>
-          )}
-          {showStatus ? (
-            <Box marginTop={1}>
-              <ContextStatus state={state} />
+        ) : (
+          <Box
+            flexDirection="column"
+            maxHeight={Math.max(1, windowSize.rows - 1)}
+            overflow="hidden"
+          >
+            <Box flexDirection="column" flexShrink={1} minHeight={0} overflow="hidden">
+              <Box flexDirection="column" flexShrink={0}>
+                <Box marginTop={1} flexDirection="column" flexShrink={0}>
+                  <Box
+                    maxHeight={
+                      state.backgroundTasks.length === 0
+                        ? LIVE_TIMELINE_MAX_ROWS
+                        : LIVE_TIMELINE_WITH_TASKS_MAX_ROWS
+                    }
+                    overflow="hidden"
+                  >
+                    <Timeline items={log.live} />
+                  </Box>
+                </Box>
+                {state.backgroundTasks.length === 0 ? null : (
+                  <Box
+                    marginTop={1}
+                    maxHeight={BACKGROUND_TASKS_MAX_ROWS}
+                    overflow="hidden"
+                    flexShrink={0}
+                  >
+                    <BackgroundTasks tasks={state.backgroundTasks} />
+                  </Box>
+                )}
+                {showStatus ? (
+                  <Box marginTop={1} flexShrink={0}>
+                    <ContextStatus state={state} bashGuard={bashGuard} />
+                  </Box>
+                ) : null}
+                {showSkills ? (
+                  <Box marginTop={1} flexShrink={0}>
+                    <SkillsPanel snapshot={binding.skills()} />
+                  </Box>
+                ) : null}
+                {showMcp ? (
+                  <Box marginTop={1} flexShrink={0}>
+                    <McpPanel snapshot={binding.mcp()} />
+                  </Box>
+                ) : null}
+              </Box>
             </Box>
-          ) : null}
-          {showSkills ? (
-            <Box marginTop={1}>
-              <SkillsPanel snapshot={binding.skills()} />
+            <Box marginTop={1} flexShrink={0}>
+              <Footer
+                status={isCancelling ? "cancelling" : state.status}
+                workedForMs={state.workedForMs}
+                yolo={bashGuard.mode === "yolo"}
+              />
             </Box>
-          ) : null}
-          {showMcp ? (
-            <Box marginTop={1}>
-              <McpPanel snapshot={binding.mcp()} />
+            <Box marginTop={1} flexDirection="column" flexShrink={0}>
+              {bashGuard.pending !== undefined ? (
+                <BashConfirmation
+                  command={bashGuard.pending.command}
+                  reason={bashGuard.pending.reason}
+                  onDecision={(decision) => {
+                    void binding
+                      .resolveBashConfirmation(decision)
+                      .catch((error: unknown) =>
+                        setNotice(`Bash confirmation failed: ${errorMessage(error)}`),
+                      );
+                  }}
+                />
+              ) : showModelPicker ? (
+                <ModelPicker
+                  profiles={profileList}
+                  currentProfileName={binding.profileName}
+                  isSwitching={modelPickerState?.isSwitching}
+                  error={modelPickerState?.error}
+                  onCancel={closeModelPicker}
+                  onSelect={doSwitchModel}
+                />
+              ) : (
+                <PromptInput
+                  modelName={binding.modelName}
+                  workspaceRoot={binding.workspaceRoot}
+                  gitBranch={gitBranch}
+                  contextUsage={state.contextUsage}
+                  isDisabled={
+                    isRunning ||
+                    isSessionOperation ||
+                    isCopying ||
+                    bashGuard.pending !== undefined
+                  }
+                  history={props.history}
+                  commands={availableCommands}
+                  fileLister={props.fileLister}
+                  importImage={binding.importImage}
+                  verifyImageAssets={binding.verifyImageAssets}
+                  onSubmit={onSubmit}
+                  onMaintenance={onMaintenance}
+                  placeholder='Enter a coding request, or "/" for commands'
+                />
+              )}
+              {viewError === undefined ? null : <Text color="red">{viewError}</Text>}
+              {notice === undefined ? null : <Text color="yellow">{notice}</Text>}
             </Box>
-          ) : null}
-          <Box marginTop={1}>
-            <Footer
-              status={isCancelling ? "cancelling" : state.status}
-              workedForMs={state.workedForMs}
-              elapsedMs={runningElapsedMs}
-            />
           </Box>
-          <Box marginTop={1} flexDirection="column">
-            {showModelPicker ? (
-              <ModelPicker
-                profiles={profileList}
-                currentProfileName={binding.profileName}
-                isSwitching={modelPickerState?.isSwitching}
-                error={modelPickerState?.error}
-                onCancel={closeModelPicker}
-                onSelect={doSwitchModel}
-              />
-            ) : (
-              <PromptInput
-                modelName={binding.modelName}
-                workspaceRoot={binding.workspaceRoot}
-                gitBranch={gitBranch}
-                contextUsage={state.contextUsage}
-                isDisabled={isRunning || isSessionOperation || isCopying}
-                history={props.history}
-                commands={availableCommands}
-                fileLister={props.fileLister}
-                importImage={binding.importImage}
-                verifyImageAssets={binding.verifyImageAssets}
-                onSubmit={onSubmit}
-                onMaintenance={onMaintenance}
-                placeholder='Enter a coding request, or "/" for commands'
-              />
-            )}
-            {viewError === undefined ? null : <Text color="red">{viewError}</Text>}
-            {notice === undefined ? null : <Text color="yellow">{notice}</Text>}
-          </Box>
-        </>
-      )}
-    </Box>
+        )}
+      </Box>
+    </AssistantMarkdownProvider>
   );
 }
 
@@ -701,42 +854,6 @@ function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-const ELAPSED_TICK_MS = 1_000;
-
-// The wall clock, quantized to whole ticks so a render pass reads one stable
-// value and re-renders at most once per second.
-function readElapsedClockMs(): number {
-  return Math.floor(Date.now() / ELAPSED_TICK_MS) * ELAPSED_TICK_MS;
-}
-
-// Counts up while a turn is active. The interval only exists while `startedAt`
-// is defined, so an idle TUI keeps no timer running.
-function useElapsedMs(startedAt: string | undefined): number | undefined {
-  const subscribe = useCallback(
-    (onClockTick: () => void) => {
-      if (startedAt === undefined) {
-        return () => undefined;
-      }
-
-      const timer = setInterval(onClockTick, ELAPSED_TICK_MS);
-      return () => clearInterval(timer);
-    },
-    [startedAt],
-  );
-  const nowMs = useSyncExternalStore(subscribe, readElapsedClockMs, readElapsedClockMs);
-
-  if (startedAt === undefined) {
-    return undefined;
-  }
-
-  const startedAtMs = Date.parse(startedAt);
-  if (!Number.isFinite(startedAtMs)) {
-    throw new Error(`Invalid turn start timestamp: ${startedAt}`);
-  }
-
-  return Math.max(0, nowMs - startedAtMs);
-}
-
 export function formatContextCompactionNotice(result: ContextCompactionResult): string {
   if (result.status === "unchanged") {
     if (result.outcome === "below_target") {
@@ -760,6 +877,56 @@ export function formatContextCompactionNotice(result: ContextCompactionResult):
   return `Context compacted: revision ${result.previousRevisionNumber} -> ${result.revisionNumber}, ${result.addedOverrideCount} observations swapped, ${before} -> ${after} estimated tokens (-${reduction}%).`;
 }
 
+export function formatTurnUndoNotice(result: TurnUndoResult): string {
+  if (result.status === "nothing") {
+    return "Nothing to undo in this active session.";
+  }
+  if (result.status === "unavailable") {
+    return `Cannot undo turn ${result.turnNumber}: ${formatUndoBarrierReason(result.reason)}`;
+  }
+  if (result.status === "refused") {
+    const count = result.conflicts.length;
+    return [
+      `Undo refused: ${count} ${count === 1 ? "file" : "files"} changed after turn ${result.turnNumber}.`,
+      ...result.conflicts.map(
+        (conflict) => `- ${conflict.displayPath}: ${conflict.detail}`,
+      ),
+    ].join("\n");
+  }
+  if (result.status === "incomplete") {
+    return `Undo incomplete for turn ${result.turnNumber}: ${formatPartialUndoCount(result)} before ${result.failedPath} failed: ${sentenceDetail(result.detail)}\nRun /undo again to retry.`;
+  }
+  return `Restored workspace to before turn ${result.turnNumber}: ${formatFileCount(result.restoredFileCount)} restored, ${formatFileCount(result.deletedFileCount)} deleted.`;
+}
+
+function formatUndoBarrierReason(reason: TurnUndoBarrierReason): string {
+  if (reason.kind === "file-too-large" || reason.kind === "turn-too-large") {
+    return "undo snapshot capacity was exceeded.";
+  }
+  return `undo snapshot could not be captured for ${reason.displayPath}: ${sentenceDetail(reason.detail)}`;
+}
+
+function formatPartialUndoCount(
+  result: Extract<TurnUndoResult, { status: "incomplete" }>,
+): string {
+  const completed: string[] = [];
+  if (result.restoredFileCount > 0) {
+    completed.push(`${formatFileCount(result.restoredFileCount)} restored`);
+  }
+  if (result.deletedFileCount > 0) {
+    completed.push(`${formatFileCount(result.deletedFileCount)} deleted`);
+  }
+  return completed.length === 0 ? "no files restored" : completed.join(" and ");
+}
+
+function formatFileCount(count: number): string {
+  return `${count} ${count === 1 ? "file" : "files"}`;
+}
+
+function sentenceDetail(detail: string): string {
+  return /[.!?]$/.test(detail) ? detail : `${detail}.`;
+}
+
 export function formatContextCompactionFailureNotice(error: unknown): string {
   if (!(error instanceof ContextManagerError)) {
     return "Context compaction failed.";