@putdotio/cli 1.0.11 → 1.1.0

package/README.md

@@ -100,10 +100,10 @@ Link your account:
 putio auth login
 ```
 
-Check the account:
+Check the auth source:
 
 ```bash
-putio whoami --output json
+putio whoami --fields auth --output json
 ```
 
 Read a small JSON result:

package/dist/bin.mjs

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
-import { A as translate, C as CliOutput, D as CliConfigLive, E as renderJson, O as CliRuntime, S as CliSdkLive, T as detectOutputModeFromArgv, a as searchCommand, c as brandCommand, i as filesCommand, j as version, k as CliRuntimeLive, l as versionCommand, m as CliStateLive, n as whoamiCommand, o as eventsCommand, r as transfersCommand, s as downloadLinksCommand, t as describeCli, u as makeAuthCommand, w as CliOutputLive } from "./metadata-DzqePHlY.mjs";
-import { Cause, Console, Effect, Layer } from "effect";
-import { Command } from "@effect/cli";
-import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import * as NodeTerminal from "@effect/platform-node/NodeTerminal";
+import { A as CliRuntimeLive, C as CliOutput, D as renderJson, E as isStructuredOutputMode, M as version, O as CliConfigLive, S as CliSdkLive, T as detectOutputModeFromArgv, a as searchCommand, c as brandCommand, i as filesCommand, j as translate, k as CliRuntime, l as versionCommand, m as CliStateLive, n as whoamiCommand, o as eventsCommand, r as transfersCommand, s as downloadLinksCommand, t as describeCli, u as makeAuthCommand, w as CliOutputLive } from "./metadata-C_yXlqxj.mjs";
+import { Cause, Console, Effect, Layer, Result } from "effect";
+import { CliError, Command } from "effect/unstable/cli";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
 //#region src/cli.ts
 const authCommand = makeAuthCommand();
 const describeCommand = Command.make("describe", {}, () => Console.log(renderJson(describeCli())));
@@ -19,21 +18,127 @@ const command = Command.make("putio", {}, () => Console.log(translate("cli.root.
 	searchCommand,
 	transfersCommand
 ]));
+const makeBufferedConsole = (entries) => ({
+	assert: (condition, ...args) => entries.push({
+		args: [condition, ...args],
+		method: "assert"
+	}),
+	clear: () => entries.push({
+		args: [],
+		method: "clear"
+	}),
+	count: (label) => entries.push({
+		args: label === void 0 ? [] : [label],
+		method: "count"
+	}),
+	countReset: (label) => entries.push({
+		args: label === void 0 ? [] : [label],
+		method: "countReset"
+	}),
+	debug: (...args) => entries.push({
+		args,
+		method: "debug"
+	}),
+	dir: (item, options) => entries.push({
+		args: options === void 0 ? [item] : [item, options],
+		method: "dir"
+	}),
+	dirxml: (...args) => entries.push({
+		args,
+		method: "dirxml"
+	}),
+	error: (...args) => entries.push({
+		args,
+		method: "error"
+	}),
+	group: (...args) => entries.push({
+		args,
+		method: "group"
+	}),
+	groupCollapsed: (...args) => entries.push({
+		args,
+		method: "groupCollapsed"
+	}),
+	groupEnd: () => entries.push({
+		args: [],
+		method: "groupEnd"
+	}),
+	info: (...args) => entries.push({
+		args,
+		method: "info"
+	}),
+	log: (...args) => entries.push({
+		args,
+		method: "log"
+	}),
+	table: (tabularData, properties) => entries.push({
+		args: properties === void 0 ? [tabularData] : [tabularData, properties],
+		method: "table"
+	}),
+	time: (label) => entries.push({
+		args: label === void 0 ? [] : [label],
+		method: "time"
+	}),
+	timeEnd: (label) => entries.push({
+		args: label === void 0 ? [] : [label],
+		method: "timeEnd"
+	}),
+	timeLog: (label, ...args) => entries.push({
+		args: label === void 0 ? args : [label, ...args],
+		method: "timeLog"
+	}),
+	trace: (...args) => entries.push({
+		args,
+		method: "trace"
+	}),
+	warn: (...args) => entries.push({
+		args,
+		method: "warn"
+	})
+});
+const replayBufferedConsole = (console, entries) => Effect.sync(() => {
+	for (const entry of entries) {
+		const method = console[entry.method];
+		method(...entry.args);
+	}
+});
+const formatCliParserError = (error) => error.errors.map((nestedError) => nestedError.message).join("\n");
+const executableName = (value) => {
+	const normalized = value.replaceAll("\\", "/");
+	return normalized.slice(normalized.lastIndexOf("/") + 1).toLowerCase();
+};
+const commandArgsFromArgv = (args) => {
+	const [first] = args;
+	if (first === void 0) return args;
+	const firstName = executableName(first);
+	if (firstName === "node" || firstName === "node.exe") return args.slice(2);
+	if (firstName === "putio" || firstName === "putio.exe" || firstName === "bin.mjs") return args.slice(1);
+	return args;
+};
 function runCli(args) {
-	return Command.run(command, {
-		name: "putio",
-		version: `v${version}`
-	})(args);
+	const run = Command.runWith(command, { version });
+	return Effect.flatMap(CliRuntime, (runtime) => {
+		const outputMode = detectOutputModeFromArgv(args, runtime.isInteractiveTerminal);
+		const commandArgs = commandArgsFromArgv(args);
+		if (!isStructuredOutputMode(outputMode)) return run(commandArgs);
+		return Console.consoleWith((currentConsole) => {
+			const entries = [];
+			return run(commandArgs).pipe(Effect.provideService(Console.Console, makeBufferedConsole(entries)), Effect.tap(() => replayBufferedConsole(currentConsole, entries)), Effect.catchFilter((error) => CliError.isCliError(error) && error._tag === "ShowHelp" ? Result.succeed(error) : Result.fail(error), (error) => {
+				if (error.errors.length === 0) return replayBufferedConsole(currentConsole, entries);
+				return Effect.fail(new Error(formatCliParserError(error)));
+			}, (error) => Effect.fail(error)));
+		});
+	});
 }
 //#endregion
 //#region src/internal/app-layer.ts
 const makeCliAppLayer = (runtime) => {
 	const runtimeLayer = runtime ? Layer.succeed(CliRuntime, runtime) : CliRuntimeLive;
-	return Layer.mergeAll(NodeContext.layer, NodeTerminal.layer, runtimeLayer, CliOutputLive.pipe(Layer.provide(runtimeLayer)), CliConfigLive.pipe(Layer.provide(runtimeLayer)), CliSdkLive, CliStateLive);
+	return Layer.mergeAll(NodeServices.layer, runtimeLayer, CliOutputLive.pipe(Layer.provide(runtimeLayer)), CliConfigLive.pipe(Layer.provide(runtimeLayer)), CliSdkLive, CliStateLive);
 };
 //#endregion
 //#region src/bin.ts
-NodeRuntime.runMain(Effect.scoped(Effect.flatMap(CliRuntime, (runtime) => runCli(runtime.argv)).pipe(Effect.catchAllCause((cause) => Effect.gen(function* () {
+NodeRuntime.runMain(Effect.scoped(Effect.flatMap(CliRuntime, (runtime) => runCli(runtime.argv)).pipe(Effect.catchCause((cause) => Effect.gen(function* () {
 	const cliOutput = yield* CliOutput;
 	const runtime = yield* CliRuntime;
 	const outputMode = detectOutputModeFromArgv(runtime.argv, runtime.isInteractiveTerminal);

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { _ as clearPersistedState, b as resolveAuthState, d as AuthStateError, f as AuthStatusSchema, g as ResolvedAuthStateSchema, h as PutioCliConfigSchema, m as CliStateLive, p as CliState, t as describeCli, v as getAuthStatus, x as savePersistedState, y as loadPersistedState } from "./metadata-DzqePHlY.mjs";
+import { _ as clearPersistedState, b as resolveAuthState, d as AuthStateError, f as AuthStatusSchema, g as ResolvedAuthStateSchema, h as PutioCliConfigSchema, m as CliStateLive, p as CliState, t as describeCli, v as getAuthStatus, x as savePersistedState, y as loadPersistedState } from "./metadata-C_yXlqxj.mjs";
 export { AuthStateError, AuthStatusSchema, CliState, CliStateLive, PutioCliConfigSchema, ResolvedAuthStateSchema, clearPersistedState, describeCli, getAuthStatus, loadPersistedState, resolveAuthState, savePersistedState };

package/dist/{metadata-DzqePHlY.mjs → metadata-C_yXlqxj.mjs}

@@ -1,19 +1,19 @@
-import { Clock, Config, Console, Context, Data, Duration, Effect, Fiber, Layer, Option, Schema } from "effect";
+import { Cause, Clock, Config, Console, Context, Data, Duration, Effect, Fiber, Layer, Option, Queue, Schema } from "effect";
 import i18next from "i18next";
-import { Command, Options } from "@effect/cli";
-import * as Terminal from "@effect/platform/Terminal";
-import { DEFAULT_PUTIO_API_BASE_URL, DEFAULT_PUTIO_WEB_APP_URL, DownloadLinksCreateInputSchema, TransferAddInputSchema, createPutioSdkEffectClient, makePutioSdkLayer } from "@putdotio/sdk";
+import { Command, Flag } from "effect/unstable/cli";
+import * as Terminal from "effect/Terminal";
+import { DEFAULT_PUTIO_API_BASE_URL, DEFAULT_PUTIO_WEB_APP_URL, DownloadLinksCreateInputSchema, TransferAddInputSchema, createPutioSdkEffectClient, makePutioSdkLiveLayer } from "@putdotio/sdk";
 import { spawn } from "node:child_process";
 import { homedir, hostname } from "node:os";
 import { dirname, join } from "node:path";
+import * as SchemaAST from "effect/SchemaAST";
 import { LocalizedError, createLocalizeError } from "@putdotio/sdk/utilities";
 import Table from "cli-table3";
-import { FetchHttpClient } from "@effect/platform";
-import * as FileSystem from "@effect/platform/FileSystem";
-import { SystemError } from "@effect/platform/Error";
+import * as FileSystem from "effect/FileSystem";
+import { PlatformError, SystemError } from "effect/PlatformError";
 //#region package.json
 var name = "@putdotio/cli";
-var version = "1.0.11";
+var version = "1.1.0";
 //#endregion
 //#region src/i18n/translate.ts
 const resources = { en: { translation: {
@@ -358,7 +358,15 @@ const createTranslator = (locale = "en") => {
 const translate = createTranslator();
 //#endregion
 //#region src/internal/agent-dx.ts
-const AgentDxCategoryNameSchema = Schema.Literal("machineReadableOutput", "rawPayloadInput", "schemaIntrospection", "contextWindowDiscipline", "inputHardening", "safetyRails", "agentKnowledgePackaging");
+const AgentDxCategoryNameSchema = Schema.Literals([
+	"machineReadableOutput",
+	"rawPayloadInput",
+	"schemaIntrospection",
+	"contextWindowDiscipline",
+	"inputHardening",
+	"safetyRails",
+	"agentKnowledgePackaging"
+]);
 const AgentDxDimensionSchema = Schema.Struct({
 	maxScore: Schema.Literal(3),
 	name: AgentDxCategoryNameSchema,
@@ -455,7 +463,7 @@ const ENV_CLI_TOKEN = "PUTIO_CLI_TOKEN";
 const ENV_XDG_CONFIG_HOME = "XDG_CONFIG_HOME";
 //#endregion
 //#region src/internal/runtime.ts
-var CliRuntime = class extends Context.Tag("@putdotio/cli/CliRuntime")() {};
+var CliRuntime = class extends Context.Service()("@putdotio/cli/CliRuntime") {};
 const openExternalWithPlatform = (platform, url) => {
 	const command = platform === "darwin" ? {
 		file: "open",
@@ -506,6 +514,20 @@ const makeCliRuntime = (options = {}) => {
 		setExitCode: (code) => Effect.sync(() => {
 			process.exitCode = code;
 		}),
+		writeStdout: (message) => Effect.sync(() => {
+			if (options.writeStdout) {
+				options.writeStdout(message);
+				return;
+			}
+			process.stdout.write(message);
+		}),
+		writeStderr: (message) => Effect.sync(() => {
+			if (options.writeStderr) {
+				options.writeStderr(message);
+				return;
+			}
+			process.stderr.write(message);
+		}),
 		openExternal: (url) => Effect.sync(() => openExternalWithPlatform(platform, url)),
 		startSpinner: (message) => Effect.sync(() => {
 			let frameIndex = 0;
@@ -532,27 +554,27 @@ const makeCliRuntime = (options = {}) => {
 const CliRuntimeLive = Layer.sync(CliRuntime, () => makeCliRuntime());
 //#endregion
 //#region src/internal/config.ts
-const NonEmptyStringSchema$4 = Schema.String.pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected a non-empty string" }));
-const UrlStringSchema = NonEmptyStringSchema$4.pipe(Schema.filter((value) => {
+const NonEmptyStringSchema$3 = Schema.String.check(Schema.isNonEmpty());
+const UrlStringSchema = NonEmptyStringSchema$3.pipe(Schema.check(Schema.makeFilter((value) => {
 	try {
 		new URL(value);
-		return true;
+		return;
 	} catch {
-		return false;
+		return "Expected a valid absolute URL";
 	}
-}, { message: () => "Expected a valid absolute URL" }));
+})));
 const PutioCliAuthFlowConfigSchema = Schema.Struct({
-	appId: NonEmptyStringSchema$4,
-	clientName: NonEmptyStringSchema$4,
+	appId: NonEmptyStringSchema$3,
+	clientName: NonEmptyStringSchema$3,
 	webAppUrl: UrlStringSchema
 });
 const CliRuntimeConfigSchema = Schema.Struct({
 	apiBaseUrl: UrlStringSchema,
-	configPath: NonEmptyStringSchema$4,
-	token: Schema.optional(NonEmptyStringSchema$4)
+	configPath: NonEmptyStringSchema$3,
+	token: Schema.optional(NonEmptyStringSchema$3)
 });
 var CliConfigError = class extends Data.TaggedError("CliConfigError") {};
-var CliConfig = class extends Context.Tag("@putdotio/cli/CliConfig")() {};
+var CliConfig = class extends Context.Service()("@putdotio/cli/CliConfig") {};
 const optionalTrimmedString = (name) => Config.option(Config.string(name)).pipe(Config.map((value) => Option.flatMap(value, (raw) => {
 	const trimmed = raw.trim();
 	return trimmed.length > 0 ? Option.some(trimmed) : Option.none();
@@ -621,23 +643,51 @@ const waitForDeviceToken = (options) => Effect.gen(function* () {
 });
 //#endregion
 //#region src/internal/command-specs.ts
-const NonEmptyStringSchema$3 = Schema.String.pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected a non-empty string" }));
-const OutputModeSchema = Schema.Literal("json", "text", "ndjson");
-const InternalRendererSchema = Schema.Literal("json", "terminal", "ndjson");
-const CommandKindSchema = Schema.Literal("utility", "auth", "read", "write");
-const CommandOptionTypeSchema = Schema.Literal("string", "integer", "boolean", "enum");
-const JsonPrimitiveKindSchema = Schema.Literal("string", "integer", "boolean", "null");
+const NonEmptyStringSchema$2 = Schema.String.check(Schema.isNonEmpty());
+const OutputModeSchema = Schema.Literals([
+	"json",
+	"text",
+	"ndjson"
+]);
+const InternalRendererSchema = Schema.Literals([
+	"json",
+	"terminal",
+	"ndjson"
+]);
+const CommandKindSchema = Schema.Literals([
+	"utility",
+	"auth",
+	"read",
+	"write"
+]);
+const CommandOptionTypeSchema = Schema.Literals([
+	"string",
+	"integer",
+	"boolean",
+	"enum"
+]);
+const JsonPrimitiveKindSchema = Schema.Literals([
+	"string",
+	"integer",
+	"boolean",
+	"null"
+]);
 const JsonScalarSchema = Schema.Struct({ kind: JsonPrimitiveKindSchema });
-const JsonEnumValueSchema = Schema.Union(Schema.String, Schema.Number, Schema.Boolean, Schema.Null);
+const JsonEnumValueSchema = Schema.Union([
+	Schema.String,
+	Schema.Number,
+	Schema.Boolean,
+	Schema.Null
+]);
 const JsonPropertySchema = Schema.Struct({
-	name: NonEmptyStringSchema$3,
+	name: NonEmptyStringSchema$2,
 	required: Schema.Boolean,
 	schema: Schema.suspend(() => CommandJsonShapeSchema)
 });
 const JsonObjectSchema = Schema.Struct({
 	kind: Schema.Literal("object"),
 	properties: Schema.Array(JsonPropertySchema),
-	rules: Schema.optional(Schema.Array(NonEmptyStringSchema$3))
+	rules: Schema.optional(Schema.Array(NonEmptyStringSchema$2))
 });
 const JsonArraySchema = Schema.Struct({
 	kind: Schema.Literal("array"),
@@ -647,12 +697,21 @@ const JsonEnumSchema = Schema.Struct({
 	kind: Schema.Literal("enum"),
 	values: Schema.Array(JsonEnumValueSchema)
 });
-const CommandJsonShapeSchema = Schema.Union(JsonScalarSchema, JsonEnumSchema, JsonObjectSchema, JsonArraySchema);
+const CommandJsonShapeSchema = Schema.Union([
+	JsonScalarSchema,
+	JsonEnumSchema,
+	JsonObjectSchema,
+	JsonArraySchema
+]);
 const CommandOptionSchema = Schema.Struct({
-	choices: Schema.optional(Schema.Array(NonEmptyStringSchema$3)),
-	defaultValue: Schema.optional(Schema.Union(NonEmptyStringSchema$3, Schema.Number, Schema.Boolean)),
-	description: Schema.optional(NonEmptyStringSchema$3),
-	name: NonEmptyStringSchema$3,
+	choices: Schema.optional(Schema.Array(NonEmptyStringSchema$2)),
+	defaultValue: Schema.optional(Schema.Union([
+		NonEmptyStringSchema$2,
+		Schema.Number,
+		Schema.Boolean
+	])),
+	description: Schema.optional(NonEmptyStringSchema$2),
+	name: NonEmptyStringSchema$2,
 	repeated: Schema.Boolean,
 	required: Schema.Boolean,
 	type: CommandOptionTypeSchema
@@ -671,10 +730,10 @@ const CommandAuthSchema = Schema.Struct({ required: Schema.Boolean });
 const CommandDescriptorSchema = Schema.Struct({
 	auth: CommandAuthSchema,
 	capabilities: CommandCapabilitiesSchema,
-	command: NonEmptyStringSchema$3,
+	command: NonEmptyStringSchema$2,
 	input: CommandInputSchema,
 	kind: CommandKindSchema,
-	purpose: NonEmptyStringSchema$3
+	purpose: NonEmptyStringSchema$2
 });
 const CliOutputContractSchema = Schema.Struct({
 	defaultInteractive: Schema.Literal("text"),
@@ -808,31 +867,38 @@ const enumFlag = (name, choices, options = {}) => ({
 });
 const unwrapSchemaAst = (ast) => {
 	let current = ast;
-	while (current && (current._tag === "Refinement" || current._tag === "Transformation" || current._tag === "Suspend")) current = current._tag === "Suspend" ? current.type : current._tag === "Transformation" ? current.to : current.from;
+	while (current && current._tag === "Suspend") current = current.thunk();
 	return current;
 };
 const schemaAstToJsonShape = (ast) => {
 	const current = unwrapSchemaAst(ast);
 	switch (current?._tag) {
-		case "StringKeyword": return stringShape();
-		case "NumberKeyword": return integerShape();
-		case "BooleanKeyword": return booleanShape();
-		case "UndefinedKeyword":
-		case "VoidKeyword":
-		case "NullKeyword": return nullShape();
-		case "Literal": return enumShape([current.literal ?? null]);
-		case "TupleType": {
-			const item = current.rest?.[0]?.type;
+		case "String": return stringShape();
+		case "Number": return integerShape();
+		case "Boolean": return booleanShape();
+		case "Undefined":
+		case "Void":
+		case "Null": return nullShape();
+		case "Literal": {
+			const literal = current.literal ?? null;
+			if (typeof literal === "bigint") throw new Error("BigInt literals are not supported in CLI json metadata.");
+			return enumShape([literal]);
+		}
+		case "Arrays": {
+			const item = current.rest[0] ?? current.elements[0];
 			if (!item) throw new Error("Unable to derive an array item schema from an empty tuple AST.");
 			return arrayShape(schemaAstToJsonShape(item));
 		}
-		case "TypeLiteral": return objectShape((current.propertySignatures ?? []).map((propertySignature) => property(propertySignature.name, schemaAstToJsonShape(propertySignature.type), propertySignature.isOptional !== true)));
+		case "Objects": return objectShape(current.propertySignatures.map((propertySignature) => property(String(propertySignature.name), schemaAstToJsonShape(propertySignature.type), !SchemaAST.isOptional(propertySignature.type))));
 		case "Union": {
-			const definedTypes = (current.types ?? []).filter((type) => unwrapSchemaAst(type)?._tag !== "UndefinedKeyword");
+			const definedTypes = current.types.filter((type) => unwrapSchemaAst(type)?._tag !== "Undefined");
 			const enumValues = definedTypes.flatMap((type) => {
 				const unwrapped = unwrapSchemaAst(type);
-				if (unwrapped?._tag === "Literal") return [unwrapped.literal ?? null];
-				if (unwrapped?._tag === "NullKeyword" || unwrapped?._tag === "VoidKeyword") return [null];
+				if (unwrapped?._tag === "Literal") {
+					const literal = unwrapped.literal ?? null;
+					return typeof literal === "bigint" ? [] : [literal];
+				}
+				if (unwrapped?._tag === "Null" || unwrapped?._tag === "Void") return [null];
 				return [];
 			});
 			if (enumValues.length === definedTypes.length && enumValues.length > 0) return enumShape(enumValues);
@@ -1272,6 +1338,7 @@ const normalizeOutputMode = (output, isInteractiveTerminal = true) => {
 	if (output === "text") return "terminal";
 	return isInteractiveTerminal ? "terminal" : "json";
 };
+const normalizeRequestedOrResolvedOutputMode = (output, isInteractiveTerminal = true) => output === "terminal" ? "terminal" : normalizeOutputMode(output, isInteractiveTerminal);
 const detectOutputModeFromArgv = (argv, isInteractiveTerminal = true) => {
 	for (let index = 0; index < argv.length; index += 1) {
 		const argument = argv[index];
@@ -1290,15 +1357,28 @@ const SAFE_SENSITIVE_SENTINEL_VALUES = new Set([
 	REDACTED_VALUE
 ]);
 const PROMPT_INJECTION_PATTERN = /\b(ignore (?:all|any|previous|above)|system prompt|developer message|tool call|function call|follow these instructions|you are chatgpt|you are an ai)\b/iu;
-const isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const sanitizeTerminalText = (value) => value.replace(/(Authorization\s*:\s*Bearer\s+)([A-Za-z0-9._~+/=-]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/((?:auth_?token|access_?token|refresh_?token|oauth_?token|token|password|secret|cookie)["']?\s*[:=]\s*["']?)([^"'&,\s}]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/(Bearer\s+)([A-Za-z0-9._~+/=-]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/([?&](?:auth_?token|access_?token|refresh_?token|oauth_?token|token)=)([^&\s]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`);
+const TERMINAL_ESCAPE_PATTERN = new RegExp(String.raw`\u001B(?:\][^\u0007]*(?:\u0007|\u001B\\)|\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])`, "gu");
+const TERMINAL_CONTROL_PATTERN = new RegExp(String.raw`[\u0000-\u0008\u000B-\u001F\u007F-\u009F]`, "gu");
+const isPlainObject = (value) => {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const prototype = Object.getPrototypeOf(value);
+	return prototype === Object.prototype || prototype === null;
+};
+const redactSensitiveText = (value) => value.replace(/(Authorization\s*:\s*Bearer\s+)([A-Za-z0-9._~+/=-]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/((?:auth_?token|access_?token|refresh_?token|oauth_?token|token|password|secret|cookie)["']?\s*[:=]\s*["']?)([^"'&,\s}]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/(Bearer\s+)([A-Za-z0-9._~+/=-]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`).replace(/([?&](?:auth_?token|access_?token|refresh_?token|oauth_?token|token)=)([^&\s]+)/gi, (_match, prefix) => `${prefix}${REDACTED_VALUE}`);
+const sanitizeTerminalText = (value) => redactSensitiveText(value).replace(TERMINAL_ESCAPE_PATTERN, "").replace(TERMINAL_CONTROL_PATTERN, "");
+const sanitizeTerminalValue = (value) => {
+	if (typeof value === "string") return sanitizeTerminalText(value);
+	if (Array.isArray(value)) return value.map(sanitizeTerminalValue);
+	if (isPlainObject(value)) return Object.fromEntries(Object.entries(value).map(([key, nestedValue]) => [key, SENSITIVE_KEY_PATTERN.test(key) && typeof nestedValue === "string" ? SAFE_SENSITIVE_SENTINEL_VALUES.has(nestedValue) ? nestedValue : REDACTED_VALUE : sanitizeTerminalValue(nestedValue)]));
+	return value;
+};
 const joinPath = (segments) => segments.reduce((path, segment) => {
 	if (segment.startsWith("[")) return `${path}${segment}`;
 	return path === "$" ? `$.${segment}` : `${path}.${segment}`;
 }, "$");
 const sanitizeStructuredValueInternal = (value, path) => {
 	if (typeof value === "string") {
-		const sanitized = sanitizeTerminalText(value);
+		const sanitized = redactSensitiveText(value);
 		return {
 			untrustedTextPaths: PROMPT_INJECTION_PATTERN.test(sanitized) ? [joinPath(path)] : [],
 			value: sanitized
@@ -1356,7 +1436,7 @@ const sanitizeStructuredValueInternal = (value, path) => {
 const sanitizeStructuredValue = (value) => sanitizeStructuredValueInternal(value, []).value;
 const renderJson = (value) => JSON.stringify(sanitizeStructuredValue(value), null, 2);
 const renderNdjson = (value) => JSON.stringify(sanitizeStructuredValue(value));
-const renderTerminal = (value, renderTerminalValue) => sanitizeTerminalText(renderTerminalValue(value));
+const renderTerminal = (value, renderTerminalValue) => redactSensitiveText(renderTerminalValue(sanitizeTerminalValue(value)));
 const toCliErrorView = (error) => {
 	const meta = error.meta;
 	return {
@@ -1381,61 +1461,60 @@ const toCliErrorJson = (error) => {
 };
 const localizeError = (error) => isLocalizedError(error) ? error : localizeCliError(error);
 const formatCliError = (error) => {
-	return sanitizeTerminalText(renderCliErrorTerminal(toCliErrorView(localizeError(error))));
+	return redactSensitiveText(renderCliErrorTerminal(sanitizeTerminalValue(toCliErrorView(localizeError(error)))));
 };
 const formatCliErrorJson = (error) => {
 	return renderJson(toCliErrorJson(isLocalizedError(error) ? error : localizeCliError(error)));
 };
-var CliOutput = class extends Context.Tag("@putdotio/cli/CliOutput")() {};
+var CliOutput = class extends Context.Service()("@putdotio/cli/CliOutput") {};
 const makeCliOutput = (runtime) => ({
-	formatError: (error, output) => isStructuredOutputMode(normalizeOutputMode(output, runtime.isInteractiveTerminal)) ? formatCliErrorJson(error) : formatCliError(error),
+	formatError: (error, output) => isStructuredOutputMode(normalizeRequestedOrResolvedOutputMode(output, runtime.isInteractiveTerminal)) ? formatCliErrorJson(error) : formatCliError(error),
 	error: (message) => Console.error(sanitizeTerminalText(message)),
-	write: (value, output, renderTerminalValue) => Console.log((() => {
-		switch (normalizeOutputMode(output, runtime.isInteractiveTerminal)) {
-			case "terminal": return renderTerminal(value, renderTerminalValue);
-			case "ndjson": return renderNdjson(value);
-			case "json": return renderJson(value);
-		}
-	})())
+	write: (value, output, renderTerminalValue) => {
+		const outputMode = normalizeOutputMode(output, runtime.isInteractiveTerminal);
+		const rendered = outputMode === "terminal" ? renderTerminal(value, renderTerminalValue) : outputMode === "ndjson" ? renderNdjson(value) : renderJson(value);
+		return runtime.writeStdout(`${rendered}\n`);
+	}
 });
 const CliOutputLive = Layer.effect(CliOutput, Effect.map(CliRuntime, makeCliOutput));
 const writeOutput = (value, output, renderTerminalValue) => Effect.flatMap(CliOutput, (cliOutput) => cliOutput.write(value, output, renderTerminalValue));
 //#endregion
 //#region src/internal/sdk.ts
 const sdk = createPutioSdkEffectClient();
-var CliSdk = class extends Context.Tag("@putdotio/cli/CliSdk")() {};
+var CliSdk = class extends Context.Service()("@putdotio/cli/CliSdk") {};
 const makeCliSdk = () => ({
 	client: sdk,
-	provide: (config, program) => program.pipe(Effect.provide(makePutioSdkLayer({
+	provide: (config, program) => program.pipe(Effect.provide(makePutioSdkLiveLayer({
 		accessToken: config.token,
 		baseUrl: config.apiBaseUrl
 	})))
 });
-const CliSdkLive = Layer.mergeAll(FetchHttpClient.layer, Layer.succeed(CliSdk, makeCliSdk()));
+const CliSdkLive = Layer.succeed(CliSdk, makeCliSdk());
 const provideSdk = (config, program) => Effect.flatMap(CliSdk, (cliSdk) => cliSdk.provide(config, program));
 //#endregion
 //#region src/internal/state.ts
-const NonEmptyStringSchema$2 = Schema.String.pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected a non-empty string" }));
+const NonEmptyStringSchema$1 = Schema.String.check(Schema.isNonEmpty());
 const PutioCliConfigSchema = Schema.Struct({
-	api_base_url: NonEmptyStringSchema$2,
-	auth_token: Schema.optional(NonEmptyStringSchema$2)
+	api_base_url: NonEmptyStringSchema$1,
+	auth_token: Schema.optional(NonEmptyStringSchema$1)
 });
 const ResolvedAuthStateSchema = Schema.Struct({
-	apiBaseUrl: NonEmptyStringSchema$2,
-	configPath: NonEmptyStringSchema$2,
-	source: Schema.Literal("env", "config"),
-	token: NonEmptyStringSchema$2
+	apiBaseUrl: NonEmptyStringSchema$1,
+	configPath: NonEmptyStringSchema$1,
+	source: Schema.Literals(["env", "config"]),
+	token: NonEmptyStringSchema$1
 });
 const AuthStatusSchema = Schema.Struct({
-	apiBaseUrl: NonEmptyStringSchema$2,
+	apiBaseUrl: NonEmptyStringSchema$1,
 	authenticated: Schema.Boolean,
-	configPath: NonEmptyStringSchema$2,
-	source: Schema.NullOr(Schema.Literal("env", "config"))
+	configPath: NonEmptyStringSchema$1,
+	source: Schema.NullOr(Schema.Literals(["env", "config"]))
 });
 var AuthStateError = class extends Data.TaggedError("AuthStateError") {};
-var CliState = class extends Context.Tag("@putdotio/cli/CliState")() {};
+var CliState = class extends Context.Service()("@putdotio/cli/CliState") {};
 const decodePersistedConfig = Schema.decodeUnknownSync(PutioCliConfigSchema);
 const mapFileSystemError = (error, message) => error instanceof AuthStateError ? error : new AuthStateError({ message });
+const resolveAuthRuntimeConfig = () => resolveCliRuntimeConfig().pipe(Effect.mapError((error) => new AuthStateError({ message: error.message })));
 const parsePersistedConfig = (raw) => {
 	let value;
 	try {
@@ -1451,8 +1530,8 @@ const parsePersistedConfig = (raw) => {
 };
 const loadPersistedStateEffect = (configPath) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
-	const effectiveConfigPath = configPath ?? (yield* resolveCliRuntimeConfig()).configPath;
-	const rawConfig = yield* fs.readFileString(effectiveConfigPath, "utf8").pipe(Effect.catchIf((error) => error instanceof SystemError && error.reason === "NotFound", () => Effect.succeed(null)), Effect.mapError((error) => mapFileSystemError(error, `Unable to read CLI config at ${effectiveConfigPath}.`)));
+	const effectiveConfigPath = configPath ?? (yield* resolveAuthRuntimeConfig()).configPath;
+	const rawConfig = yield* fs.readFileString(effectiveConfigPath, "utf8").pipe(Effect.catchIf((error) => error instanceof PlatformError && error.reason instanceof SystemError && error.reason._tag === "NotFound", () => Effect.succeed(null)), Effect.mapError((error) => mapFileSystemError(error, `Unable to read CLI config at ${effectiveConfigPath}.`)));
 	if (rawConfig === null) return null;
 	return yield* Effect.try({
 		try: () => parsePersistedConfig(rawConfig),
@@ -1462,7 +1541,7 @@ const loadPersistedStateEffect = (configPath) => Effect.gen(function* () {
 const savePersistedStateEffect = (state, configPath) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const runtime = yield* CliRuntime;
-	const effectiveConfigPath = configPath ?? (yield* resolveCliRuntimeConfig()).configPath;
+	const effectiveConfigPath = configPath ?? (yield* resolveAuthRuntimeConfig()).configPath;
 	const existingConfig = yield* loadPersistedStateEffect(effectiveConfigPath);
 	const persistedState = {
 		api_base_url: state.apiBaseUrl ?? existingConfig?.api_base_url ?? DEFAULT_PUTIO_API_BASE_URL,
@@ -1479,7 +1558,7 @@ const savePersistedStateEffect = (state, configPath) => Effect.gen(function* ()
 const clearPersistedStateEffect = (configPath) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const runtime = yield* CliRuntime;
-	const effectiveConfigPath = configPath ?? (yield* resolveCliRuntimeConfig()).configPath;
+	const effectiveConfigPath = configPath ?? (yield* resolveAuthRuntimeConfig()).configPath;
 	const existingConfig = yield* loadPersistedStateEffect(effectiveConfigPath);
 	if (existingConfig && existingConfig.api_base_url !== DEFAULT_PUTIO_API_BASE_URL) {
 		const nextConfig = { api_base_url: existingConfig.api_base_url };
@@ -1490,7 +1569,7 @@ const clearPersistedStateEffect = (configPath) => Effect.gen(function* () {
 	return { configPath: effectiveConfigPath };
 });
 const getAuthStatusEffect = () => Effect.gen(function* () {
-	const runtime = yield* resolveCliRuntimeConfig();
+	const runtime = yield* resolveAuthRuntimeConfig();
 	if (runtime.token) return {
 		authenticated: true,
 		source: "env",
@@ -1511,7 +1590,7 @@ const getAuthStatusEffect = () => Effect.gen(function* () {
 	};
 });
 const resolveAuthStateEffect = () => Effect.gen(function* () {
-	const runtime = yield* resolveCliRuntimeConfig();
+	const runtime = yield* resolveAuthRuntimeConfig();
 	if (runtime.token) return {
 		token: runtime.token,
 		apiBaseUrl: runtime.apiBaseUrl,
@@ -1542,60 +1621,73 @@ const getAuthStatus = () => Effect.flatMap(CliState, (state) => state.getAuthSta
 const resolveAuthState = () => Effect.flatMap(CliState, (state) => state.resolveAuthState());
 //#endregion
 //#region src/internal/command.ts
-const outputOption = Options.choice("output", [
+const outputOption = Flag.choice("output", [
 	"json",
 	"text",
 	"ndjson"
-]).pipe(Options.optional);
-const dryRunOption = Options.boolean("dry-run").pipe(Options.withDefault(false));
-const fieldsOption = Options.text("fields").pipe(Options.optional);
-const jsonOption = Options.text("json").pipe(Options.optional);
-const pageAllOption = Options.boolean("page-all").pipe(Options.withDefault(false));
+]).pipe(Flag.optional);
+const dryRunOption = Flag.boolean("dry-run").pipe(Flag.withDefault(false));
+const fieldsOption = Flag.string("fields").pipe(Flag.optional);
+const jsonOption = Flag.string("json").pipe(Flag.optional);
+const pageAllOption = Flag.boolean("page-all").pipe(Flag.withDefault(false));
 const defineBooleanOption = (name, options = {}) => {
-	const option = options.defaultValue === void 0 ? Options.boolean(name) : Options.boolean(name).pipe(Options.withDefault(options.defaultValue));
+	const option = options.defaultValue === void 0 ? Flag.boolean(name) : Flag.boolean(name).pipe(Flag.withDefault(options.defaultValue));
 	return {
 		flag: booleanFlag(name, options),
 		option
 	};
 };
-const defineIntegerOption = (name, options = {}) => {
-	const option = options.optional ? Options.integer(name).pipe(Options.optional) : Options.integer(name);
-	return {
-		flag: integerFlag(name, {
-			description: options.description,
-			required: options.required ?? options.optional !== true
-		}),
-		option
+function defineIntegerOption(name, options = {}) {
+	const flag = integerFlag(name, {
+		description: options.description,
+		required: options.required ?? options.optional !== true
+	});
+	return options.optional === true ? {
+		flag,
+		option: Flag.integer(name).pipe(Flag.optional)
+	} : {
+		flag,
+		option: Flag.integer(name)
 	};
-};
-const defineTextOption = (name, options = {}) => {
-	let option = Options.text(name);
-	if (options.defaultValue !== void 0) option = option.pipe(Options.withDefault(options.defaultValue));
-	else if (options.optional) option = option.pipe(Options.optional);
-	return {
-		flag: stringFlag(name, {
-			defaultValue: options.defaultValue,
-			description: options.description,
-			required: options.required ?? (options.defaultValue === void 0 && options.optional !== true)
-		}),
-		option
+}
+function defineTextOption(name, options = {}) {
+	const flag = stringFlag(name, {
+		defaultValue: options.defaultValue,
+		description: options.description,
+		required: options.required ?? (options.defaultValue === void 0 && options.optional !== true)
+	});
+	if (options.defaultValue !== void 0) return {
+		flag,
+		option: Flag.string(name).pipe(Flag.withDefault(options.defaultValue))
 	};
-};
-const defineChoiceOption = (name, choices, options = {}) => {
-	const option = options.optional ? Options.choice(name, choices).pipe(Options.optional) : Options.choice(name, choices);
-	return {
-		flag: enumFlag(name, choices, {
-			description: options.description,
-			required: options.required ?? options.optional !== true
-		}),
-		option
+	return options.optional === true ? {
+		flag,
+		option: Flag.string(name).pipe(Flag.optional)
+	} : {
+		flag,
+		option: Flag.string(name)
 	};
-};
+}
+function defineChoiceOption(name, choices, options = {}) {
+	const flag = enumFlag(name, choices, {
+		description: options.description,
+		required: options.required ?? options.optional !== true
+	});
+	return options.optional === true ? {
+		flag,
+		option: Flag.choice(name, choices).pipe(Flag.optional)
+	} : {
+		flag,
+		option: Flag.choice(name, choices)
+	};
+}
 const getOption = (option) => Option.getOrUndefined(option);
 var CliCommandInputError = class extends Data.TaggedError("CliCommandInputError") {};
 const PATH_TRAVERSAL_PATTERN = /(?:^|[\\/])\.\.(?:[\\/]|$)|%2e/iu;
 const QUERY_OR_FRAGMENT_PATTERN = /[?#]/u;
 const TOP_LEVEL_FIELD_PATTERN = /^[A-Za-z0-9_-]+$/u;
+const MAX_CURSOR_PAGES = 1e3;
+const MAX_CURSOR_ITEMS = 1e5;
 const ownKeys = (value) => Object.keys(value);
 const hasControlCharacters = (value) => [...value].some((character) => {
 	const codePoint = character.codePointAt(0);
@@ -1620,10 +1712,10 @@ const validateNameLikeInput = (label, value) => validateSafeString({
 const parseRequestedFields = (raw) => {
 	const parts = raw.split(",").map((part) => part.trim());
 	if (parts.length === 0 || parts.some((part) => part.length === 0)) throw new CliCommandInputError({ message: "Expected `--fields` to be a comma-separated list of top-level field names." });
-	return [...new Set(parts.map((part) => validateSafeString({
-		label: `\`--fields\` selector \`${part}\``,
+	return [...new Set(parts.map((part, index) => validateSafeString({
+		label: `\`--fields\` selector #${index + 1}`,
 		pattern: TOP_LEVEL_FIELD_PATTERN,
-		patternMessage: "`--fields` only accepts top-level field names without dots, brackets, or slashes.",
+		patternMessage: `\`--fields\` selector #${index + 1} only accepts top-level field names without dots, brackets, or slashes.`,
 		value: part
 	})))];
 };
@@ -1637,6 +1729,17 @@ const readPageItems = (value, itemKey, command) => {
 	if (!Array.isArray(items)) throw new CliCommandInputError({ message: `Expected \`${command}\` responses to include an array at \`${itemKey}\`.` });
 	return items;
 };
+const assertCursorPageBudget = (input) => {
+	if (input.pageCount > MAX_CURSOR_PAGES) throw new CliCommandInputError({ message: `\`${input.command}\` pagination exceeded ${MAX_CURSOR_PAGES} pages.` });
+	if (input.itemCount > MAX_CURSOR_ITEMS) throw new CliCommandInputError({ message: `\`${input.command}\` pagination exceeded ${MAX_CURSOR_ITEMS} items.` });
+};
+const assertCursorNotSeen = (input) => {
+	if (input.seenCursors.has(input.cursor)) throw new CliCommandInputError({ message: `\`${input.command}\` pagination returned a repeated cursor.` });
+	input.seenCursors.add(input.cursor);
+};
+const assertCursorNotRepeated = (input) => {
+	if (input.cursor !== null && input.seenCursors.has(input.cursor)) throw new CliCommandInputError({ message: `\`${input.command}\` pagination returned a repeated cursor.` });
+};
 const integerPattern = /^-?\d+$/;
 const parseRepeatedIntegers = (values) => {
 	const parsed = [];
@@ -1646,14 +1749,14 @@ const parseRepeatedIntegers = (values) => {
 	}
 	return Option.some(parsed);
 };
-const parseRepeatedIntegerOption = (name) => Options.text(name).pipe(Options.repeated, Options.filterMap(parseRepeatedIntegers, `Expected \`--${name}\` values to be integers.`));
+const parseRepeatedIntegerOption = (name) => Flag.string(name).pipe(Flag.atLeast(0), Flag.filterMap(parseRepeatedIntegers, () => `Expected \`--${name}\` values to be integers.`));
 const defineRepeatedIntegerOption = (name, options = {}) => ({
 	flag: repeatedIntegerFlag(name, options),
 	option: parseRepeatedIntegerOption(name)
 });
 const defineRepeatedTextOption = (name, options = {}) => ({
 	flag: repeatedStringFlag(name, options),
-	option: Options.text(name).pipe(Options.repeated)
+	option: Flag.string(name).pipe(Flag.atLeast(0))
 });
 const mapInputError = (error, fallbackMessage) => error instanceof CliCommandInputError ? error : new CliCommandInputError({ message: fallbackMessage });
 const decodeJsonOption = (schema, raw) => Effect.try({
@@ -1701,11 +1804,36 @@ const selectTopLevelFields = (input) => Effect.try({
 const collectAllCursorPages = (input) => Effect.gen(function* () {
 	if (!input.pageAll) return input.initial;
 	const collectedItems = [...readPageItems(input.initial, input.itemKey, input.command)];
+	const seenCursors = /* @__PURE__ */ new Set();
 	let cursor = readCursor(input.initial);
+	let pageCount = 1;
+	assertCursorPageBudget({
+		command: input.command,
+		itemCount: collectedItems.length,
+		pageCount
+	});
 	while (cursor !== null) {
+		assertCursorNotSeen({
+			command: input.command,
+			cursor,
+			seenCursors
+		});
 		const nextPage = yield* input.continueWithCursor(cursor);
-		collectedItems.push(...readPageItems(nextPage, input.itemKey, input.command));
-		cursor = readCursor(nextPage);
+		const nextCursor = readCursor(nextPage);
+		assertCursorNotRepeated({
+			command: input.command,
+			cursor: nextCursor,
+			seenCursors
+		});
+		const pageItems = readPageItems(nextPage, input.itemKey, input.command);
+		pageCount += 1;
+		collectedItems.push(...pageItems);
+		assertCursorPageBudget({
+			command: input.command,
+			itemCount: collectedItems.length,
+			pageCount
+		});
+		cursor = nextCursor;
 	}
 	return {
 		...input.initial,
@@ -1740,7 +1868,18 @@ const writeReadPages = (input) => Effect.gen(function* () {
 		});
 	}
 	let current = input.initial;
+	const seenCursors = /* @__PURE__ */ new Set();
+	let pageCount = 1;
+	let streamedItemCount = 0;
 	while (true) {
+		if (input.itemKey) {
+			streamedItemCount += readPageItems(current, input.itemKey, input.command).length;
+			assertCursorPageBudget({
+				command: input.command,
+				itemCount: streamedItemCount,
+				pageCount
+			});
+		}
 		yield* writeOutput(yield* selectTopLevelFields({
 			command: input.command,
 			requestedFields: input.controls.requestedFields,
@@ -1749,7 +1888,19 @@ const writeReadPages = (input) => Effect.gen(function* () {
 		if (!input.controls.pageAll || !input.continueWithCursor || !input.itemKey) return;
 		const cursor = readCursor(current);
 		if (cursor === null) return;
-		current = yield* input.continueWithCursor(cursor);
+		assertCursorNotSeen({
+			command: input.command,
+			cursor,
+			seenCursors
+		});
+		const nextPage = yield* input.continueWithCursor(cursor);
+		assertCursorNotRepeated({
+			command: input.command,
+			cursor: readCursor(nextPage),
+			seenCursors
+		});
+		current = nextPage;
+		pageCount += 1;
 	}
 });
 const renderDryRunPlanTerminal = (value) => [
@@ -1851,15 +2002,13 @@ const previewCodeOption = previewCodeConfig.option;
 const waitForOpenShortcut = (url) => Effect.gen(function* () {
 	const runtimeService = yield* CliRuntime;
 	if (!runtimeService.isInteractiveTerminal) return false;
-	const terminal = yield* Terminal.Terminal;
-	if (!(yield* terminal.isTTY)) return false;
-	const input = yield* terminal.readInput;
+	const input = yield* (yield* Terminal.Terminal).readInput;
 	while (true) {
-		const event = yield* input.take;
+		const event = yield* Queue.take(input);
 		const keyInput = Option.getOrElse(event.input, () => "").toLowerCase();
 		if (event.key.name === "o" || keyInput === "o") return yield* runtimeService.openExternal(url);
 	}
-}).pipe(Effect.catchTag("NoSuchElementException", () => Effect.succeed(false)));
+}).pipe(Effect.catchIf(Cause.isDone, () => Effect.succeed(false)));
 const renderAuthStatus = (status) => status.authenticated ? [
 	translate("cli.auth.status.authenticatedYes"),
 	translate("cli.auth.status.source", { value: status.source ?? translate("cli.auth.status.unknown") }),
@@ -1899,7 +2048,7 @@ const authLogin = Command.make("login", {
 		`code: ${code}`,
 		translate("cli.auth.login.waiting")
 	].join("\n");
-	yield* outputMode === "terminal" ? Console.log(instructionMessage) : Console.error(instructionMessage);
+	yield* outputMode === "terminal" ? Console.log(instructionMessage) : runtimeService.writeStderr(`${instructionMessage}\n`);
 	const openShortcutFiber = outputMode === "terminal" && !browserOpened ? yield* Effect.forkScoped(waitForOpenShortcut(linkUrl)) : void 0;
 	yield* Effect.addFinalizer(() => openShortcutFiber ? Fiber.interrupt(openShortcutFiber) : Effect.void);
 	const { configPath, state } = yield* savePersistedState({
@@ -2361,15 +2510,15 @@ const fileTypeOption = fileTypeConfig.option;
 const sortByOption = sortByConfig.option;
 const optionalFileIdOption = optionalFileIdConfig.option;
 const optionalFileNameOption = optionalFileNameConfig.option;
-const NonEmptyStringSchema$1 = Schema.String.pipe(Schema.filter((value) => value.trim().length > 0, { message: () => "Expected a non-empty string" }));
-const NonEmptyIdsSchema$1 = Schema.Array(Schema.Number).pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected at least one id" }));
+const NonBlankStringSchema = Schema.String.check(Schema.makeFilter((value) => value.trim().length > 0 ? void 0 : "Expected a non-empty string"));
+const NonEmptyIdsSchema$1 = Schema.Array(Schema.Number).check(Schema.isNonEmpty());
 const FilesMkdirInputSchema = Schema.Struct({
-	name: NonEmptyStringSchema$1,
+	name: NonBlankStringSchema,
 	parent_id: Schema.optional(Schema.Number)
 });
 const FilesRenameInputSchema = Schema.Struct({
 	file_id: Schema.Number,
-	name: NonEmptyStringSchema$1
+	name: NonBlankStringSchema
 });
 const FilesDeleteInputSchema = Schema.Struct({
 	ids: NonEmptyIdsSchema$1,
@@ -2812,8 +2961,8 @@ const WATCH_TERMINAL_STATUSES = [
 	"ERROR",
 	"SEEDING"
 ];
-const NonEmptyIdsSchema = Schema.Array(Schema.Number).pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected at least one id" }));
-const TransfersAddInputSchema = Schema.Array(TransferAddInputSchema).pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected at least one transfer input" }));
+const NonEmptyIdsSchema = Schema.Array(Schema.Number).check(Schema.isNonEmpty());
+const TransfersAddInputSchema = Schema.Array(TransferAddInputSchema).check(Schema.isNonEmpty());
 const TransfersCancelInputSchema = Schema.Struct({ ids: NonEmptyIdsSchema });
 const TransfersSingleIdInputSchema = Schema.Struct({ id: Schema.Number });
 const TransfersCleanInputSchema = Schema.Struct({ ids: Schema.optional(NonEmptyIdsSchema) });
@@ -2928,12 +3077,15 @@ const transfersRetry = Command.make("retry", {
 }));
 const transfersClean = Command.make("clean", {
 	dryRun: dryRunOption,
-	id: transferIdsOption.pipe(Options.optional),
+	id: transferIdsOption.pipe(Flag.optional),
 	json: jsonOption,
 	output: outputOption
 }, ({ dryRun, id, json, output }) => Effect.gen(function* () {
 	const input = yield* resolveMutationInput({
-		buildFromFlags: () => ({ ids: Option.getOrUndefined(id) }),
+		buildFromFlags: () => {
+			const ids = Option.getOrUndefined(id);
+			return ids === void 0 || ids.length === 0 ? {} : { ids };
+		},
 		json,
 		schema: TransfersCleanInputSchema
 	});
@@ -3311,7 +3463,7 @@ const commandCatalog = decodeCommandSpecs([
 ]);
 //#endregion
 //#region src/internal/metadata.ts
-const NonEmptyStringSchema = Schema.String.pipe(Schema.filter((value) => value.length > 0, { message: () => "Expected a non-empty string" }));
+const NonEmptyStringSchema = Schema.String.check(Schema.isNonEmpty());
 const CliMetadataSchema = Schema.Struct({
 	agentDx: AgentDxScorecardSchema,
 	auth: Schema.Struct({
@@ -3386,4 +3538,4 @@ const describeCli = () => decodeCliMetadata({
 	version
 });
 //#endregion
-export { translate as A, CliOutput as C, CliConfigLive as D, renderJson as E, CliRuntime as O, CliSdkLive as S, detectOutputModeFromArgv as T, clearPersistedState as _, searchCommand as a, resolveAuthState as b, brandCommand as c, AuthStateError as d, AuthStatusSchema as f, ResolvedAuthStateSchema as g, PutioCliConfigSchema as h, filesCommand as i, version as j, CliRuntimeLive as k, versionCommand as l, CliStateLive as m, whoamiCommand as n, eventsCommand as o, CliState as p, transfersCommand as r, downloadLinksCommand as s, describeCli as t, makeAuthCommand as u, getAuthStatus as v, CliOutputLive as w, savePersistedState as x, loadPersistedState as y };
+export { CliRuntimeLive as A, CliOutput as C, renderJson as D, isStructuredOutputMode as E, version as M, CliConfigLive as O, CliSdkLive as S, detectOutputModeFromArgv as T, clearPersistedState as _, searchCommand as a, resolveAuthState as b, brandCommand as c, AuthStateError as d, AuthStatusSchema as f, ResolvedAuthStateSchema as g, PutioCliConfigSchema as h, filesCommand as i, translate as j, CliRuntime as k, versionCommand as l, CliStateLive as m, whoamiCommand as n, eventsCommand as o, CliState as p, transfersCommand as r, downloadLinksCommand as s, describeCli as t, makeAuthCommand as u, getAuthStatus as v, CliOutputLive as w, savePersistedState as x, loadPersistedState as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putdotio/cli",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "Agent-first CLI for the put.io API.",
   "homepage": "https://github.com/putdotio/putio-cli#readme",
   "bugs": {
@@ -34,6 +34,7 @@
     "check": "vp check .",
     "coverage": "vp test --coverage",
     "dev": "vp pack --watch",
+    "prepare": "./scripts/prepare-effect.sh",
     "prepack": "vp pack",
     "smoke:pack": "node ./scripts/smoke-packed-install.mjs",
     "test": "vp test",
@@ -42,18 +43,17 @@
     "verify": "vp check . && vp pack && vp test && vp test --coverage"
   },
   "dependencies": {
-    "@effect/cli": "^0.73.2",
-    "@effect/platform": "0.94.5",
-    "@effect/platform-node": "0.104.1",
-    "@putdotio/sdk": "^9.1.0",
+    "@effect/platform-node": "4.0.0-beta.66",
+    "@putdotio/sdk": "^9.3.0",
     "cli-table3": "^0.6.5",
-    "effect": "3.19.19",
+    "effect": "4.0.0-beta.66",
     "i18next": "^25.5.2"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",
     "@vitest/coverage-v8": "^4.1.5",
     "esbuild": "^0.27.0",
+    "is-ci": "^4.1.0",
     "postject": "^1.0.0-alpha.6",
     "typescript": "^5.9.3",
     "vite-plus": "0.1.20"