npm - kanna-code - Versions diffs - 0.6.0 → 0.6.1 - Mend

kanna-code 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/client/assets/{index-DPinj1Li.js → index-CAUb9qP0.js} +114 -114
package/dist/client/index.html +1 -1
package/package.json +1 -1
package/src/server/terminal-manager.test.ts +128 -0
package/src/server/terminal-manager.ts +34 -5

package/dist/client/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href="/favicon.png" />
     <title>Kanna</title>
-    <script type="module" crossorigin src="/assets/index-DPinj1Li.js"></script>
+    <script type="module" crossorigin src="/assets/index-CAUb9qP0.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-C4BaFDD7.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "kanna-code",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A beautiful web UI for Claude Code",
   "license": "MIT",
   "keywords": [

package/src/server/terminal-manager.test.ts CHANGED Viewed

@@ -6,6 +6,8 @@ import { TerminalManager } from "./terminal-manager"
 const SHELL_START_TIMEOUT_MS = 5_000
 const COMMAND_TIMEOUT_MS = 5_000
+const FOCUS_IN_SEQUENCE = "\x1b[I"
+const RAW_READ_HEX_COMMAND = `python3 -c "exec('import os,sys,tty,termios,select\\nfd=sys.stdin.fileno()\\nold=termios.tcgetattr(fd)\\ntty.setraw(fd)\\ntry:\\n    sys.stdout.write(\"__RAW_READY__\\\\n\")\\n    sys.stdout.flush()\\n    r,_,_=select.select([fd],[],[],1)\\n    data=os.read(fd,8) if r else b\"\"\\n    print(data.hex() or \"__EMPTY__\")\\nfinally:\\n    termios.tcsetattr(fd, termios.TCSADRAIN, old)')"\r`
 const isSupportedPlatform = process.platform !== "win32" && typeof Bun.Terminal === "function"
 const describeIfSupported = isSupportedPlatform ? describe : describe.skip
@@ -58,6 +60,10 @@ async function createSession(terminalId: string) {
   }
 }
+async function waitForOutputToContain(getOutput: () => string, value: string, timeoutMs = COMMAND_TIMEOUT_MS) {
+  await waitFor(() => getOutput().includes(value), timeoutMs)
+}
 describeIfSupported("TerminalManager", () => {
   test("ctrl+c interrupts the foreground job and keeps the shell alive", async () => {
     const terminalId = "terminal-ctrl-c-foreground"
@@ -112,4 +118,126 @@ describeIfSupported("TerminalManager", () => {
       manager.close(terminalId)
     }
   })
+  test("filters leaked focus reports while focus mode is disabled", async () => {
+    const terminalId = "terminal-focus-filtered"
+    const { manager, getOutput } = await createSession(terminalId)
+    try {
+      const beforeLength = getOutput().length
+      manager.write(terminalId, RAW_READ_HEX_COMMAND)
+      await waitForOutputToContain(getOutput, "__RAW_READY__")
+      manager.write(terminalId, FOCUS_IN_SEQUENCE)
+      await waitForOutputToContain(getOutput, "__EMPTY__")
+      const interactionOutput = getOutput().slice(beforeLength)
+      expect(interactionOutput).toContain("__EMPTY__")
+      expect(interactionOutput).not.toContain("1b5b49")
+    } finally {
+      manager.close(terminalId)
+    }
+  })
+  test("tracks focus report mode after the PTY enables it", async () => {
+    const terminalId = "terminal-focus-enabled"
+    const { manager, getOutput } = await createSession(terminalId)
+    try {
+      const enableBeforeLength = getOutput().length
+      manager.write(terminalId, "printf '\\033[?1004h'\r")
+      await waitFor(() => getOutput().length > enableBeforeLength, COMMAND_TIMEOUT_MS)
+      await waitFor(
+        () =>
+          (
+            (manager as unknown as {
+              sessions: Map<string, { focusReportingEnabled: boolean }>
+            }).sessions.get(terminalId)?.focusReportingEnabled
+          ) === true,
+        COMMAND_TIMEOUT_MS
+      )
+    } finally {
+      manager.close(terminalId)
+    }
+  })
+  test("forwards focus reports when the session mode is enabled", () => {
+    const manager = new TerminalManager() as unknown as {
+      sessions: Map<
+        string,
+        {
+          status: "running" | "exited"
+          focusReportingEnabled: boolean
+          terminal: { write: (data: string) => void }
+          process: Bun.Subprocess | null
+        }
+      >
+      write: (terminalId: string, data: string) => void
+    }
+    const writes: string[] = []
+    manager.sessions.set("terminal-focus-forwarded", {
+      status: "running",
+      focusReportingEnabled: true,
+      terminal: {
+        write(data: string) {
+          writes.push(data)
+        },
+      },
+      process: null,
+    })
+    manager.write("terminal-focus-forwarded", FOCUS_IN_SEQUENCE)
+    expect(writes).toEqual([FOCUS_IN_SEQUENCE])
+  })
+  test("new sessions reset focus mode back to filtered", async () => {
+    const manager = new TerminalManager()
+    const firstTerminalId = "terminal-focus-first"
+    const secondTerminalId = "terminal-focus-second"
+    let outputByTerminalId = new Map<string, string>()
+    manager.onEvent((event) => {
+      if (event.type !== "terminal.output") return
+      outputByTerminalId.set(event.terminalId, `${outputByTerminalId.get(event.terminalId) ?? ""}${event.data}`)
+    })
+    const getOutput = (terminalId: string) => outputByTerminalId.get(terminalId) ?? ""
+    const createManagedSession = async (terminalId: string) => {
+      manager.createTerminal({
+        projectPath: tempProjectPath,
+        terminalId,
+        cols: 80,
+        rows: 24,
+        scrollback: 1_000,
+      })
+      manager.write(terminalId, "printf '__KANNA_READY__\\n'\r")
+      await waitForOutputToContain(() => getOutput(terminalId), "__KANNA_READY__", SHELL_START_TIMEOUT_MS)
+    }
+    try {
+      await createManagedSession(firstTerminalId)
+      const firstBeforeLength = getOutput(firstTerminalId).length
+      manager.write(firstTerminalId, "printf '\\033[?1004h'\r")
+      await waitFor(() => getOutput(firstTerminalId).length > firstBeforeLength, COMMAND_TIMEOUT_MS)
+      manager.close(firstTerminalId)
+      await createManagedSession(secondTerminalId)
+      const before = getOutput(secondTerminalId).length
+      manager.write(secondTerminalId, "cat -v\r")
+      await waitFor(() => getOutput(secondTerminalId).length > before, COMMAND_TIMEOUT_MS)
+      manager.write(secondTerminalId, FOCUS_IN_SEQUENCE)
+      manager.write(secondTerminalId, "\x03")
+      manager.write(secondTerminalId, "printf '__KANNA_FRESH_SESSION__\\n'\r")
+      await waitForOutputToContain(() => getOutput(secondTerminalId), "__KANNA_FRESH_SESSION__")
+      const interactionOutput = getOutput(secondTerminalId).slice(before)
+      expect(interactionOutput).not.toContain("^[[I")
+    } finally {
+      manager.close(firstTerminalId)
+      manager.close(secondTerminalId)
+    }
+  })
 })

package/src/server/terminal-manager.ts CHANGED Viewed

@@ -10,6 +10,9 @@ const DEFAULT_ROWS = 24
 const DEFAULT_SCROLLBACK = 1_000
 const MIN_SCROLLBACK = 500
 const MAX_SCROLLBACK = 5_000
+const FOCUS_IN_SEQUENCE = "\x1b[I"
+const FOCUS_OUT_SEQUENCE = "\x1b[O"
+const MODE_SEQUENCE_TAIL_LENGTH = 16
 interface CreateTerminalArgs {
   projectPath: string
@@ -33,6 +36,8 @@ interface TerminalSession {
   terminal: Bun.Terminal
   headless: Terminal
   serializeAddon: SerializeAddon
+  focusReportingEnabled: boolean
+  modeSequenceTail: string
 }
 function clampScrollback(value: number) {
@@ -78,6 +83,25 @@ function createTerminalEnv() {
   }
 }
+function updateFocusReportingState(session: Pick<TerminalSession, "focusReportingEnabled" | "modeSequenceTail">, chunk: string) {
+  const combined = session.modeSequenceTail + chunk
+  const regex = /\x1b\[\?1004([hl])/g
+  for (const match of combined.matchAll(regex)) {
+    session.focusReportingEnabled = match[1] === "h"
+  }
+  session.modeSequenceTail = combined.slice(-MODE_SEQUENCE_TAIL_LENGTH)
+}
+function filterFocusReportInput(data: string, allowFocusReporting: boolean) {
+  if (allowFocusReporting || (!data.includes(FOCUS_IN_SEQUENCE) && !data.includes(FOCUS_OUT_SEQUENCE))) {
+    return data
+  }
+  return data.replaceAll(FOCUS_IN_SEQUENCE, "").replaceAll(FOCUS_OUT_SEQUENCE, "")
+}
 function killTerminalProcessTree(subprocess: Bun.Subprocess | null) {
   if (!subprocess) return
@@ -179,6 +203,7 @@ export class TerminalManager {
         name: "xterm-256color",
         data: (_terminal, data) => {
           const chunk = Buffer.from(data).toString("utf8")
+          updateFocusReportingState(session, chunk)
           headless.write(chunk)
           this.emit({
             type: "terminal.output",
@@ -189,6 +214,8 @@ export class TerminalManager {
       }),
       headless,
       serializeAddon,
+      focusReportingEnabled: false,
+      modeSequenceTail: "",
     }
     try {
@@ -203,7 +230,6 @@ export class TerminalManager {
       session.headless.dispose()
       throw error
     }
     void session.process.exited.then((exitCode) => {
       const active = this.sessions.get(args.terminalId)
       if (!active) return
@@ -244,18 +270,21 @@ export class TerminalManager {
     const session = this.sessions.get(terminalId)
     if (!session || session.status === "exited") return
+    const filteredData = filterFocusReportInput(data, session.focusReportingEnabled)
+    if (!filteredData) return
     let cursor = 0
-    while (cursor < data.length) {
-      const ctrlCIndex = data.indexOf("\x03", cursor)
+    while (cursor < filteredData.length) {
+      const ctrlCIndex = filteredData.indexOf("\x03", cursor)
       if (ctrlCIndex === -1) {
-        session.terminal.write(data.slice(cursor))
+        session.terminal.write(filteredData.slice(cursor))
         return
       }
       if (ctrlCIndex > cursor) {
-        session.terminal.write(data.slice(cursor, ctrlCIndex))
+        session.terminal.write(filteredData.slice(cursor, ctrlCIndex))
       }
       signalTerminalProcessGroup(session.process, "SIGINT")