omakit 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omakit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "The safe place to find out: everything knowable about an Omarchy Quattro plugin submission before you post it, on your own machine. Agent-first, read-only against the marketplace, posts nothing, zero dependencies.",
   "license": "MIT",
   "author": "Maarten Tolhuijs",

package/tools/marketplace/completion.mjs

@@ -56,7 +56,15 @@ export function subcommandsOf(commands = COMMANDS) {
  * expression is exported so a test can run it through jq.
  */
 export const PLUGIN_IDS_JQ = "[.[] | select(((.kinds // []) | index(\"bar\")) | not)] | sort_by(.enabled | not) | .[].id"
-export const PLUGIN_IDS_COMMAND = `timeout 1 omarchy-shell shell listPlugins 2>/dev/null | jq -r '${PLUGIN_IDS_JQ}' 2>/dev/null`
+/**
+ * The pipeline, in the shell's own syntax. `timeout 1` bounds the wait
+ * where coreutils has it; a system without `timeout` (measured: the macOS
+ * runner in CI, where the TAB fell back to directories) runs the command
+ * unbounded rather than never, since `omarchy-shell` itself gives up on
+ * its IPC timeout.
+ */
+export const PLUGIN_IDS_COMMAND = `omarchy-shell shell listPlugins 2>/dev/null | jq -r '${PLUGIN_IDS_JQ}' 2>/dev/null`
+export const PLUGIN_IDS_TIMED = `timeout 1 ${PLUGIN_IDS_COMMAND}`
 
 /** What a valued flag takes, by its placeholder: a controlled value, a file, or free text. */
 function placeholderKind(placeholder) {
@@ -175,7 +183,7 @@ function bash({ subcommands, categories, tags, pin, version }) {
   lines.push("# left out, read at TAB time; nothing when the shell does not answer in a")
   lines.push("# second, and the caller falls back to a directory.")
   lines.push("_omakit_plugin_ids() {")
-  lines.push(`  ${PLUGIN_IDS_COMMAND}`)
+  lines.push(`  if command -v timeout >/dev/null 2>&1; then ${PLUGIN_IDS_TIMED}; else ${PLUGIN_IDS_COMMAND}; fi`)
   lines.push("}")
   lines.push("")
   lines.push("# A controlled value may contain a space, so each match is one line and is")
@@ -243,7 +251,7 @@ function zsh({ subcommands, categories, tags, pin, version }) {
   lines.push("# left out, read at TAB time; a directory when the shell does not answer.")
   lines.push("_omakit_plugins() {")
   lines.push("  local -a ids")
-  lines.push(`  ids=(\${(f)"$(${PLUGIN_IDS_COMMAND})"})`)
+  lines.push(`  if (( $+commands[timeout] )); then ids=(\${(f)"$(${PLUGIN_IDS_TIMED})"}); else ids=(\${(f)"$(${PLUGIN_IDS_COMMAND})"}); fi`)
   lines.push("  if (( ${#ids} )); then compadd -a ids; else _directories; fi")
   lines.push("}")
   lines.push("")
@@ -263,7 +271,7 @@ function fish({ subcommands, categories, tags, pin, version }) {
   lines.push("# left out, read at TAB time; nothing when the shell does not answer, and")
   lines.push("# the directories offered beside them stand.")
   lines.push("function __omakit_plugin_ids")
-  lines.push(`  ${PLUGIN_IDS_COMMAND}`)
+  lines.push(`  if command -q timeout; ${PLUGIN_IDS_TIMED}; else; ${PLUGIN_IDS_COMMAND}; end`)
   lines.push("end")
   lines.push("")
   for (const sub of subcommands) {

package/tools/marketplace/style.mjs

@@ -416,10 +416,10 @@ export function continuation(value, c) {
  * under itself. There is exactly one of these under any failure, and it is the
  * only line in the tool that starts with an arrow, so it can be found by shape.
  */
-export function action(text, c, { indent = GUTTER } = {}) {
+export function action(text, c, { indent = GUTTER, width: total = COLUMNS } = {}) {
   // Painted after wrapping, and all of it cyan: the whole line is the thing
   // to do, so a backticked word inside it has nothing to stand out from.
-  const lines = wrap(text, { indent: indent + 2 })
+  const lines = wrap(text, { indent: indent + 2, width: total })
   return lines.map((line, index) => (index === 0
     ? `${" ".repeat(indent)}${c("typeable.bold", ARROW)} ${c("typeable", line.trimStart())}`
     : `${" ".repeat(indent + 2)}${c("typeable", line.trimStart())}`))

package/tools/marketplace/upgrade.mjs

@@ -155,7 +155,10 @@ export const COMPLETION_REFRESH_ARGS = Object.freeze(["setup", "--completion"])
 
 function refreshCompletionWith(root, stream) {
   const entryPoint = join(root, "bin/omakit")
-  if (!existsSync(entryPoint)) return { ran: false, reason: `${entryPoint} is not there` }
+  // The reason names the relative path: the root is printed above it, and a
+  // temporary directory on macOS is long enough to push an absolute one
+  // past eighty columns in a sentence (measured in CI: 109).
+  if (!existsSync(entryPoint)) return { ran: false, reason: "this install has no bin/omakit under its root" }
   try {
     const out = execFileSync(process.execPath, [entryPoint, ...COMPLETION_REFRESH_ARGS], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] })
     stream.write(out)

package/tools/weigh/confirm.mjs

@@ -5,13 +5,30 @@
 // typed here is written anywhere.
 
 import { createInterface } from "node:readline"
-import { action, colourEnabled, styler } from "../marketplace/style.mjs"
+import { action, colourEnabled, COLUMNS, styler } from "../marketplace/style.mjs"
 
 /**
- * @param {{ input?: NodeJS.ReadStream, output?: NodeJS.WriteStream, colour?: boolean, question: string }} options
- * @returns {Promise<boolean>} true only for `y` or `yes`, in any case; the end of stdin is no
+ * The question as it is written to the terminal: the arrow line, wrapped
+ * at the contract width like every other action, with `[y/N]:` at the end
+ * of the last line, and no newline after it, so the cursor waits there.
+ * Measured on 0.2.1: the question grew a clause about --runs, wrapped to
+ * two lines, and only the first was written, so a person saw "for a" and
+ * no prompt, pressed Enter to see the rest, and the empty line was No.
+ *
+ * @param {string} question
+ * @param {(name: string, text: string) => string} c
+ * @param {{ width?: number }} [options]
+ * @returns {string} every line, joined, ending in `[y/N]: `
  */
-export function askYes({ input = process.stdin, output = process.stderr, colour = colourEnabled(output), question }) {
+export function renderQuestion(question, c, { width = COLUMNS } = {}) {
+  return `${action(`${question} [y/N]:`, c, { indent: 0, width }).join("\n")} `
+}
+
+/**
+ * @param {{ input?: NodeJS.ReadStream, output?: NodeJS.WriteStream, colour?: boolean, question: string, width?: number }} options
+ * @returns {Promise<boolean>} true only for `y` or `yes`, in any case; an empty line and the end of stdin are no
+ */
+export function askYes({ input = process.stdin, output = process.stderr, colour = colourEnabled(output), question, width = COLUMNS }) {
   const c = styler(colour)
   return new Promise((resolve) => {
     const rl = createInterface({ input, terminal: false })
@@ -27,6 +44,6 @@ export function askYes({ input = process.stdin, output = process.stderr, colour
       if (!answered) output.write("\n")
       settle(false)
     })
-    output.write(`${action(`${question} [y/N]:`, c, { indent: 0 })[0]} `)
+    output.write(renderQuestion(question, c, { width }))
   })
 }