kokoirc 0.2.4 → 0.2.6

package/README.md

@@ -60,7 +60,7 @@ bun run start
 
 # Or build a standalone binary
 bun run build
-./openirc
+./kokoirc
 ```
 
 ## Configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kokoirc",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Modern terminal IRC client with inline image preview, SASL, scripting, encrypted logging, and theming — built with OpenTUI, React, and Bun",
   "license": "MIT",
   "author": {
@@ -56,7 +56,7 @@
     "start": "bun run src/index.tsx",
     "dev": "bun --watch run src/index.tsx",
     "test": "bun test",
-    "build": "bun build --compile src/index.tsx --outfile openirc",
+    "build": "bun build --compile src/index.tsx --outfile kokoirc",
     "docs:build": "bun run docs/build.ts"
   },
   "devDependencies": {

package/src/app/App.tsx

@@ -35,7 +35,10 @@ export function App() {
 
   useKeyboard((key) => {
     if (key.name === "q" && key.ctrl) {
-      shutdownStorage().finally(() => renderer.destroy())
+      shutdownStorage().finally(() => {
+        renderer.destroy()
+        process.exit(0)
+      })
       return
     }
 
@@ -121,7 +124,10 @@ export function App() {
   // Register shutdown handler so commands can close the app
   useEffect(() => {
     useStore.getState().setShutdownHandler(() => {
-      shutdownStorage().finally(() => renderer.destroy())
+      shutdownStorage().finally(() => {
+        renderer.destroy()
+        process.exit(0)
+      })
     })
   }, [renderer])
 
@@ -140,6 +146,14 @@ export function App() {
       setTheme(theme)
 
       await loadAllDocs()
+
+      // Run image cache cleanup (fire-and-forget)
+      const imgConfig = config.image_preview
+      if (imgConfig?.enabled) {
+        import("@/core/image-preview/cache").then(({ cleanupCache }) => {
+          cleanupCache(imgConfig.cache_max_mb ?? 100, imgConfig.cache_max_days ?? 7).catch(() => {})
+        })
+      }
     }
     init().catch((err) => console.error("[init]", err))
   }, [])

package/src/core/commands/registry.ts

@@ -379,6 +379,9 @@ export const commands: Record<string, CommandDef> = {
         const client = getClient(connId)
         if (client) {
           client.part(buf.name, args[0] ?? "Window closed")
+        } else {
+          // Already disconnected — just remove the buffer
+          s.removeBuffer(buf.id)
         }
       } else if (buf.type === BufferType.Query) {
         s.removeBuffer(buf.id)

package/src/core/config/loader.ts

@@ -48,8 +48,6 @@ export function mergeWithDefaults(partial: Record<string, any>): AppConfig {
     aliases: partial.aliases ?? {},
     ignores: (partial.ignores as IgnoreEntry[] | undefined) ?? [],
     scripts: {
-      autoload: [],
-      debug: false,
       ...DEFAULT_CONFIG.scripts,
       ...partial.scripts,
     },

package/src/core/irc/antiflood.ts

@@ -169,9 +169,9 @@ export function createAntiFloodMiddleware(connId: string) {
           state.msgWindow.push({ text: message, time: now })
           // Prune old entries
           const cutoff = now - DUP_WINDOW
-          while (state.msgWindow.length > 0 && state.msgWindow[0].time < cutoff) {
-            state.msgWindow.shift()
-          }
+          let pruneIdx = 0
+          while (pruneIdx < state.msgWindow.length && state.msgWindow[pruneIdx].time < cutoff) pruneIdx++
+          if (pruneIdx > 0) state.msgWindow.splice(0, pruneIdx)
 
           // Only analyze when enough messages in window
           if (state.msgWindow.length >= DUP_MIN_IN_WINDOW) {

package/src/core/irc/client.ts

@@ -123,8 +123,18 @@ export function disconnectServer(id: string, message?: string) {
   const client = clients.get(id)
   if (client) {
     client.quit(message ?? "kokoIRC — https://github.com/kofany/kokoIRC")
+    ;(client as any).removeAllListeners()
     clients.delete(id)
+    // Force-close the TCP socket after a brief delay so the QUIT message
+    // has time to flush. Without this, the half-open socket keeps the
+    // event loop alive and prevents clean process exit.
+    setTimeout(() => {
+      try { (client as any).connection?.disposeSocket?.() } catch {}
+    }, 200)
   }
+  // Update store even if client was already gone — removeAllListeners() prevents
+  // the "close" event handler from updating status, so we must do it here.
+  useStore.getState().updateConnection(id, { status: "disconnected" })
 }
 
 export function getClient(id: string): Client | undefined {

package/src/core/irc/events.ts

@@ -19,7 +19,8 @@ function isChannelTarget(target: string): boolean {
 function getListModes(connectionId: string): Set<string> {
   const conn = useStore.getState().connections.get(connectionId)
   const chanmodes = conn?.isupport?.CHANMODES
-  if (chanmodes) return new Set(chanmodes.split(",")[0])
+  if (Array.isArray(chanmodes) && chanmodes[0]) return new Set(chanmodes[0].split(""))
+  if (typeof chanmodes === "string") return new Set(chanmodes.split(",")[0])
   return new Set(["b", "e", "I", "R"])
 }
 
@@ -178,6 +179,8 @@ export function bindEvents(client: Client, connectionId: string) {
       s.addMessage(bufferId, makeEventMessage(
         `%Zf7768eYou were kicked from ${event.channel} by %Za9b1d6${event.nick}%Zf7768e (${event.message || ""})%N`
       ))
+      // Auto-close the channel buffer after being kicked
+      getStore().removeBuffer(bufferId)
     } else {
       s.removeNick(bufferId, event.kicked)
       if (shouldIgnore(event.nick, event.ident, event.hostname, "KICKS", event.channel)) return
@@ -231,7 +234,13 @@ export function bindEvents(client: Client, connectionId: string) {
       ? event.message.toLowerCase().includes(conn.nick.toLowerCase())
       : false
 
-    s.addMessage(bufferId, {
+    const activityLevel = (s.activeBufferId !== bufferId && !isOwnMsg)
+      ? (!isChannel ? ActivityLevel.Mention
+        : isMention ? ActivityLevel.Mention
+        : ActivityLevel.Activity)
+      : undefined
+
+    s.addMessageWithActivity(bufferId, {
       id: nextMsgId(),
       timestamp: new Date(event.time || Date.now()),
       type: "message",
@@ -239,14 +248,7 @@ export function bindEvents(client: Client, connectionId: string) {
       nickMode: getNickMode(s.buffers, bufferId, event.nick),
       text: event.message,
       highlight: isMention,
-    })
-
-    if (s.activeBufferId !== bufferId && !isOwnMsg) {
-      const level = !isChannel ? ActivityLevel.Mention
-        : isMention ? ActivityLevel.Mention
-        : ActivityLevel.Activity
-      s.updateBufferActivity(bufferId, level)
-    }
+    }, activityLevel)
   })
 
   client.on("action", (event) => {
@@ -426,53 +428,55 @@ export function bindEvents(client: Client, connectionId: string) {
     const prefixMap = buildPrefixMap(conn?.isupport?.PREFIX)
     const modeOrder = buildModeOrder(conn?.isupport?.PREFIX)
 
-    for (const mc of event.modes) {
-      if (!mc.param) continue
-      const isAdding = mc.mode.startsWith("+")
-      const modeChar = mc.mode.replace(/[+-]/, "")
-      if (!modeOrder.includes(modeChar)) continue // not a nick prefix mode
+    // Batch nick prefix updates (1 set() instead of N)
+    const nickUpdates: Array<{ bufferId: string; entry: NickEntry }> = []
+    const buf = getStore().buffers.get(bufferId)
+    if (buf) {
+      for (const mc of event.modes) {
+        if (!mc.param) continue
+        const isAdding = mc.mode.startsWith("+")
+        const modeChar = mc.mode.replace(/[+-]/, "")
+        if (!modeOrder.includes(modeChar)) continue
 
-      const buf = getStore().buffers.get(bufferId)
-      const entry = buf?.users.get(mc.param)
-      if (!entry) continue
-
-      // Add or remove this specific mode char from the user's modes string
-      let modes = entry.modes ?? ""
-      if (isAdding && !modes.includes(modeChar)) {
-        modes += modeChar
-      } else if (!isAdding) {
-        modes = modes.replace(modeChar, "")
-      }
+        const entry = buf.users.get(mc.param)
+        if (!entry) continue
 
-      getStore().addNick(bufferId, {
-        ...entry,
-        modes,
-        prefix: getHighestPrefix(modes, modeOrder, prefixMap),
-      })
+        let modes = entry.modes ?? ""
+        if (isAdding && !modes.includes(modeChar)) {
+          modes += modeChar
+        } else if (!isAdding) {
+          modes = modes.replace(modeChar, "")
+        }
+
+        nickUpdates.push({
+          bufferId,
+          entry: { ...entry, modes, prefix: getHighestPrefix(modes, modeOrder, prefixMap) },
+        })
+      }
+    }
+    if (nickUpdates.length > 0) {
+      getStore().batchAddNick(nickUpdates)
     }
 
-    // Update channel modes (non-nick-prefix, non-list modes)
-    const listModes = getListModes(connectionId)
-    const buf = getStore().buffers.get(bufferId)
-    if (buf) {
-      let chanModes = buf.modes ?? ""
-      const params: Record<string, string> = { ...buf.modeParams }
+    // Batch list entry ops + update channel modes (non-nick-prefix, non-list modes)
+    const listModeSet = getListModes(connectionId)
+    const buf2 = getStore().buffers.get(bufferId)
+    if (buf2) {
+      let chanModes = buf2.modes ?? ""
+      const params: Record<string, string> = { ...buf2.modeParams }
+      const listOps: Array<{ action: "add" | "remove"; modeChar: string; entry?: { mask: string; setBy: string; setAt: number }; mask?: string }> = []
+
       for (const mc of event.modes) {
         const isAdding = mc.mode.startsWith("+")
         const modeChar = mc.mode.replace(/[+-]/, "")
-        if (modeOrder.includes(modeChar)) continue // nick prefix mode
-        if (listModes.has(modeChar)) {
-          // Track list mode changes in store
+        if (modeOrder.includes(modeChar)) continue
+        if (listModeSet.has(modeChar)) {
           if (isAdding && mc.param) {
-            getStore().addListEntry(bufferId, modeChar, {
-              mask: mc.param,
-              setBy: event.nick || "server",
-              setAt: Date.now() / 1000,
-            })
+            listOps.push({ action: "add", modeChar, entry: { mask: mc.param, setBy: event.nick || "server", setAt: Date.now() / 1000 } })
           } else if (!isAdding && mc.param) {
-            getStore().removeListEntry(bufferId, modeChar, mc.param)
+            listOps.push({ action: "remove", modeChar, mask: mc.param })
           }
-          continue // don't add to channel modes string
+          continue
         }
         if (isAdding && !chanModes.includes(modeChar)) {
           chanModes += modeChar
@@ -484,6 +488,9 @@ export function bindEvents(client: Client, connectionId: string) {
           params[modeChar] = mc.param
         }
       }
+      if (listOps.length > 0) {
+        getStore().batchListEntryOps(bufferId, listOps)
+      }
       getStore().updateBufferModes(bufferId, chanModes, params)
     }
   })
@@ -510,6 +517,7 @@ export function bindEvents(client: Client, connectionId: string) {
     clearInterval(lagPingInterval)
     destroyNetsplitState(connectionId)
     destroyAntifloodState(connectionId)
+    reopCollector.clear()
     getStore().updateConnection(connectionId, { status: "disconnected" })
     statusMsg("%Zf7768eDisconnected from server%N")
   })
@@ -592,8 +600,12 @@ export function bindEvents(client: Client, connectionId: string) {
       return
     }
     if (!event.motd) return
-    for (const line of event.motd.split("\n")) {
-      if (line.trim()) statusMsg(`%Z565f89${line}%N`)
+    const lines = event.motd.split("\n").filter((l: string) => l.trim())
+    if (lines.length > 0) {
+      getStore().batchAddMessage(lines.map((line: string) => ({
+        bufferId: statusId,
+        message: makeEventMessage(`%Z565f89${line}%N`),
+      })))
     }
   })
 
@@ -968,9 +980,10 @@ export function bindEvents(client: Client, connectionId: string) {
 
     lines.push(`%Z7aa2f7─────────────────────────────────────────────%N`)
 
-    for (const line of lines) {
-      getStore().addMessage(targetBuffer, makeEventMessage(line))
-    }
+    getStore().batchAddMessage(lines.map(line => ({
+      bufferId: targetBuffer,
+      message: makeEventMessage(line),
+    })))
   })
 
   // ─── Whowas response ──────────────────────────────────────
@@ -998,9 +1011,10 @@ export function bindEvents(client: Client, connectionId: string) {
 
     lines.push(`%Z7aa2f7─────────────────────────────────────────────%N`)
 
-    for (const line of lines) {
-      getStore().addMessage(targetBuffer, makeEventMessage(line))
-    }
+    getStore().batchAddMessage(lines.map(line => ({
+      bufferId: targetBuffer,
+      message: makeEventMessage(line),
+    })))
   })
 }
 
@@ -1011,24 +1025,21 @@ function displayNumberedList(
   channel: string,
   entries: { mask: string; setBy: string; setAt: number }[],
 ) {
-  const s = useStore.getState()
+  const msgs: Array<{ bufferId: string; message: Message }> = []
   if (entries.length === 0) {
-    s.addMessage(target, makeEventMessage(
-      `%Z565f89${channel}: ${label} is empty%N`
-    ))
-    return
-  }
-  s.addMessage(target, makeEventMessage(
-    `%Z7aa2f7───── ${label} for ${channel} ─────%N`
-  ))
-  for (let i = 0; i < entries.length; i++) {
-    const e = entries[i]
-    const by = e.setBy ? `  set by ${e.setBy}` : ""
-    const at = e.setAt ? ` [${formatDate(new Date(e.setAt * 1000))}]` : ""
-    s.addMessage(target, makeEventMessage(
-      `%Ze0af68${(i + 1).toString().padStart(2)}.%N %Za9b1d6${e.mask}%Z565f89${by}${at}%N`
-    ))
+    msgs.push({ bufferId: target, message: makeEventMessage(`%Z565f89${channel}: ${label} is empty%N`) })
+  } else {
+    msgs.push({ bufferId: target, message: makeEventMessage(`%Z7aa2f7───── ${label} for ${channel} ─────%N`) })
+    for (let i = 0; i < entries.length; i++) {
+      const e = entries[i]
+      const by = e.setBy ? `  set by ${e.setBy}` : ""
+      const at = e.setAt ? ` [${formatDate(new Date(e.setAt * 1000))}]` : ""
+      msgs.push({ bufferId: target, message: makeEventMessage(
+        `%Ze0af68${(i + 1).toString().padStart(2)}.%N %Za9b1d6${e.mask}%Z565f89${by}${at}%N`
+      ) })
+    }
   }
+  useStore.getState().batchAddMessage(msgs)
 }
 
 /** System/inline event — text may contain %Z color codes. */

package/src/core/scripts/api.ts

@@ -25,6 +25,7 @@ export function createScriptAPI(meta: ScriptMeta, scriptDefaults: Record<string,
 } {
   const scriptName = meta.name
   const unsubs: Array<() => void> = []
+  const storeUnsubs: Array<() => void> = []
   const timers: Array<TimerHandle> = []
   const registeredCommands: string[] = []
 
@@ -37,7 +38,11 @@ export function createScriptAPI(meta: ScriptMeta, scriptDefaults: Record<string,
     getConfig: () => useStore.getState().config,
     getConnection: (id) => useStore.getState().connections.get(id),
     getBuffer: (id) => useStore.getState().buffers.get(id),
-    subscribe: (listener) => useStore.subscribe(listener),
+    subscribe: (listener) => {
+      const unsub = useStore.subscribe(listener)
+      storeUnsubs.push(unsub)
+      return unsub
+    },
   }
 
   // ─── IRC Access ──────────────────────────────────────────
@@ -223,6 +228,10 @@ export function createScriptAPI(meta: ScriptMeta, scriptDefaults: Record<string,
     for (const unsub of unsubs) unsub()
     unsubs.length = 0
 
+    // Remove store subscriptions
+    for (const unsub of storeUnsubs) unsub()
+    storeUnsubs.length = 0
+
     // Clear all timers
     for (const t of timers) t.clear()
     timers.length = 0

package/src/core/state/selectors.ts

@@ -26,8 +26,7 @@ export function useSortedBuffers(): Array<Buffer & { connectionLabel: string }>
 const EMPTY_NICKS: NickEntry[] = []
 
 export function useSortedNicks(bufferId: string, prefixOrder: string): NickEntry[] {
-  const buffersMap = useStore((s) => s.buffers)
-  const buffer = buffersMap.get(bufferId)
+  const buffer = useStore((s) => s.buffers.get(bufferId))
   return useMemo(() => {
     if (!buffer) return EMPTY_NICKS
     return sortNicks(Array.from(buffer.users.values()), prefixOrder)

package/src/core/state/store.ts

@@ -45,6 +45,7 @@ interface AppState {
 
   // Message actions
   addMessage: (bufferId: string, message: Message) => void
+  addMessageWithActivity: (bufferId: string, message: Message, activity?: ActivityLevel) => void
   clearMessages: (bufferId: string) => void
 
   // Nicklist actions
@@ -66,6 +67,7 @@ interface AppState {
   batchAddNick: (entries: Array<{ bufferId: string; entry: NickEntry }>) => void
   batchUpdateNick: (entries: Array<{ bufferId: string; oldNick: string; newNick: string; prefix?: string }>) => void
   batchAddMessage: (entries: Array<{ bufferId: string; message: Message }>) => void
+  batchListEntryOps: (bufferId: string, ops: Array<{ action: "add" | "remove"; modeChar: ListModeKey; entry?: ListEntry; mask?: string }>) => void
 
   // Config/Theme
   setConfig: (config: AppConfig) => void
@@ -301,11 +303,11 @@ export const useStore = create<AppState>((set, get) => ({
   },
 
   updateBufferActivity: (id, level) => set((s) => {
+    const buf = s.buffers.get(id)
+    if (!buf || level <= buf.activity) return s
+    // Only trigger a store update when activity actually increases
     const buffers = new Map(s.buffers)
-    const buf = buffers.get(id)
-    if (buf && level > buf.activity) {
-      buffers.set(id, { ...buf, activity: level, unreadCount: buf.unreadCount + 1 })
-    }
+    buffers.set(id, { ...buf, activity: level, unreadCount: buf.unreadCount + 1 })
     return { buffers }
   }),
 
@@ -319,12 +321,60 @@ export const useStore = create<AppState>((set, get) => ({
     }
 
     return set((s) => {
+      const buf = s.buffers.get(bufferId)
+      if (!buf) return s
+      const maxLines = s.config?.display.scrollback_lines ?? 2000
+
+      // Inactive buffer — mutate in-place to avoid garbage (nobody is rendering these)
+      if (bufferId !== s.activeBufferId) {
+        buf.messages.push(message)
+        if (buf.messages.length > maxLines) buf.messages.splice(0, buf.messages.length - maxLines)
+        return s
+      }
+
+      // Active buffer — immutable update so ChatView re-renders
+      const messages = [...buf.messages, message]
+      if (messages.length > maxLines) messages.splice(0, messages.length - maxLines)
       const buffers = new Map(s.buffers)
-      const buf = buffers.get(bufferId)
+      buffers.set(bufferId, { ...buf, messages })
+      return { buffers }
+    })
+  },
+
+  addMessageWithActivity: (bufferId, message, activity) => {
+    const slashIdx = bufferId.indexOf("/")
+    if (slashIdx > 0) {
+      const network = bufferId.slice(0, slashIdx)
+      const buffer = bufferId.slice(slashIdx + 1)
+      logMessage(network, buffer, message.id, message.type, message.text, message.nick ?? null, message.highlight, message.timestamp)
+    }
+
+    return set((s) => {
+      const buf = s.buffers.get(bufferId)
       if (!buf) return s
       const maxLines = s.config?.display.scrollback_lines ?? 2000
+
+      // Inactive buffer — mutate messages in-place to avoid garbage
+      if (bufferId !== s.activeBufferId) {
+        buf.messages.push(message)
+        if (buf.messages.length > maxLines) buf.messages.splice(0, buf.messages.length - maxLines)
+        buf.unreadCount++
+
+        // Only trigger a store update if activity level actually increases
+        // (first unread message sets the marker; subsequent messages are free)
+        if (activity != null && activity > buf.activity) {
+          buf.activity = activity
+          const buffers = new Map(s.buffers)
+          buffers.set(bufferId, { ...buf })
+          return { buffers }
+        }
+        return s // no state change — React won't re-render
+      }
+
+      // Active buffer — immutable update so ChatView re-renders
       const messages = [...buf.messages, message]
       if (messages.length > maxLines) messages.splice(0, messages.length - maxLines)
+      const buffers = new Map(s.buffers)
       buffers.set(bufferId, { ...buf, messages })
       return { buffers }
     })
@@ -339,9 +389,14 @@ export const useStore = create<AppState>((set, get) => ({
   }),
 
   addNick: (bufferId, entry) => set((s) => {
-    const buffers = new Map(s.buffers)
-    const buf = buffers.get(bufferId)
+    const buf = s.buffers.get(bufferId)
     if (!buf) return s
+    // Inactive buffer — mutate in-place (NickList only renders for active buffer)
+    if (bufferId !== s.activeBufferId) {
+      buf.users.set(entry.nick, entry)
+      return s
+    }
+    const buffers = new Map(s.buffers)
     const users = new Map(buf.users)
     users.set(entry.nick, entry)
     buffers.set(bufferId, { ...buf, users })
@@ -349,9 +404,13 @@ export const useStore = create<AppState>((set, get) => ({
   }),
 
   removeNick: (bufferId, nick) => set((s) => {
-    const buffers = new Map(s.buffers)
-    const buf = buffers.get(bufferId)
+    const buf = s.buffers.get(bufferId)
     if (!buf) return s
+    if (bufferId !== s.activeBufferId) {
+      buf.users.delete(nick)
+      return s
+    }
+    const buffers = new Map(s.buffers)
     const users = new Map(buf.users)
     users.delete(nick)
     buffers.set(bufferId, { ...buf, users })
@@ -359,15 +418,19 @@ export const useStore = create<AppState>((set, get) => ({
   }),
 
   updateNick: (bufferId, oldNick, newNick, prefix) => set((s) => {
-    const buffers = new Map(s.buffers)
-    const buf = buffers.get(bufferId)
+    const buf = s.buffers.get(bufferId)
     if (!buf) return s
-    const users = new Map(buf.users)
-    const existing = users.get(oldNick)
-    if (existing) {
-      users.delete(oldNick)
-      users.set(newNick, { ...existing, nick: newNick, prefix: prefix ?? existing.prefix })
+    const existing = buf.users.get(oldNick)
+    if (!existing) return s
+    if (bufferId !== s.activeBufferId) {
+      buf.users.delete(oldNick)
+      buf.users.set(newNick, { ...existing, nick: newNick, prefix: prefix ?? existing.prefix })
+      return s
     }
+    const buffers = new Map(s.buffers)
+    const users = new Map(buf.users)
+    users.delete(oldNick)
+    users.set(newNick, { ...existing, nick: newNick, prefix: prefix ?? existing.prefix })
     buffers.set(bufferId, { ...buf, users })
     return { buffers }
   }),
@@ -424,43 +487,58 @@ export const useStore = create<AppState>((set, get) => ({
   }),
 
   batchRemoveNick: (entries) => set((s) => {
-    const buffers = new Map(s.buffers)
+    let buffers: Map<string, Buffer> | null = null
     for (const { bufferId, nick } of entries) {
-      const buf = buffers.get(bufferId)
+      const buf = (buffers ?? s.buffers).get(bufferId)
       if (!buf) continue
-      const users = new Map(buf.users)
-      users.delete(nick)
-      buffers.set(bufferId, { ...buf, users })
+      if (bufferId !== s.activeBufferId) {
+        buf.users.delete(nick)
+      } else {
+        if (!buffers) buffers = new Map(s.buffers)
+        const users = new Map(buf.users)
+        users.delete(nick)
+        buffers.set(bufferId, { ...buf, users })
+      }
     }
-    return { buffers }
+    return buffers ? { buffers } : s
   }),
 
   batchAddNick: (entries) => set((s) => {
-    const buffers = new Map(s.buffers)
+    let buffers: Map<string, Buffer> | null = null
     for (const { bufferId, entry } of entries) {
-      const buf = buffers.get(bufferId)
+      const buf = (buffers ?? s.buffers).get(bufferId)
       if (!buf) continue
-      const users = new Map(buf.users)
-      users.set(entry.nick, entry)
-      buffers.set(bufferId, { ...buf, users })
+      if (bufferId !== s.activeBufferId) {
+        buf.users.set(entry.nick, entry)
+      } else {
+        if (!buffers) buffers = new Map(s.buffers)
+        const users = new Map(buf.users)
+        users.set(entry.nick, entry)
+        buffers.set(bufferId, { ...buf, users })
+      }
     }
-    return { buffers }
+    return buffers ? { buffers } : s
   }),
 
   batchUpdateNick: (entries) => set((s) => {
-    const buffers = new Map(s.buffers)
+    let buffers: Map<string, Buffer> | null = null
     for (const { bufferId, oldNick, newNick, prefix } of entries) {
-      const buf = buffers.get(bufferId)
+      const buf = (buffers ?? s.buffers).get(bufferId)
       if (!buf) continue
-      const users = new Map(buf.users)
-      const existing = users.get(oldNick)
-      if (existing) {
+      const existing = buf.users.get(oldNick)
+      if (!existing) continue
+      if (bufferId !== s.activeBufferId) {
+        buf.users.delete(oldNick)
+        buf.users.set(newNick, { ...existing, nick: newNick, prefix: prefix ?? existing.prefix })
+      } else {
+        if (!buffers) buffers = new Map(s.buffers)
+        const users = new Map(buf.users)
         users.delete(oldNick)
         users.set(newNick, { ...existing, nick: newNick, prefix: prefix ?? existing.prefix })
+        buffers.set(bufferId, { ...buf, users })
       }
-      buffers.set(bufferId, { ...buf, users })
     }
-    return { buffers }
+    return buffers ? { buffers } : s
   }),
 
   batchAddMessage: (entries) => {
@@ -475,19 +553,49 @@ export const useStore = create<AppState>((set, get) => ({
     }
 
     return set((s) => {
-      const buffers = new Map(s.buffers)
       const maxLines = s.config?.display.scrollback_lines ?? 2000
+      let buffers: Map<string, Buffer> | null = null
+
       for (const { bufferId, message } of entries) {
-        const buf = buffers.get(bufferId)
+        const buf = (buffers ?? s.buffers).get(bufferId)
         if (!buf) continue
-        const messages = [...buf.messages, message]
-        if (messages.length > maxLines) messages.splice(0, messages.length - maxLines)
-        buffers.set(bufferId, { ...buf, messages })
+
+        if (bufferId !== s.activeBufferId) {
+          // Inactive buffer — mutate in-place
+          buf.messages.push(message)
+          if (buf.messages.length > maxLines) buf.messages.splice(0, buf.messages.length - maxLines)
+        } else {
+          // Active buffer — immutable update
+          if (!buffers) buffers = new Map(s.buffers)
+          const messages = [...buf.messages, message]
+          if (messages.length > maxLines) messages.splice(0, messages.length - maxLines)
+          buffers.set(bufferId, { ...buf, messages })
+        }
       }
-      return { buffers }
+
+      return buffers ? { buffers } : s
     })
   },
 
+  batchListEntryOps: (bufferId, ops) => set((s) => {
+    const buffers = new Map(s.buffers)
+    const buf = buffers.get(bufferId)
+    if (!buf) return s
+    const listModes = new Map(buf.listModes)
+    for (const op of ops) {
+      const existing = listModes.get(op.modeChar) ?? []
+      if (op.action === "add" && op.entry) {
+        if (!existing.some((e) => e.mask === op.entry!.mask)) {
+          listModes.set(op.modeChar, [...existing, op.entry])
+        }
+      } else if (op.action === "remove" && op.mask) {
+        listModes.set(op.modeChar, existing.filter((e) => e.mask !== op.mask))
+      }
+    }
+    buffers.set(bufferId, { ...buf, listModes })
+    return { buffers }
+  }),
+
   setConfig: (config) => set({ config }),
   setTheme: (theme) => set({ theme }),
 

package/src/core/theme/index.ts

@@ -1,3 +1,3 @@
 export { parseFormatString, resolveAbstractions } from "./parser"
 export { loadTheme } from "./loader"
-export { StyledText } from "./renderer"
+export { StyledText, renderStyledSpans } from "./renderer"

package/src/core/theme/parser.ts

@@ -335,8 +335,10 @@ export function parseFormatString(input: string, params: string[] = []): StyledS
         continue
       }
 
-      // %| — indent marker, skip
+      // %| — indent marker: emit a zero-width span so renderers can split here
       if (code === "|") {
+        flush()
+        spans.push({ text: "", bold: false, italic: false, underline: false, dim: false, indentMarker: true })
         i++
         continue
       }

package/src/core/theme/renderer.tsx

@@ -30,24 +30,26 @@ function linkify(text: string): React.ReactNode[] {
   return parts.length > 0 ? parts : [text]
 }
 
+/** Render StyledSpan[] as React elements (without wrapping <text>). */
+export function renderStyledSpans(spans: StyledSpan[], keyOffset = 0): React.ReactNode[] {
+  return spans.map((span, i) => {
+    if (span.indentMarker) return null
+    let content: any = linkify(span.text)
+    if (content.length === 1 && typeof content[0] === "string") {
+      content = content[0]
+    }
+    if (span.bold) content = <strong>{content}</strong>
+    if (span.italic) content = <em>{content}</em>
+    if (span.underline) content = <u>{content}</u>
+    if (span.dim) content = <span attributes={TextAttributes.DIM}>{content}</span>
+    return (
+      <span key={keyOffset + i} fg={span.fg} bg={span.bg}>
+        {content}
+      </span>
+    )
+  })
+}
+
 export function StyledText({ spans }: Props) {
-  return (
-    <text>
-      {spans.map((span, i) => {
-        let content: any = linkify(span.text)
-        if (content.length === 1 && typeof content[0] === "string") {
-          content = content[0]
-        }
-        if (span.bold) content = <strong>{content}</strong>
-        if (span.italic) content = <em>{content}</em>
-        if (span.underline) content = <u>{content}</u>
-        if (span.dim) content = <span attributes={TextAttributes.DIM}>{content}</span>
-        return (
-          <span key={i} fg={span.fg} bg={span.bg}>
-            {content}
-          </span>
-        )
-      })}
-    </text>
-  )
+  return <text>{renderStyledSpans(spans)}</text>
 }

package/src/types/theme.ts

@@ -34,4 +34,5 @@ export interface StyledSpan {
   italic: boolean
   underline: boolean
   dim: boolean
+  indentMarker?: boolean
 }

package/src/ui/chat/ChatView.tsx

@@ -1,21 +1,26 @@
 import { useRef, useEffect } from "react"
 import { useStore } from "@/core/state/store"
+import { useShallow } from "zustand/react/shallow"
 import { MessageLine } from "./MessageLine"
+import type { Message } from "@/types"
 import type { ScrollBoxRenderable } from "@opentui/core"
 
+const NO_BUFFER = { messages: [] as Message[], activeBufferId: null as string | null, currentNick: "", hasBuffer: false }
+
 export function ChatView() {
-  const buffer = useStore((s) => {
-    const id = s.activeBufferId
-    return id ? s.buffers.get(id) ?? null : null
-  })
-  const activeBufferId = useStore((s) => s.activeBufferId)
-  const currentNick = useStore((s) => {
+  const data = useStore(useShallow((s) => {
     const id = s.activeBufferId
-    if (!id) return ""
+    if (!id) return NO_BUFFER
     const buf = s.buffers.get(id)
-    if (!buf) return ""
-    return s.connections.get(buf.connectionId)?.nick ?? ""
-  })
+    if (!buf) return NO_BUFFER
+    const conn = s.connections.get(buf.connectionId)
+    return {
+      messages: buf.messages,
+      activeBufferId: id,
+      currentNick: conn?.nick ?? "",
+      hasBuffer: true,
+    }
+  }))
   const colors = useStore((s) => s.theme?.colors)
   const scrollRef = useRef<ScrollBoxRenderable>(null)
 
@@ -25,9 +30,9 @@ export function ChatView() {
       scrollRef.current.stickyScroll = true
       scrollRef.current.scrollTo(scrollRef.current.scrollHeight)
     }
-  }, [activeBufferId])
+  }, [data.activeBufferId])
 
-  if (!buffer) {
+  if (!data.hasBuffer) {
     return (
       <box flexGrow={1} justifyContent="center" alignItems="center">
         <text><span fg={colors?.fg_dim ?? "#292e42"}>No active buffer</span></text>
@@ -37,8 +42,8 @@ export function ChatView() {
 
   return (
     <scrollbox ref={scrollRef} height="100%" stickyScroll stickyStart="bottom">
-      {buffer.messages.map((msg) => (
-        <MessageLine key={msg.id} message={msg} isOwnNick={msg.nick === currentNick} />
+      {data.messages.map((msg) => (
+        <MessageLine key={msg.id} message={msg} isOwnNick={msg.nick === data.currentNick} />
       ))}
     </scrollbox>
   )

package/src/ui/chat/MessageLine.tsx

@@ -1,5 +1,6 @@
+import React from "react"
 import { useStore } from "@/core/state/store"
-import { resolveAbstractions, parseFormatString, StyledText } from "@/core/theme"
+import { resolveAbstractions, parseFormatString, StyledText, renderStyledSpans } from "@/core/theme"
 import { formatTimestamp } from "@/core/irc/formatting"
 import { classifyUrl } from "@/core/image-preview/fetch"
 import type { Message } from "@/types"
@@ -12,7 +13,7 @@ interface Props {
   isOwnNick: boolean
 }
 
-export function MessageLine({ message, isOwnNick }: Props) {
+export const MessageLine = React.memo(function MessageLine({ message, isOwnNick }: Props) {
   const theme = useStore((s) => s.theme)
   const config = useStore((s) => s.config)
   const abstracts = theme?.abstracts ?? {}
@@ -45,10 +46,10 @@ export function MessageLine({ message, isOwnNick }: Props) {
     const maxLen = config?.display.nick_max_length ?? nickWidth
     const truncate = config?.display.nick_truncation ?? true
 
-    // Truncate nick if needed
+    // Truncate nick if needed — show "+" to indicate truncation
     let displayNick = nick
     if (truncate && displayNick.length > maxLen) {
-      displayNick = displayNick.slice(0, maxLen)
+      displayNick = displayNick.slice(0, maxLen - 1) + "+"
     }
 
     // Pad the combined mode+nick so alignment covers the whole column
@@ -101,9 +102,29 @@ export function MessageLine({ message, isOwnNick }: Props) {
     }
   }
 
+  // Split at %| indent marker for wrap-indented two-column layout
+  const markerIdx = allSpans.findIndex((s) => s.indentMarker)
+  if (markerIdx !== -1) {
+    // Absorb whitespace-only spans after marker into prefix (for correct alignment)
+    let bodyStart = markerIdx + 1
+    while (bodyStart < allSpans.length && allSpans[bodyStart].text.trim() === "") {
+      bodyStart++
+    }
+    const prefixSpans = [...allSpans.slice(0, markerIdx), ...allSpans.slice(markerIdx + 1, bodyStart)]
+    const bodySpans = allSpans.slice(bodyStart)
+    const prefixWidth = prefixSpans.reduce((w, s) => w + s.text.length, 0)
+
+    return (
+      <box width="100%" flexDirection="row" onMouseDown={handleClick}>
+        <text width={prefixWidth}>{renderStyledSpans(prefixSpans)}</text>
+        <text flexGrow={1}>{renderStyledSpans(bodySpans, prefixSpans.length)}</text>
+      </box>
+    )
+  }
+
   return (
     <box width="100%" onMouseDown={handleClick}>
       <StyledText spans={allSpans} />
     </box>
   )
-}
+})

package/src/ui/input/CommandInput.tsx

@@ -50,6 +50,10 @@ export function CommandInput() {
   const addMessage = useStore((s) => s.addMessage)
   const sb = useStatusbarColors()
 
+  // ── Multiline paste handling ──────────────────────────────────
+  const pasteQueueRef = useRef<ReturnType<typeof setTimeout>[]>([])
+  const handleSubmitRef = useRef<(v: string) => void>(() => {})
+
   const handleSubmit = useCallback((submittedValue?: string | unknown) => {
     const text = typeof submittedValue === "string" ? submittedValue : value
     const trimmed = text.trim()
@@ -88,6 +92,56 @@ export function CommandInput() {
     }
   }, [value, buffer, addMessage])
 
+  // Keep ref in sync for paste queue callbacks
+  handleSubmitRef.current = handleSubmit
+
+  // Intercept multiline paste — split into lines and send with delay
+  useEffect(() => {
+    const PASTE_DELAY = 500 // ms between lines
+
+    const onPaste = (event: { text: string; preventDefault(): void }) => {
+      const text = event.text
+      if (!text) return
+
+      const lines = text.split(/\r?\n/).filter((l) => l.trim())
+      if (lines.length <= 1) return // single-line paste: let input handle normally
+
+      event.preventDefault()
+
+      // Prepend any existing input text to first pasted line
+      const currentInput = inputRef.current?.value ?? ""
+      if (currentInput.trim()) {
+        lines[0] = currentInput + lines[0]
+      }
+
+      // Clear input
+      setValue("")
+      if (inputRef.current) inputRef.current.value = ""
+
+      // Cancel any pending paste queue
+      for (const t of pasteQueueRef.current) clearTimeout(t)
+      pasteQueueRef.current = []
+
+      // Capture current submit for all queued lines
+      const submit = handleSubmitRef.current
+
+      // Send first line immediately, rest with delay to avoid excess flood
+      submit(lines[0])
+      for (let i = 1; i < lines.length; i++) {
+        const line = lines[i]
+        const timer = setTimeout(() => submit(line), PASTE_DELAY * i)
+        pasteQueueRef.current.push(timer)
+      }
+    }
+
+    renderer.keyInput.on("paste", onPaste)
+    return () => {
+      renderer.keyInput.off("paste", onPaste)
+      for (const t of pasteQueueRef.current) clearTimeout(t)
+      pasteQueueRef.current = []
+    }
+  }, [renderer])
+
   const tryNickCompletion = (currentValue: string) => {
     if (!buffer) return null
     const nicks = Array.from(buffer.users.keys())

package/src/ui/layout/AppLayout.tsx

@@ -35,7 +35,6 @@ export function AppLayout({ sidebar, chat, nicklist, input, topicbar, statusline
   const [liveLeftWidth, setLiveLeftWidth] = useState(leftWidth)
   const [liveRightWidth, setLiveRightWidth] = useState(rightWidth)
   const dragRef = useRef<{ side: "left" | "right"; startX: number; startWidth: number; currentWidth: number } | null>(null)
-  const store = useStore()
 
   useEffect(() => { setLiveLeftWidth(leftWidth) }, [leftWidth])
   useEffect(() => { setLiveRightWidth(rightWidth) }, [rightWidth])
@@ -59,10 +58,11 @@ export function AppLayout({ sidebar, chat, nicklist, input, topicbar, statusline
     const d = dragRef.current
     if (!d) return
     dragRef.current = null
-    const newConfig = cloneConfig(store.config!)
+    const s = useStore.getState()
+    const newConfig = cloneConfig(s.config!)
     if (d.side === "left") newConfig.sidepanel.left.width = d.currentWidth
     else newConfig.sidepanel.right.width = d.currentWidth
-    store.setConfig(newConfig)
+    s.setConfig(newConfig)
     saveConfig(CONFIG_PATH, newConfig)
   }
 

package/src/ui/sidebar/BufferList.tsx

@@ -21,26 +21,35 @@ export function BufferList() {
         // Connection header
         if (buf.connectionId !== lastConnectionId) {
           lastConnectionId = buf.connectionId
-          const format = theme?.formats.sidepanel.header ?? "%B$0%N"
-          const resolved = resolveAbstractions(format, theme?.abstracts ?? {})
-          const spans = parseFormatString(resolved, [buf.connectionLabel])
+          const hdrFormat = theme?.formats.sidepanel.header ?? "%B$0%N"
+          const hdrResolved = resolveAbstractions(hdrFormat, theme?.abstracts ?? {})
+          // Measure visible overhead of header format (everything except $0)
+          const hdrOverhead = parseFormatString(hdrResolved, [""]).reduce((w, s) => w + s.text.length, 0)
+          const maxLabelLen = leftWidth - 3 - hdrOverhead
+          const displayLabel = maxLabelLen > 0 && buf.connectionLabel.length > maxLabelLen
+            ? buf.connectionLabel.slice(0, maxLabelLen - 1) + "+"
+            : buf.connectionLabel
+          const hdrSpans = parseFormatString(hdrResolved, [displayLabel])
           items.push(
             <box key={`h-${buf.connectionId}`} width="100%">
-              <StyledText spans={spans} />
+              <StyledText spans={hdrSpans} />
             </box>
           )
         }
 
         refNum++
+        const refStr = String(refNum)
         const isActive = buf.id === activeBufferId
         const formatKey = isActive
           ? "item_selected"
           : `item_activity_${buf.activity}`
         const format = theme?.formats.sidepanel[formatKey] ?? "$0. $1"
         const resolved = resolveAbstractions(format, theme?.abstracts ?? {})
-        const maxLen = leftWidth - 4
-        const displayName = buf.name.length > maxLen ? buf.name.slice(0, maxLen - 1) + "\u2026" : buf.name
-        const spans = parseFormatString(resolved, [String(refNum), displayName])
+        // Measure visible overhead of format (refnum + decoration, excluding channel name)
+        const formatOverhead = parseFormatString(resolved, [refStr, ""]).reduce((w, s) => w + s.text.length, 0)
+        const maxLen = leftWidth - 3 - formatOverhead
+        const displayName = maxLen > 0 && buf.name.length > maxLen ? buf.name.slice(0, maxLen - 1) + "+" : buf.name
+        const spans = parseFormatString(resolved, [refStr, displayName])
 
         items.push(
           <box key={buf.id} width="100%" onMouseDown={() => setActiveBuffer(buf.id)}>

package/src/ui/sidebar/NickList.tsx

@@ -8,15 +8,15 @@ const DEFAULT_PREFIX_ORDER = "~&@%+"
 const EMPTY_NICKS: import("@/types").NickEntry[] = []
 
 export function NickList() {
-  const activeBufferId = useStore((s) => s.activeBufferId)
-  const buffersMap = useStore((s) => s.buffers)
-  const connectionsMap = useStore((s) => s.connections)
+  const buffer = useStore((s) => s.activeBufferId ? s.buffers.get(s.activeBufferId) ?? null : null)
+  const conn = useStore((s) => {
+    const buf = s.activeBufferId ? s.buffers.get(s.activeBufferId) : null
+    return buf ? s.connections.get(buf.connectionId) : undefined
+  })
   const theme = useStore((s) => s.theme)
+  const rightWidth = useStore((s) => s.config?.sidepanel.right.width ?? 18)
   const colors = theme?.colors
 
-  const buffer = activeBufferId ? buffersMap.get(activeBufferId) ?? null : null
-  const conn = buffer ? connectionsMap.get(buffer.connectionId) : undefined
-
   const prefixOrder = conn?.isupport?.PREFIX
     ? extractPrefixChars(conn.isupport.PREFIX)
     : DEFAULT_PREFIX_ORDER
@@ -46,7 +46,14 @@ export function NickList() {
         const formatKey = getFormatKey(entry.prefix)
         const format = formats[formatKey] ?? " $0"
         const resolved = resolveAbstractions(format, abstracts)
-        const spans = parseFormatString(resolved, [entry.nick])
+        // Measure visible overhead of format (prefix char etc., excluding nick)
+        const formatOverhead = parseFormatString(resolved, [""]).reduce((w, s) => w + s.text.length, 0)
+        const maxNickLen = rightWidth - 3 - formatOverhead
+        let displayNick = entry.nick
+        if (maxNickLen > 0 && displayNick.length > maxNickLen) {
+          displayNick = displayNick.slice(0, maxNickLen - 1) + "+"
+        }
+        const spans = parseFormatString(resolved, [displayNick])
 
         return (
           <box key={entry.nick} width="100%"
@@ -65,6 +72,7 @@ export function NickList() {
                   unreadCount: 0,
                   lastRead: new Date(),
                   users: new Map(),
+                  listModes: new Map(),
                 })
               }
               store.setActiveBuffer(queryId)

package/src/ui/splash/SplashScreen.tsx

@@ -46,6 +46,7 @@ export function SplashScreen({ onDone }: { onDone: () => void }) {
   const [visibleLines, setVisibleLines] = useState(0)
   const [showLogo, setShowLogo] = useState(false)
   const doneRef = useRef(false)
+  const finishTimer = useRef<ReturnType<typeof setTimeout> | null>(null)
 
   const finish = () => {
     if (doneRef.current) return
@@ -63,10 +64,13 @@ export function SplashScreen({ onDone }: { onDone: () => void }) {
       if (count >= BIRD.length) {
         clearInterval(timer)
         setShowLogo(true)
-        setTimeout(finish, 2500)
+        finishTimer.current = setTimeout(finish, 2500)
       }
     }, 50)
-    return () => clearInterval(timer)
+    return () => {
+      clearInterval(timer)
+      if (finishTimer.current) clearTimeout(finishTimer.current)
+    }
   }, [])
 
   return (

package/src/ui/statusbar/StatusLine.tsx

@@ -8,7 +8,10 @@ import { useStatusbarColors } from "@/ui/hooks/useStatusbarColors"
 export function StatusLine() {
   const config = useStore((s) => s.config)
   const buffer = useStore((s) => s.activeBufferId ? s.buffers.get(s.activeBufferId) : null)
-  const connections = useStore((s) => s.connections)
+  const conn = useStore((s) => {
+    const buf = s.activeBufferId ? s.buffers.get(s.activeBufferId) : null
+    return buf ? s.connections.get(buf.connectionId) ?? null : null
+  })
   const activeBufferId = useStore((s) => s.activeBufferId)
   const setActiveBuffer = useStore((s) => s.setActiveBuffer)
 
@@ -24,7 +27,6 @@ export function StatusLine() {
 
   if (!config?.statusbar.enabled) return null
 
-  const conn = buffer ? connections.get(buffer.connectionId) : null
   const items = config.statusbar.items
 
   function getItemFormat(item: StatusbarItem): string {