livelocale 0.10.0 → 0.11.0-next.10

package/README.md

@@ -387,9 +387,12 @@ command line) and needs `GITHUB_TOKEN`.
 - Only a maintainer (OWNER, MEMBER or COLLABORATOR, or write access) makes it write. Anyone else
   gets the reply "Waiting for a maintainer: comment `/livelocale apply`".
 - It writes one commit on a `livelocale/issue-<n>` branch (`livelocale/run-<id>` for a manual
-  run), opens or reuses the pull request, and comments the link on the issue. When the repository
-  does not let GitHub Actions open pull requests, the comment carries a one-click compare link
-  instead.
+  run), opens or reuses the pull request, and comments the link on the issue. While that pull
+  request is open, a later apply on the same issue adds one commit to it. Once it is merged or
+  closed, the next apply opens a new pull request from `livelocale/issue-<n>-<runId>` (with `-2`,
+  `-3`, … while that name is taken), and later applies add to that one while it is open; a
+  branch is never force-pushed. When the repository does not let GitHub Actions open pull
+  requests, the comment carries a one-click compare link instead.
 - `--locales` and `--dir` are relative to the repository root. `--branches` lists the branches a
   link may target (default: the repository's default branch); a link made from any other branch
   targets the default branch, and the comment says so.
@@ -445,12 +448,12 @@ liveLocaleVite({
 });
 ```
 
-| Option         | Default                                  | What it does                                                                                                                               |
-| -------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
-| `share`        | `false`                                  | Write the share Studio into `<outDir>/livelocale/` on `vite build`. SSR and library builds are skipped.                                    |
-| `exposeRepo`   | `false`                                  | Put the GitHub `owner/repo` into the published manifest and the change link. Leave it off for a private repository.                        |
-| `sourceLocale` | `en` when present, else the first locale | The locale placeholders are checked against.                                                                                               |
-| `shareBase`    | Vite `base`                              | The path the HTML is served from. Set it when `base` is a full URL (a CDN), which the build otherwise rejects with `BAD_BASE`, or differs. |
+| Option         | Default                                  | What it does                                                                                                                                                                             |
+| -------------- | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `share`        | `false`                                  | Write the share Studio into `<outDir>/livelocale/` on `vite build`. SSR and library builds are skipped.                                                                                  |
+| `exposeRepo`   | `false`                                  | Put the GitHub `owner/repo` into the published manifest and the change link. Leave it off for a private repository.                                                                      |
+| `sourceLocale` | `en` when present, else the first locale | The locale placeholders are checked against.                                                                                                                                             |
+| `shareBase`    | Vite `base`                              | The path the HTML is served from. Set it when `base` is a full URL (a CDN), which the build otherwise rejects with `BAD_BASE`, or when the HTML is served from a path other than `base`. |
 
 A relative `base` (`./`) links `flag.js` per HTML file and prints a warning: pages served by a
 client-side route fallback cannot load it, so prefer an absolute `base` for apps with such routes.
@@ -517,7 +520,8 @@ it. Without `reference` only the syntax check runs.
 
 ## 🔗 Share link on any host
 
-Translators fix text on your live site with no account, and every fix becomes a pull request with one click.
+Translators fix text on your live site with no account, and every fix becomes a pull request with
+one click.
 
 A share link needs no server, no account and no credential anywhere. The Studio ships inside your
 build at `<base>livelocale/`, so any host that serves the site serves the Studio too: Apache,
@@ -632,22 +636,21 @@ on the real page and a before/after table with the check results. Then turn it i
 - With issues turned off, or for a link you would rather not file: **Actions → LiveLocale → Run
   workflow**, paste the link and run it. The result is on the run's summary page.
 - **The trust gate.** The workflow writes only for a maintainer: the issue author or the
-  commenter must be an owner, member or collaborator, or have write access. For anyone else it
+  commenter must be an owner, member or collaborator, or have write access. In an organization
+  that includes any member or invited collaborator, even one with read-only access: they can turn a
+  link into a pull request, but only people with write access can merge it. For anyone else it
   replies "Waiting for a maintainer: comment `/livelocale apply`", and nothing is written until a
   maintainer posts that comment on the issue. Edits the translator saved with "Save anyway" are
   skipped as `needs --force`; comment `/livelocale apply --force` to include them.
-- **Who can trigger it.** The Action trusts the issue author or the commenter when GitHub marks
-  them OWNER, MEMBER or COLLABORATOR on the repository, or when they have write access. In an
-  organization that means any member or invited collaborator, even one with read-only access, can
-  turn a link into a pull request, but only people with write access can merge it.
 - **Base branches.** By default every pull request targets the default branch. To let links made
   from other builds (for example a `staging` deployment) target their own branch, list the
   branches with `npx livelocale init --share --branches main,staging`. A link from any other
   branch targets the default branch, and the comment says so. A pull request into the default
   branch says `Closes #n`, so merging it closes the issue; into another branch it says `Refs #n`,
   because GitHub only closes issues from the default branch, and LiveLocale closes the issue
-  itself when that pull request is merged or closed.
-  Also merge .github/workflows/livelocale.yml into each extra branch; pull requests into it run workflows from that branch, so LiveLocale cannot close their issues otherwise.
+  itself when that pull request is merged or closed. Also merge `.github/workflows/livelocale.yml`
+  into each extra branch: pull requests into it run workflows from that branch, so LiveLocale cannot
+  close their issues otherwise.
 
 **On any git host, from your machine:**
 
@@ -658,8 +661,9 @@ npx livelocale apply "<link or file>" --pr
 This works with your own `git` login: it commits only the locale files on a new
 `livelocale/apply-<time>` branch and pushes it. On GitHub it opens the pull request with `gh`;
 elsewhere it prints the branch to open a pull or merge request from. Every edit is checked again
-against your own files first. For a long link, use `npx livelocale apply --clipboard`, or pass `-` and pipe
-the link in (`npx livelocale apply - < changes.txt`). See [`apply`](#apply) for every option.
+against your own files first. For a long link, use `npx livelocale apply --clipboard`, or pass `-`
+and pipe the link in (`npx livelocale apply - < changes.txt`). See [`apply`](#apply) for every
+option.
 
 #### Run CI on LiveLocale PRs without the approval click
 
@@ -669,8 +673,8 @@ GitHub App token start CI as usual. To use one:
 
 1. Create a GitHub App with **Contents**, **Pull requests** and **Issues** set to read and write,
    and install it on the repository.
-2. Store its ID as the repository variable `LIVELOCALE_APP_ID` and its private key as the secret
-   `LIVELOCALE_APP_PRIVATE_KEY`.
+2. Store its Client ID (on the App's settings page) as the repository variable
+   `LIVELOCALE_APP_CLIENT_ID` and its private key as the secret `LIVELOCALE_APP_PRIVATE_KEY`.
 3. In `.github/workflows/livelocale.yml`, add this step before the `apply` step and give its token
    to the `apply` step as `GITHUB_TOKEN`:
 
@@ -679,7 +683,7 @@ GitHub App token start CI as usual. To use one:
   uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
   with:
     {
-      app-id: '${{ vars.LIVELOCALE_APP_ID }}',
+      client-id: '${{ vars.LIVELOCALE_APP_CLIENT_ID }}',
       private-key: '${{ secrets.LIVELOCALE_APP_PRIVATE_KEY }}',
     }
 - run: npx --yes livelocale@X.Y.Z apply --github-event --locales locales --source en --branches main
@@ -699,7 +703,8 @@ whose translators already have GitHub access; with the default, translators use
 
 ### What "Sent" means
 
-In this mode "Sent" means the translator handed the link over; it is not a pull request until a developer applies it.
+In this mode "Sent" means the translator handed the link over; it is not a pull request until a
+developer applies it.
 
 ### Hosting notes
 
@@ -717,9 +722,8 @@ In this mode "Sent" means the translator handed the link over; it is not a pull
 - **PWA:** a Workbox service worker (vite-plugin-pwa, workbox-webpack-plugin) can answer the Studio
   with your app shell. Add `navigateFallbackDenylist: [/^\/livelocale\//]` to its Workbox options.
 - **Relative bases** (`base: './'`, CRA `homepage: '.'`): pages served by a client-side route
-  fallback cannot load `flag.js`, so pack prints "The app base is relative (./), so flag.js is
-  linked per HTML file. Pages served by a client-side route fallback cannot load it; build with
-  an absolute base (--base /path/) if the app has such routes."
+  fallback cannot load `flag.js`, so pack prints a warning recommending an absolute base
+  (`--base /path/`) when the app has such routes.
 
 ### Security
 

package/dist/codemod/index.cjs

@@ -434,7 +434,7 @@ var path3 = __toESM(require("path"), 1);
 
 // src/core/validate.ts
 var LOCALE_RE = /^[a-zA-Z]{2,3}(-[a-zA-Z0-9]{2,4})?$/;
-var KEY_RE = /^[a-zA-Z0-9._-]+$/;
+var KEY_RE = /^[A-Za-z0-9_-]+(?:\.[A-Za-z0-9_-]+)*$/;
 var MAX_LOCALE_LENGTH = 10;
 var MAX_KEY_LENGTH = 200;
 var MAX_VALUE_LENGTH = 1e4;
@@ -1331,12 +1331,12 @@ function checkShareCsp(pages, origin) {
   return { level: "ok", title, detail: "scripts from 'self' are allowed" };
 }
 function workerCandidates(root, base) {
-  const urls = [];
+  const urls2 = [];
   if (isAnswer(root)) {
     const registered = /serviceWorker\s*\.\s*register\s*\(\s*["'`]([^"'`]+)["'`]/.exec(root.body);
     if (registered) {
       try {
-        urls.push(new URL(registered[1], base).href);
+        urls2.push(new URL(registered[1], base).href);
       } catch {
       }
     }
@@ -1346,9 +1346,9 @@ function workerCandidates(root, base) {
     ...names.map((name) => new URL(name, base).href),
     ...names.map((name) => new URL(`/${name}`, base).href)
   ]) {
-    if (!urls.includes(url)) urls.push(url);
+    if (!urls2.includes(url)) urls2.push(url);
   }
-  return urls;
+  return urls2;
 }
 async function checkServiceWorker(fetchImpl, root, base, origin) {
   const title = "Service worker";
@@ -2552,6 +2552,10 @@ var EXISTING_FLAG_TAG = /<script\b[^>]*\bsrc="[^"]*livelocale\/flag\.js"[^>]*>\s
 var HEAD_OPEN2 = /<head(?=[\s>])[^>]*>/i;
 var HTML_OPEN2 = /<html(?=[\s>])[^>]*>/i;
 var DOCTYPE2 = /<!doctype\b[^>]*>/i;
+var DOCUMENT_MARKUP = /<(?:!doctype\b|html(?=[\s>])|head(?=[\s>]))/i;
+function isHtmlDocument(html) {
+  return DOCUMENT_MARKUP.test(html);
+}
 function escapeAttribute(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -2790,10 +2794,12 @@ async function packOutput(options) {
   }
   await import_fs5.promises.writeFile(path8.join(shareDir, SHARE_FLAG_FILE), FLAG_SCRIPT, "utf-8");
   const inject = injectHtml === "auto" ? target.kind !== "next" && !(0, import_fs5.existsSync)(path8.join(outDir, "_next")) : injectHtml;
-  const htmlInjected = inject ? await findHtmlFiles(outDir, shareDir) : [];
-  for (const rel of htmlInjected) {
+  const htmlInjected = [];
+  for (const rel of inject ? await findHtmlFiles(outDir, shareDir) : []) {
     const file = path8.join(outDir, ...rel.split("/"));
     const html = await import_fs5.promises.readFile(file, "utf-8");
+    if (!isHtmlDocument(html)) continue;
+    htmlInjected.push(rel);
     const injected = injectFlagScript(html, flagSrcFor(base, rel));
     if (injected !== html) await import_fs5.promises.writeFile(file, injected, "utf-8");
   }
@@ -2854,6 +2860,55 @@ function parseShareArgs(argv) {
   }
   return args;
 }
+var PACK_USAGE = "Usage: livelocale pack <outDir> [options]";
+var BUILD_USAGE = "Usage: livelocale build [--preview] -- <your build command>";
+function usageError(problem, usage) {
+  return new PackError("USAGE", `${problem}
+${usage}`);
+}
+function checkPackArgs(args) {
+  if (args.positional.length === 0) {
+    throw usageError("Missing <outDir>: pass the built site folder, for example dist.", PACK_USAGE);
+  }
+  if (args.positional.length > 1) {
+    throw usageError(
+      `Unexpected argument "${args.positional[1]}": pack takes one <outDir>.`,
+      PACK_USAGE
+    );
+  }
+  if (args.out !== void 0) {
+    throw usageError(
+      "--out is not a pack option: pass the built site folder as <outDir>.",
+      PACK_USAGE
+    );
+  }
+  if (args.preview) {
+    throw usageError(
+      "--preview is not a pack option: use livelocale build --preview -- <your build command>.",
+      PACK_USAGE
+    );
+  }
+  if (args.command.length > 0) {
+    throw usageError(
+      "pack does not run a build command: use livelocale build -- <your build command>.",
+      PACK_USAGE
+    );
+  }
+}
+function checkBuildArgs(args) {
+  if (args.positional.length > 0) {
+    throw usageError(
+      `Unexpected argument "${args.positional[0]}": put the build command after --.`,
+      BUILD_USAGE
+    );
+  }
+  if (!args.inject) {
+    throw usageError(
+      "--no-inject is not a build option: livelocale build links flag.js itself (never on Next.js).",
+      BUILD_USAGE
+    );
+  }
+}
 var WINDOWS_NEEDS_QUOTES = /[\s"&|<>^()]/;
 function quoteWindowsArg(arg) {
   if (arg !== "" && !WINDOWS_NEEDS_QUOTES.test(arg)) return arg;
@@ -2886,7 +2941,6 @@ var spawnInherit = (command, args, { cwd, env }) => new Promise((resolve16, reje
   });
   child.on("close", (code) => resolve16(code ?? 1));
 });
-var BUILD_USAGE = "Usage: livelocale build [--preview] -- <your build command>";
 var NEXT_PREVIEW_WARNING = "Next.js pages have no watermarks without --preview; the Studio will open but nothing is editable.";
 var NEXT_GITIGNORE_WARNING = "Add public/livelocale/ to .gitignore; it is generated on every build.";
 var FRESH_SLACK_MS = 2e3;
@@ -2925,6 +2979,12 @@ async function runBuildCommand(options) {
   const childEnv = preview ? { ...env, LIVELOCALE: "preview", NEXT_PUBLIC_LIVELOCALE: "preview" } : env;
   const runBuild = () => run3(command[0], command.slice(1), { cwd: projectDir, env: childEnv });
   if (target.kind === "next") {
+    if (outDir !== void 0) {
+      throw new PackError(
+        "USAGE",
+        "--out is not used for Next.js; the share folder goes to public/"
+      );
+    }
     const blocking = target.staticExport ? findExportBlockingRoute(projectDir) : null;
     if (blocking !== null) {
       throw new PackError(
@@ -3134,6 +3194,13 @@ var URL_PATTERN = /\b(?:https?:\/\/|www\.)[^\s<>"')]+/gi;
 var BIDI_CONTROL_PATTERN = /[\u202A-\u202E\u2066-\u2069]/g;
 var tagNames = (text) => Array.from(text.matchAll(TAG_PATTERN), (m) => m[1].toLowerCase());
 var allMatches = (pattern, text) => text.match(pattern) ?? [];
+var URL_PARTS_PATTERN = /^((?:https?:\/\/|www\.)[^/?#]*)(.*)$/i;
+var normalizeUrl = (url) => {
+  const trimmed = url.replace(/[.,;:!?]+$/, "");
+  const parts = URL_PARTS_PATTERN.exec(trimmed);
+  return parts ? parts[1].toLowerCase() + parts[2] : trimmed;
+};
+var urls = (text) => allMatches(URL_PATTERN, text).map(normalizeUrl);
 var hasNew = (known, found) => {
   const set = new Set(known);
   return found.some((item) => !set.has(item));
@@ -3145,7 +3212,7 @@ function detectRiskFlags(reference, value) {
   if (SCRIPT_LINK_PATTERNS.some((pattern) => pattern.test(value) && !pattern.test(ref))) {
     flags.push("javascript-url");
   }
-  if (hasNew(allMatches(URL_PATTERN, ref), allMatches(URL_PATTERN, value))) flags.push("new-url");
+  if (hasNew(urls(ref), urls(value))) flags.push("new-url");
   if (hasNew(allMatches(BIDI_CONTROL_PATTERN, ref), allMatches(BIDI_CONTROL_PATTERN, value))) {
     flags.push("bidi-control");
   }
@@ -3504,13 +3571,39 @@ function buildFileChanges(localesDir, plan, remote, baseFiles) {
   }
   return changes;
 }
+var MAX_FALLBACK_SUFFIX = 100;
+async function findOpenFallbackPull(rest, baseName, base) {
+  const fallback = new RegExp(
+    `^${baseName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}-\\d+(?:-\\d+)?$`
+  );
+  const res = await rest.api(
+    "GET",
+    "/pulls",
+    { query: { base, state: "open", per_page: "100" } }
+  );
+  for (const pull of res.data ?? []) {
+    const ref = pull.head?.ref ?? "";
+    const headRepo = pull.head?.repo?.full_name?.toLowerCase();
+    if (headRepo !== rest.repo.toLowerCase() || !fallback.test(ref)) continue;
+    const head = await rest.refSha(ref);
+    if (head !== null) return { branch: ref, head };
+  }
+  return null;
+}
 async function prepareBranch(rest, baseName, base, targetSha, runId) {
   const head = await rest.refSha(baseName);
   if (head === null) return { branch: baseName, parentSha: targetSha, mode: "new" };
   if (await rest.findOpenPullRequest(baseName, base)) {
     return { branch: baseName, parentSha: head, mode: "append" };
   }
-  return { branch: `${baseName}-${runId}`, parentSha: targetSha, mode: "new" };
+  const open = await findOpenFallbackPull(rest, baseName, base);
+  if (open) return { branch: open.branch, parentSha: open.head, mode: "append" };
+  const fallback = `${baseName}-${runId}`;
+  for (let n = 1; n <= MAX_FALLBACK_SUFFIX; n++) {
+    const branch = n === 1 ? fallback : `${fallback}-${n}`;
+    if (await rest.refSha(branch) === null) return { branch, parentSha: targetSha, mode: "new" };
+  }
+  throw new Error(`[livelocale] No free branch name after ${fallback}-${MAX_FALLBACK_SUFFIX}.`);
 }
 async function commitFiles(rest, input) {
   const { branch, parentSha, mode } = input.branchPlan;
@@ -3555,7 +3648,7 @@ function noreplyAuthor(actor) {
 // src/codemod/apply/github-trigger.ts
 var APPLY_COMMAND_RE = /^\/livelocale\s+apply(\s+--force)?\s*$/;
 var COMMAND_PREFIX = "/livelocale";
-var ISSUE_BRANCH_RE = /^livelocale\/issue-(\d+)(?:-\d+)?$/;
+var ISSUE_BRANCH_RE = /^livelocale\/issue-(\d+)(?:-\d+){0,2}$/;
 var TRUSTED_ASSOCIATIONS = /* @__PURE__ */ new Set(["OWNER", "MEMBER", "COLLABORATOR"]);
 var TRUSTED_PERMISSIONS = /* @__PURE__ */ new Set(["admin", "write"]);
 var TRUSTED_ROLES = /* @__PURE__ */ new Set(["admin", "maintain", "write"]);
@@ -3599,7 +3692,8 @@ function parseTrigger(eventName, event) {
       if (event?.action !== "created") return ignore("comment not created");
       const issue = event.issue;
       const comment = event.comment;
-      if (issue?.pull_request) return ignore("comment on a pull request");
+      if (!issue) return ignore("comment without an issue");
+      if (issue.pull_request) return ignore("comment on a pull request");
       if (comment?.user?.type === "Bot") return ignore("comment by a bot");
       const body = textOf(comment?.body);
       const firstLine = body.split(/\r\n|\r|\n/)[0] ?? "";
@@ -3669,7 +3763,9 @@ async function isTrustedActor(rest, login, association) {
 function chooseTargetBranch(requested, allowList, defaultBranch) {
   if (!requested) return { branch: defaultBranch, reason: "default" };
   const allowed = allowList.length > 0 ? allowList : [defaultBranch];
-  if (allowed.includes(requested)) return { branch: requested, reason: "link" };
+  if (requested === defaultBranch || allowed.includes(requested)) {
+    return { branch: requested, reason: "link" };
+  }
   return { branch: defaultBranch, reason: "not-allowed" };
 }
 function branchBaseName(t, runId) {
@@ -3692,7 +3788,7 @@ var STATUS_LABELS = {
   "needs-force": "needs --force",
   invalid: "rejected"
 };
-var BIDI_CONTROL_RE = /[‪-‮⁦-⁩]/g;
+var BIDI_CONTROL_RE = /[\u202a-\u202e\u2066-\u2069]/g;
 var NEWLINE_RE = /\r\n|\r|\n/g;
 var SPAN_CONTROL_RE = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g;
 var CONTROL_RE = /[\u0000-\u001f\u007f-\u009f]/g;
@@ -4012,8 +4108,13 @@ async function runGitHubEventApply(options) {
   try {
     return await applyLink(options, rest, trigger, { repo, runId, runUrl, server, log, report });
   } catch (err) {
-    if (err instanceof ExpectedFailure) return report({ kind: "error", message: err.message });
-    await report({ kind: "error", message: errorMessage(err) });
+    const message = err instanceof ExpectedFailure ? err.message : errorMessage(err);
+    try {
+      const result = await report({ kind: "error", message });
+      if (err instanceof ExpectedFailure) return result;
+    } catch (reportErr) {
+      log(`Could not post the error comment: ${errorMessage(reportErr)}`);
+    }
     throw err;
   }
 }
@@ -4938,6 +5039,7 @@ async function runLocalApply(options) {
   const now = options.now ?? (() => /* @__PURE__ */ new Date());
   const branch = await pickBranchName(git, root, utcStamp(now()));
   await git(["switch", "-c", branch], root);
+  let committed = false;
   try {
     const written = await writeEdits(mutator, plan, targets, localesDir, localesPath);
     log(renderTerminalSummary(plan));
@@ -4955,6 +5057,7 @@ async function runLocalApply(options) {
       checkSummary = `Check could not run: ${errorMessage2(err)}`;
     }
     await new GitClient().commit(localesDir, renderCommitMessage({ plan, by: set.by }));
+    committed = true;
     await git(["push", "-u", "origin", branch], root, { inherit: true });
     const remote = (await tryRun(() => git(["remote", "get-url", "origin"], root)))?.trim();
     const slug = remote ? GITHUB_REMOTE_RE.exec(remote)?.[1] : void 0;
@@ -4985,7 +5088,9 @@ async function runLocalApply(options) {
     await git(["switch", original], root);
     return { plan, written, branch, prUrl, exitCode };
   } catch (err) {
-    log(`You are on ${branch}; your changes are committed there.`);
+    log(
+      committed ? `You are on ${branch}; your changes are committed there.` : `You are on ${branch}; the edits are written but not committed.`
+    );
     throw err;
   }
 }
@@ -5193,6 +5298,37 @@ function renderWorkflow(o) {
     ""
   ].join("\n");
 }
+function parseInitShareArgs(argv) {
+  const args = {
+    dir: ".",
+    localesPath: void 0,
+    sourceLocale: void 0,
+    branches: void 0,
+    overwrite: false
+  };
+  const valueAt = (i) => {
+    const value = argv[i + 1];
+    if (value === void 0 || value.startsWith("--")) {
+      throw new Error(`${argv[i]} needs a value.`);
+    }
+    return value;
+  };
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--dir") {
+      args.dir = valueAt(i++);
+    } else if (arg === "--locales") {
+      args.localesPath = valueAt(i++);
+    } else if (arg === "--source") {
+      args.sourceLocale = valueAt(i++);
+    } else if (arg === "--branches") {
+      args.branches = valueAt(i++).split(",").map((b) => b.trim()).filter(Boolean);
+    } else if (arg === "--overwrite") {
+      args.overwrite = true;
+    }
+  }
+  return args;
+}
 function toPosix2(p) {
   return p.split(path17.sep).join("/");
 }
@@ -5229,14 +5365,17 @@ function findLocalesPath(projectDir) {
   if (!found) throw new Error("Pass --locales <path>.");
   return found;
 }
+var REMOTE_HEAD = /^ref: refs\/heads\/(\S+)\s+HEAD$/m;
 async function defaultBranchOf(git, cwd) {
   const ref = await git(["symbolic-ref", "--short", "refs/remotes/origin/HEAD"], cwd);
   if (ref?.startsWith("origin/") && ref.length > "origin/".length) {
-    return ref.slice("origin/".length);
+    return { branch: ref.slice("origin/".length), assumed: false };
   }
+  const remote = await git(["ls-remote", "--symref", "origin", "HEAD"], cwd);
+  const remoteHead = REMOTE_HEAD.exec(remote ?? "");
+  if (remoteHead) return { branch: remoteHead[1], assumed: false };
   const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
-  if (head && head !== "HEAD") return head;
-  return "main";
+  return { branch: head && head !== "HEAD" ? head : "main", assumed: true };
 }
 function planWrite(projectDir, rel, content) {
   const current = readText3(path17.join(projectDir, rel));
@@ -5261,7 +5400,7 @@ function planViteConfig(c) {
     c.notes.push(addNote);
     return [{ path: config, action: "skipped", reason: "liveLocaleVite(...) has no { options }" }];
   }
-  const source2 = c.sourceLocale === "en" ? "" : `sourceLocale: '${c.sourceLocale}', `;
+  const source2 = c.sourceLocale === "en" || /\bsourceLocale\s*:/.test(source) ? "" : `sourceLocale: '${c.sourceLocale}', `;
   const next = source.replace(call, () => `liveLocaleVite({ share: true, ${source2}`);
   return [{ path: config, action: "update", content: next }];
 }
@@ -5376,7 +5515,12 @@ async function planInitShare(o) {
   const appRel = toPosix2(path17.relative(repoRoot, projectDir));
   const dir = appRel === "" ? void 0 : appRel;
   const repoLocales = dir === void 0 ? localesPath : `${dir}/${localesPath}`;
-  const defaultBranch = await defaultBranchOf(git, projectDir);
+  const { branch: defaultBranch, assumed } = await defaultBranchOf(git, projectDir);
+  if (assumed) {
+    notes.push(
+      `Could not read the default branch from origin; assumed \`${defaultBranch}\`. Pass --branches <branch> if that is wrong.`
+    );
+  }
   const branches = o.branches ?? [defaultBranch];
   const workflow = renderWorkflow({
     version: o.version,
@@ -5403,11 +5547,12 @@ async function planInitShare(o) {
   return { stack, files, notes };
 }
 function writePlannedFiles(projectDir, files) {
+  const root = realDir(projectDir);
   for (const file of files) {
     if (file.action !== "create" && file.action !== "update" || file.content === void 0) {
       continue;
     }
-    const target = path17.resolve(projectDir, file.path);
+    const target = path17.resolve(root, file.path);
     fs11.mkdirSync(path17.dirname(target), { recursive: true });
     fs11.writeFileSync(target, file.content, "utf-8");
   }
@@ -5881,7 +6026,6 @@ async function runCheckCommand(args) {
     warns > 0 ? `\u2705 No problems, ${warns} warning(s) worth a look.` : `\u2705 Translations look good.`
   );
 }
-var PACK_USAGE = "Usage: livelocale pack <outDir> [options]";
 function printPackSummary(result, projectDir, warnings) {
   for (const warning of warnings) console.log(`\u26A0\uFE0F  ${warning}`);
   const outRel = path18.relative(projectDir, path18.dirname(result.shareDir)).split(path18.sep).join("/") || ".";
@@ -5893,9 +6037,7 @@ function printPackSummary(result, projectDir, warnings) {
 async function runPackCommand(args) {
   try {
     const options = parseShareArgs(args.slice(1));
-    if (options.positional.length !== 1 || options.out !== void 0 || options.preview || options.command.length > 0) {
-      throw new PackError("USAGE", PACK_USAGE);
-    }
+    checkPackArgs(options);
     const projectDir = path18.resolve(options.dir);
     const result = await packOutput({
       projectDir,
@@ -5916,9 +6058,7 @@ async function runPackCommand(args) {
 async function runBuildCli(args) {
   try {
     const options = parseShareArgs(args.slice(1));
-    if (options.positional.length > 0 || !options.inject) {
-      throw new PackError("USAGE", BUILD_USAGE);
-    }
+    checkBuildArgs(options);
     const projectDir = path18.resolve(options.dir);
     const result = await runBuildCommand({
       projectDir,
@@ -5943,25 +6083,15 @@ async function runBuildCli(args) {
   }
 }
 async function runInitShareCommand(args) {
-  let dir = ".";
-  let localesPath;
-  let sourceLocale;
-  let branches;
-  let overwrite = false;
-  for (let i = 1; i < args.length; i++) {
-    const arg = args[i];
-    if (arg === "--dir") {
-      dir = args[++i] || ".";
-    } else if (arg === "--locales") {
-      localesPath = args[++i];
-    } else if (arg === "--source") {
-      sourceLocale = args[++i];
-    } else if (arg === "--branches") {
-      branches = (args[++i] ?? "").split(",").map((b) => b.trim()).filter(Boolean);
-    } else if (arg === "--overwrite") {
-      overwrite = true;
-    }
+  let parsed;
+  try {
+    parsed = parseInitShareArgs(args.slice(1));
+  } catch (err) {
+    console.error(`\u274C ${err.message}`);
+    process.exitCode = 1;
+    return;
   }
+  const { dir, localesPath, sourceLocale, branches, overwrite } = parsed;
   const projectDir = path18.resolve(dir);
   if (!fs12.existsSync(projectDir)) {
     console.error(`Error: Directory "${dir}" does not exist.`);