terminfo.dev 1.0.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminfo.dev",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Test your terminal's feature support and contribute to terminfo.dev",
   "keywords": [
     "ansi",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "silvery": "^0.4.3"
+    "commander": "^14.0.0"
   },
   "engines": {
     "node": ">=23.6.0"

package/src/index.ts

@@ -1,18 +1,18 @@
 #!/usr/bin/env bun
 /**
- * terminfo CLI — test your terminal's feature support.
+ * terminfo.dev CLI — can your terminal do that?
  *
- * Runs probes against the real terminal you're using (not a headless library),
- * shows results, and optionally submits them to terminfo.dev.
+ * Test your terminal's feature support and contribute results to terminfo.dev.
  *
  * @example
  * ```bash
- * npx terminfo          # Run all probes
- * npx terminfo --json   # Output JSON results
- * npx terminfo --submit # Submit results to terminfo.dev
+ * npx terminfo.dev           # Show terminal info + help
+ * npx terminfo.dev probe     # Run all probes
+ * npx terminfo.dev submit    # Run probes + submit results
  * ```
  */
 
+import { Command } from "commander"
 import { readFileSync } from "node:fs"
 import { dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
@@ -25,11 +25,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 /** Load feature slugs from features.json for OSC 8 hyperlinks */
 function loadFeatureSlugs(): Record<string, string> {
-  // Try repo-local path first, then npm-installed path
-  const candidates = [
-    join(__dirname, "..", "..", "features.json"),       // repo: cli/src/ -> features.json
-    join(__dirname, "..", "..", "..", "features.json"),  // npm: node_modules/terminfo.dev/src/ -> 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"))
@@ -41,42 +37,33 @@ function loadFeatureSlugs(): Record<string, string> {
       return slugs
     } catch {}
   }
-  return {} // fallback: featureSlug() will use id.replaceAll(".", "-")
+  return {}
 }
 
-interface ResultEntry {
-  terminal: string
-  terminalVersion: string
-  os: string
-  osVersion: string
-  source: "community"
-  generated: string
+/** OSC 8 hyperlink */
+function link(url: string, text: string): string {
+  return `\x1b]8;;${url}\x07${text}\x1b]8;;\x07`
+}
+
+interface ProbeResults {
+  terminal: ReturnType<typeof detectTerminal>
   results: Record<string, boolean>
   notes: Record<string, string>
   responses: Record<string, string>
+  passed: number
+  total: number
 }
 
-async function main() {
-  const args = process.argv.slice(2)
-  const jsonMode = args.includes("--json")
-  const submitMode = args.includes("--submit")
-
-  // Detect terminal
+async function runProbes(): Promise<ProbeResults> {
   const terminal = detectTerminal()
-
   const results: Record<string, boolean> = {}
   const notes: Record<string, string> = {}
   const responses: Record<string, string> = {}
   let passed = 0
-  let failed = 0
 
   await withRawMode(async () => {
-    // Enter alt screen inside raw mode so all probe output stays contained
-    process.stdout.write("\x1b[?1049h") // alt screen
-    process.stdout.write("\x1b[2J\x1b[H") // clear + home
-
+    process.stdout.write("\x1b[?1049h\x1b[2J\x1b[H")
     for (const probe of ALL_PROBES) {
-      // Clear screen before each probe to prevent leaking output
       process.stdout.write("\x1b[2J\x1b[H")
       try {
         const result = await probe.run()
@@ -84,40 +71,36 @@ async function main() {
         if (result.note) notes[probe.id] = result.note
         if (result.response) responses[probe.id] = result.response
         if (result.pass) passed++
-        else failed++
       } catch (err) {
         results[probe.id] = false
         notes[probe.id] = `error: ${err instanceof Error ? err.message : String(err)}`
-        failed++
       }
     }
-
-    // Exit alt screen while still in raw mode
     process.stdout.write("\x1b[?1049l")
   })
 
-  const total = ALL_PROBES.length
-  const pct = Math.round((passed / total) * 100)
-
-  const entry: ResultEntry = {
-    terminal: terminal.name,
-    terminalVersion: terminal.version,
-    os: terminal.os,
-    osVersion: terminal.osVersion,
-    source: "community",
-    generated: new Date().toISOString(),
-    results,
-    notes,
-    responses,
-  }
+  return { terminal, results, notes, responses, passed, total: ALL_PROBES.length }
+}
 
-  if (jsonMode) {
-    console.log(JSON.stringify(entry, null, 2))
-    return
-  }
+function printHeader(terminal: ReturnType<typeof detectTerminal>) {
+  const siteLink = link("https://terminfo.dev", "terminfo.dev")
+  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(`  Website:   ${link("https://terminfo.dev", "https://terminfo.dev")}`)
+}
 
-  // Build category data for report
+function printResults(data: ProbeResults) {
+  const { passed, total } = data
+  const pct = Math.round((passed / total) * 100)
   const slugs = loadFeatureSlugs()
+
+  printHeader(data.terminal)
+  console.log(`  Score:     \x1b[1m${passed}/${total} (${pct}%)\x1b[0m\n`)
+
   const categories = new Map<string, Array<{ id: string; name: string; pass: boolean; note?: string }>>()
   for (const probe of ALL_PROBES) {
     const cat = probe.id.split(".")[0]!
@@ -125,38 +108,105 @@ async function main() {
     categories.get(cat)!.push({
       id: probe.id,
       name: probe.name,
-      pass: results[probe.id] ?? false,
-      note: notes[probe.id],
+      pass: data.results[probe.id] ?? false,
+      note: data.notes[probe.id],
     })
   }
 
-  // Render with silvery
-  const { renderReport } = await import("./report.tsx")
-  const output = await renderReport({
-    terminal: terminal.name,
-    terminalVersion: terminal.version,
-    os: terminal.os,
-    osVersion: terminal.osVersion,
-    probeCount: total,
-    categoryCount: new Set(ALL_PROBES.map(p => p.id.split(".")[0])).size,
-    passed,
-    total,
-    categories,
-    slugs,
-    submitMode,
+  for (const [cat, probes] of categories) {
+    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})`)
+    for (const p of probes) {
+      const icon = p.pass ? "\x1b[32m✓\x1b[0m" : "\x1b[31m✗\x1b[0m"
+      const note = p.note ? ` \x1b[2m— ${p.note}\x1b[0m` : ""
+      const slug = slugs[p.id] ?? p.id.replaceAll(".", "-")
+      const fCat = p.id.split(".")[0]!
+      const featureLink = link(`https://terminfo.dev/${fCat}/${slug}`, p.name)
+      console.log(`  ${icon} ${featureLink}${note}`)
+    }
+  }
+}
+
+// ── CLI ──
+
+const program = new Command()
+  .name("terminfo.dev")
+  .description("Can your terminal do that? — test terminal feature support and contribute to terminfo.dev")
+  .version("1.1.0")
+
+program
+  .command("probe")
+  .description("Run all probes against your terminal and display results")
+  .option("--json", "Output results as JSON")
+  .action(async (opts) => {
+    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,
+        ),
+      )
+      return
+    }
+
+    printResults(data)
+    console.log(`\n\x1b[2mContribute these results: \x1b[0m\x1b[1mnpx terminfo.dev submit\x1b[0m`)
   })
-  console.log(output)
 
-  if (submitMode) {
+program
+  .command("submit")
+  .description("Run all probes and submit results to terminfo.dev via GitHub issue")
+  .action(async () => {
+    const data = await runProbes()
+    printResults(data)
+
     console.log(`\nSubmitting results to terminfo.dev...`)
-    const url = await submitResults(entry)
+    const url = await submitResults({
+      terminal: data.terminal.name,
+      terminalVersion: data.terminal.version,
+      os: data.terminal.os,
+      osVersion: data.terminal.osVersion,
+      results: data.results,
+      notes: data.notes,
+      responses: data.responses,
+      generated: new Date().toISOString(),
+    })
     if (url) {
-      console.log(`\x1b[32m✓ Issue created:\x1b[0m ${url}`)
+      console.log(`\x1b[32m✓ Issue created:\x1b[0m ${link(url, url)}`)
     }
-  }
-}
+  })
 
-main().catch((err) => {
-  console.error(err)
-  process.exit(1)
+// Default action: show terminal info + help
+program.action(() => {
+  const terminal = detectTerminal()
+  printHeader(terminal)
+  console.log(``)
+  console.log(`\x1b[2mTest your terminal against ${ALL_PROBES.length} features from the ECMA-48,`)
+  console.log(`VT100/VT510, xterm, and Kitty specifications. Results can be`)
+  console.log(`submitted to the community database at terminfo.dev.\x1b[0m`)
+  console.log(``)
+  console.log(`Commands:`)
+  console.log(`  \x1b[1mprobe\x1b[0m    Run all probes and display results`)
+  console.log(`  \x1b[1msubmit\x1b[0m   Run probes and submit to terminfo.dev`)
+  console.log(``)
+  console.log(`Options:`)
+  console.log(`  \x1b[1m--json\x1b[0m   Output results as JSON (with probe command)`)
+  console.log(`  \x1b[1m--help\x1b[0m   Show this help`)
 })
+
+program.parse()

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

@@ -1,15 +1,16 @@
 /**
  * Submit results to terminfo.dev via GitHub issue.
- *
- * Creates an issue on beorn/terminfo.dev with the JSON results
- * attached as a code block. Maintainers review and merge into
- * the results database.
  */
 
+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"
-const ISSUE_LABEL = "community-results"
 
-interface SubmitResult {
+interface SubmitData {
   terminal: string
   terminalVersion: string
   os: string
@@ -20,11 +21,42 @@ interface SubmitResult {
   generated: string
 }
 
-/**
- * Submit results by creating a GitHub issue.
- * Requires `gh` CLI to be installed and authenticated.
- */
-export async function submitResults(data: SubmitResult): Promise<string | null> {
+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)
@@ -41,10 +73,12 @@ export async function submitResults(data: SubmitResult): Promise<string | null>
 | Score | ${passed}/${total} (${pct}%) |
 | Generated | ${data.generated} |
 
-### Results
+### Summary
+
+${formatSummary(data)}
 
 <details>
-<summary>Full JSON (click to expand)</summary>
+<summary>Full JSON</summary>
 
 \`\`\`json
 ${JSON.stringify(data, null, 2)}
@@ -52,55 +86,66 @@ ${JSON.stringify(data, null, 2)}
 
 </details>
 
-### Summary
-
-${formatSummary(data)}
-
 ---
-*Submitted via \`npx terminfo\`*`
-
-  // Try gh CLI first
-  if (await hasGhCli()) {
-    try {
-      const { execSync } = await import("node:child_process")
-      const result = execSync(
-        `gh issue create --repo ${REPO} --title ${JSON.stringify(title)} --body ${JSON.stringify(body)} --label ${ISSUE_LABEL}`,
-        { encoding: "utf-8", timeout: 30000 },
-      )
-      const url = result.trim()
-      return url
-    } catch (err) {
-      console.error(`\x1b[31mFailed to create issue via gh CLI\x1b[0m`)
-      console.error(err instanceof Error ? err.message : String(err))
-      return null
-    }
+*Submitted via \`npx terminfo.dev submit\`*`
+
+  if (!hasGhCli()) {
+    const filename = `terminfo-${data.terminal}-${data.os}-${Date.now()}.json`
+    writeFileSync(filename, JSON.stringify(data, null, 2))
+    console.log(`\n\x1b[33mgh CLI not found. Results saved to ${filename}\x1b[0m`)
+    console.log(`To submit: https://github.com/${REPO}/issues/new`)
+    return null
   }
 
-  // Fallback: write to file and give instructions
-  const { writeFileSync } = await import("node:fs")
-  const filename = `terminfo-${data.terminal}-${data.os}-${Date.now()}.json`
-  writeFileSync(filename, JSON.stringify(data, null, 2))
-  console.log(`\n\x1b[33mgh CLI not found. Results saved to ${filename}\x1b[0m`)
-  console.log(`To submit manually:`)
-  console.log(`  1. Go to https://github.com/${REPO}/issues/new`)
-  console.log(`  2. Title: ${title}`)
-  console.log(`  3. Paste the contents of ${filename}`)
-  return null
+  const bodyFile = join(tmpdir(), `terminfo-submit-${Date.now()}.md`)
+  try {
+    writeFileSync(bodyFile, body)
+    const result = execFileSync("gh", [
+      "issue", "create",
+      "--repo", REPO,
+      "--title", title,
+      "--body-file", bodyFile,
+    ], { encoding: "utf-8", timeout: 30000 })
+    return result.trim()
+  } catch (err) {
+    console.error(`\x1b[31mFailed to create issue\x1b[0m`)
+    console.error(err instanceof Error ? err.message : String(err))
+    return null
+  } finally {
+    try { unlinkSync(bodyFile) } catch {}
+  }
 }
 
-async function hasGhCli(): Promise<boolean> {
+function hasGhCli(): boolean {
   try {
-    const { execSync } = await import("node:child_process")
-    execSync("gh --version", { stdio: "ignore", timeout: 5000 })
+    execFileSync("gh", ["--version"], { stdio: "ignore", timeout: 5000 })
     return true
   } catch {
     return false
   }
 }
 
-function formatSummary(data: SubmitResult): string {
-  const categories = new Map<string, { pass: number; fail: number; failList: string[] }>()
+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)) {
     const cat = id.split(".")[0]!
     if (!categories.has(cat)) categories.set(cat, { pass: 0, fail: 0, failList: [] })
@@ -112,14 +157,11 @@ function formatSummary(data: SubmitResult): string {
       entry.failList.push(note ? `- \`${id}\`: ${note}` : `- \`${id}\``)
     }
   }
-
   const lines: string[] = []
   for (const [cat, { pass, fail, failList }] of categories) {
-    const total = pass + fail
     const icon = fail === 0 ? "✅" : "⚠️"
-    lines.push(`${icon} **${cat}**: ${pass}/${total}`)
+    lines.push(`${icon} **${cat}**: ${pass}/${pass + fail}`)
     if (failList.length > 0) lines.push(...failList)
   }
-
   return lines.join("\n")
 }