@fedify/cli 2.1.9 → 2.2.0-dev.898

package/dist/cache.js

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import process from "node:process";
 import { mkdir } from "node:fs/promises";
+import process from "node:process";
+import { join } from "node:path";
+import { homedir } from "node:os";
 //#region src/cache.ts
 /**
 * Returns the default cache directory path.

package/dist/config.js

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
-import { message } from "@optique/core";
 import { printError } from "@optique/run";
+import { message } from "@optique/core";
+import { createConfigContext } from "@optique/config";
 import { readFileSync } from "node:fs";
 import { parse } from "smol-toml";
-import { createConfigContext } from "@optique/config";
 import { array, boolean, check, forward, integer as integer$1, minValue, number, object as object$1, optional as optional$1, picklist, pipe, string as string$1 } from "valibot";
 //#region src/config.ts
 /**
@@ -23,8 +23,10 @@ const lookupSchema = pipe(object$1({
 	traverse: optional$1(boolean()),
 	recurse: optional$1(picklist([
 		"replyTarget",
+		"quote",
 		"quoteUrl",
 		"https://www.w3.org/ns/activitystreams#inReplyTo",
+		"https://w3id.org/fep/044f#quote",
 		"https://www.w3.org/ns/activitystreams#quoteUrl",
 		"https://misskey-hub.net/ns#_misskey_quote",
 		"http://fedibird.com/ns#quoteUri"

package/dist/deno.js

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 //#region deno.json
-var version = "2.1.9";
+var version = "2.2.0-dev.898+44ea8f2f";
 //#endregion
 export { version };

package/dist/generate-vocab/action.js

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
-import { printError } from "@optique/run";
-import process from "node:process";
 import { generateVocab } from "@fedify/vocab-tools";
 import { message } from "@optique/core/message";
+import { printError } from "@optique/run";
 import { stat } from "node:fs/promises";
+import process from "node:process";
 //#region src/generate-vocab/action.ts
 async function runGenerateVocab({ schemaDir, generatedPath }) {
 	if (!(await stat(schemaDir)).isDirectory()) {

package/dist/generate-vocab/command.js

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
-import { argument, command, constant, message, object, option, withDefault } from "@optique/core";
 import { path } from "@optique/run";
+import { argument, command, constant, message, object, option, withDefault } from "@optique/core";
 //#region src/generate-vocab/command.ts
 const schemaDir = withDefault(option("-i", "--input", path({
 	metavar: "DIR",

package/dist/imagerenderer.js

@@ -1,11 +1,11 @@
 import "@js-temporal/polyfill";
 import { Jimp } from "./nodeinfo.js";
-import os from "node:os";
-import path from "node:path";
-import process from "node:process";
 import fs from "node:fs/promises";
+import process from "node:process";
 import { validatePublicUrl } from "@fedify/vocab-runtime";
+import path from "node:path";
 import { encodeBase64 } from "byte-encodings/base64";
+import os from "node:os";
 //#region src/imagerenderer.ts
 const KITTY_IDENTIFIERS = [
 	"kitty",

package/dist/inbox/command.js

@@ -0,0 +1,41 @@
+import "@js-temporal/polyfill";
+import { configContext } from "../config.js";
+import { createTunnelOption } from "../options.js";
+import { command, constant, group, merge, message, multiple, object, option, string } from "@optique/core";
+import { bindConfig } from "@optique/config";
+//#region src/inbox/command.ts
+const DEFAULT_EPHEMERAL_INBOX_NAME = "Fedify Ephemeral Inbox";
+const DEFAULT_EPHEMERAL_INBOX_SUMMARY = "An ephemeral ActivityPub inbox for testing purposes.";
+const inboxCommand = command("inbox", merge(object("Inbox options", {
+	command: constant("inbox"),
+	follow: bindConfig(multiple(option("-f", "--follow", string({ metavar: "URI" }), { description: message`Follow the given actor. The argument can be either an actor URI or a handle. Can be specified multiple times.` })), {
+		context: configContext,
+		key: (config) => config.inbox?.follow ?? [],
+		default: []
+	}),
+	acceptFollow: bindConfig(multiple(option("-a", "--accept-follow", string({ metavar: "URI" }), { description: message`Accept follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be accepted.` })), {
+		context: configContext,
+		key: (config) => config.inbox?.acceptFollow ?? [],
+		default: []
+	}),
+	actorName: bindConfig(option("--actor-name", string({ metavar: "NAME" }), { description: message`Customize the actor display name.` }), {
+		context: configContext,
+		key: (config) => config.inbox?.actorName ?? DEFAULT_EPHEMERAL_INBOX_NAME,
+		default: DEFAULT_EPHEMERAL_INBOX_NAME
+	}),
+	actorSummary: bindConfig(option("--actor-summary", string({ metavar: "SUMMARY" }), { description: message`Customize the actor description.` }), {
+		context: configContext,
+		key: (config) => config.inbox?.actorSummary ?? DEFAULT_EPHEMERAL_INBOX_SUMMARY,
+		default: DEFAULT_EPHEMERAL_INBOX_SUMMARY
+	}),
+	authorizedFetch: bindConfig(option("-A", "--authorized-fetch", { description: message`Enable authorized fetch mode. Incoming requests without valid HTTP signatures will be rejected with 401 Unauthorized.` }), {
+		context: configContext,
+		key: (config) => config.inbox?.authorizedFetch ?? false,
+		default: false
+	})
+}), group("Tunnel options", createTunnelOption("inbox"))), {
+	brief: message`Run an ephemeral ActivityPub inbox server.`,
+	description: message`Spins up an ephemeral server that serves the ActivityPub inbox with a one-time actor, through a short-lived public DNS with HTTPS. You can monitor the incoming activities in real-time.`
+});
+//#endregion
+export { inboxCommand };

package/dist/inbox.js

@@ -1,16 +1,12 @@
 import { Temporal } from "@js-temporal/polyfill";
-import { configContext } from "./config.js";
 import { version } from "./deno.js";
 import { getDocumentLoader } from "./docloader.js";
 import { ActivityEntryPage, ActivityListPage } from "./inbox/view.js";
 import { configureLogging, recordingSink } from "./log.js";
-import { createTunnelOption } from "./options.js";
 import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { colors, matchesActor } from "./utils.js";
-import { command, constant, group, merge, message, multiple, object, option, string } from "@optique/core";
 import process from "node:process";
-import { bindConfig } from "@optique/config";
 import { MemoryKvStore, createFederation, generateCryptoKeyPair } from "@fedify/fedify";
 import { Accept, Activity, Application, Delete, Endpoints, Follow, Image, PUBLIC_COLLECTION, isActor, lookupObject } from "@fedify/vocab";
 import { getLogger } from "@logtape/logtape";
@@ -26,37 +22,6 @@ const logger = getLogger([
 	"cli",
 	"inbox"
 ]);
-const inboxCommand = command("inbox", merge(object("Inbox options", {
-	command: constant("inbox"),
-	follow: bindConfig(multiple(option("-f", "--follow", string({ metavar: "URI" }), { description: message`Follow the given actor. The argument can be either an actor URI or a handle. Can be specified multiple times.` })), {
-		context: configContext,
-		key: (config) => config.inbox?.follow ?? [],
-		default: []
-	}),
-	acceptFollow: bindConfig(multiple(option("-a", "--accept-follow", string({ metavar: "URI" }), { description: message`Accept follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be accepted.` })), {
-		context: configContext,
-		key: (config) => config.inbox?.acceptFollow ?? [],
-		default: []
-	}),
-	actorName: bindConfig(option("--actor-name", string({ metavar: "NAME" }), { description: message`Customize the actor display name.` }), {
-		context: configContext,
-		key: (config) => config.inbox?.actorName ?? "Fedify Ephemeral Inbox",
-		default: "Fedify Ephemeral Inbox"
-	}),
-	actorSummary: bindConfig(option("--actor-summary", string({ metavar: "SUMMARY" }), { description: message`Customize the actor description.` }), {
-		context: configContext,
-		key: (config) => config.inbox?.actorSummary ?? "An ephemeral ActivityPub inbox for testing purposes.",
-		default: "An ephemeral ActivityPub inbox for testing purposes."
-	}),
-	authorizedFetch: bindConfig(option("-A", "--authorized-fetch", { description: message`Enable authorized fetch mode. Incoming requests without valid HTTP signatures will be rejected with 401 Unauthorized.` }), {
-		context: configContext,
-		key: (config) => config.inbox?.authorizedFetch ?? false,
-		default: false
-	})
-}), group("Tunnel options", createTunnelOption("inbox"))), {
-	brief: message`Run an ephemeral ActivityPub inbox server.`,
-	description: message`Spins up an ephemeral server that serves the ActivityPub inbox with an one-time actor, through a short-lived public DNS with HTTPS. You can monitor the incoming activities in real-time.`
-});
 const activities = [];
 const acceptFollows = [];
 const peers = {};
@@ -341,4 +306,4 @@ function createFetchHandler(federation, actorOptions) {
 	};
 }
 //#endregion
-export { inboxCommand, runInbox };
+export { runInbox };

package/dist/log.js

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
-import { dirname } from "node:path";
-import process from "node:process";
 import { mkdir } from "node:fs/promises";
+import process from "node:process";
 import { configure, getConsoleSink } from "@logtape/logtape";
 import { getFileSink } from "@logtape/file";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { dirname } from "node:path";
 //#region src/log.ts
 function getRecordingSink() {
 	let records = [];

package/dist/lookup.js

@@ -1,21 +1,21 @@
 import "@js-temporal/polyfill";
-import { configContext } from "./config.js";
 import { getContextLoader, getDocumentLoader as getDocumentLoader$1 } from "./docloader.js";
 import { configureLogging } from "./log.js";
-import { createTunnelServiceOption, userAgentOption } from "./options.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { colorEnabled, colors, formatObject } from "./utils.js";
+import { configContext } from "./config.js";
+import { createTunnelServiceOption, userAgentOption } from "./options.js";
 import { renderImages } from "./imagerenderer.js";
-import { argument, choice, command, constant, flag, float, integer, map, merge, message, multiple, object, option, optionNames, optional, or, string, withDefault } from "@optique/core";
 import { path, printError } from "@optique/run";
-import { createWriteStream } from "node:fs";
 import process from "node:process";
-import { bindConfig } from "@optique/config";
+import { argument, choice, command, constant, flag, float, integer, map, merge, message, multiple, object, option, optionNames, optional, or, string, withDefault } from "@optique/core";
 import { generateCryptoKeyPair, getAuthenticatedDocumentLoader, respondWithObject } from "@fedify/fedify";
 import { Application, Collection, CryptographicKey, Object as Object$1, lookupObject, traverseCollection } from "@fedify/vocab";
 import { getLogger } from "@logtape/logtape";
 import ora from "ora";
 import { UrlError } from "@fedify/vocab-runtime";
+import { bindConfig } from "@optique/config";
+import { createWriteStream } from "node:fs";
 //#region src/lookup.ts
 const logger = getLogger([
 	"fedify",
@@ -23,13 +23,16 @@ const logger = getLogger([
 	"lookup"
 ]);
 const IN_REPLY_TO_IRI = "https://www.w3.org/ns/activitystreams#inReplyTo";
+const QUOTE_IRI = "https://w3id.org/fep/044f#quote";
 const QUOTE_URL_IRI = "https://www.w3.org/ns/activitystreams#quoteUrl";
 const MISSKEY_QUOTE_IRI = "https://misskey-hub.net/ns#_misskey_quote";
 const FEDIBIRD_QUOTE_IRI = "http://fedibird.com/ns#quoteUri";
 const recurseProperties = [
 	"replyTarget",
+	"quote",
 	"quoteUrl",
 	IN_REPLY_TO_IRI,
+	QUOTE_IRI,
 	QUOTE_URL_IRI,
 	MISSKEY_QUOTE_IRI,
 	FEDIBIRD_QUOTE_IRI
@@ -59,7 +62,7 @@ const authorizedFetchOption = withDefault(object("Authorized fetch options", {
 		key: (config) => config.lookup?.firstKnock ?? "draft-cavage-http-signatures-12",
 		default: "draft-cavage-http-signatures-12"
 	}),
-	tunnelService: createTunnelServiceOption()
+	tunnelService: optional(createTunnelServiceOption())
 }), {
 	authorizedFetch: false,
 	firstKnock: void 0,
@@ -317,6 +320,11 @@ function getRecursiveTargetId(object, recurseProperty) {
 	switch (recurseProperty) {
 		case "replyTarget":
 		case IN_REPLY_TO_IRI: return object.replyTargetId;
+		case "quote":
+		case QUOTE_IRI: {
+			const quote = object.quoteId;
+			return quote instanceof URL ? quote : null;
+		}
 		case "quoteUrl":
 		case QUOTE_URL_IRI:
 		case MISSKEY_QUOTE_IRI:

package/dist/mod.js

@@ -1,99 +1,25 @@
 #!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 import "@js-temporal/polyfill";
-import { configContext, tryLoadToml } from "./config.js";
 import runGenerateVocab from "./generate-vocab/action.js";
-import generateVocabCommand from "./generate-vocab/command.js";
 import "./generate-vocab/mod.js";
-import { version } from "./deno.js";
-import { globalOptions } from "./options.js";
-import { inboxCommand, runInbox } from "./inbox.js";
-import { initCommand, runInit } from "./init/mod.js";
-import { nodeInfoCommand, runNodeInfo } from "./nodeinfo.js";
-import { lookupCommand, runLookup } from "./lookup.js";
-import { relayCommand, runRelay } from "./relay.js";
-import { runTunnel, tunnelCommand } from "./tunnel.js";
+import { runInbox } from "./inbox.js";
+import { runInit } from "./init/mod.js";
+import { runNodeInfo } from "./nodeinfo.js";
+import { runLookup } from "./lookup.js";
+import { runRelay } from "./relay.js";
+import { runTunnel } from "./tunnel.js";
 import runWebFinger from "./webfinger/action.js";
-import { webFingerCommand } from "./webfinger/command.js";
 import "./webfinger/mod.js";
-import { runWithConfig } from "@optique/config/run";
-import { group, merge, message, or } from "@optique/core";
-import { printError } from "@optique/run";
-import { merge as merge$1 } from "es-toolkit";
-import { readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { runCli } from "./runner.js";
 import process from "node:process";
-import { parse } from "smol-toml";
 //#region src/mod.ts
-/**
-* Returns the system-wide configuration file paths.
-* - Linux/macOS: Searches `$XDG_CONFIG_DIRS` (default: /etc/xdg)
-* - Windows: Uses `%ProgramData%` (default: C:\ProgramData)
-*/
-function getSystemConfigPaths() {
-	if (process.platform === "win32") return [join(process.env.ProgramData || "C:\\ProgramData", "fedify", "config.toml")];
-	return (process.env.XDG_CONFIG_DIRS || "/etc/xdg").split(":").map((dir) => join(dir, "fedify", "config.toml"));
-}
-/**
-* Returns the user-level configuration file path.
-* - Linux/macOS: `$XDG_CONFIG_HOME/fedify/config.toml` (default: ~/.config)
-* - Windows: `%APPDATA%\fedify\config.toml`
-*/
-function getUserConfigPath() {
-	if (process.platform === "win32") return join(process.env.APPDATA || join(homedir(), "AppData", "Roaming"), "fedify", "config.toml");
-	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "fedify", "config.toml");
-}
-const command$1 = merge(or(group("Generating code", or(initCommand, generateVocabCommand)), group("ActivityPub tools", or(webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, relayCommand)), group("Network tools", tunnelCommand)), globalOptions);
 async function main() {
-	const result = await runWithConfig(command$1, configContext, {
-		programName: "fedify",
-		load: (parsed) => {
-			if (parsed.ignoreConfig) return {};
-			const system = getSystemConfigPaths().map(tryLoadToml).reduce((acc, config) => merge$1(acc, config), {});
-			const user = tryLoadToml(getUserConfigPath());
-			const project = tryLoadToml(join(process.cwd(), ".fedify.toml"));
-			let custom = {};
-			if (parsed.configPath) try {
-				custom = parse(readFileSync(parsed.configPath, "utf-8"));
-			} catch (error) {
-				printError(message`Could not load config file at ${parsed.configPath}: ${error instanceof Error ? error.message : String(error)}`);
-				process.exit(1);
-			}
-			return [
-				system,
-				user,
-				project,
-				custom
-			].reduce((acc, config) => merge$1(acc, config), {});
-		},
-		args: process.argv.slice(2),
-		help: {
-			mode: "both",
-			onShow: () => process.exit(0),
-			group: "Meta commands"
-		},
-		version: {
-			mode: "both",
-			value: version,
-			group: "Meta commands"
-		},
-		completion: {
-			mode: "command",
-			name: "both",
-			helpVisibility: "plural",
-			group: "Meta commands"
-		},
-		onError: () => process.exit(1),
-		colors: process.stdout.isTTY && (process.env.NO_COLOR == null || process.env.NO_COLOR === ""),
-		maxWidth: process.stdout.columns,
-		showDefault: true,
-		showChoices: true
-	});
+	const result = await runCli(process.argv.slice(2));
 	if (result.command === "init") await runInit(result);
 	else if (result.command === "lookup") await runLookup(result);
 	else if (result.command === "webfinger") await runWebFinger(result);
-	else if (result.command === "inbox") runInbox(result);
-	else if (result.command === "nodeinfo") runNodeInfo(result);
+	else if (result.command === "inbox") await runInbox(result);
+	else if (result.command === "nodeinfo") await runNodeInfo(result);
 	else if (result.command === "tunnel") await runTunnel(result);
 	else if (result.command === "generate-vocab") await runGenerateVocab(result);
 	else if (result.command === "relay") await runRelay(result);

package/dist/nodeinfo.js

@@ -1,16 +1,16 @@
 import "@js-temporal/polyfill";
+import { colors, formatObject } from "./utils.js";
 import { configContext } from "./config.js";
 import { userAgentOption } from "./options.js";
-import { colors, formatObject } from "./utils.js";
-import { argument, command, constant, flag, group, merge, message, object, string, text } from "@optique/core";
 import { print, printError } from "@optique/run";
-import os from "node:os";
 import process from "node:process";
-import { bindConfig } from "@optique/config";
+import { argument, command, constant, flag, group, merge, message, object, string, text } from "@optique/core";
 import { getNodeInfo } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import ora from "ora";
 import { getUserAgent } from "@fedify/vocab-runtime";
+import { bindConfig } from "@optique/config";
+import os from "node:os";
 import { createJimp } from "@jimp/core";
 import webp from "@jimp/wasm-webp";
 import { isICO, parseICO } from "icojs";

package/dist/options.js

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import { configContext } from "./config.js";
 import { choice, constant, flag, map, merge, message, object, option, or, string, withDefault } from "@optique/core";
-import { bindConfig } from "@optique/config";
 import { getUserAgent } from "@fedify/vocab-runtime";
+import { bindConfig } from "@optique/config";
 //#region src/options.ts
 /**
 * Available tunneling services for exposing local servers to the public internet.
@@ -16,7 +16,8 @@ const TUNNEL_SERVICES = [
 * Creates a tunnel service option with customizable option names.
 */
 function createTunnelServiceOption(optionNames = ["--tunnel-service"]) {
-	return withDefault(bindConfig(option(...optionNames, choice(TUNNEL_SERVICES, { metavar: "SERVICE" }), { description: message`The tunneling service to use.
+	const [firstOptionName, ...restOptionNames] = optionNames;
+	return withDefault(bindConfig(option(firstOptionName, ...restOptionNames, choice(TUNNEL_SERVICES, { metavar: "SERVICE" }), { description: message`The tunneling service to use.
 By default, any of the supported tunneling services will be used
 (randomly selected for each tunnel).` }), {
 		context: configContext,

package/dist/relay/command.js

@@ -0,0 +1,50 @@
+import "@js-temporal/polyfill";
+import { configContext } from "../config.js";
+import { createTunnelOption } from "../options.js";
+import { command, constant, group, integer, merge, message, multiple, object, option, optionName, optional, string, value } from "@optique/core";
+import { bindConfig } from "@optique/config";
+import { choice as choice$1 } from "@optique/core/valueparser";
+//#region src/relay/command.ts
+const relayCommand = command("relay", merge(object("Relay options", {
+	command: constant("relay"),
+	protocol: bindConfig(option("-p", "--protocol", choice$1(["mastodon", "litepub"], { metavar: "TYPE" }), { description: message`The relay protocol to use. ${value("mastodon")} for Mastodon-compatible relay, ${value("litepub")} for LitePub-compatible relay.` }), {
+		context: configContext,
+		key: (config) => config.relay?.protocol ?? "mastodon",
+		default: "mastodon"
+	}),
+	persistent: optional(bindConfig(option("--persistent", string({ metavar: "PATH" }), { description: message`Path to SQLite database file for persistent storage. If not specified, uses in-memory storage which is lost when the server stops.` }), {
+		context: configContext,
+		key: (config) => config.relay?.persistent
+	})),
+	port: bindConfig(option("-P", "--port", integer({
+		min: 0,
+		max: 65535,
+		metavar: "PORT"
+	}), { description: message`The local port to listen on.` }), {
+		context: configContext,
+		key: (config) => config.relay?.port ?? 8e3,
+		default: 8e3
+	}),
+	name: bindConfig(option("-n", "--name", string({ metavar: "NAME" }), { description: message`The relay display name.` }), {
+		context: configContext,
+		key: (config) => config.relay?.name ?? "Fedify Relay",
+		default: "Fedify Relay"
+	}),
+	acceptFollow: bindConfig(multiple(option("-a", "--accept-follow", string({ metavar: "URI" }), { description: message`Accept follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be accepted.` })), {
+		context: configContext,
+		key: (config) => config.relay?.acceptFollow ?? [],
+		default: []
+	}),
+	rejectFollow: bindConfig(multiple(option("-r", "--reject-follow", string({ metavar: "URI" }), { description: message`Reject follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be rejected.` })), {
+		context: configContext,
+		key: (config) => config.relay?.rejectFollow ?? [],
+		default: []
+	})
+}), group("Tunnel options", createTunnelOption("relay"))), {
+	brief: message`Run an ephemeral ActivityPub relay server.`,
+	description: message`Spins up an ActivityPub relay server that forwards activities between federated instances. The server can use either Mastodon or LitePub compatible relay protocol.
+
+By default, the server is tunneled to the public internet for external access. Use ${optionName("--no-tunnel")} to run locally only.`
+});
+//#endregion
+export { relayCommand };

package/dist/relay.js

@@ -1,20 +1,15 @@
 import "@js-temporal/polyfill";
-import { configContext } from "./config.js";
 import { configureLogging } from "./log.js";
-import { createTunnelOption } from "./options.js";
 import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { colors, matchesActor } from "./utils.js";
-import { command, constant, group, integer, merge, message, multiple, object, option, optionName, optional, string, value } from "@optique/core";
 import process from "node:process";
-import { bindConfig } from "@optique/config";
 import { MemoryKvStore } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import Table from "cli-table3";
 import ora from "ora";
 import { createRelay } from "@fedify/relay";
 import { SqliteKvStore } from "@fedify/sqlite";
-import { choice as choice$1 } from "@optique/core/valueparser";
 import { DatabaseSync } from "node:sqlite";
 //#region src/relay.ts
 const logger = getLogger([
@@ -22,47 +17,6 @@ const logger = getLogger([
 	"cli",
 	"relay"
 ]);
-const relayCommand = command("relay", merge(object("Relay options", {
-	command: constant("relay"),
-	protocol: bindConfig(option("-p", "--protocol", choice$1(["mastodon", "litepub"], { metavar: "TYPE" }), { description: message`The relay protocol to use. ${value("mastodon")} for Mastodon-compatible relay, ${value("litepub")} for LitePub-compatible relay.` }), {
-		context: configContext,
-		key: (config) => config.relay?.protocol ?? "mastodon",
-		default: "mastodon"
-	}),
-	persistent: optional(bindConfig(option("--persistent", string({ metavar: "PATH" }), { description: message`Path to SQLite database file for persistent storage. If not specified, uses in-memory storage which is lost when the server stops.` }), {
-		context: configContext,
-		key: (config) => config.relay?.persistent
-	})),
-	port: bindConfig(option("-P", "--port", integer({
-		min: 0,
-		max: 65535,
-		metavar: "PORT"
-	}), { description: message`The local port to listen on.` }), {
-		context: configContext,
-		key: (config) => config.relay?.port ?? 8e3,
-		default: 8e3
-	}),
-	name: bindConfig(option("-n", "--name", string({ metavar: "NAME" }), { description: message`The relay display name.` }), {
-		context: configContext,
-		key: (config) => config.relay?.name ?? "Fedify Relay",
-		default: "Fedify Relay"
-	}),
-	acceptFollow: bindConfig(multiple(option("-a", "--accept-follow", string({ metavar: "URI" }), { description: message`Accept follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be accepted.` })), {
-		context: configContext,
-		key: (config) => config.relay?.acceptFollow ?? [],
-		default: []
-	}),
-	rejectFollow: bindConfig(multiple(option("-r", "--reject-follow", string({ metavar: "URI" }), { description: message`Reject follow requests from the given actor. The argument can be either an actor URI or a handle, or a wildcard (${"*"}). Can be specified multiple times. If a wildcard is specified, all follow requests will be rejected.` })), {
-		context: configContext,
-		key: (config) => config.relay?.rejectFollow ?? [],
-		default: []
-	})
-}), group("Tunnel options", createTunnelOption("relay"))), {
-	brief: message`Run an ephemeral ActivityPub relay server.`,
-	description: message`Spins up an ActivityPub relay server that forwards activities between federated instances. The server can use either Mastodon or LitePub compatible relay protocol.
-
-By default, the server is tunneled to the public internet for external access. Use ${optionName("--no-tunnel")} to run locally only.`
-});
 async function runRelay(command) {
 	if (command.debug) await configureLogging();
 	const spinner = ora({
@@ -128,4 +82,4 @@ async function printRelayInfo(relay, options) {
 	console.log("\nPress ^C to stop the relay server.");
 }
 //#endregion
-export { relayCommand, runRelay };
+export { runRelay };

package/dist/runner.js

@@ -0,0 +1,96 @@
+import "@js-temporal/polyfill";
+import generateVocabCommand from "./generate-vocab/command.js";
+import "./generate-vocab/mod.js";
+import { version } from "./deno.js";
+import { initCommand } from "./init/mod.js";
+import { configContext, tryLoadToml } from "./config.js";
+import { globalOptions } from "./options.js";
+import { nodeInfoCommand } from "./nodeinfo.js";
+import { lookupCommand } from "./lookup.js";
+import { inboxCommand } from "./inbox/command.js";
+import { relayCommand } from "./relay/command.js";
+import { tunnelCommand } from "./tunnel.js";
+import { webFingerCommand } from "./webfinger/command.js";
+import "./webfinger/mod.js";
+import { printError, run } from "@optique/run";
+import process from "node:process";
+import { group, merge, message, or } from "@optique/core";
+import { join } from "node:path";
+import { merge as merge$1 } from "es-toolkit";
+import { readFileSync } from "node:fs";
+import { parse } from "smol-toml";
+import { homedir } from "node:os";
+//#region src/runner.ts
+/**
+* Returns the system-wide configuration file paths.
+* - Linux/macOS: Searches `$XDG_CONFIG_DIRS` (default: /etc/xdg)
+* - Windows: Uses `%ProgramData%` (default: C:\ProgramData)
+*/
+function getSystemConfigPaths() {
+	if (process.platform === "win32") return [join(process.env.ProgramData || "C:\\ProgramData", "fedify", "config.toml")];
+	return (process.env.XDG_CONFIG_DIRS || "/etc/xdg").split(":").map((dir) => join(dir, "fedify", "config.toml"));
+}
+/**
+* Returns the user-level configuration file path.
+* - Linux/macOS: `$XDG_CONFIG_HOME/fedify/config.toml` (default: ~/.config)
+* - Windows: `%APPDATA%\fedify\config.toml`
+*/
+function getUserConfigPath() {
+	if (process.platform === "win32") return join(process.env.APPDATA || join(homedir(), "AppData", "Roaming"), "fedify", "config.toml");
+	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "fedify", "config.toml");
+}
+const command$1 = merge(or(group("Generating code", or(initCommand, generateVocabCommand)), group("ActivityPub tools", or(webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, relayCommand)), group("Network tools", tunnelCommand)), globalOptions);
+function loadConfig(parsed) {
+	if (parsed.ignoreConfig) return void 0;
+	const system = getSystemConfigPaths().map(tryLoadToml).reduce((acc, config) => merge$1(acc, config), {});
+	const user = tryLoadToml(getUserConfigPath());
+	const project = tryLoadToml(join(process.cwd(), ".fedify.toml"));
+	let custom = {};
+	if (parsed.configPath) try {
+		custom = parse(readFileSync(parsed.configPath, "utf-8"));
+	} catch (error) {
+		printError(message`Could not load config file at ${parsed.configPath}: ${error instanceof Error ? error.message : String(error)}`);
+		process.exit(1);
+	}
+	return {
+		config: [
+			system,
+			user,
+			project,
+			custom
+		].reduce((acc, config) => merge$1(acc, config), {}),
+		meta: void 0
+	};
+}
+/**
+* Runs the Fedify CLI with the given command-line arguments.
+* @param args Command-line arguments, usually `process.argv.slice(2)`.
+* @returns The parsed command result from Optique's runner.
+*/
+function runCli(args) {
+	return run(command$1, {
+		contexts: [configContext],
+		contextOptions: { load: loadConfig },
+		programName: "fedify",
+		args,
+		help: {
+			command: { group: "Meta commands" },
+			option: { group: "Meta commands" }
+		},
+		version: {
+			value: version,
+			command: { group: "Meta commands" },
+			option: { group: "Meta commands" }
+		},
+		completion: { command: {
+			names: ["completions", "completion"],
+			group: "Meta commands"
+		} },
+		colors: process.stdout.isTTY && (process.env.NO_COLOR == null || process.env.NO_COLOR === ""),
+		maxWidth: process.stdout.columns,
+		showDefault: true,
+		showChoices: true
+	});
+}
+//#endregion
+export { runCli };

package/dist/tunnel.js

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import { configureLogging } from "./log.js";
 import { createTunnelServiceOption } from "./options.js";
-import { argument, command, constant, integer, merge, message, object } from "@optique/core";
 import { print, printError } from "@optique/run";
 import process from "node:process";
+import { argument, command, constant, integer, merge, message, object } from "@optique/core";
 import ora from "ora";
 import { openTunnel } from "@hongminhee/localtunnel";
 //#region src/tunnel.ts

package/dist/utils.js

@@ -1,13 +1,13 @@
 import "@js-temporal/polyfill";
-import { message } from "@optique/core";
 import { print, printError } from "@optique/run";
-import { flow } from "es-toolkit";
 import process from "node:process";
+import { message } from "@optique/core";
 import { getActorHandle } from "@fedify/vocab";
 import util from "node:util";
 import "@fxts/core";
 import { Chalk } from "chalk";
 import { highlight } from "cli-highlight";
+import { flow } from "es-toolkit";
 //#region src/utils.ts
 const colorEnabled = process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "");
 const colors = new Chalk(colorEnabled ? {} : { level: 0 });

package/dist/webfinger/action.js

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import { formatObject } from "../utils.js";
 import { NotFoundError, getErrorMessage } from "./error.js";
 import { convertUrlIfHandle } from "./lib.js";
-import { print } from "@optique/run";
 import { formatMessage, message } from "@optique/core/message";
+import { print } from "@optique/run";
 import ora from "ora";
 import { lookupWebFinger } from "@fedify/webfinger";
 //#region src/webfinger/action.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.1.9",
+  "version": "2.2.0-dev.898+44ea8f2f",
   "type": "module",
   "files": [
     "README.md",
@@ -58,9 +58,9 @@
   },
   "dependencies": {
     "@fxts/core": "^1.20.0",
-    "@optique/config": "^0.10.7",
-    "@optique/core": "^0.10.7",
-    "@optique/run": "^0.10.7",
+    "@optique/config": "^1.0.0",
+    "@optique/core": "^1.0.0",
+    "@optique/run": "^1.0.0",
     "@hongminhee/localtunnel": "^0.3.0",
     "@inquirer/prompts": "^7.8.4",
     "@jimp/core": "^1.6.0",
@@ -86,14 +86,14 @@
     "smol-toml": "^1.6.0",
     "srvx": "^0.8.7",
     "valibot": "^1.2.0",
-    "@fedify/fedify": "2.1.9",
-    "@fedify/init": "2.1.9",
-    "@fedify/relay": "2.1.9",
-    "@fedify/sqlite": "2.1.9",
-    "@fedify/vocab-runtime": "2.1.9",
-    "@fedify/vocab-tools": "2.1.9",
-    "@fedify/vocab": "2.1.9",
-    "@fedify/webfinger": "2.1.9"
+    "@fedify/fedify": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/relay": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/sqlite": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/vocab": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/init": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/vocab-tools": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/webfinger": "2.2.0-dev.898+44ea8f2f",
+    "@fedify/vocab-runtime": "2.2.0-dev.898+44ea8f2f"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",