@dosu/cli 0.52.1 → 0.52.3

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.3", 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 = {};
@@ -10226,6 +10226,14 @@ function mcpURL(deploymentID) {
 function mcpBaseURL() {
   return `${getBackendURL()}/v1/mcp`;
 }
+function mcpEndpoint(cfg) {
+  if (cfg.mode === MODE_OSS)
+    return mcpBaseURL();
+  const deploymentID = cfg.active_account?.target?.deployment_id;
+  if (!deploymentID)
+    throw new Error("deployment ID is required");
+  return mcpURL(deploymentID);
+}
 function mcpHeaders(apiKey) {
   if (!apiKey) {
     throw new Error("API key is required. Run 'dosu setup' to create one.");
@@ -10252,18 +10260,23 @@ function mcpRemoteServer(url, apiKey) {
   };
 }
 function loadJSONConfig(path3) {
+  try {
+    return readJSONConfig(path3);
+  } catch {
+    return {};
+  }
+}
+function readJSONConfig(path3) {
   if (!existsSync7(path3))
     return {};
-  let data = readFileSync8(path3, "utf-8").trim();
-  if (!data)
+  const raw = readFileSync8(path3, "utf-8").trim();
+  if (!raw)
     return {};
-  if (path3.endsWith(".jsonc")) {
-    data = stripJSONComments(data);
-  }
   try {
-    return JSON.parse(data);
-  } catch {
-    return {};
+    return JSON.parse(stripTrailingCommas(stripJSONComments(raw)));
+  } catch (err) {
+    const detail = err.message;
+    throw new Error(`Could not parse ${path3} as JSON (${detail}). Fix the file and retry.`);
   }
 }
 function stripJSONComments(data) {
@@ -10271,25 +10284,7 @@ function stripJSONComments(data) {
   let i2 = 0;
   while (i2 < data.length) {
     if (data[i2] === '"') {
-      result.push(data[i2]);
-      i2++;
-      while (i2 < data.length && data[i2] !== '"') {
-        if (data[i2] === "\\") {
-          result.push(data[i2]);
-          i2++;
-          if (i2 < data.length) {
-            result.push(data[i2]);
-            i2++;
-          }
-          continue;
-        }
-        result.push(data[i2]);
-        i2++;
-      }
-      if (i2 < data.length) {
-        result.push(data[i2]);
-        i2++;
-      }
+      i2 = copyStringLiteral(data, i2, result);
       continue;
     }
     if (i2 + 1 < data.length && data[i2] === "/" && data[i2 + 1] === "/") {
@@ -10303,8 +10298,7 @@ function stripJSONComments(data) {
       i2 += 2;
       while (i2 + 1 < data.length && !(data[i2] === "*" && data[i2 + 1] === "/"))
         i2++;
-      if (i2 + 1 < data.length)
-        i2 += 2;
+      i2 = i2 + 1 < data.length ? i2 + 2 : data.length;
       continue;
     }
     result.push(data[i2]);
@@ -10312,6 +10306,43 @@ function stripJSONComments(data) {
   }
   return result.join("");
 }
+function copyStringLiteral(data, start, out) {
+  let i2 = start + 1;
+  out.push('"');
+  while (i2 < data.length && data[i2] !== '"') {
+    out.push(data[i2]);
+    if (data[i2] === "\\" && i2 + 1 < data.length)
+      out.push(data[++i2]);
+    i2++;
+  }
+  if (i2 < data.length) {
+    out.push('"');
+    i2++;
+  }
+  return i2;
+}
+function stripTrailingCommas(data) {
+  const result = [];
+  let i2 = 0;
+  while (i2 < data.length) {
+    if (data[i2] === '"') {
+      i2 = copyStringLiteral(data, i2, result);
+      continue;
+    }
+    if (data[i2] === ",") {
+      let j = i2 + 1;
+      while (j < data.length && /\s/.test(data[j]))
+        j++;
+      if (data[j] === "}" || data[j] === "]") {
+        i2++;
+        continue;
+      }
+    }
+    result.push(data[i2]);
+    i2++;
+  }
+  return result.join("");
+}
 function saveJSONConfig(path3, cfg) {
   writeSecureFile(path3, JSON.stringify(cfg, null, 2));
 }
@@ -10330,7 +10361,7 @@ function isJSONKeyConfigured(configPath, topLevelKey) {
   return "dosu" in section;
 }
 function installJSONServer(configPath, topKey, server) {
-  const jsonCfg = loadJSONConfig(configPath);
+  const jsonCfg = readJSONConfig(configPath);
   let section = jsonCfg[topKey];
   if (typeof section !== "object" || section === null) {
     section = {};
@@ -10342,18 +10373,19 @@ function installJSONServer(configPath, topKey, server) {
 function removeJSONServer(configPath, topKey) {
   let jsonCfg;
   try {
-    jsonCfg = loadJSONConfig(configPath);
+    jsonCfg = readJSONConfig(configPath);
   } catch {
     return;
   }
   const section = jsonCfg[topKey];
-  if (typeof section === "object" && section !== null) {
-    delete section.dosu;
-  }
+  if (typeof section !== "object" || section === null || !("dosu" in section))
+    return;
+  delete section.dosu;
   saveJSONConfig(configPath, jsonCfg);
 }
 var import_write_file_atomic, writeFileAtomic, MCP_REMOTE_VERSION = "0.1.38";
 var init_config_helpers = __esm(() => {
+  init_config();
   import_write_file_atomic = __toESM(require_lib(), 1);
   writeFileAtomic = import_write_file_atomic.default;
 });
@@ -10404,16 +10436,6 @@ var init_detect = () => {};
 
 // src/mcp/providers/base.ts
 function createJSONProvider(opts) {
-  const defaultBuildServer = (cfg) => ({
-    type: "http",
-    url: mcpURL(cfg.active_account.target.deployment_id),
-    headers: mcpHeaders(cfg.active_account?.target?.api_key)
-  });
-  const defaultBuildOSSServer = (cfg) => ({
-    type: "http",
-    url: mcpBaseURL(),
-    headers: mcpHeaders(cfg.active_account?.target?.api_key)
-  });
   const buildServer = opts.buildServer ?? defaultBuildServer;
   return {
     name: () => opts.providerName,
@@ -10425,8 +10447,10 @@ function createJSONProvider(opts) {
     globalConfigPath: () => expandHome(opts.globalPath),
     isConfigured: () => isJSONKeyConfigured(expandHome(opts.globalPath), opts.topKey),
     install(cfg, global) {
-      if (cfg.mode !== MODE_OSS && !cfg.active_account?.target?.deployment_id)
-        throw new Error("deployment ID is required");
+      const endpoint = {
+        url: mcpEndpoint(cfg),
+        headers: mcpHeaders(cfg.active_account?.target?.api_key)
+      };
       let configPath;
       if (global) {
         configPath = expandHome(opts.globalPath);
@@ -10435,8 +10459,7 @@ function createJSONProvider(opts) {
       } else {
         throw new Error(`${opts.providerName} does not support local installation`);
       }
-      const serverBuilder = cfg.mode === MODE_OSS ? defaultBuildOSSServer : buildServer;
-      installJSONServer(configPath, opts.topKey, serverBuilder(cfg));
+      installJSONServer(configPath, opts.topKey, buildServer(endpoint, cfg));
     },
     remove(global) {
       let configPath;
@@ -10451,8 +10474,12 @@ function createJSONProvider(opts) {
     }
   };
 }
+var defaultBuildServer = ({ url, headers }) => ({
+  type: "http",
+  url,
+  headers
+});
 var init_base = __esm(() => {
-  init_config();
   init_config_helpers();
   init_detect();
 });
@@ -10466,13 +10493,12 @@ var AntigravityProvider = () => createJSONProvider({
   paths: ["~/.gemini"],
   globalPath: "~/.gemini/antigravity/mcp_config.json",
   topKey: "mcpServers",
-  buildServer: (cfg) => ({
-    serverUrl: mcpURL(cfg.active_account.target.deployment_id),
-    headers: mcpHeaders(cfg.active_account.target.api_key)
+  buildServer: ({ url, headers }) => ({
+    serverUrl: url,
+    headers
   })
 });
 var init_antigravity = __esm(() => {
-  init_config_helpers();
   init_base();
 });
 
@@ -10509,9 +10535,7 @@ var ClaudeDesktopProvider = () => ({
   install(cfg, global) {
     if (!global)
       throw new Error("Claude Desktop does not support local installation");
-    if (cfg.mode !== MODE_OSS && !cfg.active_account?.target?.deployment_id)
-      throw new Error("deployment ID is required");
-    const url = cfg.mode === MODE_OSS ? mcpBaseURL() : mcpURL(cfg.active_account.target.deployment_id);
+    const url = mcpEndpoint(cfg);
     const npx = findNpx();
     const remote = mcpRemoteServer(url, cfg.active_account?.target?.api_key);
     installJSONServer(configPath(), "mcpServers", {
@@ -10527,7 +10551,6 @@ var ClaudeDesktopProvider = () => ({
   }
 });
 var init_claude_desktop = __esm(() => {
-  init_config();
   init_config_helpers();
   init_detect();
 });
@@ -10542,15 +10565,14 @@ var extensionDir = () => join11(appSupportDir(), "Code", "User", "globalStorage"
   paths: [extensionDir()],
   globalPath: join11(extensionDir(), "settings", "cline_mcp_settings.json"),
   topKey: "mcpServers",
-  buildServer: (cfg) => ({
-    url: mcpURL(cfg.active_account.target.deployment_id),
+  buildServer: ({ url, headers }) => ({
+    url,
     type: "streamableHttp",
     disabled: false,
-    headers: mcpHeaders(cfg.active_account.target.api_key)
+    headers
   })
 });
 var init_cline = __esm(() => {
-  init_config_helpers();
   init_detect();
   init_base();
 });
@@ -10568,15 +10590,14 @@ var ClineCliProvider = () => createJSONProvider({
   paths: [clineDir()],
   globalPath: join12(clineDir(), "data", "settings", "cline_mcp_settings.json"),
   topKey: "mcpServers",
-  buildServer: (cfg) => ({
-    url: mcpURL(cfg.active_account.target.deployment_id),
+  buildServer: ({ url, headers }) => ({
+    url,
     type: "streamableHttp",
     disabled: false,
-    headers: mcpHeaders(cfg.active_account.target.api_key)
+    headers
   })
 });
 var init_cline_cli = __esm(() => {
-  init_config_helpers();
   init_detect();
   init_base();
 });
@@ -10600,13 +10621,6 @@ function readTOML(path3) {
 function writeTOML(path3, content) {
   writeSecureFile(path3, content);
 }
-function mcpEndpoint(cfg) {
-  if (cfg.mode === MODE_OSS)
-    return mcpBaseURL();
-  if (!cfg.active_account?.target?.deployment_id)
-    throw new Error("deployment ID is required");
-  return mcpURL(cfg.active_account?.target?.deployment_id);
-}
 function tomlString(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 }
@@ -10689,13 +10703,6 @@ function globalPath() {
   }
   return expandHome("~/.copilot/mcp-config.json");
 }
-function mcpEndpoint2(cfg) {
-  if (cfg.mode === MODE_OSS)
-    return mcpBaseURL();
-  if (!cfg.active_account?.target?.deployment_id)
-    throw new Error("deployment ID is required");
-  return mcpURL(cfg.active_account?.target?.deployment_id);
-}
 var CopilotProvider = () => ({
   name: () => "GitHub Copilot CLI",
   id: () => "copilot",
@@ -10706,7 +10713,7 @@ var CopilotProvider = () => ({
   globalConfigPath: () => globalPath(),
   isConfigured: () => isJSONKeyConfigured(globalPath(), "mcpServers"),
   install(cfg, global) {
-    const url = mcpEndpoint2(cfg);
+    const url = mcpEndpoint(cfg);
     if (global) {
       const server = {
         type: "http",
@@ -10735,7 +10742,6 @@ var CopilotProvider = () => ({
   }
 });
 var init_copilot = __esm(() => {
-  init_config();
   init_config_helpers();
   init_detect();
 });
@@ -10750,14 +10756,13 @@ var CursorProvider = () => createJSONProvider({
   paths: ["~/.cursor"],
   globalPath: "~/.cursor/mcp.json",
   topKey: "mcpServers",
-  buildServer: (cfg) => ({
-    url: mcpURL(cfg.active_account.target.deployment_id),
-    headers: mcpHeaders(cfg.active_account.target.api_key)
+  buildServer: ({ url, headers }) => ({
+    url,
+    headers
   }),
   localConfigPath: (cwd) => join15(cwd, ".cursor", "mcp.json")
 });
 var init_cursor = __esm(() => {
-  init_config_helpers();
   init_base();
 });
 
@@ -10794,13 +10799,6 @@ var init_gemini = __esm(() => {
 });
 
 // src/mcp/providers/manual.ts
-function mcpEndpoint3(cfg) {
-  if (cfg.mode === MODE_OSS)
-    return mcpBaseURL();
-  if (!cfg.active_account?.target?.deployment_id)
-    throw new Error("deployment ID is required");
-  return mcpURL(cfg.active_account?.target?.deployment_id);
-}
 function maskSecret(secret) {
   if (secret.length <= 8)
     return "[hidden]";
@@ -10812,7 +10810,7 @@ var ManualProvider = () => ({
   id: () => "manual",
   supportsLocal: () => false,
   install(cfg, _global, opts = {}) {
-    const url = mcpEndpoint3(cfg);
+    const url = mcpEndpoint(cfg);
     const apiKey = mcpHeaders(cfg.active_account?.target?.api_key)["X-Dosu-API-Key"];
     const headerValue = opts.showSecret ? apiKey : maskSecret(apiKey);
     console.log("Use these details to configure the Dosu MCP server in your client:");
@@ -10832,7 +10830,6 @@ To remove the Dosu MCP server, manually delete the configuration from your clien
   }
 });
 var init_manual = __esm(() => {
-  init_config();
   init_config_helpers();
 });
 
@@ -10848,13 +10845,6 @@ function resolveGlobalConfigPath() {
     return jsoncPath;
   return jsonPath;
 }
-function mcpEndpoint4(cfg) {
-  if (cfg.mode === MODE_OSS)
-    return mcpBaseURL();
-  if (!cfg.active_account?.target?.deployment_id)
-    throw new Error("deployment ID is required");
-  return mcpURL(cfg.active_account?.target?.deployment_id);
-}
 var MCPorterProvider = () => ({
   name: () => "MCPorter",
   id: () => "mcporter",
@@ -10868,7 +10858,7 @@ var MCPorterProvider = () => ({
     const configPath2 = global ? resolveGlobalConfigPath() : join18(process.cwd(), "config", "mcporter.json");
     const server = {
       type: "http",
-      url: mcpEndpoint4(cfg),
+      url: mcpEndpoint(cfg),
       headers: mcpHeaders(cfg.active_account.target.api_key)
     };
     installJSONServer(configPath2, "mcpServers", server);
@@ -10879,7 +10869,6 @@ var MCPorterProvider = () => ({
   }
 });
 var init_mcporter = __esm(() => {
-  init_config();
   init_config_helpers();
   init_detect();
 });
@@ -10894,16 +10883,15 @@ var OpenCodeProvider = () => createJSONProvider({
   paths: ["~/.config/opencode"],
   globalPath: "~/.config/opencode/opencode.json",
   topKey: "mcp",
-  buildServer: (cfg) => ({
+  buildServer: ({ url, headers }) => ({
     type: "remote",
-    url: mcpURL(cfg.active_account.target.deployment_id),
+    url,
     enabled: true,
-    headers: mcpHeaders(cfg.active_account.target.api_key)
+    headers
   }),
   localConfigPath: (cwd) => join19(cwd, "opencode.json")
 });
 var init_opencode = __esm(() => {
-  init_config_helpers();
   init_base();
 });
 
@@ -10941,30 +10929,73 @@ var init_windsurf = __esm(() => {
 });
 
 // src/mcp/providers/zed.ts
-import { platform as platform3 } from "node:os";
+import { rmSync as rmSync2 } from "node:fs";
+import { homedir as homedir4, platform as platform3 } from "node:os";
 import { join as join22 } from "node:path";
 function zedConfigDir() {
   const os2 = platform3();
-  if (os2 === "darwin" || os2 === "win32")
+  if (os2 === "win32")
     return join22(appSupportDir(), "Zed");
+  if (os2 === "darwin")
+    return join22(homedir4(), ".config", "zed");
   return join22(appSupportDir(), "zed");
 }
-var ZedProvider = () => createJSONProvider({
-  providerName: "Zed",
-  providerID: "zed",
-  local: true,
-  priorityValue: 10,
-  paths: [zedConfigDir()],
-  globalPath: join22(zedConfigDir(), "settings.json"),
-  topKey: "context_servers",
-  buildServer: (cfg) => ({
-    source: "custom",
-    type: "http",
-    url: mcpURL(cfg.active_account.target.deployment_id),
-    headers: mcpHeaders(cfg.active_account.target.api_key)
-  }),
-  localConfigPath: (cwd) => join22(cwd, ".zed", "settings.json")
-});
+function zedDataDir() {
+  const os2 = platform3();
+  if (os2 === "darwin")
+    return join22(appSupportDir(), "Zed");
+  if (os2 === "win32")
+    return join22(process.env.LOCALAPPDATA ?? "", "Zed");
+  return join22(process.env.XDG_DATA_HOME ?? join22(homedir4(), ".local", "share"), "zed");
+}
+function legacyDarwinSettingsPath() {
+  return platform3() === "darwin" ? join22(appSupportDir(), "Zed", "settings.json") : null;
+}
+function removeLegacyDosuEntry(path3) {
+  let cfg;
+  try {
+    cfg = readJSONConfig(path3);
+  } catch {
+    return;
+  }
+  const servers = cfg.context_servers;
+  if (typeof servers !== "object" || servers === null || !("dosu" in servers))
+    return;
+  delete servers.dosu;
+  const nothingElse = Object.keys(cfg).length === 1 && Object.keys(servers).length === 0;
+  if (nothingElse)
+    rmSync2(path3, { force: true });
+  else
+    saveJSONConfig(path3, cfg);
+}
+var ZedProvider = (legacyPath = legacyDarwinSettingsPath()) => {
+  const provider = createJSONProvider({
+    providerName: "Zed",
+    providerID: "zed",
+    local: true,
+    priorityValue: 10,
+    paths: [zedConfigDir(), zedDataDir()],
+    globalPath: join22(zedConfigDir(), "settings.json"),
+    topKey: "context_servers",
+    buildServer: ({ url, headers }) => ({ url, headers }),
+    localConfigPath: (cwd) => join22(cwd, ".zed", "settings.json")
+  });
+  if (!legacyPath)
+    return provider;
+  return {
+    ...provider,
+    install(cfg, global) {
+      provider.install(cfg, global);
+      if (global)
+        removeLegacyDosuEntry(legacyPath);
+    },
+    remove(global) {
+      provider.remove(global);
+      if (global)
+        removeLegacyDosuEntry(legacyPath);
+    }
+  };
+};
 var init_zed = __esm(() => {
   init_config_helpers();
   init_detect();
@@ -11023,13 +11054,13 @@ var init_providers = __esm(() => {
 
 // src/rules/installer.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync10, unlinkSync as unlinkSync2, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 import { dirname as dirname4, join as join23 } from "node:path";
 function claudeConfigDir() {
-  return process.env.CLAUDE_CONFIG_DIR || join23(homedir4(), ".claude");
+  return process.env.CLAUDE_CONFIG_DIR || join23(homedir5(), ".claude");
 }
 function codexHome2() {
-  return process.env.CODEX_HOME || join23(homedir4(), ".codex");
+  return process.env.CODEX_HOME || join23(homedir5(), ".codex");
 }
 function isRuleAgent(agent) {
   return Object.hasOwn(RULE_TARGETS, agent);
@@ -11175,7 +11206,7 @@ var init_installer = __esm(() => {
     },
     cursor: {
       kind: "file",
-      path: () => join23(homedir4(), ".cursor", "rules", "dosu.mdc"),
+      path: () => join23(homedir5(), ".cursor", "rules", "dosu.mdc"),
       cursorFrontmatter: true
     },
     codex: {
@@ -11184,15 +11215,15 @@ var init_installer = __esm(() => {
     },
     opencode: {
       kind: "section",
-      path: () => join23(homedir4(), ".config", "opencode", "AGENTS.md")
+      path: () => join23(homedir5(), ".config", "opencode", "AGENTS.md")
     },
     gemini: {
       kind: "section",
-      path: () => join23(homedir4(), ".gemini", "GEMINI.md")
+      path: () => join23(homedir5(), ".gemini", "GEMINI.md")
     },
     antigravity: {
       kind: "section",
-      path: () => join23(homedir4(), ".gemini", "GEMINI.md")
+      path: () => join23(homedir5(), ".gemini", "GEMINI.md")
     }
   };
 });
@@ -11444,7 +11475,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 = "222d1353-0757-fab1-6475-6e2164756e21";
 
 // src/telemetry/telemetry.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
@@ -11473,11 +11504,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 +11530,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 +11682,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 +11700,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 +11818,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 +12017,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 +12049,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 +12059,7 @@ function createCommandTelemetry(settings2, dependencies = {}) {
     } catch {
       resolvedInstallId = undefined;
     }
-    return validInstallId(resolvedInstallId) ? resolvedInstallId : undefined;
+    return isUUID2(resolvedInstallId) ? resolvedInstallId : undefined;
   }
   function debugPayload(payload) {
     try {
@@ -12211,7 +12250,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 +12273,7 @@ async function trackCliOnboardingPreAuthEvent(onboardingRunID, event, properties
       return;
     if (!analyticsReleaseEnabled())
       return;
-    if (!isUUID2(onboardingRunID))
+    if (!isUUID3(onboardingRunID))
       return;
     const input = {
       event,
@@ -12267,13 +12306,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 +12356,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) {
@@ -12488,7 +12528,7 @@ var init_agent_kickoff = __esm(() => {
 
 // src/setup/logs-handoff.ts
 import { existsSync as existsSync15, readdirSync, statSync as statSync3 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
+import { homedir as homedir6 } from "node:os";
 import { join as join26 } from "node:path";
 function countJsonlFiles(root, cap = COUNT_CAP) {
   if (!existsSync15(root))
@@ -12518,7 +12558,7 @@ function countJsonlFiles(root, cap = COUNT_CAP) {
   }
   return { count, capped: false };
 }
-function detectLogSources(home = process.env.HOME || homedir5()) {
+function detectLogSources(home = process.env.HOME || homedir6()) {
   const roots = {
     cursor: join26(home, ".cursor", "projects"),
     claude: join26(home, ".claude", "projects"),
@@ -17489,7 +17529,7 @@ init_skill();
 var import_picocolors26 = __toESM(require_picocolors(), 1);
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { realpathSync } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { posix, win32 } from "node:path";
 var PACKAGE_NAME = "@dosu/cli";
 var LATEST_PACKAGE = `${PACKAGE_NAME}@latest`;
@@ -17566,7 +17606,7 @@ function packageRoots(manager, platform4, comSpec, env, cwd) {
     manager === "npm" ? path3.join(lines[0], "@dosu", "cli") : path3.join(lines[0], "node_modules", "@dosu", "cli")
   ];
 }
-function owningPackageManager(entrypoint, platform4, comSpec, env = process.env, cwd = homedir6()) {
+function owningPackageManager(entrypoint, platform4, comSpec, env = process.env, cwd = homedir7()) {
   const path3 = platform4 === "win32" ? win32 : posix;
   if (!entrypoint || !path3.isAbsolute(entrypoint))
     return null;
@@ -17619,7 +17659,7 @@ Or install Dosu globally with your package manager:`);
 function runUpgrade(channel = INSTALL_CHANNEL, options = {}) {
   const platform4 = options.platform ?? process.platform;
   const env = options.env ?? process.env;
-  const cwd = options.cwd ?? homedir6();
+  const cwd = options.cwd ?? homedir7();
   let manager = null;
   if (channel === "npm") {
     if (isNpxInvocation(channel, env)) {
@@ -17870,10 +17910,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 +18381,4 @@ execute().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=61606b23-6c2b-78a9-6475-6e2164756e21
+//# debugId=222d1353-0757-fab1-6475-6e2164756e21

package/package.json

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