march-cli 0.1.20 → 0.1.22

package/src/provider/share-command.mjs

@@ -1,79 +1,79 @@
-import { globalConfigJsonPath, readConfigJson } from "../config/config-json.mjs";
-import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
-import { cloneProviderForShare, createProviderShareToken, hasApiKey } from "./share-payload.mjs";
-
-export async function runProviderShareCommand({
-  homeDir,
-  providerId,
-  includeKey = false,
-  profileOnly = false,
-  input = process.stdin,
-  output = process.stdout,
-  select = selectWithKeyboard,
-} = {}) {
-  if (includeKey && profileOnly) {
-    output.write("Choose either --include-key or --profile-only, not both.\n");
-    return 1;
-  }
-
-  const config = readConfigJson(globalConfigJsonPath(homeDir));
-  const providers = normalizeProviders(config.providers);
-  const selectedProviderId = providerId ?? await selectProvider({ providers, input, output, select });
-  if (!selectedProviderId) {
-    output.write(Object.keys(providers).length ? "Provider share cancelled.\n" : "No providers configured. Run: march provider --config\n");
-    return 1;
-  }
-
-  const provider = providers[selectedProviderId];
-  if (!provider) {
-    output.write(`Provider not found: ${selectedProviderId}\n`);
-    return 1;
-  }
-
-  const includeApiKey = includeKey || (!profileOnly && await selectShareMode({ input, output, select }));
-  const sharedProvider = cloneProviderForShare(provider, { includeApiKey });
-  const token = createProviderShareToken({
-    providerId: selectedProviderId,
-    provider: sharedProvider,
-    mode: includeApiKey ? "full" : "profile-only",
-  });
-
-  output.write(`Provider: ${selectedProviderId}\n`);
-  output.write(`Mode: ${includeApiKey ? "Full config, including API key" : "Profile only, without API key"}\n`);
-  output.write(`API key: ${hasApiKey(sharedProvider) ? "included" : "not included"}\n\n`);
-  output.write(`march provider accept ${token}\n`);
-  return 0;
-}
-
-function normalizeProviders(providers) {
-  return providers && typeof providers === "object" && !Array.isArray(providers) ? providers : {};
-}
-
-async function selectProvider({ providers, input, output, select }) {
-  const items = Object.entries(providers).map(([id, provider]) => ({
-    value: id,
-    label: formatProviderLabel(id, provider),
-  }));
-  return await select({ input, output, message: "Choose provider to share", items });
-}
-
-async function selectShareMode({ input, output, select }) {
-  const mode = await select({
-    input,
-    output,
-    message: "Choose share mode",
-    items: [
-      { label: "Full config, including API key", value: "full" },
-      { label: "Profile only, without API key", value: "profile-only" },
-    ],
-  });
-  return mode === "full";
-}
-
-function formatProviderLabel(id, provider) {
-  const name = typeof provider?.name === "string" && provider.name ? provider.name : "-";
-  const type = typeof provider?.type === "string" && provider.type ? provider.type : "unknown";
-  const modelCount = Array.isArray(provider?.models) ? `${provider.models.length} model${provider.models.length === 1 ? "" : "s"}` : "built-in";
-  const key = hasApiKey(provider) ? "API key configured" : "no API key";
-  return `${id}  ${name}  ${type}  ${modelCount}  ${key}`;
-}
+import { globalConfigJsonPath, readConfigJson } from "../config/config-json.mjs";
+import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+import { cloneProviderForShare, createProviderShareToken, hasApiKey } from "./share-payload.mjs";
+
+export async function runProviderShareCommand({
+  homeDir,
+  providerId,
+  includeKey = false,
+  profileOnly = false,
+  input = process.stdin,
+  output = process.stdout,
+  select = selectWithKeyboard,
+} = {}) {
+  if (includeKey && profileOnly) {
+    output.write("Choose either --include-key or --profile-only, not both.\n");
+    return 1;
+  }
+
+  const config = readConfigJson(globalConfigJsonPath(homeDir));
+  const providers = normalizeProviders(config.providers);
+  const selectedProviderId = providerId ?? await selectProvider({ providers, input, output, select });
+  if (!selectedProviderId) {
+    output.write(Object.keys(providers).length ? "Provider share cancelled.\n" : "No providers configured. Run: march provider --config\n");
+    return 1;
+  }
+
+  const provider = providers[selectedProviderId];
+  if (!provider) {
+    output.write(`Provider not found: ${selectedProviderId}\n`);
+    return 1;
+  }
+
+  const includeApiKey = includeKey || (!profileOnly && await selectShareMode({ input, output, select }));
+  const sharedProvider = cloneProviderForShare(provider, { includeApiKey });
+  const token = createProviderShareToken({
+    providerId: selectedProviderId,
+    provider: sharedProvider,
+    mode: includeApiKey ? "full" : "profile-only",
+  });
+
+  output.write(`Provider: ${selectedProviderId}\n`);
+  output.write(`Mode: ${includeApiKey ? "Full config, including API key" : "Profile only, without API key"}\n`);
+  output.write(`API key: ${hasApiKey(sharedProvider) ? "included" : "not included"}\n\n`);
+  output.write(`march provider accept ${token}\n`);
+  return 0;
+}
+
+function normalizeProviders(providers) {
+  return providers && typeof providers === "object" && !Array.isArray(providers) ? providers : {};
+}
+
+async function selectProvider({ providers, input, output, select }) {
+  const items = Object.entries(providers).map(([id, provider]) => ({
+    value: id,
+    label: formatProviderLabel(id, provider),
+  }));
+  return await select({ input, output, message: "Choose provider to share", items });
+}
+
+async function selectShareMode({ input, output, select }) {
+  const mode = await select({
+    input,
+    output,
+    message: "Choose share mode",
+    items: [
+      { label: "Full config, including API key", value: "full" },
+      { label: "Profile only, without API key", value: "profile-only" },
+    ],
+  });
+  return mode === "full";
+}
+
+function formatProviderLabel(id, provider) {
+  const name = typeof provider?.name === "string" && provider.name ? provider.name : "-";
+  const type = typeof provider?.type === "string" && provider.type ? provider.type : "unknown";
+  const modelCount = Array.isArray(provider?.models) ? `${provider.models.length} model${provider.models.length === 1 ? "" : "s"}` : "built-in";
+  const key = hasApiKey(provider) ? "API key configured" : "no API key";
+  return `${id}  ${name}  ${type}  ${modelCount}  ${key}`;
+}

package/src/provider/share-payload.mjs

@@ -1,52 +1,52 @@
-const KIND = "march.provider.share";
-const VERSION = 1;
-const PREFIX = "march-provider-v1.";
-
-export function createProviderShareToken({ providerId, provider, mode }) {
-  const payload = {
-    kind: KIND,
-    version: VERSION,
-    mode,
-    containsApiKey: hasApiKey(provider),
-    providerId,
-    provider,
-  };
-  return `${PREFIX}${Buffer.from(JSON.stringify(payload), "utf8").toString("base64url")}`;
-}
-
-export function parseProviderShareToken(token) {
-  const text = String(token ?? "").trim();
-  if (!text.startsWith(PREFIX)) throw new Error(`Provider share token must start with ${PREFIX}`);
-  let payload;
-  try {
-    payload = JSON.parse(Buffer.from(text.slice(PREFIX.length), "base64url").toString("utf8"));
-  } catch {
-    throw new Error("Invalid provider share token");
-  }
-  validateProviderSharePayload(payload);
-  return payload;
-}
-
-export function cloneProviderForShare(provider, { includeApiKey }) {
-  const clone = structuredClone(provider);
-  if (!includeApiKey && clone.auth && typeof clone.auth === "object" && !Array.isArray(clone.auth)) {
-    delete clone.auth.apiKey;
-  }
-  return clone;
-}
-
-export function hasApiKey(provider) {
-  return typeof provider?.auth?.apiKey === "string" && provider.auth.apiKey.length > 0;
-}
-
-export function validateProviderSharePayload(payload) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) throw new Error("Invalid provider share payload");
-  if (payload.kind !== KIND || payload.version !== VERSION) throw new Error("Unsupported provider share token");
-  if (typeof payload.providerId !== "string" || !payload.providerId.trim()) throw new Error("Provider share token is missing providerId");
-  validateProviderProfile(payload.provider);
-}
-
-function validateProviderProfile(provider) {
-  if (!provider || typeof provider !== "object" || Array.isArray(provider)) throw new Error("Provider share token is missing provider config");
-  if (typeof provider.type !== "string" || !provider.type.trim()) throw new Error("Provider config is missing type");
-}
+const KIND = "march.provider.share";
+const VERSION = 1;
+const PREFIX = "march-provider-v1.";
+
+export function createProviderShareToken({ providerId, provider, mode }) {
+  const payload = {
+    kind: KIND,
+    version: VERSION,
+    mode,
+    containsApiKey: hasApiKey(provider),
+    providerId,
+    provider,
+  };
+  return `${PREFIX}${Buffer.from(JSON.stringify(payload), "utf8").toString("base64url")}`;
+}
+
+export function parseProviderShareToken(token) {
+  const text = String(token ?? "").trim();
+  if (!text.startsWith(PREFIX)) throw new Error(`Provider share token must start with ${PREFIX}`);
+  let payload;
+  try {
+    payload = JSON.parse(Buffer.from(text.slice(PREFIX.length), "base64url").toString("utf8"));
+  } catch {
+    throw new Error("Invalid provider share token");
+  }
+  validateProviderSharePayload(payload);
+  return payload;
+}
+
+export function cloneProviderForShare(provider, { includeApiKey }) {
+  const clone = structuredClone(provider);
+  if (!includeApiKey && clone.auth && typeof clone.auth === "object" && !Array.isArray(clone.auth)) {
+    delete clone.auth.apiKey;
+  }
+  return clone;
+}
+
+export function hasApiKey(provider) {
+  return typeof provider?.auth?.apiKey === "string" && provider.auth.apiKey.length > 0;
+}
+
+export function validateProviderSharePayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) throw new Error("Invalid provider share payload");
+  if (payload.kind !== KIND || payload.version !== VERSION) throw new Error("Unsupported provider share token");
+  if (typeof payload.providerId !== "string" || !payload.providerId.trim()) throw new Error("Provider share token is missing providerId");
+  validateProviderProfile(payload.provider);
+}
+
+function validateProviderProfile(provider) {
+  if (!provider || typeof provider !== "object" || Array.isArray(provider)) throw new Error("Provider share token is missing provider config");
+  if (typeof provider.type !== "string" || !provider.type.trim()) throw new Error("Provider config is missing type");
+}

package/src/session/attachment-display.mjs

@@ -1,16 +1,16 @@
-import { basename } from "node:path";
-
-const ATTACHMENT_MARKER_RE = /@\.march\/attachments\/[^\s"'`<>)]+/g;
-
-export function formatAttachmentMarkerForDisplay(marker) {
-  const name = formatAttachmentDisplayName(basename(String(marker || "").replace(/\\/g, "/")) || "image");
-  return `[image: ${name}]`;
-}
-
-export function formatMessageAttachmentsForDisplay(text) {
-  return String(text || "").replace(ATTACHMENT_MARKER_RE, (marker) => formatAttachmentMarkerForDisplay(marker));
-}
-
-export function formatAttachmentDisplayName(name) {
-  return String(name || "image").replace(/^\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z_/, "");
-}
+import { basename } from "node:path";
+
+const ATTACHMENT_MARKER_RE = /@\.march\/attachments\/[^\s"'`<>)]+/g;
+
+export function formatAttachmentMarkerForDisplay(marker) {
+  const name = formatAttachmentDisplayName(basename(String(marker || "").replace(/\\/g, "/")) || "image");
+  return `[image: ${name}]`;
+}
+
+export function formatMessageAttachmentsForDisplay(text) {
+  return String(text || "").replace(ATTACHMENT_MARKER_RE, (marker) => formatAttachmentMarkerForDisplay(marker));
+}
+
+export function formatAttachmentDisplayName(name) {
+  return String(name || "image").replace(/^\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z_/, "");
+}

package/src/session/attachment-references.mjs

@@ -1,65 +1,65 @@
-import { existsSync, readFileSync } from "node:fs";
-import { extname, join, relative, resolve } from "node:path";
-import { getAttachmentRoot, imageExtensionForMime } from "./attachments.mjs";
-
-const ATTACHMENT_MARKER_RE = /@\.march\/attachments\/[^\s"'`<>)]+/g;
-
-const IMAGE_MIME_BY_EXT = Object.freeze({
-  ".gif": "image/gif",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".png": "image/png",
-  ".webp": "image/webp",
-});
-
-export function resolveImageAttachmentReferences({ text, projectMarchDir } = {}) {
-  if (!text || !projectMarchDir) return { images: [], references: [] };
-
-  const seen = new Set();
-  const images = [];
-  const references = [];
-  for (const marker of String(text).match(ATTACHMENT_MARKER_RE) || []) {
-    if (seen.has(marker)) continue;
-    seen.add(marker);
-
-    const relativePath = marker.slice("@.march/".length);
-    const path = assertInsideAttachmentRoot(join(projectMarchDir, relativePath), projectMarchDir);
-    if (!existsSync(path)) continue;
-
-    const mimeType = readSupportedAttachmentMimeType(path) ?? mimeTypeForPath(path);
-    if (!mimeType) continue;
-
-    const data = readFileSync(path).toString("base64");
-    images.push({ type: "image", mimeType, data });
-    references.push({ marker, path, mimeType });
-  }
-
-  return { images, references };
-}
-
-function readSupportedAttachmentMimeType(path) {
-  const metadataPath = path.replace(/\.[^.\\/]+$/, ".json");
-  if (!existsSync(metadataPath)) return null;
-  try {
-    const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
-    if (typeof metadata.mimeType !== "string") return null;
-    imageExtensionForMime(metadata.mimeType);
-    return metadata.mimeType;
-  } catch {
-    return null;
-  }
-}
-
-function mimeTypeForPath(path) {
-  return IMAGE_MIME_BY_EXT[extname(path).toLowerCase()] ?? null;
-}
-
-function assertInsideAttachmentRoot(path, projectMarchDir) {
-  const root = resolve(getAttachmentRoot(projectMarchDir));
-  const resolvedPath = resolve(path);
-  const rel = relative(root, resolvedPath);
-  if (rel.startsWith("..") || rel === "" || resolve(root, rel) !== resolvedPath) {
-    throw new Error("attachment marker escaped attachments root");
-  }
-  return resolvedPath;
-}
+import { existsSync, readFileSync } from "node:fs";
+import { extname, join, relative, resolve } from "node:path";
+import { getAttachmentRoot, imageExtensionForMime } from "./attachments.mjs";
+
+const ATTACHMENT_MARKER_RE = /@\.march\/attachments\/[^\s"'`<>)]+/g;
+
+const IMAGE_MIME_BY_EXT = Object.freeze({
+  ".gif": "image/gif",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".png": "image/png",
+  ".webp": "image/webp",
+});
+
+export function resolveImageAttachmentReferences({ text, projectMarchDir } = {}) {
+  if (!text || !projectMarchDir) return { images: [], references: [] };
+
+  const seen = new Set();
+  const images = [];
+  const references = [];
+  for (const marker of String(text).match(ATTACHMENT_MARKER_RE) || []) {
+    if (seen.has(marker)) continue;
+    seen.add(marker);
+
+    const relativePath = marker.slice("@.march/".length);
+    const path = assertInsideAttachmentRoot(join(projectMarchDir, relativePath), projectMarchDir);
+    if (!existsSync(path)) continue;
+
+    const mimeType = readSupportedAttachmentMimeType(path) ?? mimeTypeForPath(path);
+    if (!mimeType) continue;
+
+    const data = readFileSync(path).toString("base64");
+    images.push({ type: "image", mimeType, data });
+    references.push({ marker, path, mimeType });
+  }
+
+  return { images, references };
+}
+
+function readSupportedAttachmentMimeType(path) {
+  const metadataPath = path.replace(/\.[^.\\/]+$/, ".json");
+  if (!existsSync(metadataPath)) return null;
+  try {
+    const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
+    if (typeof metadata.mimeType !== "string") return null;
+    imageExtensionForMime(metadata.mimeType);
+    return metadata.mimeType;
+  } catch {
+    return null;
+  }
+}
+
+function mimeTypeForPath(path) {
+  return IMAGE_MIME_BY_EXT[extname(path).toLowerCase()] ?? null;
+}
+
+function assertInsideAttachmentRoot(path, projectMarchDir) {
+  const root = resolve(getAttachmentRoot(projectMarchDir));
+  const resolvedPath = resolve(path);
+  const rel = relative(root, resolvedPath);
+  if (rel.startsWith("..") || rel === "" || resolve(root, rel) !== resolvedPath) {
+    throw new Error("attachment marker escaped attachments root");
+  }
+  return resolvedPath;
+}