@naturali/cli 0.1.1 → 0.27.1

package/README.md

@@ -10,16 +10,15 @@ naturali configure
 
 ## Configuration
 
-`naturali configure` saves a profile to `~/.naturali/config.json`: the API base
-URL, a token (`nat_sk_…` or a session JWT), and an optional default project.
+`naturali configure` saves a profile to `~/.naturali/config.json`: a token
+(`nat_sk_…` or a session JWT). The CLI always talks to `https://api.naturali.ai`
+— the only naturali.ai API origin, and not configurable.
 
 Environment variables take precedence, which is what CI should use:
 
 | Variable | Purpose |
 | --- | --- |
-| `NATURALI_BASE_URL` | API origin (e.g. `https://api.naturali.ai`). Overrides a profile's stored URL. |
-| `NATURALI_TOKEN` | Bearer credential. With `NATURALI_BASE_URL` set, no profile is needed. |
-| `NATURALI_PROJECT` | Default `project_id`, so project-scoped commands can omit `--project-id`. |
+| `NATURALI_TOKEN` | Bearer credential. When set, no profile is needed. |
 | `NATURALI_PROFILE` | Profile to use when `--profile` is not passed. Defaults to `default`. |
 
 Use `--profile <name>` to switch profiles per command.
@@ -62,28 +61,15 @@ the spec, so you never have to know.
 
 An array-typed field is always sent as a list, even with one value.
 
-### Shorthands for path parameters
-
-With a default project configured, `--project-id` can be omitted:
-
-```bash
-export NATURALI_PROJECT=proj_V1StGXR8Z5jdHi6B
-
-naturali list-agents
-naturali get-agent agent_V1StGXR8Z5jdHi6B   # positional fills the last path param
-naturali get-agent --id agent_V1StGXR8Z5jdHi6B
-```
-
-A positional argument or `--id` fills the **one** path parameter still missing;
-when more than one is unresolved the command fails and names them rather than
-guessing.
+Every path parameter a command needs must be passed explicitly; a command that
+leaves one out fails and names it rather than guessing.
 
 ## Output
 
 The response body is printed to stdout as formatted JSON, so it pipes into `jq`:
 
 ```bash
-naturali list-agents | jq -r '.data[].id'
+naturali list-agents --project-id proj_V1StGXR8Z5jdHi6B | jq -r '.data[].id'
 ```
 
 A non-2xx response prints the platform's error envelope to **stderr** and exits
@@ -108,12 +94,17 @@ there is no per-endpoint code.
 
 ## Versioning
 
-Releases are automatic, and the version tracks the API rather than a hand-picked
-schedule. Any change to `api/openapi/v1/*.yaml` regenerates this package and
-publishes it — new endpoints become new commands without anyone editing the CLI
-— and so does a change to `@naturali/sdk`, which is bundled in at build time
-rather than resolved from npm.
+Releases are automatic, and the version is **shared with the API and with
+`@naturali/sdk`** — one number, one git tag, three packages. `@naturali/cli@0.28.0`
+speaks to API 0.28.0, and `naturali --help` is generated from the specs that
+release was built from, so it is always the authority on what your version can do.
+
+Any change to `api/openapi/v1/*.yaml` regenerates this package and publishes it —
+new endpoints become new commands without anyone editing the CLI — and so does a
+change to `@naturali/sdk`, which is bundled in at build time rather than resolved
+from npm.
 
-`fix:`/`chore:` changes release a patch, `feat:` a minor, and a breaking change
-is held for human approval before it reaches npm. See the repository
-[README](../../README.md#releasing).
+`fix:`/`chore:` changes release a patch and `feat:` a minor, inferred from the
+squashed commit subject. Every case publishes on merge, breaking changes
+included. See the repository [README](../../README.md#releasing) and
+[`CHANGELOG.md`](../../CHANGELOG.md).

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import input from "@inquirer/input";
 import password from "@inquirer/password";
 import { Command } from "commander";
 import * as fs from "node:fs";
@@ -18,7 +17,7 @@ var __exportAll = (all, no_symbols) => {
 };
 //#endregion
 //#region package.json
-var version = "0.1.1";
+var version = "0.27.1";
 //#endregion
 //#region ../sdk/src/generated/core/bodySerializer.gen.ts
 const jsonBodySerializer = { bodySerializer: (body) => JSON.stringify(body, (_key, value) => typeof value === "bigint" ? value.toString() : value) };
@@ -1735,6 +1734,8 @@ const bindResource = (SdkClass, client) => {
 		return value;
 	} });
 };
+/** The naturali.ai API origin. Not configurable — there is only one. */
+const API_BASE_URL$1 = "https://api.naturali.ai";
 /**
 * The naturali.ai API client.
 *
@@ -1745,7 +1746,6 @@ const bindResource = (SdkClass, client) => {
 * import { NaturaliClient } from '@naturali/sdk';
 *
 * const naturali = new NaturaliClient({
-*   baseUrl: 'https://api.naturali.ai',
 *   token: process.env.NATURALI_TOKEN,
 * });
 *
@@ -1775,9 +1775,9 @@ var NaturaliClient = class {
 	traces;
 	/** The underlying HTTP client, for interceptors or one-off requests. */
 	http;
-	constructor({ baseUrl, token, headers } = {}) {
+	constructor({ token, headers } = {}) {
 		this.http = createClient(createConfig({
-			baseUrl: baseUrl ?? "",
+			baseUrl: API_BASE_URL$1,
 			headers: {
 				...token ? { Authorization: `Bearer ${token}` } : {},
 				...headers
@@ -1820,6 +1820,8 @@ var src_exports = /* @__PURE__ */ __exportAll({
 });
 //#endregion
 //#region src/config.ts
+/** The naturali.ai API origin. Not configurable — there is only one. */
+const API_BASE_URL = "https://api.naturali.ai";
 const CONFIG_FILE = path.join(os.homedir(), ".naturali", "config.json");
 const readConfig = () => {
 	try {
@@ -1838,57 +1840,28 @@ const writeProfile = (name, profile) => {
 const configFilePath = () => {
 	return CONFIG_FILE;
 };
-/**
-* The resolved project is deliberately *not* sent as a header. It exists to fill
-* the `project_id` **path parameter** a command left out; the API authorizes that
-* path parameter and nothing else.
-*/
 const buildClient = (args) => {
-	const { baseUrl, token } = args;
+	const { token } = args;
 	return createClient(createConfig({
-		baseUrl,
+		baseUrl: API_BASE_URL,
 		headers: { ...token ? { Authorization: `Bearer ${token}` } : {} }
 	}));
 };
 /**
 * Resolves credentials in precedence order:
 *
-* 1. `NATURALI_BASE_URL` + `NATURALI_TOKEN` — both set, no profile needed.
-* 2. A named profile (`--profile` → `NATURALI_PROFILE` → `default`), with
-*    `NATURALI_BASE_URL` / `NATURALI_PROJECT` overriding its stored values.
-* 3. `NATURALI_BASE_URL` alone — an unauthenticated client, enough for the
-*    public endpoints (`/health`, `/v1/openapi.json`, login, signup).
+* 1. `NATURALI_TOKEN` — no profile needed.
+* 2. A named profile (`--profile` → `NATURALI_PROFILE` → `default`).
 *
-* Exits with an actionable message when none of the three apply.
+* Exits with an actionable message when neither applies.
 */
 const resolveContext = (profileName) => {
-	const envBaseUrl = process.env["NATURALI_BASE_URL"];
 	const envToken = process.env["NATURALI_TOKEN"];
-	const envProject = process.env["NATURALI_PROJECT"];
-	if (envBaseUrl && envToken) return {
-		client: buildClient({
-			baseUrl: envBaseUrl,
-			token: envToken
-		}),
-		project: envProject
-	};
+	if (envToken) return { client: buildClient({ token: envToken }) };
 	const name = profileName ?? process.env["NATURALI_PROFILE"] ?? "default";
 	const profile = readConfig()[name];
-	if (profile) {
-		const project = envProject ?? profile.project;
-		return {
-			client: buildClient({
-				baseUrl: envBaseUrl ?? profile.baseUrl,
-				token: profile.token
-			}),
-			project
-		};
-	}
-	if (envBaseUrl) return {
-		client: buildClient({ baseUrl: envBaseUrl }),
-		project: envProject
-	};
-	console.error(`Profile "${name}" not found. Run: naturali configure${name !== "default" ? ` --profile ${name}` : ""}\nOr set NATURALI_BASE_URL and NATURALI_TOKEN in the environment.`);
+	if (profile) return { client: buildClient({ token: profile.token }) };
+	console.error(`Profile "${name}" not found. Run: naturali configure${name !== "default" ? ` --profile ${name}` : ""}\nOr set NATURALI_TOKEN in the environment.`);
 	process.exit(1);
 };
 //#endregion
@@ -1922,28 +1895,6 @@ const parseUnknownWithRepeats = (args) => {
 	};
 };
 /**
-* Extracts bare (non-`--flag`) tokens, e.g. the `agent_123` in
-* `naturali get-agent agent_123`. Walks the same flag/value pairing as
-* {@link parseUnknownWithRepeats} so a flag's value is never mistaken for a
-* standalone positional argument.
-*/
-const extractPositionalArgs = (args) => {
-	const { cliArgs } = args;
-	const positional = [];
-	for (let i = 0; i < cliArgs.length; i++) {
-		const arg = cliArgs[i];
-		if (arg === void 0) continue;
-		if (!arg.startsWith("--")) {
-			positional.push(arg);
-			continue;
-		}
-		if (arg.indexOf("=") > 2) continue;
-		const next = cliArgs[i + 1];
-		if (next !== void 0 && !next.startsWith("--")) i++;
-	}
-	return positional;
-};
-/**
 * Normalizes a flag name to camelCase so kebab, snake and camel spellings of
 * the same parameter all match: `agent-id`, `agent_id` and `agentId` → `agentId`.
 */
@@ -2006,9 +1957,6 @@ const oneLine = (text) => {
 const GLOBAL_FLAGS = [{
 	name: "profile",
 	description: "config profile to use"
-}, {
-	name: "id",
-	description: "alias for the command's remaining path parameter"
 }];
 /**
 * Renders `naturali <command> --help`: the operation's own description, a link
@@ -2058,12 +2006,8 @@ const renderCommandHelp = (args) => {
 };
 //#endregion
 //#region src/routeCall.ts
-/**
-* Flags the dispatcher owns, never forwarded to the API: `--profile` selects
-* credentials, `--id` is the generic alias for a command's remaining path
-* parameter.
-*/
-const RESERVED_FLAGS = /* @__PURE__ */ new Set(["profile", "id"]);
+/** Flags the dispatcher owns, never forwarded to the API. */
+const RESERVED_FLAGS = /* @__PURE__ */ new Set(["profile"]);
 const placeFlags = (args) => {
 	const { route, parsedFlags, call } = args;
 	const typeByCanonical = new Map(route.flags.map((flag) => {
@@ -2097,21 +2041,11 @@ const placeFlags = (args) => {
 /**
 * Turns parsed flags into the `{ path, query, body }` an SDK method expects.
 *
-* Two conveniences fill path parameters the caller left out, in this order —
-* an explicit flag always wins over both:
-*
-* 1. `project_id` comes from the resolved default project (`NATURALI_PROJECT`
-*    or the profile's `project`), since almost every resource is nested under
-*    a project.
-* 2. `--id <value>`, or a bare positional argument, fills the one path
-*    parameter still missing — so `naturali get-agent agent_123` works once a
-*    default project is configured.
-*
 * A path parameter that stays unresolved is reported rather than sent: a
 * request with a literal `{agent_id}` left in the URL is never useful.
 */
 const buildRouteCall = (args) => {
-	const { route, parsedFlags, positionalArgs, defaultProject } = args;
+	const { route, parsedFlags } = args;
 	const call = {
 		path: {},
 		query: {},
@@ -2122,12 +2056,6 @@ const buildRouteCall = (args) => {
 		parsedFlags,
 		call
 	});
-	if (defaultProject && route.pathParams.includes("project_id") && !("project_id" in call.path)) call.path["project_id"] = defaultProject;
-	const unresolved = route.pathParams.filter((param) => {
-		return !(param in call.path);
-	});
-	const idAlias = parsedFlags.single["id"] ?? positionalArgs[0];
-	if (idAlias !== void 0 && unresolved.length === 1) call.path[unresolved[0]] = parseFlagValue(idAlias);
 	const missingPathParams = route.pathParams.filter((param) => {
 		return !(param in call.path);
 	});
@@ -2217,13 +2145,13 @@ const dispatchCommand = async (args) => {
 	const context = resolveContext(parsedFlags.single["profile"] ?? profileFromProgram);
 	const built = buildRouteCall({
 		route,
-		parsedFlags,
-		positionalArgs: extractPositionalArgs({ cliArgs: rawArgs }),
-		defaultProject: context.project
+		parsedFlags
 	});
 	if (!built.ok) {
-		const [first] = built.missingPathParams;
-		console.error(`Missing required path parameter(s): ${built.missingPathParams.join(", ")}.\nProvide with --${first?.replace(/_/g, "-")} <value>, --id <value>, or a positional argument: naturali ${commandName} <id>` + (built.missingPathParams.includes("project_id") ? `\nTo default it for every command, set NATURALI_PROJECT or run: naturali configure` : ""));
+		const flagsHint = built.missingPathParams.map((param) => {
+			return `--${param.replace(/_/g, "-")} <value>`;
+		}).join(", ");
+		console.error(`Missing required path parameter(s): ${built.missingPathParams.join(", ")}.\nProvide with ${flagsHint}.`);
 		process.exit(1);
 	}
 	const serviceClass = resolveServiceClass(route.serviceClass);
@@ -5243,17 +5171,8 @@ const routes = {
 */
 const addConfigureCommand = (program) => {
 	program.command("configure").description(`Save credentials to a named profile (${configFilePath()})`).option("-p, --profile <name>", "profile name", "default").action(async (opts) => {
-		const baseUrl = await input({
-			message: "Base URL:",
-			default: "https://api.naturali.ai"
-		});
 		const token = await password({ message: "Token (nat_sk_… or a session JWT, hidden):" });
-		const project = await input({ message: "Default project id (optional):" });
-		writeProfile(opts.profile, {
-			baseUrl,
-			token,
-			...project ? { project } : {}
-		});
+		writeProfile(opts.profile, { token });
 		console.log(`Profile "${opts.profile}" saved to ${configFilePath()}.`);
 	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturali/cli",
-  "version": "0.1.1",
+  "version": "0.27.1",
   "description": "Command-line interface for the naturali.ai API, generated from its OpenAPI specs",
   "type": "module",
   "bin": {
@@ -21,7 +21,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@inquirer/input": "^5.1.2",
     "@inquirer/password": "^5.1.1",
     "commander": "^15.0.0"
   },
@@ -32,12 +31,12 @@
     "tsx": "^4.23.1",
     "typescript": "~6.0.3",
     "vitest": "^4.1.10",
-    "@naturali/sdk": "0.1.1"
+    "@naturali/sdk": "0.27.1"
   },
   "scripts": {
-    "generate": "pnpm --filter @naturali/sdk generate && tsx scripts/generate.ts",
-    "typecheck": "pnpm generate && tsc --noEmit",
-    "test": "pnpm generate && vitest run",
-    "build": "pnpm generate && tsdown"
+    "generate": "tsx scripts/generate.ts",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "build": "tsdown"
   }
 }