@ahood/cli 0.2.1 → 0.2.2

package/README.md

@@ -63,6 +63,6 @@ Run `ahood help`, `ahood help <command>`, or `ahood <command> --help` for the sa
 | `2` | Usage or validation error (bad arguments, or the server rejected the request as invalid) |
 | `4` | Authentication required or rejected (not logged in, or the token was refused) |
 | `5` | Not found |
-| `6` | Network/transport error |
+| `6` | Network/transport error, or an upstream server (5xx) error |
 
 Full reference, including personal API tokens, CI usage, the public REST API, and the MCP server: **https://ahood.vercel.app/docs**

package/dist/exit-code.js

@@ -0,0 +1,26 @@
+import { ApiError, NetworkError } from "./http.js";
+// A hung/black-holed connection throws undici's generic TypeError("fetch
+// failed") -- http.ts wraps that into NetworkError so it gets its own exit
+// code here, distinct from a server-returned ApiError. Kept in its own
+// module (rather than inline in index.ts) so it's importable in tests
+// without triggering index.ts's unconditional top-level main() call.
+export function exitCodeFor(error) {
+    if (error instanceof ApiError) {
+        if (error.status === 401 || error.status === 403)
+            return 4;
+        if (error.status === 404)
+            return 5;
+        // A 5xx is an upstream/server-side failure, not something wrong with the
+        // request -- previously fell through to 2 ("usage/validation error"),
+        // which told scripts/agents to fix their input when the actual problem
+        // was on the server (ahood-cli#31). Treated like a network/transport
+        // failure (6) since neither is something retrying with different input
+        // would fix.
+        if (error.status >= 500)
+            return 6;
+        return 2;
+    }
+    if (error instanceof NetworkError)
+        return 6;
+    return 1;
+}

package/dist/help.js

@@ -120,7 +120,8 @@ export function formatHelp() {
         "Run `ahood --version` to print the installed CLI version.",
         "",
         "Exit codes: 0 success, 1 general error, 2 usage/validation error,",
-        "            4 authentication required or rejected, 5 not found, 6 network/transport error.",
+        "            4 authentication required or rejected, 5 not found,",
+        "            6 network/transport error or upstream server (5xx) error.",
         "",
         "Full reference: https://ahood.vercel.app/docs",
     ].join("\n");

package/dist/http.js

@@ -36,6 +36,23 @@ export async function apiFetch(path, init = {}) {
         throw new NetworkError(`Request to ${getApiUrl()}${path} failed (${message}${cause})`);
     }
 }
+const MAX_ERROR_MESSAGE_LENGTH = 500;
+// Defense in depth (ahood-cli#31): the API is expected to never forward a raw
+// upstream error body (an HTML block page from a proxy/WAF, a giant stack
+// trace, etc.) into `error`, but this CLI shouldn't trust that unconditionally
+// -- a regression on any endpoint would otherwise dump multi-KB infra details
+// straight to a user's terminal. Anything HTML-shaped or implausibly long for
+// a normal error string is replaced with a short, safe summary instead.
+function sanitizeErrorMessage(message) {
+    const looksLikeHtml = /<!DOCTYPE|<html[\s>]/i.test(message);
+    if (!looksLikeHtml && message.length <= MAX_ERROR_MESSAGE_LENGTH)
+        return message;
+    // No preview of the raw content: an HTML-shaped body's first bytes are
+    // exactly where infra details (e.g. a Cloudflare block page's title, Ray
+    // ID) live, so a "helpful" excerpt would leak the same details this
+    // exists to suppress. Length alone is safe to report.
+    return `Request failed with an unexpected, oversized, or HTML-shaped error response (${message.length} bytes) -- this usually means an upstream proxy/WAF failure, not a problem with your request.`;
+}
 export async function apiJson(path, init = {}) {
     const res = await apiFetch(path, init);
     if (!res.ok) {
@@ -44,7 +61,7 @@ export async function apiJson(path, init = {}) {
         // rather than crashing on `body.error` of something that isn't an object.
         const body = await res.json().catch(() => undefined);
         const message = body && typeof body === "object" && typeof body.error === "string"
-            ? body.error
+            ? sanitizeErrorMessage(body.error)
             : `Request failed with status ${res.status}`;
         throw new ApiError(res.status, message);
     }

package/dist/index.js

@@ -15,7 +15,8 @@ import { star, unstar } from "./commands/star.js";
 import { view } from "./commands/view.js";
 import { completion } from "./commands/completion.js";
 import { formatHelp, formatCommandHelp, findCommandHelp } from "./help.js";
-import { ApiError, NetworkError } from "./http.js";
+import { ApiError } from "./http.js";
+import { exitCodeFor } from "./exit-code.js";
 import { CLI_NAME, CLI_VERSION } from "./version.js";
 const COMMANDS = {
     login: () => login(),
@@ -61,21 +62,6 @@ function closestCommand(input) {
     }
     return bestDistance <= 2 ? best : undefined;
 }
-// A hung/black-holed connection throws undici's generic TypeError("fetch
-// failed") -- http.ts wraps that into NetworkError so it gets its own exit
-// code here, distinct from a server-returned ApiError.
-function exitCodeFor(error) {
-    if (error instanceof ApiError) {
-        if (error.status === 401 || error.status === 403)
-            return 4;
-        if (error.status === 404)
-            return 5;
-        return 2;
-    }
-    if (error instanceof NetworkError)
-        return 6;
-    return 1;
-}
 async function main() {
     const [command, ...args] = process.argv.slice(2);
     if (command === "--version" || command === "-v") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahood/cli",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "CLI for ahood, a registry for installing and publishing Claude Code skills.",
   "license": "MIT",
   "homepage": "https://github.com/AlexKay28/ahood-cli",