impel-cli 0.18.7 → 0.18.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.18.7",
+  "version": "0.18.8",
   "description": "Prepare isolated Claude and Codex workspaces for every accessible Impel tenant",
   "type": "module",
   "bin": {

package/src/claudeSetup.js

@@ -10,6 +10,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { IMPEL_MANAGED_MCP_ENV, impelMcpInvocation } from "./selfInvocation.js";
+import { RUNTIME_BRAND } from "./runtimeBrand.js";
 import {
   applyImpelClaudeSandbox,
   captureClaudeSandbox,
@@ -20,9 +21,13 @@ export const CLAUDE_DIR = path.join(os.homedir(), ".claude");
 export const CLAUDE_SETTINGS_PATH = path.join(CLAUDE_DIR, "settings.json");
 export const CLAUDE_USER_CONFIG_PATH = path.join(os.homedir(), ".claude.json");
 
-export const IMPEL_API_KEY_HELPER = "impel token";
-export const IMPEL_MCP_SERVER_NAME = "impel";
-const LEGACY_IMPEL_MCP_SERVER = { type: "stdio", command: "impel", args: ["mcp"] };
+export const IMPEL_API_KEY_HELPER = `${RUNTIME_BRAND.cli.command} token`;
+export const IMPEL_MCP_SERVER_NAME = RUNTIME_BRAND.cli.providerId;
+const LEGACY_IMPEL_MCP_SERVER = {
+  type: "stdio",
+  command: RUNTIME_BRAND.cli.command,
+  args: ["mcp"],
+};
 
 function impelMcpServer() {
   return impelMcpInvocation();

package/src/codexSetup.js

@@ -32,11 +32,12 @@ import os from "node:os";
 import path from "node:path";
 
 import { impelCliInvocation } from "./selfInvocation.js";
+import { RUNTIME_BRAND } from "./runtimeBrand.js";
 
 export const CODEX_HOME = process.env.CODEX_HOME || path.join(os.homedir(), ".codex");
 export const CODEX_CONFIG_PATH = path.join(CODEX_HOME, "config.toml");
 
-export const PROVIDER_ID = "impel";
+export const PROVIDER_ID = RUNTIME_BRAND.cli.providerId;
 
 // Genuine Codex CLI traffic has its own byte-preserving compatibility route.
 // With wire_api = "responses", Codex POSTs to `${base_url}/responses`, so this
@@ -45,8 +46,13 @@ export const PROVIDER_ID = "impel";
 export const CODEX_CLI_BASE_PATH = "/chatgpt_passthrough/backend-api/codex";
 export const impelCodexBaseUrl = (gatewayUrl) => `${gatewayUrl}${CODEX_CLI_BASE_PATH}`;
 
-const START_MARK = `# >>> impel-cli managed block (model_providers.${PROVIDER_ID}) >>>`;
-const END_MARK = `# <<< impel-cli managed block <<<`;
+const START_MARK = `# >>> ${RUNTIME_BRAND.cli.managedMarker} managed block (model_providers.${PROVIDER_ID}) >>>`;
+const END_MARK = `# <<< ${RUNTIME_BRAND.cli.managedMarker} managed block <<<`;
+const escapedProviderId = PROVIDER_ID.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+const FOREIGN_PROVIDER_TABLE_RE = new RegExp(
+  `^(\\[model_providers\\.${escapedProviderId}(\\.|\\])|\\[mcp_servers\\.${escapedProviderId}\\])`,
+  "m",
+);
 
 const PROVIDER_LINE_RE = /^model_provider[ \t]*=[ \t]*"([^"]*)"[ \t]*$/m;
 const NETWORK_TABLE = "sandbox_workspace_write";
@@ -65,12 +71,12 @@ function providerTablesBlock(
   const mcp = impelCliInvocation(["mcp"]);
   return [
     START_MARK,
-    "# Generated by `impel use gateway codex`. Safe to re-run; do not hand-edit",
+    `# Generated by \`${RUNTIME_BRAND.cli.command} use gateway codex\`. Safe to re-run; do not hand-edit`,
     "# the lines between the markers above/below, they'll be overwritten.",
     ...(includeSandboxMode ? ['sandbox_mode = "workspace-write"'] : []),
     ...(includeNetworkAccess ? [`${NETWORK_TABLE}.${NETWORK_KEY} = true`, ""] : []),
     `[model_providers.${PROVIDER_ID}]`,
-    `name = "Impel Gateway"`,
+    `name = ${JSON.stringify(`${RUNTIME_BRAND.product.displayName} Gateway`)}`,
     `base_url = "${baseUrl}"`,
     `wire_api = "responses"`,
     "",
@@ -234,9 +240,7 @@ function stripManagedBlock(text) {
 
 /** True if a `[model_providers.impel` table exists outside of our own managed markers. */
 function hasForeignImpelTable(textWithoutManagedBlock) {
-  return /^(\[model_providers\.impel(\.|\])|\[mcp_servers\.impel\])/m.test(
-    textWithoutManagedBlock
-  );
+  return FOREIGN_PROVIDER_TABLE_RE.test(textWithoutManagedBlock);
 }
 
 /** Reads the current root-level `model_provider` value, or null if unset. */

package/src/commands/doctor.js

@@ -12,6 +12,7 @@ import {
   normalizeTenantId,
   productAccessLabel,
 } from "../tenants.js";
+import { brandedEnvironmentName } from "../runtimeBrand.js";
 
 const HELP = `impel doctor - run synthetic, billable end-to-end gateway checks
 
@@ -159,7 +160,10 @@ export async function cmdDoctor(argv) {
   const gatewayUrl = doctorGatewayUrl(
     flags.gateway !== undefined
       ? flags.gateway
-      : process.env.IMPEL_GATEWAY_URL || config.gatewayUrl || resolveDefaultGateway(),
+      : process.env[brandedEnvironmentName("GATEWAY_URL")]
+        || process.env.IMPEL_GATEWAY_URL
+        || config.gatewayUrl
+        || resolveDefaultGateway(),
   );
   const doctorConfig = { ...config, gatewayUrl };
   const listing = await fetchTenants(config);

package/src/commands/nuke.js

@@ -18,16 +18,18 @@ import { promptText } from "../prompt.js";
 import { appProcessPattern } from "../apps.js";
 import { windowsStableEntrypointRoot } from "../selfInvocation.js";
 import { windowsClaudeUserData } from "../windowsApps.js";
+import { brandedEnvironmentName, RUNTIME_BRAND } from "../runtimeBrand.js";
 
 // Launcher artifacts the CLI may have written into ~/Applications: the
 // tenant-scoped bundles, the pre-v0.8 global bundles, and any interrupted
 // `.tmp-<pid>` staging or `.previous-<pid>` rotation directories they left
 // behind. Anchored so unrelated apps that merely start with "Impel" survive.
-const MANAGED_LAUNCHER_RE = /^Impel (Claude|ChatGPT)(\.app| \()/u;
+const escapedDisplayPrefix = RUNTIME_BRAND.apps.displayPrefix.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+const MANAGED_LAUNCHER_RE = new RegExp(`^${escapedDisplayPrefix} (Claude|ChatGPT)(\\.app| \\()`, "u");
 
 // Every Impel-managed bundle identifier starts with this prefix; the vendor
 // apps use com.anthropic.* / com.openai.* and are never matched.
-const MANAGED_BUNDLE_PREFIX = "com.useimpel.";
+const MANAGED_BUNDLE_PREFIX = `${RUNTIME_BRAND.apps.bundleIdentifierPrefix}.`;
 
 // macOS per-app state locations that accumulate entries keyed by bundle id.
 const MAC_LIBRARY_LOCATIONS = [
@@ -79,9 +81,9 @@ function keychainCandidates(appsRoot) {
     // Cover both app-name eras: the current UA-safe "Impel [tenant] Claude"
     // and the pre-0.17.9 "Impel Claude [tenant]" that may have left an orphaned
     // Keychain item behind.
-    names.add(`Impel [${tenantId}] Claude Safe Storage`);
-    names.add(`Impel Claude [${tenantId}] Safe Storage`);
-    names.add(`Impel ChatGPT [${tenantId}] Safe Storage`);
+    names.add(`${RUNTIME_BRAND.apps.displayPrefix} [${tenantId}] Claude Safe Storage`);
+    names.add(`${RUNTIME_BRAND.apps.displayPrefix} Claude [${tenantId}] Safe Storage`);
+    names.add(`${RUNTIME_BRAND.apps.displayPrefix} ChatGPT [${tenantId}] Safe Storage`);
     const metadataPath = path.join(tenantsRoot, tenantId, "claude", "safe-storage.json");
     try {
       const appName = JSON.parse(fs.readFileSync(metadataPath, "utf8"))?.appName;
@@ -166,7 +168,7 @@ export async function cmdNuke(argv = [], overrides = {}) {
     ...overrides,
   };
 
-  const appsRoot = io.environment.IMPEL_APP_HOME || path.join(io.configDir, "apps");
+  const appsRoot = io.environment[brandedEnvironmentName("APP_HOME")] || path.join(io.configDir, "apps");
   const darwin = io.platform === "darwin";
   const launchers = darwin ? managedLauncherEntries(io.homeDir) : [];
   const libraryRemnants = darwin ? macLibraryRemnants(io.homeDir) : [];
@@ -222,7 +224,7 @@ export async function cmdNuke(argv = [], overrides = {}) {
     // Missing items exit non-zero; that just means there is nothing to remove.
     io.run("/usr/bin/security", ["delete-generic-password", "-s", item]);
   }
-  if (keychainItems.length) io.log(`Cleared ${keychainItems.length} Impel Safe Storage Keychain item${keychainItems.length === 1 ? "" : "s"}.`);
+  if (keychainItems.length) io.log(`Cleared ${keychainItems.length} ${RUNTIME_BRAND.product.displayName} Safe Storage Keychain item${keychainItems.length === 1 ? "" : "s"}.`);
 
   for (const remnant of windowsRemnants) {
     fs.rmSync(remnant, { recursive: true, force: true });

package/src/commands/sessions.js

@@ -16,13 +16,20 @@ import {
 import { loadConfig, redactSecretText } from "../config.js";
 import { impelCliInvocation } from "../selfInvocation.js";
 import { spawnDetachedAppRefresh } from "../updates.js";
+import { brandedEnvironmentName, RUNTIME_BRAND } from "../runtimeBrand.js";
+
+const MANAGED_SESSION_HOOK_FLAG = `${RUNTIME_BRAND.cli.command}-managed-session-hook-v1`;
+
+function environmentValue(suffix) {
+  return process.env[brandedEnvironmentName(suffix)] ?? process.env[`IMPEL_${suffix}`];
+}
 
 const SPEC = {
   provider: { type: "string" },
   surface: { type: "string" },
   tenant: { type: "string" },
   session: { type: "string" },
-  "impel-managed-session-hook-v1": { type: "boolean" },
+  [MANAGED_SESSION_HOOK_FLAG]: { type: "boolean" },
 };
 
 /**
@@ -60,12 +67,12 @@ function startDetachedFlush({ provider, tenant, session }) {
     tenant,
     "--session",
     session,
-    "--impel-managed-session-hook-v1",
+    `--${MANAGED_SESSION_HOOK_FLAG}`,
   ]);
   const child = spawn(invocation.command, invocation.args, {
     detached: true,
     stdio: "ignore",
-    env: { ...process.env, IMPEL_SESSIONS_FLUSH_CHILD: "1" },
+    env: { ...process.env, [brandedEnvironmentName("SESSIONS_FLUSH_CHILD")]: "1" },
     windowsHide: true,
   });
   child.once("error", () => {});
@@ -94,7 +101,7 @@ export async function cmdSessions(argv) {
         flush: false,
       });
       if (flags.provider === "codex") maybeRepairManagedCodexApp(flags.tenant);
-      if (config && (config.tenantId === flags.tenant || process.env.IMPEL_SESSIONS_DEV_ORG_ID)) {
+      if (config && (config.tenantId === flags.tenant || environmentValue("SESSIONS_DEV_ORG_ID"))) {
         // Hooks fire on every session event; only spawn a flush child when no
         // live one is already polling this session's outbox (heartbeat lock).
         const lock = sessionFlushLockPath({
@@ -114,7 +121,7 @@ export async function cmdSessions(argv) {
     } catch (error) {
       // Session persistence is observational. A collector outage must never
       // block a model turn or change a provider hook's decision semantics.
-      if (process.env.IMPEL_SESSIONS_DEBUG === "1") {
+      if (environmentValue("SESSIONS_DEBUG") === "1") {
         console.error(`impel sessions hook: ${redactSecretText(error?.message || error)}`);
       }
     }
@@ -130,7 +137,7 @@ export async function cmdSessions(argv) {
   if (action === "flush") {
     if (!flags.provider || !flags.session || !flags.tenant) return;
     if (!["claude_code", "codex"].includes(flags.provider)) return;
-    if (!config || flags.tenant !== config.tenantId && !process.env.IMPEL_SESSIONS_DEV_ORG_ID) return;
+    if (!config || flags.tenant !== config.tenantId && !environmentValue("SESSIONS_DEV_ORG_ID")) return;
     const lock = sessionFlushLockPath({
       tenantId: flags.tenant,
       provider: flags.provider,

package/src/commands/update.js

@@ -2,14 +2,16 @@
 // reconcile every tenant and managed surface from the live control-plane list.
 
 import fs from "node:fs";
+import path from "node:path";
 import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
 
 import { parseFlags } from "../args.js";
 import { loadConfig, redactSecretText } from "../config.js";
 import { nativeCommandInvocation } from "../nativeProcess.js";
 import { withProgress } from "../progress.js";
 import { runInstallRecovery } from "../installRecovery/engine.js";
+import { brandedText, RUNTIME_BRAND } from "../runtimeBrand.js";
+import { IMPEL_CLI_ENTRYPOINT } from "../selfInvocation.js";
 import {
   fetchRemoteVersion,
   installedVersion,
@@ -19,7 +21,7 @@ import {
   writeUpdateCache,
 } from "../updates.js";
 
-const CLI_BIN = fileURLToPath(new URL("../../bin/impel.js", import.meta.url));
+const CLI_BIN = IMPEL_CLI_ENTRYPOINT;
 
 /**
  * The version now on disk at the package that owns CLI_BIN, read FRESH (never
@@ -28,7 +30,7 @@ const CLI_BIN = fileURLToPath(new URL("../../bin/impel.js", import.meta.url));
  */
 export function postInstallCliVersion() {
   try {
-    const packagePath = fileURLToPath(new URL("../../package.json", import.meta.url));
+    const packagePath = path.resolve(path.dirname(CLI_BIN), "..", "package.json");
     const version = JSON.parse(fs.readFileSync(packagePath, "utf8"))?.version;
     return typeof version === "string" && version.trim() ? version.trim() : null;
   } catch {
@@ -36,7 +38,7 @@ export function postInstallCliVersion() {
   }
 }
 
-const HELP = `impel update - update everything Impel in one command
+const HELP = brandedText(`impel update - update everything Impel in one command
 
 Reinstalls impel-cli from npm, then uses the new build to discover every
 accessible tenant. Missing tenants are installed; existing tenant profiles and
@@ -48,7 +50,7 @@ Usage:
   impel update --skip-apps  Reconcile only isolated CLI profiles
   impel update --skip-clis  Do not install missing vendor CLIs
   impel update --no-recovery  Disable local and hosted recovery for this run
-`;
+`);
 
 function reportProcessFailure(stage, result) {
   if (result?.error) {
@@ -237,14 +239,14 @@ export async function cmdUpdate(argv, overrides = {}) {
                 platform: io.platform,
                 architecture: process.arch,
                 step: "install.impel_cli",
-                command: "npm install --global impel-cli@latest",
-                message: "The npm-verified global impel-cli update failed.",
+                command: `npm install --global ${RUNTIME_BRAND.cli.packageName}@latest`,
+                message: `The npm-verified global ${RUNTIME_BRAND.cli.packageName} update failed.`,
               },
               config,
               goals: [
                 {
                   id: "cli-update",
-                  description: "The global impel-cli npm update completed successfully",
+                  description: `The global ${RUNTIME_BRAND.cli.packageName} npm update completed successfully`,
                   run: () => updateState.ok === true,
                 },
               ],

package/src/extension/index.js

@@ -3,7 +3,25 @@ import path from "node:path";
 import { main as upstreamMain } from "../cli.js";
 import { brandedText, RUNTIME_BRAND, validateRuntimeBrand } from "../runtimeBrand.js";
 
-const ALIASES = Object.freeze({ apps: "app", pats: "pat" });
+const ALIASES = Object.freeze({
+  apps: "app",
+  pats: "pat",
+  task: "tasks",
+  tickets: "tasks",
+  ticket: "tasks",
+  tenants: "tenant",
+  org: "tenant",
+  skill: "skills",
+  agent: "agents",
+  upgrade: "update",
+  on: "use",
+  off: "use",
+});
+
+const HIDDEN_COMMAND_CAPABILITIES = Object.freeze({
+  _converge: "update",
+  "_app-launch": "app",
+});
 
 function help(version) {
   const command = RUNTIME_BRAND.cli.command;
@@ -13,10 +31,20 @@ function help(version) {
   if (enabled.has("setup")) lines.push(`  ${command} setup                         Configure and prepare ${product} CLI/app profiles`);
   if (enabled.has("auth")) lines.push(`  ${command} auth                          Store an existing ${product} PAT`);
   if (enabled.has("pat")) lines.push(`  ${command} pat create|revoke             Mint or revoke a ${product} PAT`);
+  if (enabled.has("tasks")) lines.push(`  ${command} tasks list|get|create|...     Work with ${product} tickets`);
+  if (enabled.has("tenant")) lines.push(`  ${command} tenant list|current|use       Inspect or select an organization`);
   if (enabled.has("app")) lines.push(`  ${command} app install|update|open ...   Manage isolated desktop apps`);
   if (enabled.has("claude")) lines.push(`  ${command} claude [args...]              Launch isolated Claude Code`);
   if (enabled.has("codex")) lines.push(`  ${command} codex [args...]               Launch isolated Codex`);
+  if (enabled.has("mcp")) lines.push(`  ${command} mcp                           Run the authenticated MCP transport`);
+  if (enabled.has("sessions")) lines.push(`  ${command} sessions ...                  Run managed session lifecycle hooks`);
+  if (enabled.has("skills")) lines.push(`  ${command} skills sync [...]             Sync gateway skills into managed clients`);
+  if (enabled.has("agents")) lines.push(`  ${command} agents sync [...]             Sync tenant agents into managed clients`);
   if (enabled.has("status")) lines.push(`  ${command} status                        Show local readiness`);
+  if (enabled.has("doctor")) lines.push(`  ${command} doctor [...]                  Run gateway and provider diagnostics`);
+  if (enabled.has("update")) lines.push(`  ${command} update [...]                  Update the CLI and reconcile tenants`);
+  if (enabled.has("nuke")) lines.push(`  ${command} nuke [--yes]                  Erase all ${product}-managed local state`);
+  if (enabled.has("experimental")) lines.push(`  ${command} experimental ...              Manage gated experimental features`);
   lines.push("", `Version: ${version}`);
   return `${lines.join("\n")}\n`;
 }
@@ -69,8 +97,8 @@ export function createImpelCliExtension({ brand, entrypoint, version }) {
         return;
       }
       const command = ALIASES[rawCommand] || rawCommand;
-      const hiddenAppCommand = rawCommand === "_app-launch";
-      if ((!hiddenAppCommand && !allowed.has(command)) || (hiddenAppCommand && !allowed.has("app"))) {
+      const requiredCapability = HIDDEN_COMMAND_CAPABILITIES[rawCommand] || command;
+      if (!allowed.has(requiredCapability)) {
         process.stderr.write(`${RUNTIME_BRAND.cli.command}: command ${JSON.stringify(rawCommand)} is not available\n`);
         process.exitCode = 1;
         return;

package/src/runtimeBrand.js

@@ -8,7 +8,11 @@ const SAFE_TENANT = /^[A-Za-z0-9_.-]{1,128}$/u;
 const SAFE_PACKAGE = /^(?:@[a-z0-9][a-z0-9._-]{0,62}\/)?[a-z0-9][a-z0-9._-]{0,126}$/u;
 const SAFE_BUNDLE_PREFIX = /^[A-Za-z0-9]+(?:[.-][A-Za-z0-9]+)+$/u;
 const CONTROL_RE = /[\u0000-\u001F\u007F-\u009F]/u;
-const SUPPORTED_COMMANDS = new Set(["setup", "auth", "pat", "app", "claude", "codex", "status", "token"]);
+const SUPPORTED_COMMANDS = new Set([
+  "setup", "auth", "pat", "token", "mcp", "sessions", "claude", "codex",
+  "status", "doctor", "tasks", "tenant", "app", "nuke", "skills", "agents",
+  "update", "use", "experimental",
+]);
 
 const DEFAULT = Object.freeze({
   schemaVersion: 1,
@@ -24,7 +28,9 @@ const DEFAULT = Object.freeze({
   auth: Object.freeze({ patPrefix: "impel_pat_", tenantPrefix: "impel_tenant_" }),
   tenant: Object.freeze({ defaultId: null, displayName: null }),
   gateway: Object.freeze({ defaultOrigin: "https://gateway.useimpel.com" }),
+  sessions: Object.freeze({ defaultOrigin: "https://sessions.useimpel.com" }),
   controlPlane: Object.freeze({ defaultOrigin: "https://www.useimpel.com" }),
+  updates: Object.freeze({ registry: null }),
   apps: Object.freeze({
     displayPrefix: "Impel",
     bundleIdentifierPrefix: "com.useimpel",
@@ -51,6 +57,15 @@ function origin(name, value) {
   return parsed.toString().replace(/\/$/u, "");
 }
 
+function registryUrl(name, value) {
+  const parsed = new URL(text(name, value));
+  const local = parsed.protocol === "http:" && ["localhost", "127.0.0.1", "[::1]"].includes(parsed.hostname);
+  if ((parsed.protocol !== "https:" && !local) || parsed.username || parsed.password || parsed.search || parsed.hash) {
+    throw new Error(`impel-cli runtime brand ${name} must be an HTTPS registry URL`);
+  }
+  return parsed.toString().replace(/\/+$/u, "");
+}
+
 function pathSegment(name, value) {
   const result = text(name, value);
   if (result === "." || result === ".." || /[\\/:]/u.test(result)) {
@@ -98,7 +113,18 @@ export function validateRuntimeBrand(input) {
       displayName: input.tenant?.displayName == null ? defaultTenant : text("tenant.displayName", input.tenant.displayName),
     }),
     gateway: Object.freeze({ defaultOrigin: origin("gateway.defaultOrigin", input.gateway?.defaultOrigin) }),
+    sessions: Object.freeze({
+      defaultOrigin: origin(
+        "sessions.defaultOrigin",
+        input.sessions?.defaultOrigin || input.gateway?.defaultOrigin,
+      ),
+    }),
     controlPlane: Object.freeze({ defaultOrigin: origin("controlPlane.defaultOrigin", input.controlPlane?.defaultOrigin) }),
+    updates: Object.freeze({
+      registry: input.updates?.registry == null
+        ? null
+        : registryUrl("updates.registry", input.updates.registry),
+    }),
     apps: Object.freeze({
       displayPrefix: pathSegment("apps.displayPrefix", input.apps?.displayPrefix || input.product?.displayName),
       bundleIdentifierPrefix: text("apps.bundleIdentifierPrefix", input.apps?.bundleIdentifierPrefix, SAFE_BUNDLE_PREFIX),

package/src/selfInvocation.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { environmentValue } from "./nativeProcess.js";
-import { RUNTIME_BRAND } from "./runtimeBrand.js";
+import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
 
 /** The running package's own bin script, used directly for live child spawns. */
 export const IMPEL_CLI_ENTRYPOINT = process.env.IMPEL_CLI_EXTENSION_ENTRYPOINT
@@ -64,7 +64,7 @@ export function impelCliInvocation(args = [], options = {}) {
   };
 }
 
-export const IMPEL_MANAGED_MCP_ENV = "IMPEL_MANAGED_MCP";
+export const IMPEL_MANAGED_MCP_ENV = brandedEnvironmentName("MANAGED_MCP");
 
 export function impelMcpInvocation(args = [], options = {}) {
   return {

package/src/sessionCollector.js

@@ -6,8 +6,9 @@ import { spawnSync } from "node:child_process";
 import * as zlib from "node:zlib";
 
 import { CONFIG_DIR, loadConfig, redactCredentialText, redactSecretText } from "./config.js";
+import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
 
-export const DEFAULT_SESSIONS_URL = "https://sessions.useimpel.com";
+export const DEFAULT_SESSIONS_URL = RUNTIME_BRAND.sessions.defaultOrigin;
 const MAX_HOOK_INPUT_BYTES = 2 * 1024 * 1024;
 const MAX_LEDGER_PAYLOAD_BYTES = 256 * 1024;
 const TRANSCRIPT_CHUNK_BYTES = 512 * 1024;
@@ -22,8 +23,14 @@ const DIRECT_UPLOAD_TIMEOUT_MS = 30_000;
 const SAFE_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,255}$/u;
 const TASK_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/u;
 
+function brandedEnvironmentValue(suffix) {
+  const branded = process.env[brandedEnvironmentName(suffix)];
+  if (branded !== undefined) return branded;
+  return process.env[`IMPEL_${suffix}`];
+}
+
 function stateRoot() {
-  return process.env.IMPEL_SESSIONS_STATE_DIR || path.join(CONFIG_DIR, "sessions");
+  return brandedEnvironmentValue("SESSIONS_STATE_DIR") || path.join(CONFIG_DIR, "sessions");
 }
 
 function sha256(value) {
@@ -195,7 +202,7 @@ function acquireLock(root, name, staleMs = 60_000) {
 }
 
 function providerRoots(provider) {
-  const roots = [process.env.IMPEL_SESSION_TRANSCRIPT_ROOT];
+  const roots = [brandedEnvironmentValue("SESSION_TRANSCRIPT_ROOT")];
   if (provider === "claude_code") roots.push(process.env.CLAUDE_CONFIG_DIR, path.join(os.homedir(), ".claude"));
   else roots.push(process.env.CODEX_HOME, path.join(os.homedir(), ".codex"));
   return roots.filter(Boolean).map((candidate) => {
@@ -372,8 +379,8 @@ function enforceOutboxLimits(root) {
     return { dropped: 0, pending: pendingDirectories(root).length, bytes: null, deferred: true };
   }
   try {
-    const maximumBytes = positiveIntegerEnvironment("IMPEL_SESSIONS_MAX_OUTBOX_BYTES", DEFAULT_MAX_OUTBOX_BYTES);
-    const maximumBatches = positiveIntegerEnvironment("IMPEL_SESSIONS_MAX_OUTBOX_BATCHES", DEFAULT_MAX_OUTBOX_BATCHES);
+    const maximumBytes = positiveIntegerEnvironment(brandedEnvironmentName("SESSIONS_MAX_OUTBOX_BYTES"), DEFAULT_MAX_OUTBOX_BYTES);
+    const maximumBatches = positiveIntegerEnvironment(brandedEnvironmentName("SESSIONS_MAX_OUTBOX_BATCHES"), DEFAULT_MAX_OUTBOX_BATCHES);
     const directories = pendingDirectories(root);
     let bytes = directories.reduce((total, directory) => total + batchDirectoryBytes(directory), 0);
     let count = directories.length;
@@ -503,7 +510,11 @@ function repositoryMetadata(cwd) {
 }
 
 function sessionsUrl(config) {
-  return String(process.env.IMPEL_SESSIONS_URL || config?.sessionsUrl || DEFAULT_SESSIONS_URL).trim().replace(/\/+$/u, "");
+  return String(
+    brandedEnvironmentValue("SESSIONS_URL")
+      || config?.sessionsUrl
+      || DEFAULT_SESSIONS_URL,
+  ).trim().replace(/\/+$/u, "");
 }
 
 function problemCode(body) {
@@ -516,16 +527,16 @@ function problemMessage(body) {
 
 function requestHeaders(config, tenantId, extra = {}) {
   const headers = { accept: "application/json", ...extra };
-  const devOrg = process.env.IMPEL_SESSIONS_DEV_ORG_ID;
+  const devOrg = brandedEnvironmentValue("SESSIONS_DEV_ORG_ID");
   if (devOrg) {
     headers["x-impel-dev-org-id"] = devOrg;
-    headers["x-impel-dev-user-id"] = process.env.IMPEL_SESSIONS_DEV_USER_ID || "impel-cli-smoke";
+    headers["x-impel-dev-user-id"] = brandedEnvironmentValue("SESSIONS_DEV_USER_ID") || `${RUNTIME_BRAND.cli.command}-cli-smoke`;
   } else {
     if (!config?.pat) throw new Error("Impel authentication is unavailable");
     headers.authorization = `Bearer ${config.pat}`;
     headers["x-impel-org-id"] = tenantId;
   }
-  const bypass = process.env.IMPEL_SESSIONS_VERCEL_BYPASS_TOKEN;
+  const bypass = brandedEnvironmentValue("SESSIONS_VERCEL_BYPASS_TOKEN");
   if (bypass) headers["x-vercel-protection-bypass"] = bypass;
   return headers;
 }
@@ -558,7 +569,7 @@ async function apiRequest(config, tenantId, route, options = {}) {
 }
 
 function compressZstd(payload) {
-  if (process.env.IMPEL_SESSIONS_DISABLE_DIRECT_UPLOAD === "1") return null;
+  if (brandedEnvironmentValue("SESSIONS_DISABLE_DIRECT_UPLOAD") === "1") return null;
   if (typeof zlib.zstdCompressSync !== "function") return null;
   const level = zlib.constants?.ZSTD_c_compressionLevel;
   const windowLog = zlib.constants?.ZSTD_c_windowLog;
@@ -938,8 +949,9 @@ export async function collectSessionHook({ provider, surface, tenantId, input, c
   if (!SAFE_ID_RE.test(surface)) throw new Error("Invalid session surface");
   const sessionKey = String(input?.session_id || "").trim();
   if (!sessionKey || sessionKey.length > 512 || /[\r\n\0]/u.test(sessionKey)) throw new Error("Hook input has no valid session_id");
-  const taskId = String(process.env.IMPEL_TASK_ID || "").trim();
-  if (taskId && !TASK_ID_RE.test(taskId)) throw new Error("IMPEL_TASK_ID is invalid");
+  const taskIdEnvironment = brandedEnvironmentName("TASK_ID");
+  const taskId = String(brandedEnvironmentValue("TASK_ID") || "").trim();
+  if (taskId && !TASK_ID_RE.test(taskId)) throw new Error(`${taskIdEnvironment} is invalid`);
   const sessionMeta = {
     provider,
     surface,
@@ -960,7 +972,7 @@ export async function collectSessionHook({ provider, surface, tenantId, input, c
     }
   }
   const limits = enforceOutboxLimits(root);
-  const selectedTenant = process.env.IMPEL_SESSIONS_DEV_ORG_ID || config?.tenantId === tenantId;
+  const selectedTenant = brandedEnvironmentValue("SESSIONS_DEV_ORG_ID") || config?.tenantId === tenantId;
   if (flush && config && selectedTenant) return flushCollectedSession({ tenantId, provider, sessionKey, config });
   return {
     flushed: 0,

package/src/sessionHooks.js

@@ -3,10 +3,11 @@ import crypto from "node:crypto";
 import path from "node:path";
 
 import { impelCliInvocation } from "./selfInvocation.js";
+import { RUNTIME_BRAND } from "./runtimeBrand.js";
 
-const MANAGED_MARKER = "--impel-managed-session-hook-v1";
-const CODEX_TRUST_START = "# >>> impel managed session hook trust >>>";
-const CODEX_TRUST_END = "# <<< impel managed session hook trust <<<";
+const MANAGED_MARKER = `--${RUNTIME_BRAND.cli.command}-managed-session-hook-v1`;
+const CODEX_TRUST_START = `# >>> ${RUNTIME_BRAND.product.id} managed session hook trust >>>`;
+const CODEX_TRUST_END = `# <<< ${RUNTIME_BRAND.product.id} managed session hook trust <<<`;
 
 export const CLAUDE_SESSION_EVENTS = Object.freeze([
   "SessionStart",

package/src/updates.js

@@ -9,26 +9,31 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import { spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
+import { spawn, spawnSync } from "node:child_process";
 
 import { CONFIG_DIR } from "./config.js";
+import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
+import { IMPEL_CLI_ENTRYPOINT } from "./selfInvocation.js";
+import { nativeCommandInvocation } from "./nativeProcess.js";
 import { renameWithWindowsRetry } from "./windowsFs.js";
 
 export const UPDATE_CACHE_PATH = path.join(CONFIG_DIR, "update-check.json");
 export const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 
-const CLI_ROOT = fileURLToPath(new URL("..", import.meta.url));
-const DEFAULT_UPDATE_PACKAGE = "impel-cli";
+const CLI_ROOT = path.resolve(path.dirname(IMPEL_CLI_ENTRYPOINT), "..");
 const DEFAULT_UPDATE_REGISTRY = "https://registry.npmjs.org";
 const VERSION_RE = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/u;
 
 export function updatePackage() {
-  return process.env.IMPEL_UPDATE_PACKAGE || DEFAULT_UPDATE_PACKAGE;
+  return process.env[brandedEnvironmentName("UPDATE_PACKAGE")] || RUNTIME_BRAND.cli.packageName;
 }
 
 export function updateRegistry() {
-  return String(process.env.IMPEL_UPDATE_REGISTRY || DEFAULT_UPDATE_REGISTRY).replace(/\/+$/u, "");
+  return String(
+    process.env[brandedEnvironmentName("UPDATE_REGISTRY")]
+      || RUNTIME_BRAND.updates.registry
+      || DEFAULT_UPDATE_REGISTRY,
+  ).replace(/\/+$/u, "");
 }
 
 export function updateInstallSpec() {
@@ -80,18 +85,65 @@ export function isNewerVersion(candidate, current) {
   return false;
 }
 
-/** Read the latest published version from npm's registry metadata. */
+function fetchRemoteVersionWithNpm({
+  packageName,
+  registry,
+  timeoutMs,
+  spawnSyncImpl = spawnSync,
+  environment = process.env,
+  platform = process.platform,
+}) {
+  try {
+    const invocation = nativeCommandInvocation(
+      "npm",
+      ["view", packageName, "version", "--json", "--registry", registry],
+      environment,
+      platform,
+    );
+    const result = spawnSyncImpl(invocation.command, invocation.args, {
+      encoding: "utf8",
+      env: environment,
+      timeout: timeoutMs,
+      windowsHide: true,
+      windowsVerbatimArguments: invocation.windowsVerbatimArguments,
+    });
+    if (result.status !== 0 || result.error) return null;
+    const raw = String(result.stdout || "").trim();
+    let version;
+    try { version = JSON.parse(raw); }
+    catch { version = raw; }
+    return validVersion(version) ? version : null;
+  } catch {
+    return null;
+  }
+}
+
+/** Read the latest published version from npm registry metadata. */
 export async function fetchRemoteVersion({
   packageName = updatePackage(),
   registry = updateRegistry(),
   timeoutMs = 10_000,
-  fetchImpl = globalThis.fetch,
+  fetchImpl = null,
+  spawnSyncImpl = spawnSync,
+  environment = process.env,
+  platform = process.platform,
 } = {}) {
+  const normalizedRegistry = String(registry).replace(/\/+$/u, "");
+  if (!fetchImpl && normalizedRegistry !== DEFAULT_UPDATE_REGISTRY) {
+    return fetchRemoteVersionWithNpm({
+      packageName,
+      registry: normalizedRegistry,
+      timeoutMs,
+      spawnSyncImpl,
+      environment,
+      platform,
+    });
+  }
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   try {
     const encodedName = encodeURIComponent(packageName);
-    const response = await fetchImpl(`${String(registry).replace(/\/+$/u, "")}/${encodedName}/latest`, {
+    const response = await (fetchImpl || globalThis.fetch)(`${normalizedRegistry}/${encodedName}/latest`, {
       headers: { accept: "application/json" },
       signal: controller.signal,
     });
@@ -162,7 +214,7 @@ export async function refreshUpdateCache(dependencies = {}) {
 export function updateNoticeLine({ cache = readUpdateCache(), current = installedVersion() } = {}) {
   const remote = cache?.remoteVersion;
   if (!isNewerVersion(remote, current)) return null;
-  return `impel-cli update available (v${current} → v${remote}): run \`impel update\``;
+  return `${RUNTIME_BRAND.cli.packageName} update available (v${current} → v${remote}): run \`${RUNTIME_BRAND.cli.command} update\``;
 }
 
 /**
@@ -198,7 +250,7 @@ export function spawnDetachedAppRefresh(tenantId = null) {
 
 function spawnDetached(args) {
   try {
-    const child = spawn(process.execPath, [path.join(CLI_ROOT, "bin", "impel.js"), ...args], {
+    const child = spawn(process.execPath, [IMPEL_CLI_ENTRYPOINT, ...args], {
       detached: true,
       stdio: "ignore",
       // Windows: a detached console-subsystem child gets its OWN console — a