osx-query 0.1.6 → 0.1.8

package/README.md

@@ -56,16 +56,16 @@ If queries return nothing useful, grant Accessibility access to your terminal ap
 
 ## Optional Codex Skill
 
-After install, the package can optionally prompt to run:
+On first run, `osx` can optionally prompt to run:
 
 ```bash
 npx skills add Moulik-Budhiraja/OSX-Query
 ```
 
-That step is optional and only appears in an interactive terminal. If you skip it during install, you can run it later yourself.
+That step is optional and only appears once in an interactive terminal. If you skip it, you can still run it later yourself.
 
 To suppress the prompt entirely:
 
 ```bash
-OSX_QUERY_SKIP_SKILLS_PROMPT=1 npm i -g osx-query
+OSX_QUERY_SKIP_SKILLS_PROMPT=1 osx --help
 ```

package/bin/osx.js

@@ -4,6 +4,7 @@ const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
 const https = require("node:https");
+const readline = require("node:readline/promises");
 const { spawnSync } = require("node:child_process");
 
 const pkg = require("../package.json");
@@ -53,6 +54,18 @@ function writeCache(cacheFile, payload) {
   fs.writeFileSync(cacheFile, `${JSON.stringify(payload)}\n`);
 }
 
+function shouldPromptForSkills() {
+  if (process.env.CI) {
+    return false;
+  }
+
+  if (process.env.OSX_QUERY_SKIP_SKILLS_PROMPT === "1") {
+    return false;
+  }
+
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+
 function fetchLatestVersion() {
   return new Promise((resolve, reject) => {
     const request = https.get(
@@ -137,6 +150,60 @@ async function maybeWarnAboutUpdate() {
   }
 }
 
+async function maybePromptForSkills() {
+  if (!shouldPromptForSkills()) {
+    return;
+  }
+
+  const cacheFile = getCacheFilePath();
+  const cached = readCache(cacheFile) || {};
+  if (cached.skillsPromptedAt) {
+    return;
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  let answer = "";
+  try {
+    answer = await rl.question(
+      "Install the optional Codex skill now? This will run `npx skills add Moulik-Budhiraja/OSX-Query` [y/N]: "
+    );
+  } finally {
+    rl.close();
+  }
+
+  const nextCache = {
+    ...cached,
+    skillsPromptedAt: Date.now(),
+  };
+  writeCache(cacheFile, nextCache);
+
+  if (!/^(y|yes)$/i.test(answer.trim())) {
+    return;
+  }
+
+  const command = process.platform === "win32" ? "npx.cmd" : "npx";
+  const result = spawnSync(command, ["skills", "add", "Moulik-Budhiraja/OSX-Query"], {
+    stdio: "inherit",
+  });
+
+  if (result.error) {
+    console.warn(
+      "Skill installer could not be launched. Run `npx skills add Moulik-Budhiraja/OSX-Query` manually."
+    );
+    return;
+  }
+
+  if (result.status !== 0) {
+    console.warn(
+      "Skill install did not complete successfully. Run `npx skills add Moulik-Budhiraja/OSX-Query` manually."
+    );
+  }
+}
+
 if (!fs.existsSync(binaryPath)) {
   console.error("osx-query is not installed correctly: native binary is missing");
   console.error("Try reinstalling: npm i -g osx-query");
@@ -145,6 +212,7 @@ if (!fs.existsSync(binaryPath)) {
 
 async function main() {
   await maybeWarnAboutUpdate();
+  await maybePromptForSkills();
 
   const result = spawnSync(binaryPath, process.argv.slice(2), {
     stdio: "inherit",

package/lib/install.js

@@ -4,7 +4,6 @@ const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
 const https = require("node:https");
-const readline = require("node:readline/promises");
 const { pipeline } = require("node:stream/promises");
 const { createWriteStream } = require("node:fs");
 const { spawnSync } = require("node:child_process");
@@ -91,65 +90,6 @@ function installBinary(extractedRoot, vendorDir) {
   return targetBinary;
 }
 
-function shouldPromptForSkills() {
-  if (process.env.CI) {
-    return false;
-  }
-
-  if (process.env.OSX_QUERY_SKIP_SKILLS_PROMPT === "1") {
-    return false;
-  }
-
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-
-async function maybePromptForSkills() {
-  if (!shouldPromptForSkills()) {
-    console.log(
-      "Optional: run `npx skills add Moulik-Budhiraja/OSX-Query` to install the Codex skill."
-    );
-    return;
-  }
-
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  try {
-    const answer = await rl.question(
-      "Install the optional Codex skill now? This will run `npx skills add Moulik-Budhiraja/OSX-Query` [y/N]: "
-    );
-
-    if (!/^(y|yes)$/i.test(answer.trim())) {
-      console.log(
-        "Skipped skill install. You can run `npx skills add Moulik-Budhiraja/OSX-Query` later."
-      );
-      return;
-    }
-  } finally {
-    rl.close();
-  }
-
-  const command = process.platform === "win32" ? "npx.cmd" : "npx";
-  const result = spawnSync(command, ["skills", "add", "Moulik-Budhiraja/OSX-Query"], {
-    stdio: "inherit",
-  });
-
-  if (result.error) {
-    console.warn(
-      "Skill installer could not be launched. Run `npx skills add Moulik-Budhiraja/OSX-Query` manually."
-    );
-    return;
-  }
-
-  if (result.status !== 0) {
-    console.warn(
-      "Skill install did not complete successfully. Run `npx skills add Moulik-Budhiraja/OSX-Query` manually."
-    );
-  }
-}
-
 async function main() {
   const binaryVersion = pkg.osxBinaryVersion || pkg.version;
   const assetName = getAssetName(binaryVersion);
@@ -170,7 +110,6 @@ async function main() {
     const installedBinary = installBinary(extractDir, vendorDir);
     console.log(`Installed osx at ${installedBinary}`);
     console.log("Run `osx --help` to get started.");
-    await maybePromptForSkills();
   } finally {
     fs.rmSync(tempDir, { recursive: true, force: true });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osx-query",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "osxBinaryVersion": "0.1.2",
   "description": "macOS Accessibility query CLI",
   "license": "MIT",