@hireobi/cli 0.1.7 → 0.1.9

package/dist/obi.js

@@ -14618,6 +14618,7 @@ var optionDefinitions = {
   "field-path": { type: "string" },
   "segment-name": { type: "string" },
   text: { type: "string" },
+  tag: { type: "string" },
   company: { type: "string" },
   "company-unknown": { type: "boolean" },
   product: { type: "string" },
@@ -14632,7 +14633,7 @@ var optionDefinitions = {
   help: { type: "boolean" },
   version: { type: "boolean" }
 };
-var namedCommands = ["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies"];
+var namedCommands = ["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies", "support"];
 var memoryKinds = ["preference", "constraint", "decision"];
 var credentialsActions = ["list", "revoke"];
 var emailSchema = external_exports.email().max(254);
@@ -14651,6 +14652,8 @@ var CliError = class extends Error {
   command;
   authorization;
   account;
+  /** The message `obi support` could not send, with the block to paste. */
+  support;
   constructor(options) {
     super(options.message);
     this.name = "CliError";
@@ -14662,6 +14665,7 @@ var CliError = class extends Error {
     this.command = options.command;
     this.authorization = options.authorization;
     this.account = options.account;
+    this.support = options.support;
   }
 };
 function usageError(message = "Invalid command usage.", options = {}) {
@@ -15174,6 +15178,52 @@ function parseMemoryArguments(positionals, values, context, common2) {
   throw invalid3();
 }
 
+// src/support-contract.ts
+var SUPPORT_EMAIL = "support@hireobi.com";
+var SUPPORT_TAGS = ["market-request", "scope-request"];
+var lastErrorSchema = external_exports.strictObject({
+  code: external_exports.string().regex(/^[A-Z][A-Z0-9_]{0,79}$/),
+  command: external_exports.string().regex(/^[a-z][a-z-]{0,39}$/),
+  at: external_exports.iso.datetime({ offset: true })
+});
+var SupportMessageSchema = external_exports.strictObject({
+  requestId: external_exports.string().regex(/^[0-9a-f]{32}$/),
+  message: external_exports.string().trim().min(1).max(2e3),
+  tag: external_exports.enum(SUPPORT_TAGS).nullable(),
+  diagnostic: external_exports.strictObject({
+    cliVersion: external_exports.string().min(1).max(40),
+    node: external_exports.string().min(1).max(40),
+    os: external_exports.string().min(1).max(120),
+    lastError: lastErrorSchema.nullable()
+  })
+});
+var SupportMessageResponseSchema = external_exports.object({
+  schemaVersion: external_exports.literal(1),
+  data: external_exports.object({ received: external_exports.literal(true) })
+});
+var supportDataSchema = external_exports.object({
+  delivery: external_exports.enum(["sent", "not_sent"]),
+  /** Why nothing was sent: the error code met, null once sent. */
+  reason: external_exports.string().nullable(),
+  supportEmail: external_exports.literal(SUPPORT_EMAIL),
+  mailto: external_exports.string(),
+  tag: external_exports.enum(SUPPORT_TAGS).nullable(),
+  account: external_exports.string().nullable(),
+  origin: external_exports.string().min(1),
+  diagnosticText: external_exports.string()
+});
+
+// src/support-arguments.ts
+function parseSupportArguments(positionals, values, context, common2) {
+  const allowed = /* @__PURE__ */ new Set(["json", "timeout-ms", "tag"]);
+  const message = positionals[1]?.trim() ?? "";
+  const tag = values.tag;
+  if (Object.entries(values).some(([key, value]) => value !== void 0 && value !== false && !allowed.has(key)) || positionals.length !== 2 || message.length === 0 || message.length > 2e3 || tag !== void 0 && !SUPPORT_TAGS.includes(tag)) {
+    throw usageError(`Use support "<message of at most 2000 characters>" [--tag ${SUPPORT_TAGS.join("|")}].`, context);
+  }
+  return { command: "support", supportMessage: message, ...tag === void 0 ? {} : { supportTag: tag }, ...common2 };
+}
+
 // src/research-arguments.ts
 function parseResearchScope(values, context) {
   const locale = values.locale;
@@ -15576,7 +15626,7 @@ function commandMode(command, testServer) {
   if (testServer) {
     return "test";
   }
-  return command === "login" || command === "logout" || command === "status" || command === "credentials" || command === "eval" || command === "harness" || command === "business" || command === "questions" || command === "strategies" || command === "readiness" || command === "memory" ? "product" : "local";
+  return command === "login" || command === "logout" || command === "status" || command === "credentials" || command === "eval" || command === "harness" || command === "business" || command === "questions" || command === "strategies" || command === "readiness" || command === "memory" || command === "support" ? "product" : "local";
 }
 function errorContext(argv) {
   const usesTestServer = argv.some(
@@ -15762,6 +15812,8 @@ function parseCommandArguments(argv) {
     throw usageError("Use research crawl <domain> --checkpoint <file> --output <file> [--batch-size <1-100>] [--locale <tag>] [--pages priority|all] [--max-pages <n|none>] [--retry-failed|--refresh], research capture --input <selected-page-file> --checkpoint <file> --output <corpus-file>, research readiness --input <file> --output <file>, or research video <url> --output <directory> [--frames <0-30>].", context);
   }
   if (positionals[0] === "memory") return parseMemoryArguments(positionals, values, context, { evaluationCaseId, json: json2, timeoutMs });
+  if (positionals[0] === "support") return parseSupportArguments(positionals, values, context, { json: json2, timeoutMs });
+  if (values.tag !== void 0) throw usageError("--tag is only valid with obi support.", context);
   if (stage !== void 0 || input !== void 0 || output !== void 0 || checkpoint !== void 0 || batchSize !== void 0 || retryFailed || refresh || scopeFlagsUsed || values.frames !== void 0 || free || evidenceOptionsUsed) {
     throw usageError("--stage and --input are only valid with obi harness.", context);
   }
@@ -15856,9 +15908,6 @@ function parseCommandArguments(argv) {
   }
   if (command === "doctor") {
     if (evaluationCaseId !== void 0) throw usageError("Doctor cannot use --eval-case.", context);
-    if (timeoutValue !== void 0 && testServer === void 0) {
-      throw usageError("A timeout is only valid with a test server.", context);
-    }
     return { command, json: json2, testServer, timeoutMs };
   }
   if (command === "status") {
@@ -16587,6 +16636,34 @@ var BusinessItemReviewRequestSchema = external_exports.discriminatedUnion("decis
   })
 ]);
 
+// ../shared/lib/geo/markets.ts
+var SUPPORTED_MARKETS = [
+  { iso: "US", name: "United States" },
+  { iso: "CA", name: "Canada" },
+  { iso: "GB", name: "United Kingdom" },
+  { iso: "FR", name: "France" },
+  { iso: "DE", name: "Germany" },
+  { iso: "ES", name: "Spain" },
+  { iso: "IT", name: "Italy" },
+  { iso: "NL", name: "Netherlands" },
+  { iso: "BE", name: "Belgium" },
+  { iso: "CH", name: "Switzerland" },
+  { iso: "AU", name: "Australia" },
+  { iso: "SA", name: "Saudi Arabia" },
+  { iso: "AE", name: "UAE" },
+  { iso: "QA", name: "Qatar" },
+  { iso: "KW", name: "Kuwait" }
+];
+var BY_KEY = new Map(
+  SUPPORTED_MARKETS.flatMap((market) => [
+    [market.iso.toLowerCase(), market],
+    [market.name.toLowerCase(), market]
+  ])
+);
+var SUPPORTED_MARKET_NAMES = SUPPORTED_MARKETS.map(
+  (market) => market.name
+);
+
 // src/product-api-failures.ts
 function transportError(code, message, exitCode, retryable) {
   return new CliError({
@@ -16594,7 +16671,7 @@ function transportError(code, message, exitCode, retryable) {
     message,
     exitCode,
     retryable,
-    nextAction: exitCode === 6 ? "Check the network connection and try again." : "Update the Obi CLI, then try again.",
+    nextAction: exitCode === 6 ? `Check the network connection and try again. If it keeps failing, run obi support "<what happened>" or write to ${SUPPORT_EMAIL} with the command you ran and the error code ${code}.` : "Update the Obi CLI, then try again.",
     mode: "product"
   });
 }
@@ -16624,6 +16701,14 @@ function failureError(failure2, evaluationCaseId) {
     mode: "product",
     nextAction: `Run obi business show${scope} --json and read the current work before preparing a new result.`
   });
+  if (failure2.code === "MARKET_UNSUPPORTED") return new CliError({
+    code: failure2.code,
+    message: "Obi does not measure this market yet.",
+    exitCode: 5,
+    retryable: false,
+    mode: "product",
+    nextAction: `Obi measures in: ${SUPPORTED_MARKET_NAMES.join(", ")}. Choose one of them with the customer, or record the request with obi support "<market and domain>" --tag market-request.`
+  });
   if (failure2.code === "RATE_LIMITED") {
     const wait = failure2.retryAfterSeconds === null ? "a moment" : `${failure2.retryAfterSeconds} seconds`;
     return new CliError({
@@ -17213,7 +17298,7 @@ var originMarker = {
 };
 var helpDataSchema = external_exports.object({
   usage: external_exports.string(),
-  commands: external_exports.array(external_exports.enum(["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies"]))
+  commands: external_exports.array(external_exports.enum(["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies", "support"]))
 });
 var versionDataSchema = external_exports.object({ version: external_exports.string() });
 var skillDataSchema = external_exports.discriminatedUnion("action", [
@@ -17223,6 +17308,13 @@ var skillDataSchema = external_exports.discriminatedUnion("action", [
 var capabilitiesDataSchema = external_exports.object({
   expertise: external_exports.object({ manifestVersion: external_exports.string(), competencies: external_exports.array(external_exports.object({ id: external_exports.string(), reference: external_exports.string(), sha256: external_exports.string(), reviewedOn: external_exports.string(), sources: external_exports.array(external_exports.string()) })) }).optional(),
   version: external_exports.string(),
+  measurementMarkets: external_exports.array(external_exports.object({ iso: external_exports.string().length(2), name: external_exports.string().min(1) })),
+  catalog: external_exports.object({ version: external_exports.string(), currency: external_exports.literal("usd"), monthlyCents: external_exports.object({
+    corePack: external_exports.number().int().positive(),
+    claudePerPack: external_exports.number().int().positive(),
+    perplexityPerPack: external_exports.number().int().positive()
+  }) }),
+  support: external_exports.object({ email: external_exports.literal(SUPPORT_EMAIL) }),
   realLogin: external_exports.literal("available"),
   paidExecution: external_exports.literal("server_authorized"),
   commands: external_exports.object({
@@ -17240,7 +17332,8 @@ var capabilitiesDataSchema = external_exports.object({
     memory: external_exports.object({ actions: external_exports.array(external_exports.string()), options: external_exports.array(external_exports.string()) }).optional(),
     status: external_exports.object({ options: external_exports.array(external_exports.string()) }),
     readiness: external_exports.object({ options: external_exports.array(external_exports.string()) }),
-    strategies: external_exports.object({ options: external_exports.array(external_exports.string()) })
+    strategies: external_exports.object({ options: external_exports.array(external_exports.string()) }),
+    support: external_exports.object({ tags: external_exports.array(external_exports.enum(SUPPORT_TAGS)), options: external_exports.array(external_exports.string()) })
   })
 });
 var localDoctorDataSchema = external_exports.object({
@@ -17249,6 +17342,7 @@ var localDoctorDataSchema = external_exports.object({
   origin: external_exports.string(),
   credentialStorage: external_exports.union([backendKindSchema, external_exports.literal("none")]),
   videoTools: external_exports.object({ ytDlp: external_exports.boolean(), ffmpeg: external_exports.boolean() }),
+  server: external_exports.enum(["reachable", "degraded", "unreachable"]),
   diagnostic: external_exports.literal("completed")
 });
 var loginDataSchema = external_exports.object({
@@ -17545,6 +17639,7 @@ var successfulResultSchema = external_exports.union([
   external_exports.object({ ...envelope2, command: external_exports.literal("harness"), mode: external_exports.literal("product"), data: harnessCoverageDataSchema }),
   ...harnessEvidenceDataSchema.map((schema) => external_exports.object({ ...envelope2, command: external_exports.literal("harness"), mode: external_exports.literal("product"), data: schema })),
   external_exports.object({ ...envelope2, command: external_exports.literal("harness"), mode: external_exports.literal("product"), data: harnessEvidenceExportDataSchema }),
+  external_exports.object({ ...envelope2, command: external_exports.literal("support"), mode: external_exports.literal("product"), data: supportDataSchema }),
   external_exports.object({ ...envelope2, command: external_exports.literal("memory"), mode: external_exports.literal("product"), data: memoryListDataSchema }),
   external_exports.object({ ...envelope2, command: external_exports.literal("memory"), mode: external_exports.literal("product"), data: memoryChangeDataSchema }),
   external_exports.object({
@@ -17595,7 +17690,8 @@ var failedResultSchema = external_exports.object({
   ...originMarker,
   error: errorSchema,
   authorization: pendingAuthorizationViewSchema.optional(),
-  account: confirmedAccountSchema.optional()
+  account: confirmedAccountSchema.optional(),
+  support: supportDataSchema.optional()
 });
 var cliResultSchema = external_exports.union([successfulResultSchema, failedResultSchema]);
 
@@ -17692,7 +17788,7 @@ async function send(context, request) {
     headers2.authorization = `Bearer ${request.bearer}`;
   }
   if (context.evaluationCaseId && /^\/api\/v1\/(?:status|business(?:\/.*)?|questions(?:\/.*)?|readiness|strategies|work\/[0-9a-fA-F-]+\/artifact(?:\/revisions(?:\/[1-9][0-9]*)?)?|harness(?:\/(?:evidence|outcomes))?|memory)(?:\?.*)?$/.test(request.path)) {
-    headers2["x-heysurface-evaluation-case"] = context.evaluationCaseId;
+    headers2["x-obi-evaluation-case"] = context.evaluationCaseId;
   }
   if (request.idempotencyKey !== void 0) {
     headers2[IDEMPOTENCY_KEY_HEADER] = request.idempotencyKey;
@@ -18060,40 +18156,120 @@ async function readReadiness(context, accessToken) {
     responseLimitBytes: BUSINESS_REVIEW_RESPONSE_LIMIT_BYTES
   }), ProductReadinessResponseSchema);
 }
+async function sendSupportMessage(context, accessToken, message) {
+  return interpretReview(await send(context, { method: "POST", path: "/api/v1/support", bearer: accessToken, body: SupportMessageSchema.parse(message) }), SupportMessageResponseSchema);
+}
 
 // src/refresh.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { open as open2, readFile, stat, unlink as unlink2 } from "node:fs/promises";
+import { open as open2, readFile, stat, unlink as unlink3 } from "node:fs/promises";
 import { hostname as hostname3 } from "node:os";
 import { join as join3 } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
 
 // src/file-backend.ts
 import { randomBytes } from "node:crypto";
-import { constants } from "node:fs";
-import { lstat as lstat2, open, readdir, rename, unlink } from "node:fs/promises";
+import { constants as constants2 } from "node:fs";
+import { lstat as lstat2, open, readdir as readdir2, rename as rename2, unlink as unlink2 } from "node:fs/promises";
 import { join as join2 } from "node:path";
 
 // src/state-directory.ts
 import { createHash } from "node:crypto";
-import { chmod, lstat, mkdir } from "node:fs/promises";
+import { constants } from "node:fs";
+import { chmod, copyFile, cp, link, lstat, mkdir, readdir, rename, rm, unlink } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join } from "node:path";
+import { basename, dirname, isAbsolute, join } from "node:path";
 var posixModes = process.platform !== "win32";
-function resolveStateDirectory(environment) {
+function stateBase(environment) {
   const stateHome = environment.XDG_STATE_HOME;
   if (stateHome !== void 0 && isAbsolute(stateHome)) {
-    return join(stateHome, "heysurface");
+    return stateHome;
   }
   if (process.platform === "darwin") {
-    return join(homedir(), "Library", "Application Support", "heysurface");
+    return join(homedir(), "Library", "Application Support");
   }
   if (process.platform === "win32") {
     const localAppData = environment.LOCALAPPDATA;
-    const base = localAppData !== void 0 && isAbsolute(localAppData) ? localAppData : join(homedir(), "AppData", "Local");
-    return join(base, "heysurface");
+    return localAppData !== void 0 && isAbsolute(localAppData) ? localAppData : join(homedir(), "AppData", "Local");
   }
-  return join(homedir(), ".local", "state", "heysurface");
+  return join(homedir(), ".local", "state");
+}
+var currentName = "obi-cli";
+function resolveStateDirectory(environment) {
+  return join(stateBase(environment), currentName);
+}
+var legacyName = "heysurface";
+function legacyStateDirectory(environment) {
+  return join(stateBase(environment), legacyName);
+}
+function legacySibling(stateDirectory) {
+  return basename(stateDirectory) === currentName ? join(dirname(stateDirectory), legacyName) : null;
+}
+async function present(path) {
+  try {
+    await lstat(path);
+    return true;
+  } catch (error51) {
+    if (error51.code === "ENOENT") return false;
+    throw error51;
+  }
+}
+async function prepareStateDirectory(environment) {
+  const current = resolveStateDirectory(environment);
+  const legacy = legacyStateDirectory(environment);
+  try {
+    if (!await present(legacy)) return current;
+    if (await present(current)) {
+      await adoptConnection(legacy, current).catch(() => void 0);
+      return current;
+    }
+    try {
+      await rename(legacy, current);
+      return current;
+    } catch (error51) {
+      const code = error51.code;
+      if (code === "EXDEV") {
+        await copyThenRemove(legacy, current);
+        return current;
+      }
+      if ((code === "ENOENT" || code === "EEXIST" || code === "ENOTEMPTY") && await present(current)) return current;
+      return legacy;
+    }
+  } catch {
+    return await present(current).catch(() => false) ? current : legacy;
+  }
+}
+var connectionFile = /^(credentials|pending)-[0-9a-f]{24}\.json$/;
+async function adoptConnection(legacy, current) {
+  if ((await readdir(current)).some((name) => connectionFile.test(name))) return;
+  for (const name of (await readdir(legacy)).filter((entry) => connectionFile.test(entry))) {
+    const source = join(legacy, name);
+    const target = join(current, name);
+    if (!(await lstat(source)).isFile() || await present(target)) continue;
+    try {
+      await link(source, target);
+    } catch (error51) {
+      if (error51.code !== "EXDEV") throw error51;
+      await copyFile(source, target, constants.COPYFILE_EXCL);
+      if (posixModes) await chmod(target, 384);
+    }
+    await unlink(source);
+  }
+}
+async function copyThenRemove(legacy, current) {
+  const stats = await lstat(legacy);
+  if (!stats.isDirectory()) throw new Error("not a directory");
+  const staging = `${current}.${process.pid}.moving`;
+  await mkdir(staging, { mode: 448 });
+  try {
+    await cp(legacy, staging, { recursive: true, preserveTimestamps: true, verbatimSymlinks: true, errorOnExist: true, force: false });
+    if (posixModes) await chmod(staging, stats.mode & 511);
+    await rename(staging, current);
+  } catch (error51) {
+    await rm(staging, { recursive: true, force: true });
+    throw error51;
+  }
+  await rm(legacy, { recursive: true, force: true });
 }
 function originKey(origin) {
   return createHash("sha256").update(origin).digest("hex").slice(0, 24);
@@ -18148,7 +18324,7 @@ async function ensureStateDirectory(directory) {
 
 // src/file-backend.ts
 var maxItemBytes = 64 * 1024;
-var noFollow = constants.O_NOFOLLOW ?? 0;
+var noFollow = constants2.O_NOFOLLOW ?? 0;
 function isMissing(error51) {
   return error51.code === "ENOENT";
 }
@@ -18190,7 +18366,7 @@ var FileBackend = class {
     }
     let handle;
     try {
-      handle = await open(path, constants.O_RDONLY | noFollow);
+      handle = await open(path, constants2.O_RDONLY | noFollow);
     } catch (error51) {
       if (error51.code === "ELOOP") {
         throw insecureStorage();
@@ -18220,7 +18396,7 @@ var FileBackend = class {
       }
     }
     const temporary = join2(this.directory, `.${item}-${originKey(origin)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
-    const handle = await open(temporary, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | noFollow, 384);
+    const handle = await open(temporary, constants2.O_WRONLY | constants2.O_CREAT | constants2.O_EXCL | noFollow, 384);
     try {
       if (posixModes) {
         await handle.chmod(384);
@@ -18229,14 +18405,14 @@ var FileBackend = class {
       await handle.sync();
     } catch (error51) {
       await handle.close();
-      await unlink(temporary);
+      await unlink2(temporary);
       throw error51;
     }
     await handle.close();
     try {
-      await rename(temporary, path);
+      await rename2(temporary, path);
     } catch (error51) {
-      await unlink(temporary);
+      await unlink2(temporary);
       throw error51;
     }
   }
@@ -18244,7 +18420,7 @@ var FileBackend = class {
   async remove(item, origin) {
     let names;
     try {
-      names = await readdir(this.directory);
+      names = await readdir2(this.directory);
     } catch (error51) {
       if (isMissing(error51)) {
         return;
@@ -18255,7 +18431,7 @@ var FileBackend = class {
     const paths = names.filter((name) => name.startsWith(leftover) && name.endsWith(".tmp")).map((name) => join2(this.directory, name));
     for (const path of [this.path(item, origin), ...paths]) {
       try {
-        await unlink(path);
+        await unlink2(path);
       } catch (error51) {
         if (!isMissing(error51)) {
           throw error51;
@@ -18266,8 +18442,9 @@ var FileBackend = class {
 };
 
 // src/os-backends.ts
-import { accessSync, constants as constants2, existsSync as existsSync2, statSync } from "node:fs";
-var service = "heysurface-cli";
+import { accessSync, constants as constants3, existsSync as existsSync2, statSync } from "node:fs";
+var currentService = "obi-cli";
+var legacyService = "heysurface-cli";
 var plainToken = /^[A-Za-z0-9:/.[\]_-]+$/;
 var keychainNotFound = 44;
 var maxCommandLength = 4e3;
@@ -18305,14 +18482,16 @@ async function run(executable, args, stdin) {
 var KeychainBackend = class {
   kind = "keychain";
   executable;
-  constructor(executable) {
+  service;
+  constructor(executable, service = currentService) {
     this.executable = executable;
+    this.service = service;
   }
   async exists(item, origin) {
     return await this.read(item, origin) !== null;
   }
   async read(item, origin) {
-    const result = await run(this.executable, ["find-generic-password", "-s", service, "-a", account(item, origin), "-w"]);
+    const result = await run(this.executable, ["find-generic-password", "-s", this.service, "-a", account(item, origin), "-w"]);
     if (result.exitCode === keychainNotFound) {
       return null;
     }
@@ -18323,7 +18502,7 @@ var KeychainBackend = class {
   }
   async write(item, origin, value) {
     const hex3 = Buffer.from(encode3(value), "utf8").toString("hex");
-    const command = `add-generic-password -U -s ${service} -a ${account(item, origin)} -X ${hex3}
+    const command = `add-generic-password -U -s ${this.service} -a ${account(item, origin)} -X ${hex3}
 `;
     if (command.length > maxCommandLength) {
       throw refused();
@@ -18334,7 +18513,7 @@ var KeychainBackend = class {
     }
   }
   async remove(item, origin) {
-    const result = await run(this.executable, ["delete-generic-password", "-s", service, "-a", account(item, origin)]);
+    const result = await run(this.executable, ["delete-generic-password", "-s", this.service, "-a", account(item, origin)]);
     if (result.exitCode !== 0 && result.exitCode !== keychainNotFound) {
       throw refused();
     }
@@ -18343,11 +18522,13 @@ var KeychainBackend = class {
 var SecretServiceBackend = class {
   kind = "secret-service";
   executable;
-  constructor(executable) {
+  service;
+  constructor(executable, service = currentService) {
     this.executable = executable;
+    this.service = service;
   }
   attributes(item, origin) {
-    return ["service", service, "account", account(item, origin)];
+    return ["service", this.service, "account", account(item, origin)];
   }
   async exists(item, origin) {
     return await this.read(item, origin) !== null;
@@ -18363,7 +18544,7 @@ var SecretServiceBackend = class {
     return decode3(result.stdout);
   }
   async write(item, origin, value) {
-    const result = await run(this.executable, ["store", "--label=Heysurface CLI", ...this.attributes(item, origin)], encode3(value));
+    const result = await run(this.executable, ["store", "--label=Obi CLI", ...this.attributes(item, origin)], encode3(value));
     if (result.exitCode !== 0) {
       throw refused();
     }
@@ -18379,7 +18560,7 @@ var secretToolLocations = ["/usr/bin/secret-tool", "/usr/local/bin/secret-tool",
 function installedSecretTool() {
   for (const candidate of secretToolLocations) {
     try {
-      accessSync(candidate, constants2.X_OK);
+      accessSync(candidate, constants3.X_OK);
       if (statSync(candidate).isFile()) {
         return candidate;
       }
@@ -18388,15 +18569,58 @@ function installedSecretTool() {
   }
   return null;
 }
+var MigratingBackend = class {
+  kind;
+  current;
+  legacy;
+  constructor(current, legacy) {
+    this.kind = current.kind;
+    this.current = current;
+    this.legacy = legacy;
+  }
+  async exists(item, origin) {
+    return await this.read(item, origin) !== null;
+  }
+  async read(item, origin) {
+    const value = await this.current.read(item, origin);
+    if (value !== null) return value;
+    const old = await this.legacy.read(item, origin);
+    if (old === null) return null;
+    const moved = await this.current.read(item, origin);
+    if (moved !== null) {
+      await this.legacy.remove(item, origin).catch(() => void 0);
+      return moved;
+    }
+    try {
+      await this.current.write(item, origin, old);
+    } catch {
+      return old;
+    }
+    await this.legacy.remove(item, origin).catch(() => void 0);
+    return old;
+  }
+  async write(item, origin, value) {
+    await this.current.write(item, origin, value);
+  }
+  async remove(item, origin) {
+    await this.current.remove(item, origin);
+    try {
+      await this.legacy.remove(item, origin);
+    } catch {
+      process.stderr.write("Warning: a copy of this connection under the former store name could not be removed.\n");
+    }
+  }
+};
 function systemBackend() {
   if (process.platform === "darwin") {
-    return existsSync2("/usr/bin/security") ? new KeychainBackend("/usr/bin/security") : null;
+    const security = "/usr/bin/security";
+    return existsSync2(security) ? new MigratingBackend(new KeychainBackend(security), new KeychainBackend(security, legacyService)) : null;
   }
   if (process.platform === "win32") {
     return null;
   }
   const secretTool = installedSecretTool();
-  return secretTool === null ? null : new SecretServiceBackend(secretTool);
+  return secretTool === null ? null : new MigratingBackend(new SecretServiceBackend(secretTool), new SecretServiceBackend(secretTool, legacyService));
 }
 
 // src/retired-origin.ts
@@ -18634,7 +18858,7 @@ async function acquireLock(path) {
     if (holder !== null && isStale(holder)) {
       const current = await readHolder(path);
       if (current !== null && current.raw === holder.raw && current.identity === holder.identity) {
-        await unlink2(path).catch((error51) => {
+        await unlink3(path).catch((error51) => {
           if (error51.code !== "ENOENT") throw error51;
         });
       }
@@ -18653,7 +18877,7 @@ async function withCredentialLock(context, action) {
   try {
     return await action();
   } finally {
-    await unlink2(path).catch((error51) => {
+    await unlink3(path).catch((error51) => {
       if (error51.code !== "ENOENT") throw error51;
     });
   }
@@ -19085,7 +19309,7 @@ async function submitHarnessObservation(context, path) {
 
 // src/commands.ts
 import { access } from "node:fs/promises";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/onboarding-guide.ts
 var READING_POLL_MS = 6e4;
@@ -19708,7 +19932,7 @@ import { resolve } from "node:path";
 
 // src/local-json.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { rename as rename2, unlink as unlink3, writeFile as writeFile2 } from "node:fs/promises";
+import { rename as rename3, unlink as unlink4, writeFile as writeFile2 } from "node:fs/promises";
 function localFileError(message, nextAction) {
   return new CliError({
     code: "RESEARCH_FILE_ERROR",
@@ -19726,9 +19950,9 @@ async function writeJsonAtomic(path, value, options) {
   if (bytes > options.maxBytes) throw localFileError(options.tooLarge, options.nextAction);
   try {
     await writeFile2(temporary, content, { mode: 384, flag: "wx" });
-    await rename2(temporary, path);
+    await rename3(temporary, path);
   } catch {
-    await unlink3(temporary).catch(() => void 0);
+    await unlink4(temporary).catch(() => void 0);
     throw localFileError("The output could not be written atomically.", options.nextAction);
   }
   return bytes;
@@ -20020,7 +20244,7 @@ import { setTimeout as sleep2 } from "node:timers/promises";
 import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { hostname as hostname4 } from "node:os";
-import { basename } from "node:path";
+import { basename as basename2 } from "node:path";
 var maxLabelLength = 64;
 function parentProcessName() {
   try {
@@ -20033,7 +20257,7 @@ function parentProcessName() {
         stdio: ["ignore", "pipe", "ignore"],
         timeout: 2e3
       });
-      return basename(command.trim());
+      return basename2(command.trim());
     }
   } catch {
   }
@@ -20056,17 +20280,30 @@ function deviceLabel() {
 // src/origin.ts
 var productionOrigin = "https://agent.hireobi.com";
 var developmentOrigin = /^http:\/\/(localhost|127\.0\.0\.1|\[::1\]):([1-9][0-9]{0,4})$/;
+var retiredVariable = "HEYSURFACE_ORIGIN";
 function invalidOrigin() {
   return new CliError({
     code: "INVALID_ORIGIN",
-    message: "HEYSURFACE_ORIGIN must be a loopback development origin with an explicit port.",
+    message: "OBI_ORIGIN must be a loopback development origin with an explicit port.",
+    exitCode: 2,
+    retryable: false,
+    nextAction: "Unset OBI_ORIGIN, or set it to http://localhost:<port>, http://127.0.0.1:<port> or http://[::1]:<port>."
+  });
+}
+function retiredOrigin() {
+  return new CliError({
+    code: "INVALID_ORIGIN",
+    message: `${retiredVariable} is no longer read; the development origin is OBI_ORIGIN.`,
     exitCode: 2,
     retryable: false,
-    nextAction: "Unset HEYSURFACE_ORIGIN, or set it to http://localhost:<port>, http://127.0.0.1:<port> or http://[::1]:<port>."
+    nextAction: `Unset ${retiredVariable}, and set OBI_ORIGIN instead if you meant a development server.`
   });
 }
 function resolveOrigin(environment) {
-  const override = environment.HEYSURFACE_ORIGIN;
+  if (environment[retiredVariable] !== void 0) {
+    throw retiredOrigin();
+  }
+  const override = environment.OBI_ORIGIN;
   if (override === void 0) {
     return { origin: productionOrigin, development: false };
   }
@@ -20137,6 +20374,111 @@ function memoryText(data) {
 `;
 }
 
+// src/support-commands.ts
+import { createHash as createHash2 } from "node:crypto";
+import { release } from "node:os";
+
+// src/last-error.ts
+import { readFile as readFile6, writeFile as writeFile3 } from "node:fs/promises";
+import { join as join4 } from "node:path";
+var fileIn = (stateDirectory) => join4(stateDirectory, "last-error.json");
+async function recordLastError(stateDirectory, error51) {
+  try {
+    const parsed = lastErrorSchema.safeParse({ ...error51, at: (/* @__PURE__ */ new Date()).toISOString() });
+    if (!parsed.success) return;
+    await ensureStateDirectory(stateDirectory);
+    await writeFile3(fileIn(stateDirectory), JSON.stringify(parsed.data), { mode: 384 });
+  } catch {
+  }
+}
+async function readLastError(stateDirectory) {
+  try {
+    const parsed = lastErrorSchema.safeParse(JSON.parse(await readFile6(fileIn(stateDirectory), "utf8")));
+    return parsed.success ? parsed.data : null;
+  } catch {
+    return null;
+  }
+}
+
+// src/version.ts
+var cliVersion = "0.1.9";
+
+// src/support-commands.ts
+async function probeServer(origin, timeoutMs) {
+  try {
+    const response = await exchange({
+      url: new URL("/api/health", origin.origin),
+      method: "GET",
+      headers: { accept: "application/json" },
+      timeoutMs
+    });
+    return response.status === 200 ? "reachable" : "degraded";
+  } catch {
+    return "unreachable";
+  }
+}
+async function sendSupport(context, input) {
+  const lastError = await readLastError(context.stateDirectory);
+  const diagnostic = { cliVersion, node: process.version, os: `${process.platform} ${release()} ${process.arch}`, lastError };
+  let account2 = null;
+  let reason = null;
+  try {
+    const located = await locateCredential(context);
+    if (located === null) {
+      reason = "AUTH_REQUIRED";
+    } else {
+      account2 = located.credential.account.email;
+      const requestId = createHash2("sha256").update(JSON.stringify([
+        context.origin.origin,
+        account2,
+        input.message,
+        input.tag,
+        (/* @__PURE__ */ new Date()).toISOString().slice(0, 10)
+      ])).digest("hex").slice(0, 32);
+      const { result } = await useCredential(
+        context,
+        located,
+        (token) => sendSupportMessage(context, token, { requestId, ...input, diagnostic })
+      );
+      if (!result.ok) reason = result.failure.httpStatus >= 500 ? "SERVICE_UNAVAILABLE" : result.failure.code;
+    }
+  } catch (error51) {
+    reason = error51 instanceof CliError ? error51.code : "INTERNAL_ERROR";
+  }
+  const diagnosticText = [
+    `Message: ${input.message}`,
+    `Tag: ${input.tag ?? "general"}`,
+    `Obi CLI ${diagnostic.cliVersion} \xB7 Node ${diagnostic.node} \xB7 ${diagnostic.os}`,
+    `Last error: ${lastError === null ? "none" : `${lastError.code} (${lastError.command}) at ${lastError.at}`}`,
+    `Account: ${account2 ?? "not signed in"}`
+  ].join("\n");
+  const data = {
+    delivery: reason === null ? "sent" : "not_sent",
+    reason,
+    supportEmail: SUPPORT_EMAIL,
+    mailto: `mailto:${SUPPORT_EMAIL}`,
+    tag: input.tag,
+    account: account2,
+    origin: context.origin.origin,
+    diagnosticText
+  };
+  if (reason === null) return data;
+  throw new CliError({
+    code: "SUPPORT_NOT_SENT",
+    message: `The message was not sent to Obi support (${reason}).`,
+    exitCode: reason === "AUTH_REQUIRED" ? 3 : 6,
+    retryable: reason !== "AUTH_REQUIRED",
+    mode: "product",
+    command: "support",
+    nextAction: `Write to ${SUPPORT_EMAIL} and paste the block below (support.diagnosticText with --json). Never add a token or a credential file.`,
+    support: data
+  });
+}
+function supportText(data) {
+  return `Sent to Obi support (${data.supportEmail}). The reply goes to ${sanitizeHumanText(data.account ?? "the account email")}.
+`;
+}
+
 // src/scan-output.ts
 function heading(data) {
   const scored = `${data.scoredCells}/${data.expectedCells} answers scored from question version ${data.candidateVersion ?? "none"}.`;
@@ -20261,6 +20603,7 @@ function failureText(result) {
     lines.push(`Approving account: ${sanitizeHumanText(result.account.email)} (${result.account.role}).`);
   }
   lines.push(sanitizeHumanText(result.error.nextAction));
+  if (result.support !== void 0) lines.push("", ...result.support.diagnosticText.split("\n").map(sanitizeHumanText));
   return `${lines.join("\n")}
 `;
 }
@@ -20294,22 +20637,21 @@ var storageLabels = {
   "secret-service": "the system Secret Service",
   file: "a file readable only by your user"
 };
-function toHumanOutput(result, identity = "heysurface") {
+function toHumanOutput(result) {
   if (!result.ok) {
     return failureText(result);
   }
   if (result.command === "help") {
-    if (identity === "heysurface") return `Usage: ${result.data.usage}
-`;
-    const usage2 = result.data.usage.split("\n").map((line) => `  ${line.trimStart().replace(/^heysurface /, "obi ")}`).join("\n");
+    const usage2 = result.data.usage.split("\n").map((line) => `  ${line.trimStart()}`).join("\n");
     return `Obi \xB7 AI Search Employee
 
 Get started
-  1. obi skill install
-  2. In a new Claude Code or Cursor chat, type /obi.
+  1. In Claude Code or Cursor, type /obi.
      In Codex CLI, type $obi or choose Obi from /skills.
      In the desktop app, select Obi from the skills picker.
-  3. Give Obi a website or ask to continue saved work.
+     In OpenCode, type @obi.
+  2. Give Obi a website or ask to continue saved work.
+  Every obi command registers the Skill; obi skill install repairs it.
 
 Commands
 ${usage2}
@@ -20321,11 +20663,11 @@ ${usage2}
   }
   if (result.command === "skill") {
     return result.data.action === "path" ? `${sanitizeHumanText(result.data.path)}
-` : identity === "obi" ? `Obi Skill registered locally. In a new Claude Code or Cursor chat, type /obi. In Codex CLI, type $obi or choose Obi from /skills. In the desktop app, select Obi from the skills picker.
-${result.data.removed.length > 0 ? "The earlier /heysurface Skill links of this package were removed; use /obi instead.\n" : ""}` : "Heysurface Skill registered locally. Open a new Claude Code or Cursor agent chat and type /heysurface.\n";
+` : `Obi Skill registered locally. In a new Claude Code or Cursor chat, type /obi. In Codex CLI, type $obi or choose Obi from /skills. In the desktop app, select Obi from the skills picker. In OpenCode, type @obi.
+${result.data.removed.length > 0 ? "Earlier Skill links of this package under another name were removed; use /obi.\n" : ""}`;
   }
   if (result.command === "capabilities") {
-    return "Available: business, capabilities, credentials, doctor, eval, harness, login, logout, memory, questions, readiness, research, skill, status, strategies. Scan execution requires server authorization and a separate customer decision.\n";
+    return "Available: business, capabilities, credentials, doctor, eval, harness, login, logout, memory, questions, readiness, research, skill, status, strategies, support. Scan execution requires server authorization and a separate customer decision.\n";
   }
   if (result.command === "eval") {
     if ("evaluation" in result.data) {
@@ -20340,6 +20682,7 @@ Next: ${sanitizeHumanText(result.data.nextStep)}
     return result.data.action === "list" ? connectionListText(result.data) : revocationText(result.data);
   }
   if (result.command === "memory") return memoryText(result.data);
+  if (result.command === "support") return supportText(result.data);
   if (result.command === "doctor") {
     if (result.mode === "test") {
       return `Synthetic test protocol reachable. State: ${String(result.data.state)}.
@@ -20347,7 +20690,12 @@ Next: ${sanitizeHumanText(result.data.nextStep)}
     }
     const storage = result.data.credentialStorage === "none" ? "no stored connection" : `connection stored in ${storageLabels[result.data.credentialStorage]}`;
     const video = result.data.videoTools.ytDlp ? `video reading available${result.data.videoTools.ffmpeg ? " with frames" : " (captions only; frames need ffmpeg)"}` : "video reading needs yt-dlp";
-    return `Local diagnostic completed for ${sanitizeHumanText(result.data.origin)}: ${storage}; ${video}. No request was sent.
+    const server = {
+      reachable: "Obi server reachable.",
+      degraded: `Obi server degraded: try again later, and write to ${SUPPORT_EMAIL} if it lasts.`,
+      unreachable: `Obi server unreachable: check the network connection, and write to ${SUPPORT_EMAIL} if it lasts.`
+    }[result.data.server];
+    return `Local diagnostic completed for ${sanitizeHumanText(result.data.origin)}: ${storage}; ${video}. ${server}
 `;
   }
   if (result.command === "login") {
@@ -20538,11 +20886,11 @@ ${sanitizeHumanText(data.revision.content)}
     ];
     if (review.identity === null) lines.push("  pending");
     else {
-      const { identity: identity2 } = review;
-      lines.push(`  Current company name [${identity2.origin}${identity2.latestReview === null ? "" : `, ${identity2.latestReview}`}]: ${sanitizeHumanText(identity2.value.companyName ?? "unresolved")} (company only).`);
-      lines.push(`  Site proposal [${identity2.proposal.status}]: ${sanitizeHumanText(identity2.proposal.name ?? "unresolved")} on ${sanitizeHumanText(identity2.proposal.domain)} (${sanitizeHumanText(identity2.proposal.reason)}).`);
-      if (identity2.conflict !== null) lines.push(`  Name conflict: customer says ${sanitizeHumanText(identity2.conflict.customerName)}; site proposes ${sanitizeHumanText(identity2.conflict.siteProposedName)}. Keep the customer name and review the discrepancy.`);
-      for (const evidence2 of identity2.proposal.evidence) lines.push(`    Proposal evidence: ${sanitizeHumanText(evidence2.quote)} \u2014 ${sanitizeHumanText(evidence2.url)}`);
+      const { identity } = review;
+      lines.push(`  Current company name [${identity.origin}${identity.latestReview === null ? "" : `, ${identity.latestReview}`}]: ${sanitizeHumanText(identity.value.companyName ?? "unresolved")} (company only).`);
+      lines.push(`  Site proposal [${identity.proposal.status}]: ${sanitizeHumanText(identity.proposal.name ?? "unresolved")} on ${sanitizeHumanText(identity.proposal.domain)} (${sanitizeHumanText(identity.proposal.reason)}).`);
+      if (identity.conflict !== null) lines.push(`  Name conflict: customer says ${sanitizeHumanText(identity.conflict.customerName)}; site proposes ${sanitizeHumanText(identity.conflict.siteProposedName)}. Keep the customer name and review the discrepancy.`);
+      for (const evidence2 of identity.proposal.evidence) lines.push(`    Proposal evidence: ${sanitizeHumanText(evidence2.quote)} \u2014 ${sanitizeHumanText(evidence2.url)}`);
     }
     lines.push("Summary:");
     if (review.summary === null) lines.push("  pending");
@@ -20649,13 +20997,13 @@ function humanWarnings(result) {
   }
   return "";
 }
-function writeResult(result, json2, identity = "heysurface") {
+function writeResult(result, json2) {
   if (json2) {
     process.stdout.write(toJsonLine(result));
     return;
   }
-  const human = toHumanOutput(result, identity);
-  const heading2 = identity === "obi" && (!result.ok || result.command !== "version" && result.command !== "skill" && result.command !== "help") ? "Obi\n\n" : "";
+  const human = toHumanOutput(result);
+  const heading2 = !result.ok || result.command !== "version" && result.command !== "skill" && result.command !== "help" ? "Obi\n\n" : "";
   const output = `${heading2}${result.evaluationCaseId ? `Evaluation case ${result.evaluationCaseId}
 ${human}` : human}`;
   if (result.ok) {
@@ -20683,9 +21031,6 @@ async function confirmAccount(account2) {
   }
 }
 
-// src/version.ts
-var cliVersion = "0.1.7";
-
 // src/login.ts
 var loginRequestTimeoutMs = 1e4;
 var maxLinkLength = 200;
@@ -20704,10 +21049,10 @@ function connectionLink(pending) {
   return pending.verificationUriComplete ?? pending.verificationUri;
 }
 function announcementLines(pending, opening) {
-  const link = sanitizeHumanText(connectionLink(pending));
+  const link2 = sanitizeHumanText(connectionLink(pending));
   const code = sanitizeHumanText(pending.userCode);
   return [
-    opening ? `Opening ${link} in your browser: sign in there, or create your Obi account.` : `Open ${link} to sign in or create your Obi account.`,
+    opening ? `Opening ${link2} in your browser: sign in there, or create your Obi account.` : `Open ${link2} to sign in or create your Obi account.`,
     `Check that the page shows the code ${code}, and approve the connection only if it does.`
   ];
 }
@@ -20895,7 +21240,7 @@ function accountMismatch(account2, revoked, expected) {
 }
 async function confirmAndStore(context, store, pair, receivedAt, expectedEmail) {
   const api = context;
-  const release2 = guardNewFamily(api, pair);
+  const release3 = guardNewFamily(api, pair);
   let stored = false;
   try {
     const status = await readAccountStatus(api, pair.accessToken);
@@ -20926,7 +21271,7 @@ async function confirmAndStore(context, store, pair, receivedAt, expectedEmail)
       }
       await store.writeCredential(credentialFromPair(context.origin.origin, pair, confirmed, receivedAt));
       stored = true;
-      release2();
+      release3();
     });
     try {
       await store.removePending();
@@ -20946,7 +21291,7 @@ async function confirmAndStore(context, store, pair, receivedAt, expectedEmail)
     }
     throw error51;
   } finally {
-    release2();
+    release3();
   }
 }
 async function login(session, options) {
@@ -21085,12 +21430,12 @@ async function proceedToFirstScan(context, candidateVersion) {
 }
 
 // src/research-commands.ts
-import { readFile as readFile6, stat as stat6 } from "node:fs/promises";
+import { readFile as readFile7, stat as stat6 } from "node:fs/promises";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 import { resolve as resolve2 } from "node:path";
 
 // ../geo-engine/src/geo/host-acquisition.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 
 // ../geo-engine/src/url-safety.ts
 var PRIVATE_IP_RE = /^(127\.|10\.|192\.168\.|169\.254\.|172\.(1[6-9]|2\d|3[01])\.|0\.)/;
@@ -21140,12 +21485,12 @@ import { urlToHttpOptions } from "node:url";
 
 // ../geo-engine/src/safe-fetch-decoding.ts
 import { Duplex, pipeline } from "node:stream";
-import { constants as constants3, createBrotliDecompress, createGunzip, createInflate, createInflateRaw } from "node:zlib";
+import { constants as constants4, createBrotliDecompress, createGunzip, createInflate, createInflateRaw } from "node:zlib";
 var MAX_CODINGS = 5;
 var ZLIB_DEFLATE_METHOD = 8;
 var BODILESS_STATUSES = /* @__PURE__ */ new Set([204, 205, 304]);
-var ZLIB_LENIENCY = { flush: constants3.Z_SYNC_FLUSH, finishFlush: constants3.Z_SYNC_FLUSH };
-var BROTLI_LENIENCY = { flush: constants3.BROTLI_OPERATION_FLUSH, finishFlush: constants3.BROTLI_OPERATION_FLUSH };
+var ZLIB_LENIENCY = { flush: constants4.Z_SYNC_FLUSH, finishFlush: constants4.Z_SYNC_FLUSH };
+var BROTLI_LENIENCY = { flush: constants4.BROTLI_OPERATION_FLUSH, finishFlush: constants4.BROTLI_OPERATION_FLUSH };
 function createDeflateDecoder() {
   let inflater;
   const start = (format) => {
@@ -21261,7 +21606,7 @@ async function safeFetch(url3, opts = {}) {
     if (!REDIRECT_STATUSES.has(res.status)) return res;
     const location = res.headers.get("location");
     if (!location) return res;
-    await release(res);
+    await release2(res);
     let next;
     try {
       next = new URL(location, current).href;
@@ -21272,7 +21617,7 @@ async function safeFetch(url3, opts = {}) {
   }
   throw new TooManyRedirectsError(url3, maxRedirects);
 }
-async function release(res) {
+async function release2(res) {
   await res.body?.cancel().catch((err) => {
     console.warn("[safe-fetch] cancelling an unread body failed:", err);
   });
@@ -21280,7 +21625,7 @@ async function release(res) {
 async function readCapped(res, maxBytes = MAX_RESPONSE_BYTES) {
   const declared = Number(res.headers.get("content-length"));
   if (Number.isFinite(declared) && declared > maxBytes) {
-    await release(res);
+    await release2(res);
     return "";
   }
   if (!res.body) return (await res.text()).slice(0, maxBytes);
@@ -21446,7 +21791,7 @@ function createVettedTransport(options = {}) {
 }
 
 // ../geo-engine/src/geo/page-evidence.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // ../node_modules/parse5/dist/common/unicode.js
 var UNDEFINED_CODE_POINTS = /* @__PURE__ */ new Set([
@@ -21523,20 +21868,20 @@ var SEQUENCES = {
   PUBLIC: "public",
   SYSTEM: "system"
 };
-function isSurrogate(cp) {
-  return cp >= 55296 && cp <= 57343;
+function isSurrogate(cp2) {
+  return cp2 >= 55296 && cp2 <= 57343;
 }
-function isSurrogatePair(cp) {
-  return cp >= 56320 && cp <= 57343;
+function isSurrogatePair(cp2) {
+  return cp2 >= 56320 && cp2 <= 57343;
 }
 function getSurrogatePairCodePoint(cp1, cp2) {
   return (cp1 - 55296) * 1024 + 9216 + cp2;
 }
-function isControlCodePoint(cp) {
-  return cp !== 32 && cp !== 10 && cp !== 13 && cp !== 9 && cp !== 12 && cp >= 1 && cp <= 31 || cp >= 127 && cp <= 159;
+function isControlCodePoint(cp2) {
+  return cp2 !== 32 && cp2 !== 10 && cp2 !== 13 && cp2 !== 9 && cp2 !== 12 && cp2 >= 1 && cp2 <= 31 || cp2 >= 127 && cp2 <= 159;
 }
-function isUndefinedCodePoint(cp) {
-  return cp >= 64976 && cp <= 65007 || UNDEFINED_CODE_POINTS.has(cp);
+function isUndefinedCodePoint(cp2) {
+  return cp2 >= 64976 && cp2 <= 65007 || UNDEFINED_CODE_POINTS.has(cp2);
 }
 
 // ../node_modules/parse5/dist/common/error-codes.js
@@ -21654,20 +21999,20 @@ var Preprocessor = class {
     this.gapStack.push(this.lastGapPos);
     this.lastGapPos = this.pos;
   }
-  _processSurrogate(cp) {
+  _processSurrogate(cp2) {
     if (this.pos !== this.html.length - 1) {
       const nextCp = this.html.charCodeAt(this.pos + 1);
       if (isSurrogatePair(nextCp)) {
         this.pos++;
         this._addGap();
-        return getSurrogatePairCodePoint(cp, nextCp);
+        return getSurrogatePairCodePoint(cp2, nextCp);
       }
     } else if (!this.lastChunkWritten) {
       this.endOfChunkHit = true;
       return CODE_POINTS.EOF;
     }
     this._err(ERR.surrogateInInputStream);
-    return cp;
+    return cp2;
   }
   willDropParsedChunk() {
     return this.pos > this.bufferWaterline;
@@ -21704,8 +22049,8 @@ var Preprocessor = class {
       return this.html.startsWith(pattern, this.pos);
     }
     for (let i = 0; i < pattern.length; i++) {
-      const cp = this.html.charCodeAt(this.pos + i) | 32;
-      if (cp !== pattern.charCodeAt(i)) {
+      const cp2 = this.html.charCodeAt(this.pos + i) | 32;
+      if (cp2 !== pattern.charCodeAt(i)) {
         return false;
       }
     }
@@ -21731,13 +22076,13 @@ var Preprocessor = class {
       this.endOfChunkHit = !this.lastChunkWritten;
       return CODE_POINTS.EOF;
     }
-    let cp = this.html.charCodeAt(this.pos);
-    if (cp === CODE_POINTS.CARRIAGE_RETURN) {
+    let cp2 = this.html.charCodeAt(this.pos);
+    if (cp2 === CODE_POINTS.CARRIAGE_RETURN) {
       this.isEol = true;
       this.skipNextNewLine = true;
       return CODE_POINTS.LINE_FEED;
     }
-    if (cp === CODE_POINTS.LINE_FEED) {
+    if (cp2 === CODE_POINTS.LINE_FEED) {
       this.isEol = true;
       if (this.skipNextNewLine) {
         this.line--;
@@ -21747,19 +22092,19 @@ var Preprocessor = class {
       }
     }
     this.skipNextNewLine = false;
-    if (isSurrogate(cp)) {
-      cp = this._processSurrogate(cp);
+    if (isSurrogate(cp2)) {
+      cp2 = this._processSurrogate(cp2);
     }
-    const isCommonValidRange = this.handler.onParseError === null || cp > 31 && cp < 127 || cp === CODE_POINTS.LINE_FEED || cp === CODE_POINTS.CARRIAGE_RETURN || cp > 159 && cp < 64976;
+    const isCommonValidRange = this.handler.onParseError === null || cp2 > 31 && cp2 < 127 || cp2 === CODE_POINTS.LINE_FEED || cp2 === CODE_POINTS.CARRIAGE_RETURN || cp2 > 159 && cp2 < 64976;
     if (!isCommonValidRange) {
-      this._checkForProblematicCharacters(cp);
+      this._checkForProblematicCharacters(cp2);
     }
-    return cp;
+    return cp2;
   }
-  _checkForProblematicCharacters(cp) {
-    if (isControlCodePoint(cp)) {
+  _checkForProblematicCharacters(cp2) {
+    if (isControlCodePoint(cp2)) {
       this._err(ERR.controlCharacterInInputStream);
-    } else if (isUndefinedCodePoint(cp)) {
+    } else if (isUndefinedCodePoint(cp2)) {
       this._err(ERR.noncharacterInInputStream);
     }
   }
@@ -22825,29 +23170,29 @@ var TokenizerMode = {
   PLAINTEXT: State.PLAINTEXT,
   CDATA_SECTION: State.CDATA_SECTION
 };
-function isAsciiDigit(cp) {
-  return cp >= CODE_POINTS.DIGIT_0 && cp <= CODE_POINTS.DIGIT_9;
+function isAsciiDigit(cp2) {
+  return cp2 >= CODE_POINTS.DIGIT_0 && cp2 <= CODE_POINTS.DIGIT_9;
 }
-function isAsciiUpper(cp) {
-  return cp >= CODE_POINTS.LATIN_CAPITAL_A && cp <= CODE_POINTS.LATIN_CAPITAL_Z;
+function isAsciiUpper(cp2) {
+  return cp2 >= CODE_POINTS.LATIN_CAPITAL_A && cp2 <= CODE_POINTS.LATIN_CAPITAL_Z;
 }
-function isAsciiLower(cp) {
-  return cp >= CODE_POINTS.LATIN_SMALL_A && cp <= CODE_POINTS.LATIN_SMALL_Z;
+function isAsciiLower(cp2) {
+  return cp2 >= CODE_POINTS.LATIN_SMALL_A && cp2 <= CODE_POINTS.LATIN_SMALL_Z;
 }
-function isAsciiLetter(cp) {
-  return isAsciiLower(cp) || isAsciiUpper(cp);
+function isAsciiLetter(cp2) {
+  return isAsciiLower(cp2) || isAsciiUpper(cp2);
 }
-function isAsciiAlphaNumeric2(cp) {
-  return isAsciiLetter(cp) || isAsciiDigit(cp);
+function isAsciiAlphaNumeric2(cp2) {
+  return isAsciiLetter(cp2) || isAsciiDigit(cp2);
 }
-function toAsciiLower(cp) {
-  return cp + 32;
+function toAsciiLower(cp2) {
+  return cp2 + 32;
 }
-function isWhitespace(cp) {
-  return cp === CODE_POINTS.SPACE || cp === CODE_POINTS.LINE_FEED || cp === CODE_POINTS.TABULATION || cp === CODE_POINTS.FORM_FEED;
+function isWhitespace(cp2) {
+  return cp2 === CODE_POINTS.SPACE || cp2 === CODE_POINTS.LINE_FEED || cp2 === CODE_POINTS.TABULATION || cp2 === CODE_POINTS.FORM_FEED;
 }
-function isScriptDataDoubleEscapeSequenceEnd(cp) {
-  return isWhitespace(cp) || cp === CODE_POINTS.SOLIDUS || cp === CODE_POINTS.GREATER_THAN_SIGN;
+function isScriptDataDoubleEscapeSequenceEnd(cp2) {
+  return isWhitespace(cp2) || cp2 === CODE_POINTS.SOLIDUS || cp2 === CODE_POINTS.GREATER_THAN_SIGN;
 }
 function getErrorForNumericCharacterReference(code) {
   if (code === CODE_POINTS.NULL) {
@@ -22881,9 +23226,9 @@ var Tokenizer = class {
     this.currentAttr = { name: "", value: "" };
     this.preprocessor = new Preprocessor(handler);
     this.currentLocation = this.getCurrentLocation(-1);
-    this.entityDecoder = new EntityDecoder(htmlDecodeTree, (cp, consumed) => {
+    this.entityDecoder = new EntityDecoder(htmlDecodeTree, (cp2, consumed) => {
       this.preprocessor.pos = this.entityStartPos + consumed - 1;
-      this._flushCodePointConsumedAsCharacterReference(cp);
+      this._flushCodePointConsumedAsCharacterReference(cp2);
     }, handler.onParseError ? {
       missingSemicolonAfterCharacterReference: () => {
         this._err(ERR.missingSemicolonAfterCharacterReference, 1);
@@ -22923,9 +23268,9 @@ var Tokenizer = class {
     this.inLoop = true;
     while (this.active && !this.paused) {
       this.consumedAfterSnapshot = 0;
-      const cp = this._consume();
+      const cp2 = this._consume();
       if (!this._ensureHibernation()) {
-        this._callState(cp);
+        this._callState(cp2);
       }
     }
     this.inLoop = false;
@@ -23160,9 +23505,9 @@ var Tokenizer = class {
     }
     this._createCharacterToken(type, ch);
   }
-  _emitCodePoint(cp) {
-    const type = isWhitespace(cp) ? TokenType.WHITESPACE_CHARACTER : cp === CODE_POINTS.NULL ? TokenType.NULL_CHARACTER : TokenType.CHARACTER;
-    this._appendCharToCurrentCharacterToken(type, cp < 65536 ? String.fromCharCode(cp) : String.fromCodePoint(cp));
+  _emitCodePoint(cp2) {
+    const type = isWhitespace(cp2) ? TokenType.WHITESPACE_CHARACTER : cp2 === CODE_POINTS.NULL ? TokenType.NULL_CHARACTER : TokenType.CHARACTER;
+    this._appendCharToCurrentCharacterToken(type, cp2 < 65536 ? String.fromCharCode(cp2) : String.fromCodePoint(cp2));
   }
   //NOTE: used when we emit characters explicitly.
   //This is always for non-whitespace and non-null characters, which allows us to avoid additional checks.
@@ -23179,298 +23524,298 @@ var Tokenizer = class {
   _isCharacterReferenceInAttribute() {
     return this.returnState === State.ATTRIBUTE_VALUE_DOUBLE_QUOTED || this.returnState === State.ATTRIBUTE_VALUE_SINGLE_QUOTED || this.returnState === State.ATTRIBUTE_VALUE_UNQUOTED;
   }
-  _flushCodePointConsumedAsCharacterReference(cp) {
+  _flushCodePointConsumedAsCharacterReference(cp2) {
     if (this._isCharacterReferenceInAttribute()) {
-      this.currentAttr.value += String.fromCodePoint(cp);
+      this.currentAttr.value += String.fromCodePoint(cp2);
     } else {
-      this._emitCodePoint(cp);
+      this._emitCodePoint(cp2);
     }
   }
   // Calling states this way turns out to be much faster than any other approach.
-  _callState(cp) {
+  _callState(cp2) {
     switch (this.state) {
       case State.DATA: {
-        this._stateData(cp);
+        this._stateData(cp2);
         break;
       }
       case State.RCDATA: {
-        this._stateRcdata(cp);
+        this._stateRcdata(cp2);
         break;
       }
       case State.RAWTEXT: {
-        this._stateRawtext(cp);
+        this._stateRawtext(cp2);
         break;
       }
       case State.SCRIPT_DATA: {
-        this._stateScriptData(cp);
+        this._stateScriptData(cp2);
         break;
       }
       case State.PLAINTEXT: {
-        this._statePlaintext(cp);
+        this._statePlaintext(cp2);
         break;
       }
       case State.TAG_OPEN: {
-        this._stateTagOpen(cp);
+        this._stateTagOpen(cp2);
         break;
       }
       case State.END_TAG_OPEN: {
-        this._stateEndTagOpen(cp);
+        this._stateEndTagOpen(cp2);
         break;
       }
       case State.TAG_NAME: {
-        this._stateTagName(cp);
+        this._stateTagName(cp2);
         break;
       }
       case State.RCDATA_LESS_THAN_SIGN: {
-        this._stateRcdataLessThanSign(cp);
+        this._stateRcdataLessThanSign(cp2);
         break;
       }
       case State.RCDATA_END_TAG_OPEN: {
-        this._stateRcdataEndTagOpen(cp);
+        this._stateRcdataEndTagOpen(cp2);
         break;
       }
       case State.RCDATA_END_TAG_NAME: {
-        this._stateRcdataEndTagName(cp);
+        this._stateRcdataEndTagName(cp2);
         break;
       }
       case State.RAWTEXT_LESS_THAN_SIGN: {
-        this._stateRawtextLessThanSign(cp);
+        this._stateRawtextLessThanSign(cp2);
         break;
       }
       case State.RAWTEXT_END_TAG_OPEN: {
-        this._stateRawtextEndTagOpen(cp);
+        this._stateRawtextEndTagOpen(cp2);
         break;
       }
       case State.RAWTEXT_END_TAG_NAME: {
-        this._stateRawtextEndTagName(cp);
+        this._stateRawtextEndTagName(cp2);
         break;
       }
       case State.SCRIPT_DATA_LESS_THAN_SIGN: {
-        this._stateScriptDataLessThanSign(cp);
+        this._stateScriptDataLessThanSign(cp2);
         break;
       }
       case State.SCRIPT_DATA_END_TAG_OPEN: {
-        this._stateScriptDataEndTagOpen(cp);
+        this._stateScriptDataEndTagOpen(cp2);
         break;
       }
       case State.SCRIPT_DATA_END_TAG_NAME: {
-        this._stateScriptDataEndTagName(cp);
+        this._stateScriptDataEndTagName(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPE_START: {
-        this._stateScriptDataEscapeStart(cp);
+        this._stateScriptDataEscapeStart(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPE_START_DASH: {
-        this._stateScriptDataEscapeStartDash(cp);
+        this._stateScriptDataEscapeStartDash(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED: {
-        this._stateScriptDataEscaped(cp);
+        this._stateScriptDataEscaped(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED_DASH: {
-        this._stateScriptDataEscapedDash(cp);
+        this._stateScriptDataEscapedDash(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED_DASH_DASH: {
-        this._stateScriptDataEscapedDashDash(cp);
+        this._stateScriptDataEscapedDashDash(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN: {
-        this._stateScriptDataEscapedLessThanSign(cp);
+        this._stateScriptDataEscapedLessThanSign(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED_END_TAG_OPEN: {
-        this._stateScriptDataEscapedEndTagOpen(cp);
+        this._stateScriptDataEscapedEndTagOpen(cp2);
         break;
       }
       case State.SCRIPT_DATA_ESCAPED_END_TAG_NAME: {
-        this._stateScriptDataEscapedEndTagName(cp);
+        this._stateScriptDataEscapedEndTagName(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPE_START: {
-        this._stateScriptDataDoubleEscapeStart(cp);
+        this._stateScriptDataDoubleEscapeStart(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPED: {
-        this._stateScriptDataDoubleEscaped(cp);
+        this._stateScriptDataDoubleEscaped(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPED_DASH: {
-        this._stateScriptDataDoubleEscapedDash(cp);
+        this._stateScriptDataDoubleEscapedDash(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH: {
-        this._stateScriptDataDoubleEscapedDashDash(cp);
+        this._stateScriptDataDoubleEscapedDashDash(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN: {
-        this._stateScriptDataDoubleEscapedLessThanSign(cp);
+        this._stateScriptDataDoubleEscapedLessThanSign(cp2);
         break;
       }
       case State.SCRIPT_DATA_DOUBLE_ESCAPE_END: {
-        this._stateScriptDataDoubleEscapeEnd(cp);
+        this._stateScriptDataDoubleEscapeEnd(cp2);
         break;
       }
       case State.BEFORE_ATTRIBUTE_NAME: {
-        this._stateBeforeAttributeName(cp);
+        this._stateBeforeAttributeName(cp2);
         break;
       }
       case State.ATTRIBUTE_NAME: {
-        this._stateAttributeName(cp);
+        this._stateAttributeName(cp2);
         break;
       }
       case State.AFTER_ATTRIBUTE_NAME: {
-        this._stateAfterAttributeName(cp);
+        this._stateAfterAttributeName(cp2);
         break;
       }
       case State.BEFORE_ATTRIBUTE_VALUE: {
-        this._stateBeforeAttributeValue(cp);
+        this._stateBeforeAttributeValue(cp2);
         break;
       }
       case State.ATTRIBUTE_VALUE_DOUBLE_QUOTED: {
-        this._stateAttributeValueDoubleQuoted(cp);
+        this._stateAttributeValueDoubleQuoted(cp2);
         break;
       }
       case State.ATTRIBUTE_VALUE_SINGLE_QUOTED: {
-        this._stateAttributeValueSingleQuoted(cp);
+        this._stateAttributeValueSingleQuoted(cp2);
         break;
       }
       case State.ATTRIBUTE_VALUE_UNQUOTED: {
-        this._stateAttributeValueUnquoted(cp);
+        this._stateAttributeValueUnquoted(cp2);
         break;
       }
       case State.AFTER_ATTRIBUTE_VALUE_QUOTED: {
-        this._stateAfterAttributeValueQuoted(cp);
+        this._stateAfterAttributeValueQuoted(cp2);
         break;
       }
       case State.SELF_CLOSING_START_TAG: {
-        this._stateSelfClosingStartTag(cp);
+        this._stateSelfClosingStartTag(cp2);
         break;
       }
       case State.BOGUS_COMMENT: {
-        this._stateBogusComment(cp);
+        this._stateBogusComment(cp2);
         break;
       }
       case State.MARKUP_DECLARATION_OPEN: {
-        this._stateMarkupDeclarationOpen(cp);
+        this._stateMarkupDeclarationOpen(cp2);
         break;
       }
       case State.COMMENT_START: {
-        this._stateCommentStart(cp);
+        this._stateCommentStart(cp2);
         break;
       }
       case State.COMMENT_START_DASH: {
-        this._stateCommentStartDash(cp);
+        this._stateCommentStartDash(cp2);
         break;
       }
       case State.COMMENT: {
-        this._stateComment(cp);
+        this._stateComment(cp2);
         break;
       }
       case State.COMMENT_LESS_THAN_SIGN: {
-        this._stateCommentLessThanSign(cp);
+        this._stateCommentLessThanSign(cp2);
         break;
       }
       case State.COMMENT_LESS_THAN_SIGN_BANG: {
-        this._stateCommentLessThanSignBang(cp);
+        this._stateCommentLessThanSignBang(cp2);
         break;
       }
       case State.COMMENT_LESS_THAN_SIGN_BANG_DASH: {
-        this._stateCommentLessThanSignBangDash(cp);
+        this._stateCommentLessThanSignBangDash(cp2);
         break;
       }
       case State.COMMENT_LESS_THAN_SIGN_BANG_DASH_DASH: {
-        this._stateCommentLessThanSignBangDashDash(cp);
+        this._stateCommentLessThanSignBangDashDash(cp2);
         break;
       }
       case State.COMMENT_END_DASH: {
-        this._stateCommentEndDash(cp);
+        this._stateCommentEndDash(cp2);
         break;
       }
       case State.COMMENT_END: {
-        this._stateCommentEnd(cp);
+        this._stateCommentEnd(cp2);
         break;
       }
       case State.COMMENT_END_BANG: {
-        this._stateCommentEndBang(cp);
+        this._stateCommentEndBang(cp2);
         break;
       }
       case State.DOCTYPE: {
-        this._stateDoctype(cp);
+        this._stateDoctype(cp2);
         break;
       }
       case State.BEFORE_DOCTYPE_NAME: {
-        this._stateBeforeDoctypeName(cp);
+        this._stateBeforeDoctypeName(cp2);
         break;
       }
       case State.DOCTYPE_NAME: {
-        this._stateDoctypeName(cp);
+        this._stateDoctypeName(cp2);
         break;
       }
       case State.AFTER_DOCTYPE_NAME: {
-        this._stateAfterDoctypeName(cp);
+        this._stateAfterDoctypeName(cp2);
         break;
       }
       case State.AFTER_DOCTYPE_PUBLIC_KEYWORD: {
-        this._stateAfterDoctypePublicKeyword(cp);
+        this._stateAfterDoctypePublicKeyword(cp2);
         break;
       }
       case State.BEFORE_DOCTYPE_PUBLIC_IDENTIFIER: {
-        this._stateBeforeDoctypePublicIdentifier(cp);
+        this._stateBeforeDoctypePublicIdentifier(cp2);
         break;
       }
       case State.DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED: {
-        this._stateDoctypePublicIdentifierDoubleQuoted(cp);
+        this._stateDoctypePublicIdentifierDoubleQuoted(cp2);
         break;
       }
       case State.DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED: {
-        this._stateDoctypePublicIdentifierSingleQuoted(cp);
+        this._stateDoctypePublicIdentifierSingleQuoted(cp2);
         break;
       }
       case State.AFTER_DOCTYPE_PUBLIC_IDENTIFIER: {
-        this._stateAfterDoctypePublicIdentifier(cp);
+        this._stateAfterDoctypePublicIdentifier(cp2);
         break;
       }
       case State.BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS: {
-        this._stateBetweenDoctypePublicAndSystemIdentifiers(cp);
+        this._stateBetweenDoctypePublicAndSystemIdentifiers(cp2);
         break;
       }
       case State.AFTER_DOCTYPE_SYSTEM_KEYWORD: {
-        this._stateAfterDoctypeSystemKeyword(cp);
+        this._stateAfterDoctypeSystemKeyword(cp2);
         break;
       }
       case State.BEFORE_DOCTYPE_SYSTEM_IDENTIFIER: {
-        this._stateBeforeDoctypeSystemIdentifier(cp);
+        this._stateBeforeDoctypeSystemIdentifier(cp2);
         break;
       }
       case State.DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED: {
-        this._stateDoctypeSystemIdentifierDoubleQuoted(cp);
+        this._stateDoctypeSystemIdentifierDoubleQuoted(cp2);
         break;
       }
       case State.DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED: {
-        this._stateDoctypeSystemIdentifierSingleQuoted(cp);
+        this._stateDoctypeSystemIdentifierSingleQuoted(cp2);
         break;
       }
       case State.AFTER_DOCTYPE_SYSTEM_IDENTIFIER: {
-        this._stateAfterDoctypeSystemIdentifier(cp);
+        this._stateAfterDoctypeSystemIdentifier(cp2);
         break;
       }
       case State.BOGUS_DOCTYPE: {
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
         break;
       }
       case State.CDATA_SECTION: {
-        this._stateCdataSection(cp);
+        this._stateCdataSection(cp2);
         break;
       }
       case State.CDATA_SECTION_BRACKET: {
-        this._stateCdataSectionBracket(cp);
+        this._stateCdataSectionBracket(cp2);
         break;
       }
       case State.CDATA_SECTION_END: {
-        this._stateCdataSectionEnd(cp);
+        this._stateCdataSectionEnd(cp2);
         break;
       }
       case State.CHARACTER_REFERENCE: {
@@ -23478,7 +23823,7 @@ var Tokenizer = class {
         break;
       }
       case State.AMBIGUOUS_AMPERSAND: {
-        this._stateAmbiguousAmpersand(cp);
+        this._stateAmbiguousAmpersand(cp2);
         break;
       }
       default: {
@@ -23489,8 +23834,8 @@ var Tokenizer = class {
   // State machine
   // Data state
   //------------------------------------------------------------------
-  _stateData(cp) {
-    switch (cp) {
+  _stateData(cp2) {
+    switch (cp2) {
       case CODE_POINTS.LESS_THAN_SIGN: {
         this.state = State.TAG_OPEN;
         break;
@@ -23501,7 +23846,7 @@ var Tokenizer = class {
       }
       case CODE_POINTS.NULL: {
         this._err(ERR.unexpectedNullCharacter);
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
         break;
       }
       case CODE_POINTS.EOF: {
@@ -23509,14 +23854,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   //  RCDATA state
   //------------------------------------------------------------------
-  _stateRcdata(cp) {
-    switch (cp) {
+  _stateRcdata(cp2) {
+    switch (cp2) {
       case CODE_POINTS.AMPERSAND: {
         this._startCharacterReference();
         break;
@@ -23535,14 +23880,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // RAWTEXT state
   //------------------------------------------------------------------
-  _stateRawtext(cp) {
-    switch (cp) {
+  _stateRawtext(cp2) {
+    switch (cp2) {
       case CODE_POINTS.LESS_THAN_SIGN: {
         this.state = State.RAWTEXT_LESS_THAN_SIGN;
         break;
@@ -23557,14 +23902,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data state
   //------------------------------------------------------------------
-  _stateScriptData(cp) {
-    switch (cp) {
+  _stateScriptData(cp2) {
+    switch (cp2) {
       case CODE_POINTS.LESS_THAN_SIGN: {
         this.state = State.SCRIPT_DATA_LESS_THAN_SIGN;
         break;
@@ -23579,14 +23924,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // PLAINTEXT state
   //------------------------------------------------------------------
-  _statePlaintext(cp) {
-    switch (cp) {
+  _statePlaintext(cp2) {
+    switch (cp2) {
       case CODE_POINTS.NULL: {
         this._err(ERR.unexpectedNullCharacter);
         this._emitChars(REPLACEMENT_CHARACTER);
@@ -23597,19 +23942,19 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Tag open state
   //------------------------------------------------------------------
-  _stateTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this._createStartTagToken();
       this.state = State.TAG_NAME;
-      this._stateTagName(cp);
+      this._stateTagName(cp2);
     } else
-      switch (cp) {
+      switch (cp2) {
         case CODE_POINTS.EXCLAMATION_MARK: {
           this.state = State.MARKUP_DECLARATION_OPEN;
           break;
@@ -23622,7 +23967,7 @@ var Tokenizer = class {
           this._err(ERR.unexpectedQuestionMarkInsteadOfTagName);
           this._createCommentToken(1);
           this.state = State.BOGUS_COMMENT;
-          this._stateBogusComment(cp);
+          this._stateBogusComment(cp2);
           break;
         }
         case CODE_POINTS.EOF: {
@@ -23635,19 +23980,19 @@ var Tokenizer = class {
           this._err(ERR.invalidFirstCharacterOfTagName);
           this._emitChars("<");
           this.state = State.DATA;
-          this._stateData(cp);
+          this._stateData(cp2);
         }
       }
   }
   // End tag open state
   //------------------------------------------------------------------
-  _stateEndTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateEndTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this._createEndTagToken();
       this.state = State.TAG_NAME;
-      this._stateTagName(cp);
+      this._stateTagName(cp2);
     } else
-      switch (cp) {
+      switch (cp2) {
         case CODE_POINTS.GREATER_THAN_SIGN: {
           this._err(ERR.missingEndTagName);
           this.state = State.DATA;
@@ -23663,15 +24008,15 @@ var Tokenizer = class {
           this._err(ERR.invalidFirstCharacterOfTagName);
           this._createCommentToken(2);
           this.state = State.BOGUS_COMMENT;
-          this._stateBogusComment(cp);
+          this._stateBogusComment(cp2);
         }
       }
   }
   // Tag name state
   //------------------------------------------------------------------
-  _stateTagName(cp) {
+  _stateTagName(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -23699,31 +24044,31 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.tagName += String.fromCodePoint(isAsciiUpper(cp) ? toAsciiLower(cp) : cp);
+        token.tagName += String.fromCodePoint(isAsciiUpper(cp2) ? toAsciiLower(cp2) : cp2);
       }
     }
   }
   // RCDATA less-than sign state
   //------------------------------------------------------------------
-  _stateRcdataLessThanSign(cp) {
-    if (cp === CODE_POINTS.SOLIDUS) {
+  _stateRcdataLessThanSign(cp2) {
+    if (cp2 === CODE_POINTS.SOLIDUS) {
       this.state = State.RCDATA_END_TAG_OPEN;
     } else {
       this._emitChars("<");
       this.state = State.RCDATA;
-      this._stateRcdata(cp);
+      this._stateRcdata(cp2);
     }
   }
   // RCDATA end tag open state
   //------------------------------------------------------------------
-  _stateRcdataEndTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateRcdataEndTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this.state = State.RCDATA_END_TAG_NAME;
-      this._stateRcdataEndTagName(cp);
+      this._stateRcdataEndTagName(cp2);
     } else {
       this._emitChars("</");
       this.state = State.RCDATA;
-      this._stateRcdata(cp);
+      this._stateRcdata(cp2);
     }
   }
   handleSpecialEndTag(_cp) {
@@ -23733,8 +24078,8 @@ var Tokenizer = class {
     this._createEndTagToken();
     const token = this.currentToken;
     token.tagName = this.lastStartTagName;
-    const cp = this.preprocessor.peek(this.lastStartTagName.length);
-    switch (cp) {
+    const cp2 = this.preprocessor.peek(this.lastStartTagName.length);
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -23761,49 +24106,49 @@ var Tokenizer = class {
   }
   // RCDATA end tag name state
   //------------------------------------------------------------------
-  _stateRcdataEndTagName(cp) {
-    if (this.handleSpecialEndTag(cp)) {
+  _stateRcdataEndTagName(cp2) {
+    if (this.handleSpecialEndTag(cp2)) {
       this._emitChars("</");
       this.state = State.RCDATA;
-      this._stateRcdata(cp);
+      this._stateRcdata(cp2);
     }
   }
   // RAWTEXT less-than sign state
   //------------------------------------------------------------------
-  _stateRawtextLessThanSign(cp) {
-    if (cp === CODE_POINTS.SOLIDUS) {
+  _stateRawtextLessThanSign(cp2) {
+    if (cp2 === CODE_POINTS.SOLIDUS) {
       this.state = State.RAWTEXT_END_TAG_OPEN;
     } else {
       this._emitChars("<");
       this.state = State.RAWTEXT;
-      this._stateRawtext(cp);
+      this._stateRawtext(cp2);
     }
   }
   // RAWTEXT end tag open state
   //------------------------------------------------------------------
-  _stateRawtextEndTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateRawtextEndTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this.state = State.RAWTEXT_END_TAG_NAME;
-      this._stateRawtextEndTagName(cp);
+      this._stateRawtextEndTagName(cp2);
     } else {
       this._emitChars("</");
       this.state = State.RAWTEXT;
-      this._stateRawtext(cp);
+      this._stateRawtext(cp2);
     }
   }
   // RAWTEXT end tag name state
   //------------------------------------------------------------------
-  _stateRawtextEndTagName(cp) {
-    if (this.handleSpecialEndTag(cp)) {
+  _stateRawtextEndTagName(cp2) {
+    if (this.handleSpecialEndTag(cp2)) {
       this._emitChars("</");
       this.state = State.RAWTEXT;
-      this._stateRawtext(cp);
+      this._stateRawtext(cp2);
     }
   }
   // Script data less-than sign state
   //------------------------------------------------------------------
-  _stateScriptDataLessThanSign(cp) {
-    switch (cp) {
+  _stateScriptDataLessThanSign(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SOLIDUS: {
         this.state = State.SCRIPT_DATA_END_TAG_OPEN;
         break;
@@ -23816,57 +24161,57 @@ var Tokenizer = class {
       default: {
         this._emitChars("<");
         this.state = State.SCRIPT_DATA;
-        this._stateScriptData(cp);
+        this._stateScriptData(cp2);
       }
     }
   }
   // Script data end tag open state
   //------------------------------------------------------------------
-  _stateScriptDataEndTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateScriptDataEndTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this.state = State.SCRIPT_DATA_END_TAG_NAME;
-      this._stateScriptDataEndTagName(cp);
+      this._stateScriptDataEndTagName(cp2);
     } else {
       this._emitChars("</");
       this.state = State.SCRIPT_DATA;
-      this._stateScriptData(cp);
+      this._stateScriptData(cp2);
     }
   }
   // Script data end tag name state
   //------------------------------------------------------------------
-  _stateScriptDataEndTagName(cp) {
-    if (this.handleSpecialEndTag(cp)) {
+  _stateScriptDataEndTagName(cp2) {
+    if (this.handleSpecialEndTag(cp2)) {
       this._emitChars("</");
       this.state = State.SCRIPT_DATA;
-      this._stateScriptData(cp);
+      this._stateScriptData(cp2);
     }
   }
   // Script data escape start state
   //------------------------------------------------------------------
-  _stateScriptDataEscapeStart(cp) {
-    if (cp === CODE_POINTS.HYPHEN_MINUS) {
+  _stateScriptDataEscapeStart(cp2) {
+    if (cp2 === CODE_POINTS.HYPHEN_MINUS) {
       this.state = State.SCRIPT_DATA_ESCAPE_START_DASH;
       this._emitChars("-");
     } else {
       this.state = State.SCRIPT_DATA;
-      this._stateScriptData(cp);
+      this._stateScriptData(cp2);
     }
   }
   // Script data escape start dash state
   //------------------------------------------------------------------
-  _stateScriptDataEscapeStartDash(cp) {
-    if (cp === CODE_POINTS.HYPHEN_MINUS) {
+  _stateScriptDataEscapeStartDash(cp2) {
+    if (cp2 === CODE_POINTS.HYPHEN_MINUS) {
       this.state = State.SCRIPT_DATA_ESCAPED_DASH_DASH;
       this._emitChars("-");
     } else {
       this.state = State.SCRIPT_DATA;
-      this._stateScriptData(cp);
+      this._stateScriptData(cp2);
     }
   }
   // Script data escaped state
   //------------------------------------------------------------------
-  _stateScriptDataEscaped(cp) {
-    switch (cp) {
+  _stateScriptDataEscaped(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.SCRIPT_DATA_ESCAPED_DASH;
         this._emitChars("-");
@@ -23887,14 +24232,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data escaped dash state
   //------------------------------------------------------------------
-  _stateScriptDataEscapedDash(cp) {
-    switch (cp) {
+  _stateScriptDataEscapedDash(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.SCRIPT_DATA_ESCAPED_DASH_DASH;
         this._emitChars("-");
@@ -23917,14 +24262,14 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.SCRIPT_DATA_ESCAPED;
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data escaped dash dash state
   //------------------------------------------------------------------
-  _stateScriptDataEscapedDashDash(cp) {
-    switch (cp) {
+  _stateScriptDataEscapedDashDash(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this._emitChars("-");
         break;
@@ -23951,64 +24296,64 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.SCRIPT_DATA_ESCAPED;
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data escaped less-than sign state
   //------------------------------------------------------------------
-  _stateScriptDataEscapedLessThanSign(cp) {
-    if (cp === CODE_POINTS.SOLIDUS) {
+  _stateScriptDataEscapedLessThanSign(cp2) {
+    if (cp2 === CODE_POINTS.SOLIDUS) {
       this.state = State.SCRIPT_DATA_ESCAPED_END_TAG_OPEN;
-    } else if (isAsciiLetter(cp)) {
+    } else if (isAsciiLetter(cp2)) {
       this._emitChars("<");
       this.state = State.SCRIPT_DATA_DOUBLE_ESCAPE_START;
-      this._stateScriptDataDoubleEscapeStart(cp);
+      this._stateScriptDataDoubleEscapeStart(cp2);
     } else {
       this._emitChars("<");
       this.state = State.SCRIPT_DATA_ESCAPED;
-      this._stateScriptDataEscaped(cp);
+      this._stateScriptDataEscaped(cp2);
     }
   }
   // Script data escaped end tag open state
   //------------------------------------------------------------------
-  _stateScriptDataEscapedEndTagOpen(cp) {
-    if (isAsciiLetter(cp)) {
+  _stateScriptDataEscapedEndTagOpen(cp2) {
+    if (isAsciiLetter(cp2)) {
       this.state = State.SCRIPT_DATA_ESCAPED_END_TAG_NAME;
-      this._stateScriptDataEscapedEndTagName(cp);
+      this._stateScriptDataEscapedEndTagName(cp2);
     } else {
       this._emitChars("</");
       this.state = State.SCRIPT_DATA_ESCAPED;
-      this._stateScriptDataEscaped(cp);
+      this._stateScriptDataEscaped(cp2);
     }
   }
   // Script data escaped end tag name state
   //------------------------------------------------------------------
-  _stateScriptDataEscapedEndTagName(cp) {
-    if (this.handleSpecialEndTag(cp)) {
+  _stateScriptDataEscapedEndTagName(cp2) {
+    if (this.handleSpecialEndTag(cp2)) {
       this._emitChars("</");
       this.state = State.SCRIPT_DATA_ESCAPED;
-      this._stateScriptDataEscaped(cp);
+      this._stateScriptDataEscaped(cp2);
     }
   }
   // Script data double escape start state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscapeStart(cp) {
+  _stateScriptDataDoubleEscapeStart(cp2) {
     if (this.preprocessor.startsWith(SEQUENCES.SCRIPT, false) && isScriptDataDoubleEscapeSequenceEnd(this.preprocessor.peek(SEQUENCES.SCRIPT.length))) {
-      this._emitCodePoint(cp);
+      this._emitCodePoint(cp2);
       for (let i = 0; i < SEQUENCES.SCRIPT.length; i++) {
         this._emitCodePoint(this._consume());
       }
       this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED;
     } else if (!this._ensureHibernation()) {
       this.state = State.SCRIPT_DATA_ESCAPED;
-      this._stateScriptDataEscaped(cp);
+      this._stateScriptDataEscaped(cp2);
     }
   }
   // Script data double escaped state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscaped(cp) {
-    switch (cp) {
+  _stateScriptDataDoubleEscaped(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED_DASH;
         this._emitChars("-");
@@ -24030,14 +24375,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data double escaped dash state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscapedDash(cp) {
-    switch (cp) {
+  _stateScriptDataDoubleEscapedDash(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH;
         this._emitChars("-");
@@ -24061,14 +24406,14 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED;
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data double escaped dash dash state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscapedDashDash(cp) {
-    switch (cp) {
+  _stateScriptDataDoubleEscapedDashDash(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this._emitChars("-");
         break;
@@ -24096,39 +24441,39 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED;
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // Script data double escaped less-than sign state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscapedLessThanSign(cp) {
-    if (cp === CODE_POINTS.SOLIDUS) {
+  _stateScriptDataDoubleEscapedLessThanSign(cp2) {
+    if (cp2 === CODE_POINTS.SOLIDUS) {
       this.state = State.SCRIPT_DATA_DOUBLE_ESCAPE_END;
       this._emitChars("/");
     } else {
       this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED;
-      this._stateScriptDataDoubleEscaped(cp);
+      this._stateScriptDataDoubleEscaped(cp2);
     }
   }
   // Script data double escape end state
   //------------------------------------------------------------------
-  _stateScriptDataDoubleEscapeEnd(cp) {
+  _stateScriptDataDoubleEscapeEnd(cp2) {
     if (this.preprocessor.startsWith(SEQUENCES.SCRIPT, false) && isScriptDataDoubleEscapeSequenceEnd(this.preprocessor.peek(SEQUENCES.SCRIPT.length))) {
-      this._emitCodePoint(cp);
+      this._emitCodePoint(cp2);
       for (let i = 0; i < SEQUENCES.SCRIPT.length; i++) {
         this._emitCodePoint(this._consume());
       }
       this.state = State.SCRIPT_DATA_ESCAPED;
     } else if (!this._ensureHibernation()) {
       this.state = State.SCRIPT_DATA_DOUBLE_ESCAPED;
-      this._stateScriptDataDoubleEscaped(cp);
+      this._stateScriptDataDoubleEscaped(cp2);
     }
   }
   // Before attribute name state
   //------------------------------------------------------------------
-  _stateBeforeAttributeName(cp) {
-    switch (cp) {
+  _stateBeforeAttributeName(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24139,7 +24484,7 @@ var Tokenizer = class {
       case CODE_POINTS.GREATER_THAN_SIGN:
       case CODE_POINTS.EOF: {
         this.state = State.AFTER_ATTRIBUTE_NAME;
-        this._stateAfterAttributeName(cp);
+        this._stateAfterAttributeName(cp2);
         break;
       }
       case CODE_POINTS.EQUALS_SIGN: {
@@ -24151,14 +24496,14 @@ var Tokenizer = class {
       default: {
         this._createAttr("");
         this.state = State.ATTRIBUTE_NAME;
-        this._stateAttributeName(cp);
+        this._stateAttributeName(cp2);
       }
     }
   }
   // Attribute name state
   //------------------------------------------------------------------
-  _stateAttributeName(cp) {
-    switch (cp) {
+  _stateAttributeName(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24168,7 +24513,7 @@ var Tokenizer = class {
       case CODE_POINTS.EOF: {
         this._leaveAttrName();
         this.state = State.AFTER_ATTRIBUTE_NAME;
-        this._stateAfterAttributeName(cp);
+        this._stateAfterAttributeName(cp2);
         break;
       }
       case CODE_POINTS.EQUALS_SIGN: {
@@ -24180,7 +24525,7 @@ var Tokenizer = class {
       case CODE_POINTS.APOSTROPHE:
       case CODE_POINTS.LESS_THAN_SIGN: {
         this._err(ERR.unexpectedCharacterInAttributeName);
-        this.currentAttr.name += String.fromCodePoint(cp);
+        this.currentAttr.name += String.fromCodePoint(cp2);
         break;
       }
       case CODE_POINTS.NULL: {
@@ -24189,14 +24534,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this.currentAttr.name += String.fromCodePoint(isAsciiUpper(cp) ? toAsciiLower(cp) : cp);
+        this.currentAttr.name += String.fromCodePoint(isAsciiUpper(cp2) ? toAsciiLower(cp2) : cp2);
       }
     }
   }
   // After attribute name state
   //------------------------------------------------------------------
-  _stateAfterAttributeName(cp) {
-    switch (cp) {
+  _stateAfterAttributeName(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24224,14 +24569,14 @@ var Tokenizer = class {
       default: {
         this._createAttr("");
         this.state = State.ATTRIBUTE_NAME;
-        this._stateAttributeName(cp);
+        this._stateAttributeName(cp2);
       }
     }
   }
   // Before attribute value state
   //------------------------------------------------------------------
-  _stateBeforeAttributeValue(cp) {
-    switch (cp) {
+  _stateBeforeAttributeValue(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24254,14 +24599,14 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.ATTRIBUTE_VALUE_UNQUOTED;
-        this._stateAttributeValueUnquoted(cp);
+        this._stateAttributeValueUnquoted(cp2);
       }
     }
   }
   // Attribute value (double-quoted) state
   //------------------------------------------------------------------
-  _stateAttributeValueDoubleQuoted(cp) {
-    switch (cp) {
+  _stateAttributeValueDoubleQuoted(cp2) {
+    switch (cp2) {
       case CODE_POINTS.QUOTATION_MARK: {
         this.state = State.AFTER_ATTRIBUTE_VALUE_QUOTED;
         break;
@@ -24281,14 +24626,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this.currentAttr.value += String.fromCodePoint(cp);
+        this.currentAttr.value += String.fromCodePoint(cp2);
       }
     }
   }
   // Attribute value (single-quoted) state
   //------------------------------------------------------------------
-  _stateAttributeValueSingleQuoted(cp) {
-    switch (cp) {
+  _stateAttributeValueSingleQuoted(cp2) {
+    switch (cp2) {
       case CODE_POINTS.APOSTROPHE: {
         this.state = State.AFTER_ATTRIBUTE_VALUE_QUOTED;
         break;
@@ -24308,14 +24653,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this.currentAttr.value += String.fromCodePoint(cp);
+        this.currentAttr.value += String.fromCodePoint(cp2);
       }
     }
   }
   // Attribute value (unquoted) state
   //------------------------------------------------------------------
-  _stateAttributeValueUnquoted(cp) {
-    switch (cp) {
+  _stateAttributeValueUnquoted(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24345,7 +24690,7 @@ var Tokenizer = class {
       case CODE_POINTS.EQUALS_SIGN:
       case CODE_POINTS.GRAVE_ACCENT: {
         this._err(ERR.unexpectedCharacterInUnquotedAttributeValue);
-        this.currentAttr.value += String.fromCodePoint(cp);
+        this.currentAttr.value += String.fromCodePoint(cp2);
         break;
       }
       case CODE_POINTS.EOF: {
@@ -24354,14 +24699,14 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this.currentAttr.value += String.fromCodePoint(cp);
+        this.currentAttr.value += String.fromCodePoint(cp2);
       }
     }
   }
   // After attribute value (quoted) state
   //------------------------------------------------------------------
-  _stateAfterAttributeValueQuoted(cp) {
-    switch (cp) {
+  _stateAfterAttributeValueQuoted(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24389,14 +24734,14 @@ var Tokenizer = class {
       default: {
         this._err(ERR.missingWhitespaceBetweenAttributes);
         this.state = State.BEFORE_ATTRIBUTE_NAME;
-        this._stateBeforeAttributeName(cp);
+        this._stateBeforeAttributeName(cp2);
       }
     }
   }
   // Self-closing start tag state
   //------------------------------------------------------------------
-  _stateSelfClosingStartTag(cp) {
-    switch (cp) {
+  _stateSelfClosingStartTag(cp2) {
+    switch (cp2) {
       case CODE_POINTS.GREATER_THAN_SIGN: {
         const token = this.currentToken;
         token.selfClosing = true;
@@ -24412,15 +24757,15 @@ var Tokenizer = class {
       default: {
         this._err(ERR.unexpectedSolidusInTag);
         this.state = State.BEFORE_ATTRIBUTE_NAME;
-        this._stateBeforeAttributeName(cp);
+        this._stateBeforeAttributeName(cp2);
       }
     }
   }
   // Bogus comment state
   //------------------------------------------------------------------
-  _stateBogusComment(cp) {
+  _stateBogusComment(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.GREATER_THAN_SIGN: {
         this.state = State.DATA;
         this.emitCurrentComment(token);
@@ -24437,13 +24782,13 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.data += String.fromCodePoint(cp);
+        token.data += String.fromCodePoint(cp2);
       }
     }
   }
   // Markup declaration open state
   //------------------------------------------------------------------
-  _stateMarkupDeclarationOpen(cp) {
+  _stateMarkupDeclarationOpen(cp2) {
     if (this._consumeSequenceIfMatch(SEQUENCES.DASH_DASH, true)) {
       this._createCommentToken(SEQUENCES.DASH_DASH.length + 1);
       this.state = State.COMMENT_START;
@@ -24463,13 +24808,13 @@ var Tokenizer = class {
       this._err(ERR.incorrectlyOpenedComment);
       this._createCommentToken(2);
       this.state = State.BOGUS_COMMENT;
-      this._stateBogusComment(cp);
+      this._stateBogusComment(cp2);
     }
   }
   // Comment start state
   //------------------------------------------------------------------
-  _stateCommentStart(cp) {
-    switch (cp) {
+  _stateCommentStart(cp2) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.COMMENT_START_DASH;
         break;
@@ -24483,15 +24828,15 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // Comment start dash state
   //------------------------------------------------------------------
-  _stateCommentStartDash(cp) {
+  _stateCommentStartDash(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.COMMENT_END;
         break;
@@ -24511,15 +24856,15 @@ var Tokenizer = class {
       default: {
         token.data += "-";
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // Comment state
   //------------------------------------------------------------------
-  _stateComment(cp) {
+  _stateComment(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.COMMENT_END_DASH;
         break;
@@ -24541,15 +24886,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.data += String.fromCodePoint(cp);
+        token.data += String.fromCodePoint(cp2);
       }
     }
   }
   // Comment less-than sign state
   //------------------------------------------------------------------
-  _stateCommentLessThanSign(cp) {
+  _stateCommentLessThanSign(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.EXCLAMATION_MARK: {
         token.data += "!";
         this.state = State.COMMENT_LESS_THAN_SIGN_BANG;
@@ -24561,44 +24906,44 @@ var Tokenizer = class {
       }
       default: {
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // Comment less-than sign bang state
   //------------------------------------------------------------------
-  _stateCommentLessThanSignBang(cp) {
-    if (cp === CODE_POINTS.HYPHEN_MINUS) {
+  _stateCommentLessThanSignBang(cp2) {
+    if (cp2 === CODE_POINTS.HYPHEN_MINUS) {
       this.state = State.COMMENT_LESS_THAN_SIGN_BANG_DASH;
     } else {
       this.state = State.COMMENT;
-      this._stateComment(cp);
+      this._stateComment(cp2);
     }
   }
   // Comment less-than sign bang dash state
   //------------------------------------------------------------------
-  _stateCommentLessThanSignBangDash(cp) {
-    if (cp === CODE_POINTS.HYPHEN_MINUS) {
+  _stateCommentLessThanSignBangDash(cp2) {
+    if (cp2 === CODE_POINTS.HYPHEN_MINUS) {
       this.state = State.COMMENT_LESS_THAN_SIGN_BANG_DASH_DASH;
     } else {
       this.state = State.COMMENT_END_DASH;
-      this._stateCommentEndDash(cp);
+      this._stateCommentEndDash(cp2);
     }
   }
   // Comment less-than sign bang dash dash state
   //------------------------------------------------------------------
-  _stateCommentLessThanSignBangDashDash(cp) {
-    if (cp !== CODE_POINTS.GREATER_THAN_SIGN && cp !== CODE_POINTS.EOF) {
+  _stateCommentLessThanSignBangDashDash(cp2) {
+    if (cp2 !== CODE_POINTS.GREATER_THAN_SIGN && cp2 !== CODE_POINTS.EOF) {
       this._err(ERR.nestedComment);
     }
     this.state = State.COMMENT_END;
-    this._stateCommentEnd(cp);
+    this._stateCommentEnd(cp2);
   }
   // Comment end dash state
   //------------------------------------------------------------------
-  _stateCommentEndDash(cp) {
+  _stateCommentEndDash(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         this.state = State.COMMENT_END;
         break;
@@ -24612,15 +24957,15 @@ var Tokenizer = class {
       default: {
         token.data += "-";
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // Comment end state
   //------------------------------------------------------------------
-  _stateCommentEnd(cp) {
+  _stateCommentEnd(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.GREATER_THAN_SIGN: {
         this.state = State.DATA;
         this.emitCurrentComment(token);
@@ -24643,15 +24988,15 @@ var Tokenizer = class {
       default: {
         token.data += "--";
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // Comment end bang state
   //------------------------------------------------------------------
-  _stateCommentEndBang(cp) {
+  _stateCommentEndBang(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.HYPHEN_MINUS: {
         token.data += "--!";
         this.state = State.COMMENT_END_DASH;
@@ -24672,14 +25017,14 @@ var Tokenizer = class {
       default: {
         token.data += "--!";
         this.state = State.COMMENT;
-        this._stateComment(cp);
+        this._stateComment(cp2);
       }
     }
   }
   // DOCTYPE state
   //------------------------------------------------------------------
-  _stateDoctype(cp) {
-    switch (cp) {
+  _stateDoctype(cp2) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24689,7 +25034,7 @@ var Tokenizer = class {
       }
       case CODE_POINTS.GREATER_THAN_SIGN: {
         this.state = State.BEFORE_DOCTYPE_NAME;
-        this._stateBeforeDoctypeName(cp);
+        this._stateBeforeDoctypeName(cp2);
         break;
       }
       case CODE_POINTS.EOF: {
@@ -24704,18 +25049,18 @@ var Tokenizer = class {
       default: {
         this._err(ERR.missingWhitespaceBeforeDoctypeName);
         this.state = State.BEFORE_DOCTYPE_NAME;
-        this._stateBeforeDoctypeName(cp);
+        this._stateBeforeDoctypeName(cp2);
       }
     }
   }
   // Before DOCTYPE name state
   //------------------------------------------------------------------
-  _stateBeforeDoctypeName(cp) {
-    if (isAsciiUpper(cp)) {
-      this._createDoctypeToken(String.fromCharCode(toAsciiLower(cp)));
+  _stateBeforeDoctypeName(cp2) {
+    if (isAsciiUpper(cp2)) {
+      this._createDoctypeToken(String.fromCharCode(toAsciiLower(cp2)));
       this.state = State.DOCTYPE_NAME;
     } else
-      switch (cp) {
+      switch (cp2) {
         case CODE_POINTS.SPACE:
         case CODE_POINTS.LINE_FEED:
         case CODE_POINTS.TABULATION:
@@ -24747,16 +25092,16 @@ var Tokenizer = class {
           break;
         }
         default: {
-          this._createDoctypeToken(String.fromCodePoint(cp));
+          this._createDoctypeToken(String.fromCodePoint(cp2));
           this.state = State.DOCTYPE_NAME;
         }
       }
   }
   // DOCTYPE name state
   //------------------------------------------------------------------
-  _stateDoctypeName(cp) {
+  _stateDoctypeName(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24782,15 +25127,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.name += String.fromCodePoint(isAsciiUpper(cp) ? toAsciiLower(cp) : cp);
+        token.name += String.fromCodePoint(isAsciiUpper(cp2) ? toAsciiLower(cp2) : cp2);
       }
     }
   }
   // After DOCTYPE name state
   //------------------------------------------------------------------
-  _stateAfterDoctypeName(cp) {
+  _stateAfterDoctypeName(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24818,16 +25163,16 @@ var Tokenizer = class {
           this._err(ERR.invalidCharacterSequenceAfterDoctypeName);
           token.forceQuirks = true;
           this.state = State.BOGUS_DOCTYPE;
-          this._stateBogusDoctype(cp);
+          this._stateBogusDoctype(cp2);
         }
       }
     }
   }
   // After DOCTYPE public keyword state
   //------------------------------------------------------------------
-  _stateAfterDoctypePublicKeyword(cp) {
+  _stateAfterDoctypePublicKeyword(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24865,15 +25210,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypePublicIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // Before DOCTYPE public identifier state
   //------------------------------------------------------------------
-  _stateBeforeDoctypePublicIdentifier(cp) {
+  _stateBeforeDoctypePublicIdentifier(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -24908,15 +25253,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypePublicIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // DOCTYPE public identifier (double-quoted) state
   //------------------------------------------------------------------
-  _stateDoctypePublicIdentifierDoubleQuoted(cp) {
+  _stateDoctypePublicIdentifierDoubleQuoted(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.QUOTATION_MARK: {
         this.state = State.AFTER_DOCTYPE_PUBLIC_IDENTIFIER;
         break;
@@ -24941,15 +25286,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.publicId += String.fromCodePoint(cp);
+        token.publicId += String.fromCodePoint(cp2);
       }
     }
   }
   // DOCTYPE public identifier (single-quoted) state
   //------------------------------------------------------------------
-  _stateDoctypePublicIdentifierSingleQuoted(cp) {
+  _stateDoctypePublicIdentifierSingleQuoted(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.APOSTROPHE: {
         this.state = State.AFTER_DOCTYPE_PUBLIC_IDENTIFIER;
         break;
@@ -24974,15 +25319,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.publicId += String.fromCodePoint(cp);
+        token.publicId += String.fromCodePoint(cp2);
       }
     }
   }
   // After DOCTYPE public identifier state
   //------------------------------------------------------------------
-  _stateAfterDoctypePublicIdentifier(cp) {
+  _stateAfterDoctypePublicIdentifier(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -25018,15 +25363,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypeSystemIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // Between DOCTYPE public and system identifiers state
   //------------------------------------------------------------------
-  _stateBetweenDoctypePublicAndSystemIdentifiers(cp) {
+  _stateBetweenDoctypePublicAndSystemIdentifiers(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -25059,15 +25404,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypeSystemIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // After DOCTYPE system keyword state
   //------------------------------------------------------------------
-  _stateAfterDoctypeSystemKeyword(cp) {
+  _stateAfterDoctypeSystemKeyword(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -25105,15 +25450,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypeSystemIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // Before DOCTYPE system identifier state
   //------------------------------------------------------------------
-  _stateBeforeDoctypeSystemIdentifier(cp) {
+  _stateBeforeDoctypeSystemIdentifier(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -25148,15 +25493,15 @@ var Tokenizer = class {
         this._err(ERR.missingQuoteBeforeDoctypeSystemIdentifier);
         token.forceQuirks = true;
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // DOCTYPE system identifier (double-quoted) state
   //------------------------------------------------------------------
-  _stateDoctypeSystemIdentifierDoubleQuoted(cp) {
+  _stateDoctypeSystemIdentifierDoubleQuoted(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.QUOTATION_MARK: {
         this.state = State.AFTER_DOCTYPE_SYSTEM_IDENTIFIER;
         break;
@@ -25181,15 +25526,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.systemId += String.fromCodePoint(cp);
+        token.systemId += String.fromCodePoint(cp2);
       }
     }
   }
   // DOCTYPE system identifier (single-quoted) state
   //------------------------------------------------------------------
-  _stateDoctypeSystemIdentifierSingleQuoted(cp) {
+  _stateDoctypeSystemIdentifierSingleQuoted(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.APOSTROPHE: {
         this.state = State.AFTER_DOCTYPE_SYSTEM_IDENTIFIER;
         break;
@@ -25214,15 +25559,15 @@ var Tokenizer = class {
         break;
       }
       default: {
-        token.systemId += String.fromCodePoint(cp);
+        token.systemId += String.fromCodePoint(cp2);
       }
     }
   }
   // After DOCTYPE system identifier state
   //------------------------------------------------------------------
-  _stateAfterDoctypeSystemIdentifier(cp) {
+  _stateAfterDoctypeSystemIdentifier(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.SPACE:
       case CODE_POINTS.LINE_FEED:
       case CODE_POINTS.TABULATION:
@@ -25244,15 +25589,15 @@ var Tokenizer = class {
       default: {
         this._err(ERR.unexpectedCharacterAfterDoctypeSystemIdentifier);
         this.state = State.BOGUS_DOCTYPE;
-        this._stateBogusDoctype(cp);
+        this._stateBogusDoctype(cp2);
       }
     }
   }
   // Bogus DOCTYPE state
   //------------------------------------------------------------------
-  _stateBogusDoctype(cp) {
+  _stateBogusDoctype(cp2) {
     const token = this.currentToken;
-    switch (cp) {
+    switch (cp2) {
       case CODE_POINTS.GREATER_THAN_SIGN: {
         this.emitCurrentDoctype(token);
         this.state = State.DATA;
@@ -25272,8 +25617,8 @@ var Tokenizer = class {
   }
   // CDATA section state
   //------------------------------------------------------------------
-  _stateCdataSection(cp) {
-    switch (cp) {
+  _stateCdataSection(cp2) {
+    switch (cp2) {
       case CODE_POINTS.RIGHT_SQUARE_BRACKET: {
         this.state = State.CDATA_SECTION_BRACKET;
         break;
@@ -25284,25 +25629,25 @@ var Tokenizer = class {
         break;
       }
       default: {
-        this._emitCodePoint(cp);
+        this._emitCodePoint(cp2);
       }
     }
   }
   // CDATA section bracket state
   //------------------------------------------------------------------
-  _stateCdataSectionBracket(cp) {
-    if (cp === CODE_POINTS.RIGHT_SQUARE_BRACKET) {
+  _stateCdataSectionBracket(cp2) {
+    if (cp2 === CODE_POINTS.RIGHT_SQUARE_BRACKET) {
       this.state = State.CDATA_SECTION_END;
     } else {
       this._emitChars("]");
       this.state = State.CDATA_SECTION;
-      this._stateCdataSection(cp);
+      this._stateCdataSection(cp2);
     }
   }
   // CDATA section end state
   //------------------------------------------------------------------
-  _stateCdataSectionEnd(cp) {
-    switch (cp) {
+  _stateCdataSectionEnd(cp2) {
+    switch (cp2) {
       case CODE_POINTS.GREATER_THAN_SIGN: {
         this.state = State.DATA;
         break;
@@ -25314,7 +25659,7 @@ var Tokenizer = class {
       default: {
         this._emitChars("]]");
         this.state = State.CDATA_SECTION;
-        this._stateCdataSection(cp);
+        this._stateCdataSection(cp2);
       }
     }
   }
@@ -25343,15 +25688,15 @@ var Tokenizer = class {
   }
   // Ambiguos ampersand state
   //------------------------------------------------------------------
-  _stateAmbiguousAmpersand(cp) {
-    if (isAsciiAlphaNumeric2(cp)) {
-      this._flushCodePointConsumedAsCharacterReference(cp);
+  _stateAmbiguousAmpersand(cp2) {
+    if (isAsciiAlphaNumeric2(cp2)) {
+      this._flushCodePointConsumedAsCharacterReference(cp2);
     } else {
-      if (cp === CODE_POINTS.SEMICOLON) {
+      if (cp2 === CODE_POINTS.SEMICOLON) {
         this._err(ERR.unknownNamedCharacterReference);
       }
       this.state = this.returnState;
-      this._callState(cp);
+      this._callState(cp2);
     }
   }
 };
@@ -29366,7 +29711,7 @@ function* descendants(node) {
   }
 }
 function sha256(s) {
-  return createHash2("sha256").update(s).digest("hex");
+  return createHash3("sha256").update(s).digest("hex");
 }
 var SKIPPED = /* @__PURE__ */ new Set(["script", "style", "noscript", "template", "svg", "iframe", "object", "canvas", "select", "head"]);
 var HEADING = /^h([1-6])$/;
@@ -29657,7 +30002,7 @@ function headingTexts(html, level) {
 }
 
 // ../geo-engine/src/geo/selected-page-evidence.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 
 // ../geo-engine/src/geo/material-fact-contract.ts
 var text = external_exports.string().trim().min(1);
@@ -29763,10 +30108,10 @@ var SelectedPageEvidenceSchema = external_exports.strictObject({
 function selectedPageId(pageUrl) {
   const selected = new URL(pageUrl);
   selected.hash = "";
-  return `page:${createHash3("sha256").update(selected.href).digest("hex")}`;
+  return `page:${createHash4("sha256").update(selected.href).digest("hex")}`;
 }
 function observationBodyHash(body) {
-  return createHash3("sha256").update(body).digest("hex");
+  return createHash4("sha256").update(body).digest("hex");
 }
 function sameSelectedHost(selectedUrl, finalUrl) {
   const host = (value) => new URL(value).hostname.toLowerCase().replace(/^www\./, "");
@@ -30218,14 +30563,14 @@ function evaluateAccess(parsed, token, url3, fallbackTokens = []) {
 }
 
 // ../geo-engine/src/geo/readiness/findings.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 function issueId(origin, checkId, scopeKey) {
-  return createHash4("sha256").update(`${origin.toLowerCase()}
+  return createHash5("sha256").update(`${origin.toLowerCase()}
 ${checkId}
 ${scopeKey}`).digest("hex").slice(0, 16);
 }
 function fingerprint(body) {
-  return body === null ? null : createHash4("sha256").update(body).digest("hex");
+  return body === null ? null : createHash5("sha256").update(body).digest("hex");
 }
 function makeFinding({ origin, scopeKey, policyChoice = false, materiality = "site", ...rest }) {
   return { id: issueId(origin, rest.checkId, scopeKey), policyChoice, materiality, ...rest };
@@ -30516,7 +30861,7 @@ function searchCrawlers() {
   return CRAWLER_REGISTRY.filter((entry) => entry.purpose === "search_index").map((entry) => entry.token);
 }
 function probeUserAgent(token) {
-  return `Mozilla/5.0 (compatible; ${token}; Heysurface readiness check)`;
+  return `Mozilla/5.0 (compatible; ${token}; Obi readiness check)`;
 }
 function firewallProbePlan(origin) {
   const base = new URL(origin).origin;
@@ -30622,6 +30967,7 @@ function auditFirewall(probes, origin) {
 }
 
 // ../geo-engine/src/geo/host-acquisition.ts
+var ROBOTS_TOKENS = ["Obi", "Heysurface"];
 var INVENTORY_SAFETY_LIMIT = 1e5;
 var priority = { robots: 0, sitemap: 1, page: 2, llms: 3 };
 var pagePriority = {
@@ -30697,9 +31043,9 @@ function discoverHostPageLinks(state, body, pageUrl, known = new Set(state.resou
   const alias = new URL(pageUrl);
   alias.hostname = alias.hostname.startsWith("www.") ? alias.hostname.slice(4) : `www.${alias.hostname}`;
   const links = [pageUrl, alias.href].flatMap((base) => extractSameOriginLinks(body, base, INVENTORY_SAFETY_LIMIT));
-  for (const link of links) {
-    if (/\.(?:xml|pdf|png|jpe?g|gif|svg|webp|ico|css|js|zip|mp4|woff2?)$/i.test(new URL(link).pathname)) continue;
-    const resource = appendResource(state, link, "page", known);
+  for (const link2 of links) {
+    if (/\.(?:xml|pdf|png|jpe?g|gif|svg|webp|ico|css|js|zip|mp4|woff2?)$/i.test(new URL(link2).pathname)) continue;
+    const resource = appendResource(state, link2, "page", known);
     if (resource) added.push(resource);
   }
   return added;
@@ -30727,7 +31073,7 @@ function validateState(raw) {
   return state;
 }
 function matchesFingerprint(observation) {
-  return observation.body === null ? observation.bodyHash === null : observation.bodyHash === createHash5("sha256").update(observation.body).digest("hex");
+  return observation.body === null ? observation.bodyHash === null : observation.bodyHash === createHash6("sha256").update(observation.body).digest("hex");
 }
 function pendingProbeRequests(state) {
   const home = state.resources.find((resource) => resource.kind === "page" && resource.url === `${state.origin}/`);
@@ -30794,6 +31140,7 @@ async function crawlHostBatch(raw, options = {}) {
   const pages = [];
   const fetcher = options.fetcher ?? observeSelectedHttp;
   const probePlan = options.probeBots ? firewallProbePlan(state.origin) : [];
+  const parsedRobots = /* @__PURE__ */ new Map();
   for (let attempt = 0; attempt < batchSize; attempt++) {
     if (pendingChanged) {
       pending.sort((a, b) => order.get(a.url) - order.get(b.url));
@@ -30829,7 +31176,12 @@ async function crawlHostBatch(raw, options = {}) {
     if (next.kind !== "robots" && state.robots) {
       const robots = state.robots;
       const unavailable2 = robots.errorKind || robots.truncated || robots.status === null || robots.status === 429 || robots.status >= 500;
-      const blocked = robots.status === 200 && robots.body !== null && !evaluateAccess(parseRobots(robots.body), "Heysurface", next.url).allowed;
+      let rules = null;
+      if (robots.status === 200 && robots.body !== null) {
+        rules = parsedRobots.get(robots.body) ?? parseRobots(robots.body);
+        parsedRobots.set(robots.body, rules);
+      }
+      const blocked = rules !== null && ROBOTS_TOKENS.some((token) => !evaluateAccess(rules, token, next.url).allowed);
       if (unavailable2 || blocked) {
         next.status = "blocked";
         next.error = unavailable2 ? "robots_unavailable" : "robots_disallow";
@@ -31147,7 +31499,7 @@ function auditLlms(obs, ctx) {
   }
   const valid = links.filter((l) => l.resolved !== null);
   const seen = /* @__PURE__ */ new Map();
-  for (const link of valid) seen.set(normalize(link.resolved), [...seen.get(normalize(link.resolved)) ?? [], link]);
+  for (const link2 of valid) seen.set(normalize(link2.resolved), [...seen.get(normalize(link2.resolved)) ?? [], link2]);
   const duplicates = [...seen.entries()].filter(([, list]) => list.length > 1).slice(0, MAX_LISTED);
   if (duplicates.length > 0) {
     fail("llms.duplicate-links", duplicates.map(([u]) => u).join("\n"), duplicates.flatMap(([, list]) => list.map((l) => l.line)), { links: duplicates.map(([u]) => u) }, "info");
@@ -32492,7 +32844,7 @@ async function readJson(path, maxBytes = maxCorpusBytes) {
   try {
     const info = await stat6(path);
     if (!info.isFile() || info.size > maxBytes) throw fileError(`The research file is not a regular JSON file within the ${maxBytes / 1024 / 1024} MiB local limit.`);
-    const content = await readFile6(path);
+    const content = await readFile7(path);
     if (content.byteLength > maxBytes) throw fileError(`The research file exceeds the ${maxBytes / 1024 / 1024} MiB local limit.`);
     return JSON.parse(content.toString("utf8"));
   } catch (error51) {
@@ -32680,8 +33032,8 @@ async function captureResearch(input, checkpoint, output) {
 
 // src/research-video.ts
 import { spawn as spawn2 } from "node:child_process";
-import { mkdir as mkdir2, readdir as readdir2, readFile as readFile7, rm } from "node:fs/promises";
-import { join as join4, resolve as resolve3 } from "node:path";
+import { mkdir as mkdir2, readdir as readdir3, readFile as readFile8, rm as rm2 } from "node:fs/promises";
+import { join as join5, resolve as resolve3 } from "node:path";
 var maxToolOutputBytes = 256 * 1024;
 var runTool = (executable, args, timeoutMs) => new Promise((done, fail) => {
   const child = spawn2(executable, [...args], { stdio: ["ignore", "pipe", "pipe"], shell: false });
@@ -32708,7 +33060,7 @@ var runTool = (executable, args, timeoutMs) => new Promise((done, fail) => {
   });
 });
 var presenceTimeoutMs = 6e4;
-async function present(runner, executable, flag) {
+async function present2(runner, executable, flag) {
   try {
     return (await runner(executable, [flag], presenceTimeoutMs)).exitCode === 0;
   } catch {
@@ -32716,7 +33068,7 @@ async function present(runner, executable, flag) {
   }
 }
 async function videoTools(runner = runTool) {
-  const [ytDlp, ffmpeg] = await Promise.all([present(runner, "yt-dlp", "--version"), present(runner, "ffmpeg", "-version")]);
+  const [ytDlp, ffmpeg] = await Promise.all([present2(runner, "yt-dlp", "--version"), present2(runner, "ffmpeg", "-version")]);
   return { ytDlp, ffmpeg };
 }
 var missingTool = (frames) => videoError(
@@ -32776,16 +33128,16 @@ function publicVideoUrl(raw) {
 }
 async function readVideo(rawUrl, outputDir, frames, runner = runTool) {
   const url3 = publicVideoUrl(rawUrl);
-  if (frames > 0 && !await present(runner, "ffmpeg", "-version")) throw missingTool(frames);
+  if (frames > 0 && !await present2(runner, "ffmpeg", "-version")) throw missingTool(frames);
   const directory = resolve3(outputDir);
   await mkdir2(directory, { recursive: true });
   const base = ["--ignore-config", "--no-playlist", "--quiet", "--no-warnings"];
-  const target = ["-o", join4(templateSafe(directory), "video.%(ext)s")];
+  const target = ["-o", join5(templateSafe(directory), "video.%(ext)s")];
   const failed = (message, nextAction) => videoError("RESEARCH_VIDEO_FAILED", message, nextAction);
   const metadata = await runner("yt-dlp", [...base, "--skip-download", "--write-info-json", ...target, url3.href], 18e4).catch((error51) => {
     throw error51.code === "ENOENT" ? missingTool(frames) : failed("yt-dlp did not finish reading this video page.", "Retry once; a slow or blocked network leaves the video unread.");
   });
-  const info = metadata.exitCode === 0 ? JSON.parse(await readFile7(join4(directory, "video.info.json"), "utf8")) : null;
+  const info = metadata.exitCode === 0 ? JSON.parse(await readFile8(join5(directory, "video.info.json"), "utf8")) : null;
   if (!info) {
     throw failed("yt-dlp could not read this video page.", "Check the address in a browser; a private or region-locked video stays unread.");
   }
@@ -32803,15 +33155,15 @@ async function readVideo(rawUrl, outputDir, frames, runner = runTool) {
       ...target,
       url3.href
     ], 18e4).catch(() => null);
-    const file2 = (await readdir2(directory)).find((name) => name === `video.${chosen.language}.vtt`);
+    const file2 = (await readdir3(directory)).find((name) => name === `video.${chosen.language}.vtt`);
     if (subtitles?.exitCode !== 0 || !file2) {
       throw failed("The video has captions but their download failed.", "Retry in a minute; the platform may be rate-limiting.");
     }
-    segments = parseVtt(await readFile7(join4(directory, file2), "utf8"));
+    segments = parseVtt(await readFile8(join5(directory, file2), "utf8"));
   }
   const duration3 = typeof info.duration === "number" ? info.duration : null;
   const frameFiles = [];
-  const output = join4(directory, "transcript.json");
+  const output = join5(directory, "transcript.json");
   const save = () => writeJsonAtomic(
     output,
     {
@@ -32831,7 +33183,7 @@ async function readVideo(rawUrl, outputDir, frames, runner = runTool) {
     throw failed("The video's length is unknown, so frames cannot be spaced.", "Retry with --frames 0 to keep the captions only.");
   }
   if (frames > 0 && duration3) {
-    const removeMedia = async () => Promise.all((await readdir2(directory)).filter((file2) => file2.startsWith("media.")).map((file2) => rm(join4(directory, file2), { force: true })));
+    const removeMedia = async () => Promise.all((await readdir3(directory)).filter((file2) => file2.startsWith("media.")).map((file2) => rm2(join5(directory, file2), { force: true })));
     await removeMedia();
     try {
       const download = await runner("yt-dlp", [
@@ -32839,12 +33191,12 @@ async function readVideo(rawUrl, outputDir, frames, runner = runTool) {
         "-f",
         "b[height<=480]/bv*[height<=480]/w",
         "-o",
-        join4(templateSafe(directory), "media.%(ext)s"),
+        join5(templateSafe(directory), "media.%(ext)s"),
         url3.href
       ], 6e5).catch(() => {
         throw failed("The video download did not finish.", "Retry with --frames 0 to keep the captions only.");
       });
-      const media = (await readdir2(directory)).find((file2) => file2.startsWith("media.") && !file2.endsWith(".part"));
+      const media = (await readdir3(directory)).find((file2) => file2.startsWith("media.") && !file2.endsWith(".part"));
       if (download.exitCode !== 0 || !media) {
         throw failed("The video could not be downloaded for frames.", "Retry with --frames 0 to keep the captions only.");
       }
@@ -32859,14 +33211,14 @@ async function readVideo(rawUrl, outputDir, frames, runner = runTool) {
           "-ss",
           String(atSeconds),
           "-i",
-          join4(directory, media),
+          join5(directory, media),
           "-frames:v",
           "1",
           "-vf",
           "scale=1024:-2",
-          join4(directory, file2)
+          join5(directory, file2)
         ], 6e4).catch(() => null);
-        if (extracted?.exitCode === 0) frameFiles.push({ file: join4(directory, file2), atSeconds });
+        if (extracted?.exitCode === 0) frameFiles.push({ file: join5(directory, file2), atSeconds });
       }
     } finally {
       await removeMedia();
@@ -32925,7 +33277,20 @@ async function removeEverywhere(context) {
     await new CredentialStore(backend, context.origin.origin).removeCredential();
   }
 }
+async function forgetLegacyFolder(context) {
+  const legacy = legacySibling(context.stateDirectory);
+  if (legacy === null) return;
+  const backend = new FileBackend(legacy);
+  for (const item of ["credentials", "pending"]) {
+    await backend.remove(item, context.origin.origin).catch(() => void 0);
+  }
+}
 async function logout(context) {
+  const data = await logoutHere(context);
+  await forgetLegacyFolder(context);
+  return data;
+}
+async function logoutHere(context) {
   const origin = context.origin.origin;
   let located;
   try {
@@ -32970,27 +33335,30 @@ async function showAlphaStrategies(context) {
 }
 
 // src/skill-install.ts
-import { lstat as lstat3, mkdir as mkdir3, realpath, symlink, unlink as unlink4 } from "node:fs/promises";
+import { lstat as lstat3, mkdir as mkdir3, readlink, realpath, symlink, unlink as unlink5 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { join as join5, sep } from "node:path";
+import { join as join6, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 var skillDirectories = [".agents/skills", ".claude/skills"];
-function installError(message, identity) {
+var alphaSkillName = "heysurface";
+var messageLimit = 300;
+function installError(message) {
   return new CliError({
     code: "SKILL_INSTALL_FAILED",
-    message,
+    message: message.length > messageLimit ? `${message.slice(0, messageLimit - 1)}\u2026` : message,
     exitCode: 4,
     retryable: false,
-    nextAction: `Check the personal Skill directories and run ${identity} skill install again. Existing files are never replaced.`,
+    nextAction: "Check the personal Skill directories and run obi skill install again. Existing files are never replaced.",
     mode: "local"
   });
 }
-async function existingPath(path, identity) {
+async function existingPath(path) {
   try {
     await lstat3(path);
     return true;
   } catch (error51) {
     if (error51.code === "ENOENT") return false;
-    throw installError(`Cannot inspect ${path}.`, identity);
+    throw installError(`Cannot inspect ${path}.`);
   }
 }
 async function linksIntoPackage(path, packageRoot) {
@@ -32999,52 +33367,86 @@ async function linksIntoPackage(path, packageRoot) {
     entry = await lstat3(path);
   } catch (error51) {
     if (error51.code === "ENOENT") return false;
-    throw installError(`Cannot inspect ${path}.`, "obi");
+    throw installError(`Cannot inspect ${path}.`);
   }
   if (!entry.isSymbolicLink()) return false;
-  let target;
   try {
-    target = await realpath(path);
+    const target = await realpath(path);
+    return target === packageRoot || target.startsWith(`${packageRoot}${sep}`);
   } catch {
-    return false;
+    try {
+      return await readlink(path) === join6(packageRoot, "skills", alphaSkillName);
+    } catch {
+      return false;
+    }
   }
-  return target === packageRoot || target.startsWith(`${packageRoot}${sep}`);
 }
-async function installSkill(sourceDirectory, identity) {
+async function installSkill(sourceDirectory) {
   const source = await realpath(sourceDirectory);
   const home = homedir2();
-  const destinations = skillDirectories.map((directory) => join5(home, directory, identity));
+  const destinations = skillDirectories.map((directory) => join6(home, directory, "obi"));
+  const registered = async (destination) => {
+    try {
+      return await realpath(destination) === source;
+    } catch {
+      return false;
+    }
+  };
   for (const destination of destinations) {
-    if (!await existingPath(destination, identity)) continue;
+    if (!await existingPath(destination) || await registered(destination)) continue;
+    let target = null;
     try {
-      if (await realpath(destination) === source) continue;
+      if ((await lstat3(destination)).isSymbolicLink()) target = await readlink(destination);
     } catch {
+      continue;
     }
-    throw installError(`A Skill entry already exists at ${destination}.`, identity);
+    throw installError(target === null ? `A Skill entry already exists: a file or folder this package did not create. Move it, then run obi skill install. It is at ${destination}` : `A Skill entry already exists: a link outside this installation. To use this installation, remove that link, then run obi skill install. The link: ${destination} -> ${target}`);
   }
   for (const destination of destinations) {
-    if (await existingPath(destination, identity)) continue;
+    if (await registered(destination)) continue;
     try {
-      await mkdir3(join5(destination, ".."), { recursive: true });
+      await mkdir3(join6(destination, ".."), { recursive: true });
       await symlink(source, destination, process.platform === "win32" ? "junction" : "dir");
     } catch {
-      throw installError(`Could not register the ${identity === "heysurface" ? "Heysurface" : "Obi"} Skill at ${destination}.`, identity);
+      if (await registered(destination)) continue;
+      throw installError(`Could not register the Obi Skill. Check that its folder can be written, then run obi skill install. The link to make: ${destination}`);
     }
   }
   const removed = [];
-  if (identity === "obi") {
-    const packageRoot = await realpath(join5(source, "..", ".."));
-    for (const alpha of skillDirectories.map((directory) => join5(home, directory, "heysurface"))) {
-      if (!await linksIntoPackage(alpha, packageRoot)) continue;
+  const packageRoot = await realpath(join6(source, "..", ".."));
+  for (const alpha of skillDirectories.map((directory) => join6(home, directory, alphaSkillName))) {
+    if (!await linksIntoPackage(alpha, packageRoot)) continue;
+    try {
+      await unlink5(alpha);
+    } catch (error51) {
+      if (error51.code === "ENOENT") continue;
+      throw installError(`Could not retire the earlier Skill link at ${alpha}.`);
+    }
+    removed.push(alpha);
+  }
+  return { paths: destinations, removed };
+}
+function packagedSkillDirectory() {
+  return fileURLToPath(new URL("../skills/obi", import.meta.url));
+}
+async function registerSkillLinks(sourceDirectory, env) {
+  if (env.OBI_SKILL_LINKS === "off") return { state: "off" };
+  try {
+    const source = await realpath(sourceDirectory);
+    let present3 = true;
+    for (const directory of skillDirectories) {
       try {
-        await unlink4(alpha);
+        if (await realpath(join6(homedir2(), directory, "obi")) !== source) present3 = false;
       } catch {
-        throw installError(`Could not retire the alpha /heysurface Skill link at ${alpha}.`, identity);
+        present3 = false;
       }
-      removed.push(alpha);
     }
+    if (present3) return { state: "present" };
+    await installSkill(sourceDirectory);
+    return { state: "created" };
+  } catch (error51) {
+    return { state: "failed", reason: error51 instanceof CliError ? error51.message : "The Obi Skill could not be registered." };
   }
-  return { paths: destinations, removed };
 }
 
 // src/transport.ts
@@ -33170,7 +33572,7 @@ async function fetchTestStatus(origin, timeoutMs) {
 }
 
 // src/commands.ts
-var usage = "obi <business|capabilities|credentials|doctor|eval|harness|login|logout|memory|questions|readiness|research|skill|status|strategies> [--json]\n       obi eval <start <domain>|list> [--json]\n       Evaluation commands: add --eval-case <id> to status, business, harness, readiness, questions and strategies\n       obi harness coverage [--json]\n       obi harness activate --free [--json]\n       obi harness show --stage <business|questions|strategies> [--packs <1-40> for questions review] [--json]\n       obi harness submit --stage <business|questions|strategies> --input <file> [--json]\n       obi harness outcomes --task-id <UUID> [--cursor <event-id>] [--limit <1-50>] [--json]\n       obi harness observe --input <file> [--json]\n       obi harness purchase <quote|prepare|status|resume|change> [--input <quote-and-basket.json>; resume: quote ID only] [--confirm-checkout for prepare] [--confirm-change for change] [--json]\n       obi harness artifact <save|show|history|export> --work-id <UUID> [--input <JSON file>] [--revision <n>] [--output <new file>] [--cursor <opaque>] [--limit <1-100>] [--json]\n       obi harness evidence --work-id <UUID> [--kind claims|sections|measurements] [--cursor <opaque>] [--query <text>] [--url <exact URL>] [--all --output <file>] [--json]\n       obi research crawl <domain> --checkpoint <file> --output <file> [--batch-size <1-100>] [--locale <tag>] [--pages priority|all] [--max-pages <n|none>] [--retry-failed|--refresh] [--json]\n       obi research capture --input <selected-page-file> --checkpoint <file> --output <corpus-file> [--json]\n       obi research readiness --input <corpus-file> --output <report-file> [--json]\n       obi research video <url> --output <directory> [--frames <0-30>] [--json]\n       obi memory <list|add --kind <preference|constraint|decision> --text <words>|remove <id>> [--eval-case <id>] [--json]\n       obi questions show [--json]\n       obi questions prepare --confirm-preparation [--json]\n       obi questions edit <id> --candidate-version <n> --text <wording> [--json]\n       obi questions proceed --candidate-version <n> --confirm-scan [--json]\n       obi questions results [--run latest|first|<run ID>] [--from <question position>] [--json]\n       obi readiness [--json]\n       obi strategies [--json]\n       obi skill <path|install> [--json]\n       obi credentials <list|revoke <credentialId>> [--force]\n       obi business start --confirm-domain <domain>\n       obi business show\n       obi business discover --snapshot <token> --confirm-discovery\n       obi business clarify-identity --snapshot <token> --company <name>\n       obi business clarify-fact <itemId> --snapshot <token> --field-path <path> --text <answer> --company <current name> --company-wide [--segment-name <name> for segments.append]\n       obi business challenge <itemId> --snapshot <token> --reason <reason>\n       obi business correct <itemId> --snapshot <token> --claim-id <id> --field-path <path> --text <affirmative correction> --company <current name> --company-wide\n       obi business remove <competitorItemId> --snapshot <token> [--reason <reason>]\n       obi business <add-competitor|remove-competitor|readd-competitor> <domain> --snapshot <token> [--reason <reason>]\n       obi business confirm --snapshot <token> --confirm-review\n       Global options: --json, --timeout-ms <100-30000>; login: --expect-email <email> [--storage file]; status/doctor test: --test-server <origin>";
+var usage = 'obi <business|capabilities|credentials|doctor|eval|harness|login|logout|memory|questions|readiness|research|skill|status|strategies|support> [--json]\n       obi support "<message>" [--tag market-request|scope-request] [--json]\n       obi eval <start <domain>|list> [--json]\n       Evaluation commands: add --eval-case <id> to status, business, harness, readiness, questions and strategies\n       obi harness coverage [--json]\n       obi harness activate --free [--json]\n       obi harness show --stage <business|questions|strategies> [--packs <1-40> for questions review] [--json]\n       obi harness submit --stage <business|questions|strategies> --input <file> [--json]\n       obi harness outcomes --task-id <UUID> [--cursor <event-id>] [--limit <1-50>] [--json]\n       obi harness observe --input <file> [--json]\n       obi harness purchase <quote|prepare|status|resume|change> [--input <quote-and-basket.json>; resume: quote ID only] [--confirm-checkout for prepare] [--confirm-change for change] [--json]\n       obi harness artifact <save|show|history|export> --work-id <UUID> [--input <JSON file>] [--revision <n>] [--output <new file>] [--cursor <opaque>] [--limit <1-100>] [--json]\n       obi harness evidence --work-id <UUID> [--kind claims|sections|measurements] [--cursor <opaque>] [--query <text>] [--url <exact URL>] [--all --output <file>] [--json]\n       obi research crawl <domain> --checkpoint <file> --output <file> [--batch-size <1-100>] [--locale <tag>] [--pages priority|all] [--max-pages <n|none>] [--retry-failed|--refresh] [--json]\n       obi research capture --input <selected-page-file> --checkpoint <file> --output <corpus-file> [--json]\n       obi research readiness --input <corpus-file> --output <report-file> [--json]\n       obi research video <url> --output <directory> [--frames <0-30>] [--json]\n       obi memory <list|add --kind <preference|constraint|decision> --text <words>|remove <id>> [--eval-case <id>] [--json]\n       obi questions show [--json]\n       obi questions prepare --confirm-preparation [--json]\n       obi questions edit <id> --candidate-version <n> --text <wording> [--json]\n       obi questions proceed --candidate-version <n> --confirm-scan [--json]\n       obi questions results [--run latest|first|<run ID>] [--from <question position>] [--json]\n       obi readiness [--json]\n       obi strategies [--json]\n       obi skill <path|install> [--json]\n       obi credentials <list|revoke <credentialId>> [--force]\n       obi business start --confirm-domain <domain>\n       obi business show\n       obi business discover --snapshot <token> --confirm-discovery\n       obi business clarify-identity --snapshot <token> --company <name>\n       obi business clarify-fact <itemId> --snapshot <token> --field-path <path> --text <answer> --company <current name> --company-wide [--segment-name <name> for segments.append]\n       obi business challenge <itemId> --snapshot <token> --reason <reason>\n       obi business correct <itemId> --snapshot <token> --claim-id <id> --field-path <path> --text <affirmative correction> --company <current name> --company-wide\n       obi business remove <competitorItemId> --snapshot <token> [--reason <reason>]\n       obi business <add-competitor|remove-competitor|readd-competitor> <domain> --snapshot <token> [--reason <reason>]\n       obi business confirm --snapshot <token> --confirm-review\n       Global options: --json, --timeout-ms <100-30000>; login: --expect-email <email> [--storage file]; status/doctor test: --test-server <origin>';
 function success2(command, mode, data) {
   return cliResultSchema.parse({ schemaVersion: 1, command, mode, ok: true, data });
 }
@@ -33197,7 +33599,7 @@ function statusResult(status) {
   }
   return success2("status", "test", status);
 }
-async function localDoctor(runtime) {
+async function localDoctor(runtime, timeoutMs) {
   const located = await locateCredential(runtime);
   return success2("doctor", "local", {
     node: process.version,
@@ -33205,6 +33607,7 @@ async function localDoctor(runtime) {
     origin: runtime.origin.origin,
     credentialStorage: located === null ? "none" : located.store.backend.kind,
     videoTools: await videoTools(),
+    server: await probeServer(runtime.origin, timeoutMs),
     diagnostic: "completed"
   });
 }
@@ -33217,7 +33620,7 @@ async function executeCommand(args, runtime) {
   if (args.command === "help") {
     return success2("help", "local", {
       usage,
-      commands: ["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies"]
+      commands: ["business", "capabilities", "credentials", "doctor", "eval", "harness", "login", "logout", "memory", "questions", "readiness", "research", "skill", "status", "strategies", "support"]
     });
   }
   if (args.command === "version") {
@@ -33226,6 +33629,13 @@ async function executeCommand(args, runtime) {
   if (args.command === "capabilities") {
     return success2("capabilities", "local", {
       version: cliVersion,
+      measurementMarkets: SUPPORTED_MARKETS,
+      catalog: { version: CLI_DOLLAR_CATALOG_VERSION, currency: "usd", monthlyCents: {
+        corePack: CLI_DOLLAR_PRICES.core,
+        claudePerPack: CLI_DOLLAR_PRICES.claude,
+        perplexityPerPack: CLI_DOLLAR_PRICES.perplexity
+      } },
+      support: { email: SUPPORT_EMAIL },
       realLogin: "available",
       paidExecution: "server_authorized",
       expertise: { manifestVersion: AI_SEARCH_COMPETENCY_VERSION, competencies: AI_SEARCH_COMPETENCIES },
@@ -33244,13 +33654,14 @@ async function executeCommand(args, runtime) {
         skill: { actions: ["path", "install"], options: ["--json"] },
         status: { options: ["--json", "--eval-case", "--test-server", "--timeout-ms"] },
         readiness: { options: ["--json", "--eval-case", "--timeout-ms"] },
-        strategies: { options: ["--json", "--eval-case", "--timeout-ms"] }
+        strategies: { options: ["--json", "--eval-case", "--timeout-ms"] },
+        support: { tags: [...SUPPORT_TAGS], options: ["--json", "--tag", "--timeout-ms"] }
       }
     });
   }
   if (args.command === "doctor") {
     if (args.testServer === void 0) {
-      return localDoctor(runtime);
+      return localDoctor(runtime, args.timeoutMs);
     }
     const status = await fetchTestStatus(args.testServer, args.timeoutMs);
     return success2("doctor", "test", {
@@ -33260,7 +33671,7 @@ async function executeCommand(args, runtime) {
     });
   }
   if (args.command === "skill") {
-    const path = fileURLToPath(new URL(`../skills/${runtime.identity}/SKILL.md`, import.meta.url));
+    const path = fileURLToPath2(new URL("../skills/obi/SKILL.md", import.meta.url));
     try {
       await access(path);
     } catch {
@@ -33273,7 +33684,7 @@ async function executeCommand(args, runtime) {
         mode: "local"
       });
     }
-    return success2("skill", "local", args.skillAction === "install" ? { action: "install", ...await installSkill(fileURLToPath(new URL(`../skills/${runtime.identity}`, import.meta.url)), runtime.identity) } : { action: "path", path });
+    return success2("skill", "local", args.skillAction === "install" ? { action: "install", ...await installSkill(fileURLToPath2(new URL("../skills/obi", import.meta.url))) } : { action: "path", path });
   }
   if (args.command === "login") {
     return success2("login", "product", await login(session, {
@@ -33330,6 +33741,9 @@ async function executeCommand(args, runtime) {
       }
     ) : args.researchAction === "video" ? await readVideo(args.researchVideoUrl, args.researchOutput, args.researchFrames ?? 0) : args.researchAction === "capture" ? await captureResearch(args.researchInput, args.researchCheckpoint, args.researchOutput) : await assessResearch(args.researchInput, args.researchOutput));
   }
+  if (args.command === "support") {
+    return success2("support", "product", await sendSupport(session, { message: args.supportMessage, tag: args.supportTag ?? null }));
+  }
   if (args.command === "memory") {
     if (args.memoryAction === "list") return success2("memory", "product", await listMemory(session));
     return success2("memory", "product", await changeMemory(session, args.memoryAction === "add" ? { op: "add", kind: args.memoryKind, text: args.memoryText } : { op: "remove", id: args.memoryEntryId }));
@@ -33382,23 +33796,51 @@ async function executeCommand(args, runtime) {
   return success2("status", "product", await readStatus(session));
 }
 
+// src/start.ts
+import { join as join7 } from "node:path";
+var linkStates = {
+  created: "created",
+  present: "present",
+  off: "off (OBI_SKILL_LINKS), run obi skill install"
+};
+function renderStart(input) {
+  const links = input.registration.state === "failed" ? `failed. ${sanitizeHumanText(input.registration.reason)}` : `${linkStates[input.registration.state]}.`;
+  const account2 = input.accountEmail === null ? [
+    "Account: not connected. Connect: obi login --expect-email <the user's email> (prints an address and a code for the user).",
+    "Then: obi status --json"
+  ] : [`Account: connected as ${sanitizeHumanText(input.accountEmail)}. Its state: obi status --json`];
+  return [
+    `Obi CLI ${cliVersion}, npm package @hireobi/cli. Skill links: ${links}`,
+    `Agent guide, a local file in this package: ${sanitizeHumanText(join7(input.skillDirectory, "SKILL.md"))}`,
+    ...account2,
+    input.registration.state === "created" || input.registration.state === "present" ? "In the agent: /obi (Claude Code, Cursor), $obi (Codex) or @obi (OpenCode); /reload-skills in Claude Code if /obi is missing." : "In the agent: /obi, $obi and @obi exist once the Skill links do; until then, read the guide above.",
+    'The obi command comes only from npm i -g @hireobi/cli; the npm package named "obi" is unrelated.'
+  ].join("\n") + "\n";
+}
+
 // src/welcome.ts
 var copy = {
   en: {
     tagline: "Your AI Search employee.",
     greeting: "Hi, I'm Obi. Let's get you discovered.",
-    install: "Get started: obi skill install",
+    ready: "I'm in your assistants: Claude Code, Codex, Cursor and OpenCode.",
+    off: "Get started: obi skill install",
+    failed: "I could not join your assistants.",
     claude: "Claude Code / Cursor: /obi",
     codex: "Codex: $obi or the skills picker",
+    opencode: "OpenCode: @obi",
     next: "Then give me your website in your assistant's chat.",
     help: "All commands: obi --help"
   },
   fr: {
     tagline: "Ton agent AI Search.",
     greeting: "Salut, moi c'est Obi. Faisons conna\xEEtre ton entreprise.",
-    install: "Pour d\xE9marrer : obi skill install",
+    ready: "Je suis dans tes assistants : Claude Code, Codex, Cursor et OpenCode.",
+    off: "Pour d\xE9marrer : obi skill install",
+    failed: "Je n'ai pas pu rejoindre tes assistants.",
     claude: "Claude Code / Cursor : /obi",
     codex: "Codex : $obi ou le s\xE9lecteur de skills",
+    opencode: "OpenCode : @obi",
     next: "Donne-moi ensuite ton site dans ton assistant.",
     help: "Toutes les commandes : obi --help"
   }
@@ -33452,7 +33894,7 @@ function mascotLine(row, depth) {
     return `${color(top, false, depth)}${color(bottom, true, depth)}\u2580`;
   }).join("") + reset;
 }
-function renderWelcome(env, columns, colorDepth) {
+function renderWelcome(env, columns, colorDepth, registration) {
   const locale = [env.OBI_LANGUAGE, env.LC_ALL, env.LC_MESSAGES, env.LANG].find((value) => value?.trim())?.trim().toLowerCase() ?? "en";
   const text2 = copy[/^fr(?:[-_.@]|$)/.test(locale) ? "fr" : "en"];
   const colorful = columns >= 64 && colorDepth >= 8 && env.TERM !== "dumb" && !env.NO_COLOR;
@@ -33461,14 +33903,16 @@ function renderWelcome(env, columns, colorDepth) {
     return `  ${mascotLine(row, colorDepth)}     ${aside}`;
   }).join("\n") : `Obi \xB7 ${cliVersion}
 ${text2.tagline}`;
+  const skill = registration.state === "failed" ? `${text2.failed} ${sanitizeHumanText(registration.reason)}` : registration.state === "off" ? text2.off : text2.ready;
   return `
 ${title}
 
 ${text2.greeting}
 
-  ${text2.install}
+  ${skill}
   ${text2.claude}
   ${text2.codex}
+  ${text2.opencode}
 
 ${text2.next}
 ${text2.help}
@@ -33490,16 +33934,19 @@ function failureResult(error51, command, mode) {
       nextAction: error51.nextAction
     },
     authorization: error51.authorization,
-    account: error51.account
+    account: error51.account,
+    support: error51.support
   });
 }
 function markOrigin(result, origin) {
   return origin?.development === true ? cliResultSchema.parse({ ...result, origin: origin.origin, development: true }) : result;
 }
-async function runCli(identity) {
+async function runCli() {
   const argv = process.argv.slice(2);
   const json2 = wantsJson(argv);
   const welcome = argv.length === 0 && process.stdin.isTTY === true && process.stdout.isTTY === true;
+  const start = argv.length === 0 && !welcome;
+  const registration = await registerSkillLinks(packagedSkillDirectory(), process.env);
   let command = "unknown";
   let mode = commandMode(
     void 0,
@@ -33511,21 +33958,27 @@ async function runCli(identity) {
     const resolved = resolveOrigin(process.env);
     if (resolved.development && !json2 && !warned) {
       warned = true;
-      process.stderr.write(`Warning: HEYSURFACE_ORIGIN points this CLI at the development server ${sanitizeHumanText(resolved.origin)}, not at Obi.
+      process.stderr.write(`Warning: OBI_ORIGIN points this CLI at the development server ${sanitizeHumanText(resolved.origin)}, not at Obi.
 `);
     }
     return resolved;
   };
   try {
-    const args = parseCommandArguments(welcome ? ["--help"] : argv);
+    const args = parseCommandArguments(welcome || start ? ["--help"] : argv);
     command = args.command;
     mode = commandMode(args.command, args.testServer !== void 0);
     origin = activeOrigin();
-    const result = await executeCommand(args, {
-      origin,
-      stateDirectory: resolveStateDirectory(process.env),
-      identity
-    });
+    const runtime = { origin, stateDirectory: await prepareStateDirectory(process.env) };
+    if (start) {
+      const located = await locateCredential(runtime, "skip");
+      process.stdout.write(renderStart({
+        registration,
+        skillDirectory: packagedSkillDirectory(),
+        accountEmail: located === null ? null : located.credential.account.email
+      }));
+      return;
+    }
+    const result = await executeCommand(args, runtime);
     const evaluationCaseId = args.evaluationCaseId;
     const scopeNext = (data) => ({
       ...data,
@@ -33537,9 +33990,9 @@ async function runCli(identity) {
       ...result.ok && result.command === "status" && result.mode === "product" ? { data: scopeNext(result.data) } : result.ok && result.command === "business" && result.data.action === "start" ? { data: scopeNext(result.data) } : {}
     }) : result;
     if (scoped.ok && welcome) {
-      process.stdout.write(renderWelcome(process.env, process.stdout.columns, process.stdout.getColorDepth()));
+      process.stdout.write(renderWelcome(process.env, process.stdout.columns, process.stdout.getColorDepth(), registration));
     } else {
-      writeResult(markOrigin(scoped, origin), args.json, identity);
+      writeResult(markOrigin(scoped, origin), args.json);
     }
   } catch (error51) {
     if (origin === void 0) {
@@ -33555,7 +34008,14 @@ async function runCli(identity) {
       retryable: false,
       nextAction: "Run the command again or inspect the local CLI installation."
     });
-    writeResult(markOrigin(failureResult(knownError, knownError.command ?? command, mode), origin), json2, identity);
+    const failure2 = failureResult(knownError, knownError.command ?? command, mode);
+    if (failure2.mode !== "test" && failure2.command !== "support" && knownError.code !== "AUTHORIZATION_PENDING") {
+      await prepareStateDirectory(process.env).then((directory) => recordLastError(
+        directory,
+        { code: knownError.code, command: failure2.command }
+      ), () => void 0);
+    }
+    writeResult(markOrigin(failure2, origin), json2);
     process.exitCode = knownError.exitCode;
   } finally {
     closeIdleConnections();
@@ -33563,4 +34023,4 @@ async function runCli(identity) {
 }
 
 // src/obi.ts
-void runCli("obi");
+void runCli();