lonny-agent 0.2.4 → 0.2.6

package/src/web/session-bridge.ts

@@ -1,194 +1,193 @@
-import { EventChannels, getGlobalEventBus } from '../agent/event-bus.js'
-import type { Session } from '../agent/session.js'
-import type { Config } from '../config/index.js'
-
-/**
- * Bridge between Session/EventBus and WebSocket.
- * Listens to EventBus events and forwards them as JSON messages.
- */
-
-/** Strip ANSI escape codes from a string (terminal colors are meaningless in the browser) */
-function stripAnsi(text: string): string {
-  return text.replace(/\x1b\[[0-9;]*m/g, '')
-}
-
-export interface WsMessage {
-  type: string
-  [key: string]: unknown
-}
-
-export type SendFn = (msg: WsMessage) => void
-
-const WS_PROTOCOL_VERSION = 1
-
-export function startSessionBridge(
-  session: Session,
-  config: Config,
-  send: SendFn,
-): { close: () => void; sendMessage: (text: string) => Promise<void> } {
-  const bus = getGlobalEventBus()
-
-  // Send initial handshake with current token stats
-  send({
-    type: 'hello',
-    version: WS_PROTOCOL_VERSION,
-    mode: config.mode,
-    model: config.model,
-    provider: config.provider,
-    totalIn: session.totalInputTokens,
-    totalOut: session.totalOutputTokens,
-    totalApi: session.totalApiCalls,
-  })
-
-  // ── Subscribe to EventBus ──
-
-  const unsubTurnStart = bus.on(EventChannels.TURN_START, data => {
-    const d = data as { prompt?: string }
-    send({ type: 'turn_start', prompt: d.prompt || '' })
-  })
-
-  const unsubToolCall = bus.on(EventChannels.TOOL_CALL, data => {
-    const d = data as { name: string; input: Record<string, unknown>; id: string }
-    send({ type: 'tool_call', name: d.name, input: d.input, id: d.id })
-  })
-
-  const unsubToolResult = bus.on(EventChannels.TOOL_RESULT, data => {
-    const d = data as { name: string; id: string; output: string }
-    send({
-      type: 'tool_result',
-      name: d.name,
-      id: d.id,
-      success: true,
-      output: stripAnsi(d.output),
-    })
-  })
-
-  const unsubToolError = bus.on(EventChannels.TOOL_ERROR, data => {
-    const d = data as { name: string; id: string; error: string }
-    send({ type: 'tool_result', name: d.name, id: d.id, success: false, error: stripAnsi(d.error) })
-  })
-
-  const unsubTurnEnd = bus.on(EventChannels.TURN_END, data => {
-    const d = data as { iterations: number; toolCallCount: number }
-    send({ type: 'turn_end', iterations: d.iterations, toolCallCount: d.toolCallCount })
-  })
-
-  const unsubThinking = bus.on(EventChannels.THINKING, data => {
-    const d = data as { text: string }
-    send({ type: 'thinking', text: d.text })
-  })
-
-  const unsubThinkingEnd = bus.on(EventChannels.THINKING_END, () => {
-    send({ type: 'thinking_end' })
-  })
-
-  const unsubCompaction = bus.on(EventChannels.COMPACTION_TRIGGERED, data => {
-    const d = data as { before: number; after: number }
-    send({ type: 'compaction', before: d.before, after: d.after })
-  })
-
-  const unsubTokenStats = bus.on(EventChannels.TOKEN_STATS, data => {
-    const d = data as {
-      turnIn: number
-      turnOut: number
-      totalIn: number
-      totalOut: number
-      turnApi: number
-      totalApi: number
-    }
-    send({ type: 'token_stats', ...d })
-  })
-
-  // ── Handle incoming messages from client ──
-
-  async function handleClientMessage(msg: WsMessage): Promise<void> {
-    switch (msg.type) {
-      case 'message': {
-        const text = String(msg.text || '')
-        if (!text.trim()) return
-
-        // Handle slash commands
-        if (text.startsWith('/')) {
-          const parts = text.slice(1).split(/\s+/)
-          const cmd = parts[0]
-          const arg = parts.slice(1).join(' ')
-
-          if (cmd === 'mode' && (arg === 'code' || arg === 'plan' || arg === 'ask')) {
-            session.setMode(arg as 'code' | 'plan' | 'ask')
-            send({ type: 'mode_changed', mode: arg })
-            return
-          }
-
-          if (cmd === 'model' && arg) {
-            session.config.model = arg
-            session.setMode(session.config.mode)
-            send({ type: 'model_changed', model: arg })
-            return
-          }
-
-          if (cmd === 'new') {
-            const { Session } = await import('../agent/session.js')
-            Session.clearSavedSession(config.cwd)
-            send({ type: 'session_cleared' })
-            return
-          }
-
-          if (cmd === 'help') {
-            send({
-              type: 'help',
-              commands: [
-                '/mode code|plan|ask - Switch mode',
-                '/model <name> - Switch model',
-                '/new - Start a new session',
-                '/help - Show this help',
-              ],
-            })
-            return
-          }
-
-          send({ type: 'error', message: `Unknown command: ${cmd}` })
-          return
-        }
-
-        // Send user message to session
-        try {
-          await session.chat(text)
-          send({ type: 'done', reason: 'stop' })
-        } catch (err) {
-          const errMsg = err instanceof Error ? err.message : String(err)
-          send({ type: 'error', message: errMsg })
-          send({ type: 'done', reason: 'error' })
-        }
-        return
-      }
-
-      case 'ping':
-        send({ type: 'pong' })
-        return
-
-      case 'stop':
-        session.stop()
-        return
-
-      default:
-        send({ type: 'error', message: `Unknown message type: ${msg.type}` })
-    }
-  }
-
-  return {
-    close: () => {
-      unsubTurnStart()
-      unsubToolCall()
-      unsubToolResult()
-      unsubToolError()
-      unsubTurnEnd()
-      unsubThinking()
-      unsubThinkingEnd()
-      unsubCompaction()
-      unsubTokenStats()
-    },
-    sendMessage: async (text: string) => {
-      await handleClientMessage({ type: 'message', text })
-    },
-  }
-}
+import { EventChannels, getGlobalEventBus } from '../agent/event-bus.js'
+import type { Session } from '../agent/session.js'
+import type { Config } from '../config/index.js'
+
+/**
+ * Bridge between Session/EventBus and WebSocket.
+ * Listens to EventBus events and forwards them as JSON messages.
+ */
+
+/** Strip ANSI escape codes from a string (terminal colors are meaningless in the browser) */
+function stripAnsi(text: string): string {
+  return text.replace(/\x1b\[[0-9;]*m/g, '')
+}
+
+export interface WsMessage {
+  type: string
+  [key: string]: unknown
+}
+
+export type SendFn = (msg: WsMessage) => void
+
+const WS_PROTOCOL_VERSION = 1
+
+export function startSessionBridge(
+  session: Session,
+  config: Config,
+  send: SendFn,
+): { close: () => void; sendMessage: (text: string) => Promise<void> } {
+  const bus = getGlobalEventBus()
+
+  // Send initial handshake with current token stats
+  send({
+    type: 'hello',
+    version: WS_PROTOCOL_VERSION,
+    mode: config.mode,
+    model: config.model,
+    provider: config.provider,
+    totalIn: session.totalInputTokens,
+    totalOut: session.totalOutputTokens,
+    totalApi: session.totalApiCalls,
+    totalCacheHit: session.totalCacheHitTokens || undefined,
+    totalCacheMiss: session.totalCacheMissTokens || undefined,
+  })
+
+  // ── Subscribe to EventBus ──
+
+  const unsubTurnStart = bus.on(EventChannels.TURN_START, data => {
+    const d = data as { prompt?: string }
+    send({ type: 'turn_start', prompt: d.prompt || '' })
+  })
+
+  const unsubToolCall = bus.on(EventChannels.TOOL_CALL, data => {
+    const d = data as { name: string; input: Record<string, unknown>; id: string }
+    send({ type: 'tool_call', name: d.name, input: d.input, id: d.id })
+  })
+
+  const unsubToolResult = bus.on(EventChannels.TOOL_RESULT, data => {
+    const d = data as { name: string; id: string; output: string }
+    send({
+      type: 'tool_result',
+      name: d.name,
+      id: d.id,
+      success: true,
+      output: d.name === 'edit' ? d.output : stripAnsi(d.output),
+    })
+  })
+
+  const unsubToolError = bus.on(EventChannels.TOOL_ERROR, data => {
+    const d = data as { name: string; id: string; error: string }
+    send({ type: 'tool_result', name: d.name, id: d.id, success: false, error: stripAnsi(d.error) })
+  })
+
+  const unsubTurnEnd = bus.on(EventChannels.TURN_END, data => {
+    const d = data as { iterations: number; toolCallCount: number }
+    send({ type: 'turn_end', iterations: d.iterations, toolCallCount: d.toolCallCount })
+  })
+
+  const unsubThinking = bus.on(EventChannels.THINKING, data => {
+    const d = data as { text: string }
+    send({ type: 'thinking', text: d.text })
+  })
+
+  const unsubThinkingEnd = bus.on(EventChannels.THINKING_END, () => {
+    send({ type: 'thinking_end' })
+  })
+
+  const unsubCompaction = bus.on(EventChannels.COMPACTION_TRIGGERED, data => {
+    const d = data as { before: number; after: number }
+    send({ type: 'compaction', before: d.before, after: d.after })
+  })
+
+  const unsubTokenStats = bus.on(EventChannels.TOKEN_STATS, data => {
+    const d = data as {
+      turnIn: number
+      turnOut: number
+      totalIn: number
+      totalOut: number
+      turnApi: number
+      totalApi: number
+      turnCacheHit?: number
+      turnCacheMiss?: number
+      totalCacheHit?: number
+      totalCacheMiss?: number
+    }
+    send({ type: 'token_stats', ...d })
+  })
+
+  // ── Handle incoming messages from client ──
+
+  async function handleClientMessage(msg: WsMessage): Promise<void> {
+    switch (msg.type) {
+      case 'message': {
+        const text = String(msg.text || '')
+        if (!text.trim()) return
+
+        // Handle slash commands
+        if (text.startsWith('/')) {
+          const parts = text.slice(1).split(/\s+/)
+          const cmd = parts[0]
+          const arg = parts.slice(1).join(' ')
+
+          if (cmd === 'mode' && (arg === 'code' || arg === 'plan' || arg === 'ask')) {
+            session.setMode(arg as 'code' | 'plan' | 'ask')
+            send({ type: 'mode_changed', mode: arg })
+            return
+          }
+
+          if (cmd === 'model' && arg) {
+            session.config.model = arg
+            session.setMode(session.config.mode)
+            send({ type: 'model_changed', model: arg })
+            return
+          }
+
+          if (cmd === 'help') {
+            send({
+              type: 'help',
+              commands: [
+                '/mode code|plan|ask - Switch mode',
+                '/model <name> - Switch model',
+                '/new - Start a new session',
+                '/help - Show this help',
+              ],
+            })
+            return
+          }
+
+          send({ type: 'error', message: `Unknown command: ${cmd}` })
+          return
+        }
+
+        // Send user message to session
+        try {
+          await session.chat(text)
+          send({ type: 'done', reason: 'stop' })
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err)
+          send({ type: 'error', message: errMsg })
+          send({ type: 'done', reason: 'error' })
+        }
+        return
+      }
+
+      case 'ping':
+        send({ type: 'pong' })
+        return
+
+      case 'stop':
+        session.stop()
+        return
+
+      default:
+        send({ type: 'error', message: `Unknown message type: ${msg.type}` })
+    }
+  }
+
+  return {
+    close: () => {
+      unsubTurnStart()
+      unsubToolCall()
+      unsubToolResult()
+      unsubToolError()
+      unsubTurnEnd()
+      unsubThinking()
+      unsubThinkingEnd()
+      unsubCompaction()
+      unsubTokenStats()
+    },
+    sendMessage: async (text: string) => {
+      await handleClientMessage({ type: 'message', text })
+    },
+  }
+}

package/.claude/settings.local.json

@@ -1,14 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npm run:*)",
-      "Bash(grep:*)",
-      "Bash(npx tsc:*)",
-      "Bash(npm test:*)",
-      "Bash(gh release:*)",
-      "Read(//c/Program Files/GitHub CLI//**)",
-      "Read(//c/Program Files \\(x86\\)/**)",
-      "Bash(\"/c/Program Files/GitHub CLI/gh.exe\" release create 0.2.4 --title \"v0.2.4\" --generate-notes)"
-    ]
-  }
-}

package/.kilo/plans/1780064105789-mighty-pixel.md

@@ -1,171 +0,0 @@
-# Plan: Vendor `@earendil-works/pi-tui` source
-
-## Objective
-
-Replace the `@earendil-works/pi-tui` npm dependency with vendored source code from [pi/packages/tui](https://github.com/earendil-works/pi/tree/main/packages/tui), so the project no longer depends on that npm package.
-
-## Current state
-
-- `package.json` depends on `"@earendil-works/pi-tui": "0.75.5"`
-- A patch file `patches/@earendil-works+pi-tui+0.75.5.patch` applies 2 modifications (autocomplete above editor, alternate screen buffer on start/stop)
-- `patch-package` is in devDependencies for applying the patch
-- Only 2 source files import from `@earendil-works/pi-tui`:
-  - `src/tui/index.ts` (type imports + 11 class exports)
-  - `src/tui/components.ts` (Component type + SelectList class)
-- Internal Editor access: `(editor as any).killRing`, `.undoStack`, `.history`
-
-## Steps
-
-### 1. Download pi-tui source from GitHub
-
-Clone a shallow copy of the repo to get the source at the matching version or the main branch:
-
-```bash
-# From project root temp dir
-git clone --depth 1 --branch main https://github.com/earendil-works/pi.git /tmp/pi-source
-```
-
-Alternatively, if git clone is not feasible, download each file individually from GitHub.
-
-Source files needed from `packages/tui/src/`:
-```
-src/
-  index.ts             - barrel exports
-  autocomplete.ts      - CombinedAutocompleteProvider, AutocompleteProvider, etc.
-  editor-component.ts  - EditorComponent type
-  fuzzy.ts             - fuzzyFilter, fuzzyMatch
-  keybindings.ts       - KeybindingsManager, TUI_KEYBINDINGS, etc.
-  keys.ts              - Key, matchesKey, parseKey, etc.
-  kill-ring.ts         - KillRing
-  native-modifiers.ts  - native keyboard modifiers
-  stdin-buffer.ts      - StdinBuffer
-  terminal-image.ts    - image rendering
-  terminal.ts          - ProcessTerminal, Terminal interface
-  tui.ts               - TUI, Container, Component, OverlayHandle, OverlayOptions, Focusable, CURSOR_MARKER, etc.
-  undo-stack.ts        - UndoStack
-  utils.ts             - visibleWidth, truncateToWidth, wrapTextWithAnsi, etc.
-  word-navigation.ts   - word boundary navigation
-  components/
-    box.ts
-    cancellable-loader.ts
-    editor.ts
-    image.ts
-    input.ts
-    loader.ts
-    markdown.ts
-    select-list.ts
-    settings-list.ts
-    spacer.ts
-    text.ts
-    truncated-text.ts
-```
-
-Also copy `native/` directory (Windows VT input helper):
-```
-native/win32/prebuilds/win32-x64/win32-console-mode.node
-native/win32/prebuilds/win32-arm64/win32-console-mode.node
-```
-
-### 2. Place vendored code at `src/pi-tui/`
-
-```
-src/
-  pi-tui/
-    index.ts
-    autocomplete.ts
-    editor-component.ts
-    fuzzy.ts
-    keybindings.ts
-    keys.ts
-    kill-ring.ts
-    native-modifiers.ts
-    stdin-buffer.ts
-    terminal-image.ts
-    terminal.ts
-    tui.ts
-    undo-stack.ts
-    utils.ts
-    word-navigation.ts
-    components/
-      box.ts
-      cancellable-loader.ts
-      editor.ts
-      image.ts
-      input.ts
-      loader.ts
-      markdown.ts
-      select-list.ts
-      settings-list.ts
-      spacer.ts
-      text.ts
-      truncated-text.ts
-  native/
-    win32/prebuilds/win32-x64/win32-console-mode.node
-    win32/prebuilds/win32-arm64/win32-console-mode.node
-```
-
-### 3. Apply the two manual patches to the vendored source
-
-The patch file modifies the **compiled dist JS**, but we need to apply equivalent changes to the **TypeScript source**:
-
-**Patch 1** — `components/editor.ts`: Move autocomplete rendering above the editor
-- Find the `render()` method where autocomplete lines are appended
-- Change `result.push(...acLines)` → `result.unshift(...acLines)` (or equivalent logic)
-
-**Patch 2** — `tui.ts`: Add alternate screen buffer on start/stop
-- In `start()`: add `this.terminal.write("\x1b[?1049h");` before `this.terminal.start(…)`
-- In `stop()`: add `this.terminal.write("\x1b[?1049l");` before cursor/timer cleanup
-
-### 4. Update import paths
-
-**`src/tui/index.ts`** — change:
-```ts
-import type { EditorTheme, MarkdownTheme, OverlayHandle, SelectItem, SelectListTheme, SlashCommand } from '@earendil-works/pi-tui'
-import { Box, CombinedAutocompleteProvider, Container, Editor, Loader, Markdown, ProcessTerminal, Text, TUI } from '@earendil-works/pi-tui'
-```
-to:
-```ts
-import type { EditorTheme, MarkdownTheme, OverlayHandle, SelectItem, SelectListTheme, SlashCommand } from '../pi-tui/index.js'
-import { Box, CombinedAutocompleteProvider, Container, Editor, Loader, Markdown, ProcessTerminal, Text, TUI } from '../pi-tui/index.js'
-```
-
-**`src/tui/components.ts`** — change:
-```ts
-import type { Component, SelectItem, SelectListTheme } from '@earendil-works/pi-tui'
-import { SelectList } from '@earendil-works/pi-tui'
-```
-to:
-```ts
-import type { Component, SelectItem, SelectListTheme } from '../pi-tui/index.js'
-import { SelectList } from '../pi-tui/index.js'
-```
-
-### 5. Keep `marked` and `get-east-asian-width` as runtime dependencies
-
-These are pi-tui's own runtime dependencies used by `Markdown` and `visibleWidth` respectively. They remain in `dependencies`.
-
-### 6. Remove pi-tui-related npm setup
-
-- `package.json`: Remove `"@earendil-works/pi-tui": "0.75.5"` from `dependencies`
-- `package.json`: Remove `"patch-package": "^8.0.1"` from `devDependencies` (only existed for pi-tui patching)
-- `package.json`: Change `"postinstall": "npx patch-package"` to `"postinstall": "husky"` (or remove entirely if not needed)
-- Delete `patches/@earendil-works+pi-tui+0.75.5.patch`
-- Delete `patches/` directory if empty
-- Run `npm uninstall @earendil-works/pi-tui` and `npm uninstall patch-package` to update lockfile
-
-### 7. Update `package-lock.json`
-
-Run `npm install` to regenerate `package-lock.json` without pi-tui/patch-package.
-
-### 8. Verify
-
-- `npm run build` — tsc should compile successfully
-- `npm run lint` — biome should pass
-- `npm test` — vitest tests should pass
-- Verify the TUI starts correctly with `npm run dev`
-
-## Open questions
-
-1. Should we use the exact version `0.75.5` source (may need to checkout a tag) or the latest `main` branch source? **Answer: main branch is fine unless it introduces breaking changes.**
-2. The `native-modifiers.ts` file on GitHub may export functions used by `terminal.ts`. If unavailable, we can stub it or inline the native module loading logic.
-3. If the GitHub raw URLs are flaky, alternative: download from npm tarball and reverse-engineer from dist JS (less ideal).

package/.kilo/plans/1780293725888-quick-wizard.md

@@ -1,62 +0,0 @@
-# Plan: Optimize edit tool error handling for model
-
-## Problem
-The model calls the `edit` tool with errors very frequently. The most common failures:
-1. `old_string not found` (whitespace issues, stale content, hallucinated content)
-2. `old_string appears MULTIPLE times` (insufficient context)
-3. File doesn't exist / already exists
-4. Input format misuse (already mostly auto-corrected)
-
-Error messages are returned to the model (via `session.ts:687` as `ERROR: ${result.error}`), but they lack actionable recovery guidance, and noise obscures the core issue.
-
-## Changes
-
-### 1. Use `FileReadTracker.checkModified()` to detect stale content
-The `FileReadTracker` has a `checkModified()` method that is never called in production code. The edit tool should call it before attempting edits to detect:
-- File was never read in this session → suggest `read` first
-- File was externally modified since last read → suggest re-reading
-
-This catches a major source of `old_string not found` errors — the model editing content it hasn't read, or editing stale content.
-
-**Location**: `edit.ts`, in the `for (const [resolved, group] of fileGroups)` loop, before processing edits.
-
-### 2. Include proximity hint in `firstError`
-Currently the hint (near-line snippet / file content) is only in `results.push()` but NOT in `firstError`. This means the compact "First error:" line at the bottom of the batch error message lacks the most useful context.
-
-**Fix**: Update lines ~339-342 to include hint in `firstError`.
-
-### 3. Add actionable "Suggestion:" line to failure messages
-When `old_string not found`, the error should tell the model what to do:
-- "Suggestion: Read the file again with `read({ paths: [...] })` to get current content, then retry with exact matching text. Include 2-3 lines of surrounding context for uniqueness."
-- "Suggestion: Whitespace-tolerant matching was attempted but no match found. The text content differs — not just whitespace."
-
-When `old_string appears MULTIPLE times`:
-- "Suggestion: Include more surrounding context lines (2-3 lines before and after) in old_string to make the match unique."
-
-When `File not found`:
-- "Suggestion: Check the file path or create the file first with old_string: '' (empty string)."
-
-When `File already exists` (on create):
-- "Suggestion: Use edit with old_string to replace existing content, or use a different file path."
-
-### 4. Clean up batch failure output
-When a batch fails, the current output includes ALL results (even successful edits that were rolled back). This is noisy.
-
-**Fix**: Only show FAIL lines in the batch error, plus a brief summary like "N edit(s) before failure were rolled back."
-
-### 5. Improve "multiple matches" error with location hints
-When old_string matches multiple times, show the file content at each match location (similar to the "near line" hint for not-found).
-
-### 6. Better `edits` format error
-Tighten the "edits array required" error to be more compact.
-
-## Files to modify
-- `src/tools/edit.ts` — all the above changes
-
-## Tests
-- All existing tests in `src/tools/__tests__/edit.test.ts` must pass
-- Some test assertions may need updating if error message content changes
-- Specifically:
-  - `expect(r.error).toContain('rolled back')` — still valid since rolled-back summary stays
-  - `expect(r.error).toContain('hello')` — still valid since hint stays in error
-  - Other `toContain('not found')`, `toContain('MULTIPLE times')` — still valid