terminfo.dev 1.1.0 → 1.3.0

package/package.json

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

package/src/detect.ts

@@ -1,10 +1,11 @@
 /**
  * Terminal detection — identify the running terminal emulator.
  *
- * Uses environment variables, DA2 response parsing, and fallback heuristics.
+ * Uses environment variables, macOS bundle metadata, and fallback heuristics.
  */
 
 import { release } from "node:os"
+import { execFileSync } from "node:child_process"
 
 export interface TerminalInfo {
   name: string
@@ -14,7 +15,7 @@ export interface TerminalInfo {
 }
 
 /** Known terminal detection via environment variables */
-const ENV_DETECTORS: Array<{ env: string; name: string; versionEnv?: string }> = [
+const ENV_DETECTORS: Array<{ env: string; name: string }> = [
   { env: "GHOSTTY_RESOURCES_DIR", name: "ghostty" },
   { env: "KITTY_WINDOW_ID", name: "kitty" },
   { env: "WEZTERM_EXECUTABLE", name: "wezterm" },
@@ -33,46 +34,97 @@ const TERM_PROGRAM_MAP: Record<string, string> = {
   WarpTerminal: "warp",
 }
 
+/** Known macOS bundle IDs for version lookup */
+const BUNDLE_IDS: Record<string, string> = {
+  ghostty: "com.mitchellh.ghostty",
+  kitty: "net.kovidgoyal.kitty",
+  iterm2: "com.googlecode.iterm2",
+  "terminal-app": "com.apple.Terminal",
+  wezterm: "org.wezfurlong.wezterm",
+  alacritty: "org.alacritty",
+  warp: "dev.warp.Warp-Stable",
+}
+
 export function detectTerminal(): TerminalInfo {
   const os = detectOS()
   const osVersion = detectOSVersion()
 
+  let name = "unknown"
+  let version = ""
+
   // Check specific env vars first
-  for (const { env, name } of ENV_DETECTORS) {
+  for (const { env, name: n } of ENV_DETECTORS) {
     if (process.env[env]) {
-      return { name, version: "", os, osVersion }
+      name = n
+      break
     }
   }
 
   // Check $TERM_PROGRAM
-  const termProgram = process.env.TERM_PROGRAM
-  if (termProgram) {
-    const name = TERM_PROGRAM_MAP[termProgram] ?? termProgram.toLowerCase()
-    const version = process.env.TERM_PROGRAM_VERSION ?? ""
-    return { name, version, os, osVersion }
+  if (name === "unknown") {
+    const termProgram = process.env.TERM_PROGRAM
+    if (termProgram) {
+      name = TERM_PROGRAM_MAP[termProgram] ?? termProgram.toLowerCase()
+      version = process.env.TERM_PROGRAM_VERSION ?? ""
+    }
+  }
+
+  // Check $TERMINAL_EMULATOR (Linux)
+  if (name === "unknown") {
+    const termEmu = process.env.TERMINAL_EMULATOR
+    if (termEmu) name = termEmu.toLowerCase()
   }
 
-  // Check $TERMINAL_EMULATOR (set by some Linux terminals)
-  const termEmu = process.env.TERMINAL_EMULATOR
-  if (termEmu) {
-    return { name: termEmu.toLowerCase(), version: "", os, osVersion }
+  // Fallback: $TERM
+  if (name === "unknown") {
+    name = process.env.TERM ?? "unknown"
   }
 
-  // Fallback: use $TERM
-  const term = process.env.TERM ?? "unknown"
-  return { name: term, version: "", os, osVersion }
+  // On macOS, get version from app bundle if we don't have it yet
+  if (!version && os === "macos") {
+    version = getMacOSAppVersion(name)
+  }
+
+  return { name, version, os, osVersion }
+}
+
+/**
+ * Get app version from macOS bundle metadata.
+ * Uses $__CFBundleIdentifier → mdfind → PlistBuddy.
+ */
+function getMacOSAppVersion(terminalName: string): string {
+  try {
+    // Try __CFBundleIdentifier first (set by the running app)
+    let bundleId = process.env.__CFBundleIdentifier
+    if (!bundleId) bundleId = BUNDLE_IDS[terminalName]
+    if (!bundleId) return ""
+
+    // Find app path from bundle ID
+    const appPath = execFileSync("mdfind", [`kMDItemCFBundleIdentifier == '${bundleId}'`], {
+      encoding: "utf-8",
+      timeout: 3000,
+    }).trim().split("\n")[0]
+
+    if (!appPath) return ""
+
+    // Read version from Info.plist
+    const version = execFileSync("/usr/libexec/PlistBuddy", [
+      "-c", "Print :CFBundleShortVersionString",
+      `${appPath}/Contents/Info.plist`,
+    ], { encoding: "utf-8", timeout: 2000 }).trim()
+
+    return version
+  } catch {
+    return ""
+  }
 }
 
 function detectOS(): string {
   switch (process.platform) {
-    case "darwin":
-      return "macos"
-    case "linux":
-      return "linux"
-    case "win32":
-      return "windows"
-    default:
-      return process.platform
+    case "darwin": return "macos"
+    case "linux": return "linux"
+    case "win32": return "windows"
+    default: return process.platform
   }
 }
 
@@ -86,8 +138,6 @@ function detectOSVersion(): string {
 
 /**
  * Query terminal identity via DA2 (Secondary Device Attributes).
- * Sends CSI > 0 c and parses the response.
- *
  * Must be called with raw mode enabled on stdin.
  */
 export async function queryDA2(

package/src/index.ts

@@ -25,10 +25,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 /** Load feature slugs from features.json for OSC 8 hyperlinks */
 function loadFeatureSlugs(): Record<string, string> {
-  const candidates = [
-    join(__dirname, "..", "..", "features.json"),
-    join(__dirname, "..", "..", "..", "features.json"),
-  ]
+  const candidates = [join(__dirname, "..", "..", "features.json"), join(__dirname, "..", "..", "..", "features.json")]
   for (const path of candidates) {
     try {
       const raw = JSON.parse(readFileSync(path, "utf-8"))
@@ -90,7 +87,9 @@ function printHeader(terminal: ReturnType<typeof detectTerminal>) {
   console.log(`\x1b[1m${siteLink}\x1b[0m — can your terminal do that?\n`)
   console.log(`  Terminal:  \x1b[1m${terminal.name}\x1b[0m${terminal.version ? ` ${terminal.version}` : ""}`)
   console.log(`  Platform:  ${terminal.os} ${terminal.osVersion}`)
-  console.log(`  Probes:    ${ALL_PROBES.length} features across ${new Set(ALL_PROBES.map(p => p.id.split(".")[0])).size} categories`)
+  console.log(
+    `  Probes:    ${ALL_PROBES.length} features across ${new Set(ALL_PROBES.map((p) => p.id.split(".")[0])).size} categories`,
+  )
   console.log(`  Website:   ${link("https://terminfo.dev", "https://terminfo.dev")}`)
 }
 
@@ -115,7 +114,7 @@ function printResults(data: ProbeResults) {
   }
 
   for (const [cat, probes] of categories) {
-    const catPassed = probes.filter(p => p.pass).length
+    const catPassed = probes.filter((p) => p.pass).length
     const color = catPassed === probes.length ? "\x1b[32m" : catPassed > 0 ? "\x1b[33m" : "\x1b[31m"
     const catLink = link(`https://terminfo.dev/${cat}`, cat)
     console.log(`${color}${catLink}\x1b[0m (${catPassed}/${probes.length})`)
@@ -145,21 +144,28 @@ program
     const data = await runProbes()
 
     if (opts.json) {
-      console.log(JSON.stringify({
-        terminal: data.terminal.name,
-        terminalVersion: data.terminal.version,
-        os: data.terminal.os,
-        osVersion: data.terminal.osVersion,
-        source: "community",
-        generated: new Date().toISOString(),
-        results: data.results,
-        notes: data.notes,
-        responses: data.responses,
-      }, null, 2))
+      console.log(
+        JSON.stringify(
+          {
+            terminal: data.terminal.name,
+            terminalVersion: data.terminal.version,
+            os: data.terminal.os,
+            osVersion: data.terminal.osVersion,
+            source: "community",
+            generated: new Date().toISOString(),
+            results: data.results,
+            notes: data.notes,
+            responses: data.responses,
+          },
+          null,
+          2,
+        ),
+      )
       return
     }
 
     printResults(data)
+    console.log(`\n\x1b[2mContribute these results: \x1b[0m\x1b[1mnpx terminfo.dev submit\x1b[0m`)
   })
 
 program
@@ -179,6 +185,8 @@ program
       notes: data.notes,
       responses: data.responses,
       generated: new Date().toISOString(),
+      cliVersion: "1.3.0",
+      probeCount: ALL_PROBES.length,
     })
     if (url) {
       console.log(`\x1b[32m✓ Issue created:\x1b[0m ${link(url, url)}`)

package/src/report.tsx

@@ -49,18 +49,35 @@ function Header({ terminal, terminalVersion, os, osVersion, probeCount, category
           <Text dimColor>Score</Text>
         </Box>
         <Box flexDirection="column">
-          <Text bold>{terminal}{terminalVersion ? ` ${terminalVersion}` : ""}</Text>
-          <Text>{os} {osVersion}</Text>
-          <Text>{probeCount} features, {categoryCount} categories</Text>
-          <Text bold color={pct === 100 ? "green" : pct >= 90 ? "yellow" : "red"}>{passed}/{total} ({pct}%)</Text>
+          <Text bold>
+            {terminal}
+            {terminalVersion ? ` ${terminalVersion}` : ""}
+          </Text>
+          <Text>
+            {os} {osVersion}
+          </Text>
+          <Text>
+            {probeCount} features, {categoryCount} categories
+          </Text>
+          <Text bold color={pct === 100 ? "green" : pct >= 90 ? "yellow" : "red"}>
+            {passed}/{total} ({pct}%)
+          </Text>
         </Box>
       </Box>
     </Box>
   )
 }
 
-function CategorySection({ name, probes, slugs }: { name: string; probes: ProbeResult[]; slugs: Record<string, string> }) {
-  const catPassed = probes.filter(p => p.pass).length
+function CategorySection({
+  name,
+  probes,
+  slugs,
+}: {
+  name: string
+  probes: ProbeResult[]
+  slugs: Record<string, string>
+}) {
+  const catPassed = probes.filter((p) => p.pass).length
   const allPassed = catPassed === probes.length
   const catUrl = `https://terminfo.dev/${name}`
 
@@ -69,7 +86,7 @@ function CategorySection({ name, probes, slugs }: { name: string; probes: ProbeR
       <Text color={allPassed ? "green" : catPassed > 0 ? "yellow" : "red"}>
         {osc8(catUrl, name)} ({catPassed}/{probes.length})
       </Text>
-      {probes.map(p => {
+      {probes.map((p) => {
         const slug = slugs[p.id] ?? p.id.replaceAll(".", "-")
         const url = featureUrl(p.id, slug)
         const icon = p.pass ? "✓" : "✗"
@@ -90,7 +107,7 @@ function Footer({ submitMode }: { submitMode: boolean }) {
   return (
     <Box flexDirection="column" marginTop={1}>
       <Text dimColor>Submit: npx terminfo.dev --submit</Text>
-      <Text dimColor>JSON:   npx terminfo.dev --json</Text>
+      <Text dimColor>JSON: npx terminfo.dev --json</Text>
     </Box>
   )
 }
@@ -107,7 +124,9 @@ function Report(props: ReportProps & { slugs: Record<string, string>; submitMode
   )
 }
 
-export async function renderReport(props: ReportProps & { slugs: Record<string, string>; submitMode: boolean }): Promise<string> {
+export async function renderReport(
+  props: ReportProps & { slugs: Record<string, string>; submitMode: boolean },
+): Promise<string> {
   const width = process.stdout.columns ?? 80
   return renderString(<Report {...props} />, { width })
 }

package/src/submit.ts

@@ -6,6 +6,7 @@ import { writeFileSync, unlinkSync } from "node:fs"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
 import { execFileSync } from "node:child_process"
+import { createInterface } from "node:readline"
 
 const REPO = "beorn/terminfo.dev"
 
@@ -18,9 +19,46 @@ interface SubmitData {
   notes: Record<string, string>
   responses: Record<string, string>
   generated: string
+  cliVersion?: string
+  probeCount?: number
+}
+
+async function prompt(question: string, defaultValue?: string): Promise<string> {
+  const rl = createInterface({ input: process.stdin, output: process.stdout })
+  const suffix = defaultValue ? ` [${defaultValue}]` : ""
+  return new Promise((resolve) => {
+    rl.question(`${question}${suffix}: `, (answer) => {
+      rl.close()
+      resolve(answer.trim() || defaultValue || "")
+    })
+  })
 }
 
 export async function submitResults(data: SubmitData): Promise<string | null> {
+  // Confirm/fill terminal info
+  console.log(`\n\x1b[1mConfirm submission details:\x1b[0m`)
+  data.terminal = await prompt("  Terminal name", data.terminal)
+  data.terminalVersion = await prompt("  Terminal version", data.terminalVersion || undefined)
+  data.os = await prompt("  Operating system", data.os)
+
+  if (!data.terminalVersion) {
+    console.log(`\x1b[33m  ⚠ No version specified — results will be less useful\x1b[0m`)
+  }
+
+  // Check for duplicates
+  if (hasGhCli()) {
+    const existing = checkDuplicate(data.terminal, data.terminalVersion, data.os)
+    if (existing) {
+      console.log(`\n\x1b[33m⚠ A submission already exists for ${data.terminal}${data.terminalVersion ? ` ${data.terminalVersion}` : ""} on ${data.os}:\x1b[0m`)
+      console.log(`  ${existing}`)
+      const proceed = await prompt("  Submit anyway? (y/N)", "N")
+      if (proceed.toLowerCase() !== "y") {
+        console.log(`Skipped.`)
+        return null
+      }
+    }
+  }
+
   const passed = Object.values(data.results).filter(Boolean).length
   const total = Object.keys(data.results).length
   const pct = Math.round((passed / total) * 100)
@@ -35,6 +73,8 @@ export async function submitResults(data: SubmitData): Promise<string | null> {
 | Version | ${data.terminalVersion || "unknown"} |
 | OS | ${data.os} ${data.osVersion || ""} |
 | Score | ${passed}/${total} (${pct}%) |
+| CLI Version | ${data.cliVersion ?? "unknown"} |
+| Probes | ${data.probeCount ?? total} |
 | Generated | ${data.generated} |
 
 ### Summary
@@ -51,7 +91,7 @@ ${JSON.stringify(data, null, 2)}
 </details>
 
 ---
-*Submitted via \`npx terminfo.dev\`*`
+*Submitted via \`npx terminfo.dev submit\`*`
 
   if (!hasGhCli()) {
     const filename = `terminfo-${data.terminal}-${data.os}-${Date.now()}.json`
@@ -61,7 +101,6 @@ ${JSON.stringify(data, null, 2)}
     return null
   }
 
-  // Write body to temp file to avoid shell escaping issues
   const bodyFile = join(tmpdir(), `terminfo-submit-${Date.now()}.md`)
   try {
     writeFileSync(bodyFile, body)
@@ -90,6 +129,25 @@ function hasGhCli(): boolean {
   }
 }
 
+function checkDuplicate(terminal: string, version: string, os: string): string | null {
+  try {
+    const search = `[census] ${terminal}${version ? ` ${version}` : ""} on ${os}`
+    const result = execFileSync("gh", [
+      "issue", "list",
+      "--repo", REPO,
+      "--search", search,
+      "--state", "all",
+      "--limit", "1",
+      "--json", "url,title",
+      "--jq", ".[0] | .title + \" \" + .url",
+    ], { encoding: "utf-8", timeout: 10000 })
+    const trimmed = result.trim()
+    return trimmed || null
+  } catch {
+    return null
+  }
+}
+
 function formatSummary(data: SubmitData): string {
   const categories = new Map<string, { pass: number; fail: number; failList: string[] }>()
   for (const [id, pass] of Object.entries(data.results)) {