llm-relay 0.68.7 → 0.69.0

package/dist/cli.d.ts

@@ -6,6 +6,18 @@ import type { DispatchedQuotaReport } from "./mcp/lane-runner.js";
 import { ModelCatalog } from "./catalog.js";
 import { type CommandEffect } from "./self-update.js";
 import { type KeysCliDependencies } from "./keys-cli.js";
+/**
+ * Canonical flag to short aliases mapping.
+ *
+ * Single-dash long aliases (`-task` for `--task`) are expanded automatically by
+ * `expandFlagAliases`. This table declares the explicit short aliases advertised
+ * by help and accepted by the CLI parser.
+ */
+export declare const FLAG_ALIASES: Readonly<Record<string, readonly string[]>>;
+export declare const CLI_FLAG_ALIASES: Readonly<Record<string, readonly string[]>>;
+export declare function expandFlagAliases(flags: readonly string[]): Set<string>;
+export declare const CANONICAL_VALUE_FLAGS: readonly ["--config", "--provider", "--default", "--mode", "--listen", "--task", "--exhausted", "--outcome", "--retry-after-ms", "--after", "--lane", "--tier", "--host", "--client", "--scope", "--credential", "--include", "--window", "--by", "--effort", "--shell", "--class", "--members", "--cost-class", "--rationale", "--reset-field", "--reset-ms", "--sig", "--import", "--label", "--env-name", "--out", "--repo"];
+export declare const VALUE_FLAGS: Set<string>;
 export declare function argValue(...flags: string[]): string | undefined;
 export declare function hasFlag(...flags: string[]): boolean;
 /** Extract non-flag positional arguments from an argv array, skipping flags and their values. */
@@ -171,6 +183,9 @@ export declare const CLI_COMMAND_NAMES: ReadonlySet<string>;
 export declare const ARITY_EXEMPT: ReadonlySet<string>;
 /** The commands this guard bounds — exported for the drift test, not for dispatch. */
 export declare const ARITY_GUARDED_COMMANDS: readonly string[];
+type CliOptionSpec = Readonly<Record<string, readonly string[]>>;
+export declare const CLI_OPTIONS: CliOptionSpec;
+export declare const ACTION_OPTIONS: Readonly<Record<string, CliOptionSpec>>;
 /** Return a bounded, value-free diagnostic for an option not accepted by this command/action. */
 export declare function commandOptionError(argv: readonly string[]): string | null;
 export declare function commandArityError(positionals: readonly string[]): string | null;

package/dist/cli.js

@@ -45,41 +45,76 @@ const CONTEXT_WINDOW_SOURCE_LABEL = {
     snapshot: "synced snapshot, same model id on another host",
     provider: "published by the serving provider",
 };
-const VALUE_FLAGS = new Set([
-    "--config", "-config", "-c",
-    "--provider", "-provider", "-p",
-    "--default", "-default", "-d",
-    "--mode", "-mode", "-m",
-    "--listen", "-listen", "-l",
-    "--task", "-task", "-t",
-    "--exhausted", "-exhausted", "-x",
-    "--outcome", "-outcome",
-    "--retry-after-ms", "-retry-after-ms",
-    "--after", "-after",
-    "--lane", "-lane",
-    "--tier", "-tier",
-    "--host", "-host",
-    "--client", "-client",
-    "--scope", "-scope",
-    "--credential", "-credential",
-    "--include", "-include",
-    "--window", "-window",
-    "--by", "-by",
-    "--effort", "-effort",
-    "--shell", "-shell",
-    "--class", "-class",
-    "--members", "-members",
-    "--cost-class", "-cost-class",
-    "--rationale", "-rationale",
-    "--reset-field", "-reset-field",
-    "--reset-ms", "-reset-ms",
-    "--sig", "-sig",
-    "--import", "-import",
-    "--label", "-label",
-    "--env-name", "-env-name",
-    "--out", "-out",
-    "--repo", "-repo",
-]);
+export const FLAG_ALIASES = {
+    "--config": ["-c"],
+    "--provider": ["-p"],
+    "--default": ["-d"],
+    "--mode": ["-m"],
+    "--listen": ["-l"],
+    "--task": ["-t"],
+    "--exhausted": ["-x"],
+    "--refresh": ["-r"],
+    "--help": ["-h"],
+    "--version": ["-v"],
+};
+export const CLI_FLAG_ALIASES = FLAG_ALIASES;
+const SHORT_TO_CANONICAL = Object.fromEntries(Object.entries(FLAG_ALIASES).flatMap(([canonical, aliases]) => aliases.map((alias) => [alias, canonical])));
+export function expandFlagAliases(flags) {
+    const aliases = new Set();
+    for (const flag of flags) {
+        aliases.add(flag);
+        const canonical = SHORT_TO_CANONICAL[flag] ?? (flag.startsWith("--") ? flag : `-${flag}`);
+        if (canonical !== flag && (canonical.startsWith("--") || FLAG_ALIASES[canonical])) {
+            aliases.add(canonical);
+        }
+        if (canonical.startsWith("--")) {
+            aliases.add(canonical.slice(1));
+        }
+        const shortAliases = FLAG_ALIASES[canonical] ?? FLAG_ALIASES[flag];
+        if (shortAliases !== undefined) {
+            for (const alias of shortAliases) {
+                aliases.add(alias);
+            }
+        }
+    }
+    return aliases;
+}
+export const CANONICAL_VALUE_FLAGS = [
+    "--config",
+    "--provider",
+    "--default",
+    "--mode",
+    "--listen",
+    "--task",
+    "--exhausted",
+    "--outcome",
+    "--retry-after-ms",
+    "--after",
+    "--lane",
+    "--tier",
+    "--host",
+    "--client",
+    "--scope",
+    "--credential",
+    "--include",
+    "--window",
+    "--by",
+    "--effort",
+    "--shell",
+    "--class",
+    "--members",
+    "--cost-class",
+    "--rationale",
+    "--reset-field",
+    "--reset-ms",
+    "--sig",
+    "--import",
+    "--label",
+    "--env-name",
+    "--out",
+    "--repo",
+];
+export const VALUE_FLAGS = new Set(expandFlagAliases(CANONICAL_VALUE_FLAGS));
 let cachedArgv;
 let cachedParsedArgs;
 function parseCliArgs(argv) {
@@ -118,15 +153,6 @@ function parseCliArgs(argv) {
     cachedParsedArgs = { flags, values, positionals };
     return cachedParsedArgs;
 }
-function expandFlagAliases(flags) {
-    const aliases = new Set();
-    for (const flag of flags) {
-        aliases.add(flag);
-        if (flag.startsWith("--"))
-            aliases.add(flag.slice(1));
-    }
-    return aliases;
-}
 export function argValue(...flags) {
     const aliases = expandFlagAliases(flags);
     return parseCliArgs(process.argv).values.find(({ flag }) => aliases.has(flag))?.value;
@@ -871,7 +897,7 @@ const COMMAND_ARITY = {
 };
 export const ARITY_EXEMPT = new Set(["keys", "cooldowns", "help", "version"]);
 export const ARITY_GUARDED_COMMANDS = Object.keys(COMMAND_ARITY);
-const CLI_OPTIONS = {
+export const CLI_OPTIONS = {
     proxy: ["--config", "--default", "--mode", "--listen", "--ping"],
     onboard: ["--config", "--import", "--force"],
     setup: [],
@@ -893,7 +919,7 @@ const CLI_OPTIONS = {
     "delegate-gate": ["--repo", "--fix"],
     mcp: ["--config"],
 };
-const ACTION_OPTIONS = {
+export const ACTION_OPTIONS = {
     offload: { on: ["--config", "--scope"], off: ["--config", "--scope"], enable: ["--config", "--scope"], disable: ["--config", "--scope"], status: ["--config"] },
     pools: {
         list: ["--config", "--json", "--probe"], show: ["--config", "--json"],
@@ -2805,9 +2831,13 @@ export function main() {
         if (target === "claude-desktop" || target === "desktop") {
             const res = setupClaudeDesktop();
             process.stdout.write(`${res.message}\n`);
+            if (!res.success)
+                process.exit(1);
         }
         else if (target === undefined || target === "claude-cli" || target === "cli" || target === "claude") {
-            setupClaudeCli();
+            const res = setupClaudeCli();
+            if (!res.success)
+                process.exit(1);
         }
         else {
             configCommandError(`setup: unknown target "${target}" (targets: claude-cli, claude-desktop)`);