@mp-lb/forum-cli 0.1.2 → 0.1.5

package/dist/index.js

@@ -1764,7 +1764,7 @@ import {
   rm as rm4,
   writeFile as writeFile6
 } from "fs/promises";
-import { createInterface } from "readline/promises";
+import { createInterface as createInterface2 } from "readline/promises";
 import { pathToFileURL } from "url";
 import { parse as parseYaml } from "yaml";
 
@@ -18345,7 +18345,9 @@ var listSearchReconciliationStoresInputSchema = external_exports.object({
   limit: external_exports.number().int().min(1).max(500).default(100),
   touchedAfter: external_exports.string().datetime()
 });
-var listOwnStoresInputSchema = external_exports.object({});
+var listOwnStoresInputSchema = external_exports.object({
+  workspaceId: external_exports.string().trim().min(1).optional()
+});
 var readStoreMetadataInputSchema = external_exports.object({
   workspaceId: storeWorkspaceIdSchema,
   storeId: storeIdSchema
@@ -23449,9 +23451,21 @@ var storeRootPathFromId2 = (storeId) => {
   return `/${normalizeStoreId2(storeId)}`;
 };
 
-// src/auth.ts
+// src/openInBrowser.ts
 import { execFile } from "child_process";
 import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var openInBrowser = async (url2) => {
+  if (process.platform === "darwin") {
+    await execFileAsync("open", [url2]);
+    return;
+  }
+  if (process.platform === "win32") {
+    await execFileAsync("cmd", ["/c", "start", "", url2]);
+    return;
+  }
+  await execFileAsync("xdg-open", [url2]);
+};
 
 // src/render.ts
 var options = {
@@ -23775,19 +23789,28 @@ var withActivity = async (label, run) => {
   }
 };
 
+// src/waitForLoginBrowser.ts
+import { createInterface } from "readline";
+var waitForLoginBrowser = () => new Promise((resolve, reject) => {
+  const prompt = createInterface({
+    input: process.stdin,
+    output: process.stderr
+  });
+  const cancel = () => {
+    reject(new Error("Login cancelled. Run `fm auth login` again."));
+    prompt.close();
+  };
+  prompt.once("SIGINT", cancel);
+  prompt.once("close", cancel);
+  prompt.question("Press Enter to open the browser... ", () => {
+    prompt.removeListener("close", cancel);
+    prompt.removeListener("SIGINT", cancel);
+    prompt.close();
+    resolve();
+  });
+});
+
 // src/auth.ts
-var execFileAsync = promisify(execFile);
-var openInBrowser = async (url2) => {
-  if (process.platform === "darwin") {
-    await execFileAsync("open", [url2]);
-    return;
-  }
-  if (process.platform === "win32") {
-    await execFileAsync("cmd", ["/c", "start", "", url2]);
-    return;
-  }
-  await execFileAsync("xdg-open", [url2]);
-};
 var interactiveLogin = async ({
   apiBaseUrl,
   timeoutMs = 2 * 60 * 1e3,
@@ -23806,10 +23829,11 @@ var interactiveLogin = async ({
     throw new Error(`Failed to start auth flow: ${message}`);
   }
   const session = await startResponse.json();
-  renderOutput(`Open this URL: ${session.verificationUrl}`);
-  renderOutput(`Enter this code: ${session.userCode}`);
+  renderOutput(`First, copy this code: ${session.userCode}`);
+  renderOutput(`Open this URL and enter the code: ${session.verificationUrl}`);
   renderOutput(`This code expires at: ${session.expiresAt}`);
-  if (openBrowser) {
+  if (openBrowser && process.stdin.isTTY && process.stderr.isTTY) {
+    await waitForLoginBrowser();
     void openInBrowser(session.verificationUrl).catch(() => {
       renderOutput(
         "Could not open browser automatically. Open the URL manually."
@@ -25404,6 +25428,77 @@ var atomicWriteTextFile = async (filePath, text, isExecutable = false) => {
   }
 };
 
+// src/markdownStoreLinks.ts
+var markdownExtensions = /* @__PURE__ */ new Set([".md", ".markdown", ".mdx"]);
+var inlineLinkDestinationPattern = /(\]\()([^)\s]+)(\))/g;
+var normalizeStorePath2 = (value) => {
+  const withoutFragment = value.split("#", 1)[0] ?? value;
+  const withoutQuery = withoutFragment.split("?", 1)[0] ?? withoutFragment;
+  return withoutQuery.startsWith("/") ? withoutQuery : `/${withoutQuery}`;
+};
+var normalizeFileExtension = (pathValue) => {
+  const basename3 = pathValue.split("/").at(-1) ?? pathValue;
+  const dotIndex = basename3.lastIndexOf(".");
+  return dotIndex >= 0 ? basename3.slice(dotIndex).toLowerCase() : "";
+};
+var isMarkdownStorePath = (pathValue) => markdownExtensions.has(normalizeFileExtension(pathValue));
+var encodeRawFileUrl = (baseUrl, fileId) => `${baseUrl.replace(/\/+$/, "")}/raw-file/${encodeURIComponent(fileId)}`;
+var decodeRawFileId = (href) => {
+  let url2;
+  try {
+    url2 = new URL(href);
+  } catch {
+    return null;
+  }
+  const segments2 = url2.pathname.split("/").filter(Boolean);
+  if (segments2.length !== 2 || segments2[0] !== "raw-file") {
+    return null;
+  }
+  try {
+    return decodeURIComponent(segments2[1] ?? "");
+  } catch {
+    return null;
+  }
+};
+var rewriteMarkdownLinkDestinations = (markdown, rewriteDestination) => markdown.replace(
+  inlineLinkDestinationPattern,
+  (_match, prefix, destination, suffix) => `${prefix}${rewriteDestination(destination)}${suffix}`
+);
+var rewriteStorePathLinksToRawUrls = ({
+  rawFileBaseUrl: rawFileBaseUrl2,
+  targets,
+  text
+}) => {
+  const targetByStorePath = new Map(
+    targets.map((target) => [normalizeStorePath2(target.storePath), target])
+  );
+  return rewriteMarkdownLinkDestinations(text, (destination) => {
+    if (!destination.startsWith("/") || destination.startsWith("//")) {
+      return destination;
+    }
+    const target = targetByStorePath.get(normalizeStorePath2(destination));
+    return target ? encodeRawFileUrl(rawFileBaseUrl2, target.fileId) : destination;
+  });
+};
+var rewriteRawUrlsToStorePathLinks = ({
+  targets,
+  text
+}) => {
+  const storePathByFileId = new Map(
+    targets.map((target) => [
+      target.fileId,
+      normalizeStorePath2(target.storePath)
+    ])
+  );
+  return rewriteMarkdownLinkDestinations(text, (destination) => {
+    const fileId = decodeRawFileId(destination);
+    if (!fileId) {
+      return destination;
+    }
+    return storePathByFileId.get(fileId) ?? destination;
+  });
+};
+
 // src/checkout.ts
 var reservedRootFiles = new Set(projectConfigFilenames);
 var reservedRootFileNames = [...reservedRootFiles];
@@ -25542,6 +25637,41 @@ var checkoutEchoSuppressionPathsForWorkerValue = (value) => {
 };
 var compareRelativePath3 = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 var remoteEntrySource = (entry) => entry.__forumSource;
+var remoteEntryStorePath = (entry) => entry.__forumStorePath ?? entry.path;
+var markdownLinkTargetsFromEntries = (entries) => entries.map(
+  ({ entry }) => entry.id ? {
+    fileId: entry.id,
+    storePath: remoteEntryStorePath(entry)
+  } : null
+).filter((target) => Boolean(target));
+var markdownLinkTargetsFromManifest = (manifest) => Object.values(manifest.files).map(
+  (entry) => entry.remoteFileId && entry.remotePath ? {
+    fileId: entry.remoteFileId,
+    storePath: entry.remotePath
+  } : null
+).filter((target) => Boolean(target));
+var rawFileBaseUrl = (client) => {
+  const probeId = "__forum_probe__";
+  return client.createRawFileUrl(probeId).replace(new RegExp(`/raw-file/${probeId}$`), "");
+};
+var rewriteMarkdownForLocalCheckout = ({
+  client,
+  relativePath,
+  targets,
+  text
+}) => isMarkdownStorePath(relativePath) && text.includes("](/") ? rewriteStorePathLinksToRawUrls({
+  rawFileBaseUrl: rawFileBaseUrl(client),
+  targets,
+  text
+}) : text;
+var rewriteMarkdownForRemoteStore = ({
+  manifest,
+  relativePath,
+  text
+}) => isMarkdownStorePath(relativePath) ? rewriteRawUrlsToStorePathLinks({
+  targets: markdownLinkTargetsFromManifest(manifest),
+  text
+}) : text;
 var isReservedCheckoutFile = (relativePath) => {
   const filename = relativePath.split("/").at(-1) ?? relativePath;
   return reservedRootFiles.has(filename);
@@ -25708,6 +25838,7 @@ var createSyncRuleClient = (client, rule) => {
   };
   const mapListingEntries = (entries, remoteRoot) => entries.map((entry) => ({
     ...entry,
+    __forumStorePath: entry.path,
     ...remoteRoot.displayStore ? {
       __forumRemoteRef: {
         ...remoteRoot.displayStore,
@@ -25928,6 +26059,7 @@ var createSyncRuleFileClient = (client, rule) => {
         ...listing,
         entries: listing.entries.filter((entry) => entry.path === remotePath).map((entry) => ({
           ...entry,
+          __forumStorePath: entry.path,
           path: localPathForEntry
         }))
       };
@@ -25945,6 +26077,7 @@ var createSyncRuleFileClient = (client, rule) => {
         ...listing,
         entries: listing.entries.filter((entry) => entry.path === remotePath).map((entry) => ({
           ...entry,
+          __forumStorePath: entry.path,
           path: localPathForEntry
         }))
       };
@@ -27662,6 +27795,7 @@ var pullCheckout = async ({
   const files = remoteEntries.filter(
     (file2) => isCheckoutPathIncluded2(file2.relativePath, false, includePaths)
   );
+  const markdownLinkTargets = markdownLinkTargetsFromEntries(files);
   const remotePaths = new Set(files.map((file2) => file2.relativePath));
   const remoteRenameConflictDetails = dryRun ? [] : await reconcileRemoteRenamesBeforePull({
     dryRun,
@@ -27827,14 +27961,20 @@ var pullCheckout = async ({
       if (!remoteFile?.content || !("text" in remoteFile.content)) {
         throw new Error("remote file did not include text content");
       }
+      const localText = rewriteMarkdownForLocalCheckout({
+        client,
+        relativePath,
+        targets: markdownLinkTargets,
+        text: remoteFile.content.text
+      });
       await atomicWriteTextFile(
         path7.join(localPath, relativePath),
-        remoteFile.content.text,
+        localText,
         remoteFile.isExecutable === true
       );
       updateFileManifestEntry({
         storageClass: "text",
-        hash: hashText(remoteFile.content.text),
+        hash: hashText(localText),
         manifest,
         path: relativePath,
         remoteFile,
@@ -27980,6 +28120,7 @@ var pullStoreFiles = async ({
   }
   const downloadProgress = withCheckoutProgressDirection(progress, "download");
   downloadProgress?.onTotal?.(files.length + missingRemoteDetails.length);
+  const markdownLinkTargets = markdownLinkTargetsFromEntries(files);
   return runInParallel(
     files,
     (file2) => file2.relativePath,
@@ -28017,9 +28158,15 @@ var pullStoreFiles = async ({
       if (!remoteFile.content || !("text" in remoteFile.content)) {
         throw new Error("remote file did not include text content");
       }
+      const localText = rewriteMarkdownForLocalCheckout({
+        client,
+        relativePath,
+        targets: markdownLinkTargets,
+        text: remoteFile.content.text
+      });
       await atomicWriteTextFile(
         destinationPath,
-        remoteFile.content.text,
+        localText,
         remoteFile.isExecutable === true
       );
       return { changeType, status: "succeeded" };
@@ -28273,7 +28420,11 @@ var pushCheckout = async ({
         relativePath: file2.relativePath,
         remoteRevisionNumber: manifestEntry?.remoteRevisionNumber,
         storeRef,
-        text: file2.text
+        text: rewriteMarkdownForRemoteStore({
+          manifest,
+          relativePath: file2.relativePath,
+          text: file2.text
+        })
       });
       const pushed = await client.writeTextFileByRef(writeInput);
       updateFileManifestEntry({
@@ -28400,14 +28551,20 @@ var pullRemoteFileIntoCheckout = async ({
   if (!remoteFile.content || !("text" in remoteFile.content)) {
     throw new Error("remote file did not include text content");
   }
+  const localText = rewriteMarkdownForLocalCheckout({
+    client,
+    relativePath,
+    targets: markdownLinkTargetsFromManifest(manifest),
+    text: remoteFile.content.text
+  });
   await atomicWriteTextFile(
     path7.join(localPath, relativePath),
-    remoteFile.content.text,
+    localText,
     remoteFile.isExecutable === true
   );
   updateFileManifestEntry({
     storageClass: "text",
-    hash: hashText(remoteFile.content.text),
+    hash: hashText(localText),
     manifest,
     path: relativePath,
     remoteFile,
@@ -28448,7 +28605,11 @@ var pushLocalFileFromCheckout = async ({
       relativePath: file2.relativePath,
       remoteRevisionNumber: manifestEntry?.remoteRevisionNumber,
       storeRef,
-      text: file2.text
+      text: rewriteMarkdownForRemoteStore({
+        manifest,
+        relativePath: file2.relativePath,
+        text: file2.text
+      })
     })
   );
   updateFileManifestEntry({
@@ -30936,6 +31097,7 @@ var createStoreClient = ({
     { retryDelayMs: transientRetryDelayMs }
   );
   return {
+    createRawFileUrl: (fileId) => `${apiBaseUrl.replace(/\/+$/, "")}/raw-file/${encodeURIComponent(fileId)}`,
     listStores: () => call("stores.list", () => trpc.stores.list.query({})),
     createStore: (input) => call("stores.create", () => trpc.stores.create.mutate(input)),
     deleteStore: (input) => call("stores.delete", () => trpc.stores.delete.mutate(input)),
@@ -31708,12 +31870,13 @@ var openInEditor = async (currentText, { extension = "" } = {}) => {
   try {
     await writeFile5(tempPath, currentText, "utf8");
     const exitCode = await new Promise((resolve, reject) => {
-      const child = spawn(editor, [tempPath], {
-        stdio: "inherit",
-        shell: true
-      });
+      const child = spawn(
+        "/bin/sh",
+        ["-c", `exec ${editor} "$1"`, "fm-editor", tempPath],
+        { stdio: "inherit" }
+      );
       child.on("error", reject);
-      child.on("exit", (code) => resolve(code ?? 0));
+      child.on("exit", (code) => resolve(code ?? 1));
     });
     if (exitCode !== 0) {
       return null;
@@ -31725,6 +31888,56 @@ var openInEditor = async (currentText, { extension = "" } = {}) => {
   }
 };
 
+// src/readHiddenLine.ts
+var readHiddenLine = async (prompt) => {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    throw new Error(
+      "Missing encryption password. Provide --password or DOCTRINE_ENCRYPTION_PASSWORD."
+    );
+  }
+  return new Promise((resolve, reject) => {
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+    const wasRaw = stdin.isRaw;
+    let value = "";
+    const cleanup = () => {
+      stdin.off("data", readChunk);
+      stdin.pause();
+      stdin.setRawMode(wasRaw);
+      stdout.write("\n");
+    };
+    const finish = () => {
+      cleanup();
+      resolve(value);
+    };
+    const cancel = () => {
+      cleanup();
+      reject(new Error("Encryption password prompt cancelled."));
+    };
+    const readChunk = (chunk) => {
+      for (const byte of chunk) {
+        if (byte === 3) {
+          cancel();
+          return;
+        }
+        if (byte === 13 || byte === 10) {
+          finish();
+          return;
+        }
+        if (byte === 127) {
+          value = value.slice(0, -1);
+          continue;
+        }
+        value += String.fromCharCode(byte);
+      }
+    };
+    stdin.setRawMode(true);
+    stdin.on("data", readChunk);
+    stdin.resume();
+    stdout.write(prompt);
+  });
+};
+
 // src/resolveDecryptAuthMode.ts
 var resolveDecryptAuthMode = ({
   encryptionPassword,
@@ -32730,7 +32943,7 @@ var confirmYesNo = async ({
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     throw new Error(nonInteractiveMessage);
   }
-  const readline = createInterface({
+  const readline = createInterface2({
     input: process.stdin,
     output: process.stdout
   });
@@ -33533,53 +33746,6 @@ var readCommandTextInput = async (inlineText, inputFilePath) => {
   }
   return null;
 };
-var readHiddenLine = async (prompt) => {
-  if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    throw new Error(
-      "Missing encryption password. Provide --password or DOCTRINE_ENCRYPTION_PASSWORD."
-    );
-  }
-  return new Promise((resolve, reject) => {
-    const stdin = process.stdin;
-    const stdout = process.stdout;
-    const wasRaw = stdin.isRaw;
-    let value = "";
-    const cleanup = () => {
-      stdin.off("data", readChunk);
-      stdin.setRawMode(wasRaw);
-      stdout.write("\n");
-    };
-    const finish = () => {
-      cleanup();
-      resolve(value);
-    };
-    const cancel = () => {
-      cleanup();
-      reject(new Error("Encryption password prompt cancelled."));
-    };
-    const readChunk = (chunk) => {
-      for (const byte of chunk) {
-        if (byte === 3) {
-          cancel();
-          return;
-        }
-        if (byte === 13 || byte === 10) {
-          finish();
-          return;
-        }
-        if (byte === 127) {
-          value = value.slice(0, -1);
-          continue;
-        }
-        value += String.fromCharCode(byte);
-      }
-    };
-    stdout.write(prompt);
-    stdin.setRawMode(true);
-    stdin.resume();
-    stdin.on("data", readChunk);
-  });
-};
 var readEncryptionPassword = async (parsed) => {
   const password = parsed.encryptionPassword ?? process.env.DOCTRINE_ENCRYPTION_PASSWORD;
   if (password) {
@@ -33753,7 +33919,7 @@ var confirmEncryptionMigration = async ({
       "Refusing to migrate encryption without interactive confirmation. Rerun with --yes to confirm in a non-interactive shell."
     );
   }
-  const readline = createInterface({
+  const readline = createInterface2({
     input: process.stdin,
     output: process.stdout
   });
@@ -34680,12 +34846,6 @@ var unsetConfigValue = async (parsed, key) => {
   });
   renderOutput(`Reset poll-interval-ms to ${DEFAULT_POLL_INTERVAL_MS}`);
 };
-var ensureToken = (token) => {
-  if (!token) {
-    throw new Error("Missing auth token. Provide --token or DOCTRINE_TOKEN.");
-  }
-  return token;
-};
 var parseRootStorePath = (storePathInput) => {
   const storeId = normalizeStoreId2(storePathInput);
   return {
@@ -35777,7 +35937,7 @@ var analyzeLocalIgnore = async (checkout) => {
   });
 };
 var promptIgnoreAction = async () => {
-  const readline = createInterface({
+  const readline = createInterface2({
     input: process.stdin,
     output: process.stdout
   });
@@ -36516,7 +36676,7 @@ var confirmGitMetadataDeletion = async (localPath, assumeYes) => {
   renderWarning(
     "Only continue if the repository history is backed up or you are certain you no longer need it here."
   );
-  const readline = createInterface({
+  const readline = createInterface2({
     input: process.stdin,
     output: process.stdout
   });
@@ -36641,7 +36801,7 @@ var main = async (argv = process.argv.slice(2)) => {
     const config3 = await resolveConfig(parsed);
     if (subcommand === "login") {
       const apiBaseUrl2 = ensureApiBaseUrl(config3.apiBaseUrl);
-      const token2 = await withActivity(
+      const token = await withActivity(
         "Starting login",
         () => interactiveLogin({
           apiBaseUrl: apiBaseUrl2,
@@ -36649,7 +36809,7 @@ var main = async (argv = process.argv.slice(2)) => {
         })
       );
       await writeConfig(parsed.stateDir, {
-        token: token2,
+        token,
         pollIntervalMs: config3.pollIntervalMs,
         forceWrites: config3.forceWrites
       });
@@ -36746,8 +36906,7 @@ var main = async (argv = process.argv.slice(2)) => {
     }
   }
   const apiBaseUrl = ensureApiBaseUrl(config2.apiBaseUrl);
-  const token = ensureToken(config2.token);
-  const client = createClient({ ...config2, apiBaseUrl, token });
+  const client = createClient({ ...config2, apiBaseUrl });
   if (command === "encrypt") {
     await runEncryptCommand(rest, parsed, client);
     return;