terminfo.dev 1.4.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminfo.dev",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Test your terminal's feature support and contribute to terminfo.dev",
   "keywords": [
     "ansi",

package/src/detect.ts

@@ -52,15 +52,19 @@ export function detectTerminal(): TerminalInfo {
   let name = "unknown"
   let version = ""
 
-  // Check specific env vars first
-  for (const { env, name: n } of ENV_DETECTORS) {
-    if (process.env[env]) {
-      name = n
-      break
+  // On macOS, __CFBundleIdentifier is the most reliable — set by the actual running app
+  const bundleId = process.env.__CFBundleIdentifier
+  if (bundleId && os === "macos") {
+    for (const [termName, bid] of Object.entries(BUNDLE_IDS)) {
+      if (bundleId === bid) { name = termName; break }
+    }
+    // If bundle ID didn't match known terminals, use it as-is
+    if (name === "unknown" && bundleId) {
+      name = bundleId.split(".").pop() ?? bundleId
     }
   }
 
-  // Check $TERM_PROGRAM
+  // Check $TERM_PROGRAM (more reliable than env var detectors for cross-app scenarios)
   if (name === "unknown") {
     const termProgram = process.env.TERM_PROGRAM
     if (termProgram) {
@@ -69,6 +73,16 @@ export function detectTerminal(): TerminalInfo {
     }
   }
 
+  // Check specific env vars (may be inherited from parent, so lower priority)
+  if (name === "unknown") {
+    for (const { env, name: n } of ENV_DETECTORS) {
+      if (process.env[env]) {
+        name = n
+        break
+      }
+    }
+  }
+
   // Check $TERMINAL_EMULATOR (Linux)
   if (name === "unknown") {
     const termEmu = process.env.TERMINAL_EMULATOR

package/src/index.ts

@@ -18,7 +18,7 @@ import { dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 import { detectTerminal } from "./detect.ts"
 import { ALL_PROBES } from "./probes/index.ts"
-import { withRawMode } from "./tty.ts"
+import { withRawMode, drainStdin } from "./tty.ts"
 import { submitResults } from "./submit.ts"
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -76,21 +76,11 @@ async function runProbes(): Promise<ProbeResults> {
         notes[probe.id] = `error: ${err instanceof Error ? err.message : String(err)}`
       }
     }
+    // Drain all pending responses before exiting alt screen (still in raw mode)
+    await drainStdin(500)
     process.stdout.write("\x1b[?1049l")
   })
 
-  // Drain any late-arriving escape sequence responses before output
-  await new Promise<void>((resolve) => {
-    process.stdin.resume()
-    const timer = setTimeout(() => {
-      process.stdin.pause()
-      process.stdin.removeAllListeners("readable")
-      resolve()
-    }, 100)
-    process.stdin.on("readable", () => { while (process.stdin.read() !== null) {} })
-    timer.unref()
-  })
-
   return { terminal, results, notes, responses, passed, total: ALL_PROBES.length }
 }
 
@@ -197,7 +187,7 @@ program
       notes: data.notes,
       responses: data.responses,
       generated: new Date().toISOString(),
-      cliVersion: "1.3.0",
+      cliVersion: "1.5.0",
       probeCount: ALL_PROBES.length,
     })
     if (url) {

package/src/tty.ts

@@ -89,6 +89,28 @@ export async function queryMode(modeNumber: number): Promise<"set" | "reset" | "
   }
 }
 
+/**
+ * Drain all pending bytes from stdin (late-arriving escape sequence responses).
+ * Waits up to `ms` milliseconds for bytes to stop arriving.
+ */
+export async function drainStdin(ms = 300): Promise<void> {
+  return new Promise((resolve) => {
+    if (!process.stdin.readable) { resolve(); return }
+    process.stdin.resume()
+    let timer = setTimeout(done, ms)
+    function onData() {
+      while (process.stdin.read() !== null) {} // discard
+      clearTimeout(timer)
+      timer = setTimeout(done, ms) // reset timer on each new data
+    }
+    function done() {
+      process.stdin.removeListener("readable", onData)
+      resolve()
+    }
+    process.stdin.on("readable", onData)
+  })
+}
+
 /**
  * Run a function with stdin in raw mode.
  * Restores original mode on exit.