ethagent 1.1.1 → 2.0.0

package/src/tools/privateContinuityReadTool.ts

@@ -3,7 +3,6 @@ import { z } from 'zod'
 import {
   continuityVaultRef,
   ensureContinuityFiles,
-  type PrivateContinuityFile,
 } from '../identity/continuity/storage.js'
 import type { Tool } from './contracts.js'
 
@@ -71,7 +70,7 @@ function preparePrivateContinuityRead(
 ) {
   const identity = config?.identity
   if (!identity) {
-    throw new Error('no active identity; create or load an identity before reading private continuity files')
+    throw new Error('No active identity; create or load an identity before reading private continuity files')
   }
   const ref = continuityVaultRef(identity)
   const fullPath = input.file === 'SOUL.md' ? ref.soulPath : ref.memoryPath

package/src/tools/registry.ts

@@ -1,4 +1,5 @@
 import type { AnthropicToolDefinition } from '../providers/anthropic.js'
+import type { GeminiToolDefinition } from '../providers/gemini.js'
 import type { OpenAIToolDefinition } from '../providers/openai-chat.js'
 import type { Tool } from './contracts.js'
 import { modePolicy, type SessionMode } from '../runtime/sessionMode.js'
@@ -65,3 +66,32 @@ export function openAITools(mode: SessionMode = 'chat', context: ToolAvailabilit
     },
   }))
 }
+
+const GEMINI_DROP_KEYS = new Set([
+  'additionalProperties',
+  '$schema',
+  '$ref',
+  '$defs',
+  'definitions',
+])
+
+function sanitizeForGemini(schema: unknown): unknown {
+  if (Array.isArray(schema)) return schema.map(sanitizeForGemini)
+  if (schema && typeof schema === 'object') {
+    const out: Record<string, unknown> = {}
+    for (const [k, v] of Object.entries(schema as Record<string, unknown>)) {
+      if (GEMINI_DROP_KEYS.has(k)) continue
+      out[k] = sanitizeForGemini(v)
+    }
+    return out
+  }
+  return schema
+}
+
+export function geminiTools(mode: SessionMode = 'chat', context: ToolAvailabilityContext = {}): GeminiToolDefinition[] {
+  return toolsForMode(mode, context).map(tool => ({
+    name: tool.name,
+    description: tool.description,
+    parameters: sanitizeForGemini(tool.inputSchemaJson) as GeminiToolDefinition['parameters'],
+  }))
+}

package/src/tools/writeFileTool.ts

@@ -78,7 +78,7 @@ async function prepareWrite(
   assertSafeWritePath(input.path)
   assertNotPrivateContinuityWorkspacePath(input.path, context.config, 'write_file')
   if (input.content.length === 0) {
-    throw new Error('write_file content is empty; provide non-empty file contents')
+    throw new Error('Tool write_file content is empty; provide non-empty file contents')
   }
 
   const fullPath = resolveWorkspacePath(context.workspaceRoot, input.path)
@@ -91,7 +91,7 @@ async function prepareWrite(
 async function readExistingFile(fullPath: string): Promise<{ before: string; existedBefore: boolean }> {
   try {
     const stats = await fs.stat(fullPath)
-    if (stats.isDirectory()) throw new Error('write_file path points to a directory; provide a file path')
+    if (stats.isDirectory()) throw new Error('Tool write_file path points to a directory; provide a file path')
     return { before: await fs.readFile(fullPath, 'utf8'), existedBefore: true }
   } catch (error: unknown) {
     if ((error as NodeJS.ErrnoException).code === 'ENOENT') return { before: '', existedBefore: false }
@@ -113,13 +113,13 @@ async function tryRecordRewindSnapshot(
 function assertSafeWritePath(requestedPath: string): void {
   const trimmed = requestedPath.trim()
   if (trimmed !== requestedPath || trimmed.length === 0) {
-    throw new Error('write_file path must be a clean workspace-relative file path')
+    throw new Error('Tool write_file path must be a clean workspace-relative file path')
   }
   if (/[|;&<>`]/.test(trimmed)) {
-    throw new Error('write_file path must not contain shell operators')
+    throw new Error('Tool write_file path must not contain shell operators')
   }
   if (/^(?:rm|del|erase|rmdir|remove-item|mkdir|type|cat|echo|copy|move|mv|cp)\b/i.test(trimmed)) {
-    throw new Error('write_file path looks like a shell command; pass only the file path')
+    throw new Error('Tool write_file path looks like a shell command; pass only the file path')
   }
 }
 

package/src/ui/BrandSplash.tsx

@@ -1,56 +1,14 @@
 import React, { useEffect, useState } from 'react'
 import { Text, Box } from 'ink'
-import { eyeGradientColor, theme } from './theme.js'
+import { theme } from './theme.js'
 
 const glyphs = {
-  ethagent: {
-    eth: `░░░░░░░╗░░░░░░░░╗░░╗  ░░╗
-░░╔════╝╚══░░╔══╝░░║  ░░║
-░░░░░╗     ░░║   ░░░░░░░║
-░░╔══╝     ░░║   ░░╔══░░║
-░░░░░░░╗   ░░║   ░░║  ░░║
-╚══════╝   ╚═╝   ╚═╝  ╚═╝`,
-    a: [
-      ` █████╗ `,
-      `██╔══██╗`,
-      `███████║`,
-      `██╔══██║`,
-      `██║  ██║`,
-      `╚═╝  ╚═╝`,
-    ].join('\n'),
-    g: [
-      ` ██████╗ `,
-      `██╔════╝ `,
-      `██║  ███╗`,
-      `██║   ██║`,
-      `╚██████╔╝`,
-      ` ╚═════╝ `,
-    ].join('\n'),
-    e: [
-      `███████╗`,
-      `██╔════╝`,
-      `█████╗  `,
-      `██╔══╝  `,
-      `███████╗`,
-      `╚══════╝`,
-    ].join('\n'),
-    n: [
-      `███╗   ██╗`,
-      `████╗  ██║`,
-      `██╔██╗ ██║`,
-      `██║╚██╗██║`,
-      `██║ ╚████║`,
-      `╚═╝  ╚═══╝`,
-    ].join('\n'),
-    t: [
-      `████████╗`,
-      `╚══██╔══╝`,
-      `   ██║   `,
-      `   ██║   `,
-      `   ██║   `,
-      `   ╚═╝   `,
-    ].join('\n'),
-  },
+  ethagent: `░░░░░░░╗░░░░░░░░╗░░╗  ░░╗ █████╗  ██████╗ ███████╗███╗   ██╗████████╗
+░░╔════╝╚══░░╔══╝░░║  ░░║██╔══██╗██╔════╝ ██╔════╝████╗  ██║╚══██╔══╝
+░░░░░╗     ░░║   ░░░░░░░║███████║██║  ███╗█████╗  ██╔██╗ ██║   ██║
+░░╔══╝     ░░║   ░░╔══░░║██╔══██║██║   ██║██╔══╝  ██║╚██╗██║   ██║
+░░░░░░░╗   ░░║   ░░║  ░░║██║  ██║╚██████╔╝███████╗██║ ╚████║   ██║
+╚══════╝   ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝ ╚══════╝╚═╝  ╚═══╝   ╚═╝   `,
   eyes: `
                                          -+:
                    :=-                    -%@@@%.
@@ -79,33 +37,13 @@ const glyphs = {
   },
 } as const
 
-const ethagentGlyphOrder = ['eth', 'a', 'g', 'e', 'n', 't'] as const
-
 const Eyes = () => {
   const lines = glyphs.eyes.split('\n')
   return (
     <Box flexDirection="column">
-      {lines.map((line, li) => {
-        const glyphPositions = [...line]
-          .map((char, index) => ({ char, index }))
-          .filter(entry => entry.char.trim().length > 0)
-          .map(entry => entry.index)
-        const firstGlyph = glyphPositions[0] ?? 0
-        const lastGlyph = glyphPositions[glyphPositions.length - 1] ?? firstGlyph
-        const span = Math.max(lastGlyph - firstGlyph, 1)
-
-        return (
-          <Text key={li}>
-            {[...line].map((char, ci) => {
-              if (!char.trim()) {
-                return <Text key={ci}>{char}</Text>
-              }
-              const t = (ci - firstGlyph) / span
-              return <Text key={ci} color={eyeGradientColor(t)}>{char}</Text>
-            })}
-          </Text>
-        )
-      })}
+      {lines.map((line, li) => (
+        <Text key={li} color={theme.text}>{line}</Text>
+      ))}
     </Box>
   )
 }
@@ -135,19 +73,18 @@ export const BrandSplash: React.FC<SplashProps> = ({ contextLine, tipLine, updat
     return (
       <Box flexDirection="column" alignSelf="flex-start" padding={1}>
         <Eyes />
-        <Text bold color={theme.accentPrimary}>ethagent</Text>
-        <Text color={theme.dim}>{glyphs.tagline.trim()}</Text>
+        <Text bold color={theme.accentWhite}>ethagent</Text>
+        <Text color={theme.dim}>privacy-first AI agent with a portable <Text color={theme.accentPeriwinkle}>Ethereum</Text> identity</Text>
         {contextLine ? <Text color={theme.dim}>{contextLine}</Text> : null}
         {tipLine ? <Text color={theme.dim}>{tipLine}</Text> : null}
-        {updateNotice ? <Text color={theme.accentPeach}>{updateNotice}</Text> : null}
+        {updateNotice ? <Text color={theme.accentPeriwinkle}>{updateNotice}</Text> : null}
       </Box>
     )
   }
 
-  const logoLines = ethagentGlyphOrder.map(key => glyphs.ethagent[key].split('\n'))
-  const rowCount = Math.max(...logoLines.map(lines => lines.length))
-
   const w = 69
+  const logoLines = glyphs.ethagent.split('\n').map(line => line.padEnd(w, ' '))
+
   const topPad = Math.max(0, w - glyphs.tagline.length - 1)
 
   const bottomInline = contextLine ? ` ${truncateToFit(contextLine, w - 4)} ` : ''
@@ -158,22 +95,20 @@ export const BrandSplash: React.FC<SplashProps> = ({ contextLine, tipLine, updat
       <Eyes />
       <Text>
         <Text color={theme.border}>{glyphs.frame.topLeft}</Text>
-        <Text color={theme.dim}>{glyphs.tagline}</Text>
+        <Text color={theme.dim}>{' privacy-first AI agent with a portable '}<Text color={theme.accentPeriwinkle}>Ethereum</Text>{' identity '}</Text>
         <Text color={theme.border}>{glyphs.frame.horizontal.repeat(topPad)}{glyphs.frame.topRight}</Text>
       </Text>
-      {Array.from({ length: rowCount }, (_, i) => (
+      {logoLines.map((line, i) => (
         <Box key={i}>
           <Text color={theme.border}>{glyphs.frame.side}</Text>
-          {logoLines.map((lines, index) => (
-            <Text key={ethagentGlyphOrder[index]} color={theme.border}>{lines[i] ?? ''}</Text>
-          ))}
+          <Text color={theme.border}>{line}</Text>
           <Text color={theme.border}>{glyphs.frame.side}</Text>
         </Box>
       ))}
       {bottomInline ? (
         <Text>
           <Text color={theme.border}>{glyphs.frame.bottomLeft}</Text>
-          <Text color={theme.accentMint}>{bottomInline}</Text>
+          <Text color={theme.accentPeriwinkle}>{bottomInline}</Text>
           <Text color={theme.border}>{glyphs.frame.horizontal.repeat(bottomPad)}{glyphs.frame.bottomRight}</Text>
         </Text>
       ) : (
@@ -182,7 +117,7 @@ export const BrandSplash: React.FC<SplashProps> = ({ contextLine, tipLine, updat
       {tipLine || updateNotice ? (
         <Box marginTop={1} flexDirection="column">
           {tipLine ? <Text color={theme.dim}>{tipLine}</Text> : null}
-          {updateNotice ? <Text color={theme.accentPeach}>{updateNotice}</Text> : null}
+          {updateNotice ? <Text color={theme.accentPeriwinkle}>{updateNotice}</Text> : null}
         </Box>
       ) : null}
     </Box>

package/src/ui/ProgressBar.tsx

@@ -1,24 +1,22 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { theme, gradientColor, eyeGradientColor } from './theme.js'
+import { theme, gradientColor } from './theme.js'
 
 type ProgressBarProps = {
   progress: number
   width?: number
   label?: string
   suffix?: string
-  variant?: 'default' | 'rainbow'
 }
 
-export const ProgressBar: React.FC<ProgressBarProps> = ({ progress, width = 40, label, suffix, variant = 'default' }) => {
+export const ProgressBar: React.FC<ProgressBarProps> = ({ progress, width = 40, label, suffix }) => {
   const p = Math.max(0, Math.min(1, progress))
   const filled = Math.round(p * width)
   const empty = Math.max(0, width - filled)
-  const colorFor = variant === 'rainbow' ? eyeGradientColor : gradientColor
   const cells: React.ReactElement[] = []
   for (let i = 0; i < filled; i++) {
     cells.push(
-      <Text key={`f-${i}`} color={colorFor(i / Math.max(width - 1, 1))}>█</Text>,
+      <Text key={`f-${i}`} color={gradientColor(i / Math.max(width - 1, 1))}>█</Text>,
     )
   }
   for (let i = 0; i < empty; i++) {

package/src/ui/Select.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useMemo, useState } from 'react'
 import { Box, Text } from 'ink'
 import { theme } from './theme.js'
 import { useAppInput } from '../app/input/AppInputProvider.js'
@@ -39,9 +39,18 @@ export function Select<T>({
   onCancel,
   onHighlight,
 }: SelectProps<T>) {
+  const optionsSignature = useMemo(
+    () => options.map(option => `${String(option.value)}:${option.disabled ? 'disabled' : 'enabled'}:${option.role ?? 'option'}`).join('|'),
+    [options],
+  )
   const firstEnabled = Math.max(0, options.findIndex(isSelectableOption))
   const start = isSelectableOption(options[initialIndex]) ? initialIndex : firstEnabled
   const [index, setIndex] = useState(start === -1 ? 0 : start)
+
+  useEffect(() => {
+    setIndex(start === -1 ? 0 : start)
+  }, [optionsSignature, start])
+
   const visibleCount = Math.max(1, maxVisible ?? options.length)
   const windowStart = Math.max(0, Math.min(
     index - Math.floor(visibleCount / 2),
@@ -73,7 +82,7 @@ export function Select<T>({
     else if (key.return) {
       const selected = options[index]
       if (isSelectableOption(selected)) onSubmit(selected.value)
-    } else if (key.escape) {
+    } else if (key.escape || (key.ctrl && input === 'c')) {
       onCancel?.()
     }
   })
@@ -88,24 +97,27 @@ export function Select<T>({
         const absoluteIndex = windowStart + visibleIndex
         const isActive = absoluteIndex === index
         const selectable = isSelectableOption(option)
+        const disabled = !!option.disabled
         const cursor = !selectable ? ' ' : isActive ? '>' : ' '
         const isSection = option.role === 'section' || option.role === 'group'
         const prefix = option.prefix && !isSection ? `${option.prefix} ` : ''
         const rowIndent = option.indent ?? (usesInlineSections ? isSection ? 1 : 3 : 0)
-        const prefixColor = option.disabled
+        const prefixColor = disabled
           ? option.labelColor ?? theme.border
           : isActive && selectable
-            ? theme.accentPrimary
+            ? theme.accentPeriwinkle
             : option.labelColor ?? theme.dim
         const labelColor = isSection
-          ? option.labelColor ?? theme.dim
+          ? option.labelColor ?? theme.textSubtle
           : isActive && selectable
-            ? theme.accentPrimary
-            : option.labelColor ?? (option.disabled ? theme.dim : theme.text)
+            ? theme.accentPeriwinkle
+            : option.labelColor ?? (disabled ? theme.dim : theme.text)
         const hintColor = isActive && selectable
           ? theme.textSubtle
-          : option.hintColor ?? theme.dim
-        const subtextColor = option.subtextColor ?? theme.dim
+          : disabled
+            ? theme.border
+            : option.hintColor ?? theme.dim
+        const subtextColor = disabled ? theme.border : option.subtextColor ?? theme.dim
         const bold = option.bold ?? (isSection || (isActive && selectable))
         const inlineHint = Boolean(option.hint && hintLayout === 'inline' && !isSection)
         const belowHint = Boolean(option.hint && (!inlineHint || isSection))

package/src/ui/Spinner.tsx

@@ -193,6 +193,15 @@ export function pickVerb(): string {
   return SPINNER_VERBS[idx] ?? 'thinking'
 }
 
+export function spinnerText(value: string): string {
+  const text = restoreSpinnerTerms(value.toLowerCase())
+  return text.replace(/^(\s*)([a-z])/, (_match, prefix: string, letter: string) => `${prefix}${letter.toUpperCase()}`)
+}
+
+export function spinnerHintText(value: string): string {
+  return restoreSpinnerTerms(value.toLowerCase())
+}
+
 type SpinnerProps = {
   active?: boolean
   hint?: string
@@ -210,7 +219,7 @@ export const Spinner: React.FC<SpinnerProps> = ({
   hint: rawHint,
   label,
   verb,
-  color = theme.accentSecondary,
+  color = theme.accentPeriwinkle,
   startedAt,
   showElapsed = true,
 }) => {
@@ -246,11 +255,11 @@ export const Spinner: React.FC<SpinnerProps> = ({
   if (!active) return null
 
   const autoLabel = stickyVerbRef.current ?? verb ?? 'thinking'
-  const text = label ?? `${autoLabel}…`
+  const text = spinnerText(label ?? `${autoLabel}…`)
   const glyph = FRAMES[frame] ?? 'o'
   const elapsed = showElapsed ? formatElapsedSeconds(Date.now() - (startedAt ?? internalStartedAtRef.current)) : null
   const renderedHint = [rawHint, elapsed].filter(Boolean).join(' · ')
-  const hint = renderedHint
+  const hint = renderedHint ? spinnerHintText(renderedHint) : ''
 
   return (
     <Text>
@@ -267,3 +276,29 @@ function formatElapsedSeconds(milliseconds: number): string {
   const minutes = Math.floor(seconds / 60)
   return `${minutes}:${(seconds % 60).toString().padStart(2, '0')}`
 }
+
+function restoreSpinnerTerms(value: string): string {
+  return value
+    .replace(/\bapi\b/g, 'API')
+    .replace(/\bens\b/g, 'ENS')
+    .replace(/\berc-8004\b/g, 'ERC-8004')
+    .replace(/\bgguf\b/g, 'GGUF')
+    .replace(/\bhugging face\b/g, 'Hugging Face')
+    .replace(/\bipfs\b/g, 'IPFS')
+    .replace(/\bjson\b/g, 'JSON')
+    .replace(/\bjwt\b/g, 'JWT')
+    .replace(/\bmemory\.md\b/g, 'MEMORY.md')
+    .replace(/\bopenai\b/g, 'OpenAI')
+    .replace(/\banthropic\b/g, 'Anthropic')
+    .replace(/\bgemini\b/g, 'Gemini')
+    .replace(/\bos\b/g, 'OS')
+    .replace(/\brpc\b/g, 'RPC')
+    .replace(/\bsoul\.md\b/g, 'SOUL.md')
+    .replace(/\buri\b/g, 'URI')
+    .replace(/\burl\b/g, 'URL')
+    .replace(/\bbase\b/g, 'Base')
+    .replace(/\bethereum mainnet\b/g, 'Ethereum Mainnet')
+    .replace(/\bethereum\b/g, 'Ethereum')
+    .replace(/\bsepolia\b/g, 'Sepolia')
+    .replace(/\bbase sepolia\b/g, 'Base Sepolia')
+}

package/src/ui/Surface.tsx

@@ -13,9 +13,9 @@ type SurfaceProps = {
 }
 
 const toneColor: Record<SurfaceTone, string> = {
-  primary: theme.accentPrimary,
+  primary: theme.accentPeriwinkle,
   muted: theme.border,
-  error: '#e87070',
+  error: theme.accentError,
 }
 
 export const Surface: React.FC<SurfaceProps> = ({
@@ -27,7 +27,7 @@ export const Surface: React.FC<SurfaceProps> = ({
 }) => {
   const borderColor = toneColor[tone]
   return (
-    <Box flexDirection="column" borderStyle="round" borderColor={borderColor} paddingX={2} paddingY={0}>
+    <Box flexDirection="column" borderStyle="round" borderColor={borderColor} paddingX={2} paddingY={0} width="100%">
       <Box flexDirection="column">
         <Text color={borderColor} bold>{title}</Text>
         {subtitle ? (