@naturali/cli 0.27.3 → 0.28.1

package/README.md

@@ -5,23 +5,19 @@ operation, generated from the [OpenAPI specs](../../api/openapi/).
 
 ```bash
 pnpm add -g @naturali/cli
-naturali configure
+export NATURALI_TOKEN=nat_sk_...
 ```
 
 ## Configuration
 
-`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:
+The CLI always talks to `https://api.naturali.ai` — the only naturali.ai API
+origin, and not configurable. Credentials and the default project come from
+the environment:
 
 | Variable | Purpose |
 | --- | --- |
-| `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.
+| `NATURALI_TOKEN` | Bearer credential (`nat_sk_…` or a session JWT). Required. |
+| `NATURALI_PROJECT` | Default `--project-id` for commands that take one. An explicit `--project-id` still wins. |
 
 ## Commands
 
@@ -92,6 +88,19 @@ pipeline.
 Hand-written source is limited to dispatch, flag parsing, credentials and help;
 there is no per-endpoint code.
 
+## Testing
+
+`pnpm test` runs the unit suite against a mocked `fetch` — flag parsing,
+dispatch, and help output, on every pull request.
+
+`pnpm e2e` (`tests/e2e/smoke.ts`) is different: it drives the *built* CLI
+binary (`bin/naturali`) as real subprocesses against the real, deployed API,
+using a `NATURALI_E2E_API_KEY` account-scoped key. It proves the one thing the
+mocked suite can't — that the CLI, the `@naturali/sdk` it bundles, and the live
+API actually agree — and it provisions and archives its own throwaway project.
+It costs real model-provider money, so it only runs as part of the `e2e` job in
+[`main.yml`](../../.github/workflows/main.yml), never on pull requests.
+
 ## Versioning
 
 Releases are automatic, and the version is **shared with the API and with

package/dist/index.mjs

@@ -1,9 +1,6 @@
-import * as path from "node:path";
+import * as nodePath from "node:path";
 import { fileURLToPath } from "node:url";
-import password from "@inquirer/password";
 import { Command } from "commander";
-import * as fs from "node:fs";
-import * as os from "node:os";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -17,7 +14,7 @@ var __exportAll = (all, no_symbols) => {
 };
 //#endregion
 //#region package.json
-var version = "0.27.3";
+var version = "0.28.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) };
@@ -1302,7 +1299,7 @@ var Knowledge = class {
 	*/
 	static queryKnowledgeCollection(options) {
 		return (options.client ?? client).post({
-			url: "/v1/projects/{project_id}/knowledge/collections/{collection_id}",
+			url: "/v1/projects/{project_id}/knowledge/collections/{collection_id}:query",
 			...options,
 			headers: {
 				"Content-Type": "application/json",
@@ -1365,7 +1362,7 @@ var Knowledge = class {
 	*/
 	static reingestKnowledgeDocument(options) {
 		return (options.client ?? client).post({
-			url: "/v1/projects/{project_id}/knowledge/collections/{collection_id}/documents/{document_id}",
+			url: "/v1/projects/{project_id}/knowledge/collections/{collection_id}/documents/{document_id}:reingest",
 			...options
 		});
 	}
@@ -1822,24 +1819,6 @@ var src_exports = /* @__PURE__ */ __exportAll({
 //#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 {
-		return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
-	} catch {
-		return {};
-	}
-};
-const writeProfile = (name, profile) => {
-	const config = readConfig();
-	config[name] = profile;
-	fs.mkdirSync(path.dirname(CONFIG_FILE), { recursive: true });
-	fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
-};
-/** Where the config file lives, so `configure` can name it in its output. */
-const configFilePath = () => {
-	return CONFIG_FILE;
-};
 const buildClient = (args) => {
 	const { token } = args;
 	return createClient(createConfig({
@@ -1848,20 +1827,14 @@ const buildClient = (args) => {
 	}));
 };
 /**
-* Resolves credentials in precedence order:
+* Resolves credentials from `NATURALI_TOKEN`.
 *
-* 1. `NATURALI_TOKEN` — no profile needed.
-* 2. A named profile (`--profile` → `NATURALI_PROFILE` → `default`).
-*
-* Exits with an actionable message when neither applies.
+* Exits with an actionable message when it is unset.
 */
-const resolveContext = (profileName) => {
-	const envToken = process.env["NATURALI_TOKEN"];
-	if (envToken) return { client: buildClient({ token: envToken }) };
-	const name = profileName ?? process.env["NATURALI_PROFILE"] ?? "default";
-	const profile = readConfig()[name];
-	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.`);
+const resolveContext = () => {
+	const token = process.env["NATURALI_TOKEN"];
+	if (token) return { client: buildClient({ token }) };
+	console.error("NATURALI_TOKEN is not set. Set it to a nat_sk_… API key or a session JWT.");
 	process.exit(1);
 };
 //#endregion
@@ -1954,10 +1927,6 @@ const buildArrayFlagValue = (rawValues) => {
 const oneLine = (text) => {
 	return text.replace(/\s+/g, " ").trim();
 };
-const GLOBAL_FLAGS = [{
-	name: "profile",
-	description: "config profile to use"
-}];
 /**
 * Renders `naturali <command> --help`: the operation's own description, a link
 * to the module docs page, and every flag the spec declares — grouped so it is
@@ -2000,21 +1969,16 @@ const renderCommandHelp = (args) => {
 		}
 		lines.push("");
 	}
-	lines.push("Global flags:");
-	for (const flag of GLOBAL_FLAGS) lines.push(`  --${flag.name}  <string>  ${flag.description}`);
 	return lines.join("\n");
 };
 //#endregion
 //#region src/routeCall.ts
-/** 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) => {
 		return [toCanonical(flag.name), flag.type];
 	}));
 	for (const [flagKey, rawValue] of Object.entries(parsedFlags.single)) {
-		if (RESERVED_FLAGS.has(flagKey)) continue;
 		const canonical = toCanonical(flagKey);
 		const value = typeByCanonical.get(canonical) === "array" ? buildArrayFlagValue(parsedFlags.repeated[flagKey] ?? [rawValue]) : parseFlagValue(rawValue);
 		const pathParam = route.pathParams.find((param) => {
@@ -2038,6 +2002,19 @@ const placeFlags = (args) => {
 		call.body[kebabToSnake(flagKey)] = value;
 	}
 };
+const PROJECT_ID_PARAM = "project_id";
+/**
+* Falls back to `NATURALI_PROJECT` for the `project_id` path or query
+* parameter when a command doesn't pass `--project-id` explicitly, so a user
+* working within one project doesn't have to repeat it on every command.
+*/
+const applyProjectIdEnvDefault = (args) => {
+	const { route, call } = args;
+	const envProjectId = process.env["NATURALI_PROJECT"];
+	if (!envProjectId) return;
+	if (route.pathParams.includes(PROJECT_ID_PARAM) && !(PROJECT_ID_PARAM in call.path)) call.path[PROJECT_ID_PARAM] = envProjectId;
+	else if (route.queryParams.includes(PROJECT_ID_PARAM) && !(PROJECT_ID_PARAM in call.query)) call.query[PROJECT_ID_PARAM] = envProjectId;
+};
 /**
 * Turns parsed flags into the `{ path, query, body }` an SDK method expects.
 *
@@ -2056,6 +2033,10 @@ const buildRouteCall = (args) => {
 		parsedFlags,
 		call
 	});
+	applyProjectIdEnvDefault({
+		route,
+		call
+	});
 	const missingPathParams = route.pathParams.filter((param) => {
 		return !(param in call.path);
 	});
@@ -2133,7 +2114,7 @@ const formatError = (args) => {
 * parameter, a missing SDK method, or a non-2xx response.
 */
 const dispatchCommand = async (args) => {
-	const { commandName, route, rawArgs, profileFromProgram } = args;
+	const { commandName, route, rawArgs } = args;
 	if (rawArgs.includes("--help") || rawArgs.includes("-h")) {
 		console.log(renderCommandHelp({
 			commandName,
@@ -2142,7 +2123,7 @@ const dispatchCommand = async (args) => {
 		process.exit(0);
 	}
 	const parsedFlags = parseUnknownWithRepeats({ cliArgs: rawArgs });
-	const context = resolveContext(parsedFlags.single["profile"] ?? profileFromProgram);
+	const context = resolveContext();
 	const built = buildRouteCall({
 		route,
 		parsedFlags
@@ -3798,52 +3779,6 @@ const routes = {
 			"in": "path"
 		}]
 	},
-	"query-knowledge-collection": {
-		serviceClass: "Knowledge",
-		operationId: "queryKnowledgeCollection",
-		description: "Retrieval preview (API.md §4, K5): returns the chunks the collection would surface for a question — debuggable standalone, before any agent is bound to it. This is the `…:query` action; the path segment is `{collection_id}:query`.",
-		moduleDocsUrl: "https://docs.naturali.ai/docs/modules/knowledge",
-		httpMethod: "post",
-		pathParams: ["project_id", "collection_id"],
-		queryParams: [],
-		flags: [
-			{
-				"name": "project_id",
-				"description": "Project public ID (proj_ prefix).",
-				"required": true,
-				"type": "string",
-				"in": "path"
-			},
-			{
-				"name": "collection_id",
-				"description": "Knowledge collection public ID (kcol_ prefix).",
-				"required": true,
-				"type": "string",
-				"in": "path"
-			},
-			{
-				"name": "query",
-				"description": "The question to preview retrieval for.",
-				"required": true,
-				"type": "string",
-				"in": "body"
-			},
-			{
-				"name": "top_k",
-				"description": "Maximum chunks to return.",
-				"required": false,
-				"type": "integer",
-				"in": "body"
-			},
-			{
-				"name": "min_score",
-				"description": "Drop chunks below this similarity score.",
-				"required": false,
-				"type": "number",
-				"in": "body"
-			}
-		]
-	},
 	"update-knowledge-collection": {
 		serviceClass: "Knowledge",
 		operationId: "updateKnowledgeCollection",
@@ -3905,6 +3840,52 @@ const routes = {
 			"in": "path"
 		}]
 	},
+	"query-knowledge-collection": {
+		serviceClass: "Knowledge",
+		operationId: "queryKnowledgeCollection",
+		description: "Retrieval preview (API.md §4, K5): returns the chunks the collection would surface for a question — debuggable standalone, before any agent is bound to it. This is the `…:query` action; the path segment is `{collection_id}:query`.",
+		moduleDocsUrl: "https://docs.naturali.ai/docs/modules/knowledge",
+		httpMethod: "post",
+		pathParams: ["project_id", "collection_id"],
+		queryParams: [],
+		flags: [
+			{
+				"name": "project_id",
+				"description": "Project public ID (proj_ prefix).",
+				"required": true,
+				"type": "string",
+				"in": "path"
+			},
+			{
+				"name": "collection_id",
+				"description": "Knowledge collection public ID (kcol_ prefix).",
+				"required": true,
+				"type": "string",
+				"in": "path"
+			},
+			{
+				"name": "query",
+				"description": "The question to preview retrieval for.",
+				"required": true,
+				"type": "string",
+				"in": "body"
+			},
+			{
+				"name": "top_k",
+				"description": "Maximum chunks to return.",
+				"required": false,
+				"type": "integer",
+				"in": "body"
+			},
+			{
+				"name": "min_score",
+				"description": "Drop chunks below this similarity score.",
+				"required": false,
+				"type": "number",
+				"in": "body"
+			}
+		]
+	},
 	"list-knowledge-documents": {
 		serviceClass: "Knowledge",
 		operationId: "listKnowledgeDocuments",
@@ -4026,12 +4007,12 @@ const routes = {
 			}
 		]
 	},
-	"reingest-knowledge-document": {
+	"delete-knowledge-document": {
 		serviceClass: "Knowledge",
-		operationId: "reingestKnowledgeDocument",
-		description: "Re-run ingestion for a document against its stored source, resetting it to `pending` before re-processing — the recovery path for a `failed` ingest (API.md §4, K1). This is the `…:reingest` action; the path segment is `{document_id}:reingest`.",
+		operationId: "deleteKnowledgeDocument",
+		description: "Delete a document",
 		moduleDocsUrl: "https://docs.naturali.ai/docs/modules/knowledge",
-		httpMethod: "post",
+		httpMethod: "delete",
 		pathParams: [
 			"project_id",
 			"collection_id",
@@ -4062,12 +4043,12 @@ const routes = {
 			}
 		]
 	},
-	"delete-knowledge-document": {
+	"reingest-knowledge-document": {
 		serviceClass: "Knowledge",
-		operationId: "deleteKnowledgeDocument",
-		description: "Delete a document",
+		operationId: "reingestKnowledgeDocument",
+		description: "Re-run ingestion for a document against its stored source, resetting it to `pending` before re-processing — the recovery path for a `failed` ingest (API.md §4, K1). This is the `…:reingest` action; the path segment is `{document_id}:reingest`.",
 		moduleDocsUrl: "https://docs.naturali.ai/docs/modules/knowledge",
-		httpMethod: "delete",
+		httpMethod: "post",
 		pathParams: [
 			"project_id",
 			"collection_id",
@@ -5166,16 +5147,9 @@ const routes = {
 * Every API operation is a command, generated from `api/openapi/v1/*.yaml` into
 * `src/generated/routes.ts` and dispatched through `@naturali/sdk` — so the CLI
 * is a thin client over exactly the public contract (api/API.md), with nothing
-* hand-written per endpoint. Only credential management (`configure`) and
-* discovery (`list-commands`) are commands of its own.
+* hand-written per endpoint. Only discovery (`list-commands`) is a command of
+* its own. Credentials come from the `NATURALI_TOKEN` environment variable.
 */
-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 token = await password({ message: "Token (nat_sk_… or a session JWT, hidden):" });
-		writeProfile(opts.profile, { token });
-		console.log(`Profile "${opts.profile}" saved to ${configFilePath()}.`);
-	});
-};
 const addListCommandsCommand = (program) => {
 	program.command("list-commands").description("List every available API command").action(() => {
 		const entries = Object.entries(routes).sort(([a], [b]) => {
@@ -5208,8 +5182,7 @@ const addDynamicDispatch = (program) => {
 		await dispatchCommand({
 			commandName,
 			route,
-			rawArgs: commandIdx >= 0 ? process.argv.slice(commandIdx + 1) : [],
-			profileFromProgram: program.opts().profile
+			rawArgs: commandIdx >= 0 ? process.argv.slice(commandIdx + 1) : []
 		});
 	});
 };
@@ -5223,9 +5196,8 @@ const addDynamicDispatch = (program) => {
 */
 const createProgram = () => {
 	const program = new Command();
-	program.name("naturali").description("naturali.ai CLI").version(version).option("-p, --profile <name>", "config profile to use");
+	program.name("naturali").description("naturali.ai CLI").version(version);
 	program.addHelpText("after", "\nRun `naturali list-commands` to see every API command, and\n`naturali <command> --help` for a command's flags and docs link.");
-	addConfigureCommand(program);
 	addListCommandsCommand(program);
 	addDynamicDispatch(program);
 	return program;
@@ -5241,7 +5213,7 @@ const runCli = async (args) => {
 };
 if ((() => {
 	if (!process.argv[1]) return false;
-	return path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
+	return nodePath.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 })()) runCli(process.argv);
 //#endregion
 export { createProgram, runCli };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturali/cli",
-  "version": "0.27.3",
+  "version": "0.28.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/password": "^5.1.1",
     "commander": "^15.0.0"
   },
   "devDependencies": {
@@ -31,12 +30,13 @@
     "tsx": "^4.23.1",
     "typescript": "~6.0.3",
     "vitest": "^4.1.10",
-    "@naturali/sdk": "0.27.3"
+    "@naturali/sdk": "0.28.1"
   },
   "scripts": {
     "generate": "tsx scripts/generate.ts",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "build": "tsdown"
+    "build": "tsdown",
+    "e2e": "tsx tests/e2e/smoke.ts"
   }
 }