@dosu/cli 0.59.0 → 0.60.1

package/README.md

@@ -206,10 +206,12 @@ installation history is never aliased to an account. Setup-funnel events are lin
 and may include documented coarse setup choices. `DO_NOT_TRACK=1` and
 `DOSU_TELEMETRY_DISABLED=1` disable all telemetry for the process. Dosu never collects
 prompts, raw command lines, free-form argument or option values, user source code, file contents,
-local paths, raw environment-variable names or values, credentials, raw error messages, or
-`debug.log`. See
-[Telemetry and privacy](docs/telemetry.md) for the exact event fields, destinations, retention, and
-controls.
+local paths, credentials, raw error messages, or `debug.log`. Environment-variable names and values
+are not collected, with one exception: when a managed Claude Code settings conflict prevents a
+study run, Dosu reports the allowlisted public Claude Code setting/variable names that caused the
+conflict (never their values) to help diagnose why knowledge sync fails due to settings conflicts.
+See [Telemetry and privacy](docs/telemetry.md) for the exact event fields, destinations, retention,
+and controls.
 
 ## Configuration
 

package/bin/dosu.js

@@ -1083,7 +1083,7 @@ function isNpxInvocation(channel = INSTALL_CHANNEL, env = process.env) {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.59.0", INSTALL_CHANNEL = "npm";
+var VERSION = "0.60.1", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -13741,12 +13741,70 @@ var init_sync = __esm(() => {
   init_watermark();
 });
 
+// src/learner/conflicts.ts
+import { existsSync as existsSync13, readFileSync as readFileSync15 } from "node:fs";
+function managedSettingsPaths(platform = process.platform) {
+  switch (platform) {
+    case "darwin":
+      return ["/Library/Application Support/ClaudeCode/managed-settings.json"];
+    case "win32":
+      return ["C:\\ProgramData\\ClaudeCode\\managed-settings.json"];
+    default:
+      return ["/etc/claude-code/managed-settings.json"];
+  }
+}
+function conflictingKeysIn(settings) {
+  const keys = [];
+  for (const key of CONFLICTING_KEYS) {
+    if (key in settings)
+      keys.push(key);
+  }
+  const env = settings.env;
+  if (typeof env === "object" && env !== null && !Array.isArray(env)) {
+    for (const name of Object.keys(env)) {
+      if (CONFLICTING_ENV_PREFIXES.some((p) => name.startsWith(p)))
+        keys.push(`env.${name}`);
+    }
+  }
+  return keys;
+}
+function detectSettingsConflicts(paths = managedSettingsPaths()) {
+  const conflicts = [];
+  for (const file of paths) {
+    if (!existsSync13(file))
+      continue;
+    let settings;
+    try {
+      settings = JSON.parse(readFileSync15(file, "utf8"));
+    } catch {
+      conflicts.push({ file, keys: [UNREADABLE_SETTINGS_KEY] });
+      continue;
+    }
+    if (typeof settings !== "object" || settings === null)
+      continue;
+    const keys = conflictingKeysIn(settings);
+    if (keys.length > 0)
+      conflicts.push({ file, keys });
+  }
+  return conflicts;
+}
+var CONFLICTING_KEYS, CONFLICTING_ENV_PREFIXES, UNREADABLE_SETTINGS_KEY = "<unreadable or invalid JSON>";
+var init_conflicts = __esm(() => {
+  CONFLICTING_KEYS = [
+    "apiKeyHelper",
+    "forceLoginMethod",
+    "awsAuthRefresh",
+    "awsCredentialExport"
+  ];
+  CONFLICTING_ENV_PREFIXES = ["ANTHROPIC_", "CLAUDE_CODE_", "AWS_"];
+});
+
 // src/telemetry/debug-id.ts
-var BUNDLE_DEBUG_ID_PLACEHOLDER = "ecb91fd5-693a-ffc0-6475-6e2164756e21";
+var BUNDLE_DEBUG_ID_PLACEHOLDER = "9d93d312-f9af-7e47-6475-6e2164756e21";
 
 // src/telemetry/telemetry.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { existsSync as existsSync13 } from "node:fs";
+import { existsSync as existsSync14 } from "node:fs";
 import { request as httpRequest2 } from "node:http";
 import { request as httpsRequest } from "node:https";
 import { isAbsolute, relative, resolve as resolve2, sep } from "node:path";
@@ -13884,7 +13942,7 @@ function parseOwnedStackLine(originalLine, packageRoot) {
     return;
   }
   try {
-    if (!existsSync13(resolvedPath))
+    if (!existsSync14(resolvedPath))
       return;
   } catch {
     return;
@@ -13970,6 +14028,29 @@ function allowlisted(value, allowed) {
 function matching(value, pattern) {
   return typeof value === "string" && pattern.test(value) ? value : undefined;
 }
+function conflictKeysFacet(value) {
+  if (!Array.isArray(value))
+    return;
+  const keys = new Set;
+  for (const raw of value) {
+    if (typeof raw !== "string")
+      continue;
+    if (SETTINGS_CONFLICT_KEYS.has(raw))
+      keys.add(raw);
+    else if (raw === UNREADABLE_SETTINGS_KEY)
+      keys.add("unreadable");
+    else
+      keys.add(SETTINGS_CONFLICT_FAMILIES.find(([p]) => raw.startsWith(p))?.[1] ?? "other");
+  }
+  let joined = "";
+  for (const key of [...keys].sort()) {
+    const next = joined ? `${joined},${key}` : key;
+    if (next.length > MAX_CONFLICT_KEYS_LENGTH)
+      break;
+    joined = next;
+  }
+  return joined || undefined;
+}
 function sanitizeFacets(facets) {
   if (!facets || typeof facets !== "object")
     return {};
@@ -13977,6 +14058,7 @@ function sanitizeFacets(facets) {
   const status = allowlisted(facets.sync_status, SYNC_STATUSES);
   const learner = allowlisted(facets.learner_outcome, LEARNER_OUTCOMES);
   const gatewayReason = allowlisted(facets.gateway_reason, GATEWAY_REASONS);
+  const conflictKeys = conflictKeysFacet(facets.settings_conflict_keys);
   const claudeSource = allowlisted(facets.claude_code_source, CLAUDE_CODE_SOURCES);
   const claudeVersion = matching(facets.claude_code_version, CLAUDE_CODE_VERSION_PATTERN);
   const model = matching(facets.learner_model, LEARNER_MODEL_PATTERN);
@@ -13988,6 +14070,7 @@ function sanitizeFacets(facets) {
     ...facets.notes_written !== undefined ? { notes_written: countBucket(facets.notes_written) } : {},
     ...learner ? { learner_outcome: learner } : {},
     ...gatewayReason ? { gateway_reason: gatewayReason } : {},
+    ...conflictKeys ? { settings_conflict_keys: conflictKeys } : {},
     ...claudeSource ? { claude_code_source: claudeSource } : {},
     ...claudeVersion ? { claude_code_version: claudeVersion } : {},
     ...model ? { learner_model: model } : {},
@@ -14115,7 +14198,8 @@ function exceptionSummary(command, error, facets) {
   const outcome = facets.learner_outcome ?? facets.sync_status;
   if (!outcome)
     return error.code ?? error.type;
-  return `${command}: ${outcome}${facets.gateway_reason ? ` (${facets.gateway_reason})` : ""}`;
+  const detail = facets.gateway_reason ?? facets.settings_conflict_keys;
+  return `${command}: ${outcome}${detail ? ` (${detail})` : ""}`;
 }
 function buildSentryEnvelope(input) {
   const parsedDsn = parseSentryDsn(input.dsn);
@@ -14517,8 +14601,9 @@ function createCommandTelemetry(settings, dependencies = {}) {
 function shouldSendToSentry(error) {
   return !["SESSION_EXPIRED", "SESSION_PERSISTENCE_ERROR"].includes(error.code ?? "");
 }
-var REQUEST_TIMEOUT_MS = 500, MAX_RESPONSE_BYTES, MAX_STACK_FRAMES = 20, UNKNOWN_COMMAND = "unknown", FALLBACK_INSTALL_ID = "00000000-0000-4000-8000-000000000000", BUNDLE_CODE_FILE = "app:///bin/dosu.js", CLI_PACKAGE_ROOT, SAFE_ERROR_TYPES, SAFE_ERROR_CODES, SYNC_TRIGGERS, SYNC_STATUSES, LEARNER_OUTCOMES, GATEWAY_REASONS, CLAUDE_CODE_SOURCES, CLAUDE_CODE_VERSION_PATTERN, LEARNER_MODEL_PATTERN, BACKFILL_OFFERS, SENTRY_FACET_TAGS, pendingFacets;
+var REQUEST_TIMEOUT_MS = 500, MAX_RESPONSE_BYTES, MAX_STACK_FRAMES = 20, UNKNOWN_COMMAND = "unknown", FALLBACK_INSTALL_ID = "00000000-0000-4000-8000-000000000000", BUNDLE_CODE_FILE = "app:///bin/dosu.js", CLI_PACKAGE_ROOT, SAFE_ERROR_TYPES, SAFE_ERROR_CODES, SYNC_TRIGGERS, SYNC_STATUSES, LEARNER_OUTCOMES, GATEWAY_REASONS, CLAUDE_CODE_SOURCES, SETTINGS_CONFLICT_KEYS, SETTINGS_CONFLICT_FAMILIES, MAX_CONFLICT_KEYS_LENGTH = 200, CLAUDE_CODE_VERSION_PATTERN, LEARNER_MODEL_PATTERN, BACKFILL_OFFERS, SENTRY_FACET_TAGS, pendingFacets;
 var init_telemetry = __esm(() => {
+  init_conflicts();
   MAX_RESPONSE_BYTES = 1024 * 1024;
   CLI_PACKAGE_ROOT = detectCliPackageRoot();
   SAFE_ERROR_TYPES = new Set([
@@ -14623,6 +14708,11 @@ var init_telemetry = __esm(() => {
     "quota_exceeded",
     "gateway_rejected",
     "claude_code_missing",
+    "max_turns",
+    "run_failed",
+    "no_result",
+    "timed_out",
+    "sdk_error",
     "error"
   ]);
   GATEWAY_REASONS = new Set([
@@ -14635,6 +14725,58 @@ var init_telemetry = __esm(() => {
     "other"
   ]);
   CLAUDE_CODE_SOURCES = new Set(["sdk", "system", "missing"]);
+  SETTINGS_CONFLICT_KEYS = new Set([
+    "apiKeyHelper",
+    "forceLoginMethod",
+    "awsAuthRefresh",
+    "awsCredentialExport",
+    "env.ANTHROPIC_API_KEY",
+    "env.ANTHROPIC_AUTH_TOKEN",
+    "env.ANTHROPIC_BASE_URL",
+    "env.ANTHROPIC_CUSTOM_HEADERS",
+    "env.ANTHROPIC_MODEL",
+    "env.ANTHROPIC_SMALL_FAST_MODEL",
+    "env.ANTHROPIC_DEFAULT_OPUS_MODEL",
+    "env.ANTHROPIC_DEFAULT_SONNET_MODEL",
+    "env.ANTHROPIC_DEFAULT_HAIKU_MODEL",
+    "env.ANTHROPIC_BEDROCK_BASE_URL",
+    "env.ANTHROPIC_VERTEX_BASE_URL",
+    "env.ANTHROPIC_VERTEX_PROJECT_ID",
+    "env.ANTHROPIC_FOUNDRY_BASE_URL",
+    "env.ANTHROPIC_FOUNDRY_API_KEY",
+    "env.ANTHROPIC_AWS_BASE_URL",
+    "env.ANTHROPIC_BEDROCK_MANTLE_BASE_URL",
+    "env.ANTHROPIC_AWS_API_KEY",
+    "env.ANTHROPIC_PROFILE",
+    "env.ANTHROPIC_ENVIRONMENT_KEY",
+    "env.ANTHROPIC_IDENTITY_TOKEN",
+    "env.ANTHROPIC_FEDERATION_RULE_ID",
+    "env.ANTHROPIC_SERVICE_ACCOUNT_ID",
+    "env.CLAUDE_CODE_USE_BEDROCK",
+    "env.CLAUDE_CODE_USE_VERTEX",
+    "env.CLAUDE_CODE_USE_FOUNDRY",
+    "env.CLAUDE_CODE_USE_MANTLE",
+    "env.CLAUDE_CODE_USE_ANTHROPIC_AWS",
+    "env.CLAUDE_CODE_OAUTH_TOKEN",
+    "env.CLAUDE_CODE_API_BASE_URL",
+    "env.CLAUDE_CODE_SKIP_BEDROCK_AUTH",
+    "env.CLAUDE_CODE_SKIP_VERTEX_AUTH",
+    "env.CLAUDE_CODE_API_KEY_HELPER_TTL_MS",
+    "env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC",
+    "env.CLAUDE_CODE_ENABLE_TELEMETRY",
+    "env.CLAUDE_CODE_MAX_OUTPUT_TOKENS",
+    "env.AWS_REGION",
+    "env.AWS_PROFILE",
+    "env.AWS_BEARER_TOKEN_BEDROCK",
+    "env.AWS_ACCESS_KEY_ID",
+    "env.AWS_SECRET_ACCESS_KEY",
+    "env.AWS_SESSION_TOKEN"
+  ]);
+  SETTINGS_CONFLICT_FAMILIES = [
+    ["env.ANTHROPIC_", "env.ANTHROPIC_other"],
+    ["env.CLAUDE_CODE_", "env.CLAUDE_CODE_other"],
+    ["env.AWS_", "env.AWS_other"]
+  ];
   CLAUDE_CODE_VERSION_PATTERN = /^\d{1,4}\.\d{1,4}\.\d{1,6}(?:-[0-9A-Za-z]{1,16}(?:\.[0-9A-Za-z]{1,16}){0,3})?$/;
   LEARNER_MODEL_PATTERN = /^claude-[a-z0-9.-]{1,56}$/;
   BACKFILL_OFFERS = new Set([
@@ -14649,6 +14791,7 @@ var init_telemetry = __esm(() => {
     "sync_status",
     "learner_outcome",
     "gateway_reason",
+    "settings_conflict_keys",
     "claude_code_source",
     "claude_code_version",
     "learner_model"
@@ -14682,7 +14825,7 @@ var init_agent_select = __esm(() => {
 });
 
 // src/incognito/agents.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync9, readFileSync as readFileSync15, unlinkSync as unlinkSync2, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync16, unlinkSync as unlinkSync2, writeFileSync as writeFileSync10 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { dirname as dirname5, join as join13 } from "node:path";
 function withFrontmatter(body) {
@@ -14707,18 +14850,18 @@ function fileAgent(options) {
     commandPath,
     isEnabled: () => {
       const path = commandPath();
-      if (!existsSync14(path))
+      if (!existsSync15(path))
         return false;
       try {
-        return readFileSync15(path, "utf-8").includes(INCOGNITO_MARKER);
+        return readFileSync16(path, "utf-8").includes(INCOGNITO_MARKER);
       } catch {
         return false;
       }
     },
     enable: () => {
       const path = commandPath();
-      if (existsSync14(path)) {
-        if (readFileSync15(path, "utf-8") === content)
+      if (existsSync15(path)) {
+        if (readFileSync16(path, "utf-8") === content)
           return "unchanged";
         writeFileSync10(path, content, "utf-8");
         return "updated";
@@ -14729,7 +14872,7 @@ function fileAgent(options) {
     },
     disable: () => {
       const path = commandPath();
-      if (!existsSync14(path))
+      if (!existsSync15(path))
         return "not_found";
       unlinkSync2(path);
       return "removed";
@@ -15171,64 +15314,6 @@ function createRunConfigDir() {
 }
 var init_config_dir = () => {};
 
-// src/learner/conflicts.ts
-import { existsSync as existsSync15, readFileSync as readFileSync16 } from "node:fs";
-function managedSettingsPaths(platform = process.platform) {
-  switch (platform) {
-    case "darwin":
-      return ["/Library/Application Support/ClaudeCode/managed-settings.json"];
-    case "win32":
-      return ["C:\\ProgramData\\ClaudeCode\\managed-settings.json"];
-    default:
-      return ["/etc/claude-code/managed-settings.json"];
-  }
-}
-function conflictingKeysIn(settings) {
-  const keys = [];
-  for (const key of CONFLICTING_KEYS) {
-    if (key in settings)
-      keys.push(key);
-  }
-  const env = settings.env;
-  if (typeof env === "object" && env !== null && !Array.isArray(env)) {
-    for (const name of Object.keys(env)) {
-      if (CONFLICTING_ENV_PREFIXES.some((p) => name.startsWith(p)))
-        keys.push(`env.${name}`);
-    }
-  }
-  return keys;
-}
-function detectSettingsConflicts(paths = managedSettingsPaths()) {
-  const conflicts = [];
-  for (const file of paths) {
-    if (!existsSync15(file))
-      continue;
-    let settings;
-    try {
-      settings = JSON.parse(readFileSync16(file, "utf8"));
-    } catch {
-      conflicts.push({ file, keys: ["<unreadable or invalid JSON>"] });
-      continue;
-    }
-    if (typeof settings !== "object" || settings === null)
-      continue;
-    const keys = conflictingKeysIn(settings);
-    if (keys.length > 0)
-      conflicts.push({ file, keys });
-  }
-  return conflicts;
-}
-var CONFLICTING_KEYS, CONFLICTING_ENV_PREFIXES;
-var init_conflicts = __esm(() => {
-  CONFLICTING_KEYS = [
-    "apiKeyHelper",
-    "forceLoginMethod",
-    "awsAuthRefresh",
-    "awsCredentialExport"
-  ];
-  CONFLICTING_ENV_PREFIXES = ["ANTHROPIC_", "CLAUDE_CODE_", "AWS_"];
-});
-
 // src/learner/env.ts
 function isStripped(name) {
   return STRIPPED_NAMES.has(name) || STRIPPED_PREFIXES.some((p) => name.startsWith(p));
@@ -58365,7 +58450,8 @@ async function runLearner(options) {
       outcome: "settings_conflict",
       notesWritten: 0,
       turns: 0,
-      message: `Refusing to run: conflicting Claude Code settings would override the study run's auth (${detail})`
+      message: `Refusing to run: conflicting Claude Code settings would override the study run's auth (${detail})`,
+      conflictKeys: conflicts.flatMap((c) => c.keys)
     };
   }
   const gatewayURL = options.gatewayURL ?? getLlmGatewayURL();
@@ -58522,13 +58608,16 @@ async function runLearner(options) {
         }
         if (message.subtype !== "success" || message.is_error) {
           logger.debug("learner", `run ${runID} failed: ${text}`);
-          return finish("error", "Study run failed; see debug log for details.");
+          if (message.subtype === "error_max_turns") {
+            return finish("max_turns", "Study run hit its turn limit before finishing.");
+          }
+          return finish("run_failed", "Study run failed; see debug log for details.");
         }
         logger.debug("learner", `run ${runID} completed: ${turns} turns, ${notesWritten} suggested pages`);
         return finish("completed", text);
       }
     }
-    return finish("error", "Study run ended without a result.");
+    return finish("no_result", "Study run ended without a result.");
   } catch (error) {
     const text = error instanceof Error ? error.message : String(error);
     const gatewayError = classifyGatewayError(text) ?? classifyGatewayRejection(text);
@@ -58536,7 +58625,7 @@ async function runLearner(options) {
       return finish(gatewayError.outcome, gatewayError.message, gatewayError.reason);
     }
     logger.debug("learner", `run ${runID} threw: ${text}`);
-    return finish("error", abort.signal.aborted ? "Study run timed out and was aborted." : "Study run failed; see debug log for details.");
+    return abort.signal.aborted ? finish("timed_out", "Study run timed out and was aborted.") : finish("sdk_error", "Study run failed; see debug log for details.");
   } finally {
     clearTimeout(timer);
     configDir.cleanup();
@@ -58803,6 +58892,7 @@ function learnerFacets(learner) {
   return {
     learner_outcome: learner.outcome,
     ...learner.gatewayReason ? { gateway_reason: learner.gatewayReason } : {},
+    ...learner.conflictKeys ? { settings_conflict_keys: learner.conflictKeys } : {},
     ...learner.claudeCodeSource ? { claude_code_source: learner.claudeCodeSource } : {},
     ...learner.claudeCodeVersion ? { claude_code_version: learner.claudeCodeVersion } : {},
     ...learner.model ? { learner_model: learner.model } : {}
@@ -67761,4 +67851,4 @@ main().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=ecb91fd5-693a-ffc0-6475-6e2164756e21
+//# debugId=9d93d312-f9af-7e47-6475-6e2164756e21

package/package.json

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