ninepm 0.51.0 → 0.53.0

package/dist/index.d.ts

@@ -114,7 +114,7 @@ export interface CreatedServiceToken {
     clientSecret: string;
 }
 export type FetchLike = (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
-export declare const CLI_VERSION = "0.51.0";
+export declare const CLI_VERSION = "0.53.0";
 type CredentialBackend = "macos-keychain" | "windows-dpapi" | "linux-secret-service" | "file-plaintext" | "none";
 export interface StoredCredentialEntry {
     token: string;
@@ -192,8 +192,24 @@ export declare function defaultNextWranglerConfig(appName: string): string;
 export declare function isOpenNextInstalled(directory: string): boolean;
 export declare class DeployError extends Error {
     readonly slug: string | undefined;
-    constructor(message: string, slug: string | undefined);
+    readonly deliberate: boolean;
+    constructor(message: string, slug: string | undefined, deliberate?: boolean);
 }
+/**
+ * A refusal the platform MEANT — an operator paused deploys, a queue is full —
+ * as opposed to something going wrong.
+ *
+ * The distinction earns its keep in two places: the server-written message is
+ * the entire response and prints alone rather than inside the raw JSON envelope,
+ * and the "Stuck? Report it" prompt is suppressed. There is nothing to report
+ * about a pause somebody chose, and inviting a ticket for every blocked deploy
+ * generates precisely the support volume that announcing the pause was meant to
+ * prevent (#1061).
+ */
+export declare class DeliberateRefusalError extends Error {
+    constructor(message: string);
+}
+export declare function isDeliberateRefusal(error: unknown): boolean;
 export declare function deployDirectory(initialOptions: DeployOptions): Promise<DeployResult>;
 export type ApiReachability = "reachable" | "blocked";
 export declare function probeApiReachability(apiUrl: string, fetchFn: typeof fetch, timeoutMs?: number): Promise<ApiReachability>;
@@ -291,6 +307,17 @@ export interface UpdateNudgeOptions {
     env?: NodeJS.ProcessEnv;
 }
 export declare function deployUpdateNudge(options?: UpdateNudgeOptions): Promise<string | null>;
+export interface SkillFreshness {
+    status: "up_to_date" | "stale" | "not_installed" | "unknown";
+    installedStamp?: string;
+    publishedStamp?: string;
+    detail?: string;
+}
+export declare function checkSkillFreshness(options?: {
+    fetchFn?: FetchLike;
+    skillPath?: string;
+    timeoutMs?: number;
+}): Promise<SkillFreshness>;
 export interface ListSitesResult {
     projects: Project[];
 }
@@ -360,6 +387,8 @@ export interface DeviceAuthProgressReporter {
     stop(): void;
 }
 export declare function createDeviceAuthProgressReporter(stream?: NodeJS.WriteStream): DeviceAuthProgressReporter;
+export declare function noteCliOutdatedAdvisory(response: Response, log?: (line: string) => void): void;
+export declare function resetCliOutdatedAdvisoryForTests(): void;
 type CliCommand = {
     kind: "deploy";
     options: DeployOptions;

package/dist/index.js

@@ -14,7 +14,7 @@ import { MAX_DEPLOY_DESCRIPTION_LENGTH, normalizeDeployDescription } from "./dep
 import { MAX_STATIC_ASSET_FILE_BYTES, MAX_WORKER_ENTRY_COMPRESSED_BYTES, MAX_WORKER_SCRIPT_COMPRESSED_BYTES, WORKER_ENTRY_COMPRESSED_WARN_BYTES, assetFileTooLargeMessage, formatMebibytes, formatMegabytes, oversizedAssets, workerBundleNearLimitMessage, workerBundleTooLargeMessage, workerEntryNearLimitMessage, workerEntryTooLargeMessage, } from "./deploy-limits.js";
 import { buildFileManifest, readManifestFile } from "./manifest.js";
 import { API_KEY_HELP, API_URL_HELP, CLI_CLIENT_ID, DEFAULT_API_URL, reportCliError } from "./cli-config.js";
-export const CLI_VERSION = "0.51.0";
+export const CLI_VERSION = "0.53.0";
 const PUBLIC_DASHBOARD_URL = "https://9pm.ai/dashboard";
 const TOKEN_SERVICE = "9pm";
 const TOKEN_ACCOUNT = "default";
@@ -184,12 +184,59 @@ const DOCKERFILE_STATIC_HINT = "Found a Dockerfile but no runtime was selected,
 // slug (server-normalized to "my-app"), so the raw name would not resolve.
 export class DeployError extends Error {
     slug;
-    constructor(message, slug) {
+    // Whether the refusal underneath was a decision rather than a fault. Carried
+    // here because deployDirectory re-wraps everything it catches into a
+    // DeployError, which would otherwise erase the distinction before the command
+    // that needs it ever sees the error.
+    deliberate;
+    constructor(message, slug, deliberate = false) {
         super(message);
         this.name = "DeployError";
         this.slug = slug;
+        this.deliberate = deliberate;
     }
 }
+/**
+ * A refusal the platform MEANT — an operator paused deploys, a queue is full —
+ * as opposed to something going wrong.
+ *
+ * The distinction earns its keep in two places: the server-written message is
+ * the entire response and prints alone rather than inside the raw JSON envelope,
+ * and the "Stuck? Report it" prompt is suppressed. There is nothing to report
+ * about a pause somebody chose, and inviting a ticket for every blocked deploy
+ * generates precisely the support volume that announcing the pause was meant to
+ * prevent (#1061).
+ */
+export class DeliberateRefusalError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "DeliberateRefusalError";
+    }
+}
+/**
+ * Error codes whose message is written for the person reading it, by someone who
+ * decided to refuse them.
+ *
+ * Deliberately an allowlist of CODES rather than a rule about status. 503 is also
+ * what a genuinely broken dependency returns, and 426 is a general
+ * protocol-upgrade status an intermediary can raise on its own — treating either
+ * as intentional on the strength of the number would hide a real fault behind a
+ * calm sentence, and drop the support prompt exactly when it is wanted. A code
+ * has to be added here on purpose.
+ *
+ * `cli_version_outdated` is the control plane's enforced CLI floor (#996). It had
+ * its own status-only branch here until #1061, which is the shape this comment
+ * warns against: any 426, from anywhere, was treated as the floor.
+ */
+const DELIBERATE_REFUSAL_CODES = new Set([
+    "deploys_frozen",
+    "cli_version_outdated",
+]);
+export function isDeliberateRefusal(error) {
+    if (error instanceof DeliberateRefusalError)
+        return true;
+    return error instanceof DeployError && error.deliberate;
+}
 // Shell-quote a value for a copy-pasteable command. Clean slugs pass through
 // unquoted; anything with shell-significant characters is single-quoted.
 function quoteSiteArg(value) {
@@ -231,7 +278,7 @@ export async function deployDirectory(initialOptions) {
         }
         if (error instanceof DeployError)
             throw error;
-        throw new DeployError(error instanceof Error ? error.message : String(error), slugHolder.slug);
+        throw new DeployError(error instanceof Error ? error.message : String(error), slugHolder.slug, isDeliberateRefusal(error));
     }
 }
 // Cheap unauthenticated probe of the control-plane API before a deploy. The
@@ -499,6 +546,7 @@ async function runDeploy(initialOptions, slugHolder) {
             method: upload.method,
             headers: {
                 authorization: `Bearer ${options.token}`,
+                ...cliVersionHeader(),
                 ...upload.headers,
             },
             body: arrayBufferFromBytes(body),
@@ -856,8 +904,9 @@ async function doctor(options) {
     catch (error) {
         versionError = error instanceof Error ? error.message : String(error);
     }
+    const skill = await checkSkillFreshness();
     if (options.json) {
-        console.log(JSON.stringify({ apiUrl: normalizeApiUrl(options.apiUrl), credentials, account, accountError, version: versionCheck, versionError }, null, 2));
+        console.log(JSON.stringify({ apiUrl: normalizeApiUrl(options.apiUrl), credentials, account, accountError, version: versionCheck, versionError, skill }, null, 2));
         return;
     }
     console.log("9pm.ai doctor");
@@ -898,6 +947,18 @@ async function doctor(options) {
     else if (versionError) {
         console.log(`CLI: ${CLI_VERSION} (latest unavailable: ${versionError})`);
     }
+    if (skill.status === "up_to_date") {
+        console.log(`Skill: up to date (stamp ${skill.installedStamp})`);
+    }
+    else if (skill.status === "stale") {
+        console.log(`Skill: stale (installed ${skill.installedStamp ?? "no stamp"}, published ${skill.publishedStamp}). Refresh: ${SKILL_REFRESH_COMMAND}`);
+    }
+    else if (skill.status === "not_installed") {
+        console.log("Skill: not installed (expected at ~/.agents/skills/9pm/SKILL.md)");
+    }
+    else {
+        console.log(`Skill: installed; freshness unknown (${skill.detail ?? "no detail"})`);
+    }
 }
 export async function getSiteAccess(options) {
     return apiRequest(options, `/v1/sites/${encodeURIComponent(options.site)}/access`, {
@@ -1071,6 +1132,56 @@ export async function deployUpdateNudge(options = {}) {
     }
     return `Update available: 9pm CLI ${CLI_VERSION} -> ${latest}. Run: npm i -g ninepm@latest`;
 }
+// Skill-freshness half of `9pm doctor` (#996): compare the installed skill's
+// stamp line against the public source copy — the same reference SKILL.md's
+// own "Keeping this skill fresh" section names, and the source the install
+// command actually pulls from (the platform-hosted copy tracks releases and
+// can lag it). Never throws: doctor is diagnostics, not a gate.
+const SKILL_INSTALL_PATH_SEGMENTS = [".agents", "skills", "9pm", "SKILL.md"];
+const SKILL_SOURCE_URL = "https://raw.githubusercontent.com/tmrw-realityos/9pm-skill/main/skills/9pm/SKILL.md";
+const SKILL_STAMP_PATTERN = /^Skill guide stamp:\s*(\S+)/m;
+const SKILL_REFRESH_COMMAND = "npx skills add tmrw-realityos/9pm-skill --skill 9pm -g";
+export async function checkSkillFreshness(options = {}) {
+    const skillPath = options.skillPath ?? path.join(os.homedir(), ...SKILL_INSTALL_PATH_SEGMENTS);
+    let installed;
+    try {
+        installed = readFileSync(skillPath, "utf8");
+    }
+    catch {
+        return { status: "not_installed" };
+    }
+    const installedStamp = SKILL_STAMP_PATTERN.exec(installed)?.[1] ?? null;
+    const fetchFn = options.fetchFn ?? fetch;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), options.timeoutMs ?? 3000);
+    let publishedStamp = null;
+    try {
+        const response = await fetchFn(SKILL_SOURCE_URL, { signal: controller.signal });
+        if (!response.ok) {
+            throw new Error(`skill source returned ${response.status}`);
+        }
+        publishedStamp = SKILL_STAMP_PATTERN.exec(await response.text())?.[1] ?? null;
+    }
+    catch (error) {
+        return {
+            status: "unknown",
+            ...(installedStamp ? { installedStamp } : {}),
+            detail: error instanceof Error ? error.message : String(error),
+        };
+    }
+    finally {
+        clearTimeout(timer);
+    }
+    if (!publishedStamp) {
+        return { status: "unknown", ...(installedStamp ? { installedStamp } : {}), detail: "published copy has no stamp line" };
+    }
+    // An installed copy with no stamp predates the stamp convention, which is
+    // itself proof it is behind.
+    if (!installedStamp || installedStamp !== publishedStamp) {
+        return { status: "stale", ...(installedStamp ? { installedStamp } : {}), publishedStamp };
+    }
+    return { status: "up_to_date", installedStamp, publishedStamp };
+}
 // Best-effort read of the update-check cache; the caller judges freshness.
 // checkedAtMs is null when the file is missing or malformed (so the next probe
 // runs now), and latest is null when the last attempt failed to get an answer
@@ -1114,7 +1225,7 @@ async function deviceAuthFlow(options) {
     // made here; an unpredictable store failure is caught after the poll instead.
     const startResponse = await fetchFn(`${apiUrl}/v1/oauth/device/start`, {
         method: "POST",
-        headers: { "content-type": "application/json" },
+        headers: { "content-type": "application/json", ...cliVersionHeader() },
         body: JSON.stringify({ machineName: options.machineName ?? os.hostname(), purpose: options.purpose }),
     });
     // The control plane refuses a signup it knows can never be approved (#507) with
@@ -1180,7 +1291,7 @@ async function deviceAuthFlow(options) {
             await sleep(intervalMs);
             const pollResponse = await fetchFn(`${apiUrl}/v1/oauth/device/poll`, {
                 method: "POST",
-                headers: { "content-type": "application/json" },
+                headers: { "content-type": "application/json", ...cliVersionHeader() },
                 body: JSON.stringify({ code: deviceCode }),
             });
             if (pollResponse.status === 400) {
@@ -1349,6 +1460,7 @@ export async function putManagedFile(options) {
         headers: {
             authorization: `Bearer ${options.token}`,
             "content-type": "application/octet-stream",
+            ...cliVersionHeader(),
         },
         body: bytes,
     });
@@ -1359,7 +1471,7 @@ export async function getManagedFile(options) {
     const apiUrl = normalizeApiUrl(options.apiUrl);
     const response = await fetchFn(`${apiUrl}${filesRoute(options)}/${encodeURIComponent(options.fileId)}`, {
         method: "GET",
-        headers: { authorization: `Bearer ${options.token}` },
+        headers: { authorization: `Bearer ${options.token}`, ...cliVersionHeader() },
     });
     await expectOk(response, "download file");
     const bytes = new Uint8Array(await response.arrayBuffer());
@@ -1432,7 +1544,7 @@ async function finalizeDeployment(fetchFn, apiUrl, token, deploymentId) {
 async function getDeployment(fetchFn, apiUrl, token, deploymentId) {
     const response = await fetchFn(`${apiUrl}/v1/deployments/${encodeURIComponent(deploymentId)}`, {
         method: "GET",
-        headers: { authorization: `Bearer ${token}` },
+        headers: { authorization: `Bearer ${token}`, ...cliVersionHeader() },
     });
     const payload = await expectJson(response, "get deployment");
     return payload.deployment;
@@ -1869,20 +1981,73 @@ function jsonHeaders(token) {
     return {
         authorization: `Bearer ${token}`,
         "content-type": "application/json",
-        "x-9pm-cli-version": CLI_VERSION,
+        ...cliVersionHeader(),
     };
 }
+// Every control-plane request must carry the CLI's version (#996): the server's
+// version floor only judges requests that have it, so a hand-built header object
+// that omits it silently exempts that call from both the advisory and an
+// enforced floor. Spread this into any headers literal that bypasses
+// apiRequest/jsonHeaders.
+function cliVersionHeader() {
+    return { "x-9pm-cli-version": CLI_VERSION };
+}
 async function expectJson(response, action) {
     await expectOk(response, action);
     return (await response.json());
 }
 async function expectOk(response, action) {
+    noteCliOutdatedAdvisory(response);
     if (response.ok) {
         return;
     }
     const text = await response.text();
+    // A refusal somebody chose: print what they wrote, not the envelope it came
+    // in. Both the code and the message have to be there — an allowlisted code
+    // with no usable message falls through, so an empty reason can never turn
+    // into an empty error. The raw form still applies to everything else, so no
+    // detail is lost on the failures that genuinely are faults.
+    const envelope = parseErrorEnvelope(text);
+    const code = typeof envelope?.code === "string" ? envelope.code : "";
+    const message = typeof envelope?.message === "string" ? envelope.message.trim() : "";
+    if (code && message && DELIBERATE_REFUSAL_CODES.has(code)) {
+        throw new DeliberateRefusalError(message);
+    }
     throw new Error(`Failed to ${action}: ${response.status} ${text}`);
 }
+// Takes the already-consumed body text rather than the Response: a body can only
+// be read once, and expectOk needs the code and the message from the same read.
+function parseErrorEnvelope(text) {
+    try {
+        const parsed = JSON.parse(text);
+        return parsed.error ?? null;
+    }
+    catch {
+        // Not JSON (proxy error page, empty body).
+        return null;
+    }
+}
+// Advisory half of the control plane's CLI floor (#996): when a response says
+// this version is below the platform's recommended minimum, say so once per
+// invocation, on stderr so command output (including --json) stays parseable.
+const CLI_OUTDATED_HEADER = "x-9pm-cli-outdated";
+let cliOutdatedAdvisoryPrinted = false;
+export function noteCliOutdatedAdvisory(response, log = (line) => console.error(line)) {
+    if (cliOutdatedAdvisoryPrinted) {
+        return;
+    }
+    const min = response.headers.get(CLI_OUTDATED_HEADER);
+    if (!min) {
+        return;
+    }
+    cliOutdatedAdvisoryPrinted = true;
+    log(`Note: this CLI (${CLI_VERSION}) is older than the platform's recommended minimum (${min}). Update: npm i -g ninepm@latest`);
+}
+// Test seam: the once-per-invocation latch above is module state, which one
+// test process shares across cases.
+export function resetCliOutdatedAdvisoryForTests() {
+    cliOutdatedAdvisoryPrinted = false;
+}
 // Pull the control plane's own message out of its {error:{code,message}} envelope,
 // for the few refusals whose message is written for the tester and is the whole
 // point of the response (e.g. device signup being unavailable, #507). Dumping the
@@ -1890,15 +2055,9 @@ async function expectOk(response, action) {
 // expectOk's text when the body isn't that shape, so this can never lose detail.
 async function apiErrorMessage(response, action) {
     const text = await response.text();
-    try {
-        const parsed = JSON.parse(text);
-        const message = parsed.error?.message;
-        if (typeof message === "string" && message.trim()) {
-            return message.trim();
-        }
-    }
-    catch {
-        // Not JSON (proxy error page, empty body) — fall through to the raw form.
+    const message = parseErrorEnvelope(text)?.message;
+    if (typeof message === "string" && message.trim()) {
+        return message.trim();
     }
     return `Failed to ${action}: ${response.status} ${text}`;
 }
@@ -3739,9 +3898,16 @@ async function main() {
                 // exists) so `9pm support --site <slug>` resolves and /v1/me/support can
                 // attach the failed deploy's id/status/error. Bare form when no slug is
                 // known yet (failure before the project was created).
+                const base = error instanceof Error ? error.message : String(error);
+                // Nothing to report: the platform refused on purpose and said why.
+                // Pointing the reader at support here would send them to open a ticket
+                // about a decision we made, which is the opposite of what announcing it
+                // was for (#1061).
+                if (isDeliberateRefusal(error)) {
+                    throw new Error(base);
+                }
                 const slug = error instanceof DeployError ? error.slug : command.options.slug;
                 const siteFlag = slug ? ` --site ${quoteSiteArg(slug)}` : "";
-                const base = error instanceof Error ? error.message : String(error);
                 throw new Error(`${base}\n\nStuck? Report it with context: 9pm support${siteFlag} -m "<what happened>"`);
             }
             const databaseLine = result.database ? `database ${result.database.bindingName}:${result.database.name}` : "no database";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ninepm",
-  "version": "0.51.0",
+  "version": "0.53.0",
   "description": "CLI for deploying built apps to 9pm.ai.",
   "homepage": "https://9pm.ai",
   "keywords": [