@dosu/cli 0.52.1 → 0.52.2

package/bin/dosu.js

@@ -5000,7 +5000,7 @@ function isNpxInvocation(channel = INSTALL_CHANNEL, env = process.env) {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.52.1", INSTALL_CHANNEL = "npm";
+var VERSION = "0.52.2", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -5134,7 +5134,7 @@ var init_logger = __esm(() => {
 });
 
 // src/client/contract.ts
-var CLI_CONTRACT_HASH = "85b07f7689e2";
+var CLI_CONTRACT_HASH = "1d4be4b6214f";
 
 // src/client/trpc.ts
 var exports_trpc = {};
@@ -11444,7 +11444,7 @@ var init_settings = __esm(() => {
 });
 
 // src/telemetry/debug-id.ts
-var BUNDLE_DEBUG_ID_PLACEHOLDER = "61606b23-6c2b-78a9-6475-6e2164756e21";
+var BUNDLE_DEBUG_ID_PLACEHOLDER = "11869608-d7a8-aa45-6475-6e2164756e21";
 
 // src/telemetry/telemetry.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
@@ -11473,11 +11473,13 @@ function normalizeContext(context) {
   const isAuthenticated2 = context?.isAuthenticated === true;
   const id = safeRead(context?.user, "id");
   const email = safeRead(context?.user, "email");
-  const user = isAuthenticated2 && validUserId(id) ? { id, ...validEmail(email) ? { email } : {} } : undefined;
+  const orgId = safeRead(context, "orgId");
+  const user = isAuthenticated2 && isUUID2(id) ? { id, ...validEmail(email) ? { email } : {} } : undefined;
   return {
     mode: context?.mode === "oss" ? "oss" : "cloud",
     isAuthenticated: isAuthenticated2,
-    ...user ? { user } : {}
+    ...user ? { user } : {},
+    ...user && isUUID2(orgId) ? { orgId } : {}
   };
 }
 function normalizeExitCode(value, fallback = 1) {
@@ -11497,12 +11499,9 @@ function normalizeRuntime(runtime) {
     isTty: runtime.isTty === true
   };
 }
-function validInstallId(value) {
+function isUUID2(value) {
   return typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
 }
-function validUserId(value) {
-  return validInstallId(value);
-}
 function validEmail(value) {
   return typeof value === "string" && value.length <= 254 && /^[A-Za-z0-9.!#$%&'*+/=?^_`{|}~-]+@[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/.test(value);
 }
@@ -11652,7 +11651,7 @@ function buildPostHogPayload(input) {
   const result = input.result === "success" || input.result === "validation_error" ? input.result : "failure";
   return {
     api_key: input.apiKey,
-    distinct_id: context.user?.id ?? (validInstallId(input.installId) ? input.installId : FALLBACK_INSTALL_ID),
+    distinct_id: context.user?.id ?? (isUUID2(input.installId) ? input.installId : FALLBACK_INSTALL_ID),
     event: "cli_command_completed",
     properties: {
       $geoip_disable: true,
@@ -11670,6 +11669,10 @@ function buildPostHogPayload(input) {
       is_ci: runtime.isCi,
       is_tty: runtime.isTty,
       mode: context.mode,
+      ...context.orgId ? {
+        org_id: context.orgId,
+        $groups: { organization: context.orgId }
+      } : {},
       is_authenticated: context.isAuthenticated,
       exit_code: normalizeExitCode(input.exitCode),
       ...errorCode ? { error_code: errorCode } : {}
@@ -11784,7 +11787,12 @@ function buildSentryEnvelope(input) {
     level: "error",
     release: `dosu-cli@${runtime.version}`,
     tags: sentryTags(command, context, runtime, error),
-    ...context.user ? { user: context.user } : {},
+    ...context.user ? {
+      user: {
+        id: context.user.id,
+        ...context.user.email ? { email: context.user.email } : {}
+      }
+    } : {},
     ...mappedBundle ? {
       debug_meta: {
         images: [{ type: "sourcemap", code_file: BUNDLE_CODE_FILE, debug_id: debugId }]
@@ -11978,7 +11986,7 @@ function safeNow(now) {
 function safeUuid(generate) {
   try {
     const value = generate();
-    return validInstallId(value) ? value : undefined;
+    return isUUID2(value) ? value : undefined;
   } catch {
     return;
   }
@@ -12010,7 +12018,7 @@ function createCommandTelemetry(settings2, dependencies = {}) {
   let installIdResolved = false;
   let resolvedInstallId = settings2.install_id;
   function installId() {
-    if (validInstallId(resolvedInstallId))
+    if (isUUID2(resolvedInstallId))
       return resolvedInstallId;
     if (installIdResolved)
       return;
@@ -12020,7 +12028,7 @@ function createCommandTelemetry(settings2, dependencies = {}) {
     } catch {
       resolvedInstallId = undefined;
     }
-    return validInstallId(resolvedInstallId) ? resolvedInstallId : undefined;
+    return isUUID2(resolvedInstallId) ? resolvedInstallId : undefined;
   }
   function debugPayload(payload) {
     try {
@@ -12211,7 +12219,7 @@ async function trackCliOnboardingEvent(cfg, onboardingRunID, event, properties =
       return;
     if (!cfg.active_account?.session.access_token)
       return;
-    if (!isUUID2(onboardingRunID))
+    if (!isUUID3(onboardingRunID))
       return;
     const input = {
       event,
@@ -12234,7 +12242,7 @@ async function trackCliOnboardingPreAuthEvent(onboardingRunID, event, properties
       return;
     if (!analyticsReleaseEnabled())
       return;
-    if (!isUUID2(onboardingRunID))
+    if (!isUUID3(onboardingRunID))
       return;
     const input = {
       event,
@@ -12267,13 +12275,14 @@ function analyticsReleaseEnabled() {
   return Boolean(parsePostHogProjectToken(process.env.DOSU_POSTHOG_PROJECT_TOKEN_OVERRIDE ?? "phc_Uo9RxhN0HRk8gZkPlT18BCr7eqsM0MPWVW88HZB95V5"));
 }
 function baseProperties(cfg) {
+  const orgId = cfg.active_account?.target?.org_id;
   return {
     cli_version: safeIdentifier(VERSION, 32),
     install_channel: safeIdentifier(INSTALL_CHANNEL, 32),
     platform: safeIdentifier(process.platform, 24),
     arch: safeIdentifier(process.arch, 24),
     mode: cfg.mode ?? "cloud",
-    org_id: safeIdentifier(cfg.active_account?.target?.org_id, 128),
+    ...orgId && isUUID3(orgId) ? { org_id: orgId, $groups: { organization: orgId } } : {},
     deployment_id: safeIdentifier(cfg.active_account?.target?.deployment_id, 128),
     space_id: safeIdentifier(cfg.active_account?.target?.space_id, 128)
   };
@@ -12316,7 +12325,7 @@ function allowlistedWorkflowProperties(properties) {
 function safeIdentifier(value, maxLength) {
   return typeof value === "string" && value.length <= maxLength && /^[A-Za-z0-9][A-Za-z0-9._+-]*$/.test(value) ? value : undefined;
 }
-function isUUID2(value) {
+function isUUID3(value) {
   return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
 }
 function createAnalyticsClient(accessToken, requestSignal) {
@@ -17870,10 +17879,12 @@ function commandTelemetryContext() {
     const tokenUserID = getAccessTokenUserID(accessToken);
     const userID = configUserID && configUserID === tokenUserID ? configUserID : undefined;
     const email = userID ? getAccessTokenEmail(accessToken) : undefined;
+    const orgId = userID ? cfg.active_account?.target?.org_id : undefined;
     return {
       mode: cfg.mode === MODE_OSS ? "oss" : "cloud",
       isAuthenticated: authenticated,
-      ...userID ? { user: { id: userID, ...email ? { email } : {} } } : {}
+      ...userID ? { user: { id: userID, ...email ? { email } : {} } } : {},
+      ...orgId ? { orgId } : {}
     };
   } catch {
     return { mode: "cloud", isAuthenticated: false };
@@ -18339,4 +18350,4 @@ execute().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=61606b23-6c2b-78a9-6475-6e2164756e21
+//# debugId=11869608-d7a8-aa45-6475-6e2164756e21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.52.1",
+  "version": "0.52.2",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",