lonny-agent 0.2.3 → 0.2.6

package/src/web/index.ts

@@ -8,6 +8,7 @@ import { ensurePromptsDir, loadPromptTemplates } from '../agent/prompt-templates
 import { Session, type SessionOutput } from '../agent/session.js'
 import { ensureSkillsDir, loadSkills } from '../agent/skills.js'
 import type { Config } from '../config/index.js'
+import { resetTokenUsage } from '../config/tokens.js'
 import { fmtErr } from '../tools/errors.js'
 import { fetchDeepSeekBalance, isDeepSeekOfficial } from '../tui/balance.js'
 import { listPlans, type PlanEntry } from '../tui/components.js'
@@ -88,13 +89,13 @@ export async function startWebUi(config: Config, port: number): Promise<void> {
   // Create WebSocket server
   const wss = new WebSocketServer({ server })
 
-  wss.on('connection', (ws: WebSocket) => {
+  wss.on('connection', async (ws: WebSocket) => {
     console.log('[Web UI] Client connected')
 
     // Reset event bus for new session
     resetGlobalEventBus()
 
-    const session = Session.load(config) || new Session(config)
+    const session = (await Session.load(config)) || new Session(config)
     let bridge: ReturnType<typeof startSessionBridge> | null = null
 
     // Track output to forward to WebSocket
@@ -149,7 +150,7 @@ export async function startWebUi(config: Config, port: number): Promise<void> {
     }
 
     // Re-create session with output
-    const sessionWithOutput = Session.load(config, output) || new Session(config, output)
+    let sessionWithOutput = (await Session.load(config, output)) || new Session(config, output)
     sessionWithOutput.messages = session.messages
     sessionWithOutput.totalInputTokens = session.totalInputTokens
     sessionWithOutput.totalOutputTokens = session.totalOutputTokens
@@ -238,20 +239,41 @@ export async function startWebUi(config: Config, port: number): Promise<void> {
             const arg = parts.slice(1).join(' ')
 
             if (cmd === 'mode' && (arg === 'code' || arg === 'plan' || arg === 'ask')) {
-              sessionWithOutput.setMode(arg as 'code' | 'plan' | 'ask')
+              await sessionWithOutput.setMode(arg as 'code' | 'plan' | 'ask')
               ws.send(JSON.stringify({ type: 'mode_changed', mode: arg }))
               return
             }
 
             if (cmd === 'model' && arg) {
               sessionWithOutput.config.model = arg
-              sessionWithOutput.setMode(sessionWithOutput.config.mode)
+              await sessionWithOutput.setMode(sessionWithOutput.config.mode)
               ws.send(JSON.stringify({ type: 'model_changed', model: arg }))
               return
             }
 
             if (cmd === 'new') {
+              // Stop any running agent first
+              sessionWithOutput.stop()
+              // Close old bridge
+              if (bridge) bridge.close()
+              // Clear persisted state
               Session.clearSavedSession(config.cwd)
+              resetTokenUsage(config.cwd)
+              resetGlobalEventBus()
+              // Create fresh session with empty context
+              sessionWithOutput = new Session(config, output)
+              sessionWithOutput.onPlanWritten = (display: string) => {
+                ws.send(JSON.stringify({ type: 'plan_written', display }))
+                sendPlanData()
+              }
+              // Create new bridge for the fresh session
+              bridge = startSessionBridge(sessionWithOutput, config, (msg: WsMessage) => {
+                if (ws.readyState === ws.OPEN) {
+                  ws.send(JSON.stringify(msg))
+                }
+              })
+              // Reset pending confirmation state
+              pendingConfirm = null
               ws.send(JSON.stringify({ type: 'session_cleared' }))
               ws.send(JSON.stringify({ type: 'done', reason: 'stop' }))
               return
@@ -428,11 +450,11 @@ export async function startWebUi(config: Config, port: number): Promise<void> {
       sendPlanData()
     })()
 
-    // Send full session history (exclude system prompt, strip ANSI from tool results)
+    // Send full session history (exclude system prompt, strip ANSI from non-edit tool results)
     const historyMessages = sessionWithOutput.messages
       .filter(m => m.role !== 'system')
       .map(m => {
-        if (m.role === 'tool' && typeof m.content === 'string') {
+        if (m.role === 'tool' && typeof m.content === 'string' && m.name !== 'edit') {
           return { ...m, content: stripAnsi(m.content) }
         }
         return m