ethagent 2.1.1 → 2.3.0

package/src/auth/openaiOAuth/shared.ts

@@ -0,0 +1,115 @@
+export const OPENAI_OAUTH_ISSUER = 'https://auth.openai.com'
+export const OPENAI_OAUTH_TOKEN_URL = `${OPENAI_OAUTH_ISSUER}/oauth/token`
+export const OPENAI_OAUTH_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann'
+export const OPENAI_OAUTH_CALLBACK_PORT = 1455
+export const OPENAI_OAUTH_SCOPE =
+  'openid profile email offline_access api.connectors.read api.connectors.invoke'
+export const OPENAI_OAUTH_ORIGINATOR = 'codex_cli_rs'
+export const OPENAI_API_KEY_TOKEN_NAME = 'openai-api-key'
+export const OPENAI_ID_TOKEN_SUBJECT_TYPE =
+  'urn:ietf:params:oauth:token-type:id_token'
+export const OPENAI_TOKEN_EXCHANGE_GRANT =
+  'urn:ietf:params:oauth:grant-type:token-exchange'
+
+export function asTrimmedString(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const trimmed = value.trim()
+  return trimmed ? trimmed : undefined
+}
+
+export function decodeJwtPayload(
+  token: string,
+): Record<string, unknown> | undefined {
+  const parts = token.split('.')
+  if (parts.length < 2) return undefined
+  const segment = parts[1]
+  if (!segment) return undefined
+
+  try {
+    const normalized = segment.replace(/-/g, '+').replace(/_/g, '/')
+    const padded = normalized + '='.repeat((4 - (normalized.length % 4)) % 4)
+    const json = Buffer.from(padded, 'base64').toString('utf8')
+    const parsed = JSON.parse(json) as unknown
+    return parsed && typeof parsed === 'object'
+      ? (parsed as Record<string, unknown>)
+      : undefined
+  } catch {
+    return undefined
+  }
+}
+
+export function parseChatgptAccountId(
+  token: string | undefined,
+): string | undefined {
+  if (!token) return undefined
+
+  const payload = decodeJwtPayload(token)
+  const nestedAuthRaw = payload?.['https://api.openai.com/auth']
+  const nestedAuth =
+    nestedAuthRaw && typeof nestedAuthRaw === 'object'
+      ? (nestedAuthRaw as Record<string, unknown>)
+      : undefined
+
+  return (
+    asTrimmedString(
+      nestedAuth?.chatgpt_account_id ??
+        payload?.['https://api.openai.com/auth.chatgpt_account_id'] ??
+        payload?.chatgpt_account_id,
+    ) ?? undefined
+  )
+}
+
+export function escapeHtml(value: string): string {
+  return value.replace(/[&<>"']/g, char => {
+    switch (char) {
+      case '&':
+        return '&amp;'
+      case '<':
+        return '&lt;'
+      case '>':
+        return '&gt;'
+      case '"':
+        return '&quot;'
+      case '\'':
+        return '&#39;'
+      default:
+        return char
+    }
+  })
+}
+
+export async function exchangeIdTokenForApiKey(idToken: string): Promise<string> {
+  const body = new URLSearchParams({
+    grant_type: OPENAI_TOKEN_EXCHANGE_GRANT,
+    client_id: OPENAI_OAUTH_CLIENT_ID,
+    requested_token: OPENAI_API_KEY_TOKEN_NAME,
+    subject_token: idToken,
+    subject_token_type: OPENAI_ID_TOKEN_SUBJECT_TYPE,
+  })
+
+  const response = await fetch(OPENAI_OAUTH_TOKEN_URL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    body,
+    signal: AbortSignal.timeout(15_000),
+  })
+
+  if (!response.ok) {
+    const bodyText = await response.text().catch(() => '')
+    throw new Error(
+      bodyText.trim()
+        ? `OpenAI API key exchange failed (${response.status}): ${bodyText.trim()}`
+        : `OpenAI API key exchange failed with status ${response.status}.`,
+    )
+  }
+
+  const payload = (await response.json()) as { access_token?: string }
+  const apiKey = asTrimmedString(payload.access_token)
+  if (!apiKey) {
+    throw new Error(
+      'OpenAI API key exchange completed, but no key was returned.',
+    )
+  }
+
+  return apiKey
+}

package/src/chat/ChatBottomPane.tsx

@@ -3,26 +3,26 @@ import type { EthagentConfig } from '../storage/config.js'
 import type { PermissionDecision, PermissionRequest, SessionPermissionRule } from '../tools/contracts.js'
 import { type ModelPickerSelection, ModelPicker } from '../models/ModelPicker.js'
 import type { ModelPickerContextFit } from '../models/modelPickerOptions.js'
-import { ResumeView } from './ResumeView.js'
-import { RewindView } from './RewindView.js'
-import { PermissionsView } from './PermissionsView.js'
-import { CopyPicker } from './CopyPicker.js'
-import { PermissionPrompt } from './PermissionPrompt.js'
-import { PlanApprovalView, type PlanApprovalAction } from './PlanApprovalView.js'
-import { ChatInput } from './ChatInput.js'
+import { ResumeView } from './views/ResumeView.js'
+import { RewindView } from './views/RewindView.js'
+import { PermissionsView } from './views/PermissionsView.js'
+import { CopyPicker } from './views/CopyPicker.js'
+import { PermissionPrompt } from './views/PermissionPrompt.js'
+import { PlanApprovalView, type PlanApprovalAction } from './views/PlanApprovalView.js'
+import { ChatInput } from './input/ChatInput.js'
 import { IdentityHub, type IdentityHubInitialAction, type IdentityHubResult } from '../identity/hub/IdentityHub.js'
 import type { CopyResult } from '../utils/clipboard.js'
 import { getSlashSuggestions } from './commands.js'
 import { Box, Text } from 'ink'
 import { theme } from '../ui/theme.js'
 import { Spinner } from '../ui/Spinner.js'
-import { ContextLimitView, type ContextLimitAction } from './ContextLimitView.js'
+import { ContextLimitView, type ContextLimitAction } from './views/ContextLimitView.js'
 import type { ContextUsage } from '../runtime/compaction.js'
 import {
   ContinuityEditReviewView,
   type ContinuityEditReviewAction,
   type ContinuityEditReviewState,
-} from './ContinuityEditReviewView.js'
+} from './views/ContinuityEditReviewView.js'
 
 export type Overlay = 'none' | 'modelPicker' | 'resume' | 'rewind' | 'copyPicker' | 'permission' | 'permissions' | 'planApproval' | 'identity' | 'contextLimit' | 'continuityEditReview'
 export type CopyPickerState = { turnText: string; turnLabel: string } | null
@@ -66,7 +66,10 @@ type ChatBottomPaneProps = {
   handleResumeClearAll: () => void | Promise<void>
   identityOverlay: IdentityOverlayState | null
   handleIdentityResult: (result: IdentityHubResult) => void
-  handleRestoreConversation: (turnId: string) => void
+  handleRestoreConversation: (turnId: string, promptText?: string) => void
+  pendingInputDraft: string | null
+  onInputDraftConsumed: () => void
+  handleSummarizeFromTurn: (turnId: string) => void | Promise<unknown>
   handleCopyDone: (result: CopyResult, label: string) => void
   handleCopyCancel: () => void
   resolvePermission: (decision: PermissionDecision) => void
@@ -110,6 +113,9 @@ export function ChatBottomPane({
   identityOverlay,
   handleIdentityResult,
   handleRestoreConversation,
+  handleSummarizeFromTurn,
+  pendingInputDraft,
+  onInputDraftConsumed,
   handleCopyDone,
   handleCopyCancel,
   resolvePermission,
@@ -155,6 +161,7 @@ export function ChatBottomPane({
         cwd={cwd}
         currentSessionId={currentSessionId}
         onRestoreConversation={handleRestoreConversation}
+        onSummarizeFromTurn={handleSummarizeFromTurn}
         onDone={(message, variant = 'info') => {
           setOverlay('none')
           pushNote(message, variant)
@@ -261,10 +268,12 @@ export function ChatBottomPane({
         slashSuggestions={slashSuggestions}
         footerRight={footerRight}
         cwd={cwd}
+        seedText={pendingInputDraft}
+        onSeedConsumed={onInputDraftConsumed}
       />
       <Box marginLeft={2} marginTop={0} flexDirection="column">
         <Text>
-          <Text color={theme.dim}>workspace · </Text>
+          <Text color={theme.dim}>Workspace · </Text>
           <Text color={theme.textSubtle}>{cwd}</Text>
         </Text>
       </Box>

package/src/chat/ChatScreen.tsx

@@ -16,6 +16,7 @@ import { theme } from '../ui/theme.js'
 import { BrandSplash } from '../ui/BrandSplash.js'
 import { SessionStatus, formatTokens } from './SessionStatus.js'
 import { formatModelDisplayName } from '../models/modelDisplay.js'
+import { providerDisplayName } from '../models/providerDisplay.js'
 import { toggleReasoningRow, type MessageRow } from './MessageList.js'
 import { ConversationStack } from './ConversationStack.js'
 import type { ModelPickerSelection } from '../models/ModelPicker.js'
@@ -53,6 +54,7 @@ import type {
   PermissionRequest,
   SessionPermissionRule,
 } from '../tools/contracts.js'
+import { splitFileChangeResult } from '../tools/fileDiff.js'
 import {
   buildBaseMessages,
   sessionMessagesToRows,
@@ -63,7 +65,7 @@ import { setTokenIdentity, getIdentityStatus } from '../storage/identity.js'
 import type { IdentityHubResult } from '../identity/hub/IdentityHub.js'
 import { continuityWorkingTreeStatus } from '../identity/continuity/storage.js'
 import { listPublishedContinuitySnapshots } from '../identity/continuity/snapshots.js'
-import { localChangeStatusView } from '../identity/hub/model/continuity.js'
+import { localChangeStatusView } from '../identity/hub/continuity/state.js'
 import {
   buildResumedSessionState,
   promptHistoryFromSessionMessages,
@@ -72,9 +74,9 @@ import {
 } from './chatSessionState.js'
 import { runStreamingTurn } from './chatTurnOrchestrator.js'
 import { ensureLlamaCppRunnerReady } from '../models/llamacppPreflight.js'
-import type { PlanApprovalAction } from './PlanApprovalView.js'
-import type { ContextLimitAction } from './ContextLimitView.js'
-import type { ContinuityEditReviewAction, ContinuityEditReviewState } from './ContinuityEditReviewView.js'
+import type { PlanApprovalAction } from './views/PlanApprovalView.js'
+import type { ContextLimitAction } from './views/ContextLimitView.js'
+import type { ContinuityEditReviewAction, ContinuityEditReviewState } from './views/ContinuityEditReviewView.js'
 import { openFileInEditor } from '../identity/continuity/editor.js'
 import { EMPTY_MCP_SNAPSHOT, McpManager, type McpSnapshot } from '../mcp/manager.js'
 
@@ -154,6 +156,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
     contextUsageFromTokens(0, initialConfig.provider, initialConfig.model),
   )
   const [mcpSnapshot, setMcpSnapshot] = useState<McpSnapshot>(EMPTY_MCP_SNAPSHOT)
+  const [pendingInputDraft, setPendingInputDraft] = useState<string | null>(null)
 
   const rowsRef = useRef<MessageRow[]>([])
   const visibleReasoningIdsRef = useRef<string[]>([])
@@ -380,7 +383,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
     setModelPickerContextFit(null)
     overlayRef.current = 'none'
     setOverlay('none')
-    if (hadPendingPrompt) pushNote('pending message cancelled.', 'dim')
+    if (hadPendingPrompt) pushNote('Pending message cancelled.', 'dim')
   }, [pushNote])
 
   const changeCwd = useCallback((next: string) => {
@@ -489,7 +492,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         modeRef.current,
       )
       if (priorMessages.length <= 5) {
-        pushNote('not enough turns to compact yet.', 'dim')
+        pushNote('Not enough turns to compact yet.', 'dim')
         return false
       }
       compactingRef.current = true
@@ -501,14 +504,14 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         })
         if (!result.ok && result.cancelled) {
           removeCompactionProgress(compaction)
-          pushNote('compaction cancelled.', 'dim')
+          pushNote('Compaction cancelled.', 'dim')
           return false
         }
         const summary = result.ok
           ? normalizeHandoffSummary(result.summary)
           : normalizeHandoffSummary(summarizeTranscriptLocally(priorMessages, result.reason))
         if (!result.ok) {
-          pushNote(`provider summary failed; created a local summary instead: ${result.reason}`, 'dim')
+          pushNote(`Provider summary failed; created a local summary instead: ${result.reason}`, 'dim')
         }
 
         updateCompactionStage(compaction, 'saving summarized conversation')
@@ -573,9 +576,123 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       } catch (err: unknown) {
         removeCompactionProgress(compaction)
         if (compaction.controller.signal.aborted) {
-          pushNote('compaction cancelled.', 'dim')
+          pushNote('Compaction cancelled.', 'dim')
         } else {
-          pushNote(`compact error: ${(err as Error).message}`, 'error')
+          pushNote(`Compact error: ${(err as Error).message}`, 'error')
+        }
+        return false
+      } finally {
+        compactingRef.current = false
+        compactionUiRef.current = null
+        setCompactionUi(null)
+      }
+    },
+    [beginCompactionUi, pushNote, refreshVisibleStats, removeCompactionProgress, updateCompactionStage],
+  )
+
+  const runCompactionFromTurn = useCallback(
+    async (turnId: string): Promise<boolean> => {
+      if (compactingRef.current) return false
+      const sourceSessionId = sessionIdRef.current
+      const all = sessionMessagesRef.current
+      const splitIndex = all.findIndex(m => m.turnId === turnId)
+      if (splitIndex < 0) {
+        pushNote('Could not find that prompt to summarize from.', 'error')
+        return false
+      }
+      const before = all.slice(0, splitIndex)
+      const from = all.slice(splitIndex)
+      const fromBase = buildBaseMessages(
+        from,
+        configRef.current,
+        providerRef.current.supportsTools,
+        cwdRef.current,
+        modeRef.current,
+      )
+      if (fromBase.length <= 2) {
+        pushNote('Not enough messages from that point to summarize.', 'dim')
+        return false
+      }
+      compactingRef.current = true
+      const compaction = beginCompactionUi('conversation', sourceSessionId)
+      try {
+        const result = await compactTranscript(providerRef.current, fromBase, {
+          signal: compaction.controller.signal,
+          onStage: stage => updateCompactionStage(compaction, stage),
+        })
+        if (!result.ok && result.cancelled) {
+          removeCompactionProgress(compaction)
+          pushNote('Compaction cancelled.', 'dim')
+          return false
+        }
+        const summary = result.ok
+          ? normalizeHandoffSummary(result.summary)
+          : normalizeHandoffSummary(summarizeTranscriptLocally(fromBase, result.reason))
+        if (!result.ok) {
+          pushNote(`Provider summary failed; created a local summary instead: ${result.reason}`, 'dim')
+        }
+        updateCompactionStage(compaction, 'saving summarized conversation')
+        const nextSessionId = newSessionId()
+        const summaryMessage: SessionMessage = {
+          role: 'user',
+          synthetic: true,
+          content: [
+            `Conversation handoff from ${sourceSessionId.slice(0, 8)} (summarized from a chosen prompt forward):`,
+            '',
+            summary,
+          ].join('\n'),
+          createdAt: nowIso(),
+        }
+        const acknowledgement: SessionMessage = {
+          role: 'assistant',
+          content: 'Ready to continue from this summary.',
+          createdAt: nowIso(),
+          model: configRef.current.model,
+        }
+        const context = {
+          cwd: cwdRef.current,
+          provider: configRef.current.provider,
+          model: configRef.current.model,
+          mode: modeRef.current,
+        }
+        await ensureSessionMetadata(nextSessionId, context)
+        await updateSessionActivity(nextSessionId, context, { compactedFromSessionId: sourceSessionId })
+        for (const msg of before) {
+          await appendSessionMessage(nextSessionId, msg, context)
+        }
+        await appendSessionMessage(nextSessionId, summaryMessage, context)
+        await appendSessionMessage(nextSessionId, acknowledgement, context)
+
+        updateCompactionStage(compaction, 'opening summarized conversation')
+        const nextMessages: SessionMessage[] = [...before, summaryMessage, acknowledgement]
+        compactionUiRef.current = null
+        setCompactionUi(null)
+        sessionIdRef.current = nextSessionId
+        setSessionId(nextSessionId)
+        sessionMessagesRef.current = nextMessages
+        historyScopeRef.current = 'session'
+        setHistory(promptHistoryFromSessionMessages(nextMessages))
+        statsSegmentStartRef.current = 0
+        setRows([
+          {
+            role: 'note',
+            id: nextRowId(),
+            kind: 'dim',
+            content: `kept ${sourceSessionId.slice(0, 8)} saved; summarized from a chosen prompt into ${nextSessionId.slice(0, 8)}.`,
+          },
+          ...sessionMessagesToRows(nextMessages, nextRowId),
+        ])
+        setQueuedInputs([])
+        setStatusStartedAt(Date.now())
+        refreshVisibleStats(nextMessages, providerRef.current.supportsTools, cwdRef.current, configRef.current, modeRef.current)
+        setSessionKey(key => key + 1)
+        return true
+      } catch (err: unknown) {
+        removeCompactionProgress(compaction)
+        if (compaction.controller.signal.aborted) {
+          pushNote('Compaction cancelled.', 'dim')
+        } else {
+          pushNote(`Compact error: ${(err as Error).message}`, 'error')
         }
         return false
       } finally {
@@ -707,7 +824,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       try {
         await savePermissionRule(cwdRef.current, sessionRule)
       } catch (error: unknown) {
-        pushNote(`failed to save permission rule: ${(error as Error).message}`, 'error')
+        pushNote(`Failed to save permission rule: ${(error as Error).message}`, 'error')
       }
     },
     [pushNote],
@@ -855,7 +972,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
 
       if (streaming || pullInFlight || compactionUiRef.current) {
         if (parseSlash(value)) {
-          pushNote('slash commands cannot be queued. wait for the current task to finish.', 'dim')
+          pushNote('Slash commands cannot be queued. Wait for the current task to finish.', 'dim')
           return
         }
         setQueuedInputs(prev => [...prev, value])
@@ -892,7 +1009,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
 
   const handleContextLimitCancel = useCallback(() => {
     clearContextLimit()
-    pushNote('pending message cancelled.', 'dim')
+    pushNote('Pending message cancelled.', 'dim')
   }, [clearContextLimit, pushNote])
 
   const handleContextLimitAction = useCallback(
@@ -905,7 +1022,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       const prompt = state.prompt
       clearContextLimit()
       if (action === 'cancel') {
-        pushNote('pending message cancelled.', 'dim')
+        pushNote('Pending message cancelled.', 'dim')
         return
       }
       if (action === 'switchModel') {
@@ -1020,7 +1137,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         pushNote(resolution.notice, resolution.tone)
         await continuePendingPromptAfterModelSwitch(pendingPrompt)
       } catch (err: unknown) {
-        pushNote(`provider switch failed: ${(err as Error).message}`, 'error')
+        pushNote(`Provider switch failed: ${(err as Error).message}`, 'error')
         if (pendingPrompt) showContextLimitForPrompt(pendingPrompt)
       }
     },
@@ -1033,7 +1150,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       try {
         const [loaded, metadata] = await Promise.all([loadSession(id), loadSessionMetadata(id)])
         if (loaded.length === 0) {
-          pushNote('session was empty.', 'error')
+          pushNote('Session was empty.', 'error')
           return
         }
         const resumed = buildResumedSessionState({
@@ -1068,7 +1185,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         refreshVisibleStats(loaded, providerRef.current.supportsTools, resumedCwd, configRef.current, resumed.mode)
         setSessionKey(k => k + 1)
       } catch (err: unknown) {
-        pushNote(`resume failed: ${(err as Error).message}`, 'error')
+        pushNote(`Resume failed: ${(err as Error).message}`, 'error')
       }
     },
     [clearContextLimit, clearPendingPlan, cwd, pushNote, refreshVisibleStats],
@@ -1080,7 +1197,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       clearTranscript()
       overlayRef.current = 'none'
       setOverlay('none')
-      pushNote('cleared saved chat logs and resume context from this machine.', 'dim')
+      pushNote('Cleared saved chat logs and resume context from this machine.', 'dim')
     },
     [clearTranscript, pushNote],
   )
@@ -1099,9 +1216,9 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
           try {
             const nextConfig = await setTokenIdentity(configRef.current, result.identity)
             applyConfigChange(nextConfig)
-            pushNote(`identity saved · ERC-8004 #${result.identity.agentId}`, 'info')
+            pushNote(`Identity saved · ERC-8004 #${result.identity.agentId}`, 'info')
           } catch (err: unknown) {
-            pushNote(`identity save failed: ${(err as Error).message}`, 'error')
+            pushNote(`Identity save failed: ${(err as Error).message}`, 'error')
           }
         })()
       }
@@ -1133,12 +1250,12 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         })
         overlayRef.current = 'identity'
         setOverlay('identity')
-        pushNote('opening snapshot signature.', 'dim')
+        pushNote('Opening snapshot signature.', 'dim')
         return
       }
       overlayRef.current = 'none'
       setOverlay('none')
-      pushNote('snapshot not saved yet.', 'dim')
+      pushNote('Snapshot not saved yet.', 'dim')
     },
     [continuityEditReview, pushNote],
   )
@@ -1147,7 +1264,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
     setContinuityEditReview(null)
     overlayRef.current = 'none'
     setOverlay('none')
-    pushNote('snapshot not saved yet.', 'dim')
+    pushNote('Snapshot not saved yet.', 'dim')
   }, [pushNote])
 
   const handleCopyDone = useCallback(
@@ -1155,9 +1272,9 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       setOverlay('none')
       setCopyPickerState(null)
       if (result.ok) {
-        pushNote(`copied ${label} via ${result.method}.`, 'dim')
+        pushNote(`${label} copied to clipboard · ${result.chars} chars`, 'dim')
       } else {
-        pushNote(`copy failed: ${result.error}`, 'error')
+        pushNote(`Copy failed: ${result.error}`, 'error')
       }
     },
     [pushNote],
@@ -1166,15 +1283,18 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
   const handleCopyCancel = useCallback(() => {
     setOverlay('none')
     setCopyPickerState(null)
-    pushNote('copy cancelled.', 'dim')
+    pushNote('Copy cancelled.', 'dim')
   }, [pushNote])
 
-  const handleRestoreConversation = useCallback((turnId: string) => {
+  const handleRestoreConversation = useCallback((turnId: string, promptText?: string) => {
     const restored = restoreConversationState(sessionMessagesRef.current, turnId, nextRowId)
     sessionMessagesRef.current = restored.messages
     setRows(restored.rows)
     historyScopeRef.current = 'session'
     setHistory(restored.promptHistory)
+    if (promptText != null && promptText.length > 0) {
+      setPendingInputDraft(promptText)
+    }
     if (restored.truncated) {
       setQueuedInputs([])
       statsSegmentStartRef.current = Math.min(statsSegmentStartRef.current, restored.messages.length)
@@ -1216,7 +1336,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
 
       if (priorMessages.length <= 5) {
         startFreshImplementationContext()
-        pushNote('not enough planning context to summarize; starting a plan-only implementation conversation.', 'dim')
+        pushNote('Not enough planning context to summarize; starting a plan-only implementation conversation.', 'dim')
         return true
       }
 
@@ -1229,14 +1349,14 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         })
         if (!result.ok && result.cancelled) {
           removeCompactionProgress(compaction)
-          pushNote('plan context summary cancelled.', 'dim')
+          pushNote('Plan context summary cancelled.', 'dim')
           return false
         }
         const summary = result.ok
           ? normalizeHandoffSummary(result.summary)
           : normalizeHandoffSummary(summarizeTranscriptLocally(priorMessages, result.reason))
         if (!result.ok) {
-          pushNote(`provider summary failed; created a local summary instead: ${result.reason}`, 'dim')
+          pushNote(`Provider summary failed; created a local summary instead: ${result.reason}`, 'dim')
         }
 
         updateCompactionStage(compaction, 'saving summarized conversation')
@@ -1287,9 +1407,9 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       } catch (err: unknown) {
         removeCompactionProgress(compaction)
         if (compaction.controller.signal.aborted) {
-          pushNote('plan context summary cancelled.', 'dim')
+          pushNote('Plan context summary cancelled.', 'dim')
         } else {
-          pushNote(`context summary error: ${(err as Error).message}`, 'error')
+          pushNote(`Context summary error: ${(err as Error).message}`, 'error')
         }
         return false
       } finally {
@@ -1323,7 +1443,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       }
       if (plan.cwd !== cwdRef.current || plan.sessionId !== sessionIdRef.current) {
         clearPendingPlan()
-        pushNote('dismissed stale plan approval because the workspace changed.', 'dim')
+        pushNote('Dismissed stale plan approval because the workspace changed.', 'dim')
         return
       }
       if (action === 'continue') {
@@ -1387,7 +1507,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
     })
   }, [compactionUi, overlay, projectedUsageForInput, pullInFlight, pushNote, queuedInputs, runStream, showContextLimitForPrompt, streaming])
 
-  const contextLine = `${config.provider} · ${formatModelDisplayName(config.provider, config.model, { maxLength: 24 })} · ${compressHome(cwd)}`
+  const contextLine = `${providerDisplayName(config.provider)} · ${formatModelDisplayName(config.provider, config.model, { maxLength: 24 })} · ${compressHome(cwd)}`
   const tipLine = 'Tip: type /help to get started · shift+enter for newline'
 
   const placeholderHints = useMemo(() => {
@@ -1456,6 +1576,9 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
           identityOverlay={identityOverlay}
           handleIdentityResult={handleIdentityResult}
           handleRestoreConversation={handleRestoreConversation}
+          pendingInputDraft={pendingInputDraft}
+          onInputDraftConsumed={() => setPendingInputDraft(null)}
+          handleSummarizeFromTurn={runCompactionFromTurn}
           handleCopyDone={handleCopyDone}
           handleCopyCancel={handleCopyCancel}
           resolvePermission={resolvePermission}
@@ -1568,12 +1691,14 @@ export function privateContinuityEditReviewFromToolResult(
   if (name !== 'propose_private_continuity_edit' || !result.ok) return null
   const file = normalizePrivateContinuityFile(input.file)
   if (!file) return null
-  const filePath = extractReviewFilePath(result.content)
+  const parsed = splitFileChangeResult(result.content)
+  const filePath = extractReviewFilePath(parsed.content)
   if (!filePath) return null
   return {
     file,
     filePath,
     summary: result.summary,
+    ...(parsed.diff ? { diff: parsed.diff } : {}),
   }
 }
 

package/src/chat/ConversationStack.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Box } from 'ink'
-import { TranscriptView } from './TranscriptView.js'
+import { TranscriptView } from './transcript/TranscriptView.js'
 import type { MessageRow } from './MessageList.js'
 
 type ConversationStackProps = {