lonny-agent 0.2.4 → 0.2.6

package/dist/web/public/utils.js

@@ -0,0 +1,37 @@
+/* ── Utility Functions ── */
+
+import { chatContainer } from './state.js'
+
+export function getWsUrl() {
+  const proto = location.protocol === 'https:' ? 'wss:' : 'ws:'
+  return `${proto}//${location.host}`
+}
+
+export function scrollToBottom() {
+  requestAnimationFrame(() => {
+    chatContainer.scrollTop = chatContainer.scrollHeight
+  })
+}
+
+export function escapeHtml(text) {
+  const div = document.createElement('div')
+  div.textContent = text
+  return div.innerHTML
+}
+
+export function formatTimestamp() {
+  return new Date().toLocaleTimeString()
+}
+
+export function formatTokenCount(n) {
+  if (n >= 1000000) return `${(n / 1000000).toFixed(n % 1000000 === 0 ? 0 : 1)}M`
+  if (n >= 1000) return `${(n / 1000).toFixed(n % 1000 === 0 ? 0 : 1)}K`
+  return String(n)
+}
+
+export function renderMarkdown(text) {
+  if (typeof marked !== 'undefined' && marked.parse) {
+    return marked.parse(text, { breaks: true, gfm: true })
+  }
+  return `<pre>${escapeHtml(text)}</pre>`
+}

package/dist/web/public/websocket.js

@@ -0,0 +1,267 @@
+/* ── WebSocket Connection & Message Handler ── */
+
+import { closeConfirmDialog, showConfirmDialog } from './confirm.js'
+import {
+  addErrorMessage,
+  addSystemMessage,
+  addTokenStats,
+  addToolCall,
+  addToolResult,
+  appendChunk,
+  finalizeAssistantMessage,
+  hideThinking,
+  renderSessionHistory,
+  showThinking,
+  startAssistantMessage,
+} from './messages.js'
+import { updatePlansAndTodos } from './sidebar.js'
+import {
+  balanceDisplay,
+  balanceSep,
+  connectionOverlay,
+  cwdDisplay,
+  MAX_RECONNECT_ATTEMPTS,
+  messagesEl,
+  modeDisplay,
+  modelDisplay,
+  pendingToolCalls,
+  RECONNECT_DELAY,
+  setStatus,
+  state,
+  tokenCache,
+  tokenCalls,
+  tokenIn,
+  tokenOut,
+} from './state.js'
+import { formatTokenCount, getWsUrl, scrollToBottom } from './utils.js'
+import { setWs } from './ws.js'
+
+function handleMessage(msg) {
+  switch (msg.type) {
+    case 'hello':
+      state.currentMode = msg.mode || 'code'
+      state.currentModel = msg.model || ''
+      state.currentProvider = msg.provider || ''
+      modeDisplay.textContent = state.currentMode
+      modelDisplay.textContent = `${state.currentProvider}/${state.currentModel}`
+      if (msg.totalIn !== undefined) {
+        tokenIn.textContent = formatTokenCount(msg.totalIn || 0)
+        tokenOut.textContent = formatTokenCount(msg.totalOut || 0)
+        tokenCalls.textContent = `(${msg.totalApi || 0})`
+        const cacheHit = msg.totalCacheHit ?? 0
+        const cacheMiss = msg.totalCacheMiss ?? 0
+        const cacheTotal = cacheHit + cacheMiss
+        if (cacheTotal > 0) {
+          const pct = Math.round((cacheHit / cacheTotal) * 100)
+          tokenCache.textContent = `| 缓存 ${pct}%`
+          tokenCache.classList.remove('hidden')
+        }
+      }
+      if (msg.webBalance) {
+        balanceDisplay.textContent = `余额：${msg.webBalance}`
+        balanceDisplay.style.display = ''
+        balanceSep.style.display = ''
+      } else if (msg.balance) {
+        balanceDisplay.textContent = `余额：${msg.balance}`
+        balanceDisplay.style.display = ''
+        balanceSep.style.display = ''
+      } else {
+        balanceDisplay.style.display = 'none'
+        balanceSep.style.display = 'none'
+      }
+      if (msg.cwd) {
+        const maxLen = 35
+        cwdDisplay.textContent = msg.cwd.length > maxLen ? `...${msg.cwd.slice(-maxLen)}` : msg.cwd
+      }
+      break
+
+    case 'chunk':
+      appendChunk(msg.text || '')
+      break
+
+    case 'thinking':
+      showThinking(msg.text || '')
+      break
+
+    case 'thinking_end':
+      hideThinking()
+      break
+
+    case 'tool_call':
+      addToolCall(msg.name, msg.input, msg.id)
+      break
+
+    case 'tool_result':
+      if (msg.success) {
+        addToolResult(msg.name, true, msg.output || '', msg.id)
+      } else {
+        addToolResult(msg.name, false, msg.error || 'Unknown error', msg.id)
+      }
+      break
+
+    case 'turn_start':
+      setStatus(true)
+      startAssistantMessage()
+      break
+
+    case 'turn_end':
+      hideThinking()
+      for (const [, el] of pendingToolCalls) el.classList.remove('executing')
+      pendingToolCalls.clear()
+      finalizeAssistantMessage()
+      break
+
+    case 'done':
+      setStatus(false)
+      hideThinking()
+      for (const [, el] of pendingToolCalls) el.classList.remove('executing')
+      pendingToolCalls.clear()
+      finalizeAssistantMessage()
+      if (msg.reason === 'error') {
+        addErrorMessage('An error occurred during processing.')
+      }
+      break
+
+    case 'mode_changed':
+      state.currentMode = msg.mode
+      modeDisplay.textContent = state.currentMode
+      addSystemMessage(`Switched to ${state.currentMode} mode`)
+      break
+
+    case 'model_changed':
+      state.currentModel = msg.model
+      modelDisplay.textContent = `${state.currentProvider}/${state.currentModel}`
+      addSystemMessage(`Model switched to ${state.currentModel}`)
+      break
+
+    case 'session_cleared':
+      messagesEl.innerHTML = ''
+      addSystemMessage('Session cleared. Starting fresh.')
+      break
+
+    case 'help':
+      if (Array.isArray(msg.commands)) {
+        addSystemMessage('Available commands:')
+        msg.commands.forEach(cmd => addSystemMessage(cmd))
+      }
+      break
+
+    case 'compaction':
+      addSystemMessage(`📦 Compressed context: ${msg.before} → ${msg.after} messages`)
+      break
+
+    case 'plan_written':
+      addSystemMessage(`📝 Plan written: ${msg.display || ''}`)
+      break
+
+    case 'session_history':
+      renderSessionHistory(msg.messages)
+      setTimeout(scrollToBottom, 50)
+      break
+
+    case 'plan_data':
+      state.plans = msg.plans || []
+      state.currentPlanName = msg.currentPlanName || ''
+      state.todos = msg.todos || []
+      updatePlansAndTodos()
+      break
+
+    case 'balance_update':
+      if (msg.webBalance) {
+        balanceDisplay.textContent = `余额：${msg.webBalance}`
+        balanceDisplay.style.display = ''
+        balanceSep.style.display = ''
+      } else if (msg.balance) {
+        balanceDisplay.textContent = `余额：${msg.balance}`
+        balanceDisplay.style.display = ''
+        balanceSep.style.display = ''
+      }
+      break
+
+    case 'token_stats':
+      addTokenStats(
+        msg.turnIn,
+        msg.turnOut,
+        msg.totalIn,
+        msg.totalOut,
+        msg.turnApi,
+        msg.totalApi,
+        msg.totalCacheHit,
+        msg.totalCacheMiss,
+      )
+      break
+
+    case 'tool_confirm_request': {
+      if (!msg.toolCalls || msg.toolCalls.length === 0) break
+      showConfirmDialog(msg.toolCalls)
+      break
+    }
+
+    case 'error':
+      closeConfirmDialog()
+      addErrorMessage(msg.message || 'Unknown error')
+      break
+
+    case 'pong':
+      break
+
+    default:
+      console.log('Unknown message type:', msg.type)
+  }
+}
+
+export function connect() {
+  connectionOverlay.classList.remove('hidden')
+
+  let ws
+  try {
+    ws = new WebSocket(getWsUrl())
+    setWs(ws)
+  } catch (err) {
+    connectionOverlay.classList.add('hidden')
+    addErrorMessage(`Connection failed: ${err.message}`)
+    return
+  }
+
+  ws.onopen = () => {
+    connectionOverlay.classList.add('hidden')
+    state.reconnectAttempts = 0
+    addSystemMessage('Connected to Lonny')
+  }
+
+  ws.onmessage = event => {
+    try {
+      const msg = JSON.parse(event.data)
+      handleMessage(msg)
+    } catch (err) {
+      console.error('Failed to parse message:', err)
+    }
+  }
+
+  ws.onclose = () => {
+    setStatus(false)
+    hideThinking()
+    for (const [, el] of pendingToolCalls) el.classList.remove('executing')
+    pendingToolCalls.clear()
+    if (state.streamingMsgEl) {
+      finalizeAssistantMessage()
+    }
+
+    if (state.reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
+      state.reconnectAttempts++
+      const delay = RECONNECT_DELAY * Math.min(state.reconnectAttempts, 5)
+      connectionOverlay.querySelector('p').textContent =
+        `Reconnecting in ${delay / 1000}s... (attempt ${state.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`
+      connectionOverlay.classList.remove('hidden')
+      setTimeout(connect, delay)
+    } else {
+      connectionOverlay.querySelector('p').textContent = 'Connection lost. Please refresh the page.'
+      connectionOverlay.classList.remove('hidden')
+      addErrorMessage('Connection lost. Refresh the page to reconnect.')
+    }
+  }
+
+  ws.onerror = () => {
+    // onclose will fire after this
+  }
+}

package/dist/web/public/ws.js

@@ -0,0 +1,19 @@
+/* ── WebSocket Reference & Send ── */
+
+let ws = null
+
+export function getWs() {
+  return ws
+}
+
+export function setWs(newWs) {
+  ws = newWs
+}
+
+export function sendWsMsg(data) {
+  if (ws && ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify(data))
+    return true
+  }
+  return false
+}

package/dist/web/session-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../src/web/session-bridge.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAYhD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAA;AAI7C,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX;IAAE,KAAK,EAAE,MAAM,IAAI,CAAC;IAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAsKrE"}
+{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../src/web/session-bridge.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAYhD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAA;AAI7C,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX;IAAE,KAAK,EAAE,MAAM,IAAI,CAAC;IAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAqKrE"}

package/dist/web/session-bridge.js

@@ -20,6 +20,8 @@ export function startSessionBridge(session, config, send) {
         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 => {
@@ -37,7 +39,7 @@ export function startSessionBridge(session, config, send) {
             name: d.name,
             id: d.id,
             success: true,
-            output: stripAnsi(d.output),
+            output: d.name === 'edit' ? d.output : stripAnsi(d.output),
         });
     });
     const unsubToolError = bus.on(EventChannels.TOOL_ERROR, data => {
@@ -86,12 +88,6 @@ export function startSessionBridge(session, config, send) {
                         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',

package/dist/web/session-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../src/web/session-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../src/web/session-bridge.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,54 +1,55 @@
-{
-  "name": "lonny-agent",
-  "version": "0.2.4",
-  "license": "MIT",
-  "repository": "github:as3long/lonny-agent",
-  "description": "AI coding agent that does more with fewer API calls, optimized for Coding Plan (5h 1200-call bundle)",
-  "type": "module",
-  "bin": {
-    "lonny": "./dist/index.js"
-  },
-  "scripts": {
-    "build": "tsc && npm run copy:web && npm run copy:native",
-    "copy:web": "node -e \"const fs=require('fs'),p=require('path');const src=p.join('src','web','public');const dst=p.join('dist','web','public');if(fs.existsSync(src)){if(!fs.existsSync(dst))fs.mkdirSync(dst,{recursive:true});for(const f of fs.readdirSync(src)){fs.copyFileSync(p.join(src,f),p.join(dst,f))}}\"",
-    "copy:native": "node -e \"const fs=require('fs'),p=require('path');function cpDir(s,d){fs.mkdirSync(d,{recursive:true});for(const e of fs.readdirSync(s)){const sp=p.join(s,e),dp=p.join(d,e);fs.statSync(sp).isDirectory()?cpDir(sp,dp):fs.copyFileSync(sp,dp)}}const src=p.join('src','pi-tui','native');const dst=p.join('dist','pi-tui','native');if(fs.existsSync(src))cpDir(src,dst)\"",
-    "dev": "tsx src/index.ts",
-    "start": "node dist/index.js",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "lint": "biome lint .",
-    "lint:fix": "biome lint --fix .",
-    "format": "biome format --write .",
-    "check": "biome check .",
-    "check:fix": "biome check --fix .",
-    "prepare": "husky"
-  },
-  "lint-staged": {
-    "*.{ts,js,mjs}": [
-      "biome check --fix --no-errors-on-unmatched"
-    ],
-    "*.{json,jsonc}": [
-      "biome format --write --no-errors-on-unmatched"
-    ]
-  },
-  "dependencies": {
-    "@anthropic-ai/sdk": "^0.30.0",
-    "adm-zip": "^0.5.17",
-    "get-east-asian-width": "1.6.0",
-    "marked": "15.0.12",
-    "commander": "^12.0.0",
-    "openai": "^4.0.0",
-    "ws": "^8.21.0",
-    "zod": "^3.23.0"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^2.4.15",
-    "@types/node": "^22.19.19",
-    "@types/ws": "^8.18.1",
-    "husky": "^9.1.7",
-    "lint-staged": "^17.0.5",
-    "tsx": "^4.19.0",
-    "typescript": "^5.6.0",
-    "vitest": "^2.1.0"
-  }
-}
+{
+  "name": "lonny-agent",
+  "version": "0.2.6",
+  "license": "MIT",
+  "repository": "github:as3long/lonny-agent",
+  "description": "AI coding agent that does more with fewer API calls, optimized for Coding Plan (5h 1200-call bundle)",
+  "type": "module",
+  "bin": {
+    "lonny": "./dist/index.js"
+  },
+  "scripts": {
+    "build": "tsc && npm run copy:web && npm run copy:native",
+    "copy:web": "node scripts/copy-web.mjs",
+    "copy:native": "node scripts/copy-native.mjs",
+    "dev": "tsx src/index.ts",
+    "start": "node dist/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "lint": "biome lint .",
+    "lint:fix": "biome lint --fix .",
+    "format": "biome format --write .",
+    "check": "biome check .",
+    "check:fix": "biome check --fix .",
+    "prepare": "husky"
+  },
+  "lint-staged": {
+    "*.{ts,js,mjs}": [
+      "biome check --fix --no-errors-on-unmatched"
+    ],
+    "*.{json,jsonc}": [
+      "biome format --write --no-errors-on-unmatched"
+    ]
+  },
+  "dependencies": {
+    "@anthropic-ai/sdk": "^0.30.0",
+    "adm-zip": "^0.5.17",
+    "commander": "^12.0.0",
+    "get-east-asian-width": "1.6.0",
+    "jest-diff": "^30.4.1",
+    "marked": "15.0.12",
+    "openai": "^4.0.0",
+    "ws": "^8.21.0",
+    "zod": "^3.23.0"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^2.4.15",
+    "@types/node": "^22.19.19",
+    "@types/ws": "^8.18.1",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.0.5",
+    "tsx": "^4.19.0",
+    "typescript": "^5.6.0",
+    "vitest": "^2.1.0"
+  }
+}

package/scripts/copy-native.mjs

@@ -0,0 +1,24 @@
+// copy:native — recursively copies src/pi-tui/native/ to dist/pi-tui/native/
+import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from 'fs'
+import { join } from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = fileURLToPath(new URL('..', import.meta.url))
+
+function cpDir(s, d) {
+  mkdirSync(d, { recursive: true })
+  for (const e of readdirSync(s)) {
+    const sp = join(s, e)
+    const dp = join(d, e)
+    if (statSync(sp).isDirectory()) {
+      cpDir(sp, dp)
+    } else {
+      copyFileSync(sp, dp)
+    }
+  }
+}
+
+const src = join(__dirname, 'src', 'pi-tui', 'native')
+const dst = join(__dirname, 'dist', 'pi-tui', 'native')
+
+if (existsSync(src)) cpDir(src, dst)

package/scripts/copy-web.mjs

@@ -0,0 +1,15 @@
+// copy:web — copies src/web/public/ to dist/web/public/
+import { copyFileSync, existsSync, mkdirSync, readdirSync } from 'fs'
+import { join } from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = fileURLToPath(new URL('..', import.meta.url))
+const src = join(__dirname, 'src', 'web', 'public')
+const dst = join(__dirname, 'dist', 'web', 'public')
+
+if (existsSync(src)) {
+  if (!existsSync(dst)) mkdirSync(dst, { recursive: true })
+  for (const f of readdirSync(src)) {
+    copyFileSync(join(src, f), join(dst, f))
+  }
+}

package/src/agent/index.ts

@@ -1,25 +1,25 @@
-import * as readline from 'node:readline'
-import type { Config } from '../config/index.js'
-import { Session, type SessionOutput } from './session.js'
-
-export async function runAgent(prompt: string, config: Config): Promise<void> {
-  const output: SessionOutput = {
-    write: text => process.stdout.write(text),
-    confirmTool: async toolCalls => {
-      console.log('\nAllow these tool calls?')
-      for (const tc of toolCalls) {
-        const input = JSON.stringify(tc.input)
-        console.log(`  \u2022 ${tc.name}: ${input.slice(0, 120)}`)
-      }
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
-      return new Promise(resolve => {
-        rl.question('  (y/N) ', answer => {
-          rl.close()
-          resolve(answer.trim().toLowerCase() === 'y')
-        })
-      })
-    },
-  }
-  const session = (await Session.load(config, output)) || new Session(config, output)
-  await session.chat(prompt)
-}
+import * as readline from 'node:readline'
+import type { Config } from '../config/index.js'
+import { Session, type SessionOutput } from './session.js'
+
+export async function runAgent(prompt: string, config: Config): Promise<void> {
+  const output: SessionOutput = {
+    write: text => process.stdout.write(text),
+    confirmTool: async toolCalls => {
+      console.log('\nAllow these tool calls?')
+      for (const tc of toolCalls) {
+        const input = JSON.stringify(tc.input)
+        console.log(`  \u2022 ${tc.name}: ${input.slice(0, 120)}`)
+      }
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+      return new Promise(resolve => {
+        rl.question('  (y/N) ', answer => {
+          rl.close()
+          resolve(answer.trim().toLowerCase() === 'y')
+        })
+      })
+    },
+  }
+  const session = (await Session.load(config, output)) || new Session(config, output)
+  await session.chat(prompt)
+}

package/src/agent/llm.ts

@@ -20,6 +20,10 @@ export interface LLMProvider {
 export interface TokenUsage {
   input_tokens: number
   output_tokens: number
+  /** DeepSeek-specific: tokens read from cache */
+  prompt_cache_hit_tokens?: number
+  /** DeepSeek-specific: tokens not in cache */
+  prompt_cache_miss_tokens?: number
 }
 
 export interface LLMChunk {

package/src/agent/prompt-builder.ts

@@ -49,13 +49,12 @@ export async function buildSystemPrompt(config: Config): Promise<string> {
 - \`glob\`: Find files by glob pattern (pattern: string)
 - \`grep\`: Search file content by regex (pattern: string, include?: string, path?: string)
 - \`ls\`: List directory (path?: string)
-- \`bash\`: Execute a shell command
-- \`edit\`: Replace text in files — call with {edits: [{file_path: string, old_string: string, new_string: string}]} (array required)
+      - \`bash\`: Execute a shell command — for running commands (NOT for creating or modifying files — use \`edit\` for that)
+- \`edit\`: Replace text in files using markdown code block format. Use: \`edit({ content: "\`\`\`edit\\nfile: path\\nold: |\\ntext\\nnew: |\\ntext\\n\`\`\`" })\`
 - \`install_skill\`: Install an npm package as a skill — fetches package info from npm, runs npm install, and creates a .lonny/skills/ file with usage instructions for the AI
 - \`find\`: Find files by name pattern (pattern: string, path?: string, maxResults?: number)
 - \`git\`: Run read-only git commands (command: string)
 - \`search\`: Search the web using Tavily (query: string, search_depth?: string, include_answer?: boolean, max_results?: number, topic?: string, days?: number)
-- \`exec\`: Run JavaScript in a sandbox to orchestrate multiple tool calls — all tools are available as \`await tools.xxx(args)\` inside exec (code mode only)
 `
   }
 
@@ -64,8 +63,7 @@ export async function buildSystemPrompt(config: Config): Promise<string> {
 RULES:
 1. Read first: Use read/grep/glob tools to gather all context you need before making any edits.
 2. Be thorough: Explore the relevant parts of the codebase.
-3. COST OPTIMIZATION (CRITICAL): Each API call costs money. You MUST maximize work per call. Use \`read(paths: [...])\` to read multiple files at once. Use \`edit({edits: [...]})\` to edit multiple files at once. Do NOT do sequential single-file reads or single-edit calls.
-4. When using \`edit\`, the \`edits\` value MUST be an array — even for a single change. Do NOT pass empty objects.
+3. COST OPTIMIZATION (CRITICAL): Each API call costs money. You MUST maximize work per call. Use \`read(paths: [...])\` to read multiple files at once. Use \`edit({ content: "..." })\` with multiple \`\`\`edit blocks to edit multiple files at once.
 
 ${getToolListForMode(config.mode)}`
 
@@ -74,7 +72,7 @@ ${getToolListForMode(config.mode)}`
     config.mode === 'plan'
       ? `You are a planning agent. Your ONLY job is to investigate the codebase and produce an actionable implementation plan with a todo list.
 
-You CANNOT edit files. You do NOT have access to edit, bash (write mode), exec, or install_skill.
+You CANNOT edit files. You do NOT have access to edit, bash (write mode), or install_skill.
 Any attempt to call these tools will FAIL — they are simply unavailable in this mode.
 
 RULES (plan-specific):
@@ -116,9 +114,15 @@ RULES (ask-specific):
 
 RULES (code-specific):
 1. Read first: Use read/grep/glob tools to gather all context you need BEFORE making any edits. The \`read\` output prefixes each line with "<lineNumber>: " for easy reference. Do NOT include the "N: " prefix when copying text into \`edit\`.
-2. edit CALL FORMAT — you MUST call edit with exactly this JSON shape:
-   { "edits": [{ "file_path": "src/file.ts", "old_string": "text to replace", "new_string": "replacement text" }] }
-   The "edits" value is ALWAYS an array, even for a single edit. Do NOT pass file_path/old_string/new_string as top-level keys. Do NOT pass an empty object {}.
+2. edit CALL FORMAT — use markdown code block format:
+   \`\`\`edit
+   file: src/file.ts
+   old: |
+     text to replace
+   new: |
+     replacement text
+   \`\`\`
+   Use separate \`\`\`edit blocks for multiple files.
 3. After making edits to a file, if you need to make ANOTHER edit to the SAME file, you MUST re-read it first to get the updated content.
 4. If \`edit\` reports \`old_string not found\`, do NOT retry with the same old_string — re-read the file immediately to see its actual current content, then retry with correctly-copied text.
 5. When copying old_string from \`read\` output, include 2-3 lines of context BEFORE and AFTER the target change to make the string unique in the file.