@glasstrace/sdk 0.14.2 → 0.16.0

package/dist/cli/init.cjs

@@ -31,13 +31,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/tsup/assets/cjs_shims.js
-var init_cjs_shims = __esm({
-  "../../node_modules/tsup/assets/cjs_shims.js"() {
-    "use strict";
-  }
-});
-
 // src/cli/constants.ts
 function formatAgentName(name) {
   const displayNames = {
@@ -54,7 +47,6 @@ var MCP_ENDPOINT, NEXT_CONFIG_NAMES;
 var init_constants = __esm({
   "src/cli/constants.ts"() {
     "use strict";
-    init_cjs_shims();
     MCP_ENDPOINT = "https://api.glasstrace.dev/mcp";
     NEXT_CONFIG_NAMES = ["next.config.ts", "next.config.js", "next.config.mjs"];
   }
@@ -83,14 +75,14 @@ function injectRegisterGlasstrace(content) {
   const indentMatch = /\n([ \t]+)/.exec(afterBrace);
   const indent = indentMatch ? indentMatch[1] : "  ";
   const importLine = 'import { registerGlasstrace } from "@glasstrace/sdk";\n';
-  const hasGlasstraceImport = content.includes("@glasstrace/sdk");
+  const hasGlasstraceImport2 = content.includes("@glasstrace/sdk");
   const insertPoint = match.index + match[0].length;
   const callInjection = `
 ${indent}// Glasstrace must be registered before other instrumentation
 ${indent}registerGlasstrace();
 `;
   let modified;
-  if (hasGlasstraceImport) {
+  if (hasGlasstraceImport2) {
     const importRegex = /import\s*\{([^}]+)\}\s*from\s*["']@glasstrace\/sdk["']/;
     const importMatch = importRegex.exec(content);
     if (importMatch) {
@@ -122,8 +114,145 @@ ${indent}registerGlasstrace();
   }
   return { injected: true, content: modified };
 }
-async function scaffoldInstrumentation(projectRoot) {
-  const filePath = path.join(projectRoot, "instrumentation.ts");
+function resolveInstrumentationTarget(projectRoot) {
+  const rootExisting = [];
+  const srcExisting = [];
+  for (const name of INSTRUMENTATION_FILENAMES) {
+    const rootPath = path.join(projectRoot, name);
+    if (isRegularFile(rootPath)) {
+      rootExisting.push(rootPath);
+    }
+    const srcPath = path.join(projectRoot, "src", name);
+    if (isRegularFile(srcPath)) {
+      srcExisting.push(srcPath);
+    }
+  }
+  const existing = [...rootExisting, ...srcExisting];
+  if (rootExisting.length > 0 && srcExisting.length > 0) {
+    return {
+      target: null,
+      layout: null,
+      existing,
+      rootExisting,
+      srcExisting,
+      conflict: true
+    };
+  }
+  if (srcExisting.length > 0) {
+    return {
+      target: srcExisting[0],
+      layout: "src",
+      existing,
+      rootExisting,
+      srcExisting,
+      conflict: false
+    };
+  }
+  if (rootExisting.length > 0) {
+    return {
+      target: rootExisting[0],
+      layout: "root",
+      existing,
+      rootExisting,
+      srcExisting,
+      conflict: false
+    };
+  }
+  const srcDir = path.join(projectRoot, "src");
+  const layout = isDirectory(srcDir) ? "src" : "root";
+  const target = layout === "src" ? path.join(projectRoot, "src", "instrumentation.ts") : path.join(projectRoot, "instrumentation.ts");
+  return {
+    target,
+    layout,
+    existing,
+    rootExisting,
+    srcExisting,
+    conflict: false
+  };
+}
+function isDirectory(p) {
+  try {
+    return fs.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function isRegularFile(p) {
+  try {
+    const stat2 = fs.lstatSync(p);
+    if (stat2.isSymbolicLink()) {
+      return fs.statSync(p).isFile();
+    }
+    return stat2.isFile();
+  } catch {
+    return false;
+  }
+}
+function appendRegisterFunction(content) {
+  const importLine = 'import { registerGlasstrace } from "@glasstrace/sdk";\n';
+  const functionBlock = "\nexport async function register() {\n  // Glasstrace must be registered before Prisma instrumentation\n  // to ensure all ORM spans are captured correctly.\n  // If you use @prisma/instrumentation, import it after this call.\n  registerGlasstrace();\n}\n";
+  let withImport = content;
+  const hasGlasstraceImport2 = content.includes("@glasstrace/sdk");
+  if (!hasGlasstraceImport2) {
+    withImport = importLine + content;
+  } else {
+    const importRegex = /import\s*\{([^}]+)\}\s*from\s*["']@glasstrace\/sdk["']/;
+    const importMatch = importRegex.exec(content);
+    if (importMatch) {
+      const specifiers = importMatch[1];
+      const alreadyImported = specifiers.split(",").some((s) => s.trim() === "registerGlasstrace");
+      if (!alreadyImported) {
+        const existingImports = specifiers.trimEnd();
+        const separator = existingImports.endsWith(",") ? " " : ", ";
+        const updatedImport = `import { ${existingImports.trim()}${separator}registerGlasstrace } from "@glasstrace/sdk"`;
+        withImport = content.replace(importMatch[0], updatedImport);
+      }
+    } else {
+      withImport = importLine + content;
+    }
+  }
+  const trailingNewline = withImport.endsWith("\n") ? "" : "\n";
+  return withImport + trailingNewline + functionBlock;
+}
+async function defaultInstrumentationPrompt(question, defaultValue) {
+  if (!process.stdin.isTTY) return defaultValue;
+  const readline2 = await import("node:readline");
+  const rl = readline2.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve2) => {
+    const suffix = defaultValue ? " [Y/n] " : " [y/N] ";
+    rl.question(question + suffix, (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      if (trimmed === "") {
+        resolve2(defaultValue);
+        return;
+      }
+      resolve2(trimmed === "y" || trimmed === "yes");
+    });
+  });
+}
+async function scaffoldInstrumentation(projectRoot, options = {}) {
+  const target = resolveInstrumentationTarget(projectRoot);
+  if (target.conflict) {
+    return {
+      action: "conflict",
+      // Point the user at the `src/` variant — modern Next.js apps with a
+      // `src/` directory load from there, so that's the merge target. The
+      // competing path is reported separately for the error message.
+      filePath: target.srcExisting[0],
+      conflictingPath: target.rootExisting[0]
+    };
+  }
+  const filePath = target.target;
+  const layout = target.layout;
+  if (filePath === null || layout === null) {
+    return { action: "unrecognized" };
+  }
+  const force = options.force === true;
+  const prompt = options.prompt ?? defaultInstrumentationPrompt;
   if (!fs.existsSync(filePath)) {
     const content = `import { registerGlasstrace } from "@glasstrace/sdk";
 
@@ -134,19 +263,31 @@ export async function register() {
   registerGlasstrace();
 }
 `;
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, content, "utf-8");
-    return { action: "created" };
+    return { action: "created", filePath, layout };
   }
   const existing = fs.readFileSync(filePath, "utf-8");
   if (hasRegisterGlasstraceCall(existing)) {
-    return { action: "already-registered" };
+    return { action: "already-registered", filePath, layout };
+  }
+  if (!force) {
+    const approved = await prompt(
+      `Merge registerGlasstrace() into ${path.relative(projectRoot, filePath)}?`,
+      false
+    );
+    if (!approved) {
+      return { action: "skipped", filePath, layout };
+    }
   }
-  const result = injectRegisterGlasstrace(existing);
-  if (result.injected) {
-    fs.writeFileSync(filePath, result.content, "utf-8");
-    return { action: "injected" };
+  const injectResult = injectRegisterGlasstrace(existing);
+  if (injectResult.injected) {
+    fs.writeFileSync(filePath, injectResult.content, "utf-8");
+    return { action: "injected", filePath, layout };
   }
-  return { action: "unrecognized" };
+  const appended = appendRegisterFunction(existing);
+  fs.writeFileSync(filePath, appended, "utf-8");
+  return { action: "appended", filePath, layout };
 }
 async function scaffoldNextConfig(projectRoot) {
   let configPath;
@@ -230,6 +371,23 @@ function wrapCJSExport(content) {
     wrapped: true
   };
 }
+function readEnvLocalApiKey(content) {
+  let last = null;
+  const regex = /^\s*GLASSTRACE_API_KEY\s*=\s*(.*)$/gm;
+  let match;
+  while ((match = regex.exec(content)) !== null) {
+    const raw = match[1].trim();
+    if (raw === "") continue;
+    const unquoted = raw.replace(/^(['"])(.*)\1$/, "$2");
+    if (unquoted === "" || unquoted === "your_key_here") continue;
+    last = unquoted;
+  }
+  return last;
+}
+function isDevApiKey(value) {
+  if (value === null || value === void 0) return false;
+  return value.trim().startsWith("gt_dev_");
+}
 async function scaffoldEnvLocal(projectRoot) {
   const filePath = path.join(projectRoot, ".env.local");
   if (fs.existsSync(filePath)) {
@@ -281,6 +439,30 @@ async function scaffoldGitignore(projectRoot) {
   fs.writeFileSync(filePath, ".glasstrace/\n", "utf-8");
   return true;
 }
+function mcpConfigMatches(existingContent, expectedContent) {
+  const trimmedExpected = expectedContent.trim();
+  try {
+    const existingParsed = JSON.parse(existingContent);
+    const expectedParsed = JSON.parse(trimmedExpected);
+    return JSON.stringify(canonicalize(existingParsed)) === JSON.stringify(canonicalize(expectedParsed));
+  } catch {
+  }
+  return existingContent.trim() === trimmedExpected;
+}
+function canonicalize(value) {
+  if (Array.isArray(value)) {
+    return value.map(canonicalize);
+  }
+  if (value !== null && typeof value === "object") {
+    const obj = value;
+    const sorted = {};
+    for (const key of Object.keys(obj).sort()) {
+      sorted[key] = canonicalize(obj[key]);
+    }
+    return sorted;
+  }
+  return value;
+}
 async function scaffoldMcpMarker(projectRoot, anonKey) {
   const dirPath = path.join(projectRoot, ".glasstrace");
   const markerPath = path.join(dirPath, "mcp-connected");
@@ -304,15 +486,19 @@ async function scaffoldMcpMarker(projectRoot, anonKey) {
   fs.chmodSync(markerPath, 384);
   return true;
 }
-var import_node_crypto, fs, path;
+var import_node_crypto, fs, path, INSTRUMENTATION_FILENAMES;
 var init_scaffolder = __esm({
   "src/cli/scaffolder.ts"() {
     "use strict";
-    init_cjs_shims();
-    import_node_crypto = require("crypto");
-    fs = __toESM(require("fs"), 1);
-    path = __toESM(require("path"), 1);
+    import_node_crypto = require("node:crypto");
+    fs = __toESM(require("node:fs"), 1);
+    path = __toESM(require("node:path"), 1);
     init_constants();
+    INSTRUMENTATION_FILENAMES = [
+      "instrumentation.ts",
+      "instrumentation.js",
+      "instrumentation.mjs"
+    ];
   }
 });
 
@@ -378,7 +564,6 @@ var NEVER, $brand, $ZodAsyncError, $ZodEncodeError, globalConfig;
 var init_core = __esm({
   "../../node_modules/zod/v4/core/core.js"() {
     "use strict";
-    init_cjs_shims();
     NEVER = Object.freeze({
       status: "aborted"
     });
@@ -570,10 +755,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path8) {
-  if (!path8)
+function getElementAtPath(obj, path9) {
+  if (!path9)
     return obj;
-  return path8.reduce((acc, key) => acc?.[key], obj);
+  return path9.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -885,11 +1070,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path8, issues) {
+function prefixIssues(path9, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path8);
+    iss.path.unshift(path9);
     return iss;
   });
 }
@@ -1004,7 +1189,6 @@ var EVALUATING, captureStackTrace, allowsEval, getParsedType, propertyKeyTypes,
 var init_util = __esm({
   "../../node_modules/zod/v4/core/util.js"() {
     "use strict";
-    init_cjs_shims();
     EVALUATING = /* @__PURE__ */ Symbol("evaluating");
     captureStackTrace = "captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => {
     };
@@ -1133,7 +1317,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path8 = []) => {
+  const processError = (error49, path9 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -1143,7 +1327,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path8, ...issue2.path];
+        const fullpath = [...path9, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1175,8 +1359,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path8 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path8) {
+  const path9 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path9) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -1205,7 +1389,6 @@ var initializer, $ZodError, $ZodRealError;
 var init_errors = __esm({
   "../../node_modules/zod/v4/core/errors.js"() {
     "use strict";
-    init_cjs_shims();
     init_core();
     init_util();
     initializer = (inst, def) => {
@@ -1234,7 +1417,6 @@ var _parse, parse, _parseAsync, parseAsync, _safeParse, safeParse, _safeParseAsy
 var init_parse = __esm({
   "../../node_modules/zod/v4/core/parse.js"() {
     "use strict";
-    init_cjs_shims();
     init_core();
     init_errors();
     init_util();
@@ -1420,7 +1602,6 @@ var cuid, cuid2, ulid, xid, ksuid, nanoid, duration, extendedDuration, guid, uui
 var init_regexes = __esm({
   "../../node_modules/zod/v4/core/regexes.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     cuid = /^[cC][^\s-]{8,}$/;
     cuid2 = /^[0-9a-z]+$/;
@@ -1502,7 +1683,6 @@ var $ZodCheck, numericOriginMap, $ZodCheckLessThan, $ZodCheckGreaterThan, $ZodCh
 var init_checks = __esm({
   "../../node_modules/zod/v4/core/checks.js"() {
     "use strict";
-    init_cjs_shims();
     init_core();
     init_regexes();
     init_util();
@@ -2055,7 +2235,6 @@ var Doc;
 var init_doc = __esm({
   "../../node_modules/zod/v4/core/doc.js"() {
     "use strict";
-    init_cjs_shims();
     Doc = class {
       constructor(args = []) {
         this.content = [];
@@ -2098,7 +2277,6 @@ var version;
 var init_versions = __esm({
   "../../node_modules/zod/v4/core/versions.js"() {
     "use strict";
-    init_cjs_shims();
     version = {
       major: 4,
       minor: 3,
@@ -2469,7 +2647,6 @@ var $ZodType, $ZodString, $ZodStringFormat, $ZodGUID, $ZodUUID, $ZodEmail, $ZodU
 var init_schemas = __esm({
   "../../node_modules/zod/v4/core/schemas.js"() {
     "use strict";
-    init_cjs_shims();
     init_checks();
     init_core();
     init_doc();
@@ -4103,7 +4280,6 @@ var error;
 var init_ar = __esm({
   "../../node_modules/zod/v4/locales/ar.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error = () => {
       const Sizable = {
@@ -4218,7 +4394,6 @@ var error2;
 var init_az = __esm({
   "../../node_modules/zod/v4/locales/az.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error2 = () => {
       const Sizable = {
@@ -4347,7 +4522,6 @@ var error3;
 var init_be = __esm({
   "../../node_modules/zod/v4/locales/be.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error3 = () => {
       const Sizable = {
@@ -4497,7 +4671,6 @@ var error4;
 var init_bg = __esm({
   "../../node_modules/zod/v4/locales/bg.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error4 = () => {
       const Sizable = {
@@ -4626,7 +4799,6 @@ var error5;
 var init_ca = __esm({
   "../../node_modules/zod/v4/locales/ca.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error5 = () => {
       const Sizable = {
@@ -4743,7 +4915,6 @@ var error6;
 var init_cs = __esm({
   "../../node_modules/zod/v4/locales/cs.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error6 = () => {
       const Sizable = {
@@ -4863,7 +5034,6 @@ var error7;
 var init_da = __esm({
   "../../node_modules/zod/v4/locales/da.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error7 = () => {
       const Sizable = {
@@ -4987,7 +5157,6 @@ var error8;
 var init_de = __esm({
   "../../node_modules/zod/v4/locales/de.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error8 = () => {
       const Sizable = {
@@ -5104,7 +5273,6 @@ var error9;
 var init_en = __esm({
   "../../node_modules/zod/v4/locales/en.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error9 = () => {
       const Sizable = {
@@ -5221,7 +5389,6 @@ var error10;
 var init_eo = __esm({
   "../../node_modules/zod/v4/locales/eo.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error10 = () => {
       const Sizable = {
@@ -5339,7 +5506,6 @@ var error11;
 var init_es = __esm({
   "../../node_modules/zod/v4/locales/es.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error11 = () => {
       const Sizable = {
@@ -5480,7 +5646,6 @@ var error12;
 var init_fa = __esm({
   "../../node_modules/zod/v4/locales/fa.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error12 = () => {
       const Sizable = {
@@ -5603,7 +5768,6 @@ var error13;
 var init_fi = __esm({
   "../../node_modules/zod/v4/locales/fi.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error13 = () => {
       const Sizable = {
@@ -5724,7 +5888,6 @@ var error14;
 var init_fr = __esm({
   "../../node_modules/zod/v4/locales/fr.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error14 = () => {
       const Sizable = {
@@ -5841,7 +6004,6 @@ var error15;
 var init_fr_CA = __esm({
   "../../node_modules/zod/v4/locales/fr-CA.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error15 = () => {
       const Sizable = {
@@ -5957,7 +6119,6 @@ var error16;
 var init_he = __esm({
   "../../node_modules/zod/v4/locales/he.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error16 = () => {
       const TypeNames = {
@@ -6160,7 +6321,6 @@ var error17;
 var init_hu = __esm({
   "../../node_modules/zod/v4/locales/hu.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error17 = () => {
       const Sizable = {
@@ -6287,7 +6447,6 @@ var error18;
 var init_hy = __esm({
   "../../node_modules/zod/v4/locales/hy.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error18 = () => {
       const Sizable = {
@@ -6433,7 +6592,6 @@ var error19;
 var init_id = __esm({
   "../../node_modules/zod/v4/locales/id.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error19 = () => {
       const Sizable = {
@@ -6548,7 +6706,6 @@ var error20;
 var init_is = __esm({
   "../../node_modules/zod/v4/locales/is.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error20 = () => {
       const Sizable = {
@@ -6666,7 +6823,6 @@ var error21;
 var init_it = __esm({
   "../../node_modules/zod/v4/locales/it.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error21 = () => {
       const Sizable = {
@@ -6783,7 +6939,6 @@ var error22;
 var init_ja = __esm({
   "../../node_modules/zod/v4/locales/ja.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error22 = () => {
       const Sizable = {
@@ -6899,7 +7054,6 @@ var error23;
 var init_ka = __esm({
   "../../node_modules/zod/v4/locales/ka.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error23 = () => {
       const Sizable = {
@@ -7020,7 +7174,6 @@ var error24;
 var init_km = __esm({
   "../../node_modules/zod/v4/locales/km.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error24 = () => {
       const Sizable = {
@@ -7136,7 +7289,6 @@ function kh_default() {
 var init_kh = __esm({
   "../../node_modules/zod/v4/locales/kh.js"() {
     "use strict";
-    init_cjs_shims();
     init_km();
   }
 });
@@ -7151,7 +7303,6 @@ var error25;
 var init_ko = __esm({
   "../../node_modules/zod/v4/locales/ko.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error25 = () => {
       const Sizable = {
@@ -7281,7 +7432,6 @@ var capitalizeFirstCharacter, error26;
 var init_lt = __esm({
   "../../node_modules/zod/v4/locales/lt.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     capitalizeFirstCharacter = (text) => {
       return text.charAt(0).toUpperCase() + text.slice(1);
@@ -7483,7 +7633,6 @@ var error27;
 var init_mk = __esm({
   "../../node_modules/zod/v4/locales/mk.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error27 = () => {
       const Sizable = {
@@ -7601,7 +7750,6 @@ var error28;
 var init_ms = __esm({
   "../../node_modules/zod/v4/locales/ms.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error28 = () => {
       const Sizable = {
@@ -7717,7 +7865,6 @@ var error29;
 var init_nl = __esm({
   "../../node_modules/zod/v4/locales/nl.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error29 = () => {
       const Sizable = {
@@ -7836,7 +7983,6 @@ var error30;
 var init_no = __esm({
   "../../node_modules/zod/v4/locales/no.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error30 = () => {
       const Sizable = {
@@ -7953,7 +8099,6 @@ var error31;
 var init_ota = __esm({
   "../../node_modules/zod/v4/locales/ota.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error31 = () => {
       const Sizable = {
@@ -8071,7 +8216,6 @@ var error32;
 var init_ps = __esm({
   "../../node_modules/zod/v4/locales/ps.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error32 = () => {
       const Sizable = {
@@ -8194,7 +8338,6 @@ var error33;
 var init_pl = __esm({
   "../../node_modules/zod/v4/locales/pl.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error33 = () => {
       const Sizable = {
@@ -8312,7 +8455,6 @@ var error34;
 var init_pt = __esm({
   "../../node_modules/zod/v4/locales/pt.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error34 = () => {
       const Sizable = {
@@ -8444,7 +8586,6 @@ var error35;
 var init_ru = __esm({
   "../../node_modules/zod/v4/locales/ru.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error35 = () => {
       const Sizable = {
@@ -8594,7 +8735,6 @@ var error36;
 var init_sl = __esm({
   "../../node_modules/zod/v4/locales/sl.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error36 = () => {
       const Sizable = {
@@ -8712,7 +8852,6 @@ var error37;
 var init_sv = __esm({
   "../../node_modules/zod/v4/locales/sv.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error37 = () => {
       const Sizable = {
@@ -8831,7 +8970,6 @@ var error38;
 var init_ta = __esm({
   "../../node_modules/zod/v4/locales/ta.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error38 = () => {
       const Sizable = {
@@ -8950,7 +9088,6 @@ var error39;
 var init_th = __esm({
   "../../node_modules/zod/v4/locales/th.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error39 = () => {
       const Sizable = {
@@ -9069,7 +9206,6 @@ var error40;
 var init_tr = __esm({
   "../../node_modules/zod/v4/locales/tr.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error40 = () => {
       const Sizable = {
@@ -9183,7 +9319,6 @@ var error41;
 var init_uk = __esm({
   "../../node_modules/zod/v4/locales/uk.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error41 = () => {
       const Sizable = {
@@ -9297,7 +9432,6 @@ function ua_default() {
 var init_ua = __esm({
   "../../node_modules/zod/v4/locales/ua.js"() {
     "use strict";
-    init_cjs_shims();
     init_uk();
   }
 });
@@ -9312,7 +9446,6 @@ var error42;
 var init_ur = __esm({
   "../../node_modules/zod/v4/locales/ur.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error42 = () => {
       const Sizable = {
@@ -9431,7 +9564,6 @@ var error43;
 var init_uz = __esm({
   "../../node_modules/zod/v4/locales/uz.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error43 = () => {
       const Sizable = {
@@ -9549,7 +9681,6 @@ var error44;
 var init_vi = __esm({
   "../../node_modules/zod/v4/locales/vi.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error44 = () => {
       const Sizable = {
@@ -9666,7 +9797,6 @@ var error45;
 var init_zh_CN = __esm({
   "../../node_modules/zod/v4/locales/zh-CN.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error45 = () => {
       const Sizable = {
@@ -9784,7 +9914,6 @@ var error46;
 var init_zh_TW = __esm({
   "../../node_modules/zod/v4/locales/zh-TW.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error46 = () => {
       const Sizable = {
@@ -9900,7 +10029,6 @@ var error47;
 var init_yo = __esm({
   "../../node_modules/zod/v4/locales/yo.js"() {
     "use strict";
-    init_cjs_shims();
     init_util();
     error47 = () => {
       const Sizable = {
@@ -10062,7 +10190,6 @@ __export(locales_exports, {
 var init_locales = __esm({
   "../../node_modules/zod/v4/locales/index.js"() {
     "use strict";
-    init_cjs_shims();
     init_ar();
     init_az();
     init_be();
@@ -10123,7 +10250,6 @@ var _a, $output, $input, $ZodRegistry, globalRegistry;
 var init_registries = __esm({
   "../../node_modules/zod/v4/core/registries.js"() {
     "use strict";
-    init_cjs_shims();
     $output = /* @__PURE__ */ Symbol("ZodOutput");
     $input = /* @__PURE__ */ Symbol("ZodInput");
     $ZodRegistry = class {
@@ -11206,7 +11332,6 @@ var TimePrecision;
 var init_api = __esm({
   "../../node_modules/zod/v4/core/api.js"() {
     "use strict";
-    init_cjs_shims();
     init_checks();
     init_registries();
     init_schemas();
@@ -11563,7 +11688,6 @@ var createToJSONSchemaMethod, createStandardJSONSchemaMethod;
 var init_to_json_schema = __esm({
   "../../node_modules/zod/v4/core/to-json-schema.js"() {
     "use strict";
-    init_cjs_shims();
     init_registries();
     createToJSONSchemaMethod = (schema, processors = {}) => (params) => {
       const ctx = initializeContext({ ...params, processors });
@@ -11620,7 +11744,6 @@ var formatMap, stringProcessor, numberProcessor, booleanProcessor, bigintProcess
 var init_json_schema_processors = __esm({
   "../../node_modules/zod/v4/core/json-schema-processors.js"() {
     "use strict";
-    init_cjs_shims();
     init_to_json_schema();
     init_util();
     formatMap = {
@@ -12146,7 +12269,6 @@ var JSONSchemaGenerator;
 var init_json_schema_generator = __esm({
   "../../node_modules/zod/v4/core/json-schema-generator.js"() {
     "use strict";
-    init_cjs_shims();
     init_json_schema_processors();
     init_to_json_schema();
     JSONSchemaGenerator = class {
@@ -12230,7 +12352,6 @@ var json_schema_exports = {};
 var init_json_schema = __esm({
   "../../node_modules/zod/v4/core/json-schema.js"() {
     "use strict";
-    init_cjs_shims();
   }
 });
 
@@ -12514,7 +12635,6 @@ __export(core_exports2, {
 var init_core2 = __esm({
   "../../node_modules/zod/v4/core/index.js"() {
     "use strict";
-    init_cjs_shims();
     init_core();
     init_parse();
     init_errors();
@@ -12570,7 +12690,6 @@ __export(checks_exports2, {
 var init_checks2 = __esm({
   "../../node_modules/zod/v4/classic/checks.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
   }
 });
@@ -12603,7 +12722,6 @@ var ZodISODateTime, ZodISODate, ZodISOTime, ZodISODuration;
 var init_iso = __esm({
   "../../node_modules/zod/v4/classic/iso.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_schemas2();
     ZodISODateTime = /* @__PURE__ */ $constructor("ZodISODateTime", (inst, def) => {
@@ -12630,7 +12748,6 @@ var initializer2, ZodError, ZodRealError;
 var init_errors2 = __esm({
   "../../node_modules/zod/v4/classic/errors.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_core2();
     init_util();
@@ -12680,7 +12797,6 @@ var parse2, parseAsync2, safeParse2, safeParseAsync2, encode2, decode2, encodeAs
 var init_parse2 = __esm({
   "../../node_modules/zod/v4/classic/parse.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_errors2();
     parse2 = /* @__PURE__ */ _parse(ZodRealError);
@@ -13324,7 +13440,6 @@ var ZodType, _ZodString, ZodString, ZodStringFormat, ZodEmail, ZodGUID, ZodUUID,
 var init_schemas2 = __esm({
   "../../node_modules/zod/v4/classic/schemas.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_core2();
     init_json_schema_processors();
@@ -13971,7 +14086,6 @@ var ZodIssueCode, ZodFirstPartyTypeKind;
 var init_compat = __esm({
   "../../node_modules/zod/v4/classic/compat.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_core2();
     ZodIssueCode = {
@@ -14010,13 +14124,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path8 = ref.slice(1).split("/").filter(Boolean);
-  if (path8.length === 0) {
+  const path9 = ref.slice(1).split("/").filter(Boolean);
+  if (path9.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path8[0] === defsKey) {
-    const key = path8[1];
+  if (path9[0] === defsKey) {
+    const key = path9[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -14393,7 +14507,6 @@ var z, RECOGNIZED_KEYS;
 var init_from_json_schema = __esm({
   "../../node_modules/zod/v4/classic/from-json-schema.js"() {
     "use strict";
-    init_cjs_shims();
     init_registries();
     init_checks2();
     init_iso();
@@ -14504,7 +14617,6 @@ function date4(params) {
 var init_coerce = __esm({
   "../../node_modules/zod/v4/classic/coerce.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_schemas2();
   }
@@ -14753,7 +14865,6 @@ __export(external_exports, {
 var init_external = __esm({
   "../../node_modules/zod/v4/classic/external.js"() {
     "use strict";
-    init_cjs_shims();
     init_core2();
     init_schemas2();
     init_checks2();
@@ -14777,7 +14888,6 @@ var init_external = __esm({
 var init_zod = __esm({
   "../../node_modules/zod/index.js"() {
     "use strict";
-    init_cjs_shims();
     init_external();
     init_external();
   }
@@ -14799,7 +14909,6 @@ var DevApiKeySchema, AnonApiKeySchema, SessionIdSchema, BuildHashSchema, SdkDiag
 var init_dist = __esm({
   "../protocol/dist/index.js"() {
     "use strict";
-    init_cjs_shims();
     init_zod();
     init_zod();
     init_zod();
@@ -14935,11 +15044,11 @@ var init_dist = __esm({
 async function loadFsPath() {
   if (fsPathCache !== void 0) return fsPathCache;
   try {
-    const [fs8, path8] = await Promise.all([
-      import("fs/promises"),
-      import("path")
+    const [fs9, path9] = await Promise.all([
+      import("node:fs/promises"),
+      import("node:path")
     ]);
-    fsPathCache = { fs: fs8, path: path8 };
+    fsPathCache = { fs: fs9, path: path9 };
     return fsPathCache;
   } catch {
     fsPathCache = null;
@@ -15018,7 +15127,6 @@ var GLASSTRACE_DIR, ANON_KEY_FILE, fsPathCache, ephemeralKeyCache;
 var init_anon_key = __esm({
   "src/anon-key.ts"() {
     "use strict";
-    init_cjs_shims();
     init_dist();
     GLASSTRACE_DIR = ".glasstrace";
     ANON_KEY_FILE = "anon_key";
@@ -15027,9 +15135,9 @@ var init_anon_key = __esm({
 });
 
 // src/agent-detection/detect.ts
-async function pathExists(path8, mode = import_node_fs.constants.R_OK) {
+async function pathExists(path9, mode = import_node_fs.constants.R_OK) {
   try {
-    await (0, import_promises.access)(path8, mode);
+    await (0, import_promises.access)(path9, mode);
     return true;
   } catch {
     return false;
@@ -15135,12 +15243,11 @@ var import_node_child_process, import_promises, import_node_path, import_node_os
 var init_detect = __esm({
   "src/agent-detection/detect.ts"() {
     "use strict";
-    init_cjs_shims();
-    import_node_child_process = require("child_process");
-    import_promises = require("fs/promises");
-    import_node_path = require("path");
-    import_node_os = require("os");
-    import_node_fs = require("fs");
+    import_node_child_process = require("node:child_process");
+    import_promises = require("node:fs/promises");
+    import_node_path = require("node:path");
+    import_node_os = require("node:os");
+    import_node_fs = require("node:fs");
     AGENT_RULES = [
       {
         name: "claude",
@@ -15350,7 +15457,6 @@ ${content}${m.end}
 var init_configs = __esm({
   "src/agent-detection/configs.ts"() {
     "use strict";
-    init_cjs_shims();
   }
 });
 
@@ -15528,9 +15634,8 @@ var import_promises2, import_node_path2, HTML_START, HTML_END, HASH_START, HASH_
 var init_inject = __esm({
   "src/agent-detection/inject.ts"() {
     "use strict";
-    init_cjs_shims();
-    import_promises2 = require("fs/promises");
-    import_node_path2 = require("path");
+    import_promises2 = require("node:fs/promises");
+    import_node_path2 = require("node:path");
     HTML_START = "<!-- glasstrace:mcp:start -->";
     HTML_END = "<!-- glasstrace:mcp:end -->";
     HASH_START = "# glasstrace:mcp:start";
@@ -15777,9 +15882,8 @@ var fs3, path3;
 var init_monorepo = __esm({
   "src/cli/monorepo.ts"() {
     "use strict";
-    init_cjs_shims();
-    fs3 = __toESM(require("fs"), 1);
-    path3 = __toESM(require("path"), 1);
+    fs3 = __toESM(require("node:fs"), 1);
+    path3 = __toESM(require("node:path"), 1);
     init_constants();
   }
 });
@@ -15798,7 +15902,8 @@ __export(uninit_exports, {
   runUninit: () => runUninit,
   skipString: () => skipString,
   unwrapCJSExport: () => unwrapCJSExport,
-  unwrapExport: () => unwrapExport
+  unwrapExport: () => unwrapExport,
+  writeShutdownMarker: () => writeShutdownMarker
 });
 function skipString(text, start, quote) {
   let i = start + 1;
@@ -16099,12 +16204,75 @@ function processTomlMcpConfig(content) {
   }
   return { action: "removed-section", content: result + "\n" };
 }
+function writeShutdownMarker(projectRoot) {
+  const dirPath = path4.join(projectRoot, ".glasstrace");
+  if (!fs4.existsSync(dirPath)) {
+    return false;
+  }
+  const markerPath = path4.join(dirPath, "shutdown-requested");
+  const tmpPath = `${markerPath}.tmp`;
+  const body = JSON.stringify({ requestedAt: (/* @__PURE__ */ new Date()).toISOString() });
+  try {
+    fs4.writeFileSync(tmpPath, body, { encoding: "utf-8", mode: 384 });
+    try {
+      fs4.chmodSync(tmpPath, 384);
+    } catch {
+    }
+    fs4.renameSync(tmpPath, markerPath);
+    return true;
+  } catch {
+    try {
+      fs4.unlinkSync(tmpPath);
+    } catch {
+    }
+    return false;
+  }
+}
+async function defaultPrompt(question, defaultValue) {
+  if (!process.stdin.isTTY) return defaultValue;
+  const readline2 = await import("node:readline");
+  const rl = readline2.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve2) => {
+    const suffix = defaultValue ? " [Y/n] " : " [y/N] ";
+    rl.question(question + suffix, (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      if (trimmed === "") {
+        resolve2(defaultValue);
+        return;
+      }
+      resolve2(trimmed === "y" || trimmed === "yes");
+    });
+  });
+}
 async function runUninit(options) {
   const { projectRoot, dryRun } = options;
+  const force = options.force === true;
+  const prompt = options.prompt ?? defaultPrompt;
   const summary = [];
   const warnings = [];
   const errors = [];
   const prefix = dryRun ? "[dry run] " : "";
+  try {
+    if (!dryRun) {
+      const markerWritten = writeShutdownMarker(projectRoot);
+      if (markerWritten) {
+        summary.push("Wrote .glasstrace/shutdown-requested marker");
+      }
+    } else {
+      const dirPath = path4.join(projectRoot, ".glasstrace");
+      if (fs4.existsSync(dirPath)) {
+        summary.push(`${prefix}Would write .glasstrace/shutdown-requested marker`);
+      }
+    }
+  } catch (err) {
+    warnings.push(
+      `Shutdown marker write failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
   try {
     let configHandled = false;
     for (const name of NEXT_CONFIG_NAMES) {
@@ -16187,23 +16355,57 @@ async function runUninit(options) {
     const envPath = path4.join(projectRoot, ".env.local");
     if (fs4.existsSync(envPath)) {
       const content = fs4.readFileSync(envPath, "utf-8");
-      const lines = content.split("\n");
-      const filtered = lines.filter((line) => {
-        const trimmed = line.trim();
-        return !(/^\s*#?\s*GLASSTRACE_API_KEY\s*=/.test(trimmed) || /^\s*#?\s*GLASSTRACE_COVERAGE_MAP\s*=/.test(trimmed));
-      });
-      if (filtered.length !== lines.length) {
-        const result = filtered.join("\n");
-        if (result.trim().length === 0) {
-          if (!dryRun) {
-            fs4.unlinkSync(envPath);
-          }
-          summary.push(`${prefix}Deleted .env.local (no remaining entries)`);
+      const existingKey = readEnvLocalApiKey(content);
+      const hasDevKey = isDevApiKey(existingKey);
+      let proceed = true;
+      let devKeyPath = "none";
+      if (hasDevKey) {
+        if (dryRun) {
+          devKeyPath = "dry-run-preview";
+        } else if (force) {
+          devKeyPath = "force-bypass";
         } else {
-          if (!dryRun) {
-            fs4.writeFileSync(envPath, result, "utf-8");
+          const confirmed = await prompt(
+            ".env.local contains a claimed Glasstrace developer API key (gt_dev_...). Removing it will require you to re-authenticate. Continue?",
+            false
+          );
+          proceed = confirmed;
+          if (confirmed) devKeyPath = "interactive-confirmed";
+        }
+      }
+      if (!proceed) {
+        warnings.push(
+          "Preserved GLASSTRACE_API_KEY in .env.local (claimed dev key; re-run with --force to remove)"
+        );
+      } else {
+        const lines = content.split("\n");
+        const filtered = lines.filter((line) => {
+          const trimmed = line.trim();
+          return !(/^\s*#?\s*GLASSTRACE_API_KEY\s*=/.test(trimmed) || /^\s*#?\s*GLASSTRACE_COVERAGE_MAP\s*=/.test(trimmed));
+        });
+        if (filtered.length !== lines.length) {
+          const result = filtered.join("\n");
+          if (result.trim().length === 0) {
+            if (!dryRun) {
+              fs4.unlinkSync(envPath);
+            }
+            summary.push(`${prefix}Deleted .env.local (no remaining entries)`);
+          } else {
+            if (!dryRun) {
+              fs4.writeFileSync(envPath, result, "utf-8");
+            }
+            let devKeyAnnotation = "";
+            if (devKeyPath === "interactive-confirmed") {
+              devKeyAnnotation = " (dev key confirmed)";
+            } else if (devKeyPath === "force-bypass") {
+              devKeyAnnotation = " (dev key removed via --force)";
+            } else if (devKeyPath === "dry-run-preview") {
+              devKeyAnnotation = " (dev key would be removed; real run would require confirmation)";
+            }
+            summary.push(
+              `${prefix}Removed GLASSTRACE entries from .env.local${devKeyAnnotation}`
+            );
           }
-          summary.push(`${prefix}Removed GLASSTRACE entries from .env.local`);
         }
       }
     }
@@ -16354,11 +16556,11 @@ var fs4, os, path4, MCP_CONFIG_FILES, AGENT_INFO_FILES;
 var init_uninit = __esm({
   "src/cli/uninit.ts"() {
     "use strict";
-    init_cjs_shims();
-    fs4 = __toESM(require("fs"), 1);
-    os = __toESM(require("os"), 1);
-    path4 = __toESM(require("path"), 1);
+    fs4 = __toESM(require("node:fs"), 1);
+    os = __toESM(require("node:os"), 1);
+    path4 = __toESM(require("node:path"), 1);
     init_constants();
+    init_scaffolder();
     MCP_CONFIG_FILES = [".mcp.json", ".cursor/mcp.json", ".gemini/settings.json"];
     AGENT_INFO_FILES = [
       "CLAUDE.md",
@@ -16584,11 +16786,10 @@ var import_node_child_process2, fs5, path5, import_node_util, execFileAsync;
 var init_mcp_add = __esm({
   "src/cli/mcp-add.ts"() {
     "use strict";
-    init_cjs_shims();
-    import_node_child_process2 = require("child_process");
-    fs5 = __toESM(require("fs"), 1);
-    path5 = __toESM(require("path"), 1);
-    import_node_util = require("util");
+    import_node_child_process2 = require("node:child_process");
+    fs5 = __toESM(require("node:fs"), 1);
+    path5 = __toESM(require("node:path"), 1);
+    import_node_util = require("node:util");
     init_anon_key();
     init_detect();
     init_configs();
@@ -16599,6 +16800,111 @@ var init_mcp_add = __esm({
   }
 });
 
+// src/cli/validate.ts
+var validate_exports = {};
+__export(validate_exports, {
+  hasGlasstraceImport: () => hasGlasstraceImport,
+  hasRegisterGlasstraceImport: () => hasRegisterGlasstraceImport,
+  runValidate: () => runValidate
+});
+function hasGlasstraceImport(content) {
+  return /@glasstrace\/sdk/.test(content);
+}
+function hasRegisterGlasstraceImport(content) {
+  const match = /import\s*\{([^}]+)\}\s*from\s*["']@glasstrace\/sdk["']/;
+  const importMatch = match.exec(content);
+  if (!importMatch) return false;
+  return importMatch[1].split(",").map((s) => s.trim()).includes("registerGlasstrace");
+}
+function runValidate(options) {
+  const { projectRoot } = options;
+  const issues = [];
+  const glasstraceDir = path6.join(projectRoot, ".glasstrace");
+  const instrumentationPath = path6.join(projectRoot, "instrumentation.ts");
+  const markerPath = path6.join(glasstraceDir, "mcp-connected");
+  const glasstraceDirExists = isDirectorySafe(glasstraceDir);
+  const instrumentationExists = fs6.existsSync(instrumentationPath);
+  const instrumentationContent = instrumentationExists ? safeReadFile(instrumentationPath) : null;
+  const markerExists = fs6.existsSync(markerPath);
+  const mcpConfigsPresent = MCP_CONFIG_CANDIDATES.filter(
+    (rel) => fs6.existsSync(path6.join(projectRoot, rel))
+  );
+  if (glasstraceDirExists) {
+    if (instrumentationContent === null || !hasRegisterGlasstraceImport(instrumentationContent)) {
+      issues.push({
+        code: "glasstrace-dir-without-register-import",
+        message: ".glasstrace/ exists but instrumentation.ts is missing the registerGlasstrace import.",
+        fix: "Run `npx glasstrace init` to re-scaffold instrumentation.ts, or remove .glasstrace/ if the SDK is no longer in use."
+      });
+    }
+  }
+  if (!glasstraceDirExists && instrumentationContent !== null) {
+    if (hasGlasstraceImport(instrumentationContent)) {
+      issues.push({
+        code: "sdk-import-without-glasstrace-dir",
+        message: "instrumentation.ts imports from @glasstrace/sdk but .glasstrace/ is missing.",
+        fix: "Run `npx glasstrace init` to recreate .glasstrace/, or `npx glasstrace uninit` to fully remove the SDK."
+      });
+    }
+  }
+  if (markerExists && mcpConfigsPresent.length === 0) {
+    issues.push({
+      code: "mcp-marker-without-configs",
+      message: ".glasstrace/mcp-connected marker is present but no MCP config files were found.",
+      fix: "Run `npx glasstrace mcp add --force` to regenerate MCP configs, or delete .glasstrace/mcp-connected."
+    });
+  }
+  if (!markerExists && mcpConfigsPresent.length > 0) {
+    issues.push({
+      code: "mcp-configs-without-marker",
+      message: `MCP config files exist (${mcpConfigsPresent.join(", ")}) but .glasstrace/mcp-connected marker is missing.`,
+      fix: "Run `npx glasstrace init` to re-register the marker, or `npx glasstrace uninit` to fully remove MCP configuration."
+    });
+  }
+  const summary = [];
+  if (issues.length === 0) {
+    summary.push("Glasstrace install state is consistent.");
+  } else {
+    summary.push(
+      `Detected ${issues.length} inconsistenc${issues.length === 1 ? "y" : "ies"} in Glasstrace install state:`
+    );
+  }
+  return {
+    exitCode: issues.length > 0 ? 1 : 0,
+    summary,
+    issues
+  };
+}
+function safeReadFile(filePath) {
+  try {
+    return fs6.readFileSync(filePath, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function isDirectorySafe(dirPath) {
+  try {
+    if (!fs6.existsSync(dirPath)) return false;
+    return fs6.statSync(dirPath).isDirectory();
+  } catch {
+    return false;
+  }
+}
+var fs6, path6, MCP_CONFIG_CANDIDATES;
+var init_validate = __esm({
+  "src/cli/validate.ts"() {
+    "use strict";
+    fs6 = __toESM(require("node:fs"), 1);
+    path6 = __toESM(require("node:path"), 1);
+    MCP_CONFIG_CANDIDATES = [
+      ".mcp.json",
+      ".cursor/mcp.json",
+      ".gemini/settings.json",
+      ".codex/config.toml"
+    ];
+  }
+});
+
 // src/cli/status.ts
 var status_exports = {};
 __export(status_exports, {
@@ -16619,8 +16925,8 @@ function runStatus(options) {
 }
 function checkInstalled(root) {
   try {
-    const pkgPath = path6.join(root, "package.json");
-    const content = fs6.readFileSync(pkgPath, "utf-8");
+    const pkgPath = path7.join(root, "package.json");
+    const content = fs7.readFileSync(pkgPath, "utf-8");
     const pkg = JSON.parse(content);
     const deps = pkg["dependencies"];
     const devDeps = pkg["devDependencies"];
@@ -16631,7 +16937,7 @@ function checkInstalled(root) {
 }
 function checkInitialized(root) {
   try {
-    return fs6.statSync(path6.join(root, ".glasstrace")).isDirectory();
+    return fs7.statSync(path7.join(root, ".glasstrace")).isDirectory();
   } catch {
     return false;
   }
@@ -16639,7 +16945,7 @@ function checkInitialized(root) {
 function checkInstrumentation(root) {
   for (const name of INSTRUMENTATION_FILES) {
     try {
-      const content = fs6.readFileSync(path6.join(root, name), "utf-8");
+      const content = fs7.readFileSync(path7.join(root, name), "utf-8");
       if (content.includes("registerGlasstrace")) {
         return true;
       }
@@ -16651,7 +16957,7 @@ function checkInstrumentation(root) {
 function checkConfigWrapped(root) {
   for (const name of NEXT_CONFIG_NAMES) {
     try {
-      const content = fs6.readFileSync(path6.join(root, name), "utf-8");
+      const content = fs7.readFileSync(path7.join(root, name), "utf-8");
       if (content.includes("withGlasstraceConfig")) {
         return true;
       }
@@ -16662,7 +16968,7 @@ function checkConfigWrapped(root) {
 }
 function checkAnonKey(root) {
   try {
-    return fs6.statSync(path6.join(root, ".glasstrace", "anon_key")).isFile();
+    return fs7.statSync(path7.join(root, ".glasstrace", "anon_key")).isFile();
   } catch {
     return false;
   }
@@ -16670,7 +16976,7 @@ function checkAnonKey(root) {
 function checkMcpConfigured(root) {
   for (const name of MCP_JSON_FILES) {
     try {
-      const content = fs6.readFileSync(path6.join(root, name), "utf-8");
+      const content = fs7.readFileSync(path7.join(root, name), "utf-8");
       const parsed = JSON.parse(content);
       const mcpServers = parsed["mcpServers"];
       if (mcpServers && typeof mcpServers === "object" && "glasstrace" in mcpServers) {
@@ -16681,7 +16987,7 @@ function checkMcpConfigured(root) {
   }
   for (const name of MCP_TOML_FILES) {
     try {
-      const content = fs6.readFileSync(path6.join(root, name), "utf-8");
+      const content = fs7.readFileSync(path7.join(root, name), "utf-8");
       if (content.includes("[mcp_servers.glasstrace]")) {
         return true;
       }
@@ -16694,7 +17000,7 @@ function checkAgents(root) {
   const found = [];
   for (const name of AGENT_INFO_FILES2) {
     try {
-      const content = fs6.readFileSync(path6.join(root, name), "utf-8");
+      const content = fs7.readFileSync(path7.join(root, name), "utf-8");
       const hasHtmlMarkers = content.includes("<!-- glasstrace:mcp:start -->") && content.includes("<!-- glasstrace:mcp:end -->");
       const hasHashMarkers = content.includes("# glasstrace:mcp:start") && content.includes("# glasstrace:mcp:end");
       if (hasHtmlMarkers || hasHashMarkers) {
@@ -16717,8 +17023,8 @@ function readRuntimeState(root) {
     pid: null
   };
   try {
-    const filePath = path6.join(root, ".glasstrace", "runtime-state.json");
-    const content = fs6.readFileSync(filePath, "utf-8");
+    const filePath = path7.join(root, ".glasstrace", "runtime-state.json");
+    const content = fs7.readFileSync(filePath, "utf-8");
     const parsed = JSON.parse(content);
     const updatedAt = typeof parsed.updatedAt === "string" ? parsed.updatedAt : null;
     const pid = typeof parsed.pid === "number" ? parsed.pid : null;
@@ -16767,13 +17073,12 @@ function readRuntimeState(root) {
     return empty;
   }
 }
-var fs6, path6, MCP_JSON_FILES, MCP_TOML_FILES, AGENT_INFO_FILES2, INSTRUMENTATION_FILES, STALE_THRESHOLD_MS;
+var fs7, path7, MCP_JSON_FILES, MCP_TOML_FILES, AGENT_INFO_FILES2, INSTRUMENTATION_FILES, STALE_THRESHOLD_MS;
 var init_status = __esm({
   "src/cli/status.ts"() {
     "use strict";
-    init_cjs_shims();
-    fs6 = __toESM(require("fs"), 1);
-    path6 = __toESM(require("path"), 1);
+    fs7 = __toESM(require("node:fs"), 1);
+    path7 = __toESM(require("node:path"), 1);
     init_constants();
     MCP_JSON_FILES = [".mcp.json", ".cursor/mcp.json", ".gemini/settings.json", ".glasstrace/mcp.json"];
     MCP_TOML_FILES = [".codex/config.toml"];
@@ -16797,23 +17102,23 @@ var init_status = __esm({
 // src/cli/init.ts
 var init_exports = {};
 __export(init_exports, {
+  decideMcpConfigAction: () => decideMcpConfigAction,
   meetsNodeVersion: () => meetsNodeVersion,
   rollbackSteps: () => rollbackSteps,
-  runInit: () => runInit
+  runInit: () => runInit,
+  verifyAnonKeyRegistration: () => verifyAnonKeyRegistration
 });
 module.exports = __toCommonJS(init_exports);
-init_cjs_shims();
-var fs7 = __toESM(require("fs"), 1);
-var path7 = __toESM(require("path"), 1);
-var readline = __toESM(require("readline"), 1);
+var fs8 = __toESM(require("node:fs"), 1);
+var path8 = __toESM(require("node:path"), 1);
+var readline = __toESM(require("node:readline"), 1);
 init_scaffolder();
 
 // src/import-graph.ts
-init_cjs_shims();
-var fs2 = __toESM(require("fs/promises"), 1);
-var fsSync = __toESM(require("fs"), 1);
-var path2 = __toESM(require("path"), 1);
-var crypto2 = __toESM(require("crypto"), 1);
+var fs2 = __toESM(require("node:fs/promises"), 1);
+var fsSync = __toESM(require("node:fs"), 1);
+var path2 = __toESM(require("node:path"), 1);
+var crypto2 = __toESM(require("node:crypto"), 1);
 init_dist();
 var MAX_TEST_FILES = 5e3;
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set(["node_modules", ".next", ".git", "dist", ".turbo"]);
@@ -16986,10 +17291,382 @@ init_inject();
 init_constants();
 init_monorepo();
 init_uninit();
+
+// src/init-client.ts
+init_dist();
+
+// src/https-transport.ts
+var import_node_https = require("node:https");
+var import_node_http = require("node:http");
+var import_node_url = require("node:url");
+var HttpsTransportError = class extends Error {
+  kind = "transport";
+  cause;
+  constructor(message, cause) {
+    super(message);
+    this.name = "HttpsTransportError";
+    this.cause = cause;
+  }
+};
+var HttpsStatusError = class extends Error {
+  kind = "status";
+  status;
+  /** Raw response body text (may be truncated by caller if large). */
+  body;
+  constructor(status, body) {
+    super(`Server returned HTTP ${status}`);
+    this.name = "HttpsStatusError";
+    this.status = status;
+    this.body = body;
+  }
+};
+var HttpsBodyParseError = class extends Error {
+  kind = "parse";
+  status;
+  cause;
+  constructor(status, cause) {
+    super(`Server returned malformed response (HTTP ${status})`);
+    this.name = "HttpsBodyParseError";
+    this.status = status;
+    this.cause = cause;
+  }
+};
+var DEFAULT_TIMEOUT_MS = 1e4;
+var DEFAULT_RETRY_DELAYS_MS = [500, 1500];
+var DEFAULT_TOTAL_DEADLINE_MS = 2e4;
+async function httpsPostJson(url2, jsonBody, options) {
+  const parsed = new import_node_url.URL(url2);
+  const isHttps = parsed.protocol === "https:";
+  const isHttp = parsed.protocol === "http:";
+  if (!isHttps && !isHttp) {
+    throw new HttpsTransportError(
+      `Unsupported protocol: ${parsed.protocol} (expected http: or https:)`
+    );
+  }
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const maxAttempts = options.maxAttempts ?? 3;
+  const retryDelaysMs = options.retryDelaysMs ?? DEFAULT_RETRY_DELAYS_MS;
+  const totalDeadlineMs = options.totalDeadlineMs ?? DEFAULT_TOTAL_DEADLINE_MS;
+  const scheduler = options.scheduler ?? ((fn, ms) => setTimeout(fn, ms));
+  const requestImpl = isHttps ? options.requestImpl ?? import_node_https.request : options.httpRequestImpl ?? import_node_http.request;
+  let payload;
+  try {
+    payload = JSON.stringify(jsonBody);
+  } catch (err) {
+    throw new HttpsTransportError(
+      `Failed to serialize request body: ${err instanceof Error ? err.message : String(err)}`,
+      err
+    );
+  }
+  const payloadBuffer = Buffer.from(payload, "utf-8");
+  const startedAt = Date.now();
+  let lastError;
+  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+    if (options.signal?.aborted) {
+      throw new HttpsTransportError("Request aborted");
+    }
+    const elapsed = Date.now() - startedAt;
+    if (elapsed >= totalDeadlineMs) {
+      break;
+    }
+    const remainingBudget = totalDeadlineMs - elapsed;
+    const attemptTimeoutMs = Math.min(timeoutMs, remainingBudget);
+    try {
+      return await sendSingleRequest(
+        parsed,
+        payloadBuffer,
+        options.headers,
+        attemptTimeoutMs,
+        options.signal,
+        requestImpl
+      );
+    } catch (err) {
+      lastError = err;
+      if (err instanceof HttpsStatusError || err instanceof HttpsBodyParseError) {
+        throw err;
+      }
+      const isLast = attempt === maxAttempts - 1;
+      if (isLast) break;
+      const delayMs = retryDelaysMs[attempt] ?? retryDelaysMs[retryDelaysMs.length - 1] ?? 0;
+      const elapsedBeforeSleep = Date.now() - startedAt;
+      const remaining = totalDeadlineMs - elapsedBeforeSleep;
+      if (remaining <= 0) break;
+      const actualDelayMs = Math.min(delayMs, remaining);
+      await sleep(actualDelayMs, scheduler, options.signal);
+    }
+  }
+  if (lastError instanceof HttpsTransportError) throw lastError;
+  throw new HttpsTransportError(
+    lastError instanceof Error ? lastError.message : "Request failed",
+    lastError
+  );
+}
+function sendSingleRequest(url2, payload, headers, timeoutMs, signal, requestImpl) {
+  return new Promise((resolve2, reject) => {
+    const finalHeaders = {
+      ...headers,
+      "Content-Length": payload.byteLength
+    };
+    const reqOptions = {
+      method: "POST",
+      hostname: url2.hostname,
+      port: url2.port === "" ? void 0 : Number(url2.port),
+      path: `${url2.pathname}${url2.search}`,
+      headers: finalHeaders,
+      // Explicit timeout at the socket level. Still complemented by a
+      // manual timer below because `timeout` only fires when the socket
+      // is idle — it does not cover "TLS handshake hangs forever".
+      timeout: timeoutMs
+    };
+    let settled = false;
+    let cleanup = () => {
+    };
+    const settle = (fn) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn();
+    };
+    const req = requestImpl(reqOptions, (res) => {
+      const chunks = [];
+      res.on("data", (chunk) => {
+        chunks.push(typeof chunk === "string" ? Buffer.from(chunk, "utf-8") : chunk);
+      });
+      res.on("end", () => {
+        const raw = Buffer.concat(chunks).toString("utf-8");
+        const status = res.statusCode ?? 0;
+        if (status < 200 || status >= 300) {
+          settle(() => reject(new HttpsStatusError(status, raw)));
+          return;
+        }
+        if (status === 204 || raw.length === 0) {
+          settle(() => resolve2({ status, body: void 0, raw }));
+          return;
+        }
+        try {
+          const parsed = JSON.parse(raw);
+          settle(() => resolve2({ status, body: parsed, raw }));
+        } catch (err) {
+          settle(() => reject(new HttpsBodyParseError(status, err)));
+        }
+      });
+      res.on("error", (err) => {
+        settle(() => reject(new HttpsTransportError(`Response stream error: ${err.message}`, err)));
+      });
+    });
+    const timer = setTimeout(() => {
+      settle(() => {
+        req.destroy(new Error("Request timed out"));
+        reject(new HttpsTransportError(`Request timed out after ${timeoutMs}ms`));
+      });
+    }, timeoutMs);
+    if (typeof timer.unref === "function") timer.unref();
+    const onAbort = () => {
+      settle(() => {
+        req.destroy(new Error("Aborted"));
+        reject(new HttpsTransportError("Request aborted"));
+      });
+    };
+    cleanup = () => {
+      clearTimeout(timer);
+      if (signal !== void 0) {
+        signal.removeEventListener("abort", onAbort);
+      }
+    };
+    req.on("error", (err) => {
+      settle(() => reject(new HttpsTransportError(`fetch failed: ${err.message}`, err)));
+    });
+    req.on("timeout", () => {
+      settle(() => {
+        req.destroy(new Error("Request timed out"));
+        reject(new HttpsTransportError(`Request timed out after ${timeoutMs}ms`));
+      });
+    });
+    if (signal !== void 0) {
+      if (signal.aborted) {
+        req.destroy(new Error("Aborted"));
+        settle(() => reject(new HttpsTransportError("Request aborted")));
+        return;
+      }
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+    req.end(payload);
+  });
+}
+function sleep(ms, scheduler, signal) {
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    let cleanup = () => {
+    };
+    const settle = (fn) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn();
+    };
+    const onAbort = () => {
+      settle(() => reject(new HttpsTransportError("Request aborted")));
+    };
+    const timer = scheduler(() => {
+      settle(resolve2);
+    }, ms);
+    if (typeof timer.unref === "function") timer.unref();
+    cleanup = () => {
+      clearTimeout(timer);
+      if (signal !== void 0) {
+        signal.removeEventListener("abort", onAbort);
+      }
+    };
+    if (signal !== void 0) {
+      if (signal.aborted) {
+        onAbort();
+        return;
+      }
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+  });
+}
+
+// src/init-client.ts
+var TWENTY_FOUR_HOURS_MS = 24 * 60 * 60 * 1e3;
+var INIT_TIMEOUT_MS = 1e4;
+var transportOverride = null;
+async function sendInitRequest(config2, anonKey, sdkVersion, importGraph, healthReport, diagnostics, signal) {
+  const effectiveKey = config2.apiKey || anonKey;
+  if (!effectiveKey) {
+    throw new Error("No API key available for init request");
+  }
+  const payload = {
+    sdkVersion
+  };
+  if (config2.apiKey && anonKey) {
+    payload.anonKey = anonKey;
+  }
+  if (config2.environment) {
+    payload.environment = config2.environment;
+  }
+  if (importGraph) {
+    payload.importGraph = importGraph;
+  }
+  if (healthReport) {
+    payload.healthReport = healthReport;
+  }
+  if (diagnostics) {
+    payload.diagnostics = diagnostics;
+  }
+  const url2 = `${config2.endpoint}/v1/sdk/init`;
+  const transport = transportOverride ?? httpsPostJson;
+  let result;
+  try {
+    result = await transport(url2, payload, {
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${effectiveKey}`
+      },
+      timeoutMs: INIT_TIMEOUT_MS,
+      signal
+    });
+  } catch (err) {
+    if (err instanceof HttpsStatusError) {
+      const error48 = new Error(`Init request failed with status ${err.status}`);
+      error48.status = err.status;
+      throw error48;
+    }
+    if (err instanceof HttpsBodyParseError) {
+      const cause = err.cause;
+      if (cause instanceof SyntaxError) throw cause;
+      throw err;
+    }
+    if (err instanceof HttpsTransportError) {
+      throw err;
+    }
+    throw err;
+  }
+  return SdkInitResponseSchema.parse(result.body);
+}
+async function verifyInitReachable(config2, anonKey, sdkVersion) {
+  try {
+    const response = await sendInitRequest(config2, anonKey, sdkVersion);
+    return { ok: true, response };
+  } catch (err) {
+    const status = err.status;
+    if (typeof status === "number") {
+      return {
+        ok: false,
+        reason: "rejected",
+        status,
+        detail: `server returned HTTP ${status}`
+      };
+    }
+    if (err instanceof Error && (err.name === "ZodError" || err.name === "SyntaxError")) {
+      return {
+        ok: false,
+        reason: "malformed",
+        detail: "server returned malformed response"
+      };
+    }
+    const rawMessage = err instanceof Error ? err.message : String(err);
+    const detail = rawMessage.startsWith("fetch failed: ") ? rawMessage.slice("fetch failed: ".length) : rawMessage;
+    return { ok: false, reason: "transport", detail };
+  }
+}
+
+// src/env-detection.ts
+var DEFAULT_ENDPOINT = "https://api.glasstrace.dev";
+function readEnvVars() {
+  return {
+    GLASSTRACE_API_KEY: process.env.GLASSTRACE_API_KEY?.trim() || void 0,
+    GLASSTRACE_FORCE_ENABLE: process.env.GLASSTRACE_FORCE_ENABLE,
+    GLASSTRACE_ENV: process.env.GLASSTRACE_ENV,
+    GLASSTRACE_COVERAGE_MAP: process.env.GLASSTRACE_COVERAGE_MAP,
+    NODE_ENV: process.env.NODE_ENV,
+    VERCEL_ENV: process.env.VERCEL_ENV
+  };
+}
+function resolveConfig(options) {
+  const env = readEnvVars();
+  return {
+    apiKey: options?.apiKey ?? env.GLASSTRACE_API_KEY,
+    endpoint: options?.endpoint ?? DEFAULT_ENDPOINT,
+    forceEnable: options?.forceEnable ?? env.GLASSTRACE_FORCE_ENABLE === "true",
+    verbose: options?.verbose ?? false,
+    environment: env.GLASSTRACE_ENV,
+    coverageMapEnabled: env.GLASSTRACE_COVERAGE_MAP === "true",
+    nodeEnv: env.NODE_ENV,
+    vercelEnv: env.VERCEL_ENV
+  };
+}
+
+// src/cli/init.ts
 function meetsNodeVersion(minMajor) {
   const [major] = process.versions.node.split(".").map(Number);
   return major >= minMajor;
 }
+async function decideMcpConfigAction(options) {
+  const { configPath, expectedContent, force } = options;
+  if (configPath === null) return "write";
+  const exists = options.existsSync ?? fs8.existsSync;
+  const read = options.readFile ?? ((p) => fs8.readFileSync(p, "utf-8"));
+  const prompt = options.prompt ?? promptYesNo;
+  if (!exists(configPath)) return "write";
+  let existingContent;
+  try {
+    existingContent = read(configPath);
+  } catch {
+    return "write";
+  }
+  if (mcpConfigMatches(existingContent, expectedContent)) {
+    return "write";
+  }
+  if (force) {
+    return "force-overwrite";
+  }
+  const answer = await prompt(
+    `Existing MCP config at ${configPath} differs from Glasstrace's template. Overwrite?`,
+    false
+  );
+  return answer ? "force-overwrite" : "skip";
+}
 async function promptYesNo(question, defaultValue) {
   if (!process.stdin.isTTY) {
     return defaultValue;
@@ -17019,17 +17696,17 @@ async function rollbackSteps(steps, projectRoot, state) {
     try {
       switch (step) {
         case "instrumentation": {
-          const instrPath = path7.join(projectRoot, "instrumentation.ts");
-          if (fs7.existsSync(instrPath)) {
-            const content = fs7.readFileSync(instrPath, "utf-8");
+          const instrPath = state?.instrumentationPath ?? path8.join(projectRoot, "instrumentation.ts");
+          if (fs8.existsSync(instrPath)) {
+            const content = fs8.readFileSync(instrPath, "utf-8");
             if (isInitCreatedInstrumentation(content)) {
-              fs7.unlinkSync(instrPath);
+              fs8.unlinkSync(instrPath);
             } else if (state?.originalInstrumentationContent !== void 0) {
-              fs7.writeFileSync(instrPath, state.originalInstrumentationContent, "utf-8");
+              fs8.writeFileSync(instrPath, state.originalInstrumentationContent, "utf-8");
             } else {
               const cleaned = removeRegisterGlasstrace(content);
               if (cleaned !== content) {
-                fs7.writeFileSync(instrPath, cleaned, "utf-8");
+                fs8.writeFileSync(instrPath, cleaned, "utf-8");
               }
             }
           }
@@ -17037,11 +17714,11 @@ async function rollbackSteps(steps, projectRoot, state) {
         }
         case "next-config": {
           for (const name of NEXT_CONFIG_NAMES) {
-            const configPath = path7.join(projectRoot, name);
-            if (!fs7.existsSync(configPath)) {
+            const configPath = path8.join(projectRoot, name);
+            if (!fs8.existsSync(configPath)) {
               continue;
             }
-            const content = fs7.readFileSync(configPath, "utf-8");
+            const content = fs8.readFileSync(configPath, "utf-8");
             if (!content.includes("withGlasstraceConfig")) {
               continue;
             }
@@ -17049,16 +17726,16 @@ async function rollbackSteps(steps, projectRoot, state) {
             const unwrapResult = isESM ? unwrapExport(content) : unwrapCJSExport(content);
             if (unwrapResult.unwrapped) {
               const cleaned = removeGlasstraceConfigImport(unwrapResult.content);
-              fs7.writeFileSync(configPath, cleanLeadingBlankLines2(cleaned), "utf-8");
+              fs8.writeFileSync(configPath, cleanLeadingBlankLines2(cleaned), "utf-8");
             }
             break;
           }
           break;
         }
         case "env-local": {
-          const envPath = path7.join(projectRoot, ".env.local");
-          if (fs7.existsSync(envPath)) {
-            const content = fs7.readFileSync(envPath, "utf-8");
+          const envPath = path8.join(projectRoot, ".env.local");
+          if (fs8.existsSync(envPath)) {
+            const content = fs8.readFileSync(envPath, "utf-8");
             const lines = content.split("\n");
             const filtered = lines.filter((line) => {
               const trimmed = line.trim();
@@ -17067,18 +17744,18 @@ async function rollbackSteps(steps, projectRoot, state) {
             if (filtered.length !== lines.length) {
               const result = filtered.join("\n");
               if (result.trim().length === 0) {
-                fs7.unlinkSync(envPath);
+                fs8.unlinkSync(envPath);
               } else {
-                fs7.writeFileSync(envPath, result, "utf-8");
+                fs8.writeFileSync(envPath, result, "utf-8");
               }
             }
           }
           break;
         }
         case "gitignore": {
-          const gitignorePath = path7.join(projectRoot, ".gitignore");
-          if (fs7.existsSync(gitignorePath)) {
-            const content = fs7.readFileSync(gitignorePath, "utf-8");
+          const gitignorePath = path8.join(projectRoot, ".gitignore");
+          if (fs8.existsSync(gitignorePath)) {
+            const content = fs8.readFileSync(gitignorePath, "utf-8");
             const lines = content.split("\n");
             const filtered = lines.filter(
               (line) => line.trim() !== ".glasstrace/"
@@ -17086,9 +17763,9 @@ async function rollbackSteps(steps, projectRoot, state) {
             if (filtered.length !== lines.length) {
               const result = filtered.join("\n");
               if (result.trim().length === 0) {
-                fs7.unlinkSync(gitignorePath);
+                fs8.unlinkSync(gitignorePath);
               } else {
-                fs7.writeFileSync(gitignorePath, result, "utf-8");
+                fs8.writeFileSync(gitignorePath, result, "utf-8");
               }
             }
           }
@@ -17115,39 +17792,83 @@ async function runInit(options) {
     errors.push(err instanceof Error ? err.message : String(err));
     return { exitCode: 1, summary, warnings, errors };
   }
-  const packageJsonPath = path7.join(projectRoot, "package.json");
-  if (!fs7.existsSync(packageJsonPath)) {
+  const packageJsonPath = path8.join(projectRoot, "package.json");
+  if (!fs8.existsSync(packageJsonPath)) {
     errors.push("No package.json found. Run this command from a Node.js project root.");
     return { exitCode: 1, summary, warnings, errors };
   }
   const rollbackState = { steps: [] };
   try {
-    const instrPath = path7.join(projectRoot, "instrumentation.ts");
-    if (fs7.existsSync(instrPath)) {
-      rollbackState.originalInstrumentationContent = fs7.readFileSync(instrPath, "utf-8");
+    const preResolved = resolveInstrumentationTarget(projectRoot);
+    if (!preResolved.conflict && preResolved.target !== null) {
+      rollbackState.instrumentationPath = preResolved.target;
+      if (fs8.existsSync(preResolved.target)) {
+        rollbackState.originalInstrumentationContent = fs8.readFileSync(
+          preResolved.target,
+          "utf-8"
+        );
+      }
     }
-    const instrResult = await scaffoldInstrumentation(projectRoot);
+    const instrResult = await scaffoldInstrumentation(projectRoot, {
+      // `--yes` implies non-interactive automation and must not hang on a
+      // merge confirmation prompt. `--force` skips the prompt explicitly
+      // (DISC-1247 Scenario 2c parity).
+      force: options.force === true || options.yes
+    });
+    if (instrResult.filePath !== void 0) {
+      rollbackState.instrumentationPath = instrResult.filePath;
+    }
+    const relativePath = instrResult.filePath !== void 0 ? path8.relative(projectRoot, instrResult.filePath) : "instrumentation.ts";
     switch (instrResult.action) {
       case "created":
-        summary.push("Created instrumentation.ts");
+        summary.push(`Created ${relativePath}`);
         rollbackState.steps.push("instrumentation");
         break;
       case "injected":
-        summary.push("Added registerGlasstrace() to existing instrumentation.ts");
+        summary.push(`Added registerGlasstrace() to existing ${relativePath}`);
+        rollbackState.steps.push("instrumentation");
+        break;
+      case "appended":
+        summary.push(
+          `Appended register() with registerGlasstrace() to ${relativePath}`
+        );
         rollbackState.steps.push("instrumentation");
         break;
       case "already-registered":
-        summary.push("Skipped instrumentation.ts (registerGlasstrace already present)");
+        summary.push(`Skipped ${relativePath} (registerGlasstrace already present)`);
         break;
+      case "skipped":
+        warnings.push(
+          `Preserved ${relativePath} (merge declined; re-run with --force to apply the merge without prompting)`
+        );
+        break;
+      case "conflict": {
+        const primary = instrResult.filePath !== void 0 ? path8.relative(projectRoot, instrResult.filePath) : "src/instrumentation.ts";
+        const competing = instrResult.conflictingPath !== void 0 ? path8.relative(projectRoot, instrResult.conflictingPath) : "instrumentation.ts";
+        await rollbackSteps(rollbackState.steps, projectRoot, rollbackState);
+        errors.push(
+          `Both ${primary} and ${competing} exist. Next.js's loader behavior is undefined when both are present.
+Merge your instrumentation into ${primary} and remove ${competing}, then re-run init.`
+        );
+        return { exitCode: 1, summary, warnings, errors };
+      }
       case "unrecognized":
         warnings.push(
-          'instrumentation.ts exists but has no recognizable register() function.\nAdd this import at the top of your file:\n\n  import { registerGlasstrace } from "@glasstrace/sdk";\n\nThen add this as the first statement in your register() function:\n\n  registerGlasstrace();\n'
+          `${relativePath} exists but has no recognizable register() function.
+Add this import at the top of your file:
+
+  import { registerGlasstrace } from "@glasstrace/sdk";
+
+Then add this as the first statement in your register() function:
+
+  registerGlasstrace();
+`
         );
         break;
     }
   } catch (err) {
     await rollbackSteps(rollbackState.steps, projectRoot, rollbackState);
-    errors.push(`Failed to write instrumentation.ts: ${err instanceof Error ? err.message : String(err)}`);
+    errors.push(`Failed to write instrumentation file: ${err instanceof Error ? err.message : String(err)}`);
     return { exitCode: 1, summary, warnings, errors };
   }
   try {
@@ -17170,10 +17891,20 @@ async function runInit(options) {
     return { exitCode: 1, summary, warnings, errors };
   }
   try {
+    const envPathForCheck = path8.join(projectRoot, ".env.local");
+    let existingDevKey = false;
+    if (fs8.existsSync(envPathForCheck)) {
+      const existingContent = fs8.readFileSync(envPathForCheck, "utf-8");
+      existingDevKey = isDevApiKey(readEnvLocalApiKey(existingContent));
+    }
     const envCreated = await scaffoldEnvLocal(projectRoot);
     if (envCreated) {
       summary.push("Updated .env.local with Glasstrace configuration");
       rollbackState.steps.push("env-local");
+    } else if (existingDevKey) {
+      summary.push(
+        "Preserved existing .env.local (GLASSTRACE_API_KEY contains a claimed dev key)"
+      );
     } else {
       summary.push("Skipped .env.local (GLASSTRACE_API_KEY already configured)");
     }
@@ -17198,19 +17929,30 @@ async function runInit(options) {
   const ciEnv = process.env["CI"];
   const isCI = typeof ciEnv === "string" && ciEnv.trim() !== "" && ciEnv.toLowerCase() !== "false" && ciEnv.trim() !== "0" || process.env["GITHUB_ACTIONS"] === "true";
   try {
+    const preExistingAnonKey = await readAnonKey(projectRoot);
     const anonKey = await getOrCreateAnonKey(projectRoot);
+    if (preExistingAnonKey !== null) {
+      summary.push("Preserved existing .glasstrace/anon_key");
+    }
     let anyConfigWritten = false;
     if (isCI) {
       const genericAgent = {
         name: "generic",
-        mcpConfigPath: path7.join(projectRoot, ".glasstrace", "mcp.json"),
+        mcpConfigPath: path8.join(projectRoot, ".glasstrace", "mcp.json"),
         infoFilePath: null,
         cliAvailable: false,
         registrationCommand: null
       };
       const genericConfig = generateMcpConfig(genericAgent, MCP_ENDPOINT, anonKey);
-      await writeMcpConfig(genericAgent, genericConfig, projectRoot);
-      if (genericAgent.mcpConfigPath !== null && fs7.existsSync(genericAgent.mcpConfigPath)) {
+      const decision = await decideMcpConfigAction({
+        configPath: genericAgent.mcpConfigPath,
+        expectedContent: genericConfig,
+        force: true
+      });
+      if (decision !== "skip") {
+        await writeMcpConfig(genericAgent, genericConfig, projectRoot);
+      }
+      if (genericAgent.mcpConfigPath !== null && fs8.existsSync(genericAgent.mcpConfigPath)) {
         anyConfigWritten = true;
         summary.push("Created .glasstrace/mcp.json (CI mode)");
       }
@@ -17224,14 +17966,14 @@ async function runInit(options) {
         );
         const genericAgent = {
           name: "generic",
-          mcpConfigPath: path7.join(projectRoot, ".glasstrace", "mcp.json"),
+          mcpConfigPath: path8.join(projectRoot, ".glasstrace", "mcp.json"),
           infoFilePath: null,
           cliAvailable: false,
           registrationCommand: null
         };
         const genericConfig = generateMcpConfig(genericAgent, MCP_ENDPOINT, anonKey);
         await writeMcpConfig(genericAgent, genericConfig, projectRoot);
-        if (genericAgent.mcpConfigPath !== null && fs7.existsSync(genericAgent.mcpConfigPath)) {
+        if (genericAgent.mcpConfigPath !== null && fs8.existsSync(genericAgent.mcpConfigPath)) {
           anyConfigWritten = true;
         }
         agents = [];
@@ -17240,8 +17982,22 @@ async function runInit(options) {
       for (const agent of agents) {
         try {
           const configContent = generateMcpConfig(agent, MCP_ENDPOINT, anonKey);
+          const decision = await decideMcpConfigAction({
+            configPath: agent.mcpConfigPath,
+            expectedContent: configContent,
+            force: options.force === true || options.yes
+          });
+          if (decision === "skip") {
+            summary.push(
+              `Preserved existing ${agent.mcpConfigPath ?? agent.name} (user declined overwrite)`
+            );
+            if (agent.mcpConfigPath !== null && fs8.existsSync(agent.mcpConfigPath)) {
+              anyConfigWritten = true;
+            }
+            continue;
+          }
           await writeMcpConfig(agent, configContent, projectRoot);
-          const configExists = agent.mcpConfigPath !== null && fs7.existsSync(agent.mcpConfigPath);
+          const configExists = agent.mcpConfigPath !== null && fs8.existsSync(agent.mcpConfigPath);
           if (!configExists) {
             continue;
           }
@@ -17305,17 +18061,76 @@ async function runInit(options) {
       warnings.push(`Import graph scan failed: ${err instanceof Error ? err.message : String(err)}. You can run it later.`);
     }
   }
+  const skipVerify = process.env["GLASSTRACE_SKIP_INIT_VERIFY"] === "1" || process.env["GLASSTRACE_SKIP_INIT_VERIFY"] === "true" || process.env["VITEST"] === "true";
+  if (!skipVerify && !isCI) {
+    const verifyResult = await verifyAnonKeyRegistration(projectRoot);
+    if (verifyResult.outcome === "failed") {
+      errors.push(verifyResult.error);
+      return { exitCode: 2, summary, warnings, errors };
+    }
+    if (verifyResult.outcome === "verified") {
+      summary.push("Verified anon key registration with Glasstrace API");
+    } else {
+      summary.push("Skipped anon key verification (no anon key on disk)");
+    }
+  }
   return { exitCode: 0, summary, warnings, errors };
 }
+async function verifyAnonKeyRegistration(projectRoot) {
+  const anonKey = await readAnonKey(projectRoot);
+  if (anonKey === null) {
+    return { outcome: "skipped" };
+  }
+  let devKey;
+  try {
+    const envPath = path8.join(projectRoot, ".env.local");
+    if (fs8.existsSync(envPath)) {
+      const envContent = fs8.readFileSync(envPath, "utf-8");
+      const effective = readEnvLocalApiKey(envContent);
+      if (effective !== null && isDevApiKey(effective)) {
+        devKey = effective;
+      }
+    }
+  } catch {
+  }
+  const baseConfig = resolveConfig({ apiKey: devKey });
+  const config2 = { ...baseConfig, apiKey: devKey };
+  const sdkVersion = true ? "0.16.0" : "0.0.0-dev";
+  const result = await verifyInitReachable(config2, anonKey, sdkVersion);
+  if (result.ok) {
+    return { outcome: "verified" };
+  }
+  const hint = "Run 'npx glasstrace status' or 'npx glasstrace doctor' to diagnose.";
+  switch (result.reason) {
+    case "transport":
+      return {
+        outcome: "failed",
+        error: `Glasstrace init verification failed: fetch failed: ${result.detail}. ${hint}`
+      };
+    case "rejected":
+      return {
+        outcome: "failed",
+        error: `Glasstrace init verification failed: server rejected the key (HTTP ${result.status}). ${hint}`
+      };
+    case "malformed":
+      return {
+        outcome: "failed",
+        error: `Glasstrace init verification failed: server returned malformed response. ${hint}`
+      };
+  }
+}
 function parseArgs(argv) {
   const args = argv.slice(2);
   let yes = false;
   let coverageMap = false;
+  let force = false;
   for (const arg of args) {
     if (arg === "--yes" || arg === "-y") {
       yes = true;
     } else if (arg === "--coverage-map") {
       coverageMap = true;
+    } else if (arg === "--force") {
+      force = true;
     }
   }
   if (!process.stdin.isTTY) {
@@ -17324,11 +18139,12 @@ function parseArgs(argv) {
   return {
     projectRoot: process.cwd(),
     yes,
-    coverageMap
+    coverageMap,
+    force
   };
 }
 var scriptPath = typeof process !== "undefined" && process.argv[1] !== void 0 ? process.argv[1].replace(/\\/g, "/") : void 0;
-var scriptBasename = scriptPath !== void 0 ? path7.basename(scriptPath) : void 0;
+var scriptBasename = scriptPath !== void 0 ? path8.basename(scriptPath) : void 0;
 var isDirectExecution = scriptPath !== void 0 && (scriptPath.endsWith("/cli/init.js") || scriptPath.endsWith("/cli/init.ts") || scriptBasename === "glasstrace");
 if (isDirectExecution) {
   if (!meetsNodeVersion(20)) {
@@ -17366,47 +18182,84 @@ Usage: glasstrace mcp add [--force] [--dry-run]
       process.exit(1);
     }
   } else if (subcommand === void 0 || subcommand === "init" || subcommand.startsWith("-")) {
-    const options = parseArgs(process.argv);
-    runInit(options).then((result) => {
-      if (result.errors.length > 0) {
-        for (const err of result.errors) {
-          process.stderr.write(`Error: ${err}
-`);
-        }
+    const forwardedArgs = process.argv.slice(subcommand === "init" ? 3 : 2);
+    if (forwardedArgs.includes("--validate")) {
+      let validateProjectRoot = process.cwd();
+      try {
+        validateProjectRoot = resolveProjectRoot(validateProjectRoot).projectRoot;
+      } catch {
       }
-      if (result.warnings.length > 0) {
-        for (const warn of result.warnings) {
-          process.stderr.write(`Warning: ${warn}
+      Promise.resolve().then(() => (init_validate(), validate_exports)).then(({ runValidate: runValidate2 }) => runValidate2({ projectRoot: validateProjectRoot })).then((result) => {
+        for (const line of result.summary) {
+          process.stderr.write(`${line}
 `);
         }
-      }
-      if (result.summary.length > 0) {
-        process.stderr.write("\nGlasstrace initialized successfully!\n\n");
-        for (const line of result.summary) {
-          process.stderr.write(`  - ${line}
+        for (const issue2 of result.issues) {
+          process.stderr.write(`  - ${issue2.message}
 `);
+          if (issue2.fix) {
+            process.stderr.write(`      Fix: ${issue2.fix}
+`);
+          }
         }
-        process.stderr.write("\nNext steps:\n");
-        process.stderr.write("  1. Start your Next.js dev server\n");
+        process.exit(result.exitCode);
+      }).catch((err) => {
         process.stderr.write(
-          "  2. Glasstrace works immediately in anonymous mode\n"
+          `Fatal error: ${err instanceof Error ? err.message : String(err)}
+`
         );
+        process.exit(1);
+      });
+    } else {
+      const options = parseArgs(process.argv);
+      runInit(options).then((result) => {
+        if (result.errors.length > 0) {
+          for (const err of result.errors) {
+            process.stderr.write(`Error: ${err}
+`);
+          }
+        }
+        if (result.warnings.length > 0) {
+          for (const warn of result.warnings) {
+            process.stderr.write(`Warning: ${warn}
+`);
+          }
+        }
+        if (result.summary.length > 0) {
+          if (result.exitCode === 0) {
+            process.stderr.write("\nGlasstrace initialized successfully!\n\n");
+          } else {
+            process.stderr.write("\nGlasstrace init completed with errors.\n\n");
+          }
+          for (const line of result.summary) {
+            process.stderr.write(`  - ${line}
+`);
+          }
+          if (result.exitCode === 0) {
+            process.stderr.write("\nNext steps:\n");
+            process.stderr.write("  1. Start your Next.js dev server\n");
+            process.stderr.write(
+              "  2. Glasstrace works immediately in anonymous mode\n"
+            );
+            process.stderr.write(
+              "  3. To link to your account, set GLASSTRACE_API_KEY in .env.local\n\n"
+            );
+          }
+        }
+        process.exit(result.exitCode);
+      }).catch((err) => {
         process.stderr.write(
-          "  3. To link to your account, set GLASSTRACE_API_KEY in .env.local\n\n"
-        );
-      }
-      process.exit(result.exitCode);
-    }).catch((err) => {
-      process.stderr.write(
-        `Fatal error: ${err instanceof Error ? err.message : String(err)}
+          `Fatal error: ${err instanceof Error ? err.message : String(err)}
 `
-      );
-      process.exit(1);
-    });
+        );
+        process.exit(1);
+      });
+    }
   } else if (subcommand === "uninit") {
     const remainingArgs = process.argv.slice(3);
     const dryRun = remainingArgs.includes("--dry-run");
-    Promise.resolve().then(() => (init_uninit(), uninit_exports)).then(({ runUninit: runUninit2 }) => runUninit2({ projectRoot: process.cwd(), dryRun })).then((result) => {
+    const force = remainingArgs.includes("--force");
+    Promise.resolve().then(() => (init_uninit(), uninit_exports)).then(({ runUninit: runUninit2 }) => runUninit2({ projectRoot: process.cwd(), dryRun, force })).then((result) => {
       if (result.errors.length > 0) {
         for (const err of result.errors) {
           process.stderr.write(`Error: ${err}
@@ -17480,8 +18333,8 @@ Usage: glasstrace mcp add [--force] [--dry-run]
       `Unknown command: ${subcommand}
 
 Usage:
-  glasstrace init [--yes] [--coverage-map]
-  glasstrace uninit [--dry-run]
+  glasstrace init [--yes] [--coverage-map] [--force] [--validate]
+  glasstrace uninit [--dry-run] [--force]
   glasstrace status [--json]
   glasstrace mcp add [--force] [--dry-run]
 `
@@ -17491,8 +18344,10 @@ Usage:
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  decideMcpConfigAction,
   meetsNodeVersion,
   rollbackSteps,
-  runInit
+  runInit,
+  verifyAnonKeyRegistration
 });
 //# sourceMappingURL=init.cjs.map