@codacy/verity-cli 0.27.2 → 0.28.1-experimental.9155758

package/bin/verity.js

@@ -10327,10 +10327,6 @@ var {
 // src/commands/auth.ts
 var import_node_child_process4 = require("node:child_process");
 
-// src/lib/auth.ts
-var import_promises = require("node:fs/promises");
-var import_node_child_process2 = require("node:child_process");
-
 // src/constants.ts
 var import_node_child_process = require("node:child_process");
 var import_node_path = require("node:path");
@@ -10347,7 +10343,6 @@ function repoRoot() {
 }
 var VERITY_DIR = ".verity";
 var CREDENTIALS_FILE = `${VERITY_DIR}/credentials`;
-var GLOBAL_CREDENTIALS_FILE = `${process.env.HOME}/.verity/credentials`;
 var DEBOUNCE_FILE = `${VERITY_DIR}/.last-analysis`;
 var ITERATION_FILE = `${VERITY_DIR}/.iteration-count`;
 var HASH_FILE = `${VERITY_DIR}/.last-pass-hash`;
@@ -10473,7 +10468,7 @@ var SECURITY_PATTERNS = [
   /Dockerfile/
 ];
 var PROD_SERVICE_URL = "https://ofcamwrjwrkazqvdchko.supabase.co/functions/v1";
-var DEFAULT_SERVICE_URL = "".length > 0 ? "" : PROD_SERVICE_URL;
+var DEFAULT_SERVICE_URL = "https://wukeddyzpijoegyajtnc.supabase.co/functions/v1".length > 0 ? "https://wukeddyzpijoegyajtnc.supabase.co/functions/v1" : PROD_SERVICE_URL;
 var GITHUB_CLIENT_ID = "Iv23li88HxAi3ZrbYzWh";
 var GITHUB_DEVICE_CODE_URL = "https://github.com/login/device/code";
 var GITHUB_ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token";
@@ -10551,6 +10546,13 @@ function rotateIfNeeded(file) {
 }
 
 // src/lib/api-client.ts
+function describeFetchError(err, url) {
+  const message = err instanceof Error ? err.message : String(err);
+  const cause = err?.cause;
+  const causeBits = [cause?.code, cause?.hostname].filter(Boolean).join(" ");
+  const detail = causeBits || (cause?.message && cause.message !== message ? cause.message : "");
+  return `${message}${detail ? ` (${detail})` : ""} \u2014 could not reach ${url}`;
+}
 async function apiRequest(options) {
   const {
     method,
@@ -10606,7 +10608,7 @@ async function apiRequest(options) {
     const duration2 = Date.now() - startedAt;
     const isTimeout = err instanceof DOMException && err.name === "TimeoutError";
     const category = isTimeout ? "timeout" : "network";
-    const error = isTimeout ? `Request timed out after ${timeout}ms` : `Network error: ${err.message}`;
+    const error = isTimeout ? `Request timed out after ${timeout}ms (${url})` : `Network error: ${describeFetchError(err, url)}`;
     logHttpCall({ ...logBase, duration_ms: duration2, http_status: null, category, error });
     return { ok: false, error, category, http_status: null };
   }
@@ -10665,111 +10667,287 @@ function analyzeRequest(options) {
   });
 }
 
-// src/lib/auth.ts
-function parseIdentity(content) {
-  const idMatch = content.match(/^user_id:\s*(\d+)/m);
-  const emailMatch = content.match(/^email:\s*(\S+)/m);
+// src/lib/service-url.ts
+var import_promises2 = require("node:fs/promises");
+
+// src/lib/credentials.ts
+var import_promises = require("node:fs/promises");
+var import_node_path2 = require("node:path");
+var import_node_child_process2 = require("node:child_process");
+function globalCredentialsPath() {
+  return `${process.env.HOME}/.verity/credentials`;
+}
+function currentRemote() {
+  try {
+    return (0, import_node_child_process2.execSync)("git remote get-url origin", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return "";
+  }
+}
+var TOKEN_RE = /token:\s*((?:gate_|verity_)[a-f0-9]+)/;
+function parseCredentialLine(line) {
+  const idx = line.indexOf(" token:");
+  const remote = idx === -1 ? "" : line.slice(0, idx).trim();
+  const rest = idx === -1 ? line : line.slice(idx);
+  const tokenMatch = rest.match(TOKEN_RE);
+  if (!tokenMatch) return null;
+  const serviceUrl = rest.match(/service_url:\s*(https?:\/\/\S+)/)?.[1];
+  const userIdRaw = rest.match(/user_id:\s*(\d+)/)?.[1];
+  const email = rest.match(/email:\s*(\S+)/)?.[1];
   return {
-    userId: idMatch ? Number(idMatch[1]) : void 0,
-    email: emailMatch ? emailMatch[1] : void 0
+    remote,
+    rec: {
+      token: tokenMatch[1],
+      serviceUrl,
+      userId: userIdRaw != null ? Number(userIdRaw) : void 0,
+      email
+    }
   };
 }
-async function resolveToken(flagToken) {
-  if (flagToken) {
-    return { ok: true, data: { token: flagToken, source: "flag" } };
+function encodeRemoteKey(remote) {
+  return remote.replace(
+    /[%\x00-\x20\x7f]/g,
+    (c) => "%" + c.charCodeAt(0).toString(16).padStart(2, "0").toUpperCase()
+  );
+}
+function serializeCredential(remote, rec) {
+  const key = encodeRemoteKey(remote);
+  const out = [key ? `${key} token: ${rec.token}` : `token: ${rec.token}`];
+  if (rec.serviceUrl) out.push(`service_url: ${rec.serviceUrl}`);
+  if (rec.userId != null) out.push(`user_id: ${rec.userId}`);
+  if (rec.email) out.push(`email: ${rec.email}`);
+  return out.join(" ");
+}
+async function readGlobalCredential(remote) {
+  let content;
+  try {
+    content = await (0, import_promises.readFile)(globalCredentialsPath(), "utf-8");
+  } catch {
+    return null;
   }
-  const envToken = process.env.VERITY_TOKEN;
-  if (envToken) {
-    return { ok: true, data: { token: envToken, source: "env" } };
+  const lines = content.split("\n");
+  const key = encodeRemoteKey(remote);
+  if (key) {
+    let last = null;
+    for (const line of lines) {
+      const parsed = parseCredentialLine(line);
+      if (parsed && parsed.remote === key) last = parsed.rec;
+    }
+    if (last) return last;
+  }
+  let plain = null;
+  for (const line of lines) {
+    const parsed = parseCredentialLine(line);
+    if (parsed && parsed.remote === "") plain = parsed.rec;
   }
+  return plain;
+}
+async function upsertGlobalCredential(remote, rec) {
+  const path = globalCredentialsPath();
+  await (0, import_promises.mkdir)((0, import_node_path2.dirname)(path), { recursive: true });
+  let content = "";
   try {
-    const content = await (0, import_promises.readFile)(projectPath(CREDENTIALS_FILE), "utf-8");
-    const match = content.match(/token:\s*((?:gate_|verity_)[a-f0-9]+)/);
-    if (match) {
-      return { ok: true, data: { token: match[1], source: "local", ...parseIdentity(content) } };
-    }
+    content = await (0, import_promises.readFile)(path, "utf-8");
   } catch {
   }
-  const globalCredentials = `${process.env.HOME}/.verity/credentials`;
-  try {
-    const content = await (0, import_promises.readFile)(globalCredentials, "utf-8");
-    let remote = "";
-    try {
-      remote = (0, import_node_child_process2.execSync)("git remote get-url origin", { encoding: "utf-8" }).trim();
-    } catch {
-    }
-    if (remote) {
-      const remoteLine = content.split("\n").find((l) => l.includes(remote));
-      if (remoteLine) {
-        const match = remoteLine.match(/token:\s*((?:gate_|verity_)[a-f0-9]+)/);
-        if (match) {
-          return { ok: true, data: { token: match[1], source: "global" } };
-        }
+  const line = serializeCredential(remote, rec);
+  const key = encodeRemoteKey(remote);
+  const kept = [];
+  let replaced = false;
+  for (const existing of content ? content.split("\n") : []) {
+    const parsed = parseCredentialLine(existing);
+    const matches = parsed !== null && parsed.remote === key;
+    if (matches) {
+      if (!replaced) {
+        kept.push(line);
+        replaced = true;
       }
+      continue;
     }
-    const plainMatch = content.match(/^token:\s*((?:gate_|verity_)[a-f0-9]+)/m);
-    if (plainMatch) {
-      return { ok: true, data: { token: plainMatch[1], source: "global" } };
-    }
-  } catch {
+    kept.push(existing);
   }
-  return { ok: false, error: "No Verity token found. Run /verity-setup to configure." };
-}
-async function whoami(token, serviceUrl, verbose) {
-  return apiRequest({
-    method: "GET",
-    path: "/auth/whoami",
-    serviceUrl,
-    token,
-    verbose
+  while (kept.length && kept[kept.length - 1].trim() === "") kept.pop();
+  if (!replaced) kept.push(line);
+  const body = kept.join("\n") + "\n";
+  await (0, import_promises.writeFile)(path, body, { mode: 384 });
+  await (0, import_promises.chmod)(path, 384).catch(() => {
   });
 }
-
-// src/lib/service-url.ts
-var import_promises2 = require("node:fs/promises");
-async function resolveServiceUrl(flagUrl) {
-  if (flagUrl) {
-    return { ok: true, data: flagUrl };
+function parseLocalCredentialFile(content) {
+  const tokenMatch = content.match(/token:\s*((?:gate_|verity_)[a-f0-9]+)/);
+  if (!tokenMatch) return null;
+  const userIdMatch = content.match(/^user_id:\s*(\d+)/m);
+  return {
+    token: tokenMatch[1],
+    serviceUrl: content.match(/service_url:\s*(https?:\/\/\S+)/)?.[1],
+    userId: userIdMatch ? Number(userIdMatch[1]) : void 0,
+    email: content.match(/^email:\s*(\S+)/m)?.[1]
+  };
+}
+async function readLegacyLocalCredential() {
+  try {
+    return parseLocalCredentialFile(await (0, import_promises.readFile)(projectPath(CREDENTIALS_FILE), "utf-8"));
+  } catch {
+    return null;
   }
-  const envUrl = process.env.VERITY_SERVICE_URL;
-  if (envUrl) {
-    return { ok: true, data: envUrl };
+}
+async function foldLegacyLocalCredential(remoteArg) {
+  let content;
+  try {
+    content = await (0, import_promises.readFile)(projectPath(CREDENTIALS_FILE), "utf-8");
+  } catch {
+    return false;
+  }
+  const local = parseLocalCredentialFile(content);
+  if (!local) {
+    await (0, import_promises.unlink)(projectPath(CREDENTIALS_FILE)).catch(() => {
+    });
+    return false;
+  }
+  const remote = remoteArg ?? currentRemote();
+  if (!remote) {
+    return false;
   }
+  const existing = await readGlobalCredential(remote);
+  const merged = {
+    token: existing?.token ?? local.token,
+    serviceUrl: existing?.serviceUrl ?? local.serviceUrl,
+    userId: existing?.userId ?? local.userId,
+    email: existing?.email ?? local.email
+  };
   try {
-    const creds = await (0, import_promises2.readFile)(projectPath(CREDENTIALS_FILE), "utf-8");
-    const match = creds.match(/service_url:\s*(https?:\/\/[^\s]+)/);
-    if (match) {
-      return { ok: true, data: match[1] };
-    }
+    await upsertGlobalCredential(remote, merged);
   } catch {
+    return false;
   }
+  await (0, import_promises.unlink)(projectPath(CREDENTIALS_FILE)).catch(() => {
+  });
+  return true;
+}
+
+// src/lib/service-url.ts
+async function serviceUrlFromCredentials() {
+  const rec = await readGlobalCredential(currentRemote());
+  return rec?.serviceUrl ?? null;
+}
+async function serviceUrlFromVerityMd() {
   try {
     const content = await (0, import_promises2.readFile)(projectPath(VERITY_MD_FILE), "utf-8");
-    const boldMatch = content.match(/\*\*url\*\*/i);
-    if (boldMatch) {
-      const lineMatch = content.split("\n").find((l) => /\*\*url\*\*/i.test(l));
-      if (lineMatch) {
-        const urlMatch = lineMatch.match(/https:\/\/[^\s]+/);
-        if (urlMatch) {
-          return { ok: true, data: urlMatch[0] };
-        }
-      }
+    const boldLine = content.split("\n").find((l) => /\*\*url\*\*/i.test(l));
+    if (boldLine) {
+      const urlMatch = boldLine.match(/https:\/\/[^\s]+/);
+      if (urlMatch) return urlMatch[0];
     }
     const plainLine = content.split("\n").find((l) => /(?:url|service)\s*:/i.test(l));
     if (plainLine) {
       const urlMatch = plainLine.match(/https:\/\/[^\s]+/);
-      if (urlMatch) {
-        return { ok: true, data: urlMatch[0] };
-      }
+      if (urlMatch) return urlMatch[0];
     }
   } catch {
   }
+  return null;
+}
+async function resolveServiceUrlDetailed(flagUrl) {
+  if (flagUrl) {
+    return { ok: true, data: { url: flagUrl, source: "flag" } };
+  }
+  const envUrl = process.env.VERITY_SERVICE_URL;
+  if (envUrl) {
+    return { ok: true, data: { url: envUrl, source: "env" } };
+  }
+  const credsUrl = await serviceUrlFromCredentials();
+  if (credsUrl) {
+    return { ok: true, data: { url: credsUrl, source: "credentials" } };
+  }
+  const mdUrl = await serviceUrlFromVerityMd();
+  if (mdUrl) {
+    return { ok: true, data: { url: mdUrl, source: "verity_md" } };
+  }
   return { ok: false, error: "No Verity service URL found. Run /verity-setup to configure." };
 }
+async function resolveServiceUrl(flagUrl) {
+  const result = await resolveServiceUrlDetailed(flagUrl);
+  return result.ok ? { ok: true, data: result.data.url } : result;
+}
+function isHealCandidate(resolved) {
+  return (resolved.source === "credentials" || resolved.source === "verity_md") && resolved.url !== DEFAULT_SERVICE_URL;
+}
+
+// src/lib/auth.ts
+async function resolveToken(flagToken) {
+  if (flagToken) {
+    return { ok: true, data: { token: flagToken, source: "flag" } };
+  }
+  const envToken = process.env.VERITY_TOKEN;
+  if (envToken) {
+    return { ok: true, data: { token: envToken, source: "env" } };
+  }
+  const rec = await readGlobalCredential(currentRemote());
+  if (rec) {
+    return {
+      ok: true,
+      data: { token: rec.token, source: "global", userId: rec.userId, email: rec.email }
+    };
+  }
+  const local = await readLegacyLocalCredential();
+  if (local) {
+    return {
+      ok: true,
+      data: { token: local.token, source: "local", userId: local.userId, email: local.email }
+    };
+  }
+  return { ok: false, error: "No Verity token found. Run /verity-setup to configure." };
+}
+async function whoami(token, serviceUrl, verbose) {
+  return apiRequest({
+    method: "GET",
+    path: "/auth/whoami",
+    serviceUrl,
+    token,
+    verbose,
+    cmd: "whoami"
+  });
+}
+async function probeService(serviceUrl, verbose) {
+  const res = await apiRequest({
+    method: "GET",
+    path: "/auth/whoami",
+    serviceUrl,
+    verbose,
+    timeout: 5e3,
+    cmd: "probe"
+  });
+  if (res.ok || res.http_status != null) return { reachable: true };
+  return { reachable: false, dnsDead: /\bENOTFOUND\b/.test(res.error), error: res.error };
+}
+async function maybeHealServiceUrl(resolution, verbose) {
+  if (!isHealCandidate(resolution)) {
+    return { serviceUrl: resolution.url, healed: false };
+  }
+  const probe = await probeService(resolution.url, verbose);
+  if (probe.reachable) {
+    return { serviceUrl: resolution.url, healed: false };
+  }
+  const from = resolution.source === "credentials" ? "~/.verity/credentials" : "VERITY.md";
+  printWarn(`Your configured Verity service URL is unreachable: ${resolution.url}`);
+  printInfo(`  (${probe.error})`);
+  if (probe.dnsDead && (await probeService(DEFAULT_SERVICE_URL, verbose)).reachable) {
+    printInfo(`  The hostname no longer exists \u2014 the URL in ${from} is stale (e.g. a retired preview backend).`);
+    printInfo(`  Falling back to the default Verity service: ${DEFAULT_SERVICE_URL}`);
+    if (resolution.source === "verity_md") {
+      printWarn(`  Note: VERITY.md still contains the stale URL \u2014 update it to ${DEFAULT_SERVICE_URL} and commit.`);
+    }
+    return { serviceUrl: DEFAULT_SERVICE_URL, healed: true };
+  }
+  printInfo("  Continuing against the configured URL. If it is stale, log in against the default with:");
+  printInfo(`    VERITY_SERVICE_URL=${DEFAULT_SERVICE_URL} verity login`);
+  return { serviceUrl: resolution.url, healed: false };
+}
 
 // src/lib/register.ts
-var import_promises3 = require("node:fs/promises");
-var import_node_path3 = require("node:path");
 var readline = __toESM(require("node:readline/promises"));
 
 // src/lib/provider-auth.ts
@@ -10879,7 +11057,7 @@ async function githubDeviceFlow() {
 // src/lib/git.ts
 var import_node_child_process3 = require("node:child_process");
 var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
+var import_node_path3 = require("node:path");
 function resolveFile(relpath) {
   if ((0, import_node_fs2.existsSync)(relpath)) return relpath;
   if ((0, import_node_fs2.existsSync)(".claude/worktrees")) {
@@ -10887,7 +11065,7 @@ function resolveFile(relpath) {
       const entries = (0, import_node_fs2.readdirSync)(".claude/worktrees", { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const candidate = (0, import_node_path2.join)(".claude/worktrees", entry.name, relpath);
+        const candidate = (0, import_node_path3.join)(".claude/worktrees", entry.name, relpath);
         if ((0, import_node_fs2.existsSync)(candidate)) return candidate;
       }
     } catch {
@@ -10928,7 +11106,7 @@ function readBaselineSha() {
 function writeBaselineSha(sha) {
   if (!SHA_RE.test(sha)) return;
   try {
-    (0, import_node_fs2.mkdirSync)((0, import_node_path2.dirname)(BASELINE_SHA_FILE), { recursive: true });
+    (0, import_node_fs2.mkdirSync)((0, import_node_path3.dirname)(BASELINE_SHA_FILE), { recursive: true });
     (0, import_node_fs2.writeFileSync)(BASELINE_SHA_FILE, sha);
   } catch {
   }
@@ -11022,7 +11200,7 @@ function getWorktreeFiles() {
     const entries = (0, import_node_fs2.readdirSync)(worktreeDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const wtDir = (0, import_node_path2.join)(worktreeDir, entry.name);
+      const wtDir = (0, import_node_path3.join)(worktreeDir, entry.name);
       scanDir(wtDir, wtDir, fiveMinAgo, result);
     }
   } catch {
@@ -11033,12 +11211,12 @@ function scanDir(baseDir, dir, minMtime, result) {
   try {
     const entries = (0, import_node_fs2.readdirSync)(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = (0, import_node_path2.join)(dir, entry.name);
+      const fullPath = (0, import_node_path3.join)(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name === ".git") continue;
         scanDir(baseDir, fullPath, minMtime, result);
       } else if (entry.isFile()) {
-        const ext = (0, import_node_path2.extname)(entry.name).slice(1);
+        const ext = (0, import_node_path3.extname)(entry.name).slice(1);
         if (!ANALYZABLE_EXTENSIONS.has(ext)) continue;
         try {
           const stat3 = (0, import_node_fs2.statSync)(fullPath);
@@ -11055,13 +11233,13 @@ function scanDir(baseDir, dir, minMtime, result) {
 }
 function filterAnalyzable(files) {
   return files.filter((f) => {
-    const ext = (0, import_node_path2.extname)(f).slice(1);
+    const ext = (0, import_node_path3.extname)(f).slice(1);
     return ANALYZABLE_EXTENSIONS.has(ext);
   });
 }
 function filterReviewable(files) {
   return files.filter((f) => {
-    const ext = (0, import_node_path2.extname)(f).slice(1);
+    const ext = (0, import_node_path3.extname)(f).slice(1);
     if (ANALYZABLE_EXTENSIONS.has(ext)) return false;
     if (REVIEWABLE_EXTENSIONS.has(ext)) return true;
     const basename4 = f.split("/").pop() ?? "";
@@ -11185,7 +11363,8 @@ async function registerProject(opts) {
     serviceUrl: opts.serviceUrl,
     body: { project_name: opts.projectName, git_remote_url: opts.remote },
     extraHeaders: { "X-Provider-Token": providerToken },
-    verbose: opts.verbose
+    verbose: opts.verbose,
+    cmd: "register"
   });
   if (!result.ok) {
     return { ok: false, error: result.error };
@@ -11193,38 +11372,19 @@ async function registerProject(opts) {
   const { project_id, token, service_url, user } = result.data;
   const userId = result.data.user_id ?? user?.id;
   const email = user?.email;
-  const identityLines = (userId != null ? `user_id: ${userId}
-` : "") + (email ? `email: ${email}
-` : "");
   try {
-    await (0, import_promises3.mkdir)(VERITY_DIR, { recursive: true });
-    await (0, import_promises3.writeFile)(
-      CREDENTIALS_FILE,
-      `token: ${token}
-service_url: ${service_url}
-${identityLines}`,
-      { mode: 384 }
-    );
-    await (0, import_promises3.chmod)(CREDENTIALS_FILE, 384).catch(() => {
+    await upsertGlobalCredential(opts.remote, {
+      token,
+      serviceUrl: service_url,
+      userId: userId ?? void 0,
+      email
     });
   } catch (err) {
     return {
       ok: false,
-      error: `Registered with the Verity service, but could not save credentials to ${CREDENTIALS_FILE}: ${err.message}. Check filesystem permissions and re-run "verity auth register".`
+      error: `Registered with the Verity service, but could not save credentials to ~/.verity/credentials: ${err.message}. Check filesystem permissions and re-run "verity auth register".`
     };
   }
-  try {
-    await (0, import_promises3.mkdir)((0, import_node_path3.dirname)(GLOBAL_CREDENTIALS_FILE), { recursive: true });
-    await (0, import_promises3.appendFile)(
-      GLOBAL_CREDENTIALS_FILE,
-      `${opts.remote} token: ${token}
-`,
-      { mode: 384 }
-    );
-    await (0, import_promises3.chmod)(GLOBAL_CREDENTIALS_FILE, 384).catch(() => {
-    });
-  } catch {
-  }
   return { ok: true, data: { projectId: project_id, serviceUrl: service_url, email, userId } };
 }
 
@@ -11321,14 +11481,18 @@ var import_node_path4 = require("node:path");
 function registerLoginCommand(program2) {
   program2.command("login").description("Log in to Verity (link your GitHub identity so runs and memory are saved)").option("--force", "Re-authenticate even if already logged in").action(async (opts) => {
     const globals = program2.opts();
-    const urlResult = await resolveServiceUrl(globals.serviceUrl);
+    const urlResult = await resolveServiceUrlDetailed(globals.serviceUrl);
     if (!urlResult.ok) {
       printError(urlResult.error);
       process.exit(1);
     }
-    const serviceUrl = urlResult.data;
+    const heal = await maybeHealServiceUrl(urlResult.data, globals.verbose);
+    const serviceUrl = heal.serviceUrl;
+    if (heal.healed) {
+      printInfo("  Completing login re-registers this project and updates ~/.verity/credentials.");
+    }
     const existing = await resolveToken(globals.token);
-    if (existing.ok && !opts.force) {
+    if (existing.ok && !opts.force && !heal.healed) {
       if (existing.data.userId != null) {
         printInfo(`Already logged in as ${existing.data.email ?? `user #${existing.data.userId}`}. \u2713`);
         printInfo("  Re-authenticate with: verity login --force");
@@ -11373,11 +11537,11 @@ function registerLoginCommand(program2) {
 }
 
 // src/lib/hooks.ts
-var import_promises5 = require("node:fs/promises");
+var import_promises4 = require("node:fs/promises");
 var import_node_path6 = require("node:path");
 
 // src/lib/json-file.ts
-var import_promises4 = require("node:fs/promises");
+var import_promises3 = require("node:fs/promises");
 var import_node_path5 = require("node:path");
 function jsonSemanticEqual(a, b) {
   if (a === b) return true;
@@ -11411,7 +11575,7 @@ function detectJsonIndent(raw) {
 async function writeJsonFilePreservingStyle(file, value) {
   let currentRaw = null;
   try {
-    currentRaw = await (0, import_promises4.readFile)(file, "utf-8");
+    currentRaw = await (0, import_promises3.readFile)(file, "utf-8");
   } catch {
     currentRaw = null;
   }
@@ -11424,8 +11588,8 @@ async function writeJsonFilePreservingStyle(file, value) {
   const indent = currentRaw !== null ? detectJsonIndent(currentRaw) : 2;
   const next = JSON.stringify(value, null, indent) + "\n";
   if (next === currentRaw) return false;
-  await (0, import_promises4.mkdir)((0, import_node_path5.dirname)(file), { recursive: true });
-  await (0, import_promises4.writeFile)(file, next);
+  await (0, import_promises3.mkdir)((0, import_node_path5.dirname)(file), { recursive: true });
+  await (0, import_promises3.writeFile)(file, next);
   return true;
 }
 
@@ -11507,7 +11671,7 @@ function globalSettingsFile() {
 }
 async function readSettings() {
   try {
-    const content = await (0, import_promises5.readFile)(CLAUDE_SETTINGS_FILE, "utf-8");
+    const content = await (0, import_promises4.readFile)(CLAUDE_SETTINGS_FILE, "utf-8");
     return JSON.parse(content);
   } catch {
     return {};
@@ -11518,7 +11682,7 @@ async function readAllSettings() {
   const out = [];
   for (const f of files) {
     try {
-      out.push(JSON.parse(await (0, import_promises5.readFile)(f, "utf-8")));
+      out.push(JSON.parse(await (0, import_promises4.readFile)(f, "utf-8")));
     } catch {
     }
   }
@@ -11547,7 +11711,7 @@ async function checkExternalVerityHooks() {
   for (const f of [SETTINGS_LOCAL_FILE, globalSettingsFile()]) {
     let settings;
     try {
-      settings = JSON.parse(await (0, import_promises5.readFile)(f, "utf-8"));
+      settings = JSON.parse(await (0, import_promises4.readFile)(f, "utf-8"));
     } catch {
       continue;
     }
@@ -11585,7 +11749,7 @@ async function writeSettings(settings) {
 }
 async function readSettingsAt(root) {
   try {
-    return JSON.parse(await (0, import_promises5.readFile)((0, import_node_path6.join)(root, CLAUDE_SETTINGS_FILE), "utf-8"));
+    return JSON.parse(await (0, import_promises4.readFile)((0, import_node_path6.join)(root, CLAUDE_SETTINGS_FILE), "utf-8"));
   } catch {
     return {};
   }
@@ -11827,10 +11991,10 @@ function registerHooksCommands(program2) {
 }
 
 // src/commands/intent.ts
-var import_node_crypto3 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 
 // src/lib/conversation-buffer.ts
-var import_promises6 = require("node:fs/promises");
+var import_promises5 = require("node:fs/promises");
 var import_node_fs3 = require("node:fs");
 var import_node_child_process6 = require("node:child_process");
 var import_node_crypto = require("node:crypto");
@@ -11842,7 +12006,7 @@ function bufferTmpPath() {
 }
 async function appendToConversationBuffer(prompt, sessionId) {
   try {
-    await (0, import_promises6.mkdir)(VERITY_DIR, { recursive: true });
+    await (0, import_promises5.mkdir)(VERITY_DIR, { recursive: true });
     let sanitized = prompt.length > MAX_INTENT_CHARS ? prompt.slice(0, MAX_INTENT_CHARS) : prompt;
     sanitized = stripImageReferences(sanitized);
     const entry = {
@@ -11860,8 +12024,8 @@ async function appendToConversationBuffer(prompt, sessionId) {
     const capped = recent.slice(-CONVERSATION_MAX_ENTRIES);
     const content = capped.map((e) => JSON.stringify(e)).join("\n") + "\n";
     const tmpFile = bufferTmpPath();
-    await (0, import_promises6.writeFile)(tmpFile, content);
-    await (0, import_promises6.rename)(tmpFile, CONVERSATION_BUFFER_FILE);
+    await (0, import_promises5.writeFile)(tmpFile, content);
+    await (0, import_promises5.rename)(tmpFile, CONVERSATION_BUFFER_FILE);
   } catch {
   }
 }
@@ -11878,10 +12042,10 @@ async function readAndClearConversationBuffer(currentSessionId) {
       if (others.length > 0) {
         const remaining = others.map((e) => JSON.stringify(e)).join("\n") + "\n";
         const tmpFile = bufferTmpPath();
-        await (0, import_promises6.writeFile)(tmpFile, remaining);
-        await (0, import_promises6.rename)(tmpFile, CONVERSATION_BUFFER_FILE);
+        await (0, import_promises5.writeFile)(tmpFile, remaining);
+        await (0, import_promises5.rename)(tmpFile, CONVERSATION_BUFFER_FILE);
       } else {
-        await (0, import_promises6.unlink)(CONVERSATION_BUFFER_FILE).catch(() => {
+        await (0, import_promises5.unlink)(CONVERSATION_BUFFER_FILE).catch(() => {
         });
       }
       if (mine.length > 0) {
@@ -11893,8 +12057,8 @@ async function readAndClearConversationBuffer(currentSessionId) {
     }
     if ((0, import_node_fs3.existsSync)(INTENT_FILE)) {
       try {
-        const content = await (0, import_promises6.readFile)(INTENT_FILE, "utf-8");
-        await (0, import_promises6.unlink)(INTENT_FILE).catch(() => {
+        const content = await (0, import_promises5.readFile)(INTENT_FILE, "utf-8");
+        await (0, import_promises5.unlink)(INTENT_FILE).catch(() => {
         });
         const data = JSON.parse(content);
         if (data.prompt) {
@@ -11917,7 +12081,7 @@ async function readAndClearConversationBuffer(currentSessionId) {
 }
 async function readBufferEntries() {
   try {
-    const content = await (0, import_promises6.readFile)(CONVERSATION_BUFFER_FILE, "utf-8");
+    const content = await (0, import_promises5.readFile)(CONVERSATION_BUFFER_FILE, "utf-8");
     const entries = [];
     for (const line of content.split("\n")) {
       const trimmed = line.trim();
@@ -11946,8 +12110,21 @@ function getRecentCommitMessages() {
   }
 }
 
+// src/lib/context-identity.ts
+var import_node_crypto2 = require("node:crypto");
+function contextIdentity(token, sessionId) {
+  const t = (token ?? "").trim();
+  const s = (sessionId ?? "").trim();
+  const userKey = t.length > 0 ? (0, import_node_crypto2.createHash)("sha256").update(t).digest("hex").slice(0, 12) : "anon";
+  const sessionKey2 = s.length > 0 ? (0, import_node_crypto2.createHash)("sha256").update(s).digest("hex").slice(0, 16) : "_default";
+  return { userKey, sessionKey: sessionKey2, bucket: `${userKey}/${sessionKey2}` };
+}
+function sessionScopeKey(token, sessionId) {
+  return contextIdentity(token, sessionId).bucket;
+}
+
 // src/lib/task-context-buffer.ts
-var import_promises7 = require("node:fs/promises");
+var import_promises6 = require("node:fs/promises");
 var import_node_fs4 = require("node:fs");
 var import_node_path7 = require("node:path");
 var TASK_CONTEXT_DIR = `${VERITY_DIR}/.task-context`;
@@ -11990,7 +12167,7 @@ async function readTaskContextBuffer(taskId) {
   const filePath = bufferPath(taskId);
   if (!(0, import_node_fs4.existsSync)(filePath)) return null;
   try {
-    const content = await (0, import_promises7.readFile)(filePath, "utf-8");
+    const content = await (0, import_promises6.readFile)(filePath, "utf-8");
     if (!content.trim()) return null;
     const lines = content.split("\n").filter((l) => l.trim());
     const formatted = [];
@@ -12023,15 +12200,15 @@ async function readTaskContextBuffer(taskId) {
 async function cleanupTaskContextBuffers() {
   try {
     if (!(0, import_node_fs4.existsSync)(TASK_CONTEXT_DIR)) return;
-    const files = await (0, import_promises7.readdir)(TASK_CONTEXT_DIR);
+    const files = await (0, import_promises6.readdir)(TASK_CONTEXT_DIR);
     const cutoffMs = Date.now() - RETENTION_DAYS * 24 * 60 * 60 * 1e3;
     for (const file of files) {
       if (!file.endsWith(".jsonl")) continue;
       const filePath = (0, import_node_path7.join)(TASK_CONTEXT_DIR, file);
       try {
-        const stats = await (0, import_promises7.stat)(filePath);
+        const stats = await (0, import_promises6.stat)(filePath);
         if (stats.mtimeMs < cutoffMs) {
-          await (0, import_promises7.unlink)(filePath);
+          await (0, import_promises6.unlink)(filePath);
         }
       } catch {
       }
@@ -12045,27 +12222,27 @@ function bufferPath(taskId) {
 }
 async function appendEntry(taskId, entry) {
   try {
-    await (0, import_promises7.mkdir)(TASK_CONTEXT_DIR, { recursive: true });
+    await (0, import_promises6.mkdir)(TASK_CONTEXT_DIR, { recursive: true });
     const filePath = bufferPath(taskId);
     if ((0, import_node_fs4.existsSync)(filePath)) {
-      const stats = await (0, import_promises7.stat)(filePath);
+      const stats = await (0, import_promises6.stat)(filePath);
       if (stats.size >= MAX_BUFFER_BYTES) {
-        const content = await (0, import_promises7.readFile)(filePath, "utf-8");
+        const content = await (0, import_promises6.readFile)(filePath, "utf-8");
         const lines = content.split("\n").filter((l) => l.trim());
         const keepFrom = Math.floor(lines.length * 0.25);
         const pruned = lines.slice(keepFrom).join("\n") + "\n";
-        await (0, import_promises7.writeFile)(filePath, pruned);
+        await (0, import_promises6.writeFile)(filePath, pruned);
       }
     }
     const line = JSON.stringify(entry) + "\n";
-    const existing = (0, import_node_fs4.existsSync)(filePath) ? await (0, import_promises7.readFile)(filePath, "utf-8") : "";
-    await (0, import_promises7.writeFile)(filePath, existing + line);
+    const existing = (0, import_node_fs4.existsSync)(filePath) ? await (0, import_promises6.readFile)(filePath, "utf-8") : "";
+    await (0, import_promises6.writeFile)(filePath, existing + line);
   } catch {
   }
 }
 
 // src/lib/memory-retrieval.ts
-var import_promises8 = require("node:fs/promises");
+var import_promises7 = require("node:fs/promises");
 var import_node_fs5 = require("node:fs");
 var import_node_path8 = require("node:path");
 var memoryDir = () => projectPath(`${VERITY_DIR}/memory`);
@@ -12168,11 +12345,11 @@ async function retrieveForInjection(promptText, taskFiles = [], budgetTokens = D
     const domainDir = (0, import_node_path8.join)(memoryDir(), domain);
     if (!(0, import_node_fs5.existsSync)(domainDir)) continue;
     try {
-      const files = await (0, import_promises8.readdir)(domainDir);
+      const files = await (0, import_promises7.readdir)(domainDir);
       for (const file of files) {
         if (!file.endsWith(".md")) continue;
         try {
-          const content = await (0, import_promises8.readFile)((0, import_node_path8.join)(domainDir, file), "utf-8");
+          const content = await (0, import_promises7.readFile)((0, import_node_path8.join)(domainDir, file), "utf-8");
           const { fm, body } = parseFrontmatter(content);
           if (fm.status && fm.status !== "active") continue;
           nodes.push({
@@ -12230,10 +12407,10 @@ async function retrieveForInjection(promptText, taskFiles = [], budgetTokens = D
 }
 
 // src/lib/memory-sync.ts
-var import_promises9 = require("node:fs/promises");
+var import_promises8 = require("node:fs/promises");
 var import_node_fs6 = require("node:fs");
 var import_node_path9 = require("node:path");
-var import_node_crypto2 = require("node:crypto");
+var import_node_crypto3 = require("node:crypto");
 
 // src/lib/glob-match.ts
 function globToRegex(glob) {
@@ -12301,18 +12478,18 @@ var memoryDir2 = () => projectPath(`${VERITY_DIR}/memory`);
 var DOMAINS2 = ["decisions", "quality", "security", "intent", "gotchas", "patterns", "domain", "integrations", "_archive"];
 var syncStateFile = () => projectPath(`${VERITY_DIR}/.memory-sync-state.json`);
 async function ensureMemoryDir() {
-  await (0, import_promises9.mkdir)(memoryDir2(), { recursive: true });
+  await (0, import_promises8.mkdir)(memoryDir2(), { recursive: true });
   for (const domain of DOMAINS2) {
-    await (0, import_promises9.mkdir)((0, import_node_path9.join)(memoryDir2(), domain), { recursive: true });
+    await (0, import_promises8.mkdir)((0, import_node_path9.join)(memoryDir2(), domain), { recursive: true });
   }
   if (!(0, import_node_fs6.existsSync)((0, import_node_path9.join)(memoryDir2(), "SCHEMA.md"))) {
-    await (0, import_promises9.writeFile)((0, import_node_path9.join)(memoryDir2(), "SCHEMA.md"), SCHEMA_TEMPLATE);
+    await (0, import_promises8.writeFile)((0, import_node_path9.join)(memoryDir2(), "SCHEMA.md"), SCHEMA_TEMPLATE);
   }
   if (!(0, import_node_fs6.existsSync)((0, import_node_path9.join)(memoryDir2(), "index.md"))) {
-    await (0, import_promises9.writeFile)((0, import_node_path9.join)(memoryDir2(), "index.md"), "# Project Memory Index\n\nNo nodes yet. Run an analysis to start building the knowledge graph.\n");
+    await (0, import_promises8.writeFile)((0, import_node_path9.join)(memoryDir2(), "index.md"), "# Project Memory Index\n\nNo nodes yet. Run an analysis to start building the knowledge graph.\n");
   }
   if (!(0, import_node_fs6.existsSync)((0, import_node_path9.join)(memoryDir2(), "log.md"))) {
-    await (0, import_promises9.writeFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "# Memory Log\n\n");
+    await (0, import_promises8.writeFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "# Memory Log\n\n");
   }
 }
 async function buildManifest() {
@@ -12324,14 +12501,14 @@ async function buildManifest() {
     const domainDir = (0, import_node_path9.join)(memoryDir2(), domain);
     if (!(0, import_node_fs6.existsSync)(domainDir)) continue;
     try {
-      const files = await (0, import_promises9.readdir)(domainDir);
+      const files = await (0, import_promises8.readdir)(domainDir);
       for (const file of files) {
         if (!file.endsWith(".md")) continue;
         const filePath = `${domain}/${file}`;
         const fullPath = (0, import_node_path9.join)(memoryDir2(), filePath);
         try {
-          const content = await (0, import_promises9.readFile)(fullPath, "utf-8");
-          const hash = (0, import_node_crypto2.createHash)("sha256").update(content).digest("hex").slice(0, 16);
+          const content = await (0, import_promises8.readFile)(fullPath, "utf-8");
+          const hash = (0, import_node_crypto3.createHash)("sha256").update(content).digest("hex").slice(0, 16);
           nodes.push({ path: filePath, content_hash: `sha256:${hash}` });
         } catch {
         }
@@ -12341,20 +12518,20 @@ async function buildManifest() {
   }
   let indexHash = null;
   try {
-    const indexContent = await (0, import_promises9.readFile)((0, import_node_path9.join)(memoryDir2(), "index.md"), "utf-8");
-    indexHash = `sha256:${(0, import_node_crypto2.createHash)("sha256").update(indexContent).digest("hex").slice(0, 16)}`;
+    const indexContent = await (0, import_promises8.readFile)((0, import_node_path9.join)(memoryDir2(), "index.md"), "utf-8");
+    indexHash = `sha256:${(0, import_node_crypto3.createHash)("sha256").update(indexContent).digest("hex").slice(0, 16)}`;
   } catch {
   }
   let logLength = 0;
   try {
-    const logContent = await (0, import_promises9.readFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "utf-8");
+    const logContent = await (0, import_promises8.readFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "utf-8");
     logLength = logContent.split("\n").length;
   } catch {
   }
   return { schema_version: 1, nodes, index_hash: indexHash, log_length: logLength };
 }
 function hashContent(content) {
-  return `sha256:${(0, import_node_crypto2.createHash)("sha256").update(content).digest("hex").slice(0, 16)}`;
+  return `sha256:${(0, import_node_crypto3.createHash)("sha256").update(content).digest("hex").slice(0, 16)}`;
 }
 async function readOnDiskNodes() {
   const out = /* @__PURE__ */ new Map();
@@ -12363,10 +12540,10 @@ async function readOnDiskNodes() {
     const domainDir = (0, import_node_path9.join)(memoryDir2(), domain);
     if (!(0, import_node_fs6.existsSync)(domainDir)) continue;
     try {
-      for (const file of await (0, import_promises9.readdir)(domainDir)) {
+      for (const file of await (0, import_promises8.readdir)(domainDir)) {
         if (!file.endsWith(".md")) continue;
         try {
-          out.set(`${domain}/${file}`, hashContent(await (0, import_promises9.readFile)((0, import_node_path9.join)(domainDir, file), "utf-8")));
+          out.set(`${domain}/${file}`, hashContent(await (0, import_promises8.readFile)((0, import_node_path9.join)(domainDir, file), "utf-8")));
         } catch {
         }
       }
@@ -12378,7 +12555,7 @@ async function readOnDiskNodes() {
 async function readSyncBaseline() {
   const out = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(await (0, import_promises9.readFile)(syncStateFile(), "utf-8"));
+    const parsed = JSON.parse(await (0, import_promises8.readFile)(syncStateFile(), "utf-8"));
     if (Array.isArray(parsed?.nodes)) {
       for (const n of parsed.nodes) if (n?.path) out.set(n.path, n.hash ?? null);
     } else if (Array.isArray(parsed?.paths)) {
@@ -12394,12 +12571,12 @@ async function recordSyncedNodePaths() {
     const next = JSON.stringify({ schema: 2, nodes }) + "\n";
     let existing = "";
     try {
-      existing = await (0, import_promises9.readFile)(syncStateFile(), "utf-8");
+      existing = await (0, import_promises8.readFile)(syncStateFile(), "utf-8");
     } catch {
     }
     if (existing === next) return;
-    await (0, import_promises9.mkdir)(projectPath(VERITY_DIR), { recursive: true });
-    await (0, import_promises9.writeFile)(syncStateFile(), next);
+    await (0, import_promises8.mkdir)(projectPath(VERITY_DIR), { recursive: true });
+    await (0, import_promises8.writeFile)(syncStateFile(), next);
   } catch {
   }
 }
@@ -12416,7 +12593,7 @@ async function computeEditedNodeUploads() {
     if (!(0, import_node_fs6.existsSync)(full)) continue;
     let content;
     try {
-      content = await (0, import_promises9.readFile)(full, "utf-8");
+      content = await (0, import_promises8.readFile)(full, "utf-8");
     } catch {
       continue;
     }
@@ -12449,8 +12626,8 @@ async function applyMemoryWrites(writes, opts = {}) {
   const logLines = [`- ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 16)} \u2014 Applied ${count} write(s) from server`];
   for (const n of notes) logLines.push(`  - ${n}`);
   try {
-    const existing = (0, import_node_fs6.existsSync)((0, import_node_path9.join)(memoryDir2(), "log.md")) ? await (0, import_promises9.readFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "utf-8") : "# Memory Log\n\n";
-    await (0, import_promises9.writeFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), existing + logLines.join("\n") + "\n");
+    const existing = (0, import_node_fs6.existsSync)((0, import_node_path9.join)(memoryDir2(), "log.md")) ? await (0, import_promises8.readFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), "utf-8") : "# Memory Log\n\n";
+    await (0, import_promises8.writeFile)((0, import_node_path9.join)(memoryDir2(), "log.md"), existing + logLines.join("\n") + "\n");
   } catch {
   }
   await recordSyncedNodePaths();
@@ -12470,7 +12647,7 @@ async function applyOneWrite(write, treePaths) {
   if ((0, import_node_fs6.existsSync)(fullPath)) {
     let existing = "";
     try {
-      existing = await (0, import_promises9.readFile)(fullPath, "utf-8");
+      existing = await (0, import_promises8.readFile)(fullPath, "utf-8");
     } catch {
     }
     if (existing === content) return { written: false, notes };
@@ -12479,8 +12656,8 @@ async function applyOneWrite(write, treePaths) {
       return { written: false, notes };
     }
   }
-  await (0, import_promises9.mkdir)((0, import_node_path9.dirname)(fullPath), { recursive: true });
-  await (0, import_promises9.writeFile)(fullPath, content);
+  await (0, import_promises8.mkdir)((0, import_node_path9.dirname)(fullPath), { recursive: true });
+  await (0, import_promises8.writeFile)(fullPath, content);
   return { written: true, notes };
 }
 function groundFileGlobs(content, treePaths) {
@@ -12523,7 +12700,7 @@ async function regenerateIndex() {
     const domainDir = (0, import_node_path9.join)(memoryDir2(), domain);
     if (!(0, import_node_fs6.existsSync)(domainDir)) continue;
     try {
-      const files = await (0, import_promises9.readdir)(domainDir);
+      const files = await (0, import_promises8.readdir)(domainDir);
       const mdFiles = files.filter((f) => f.endsWith(".md"));
       if (mdFiles.length === 0) continue;
       lines.push(`## ${domain}/ (${mdFiles.length})`);
@@ -12531,7 +12708,7 @@ async function regenerateIndex() {
       for (const file of mdFiles.sort()) {
         const slug = file.replace(/\.md$/, "");
         try {
-          const content = await (0, import_promises9.readFile)((0, import_node_path9.join)(domainDir, file), "utf-8");
+          const content = await (0, import_promises8.readFile)((0, import_node_path9.join)(domainDir, file), "utf-8");
           const title = pickFrontmatter(content, "title") ?? slug;
           const kind = pickFrontmatter(content, "kind") ?? "-";
           const confidence = pickFrontmatter(content, "confidence");
@@ -12558,11 +12735,11 @@ async function regenerateIndex() {
   const indexPath = (0, import_node_path9.join)(memoryDir2(), "index.md");
   let existing = null;
   try {
-    existing = await (0, import_promises9.readFile)(indexPath, "utf-8");
+    existing = await (0, import_promises8.readFile)(indexPath, "utf-8");
   } catch {
   }
   if (existing === next) return;
-  await (0, import_promises9.writeFile)(indexPath, next);
+  await (0, import_promises8.writeFile)(indexPath, next);
 }
 function pickFrontmatter(content, key) {
   const re = new RegExp(`^${key}:\\s*"?([^"\\n]+?)"?\\s*$`, "m");
@@ -12640,7 +12817,7 @@ async function ensureClaudeMdPointer(cwd = repoRoot()) {
   const claudeMdPath = (0, import_node_path9.join)(cwd, "CLAUDE.md");
   let existing = "";
   if ((0, import_node_fs6.existsSync)(claudeMdPath)) {
-    existing = await (0, import_promises9.readFile)(claudeMdPath, "utf-8");
+    existing = await (0, import_promises8.readFile)(claudeMdPath, "utf-8");
   }
   let startTag = CLAUDE_MD_START;
   let endTag = CLAUDE_MD_END;
@@ -12696,7 +12873,7 @@ async function ensureClaudeMdPointer(cwd = repoRoot()) {
     next = existing.replace(/\n*$/, "") + "\n\n" + block + "\n";
   }
   if (next === existing) return;
-  await (0, import_promises9.writeFile)(claudeMdPath, next);
+  await (0, import_promises8.writeFile)(claudeMdPath, next);
 }
 function extractPreserveContent(interior) {
   for (const [start, end] of [
@@ -12799,7 +12976,10 @@ function registerIntentCommands(program2) {
       if (!prompt) {
         process.exit(0);
       }
-      await appendToConversationBuffer(prompt, event.session_id ?? "");
+      const authForScope = await resolveToken(program2.opts().token);
+      const scopeToken = authForScope.ok ? authForScope.data.token : void 0;
+      const scopeSession = event.session_id || process.env.CLAUDE_SESSION_ID || "";
+      await appendToConversationBuffer(prompt, sessionScopeKey(scopeToken, scopeSession));
       try {
         await ensureMemoryDir();
         const injection = await retrieveForInjection(prompt);
@@ -12841,7 +13021,7 @@ async function fireClassify(prompt, sessionId) {
     logEvent("classify_skipped", { reason: "no_service_url", detail: urlResult.error });
     return;
   }
-  const promptHash = (0, import_node_crypto3.createHash)("sha256").update(prompt).digest("hex");
+  const promptHash = (0, import_node_crypto4.createHash)("sha256").update(prompt).digest("hex");
   const result = await apiRequest({
     method: "POST",
     path: "/classify-task",
@@ -12879,7 +13059,7 @@ async function fireClassify(prompt, sessionId) {
 }
 
 // src/commands/standard.ts
-var import_promises10 = require("node:fs/promises");
+var import_promises9 = require("node:fs/promises");
 var import_yaml = __toESM(require_dist());
 function registerStandardCommands(program2) {
   const standard = program2.command("standard").description("Manage the project Standard");
@@ -12897,7 +13077,7 @@ function registerStandardCommands(program2) {
     }
     let yamlContent;
     try {
-      yamlContent = await (0, import_promises10.readFile)(opts.file, "utf-8");
+      yamlContent = await (0, import_promises9.readFile)(opts.file, "utf-8");
     } catch {
       printError(`Cannot read ${opts.file}`);
       process.exit(1);
@@ -12988,7 +13168,7 @@ function registerStandardCommands(program2) {
 }
 
 // src/commands/config.ts
-var import_promises11 = require("node:fs/promises");
+var import_promises10 = require("node:fs/promises");
 function registerConfigCommands(program2) {
   const config = program2.command("config").description("Manage analysis configuration");
   config.command("push").description("Upload the analysis config to the service").option("--file <path>", "Path to config file", CODACY_CONFIG_FILE).action(async (opts) => {
@@ -13005,7 +13185,7 @@ function registerConfigCommands(program2) {
     }
     let content;
     try {
-      const raw = await (0, import_promises11.readFile)(opts.file, "utf-8");
+      const raw = await (0, import_promises10.readFile)(opts.file, "utf-8");
       content = JSON.parse(raw);
     } catch {
       printError(`Cannot read or parse ${opts.file}`);
@@ -13499,10 +13679,10 @@ function collectCodeDelta(files, opts) {
 
 // src/lib/debounce.ts
 var import_node_fs9 = require("node:fs");
-var import_node_crypto4 = require("node:crypto");
+var import_node_crypto5 = require("node:crypto");
 function scopedFile(base, sessionId) {
   if (!sessionId) return base;
-  return `${base}.${(0, import_node_crypto4.createHash)("sha1").update(sessionId).digest("hex").slice(0, 12)}`;
+  return `${base}.${(0, import_node_crypto5.createHash)("sha1").update(sessionId).digest("hex").slice(0, 12)}`;
 }
 function checkDebounce(debounceSeconds = DEBOUNCE_SECONDS, sessionId) {
   const file = scopedFile(DEBOUNCE_FILE, sessionId);
@@ -13543,7 +13723,7 @@ function checkMtime(files, bypassForRecentCommits, sessionId) {
   return "No files modified since last analysis";
 }
 function computeContentHash(files) {
-  const hash = (0, import_node_crypto4.createHash)("sha1");
+  const hash = (0, import_node_crypto5.createHash)("sha1");
   const sorted = [...files].sort();
   for (const f of sorted) {
     const resolved = resolveFile(f) ?? f;
@@ -13931,14 +14111,14 @@ function cleanStaleSnapshots(dir, keepSet) {
 // src/lib/baseline.ts
 var import_node_fs13 = require("node:fs");
 var import_node_path13 = require("node:path");
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto6 = require("node:crypto");
 var BASELINE_VERSION = 1;
 var BASELINE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var MIRROR_MAX_BYTES = 2 * 1024 * 1024;
 var DEFAULT_SESSION_KEY = "_default";
 function sessionKey(sessionId) {
   if (!sessionId) return DEFAULT_SESSION_KEY;
-  return (0, import_node_crypto5.createHash)("sha256").update(sessionId).digest("hex").slice(0, 16);
+  return (0, import_node_crypto6.createHash)("sha256").update(sessionId).digest("hex").slice(0, 16);
 }
 function sessionDir(key) {
   return (0, import_node_path13.join)(projectPath(BASELINE_DIR), key);
@@ -14120,13 +14300,57 @@ function pruneOldBaselines() {
   }
 }
 
+// src/lib/task-context.ts
+var import_node_child_process9 = require("node:child_process");
+var CLOSING_RE = /\b(close[sd]?|fix(?:e[sd])?|resolve[sd]?)\b[\s:]*#(\d+)/i;
+var BRANCH_RE = /(?:^|[/_-])(?:issue|gh|fix)[-_/]?(\d+)\b/i;
+function parseLinkedIssue(sources) {
+  for (const c of sources.commits ?? []) {
+    const m = CLOSING_RE.exec(c);
+    if (m) return { issue: parseInt(m[2], 10), via: `commit:${m[1].toLowerCase()}` };
+  }
+  if (sources.branch) {
+    const m = BRANCH_RE.exec(sources.branch);
+    if (m) return { issue: parseInt(m[1], 10), via: "branch" };
+  }
+  return null;
+}
+function safeExec(cmd, timeout) {
+  try {
+    return (0, import_node_child_process9.execSync)(cmd, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout }).trim();
+  } catch {
+    return "";
+  }
+}
+function defaultGhFetch(issue) {
+  const raw = safeExec(`gh issue view ${issue} --json title,body`, 5e3);
+  if (!raw) return null;
+  try {
+    const j = JSON.parse(raw);
+    return j.title ? { title: j.title, body: j.body ?? "" } : null;
+  } catch {
+    return null;
+  }
+}
+function resolveTaskContext(opts) {
+  const branch = opts?.branch ?? safeExec("git rev-parse --abbrev-ref HEAD", 3e3);
+  const commits = opts?.commits ?? safeExec("git log -5 --format=%s%n%b", 3e3).split("\n").map((l) => l.trim()).filter(Boolean);
+  const linked = parseLinkedIssue({ branch, commits });
+  if (!linked) return null;
+  const issue = (opts?.ghFetch ?? defaultGhFetch)(linked.issue);
+  if (!issue) return null;
+  const body = (issue.body ?? "").slice(0, 4e3).trim();
+  const goal = `[#${linked.issue}] ${issue.title}${body ? "\n\n" + body : ""}`;
+  return { number: linked.issue, title: issue.title, goal, via: linked.via };
+}
+
 // src/lib/offline.ts
 var import_node_fs14 = require("node:fs");
-var import_node_crypto6 = require("node:crypto");
+var import_node_crypto7 = require("node:crypto");
 function cacheRequest(body) {
   try {
     (0, import_node_fs14.mkdirSync)(CACHE_DIR, { recursive: true });
-    const suffix = (0, import_node_crypto6.randomBytes)(4).toString("hex");
+    const suffix = (0, import_node_crypto7.randomBytes)(4).toString("hex");
     const filename = `pending-${Math.floor(Date.now() / 1e3)}-${suffix}.json`;
     (0, import_node_fs14.writeFileSync)(`${CACHE_DIR}/${filename}`, JSON.stringify(body));
   } catch {
@@ -14331,6 +14555,30 @@ function detectAnalysisMode(noFilesChanged, assistantResponse, conversationPromp
   }
   return "standard";
 }
+var FILE_MUTATE_RE = /(?:^|[\s|&;(`])(?:sed\s+-i|perl\s+-i|awk\b|tee\b|dd\b|cp\b|mv\b|ln\b|install\b|touch\b|patch\b|git\s+(?:apply|am)\b|cargo\s+build|go\s+generate|make\b|--write\b|--fix\b|--in-place\b)|>>?(?![&>])/i;
+var GIT_PLUMBING_RE = /^\s*git\s+(?:merge|rebase|stash|cherry-pick|revert|pull|fetch|checkout|switch|reset|restore|clean)\b/i;
+var READ_ONLY_RE = /^\s*(?:git\s+(?:status|diff|log|show|branch|remote|config|rev-parse|ls-files|blame|describe)|ls|cat|head|tail|less|grep|rg|find|pwd|echo|printf|wc|which|type|tree|stat|file|env|printenv|date|whoami)\b/i;
+var CHAIN_RE = /&&|\||;|\$\(|\x60/;
+function hasNonEditAuthorship(actionSummary, sessionAuthoredCode) {
+  if (!actionSummary) return sessionAuthoredCode;
+  if ((actionSummary.subagents ?? 0) > 0) return true;
+  if (Object.keys(actionSummary.tool_counts ?? {}).some((t) => t.startsWith("mcp__"))) return true;
+  const commands = actionSummary.commands ?? [];
+  if (commands.some((c) => FILE_MUTATE_RE.test(c))) return true;
+  if (sessionAuthoredCode) {
+    const allSafe = commands.length > 0 && commands.every(
+      (c) => !CHAIN_RE.test(c) && (GIT_PLUMBING_RE.test(c) || READ_ONLY_RE.test(c))
+    );
+    if (!allSafe) return true;
+  }
+  return false;
+}
+function scopeToAuthored(files, actionSummary) {
+  if (!actionSummary) return { files, signal: "no-transcript" };
+  const touched = [...actionSummary.files_edited ?? [], ...actionSummary.files_created ?? []];
+  if (touched.length === 0) return { files: [], signal: "none-authored" };
+  return { files: narrowToAgentAuthored(files, actionSummary), signal: "authored" };
+}
 function narrowToAgentAuthored(files, actionSummary) {
   if (!actionSummary) return files;
   const touched = [
@@ -14533,6 +14781,7 @@ function buildSummary(lines) {
           searches++;
           break;
         case "Agent":
+        case "Task":
           subagents++;
           break;
         case "WebFetch":
@@ -14585,21 +14834,50 @@ function addPath(set, rawPath) {
 function sanitizeCommand(rawCmd) {
   if (typeof rawCmd !== "string" || !rawCmd) return null;
   let cmd = rawCmd.split("\n")[0];
+  let cut = -1;
+  let marker = "";
   for (const sep of [" | ", " > ", " >> ", " 2>", " && ", " ; "]) {
     const idx = cmd.indexOf(sep);
-    if (idx > 0) cmd = cmd.slice(0, idx);
+    if (idx > 0 && (cut === -1 || idx < cut)) {
+      cut = idx;
+      marker = sep.trim();
+    }
   }
+  if (cut > -1) cmd = cmd.slice(0, cut);
   if (cmd.length > MAX_COMMAND_CHARS) {
     cmd = cmd.slice(0, MAX_COMMAND_CHARS);
   }
-  return cmd.trim() || null;
+  cmd = cmd.trim();
+  if (marker) cmd = cmd ? `${cmd} ${marker}` : marker;
+  return cmd || null;
 }
 function capArray(set, max) {
   return Array.from(set).slice(0, max);
 }
 
+// src/lib/run-mode.ts
+function parseAutonomousEnv(raw) {
+  if (raw === void 0) return void 0;
+  const v = raw.trim().toLowerCase();
+  if (v === "") return void 0;
+  if (v === "0" || v === "false" || v === "off" || v === "no") return false;
+  return true;
+}
+function resolveRunMode(inputs = {}) {
+  if (inputs.autonomousFlag === true) return "autonomous";
+  if (inputs.autonomousFlag === false) return "interactive";
+  const env = inputs.env ?? process.env;
+  const envDecision = parseAutonomousEnv(env.VERITY_AUTONOMOUS);
+  if (envDecision !== void 0) return envDecision ? "autonomous" : "interactive";
+  const isTTY = inputs.isTTY ?? Boolean(process.stdin?.isTTY);
+  return isTTY ? "interactive" : "autonomous";
+}
+function isExplicitlyAutonomous(env = process.env) {
+  return parseAutonomousEnv(env.VERITY_AUTONOMOUS) === true || parseAutonomousEnv(env.CI) === true || parseAutonomousEnv(env.GITHUB_ACTIONS) === true;
+}
+
 // src/lib/seed-runner.ts
-var import_promises12 = require("node:fs/promises");
+var import_promises11 = require("node:fs/promises");
 var import_node_fs18 = require("node:fs");
 var import_node_path15 = require("node:path");
 var import_yaml2 = __toESM(require_dist());
@@ -14845,7 +15123,7 @@ async function runSeed(opts) {
   }
   let standardDoc;
   try {
-    const raw = await (0, import_promises12.readFile)(STANDARD_FILE, "utf-8");
+    const raw = await (0, import_promises11.readFile)(STANDARD_FILE, "utf-8");
     standardDoc = (0, import_yaml2.parse)(raw);
   } catch {
     return { created: 0, failed: 0, skipped: "no_standard", candidates: [] };
@@ -14854,7 +15132,7 @@ async function runSeed(opts) {
   let readmeContent;
   if ((0, import_node_fs18.existsSync)("README.md")) {
     try {
-      readmeContent = await (0, import_promises12.readFile)("README.md", "utf-8");
+      readmeContent = await (0, import_promises11.readFile)("README.md", "utf-8");
     } catch {
     }
   }
@@ -14862,7 +15140,7 @@ async function runSeed(opts) {
   for (const p of ["CLAUDE.md", ".claude/CLAUDE.md"]) {
     if ((0, import_node_fs18.existsSync)(p)) {
       try {
-        claudeMdContent = await (0, import_promises12.readFile)(p, "utf-8");
+        claudeMdContent = await (0, import_promises11.readFile)(p, "utf-8");
         break;
       } catch {
       }
@@ -14921,8 +15199,8 @@ async function runSeed(opts) {
     const filePathRel = res.data.file_path;
     const targetPath = (0, import_node_path15.join)(MEMORY_DIR, filePathRel);
     try {
-      await (0, import_promises12.mkdir)((0, import_node_path15.dirname)(targetPath), { recursive: true });
-      await (0, import_promises12.writeFile)(targetPath, renderNodeMarkdown(c, nodeId, createdAt));
+      await (0, import_promises11.mkdir)((0, import_node_path15.dirname)(targetPath), { recursive: true });
+      await (0, import_promises11.writeFile)(targetPath, renderNodeMarkdown(c, nodeId, createdAt));
       created++;
       opts.onCreated?.(nodeId, filePathRel, c);
     } catch (err) {
@@ -15012,7 +15290,10 @@ async function runAnalyze(opts, globals) {
   }
   const { assistantMessage: assistantResponse, stopReason, transcriptPath, sessionId } = await readStopHookStdin();
   const actionSummary = transcriptPath ? await extractActionSummary(transcriptPath) : null;
-  const baselineSessionId = sessionId || process.env.CLAUDE_SESSION_ID || void 0;
+  const tokenResult = await resolveToken(globals.token);
+  const scopeToken = tokenResult.ok ? tokenResult.data.token : void 0;
+  const rawSessionId = sessionId || process.env.CLAUDE_SESSION_ID || void 0;
+  const baselineSessionId = sessionScopeKey(scopeToken, rawSessionId);
   const baseline = readBaseline(baselineSessionId);
   if (baseline) {
     logEvent("baseline_loaded", {
@@ -15030,7 +15311,7 @@ async function runAnalyze(opts, globals) {
     passAndExit("No analyzable files changed");
   }
   const allForReview = Array.from(/* @__PURE__ */ new Set([...analyzable, ...reviewable]));
-  const conversation = await readAndClearConversationBuffer(sessionId ?? void 0);
+  const conversation = await readAndClearConversationBuffer(baselineSessionId);
   const specs = discoverSpecs();
   const plans = discoverPlans();
   const latestPrompt = conversation?.prompts?.[conversation.prompts.length - 1]?.prompt ?? "";
@@ -15044,7 +15325,6 @@ async function runAnalyze(opts, globals) {
   if (isReflectionQuestion(assistantResponse) && !agentAuthoredCodeThisTurn) {
     passAndExit("Reflection-prompt turn \u2014 skipping analysis");
   }
-  const tokenResult = await resolveToken(globals.token);
   const urlResult = await resolveServiceUrl(globals.serviceUrl);
   if (!tokenResult.ok || !urlResult.ok) {
     localOnlyAndExit(runLocalStatic(analyzable, securityFiles, baseline, !!opts.skipStatic));
@@ -15138,8 +15418,11 @@ async function runAnalyze(opts, globals) {
       }
       contentHash = hashResult.hash;
       if (analysisMode !== "plan") {
-        const agentNarrowed = narrowToAgentAuthored(allForReview, actionSummary);
-        const baseForReview = agentNarrowed.length > 0 ? agentNarrowed : allForReview;
+        const scoped = scopeToAuthored(allForReview, actionSummary);
+        if (scoped.signal === "none-authored" && !hasNonEditAuthorship(actionSummary, sessionAuthoredCode)) {
+          passAndExit("No agent-authored code this turn \u2014 working-tree changes were not authored by this session");
+        }
+        const baseForReview = scoped.signal === "authored" && scoped.files.length > 0 ? scoped.files : allForReview;
         const recentForReview = narrowToRecent(baseForReview, baselineSessionId);
         if (!opts.skipStatic && isCodacyAvailable()) {
           let allScannable = Array.from(/* @__PURE__ */ new Set([...analyzable, ...securityFiles]));
@@ -15269,7 +15552,9 @@ async function runAnalyze(opts, globals) {
   if (snapshotResult.has_snapshots && snapshotResult.diffs.length > 0) {
     requestBody.snapshot_diffs = snapshotResult.diffs;
   }
-  const hasIntent = (conversation?.prompts?.length ?? 0) > 0 || specs.length > 0 || plans.length > 0 || !!assistantResponse;
+  const noHumanPrompt = (conversation?.prompts?.length ?? 0) === 0;
+  const w4Task = noHumanPrompt && isExplicitlyAutonomous() ? resolveTaskContext() : null;
+  const hasIntent = (conversation?.prompts?.length ?? 0) > 0 || specs.length > 0 || plans.length > 0 || !!assistantResponse || !!w4Task;
   if (hasIntent) {
     const intentContext = {};
     if (conversation && conversation.prompts.length > 0) {
@@ -15284,6 +15569,10 @@ async function runAnalyze(opts, globals) {
         intentContext.recent_commits = conversation.recent_commits;
       }
     }
+    if (w4Task && !intentContext.user_prompt) {
+      intentContext.user_prompt = w4Task.goal;
+      logEvent("w4_issue_anchor", { issue: w4Task.number, via: w4Task.via });
+    }
     if (assistantResponse) {
       const cap = analysisMode === "plan" ? MAX_ASSISTANT_RESPONSE_CHARS_PLAN : MAX_ASSISTANT_RESPONSE_CHARS_DEFAULT;
       intentContext.assistant_response = assistantResponse.length > cap ? assistantResponse.slice(0, cap) : assistantResponse;
@@ -15576,7 +15865,10 @@ function registerBaselineCommands(program2) {
           }
         }
       }
-      const result = captureBaseline({ sessionId, source });
+      const authForScope = await resolveToken(program2.opts().token);
+      const scopeToken = authForScope.ok ? authForScope.data.token : void 0;
+      const scopeSession = sessionId || process.env.CLAUDE_SESSION_ID || void 0;
+      const result = captureBaseline({ sessionId: sessionScopeKey(scopeToken, scopeSession), source });
       logEvent("baseline_capture", {
         created: result.created,
         source: source ?? null,
@@ -16022,20 +16314,112 @@ function writeBlockMessage(moment, response) {
 var import_node_fs24 = require("node:fs");
 var import_promises13 = require("node:fs/promises");
 var import_node_path19 = require("node:path");
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process11 = require("node:child_process");
 var readline2 = __toESM(require("node:readline/promises"));
 
 // src/commands/migrate.ts
 var import_node_fs23 = require("node:fs");
 var import_node_path18 = require("node:path");
-var import_node_child_process9 = require("node:child_process");
+var import_node_child_process10 = require("node:child_process");
+
+// src/lib/telemetry.ts
+var import_promises12 = require("node:fs/promises");
+var SETTINGS_LOCAL_FILE2 = ".claude/settings.local.json";
+var GITIGNORE_FILE = ".gitignore";
+var GITIGNORE_ENTRY = ".claude/settings.local.json";
+var OTEL_HEADERS_HELPER_CMD = "verity telemetry headers";
+var LEGACY_TELEMETRY_ENV_KEYS = ["OTEL_EXPORTER_OTLP_HEADERS"];
+function deriveOtlpEndpoint(serviceUrl) {
+  return serviceUrl.replace(/\/+$/, "").replace(/\/v1$/, "") + "/v1/otlp";
+}
+function buildTelemetryEnv(serviceUrl) {
+  return {
+    CLAUDE_CODE_ENABLE_TELEMETRY: "1",
+    OTEL_METRICS_EXPORTER: "otlp",
+    OTEL_TRACES_EXPORTER: "otlp",
+    CLAUDE_CODE_ENHANCED_TELEMETRY_BETA: "1",
+    OTEL_EXPORTER_OTLP_PROTOCOL: "http/json",
+    OTEL_EXPORTER_OTLP_ENDPOINT: deriveOtlpEndpoint(serviceUrl),
+    OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: "delta",
+    OTEL_LOG_USER_PROMPTS: "0",
+    OTEL_LOG_TOOL_DETAILS: "0",
+    OTEL_LOG_TOOL_CONTENT: "0",
+    OTEL_METRICS_INCLUDE_SESSION_ID: "true",
+    OTEL_METRICS_INCLUDE_ACCOUNT_UUID: "false",
+    OTEL_METRICS_INCLUDE_VERSION: "false",
+    OTEL_METRIC_EXPORT_INTERVAL: "60000"
+  };
+}
+var VERITY_TELEMETRY_KEYS = Object.keys(buildTelemetryEnv(""));
+async function readSettingsLocal() {
+  try {
+    return JSON.parse(await (0, import_promises12.readFile)(projectPath(SETTINGS_LOCAL_FILE2), "utf-8"));
+  } catch {
+    return {};
+  }
+}
+async function writeSettingsLocal(settings) {
+  await writeJsonFilePreservingStyle(projectPath(SETTINGS_LOCAL_FILE2), settings);
+}
+async function ensureGitignore() {
+  const file = projectPath(GITIGNORE_FILE);
+  let content = "";
+  try {
+    content = await (0, import_promises12.readFile)(file, "utf-8");
+  } catch {
+  }
+  const lines = content.split("\n").map((l) => l.trim());
+  if (lines.includes(GITIGNORE_ENTRY) || lines.includes(".claude/") || lines.includes(".claude")) {
+    return;
+  }
+  const block = "# Verity telemetry \u2014 machine-local Claude Code settings\n" + GITIGNORE_ENTRY + "\n";
+  const next = content ? content + (content.endsWith("\n") ? "" : "\n") + "\n" + block : block;
+  await (0, import_promises12.writeFile)(file, next);
+}
+async function installTelemetry(serviceUrl) {
+  const env = buildTelemetryEnv(serviceUrl);
+  const settings = await readSettingsLocal();
+  settings.env = { ...settings.env ?? {}, ...env };
+  for (const key of LEGACY_TELEMETRY_ENV_KEYS) delete settings.env[key];
+  settings.otelHeadersHelper = OTEL_HEADERS_HELPER_CMD;
+  await writeSettingsLocal(settings);
+  await ensureGitignore();
+  return { ok: true, data: { endpoint: env.OTEL_EXPORTER_OTLP_ENDPOINT } };
+}
+async function checkTelemetry() {
+  const env = (await readSettingsLocal()).env ?? {};
+  const enabled = env.CLAUDE_CODE_ENABLE_TELEMETRY === "1" && !!env.OTEL_EXPORTER_OTLP_ENDPOINT;
+  return { enabled, endpoint: env.OTEL_EXPORTER_OTLP_ENDPOINT ?? null, settingsPath: SETTINGS_LOCAL_FILE2 };
+}
+async function uninstallTelemetry() {
+  const settings = await readSettingsLocal();
+  const hadHelper = settings.otelHeadersHelper === OTEL_HEADERS_HELPER_CMD;
+  if (hadHelper) delete settings.otelHeadersHelper;
+  if (!settings.env) {
+    if (hadHelper) await writeSettingsLocal(settings);
+    return { ok: true, data: { removed: 0 } };
+  }
+  let removed = 0;
+  for (const key of VERITY_TELEMETRY_KEYS) {
+    if (key in settings.env) {
+      delete settings.env[key];
+      removed++;
+    }
+  }
+  for (const key of LEGACY_TELEMETRY_ENV_KEYS) delete settings.env[key];
+  if (Object.keys(settings.env).length === 0) delete settings.env;
+  await writeSettingsLocal(settings);
+  return { ok: true, data: { removed } };
+}
+
+// src/commands/migrate.ts
 var LEGACY_NPM_PACKAGE = "@codacy/gate-cli";
 function defaultNpmRemover(pkg) {
-  (0, import_node_child_process9.execSync)(`npm rm -g ${pkg}`, { stdio: "pipe", timeout: 12e4 });
+  (0, import_node_child_process10.execSync)(`npm rm -g ${pkg}`, { stdio: "pipe", timeout: 12e4 });
 }
 function isGitTracked(cwd, relPath) {
   try {
-    (0, import_node_child_process9.execSync)(`git ls-files --error-unmatch ${relPath}`, { cwd, stdio: "pipe" });
+    (0, import_node_child_process10.execSync)(`git ls-files --error-unmatch ${relPath}`, { cwd, stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -16043,7 +16427,7 @@ function isGitTracked(cwd, relPath) {
 }
 function isGitRepo(cwd) {
   try {
-    (0, import_node_child_process9.execSync)("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
+    (0, import_node_child_process10.execSync)("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -16059,6 +16443,7 @@ async function runMigration(opts = {}) {
   await migrateLegacyHooks(root, actions);
   await migrateClaudeMd(root, actions);
   migrateStandardFile(root, actions);
+  await migrateTelemetryHeaders(root, actions);
   removeLegacyPackage(movedProjectDir, npmRemover, actions);
   return { actions, migrated: actions.length > 0 };
 }
@@ -16082,7 +16467,7 @@ function migrateProjectDirRename(root, gateDir, verityDir, actions) {
       );
     }
     try {
-      (0, import_node_child_process9.execSync)("git mv .gate .verity", { cwd: root, stdio: "pipe" });
+      (0, import_node_child_process10.execSync)("git mv .gate .verity", { cwd: root, stdio: "pipe" });
       actions.push("Moved .gate/ \u2192 .verity/ (git mv, staged)");
       moved = true;
     } catch {
@@ -16161,7 +16546,7 @@ function migrateStandardFile(root, actions) {
   let moved = false;
   if (isGitRepo(root) && isGitTracked(root, "GATE.md")) {
     try {
-      (0, import_node_child_process9.execSync)("git mv GATE.md VERITY.md", { cwd: root, stdio: "pipe" });
+      (0, import_node_child_process10.execSync)("git mv GATE.md VERITY.md", { cwd: root, stdio: "pipe" });
       moved = true;
     } catch {
     }
@@ -16172,6 +16557,25 @@ function migrateStandardFile(root, actions) {
   if (refreshed !== content) (0, import_node_fs23.writeFileSync)(verityMd, refreshed);
   actions.push("Renamed GATE.md \u2192 VERITY.md");
 }
+async function migrateTelemetryHeaders(root, actions) {
+  const file = (0, import_node_path18.join)(root, ".claude", "settings.local.json");
+  if (!(0, import_node_fs23.existsSync)(file)) return;
+  let settings;
+  try {
+    settings = JSON.parse(readFileSyncSafe(file) || "{}");
+  } catch {
+    return;
+  }
+  const env = settings.env;
+  const hasInlineHeader = !!env && "OTEL_EXPORTER_OTLP_HEADERS" in env;
+  const telemetryEnabled = env?.CLAUDE_CODE_ENABLE_TELEMETRY === "1";
+  const needsHelper = telemetryEnabled && settings.otelHeadersHelper !== OTEL_HEADERS_HELPER_CMD;
+  if (!hasInlineHeader && !needsHelper) return;
+  if (hasInlineHeader && env) delete env["OTEL_EXPORTER_OTLP_HEADERS"];
+  if (telemetryEnabled) settings.otelHeadersHelper = OTEL_HEADERS_HELPER_CMD;
+  await writeJsonFilePreservingStyle(file, settings);
+  actions.push("Moved the telemetry token out of .claude/settings.local.json (now resolved at runtime)");
+}
 function removeLegacyPackage(movedProjectDir, npmRemover, actions) {
   if (!movedProjectDir) return;
   try {
@@ -16217,7 +16621,7 @@ function readFileSyncSafe(path) {
 }
 function hasStagedChanges(root) {
   try {
-    (0, import_node_child_process9.execSync)("git diff --cached --quiet", { cwd: root, stdio: "pipe" });
+    (0, import_node_child_process10.execSync)("git diff --cached --quiet", { cwd: root, stdio: "pipe" });
     return false;
   } catch {
     return true;
@@ -16313,30 +16717,47 @@ async function promptYes(question) {
     rl.close();
   }
 }
-async function runOptionalAuth(serviceUrl) {
-  const existing = await resolveToken();
-  if (existing.ok) {
-    const who = await whoami(existing.data.token, serviceUrl);
-    if (who.ok && who.data.logged_in) {
-      printInfo(`Logged in as ${who.data.email ?? `user #${who.data.user_id}`} \u2713 \u2014 runs & memory sync to Verity.`);
-      return;
+async function confirmExistingLogin(serviceUrl, opts) {
+  const existing = await resolveToken(opts.token);
+  if (!existing.ok) return "drive-login";
+  const who = await whoami(existing.data.token, serviceUrl, opts.verbose);
+  if (who.ok && who.data.logged_in) {
+    printInfo(`Logged in as ${who.data.email ?? `user #${who.data.user_id}`} \u2713 \u2014 runs & memory sync to Verity.`);
+    return "handled";
+  }
+  if (!who.ok) {
+    if (existing.data.userId != null) {
+      printInfo(`Logged in as ${existing.data.email ?? `user #${existing.data.userId}`} (cached \u2014 could not reach the Verity service). \u2713`);
+    } else {
+      printInfo("Could not confirm your login state with the service; continuing with your existing token.");
+      printInfo(`  (${who.error})`);
     }
-    if (!who.ok) {
-      if (existing.data.userId != null) {
-        printInfo(`Logged in as ${existing.data.email ?? `user #${existing.data.userId}`} (cached \u2014 could not reach the Verity service). \u2713`);
-      } else {
-        printInfo("Could not confirm your login state with the service; continuing with your existing token.");
-      }
-      return;
+    return "handled";
+  }
+  console.log("");
+  printWarn("You are NOT logged in \u2014 this project has only an anonymous token.");
+  printInfo("  The gate still runs, but no runs are saved and Verity keeps no memory of this project.");
+  printInfo("  Log in below to unlock run history, trends, and cloud memory (strongly recommended).");
+  return "drive-login";
+}
+async function runOptionalAuth(resolution, opts = {}) {
+  let serviceUrl = resolution?.url ?? DEFAULT_SERVICE_URL;
+  let healed = false;
+  if (resolution) {
+    const heal = await maybeHealServiceUrl(resolution, opts.verbose);
+    serviceUrl = heal.serviceUrl;
+    healed = heal.healed;
+    if (healed) {
+      printInfo("  Log in below to re-register this project and repair ~/.verity/credentials.");
     }
-    console.log("");
-    printWarn("You are NOT logged in \u2014 this project has only an anonymous token.");
-    printInfo("  The gate still runs, but no runs are saved and Verity keeps no memory of this project.");
-    printInfo("  Log in below to unlock run history, trends, and cloud memory (strongly recommended).");
+  }
+  if (!healed) {
+    const state = await confirmExistingLogin(serviceUrl, opts);
+    if (state === "handled") return;
   }
   let remote = "";
   try {
-    remote = (0, import_node_child_process10.execSync)("git remote get-url origin", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+    remote = (0, import_node_child_process11.execSync)("git remote get-url origin", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
   } catch {
   }
   const localOnlyNote = () => {
@@ -16369,7 +16790,7 @@ async function runOptionalAuth(serviceUrl) {
   }
   const projectName = parseRemote(remote)?.repo ?? (0, import_node_path19.basename)(process.cwd());
   printInfo("Authenticating with GitHub\u2026");
-  const result = await registerProject({ projectName, remote, serviceUrl });
+  const result = await registerProject({ projectName, remote, serviceUrl, verbose: opts.verbose });
   if (result.ok) {
     const who = result.data.email ?? (result.data.userId != null ? `user #${result.data.userId}` : null);
     printInfo(`Logged in${who ? ` as ${who}` : ""} \u2713 \u2014 runs, history, and cloud memory now sync to Verity.`);
@@ -16432,30 +16853,30 @@ function registerInitCommand(program2) {
     }
     printInfo(`  Node.js ${nodeVersion} \u2713`);
     try {
-      const gitVersion = (0, import_node_child_process10.execSync)("git --version", { encoding: "utf-8" }).trim();
+      const gitVersion = (0, import_node_child_process11.execSync)("git --version", { encoding: "utf-8" }).trim();
       printInfo(`  ${gitVersion} \u2713`);
     } catch {
       printError("git is required but not installed. Install from https://git-scm.com");
       process.exit(1);
     }
     try {
-      (0, import_node_child_process10.execSync)("which claude", { encoding: "utf-8" });
+      (0, import_node_child_process11.execSync)("which claude", { encoding: "utf-8" });
       printInfo("  Claude Code \u2713");
     } catch {
       printWarn("  Claude Code not found \u2014 hooks will be configured but need Claude Code to run.");
     }
     try {
-      (0, import_node_child_process10.execSync)("which codacy-analysis", { encoding: "utf-8", stdio: "pipe" });
+      (0, import_node_child_process11.execSync)("which codacy-analysis", { encoding: "utf-8", stdio: "pipe" });
       printInfo("  @codacy/analysis-cli \u2713");
     } catch {
       printInfo("  Installing @codacy/analysis-cli...");
       try {
-        (0, import_node_child_process10.execSync)("npm install -g @codacy/analysis-cli", { encoding: "utf-8", stdio: "pipe", timeout: 12e4 });
+        (0, import_node_child_process11.execSync)("npm install -g @codacy/analysis-cli", { encoding: "utf-8", stdio: "pipe", timeout: 12e4 });
         printInfo("  @codacy/analysis-cli installed \u2713");
       } catch {
         try {
           printWarn("  Retrying with sudo...");
-          (0, import_node_child_process10.execSync)("sudo npm install -g @codacy/analysis-cli", { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
+          (0, import_node_child_process11.execSync)("sudo npm install -g @codacy/analysis-cli", { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
           printInfo("  @codacy/analysis-cli installed \u2713");
         } catch {
           printWarn("  Could not install @codacy/analysis-cli automatically.");
@@ -16523,8 +16944,11 @@ function registerInitCommand(program2) {
     console.log("");
     try {
       const globals = program2.opts();
-      const urlResult = await resolveServiceUrl(globals.serviceUrl);
-      await runOptionalAuth(urlResult.ok ? urlResult.data : DEFAULT_SERVICE_URL);
+      const urlResult = await resolveServiceUrlDetailed(globals.serviceUrl);
+      await runOptionalAuth(urlResult.ok ? urlResult.data : null, {
+        token: globals.token,
+        verbose: globals.verbose
+      });
     } catch (err) {
       printWarn(`Authentication step skipped: ${err.message}`);
     }
@@ -16894,24 +17318,6 @@ function registerResetCommand(program2) {
   });
 }
 
-// src/lib/run-mode.ts
-function parseAutonomousEnv(raw) {
-  if (raw === void 0) return void 0;
-  const v = raw.trim().toLowerCase();
-  if (v === "") return void 0;
-  if (v === "0" || v === "false" || v === "off" || v === "no") return false;
-  return true;
-}
-function resolveRunMode(inputs = {}) {
-  if (inputs.autonomousFlag === true) return "autonomous";
-  if (inputs.autonomousFlag === false) return "interactive";
-  const env = inputs.env ?? process.env;
-  const envDecision = parseAutonomousEnv(env.VERITY_AUTONOMOUS);
-  if (envDecision !== void 0) return envDecision ? "autonomous" : "interactive";
-  const isTTY = inputs.isTTY ?? Boolean(process.stdin?.isTTY);
-  return isTTY ? "interactive" : "autonomous";
-}
-
 // src/commands/reflect.ts
 function registerReflectCommand(program2) {
   program2.command("reflect").description("Capture learnings \u2014 auto-extract or submit a human reflection").option("--user-input <text>", "The reflection to record (the agent-drafted or user-confirmed text)").option("--kind <kind>", "Node kind (decision, gotcha, pattern, security, quality, intent, domain, integration)", "gotcha").option("--task-id <id>", "Task to reflect on (defaults to current task)").option("--autonomous", "Record the drafted reflection without a confirm step (auto-detected from TTY / VERITY_AUTONOMOUS when omitted)").action(async (opts) => {
@@ -17140,89 +17546,6 @@ function registerRunCommand(program2) {
   });
 }
 
-// src/lib/telemetry.ts
-var import_promises14 = require("node:fs/promises");
-var SETTINGS_LOCAL_FILE2 = ".claude/settings.local.json";
-var GITIGNORE_FILE = ".gitignore";
-var GITIGNORE_ENTRY = ".claude/settings.local.json";
-function deriveOtlpEndpoint(serviceUrl) {
-  return serviceUrl.replace(/\/+$/, "").replace(/\/v1$/, "") + "/v1/otlp";
-}
-function buildTelemetryEnv(serviceUrl, token) {
-  return {
-    CLAUDE_CODE_ENABLE_TELEMETRY: "1",
-    OTEL_METRICS_EXPORTER: "otlp",
-    OTEL_TRACES_EXPORTER: "otlp",
-    CLAUDE_CODE_ENHANCED_TELEMETRY_BETA: "1",
-    OTEL_EXPORTER_OTLP_PROTOCOL: "http/json",
-    OTEL_EXPORTER_OTLP_ENDPOINT: deriveOtlpEndpoint(serviceUrl),
-    // <token> is whatever is in .verity/credentials — verity_ OR legacy gate_.
-    // The server hashes the raw token regardless of prefix.
-    OTEL_EXPORTER_OTLP_HEADERS: `Authorization=Bearer ${token}`,
-    OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: "delta",
-    OTEL_LOG_USER_PROMPTS: "0",
-    OTEL_LOG_TOOL_DETAILS: "0",
-    OTEL_LOG_TOOL_CONTENT: "0",
-    OTEL_METRICS_INCLUDE_SESSION_ID: "true",
-    OTEL_METRICS_INCLUDE_ACCOUNT_UUID: "false",
-    OTEL_METRICS_INCLUDE_VERSION: "false",
-    OTEL_METRIC_EXPORT_INTERVAL: "60000"
-  };
-}
-var VERITY_TELEMETRY_KEYS = Object.keys(buildTelemetryEnv("", ""));
-async function readSettingsLocal() {
-  try {
-    return JSON.parse(await (0, import_promises14.readFile)(projectPath(SETTINGS_LOCAL_FILE2), "utf-8"));
-  } catch {
-    return {};
-  }
-}
-async function writeSettingsLocal(settings) {
-  await writeJsonFilePreservingStyle(projectPath(SETTINGS_LOCAL_FILE2), settings);
-}
-async function ensureGitignore() {
-  const file = projectPath(GITIGNORE_FILE);
-  let content = "";
-  try {
-    content = await (0, import_promises14.readFile)(file, "utf-8");
-  } catch {
-  }
-  const lines = content.split("\n").map((l) => l.trim());
-  if (lines.includes(GITIGNORE_ENTRY) || lines.includes(".claude/") || lines.includes(".claude")) {
-    return;
-  }
-  const block = "# Verity telemetry \u2014 holds your project token\n" + GITIGNORE_ENTRY + "\n";
-  const next = content ? content + (content.endsWith("\n") ? "" : "\n") + "\n" + block : block;
-  await (0, import_promises14.writeFile)(file, next);
-}
-async function installTelemetry(serviceUrl, token) {
-  const env = buildTelemetryEnv(serviceUrl, token);
-  const settings = await readSettingsLocal();
-  settings.env = { ...settings.env ?? {}, ...env };
-  await writeSettingsLocal(settings);
-  await ensureGitignore();
-  return { ok: true, data: { endpoint: env.OTEL_EXPORTER_OTLP_ENDPOINT } };
-}
-async function checkTelemetry() {
-  const env = (await readSettingsLocal()).env ?? {};
-  const enabled = env.CLAUDE_CODE_ENABLE_TELEMETRY === "1" && !!env.OTEL_EXPORTER_OTLP_ENDPOINT;
-  return { enabled, endpoint: env.OTEL_EXPORTER_OTLP_ENDPOINT ?? null, settingsPath: SETTINGS_LOCAL_FILE2 };
-}
-async function uninstallTelemetry() {
-  const settings = await readSettingsLocal();
-  if (!settings.env) return { ok: true, data: { removed: 0 } };
-  let removed = 0;
-  for (const key of VERITY_TELEMETRY_KEYS) {
-    if (key in settings.env) {
-      delete settings.env[key];
-      removed++;
-    }
-  }
-  if (Object.keys(settings.env).length === 0) delete settings.env;
-  await writeSettingsLocal(settings);
-  return { ok: true, data: { removed } };
-}
-
 // src/commands/telemetry.ts
 function registerTelemetryCommands(program2) {
   const telemetry = program2.command("telemetry").description("Manage Claude Code OpenTelemetry export to Verity (cost & usage)");
@@ -17238,16 +17561,25 @@ function registerTelemetryCommands(program2) {
       printError(urlResult.error);
       process.exit(1);
     }
-    const result = await installTelemetry(urlResult.data, tokenResult.data.token);
+    const result = await installTelemetry(urlResult.data);
     if (!result.ok) {
       printError(result.error);
       process.exit(1);
     }
     printInfo(`Telemetry enabled \u2192 ${result.data.endpoint}`);
-    printInfo(`  wrote ${SETTINGS_LOCAL_FILE2} (gitignored \u2014 it holds your project token)`);
+    printInfo(`  wrote ${SETTINGS_LOCAL_FILE2} (no token stored \u2014 resolved at runtime via otelHeadersHelper)`);
     printInfo("  takes effect on your NEXT Claude Code session; first metrics appear within ~60s of activity");
     printInfo("  view cost & usage at /usage");
   });
+  telemetry.command("headers").description("Print the OTLP Authorization header as JSON (used by Claude Code otelHeadersHelper)").action(async () => {
+    const globals = program2.opts();
+    const tokenResult = await resolveToken(globals.token);
+    if (tokenResult.ok) {
+      printJsonCompact({ Authorization: `Bearer ${tokenResult.data.token}` });
+    } else {
+      printJsonCompact({});
+    }
+  });
   telemetry.command("check").description("Show whether Claude Code telemetry export to Verity is enabled").option("--json", "Output status as JSON").action(async (opts) => {
     const status = await checkTelemetry();
     if (opts.json) {
@@ -17273,7 +17605,12 @@ function registerTelemetryCommands(program2) {
 }
 
 // src/cli.ts
-program.name("verity").description("CLI for Verity quality gate service").version("0.27.2").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr");
+program.name("verity").description("CLI for Verity quality gate service").version("0.28.1-experimental.9155758").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr").hook("preAction", async () => {
+  try {
+    await foldLegacyLocalCredential();
+  } catch {
+  }
+});
 registerAuthCommands(program);
 registerLoginCommand(program);
 registerHooksCommands(program);
@@ -17295,4 +17632,8 @@ registerMemoryCommand(program);
 registerRunCommand(program);
 registerMigrateCommand(program);
 registerTelemetryCommands(program);
-program.parse();
+program.parseAsync().catch((err) => {
+  process.stderr.write(`[verity] ${err instanceof Error ? err.message : String(err)}
+`);
+  process.exit(1);
+});