march-cli 0.1.21 → 0.1.23

package/src/provider/accept-command.mjs

@@ -1,89 +1,89 @@
-import { globalConfigJsonPath, readConfigJson, upsertSharedProviderProfile } from "../config/config-json.mjs";
-import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
-import { hasApiKey, parseProviderShareToken } from "./share-payload.mjs";
-
-export async function runProviderAcceptCommand({
-  homeDir,
-  token,
-  input = process.stdin,
-  output = process.stdout,
-  select = selectWithKeyboard,
-} = {}) {
-  if (!token) {
-    output.write("Usage: march provider accept <march-provider-v1-token>\n");
-    return 1;
-  }
-
-  let payload;
-  try {
-    payload = parseProviderShareToken(token);
-  } catch (error) {
-    output.write(`Invalid provider share token: ${error.message}\n`);
-    return 1;
-  }
-
-  output.write(formatImportPreview(payload));
-  const path = globalConfigJsonPath(homeDir);
-  const config = readConfigJson(path);
-  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers) ? config.providers : {};
-  if (providers[payload.providerId]) {
-    const action = await select({
-      input,
-      output,
-      message: `Provider "${payload.providerId}" already exists`,
-      items: [
-        { label: "Overwrite existing provider", value: "overwrite" },
-        { label: "Cancel", value: "cancel" },
-      ],
-    });
-    if (action !== "overwrite") {
-      output.write("Provider import cancelled.\n");
-      return 1;
-    }
-  } else {
-    const action = await select({
-      input,
-      output,
-      message: "Import provider?",
-      items: [
-        { label: "Import", value: "import" },
-        { label: "Cancel", value: "cancel" },
-      ],
-    });
-    if (action !== "import") {
-      output.write("Provider import cancelled.\n");
-      return 1;
-    }
-  }
-
-  upsertSharedProviderProfile({ path, id: payload.providerId, provider: payload.provider });
-  output.write(`Imported provider: ${payload.providerId}\n`);
-  output.write(`Config: ${path}\n`);
-  return 0;
-}
-
-export function formatImportPreview(payload) {
-  const provider = payload.provider;
-  const models = Array.isArray(provider.models) ? provider.models : [];
-  const lines = [
-    "Provider to import:",
-    `  Id: ${payload.providerId}`,
-    `  Name: ${typeof provider.name === "string" && provider.name ? provider.name : "-"}`,
-    `  Type: ${provider.type}`,
-  ];
-  if (typeof provider.baseUrl === "string" && provider.baseUrl) lines.push(`  Base URL: ${provider.baseUrl}`);
-  if (typeof provider.api === "string" && provider.api) lines.push(`  API: ${provider.api}`);
-  if (models.length) {
-    lines.push(`  Models: ${models.length}`);
-    for (const model of models.slice(0, 5)) lines.push(`    - ${formatModel(model)}`);
-    if (models.length > 5) lines.push(`    ... ${models.length - 5} more`);
-  }
-  lines.push(`  API key: ${hasApiKey(provider) ? "included" : "not included"}`);
-  lines.push("");
-  return `${lines.join("\n")}\n`;
-}
-
-function formatModel(model) {
-  if (model && typeof model === "object" && !Array.isArray(model)) return model.name || model.id || "<unnamed>";
-  return String(model);
-}
+import { globalConfigJsonPath, readConfigJson, upsertSharedProviderProfile } from "../config/config-json.mjs";
+import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+import { hasApiKey, parseProviderShareToken } from "./share-payload.mjs";
+
+export async function runProviderAcceptCommand({
+  homeDir,
+  token,
+  input = process.stdin,
+  output = process.stdout,
+  select = selectWithKeyboard,
+} = {}) {
+  if (!token) {
+    output.write("Usage: march provider accept <march-provider-v1-token>\n");
+    return 1;
+  }
+
+  let payload;
+  try {
+    payload = parseProviderShareToken(token);
+  } catch (error) {
+    output.write(`Invalid provider share token: ${error.message}\n`);
+    return 1;
+  }
+
+  output.write(formatImportPreview(payload));
+  const path = globalConfigJsonPath(homeDir);
+  const config = readConfigJson(path);
+  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers) ? config.providers : {};
+  if (providers[payload.providerId]) {
+    const action = await select({
+      input,
+      output,
+      message: `Provider "${payload.providerId}" already exists`,
+      items: [
+        { label: "Overwrite existing provider", value: "overwrite" },
+        { label: "Cancel", value: "cancel" },
+      ],
+    });
+    if (action !== "overwrite") {
+      output.write("Provider import cancelled.\n");
+      return 1;
+    }
+  } else {
+    const action = await select({
+      input,
+      output,
+      message: "Import provider?",
+      items: [
+        { label: "Import", value: "import" },
+        { label: "Cancel", value: "cancel" },
+      ],
+    });
+    if (action !== "import") {
+      output.write("Provider import cancelled.\n");
+      return 1;
+    }
+  }
+
+  upsertSharedProviderProfile({ path, id: payload.providerId, provider: payload.provider });
+  output.write(`Imported provider: ${payload.providerId}\n`);
+  output.write(`Config: ${path}\n`);
+  return 0;
+}
+
+export function formatImportPreview(payload) {
+  const provider = payload.provider;
+  const models = Array.isArray(provider.models) ? provider.models : [];
+  const lines = [
+    "Provider to import:",
+    `  Id: ${payload.providerId}`,
+    `  Name: ${typeof provider.name === "string" && provider.name ? provider.name : "-"}`,
+    `  Type: ${provider.type}`,
+  ];
+  if (typeof provider.baseUrl === "string" && provider.baseUrl) lines.push(`  Base URL: ${provider.baseUrl}`);
+  if (typeof provider.api === "string" && provider.api) lines.push(`  API: ${provider.api}`);
+  if (models.length) {
+    lines.push(`  Models: ${models.length}`);
+    for (const model of models.slice(0, 5)) lines.push(`    - ${formatModel(model)}`);
+    if (models.length > 5) lines.push(`    ... ${models.length - 5} more`);
+  }
+  lines.push(`  API key: ${hasApiKey(provider) ? "included" : "not included"}`);
+  lines.push("");
+  return `${lines.join("\n")}\n`;
+}
+
+function formatModel(model) {
+  if (model && typeof model === "object" && !Array.isArray(model)) return model.name || model.id || "<unnamed>";
+  return String(model);
+}

package/src/provider/command.mjs

@@ -1,21 +1,21 @@
-import { homedir } from "node:os";
-import { runProviderConfigCommand } from "./config-command.mjs";
-import { runProviderShareCommand } from "./share-command.mjs";
-import { runProviderAcceptCommand } from "./accept-command.mjs";
-
-export async function runProviderCommand(args, { homeDir = homedir(), stderr = process.stderr } = {}) {
-  if (args.providerConfig) return await runProviderConfigCommand({ homeDir });
-  if (args.command.args[0] === "share") {
-    return await runProviderShareCommand({
-      homeDir,
-      providerId: args.command.args[1],
-      includeKey: args.includeKey,
-      profileOnly: args.profileOnly,
-    });
-  }
-  if (args.command.args[0] === "accept") {
-    return await runProviderAcceptCommand({ homeDir, token: args.command.args[1] });
-  }
-  stderr.write("Usage: march provider --config | march provider share [id] | march provider accept <token>\n");
-  return 1;
-}
+import { homedir } from "node:os";
+import { runProviderConfigCommand } from "./config-command.mjs";
+import { runProviderShareCommand } from "./share-command.mjs";
+import { runProviderAcceptCommand } from "./accept-command.mjs";
+
+export async function runProviderCommand(args, { homeDir = homedir(), stderr = process.stderr } = {}) {
+  if (args.providerConfig) return await runProviderConfigCommand({ homeDir });
+  if (args.command.args[0] === "share") {
+    return await runProviderShareCommand({
+      homeDir,
+      providerId: args.command.args[1],
+      includeKey: args.includeKey,
+      profileOnly: args.profileOnly,
+    });
+  }
+  if (args.command.args[0] === "accept") {
+    return await runProviderAcceptCommand({ homeDir, token: args.command.args[1] });
+  }
+  stderr.write("Usage: march provider --config | march provider share [id] | march provider accept <token>\n");
+  return 1;
+}

package/src/provider/config-command.mjs

@@ -1,129 +1,129 @@
-import { createInterface } from "node:readline";
-import { AuthStorage } from "@earendil-works/pi-coding-agent";
-import { globalConfigJsonPath, upsertProviderProfile } from "../config/config-json.mjs";
-import { getMarchAuthPath } from "../auth/storage.mjs";
-import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
-import { PROVIDER_PRESETS } from "./presets.mjs";
-
-export { formatSelectionList, selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
-
-export async function runProviderConfigCommand({
-  homeDir,
-  input = process.stdin,
-  output = process.stdout,
-  select = selectWithKeyboard,
-  readSecret = readLine,
-  authStorage = AuthStorage.create(getMarchAuthPath(homeDir)),
-} = {}) {
-  const preset = await select({
-    input,
-    output,
-    message: "Choose provider to configure",
-    items: PROVIDER_PRESETS.map((item) => ({ label: item.label, value: item })),
-  });
-  if (!preset) {
-    output.write("Provider configuration cancelled.\n");
-    return 1;
-  }
-
-  const authMethod = preset.authMethods.length === 1
-    ? preset.authMethods[0]
-    : await select({
-      input,
-      output,
-      message: "Choose auth method",
-      items: preset.authMethods.map((method) => ({ label: formatAuthMethod(method), value: method })),
-    });
-  if (!authMethod) {
-    output.write("Provider configuration cancelled.\n");
-    return 1;
-  }
-
-  if (authMethod === "oauth") {
-    return runOAuthConfig({ preset, authStorage, input, output, homeDir });
-  }
-
-  if (authMethod !== "apiKey") {
-    output.write(`Unsupported auth method: ${authMethod}\n`);
-    return 1;
-  }
-
-  const apiKey = String(await readSecret({ input, output, prompt: `${preset.apiKeyLabel}: ` }) ?? "").trim();
-  if (!apiKey) {
-    output.write("API key is required.\n");
-    return 1;
-  }
-
-  const path = globalConfigJsonPath(homeDir);
-  upsertProviderProfile({
-    path,
-    id: preset.id,
-    type: preset.type,
-    auth: { method: "apiKey", apiKey },
-  });
-  output.write(`Saved provider: ${preset.label}\n`);
-  output.write(`Config: ${path}\n`);
-  return 0;
-}
-
-function formatAuthMethod(method) {
-  if (method === "apiKey") return "API key";
-  if (method === "oauth") return "OAuth / subscription";
-  return method;
-}
-
-async function runOAuthConfig({ preset, authStorage, input, output, homeDir }) {
-  const rl = createInterface({ input, output });
-  try {
-    output.write(`Logging in to ${preset.label}...\n`);
-    await authStorage.login(preset.type, {
-      onAuth: (info) => {
-        output.write(`\nOpen this URL in your browser:\n${info.url}\n`);
-        if (info.instructions) output.write(`${info.instructions}\n`);
-        output.write("\n");
-      },
-      onPrompt: (prompt) => ask(rl, `${prompt.message}${prompt.placeholder ? ` (${prompt.placeholder})` : ""}: `),
-      onManualCodeInput: () => ask(rl, "Paste redirect URL or code: "),
-      onProgress: (message) => output.write(`${message}\n`),
-      onSelect: async (prompt) => selectOAuthOption({ prompt, rl, output }),
-    });
-    output.write(`\nCredentials saved to ${getMarchAuthPath(homeDir)}\n`);
-    return 0;
-  } catch (error) {
-    output.write(`OAuth login failed: ${error instanceof Error ? error.message : String(error)}\n`);
-    return 1;
-  } finally {
-    rl.close();
-  }
-}
-
-async function selectOAuthOption({ prompt, rl, output }) {
-  output.write(`${prompt.message}\n`);
-  for (let i = 0; i < prompt.options.length; i++) {
-    const option = prompt.options[i];
-    output.write(`  ${i + 1}. ${option.label} (${option.id})\n`);
-  }
-  const answer = await ask(rl, `Enter option id or number (1-${prompt.options.length}): `);
-  return resolveSelection(answer, prompt.options);
-}
-
-function resolveSelection(answer, options) {
-  const trimmed = answer.trim();
-  const index = Number.parseInt(trimmed, 10);
-  if (Number.isInteger(index) && String(index) === trimmed && index >= 1 && index <= options.length) {
-    return options[index - 1].id;
-  }
-  return options.some((option) => option.id === trimmed) ? trimmed : undefined;
-}
-
-function ask(rl, question) {
-  return new Promise((resolve) => rl.question(question, resolve));
-}
-
-function readLine({ input = process.stdin, output = process.stdout, prompt }) {
-  const rl = createInterface({ input, output });
-  return new Promise((resolve) => rl.question(prompt, (answer) => {
-    rl.close();
-    resolve(answer);
-  }));
-}
+import { createInterface } from "node:readline";
+import { AuthStorage } from "@earendil-works/pi-coding-agent";
+import { globalConfigJsonPath, upsertProviderProfile } from "../config/config-json.mjs";
+import { getMarchAuthPath } from "../auth/storage.mjs";
+import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+import { PROVIDER_PRESETS } from "./presets.mjs";
+
+export { formatSelectionList, selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+
+export async function runProviderConfigCommand({
+  homeDir,
+  input = process.stdin,
+  output = process.stdout,
+  select = selectWithKeyboard,
+  readSecret = readLine,
+  authStorage = AuthStorage.create(getMarchAuthPath(homeDir)),
+} = {}) {
+  const preset = await select({
+    input,
+    output,
+    message: "Choose provider to configure",
+    items: PROVIDER_PRESETS.map((item) => ({ label: item.label, value: item })),
+  });
+  if (!preset) {
+    output.write("Provider configuration cancelled.\n");
+    return 1;
+  }
+
+  const authMethod = preset.authMethods.length === 1
+    ? preset.authMethods[0]
+    : await select({
+      input,
+      output,
+      message: "Choose auth method",
+      items: preset.authMethods.map((method) => ({ label: formatAuthMethod(method), value: method })),
+    });
+  if (!authMethod) {
+    output.write("Provider configuration cancelled.\n");
+    return 1;
+  }
+
+  if (authMethod === "oauth") {
+    return runOAuthConfig({ preset, authStorage, input, output, homeDir });
+  }
+
+  if (authMethod !== "apiKey") {
+    output.write(`Unsupported auth method: ${authMethod}\n`);
+    return 1;
+  }
+
+  const apiKey = String(await readSecret({ input, output, prompt: `${preset.apiKeyLabel}: ` }) ?? "").trim();
+  if (!apiKey) {
+    output.write("API key is required.\n");
+    return 1;
+  }
+
+  const path = globalConfigJsonPath(homeDir);
+  upsertProviderProfile({
+    path,
+    id: preset.id,
+    type: preset.type,
+    auth: { method: "apiKey", apiKey },
+  });
+  output.write(`Saved provider: ${preset.label}\n`);
+  output.write(`Config: ${path}\n`);
+  return 0;
+}
+
+function formatAuthMethod(method) {
+  if (method === "apiKey") return "API key";
+  if (method === "oauth") return "OAuth / subscription";
+  return method;
+}
+
+async function runOAuthConfig({ preset, authStorage, input, output, homeDir }) {
+  const rl = createInterface({ input, output });
+  try {
+    output.write(`Logging in to ${preset.label}...\n`);
+    await authStorage.login(preset.type, {
+      onAuth: (info) => {
+        output.write(`\nOpen this URL in your browser:\n${info.url}\n`);
+        if (info.instructions) output.write(`${info.instructions}\n`);
+        output.write("\n");
+      },
+      onPrompt: (prompt) => ask(rl, `${prompt.message}${prompt.placeholder ? ` (${prompt.placeholder})` : ""}: `),
+      onManualCodeInput: () => ask(rl, "Paste redirect URL or code: "),
+      onProgress: (message) => output.write(`${message}\n`),
+      onSelect: async (prompt) => selectOAuthOption({ prompt, rl, output }),
+    });
+    output.write(`\nCredentials saved to ${getMarchAuthPath(homeDir)}\n`);
+    return 0;
+  } catch (error) {
+    output.write(`OAuth login failed: ${error instanceof Error ? error.message : String(error)}\n`);
+    return 1;
+  } finally {
+    rl.close();
+  }
+}
+
+async function selectOAuthOption({ prompt, rl, output }) {
+  output.write(`${prompt.message}\n`);
+  for (let i = 0; i < prompt.options.length; i++) {
+    const option = prompt.options[i];
+    output.write(`  ${i + 1}. ${option.label} (${option.id})\n`);
+  }
+  const answer = await ask(rl, `Enter option id or number (1-${prompt.options.length}): `);
+  return resolveSelection(answer, prompt.options);
+}
+
+function resolveSelection(answer, options) {
+  const trimmed = answer.trim();
+  const index = Number.parseInt(trimmed, 10);
+  if (Number.isInteger(index) && String(index) === trimmed && index >= 1 && index <= options.length) {
+    return options[index - 1].id;
+  }
+  return options.some((option) => option.id === trimmed) ? trimmed : undefined;
+}
+
+function ask(rl, question) {
+  return new Promise((resolve) => rl.question(question, resolve));
+}
+
+function readLine({ input = process.stdin, output = process.stdout, prompt }) {
+  const rl = createInterface({ input, output });
+  return new Promise((resolve) => rl.question(prompt, (answer) => {
+    rl.close();
+    resolve(answer);
+  }));
+}