specli 0.0.3 → 0.0.5

package/package.json

@@ -2,7 +2,7 @@
 	"name": "specli",
 	"module": "index.ts",
 	"type": "module",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"bin": {
 		"specli": "./cli.ts"
 	},

package/src/cli/compile.ts

@@ -65,18 +65,23 @@ export async function compileCommand(
 
 	buildArgs.push("./src/compiled.ts");
 
+	// Only set env vars that have actual values - avoid empty strings
+	// because the macros will embed them and they will override defaults.
+	const buildEnv: Record<string, string> = {
+		...process.env,
+		SPECLI_SPEC: spec,
+		SPECLI_NAME: name,
+	};
+	if (options.server) buildEnv.SPECLI_SERVER = options.server;
+	if (options.serverVar?.length)
+		buildEnv.SPECLI_SERVER_VARS = options.serverVar.join(",");
+	if (options.auth) buildEnv.SPECLI_AUTH = options.auth;
+
 	const proc = Bun.spawn({
 		cmd: ["bun", ...buildArgs],
 		stdout: "pipe",
 		stderr: "pipe",
-		env: {
-			...process.env,
-			SPECLI_SPEC: spec,
-			SPECLI_NAME: name,
-			SPECLI_SERVER: options.server ?? "",
-			SPECLI_SERVER_VARS: options.serverVar?.join(",") ?? "",
-			SPECLI_AUTH: options.auth ?? "",
-		},
+		env: buildEnv,
 	});
 
 	const output = await new Response(proc.stdout).text();

package/src/cli/main.ts

@@ -6,9 +6,7 @@ import { buildRuntimeContext } from "./runtime/context.ts";
 import { addGeneratedCommands } from "./runtime/generated.ts";
 import { deleteToken, getToken, setToken } from "./runtime/profile/secrets.ts";
 import {
-	getProfile,
 	readProfiles,
-	removeProfile,
 	upsertProfile,
 	writeProfiles,
 } from "./runtime/profile/store.ts";
@@ -42,7 +40,6 @@ export async function main(argv: string[], options: MainOptions = {}) {
 		.option("--username <username>", "Basic auth username")
 		.option("--password <password>", "Basic auth password")
 		.option("--api-key <key>", "API key value")
-		.option("--profile <name>", "Profile name (stored under ~/.config/specli)")
 		.option("--json", "Machine-readable output")
 		.showHelpAfterError();
 
@@ -63,197 +60,109 @@ export async function main(argv: string[], options: MainOptions = {}) {
 		embeddedSpecText: options.embeddedSpecText,
 	});
 
-	const profileCmd = program
-		.command("profile")
-		.description("Manage specli profiles");
+	// Simple auth commands
+	const defaultProfileName = "default";
 
-	profileCmd
-		.command("list")
-		.description("List profiles")
-		.action(async (_opts, command) => {
+	program
+		.command("login [token]")
+		.description("Store a bearer token for authentication")
+		.action(async (tokenArg: string | undefined, _opts, command) => {
 			const globals = command.optsWithGlobals() as { json?: boolean };
-			const file = await readProfiles();
-
-			const payload = {
-				defaultProfile: file.defaultProfile,
-				profiles: file.profiles.map((p) => ({
-					name: p.name,
-					server: p.server,
-					authScheme: p.authScheme,
-				})),
-			};
-
-			if (globals.json) {
-				process.stdout.write(`${JSON.stringify(payload)}\n`);
-				return;
-			}
 
-			if (payload.defaultProfile) {
-				process.stdout.write(`default: ${payload.defaultProfile}\n`);
-			}
-			for (const p of payload.profiles) {
-				process.stdout.write(`${p.name}\n`);
-				if (p.server) process.stdout.write(`  server: ${p.server}\n`);
-				if (p.authScheme)
-					process.stdout.write(`  authScheme: ${p.authScheme}\n`);
+			let token = tokenArg;
+
+			// If no token argument, try to read from stdin (for piping)
+			if (!token) {
+				const isTTY = process.stdin.isTTY;
+				if (isTTY) {
+					// Interactive mode - prompt user
+					process.stdout.write("Enter token: ");
+					const reader = process.stdin;
+					const chunks: Buffer[] = [];
+					for await (const chunk of reader) {
+						chunks.push(chunk);
+						// Read one line only
+						if (chunk.includes(10)) break; // newline
+					}
+					token = Buffer.concat(chunks).toString().trim();
+				} else {
+					// Piped input - use Bun's stdin stream
+					const text = await Bun.stdin.text();
+					token = text.trim();
+				}
 			}
-		});
 
-	profileCmd
-		.command("set")
-		.description("Create or update a profile")
-		.requiredOption("--name <name>", "Profile name")
-		.option("--server <url>", "Default server/base URL")
-		.option("--auth <scheme>", "Default auth scheme key")
-		.option("--default", "Set as default profile")
-		.action(async (opts, command) => {
-			const globals = command.optsWithGlobals() as {
-				json?: boolean;
-				server?: string;
-				auth?: string;
-			};
-
-			const file = await readProfiles();
-			const next = upsertProfile(file, {
-				name: String(opts.name),
-				server:
-					typeof opts.server === "string"
-						? opts.server
-						: typeof globals.server === "string"
-							? globals.server
-							: undefined,
-				authScheme:
-					typeof opts.auth === "string"
-						? opts.auth
-						: typeof globals.auth === "string"
-							? globals.auth
-							: undefined,
-			});
-			const final = opts.default
-				? { ...next, defaultProfile: String(opts.name) }
-				: next;
-			await writeProfiles(final);
-
-			if (globals.json) {
-				process.stdout.write(
-					`${JSON.stringify({ ok: true, profile: String(opts.name) })}\n`,
+			if (!token) {
+				throw new Error(
+					"No token provided. Usage: login <token> or echo $TOKEN | login",
 				);
-				return;
 			}
-			process.stdout.write(`ok: profile ${String(opts.name)}\n`);
-		});
 
-	profileCmd
-		.command("rm")
-		.description("Remove a profile")
-		.requiredOption("--name <name>", "Profile name")
-		.action(async (opts, command) => {
-			const globals = command.optsWithGlobals() as { json?: boolean };
+			// Ensure default profile exists
 			const file = await readProfiles();
-			const removed = removeProfile(file, String(opts.name));
-
-			const final =
-				file.defaultProfile === opts.name
-					? { ...removed, defaultProfile: undefined }
-					: removed;
+			if (!file.profiles.find((p) => p.name === defaultProfileName)) {
+				const updated = upsertProfile(file, { name: defaultProfileName });
+				await writeProfiles({ ...updated, defaultProfile: defaultProfileName });
+			} else if (!file.defaultProfile) {
+				await writeProfiles({ ...file, defaultProfile: defaultProfileName });
+			}
 
-			await writeProfiles(final);
+			await setToken(ctx.loaded.id, defaultProfileName, token);
 
 			if (globals.json) {
-				process.stdout.write(
-					`${JSON.stringify({ ok: true, profile: String(opts.name) })}\n`,
-				);
+				process.stdout.write(`${JSON.stringify({ ok: true })}\n`);
 				return;
 			}
-
-			process.stdout.write(`ok: removed ${String(opts.name)}\n`);
+			process.stdout.write("ok: logged in\n");
 		});
 
-	profileCmd
-		.command("use")
-		.description("Set the default profile")
-		.requiredOption("--name <name>", "Profile name")
-		.action(async (opts, command) => {
+	program
+		.command("logout")
+		.description("Clear stored authentication token")
+		.action(async (_opts, command) => {
 			const globals = command.optsWithGlobals() as { json?: boolean };
-			const file = await readProfiles();
-			const profile = getProfile(file, String(opts.name));
-			if (!profile) throw new Error(`Profile not found: ${String(opts.name)}`);
 
-			await writeProfiles({ ...file, defaultProfile: String(opts.name) });
+			const deleted = await deleteToken(ctx.loaded.id, defaultProfileName);
 
 			if (globals.json) {
-				process.stdout.write(
-					`${JSON.stringify({ ok: true, defaultProfile: String(opts.name) })}\n`,
-				);
+				process.stdout.write(`${JSON.stringify({ ok: deleted })}\n`);
 				return;
 			}
-			process.stdout.write(`ok: default ${String(opts.name)}\n`);
+			process.stdout.write(
+				deleted ? "ok: logged out\n" : "ok: not logged in\n",
+			);
 		});
 
-	const authCmd = program.command("auth").description("Manage auth secrets");
+	program
+		.command("whoami")
+		.description("Show current authentication status")
+		.action(async (_opts, command) => {
+			const globals = command.optsWithGlobals() as { json?: boolean };
 
-	authCmd
-		.command("token")
-		.description("Set or get bearer token for a profile")
-		.option("--name <name>", "Profile name (defaults to global --profile)")
-		.option("--set <token>", "Set token")
-		.option("--get", "Get token")
-		.option("--delete", "Delete token")
-		.action(async (opts, command) => {
-			const globals = command.optsWithGlobals() as {
-				json?: boolean;
-				profile?: string;
-			};
+			const token = await getToken(ctx.loaded.id, defaultProfileName);
+			const hasToken = Boolean(token);
 
-			const profileName = String(opts.name ?? globals.profile ?? "");
-			if (!profileName) {
-				throw new Error(
-					"Missing profile name. Provide --name <name> or global --profile <name>.",
-				);
-			}
-			if (opts.set && (opts.get || opts.delete)) {
-				throw new Error("Use only one of --set, --get, --delete");
-			}
-			if (opts.get && opts.delete) {
-				throw new Error("Use only one of --get or --delete");
-			}
-			if (!opts.set && !opts.get && !opts.delete) {
-				throw new Error("Provide one of --set, --get, --delete");
+			// Mask the token for display (show first 8 and last 4 chars)
+			let maskedToken: string | null = null;
+			if (token && token.length > 16) {
+				maskedToken = `${token.slice(0, 8)}...${token.slice(-4)}`;
+			} else if (token) {
+				maskedToken = `${token.slice(0, 4)}...`;
 			}
 
-			if (typeof opts.set === "string") {
-				await setToken(ctx.loaded.id, profileName, opts.set);
-				if (globals.json) {
-					process.stdout.write(
-						`${JSON.stringify({ ok: true, profile: profileName })}\n`,
-					);
-					return;
-				}
-				process.stdout.write(`ok: token set for ${profileName}\n`);
-				return;
-			}
-
-			if (opts.get) {
-				const token = await getToken(ctx.loaded.id, profileName);
-				if (globals.json) {
-					process.stdout.write(
-						`${JSON.stringify({ profile: profileName, token })}\n`,
-					);
-					return;
-				}
-				process.stdout.write(`${token ?? ""}\n`);
+			if (globals.json) {
+				process.stdout.write(
+					`${JSON.stringify({ authenticated: hasToken, token: maskedToken })}\n`,
+				);
 				return;
 			}
 
-			if (opts.delete) {
-				const ok = await deleteToken(ctx.loaded.id, profileName);
-				if (globals.json) {
-					process.stdout.write(
-						`${JSON.stringify({ ok, profile: profileName })}\n`,
-					);
-					return;
-				}
-				process.stdout.write(`ok: ${ok ? "deleted" : "not-found"}\n`);
+			if (hasToken) {
+				process.stdout.write(`authenticated: yes\n`);
+				process.stdout.write(`token: ${maskedToken}\n`);
+			} else {
+				process.stdout.write(`authenticated: no\n`);
+				process.stdout.write(`Run 'login <token>' to authenticate.\n`);
 			}
 		});
 

package/src/cli/runtime/auth/resolve.ts

@@ -4,8 +4,15 @@ export type AuthInputs = {
 	flagAuthScheme?: string;
 	profileAuthScheme?: string;
 	embeddedAuthScheme?: string;
+	hasStoredToken?: boolean;
 };
 
+const BEARER_COMPATIBLE_KINDS = new Set([
+	"http-bearer",
+	"oauth2",
+	"openIdConnect",
+]);
+
 export function resolveAuthScheme(
 	authSchemes: AuthScheme[],
 	required: import("../../auth-requirements.ts").AuthSummary,
@@ -35,5 +42,18 @@ export function resolveAuthScheme(
 	// Otherwise if there is only one scheme in spec, pick it.
 	if (authSchemes.length === 1) return authSchemes[0]?.key;
 
+	// If user has a stored token and operation accepts a bearer-compatible scheme,
+	// automatically pick the first one that matches.
+	if (inputs.hasStoredToken && alts.length > 0) {
+		for (const alt of alts) {
+			if (alt.length !== 1) continue;
+			const key = alt[0]?.key;
+			const scheme = authSchemes.find((s) => s.key === key);
+			if (scheme && BEARER_COMPATIBLE_KINDS.has(scheme.kind)) {
+				return key;
+			}
+		}
+	}
+
 	return undefined;
 }

package/src/cli/runtime/request.ts

@@ -26,8 +26,6 @@ export type RuntimeGlobals = {
 	username?: string;
 	password?: string;
 	apiKey?: string;
-
-	profile?: string;
 };
 
 function parseKeyValuePairs(
@@ -155,8 +153,10 @@ export type BuildRequestInput = {
 export async function buildRequest(
 	input: BuildRequestInput,
 ): Promise<{ request: Request; curl: string }> {
+	// Always use the "default" profile for simplicity
+	const defaultProfileName = "default";
 	const profilesFile = await readProfiles();
-	const profile = getProfile(profilesFile, input.globals.profile);
+	const profile = getProfile(profilesFile, defaultProfileName);
 	const embedded = input.embeddedDefaults;
 
 	// Merge server vars: CLI flags override embedded defaults
@@ -188,10 +188,12 @@ export async function buildRequest(
 
 	const path = applyTemplate(input.action.path, pathVars, { encode: true });
 
-	const url = new URL(
-		path,
-		serverUrl.endsWith("/") ? serverUrl : `${serverUrl}/`,
-	);
+	// Build the full URL by combining server URL and path.
+	// We need to handle the case where path starts with "/" carefully:
+	// URL constructor treats absolute paths as relative to origin, not base path.
+	const baseUrl = serverUrl.endsWith("/") ? serverUrl : `${serverUrl}/`;
+	const relativePath = path.startsWith("/") ? path.slice(1) : path;
+	const url = new URL(relativePath, baseUrl);
 
 	const headers = new Headers();
 
@@ -309,6 +311,11 @@ export async function buildRequest(
 		}
 	}
 
+	// Check if user has a stored token (needed for auth scheme auto-selection)
+	const storedToken = profile?.name
+		? await getToken(input.specId, profile.name)
+		: null;
+
 	// Auth resolution priority: CLI flag > profile > embedded default
 	const resolvedAuthScheme = resolveAuthScheme(
 		input.authSchemes,
@@ -317,13 +324,11 @@ export async function buildRequest(
 			flagAuthScheme: input.globals.auth,
 			profileAuthScheme: profile?.authScheme,
 			embeddedAuthScheme: embedded?.auth,
+			hasStoredToken: Boolean(storedToken),
 		},
 	);
 
-	const tokenFromProfile =
-		profile?.name && resolvedAuthScheme
-			? await getToken(input.specId, profile.name)
-			: null;
+	const tokenFromProfile = resolvedAuthScheme ? storedToken : null;
 
 	const globalsWithProfileAuth: RuntimeGlobals = {
 		...input.globals,

package/src/cli/runtime/server-url.ts

@@ -9,7 +9,8 @@ export type ResolveServerInput = {
 };
 
 export function resolveServerUrl(input: ResolveServerInput): string {
-	const base = input.serverOverride ?? input.servers[0]?.url;
+	// Treat empty string as undefined (serverOverride can come from env vars or profiles)
+	const base = input.serverOverride || input.servers[0]?.url;
 	if (!base) {
 		throw new Error(
 			"No server URL found. Provide --server <url> or define servers in the OpenAPI spec.",