@metabase/rde 0.1.8 → 0.1.9

package/README.md

@@ -59,7 +59,7 @@ The git step reads `–` until a license with remote sync is active; it is check
 | Start Metabase | Starts the container or the jar and waits for `/api/health`, showing Metabase's own progress |
 | Create the admin user | `admin@metabase.local` with a generated password that `rde credentials` shows, or your own with `--admin prompted`, see [Credentials](#credentials) |
 | Connect the Metabase CLI | Creates an API key named `rde` and logs `mb` in with it under the profile `default`, so plain `mb` uses the instance; when `default` already points at another Metabase it asks first, see [The `mb` profile](#the-mb-profile); a key Metabase rejects is replaced |
-| Connect a sample database | Runs Metabase's Postgres sample data (`metabase/qa-databases:postgres-sample-15`) in a container named `rde-sampledb-default` on the first free port from 15432, connects it as `Sample Database`, and switches transforms on. It replaces the H2 sample database Metabase would otherwise bundle, which cannot be a transform target. Needs Docker, so a jar instance on a machine without Docker keeps the H2 one instead |
+| Connect a sample database | Runs Metabase's Postgres sample data (`metabase/qa-databases:postgres-sample-15`) in a container named `rde-sampledb-default` on the first free port from 15432 (or one Docker picks, when another program or a concurrent `rde init` takes that port first), connects it as `Sample Database`, and switches transforms on. It replaces the H2 sample database Metabase would otherwise bundle, which cannot be a transform target. Needs Docker, so a jar instance on a machine without Docker keeps the H2 one instead |
 | Activate your license | Optional. Paste a token, or press Enter to skip; remote sync needs one with the `remote-sync` feature |
 | Connect your databases | At a terminal, until you connect one of your own or skip it: paste a connection string (Enter skips), review, test, add; repeat. `--database` names them ahead of time; with `--yes` or without a terminal nothing is asked. `rde db add` starts from the engine list, where the fields can also be filled one by one |
 | Connect a git repository | Only with a license. Initializes or reuses a repository and points Metabase's remote sync at it |
@@ -102,7 +102,7 @@ The second run on the same machine detects every step as done and prints the sum
 └  rde init finished
 ```
 
-Ctrl-C at any prompt stops the run; `rde init` again continues from the first step that is not done. A step that fails ends the run with exit code 1 (2 for a missing answer) and a last line naming the step and the command that resumes there: `rde init stopped at "Connect a sample database": <reason>. Resume with rde init --from sample-database.` `rde init --from license` re-runs from a step on, `rde init --only databases` runs one step.
+Ctrl-C at any prompt stops the run; `rde init` again continues from the first step that is not done. A step that fails ends the run with exit code 1 (2 for a missing answer) and a last line naming the step and the command that resumes there: `rde init stopped at "Connect a sample database": <reason>. Resume with rde init --from sample-database.` `rde init --from license` re-runs from a step on (a later step that does not apply, such as the git step without a license that has remote sync, stays skipped), `rde init --only databases` runs one step.
 
 ## The sample database
 
@@ -191,10 +191,10 @@ mb git-sync status
 
 ## The git repository
 
-With a license that includes remote sync, the last step connects a git repository. You choose where the working directory lives (here, a new directory, or an existing repository) and where Metabase pushes:
+With a license that includes remote sync, the last step connects a git repository. You choose where Metabase pushes, then where the working directory lives (here, another directory, or an existing repository):
 
 - **Local remote inside `~/.rde`** (default): a bare repository at `instances/default/data/content.git`, mounted into the container and reached as `file:///rde/content.git`. No account, no token. Your working directory gets it as `origin` (or as `rde-remote` when `origin` already points elsewhere).
-- **Hosted remote**: a GitHub, GitLab, or Bitbucket `https://` URL plus a token with read and write access. `rde` tests the connection through Metabase before saving anything.
+- **Hosted remote**: a GitHub, GitLab, or Bitbucket `https://` URL plus a token with read and write access. `rde` tests the connection through Metabase before saving anything, then clones the repository into the working directory (an existing repository gets the URL as `origin` instead); an empty hosted repository gets the first commit pushed to it. The token is handed to Metabase and, for the clone and that first push, to git in its environment; it never lands in the clone's config, the remote URL, or a credential helper, so a later `git pull` uses your own git credentials.
 
 A fresh repository gets a first commit with a `README.md` and a `.gitignore` that keeps out what a data app built in it must not push: `.env`, `.env.local`, `.env.*.local`, `node_modules/`, `.vite/`, the rde skill's `.scratch/`, and `.DS_Store` (a data app's built `dist/` stays tracked, since that bundle is what Metabase serves); a `.gitignore` already there keeps its lines and gets the missing ones, and a repository that already has commits is left as it is. A repository that already holds Metabase content is imported on the spot. Afterwards:
 
@@ -257,7 +257,7 @@ rde init --license-token '$RDE_LICENSE_TOKEN' …
 
 ### Recording a run
 
-`rde init --print-answers <file>` writes, once an interactive run finishes, the answers file that reproduces it: the prompts as they were answered, plus any override given by a flag. Secrets are written as references, never as values: `$RDE_ADMIN_PASSWORD`, `$RDE_LICENSE_TOKEN`, `$RDE_GIT_TOKEN`, `$RDE_DATABASE_<n>_URI` for a connection string carrying a password, and `$RDE_DATABASE_<n>_<FIELD>` for a secret field (a password, or an SSH private key). Set those variables and run `rde init --answers <file>` on the next machine.
+`rde init --print-answers <file>` writes, once an interactive run finishes, the answers file that reproduces it: the prompts as they were answered, each database as it was added (its connection string if used as pasted, otherwise its fields), plus any override given by a flag. Secrets are written as references, never as values: `$RDE_ADMIN_PASSWORD`, `$RDE_LICENSE_TOKEN`, `$RDE_GIT_TOKEN`, `$RDE_DATABASE_<n>_URI` for a connection string carrying a password, and `$RDE_DATABASE_<n>_<FIELD>` for a secret field (a password, or an SSH private key). Set those variables and run `rde init --answers <file>` on the next machine.
 
 ## Upgrading
 

package/dist/cli.mjs

@@ -1600,6 +1600,10 @@ async function run$1(signal, command, args, options) {
 				"pipe"
 			],
 			...options.cwd !== void 0 && { cwd: options.cwd },
+			...options.addedEnv !== void 0 && { env: {
+				...hostEnvironment(),
+				...options.addedEnv
+			} },
 			signal: combined,
 			killSignal: "SIGKILL"
 		});
@@ -2118,9 +2122,9 @@ function adminUserStep(options, deps = hostDeps$12) {
 			const client = resolved.client(configured.url, NO_AUTH);
 			const properties = await client.session.properties();
 			if (properties["has-user-setup"]) {
-				if (ctx.state.admin === null) return recordExistingAdmin(ctx, options.variant, client, configured.url);
+				if (ctx.state.admin === null) return { outcome: await recordExistingAdmin(ctx, options.variant, client, configured.url) };
 				ctx.ui.info("Metabase already has an admin user");
-				return "completed";
+				return { outcome: "completed" };
 			}
 			const token = properties["setup-token"];
 			if (token === null) throw new ConfigError("Metabase has no admin user yet but offers no setup token");
@@ -2159,7 +2163,7 @@ function adminUserStep(options, deps = hostDeps$12) {
 				}
 			});
 			ctx.ui.success(`Admin user ${user.email} created`);
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -2635,7 +2639,7 @@ function apiKeyStep(deps = hostDeps$11) {
 			if (entry === void 0) throw new ConfigError(`\`mb auth list\` does not show profile ${profile} after login`);
 			if (entry.status !== "ok") throw new ConfigError(`mb profile ${profile} reports ${entry.status} after login`);
 			ctx.ui.note(usageNote(profile), "Metabase CLI connected");
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -3266,6 +3270,43 @@ function withoutUnasked(fields, details) {
 function promptableFields(fields, details) {
 	return visibleFields(fields, details).filter(isPromptable);
 }
+const SECRET_KINDS$1 = /* @__PURE__ */ new Set(["password", "file"]);
+function answerOf(field, details) {
+	const kind = promptKindFor(field);
+	const current = details[field.name];
+	if (kind === "boolean") {
+		const value = typeof current === "boolean" ? current : Boolean(field.default);
+		return {
+			name: field.name,
+			value,
+			secret: false
+		};
+	}
+	if (kind === "select") {
+		const value = current ?? field.default;
+		return value === void 0 || value === null ? null : {
+			name: field.name,
+			value: String(value),
+			secret: false
+		};
+	}
+	if (current === void 0 || current === "") return {
+		name: field.name,
+		value: "",
+		secret: false
+	};
+	return {
+		name: field.name,
+		value: current,
+		secret: SECRET_KINDS$1.has(kind)
+	};
+}
+function answeredFields(fields, details) {
+	return promptableFields(fields, details).flatMap((field) => {
+		const answer = answerOf(field, details);
+		return answer === null ? [] : [answer];
+	});
+}
 async function fillRequiredFields(deps, fields, details) {
 	let current = details;
 	const asked = /* @__PURE__ */ new Set();
@@ -3525,18 +3566,45 @@ function databaseListingLines(listing) {
 //#region src/steps/databases/flow.ts
 const DATABASE_KEYS = {
 	connection: "databases.connection",
-	detectedEngine: "databases.detected-engine",
-	engine: "databases.engine",
-	skip: "databases.skip",
-	mode: "databases.mode",
-	uri: "databases.uri",
-	name: "databases.name",
-	action: "databases.action",
-	editField: "databases.edit-field",
-	testAction: "databases.test-action",
-	switchEngine: "databases.switch-engine",
-	another: "databases.another"
+	skip: "databases.skip"
+};
+const DATABASE_KEY_NAMES = {
+	detectedEngine: "detected-engine",
+	engine: "engine",
+	mode: "mode",
+	uri: "uri",
+	name: "name",
+	action: "action",
+	editField: "edit-field",
+	testAction: "test-action",
+	switchEngine: "switch-engine",
+	another: "another"
 };
+function sameDetails(left, right) {
+	return [.../* @__PURE__ */ new Set([...Object.keys(left), ...Object.keys(right)])].every((key) => left[key] === right[key]);
+}
+function addedDatabase(chosen, model, name) {
+	const pastedAsIs = model.uri !== null && model.pasted !== null && sameDetails(model.details, model.pasted);
+	return {
+		engine: chosen.engine.key,
+		name,
+		uri: pastedAsIs ? model.uri : null,
+		fields: pastedAsIs ? [] : answeredFields(chosen.fields, model.details)
+	};
+}
+function databaseKey(ordinal, name) {
+	return `databases.${ordinal}.${DATABASE_KEY_NAMES[name]}`;
+}
+const DATABASE_KEY = /^databases\.(?<ordinal>\d+)\.(?<name>[a-z-]+)$/;
+function parseDatabaseKey(key) {
+	const groups = DATABASE_KEY.exec(key)?.groups;
+	const ordinal = groups?.["ordinal"];
+	const name = groups?.["name"];
+	return ordinal === void 0 || name === void 0 ? null : {
+		ordinal: Number(ordinal),
+		name
+	};
+}
 const FINISH = "finish";
 const RETRY = "try-again";
 const BAD_REQUEST_STATUS$1 = 400;
@@ -3558,13 +3626,16 @@ const FRESH$1 = {
 	name: null,
 	fieldErrors: null
 };
+function ordinalOf(run) {
+	return run.created.length + 1;
+}
 function fieldDeps(run) {
 	const { prompts, ui, readTextFile } = run.deps;
 	return {
 		prompts,
 		ui,
 		readTextFile,
-		ordinal: run.created.length + 1
+		ordinal: ordinalOf(run)
 	};
 }
 async function orFailure(failure, ask) {
@@ -3612,7 +3683,7 @@ function isCreatableEntry(entry) {
 }
 async function pickDetectedEngine(run, candidates) {
 	const picked = await run.deps.prompts.selectOrBack({
-		key: DATABASE_KEYS.detectedEngine,
+		key: databaseKey(ordinalOf(run), "detectedEngine"),
 		message: "Which database is it?",
 		choices: candidates.map((entry) => ({
 			value: entry.key,
@@ -3679,7 +3750,7 @@ function pickEngineScreen(run) {
 		};
 		for (;;) {
 			const picked = await run.deps.prompts.select({
-				key: DATABASE_KEYS.engine,
+				key: databaseKey(ordinalOf(run), "engine"),
 				message: "Which database engine?",
 				choices: [...run.deps.catalog.list().map(engineChoice), finishChoice],
 				...model.engine !== null && { initialValue: model.engine.key }
@@ -3720,7 +3791,7 @@ async function chooseAfterParseError(run, engine, uri, error) {
 		hint: "this looks like one of its connection strings"
 	}));
 	const picked = await orFailure(error.message, () => run.deps.prompts.selectOrBack({
-		key: DATABASE_KEYS.switchEngine,
+		key: databaseKey(ordinalOf(run), "switchEngine"),
 		message: "What now?",
 		choices: [...switches, {
 			value: RETRY,
@@ -3774,7 +3845,7 @@ function pasteUriScreen(run) {
 		for (;;) {
 			if (engine.exampleUri === null) return manualEntry(run, model, engine);
 			const mode = await run.deps.prompts.selectOrBack({
-				key: DATABASE_KEYS.mode,
+				key: databaseKey(ordinalOf(run), "mode"),
 				message: `How do you want to connect to ${engine.displayName}?`,
 				choices: [{
 					value: "paste",
@@ -3787,7 +3858,7 @@ function pasteUriScreen(run) {
 			if (mode === BACK) return { type: "back" };
 			if (mode === "manual") return manualEntry(run, model, engine);
 			const uri = await run.deps.prompts.textOrBack({
-				key: DATABASE_KEYS.uri,
+				key: databaseKey(ordinalOf(run), "uri"),
 				message: "Connection string",
 				placeholder: engine.exampleUri,
 				...draft !== null && { initialValue: draft }
@@ -3852,7 +3923,7 @@ function reviewNote(run, chosen, model) {
 async function promptName(run, model, engine) {
 	const suggested = model.name ?? model.suggestedName ?? engine.displayName;
 	return run.deps.prompts.text({
-		key: DATABASE_KEYS.name,
+		key: databaseKey(ordinalOf(run), "name"),
 		message: "Display name",
 		defaultValue: suggested,
 		placeholder: suggested
@@ -3869,7 +3940,7 @@ async function editOneField(run, fields, details) {
 		};
 	});
 	const picked = await run.deps.prompts.selectOrBack({
-		key: DATABASE_KEYS.editField,
+		key: databaseKey(ordinalOf(run), "editField"),
 		message: "Which field?",
 		choices
 	});
@@ -3912,7 +3983,7 @@ function reviewAttempt(run) {
 			reviewNote(run, chosen, current);
 			if (name === null) name = await promptName(run, current, chosen.engine);
 			const action = await run.deps.prompts.selectOrBack({
-				key: DATABASE_KEYS.action,
+				key: databaseKey(ordinalOf(run), "action"),
 				message: `Add ${name}?`,
 				choices: [
 					{
@@ -3977,7 +4048,7 @@ function testScreen(run) {
 		const lines = fieldErrorLines(chosen.fields, errors);
 		if (lines.length > 0) run.deps.ui.warn(lines.join("\n"));
 		const action = await orFailure(failure, () => run.deps.prompts.selectOrBack({
-			key: DATABASE_KEYS.testAction,
+			key: databaseKey(ordinalOf(run), "testAction"),
 			message: "What now?",
 			choices: [{
 				value: "fix",
@@ -4038,6 +4109,7 @@ function createScreen(run) {
 		}
 		run.created.push(database);
 		spinner.stop(`Added ${database.name}. Initial sync is running in the background; \`rde status\` shows progress.`);
+		run.added.push(addedDatabase(chosen, model, model.name));
 		await run.deps.onCreated(database);
 		return {
 			type: "next",
@@ -4049,7 +4121,7 @@ function createScreen(run) {
 function anotherScreen(run) {
 	return async (model) => {
 		if (await run.deps.prompts.select({
-			key: DATABASE_KEYS.another,
+			key: databaseKey(run.created.length, "another"),
 			message: "Anything else?",
 			choices: [{
 				value: "another",
@@ -4072,7 +4144,8 @@ function anotherScreen(run) {
 async function runDatabaseFlow(deps) {
 	const run = {
 		deps,
-		created: []
+		created: [],
+		added: []
 	};
 	await runFlow({
 		"connection-string": connectionStringScreen(run),
@@ -4083,7 +4156,10 @@ async function runDatabaseFlow(deps) {
 		create: createScreen(run),
 		another: anotherScreen(run)
 	}, START_SCREEN[deps.start], FRESH$1);
-	return { created: run.created };
+	return {
+		created: run.created,
+		added: run.added
+	};
 }
 //#endregion
 //#region src/tools/docker.ts
@@ -4131,9 +4207,9 @@ function createArgs(options) {
 		"--label",
 		`${HOME_LABEL}=${options.home}`,
 		"-p",
-		`${LOOPBACK_HOST}:${options.port.host}:${options.port.container}`
+		`${LOOPBACK_HOST}:${options.port.host ?? ""}:${options.port.container}`
 	];
-	if (options.port.alsoOn !== null) args.push("-p", `${options.port.alsoOn}:${options.port.host}:${options.port.container}`);
+	if (options.port.alsoOn !== null) args.push("-p", `${options.port.alsoOn}:${options.port.host ?? ""}:${options.port.container}`);
 	if (options.mount !== null) args.push("-v", `${options.mount.source}:${options.mount.target}`);
 	for (const [name, value] of Object.entries(options.env)) args.push("-e", `${name}=${value}`);
 	if (options.hostUser !== null) {
@@ -4244,6 +4320,33 @@ function dockerTool(runner) {
 	async function containerRemove(name) {
 		await docker(["rm", name]);
 	}
+	async function containerForceRemove(name) {
+		await docker([
+			"rm",
+			"-f",
+			name
+		]);
+	}
+	async function containerLoopbackPort(name, containerPort) {
+		const args = [
+			"port",
+			name,
+			`${containerPort}/tcp`
+		];
+		const result = await docker(args);
+		const prefix = `${LOOPBACK_HOST}:`;
+		const line = result.stdout.split("\n").find((entry) => entry.startsWith(prefix));
+		if (line !== void 0) {
+			const port = Number.parseInt(line.slice(prefix.length), 10);
+			if (Number.isInteger(port)) return port;
+		}
+		throw new ExternalToolError({
+			tool: DOCKER,
+			argv: args,
+			exitCode: 0,
+			stderrTail: `no port published on ${LOOPBACK_HOST} in: ${result.stdout.trim()}`
+		});
+	}
 	async function containerExecSucceeds(name, command) {
 		return (await runner.run(DOCKER, [
 			"exec",
@@ -4270,6 +4373,8 @@ function dockerTool(runner) {
 		containerStart,
 		containerStop,
 		containerRemove,
+		containerForceRemove,
+		containerLoopbackPort,
 		containerExecSucceeds,
 		containerLogs
 	};
@@ -4294,6 +4399,21 @@ const METABASE_CONTENT_DIRS = [
 	"snippets",
 	"transforms"
 ];
+const TOKEN_USERNAMES = { "bitbucket.org": "x-token-auth" };
+const DEFAULT_TOKEN_USERNAME = "x-access-token";
+function credentialEnv(credentials) {
+	const { origin, hostname } = new URL(credentials.url);
+	const username = TOKEN_USERNAMES[hostname] ?? DEFAULT_TOKEN_USERNAME;
+	const basic = Buffer.from(`${username}:${credentials.token}`).toString("base64");
+	return {
+		GIT_CONFIG_COUNT: "2",
+		GIT_CONFIG_KEY_0: `http.${origin}/.extraHeader`,
+		GIT_CONFIG_VALUE_0: `Authorization: Basic ${basic}`,
+		GIT_CONFIG_KEY_1: "credential.helper",
+		GIT_CONFIG_VALUE_1: "",
+		GIT_TERMINAL_PROMPT: "0"
+	};
+}
 async function directoryExists(path) {
 	try {
 		return (await promises.stat(path)).isDirectory();
@@ -4302,8 +4422,8 @@ async function directoryExists(path) {
 	}
 }
 function gitTool(runner) {
-	async function git(args, cwd) {
-		const result = await runner.run(GIT, args, cwd === void 0 ? {} : { cwd });
+	async function git(args, options = {}) {
+		const result = await runner.run(GIT, args, options);
 		if (result.exitCode !== 0) throw toolFailure(GIT, args, result);
 		return result;
 	}
@@ -4349,7 +4469,7 @@ function gitTool(runner) {
 		return result.exitCode === 0 && result.stdout.trim().length > 0;
 	}
 	async function commitAll(dir, message) {
-		await git(["add", "--all"], dir);
+		await git(["add", "--all"], { cwd: dir });
 		await git([
 			...await hasIdentity(dir) ? [] : [
 				"-c",
@@ -4360,7 +4480,7 @@ function gitTool(runner) {
 			"commit",
 			"--message",
 			message
-		], dir);
+		], { cwd: dir });
 	}
 	async function addRemote(dir, name, url) {
 		await git([
@@ -4368,22 +4488,33 @@ function gitTool(runner) {
 			"add",
 			name,
 			url
-		], dir);
+		], { cwd: dir });
+	}
+	async function clone(credentials, dir) {
+		await git([
+			"clone",
+			"--quiet",
+			credentials.url,
+			dir
+		], { addedEnv: credentialEnv(credentials) });
 	}
-	async function push(dir, remote, branch) {
+	async function push(dir, remote, branch, credentials) {
 		await git([
 			"push",
 			"--set-upstream",
 			remote,
 			branch
-		], dir);
+		], {
+			cwd: dir,
+			...credentials !== void 0 && { addedEnv: credentialEnv(credentials) }
+		});
 	}
 	async function currentBranch(dir) {
 		return (await git([
 			"rev-parse",
 			"--abbrev-ref",
 			"HEAD"
-		], dir)).stdout.trim();
+		], { cwd: dir })).stdout.trim();
 	}
 	async function remoteUrl(dir, name) {
 		const result = await runner.run(GIT, [
@@ -4406,6 +4537,7 @@ function gitTool(runner) {
 		hasCommits,
 		commitAll,
 		addRemote,
+		clone,
 		push,
 		currentBranch,
 		remoteUrl,
@@ -4459,10 +4591,11 @@ function hostDeps$10(ctx) {
 		taskPollIntervalMs: TASK_POLL_INTERVAL_MS
 	};
 }
+const SKIP_GIT_SYNC = "skip";
 const FRESH = {
-	workdir: null,
 	remoteKind: null,
-	hostedUrl: null
+	hostedUrl: null,
+	workdir: null
 };
 function expandHome(path) {
 	return path.startsWith(HOME_PREFIX) ? join(homedir(), path.slice(2)) : path;
@@ -4478,6 +4611,10 @@ async function directoryState(path) {
 	if (!stat.isDirectory()) return "file";
 	return (await promises.readdir(path)).length === 0 ? "empty" : "populated";
 }
+async function isCloneTarget(path) {
+	const state = await directoryState(path);
+	return state === "missing" || state === "empty";
+}
 async function initTargetProblem(run, path) {
 	switch (await directoryState(path)) {
 		case "missing":
@@ -4488,78 +4625,132 @@ async function initTargetProblem(run, path) {
 		case "populated": return await run.git.isRepo(path) ? null : `${path} is not empty and not a git repository; pick an empty directory or a repository`;
 	}
 }
+async function cloneTargetProblem(path) {
+	if (await isCloneTarget(path)) return null;
+	return await directoryState(path) === "file" ? `${path} is not a directory` : `${path} is not empty; pick an empty directory, or use an existing repository`;
+}
 async function existingRepoProblem(run, path) {
 	return await run.git.isRepo(path) ? null : `${path} is not a git repository`;
 }
-const PATH_PROMPTS = {
-	new: "Directory for the repository (created if missing)",
-	existing: "Path of the existing repository"
+const FRESH_WORKDIRS = {
+	"local-bare": {
+		here: "Initialize a repository here",
+		elsewhere: "Initialize in another directory",
+		pathMessage: "Directory for the repository (created if missing)",
+		problem: initTargetProblem
+	},
+	hosted: {
+		here: "Clone the repository here",
+		elsewhere: "Clone into another directory",
+		pathMessage: "Directory to clone into (created if missing)",
+		problem: (_run, path) => cloneTargetProblem(path)
+	}
 };
-async function askPath(run, model, kind) {
+async function askPath(run, question) {
 	for (;;) {
 		const typed = await run.ctx.prompts.textOrBack({
 			key: GIT_SYNC_KEYS.path,
-			message: PATH_PROMPTS[kind],
-			...model.workdir !== null && { initialValue: model.workdir }
+			message: question.message
 		});
 		if (typed === BACK) return BACK;
 		const path = resolve(run.deps.cwd, expandHome(typed));
-		const problem = kind === "new" ? await initTargetProblem(run, path) : await existingRepoProblem(run, path);
+		const problem = await question.problem(path);
 		if (problem === null) return path;
 		run.ctx.ui.warn(problem);
 	}
 }
+function remoteScreen(run) {
+	return async (model) => {
+		const choice = await run.ctx.prompts.select({
+			key: GIT_SYNC_KEYS.remote,
+			message: "Where should Metabase push the content?",
+			choices: [
+				{
+					value: "local-bare",
+					label: "Local remote inside ~/.rde",
+					hint: "no account needed, recommended"
+				},
+				{
+					value: "hosted",
+					label: "Hosted remote (GitHub, GitLab, Bitbucket…)",
+					hint: "needs a token"
+				},
+				{
+					value: SKIP_GIT_SYNC,
+					label: "Skip for now",
+					hint: "rde init --only git-sync sets it up later"
+				}
+			],
+			...model.remoteKind !== null && { initialValue: model.remoteKind }
+		});
+		if (choice === "skip") return {
+			type: "done",
+			model: FRESH
+		};
+		const next = {
+			...model,
+			remoteKind: choice
+		};
+		return {
+			type: "next",
+			to: choice === "hosted" ? "hosted" : "workdir",
+			model: next
+		};
+	};
+}
 function workdirScreen(run) {
 	return async (model) => {
+		if (model.remoteKind === null) throw new Error("no remote before the workdir screen");
+		const fresh = FRESH_WORKDIRS[model.remoteKind];
+		const questions = {
+			new: {
+				message: fresh.pathMessage,
+				problem: (path) => fresh.problem(run, path)
+			},
+			existing: {
+				message: "Path of the existing repository",
+				problem: (path) => existingRepoProblem(run, path)
+			}
+		};
 		for (;;) {
-			const choice = await run.ctx.prompts.select({
+			const choice = await run.ctx.prompts.selectOrBack({
 				key: GIT_SYNC_KEYS.location,
 				message: "Where should the Metabase content repository live?",
 				choices: [
 					{
 						value: "here",
-						label: "Initialize a repository here",
+						label: fresh.here,
 						hint: run.deps.cwd
 					},
 					{
 						value: "new",
-						label: "Initialize in another directory"
+						label: fresh.elsewhere
 					},
 					{
 						value: "existing",
 						label: "Use an existing repository"
-					},
-					{
-						value: "skip",
-						label: "Skip for now",
-						hint: "rde init --only git-sync sets it up later"
 					}
 				]
 			});
-			if (choice === "skip") return {
-				type: "done",
-				model: FRESH
-			};
+			if (choice === BACK) return { type: "back" };
 			if (choice === "here") {
-				const problem = await initTargetProblem(run, run.deps.cwd);
+				const problem = await fresh.problem(run, run.deps.cwd);
 				if (problem !== null) {
 					run.ctx.ui.warn(problem);
 					continue;
 				}
 				return {
-					type: "next",
-					to: "remote",
+					type: "done",
 					model: {
 						...model,
 						workdir: run.deps.cwd
 					}
 				};
 			}
-			const path = await askPath(run, model, choice);
+			const path = await askPath(run, questions[choice]);
 			if (path === BACK) continue;
 			return {
-				type: "next",
-				to: "remote",
+				type: "done",
 				model: {
 					...model,
 					workdir: path
@@ -4568,37 +4759,6 @@ function workdirScreen(run) {
 		}
 	};
 }
-function remoteScreen(run) {
-	return async (model) => {
-		const kind = await run.ctx.prompts.selectOrBack({
-			key: GIT_SYNC_KEYS.remote,
-			message: "Where should Metabase push the content?",
-			choices: [{
-				value: "local-bare",
-				label: "Local remote inside ~/.rde",
-				hint: "no account needed, recommended"
-			}, {
-				value: "hosted",
-				label: "Hosted remote (GitHub, GitLab, Bitbucket…)",
-				hint: "needs a token"
-			}],
-			...model.remoteKind !== null && { initialValue: model.remoteKind }
-		});
-		if (kind === BACK) return { type: "back" };
-		const next = {
-			...model,
-			remoteKind: kind
-		};
-		return kind === "hosted" ? {
-			type: "next",
-			to: "hosted",
-			model: next
-		} : {
-			type: "done",
-			model: next
-		};
-	};
-}
 function validateHttpsUrl(value) {
 	return value.length === 0 || value.startsWith(HTTPS_PREFIX) ? void 0 : `The repository URL must start with ${HTTPS_PREFIX}`;
 }
@@ -4639,7 +4799,8 @@ function hostedScreen(run) {
 			spinner.stop("Metabase can reach the repository");
 			run.ctx.session.gitToken.set(token);
 			return {
-				type: "done",
+				type: "next",
+				to: "workdir",
 				model: {
 					...model,
 					hostedUrl: url
@@ -4706,9 +4867,34 @@ async function configureLocalBare(run, runtime, workdir) {
 		}
 	};
 }
-async function configureHosted(run, workdir, url) {
+async function cloneHosted(run, workdir, credentials) {
+	const spinner = run.ctx.ui.spinner(`Cloning ${credentials.url}…`);
+	try {
+		await run.git.clone(credentials, workdir);
+	} catch (error) {
+		spinner.fail("Could not clone the repository");
+		throw error;
+	}
+	spinner.stop(`Cloned into ${workdir}`);
+	if (await run.git.hasCommits(workdir)) return {
+		workdir,
+		branch: await run.git.currentBranch(workdir)
+	};
+	const prepared = await prepareWorkdir(run, workdir);
+	await run.git.push(workdir, ORIGIN, prepared.branch, credentials);
+	return prepared;
+}
+async function adoptRepository(run, workdir, url) {
 	const prepared = await prepareWorkdir(run, workdir);
 	await ensureRemote(run, workdir, url);
+	return prepared;
+}
+async function configureHosted(run, workdir, url) {
+	const token = run.ctx.session.gitToken.get();
+	const prepared = await isCloneTarget(workdir) ? await cloneHosted(run, workdir, {
+		url,
+		token
+	}) : await adoptRepository(run, workdir, url);
 	return {
 		gitRemote: {
 			kind: "hosted",
@@ -4718,7 +4904,7 @@ async function configureHosted(run, workdir, url) {
 		},
 		settings: {
 			"remote-sync-url": url,
-			"remote-sync-token": run.ctx.session.gitToken.get(),
+			"remote-sync-token": token,
 			"remote-sync-type": "read-write",
 			"remote-sync-branch": prepared.branch
 		}
@@ -4836,10 +5022,10 @@ async function runGitSync(ctx, deps) {
 		})
 	};
 	const flow = await runFlow({
-		workdir: workdirScreen(run),
 		remote: remoteScreen(run),
-		hosted: hostedScreen(run)
-	}, "workdir", FRESH);
+		hosted: hostedScreen(run),
+		workdir: workdirScreen(run)
+	}, "remote", FRESH);
 	if (flow.type === "exited" || !isChosen(flow.model)) {
 		ctx.ui.info("Skipping remote sync; run `rde init --only git-sync` to set it up later");
 		return "skipped";
@@ -4865,8 +5051,8 @@ function gitSyncStep(deps = hostDeps$10) {
 				throw error;
 			}
 		},
-		run(ctx) {
-			return runGitSync(ctx, deps(ctx));
+		async run(ctx) {
+			return { outcome: await runGitSync(ctx, deps(ctx)) };
 		}
 	};
 }
@@ -5112,7 +5298,7 @@ function agentsSkillsStep(options, deps = hostDeps$9) {
 			const selection = await selectAgents(ctx, all, options);
 			if (selection.agents.length === 0) {
 				ctx.ui.info(skipLine(all, selection.source));
-				return "skipped";
+				return { outcome: "skipped" };
 			}
 			const skills = skillsCli(resolved.runner);
 			const agents = selection.agents.map((agent) => agent.skillsCliName);
@@ -5137,7 +5323,7 @@ function agentsSkillsStep(options, deps = hostDeps$9) {
 			if (missing.length > 0) throw new ConfigError(`the skills installer finished but \`skills list\` does not show ${missing.join(", ")}`);
 			ctx.ui.note(installedLines(requiredEntries(installed), selection.agents), "Skills installed");
 			ctx.ui.info(MECHANICS_NOTE);
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -5225,15 +5411,23 @@ async function connectDatabases(ctx, deps, start) {
 	});
 	return {
 		existing: existing.data.length,
-		created: result.created.length
+		created: result.created.length,
+		added: result.added
 	};
 }
 async function addDatabases(ctx, deps) {
 	const connected = await connectDatabases(ctx, deps, "engine");
-	return connected.existing + connected.created > 0 ? "completed" : "skipped";
+	return {
+		outcome: connected.existing + connected.created > 0 ? "completed" : "skipped",
+		result: { addedDatabases: connected.added }
+	};
 }
 async function askForOwnDatabase(ctx, deps) {
-	return (await connectDatabases(ctx, deps, "connection-string")).created > 0 ? "completed" : "skipped";
+	const connected = await connectDatabases(ctx, deps, "connection-string");
+	return {
+		outcome: connected.created > 0 ? "completed" : "skipped",
+		result: { addedDatabases: connected.added }
+	};
 }
 function hostDeps$8(ctx) {
 	return hostDatabasesDeps(ctx.signal);
@@ -5274,9 +5468,12 @@ function databasesStep(options, deps = hostDeps$8) {
 				throw error;
 			}
 		},
-		run(ctx) {
-			if (options.request === "ask-once") return askForOwnDatabase(ctx, deps(ctx));
-			return addDatabases(ctx, deps(ctx));
+		async run(ctx) {
+			switch (options.request) {
+				case "ask-once": return askForOwnDatabase(ctx, deps(ctx));
+				case "named": return addDatabases(ctx, deps(ctx));
+				case "sample-stands-in": return { outcome: "skipped" };
+			}
 		}
 	};
 }
@@ -5420,7 +5617,7 @@ function installMbStep(deps = hostDeps$7) {
 			const before = await inspectMb(resolved.runner);
 			if (before.installed && before.satisfies) {
 				ctx.ui.success(`mb ${before.version} is installed`);
-				return "completed";
+				return { outcome: "completed" };
 			}
 			if (before.installed) ctx.ui.warn(`mb ${before.version} is installed; ${MIN_MB_VERSION} or newer is required`);
 			const install = mbInstallCommand(resolved.installedWith);
@@ -5429,7 +5626,7 @@ function installMbStep(deps = hostDeps$7) {
 			const after = await inspectMb(resolved.runner);
 			if (!after.installed || !after.satisfies) throw await stillWrong(install, after, resolved);
 			ctx.ui.success(`mb ${after.version} is installed`);
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -5487,7 +5684,7 @@ function licenseStep(deps = hostDeps$6) {
 			});
 			if (token.length === 0) {
 				ctx.ui.info("Skipping the license; remote sync needs one. Run `rde init --from license` to add it later");
-				return "skipped";
+				return { outcome: "skipped" };
 			}
 			ctx.session.licenseToken.set(token);
 			const client = deps(ctx).client(configured.url, {
@@ -5518,7 +5715,7 @@ function licenseStep(deps = hostDeps$6) {
 			});
 			if (status.features.includes("remote-sync")) ctx.ui.info("Remote sync is included; the git step will set it up");
 			else ctx.ui.warn("This license does not include remote sync; the git step will be skipped");
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -5742,7 +5939,7 @@ function preflightStep(deps = hostDeps$5) {
 			const checks = await runChecks(resolved, resolved.platform);
 			ctx.ui.note(checkLines(checks).join("\n"), "This machine");
 			if (checks.some(blocks)) throw new ConfigError("Fix the items above and run rde init again");
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -6355,7 +6552,7 @@ function runtimeStep(options, deps = hostDeps$4) {
 				throw error;
 			}
 			spinner.stop(`Metabase installed on port ${chosen.port}`);
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -6391,13 +6588,13 @@ function sampleDatabaseUrl(port) {
 function publishesOnLoopback$1(inspection, port) {
 	return inspection.ports.some((mapping) => mapping.container === POSTGRES_PORT && mapping.host === port && mapping.hostIp === "127.0.0.1");
 }
-function createOptions(state, home, alsoOn) {
+function createOptions(state, home, hostPort, alsoOn) {
 	return {
 		name: state.containerName,
 		home,
 		image: state.image,
 		port: {
-			host: state.port,
+			host: hostPort,
 			container: POSTGRES_PORT,
 			alsoOn
 		},
@@ -6407,6 +6604,9 @@ function createOptions(state, home, alsoOn) {
 		hostUser: null
 	};
 }
+function requireOwnContainer(name, existing, home) {
+	if (existing.home !== null && existing.home !== home) throw new ConfigError(`container ${name} belongs to the rde home ${existing.home} and is left alone`);
+}
 function sampleDatabaseContainer(state, docker, home) {
 	const name = state.containerName;
 	function conflict(reason) {
@@ -6416,11 +6616,12 @@ function sampleDatabaseContainer(state, docker, home) {
 		const existing = await docker.containerInspect(name);
 		if (existing.exists) {
 			if (existing.image !== state.image) throw conflict(`with image ${existing.image}, not ${state.image}`);
-			if (!publishesOnLoopback$1(existing, state.port)) throw conflict(`without port ${state.port} published on ${LOOPBACK_HOST}`);
-			return;
+			if (publishesOnLoopback$1(existing, state.port)) return;
+			requireOwnContainer(name, existing, home);
+			await docker.containerForceRemove(name);
 		}
 		await docker.imagePull(state.image, { onLine: options.onProgress });
-		await docker.containerCreate(createOptions(state, home, options.alsoOn));
+		await docker.containerCreate(createOptions(state, home, state.port, options.alsoOn));
 	}
 	async function start() {
 		const existing = await docker.containerInspect(name);
@@ -6470,7 +6671,22 @@ function extraAddress(inspection) {
 	const extra = inspection.ports.find((mapping) => mapping.container === POSTGRES_PORT && mapping.hostIp !== "127.0.0.1");
 	return extra === void 0 ? null : extra.hostIp;
 }
-async function startOnFreePort(state, docker, ports, home) {
+async function startOnDockerPort(state, docker, home, alsoOn) {
+	const name = state.containerName;
+	await docker.containerForceRemove(name);
+	await docker.containerCreate(createOptions(state, home, null, null));
+	await docker.containerStart(name);
+	const port = await docker.containerLoopbackPort(name, POSTGRES_PORT);
+	await docker.containerForceRemove(name);
+	const pinned = {
+		...state,
+		port
+	};
+	await docker.containerCreate(createOptions(pinned, home, port, alsoOn));
+	await docker.containerStart(name);
+	return pinned;
+}
+async function startOnFreePort(state, docker, home) {
 	try {
 		return {
 			outcome: await sampleDatabaseContainer(state, docker, home).start(),
@@ -6480,18 +6696,10 @@ async function startOnFreePort(state, docker, ports, home) {
 		if (!isPortTaken(error)) throw error;
 	}
 	const existing = await docker.containerInspect(state.containerName);
-	if (existing.exists && existing.home !== null && existing.home !== home) throw new ConfigError(`container ${state.containerName} belongs to the rde home ${existing.home} and is left alone`);
-	const moved = {
-		...state,
-		port: await ports.findFree(SAMPLE_DATABASE_PORT)
-	};
-	const alsoOn = existing.exists ? extraAddress(existing) : null;
-	await docker.containerRemove(state.containerName);
-	await docker.containerCreate(createOptions(moved, home, alsoOn));
-	await docker.containerStart(moved.containerName);
+	if (existing.exists) requireOwnContainer(state.containerName, existing, home);
 	return {
 		outcome: "started",
-		state: moved
+		state: await startOnDockerPort(state, docker, home, existing.exists ? extraAddress(existing) : null)
 	};
 }
 //#endregion
@@ -6585,7 +6793,7 @@ async function installAndStart(ctx, sidecar, installed, deps) {
 		throw error;
 	}
 	installing.stop(`Sample database container ${installed.containerName} on port ${installed.port}`);
-	const started = await startOnFreePort(installed, deps.runtime.docker, deps.ports, deps.runtime.rdeHome);
+	const started = await startOnFreePort(installed, deps.runtime.docker, deps.runtime.rdeHome);
 	const record = started.state.port === installed.port ? installed : await recordSampleDatabaseMove(ctx, installed, started.state);
 	const waiting = ctx.ui.spinner("Waiting for Postgres to accept connections…");
 	try {
@@ -6694,7 +6902,7 @@ function sampleDatabaseStep(deps = hostDeps$3) {
 			await connectDatabase(ctx, choice, configured, client, resolved);
 			await client.setting.enableTransforms();
 			ctx.ui.note(usageLines(record), "Sample database");
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -6706,7 +6914,6 @@ const PERCENT = 100;
 function hostDeps$2(ctx) {
 	return {
 		runtime: hostRuntimeDeps(ctx.state.name, ctx.signal),
-		ports: hostPortProbe,
 		client: (baseUrl, auth) => createMetabaseClient(baseUrl, auth, ctx.signal),
 		timing: DEFAULT_HEALTH_TIMING
 	};
@@ -6723,7 +6930,7 @@ function progressLabel(progress) {
 async function startSampleDatabase(ctx, deps) {
 	const record = ctx.state.sampleDatabase;
 	if (record === null) return;
-	const started = await startOnFreePort(record, deps.runtime.docker, deps.ports, deps.runtime.rdeHome);
+	const started = await startOnFreePort(record, deps.runtime.docker, deps.runtime.rdeHome);
 	if (started.state.port !== record.port) await recordSampleDatabaseMove(ctx, record, started.state);
 	switch (started.outcome) {
 		case "missing":
@@ -6783,7 +6990,7 @@ function startMetabaseStep(deps = hostDeps$2) {
 				version
 			});
 			spinner.stop(`Metabase ${version} is running at ${configured.url}`);
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -6879,7 +7086,7 @@ function summaryStep(deps = hostDeps$1) {
 		async run(ctx) {
 			const lines = await summaryLines(ctx.state, ctx.secrets.apiKey, deps(ctx));
 			ctx.ui.note(lines.join("\n"), "Your environment");
-			return "completed";
+			return { outcome: "completed" };
 		}
 	};
 }
@@ -7016,16 +7223,16 @@ function fieldAnswer(value) {
 	return text$1(String(value));
 }
 function addDatabase(map, database, ordinal, last) {
-	add(map, DATABASE_KEYS.engine, select$1(database.engine));
+	add(map, databaseKey(ordinal, "engine"), select$1(database.engine));
 	if (database.uri !== void 0) {
-		add(map, DATABASE_KEYS.mode, select$1("paste"));
-		add(map, DATABASE_KEYS.uri, text$1(database.uri));
+		add(map, databaseKey(ordinal, "mode"), select$1("paste"));
+		add(map, databaseKey(ordinal, "uri"), text$1(database.uri));
 	}
-	if (database.uri === void 0 && EXAMPLE_URIS[database.engine] !== void 0) add(map, DATABASE_KEYS.mode, select$1("manual"));
+	if (database.uri === void 0 && EXAMPLE_URIS[database.engine] !== void 0) add(map, databaseKey(ordinal, "mode"), select$1("manual"));
 	if (database.fields !== void 0) for (const [name, value] of Object.entries(database.fields)) add(map, fieldKey(ordinal, name), fieldAnswer(value));
-	add(map, DATABASE_KEYS.name, text$1(database.name ?? ACCEPT_DEFAULT));
-	add(map, DATABASE_KEYS.action, select$1("test"));
-	add(map, DATABASE_KEYS.another, select$1(last ? "finish" : "another"));
+	add(map, databaseKey(ordinal, "name"), text$1(database.name ?? ACCEPT_DEFAULT));
+	add(map, databaseKey(ordinal, "action"), select$1("test"));
+	add(map, databaseKey(ordinal, "another"), select$1(last ? "finish" : "another"));
 }
 function addAdmin(map, admin) {
 	if (admin.variant !== "prompted") return;
@@ -7083,17 +7290,12 @@ function keyedAnswers(answers) {
 	const license = answers.license;
 	if (license !== void 0) add(map, LICENSE_KEYS.token, password$1(license.token ?? SKIP_LICENSE));
 	const databases = answers.databases;
-	if (databases !== void 0) {
-		if (databases.length === 0) {
-			add(map, DATABASE_KEYS.engine, select$1(FINISH));
-			add(map, DATABASE_KEYS.skip, confirm$1(true));
-		}
-		databases.forEach((database, index) => {
-			addDatabase(map, database, index + 1, index === databases.length - 1);
-		});
-	}
+	if (databases !== void 0) databases.forEach((database, index) => {
+		addDatabase(map, database, index + 1, index === databases.length - 1);
+	});
 	const git = answers["git-sync"];
-	if (git !== void 0) {
+	if (git?.location === "skip") add(map, GIT_SYNC_KEYS.remote, select$1(SKIP_GIT_SYNC));
+	else if (git !== void 0) {
 		add(map, GIT_SYNC_KEYS.location, select$1(git.location));
 		if (git.path !== void 0) add(map, GIT_SYNC_KEYS.path, text$1(git.path));
 		if (git.remote !== void 0) add(map, GIT_SYNC_KEYS.remote, select$1(git.remote));
@@ -7137,18 +7339,26 @@ const FLAG_FOR_KEY$1 = {
 	[API_KEY_KEYS.password]: "--admin-password",
 	[API_KEY_KEYS.profile]: "--mb-profile",
 	[LICENSE_KEYS.token]: "--license-token or --skip-license",
-	[DATABASE_KEYS.engine]: "--database or --skip-databases",
-	[DATABASE_KEYS.uri]: "--database",
 	[DATABASE_KEYS.skip]: "--skip-databases",
-	[GIT_SYNC_KEYS.location]: "--git-dir or --skip-git",
+	[GIT_SYNC_KEYS.location]: "--git-dir",
 	[GIT_SYNC_KEYS.path]: "--git-dir",
-	[GIT_SYNC_KEYS.remote]: "--git-remote",
+	[GIT_SYNC_KEYS.remote]: "--git-remote or --skip-git",
 	[GIT_SYNC_KEYS.url]: "--git-url",
 	[GIT_SYNC_KEYS.token]: "--git-token"
 };
+const DATABASE_FLAG_FOR_NAME = {
+	engine: "--database or --skip-databases",
+	uri: "--database"
+};
 function howToAnswer(key) {
 	const field = parseFieldKey(key);
 	if (field !== null) return `set "${field.name}" under "fields" of database ${field.ordinal} in the --answers file (for a pasted database, in its connection string)`;
+	const database = parseDatabaseKey(key);
+	if (database !== null) {
+		const flag = DATABASE_FLAG_FOR_NAME[database.name];
+		const inFile = `set database ${database.ordinal} in the --answers file`;
+		return flag === void 0 ? inFile : `pass ${flag}, or ${inFile}`;
+	}
 	const flag = FLAG_FOR_KEY$1[key];
 	const inFile = `set "${key}" in the --answers file`;
 	return flag === void 0 ? inFile : `pass ${flag}, or ${inFile}`;
@@ -7741,17 +7951,30 @@ function requireKnownStep(steps, id, flag) {
 	if (id === void 0) return;
 	if (!steps.some((step) => step.id === id)) throw new ConfigError(`${flag} ${id} is not one of the steps: ${steps.map((step) => step.id).join(", ")}`);
 }
+async function detectOne(step, ctx, options, fromHere) {
+	if (step.id === (options.only ?? options.from)) return {
+		step,
+		status: "todo",
+		forced: true
+	};
+	const status = await step.detect(ctx);
+	if (options.only === void 0 && fromHere && status !== "not-applicable") return {
+		step,
+		status: "todo",
+		forced: true
+	};
+	return {
+		step,
+		status,
+		forced: false
+	};
+}
 async function detectAll(steps, ctx, options) {
 	const detected = [];
 	let fromHere = false;
 	for (const step of steps) {
 		if (step.id === options.from) fromHere = true;
-		const forced = options.only !== void 0 ? step.id === options.only : fromHere;
-		detected.push({
-			step,
-			status: forced ? "todo" : await step.detect(ctx),
-			forced
-		});
+		detected.push(await detectOne(step, ctx, options, fromHere));
 	}
 	return detected;
 }
@@ -7790,13 +8013,16 @@ async function runWizard(steps, ctx, options = {}) {
 		title: step.title,
 		status
 	})));
+	const results = [];
 	for (const entry of detected) try {
 		if (!await shouldRun(entry, ctx, options)) continue;
-		const outcome = await entry.step.run(ctx);
+		const { outcome, result } = await entry.step.run(ctx);
+		if (result !== void 0) results.push(result);
 		await ctx.saveState(withStepRecord(ctx.state, entry.step.id, recordFor(outcome, now())));
 	} catch (error) {
 		throw failureAt(entry.step, error);
 	}
+	return results;
 }
 //#endregion
 //#region src/steps/doctor.ts
@@ -8690,73 +8916,11 @@ function isLocation(value) {
 function isRemote(value) {
 	return value === "local-bare" || value === "hosted";
 }
-function applyConnectionRecord(draft, value) {
-	draft.databases = draft.databases.filter((database) => !database.pasted);
-	if (value === null) return;
-	if (value.trim().length === 0) {
-		draft.databasesFinished = true;
-		return;
-	}
-	draft.databases.push({
-		engine: null,
-		uri: value.trim(),
-		fields: {},
-		name: null,
-		pasted: true,
-		added: false
-	});
-}
-function applyEngineRecord(draft, value) {
-	if (draft.databases.at(-1)?.added === false) draft.databases.pop();
-	if (value === "finish") draft.databasesFinished = true;
-	else if (value !== null) draft.databases.push({
-		engine: value,
-		uri: null,
-		fields: {},
-		name: null,
-		pasted: false,
-		added: false
-	});
-}
 function applyDatabaseRecord(draft, record) {
 	const value = stringOf(record.answer);
-	if (record.key === DATABASE_KEYS.connection) {
-		applyConnectionRecord(draft, value);
-		return;
-	}
-	if (record.key === DATABASE_KEYS.engine) {
-		applyEngineRecord(draft, value);
-		return;
-	}
-	const database = draft.databases.at(-1);
-	if (database === void 0) return;
-	const switched = record.key === DATABASE_KEYS.switchEngine && value !== "try-again";
-	if ((record.key === DATABASE_KEYS.detectedEngine || switched) && value !== null) {
-		database.engine = value;
-		return;
-	}
-	if (record.key === DATABASE_KEYS.another) {
-		database.added = true;
-		return;
-	}
-	if (record.key === DATABASE_KEYS.mode) {
-		database.fields = {};
-		if (value === "manual") database.uri = null;
-		return;
-	}
-	if (record.key === DATABASE_KEYS.uri && value !== null) {
-		database.uri = value;
-		return;
-	}
-	if (record.key === DATABASE_KEYS.name && value !== null && value.length > 0) {
-		database.name = value;
-		return;
-	}
-	const fieldName = parseFieldKey(record.key)?.name;
-	if (fieldName === void 0) return;
-	if (record.answer.kind === "confirm") database.fields[fieldName] = record.answer.value;
-	else if (record.answer.kind === "password") database.fields[fieldName] = envReference(databaseEnv(draft.databases.length - 1, fieldName));
-	else if (value !== null) database.fields[fieldName] = value;
+	const skippedConnection = record.key === DATABASE_KEYS.connection && value?.trim() === "";
+	const finished = parseDatabaseKey(record.key)?.name === "engine" && value === "finish";
+	if (skippedConnection || finished) draft.databasesFinished = true;
 }
 function applyAdminRecord(draft, key, value) {
 	if (key === ADMIN_USER_KEYS.email && value !== null) admin(draft).email = value;
@@ -8765,7 +8929,8 @@ function applyAdminRecord(draft, key, value) {
 	else if (key === ADMIN_USER_KEYS.lastName && value !== null && value.length > 0) admin(draft)["last-name"] = value;
 }
 function applyGitRecord(draft, key, value) {
-	if (key === GIT_SYNC_KEYS.location && value !== null && isLocation(value)) gitSync(draft).location = value;
+	if (key === GIT_SYNC_KEYS.remote && value === "skip") draft.answers["git-sync"] = { location: SKIP_GIT_SYNC };
+	else if (key === GIT_SYNC_KEYS.location && value !== null && isLocation(value)) gitSync(draft).location = value;
 	else if (key === GIT_SYNC_KEYS.path && value !== null) gitSync(draft).path = value;
 	else if (key === GIT_SYNC_KEYS.remote && value !== null && isRemote(value)) gitSync(draft).remote = value;
 	else if (key === GIT_SYNC_KEYS.url && value !== null) gitSync(draft).url = value;
@@ -8793,30 +8958,26 @@ function writableUri(uri, index) {
 	const trimmed = uri.trim();
 	return URI_PASSWORDS.some((pattern) => pattern.test(trimmed)) ? envReference(databaseEnv(index, "uri")) : trimmed;
 }
-function engineOf(database) {
-	if (database.engine !== null) return database.engine;
-	const [only, ...others] = database.uri === null ? [] : detectEngine(database.uri);
-	return only !== void 0 && others.length === 0 ? only : null;
-}
-function databaseEntry(database, index) {
-	const hasFields = Object.keys(database.fields).length > 0;
-	const engine = engineOf(database);
-	if (!database.added || database.uri === null && !hasFields || engine === null) return null;
+function databaseEntry(added, index) {
+	if (added.uri !== null) return {
+		engine: added.engine,
+		uri: writableUri(added.uri, index),
+		name: added.name
+	};
+	const fields = added.fields.map(({ name, value, secret }) => [name, secret ? envReference(databaseEnv(index, name)) : value]);
 	return {
-		engine,
-		...database.uri !== null && { uri: writableUri(database.uri, index) },
-		...database.uri === null && { fields: database.fields },
-		...database.name !== null && { name: database.name }
+		engine: added.engine,
+		fields: Object.fromEntries(fields),
+		name: added.name
 	};
 }
-function answersFromRecords(records, overrides) {
+function answersFromRecords(records, overrides, added) {
 	const draft = {
 		answers: {},
-		databases: [],
 		databasesFinished: false
 	};
 	for (const record of records) applyRecord(draft, record);
-	const databases = draft.databases.map(databaseEntry).filter((entry) => entry !== null);
+	const databases = added.map(databaseEntry);
 	if (databases.length > 0 || draft.databasesFinished) draft.answers.databases = databases;
 	return {
 		...draft.answers,
@@ -9063,9 +9224,10 @@ const init = defineRdeCommand({
 			prompts: recording?.prompts ?? answering
 		});
 		ctx.ui.intro("rde init");
-		await runWizard(initSteps(stepOptionsFrom(answers, { interactive: stdinIsTty() && !runOptions.yes })), ctx, options);
+		const results = await runWizard(initSteps(stepOptionsFrom(answers, { interactive: stdinIsTty() && !runOptions.yes })), ctx, options);
 		if (recording !== null && printTo !== void 0) {
-			await writeAnswersFile(printTo, answersFromRecords(recording.records, answers));
+			const added = results.flatMap((result) => result.addedDatabases);
+			await writeAnswersFile(printTo, answersFromRecords(recording.records, answers, added));
 			ctx.ui.info(`Answers written to ${printTo}`);
 		}
 		ctx.ui.outro("rde init finished");
@@ -9771,7 +9933,6 @@ const RELEASE_TAG = /^v?[01]\.(\d+\.\d+(?:\.\d+)?)/;
 function hostDeps(ctx) {
 	return {
 		runtime: hostRuntimeDeps(ctx.state.name, ctx.signal),
-		ports: hostPortProbe,
 		client: (baseUrl, auth) => createMetabaseClient(baseUrl, auth, ctx.signal),
 		timing: DEFAULT_HEALTH_TIMING,
 		releases: releaseLookup(ctx.signal),
@@ -10033,7 +10194,7 @@ const upgradeCommand = defineRdeCommand({
 const main = defineCommand({
 	meta: {
 		name: "rde",
-		version: "0.1.8",
+		version: "0.1.9",
 		description: "Prepares a local machine for data-engineering work with Metabase and coding agents"
 	},
 	subCommands: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metabase/rde",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Prepares a local machine for data-engineering work with Metabase and coding agents",
   "license": "AGPL-3.0",
   "bin": {