@typeship-ax/cli 0.6.0 → 0.8.0

package/dist/cli.js

@@ -11,24 +11,29 @@ import { homedir, hostname } from "node:os";
 import { basename, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { TypeshipClient, formatDebugEvent } from "./index.js";
-import { GLOBALS, OPS, buildArgs, findOp, missingRequired } from "./ops.js";
+import { GLOBALS, OMITTED_OPS, OPS, buildArgs, findOp, missingRequired } from "./ops.js";
 import { MCP_CLIENTS, agentGuide, agentBlock, agentInstructionsFile, agentMode, bundleProperty, claimProperty, classifyApiError, collectionProperty, detectHarness, envelope, exitCodeFor, findMcpClient, installSkills, mcpConfigured, pendingClaims, recordClaim, summarizeDoctor, upsertAgentBlock, writeBundle, writeMcpConfig, } from "./cli-agent.js";
 import { relativeDate } from "./dates.js";
+import { fetchDocsText, resolveDocsContentUrl } from "./docs.js";
 const BIN = "typeship";
 const DEFAULT_BASE_URL = "https://typeship.dev/api/v1";
 const AUTH_SCALARS = [{ "option": "bearerToken", "flag": "token", "env": "TYPESHIP_TOKEN" }];
 const BASIC = null;
+/** Operations omitted from the generated package by its plan cap. */
 const EXCLUDED_OPS = 0;
-const VERSION = "0.6.0";
-const API_VERSION = "0.6.0";
+/** Generated CLI operations that are intentionally unavailable to MCP. */
+const MCP_EXCLUDED_OPS = 0;
+const VERSION = "0.8.0";
+const API_VERSION = "1.0.0";
 const SPEC_FORMAT = "openapi";
 const WHOAMI = { "resource": "account", "method": "retrieve" };
 const ENVIRONMENTS = {};
 const HAS_MCP = false;
 const PKG_NAME = "@typeship-ax/cli";
 const UPDATE_NOTICE = false;
-const API_DESCRIPTION = "Generate production SDKs, CLIs, and MCP servers from an OpenAPI or\nGraphQL spec, and keep every selected output current.\n\nEvery operation but one requires an API key, created in the console and\nsent as `Authorization: Bearer ak_...`. A browser session is not a\ncredential for this API. The exception is POST /generate, which works\nanonymously with the free plan's limits.\n";
+const API_DESCRIPTION = "Resolve an OpenAPI or GraphQL Definition, diagnose it, and keep every\nselected SDK, CLI, and MCP Target current.\n\nEvery operation but one requires a bearer credential: an organization\nAPI key from the console, or an OAuth access token carrying the operation's\nread, generate, or write capability and the organization selected during\nconsent. OAuth grants cannot switch organizations after consent. A browser\nsession is not a credential for this API. The exception is POST /generate,\nwhich works anonymously with the free plan's limits.\n";
 const DOCS_URL_DEFAULT = "https://typeship.dev";
+const DOCS_INDEX_URL_DEFAULT = null;
 const RELAY = null;
 const SUPPORT_URL = null;
 const OAUTH_TOKEN_URL = null;
@@ -271,7 +276,7 @@ function humanError(body, code) {
         const firstWords = (issue?.message ?? "").slice(0, 40);
         if (compact && compact !== "{}" && !(firstWords && compact.includes(firstWords)))
             lines.push("  " + paintErr("dim", "API said: " + (compact.length > 300 ? compact.slice(0, 297) + "…" : compact)));
-        const requestId = detail.body?.request_id ?? detail.body?.requestId;
+        const requestId = detail.request_id ?? detail.body?.request_id ?? detail.body?.requestId;
         if (typeof requestId === "string")
             lines.push("  " + paintErr("dim", "request id: " + requestId));
     }
@@ -290,7 +295,7 @@ function fail(code, message, extra, nextSteps) {
             : /^(Missing required|Expected \d+ argument)/.test(message) ? "MISSING_ARGUMENT"
                 : "INVALID_USAGE";
     return failWith({
-        code: code === 2 ? usageCode : "COMMAND_FAILED",
+        code: code === 2 ? usageCode : "CALL_FAILED",
         message,
         ...(extra !== undefined ? { detail: extra } : {}),
         nextSteps: nextSteps ?? (code === 2 ? ["Run '" + USAGE_HINT + "' for the flags this command takes."] : []),
@@ -547,7 +552,7 @@ async function browserApprove(headless, flags) {
         });
         start = await response.json();
         if (!response.ok || !start.session || !start.verification_url) {
-            failWith({ code: "COMMAND_FAILED", message: "Could not start the browser login: " + (start.error ?? "HTTP " + response.status), nextSteps: ["Pass the credential directly: '" + BIN + " login --" + first.flag + " <value>'."] });
+            failWith({ code: "CALL_FAILED", message: "Could not start the browser login: " + (start.error ?? "HTTP " + response.status), nextSteps: ["Pass the credential directly: '" + BIN + " login --" + first.flag + " <value>'."] });
         }
     }
     catch (e) {
@@ -588,7 +593,7 @@ async function browserApprove(headless, flags) {
             failWith({ status: "action_required", code: "AUTH_INVALID", message: "The request was denied in the browser.", nextSteps: ["Run '" + BIN + " login' again if that was a mistake, or pass a credential directly with --" + first.flag + "."] });
         if (poll.status === "expired")
             break;
-        failWith({ code: "COMMAND_FAILED", message: "Browser login stopped: " + (poll.status ?? "unknown status"), nextSteps: ["Run '" + BIN + " login' again."] });
+        failWith({ code: "CALL_FAILED", message: "Browser login stopped: " + (poll.status ?? "unknown status"), nextSteps: ["Run '" + BIN + " login' again."] });
     }
     failWith({ status: "action_required", code: "TTY_REQUIRED", message: "The browser approval expired after " + expiresIn + "s without a decision.", nextSteps: ["Run '" + BIN + " login' again and approve the link within ten minutes.", "Or pass the credential directly: '" + BIN + " login --" + first.flag + " <value>'."] });
 }
@@ -848,15 +853,6 @@ function mcpServerPath() {
     }
     return { path, warning };
 }
-function claudeDesktopConfigPath() {
-    if (process.platform === "darwin") {
-        return join(homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
-    }
-    if (process.platform === "win32") {
-        return join(process.env.APPDATA ?? join(homedir(), "AppData", "Roaming"), "Claude", "claude_desktop_config.json");
-    }
-    return join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "Claude", "claude_desktop_config.json");
-}
 /** The mcp entry for a client: the hosted endpoint when the API has one
  * (auth env var as a reference, never a literal), else the local stdio
  * server. --url overrides. */
@@ -900,11 +896,20 @@ async function cmdMcp(parsed) {
             "  " + BIN + " mcp install --claude --read-only   register a read-only server (writes are not callable)",
             "",
             (MCP_URL ? "Default entry: the hosted endpoint " + MCP_URL + " with the auth env var as a reference (never a literal key)." : "Default entry: this package's local stdio server, which reads credentials saved by '" + BIN + " login' or the CLI's auth env vars."),
-            "The old spelling '" + BIN + " mcp --claude' still works. --all skips Cursor until it speaks MCP 2026-07-28.",
+            "--all skips Cursor until it speaks MCP 2026-07-28.",
         ];
         process.stdout.write(lines.join("\n") + "\n");
         await flushExit(0);
     }
+    const sub = parsed.positionals[1];
+    if (sub !== undefined && sub !== "install") {
+        fail(2, "Unknown mcp command: " + sub + ". Try '" + BIN + " mcp install --all'.");
+    }
+    const requestedInstall = parsed.flags.get("all") === true
+        || Object.keys(MCP_CLIENT_FLAGS).some((flag) => parsed.flags.get(flag) === true);
+    if (requestedInstall && sub !== "install") {
+        fail(2, "Installing an MCP entry requires '" + BIN + " mcp install'.");
+    }
     const url = typeof parsed.flags.get("url") === "string" ? parsed.flags.get("url") : undefined;
     if (url) {
         try {
@@ -970,6 +975,9 @@ function agentContext() {
         envPrefix: ENV_PREFIX,
         authEnvVars: [...AUTH_SCALARS.map((a) => a.env), ...(BASIC ? [BASIC.envUser, BASIC.envPass] : [])],
         docsUrl: docsSiteUrl(),
+        docsIndexUrl: docsIndexUrl(),
+        generatedOperationCount: OPS.length,
+        omittedOperations: OMITTED_OPS.map((op) => ({ command: op.command.join(" "), tool: op.tool, method: op.httpMethod, path: op.path })),
         mcpUrl: MCP_URL,
         skillsRepo: SKILLS_REPO,
         hasMcp: HAS_MCP,
@@ -1028,6 +1036,14 @@ function helpJson() {
                 };
             }),
         })),
+        ...(EXCLUDED_OPS > 0 ? {
+            coverage: {
+                generated_operations: OPS.length,
+                total_operations: OPS.length + EXCLUDED_OPS,
+                omitted_operations: OMITTED_OPS.map((op) => ({ command: op.command.join(" "), tool: op.tool, method: op.httpMethod, path: op.path })),
+                reason: "plan_limit",
+            },
+        } : {}),
         discovery: {
             search: BIN + " docs search <term> --json",
             operation: BIN + " docs <resource> <command> --json",
@@ -1315,7 +1331,7 @@ async function cmdUpgrade(parsed) {
         fail(1, "This run came through npx, which fetches the latest version each time; there is nothing to upgrade in place.");
     if (manager !== "npm") {
         const command = manager === "pnpm" ? "pnpm add -g " + PKG_NAME + "@" + latest : manager === "bun" ? "bun add -g " + PKG_NAME + "@" + latest : "yarn global add " + PKG_NAME + "@" + latest;
-        failWith({ status: "action_required", code: "COMMAND_FAILED", message: PKG_NAME + " was installed with " + manager + ", so npm can't upgrade it in place.", nextSteps: ["Run: " + command] });
+        failWith({ status: "action_required", code: "CALL_FAILED", message: PKG_NAME + " was installed with " + manager + ", so npm can't upgrade it in place.", nextSteps: ["Run: " + command] });
     }
     process.stderr.write("Upgrading " + PKG_NAME + " " + VERSION + " -> " + latest + "\n");
     // Windows resolves npm to npm.cmd, which only a shell can start.
@@ -1329,7 +1345,7 @@ async function cmdUpgrade(parsed) {
 // ---------------------------------------------------------------------------
 // completion — shell completion scripts built from the op table
 // ---------------------------------------------------------------------------
-const TOP_WORDS = ["login", "logout", "whoami", "config", "mcp", "upgrade", "docs", "webhooks", "feedback", "completion", "help", "version", "init", "agent-guide", "auth", "doctor"];
+const TOP_WORDS = ["login", "logout", "whoami", "config", "mcp", "docs", "upgrade", "completion", "help", "version", "init", "agent-guide", "auth", "doctor"];
 /** Every flag an API command accepts, with the values a flag completes to (enums, on|off|auto, agent|human). */
 function completionFlagsFor(op) {
     const flags = [...op.params.filter((p) => p.kind !== "path").map((p) => "--" + p.flag), ...COMPLETION_GLOBAL_FLAGS];
@@ -1349,7 +1365,6 @@ const BUILTIN_WORDS = {
     completion: ["bash", "zsh", "fish"],
     auth: ["check"],
     mcp: ["install"],
-    webhooks: ["listen", "fake"],
 };
 /** bash (and zsh via bashcompinit): resources, commands, flags, and the values a flag takes. */
 function completionScript() {
@@ -1446,16 +1461,18 @@ async function cmdCompletion(parsed) {
 function docsSiteUrl() {
     return readConfig().docsUrl ?? DOCS_URL_DEFAULT;
 }
+function docsIndexUrl() {
+    const configured = readConfig().docsUrl;
+    return configured
+        ? resolveDocsContentUrl(configured, null, "llms.txt")
+        : DOCS_INDEX_URL_DEFAULT ?? resolveDocsContentUrl(DOCS_URL_DEFAULT, null, "llms.txt");
+}
 /** Fetch llms.txt / llms-full.txt / a prose page from the docs site,
  * with a 1h cache in the config dir. Explicit command = explicit fetch;
  * nothing here runs unless the user asked for docs. */
 async function fetchDocs(pathOrFile) {
     const base = docsSiteUrl();
-    const url = /^https?:\/\//.test(pathOrFile)
-        ? pathOrFile
-        : base === null
-            ? null
-            : base.replace(/\/+$/, "") + "/" + pathOrFile.replace(/^\/+/, "");
+    const url = resolveDocsContentUrl(base, docsIndexUrl(), pathOrFile);
     if (url === null)
         return null;
     const cacheFile = join(configDir(), "docs-cache", url.replace(/[^a-zA-Z0-9.]+/g, "_").slice(-120));
@@ -1466,13 +1483,9 @@ async function fetchDocs(pathOrFile) {
     }
     catch { /* not cached */ }
     try {
-        const response = await fetch(url, {
-            headers: { Accept: "text/markdown, text/plain, */*" },
-            signal: AbortSignal.timeout(10_000),
-        });
-        if (!response.ok)
+        const text = await fetchDocsText(url);
+        if (text === null)
             return null;
-        const text = await response.text();
         mkdirSync(join(configDir(), "docs-cache"), { recursive: true, mode: 0o700 });
         writeFileSync(cacheFile, text);
         return text;
@@ -1708,6 +1721,9 @@ async function cmdDocs(parsed) {
     if (sub !== undefined) {
         const op = findOp(sub, parsed.positionals[2] ?? "");
         if (!op) {
+            const omitted = omittedCommand(sub, parsed.positionals[2]);
+            if (omitted)
+                failOmitted(omitted);
             const list = OPS.filter((o) => o.command[0] === sub);
             if (list.length === 0)
                 fail(2, "Unknown docs topic: " + sub + ". Run '" + BIN + " docs' for the overview.");
@@ -1759,182 +1775,9 @@ async function cmdDocs(parsed) {
     process.stdout.write(lines.join("\n") + "\n");
     await flushExit(0);
 }
-function eventTypeOf(body) {
-    try {
-        const parsed = JSON.parse(body);
-        for (const key of ["type", "event", "event_type", "eventType", "name"]) {
-            if (typeof parsed[key] === "string")
-                return parsed[key];
-        }
-    }
-    catch { /* not JSON */ }
-    return null;
-}
-async function cmdWebhooksFake(parsed) {
-    void parsed;
-    fail(2, "This API's spec declares no webhooks, so there is nothing to fake.");
-}
-async function cmdWebhooks(parsed) {
-    const sub = parsed.positionals[1];
-    if (parsed.help || sub === undefined) {
-        const lines = [
-            BIN + " webhooks — work with this API's webhook events",
-            "",
-            "  " + BIN + " webhooks listen --forward-to localhost:3000/webhooks",
-            "  " + BIN + " webhooks listen --forward-to localhost:3000/hooks --events account.created,account.updated",
-            "  " + BIN + " webhooks fake [<event>] [--key whsec_...] [--forward-to <url>]",
-            "",
-            "listen mints a private relay URL to point the API's webhook settings",
-            "at; events replay locally with their original headers, so signature",
-            "verification keeps working. No tunnels, no exposed ports.",
-            "fake sends (or prints) a signed sample event for local handler testing.",
-        ];
-        process.stdout.write(lines.join("\n") + "\n");
-        await flushExit(parsed.help ? 0 : 2);
-    }
-    if (sub === "fake") {
-        await cmdWebhooksFake(parsed);
-    }
-    if (sub !== "listen")
-        fail(2, "Unknown webhooks command: " + String(sub) + ". Try '" + BIN + " webhooks listen' or '" + BIN + " webhooks fake'.");
-    if (!RELAY) {
-        fail(2, "The webhook relay isn't enabled for this package. The API provider can enable it in their typeship console; the next regeneration bakes it in.");
-    }
-    const forwardRaw = parsed.flags.get("forward-to");
-    if (typeof forwardRaw !== "string") {
-        fail(2, "webhooks listen requires --forward-to <url>, e.g. --forward-to localhost:3000/webhooks");
-    }
-    const forwardTo = /^https?:\/\//.test(forwardRaw) ? forwardRaw : "http://" + forwardRaw;
-    const eventsRaw = parsed.flags.get("events");
-    const eventsFilter = typeof eventsRaw === "string"
-        ? eventsRaw.split(",").map((s) => s.trim()).filter(Boolean)
-        : null;
-    let minted = null;
-    try {
-        const response = await fetch(RELAY.mintUrl, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", Accept: "application/json" },
-            body: JSON.stringify({ project: RELAY.project }),
-            signal: AbortSignal.timeout(15_000),
-        });
-        minted = await response.json().catch(() => null);
-        if (!response.ok || typeof minted?.ingest_url !== "string" || typeof minted.poll_url !== "string") {
-            const detail = minted?.errors?.[0]?.message ?? "HTTP " + response.status;
-            fail(1, "Couldn't start a relay session: " + detail);
-        }
-    }
-    catch (e) {
-        if (e instanceof ExitPending)
-            throw e;
-        fail(1, "Couldn't reach the relay: " + e.message);
-    }
-    process.stderr.write(paintErr("green", "Ready!") + " Forwarding relayed events to " + forwardTo + "\n");
-    process.stderr.write("Point this API's webhook endpoint at: " + paintErr("cyan", minted.ingest_url) + " (^C to quit)\n");
-    let cursor = 0;
-    let pollFailures = 0;
-    for (;;) {
-        let payload;
-        try {
-            const response = await fetch(minted.poll_url + "?after=" + cursor + "&wait=1", {
-                headers: { Accept: "application/json" },
-                signal: AbortSignal.timeout(30_000),
-            });
-            if (response.status === 404)
-                fail(1, "The relay session expired. Run '" + BIN + " webhooks listen' again.");
-            if (!response.ok)
-                throw new Error("HTTP " + response.status);
-            payload = await response.json();
-            pollFailures = 0;
-        }
-        catch (e) {
-            if (e instanceof ExitPending)
-                throw e;
-            pollFailures++;
-            if (pollFailures > 5)
-                fail(1, "Lost the relay: " + e.message);
-            await new Promise((resolve) => setTimeout(resolve, 2000 * pollFailures));
-            continue;
-        }
-        for (const event of payload.events) {
-            cursor = event.seq;
-            const type = eventTypeOf(event.body);
-            if (eventsFilter !== null && (type === null || !eventsFilter.includes(type)))
-                continue;
-            const started = Date.now();
-            try {
-                const forwarded = await fetch(forwardTo, {
-                    method: event.method,
-                    headers: event.headers,
-                    body: event.method === "GET" ? undefined : event.body,
-                    signal: AbortSignal.timeout(30_000),
-                });
-                process.stderr.write((forwarded.ok ? paintErr("green", String(forwarded.status)) : paintErr("yellow", String(forwarded.status))) +
-                    "  " + (type ?? event.method) + " [" + event.seq + "] (" + (Date.now() - started) + "ms)\n");
-            }
-            catch (e) {
-                process.stderr.write(paintErr("yellow", "unreachable") + "  " + (type ?? event.method) + " [" + event.seq + "]: " + e.message + "\n");
-            }
-        }
-        if (payload.next > cursor)
-            cursor = payload.next;
-    }
-}
-async function cmdFeedback(parsed) {
-    if (parsed.help) {
-        process.stdout.write(BIN + " feedback — open the API provider's issue tracker with environment details prefilled\n");
-        await flushExit(0);
-    }
-    if (!SUPPORT_URL) {
-        fail(2, "No support URL is configured for this CLI. The API provider can set one in their typeship console.");
-    }
-    let target = SUPPORT_URL;
-    if (/github\.com\/[^/]+\/[^/]+\/issues\/new/.test(target)) {
-        const bodyLines = [
-            "<!-- describe the problem or request above the line -->",
-            "",
-            "---",
-            "- cli: " + BIN + " " + VERSION + " (api " + API_VERSION + ")",
-            "- node: " + process.version,
-            "- platform: " + process.platform + "/" + process.arch,
-        ];
-        const sep = target.includes("?") ? "&" : "?";
-        target += sep + "title=" + encodeURIComponent("[" + BIN + "] ") + "&body=" + encodeURIComponent(bodyLines.join("\n"));
-    }
-    if (!nonInteractive(parsed))
-        process.stderr.write("Opening " + paintErr("cyan", SUPPORT_URL) + "\n");
-    const opened = openInBrowser(target, parsed);
-    if (opened.opened)
-        out({ ok: true, opened: SUPPORT_URL });
-    await flushExit(0);
-}
-/** Opt-in (console setting) once-a-day upgrade hint. Off by default:
- * generated code phones nobody unless the project owner chose this. The
- * notice prints the previous run's cached answer; at most once a day it
- * refreshes the cache first, with a 1.5s cap so a slow registry can't
- * hold a command hostage. */
-async function maybeUpdateNotice(commandWord, quiet) {
-    if (!UPDATE_NOTICE || quiet)
-        return;
-    if (commandWord === undefined || ["upgrade", "version", "help", "login", "logout"].includes(commandWord))
-        return;
-    const cacheFile = join(configDir(), "update-check.json");
-    let cache = {};
-    try {
-        cache = JSON.parse(readFileSync(cacheFile, "utf8"));
-    }
-    catch { /* no cache yet */ }
-    if ((cache.checkedAt ?? 0) < Date.now() - 24 * 60 * 60 * 1000) {
-        const latest = await latestVersion(1500);
-        if (latest !== null) {
-            cache = { checkedAt: Date.now(), latest };
-            mkdirSync(configDir(), { recursive: true, mode: 0o700 });
-            writeFileSync(cacheFile, JSON.stringify(cache) + "\n");
-        }
-    }
-    if (cache.latest !== undefined && semverLess(VERSION, cache.latest)) {
-        process.stderr.write(paintErr("yellow", "A newer " + BIN + " is available: " + VERSION + " -> " + cache.latest + ". Run '" + BIN + " upgrade'.") + "\n");
-    }
-}
+// ---------------------------------------------------------------------------
+// webhooks listen — forward relayed events to a local handler
+// ---------------------------------------------------------------------------
 /** The command that fetches the next page: same positionals, the next page's query flags. */
 function nextCommandFor(op, pathValues, next) {
     const parts = [BIN, op.command[0], op.command[1], ...pathValues.map(shellQuote)];
@@ -2083,7 +1926,7 @@ function printRoot(stream = process.stdout) {
     }
     const width = termWidth();
     const lines = [];
-    lines.push(paintOut("bold", BIN) + ": " + "typeship" + " (v" + "0.6.0" + ")");
+    lines.push(paintOut("bold", BIN) + ": " + "typeship API" + " (v" + "1.0.0" + "), package " + "0.8.0");
     lines.push("");
     lines.push(paintOut("bold", "Usage:") + " " + BIN + " <resource> <command> [args] [--flags]");
     lines.push("");
@@ -2101,6 +1944,12 @@ function printRoot(stream = process.stdout) {
         for (const more of wrapped.slice(1))
             lines.push(" ".repeat(2 + col) + more);
     }
+    if (EXCLUDED_OPS > 0) {
+        lines.push("");
+        lines.push(...labeled(paintOut("yellow", "Plan limit:") + " ", "generated " + OPS.length + " of " + (OPS.length + EXCLUDED_OPS) + " operations", width, 14));
+        lines.push(...labeled("Omitted: ", OMITTED_OPS.map((op) => op.command.join(" ") + " (" + op.httpMethod + " " + op.path + ")").join(", "), width, 14));
+        lines.push(...labeled("Upgrade: ", "https://typeship.dev/pricing, then regenerate without the operation cap", width, 14));
+    }
     lines.push("");
     const flagsText = "-v/--version, -h/--help, --debug, --non-interactive, --color on|off|auto, --base-url <url>, --data '<json>', --fields <a,b.c>, --all (paginated lists), --validate (schema-check bodies)" +
         (AUTH_SCALARS.length > 0 ? ", " + AUTH_SCALARS.map((a) => "--" + a.flag + " <value>").join(", ") : "");
@@ -2118,9 +1967,9 @@ function printRoot(stream = process.stdout) {
         lines.push("Webhooks: " + BIN + " webhooks listen --forward-to <url>  (local event forwarding)");
     if (SUPPORT_URL)
         lines.push("Feedback: " + BIN + " feedback  (opens the provider's issue tracker)");
-    if (EXCLUDED_OPS > 0 && HAS_MCP) {
+    if (MCP_EXCLUDED_OPS > 0 && HAS_MCP) {
         lines.push("");
-        lines.push("Note: " + EXCLUDED_OPS + " operation(s) with uploads or event streams are CLI/SDK-only, not MCP tools.");
+        lines.push("Note: " + MCP_EXCLUDED_OPS + " generated operation(s) with uploads or event streams are CLI/SDK-only, not MCP tools.");
     }
     lines.push("");
     lines.push("Run '" + BIN + " <resource>' for a resource's commands, '" + BIN + " <resource> <command> --help' for flags.");
@@ -2406,11 +2255,10 @@ function resolveBaseUrl(flags) {
 }
 async function makeClient(flags) {
     const stored = readCreds();
-    const options = {};
     const baseUrl = resolveBaseUrl(flags);
     if (baseUrl === undefined)
         fail(2, "No base URL. Pass --base-url, set TYPESHIP_BASE_URL, or run '" + BIN + " config set base-url <url>'.");
-    options.baseUrl = baseUrl;
+    const options = { baseUrl };
     for (const a of AUTH_SCALARS) {
         const v = (typeof flags.get(a.flag) === "string" ? flags.get(a.flag) : undefined)
             ?? process.env[a.env] ?? stored?.scalars?.[a.option];
@@ -2483,7 +2331,20 @@ function didYouMean(input, candidates) {
     }
     return best;
 }
-const BUILTIN_COMMANDS = ["login", "logout", "whoami", "config", "mcp", "docs", "upgrade", "feedback", "completion", "webhooks", "help", "version", "init", "agent-guide", "auth", "doctor"];
+function omittedCommand(resource, method) {
+    return OMITTED_OPS.find((op) => op.command[0] === resource &&
+        (method === undefined || op.command[1] === method || op.commandAlias === method));
+}
+function failOmitted(op) {
+    return failWith({
+        status: "action_required",
+        code: "PLAN_LIMIT",
+        message: "The command '" + BIN + " " + op.command.join(" ") + "' exists in the API Definition but was omitted from this generated package by its plan limit.",
+        detail: { operation: op.tool, method: op.httpMethod, path: op.path, generated_operations: OPS.length, total_operations: OPS.length + EXCLUDED_OPS },
+        nextSteps: ["Upgrade at https://typeship.dev/pricing and regenerate the package without the operation cap.", "Do not invent or retry an omitted command against this generated package."],
+    });
+}
+const BUILTIN_COMMANDS = ["login", "logout", "whoami", "config", "mcp", "docs", "upgrade", "completion", "help", "version", "init", "agent-guide", "auth", "doctor"];
 async function main() {
     const argv = process.argv.slice(2);
     const parsed = parseArgv(argv);
@@ -2511,9 +2372,8 @@ async function main() {
     COLOR_ERR = colorEnabled(process.stderr, parsed);
     // Prose errors for a person: stderr is a terminal (or --mode human says
     // to behave as if), and nothing asked for JSON.
-    const forcedHuman = parsed.flags.get("mode") === "human" || parsed.flags.get("mode") === "interactive" || process.env["TYPESHIP_MODE"] === "human";
+    const forcedHuman = parsed.flags.get("mode") === "human" || process.env["TYPESHIP_MODE"] === "human";
     HUMAN_ERRORS = (process.stderr.isTTY === true || forcedHuman) && !isAgentMode(parsed) && parsed.flags.get("format") !== "json" && parsed.flags.get("json") !== true;
-    await maybeUpdateNotice(resourceCmd, explicitNonInteractive(parsed));
     if (resourceCmd === "init") {
         await cmdInit(parsed);
     }
@@ -2529,12 +2389,6 @@ async function main() {
     if (resourceCmd === "upgrade") {
         await cmdUpgrade(parsed);
     }
-    if (resourceCmd === "webhooks") {
-        await cmdWebhooks(parsed);
-    }
-    if (resourceCmd === "feedback") {
-        await cmdFeedback(parsed);
-    }
     if (resourceCmd === "docs") {
         await cmdDocs(parsed);
     }
@@ -2574,6 +2428,9 @@ async function main() {
     }
     const resourceExists = OPS.some((o) => o.command[0] === resourceCmd);
     if (!resourceExists) {
+        const omitted = omittedCommand(resourceCmd, methodCmd);
+        if (omitted)
+            failOmitted(omitted);
         const suggestion = didYouMean(resourceCmd, [...new Set(OPS.map((o) => o.command[0])), ...BUILTIN_COMMANDS]);
         fail(2, "Unknown command: " + resourceCmd + "." + (suggestion ? " Did you mean '" + BIN + " " + suggestion + "'?" : ""), undefined, ["Run '" + BIN + " --help' for the commands."]);
     }
@@ -2583,6 +2440,9 @@ async function main() {
     }
     const op = findOp(resourceCmd, methodCmd);
     if (!op) {
+        const omitted = omittedCommand(resourceCmd, methodCmd);
+        if (omitted)
+            failOmitted(omitted);
         const suggestion = didYouMean(methodCmd, OPS.filter((o) => o.command[0] === resourceCmd).map((o) => o.command[1]));
         fail(2, "Unknown command: " + resourceCmd + " " + methodCmd + "." + (suggestion ? " Did you mean '" + BIN + " " + resourceCmd + " " + suggestion + "'?" : ""), undefined, ["Run '" + BIN + " " + resourceCmd + "' for its commands."]);
     }
@@ -2758,6 +2618,7 @@ async function main() {
                 items: project(page.items),
                 hasMore: next !== null,
                 ...(next !== null ? { nextPage: next, nextCommand: nextCommandFor(op, pathValues, next) } : {}),
+                ...(page.response.requestId ? { request_id: page.response.requestId } : {}),
             });
         }
         else if (FIELDS !== null && collectionField !== null && result.data !== null && typeof result.data === "object" && !Array.isArray(result.data) && Array.isArray(result.data[collectionField])) {
@@ -2789,16 +2650,6 @@ function errorMessage(error) {
     }
     return base;
 }
-function serializeError(error) {
-    if (error && typeof error === "object" && "violations" in error) {
-        return { violations: error.violations };
-    }
-    if (error && typeof error === "object" && "status" in error) {
-        const e = error;
-        return { status: e.status, body: e.body };
-    }
-    return undefined;
-}
 main().catch((e) => {
     if (e instanceof ExitPending)
         return;