@kubb/cli 5.6.0 → 5.6.2

package/dist/{snapshot-D4nKbwkw.cjs → snapshot-BLEmwvP6.cjs}

@@ -1,15 +1,31 @@
 const require_agent = require("./agent-DElUuYuy.cjs");
-const require_run = require("./run-D8Wz_17X.cjs");
-const require_output = require("./output-i3s5c4Xu.cjs");
-const require_config = require("./config-ByfJSj3q.cjs");
+const require_run = require("./run-BQgoSvvl.cjs");
+const require_Telemetry = require("./Telemetry-CuO35YOL.cjs");
+const require_output = require("./output-gox62nKo.cjs");
+const require_config = require("./config-B2BlaYOU.cjs");
 let node_util = require("node:util");
-let node_crypto = require("node:crypto");
 let node_process = require("node:process");
 node_process = require_agent.__toESM(node_process, 1);
+let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
 let _kubb_core = require("@kubb/core");
 let node_fs = require("node:fs");
 let _kubb_studio = require("@kubb/studio");
+//#region ../../internals/utils/src/fs.ts
+/**
+* Reads the file at `path` as a UTF-8 string.
+* Uses `Bun.file().text()` when running under Bun, `fs.readFile` otherwise.
+*
+* @example
+* ```ts
+* const source = await read('./src/Pet.ts')
+* ```
+*/
+async function read(path) {
+	if (require_Telemetry.runtime.isBun) return Bun.file(path).text();
+	return (0, node_fs_promises.readFile)(path, { encoding: "utf8" });
+}
+//#endregion
 //#region src/runners/studio/ci.ts
 function readGithubPullRequest(eventPath) {
 	if (!eventPath) return;
@@ -82,35 +98,17 @@ function detectCi(env = node_process.default.env) {
 //#endregion
 //#region src/runners/studio/snapshot.ts
 /**
-* How long to wait for Studio's `studio:ready` acknowledgement, above the client's own 10s
-* handshake-ack timeout.
+* Walks up from `directory` to the first package.json with a name and a version.
 */
-const READY_TIMEOUT_MS = 15e3;
-/**
-* Longest `--timeout` accepted. Job records expire from Studio's storage after an hour.
-*/
-const MAX_TIMEOUT_SECONDS = 3600;
-const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
-	"localhost",
-	"127.0.0.1",
-	"::1"
-]);
-async function findPackageJson(startDirectory) {
-	let directory = startDirectory;
-	for (;;) {
-		const file = (0, node_path.join)(directory, "package.json");
-		if (await require_run.exists(file)) {
-			const packageJson = JSON.parse(await require_run.read(file));
-			if (packageJson.name && packageJson.version) return {
-				name: packageJson.name,
-				version: packageJson.version
-			};
-		}
-		const parent = (0, node_path.dirname)(directory);
-		if (parent === directory) break;
-		directory = parent;
-	}
-	throw new Error(`No package.json with a name and a version found above ${startDirectory}`);
+async function findPackageJson(directory) {
+	const packageJson = JSON.parse(await read((0, node_path.join)(directory, "package.json")).catch(() => "{}"));
+	if (packageJson.name && packageJson.version) return {
+		name: packageJson.name,
+		version: packageJson.version
+	};
+	const parent = (0, node_path.dirname)(directory);
+	if (parent === directory) throw new Error(`No package.json with a name and a version found above ${node_process.default.cwd()}`);
+	return findPackageJson(parent);
 }
 /** Reads package.json only for whichever of name/version --name and --version did not supply. */
 async function resolvePackageMetadata(options) {
@@ -118,10 +116,10 @@ async function resolvePackageMetadata(options) {
 		name: options.name,
 		version: options.packageVersion
 	};
-	const packageMetadata = await findPackageJson(node_process.default.cwd());
+	const found = await findPackageJson(node_process.default.cwd());
 	return {
-		name: options.name ?? packageMetadata.name,
-		version: options.packageVersion ?? packageMetadata.version
+		name: options.name ?? found.name,
+		version: options.packageVersion ?? found.version
 	};
 }
 function resolveToken(options) {
@@ -146,21 +144,10 @@ function resolveCiIdentity(options) {
 		base: base?.id === ci.id ? void 0 : base
 	};
 }
-/** Rejects a bad `--timeout` up front instead of letting it reach `waitForJob` as NaN or <= 0. */
-function resolveTimeoutMs(options) {
-	const seconds = options.timeout ?? 600;
-	if (!Number.isFinite(seconds) || seconds <= 0) throw new Error("--timeout must be a positive number of seconds");
-	return Math.min(seconds, MAX_TIMEOUT_SECONDS) * 1e3;
-}
-/** The CI key is a credential, so refuse to send it anywhere but HTTPS or a loopback dev host. */
-function assertSecureStudioUrl(studioUrl) {
-	const url = new URL(studioUrl);
-	if (url.protocol !== "https:" && !LOOPBACK_HOSTS.has(url.hostname)) throw new Error(`Refusing to send the CI API key to ${studioUrl}. Use an https:// Studio URL, or a loopback host for local development.`);
-}
 function absoluteUrl(studioUrl, path) {
 	return new URL(path, `${studioUrl}/`).toString();
 }
-function toResult(studioUrl, snapshot, agentSlug, ci) {
+function toResult({ studioUrl, snapshot, ci }) {
 	return {
 		id: snapshot.id,
 		name: snapshot.name,
@@ -169,7 +156,7 @@ function toResult(studioUrl, snapshot, agentSlug, ci) {
 		url: absoluteUrl(studioUrl, snapshot.url),
 		snapshotIdUrl: absoluteUrl(studioUrl, snapshot.snapshotIdUrl),
 		expiresAt: snapshot.expiresAt,
-		agentUrl: absoluteUrl(studioUrl, `/agents/${agentSlug}`),
+		agentUrl: absoluteUrl(studioUrl, `/agents/${snapshot.agent.slug ?? snapshot.agent.id}`),
 		changes: snapshot.changes,
 		branchChanges: snapshot.branchChanges && ci.base ? {
 			...snapshot.branchChanges,
@@ -203,126 +190,71 @@ function printSummary(result) {
 	]);
 }
 /**
-* Generates a Kubb Studio snapshot from a script: registers or reuses a CI agent, connects it,
-* queues a snapshot job, and polls until the tarball is ready. A snapshot job runs generation and
-* packs the tarball in one step, so this needs no separate generation run.
+* Generates the project, packs it, and publishes it to Kubb Studio in one request, under the CI
+* agent the run's identity names.
 */
 async function snapshot(options) {
-	const timeoutMs = resolveTimeoutMs(options);
 	const token = resolveToken(options);
-	assertSecureStudioUrl(options.studioUrl);
-	const { configPath } = await require_run.loadConfigs(options);
+	const { config } = await require_run.loadConfigs(options);
 	const ci = resolveCiIdentity(options);
 	const { name, version: packageVersion } = await resolvePackageMetadata(options);
 	const logLevel = _kubb_core.logLevel[options.logLevel ?? "info"];
-	node_process.default.env.KUBB_AGENT_SECRET = ci.id;
 	const write = options.json ? (line) => console.error(line) : (line) => console.log(line);
-	const logger = require_output.createPlainLogger(write);
+	const hooks = new _kubb_core.Hookable();
+	require_config.setupReporters(hooks, {
+		logLevel,
+		reporters: [_kubb_core.cliReporter],
+		logger: require_output.createPlainLogger(write)
+	});
 	const step = (message) => {
 		if (logLevel > _kubb_core.logLevel.silent) write(message);
 	};
-	step("Creating Kubb Studio agent");
-	const agent = await (0, _kubb_studio.createAgent)({
-		studioUrl: options.studioUrl,
-		token,
-		name: ci.name,
-		machineToken: (0, _kubb_studio.machineTokenFrom)(ci.id)
-	});
-	const instanceId = (0, node_crypto.randomUUID)();
-	const { promise: ready, resolve: markReady } = Promise.withResolvers();
-	const shutdown = new AbortController();
-	const connection = (0, _kubb_studio.runConnection)({
-		credentials: { token: agent.token },
-		signal: shutdown.signal,
-		clientOptions: () => ({
-			studioUrl: options.studioUrl,
-			instanceId,
-			configPath,
-			root: node_process.default.cwd(),
-			version: options.version,
-			permissions: options.permission,
-			loadConfig: async () => (await require_run.loadConfigs(options)).config,
-			installLogger: async (hooks) => {
-				require_config.setupReporters(hooks, {
-					logLevel,
-					reporters: [_kubb_core.cliReporter],
-					logger
-				});
-				hooks.hook("studio:ready", () => markReady());
-			}
-		}),
-		onTokenRejected: ({ error }) => Promise.reject(error)
-	});
-	const connectionLost = new AbortController();
-	const connectionEnded = /* @__PURE__ */ new Error("The Kubb Studio connection ended before the snapshot finished");
-	connection.then(() => connectionLost.abort(connectionEnded), (error) => connectionLost.abort(error));
-	const lost = connection.then(() => Promise.reject(connectionEnded), (error) => Promise.reject(error));
-	lost.catch(() => {});
+	step("Generating the snapshot");
 	try {
-		let readyTimeout;
-		try {
-			await Promise.race([
-				ready,
-				lost,
-				new Promise((_, reject) => {
-					readyTimeout = setTimeout(() => reject(/* @__PURE__ */ new Error("Timed out waiting for Kubb Studio to confirm the agent was ready")), READY_TIMEOUT_MS);
-				})
-			]);
-		} finally {
-			clearTimeout(readyTimeout);
-		}
-		step("Creating snapshot job");
-		const snapshotDeadline = Date.now() + timeoutMs;
-		const snapshotTimeoutMs = () => Math.max(snapshotDeadline - Date.now(), 1);
-		const job = await (0, _kubb_studio.createJob)({
+		const published = await (0, _kubb_studio.createSnapshot)({
 			studioUrl: options.studioUrl,
-			token,
-			type: "snapshot",
-			agentId: agent.id,
-			instanceId,
-			name,
+			apiKey: token,
+			config,
+			hooks,
+			id: ci.id,
+			name: ci.name,
+			packageName: name,
 			version: packageVersion,
 			commit: ci.commit,
-			baseId: ci.base?.id,
-			timeoutMs: snapshotTimeoutMs(),
-			signal: connectionLost.signal
+			baseId: ci.base?.id
 		});
-		step(`Snapshot job queued: ${job.id}`);
-		const finished = await Promise.race([(0, _kubb_studio.waitForJob)({
+		const result = toResult({
 			studioUrl: options.studioUrl,
-			token,
-			id: job.id,
-			timeoutMs: snapshotTimeoutMs(),
-			signal: connectionLost.signal
-		}), lost]);
-		if (finished.status === "failed") throw new Error(finished.error ?? "Snapshot job failed");
-		if (!finished.snapshot) throw new Error("Snapshot job succeeded without a snapshot");
-		const result = toResult(options.studioUrl, finished.snapshot, agent.slug, ci);
+			snapshot: published,
+			ci
+		});
 		step("Snapshot published");
 		if (options.json) console.log(JSON.stringify(result));
 		if (!options.json) printSummary(result);
 	} catch (error) {
 		step("Snapshot failed");
 		throw error;
-	} finally {
-		step("Disconnecting from Kubb Studio");
-		shutdown.abort();
 	}
 }
 const runner = async ({ values }) => {
 	const options = {
-		...require_run.createStudioOptions(values),
+		configPath: values.config,
+		studioUrl: values.url ?? _kubb_studio.defaultStudioUrl,
+		logLevel: values.logLevel,
 		token: values.token,
 		id: values.id,
 		baseId: values.baseId,
 		name: values.name,
 		packageVersion: values.packageVersion,
-		timeout: values.timeout,
 		json: values.json
 	};
-	await require_run.run(options, () => snapshot(options), { json: options.json });
+	await require_run.run({
+		options,
+		action: () => snapshot(options),
+		json: options.json
+	});
 };
 //#endregion
 exports.runner = runner;
 
-//# sourceMappingURL=snapshot-D4nKbwkw.cjs.map
+//# sourceMappingURL=snapshot-BLEmwvP6.cjs.map

package/dist/snapshot-BLEmwvP6.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot-BLEmwvP6.cjs","names":["runtime","readFile","readFileSync","process","join","dirname","process","styleText","loadConfigs","logLevelMap","Hookable","cliReporter","createPlainLogger","createSnapshot","defaultStudioUrl","run"],"sources":["../../../internals/utils/src/fs.ts","../src/runners/studio/ci.ts","../src/runners/studio/snapshot.ts"],"sourcesContent":["import { access, mkdir, readFile, rm, writeFile } from 'node:fs/promises'\nimport { dirname, isAbsolute, relative, resolve } from 'node:path'\nimport { runtime } from './runtime.ts'\n\n/**\n * Resolves to `true` when the file or directory at `path` exists.\n * Uses `Bun.file().exists()` when running under Bun, `fs.access` otherwise.\n *\n * @example\n * ```ts\n * if (await exists('./kubb.config.ts')) {\n *   const content = await read('./kubb.config.ts')\n * }\n * ```\n */\nexport async function exists(path: string): Promise<boolean> {\n  if (runtime.isBun) {\n    return Bun.file(path).exists()\n  }\n  return access(path).then(\n    () => true,\n    () => false,\n  )\n}\n\n/**\n * Reads the file at `path` as a UTF-8 string.\n * Uses `Bun.file().text()` when running under Bun, `fs.readFile` otherwise.\n *\n * @example\n * ```ts\n * const source = await read('./src/Pet.ts')\n * ```\n */\nexport async function read(path: string): Promise<string> {\n  if (runtime.isBun) {\n    return Bun.file(path).text()\n  }\n  return readFile(path, { encoding: 'utf8' })\n}\n\ntype WriteOptions = {\n  /**\n   * Previously read content, or `null` when the file does not exist.\n   * Omitting this value reads the file before writing.\n   */\n  stored?: string | null\n  /**\n   * When `true`, re-reads the file immediately after writing and throws if the\n   * content does not match — useful for catching write failures on unreliable file systems.\n   */\n  sanity?: boolean\n}\n\n/**\n * Whether `stored` already holds `source`, comparing on the trimmed text rather than the exact\n * bytes. Surrounding whitespace is what a formatter adds and what editors strip, and neither is a\n * reason to rewrite the file.\n *\n * Both sides are trimmed, so a storage that keeps bytes verbatim settles on the same answer as one\n * that normalizes what it stores. Trimming only `stored` would leave a source with leading\n * whitespace rewritten on every build, since the stored copy keeps the whitespace the comparison\n * has already dropped.\n */\nexport function matchesStored({ stored, source }: { stored: string; source: string }): boolean {\n  return stored.trim() === source.trim()\n}\n\n/**\n * Writes `data` to `path`, trimming surrounding whitespace and ending the file with a single newline\n * the way prettier, biome, and oxfmt all do.\n * Skips the write when the trimmed content is empty, or when the file already holds that content.\n * Creates any missing parent directories automatically.\n * When `sanity` is `true`, re-reads the file after writing and throws if the content does not match.\n *\n * @example\n * ```ts\n * await write('./src/Pet.ts', source)         // writes and returns the trimmed content plus a newline\n * await write('./src/Pet.ts', source)         // null — file unchanged\n * await write('./src/Pet.ts', '  ')           // null — empty content skipped\n * ```\n */\nexport async function write(path: string, data: string, options: WriteOptions = {}): Promise<string | null> {\n  const trimmed = data.trim()\n  if (trimmed === '') return null\n\n  const content = `${trimmed}\\n`\n  const resolved = resolve(path)\n  let stored = options.stored\n\n  if (stored === undefined) {\n    if (runtime.isBun) {\n      const file = Bun.file(resolved)\n      stored = (await file.exists()) ? await file.text() : null\n    } else {\n      try {\n        stored = await readFile(resolved, { encoding: 'utf-8' })\n      } catch {\n        /* file doesn't exist yet */\n        stored = null\n      }\n    }\n  }\n  if (matchesStored({ stored: stored ?? '', source: trimmed })) return null\n\n  if (runtime.isBun) {\n    await Bun.write(resolved, content)\n    return content\n  }\n\n  // Creating the directory up front costs a syscall per file, and every file after the first in a\n  // directory pays it for nothing. Write first and only fall back when the directory is missing,\n  // which also stays correct when something removed it mid-run.\n  try {\n    await writeFile(resolved, content, { encoding: 'utf-8' })\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error\n\n    await mkdir(dirname(resolved), { recursive: true })\n    await writeFile(resolved, content, { encoding: 'utf-8' })\n  }\n\n  if (options.sanity) {\n    const savedData = await readFile(resolved, { encoding: 'utf-8' })\n    if (savedData !== content) {\n      throw new Error(`Sanity check failed for ${path}\\n\\nData[${data.length}]:\\n${data}\\n\\nSaved[${savedData.length}]:\\n${savedData}\\n`)\n    }\n    return savedData\n  }\n\n  return content\n}\n\n/**\n * Recursively removes `path`. Silently succeeds when `path` does not exist.\n *\n * @example\n * ```ts\n * await clean('./dist')\n * ```\n */\nexport async function clean(path: string): Promise<void> {\n  return rm(path, { recursive: true, force: true })\n}\n\n/**\n * Converts a filesystem path to use POSIX (`/`) separators.\n *\n * Most of the codebase compares and composes paths as strings (prefix matching, joining for\n * import specifiers, splitting on `/`). On POSIX `path.resolve` already returns `/`-separated\n * paths, but on Windows it returns `\\`-separated paths, which breaks every such comparison.\n *\n * Routing every path that crosses a module boundary through `toPosixPath` keeps the rest of the\n * code platform-agnostic. The conversion runs unconditionally so Windows-specific behavior is\n * exercisable from POSIX CI.\n *\n * @example\n * toPosixPath('C:\\\\repo\\\\src\\\\pet.ts') // 'C:/repo/src/pet.ts'\n */\nexport function toPosixPath(filePath: string): string {\n  return filePath.replaceAll('\\\\', '/')\n}\n\n/**\n * Strips the file extension from a path or file name.\n * Only removes the last `.ext` segment when the dot is not part of a directory name.\n *\n * @example\n * trimExtName('petStore.ts')             // 'petStore'\n * trimExtName('/src/models/pet.ts')      // '/src/models/pet'\n * trimExtName('/project.v2/gen/pet.ts')  // '/project.v2/gen/pet'\n * trimExtName('noExtension')             // 'noExtension'\n */\nexport function trimExtName(text: string): string {\n  const dotIndex = text.lastIndexOf('.')\n  if (dotIndex > 0 && !text.includes('/', dotIndex)) {\n    return text.slice(0, dotIndex)\n  }\n  return text\n}\n\n/**\n * Resolves to `true` when `path` is `parent` itself or nested inside it. Both sides are resolved\n * to absolute paths first, so relative and `..`-containing inputs compare correctly.\n *\n * Guards a destructive or an out-of-tree operation: before wiping an output directory, check that\n * it does not contain the project root, and before loading a path a caller supplied, check that it\n * did not escape the directory it is allowed to read from.\n *\n * @example\n * isPathInside('./src/gen', '.')   // true  — nested inside the root\n * isPathInside('.', '.')           // true  — the same directory counts as inside\n * isPathInside('.', './src/gen')   // false — the root is not inside its own output\n * isPathInside('../other', '.')    // false — escapes the root\n */\nexport function isPathInside(path: string, parent: string): boolean {\n  const resolvedPath = resolve(path)\n  const resolvedParent = resolve(parent)\n  if (resolvedPath === resolvedParent) {\n    return true\n  }\n\n  const rel = relative(resolvedParent, resolvedPath)\n\n  return rel !== '' && !rel.startsWith('..') && !isAbsolute(rel)\n}\n","import { readFileSync } from 'node:fs'\nimport process from 'node:process'\n\n/**\n * Stable identity for the CI agent a snapshot run registers or reuses.\n */\nexport type CiContext = {\n  /**\n   * Fed into the machine token, so the same merge or pull request reuses one agent.\n   */\n  id: string\n  /**\n   * Agent display name shown in Studio.\n   */\n  name: string\n  /** The commit this run builds, so the next snapshot can diff against it. */\n  commit?: string\n  /** The branch a pull request merges into, and the `id` runs on that branch register under. */\n  base?: { branch: string; id: string }\n}\n\ntype GithubPullRequest = { number: number; head?: { sha?: string }; base?: { ref?: string } }\n\nfunction readGithubPullRequest(eventPath: string | undefined): GithubPullRequest | undefined {\n  if (!eventPath) {\n    return undefined\n  }\n\n  try {\n    const event = JSON.parse(readFileSync(eventPath, 'utf8')) as { pull_request?: GithubPullRequest }\n    return event.pull_request?.number ? event.pull_request : undefined\n  } catch {\n    return undefined\n  }\n}\n\n/** Reproduces GitLab's `CI_COMMIT_REF_SLUG` for a branch it gives no slug of, like a merge request's target. */\nexport function gitlabRefSlug(ref: string): string {\n  return ref\n    .toLowerCase()\n    .replace(/[^a-z0-9]/gu, '-')\n    .slice(0, 63)\n    .replace(/^-+|-+$/g, '')\n}\n\n/**\n * Detects the CI provider from its environment variables and derives a stable identity from it.\n * The GitHub row reproduces `gh:<repositoryId>:<prNumber>`, the identity `kubb-labs/action` has\n * always registered agents under, so an existing repository keeps reusing its agent.\n */\nexport function detectCi(env: Record<string, string | undefined> = process.env): CiContext | null {\n  if (env.GITHUB_ACTIONS) {\n    const pullRequest = readGithubPullRequest(env.GITHUB_EVENT_PATH)\n    const repositoryId = env.GITHUB_REPOSITORY_ID ?? env.GITHUB_REPOSITORY ?? ''\n    const branch = env.GITHUB_REF?.startsWith('refs/heads/') ? env.GITHUB_REF.slice('refs/heads/'.length) : undefined\n    // A branch run is scoped by its ref, which a pull request number never collides with.\n    const scope = pullRequest?.number ?? (branch ? `refs/heads/${branch}` : env.GITHUB_RUN_ID) ?? ''\n    const baseBranch = pullRequest?.base?.ref\n\n    return {\n      id: `gh:${repositoryId}:${scope}`,\n      name: `${env.GITHUB_REPOSITORY ?? 'github'}#${pullRequest?.number ?? branch ?? scope}`,\n      // The head commit, not the merge commit a pull request run checks out.\n      commit: pullRequest?.head?.sha ?? env.GITHUB_SHA,\n      base: baseBranch ? { branch: baseBranch, id: `gh:${repositoryId}:refs/heads/${baseBranch}` } : undefined,\n    }\n  }\n\n  if (env.GITLAB_CI) {\n    const scope = env.CI_MERGE_REQUEST_IID ?? env.CI_COMMIT_REF_SLUG ?? ''\n    const baseBranch = env.CI_MERGE_REQUEST_TARGET_BRANCH_NAME\n\n    return {\n      id: `gl:${env.CI_PROJECT_ID ?? ''}:${scope}`,\n      name: `${env.CI_PROJECT_PATH ?? 'gitlab'}#${scope}`,\n      commit: env.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA || env.CI_COMMIT_SHA,\n      base: baseBranch ? { branch: baseBranch, id: `gl:${env.CI_PROJECT_ID ?? ''}:${gitlabRefSlug(baseBranch)}` } : undefined,\n    }\n  }\n\n  if (env.BITBUCKET_BUILD_NUMBER) {\n    const scope = env.BITBUCKET_PR_ID ?? env.BITBUCKET_BRANCH ?? ''\n\n    return { id: `bb:${env.BITBUCKET_REPO_UUID ?? ''}:${scope}`, name: `${env.BITBUCKET_REPO_FULL_NAME ?? 'bitbucket'}#${scope}`, commit: env.BITBUCKET_COMMIT }\n  }\n\n  if (env.CIRCLECI) {\n    // Owner-qualified: two projects with the same name under different CircleCI orgs must not\n    // collide on one agent, since registering it purges the other project's live sessions.\n    const owner = env.CIRCLE_PROJECT_USERNAME ?? ''\n    const project = env.CIRCLE_PROJECT_REPONAME ?? 'circleci'\n    const scope = env.CIRCLE_PR_NUMBER ?? env.CIRCLE_BRANCH ?? ''\n\n    return { id: `circle:${owner}:${project}:${scope}`, name: `${owner ? `${owner}/` : ''}${project}#${scope}`, commit: env.CIRCLE_SHA1 }\n  }\n\n  return null\n}\n","import { dirname, join } from 'node:path'\nimport process from 'node:process'\nimport { styleText } from 'node:util'\nimport { read } from '@internals/utils'\nimport { cliReporter, Hookable, type KubbHooks, logLevel as logLevelMap } from '@kubb/core'\nimport { createSnapshot, defaultStudioUrl } from '@kubb/studio'\nimport type { BranchSnapshotChanges, PublishedSnapshot, SnapshotChanges } from '@kubb/studio/protocol'\nimport { logBlock } from '../../loggers/output.ts'\nimport { createPlainLogger } from '../../loggers/plainLogger.ts'\nimport setupReporters from '../../loggers/reporters.ts'\nimport { type CiContext, detectCi } from './ci.ts'\nimport { loadConfigs, run, type SnapshotOptions } from './run.ts'\nimport type { command } from '../../commands/studio/snapshot.ts'\nimport type { CommandRunner } from 'gunshi'\n\n/**\n * Walks up from `directory` to the first package.json with a name and a version.\n */\nasync function findPackageJson(directory: string): Promise<{ name: string; version: string }> {\n  const packageJson = JSON.parse(await read(join(directory, 'package.json')).catch(() => '{}')) as Partial<{ name: string; version: string }>\n  if (packageJson.name && packageJson.version) return { name: packageJson.name, version: packageJson.version }\n\n  const parent = dirname(directory)\n  if (parent === directory) throw new Error(`No package.json with a name and a version found above ${process.cwd()}`)\n\n  return findPackageJson(parent)\n}\n\n/** Reads package.json only for whichever of name/version --name and --version did not supply. */\nasync function resolvePackageMetadata(options: SnapshotOptions): Promise<{ name: string; version: string }> {\n  if (options.name && options.packageVersion) return { name: options.name, version: options.packageVersion }\n\n  const found = await findPackageJson(process.cwd())\n  return { name: options.name ?? found.name, version: options.packageVersion ?? found.version }\n}\n\nfunction resolveToken(options: SnapshotOptions): string {\n  const token = options.token ?? process.env.KUBB_TOKEN\n\n  if (!token) {\n    throw new Error('An organization CI API key is required. Pass --token or set KUBB_TOKEN.')\n  }\n\n  return token\n}\n\nfunction resolveCiIdentity(options: SnapshotOptions): CiContext {\n  const detected = detectCi()\n  // A custom --id drops the detected base, since runs on that branch may use a custom id too.\n  const ci = options.id ? { id: options.id, name: detected?.name ?? options.id, commit: detected?.commit } : detected\n\n  if (!ci) {\n    throw new Error('Could not detect a supported CI provider (GitHub Actions, GitLab CI, Bitbucket Pipelines, CircleCI). Pass --id.')\n  }\n\n  // An explicit --base-id may not name a branch, so it labels the comparison itself.\n  const base = options.baseId ? { branch: options.baseId, id: options.baseId } : ci.base\n\n  return { ...ci, base: base?.id === ci.id ? undefined : base }\n}\n\nfunction absoluteUrl(studioUrl: string, path: string): string {\n  return new URL(path, `${studioUrl}/`).toString()\n}\n\ntype SnapshotResult = {\n  id: string\n  name: string | null\n  version: string | null\n  integrity: string | null\n  url: string\n  snapshotIdUrl: string\n  expiresAt: string\n  agentUrl: string\n  /** What changed since the previous snapshot of this package on this agent. */\n  changes?: SnapshotChanges\n  /** What differs from the latest snapshot of the base branch, named by `branch`. */\n  branchChanges?: BranchSnapshotChanges & { branch: string }\n}\n\nfunction toResult({ studioUrl, snapshot, ci }: { studioUrl: string; snapshot: PublishedSnapshot; ci: CiContext }): SnapshotResult {\n  return {\n    id: snapshot.id,\n    name: snapshot.name,\n    version: snapshot.version,\n    integrity: snapshot.integrity,\n    url: absoluteUrl(studioUrl, snapshot.url),\n    snapshotIdUrl: absoluteUrl(studioUrl, snapshot.snapshotIdUrl),\n    expiresAt: snapshot.expiresAt,\n    agentUrl: absoluteUrl(studioUrl, `/agents/${snapshot.agent.slug ?? snapshot.agent.id}`),\n    changes: snapshot.changes,\n    branchChanges: snapshot.branchChanges && ci.base ? { ...snapshot.branchChanges, branch: ci.base.branch } : undefined,\n  }\n}\n\n/** How many files differ, `against` what. */\nfunction describeChanges(changes: SnapshotChanges, against: string): string {\n  const { added, changed, removed } = changes\n\n  return added.length + changed.length + removed.length\n    ? `${added.length} added, ${changed.length} changed, ${removed.length} removed ${against}`\n    : `No changes ${against}`\n}\n\n/** One summary line: how many files changed, and since which run. */\nexport function formatChanges(changes: SnapshotChanges): string {\n  if (!changes.base) {\n    return 'First snapshot'\n  }\n\n  return describeChanges(changes, `since ${changes.base.commit?.slice(0, 7) ?? changes.base.createdAt}`)\n}\n\n/** One summary line: how the snapshot differs from the base branch's latest one. */\nexport function formatBranchChanges(changes: BranchSnapshotChanges & { branch: string }): string {\n  if (changes.base) return describeChanges(changes, `against ${changes.branch}`)\n\n  return changes.baseFound ? `No snapshot of ${changes.branch} for this package yet` : `No snapshot of ${changes.branch} to compare with`\n}\n\nfunction printSummary(result: SnapshotResult): void {\n  logBlock([\n    `${styleText('dim', 'Package'.padEnd(10))}  ${result.name ?? '(unnamed)'}@${result.version ?? '0.0.0'}`,\n    `${styleText('dim', 'Tarball'.padEnd(10))}  ${styleText('cyan', result.url)}`,\n    `${styleText('dim', 'Agent'.padEnd(10))}  ${result.agentUrl}`,\n    ...(result.branchChanges ? [`${styleText('dim', 'Branch'.padEnd(10))}  ${formatBranchChanges(result.branchChanges)}`] : []),\n    ...(result.changes ? [`${styleText('dim', 'Changes'.padEnd(10))}  ${formatChanges(result.changes)}`] : []),\n    `${styleText('dim', 'Expires'.padEnd(10))}  ${result.expiresAt}`,\n  ])\n}\n\n/**\n * Generates the project, packs it, and publishes it to Kubb Studio in one request, under the CI\n * agent the run's identity names.\n */\nexport async function snapshot(options: SnapshotOptions): Promise<void> {\n  const token = resolveToken(options)\n  const { config } = await loadConfigs(options)\n  const ci = resolveCiIdentity(options)\n  const { name, version: packageVersion } = await resolvePackageMetadata(options)\n  const logLevel = logLevelMap[options.logLevel ?? 'info']\n\n  const write = options.json ? (line: string) => console.error(line) : (line: string) => console.log(line)\n  const hooks = new Hookable<KubbHooks>()\n  setupReporters(hooks, { logLevel, reporters: [cliReporter], logger: createPlainLogger(write) })\n  const step = (message: string) => {\n    if (logLevel > logLevelMap.silent) {\n      write(message)\n    }\n  }\n\n  step('Generating the snapshot')\n\n  try {\n    const published = await createSnapshot({\n      studioUrl: options.studioUrl,\n      apiKey: token,\n      config,\n      hooks,\n      id: ci.id,\n      name: ci.name,\n      packageName: name,\n      version: packageVersion,\n      commit: ci.commit,\n      baseId: ci.base?.id,\n    })\n    const result = toResult({ studioUrl: options.studioUrl, snapshot: published, ci })\n\n    step('Snapshot published')\n\n    if (options.json) {\n      console.log(JSON.stringify(result))\n    }\n    if (!options.json) {\n      printSummary(result)\n    }\n  } catch (error) {\n    step('Snapshot failed')\n    throw error\n  }\n}\n\nexport const runner: CommandRunner<{ args: typeof command.args; extensions: {} }> = async ({ values }) => {\n  const options: SnapshotOptions = {\n    configPath: values.config,\n    studioUrl: values.url ?? defaultStudioUrl,\n    logLevel: values.logLevel,\n    token: values.token,\n    id: values.id,\n    baseId: values.baseId,\n    name: values.name,\n    packageVersion: values.packageVersion,\n    json: values.json,\n  }\n  await run({ options, action: () => snapshot(options), json: options.json })\n}\n"],"mappings":"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"}

package/dist/{snapshot-CkHXR0Nl.js → snapshot-DVdepLl5.js}

@@ -1,14 +1,30 @@
 import "./rolldown-runtime-CRm0XQPb.js";
-import { d as exists, f as read, i as loadConfigs, n as createStudioOptions, s as run } from "./run-Dgph0WYk.js";
-import { r as setupReporters } from "./config-8Xl4yZmw.js";
-import { h as createPlainLogger, r as logBlock } from "./output-B6Ondw0g.js";
+import { i as loadConfigs, s as run } from "./run-B_0Vp1ZV.js";
+import { i as runtime } from "./Telemetry-DqT0XYcN.js";
+import { r as setupReporters } from "./config-CCxOcwWu.js";
+import { h as createPlainLogger, r as logBlock } from "./output-CnSY0tCG.js";
 import { styleText } from "node:util";
-import { randomUUID } from "node:crypto";
 import process from "node:process";
+import { readFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { readFileSync } from "node:fs";
-import { createAgent, createJob, machineTokenFrom, runConnection, waitForJob } from "@kubb/studio";
-import { cliReporter, logLevel } from "@kubb/core";
+import { Hookable, cliReporter, logLevel } from "@kubb/core";
+import { createSnapshot, defaultStudioUrl } from "@kubb/studio";
+//#region ../../internals/utils/src/fs.ts
+/**
+* Reads the file at `path` as a UTF-8 string.
+* Uses `Bun.file().text()` when running under Bun, `fs.readFile` otherwise.
+*
+* @example
+* ```ts
+* const source = await read('./src/Pet.ts')
+* ```
+*/
+async function read(path) {
+	if (runtime.isBun) return Bun.file(path).text();
+	return readFile(path, { encoding: "utf8" });
+}
+//#endregion
 //#region src/runners/studio/ci.ts
 function readGithubPullRequest(eventPath) {
 	if (!eventPath) return;
@@ -81,35 +97,17 @@ function detectCi(env = process.env) {
 //#endregion
 //#region src/runners/studio/snapshot.ts
 /**
-* How long to wait for Studio's `studio:ready` acknowledgement, above the client's own 10s
-* handshake-ack timeout.
+* Walks up from `directory` to the first package.json with a name and a version.
 */
-const READY_TIMEOUT_MS = 15e3;
-/**
-* Longest `--timeout` accepted. Job records expire from Studio's storage after an hour.
-*/
-const MAX_TIMEOUT_SECONDS = 3600;
-const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
-	"localhost",
-	"127.0.0.1",
-	"::1"
-]);
-async function findPackageJson(startDirectory) {
-	let directory = startDirectory;
-	for (;;) {
-		const file = join(directory, "package.json");
-		if (await exists(file)) {
-			const packageJson = JSON.parse(await read(file));
-			if (packageJson.name && packageJson.version) return {
-				name: packageJson.name,
-				version: packageJson.version
-			};
-		}
-		const parent = dirname(directory);
-		if (parent === directory) break;
-		directory = parent;
-	}
-	throw new Error(`No package.json with a name and a version found above ${startDirectory}`);
+async function findPackageJson(directory) {
+	const packageJson = JSON.parse(await read(join(directory, "package.json")).catch(() => "{}"));
+	if (packageJson.name && packageJson.version) return {
+		name: packageJson.name,
+		version: packageJson.version
+	};
+	const parent = dirname(directory);
+	if (parent === directory) throw new Error(`No package.json with a name and a version found above ${process.cwd()}`);
+	return findPackageJson(parent);
 }
 /** Reads package.json only for whichever of name/version --name and --version did not supply. */
 async function resolvePackageMetadata(options) {
@@ -117,10 +115,10 @@ async function resolvePackageMetadata(options) {
 		name: options.name,
 		version: options.packageVersion
 	};
-	const packageMetadata = await findPackageJson(process.cwd());
+	const found = await findPackageJson(process.cwd());
 	return {
-		name: options.name ?? packageMetadata.name,
-		version: options.packageVersion ?? packageMetadata.version
+		name: options.name ?? found.name,
+		version: options.packageVersion ?? found.version
 	};
 }
 function resolveToken(options) {
@@ -145,21 +143,10 @@ function resolveCiIdentity(options) {
 		base: base?.id === ci.id ? void 0 : base
 	};
 }
-/** Rejects a bad `--timeout` up front instead of letting it reach `waitForJob` as NaN or <= 0. */
-function resolveTimeoutMs(options) {
-	const seconds = options.timeout ?? 600;
-	if (!Number.isFinite(seconds) || seconds <= 0) throw new Error("--timeout must be a positive number of seconds");
-	return Math.min(seconds, MAX_TIMEOUT_SECONDS) * 1e3;
-}
-/** The CI key is a credential, so refuse to send it anywhere but HTTPS or a loopback dev host. */
-function assertSecureStudioUrl(studioUrl) {
-	const url = new URL(studioUrl);
-	if (url.protocol !== "https:" && !LOOPBACK_HOSTS.has(url.hostname)) throw new Error(`Refusing to send the CI API key to ${studioUrl}. Use an https:// Studio URL, or a loopback host for local development.`);
-}
 function absoluteUrl(studioUrl, path) {
 	return new URL(path, `${studioUrl}/`).toString();
 }
-function toResult(studioUrl, snapshot, agentSlug, ci) {
+function toResult({ studioUrl, snapshot, ci }) {
 	return {
 		id: snapshot.id,
 		name: snapshot.name,
@@ -168,7 +155,7 @@ function toResult(studioUrl, snapshot, agentSlug, ci) {
 		url: absoluteUrl(studioUrl, snapshot.url),
 		snapshotIdUrl: absoluteUrl(studioUrl, snapshot.snapshotIdUrl),
 		expiresAt: snapshot.expiresAt,
-		agentUrl: absoluteUrl(studioUrl, `/agents/${agentSlug}`),
+		agentUrl: absoluteUrl(studioUrl, `/agents/${snapshot.agent.slug ?? snapshot.agent.id}`),
 		changes: snapshot.changes,
 		branchChanges: snapshot.branchChanges && ci.base ? {
 			...snapshot.branchChanges,
@@ -202,126 +189,71 @@ function printSummary(result) {
 	]);
 }
 /**
-* Generates a Kubb Studio snapshot from a script: registers or reuses a CI agent, connects it,
-* queues a snapshot job, and polls until the tarball is ready. A snapshot job runs generation and
-* packs the tarball in one step, so this needs no separate generation run.
+* Generates the project, packs it, and publishes it to Kubb Studio in one request, under the CI
+* agent the run's identity names.
 */
 async function snapshot(options) {
-	const timeoutMs = resolveTimeoutMs(options);
 	const token = resolveToken(options);
-	assertSecureStudioUrl(options.studioUrl);
-	const { configPath } = await loadConfigs(options);
+	const { config } = await loadConfigs(options);
 	const ci = resolveCiIdentity(options);
 	const { name, version: packageVersion } = await resolvePackageMetadata(options);
 	const logLevel$1 = logLevel[options.logLevel ?? "info"];
-	process.env.KUBB_AGENT_SECRET = ci.id;
 	const write = options.json ? (line) => console.error(line) : (line) => console.log(line);
-	const logger = createPlainLogger(write);
+	const hooks = new Hookable();
+	setupReporters(hooks, {
+		logLevel: logLevel$1,
+		reporters: [cliReporter],
+		logger: createPlainLogger(write)
+	});
 	const step = (message) => {
 		if (logLevel$1 > logLevel.silent) write(message);
 	};
-	step("Creating Kubb Studio agent");
-	const agent = await createAgent({
-		studioUrl: options.studioUrl,
-		token,
-		name: ci.name,
-		machineToken: machineTokenFrom(ci.id)
-	});
-	const instanceId = randomUUID();
-	const { promise: ready, resolve: markReady } = Promise.withResolvers();
-	const shutdown = new AbortController();
-	const connection = runConnection({
-		credentials: { token: agent.token },
-		signal: shutdown.signal,
-		clientOptions: () => ({
-			studioUrl: options.studioUrl,
-			instanceId,
-			configPath,
-			root: process.cwd(),
-			version: options.version,
-			permissions: options.permission,
-			loadConfig: async () => (await loadConfigs(options)).config,
-			installLogger: async (hooks) => {
-				setupReporters(hooks, {
-					logLevel: logLevel$1,
-					reporters: [cliReporter],
-					logger
-				});
-				hooks.hook("studio:ready", () => markReady());
-			}
-		}),
-		onTokenRejected: ({ error }) => Promise.reject(error)
-	});
-	const connectionLost = new AbortController();
-	const connectionEnded = /* @__PURE__ */ new Error("The Kubb Studio connection ended before the snapshot finished");
-	connection.then(() => connectionLost.abort(connectionEnded), (error) => connectionLost.abort(error));
-	const lost = connection.then(() => Promise.reject(connectionEnded), (error) => Promise.reject(error));
-	lost.catch(() => {});
+	step("Generating the snapshot");
 	try {
-		let readyTimeout;
-		try {
-			await Promise.race([
-				ready,
-				lost,
-				new Promise((_, reject) => {
-					readyTimeout = setTimeout(() => reject(/* @__PURE__ */ new Error("Timed out waiting for Kubb Studio to confirm the agent was ready")), READY_TIMEOUT_MS);
-				})
-			]);
-		} finally {
-			clearTimeout(readyTimeout);
-		}
-		step("Creating snapshot job");
-		const snapshotDeadline = Date.now() + timeoutMs;
-		const snapshotTimeoutMs = () => Math.max(snapshotDeadline - Date.now(), 1);
-		const job = await createJob({
+		const published = await createSnapshot({
 			studioUrl: options.studioUrl,
-			token,
-			type: "snapshot",
-			agentId: agent.id,
-			instanceId,
-			name,
+			apiKey: token,
+			config,
+			hooks,
+			id: ci.id,
+			name: ci.name,
+			packageName: name,
 			version: packageVersion,
 			commit: ci.commit,
-			baseId: ci.base?.id,
-			timeoutMs: snapshotTimeoutMs(),
-			signal: connectionLost.signal
+			baseId: ci.base?.id
 		});
-		step(`Snapshot job queued: ${job.id}`);
-		const finished = await Promise.race([waitForJob({
+		const result = toResult({
 			studioUrl: options.studioUrl,
-			token,
-			id: job.id,
-			timeoutMs: snapshotTimeoutMs(),
-			signal: connectionLost.signal
-		}), lost]);
-		if (finished.status === "failed") throw new Error(finished.error ?? "Snapshot job failed");
-		if (!finished.snapshot) throw new Error("Snapshot job succeeded without a snapshot");
-		const result = toResult(options.studioUrl, finished.snapshot, agent.slug, ci);
+			snapshot: published,
+			ci
+		});
 		step("Snapshot published");
 		if (options.json) console.log(JSON.stringify(result));
 		if (!options.json) printSummary(result);
 	} catch (error) {
 		step("Snapshot failed");
 		throw error;
-	} finally {
-		step("Disconnecting from Kubb Studio");
-		shutdown.abort();
 	}
 }
 const runner = async ({ values }) => {
 	const options = {
-		...createStudioOptions(values),
+		configPath: values.config,
+		studioUrl: values.url ?? defaultStudioUrl,
+		logLevel: values.logLevel,
 		token: values.token,
 		id: values.id,
 		baseId: values.baseId,
 		name: values.name,
 		packageVersion: values.packageVersion,
-		timeout: values.timeout,
 		json: values.json
 	};
-	await run(options, () => snapshot(options), { json: options.json });
+	await run({
+		options,
+		action: () => snapshot(options),
+		json: options.json
+	});
 };
 //#endregion
 export { runner };
 
-//# sourceMappingURL=snapshot-CkHXR0Nl.js.map
+//# sourceMappingURL=snapshot-DVdepLl5.js.map