lingo.dev 0.117.15 → 0.117.17

package/build/cli.mjs

@@ -5477,23 +5477,25 @@ function createPoDataLoader(params) {
         const contextKey = _12.keys(sectionPo.translations)[0];
         const entries = sectionPo.translations[contextKey];
         const msgid = Object.keys(entries).find((key) => entries[key].msgid);
+        const currentSection = currentSections.find((cs) => {
+          const csPo = gettextParser.po.parse(cs);
+          const csContextKey = _12.keys(csPo.translations)[0];
+          const csEntries = csPo.translations[csContextKey];
+          const csMsgid = Object.keys(csEntries).find(
+            (key) => csEntries[key].msgid
+          );
+          return csMsgid === msgid;
+        });
         if (!msgid) {
-          const currentSection = currentSections.find((cs) => {
-            const csPo = gettextParser.po.parse(cs);
-            const csContextKey = _12.keys(csPo.translations)[0];
-            const csEntries = csPo.translations[csContextKey];
-            const csMsgid = Object.keys(csEntries).find(
-              (key) => csEntries[key].msgid
-            );
-            return csMsgid === msgid;
-          });
           if (currentSection) {
             return currentSection;
           }
           return section;
         }
         if (data[msgid]) {
+          const headers = currentSection ? gettextParser.po.parse(currentSection).headers : sectionPo.headers;
           const updatedPo = _12.merge({}, sectionPo, {
+            headers,
             translations: {
               [contextKey]: {
                 [msgid]: {
@@ -10796,27 +10798,128 @@ function withExponentialBackoff(fn, maxAttempts = 3, baseDelay = 1e3) {
 // src/cli/utils/observability.ts
 import pkg from "node-machine-id";
 import https from "https";
+
+// src/cli/utils/repository-id.ts
+import { execSync } from "child_process";
+var cachedGitRepoId = void 0;
+function getRepositoryId() {
+  const ciRepoId = getCIRepositoryId();
+  if (ciRepoId) return ciRepoId;
+  const gitRepoId = getGitRepositoryId();
+  if (gitRepoId) return gitRepoId;
+  return null;
+}
+function getCIRepositoryId() {
+  if (process.env.GITHUB_REPOSITORY) {
+    return `github:${process.env.GITHUB_REPOSITORY}`;
+  }
+  if (process.env.CI_PROJECT_PATH) {
+    return `gitlab:${process.env.CI_PROJECT_PATH}`;
+  }
+  if (process.env.BITBUCKET_REPO_FULL_NAME) {
+    return `bitbucket:${process.env.BITBUCKET_REPO_FULL_NAME}`;
+  }
+  return null;
+}
+function getGitRepositoryId() {
+  if (cachedGitRepoId !== void 0) {
+    return cachedGitRepoId;
+  }
+  try {
+    const remoteUrl = execSync("git config --get remote.origin.url", {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "ignore"]
+    }).trim();
+    if (!remoteUrl) {
+      cachedGitRepoId = null;
+      return null;
+    }
+    cachedGitRepoId = parseGitUrl(remoteUrl);
+    return cachedGitRepoId;
+  } catch {
+    cachedGitRepoId = null;
+    return null;
+  }
+}
+function parseGitUrl(url) {
+  const cleanUrl = url.replace(/\.git$/, "");
+  let platform = null;
+  if (cleanUrl.includes("github.com")) {
+    platform = "github";
+  } else if (cleanUrl.includes("gitlab.com")) {
+    platform = "gitlab";
+  } else if (cleanUrl.includes("bitbucket.org")) {
+    platform = "bitbucket";
+  }
+  const sshMatch = cleanUrl.match(/[@:]([^:/@]+\/[^:/@]+)$/);
+  const httpsMatch = cleanUrl.match(/\/([^/]+\/[^/]+)$/);
+  const repoPath = sshMatch?.[1] || httpsMatch?.[1];
+  if (!repoPath) return null;
+  if (platform) {
+    return `${platform}:${repoPath}`;
+  }
+  return `git:${repoPath}`;
+}
+
+// src/cli/utils/observability.ts
 var { machineIdSync } = pkg;
 var POSTHOG_API_KEY = "phc_eR0iSoQufBxNY36k0f0T15UvHJdTfHlh8rJcxsfhfXk";
 var POSTHOG_HOST = "eu.i.posthog.com";
 var POSTHOG_PATH = "/i/v0/e/";
 var REQUEST_TIMEOUT_MS = 1e3;
+var TRACKING_VERSION = "2.0";
+function determineDistinctId(providedId) {
+  if (providedId) {
+    const projectId = getRepositoryId();
+    return {
+      distinct_id: providedId,
+      distinct_id_source: "email",
+      project_id: projectId
+    };
+  }
+  const repoId = getRepositoryId();
+  if (repoId) {
+    return {
+      distinct_id: repoId,
+      distinct_id_source: "git_repo",
+      project_id: repoId
+    };
+  }
+  const deviceId = `device-${machineIdSync()}`;
+  if (process.env.DEBUG === "true") {
+    console.warn(
+      "[Tracking] Using device ID fallback. Consider using git repository for consistent tracking."
+    );
+  }
+  return {
+    distinct_id: deviceId,
+    distinct_id_source: "device",
+    project_id: null
+  };
+}
 function trackEvent(distinctId, event, properties) {
   if (process.env.DO_NOT_TRACK === "1") {
     return;
   }
   setImmediate(() => {
     try {
-      const actualId = distinctId || `device-${machineIdSync()}`;
+      const identityInfo = determineDistinctId(distinctId);
+      if (process.env.DEBUG === "true") {
+        console.log(
+          `[Tracking] Event: ${event}, ID: ${identityInfo.distinct_id}, Source: ${identityInfo.distinct_id_source}`
+        );
+      }
       const eventData = {
         api_key: POSTHOG_API_KEY,
         event,
-        distinct_id: actualId,
+        distinct_id: identityInfo.distinct_id,
         properties: {
           ...properties,
           $lib: "lingo.dev-cli",
           $lib_version: process.env.npm_package_version || "unknown",
-          // Essential debugging context only
+          tracking_version: TRACKING_VERSION,
+          distinct_id_source: identityInfo.distinct_id_source,
+          project_id: identityInfo.project_id,
           node_version: process.version,
           is_ci: !!process.env.CI,
           debug_enabled: process.env.DEBUG === "true"
@@ -11026,7 +11129,7 @@ var i18n_default = new Command14().command("i18n").description(
   try {
     flags = parseFlags(options);
   } catch (parseError) {
-    await trackEvent("unknown", "cmd.i18n.error", {
+    await trackEvent(null, "cmd.i18n.error", {
       errorType: "validation_error",
       errorName: parseError.name || "ValidationError",
       errorMessage: parseError.message || "Invalid command line options",
@@ -11426,7 +11529,7 @@ var i18n_default = new Command14().command("i18n").description(
       });
     } else {
       ora.warn("Localization completed with errors.");
-      await trackEvent(authId || "unknown", "cmd.i18n.error", {
+      await trackEvent(authId, "cmd.i18n.error", {
         flags,
         ...aggregateErrorAnalytics(
           errorDetails,
@@ -11452,7 +11555,7 @@ var i18n_default = new Command14().command("i18n").description(
         bucket: error.bucket
       };
     }
-    await trackEvent(authId || "unknown", "cmd.i18n.error", {
+    await trackEvent(authId, "cmd.i18n.error", {
       flags,
       errorType,
       errorName: error.name || "Error",
@@ -11972,10 +12075,10 @@ import { Command as Command19 } from "interactive-commander";
 import createOra from "ora";
 
 // src/cli/cmd/ci/flows/pull-request.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 
 // src/cli/cmd/ci/flows/in-branch.ts
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import path18 from "path";
 
 // src/cli/cmd/ci/flows/_base.ts
@@ -13208,7 +13311,7 @@ var run_default = new Command18().command("run").description("Run localization p
       flags: ctx.flags
     });
   } catch (error) {
-    await trackEvent(authId || "unknown", "cmd.run.error", {});
+    await trackEvent(authId, "cmd.run.error", {});
     if (args.sound) {
       await playSound("failure");
     }
@@ -13228,15 +13331,15 @@ var InBranchFlow = class extends IntegrationFlow {
     this.ora.start("Running Lingo.dev");
     await this.runLingoDotDev(options.parallel);
     this.ora.succeed("Done running Lingo.dev");
-    execSync(`rm -f i18n.cache`, { stdio: "inherit" });
+    execSync2(`rm -f i18n.cache`, { stdio: "inherit" });
     this.ora.start("Checking for changes");
     const hasChanges = this.checkCommitableChanges();
     this.ora.succeed(hasChanges ? "Changes detected" : "No changes detected");
     if (hasChanges) {
       this.ora.start("Committing changes");
-      execSync(`git add .`, { stdio: "inherit" });
-      execSync(`git status --porcelain`, { stdio: "inherit" });
-      execSync(
+      execSync2(`git add .`, { stdio: "inherit" });
+      execSync2(`git status --porcelain`, { stdio: "inherit" });
+      execSync2(
         `git commit -m ${escapeShellArg(
           this.platformKit.config.commitMessage
         )} --no-verify`,
@@ -13247,7 +13350,7 @@ var InBranchFlow = class extends IntegrationFlow {
       this.ora.succeed("Changes committed");
       this.ora.start("Pushing changes to remote");
       const currentBranch = this.i18nBranchName ?? this.platformKit.platformConfig.baseBranchName;
-      execSync(
+      execSync2(
         `git push origin ${currentBranch} ${options.force ? "--force" : ""}`,
         {
           stdio: "inherit"
@@ -13258,7 +13361,7 @@ var InBranchFlow = class extends IntegrationFlow {
     return hasChanges;
   }
   checkCommitableChanges() {
-    return execSync('git status --porcelain || echo "has_changes"', {
+    return execSync2('git status --porcelain || echo "has_changes"', {
       encoding: "utf8"
     }).length > 0;
   }
@@ -13283,17 +13386,17 @@ var InBranchFlow = class extends IntegrationFlow {
     const { baseBranchName } = this.platformKit.platformConfig;
     const gitConfig = getGitConfig(this.platformKit);
     this.ora.info(`Current working directory:`);
-    execSync(`pwd`, { stdio: "inherit" });
-    execSync(`ls -la`, { stdio: "inherit" });
-    execSync(`git config --global safe.directory ${process.cwd()}`);
-    execSync(`git config user.name "${gitConfig.userName}"`);
-    execSync(`git config user.email "${gitConfig.userEmail}"`);
+    execSync2(`pwd`, { stdio: "inherit" });
+    execSync2(`ls -la`, { stdio: "inherit" });
+    execSync2(`git config --global safe.directory ${process.cwd()}`);
+    execSync2(`git config user.name "${gitConfig.userName}"`);
+    execSync2(`git config user.email "${gitConfig.userEmail}"`);
     this.platformKit?.gitConfig();
-    execSync(`git fetch origin ${baseBranchName}`, { stdio: "inherit" });
-    execSync(`git checkout ${baseBranchName} --`, { stdio: "inherit" });
+    execSync2(`git fetch origin ${baseBranchName}`, { stdio: "inherit" });
+    execSync2(`git checkout ${baseBranchName} --`, { stdio: "inherit" });
     if (!processOwnCommits) {
       const currentAuthor = `${gitConfig.userName} <${gitConfig.userEmail}>`;
-      const authorOfLastCommit = execSync(
+      const authorOfLastCommit = execSync2(
         `git log -1 --pretty=format:'%an <%ae>'`
       ).toString();
       if (authorOfLastCommit === currentAuthor) {
@@ -13397,18 +13500,18 @@ var PullRequestFlow = class extends InBranchFlow {
     return prNumber;
   }
   checkoutI18nBranch(i18nBranchName) {
-    execSync2(`git fetch origin ${i18nBranchName}`, { stdio: "inherit" });
-    execSync2(`git checkout -b ${i18nBranchName}`, {
+    execSync3(`git fetch origin ${i18nBranchName}`, { stdio: "inherit" });
+    execSync3(`git checkout -b ${i18nBranchName}`, {
       stdio: "inherit"
     });
   }
   createI18nBranch(i18nBranchName) {
     try {
-      execSync2(
+      execSync3(
         `git fetch origin ${this.platformKit.platformConfig.baseBranchName}`,
         { stdio: "inherit" }
       );
-      execSync2(
+      execSync3(
         `git checkout -b ${i18nBranchName} origin/${this.platformKit.platformConfig.baseBranchName}`,
         {
           stdio: "inherit"
@@ -13433,7 +13536,7 @@ var PullRequestFlow = class extends InBranchFlow {
     this.ora.start(
       `Fetching latest changes from ${this.platformKit.platformConfig.baseBranchName}`
     );
-    execSync2(
+    execSync3(
       `git fetch origin ${this.platformKit.platformConfig.baseBranchName}`,
       { stdio: "inherit" }
     );
@@ -13442,7 +13545,7 @@ var PullRequestFlow = class extends InBranchFlow {
     );
     try {
       this.ora.start("Attempting to rebase branch");
-      execSync2(
+      execSync3(
         `git rebase origin/${this.platformKit.platformConfig.baseBranchName}`,
         { stdio: "inherit" }
       );
@@ -13450,12 +13553,12 @@ var PullRequestFlow = class extends InBranchFlow {
     } catch (error) {
       this.ora.warn("Rebase failed, falling back to alternative sync method");
       this.ora.start("Aborting failed rebase");
-      execSync2("git rebase --abort", { stdio: "inherit" });
+      execSync3("git rebase --abort", { stdio: "inherit" });
       this.ora.succeed("Aborted failed rebase");
       this.ora.start(
         `Resetting to ${this.platformKit.platformConfig.baseBranchName}`
       );
-      execSync2(
+      execSync3(
         `git reset --hard origin/${this.platformKit.platformConfig.baseBranchName}`,
         { stdio: "inherit" }
       );
@@ -13464,15 +13567,15 @@ var PullRequestFlow = class extends InBranchFlow {
       );
       this.ora.start("Restoring target files");
       const targetFiles = ["i18n.lock"];
-      const targetFileNames = execSync2(
+      const targetFileNames = execSync3(
         `npx lingo.dev@latest show files --target ${this.platformKit.platformConfig.baseBranchName}`,
         { encoding: "utf8" }
       ).split("\n").filter(Boolean);
       targetFiles.push(...targetFileNames);
-      execSync2(`git fetch origin ${this.i18nBranchName}`, { stdio: "inherit" });
+      execSync3(`git fetch origin ${this.i18nBranchName}`, { stdio: "inherit" });
       for (const file of targetFiles) {
         try {
-          execSync2(`git checkout FETCH_HEAD -- ${file}`, { stdio: "inherit" });
+          execSync3(`git checkout FETCH_HEAD -- ${file}`, { stdio: "inherit" });
         } catch (error2) {
           this.ora.warn(`Skipping non-existent file: ${file}`);
           continue;
@@ -13483,8 +13586,8 @@ var PullRequestFlow = class extends InBranchFlow {
     this.ora.start("Checking for changes to commit");
     const hasChanges = this.checkCommitableChanges();
     if (hasChanges) {
-      execSync2("git add .", { stdio: "inherit" });
-      execSync2(
+      execSync3("git add .", { stdio: "inherit" });
+      execSync3(
         `git commit -m "chore: sync with ${this.platformKit.platformConfig.baseBranchName}" --no-verify`,
         {
           stdio: "inherit"
@@ -13516,18 +13619,18 @@ Hey team,
 };
 
 // src/cli/cmd/ci/platforms/bitbucket.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 import bbLib from "bitbucket";
 import Z8 from "zod";
 
 // src/cli/cmd/ci/platforms/_base.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import Z7 from "zod";
 var defaultMessage = "feat: update translations via @lingodotdev";
 var PlatformKit = class {
   gitConfig(token, repoUrl) {
     if (token && repoUrl) {
-      execSync3(`git remote set-url origin ${repoUrl}`, {
+      execSync4(`git remote set-url origin ${repoUrl}`, {
         stdio: "inherit"
       });
     }
@@ -13631,10 +13734,10 @@ var BitbucketPlatformKit = class extends PlatformKit {
     });
   }
   async gitConfig() {
-    execSync4("git config --unset http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy", {
+    execSync5("git config --unset http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy", {
       stdio: "inherit"
     });
-    execSync4(
+    execSync5(
       "git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://host.docker.internal:29418/",
       {
         stdio: "inherit"
@@ -14063,7 +14166,7 @@ var status_default = new Command20().command("status").description("Show the sta
     ora.start("Validating localization configuration...");
     validateParams2(i18nConfig, flags);
     ora.succeed("Localization configuration is valid");
-    trackEvent(authId || "status", "cmd.status.start", {
+    trackEvent(authId, "cmd.status.start", {
       i18nConfig,
       flags
     });
@@ -14450,7 +14553,7 @@ var status_default = new Command20().command("status").description("Show the sta
         `\u2022 Try 'lingo.dev@latest i18n --locale ${targetLocales[0]}' to process just one language`
       );
     }
-    trackEvent(authId || "status", "cmd.status.success", {
+    trackEvent(authId, "cmd.status.success", {
       i18nConfig,
       flags,
       totalSourceKeyCount,
@@ -14461,7 +14564,7 @@ var status_default = new Command20().command("status").description("Show the sta
     exitGracefully();
   } catch (error) {
     ora.fail(error.message);
-    trackEvent(authId || "status", "cmd.status.error", {
+    trackEvent(authId, "cmd.status.error", {
       flags,
       error: error.message,
       authenticated: !!authId
@@ -14603,7 +14706,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.117.15",
+  version: "0.117.17",
   description: "Lingo.dev CLI",
   private: false,
   repository: {