@prisma/cli 3.0.0-beta.9 → 3.0.0-dev.102.1

package/dist/lib/project/setup.js

@@ -1,7 +1,10 @@
 import { CliError, usageError } from "../../shell/errors.js";
-import "../../shell/command-arguments.js";
+import { shortenHomePath } from "../fs/home-path.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, ensureLocalResolutionPinGitignore, writeLocalResolutionPin } from "./local-pin.js";
+import "../../shell/command-arguments.js";
 import { projectAmbiguousError, projectNotFoundError } from "./resolution.js";
+import path from "node:path";
+import { Result, matchError } from "better-result";
 //#region src/lib/project/setup.ts
 function isValidProjectSetupName(projectName) {
 	return projectName.trim().length > 0;
@@ -16,22 +19,64 @@ function resolveProjectForSetup(projectRef, projects, workspace) {
 	if (matches.length > 1) throw projectAmbiguousError(projectRef, matches);
 	throw projectNotFoundError(projectRef, workspace);
 }
-async function bindProjectToDirectory(context, workspace, project, action) {
-	await writeLocalResolutionPin(context.runtime.cwd, {
-		workspaceId: workspace.id,
-		projectId: project.id
-	}, context.runtime.signal);
-	await ensureLocalResolutionPinGitignore(context.runtime.cwd, context.runtime.signal);
-	return {
-		workspace,
-		project,
-		directory: formatSetupDirectory(context.runtime.cwd),
-		localPin: {
-			path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
-			written: true
+async function bindProjectToDirectory(context, workspace, project, action, directory = context.runtime.cwd) {
+	return Result.gen(async function* () {
+		yield* Result.await(writeLocalResolutionPin(directory, {
+			workspaceId: workspace.id,
+			projectId: project.id
+		}, context.runtime.signal));
+		yield* Result.await(ensureLocalResolutionPinGitignore(directory, context.runtime.signal));
+		return Result.ok({
+			workspace,
+			project,
+			directory: formatSetupDirectory(directory, context),
+			localPin: {
+				path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+				written: true
+			},
+			action
+		});
+	});
+}
+function projectDirectoryBindingErrorToCliError(error) {
+	return matchError(error, {
+		LocalResolutionPinSerializationError: (error) => {
+			throw error;
 		},
-		action
-	};
+		LocalResolutionPinWriteAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinWriteFailedError: (error) => localStateWriteFailedError(error, {
+			why: `The CLI could not write ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			meta: {
+				pinPath: error.pinPath,
+				operation: error.operation
+			}
+		}),
+		LocalResolutionPinGitignoreUpdateAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinGitignoreUpdateFailedError: (error) => localStateWriteFailedError(error, {
+			why: "The CLI could not update .gitignore to keep local Project binding state out of git.",
+			meta: {
+				gitignorePath: error.gitignorePath,
+				operation: error.operation
+			}
+		})
+	});
+}
+function localStateWriteFailedError(error, options) {
+	return new CliError({
+		code: "LOCAL_STATE_WRITE_FAILED",
+		domain: "project",
+		summary: "Could not save local Project binding",
+		why: options.why,
+		fix: "Check that this directory is writable and that .prisma/local.json and .gitignore are not blocked by directories or permissions, then retry.",
+		debug: formatDebugDetails(error.cause),
+		meta: options.meta,
+		exitCode: 1,
+		nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli app deploy --project <id-or-name>"]
+	});
 }
 function toProjectSummary(project) {
 	return {
@@ -66,8 +111,9 @@ function projectCreateFailedError(error, projectName, workspace, options) {
 		nextSteps: options.nextSteps
 	});
 }
-function formatSetupDirectory(cwd) {
-	const basename = cwd.split(/[\\/]/).filter(Boolean).pop();
+function formatSetupDirectory(directory, context) {
+	if (path.resolve(directory) !== path.resolve(context.runtime.cwd)) return shortenHomePath(directory, context.runtime.env);
+	const basename = directory.split(/[\\/]/).filter(Boolean).pop();
 	return basename ? `./${basename}` : ".";
 }
 function extractHttpStatus(error) {
@@ -86,4 +132,4 @@ function formatDebugDetails(error) {
 	return typeof error === "string" ? error : null;
 }
 //#endregion
-export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };
+export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };

package/dist/output/patterns.js

@@ -1,5 +1,5 @@
-import { maskValue, padDisplay, renderSummaryLine } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { maskValue, padDisplay, renderSummaryLine } from "../shell/ui.js";
 import stringWidth from "string-width";
 //#region src/output/patterns.ts
 function renderList(input, ui) {

package/dist/presenters/app.js

@@ -28,7 +28,8 @@ function renderAppBuild(context, descriptor, result) {
 function serializeAppBuild(result) {
 	return result;
 }
-function renderAppDeploy(context, descriptor, result) {
+function renderAppDeploy(context, descriptor, result, options) {
+	const logsCommand = options?.logsTarget ? `prisma-cli app logs ${options.logsTarget}` : "prisma-cli app logs";
 	return [
 		`Live in ${formatDuration(result.durationMs)}`,
 		...result.deployment.url ? [context.ui.link(result.deployment.url)] : [],
@@ -36,12 +37,37 @@ function renderAppDeploy(context, descriptor, result) {
 		"",
 		...renderDeployOutputRows(context.ui, [{
 			label: "Logs",
-			value: "prisma-cli app logs"
+			value: logsCommand
 		}]),
 		...renderDeployResolvedContextBlock(context, result),
 		...renderDeploySettingsBlock(context, result)
 	];
 }
+function isAppDeployAllResult(result) {
+	return "deployments" in result;
+}
+function renderAppDeployAll(context, descriptor, result) {
+	const lines = [];
+	for (const deployment of result.deployments) {
+		lines.push(deployment.target);
+		lines.push(...renderAppDeploy(context, descriptor, deployment.result, { logsTarget: deployment.target }).map((line) => line ? `  ${line}` : line));
+		lines.push("");
+	}
+	lines.push(...renderDeployOutputRows(context.ui, result.deployments.map((deployment) => ({
+		label: deployment.target,
+		value: deployment.result.deployment.url ?? deployment.result.deployment.id
+	}))));
+	return lines;
+}
+function serializeAppDeployAll(result) {
+	return {
+		count: result.deployments.length,
+		deployments: result.deployments.map((deployment) => ({
+			target: deployment.target,
+			...serializeAppDeploy(deployment.result)
+		}))
+	};
+}
 function serializeAppDeploy(result) {
 	const { deploySettings, localPin: _localPin, ...serialized } = result;
 	const { id: _branchId, ...branch } = serialized.branch;
@@ -57,27 +83,13 @@ function serializeAppDeploy(result) {
 }
 function renderBranchDatabaseDeploySummary(context, result) {
 	if (!result.branchDatabase || result.branchDatabase.status !== "created") return [];
-	return ["", ...renderDeployOutputRows(context.ui, [
-		{
-			label: "Database",
-			value: result.branchDatabase.database?.name ?? "created"
-		},
-		{
-			label: "Env",
-			value: result.branchDatabase.envVars.join(", ")
-		},
-		...result.branchDatabase.schema ? [{
-			label: "Schema",
-			value: formatBranchDatabaseSchemaCommand(result.branchDatabase.schema.command)
-		}] : []
-	])];
-}
-function formatBranchDatabaseSchemaCommand(command) {
-	switch (command) {
-		case "migrate-deploy": return "prisma migrate deploy";
-		case "db-push": return "prisma db push";
-		case "prisma-next-db-init": return "prisma-next db init";
-	}
+	return ["", ...renderDeployOutputRows(context.ui, [{
+		label: "Database",
+		value: result.branchDatabase.database?.name ?? "created"
+	}, {
+		label: "Env",
+		value: result.branchDatabase.envVars.join(", ")
+	}])];
 }
 function formatDuration(durationMs) {
 	if (durationMs < 1e3) return `${durationMs}ms`;
@@ -163,21 +175,14 @@ function branchDatabaseRows(branchDatabase) {
 		value: "not configured",
 		tone: "dim"
 	}];
-	return [
-		{
-			key: "branch db",
-			value: branchDatabase.status === "created" ? `created${branchDatabase.database ? ` (${branchDatabase.database.name})` : ""}` : `skipped${branchDatabase.reason ? ` (${branchDatabase.reason})` : ""}`,
-			tone: branchDatabase.status === "created" ? "success" : "dim"
-		},
-		...branchDatabase.envVars.length > 0 ? [{
-			key: "branch db env",
-			value: branchDatabase.envVars.join(", ")
-		}] : [],
-		...branchDatabase.schema ? [{
-			key: "branch db schema",
-			value: `${formatBranchDatabaseSchemaCommand(branchDatabase.schema.command)} (${branchDatabase.schema.source}, ${branchDatabase.schema.path})`
-		}] : []
-	];
+	return [{
+		key: "branch db",
+		value: branchDatabase.status === "created" ? `created${branchDatabase.database ? ` (${branchDatabase.database.name})` : ""}` : `skipped${branchDatabase.reason ? ` (${branchDatabase.reason})` : ""}`,
+		tone: branchDatabase.status === "created" ? "success" : "dim"
+	}, ...branchDatabase.envVars.length > 0 ? [{
+		key: "branch db env",
+		value: branchDatabase.envVars.join(", ")
+	}] : []];
 }
 function formatEnvVarNames(envVars) {
 	return envVars.length > 0 ? envVars.join(", ") : "none";
@@ -638,4 +643,4 @@ function formatRecentDeployments(deployments) {
 	return deployments.map((deployment) => `${deployment.id}${deployment.live ? " (live)" : ""}`).join(", ");
 }
 //#endregion
-export { renderAppBuild, renderAppDeploy, renderAppDomainAdd, renderAppDomainRemove, renderAppDomainRetry, renderAppDomainShow, renderAppListDeploys, renderAppOpen, renderAppPromote, renderAppRemove, renderAppRollback, renderAppRun, renderAppShow, renderAppShowDeploy, serializeAppBuild, serializeAppDeploy, serializeAppDomainAdd, serializeAppDomainRemove, serializeAppDomainRetry, serializeAppDomainShow, serializeAppListDeploys, serializeAppOpen, serializeAppPromote, serializeAppRemove, serializeAppRollback, serializeAppRun, serializeAppShow, serializeAppShowDeploy };
+export { isAppDeployAllResult, renderAppBuild, renderAppDeploy, renderAppDeployAll, renderAppDomainAdd, renderAppDomainRemove, renderAppDomainRetry, renderAppDomainShow, renderAppListDeploys, renderAppOpen, renderAppPromote, renderAppRemove, renderAppRollback, renderAppRun, renderAppShow, renderAppShowDeploy, serializeAppBuild, serializeAppDeploy, serializeAppDeployAll, serializeAppDomainAdd, serializeAppDomainRemove, serializeAppDomainRetry, serializeAppDomainShow, serializeAppListDeploys, serializeAppOpen, serializeAppPromote, serializeAppRemove, serializeAppRollback, serializeAppRun, serializeAppShow, serializeAppShowDeploy };

package/dist/presenters/auth.js

@@ -1,4 +1,7 @@
+import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { padDisplay } from "../shell/ui.js";
 import { renderMutate, renderShow } from "../output/patterns.js";
+import stringWidth from "string-width";
 //#region src/presenters/auth.ts
 function renderAuthSuccess(context, descriptor, command, result) {
 	if (command === "auth.login") {
@@ -62,11 +65,105 @@ function renderAuthSuccess(context, descriptor, command, result) {
 		}]
 	}, context.ui);
 }
+function renderAuthWorkspaceList(context, descriptor, result) {
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	const lines = [
+		`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing authenticated workspaces on this machine.")}`,
+		"",
+		`${rail}  ${ui.accent("auth source:")}  ${authSourceLabel(result.authSource)}`
+	];
+	const hasMixedSources = new Set(result.workspaces.map((workspace) => workspace.source)).size > 1;
+	if (result.workspaces.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No local OAuth workspaces found.")}`);
+		return lines;
+	}
+	const nameWidth = Math.max(4, ...result.workspaces.map((workspace) => stringWidth(workspace.name)));
+	const idWidth = Math.max(2, ...result.workspaces.map((workspace) => stringWidth(workspace.id)));
+	const sourceWidth = hasMixedSources ? Math.max(6, ...result.workspaces.map((workspace) => stringWidth(workspaceSourceLabel(workspace.source)))) : 0;
+	lines.push(rail);
+	lines.push(hasMixedSources ? `${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent(padDisplay("id", idWidth))}  ${ui.accent(padDisplay("source", sourceWidth))}  ${ui.accent("status")}` : `${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent(padDisplay("id", idWidth))}  ${ui.accent("status")}`);
+	for (const workspace of result.workspaces) {
+		const status = workspace.active ? "active" : "";
+		const source = workspaceSourceLabel(workspace.source);
+		lines.push(hasMixedSources ? `${rail}  ${padDisplay(workspace.name, nameWidth)}  ${padDisplay(workspace.id, idWidth)}  ${padDisplay(source, sourceWidth)}  ${status}` : `${rail}  ${padDisplay(workspace.name, nameWidth)}  ${padDisplay(workspace.id, idWidth)}  ${status}`);
+	}
+	return lines;
+}
+function serializeAuthWorkspaceList(result) {
+	return {
+		context: {
+			authSource: result.authSource,
+			activeWorkspaceId: result.activeWorkspace?.id ?? null,
+			activeWorkspaceName: result.activeWorkspace?.name ?? null
+		},
+		items: result.workspaces.map((workspace) => ({
+			id: workspace.id,
+			name: workspace.name,
+			status: workspace.active ? "active" : null,
+			source: workspace.source,
+			switchable: workspace.switchable,
+			credentialWorkspaceId: workspace.credentialWorkspaceId,
+			lastSeenAt: workspace.lastSeenAt
+		})),
+		count: result.workspaces.length
+	};
+}
+function renderAuthWorkspaceUse(context, descriptor, result) {
+	return renderMutate({
+		title: "Switching the local CLI workspace.",
+		descriptor,
+		context: [...result.previousWorkspace ? [{
+			key: "previous",
+			value: result.previousWorkspace.name
+		}] : [], {
+			key: "workspace",
+			value: result.workspace.name
+		}],
+		operationDescription: "Applying workspace selection",
+		operationCount: 1,
+		details: ["Local OAuth workspace selection updated."]
+	}, context.ui);
+}
+function serializeAuthWorkspaceUse(result) {
+	return result;
+}
+function renderAuthWorkspaceLogout(context, descriptor, result) {
+	return renderMutate({
+		title: "Removing a local OAuth workspace session.",
+		descriptor,
+		context: [{
+			key: "workspace",
+			value: result.workspace.name
+		}, ...result.activeWorkspace ? [{
+			key: "active",
+			value: result.activeWorkspace.name
+		}] : [{
+			key: "active",
+			value: "none",
+			tone: "dim"
+		}]],
+		operationDescription: "Removing workspace session",
+		operationCount: 1,
+		details: [result.wasActive ? "Removed active workspace session; no replacement workspace was selected." : "Removed workspace session."]
+	}, context.ui);
+}
+function serializeAuthWorkspaceLogout(result) {
+	return result;
+}
 function providerLabel(provider) {
 	if (provider === "github") return "GitHub";
 	if (provider === "google") return "Google";
 	return "";
 }
+function authSourceLabel(source) {
+	if (source === "oauth") return "local OAuth";
+	if (source === "service_token") return "PRISMA_SERVICE_TOKEN";
+	return "none";
+}
+function workspaceSourceLabel(source) {
+	return source === "service_token" ? "service token" : "OAuth";
+}
 function authUserLabel(result) {
 	return result.user?.email ?? credentialUserLabel(result);
 }
@@ -83,4 +180,4 @@ function credentialUserLabel(result) {
 	return null;
 }
 //#endregion
-export { renderAuthSuccess };
+export { renderAuthSuccess, renderAuthWorkspaceList, renderAuthWorkspaceLogout, renderAuthWorkspaceUse, serializeAuthWorkspaceList, serializeAuthWorkspaceLogout, serializeAuthWorkspaceUse };

package/dist/presenters/branch.js

@@ -1,5 +1,5 @@
-import { formatColumns } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { formatColumns } from "../shell/ui.js";
 import { renderResolvedProjectContextBlock } from "./verbose-context.js";
 //#region src/presenters/branch.ts
 function renderBranchList(context, descriptor, result) {

package/dist/presenters/database.js

@@ -1,5 +1,5 @@
-import { formatColumns, renderSummaryLine } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { formatColumns, renderSummaryLine } from "../shell/ui.js";
 import { renderMutate, renderShow, serializeList } from "../output/patterns.js";
 import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/database.ts
@@ -234,7 +234,7 @@ function renderDatabaseConnectionRemove(context, descriptor, result) {
 	}, context.ui);
 }
 function serializeDatabaseConnectionRemove(result) {
-	return result;
+	return { connection: result.connection };
 }
 function formatStatus(database) {
 	return database.status ?? (database.isDefault ? "default" : "unknown");

package/dist/presenters/project.js

@@ -1,9 +1,9 @@
-import { padDisplay, renderNextSteps, renderSummaryLine, renderVerboseBlock } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { padDisplay, renderNextSteps, renderSummaryLine, renderVerboseBlock } from "../shell/ui.js";
+import { shortenHomePath } from "../lib/fs/home-path.js";
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { renderMutate, renderShow, serializeList } from "../output/patterns.js";
 import { renderResolvedProjectContextBlock } from "./verbose-context.js";
-import path from "node:path";
 import stringWidth from "string-width";
 //#region src/presenters/project.ts
 function renderProjectList(context, descriptor, result) {
@@ -160,13 +160,7 @@ function renderBoundProjectShow(context, descriptor, result) {
 	return lines;
 }
 function formatLocalRepoPath(cwd, env) {
-	const resolved = path.resolve(cwd);
-	const home = env.HOME ? path.resolve(env.HOME) : null;
-	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
-		const relative = path.relative(home, resolved);
-		return relative ? `~/${relative}` : "~";
-	}
-	return resolved;
+	return shortenHomePath(cwd, env);
 }
 function formatGitConnectionDetail(status) {
 	switch (status) {

package/dist/shell/command-meta.js

@@ -50,6 +50,58 @@ const DESCRIPTORS = [
 		description: "Show the authenticated user and accessible workspace",
 		examples: ["prisma-cli auth whoami", "prisma-cli auth whoami --json"]
 	},
+	{
+		id: "auth.workspace",
+		path: [
+			"prisma",
+			"auth",
+			"workspace"
+		],
+		description: "Manage local authenticated workspaces",
+		examples: [
+			"prisma-cli auth workspace list",
+			"prisma-cli auth workspace use",
+			"prisma-cli auth workspace use wksp_123",
+			"prisma-cli auth workspace logout wksp_123"
+		]
+	},
+	{
+		id: "auth.workspace.list",
+		path: [
+			"prisma",
+			"auth",
+			"workspace",
+			"list"
+		],
+		description: "List locally authenticated workspaces",
+		examples: ["prisma-cli auth workspace list", "prisma-cli auth workspace list --json"]
+	},
+	{
+		id: "auth.workspace.use",
+		path: [
+			"prisma",
+			"auth",
+			"workspace",
+			"use"
+		],
+		description: "Switch the local CLI workspace",
+		examples: [
+			"prisma-cli auth workspace use",
+			"prisma-cli auth workspace use wksp_123",
+			"prisma-cli auth workspace use \"Acme Inc\""
+		]
+	},
+	{
+		id: "auth.workspace.logout",
+		path: [
+			"prisma",
+			"auth",
+			"workspace",
+			"logout"
+		],
+		description: "Remove one local OAuth workspace session",
+		examples: ["prisma-cli auth workspace logout wksp_123", "prisma-cli auth workspace logout \"Acme Inc\""]
+	},
 	{
 		id: "project",
 		path: ["prisma", "project"],
@@ -289,7 +341,6 @@ const DESCRIPTORS = [
 			"deploy"
 		],
 		description: "Creates a new deployment for the app",
-		longDescription: "Agent skills for guided Next.js deploys are available from the Prisma CLI skill cluster.",
 		examples: [
 			"prisma-cli app deploy",
 			"prisma-cli app deploy --project proj_123",
@@ -301,7 +352,6 @@ const DESCRIPTORS = [
 			"prisma-cli app deploy --app my-app --framework nextjs --http-port 3000",
 			"prisma-cli app deploy --branch feat-login --framework hono",
 			"prisma-cli app deploy --prod --yes",
-			"pnpm dlx skills@latest add prisma/prisma-cli/skills#cli-v<cli-version> --all",
 			"prisma-cli app deploy --framework bun --entry src/server.ts"
 		]
 	},

package/dist/shell/command-runner.js

@@ -1,8 +1,8 @@
-import { CliError, authRequiredError, commandCanceledError } from "./errors.js";
-import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
+import { CliError, authConfigInvalidError, authRequiredError, commandCanceledError } from "./errors.js";
 import { getCommandDescriptor } from "./command-meta.js";
 import { resolveGlobalFlags } from "./global-flags.js";
 import { createCommandContext } from "./runtime.js";
+import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
 import { collectCommandDiagnostics } from "../lib/diagnostics.js";
 import { renderCommandDiagnostics } from "./diagnostics-output.js";
 import { AuthError } from "@prisma/management-api-sdk";
@@ -11,6 +11,7 @@ function toCliError(error, runtime) {
 	if (isCancellationError(error) || runtime.signal.aborted) return commandCanceledError();
 	if (error instanceof CliError) return error;
 	if (error instanceof AuthError) return authRequiredError(["prisma-cli auth login"], { debug: error.message });
+	if (error instanceof Error && error.message.startsWith("PRISMA_SERVICE_TOKEN is set but empty")) return authConfigInvalidError(error.message);
 	return null;
 }
 function isCancellationError(error) {
@@ -18,44 +19,54 @@ function isCancellationError(error) {
 	return error.name === "AbortError" || error.name === "CancelledError";
 }
 async function runCommand(runtime, commandName, options, handler, presenter) {
-	const flags = resolveGlobalFlags(runtime.argv, options);
-	const context = await createCommandContext(runtime, flags);
+	const context = await createCommandContext(runtime, resolveGlobalFlags(runtime.argv, options));
 	const descriptor = getCommandDescriptor(commandName);
 	const startedAt = Date.now();
 	try {
-		const success = await handler(context);
-		if (flags.json) {
-			writeJsonSuccess(context.output, {
-				...success,
-				result: presenter.renderJson ? presenter.renderJson(success.result) : success.result
-			});
-			return;
-		}
-		const stdout = presenter.renderStdout?.(context, descriptor, success.result) ?? [];
-		if (flags.quiet) {
-			if (stdout.length > 0) context.output.stdout.write(`${stdout.join("\n")}\n`);
-			return;
-		}
-		const rendered = presenter.renderHuman(context, descriptor, success.result);
-		const diagnostics = await renderBestEffortCommandDiagnostics(context, {
-			enabled: flags.verbose && rendered.length > 0,
-			durationMs: Date.now() - startedAt
-		});
-		const humanLines = [...rendered, ...diagnostics];
-		if (stdout.length > 0 && humanLines.length > 0) humanLines.push("");
-		writeHumanLines(context.output, humanLines);
-		if (stdout.length > 0) context.output.stdout.write(`${stdout.join("\n")}\n`);
+		await writeCommandSuccess(context, descriptor, await handler(context), presenter, Date.now() - startedAt);
 	} catch (error) {
 		const cliError = toCliError(error, runtime);
 		if (cliError) {
-			if (flags.json) writeJsonError(context.output, commandName, cliError);
-			else writeHumanError(context.output, context.ui, cliError, { trace: flags.trace });
+			writeCommandError(context, commandName, cliError);
 			process.exitCode = cliError.exitCode;
 			return;
 		}
 		throw error;
 	}
 }
+async function writeCommandSuccess(context, descriptor, success, presenter, durationMs) {
+	if (context.flags.json) {
+		writeJsonSuccess(context.output, {
+			...success,
+			result: presenter.renderJson ? presenter.renderJson(success.result) : success.result
+		});
+		return;
+	}
+	const stdout = presenter.renderStdout?.(context, descriptor, success.result) ?? [];
+	if (context.flags.quiet) {
+		writeStdoutLines(context, stdout);
+		return;
+	}
+	const rendered = presenter.renderHuman(context, descriptor, success.result);
+	const diagnostics = await renderBestEffortCommandDiagnostics(context, {
+		enabled: context.flags.verbose && rendered.length > 0,
+		durationMs
+	});
+	const humanLines = [...rendered, ...diagnostics];
+	if (stdout.length > 0 && humanLines.length > 0) humanLines.push("");
+	writeHumanLines(context.output, humanLines);
+	writeStdoutLines(context, stdout);
+}
+function writeCommandError(context, commandName, cliError) {
+	if (context.flags.json) {
+		writeJsonError(context.output, commandName, cliError);
+		return;
+	}
+	writeHumanError(context.output, context.ui, cliError, { trace: context.flags.trace });
+}
+function writeStdoutLines(context, lines) {
+	if (lines.length > 0) context.output.stdout.write(`${lines.join("\n")}\n`);
+}
 async function renderBestEffortCommandDiagnostics(context, options) {
 	if (!options.enabled) return [];
 	try {

package/dist/shell/diagnostics-output.js

@@ -1,5 +1,5 @@
 import { renderVerboseBlock } from "./ui.js";
-import path from "node:path";
+import { shortenHomePath } from "../lib/fs/home-path.js";
 //#region src/shell/diagnostics-output.ts
 function renderCommandDiagnostics(context, diagnostics, rows = [], options = {}) {
 	if (!diagnostics) return [];
@@ -43,13 +43,7 @@ function renderCommandDiagnostics(context, diagnostics, rows = [], options = {})
 	], { title: options.title ?? "Local context" });
 }
 function formatLocalPath(value, env) {
-	const resolved = path.resolve(value);
-	const home = env.HOME ? path.resolve(env.HOME) : null;
-	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
-		const relative = path.relative(home, resolved);
-		return relative ? `~/${relative}` : "~";
-	}
-	return resolved;
+	return shortenHomePath(value, env);
 }
 function formatDirtyState(dirty) {
 	if (dirty === null) return "unknown";