@wrangled/cli 0.3.150 → 0.3.151

package/dist/api.js

@@ -3,6 +3,7 @@ import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { brand, envPrefix } from "./brand.js";
 import { RUN_ROOT_ENV, writeFileAtomic } from "./files.js";
+import { noteLatestCli } from "./version-check.js";
 export const exitCodes = { ok: 0, error: 1, usage: 2, auth: 3, timedOut: 4, interrupted: 130 };
 export class CliError extends Error {
     exitCode;
@@ -335,9 +336,9 @@ async function request(connection, path, init) {
         });
     }
     catch (error) {
-        const cause = error.cause?.message ?? error.message;
-        throw new CliError(`Cannot reach ${connection.apiUrl}: ${cause}`, exitCodes.error);
+        throw cannotReach(connection.apiUrl, error);
     }
+    noteLatestCli(response);
     if (response.status === 401) {
         throw new CliError(connection.rejected ?? `The API key was rejected by ${connection.apiUrl}. Run \`${brand.slug} login\` with a valid key.`, exitCodes.auth);
     }
@@ -347,6 +348,33 @@ async function request(connection, path, init) {
     }
     return response;
 }
+/** The build the API at `apiUrl` runs; it needs no key. */
+export async function fetchApiVersion(apiUrl) {
+    let response;
+    let body;
+    try {
+        response = await fetch(`${apiUrl}/api/v1/version`, { signal: AbortSignal.timeout(VERSION_TIMEOUT_MS) });
+        noteLatestCli(response);
+        if (!response.ok)
+            throw new CliError(`HTTP ${response.status} from /api/v1/version at ${apiUrl}`, exitCodes.error);
+        body = await response.json().catch(() => undefined);
+    }
+    catch (error) {
+        if (error instanceof CliError)
+            throw error;
+        throw cannotReach(apiUrl, error);
+    }
+    const api = body?.api;
+    if (typeof api?.cliLatest !== "string" || (api.commit !== null && typeof api.commit !== "string")) {
+        throw new CliError(`/api/v1/version at ${apiUrl} did not answer with a version.`, exitCodes.error);
+    }
+    return { api: { commit: api.commit, cliLatest: api.cliLatest } };
+}
+const VERSION_TIMEOUT_MS = 5_000;
+function cannotReach(apiUrl, error) {
+    const cause = error.cause;
+    return new CliError(`Cannot reach ${apiUrl}: ${cause?.message || cause?.code || error.message}`, exitCodes.error);
+}
 function parseErrorBody(text) {
     try {
         return JSON.parse(text).error;

package/dist/guide.js

@@ -453,6 +453,7 @@ A scheduled agent's run acts as its skill's agent, the way the Facebook ads agen
 ${cli} login [--client <name>]      validate a key (prompted, piped, or ${envPrefix}_API_KEY) and save it, as the default or under a client's name
 ${cli} logout [--client <name>]     delete the default saved login, or one client's
 ${cli} whoami                       show the current workspace, library access, and which client's key is in use and why
+${cli} version                      this CLI's version, the commit the API runs, and the latest CLI it ships (also --version); needs no login
 ${cli} knowledge search "<question>" [--limit <n>] [--kind <kind>] [--hook-kind <v> ...]   short, cited snippets from the know-how libraries (keys with library access)
 ${cli} knowledge tag <entry-id> --hook-kind <v> --confidence <c>   tag a library entry with the marketing grammar (or --file tags.json)
 ${cli} guide                        what this workspace's data holds, how fresh it is, and what is missing: read it first

package/dist/main.js

@@ -5,7 +5,7 @@ import { mkdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, extname, join, resolve } from "node:path";
 import { parseArgs } from "node:util";
-import { api, ApiError, apiDownload, apiText, apiUpload, CliError, exitCodes, getSigned, IMPORT_LIMITS, DOCUMENT_LIMITS, META_IDS_MAX, PROFILE_MESSAGING_KINDS, OUTCOME_PARTS, FACET_WORDS, GOOGLE_ADS_IDS_MAX, IMPORT_NAME_PATTERN, AGENT_TABLE_LIMITS, AGENT_TABLE_NAME_PATTERN, putSigned, CLIENT_FILE, parseClientName, readSavedLogins, removeCredentials, resolveApiUrl, resolveConnection, resolveLogin, UnreadableCredentialsError, writeCredentials, OUTBOUND_PUSH_MAX, entryTagFlags, streamSigned, } from "./api.js";
+import { api, ApiError, apiDownload, apiText, apiUpload, CliError, exitCodes, getSigned, IMPORT_LIMITS, DOCUMENT_LIMITS, META_IDS_MAX, PROFILE_MESSAGING_KINDS, OUTCOME_PARTS, FACET_WORDS, GOOGLE_ADS_IDS_MAX, IMPORT_NAME_PATTERN, AGENT_TABLE_LIMITS, AGENT_TABLE_NAME_PATTERN, putSigned, CLIENT_FILE, parseClientName, readSavedLogins, removeCredentials, resolveApiUrl, chosenApiUrl, fetchApiVersion, resolveConnection, resolveLogin, UnreadableCredentialsError, writeCredentials, OUTBOUND_PUSH_MAX, entryTagFlags, streamSigned, } from "./api.js";
 import { brand, envPrefix } from "./brand.js";
 import { campaignLayout, money, moneyLayout } from "./report-columns.js";
 import { renderDataMap, renderQuestions } from "./map.js";
@@ -29,6 +29,7 @@ import { AGENT_ENV, HARNESS_COMMAND_ENV, RUNNER_TOKEN_ENV, runLoop, runOnce } fr
 import { npmRegistry } from "./runner/self-update.js";
 import { SKILL_NAME_PATTERN } from "./skill-zip.js";
 import { installSkillFolder, operatorConnection, packSkill, parseSkillRef, readSkillFolder, unpackSkill, } from "./skills.js";
+import { ownVersion } from "./version-check.js";
 import { versionAtLeast } from "./version.js";
 const DEFAULT_WAIT_SECONDS = 300;
 const META_AD_PAUSE_USAGE = 'meta ad pause <ad-id> --idempotency-key <key> --reason "<why>" [--name "<expected>"] [--run <run-id>]';
@@ -114,6 +115,25 @@ const commands = {
             console.log(`\n${clientReason(choice)}`);
         },
     },
+    version: {
+        usage: "version   this CLI's version, and the API's: the commit it runs and the latest CLI it ships (also --version)",
+        async run(args, options) {
+            if (args.length > 0)
+                throw new CliError("Usage: version", exitCodes.usage);
+            const url = await chosenApiUrl(options);
+            const api = await fetchApiVersion(url).then(({ api }) => ({ url, commit: api.commit, cliLatest: api.cliLatest }), (error) => {
+                if (!(error instanceof CliError))
+                    throw error;
+                console.error(`error: ${error.message}`);
+                return null;
+            });
+            if (options.format === "json")
+                return printJson({ cli: ownVersion(), api });
+            console.log(`CLI ${ownVersion()}`);
+            if (api)
+                console.log(`API ${api.url} commit ${api.commit ?? "unknown"}, latest CLI ${api.cliLatest}`);
+        },
+    },
     "knowledge search": {
         usage: 'knowledge search ["<question>"] [--limit <n>] [--kind message|transcript|document|note] [--library <slug>] [--angle <v>] [--hook-kind <v>] [--ad-format <v>] [--awareness <v>]',
         async run(args, options) {
@@ -4033,8 +4053,7 @@ async function withRunner(options, work) {
         await work({
             apiUrl: resolveApiUrl(options.apiUrl, null),
             token,
-            // main.js sits in dist/ (main.ts in src/), one below the package's package.json.
-            cliVersion: JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8")).version,
+            cliVersion: ownVersion(),
             harnessCommand: process.env[HARNESS_COMMAND_ENV] || undefined,
             openRouterKey: process.env[OPENROUTER_KEY_ENV] || undefined,
             maxSeconds: options.maxSeconds,
@@ -5213,11 +5232,14 @@ the runner starts instead of Claude Code or Codex.
 
 Run \`${brand.slug} docs\` for the full guide.
 `;
-/** A bare --questions (map's switch) as an empty value, since funnels draft gives --questions a value. */
-const bareQuestions = (argv) => argv.map((arg, i) => (arg === "--questions" && (i === argv.length - 1 || argv[i + 1].startsWith("-")) ? "--questions=" : arg));
+/**
+ * A bare --questions (map's switch) or --version (the version command, with no command before it) as an empty value,
+ * since funnels draft gives --questions a value, and funnels show and dashboards rollback --version.
+ */
+const bareSwitches = (argv) => argv.map((arg, i) => ((arg === "--questions" || arg === "--version") && (i === argv.length - 1 || argv[i + 1].startsWith("-")) ? `${arg}=` : arg));
 function parseOptions(argv) {
     const { values, positionals } = parseArgs({
-        args: bareQuestions(argv),
+        args: bareSwitches(argv),
         allowPositionals: true,
         options: {
             format: { type: "string", default: "table" },
@@ -6982,7 +7004,7 @@ async function newerCliHint() {
     // Tests run the CLI with NODE_ENV=test; they ask a registry only when they name one, so npm's real version cannot change their output.
     if (process.env.NODE_ENV === "test" && !process.env.npm_config_registry)
         return undefined;
-    const version = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8")).version;
+    const version = ownVersion();
     const latest = await npmRegistry.latest(3_000).catch(() => undefined);
     if (latest === undefined || versionAtLeast(version, latest))
         return undefined;
@@ -6990,6 +7012,8 @@ async function newerCliHint() {
 }
 async function main(argv) {
     const { positionals, options, help: wantsHelp } = parseOptions(argv);
+    if (positionals.length === 0 && options.version === "" && !wantsHelp)
+        return commands.version.run([], options);
     if (wantsHelp || positionals.length === 0) {
         process.stdout.write(help);
         return;

package/dist/version-check.js

@@ -0,0 +1,28 @@
+import { readFileSync } from "node:fs";
+import { brand } from "./brand.js";
+import { VERSION_PATTERN, versionAtLeast } from "./version.js";
+let own;
+/** This CLI's version, from the package.json one folder above dist/ (and src/). */
+export function ownVersion() {
+    own ??= JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
+    return own;
+}
+/** The response header that names the latest CLI version the API's build ships. */
+export const CLI_LATEST_HEADER = `x-${brand.slug}-cli-latest`;
+/** The line to warn with when `latest` is a newer version than `version`; nothing when it is not, or is no version at all. */
+export function cliUpdateWarning(version, latest) {
+    if (!latest || !VERSION_PATTERN.test(latest) || !VERSION_PATTERN.test(version) || versionAtLeast(version, latest))
+        return undefined;
+    return `warning: this CLI is ${version} and the API's latest is ${latest}. Update: npm install -g ${brand.npmPackage}@latest`;
+}
+let warned = false;
+/** Warns on stderr, once per process, when an API response says a newer CLI is out. */
+export function noteLatestCli(response) {
+    if (warned)
+        return;
+    const warning = cliUpdateWarning(ownVersion(), response.headers.get(CLI_LATEST_HEADER));
+    if (warning === undefined)
+        return;
+    warned = true;
+    process.stderr.write(`${warning}\n`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrangled/cli",
-  "version": "0.3.150",
+  "version": "0.3.151",
   "description": "Command-line access to your marketing data warehouse, for people and coding agents",
   "type": "module",
   "bin": {