ethagent 0.2.1 → 1.0.0

package/src/chat/chatInputState.ts

@@ -0,0 +1,247 @@
+import {
+  cursorColumn,
+  cursorOnLastLineAtColumn,
+  getVisualLines,
+  moveVerticalVisualCursor,
+  moveVerticalCursor,
+  normalizeCursor,
+} from './textCursor.js'
+
+export type ChatBuffer = {
+  value: string
+  cursor: number
+}
+
+export type FileMentionToken = {
+  start: number
+  end: number
+  query: string
+}
+
+export type HistoryPreviewState = {
+  historyIndex: number | null
+  historyPreviewActive: boolean
+  draftBuffer: ChatBuffer
+  preferredColumn: number | null
+}
+
+export type VerticalMoveResult =
+  | { kind: 'moved'; cursor: number; preferredColumn: number }
+  | { kind: 'boundary-top'; cursor: number; preferredColumn: number }
+  | { kind: 'boundary-bottom'; cursor: number; preferredColumn: number }
+
+export function emptyBuffer(): ChatBuffer {
+  return { value: '', cursor: 0 }
+}
+
+export function bufferFromValue(value: string, cursor = value.length): ChatBuffer {
+  const next = normalizeCursor(value, cursor)
+  return { value: next.value, cursor: next.offset }
+}
+
+export function canNavigateHistory(
+  _buffer: ChatBuffer,
+  historyLength: number,
+  _historyIndex: number | null,
+  _historyPreviewActive: boolean,
+): boolean {
+  return historyLength > 0
+}
+
+export function beginHistoryPreview(
+  buffer: ChatBuffer,
+  history: string[],
+  direction: 1 | -1,
+  _preferredColumn: number | null,
+): { preview: HistoryPreviewState; buffer: ChatBuffer } | null {
+  if (history.length === 0) return null
+  const nextIndex = direction === -1 ? history.length - 1 : 0
+  const chosen = history[nextIndex] ?? ''
+  return {
+    preview: {
+      historyIndex: nextIndex,
+      historyPreviewActive: true,
+      draftBuffer: buffer,
+      preferredColumn: null,
+    },
+    buffer: bufferFromValue(chosen),
+  }
+}
+
+export function moveThroughHistory(
+  history: string[],
+  historyIndex: number,
+  direction: 1 | -1,
+  draftBuffer: ChatBuffer,
+  preferredColumn: number | null,
+): { preview: HistoryPreviewState; buffer: ChatBuffer } {
+  const next = historyIndex + direction
+  if (next < 0) {
+    const chosen = history[0] ?? ''
+    return {
+      preview: {
+        historyIndex: 0,
+        historyPreviewActive: true,
+        draftBuffer,
+        preferredColumn: null,
+      },
+      buffer: bufferFromValue(chosen),
+    }
+  }
+  if (next >= history.length) {
+    return {
+      preview: {
+        historyIndex: null,
+        historyPreviewActive: false,
+        draftBuffer,
+        preferredColumn: null,
+      },
+      buffer: bufferFromValue(draftBuffer.value),
+    }
+  }
+  const chosen = history[next] ?? ''
+  return {
+    preview: {
+      historyIndex: next,
+      historyPreviewActive: true,
+      draftBuffer,
+      preferredColumn: null,
+    },
+    buffer: bufferFromValue(chosen),
+  }
+}
+
+export function exitHistoryPreview(
+  buffer: ChatBuffer,
+): { historyIndex: null; historyPreviewActive: false; draftBuffer: ChatBuffer; preferredColumn: null } {
+  return {
+    historyIndex: null,
+    historyPreviewActive: false,
+    draftBuffer: buffer,
+    preferredColumn: null,
+  }
+}
+
+export function bufferFromLastLine(value: string, preferredColumn: number | null = null): ChatBuffer {
+  const next = cursorOnLastLineAtColumn(value, preferredColumn ?? 0)
+  return { value: next.value, cursor: next.offset }
+}
+
+export function deleteToLineStart(buffer: ChatBuffer, wrapWidth: number): ChatBuffer {
+  const normalized = normalizeCursor(buffer.value, buffer.cursor)
+  const { value, offset } = normalized
+  if (offset <= 0) return { value, cursor: 0 }
+
+  if (value[offset - 1] === '\n') {
+    return {
+      value: value.slice(0, offset - 1) + value.slice(offset),
+      cursor: offset - 1,
+    }
+  }
+
+  const lineStart = visualLineStart(value, offset, wrapWidth)
+  return {
+    value: value.slice(0, lineStart) + value.slice(offset),
+    cursor: lineStart,
+  }
+}
+
+export function moveVertical(
+  text: string,
+  cursor: number,
+  direction: 1 | -1,
+  preferredColumn: number | null = null,
+): VerticalMoveResult {
+  const normalized = normalizeCursor(text, cursor)
+  const nextColumn = preferredColumn ?? cursorColumn(normalized.value, normalized.offset)
+  const moved = moveVerticalCursor(normalized, direction, nextColumn)
+  if (moved.moved) {
+    return { kind: 'moved', cursor: moved.cursor.offset, preferredColumn: nextColumn }
+  }
+  return {
+    kind: direction === -1 ? 'boundary-top' : 'boundary-bottom',
+    cursor: normalized.offset,
+    preferredColumn: nextColumn,
+  }
+}
+
+export function moveVerticalVisual(
+  text: string,
+  cursor: number,
+  direction: 1 | -1,
+  wrapWidth: number,
+  preferredColumn: number | null = null,
+): VerticalMoveResult {
+  const normalized = normalizeCursor(text, cursor)
+  const position = visualPosition(normalized.value, normalized.offset, wrapWidth)
+  const nextColumn = preferredColumn ?? position.column
+  const moved = moveVerticalVisualCursor(normalized, direction, wrapWidth, nextColumn)
+  if (moved.moved) {
+    return { kind: 'moved', cursor: moved.cursor.offset, preferredColumn: nextColumn }
+  }
+  return {
+    kind: direction === -1 ? 'boundary-top' : 'boundary-bottom',
+    cursor: normalized.offset,
+    preferredColumn: nextColumn,
+  }
+}
+
+export function detectActiveFileMention(value: string, cursor: number): FileMentionToken | undefined {
+  const safeCursor = Math.max(0, Math.min(cursor, value.length))
+  const left = value.slice(0, safeCursor)
+  const atIndex = left.lastIndexOf('@')
+  if (atIndex === -1) return undefined
+  const before = atIndex === 0 ? '' : value[atIndex - 1]
+  if (before && !/\s|\(|\[|\{/.test(before)) return undefined
+  const between = value.slice(atIndex + 1, safeCursor)
+  if (/\s/.test(between)) return undefined
+  let end = safeCursor
+  while (end < value.length && !/\s/.test(value[end]!)) end += 1
+  return { start: atIndex, end, query: between }
+}
+
+export function replaceActiveFileMention(buffer: ChatBuffer, replacementPath: string): ChatBuffer {
+  const mention = detectActiveFileMention(buffer.value, buffer.cursor)
+  if (!mention) return buffer
+  const replacement = `@${replacementPath}`
+  const value = buffer.value.slice(0, mention.start) + replacement + buffer.value.slice(mention.end)
+  return { value, cursor: mention.start + replacement.length }
+}
+
+function visualPosition(value: string, offset: number, wrapWidth: number): { column: number } {
+  const lines = getVisualLines(value, wrapWidth)
+  for (const entry of lines) {
+    if (entry.start === entry.end && offset === entry.start) {
+      return { column: 0 }
+    }
+    if (offset >= entry.start && offset < entry.end) {
+      return { column: offset - entry.start }
+    }
+  }
+
+  for (let index = lines.length - 1; index >= 0; index -= 1) {
+    const entry = lines[index]!
+    if (offset === entry.end) {
+      return { column: entry.end - entry.start }
+    }
+  }
+
+  return { column: 0 }
+}
+
+function visualLineStart(value: string, offset: number, wrapWidth: number): number {
+  const lines = getVisualLines(value, wrapWidth)
+  for (let index = 0; index < lines.length; index += 1) {
+    const entry = lines[index]!
+    if (entry.start === entry.end && offset === entry.start) return entry.start
+    if (offset > entry.start && offset <= entry.end) return entry.start
+    if (offset === entry.start) {
+      const previous = lines[index - 1]
+      if (previous && previous.end === entry.start) return previous.start
+      return entry.start
+    }
+  }
+
+  const last = lines[lines.length - 1]
+  return last ? last.start : 0
+}

package/src/chat/chatPaste.ts

@@ -0,0 +1,49 @@
+export const LARGE_PASTE_THRESHOLD = 800
+
+export type PastedTextRef = {
+  id: number
+  content: string
+}
+
+export function normalizePastedText(text: string): string {
+  return text
+    .replaceAll('\x1b[200~', '')
+    .replaceAll('\x1b[201~', '')
+    .replace(/(^|\n)(?:\[?200~|\[?201~)(?=\n|$)/g, '$1')
+    .replace(/\r\n/g, '\n')
+    .replace(/\r/g, '\n')
+}
+
+export function shouldCollapsePastedText(
+  text: string,
+  maxInlineLines: number,
+  threshold = LARGE_PASTE_THRESHOLD,
+): boolean {
+  return text.length > threshold || countPastedTextLineBreaks(text) > maxInlineLines
+}
+
+export function countPastedTextLineBreaks(text: string): number {
+  return (text.match(/\n/g) ?? []).length
+}
+
+export function formatPastedTextRef(id: number, chars: number): string {
+  return `[Pasted Content ${chars} chars #${id}]`
+}
+
+export function expandPastedTextRefs(input: string, refs: Map<number, PastedTextRef>): string {
+  const matches = [...input.matchAll(/\[Pasted Content (\d+) chars #(\d+)\]/g)]
+  let expanded = input
+
+  for (let index = matches.length - 1; index >= 0; index -= 1) {
+    const match = matches[index]!
+    const id = Number(match[2])
+    const ref = refs.get(id)
+    if (!ref) continue
+    expanded =
+      expanded.slice(0, match.index) +
+      ref.content +
+      expanded.slice((match.index ?? 0) + match[0].length)
+  }
+
+  return expanded
+}

package/src/chat/chatScreenUtils.ts

@@ -0,0 +1,187 @@
+import { systemMessage } from '../utils/messages.js'
+import { buildSystemPrompt } from '../runtime/systemPrompt.js'
+import type { Message } from '../providers/contracts.js'
+import { isLocalProvider } from '../providers/registry.js'
+import type { SessionMode } from '../runtime/sessionMode.js'
+import type { EthagentConfig } from '../storage/config.js'
+import {
+  latestUserMessageCorrectsToolState,
+  sessionMessagesToProviderMessages,
+  TOOL_CORRECTION_CONTEXT_MESSAGE,
+  type SessionMessage,
+} from '../storage/sessions.js'
+import type { MessageRow } from './MessageList.js'
+import { hidesSuccessfulToolResultContent } from './toolResultDisplay.js'
+
+export type TurnCheckpoint = {
+  sessionId: string
+  turnId: string
+  messageRole: 'user'
+  promptSnippet: string
+  checkpointLabel: string
+}
+
+export function buildBaseMessages(
+  sessionMessages: SessionMessage[],
+  config: EthagentConfig,
+  hasTools: boolean,
+  cwd: string,
+  mode: SessionMode = 'chat',
+  options: { preserveTurnId?: string; compactToolHistory?: boolean } = {},
+): Message[] {
+  const compactToolHistory = options.compactToolHistory ?? isLocalProvider(config.provider)
+  const correctionContext = latestUserMessageCorrectsToolState(sessionMessages)
+    ? [systemMessage(TOOL_CORRECTION_CONTEXT_MESSAGE)]
+    : []
+  return [
+    systemMessage(buildSystemPrompt({
+      cwd,
+      model: config.model,
+      provider: config.provider,
+      hasTools,
+      hasIdentity: Boolean(config.identity),
+      mode,
+    })),
+    ...correctionContext,
+    ...sessionMessagesToProviderMessages(sessionMessages, {
+      compactToolHistory,
+      preserveTurnId: options.preserveTurnId,
+    }),
+  ]
+}
+
+export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: () => string): MessageRow[] {
+  const restored: MessageRow[] = []
+  for (const msg of messages) {
+    if (msg.role === 'user') restored.push({ role: 'user', id: nextRowId(), content: msg.content })
+    else if (msg.role === 'assistant') restored.push({ role: 'assistant', id: nextRowId(), content: msg.content })
+    else if (msg.role === 'tool_use') {
+      restored.push({
+        role: 'tool_use',
+        id: nextRowId(),
+        name: msg.name,
+        summary: msg.name,
+        input: summarizeToolInput(msg.input),
+      })
+    } else if (msg.role === 'tool_result') {
+      restored.push({
+        role: 'tool_result',
+        id: nextRowId(),
+        name: msg.name,
+        summary: msg.isError ? `${msg.name} failed` : `${msg.name} completed`,
+        content: toolResultContentForRow(msg.name, msg.content, msg.isError),
+        isError: msg.isError,
+      })
+    }
+  }
+  return restored
+}
+
+export function summarizeToolInput(input: Record<string, unknown>): string {
+  try {
+    const text = JSON.stringify(input)
+    if (text.length <= 160) return text
+    return `${text.slice(0, 157)}...`
+  } catch {
+    return '[unserializable input]'
+  }
+}
+
+export function truncateForRow(text: string, max = 1200): string {
+  if (text.length <= max) return text
+  return `${text.slice(0, max - 3)}...`
+}
+
+export function toolResultContentForRow(name: string, content: string, isError?: boolean): string {
+  return hidesSuccessfulToolResultContent(name, isError) ? '' : truncateForRow(content)
+}
+
+export function splitStreamingContent(text: string): { committed: string; liveTail: string } {
+  if (!text) return { committed: '', liveTail: '' }
+  const boundary = findStableBoundary(text)
+  if (boundary <= 0 || boundary >= text.length) {
+    return { committed: boundary >= text.length ? text : '', liveTail: boundary >= text.length ? '' : text }
+  }
+  return { committed: text.slice(0, boundary), liveTail: text.slice(boundary) }
+}
+
+export function findStableBoundary(text: string): number {
+  let lastStructural = 0
+  let lastSentence = 0
+  let inFence = false
+  let offset = 0
+  const lines = text.match(/[^\n]*\n?|$/g)?.filter(Boolean) ?? []
+
+  for (const lineWithEnding of lines) {
+    const line = lineWithEnding.endsWith('\n') ? lineWithEnding.slice(0, -1) : lineWithEnding
+    const trimmed = line.trim()
+    const nextOffset = offset + lineWithEnding.length
+
+    if (/^```/.test(trimmed)) {
+      inFence = !inFence
+      if (!inFence) lastStructural = nextOffset
+      offset = nextOffset
+      continue
+    }
+
+    if (!inFence) {
+      if (!trimmed) {
+        lastStructural = nextOffset
+      } else if (/^(#{1,3}\s|>\s?|[-*+]\s|\d+\.\s)/.test(trimmed)) {
+        lastStructural = nextOffset
+      }
+
+      let match: RegExpExecArray | null
+      const sentencePattern = /[.!?]["')\]]?(?=\s|$)/g
+      while ((match = sentencePattern.exec(line)) !== null) {
+        lastSentence = offset + match.index + match[0].length
+      }
+    }
+
+    offset = nextOffset
+  }
+
+  if (inFence) return lastStructural
+  if (lastStructural > 0) return lastStructural
+  if (text.length > 220 && lastSentence > 0) return lastSentence
+  if (text.length > 320) {
+    const fallbackSpace = text.lastIndexOf(' ', Math.max(160, text.length - 80))
+    if (fallbackSpace > 80) return fallbackSpace + 1
+  }
+  return 0
+}
+
+export function formatBytes(bytes: number): string {
+  if (bytes <= 0) return '0B'
+  const gb = bytes / (1024 * 1024 * 1024)
+  if (gb >= 1) return `${gb.toFixed(2)}GB`
+  const mb = bytes / (1024 * 1024)
+  if (mb >= 1) return `${mb.toFixed(0)}MB`
+  const kb = bytes / 1024
+  return `${kb.toFixed(0)}KB`
+}
+
+export function createTurnCheckpoint(sessionId: string, userText: string): TurnCheckpoint {
+  const promptSnippet = summarizePrompt(userText)
+  return {
+    sessionId,
+    turnId: `turn-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+    messageRole: 'user',
+    promptSnippet,
+    checkpointLabel: promptSnippet || 'Untitled checkpoint',
+  }
+}
+
+export function summarizePrompt(text: string): string {
+  const normalized = text.replace(/\s+/g, ' ').trim()
+  if (!normalized) return ''
+  return normalized.length <= 96 ? normalized : `${normalized.slice(0, 93)}...`
+}
+
+export function buildDeleteCommand(targetPath: string): string {
+  const escaped = targetPath.replace(/"/g, '""')
+  if (process.platform === 'win32') {
+    return `del /f /q "${escaped}"`
+  }
+  return `rm -f -- "${targetPath.replace(/"/g, '\\"')}"`
+}

package/src/chat/chatSessionState.ts

@@ -0,0 +1,142 @@
+import { localProviderBaseUrlFor, type EthagentConfig } from '../storage/config.js'
+import type { SessionMetadata, SessionMessage } from '../storage/sessions.js'
+import type { SessionMode } from '../runtime/sessionMode.js'
+import type { MessageRow } from './MessageList.js'
+import type { ModelPickerSelection } from '../models/ModelPicker.js'
+import { sessionMessagesToRows } from './chatScreenUtils.js'
+import { formatModelDisplayName } from '../models/modelDisplay.js'
+
+export type ModelSelectionResolution =
+  | { kind: 'noop' }
+  | {
+      kind: 'switch'
+      config: EthagentConfig
+      notice: string
+      tone: 'info' | 'dim'
+    }
+
+export type ResumedSessionState = {
+  cwd: string
+  mode: SessionMode
+  rows: MessageRow[]
+  promptHistory: string[]
+  statusStartedAt: number
+}
+
+const MAX_PROMPT_HISTORY = 500
+
+export function resolveModelSelection(
+  selection: ModelPickerSelection,
+  currentConfig: EthagentConfig,
+): ModelSelectionResolution {
+  if (selection.kind === 'llamacpp') {
+    const baseUrl = localProviderBaseUrlFor(
+      'llamacpp',
+      currentConfig.provider === 'llamacpp' ? currentConfig.baseUrl : undefined,
+    )
+    if (
+      selection.model === currentConfig.model
+      && currentConfig.provider === 'llamacpp'
+      && currentConfig.baseUrl === baseUrl
+    ) {
+      return { kind: 'noop' }
+    }
+    return {
+      kind: 'switch',
+      config: {
+        ...currentConfig,
+        provider: 'llamacpp',
+        model: selection.model,
+        baseUrl,
+      },
+      notice: `local Hugging Face model ready. now using ${formatModelDisplayName('llamacpp', selection.model, { maxLength: 64 })}.`,
+      tone: 'info',
+    }
+  }
+
+  const nextProvider = selection.provider
+  const nextBaseUrl =
+    nextProvider === 'openai' && currentConfig.provider === 'openai'
+      ? currentConfig.baseUrl
+      : undefined
+  const nextConfig: EthagentConfig = {
+    ...currentConfig,
+    provider: nextProvider,
+    model: selection.model,
+    baseUrl: nextBaseUrl,
+  }
+
+  return {
+    kind: 'switch',
+    config: nextConfig,
+    notice: `${selection.keyJustSet ? `${selection.provider} key saved.` : `${selection.provider} ready.`} now using ${nextConfig.provider} · ${formatModelDisplayName(nextConfig.provider, nextConfig.model, { maxLength: 64 })}.`,
+    tone: 'dim',
+  }
+}
+
+export function buildResumedSessionState(args: {
+  messages: SessionMessage[]
+  metadata: SessionMetadata | null
+  fallbackCwd: string
+  nextRowId: () => string
+}): ResumedSessionState {
+  const cwd = args.metadata?.lastCwd ?? args.metadata?.workspaceRoot ?? args.fallbackCwd
+  return {
+    cwd,
+    mode: args.metadata?.mode ?? 'chat',
+    rows: [
+      ...sessionMessagesToRows(args.messages, args.nextRowId),
+      {
+        role: 'note',
+        id: args.nextRowId(),
+        kind: 'dim',
+        content: formatResumeNote(args.metadata),
+      },
+    ],
+    promptHistory: promptHistoryFromSessionMessages(args.messages),
+    statusStartedAt: Date.now(),
+  }
+}
+
+function formatResumeNote(metadata: SessionMetadata | null): string {
+  const id = metadata?.id?.slice(0, 8) ?? ''
+  const source = metadata?.compactedFromSessionId ? ` summarized from ${metadata.compactedFromSessionId.slice(0, 8)}` : ''
+  return `resumed from session ${id}.${source}`.trim()
+}
+
+export function restoreConversationState(
+  messages: SessionMessage[],
+  turnId: string,
+  nextRowId: () => string,
+): {
+  messages: SessionMessage[]
+  rows: MessageRow[]
+  promptHistory: string[]
+  truncated: boolean
+} {
+  const firstIndex = messages.findIndex(message => message.turnId === turnId)
+  const nextMessages =
+    firstIndex >= 0
+      ? messages.slice(0, firstIndex)
+      : messages.filter(message => message.turnId !== turnId)
+
+  return {
+    messages: nextMessages,
+    rows: sessionMessagesToRows(nextMessages, nextRowId),
+    promptHistory: promptHistoryFromSessionMessages(nextMessages),
+    truncated: firstIndex >= 0,
+  }
+}
+
+export function promptHistoryFromSessionMessages(messages: SessionMessage[]): string[] {
+  const prompts: string[] = []
+  for (const message of messages) {
+    if (message.role !== 'user') continue
+    if (message.synthetic) continue
+    const prompt = message.content.trim()
+    if (!prompt) continue
+    if (prompts[prompts.length - 1] === prompt) continue
+    prompts.push(prompt)
+  }
+  return prompts.slice(-MAX_PROMPT_HISTORY)
+}