@opencow-ai/opencow-agent-sdk 0.4.25 → 0.4.27

package/dist/client.js

@@ -19269,6 +19269,7 @@ var init_envVars = __esm(() => {
     DISABLE_EARLY_INPUT: envVar("OPENCOW_DISABLE_EARLY_INPUT"),
     ENABLE_EXTENDED_KEYS: envVar("OPENCOW_ENABLE_EXTENDED_KEYS"),
     ENABLE_STREAM_WATCHDOG: envVar("OPENCOW_ENABLE_STREAM_WATCHDOG"),
+    SKILL_LISTING: envVar("OPENCOW_SKILL_LISTING"),
     STREAM_IDLE_TIMEOUT_MS: envVar("OPENCOW_STREAM_IDLE_TIMEOUT_MS"),
     UNBOUNDED_CONNECTION_RETRY: envVar("OPENCOW_UNBOUNDED_CONNECTION_RETRY"),
     STREAM_REPLAY_RETRIES: envVar("OPENCOW_STREAM_REPLAY_RETRIES"),
@@ -19277,21 +19278,49 @@ var init_envVars = __esm(() => {
 });
 
 // src/session/brandingConfig.ts
+function toProductSlug(value) {
+  const slug = value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return slug || PRODUCT_SLUG_FALLBACK;
+}
 function normalizeBrandName(value, fallback) {
   const normalized = value?.replace(/[\u0000-\u001f\u007f]+/g, " ").replace(/\s+/g, " ").trim();
   return normalized ? normalized.slice(0, 80) : fallback;
 }
+function optionalUrl(key, value) {
+  const trimmed = value?.trim();
+  return trimmed ? { [key]: trimmed } : {};
+}
+function validatedProductUrl(value) {
+  const trimmed = value?.trim();
+  if (!trimmed)
+    return {};
+  let protocol;
+  try {
+    protocol = new URL(trimmed).protocol;
+  } catch {
+    throw new TypeError(`branding.productUrl is not a valid URL: ${trimmed}`);
+  }
+  if (protocol !== "https:" && protocol !== "http:" || /[^\x21-\x7e]/.test(trimmed)) {
+    throw new TypeError(`branding.productUrl must be an ASCII http(s) URL: ${trimmed}`);
+  }
+  return { productUrl: trimmed };
+}
 function resolveBranding(options) {
   const productName = normalizeBrandName(options?.productName, DEFAULT_BRANDING.productName);
+  const explicitSlug = options?.productSlug?.trim();
   return Object.freeze({
     productName,
-    assistantName: normalizeBrandName(options?.assistantName, productName)
+    productSlug: toProductSlug(explicitSlug || productName),
+    assistantName: normalizeBrandName(options?.assistantName, productName),
+    ...optionalUrl("mcpOAuthClientMetadataUrl", options?.mcpOAuthClientMetadataUrl),
+    ...validatedProductUrl(options?.productUrl)
   });
 }
-var DEFAULT_BRANDING;
+var DEFAULT_BRANDING, PRODUCT_SLUG_FALLBACK = "app";
 var init_brandingConfig = __esm(() => {
   DEFAULT_BRANDING = Object.freeze({
     productName: "Agentic",
+    productSlug: "agentic",
     assistantName: "Agentic"
   });
 });
@@ -19308,12 +19337,17 @@ function getAssistantIdentityPrompt() {
   return `You are ${getBranding().assistantName}, an agentic coding assistant.`;
 }
 function getMcpClientInfo() {
-  const { productName } = getBranding();
+  const { productName, productSlug, productUrl } = getBranding();
   return {
+    name: productSlug,
     title: `${productName} Coding Client`,
-    description: `${productName} agentic coding client`
+    description: `${productName} agentic coding client`,
+    ...productUrl ? { websiteUrl: productUrl } : {}
   };
 }
+function getProductUserAgentToken() {
+  return getBranding().productSlug;
+}
 var brandingStorage;
 var init_branding = __esm(() => {
   init_brandingConfig();
@@ -19543,6 +19577,12 @@ var init_paths = __esm(() => {
 });
 
 // src/session/layout/LayoutProfile.ts
+var exports_LayoutProfile = {};
+__export(exports_LayoutProfile, {
+  DEFAULT_LAYOUT_PROFILE: () => DEFAULT_LAYOUT_PROFILE,
+  resolveBinding: () => resolveBinding,
+  resolveLayoutProfile: () => resolveLayoutProfile
+});
 function resolveBinding(binding) {
   if (typeof binding === "string") {
     return BUILT_IN_BINDINGS[binding];
@@ -27244,6 +27284,11 @@ var init_platform = __esm(() => {
 });
 
 // src/session/settings/managedPath.ts
+var exports_managedPath = {};
+__export(exports_managedPath, {
+  getManagedFilePath: () => getManagedFilePath,
+  getManagedSettingsDropInDir: () => getManagedSettingsDropInDir
+});
 import { join as join5 } from "path";
 var getManagedFilePath, getManagedSettingsDropInDir;
 var init_managedPath = __esm(() => {
@@ -35391,7 +35436,7 @@ function getOauthConfig() {
   }
   return config;
 }
-var CLAUDE_AI_INFERENCE_SCOPE = "user:inference", CLAUDE_AI_PROFILE_SCOPE = "user:profile", CONSOLE_SCOPE = "org:create_api_key", OAUTH_BETA_HEADER = "oauth-2025-04-20", CONSOLE_OAUTH_SCOPES, CLAUDE_AI_OAUTH_SCOPES, ALL_OAUTH_SCOPES, PROD_OAUTH_CONFIG, MCP_CLIENT_METADATA_URL = "https://claude.ai/oauth/claude-code-client-metadata", STAGING_OAUTH_CONFIG, ALLOWED_OAUTH_BASE_URLS;
+var CLAUDE_AI_INFERENCE_SCOPE = "user:inference", CLAUDE_AI_PROFILE_SCOPE = "user:profile", CONSOLE_SCOPE = "org:create_api_key", OAUTH_BETA_HEADER = "oauth-2025-04-20", CONSOLE_OAUTH_SCOPES, CLAUDE_AI_OAUTH_SCOPES, ALL_OAUTH_SCOPES, PROD_OAUTH_CONFIG, STAGING_OAUTH_CONFIG, ALLOWED_OAUTH_BASE_URLS;
 var init_oauth = __esm(() => {
   init_envUtils();
   init_envVars();
@@ -38526,6 +38571,7 @@ var init_git = __esm(() => {
   init_log2();
   init_memoize2();
   init_which();
+  init_branding();
   GIT_ROOT_NOT_FOUND = Symbol("git-root-not-found");
   findGitRootImpl = memoizeWithLRU((startPath) => {
     const startTime = Date.now();
@@ -39816,7 +39862,8 @@ var init_types4 = __esm(() => {
     type: literal("stdio").optional(),
     command: string2().min(1, "Command cannot be empty"),
     args: array(string2()).default([]),
-    env: record(string2(), string2()).optional()
+    env: record(string2(), string2()).optional(),
+    cwd: string2().optional()
   }));
   McpXaaConfigSchema = lazySchema(() => boolean2());
   McpOAuthConfigSchema = lazySchema(() => object2({
@@ -40753,7 +40800,7 @@ var init_types5 = __esm(() => {
     allow: array(PermissionRuleSchema()).optional().describe("List of permission rules for allowed operations"),
     deny: array(PermissionRuleSchema()).optional().describe("List of permission rules for denied operations"),
     ask: array(PermissionRuleSchema()).optional().describe("List of permission rules that should always prompt for confirmation"),
-    defaultMode: _enum(EXTERNAL_PERMISSION_MODES).optional().describe("Default permission mode when Claude Code needs access"),
+    defaultMode: _enum(EXTERNAL_PERMISSION_MODES).optional().describe("Default permission mode when the agent needs access"),
     disableBypassPermissionsMode: _enum(["disable"]).optional().describe("Disable the ability to bypass permission prompts"),
     ...{},
     additionalDirectories: array(string2()).optional().describe("Additional directories to include in the permission scope")
@@ -40798,7 +40845,7 @@ var init_types5 = __esm(() => {
     "mcp"
   ];
   SettingsSchema = lazySchema(() => object2({
-    $schema: literal(CLAUDE_CODE_SETTINGS_SCHEMA_URL).optional().describe("JSON Schema reference for Claude Code settings"),
+    $schema: literal(CLAUDE_CODE_SETTINGS_SCHEMA_URL).optional().describe("JSON Schema reference for settings"),
     apiKeyHelper: string2().optional().describe("Path to a script that outputs authentication values"),
     awsCredentialExport: string2().optional().describe("Path to a script that exports AWS credentials"),
     awsAuthRefresh: string2().optional().describe("Path to a script that refreshes AWS authentication"),
@@ -40806,7 +40853,7 @@ var init_types5 = __esm(() => {
     ...isEnvTruthy(resolveEnvVar("ENABLE_XAA")) ? {
       xaaIdp: object2({
         issuer: string2().url().describe("IdP issuer URL for OIDC discovery"),
-        clientId: string2().describe("Claude Code's client_id registered at the IdP"),
+        clientId: string2().describe("The client_id registered at the IdP"),
         callbackPort: number2().int().positive().optional().describe("Fixed loopback callback port for the IdP OIDC login. " + "Only needed if the IdP does not honor RFC 8252 port-any matching.")
       }).optional().describe("XAA (SEP-990) IdP connection. Configure once; all XAA-enabled MCP servers reuse this.")
     } : {},
@@ -40816,10 +40863,10 @@ var init_types5 = __esm(() => {
     }).optional().describe("Custom file suggestion configuration for @ mentions"),
     respectGitignore: boolean2().optional().describe("Whether file picker should respect .gitignore files (default: true). " + "Note: .ignore files are always respected."),
     cleanupPeriodDays: number2().nonnegative().int().optional().describe("Number of days to retain chat transcripts (default: 30). Setting to 0 disables session persistence entirely: no transcripts are written and existing transcripts are deleted at startup."),
-    env: EnvironmentVariablesSchema().optional().describe("Environment variables to set for Claude Code sessions"),
+    env: EnvironmentVariablesSchema().optional().describe("Environment variables to set for agent sessions"),
     includeGitInstructions: boolean2().optional().describe("Include built-in commit and PR workflow instructions in Claude's system prompt (default: true)"),
     permissions: PermissionsSchema().optional().describe("Tool usage permissions configuration"),
-    model: string2().optional().describe("Override the default model used by Claude Code"),
+    model: string2().optional().describe("Override the default model used by the agent"),
     availableModels: array(string2()).optional().describe("Allowlist of models that users can select. " + 'Accepts family aliases ("opus" allows any opus version), ' + 'version prefixes ("opus-4-5" allows only that version), ' + "and full model IDs. " + "If undefined, all models are available. If empty array, only the default model is available. " + "Typically set in managed settings by enterprise administrators."),
     modelOverrides: record(string2(), string2()).optional().describe('Override mapping from Anthropic model ID (e.g. "claude-opus-4-6") to provider-specific ' + "model ID (e.g. a Bedrock inference profile ARN). Typically set in managed settings by " + "enterprise administrators."),
     enableAllProjectMcpServers: boolean2().optional().describe("Whether to automatically approve all MCP servers in the project"),
@@ -63644,11 +63691,6 @@ function parseAnthropicStreamChunk(chunk) {
   return [chunk];
 }
 
-// src/providers/shared/userAgent.ts
-function getClaudeCodeUserAgent() {
-  return `claude-code/${"99.0.0"}`;
-}
-
 // src/session/workloadContext.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 function getWorkload() {
@@ -63680,17 +63722,19 @@ function getMCPUserAgent() {
     parts.push(`client-app/${process.env.CLAUDE_AGENT_SDK_CLIENT_APP}`);
   }
   const suffix = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-  return `claude-code/${"99.0.0"}${suffix}`;
+  return `${getProductUserAgentToken()}/${"99.0.0"}${suffix}`;
 }
 function getWebFetchUserAgent() {
-  const supportUrl = isFamily(getProvider(), "firstParty") ? "https://support.anthropic.com/" : "https://github.com/Gitlawb/opencow";
-  return `Claude-User (${getClaudeCodeUserAgent()}; +${supportUrl})`;
+  const { productSlug, productUrl } = getBranding();
+  const contact = productUrl ? `; +${productUrl}` : "";
+  return `${productSlug}-User (${productSlug}/${"99.0.0"}${contact})`;
 }
 var init_http2 = __esm(() => {
   init_oauth();
   init_auth();
   init_state2();
   init_workloadContext();
+  init_branding();
 });
 
 // src/providers/shared/model/providers.ts
@@ -90142,8 +90186,8 @@ function createBootQueryContext() {
   }
   const sessionId = randomUUID();
   init_paths();
-  init_LayoutProfile();
-  init_managedPath();
+  const { DEFAULT_LAYOUT_PROFILE } = (init_LayoutProfile(), __toCommonJS(exports_LayoutProfile));
+  const { getManagedFilePath } = (init_managedPath(), __toCommonJS(exports_managedPath));
   const { homedir } = __require("node:os");
   const bootConfigHomeDir = process.env.CLAUDE_CONFIG_DIR ? process.env.CLAUDE_CONFIG_DIR.normalize("NFC") : (homedir() + "/.opencow").normalize("NFC");
   const bootMemoryBaseDir = resolveEnvVar("REMOTE_MEMORY_DIR") ?? bootConfigHomeDir;
@@ -90248,6 +90292,7 @@ function createBootQueryContext() {
         loaded: createSignal()
       },
       pluginDataPaths: new Map,
+      pluginContentVariables: {},
       lspManager: null
     },
     diagnostics: createFreshDiagnostics(),
@@ -90339,6 +90384,7 @@ function deriveSubagentRegistries(parent) {
     skillListingSuppressNext: false,
     dynamicSkills: parent.dynamicSkills,
     pluginDataPaths: parent.pluginDataPaths,
+    pluginContentVariables: parent.pluginContentVariables,
     lspManager: parent.lspManager
   };
 }
@@ -90491,7 +90537,7 @@ function buildQueryContextFromSdk(options) {
   const memoryBaseDir = resolveEnvVar("REMOTE_MEMORY_DIR") ?? configHomeDir;
   const autoMemEnvOverride = resolveEnvVar("MEMORY_PATH_OVERRIDE");
   const autoMemSettingsOverride = resolvedFileSystemLayer === "disabled" ? undefined : readAutoMemSettingsOverride();
-  init_managedPath();
+  const { getManagedFilePath } = (init_managedPath(), __toCommonJS(exports_managedPath));
   const paths = computeSessionPaths({
     cwd,
     projectRoot: cwd,
@@ -90594,6 +90640,7 @@ function buildQueryContextFromSdk(options) {
         loaded: createSignal()
       },
       pluginDataPaths: new Map,
+      pluginContentVariables: {},
       lspManager: null
     },
     diagnostics: createFreshDiagnostics(),
@@ -91108,11 +91155,22 @@ function resetSdkInitState() {
   r.initJsonSchema = null;
   r.registeredHooks = null;
 }
-function setExplicitPluginRuntimeContext(dataPaths, lspManager) {
+function setExplicitPluginRuntimeContext(dataPaths, lspManager, contentVariables) {
   const registries = getQueryContext().registries;
   registries.pluginDataPaths = new Map(dataPaths);
+  registries.pluginContentVariables = { ...contentVariables };
   registries.lspManager = lspManager;
 }
+function setExplicitPluginRuntimeBundle(bundle) {
+  setExplicitPluginRuntimeContext(bundle.dataPaths, bundle.lspManager, bundle.contentVariables ?? {});
+}
+function tryGetPluginContentVariables() {
+  try {
+    return getQueryContext().registries.pluginContentVariables;
+  } catch {
+    return {};
+  }
+}
 function tryGetExplicitPluginDataPath(pluginId) {
   try {
     return getQueryContext().registries.pluginDataPaths.get(pluginId);
@@ -91578,6 +91636,7 @@ __export(exports_state, {
   setCwdState: () => setCwdState2,
   setDirectConnectServerUrl: () => setDirectConnectServerUrl,
   setEnvVar: () => setEnvVar,
+  setExplicitPluginRuntimeBundle: () => setExplicitPluginRuntimeBundle,
   setExplicitPluginRuntimeContext: () => setExplicitPluginRuntimeContext,
   setFastModeHeaderLatched: () => setFastModeHeaderLatched2,
   setFlagSettingsInline: () => setFlagSettingsInline,
@@ -91614,6 +91673,7 @@ __export(exports_state, {
   snapshotOutputTokensForTurn: () => snapshotOutputTokensForTurn,
   switchSession: () => switchSession,
   tryGetExplicitPluginDataPath: () => tryGetExplicitPluginDataPath,
+  tryGetPluginContentVariables: () => tryGetPluginContentVariables,
   tryGetQueryContext: () => tryGetQueryContext,
   tryGetSessionLspManager: () => tryGetSessionLspManager,
   unregisterCreatedTeam: () => unregisterCreatedTeam
@@ -107254,6 +107314,7 @@ var init_TaskOutput = __esm(() => {
   init_stringUtils();
   init_diskOutput();
   init_fsOperations();
+  init_branding();
   DEFAULT_MAX_MEMORY = 8 * 1024 * 1024;
   TaskOutput = class TaskOutput {
     taskId;
@@ -107441,7 +107502,7 @@ Output truncated (${sizeKB}KB total). Full output saved to: ${this.path}`;
       } catch (err) {
         const code = err instanceof Error && "code" in err ? String(err.code) : "unknown";
         logForDebugging(`TaskOutput.#readStdoutFromFile: failed to read ${this.path} (${code}): ${err}`);
-        return `<bash output unavailable: output file ${this.path} could not be read (${code}). This usually means another Claude Code process in the same project deleted it during startup cleanup.>`;
+        return `<bash output unavailable: output file ${this.path} could not be read (${code}). This usually means another ${getBranding().productName} process in the same project deleted it during startup cleanup.>`;
       }
     }
     getStderr() {
@@ -113082,6 +113143,11 @@ function substitutePluginVariables(value, plugin) {
   }
   return out;
 }
+function substitutePluginContentVariables(value, variables = tryGetPluginContentVariables()) {
+  if (Object.keys(variables).length === 0)
+    return value;
+  return value.replace(/\$\{([A-Z][A-Z0-9_]*)\}/g, (match, name) => Object.hasOwn(variables, name) ? variables[name] : match);
+}
 function substituteUserConfigVariables(value, userConfig) {
   return value.replace(/\$\{user_config\.([^}]+)\}/g, (_match, key) => {
     const configValue = userConfig[key];
@@ -122419,7 +122485,7 @@ function getErrorMessageIfRefusal(stopReason, model) {
   }
   logEvent("tengu_refusal_api_response", {});
   const usagePolicyUrl = isFamily(getProvider(), "firstParty") ? "https://www.anthropic.com/legal/aup" : "your provider's acceptable use policy";
-  const baseMessage = getIsNonInteractiveSession() ? `${API_ERROR_MESSAGE_PREFIX}: Claude Code is unable to respond to this request, which appears to violate our Usage Policy (${usagePolicyUrl}). Try rephrasing the request or attempting a different approach.` : `${API_ERROR_MESSAGE_PREFIX}: Claude Code is unable to respond to this request, which appears to violate our Usage Policy (${usagePolicyUrl}). Please double press esc to edit your last message or start a new session for Claude Code to assist with a different task.`;
+  const baseMessage = getIsNonInteractiveSession() ? `${API_ERROR_MESSAGE_PREFIX}: ${getBranding().productName} is unable to respond to this request, which appears to violate our Usage Policy (${usagePolicyUrl}). Try rephrasing the request or attempting a different approach.` : `${API_ERROR_MESSAGE_PREFIX}: ${getBranding().productName} is unable to respond to this request, which appears to violate our Usage Policy (${usagePolicyUrl}). Please double press esc to edit your last message or start a new session for ${getBranding().productName} to assist with a different task.`;
   const modelSuggestion = model !== "claude-sonnet-4-20250514" ? " If you are seeing this refusal repeatedly, try running /model claude-sonnet-4-20250514 to switch models." : "";
   return createAssistantAPIErrorMessage({
     content: baseMessage + modelSuggestion,
@@ -122466,6 +122532,7 @@ var init_errors7 = __esm(() => {
   init_claudeAiLimits();
   init_mocking();
   init_errorUtils();
+  init_branding();
 });
 
 // src/providers/shared/retry.ts
@@ -166871,40 +166938,6 @@ var init_p_map = __esm(() => {
   pMapSkip = Symbol("skip");
 });
 
-// src/session/bridge/sessionIdCompat.ts
-function toCompatSessionId(id) {
-  if (!id.startsWith("cse_"))
-    return id;
-  if (_isCseShimEnabled && !_isCseShimEnabled())
-    return id;
-  return "session_" + id.slice("cse_".length);
-}
-var _isCseShimEnabled;
-
-// src/constants/product.ts
-function isRemoteSessionStaging(sessionId, ingressUrl) {
-  return sessionId?.includes("_staging_") === true || ingressUrl?.includes("staging") === true;
-}
-function isRemoteSessionLocal(sessionId, ingressUrl) {
-  return sessionId?.includes("_local_") === true || ingressUrl?.includes("localhost") === true;
-}
-function getClaudeAiBaseUrl(sessionId, ingressUrl) {
-  if (isRemoteSessionLocal(sessionId, ingressUrl)) {
-    return CLAUDE_AI_LOCAL_BASE_URL;
-  }
-  if (isRemoteSessionStaging(sessionId, ingressUrl)) {
-    return CLAUDE_AI_STAGING_BASE_URL;
-  }
-  return CLAUDE_AI_BASE_URL;
-}
-function getRemoteSessionUrl(sessionId, ingressUrl) {
-  ;
-  const compatId = toCompatSessionId(sessionId);
-  const baseUrl = getClaudeAiBaseUrl(compatId, ingressUrl);
-  return `${baseUrl}/code/${compatId}`;
-}
-var PRODUCT_URL = "https://claude.com/claude-code", TELEMETRY_SERVICE_NAME = "claude-code", CLAUDE_AI_BASE_URL = "https://claude.ai", CLAUDE_AI_STAGING_BASE_URL = "https://claude-ai.staging.ant.dev", CLAUDE_AI_LOCAL_BASE_URL = "http://localhost:4000";
-
 // node_modules/.bun/semver@7.7.4/node_modules/semver/internal/constants.js
 var require_constants7 = __commonJS(function(exports, module) {
   var SEMVER_SPEC_VERSION = "2.0.0";
@@ -171573,11 +171606,11 @@ For example, to get tab context:
 var init_knownServers = () => {};
 
 // src/capabilities/mcp/envExpansion.ts
-function expandEnvVarsInString(value) {
+function expandEnvVarsInString(value, env = process.env) {
   const missingVars = [];
   const expanded = value.replace(/\$\{([^}]+)\}/g, (match, varContent) => {
     const [varName, defaultValue] = varContent.split(":-", 2);
-    const envValue = process.env[varName];
+    const envValue = env[varName];
     if (envValue !== undefined) {
       return envValue;
     }
@@ -171593,8 +171626,63 @@ function expandEnvVarsInString(value) {
   };
 }
 
+// src/capabilities/mcp/codexConfigFields.ts
+function isPlainObject6(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function setMissing(record, key, value) {
+  if (record[key] !== undefined)
+    return;
+  record[key] = value;
+}
+function recordFor(config, key) {
+  const existing = config[key];
+  if (isPlainObject6(existing))
+    return existing;
+  const created = {};
+  config[key] = created;
+  return created;
+}
+function stringRecordEntries(value) {
+  if (!isPlainObject6(value))
+    return [];
+  return Object.entries(value).filter((entry) => typeof entry[1] === "string");
+}
+function normalizeCodexMcpFields(input) {
+  if (!isPlainObject6(input))
+    return {};
+  const config = structuredClone(input);
+  const envVars = config["env_vars"];
+  if (Array.isArray(envVars)) {
+    for (const name of envVars.filter((item) => typeof item === "string")) {
+      setMissing(recordFor(config, "env"), name, `\${${name}}`);
+    }
+    delete config["env_vars"];
+  }
+  const envHttpHeaders = config["env_http_headers"];
+  if (isPlainObject6(envHttpHeaders)) {
+    for (const [header, varName] of stringRecordEntries(envHttpHeaders)) {
+      setMissing(recordFor(config, "headers"), header, `\${${varName}}`);
+    }
+    delete config["env_http_headers"];
+  }
+  const bearer = config["bearer_token_env_var"];
+  if (typeof bearer === "string" && bearer.trim()) {
+    setMissing(recordFor(config, "headers"), "Authorization", `Bearer \${${bearer.trim()}}`);
+    delete config["bearer_token_env_var"];
+  }
+  const httpHeaders = config["http_headers"];
+  if (isPlainObject6(httpHeaders)) {
+    for (const [header, value] of stringRecordEntries(httpHeaders)) {
+      setMissing(recordFor(config, "headers"), header, value);
+    }
+    delete config["http_headers"];
+  }
+  return config;
+}
+
 // src/capabilities/plugins/mcpPluginIntegration.ts
-import { join as join40 } from "path";
+import { join as join40, resolve as resolvePath } from "path";
 async function loadMcpServersFromMcpb(plugin, mcpbPath, errors) {
   try {
     logForDebugging(`Loading MCP servers from MCPB: ${mcpbPath}`);
@@ -171725,7 +171813,7 @@ async function loadMcpServersFromFile(pluginPath, relativePath, errors, plugin,
     const mcpServers = parsed.mcpServers || parsed;
     const validatedServers = {};
     for (const [name, config] of Object.entries(mcpServers)) {
-      const result = McpServerConfigSchema().safeParse(config);
+      const result = McpServerConfigSchema().safeParse(normalizeCodexMcpFields(config));
       if (result.success) {
         validatedServers[name] = result.data;
       } else {
@@ -171783,12 +171871,13 @@ function buildMcpUserConfig(plugin, serverName) {
 }
 function resolvePluginMcpEnvironment(config, plugin, userConfig, errors, pluginName, serverName) {
   const allMissingVars = [];
+  const envLookup = plugin.env ? { ...process.env, ...plugin.env } : process.env;
   const resolveValue = (value) => {
     let resolved = substitutePluginVariables(value, plugin);
     if (userConfig) {
       resolved = substituteUserConfigVariables(resolved, userConfig);
     }
-    const { expanded, missingVars } = expandEnvVarsInString(resolved);
+    const { expanded, missingVars } = expandEnvVarsInString(resolved, envLookup);
     allMissingVars.push(...missingVars);
     return expanded;
   };
@@ -171803,6 +171892,9 @@ function resolvePluginMcpEnvironment(config, plugin, userConfig, errors, pluginN
       if (stdioConfig.args) {
         stdioConfig.args = stdioConfig.args.map((arg) => resolveValue(arg));
       }
+      if (stdioConfig.cwd) {
+        stdioConfig.cwd = resolvePath(plugin.path, resolveValue(stdioConfig.cwd));
+      }
       const resolvedEnv = {
         CLAUDE_PLUGIN_ROOT: plugin.path,
         CLAUDE_PLUGIN_DATA: plugin.dataPath ?? getPluginDataDir(plugin.source),
@@ -172367,160 +172459,6 @@ var init_agentMemorySnapshot = __esm(() => {
   }));
 });
 
-// src/capabilities/tools/AgentTool/built-in/claudeCodeGuideAgent.ts
-function getClaudeCodeGuideBasePrompt() {
-  const localSearchHint = hasEmbeddedSearchTools() ? `${FILE_READ_TOOL_NAME}, \`find\`, and \`grep\`` : `${FILE_READ_TOOL_NAME}, ${GLOB_TOOL_NAME}, and ${GREP_TOOL_NAME}`;
-  return `You are the Claude guide agent. Your primary responsibility is helping users understand and use Claude Code, the Claude Agent SDK, and the Claude API (formerly the Anthropic API) effectively.
-
-**Your expertise spans three domains:**
-
-1. **Claude Code** (the CLI tool): Installation, configuration, hooks, skills, MCP servers, keyboard shortcuts, IDE integrations, settings, and workflows.
-
-2. **Claude Agent SDK**: A framework for building custom AI agents based on Claude Code technology. Available for Node.js/TypeScript and Python.
-
-3. **Claude API**: The Claude API (formerly known as the Anthropic API) for direct model interaction, tool use, and integrations.
-
-**Documentation sources:**
-
-- **Claude Code docs** (${CLAUDE_CODE_DOCS_MAP_URL}): Fetch this for questions about the Claude Code CLI tool, including:
-  - Installation, setup, and getting started
-  - Hooks (pre/post command execution)
-  - Custom skills
-  - MCP server configuration
-  - IDE integrations (VS Code, JetBrains)
-  - Settings files and configuration
-  - Keyboard shortcuts and hotkeys
-  - Subagents and plugins
-  - Sandboxing and security
-
-- **Claude Agent SDK docs** (${CDP_DOCS_MAP_URL}): Fetch this for questions about building agents with the SDK, including:
-  - SDK overview and getting started (Python and TypeScript)
-  - Agent configuration + custom tools
-  - Session management and permissions
-  - MCP integration in agents
-  - Hosting and deployment
-  - Cost tracking and context management
-  Note: Agent SDK docs are part of the Claude API documentation at the same URL.
-
-- **Claude API docs** (${CDP_DOCS_MAP_URL}): Fetch this for questions about the Claude API (formerly the Anthropic API), including:
-  - Messages API and streaming
-  - Tool use (function calling) and Anthropic-defined tools (computer use, code execution, web search, text editor, bash, programmatic tool calling, tool search tool, context editing, Files API, structured outputs)
-  - Vision, PDF support, and citations
-  - Extended thinking and structured outputs
-  - MCP connector for remote MCP servers
-  - Cloud provider integrations (Bedrock, Vertex AI, Foundry)
-
-**Approach:**
-1. Determine which domain the user's question falls into
-2. Use ${WEB_FETCH_TOOL_NAME} to fetch the appropriate docs map
-3. Identify the most relevant documentation URLs from the map
-4. Fetch the specific documentation pages
-5. Provide clear, actionable guidance based on official documentation
-6. Use ${WEB_SEARCH_TOOL_NAME} if docs don't cover the topic
-7. Reference local project files (CLAUDE.md, .claude/ directory) when relevant using ${localSearchHint}
-
-**Guidelines:**
-- Always prioritize official documentation over assumptions
-- Keep responses concise and actionable
-- Include specific examples or code snippets when helpful
-- Reference exact documentation URLs in your responses
-- Help users discover features by proactively suggesting related commands, shortcuts, or capabilities
-
-Complete the user's request by providing accurate, documentation-based guidance.`;
-}
-function getFeedbackGuideline() {
-  if (isUsing3PServices()) {
-    return `- When you cannot find an answer or the feature doesn't exist, direct the user to ${"report the issue at https://github.com/anthropics/claude-code/issues"}`;
-  }
-  return "- When you cannot find an answer or the feature doesn't exist, direct the user to use /feedback to report a feature request or bug";
-}
-var CLAUDE_CODE_DOCS_MAP_URL = "https://code.claude.com/docs/en/claude_code_docs_map.md", CDP_DOCS_MAP_URL = "https://platform.claude.com/llms.txt", CLAUDE_CODE_GUIDE_AGENT_TYPE = "claude-code-guide", CLAUDE_CODE_GUIDE_AGENT;
-var init_claudeCodeGuideAgent = __esm(() => {
-  init_auth();
-  init_embeddedTools();
-  init_settings2();
-  init_slowOperations();
-  CLAUDE_CODE_GUIDE_AGENT = {
-    agentType: CLAUDE_CODE_GUIDE_AGENT_TYPE,
-    whenToUse: `Use this agent when the user asks questions ("Can Claude...", "Does Claude...", "How do I...") about: (1) Claude Code (the CLI tool) - features, hooks, slash commands, MCP servers, settings, IDE integrations, keyboard shortcuts; (2) Claude Agent SDK - building custom agents; (3) Claude API (formerly Anthropic API) - API usage, tool use, Anthropic SDK usage. **IMPORTANT:** Before spawning a new agent, check if there is already a running or recently completed claude-code-guide agent that you can continue via ${SEND_MESSAGE_TOOL_NAME}.`,
-    tools: hasEmbeddedSearchTools() ? [
-      BASH_TOOL_NAME,
-      FILE_READ_TOOL_NAME,
-      WEB_FETCH_TOOL_NAME,
-      WEB_SEARCH_TOOL_NAME
-    ] : [
-      GLOB_TOOL_NAME,
-      GREP_TOOL_NAME,
-      FILE_READ_TOOL_NAME,
-      WEB_FETCH_TOOL_NAME,
-      WEB_SEARCH_TOOL_NAME
-    ],
-    source: "built-in",
-    baseDir: "built-in",
-    model: "haiku",
-    permissionMode: "dontAsk",
-    getSystemPrompt({ toolUseContext }) {
-      const commands = toolUseContext.options.commands;
-      const contextSections = [];
-      const customCommands = commands.filter((cmd) => cmd.type === "prompt");
-      if (customCommands.length > 0) {
-        const commandList = customCommands.map((cmd) => `- /${cmd.name}: ${cmd.description}`).join(`
-`);
-        contextSections.push(`**Available custom skills in this project:**
-${commandList}`);
-      }
-      const customAgents = toolUseContext.options.agentDefinitions.activeAgents.filter((a) => a.source !== "built-in");
-      if (customAgents.length > 0) {
-        const agentList = customAgents.map((a) => `- ${a.agentType}: ${a.whenToUse}`).join(`
-`);
-        contextSections.push(`**Available custom agents configured:**
-${agentList}`);
-      }
-      const mcpClients = toolUseContext.options.mcpClients;
-      if (mcpClients && mcpClients.length > 0) {
-        const mcpList = mcpClients.map((client) => `- ${client.name}`).join(`
-`);
-        contextSections.push(`**Configured MCP servers:**
-${mcpList}`);
-      }
-      const pluginCommands = commands.filter((cmd) => cmd.type === "prompt" && cmd.source === "plugin");
-      if (pluginCommands.length > 0) {
-        const pluginList = pluginCommands.map((cmd) => `- /${cmd.name}: ${cmd.description}`).join(`
-`);
-        contextSections.push(`**Available plugin skills:**
-${pluginList}`);
-      }
-      const settings = getSettings_DEPRECATED();
-      if (Object.keys(settings).length > 0) {
-        const settingsJson = jsonStringify(settings, null, 2);
-        contextSections.push(`**User's settings.json:**
-\`\`\`json
-${settingsJson}
-\`\`\``);
-      }
-      const feedbackGuideline = getFeedbackGuideline();
-      const basePromptWithFeedback = `${getClaudeCodeGuideBasePrompt()}
-${feedbackGuideline}`;
-      if (contextSections.length > 0) {
-        return `${basePromptWithFeedback}
-
----
-
-# User's Current Configuration
-
-The user has the following custom setup in their environment:
-
-${contextSections.join(`
-
-`)}
-
-When answering questions, consider these configured features and proactively suggest them when relevant.`;
-      }
-      return basePromptWithFeedback;
-    }
-  };
-});
-
 // src/capabilities/tools/AgentTool/built-in/exploreAgent.ts
 function getExploreSystemPrompt() {
   const embedded = hasEmbeddedSearchTools();
@@ -172995,10 +172933,6 @@ function getBuiltInAgents() {
   if (areExplorePlanAgentsEnabled()) {
     agents.push(EXPLORE_AGENT, PLAN_AGENT);
   }
-  const isNonSdkEntrypoint = resolveEnvVar("ENTRYPOINT") !== "sdk-ts" && resolveEnvVar("ENTRYPOINT") !== "sdk-py" && resolveEnvVar("ENTRYPOINT") !== "sdk-cli";
-  if (isNonSdkEntrypoint) {
-    agents.push(CLAUDE_CODE_GUIDE_AGENT);
-  }
   if (false) {}
   return agents;
 }
@@ -173008,7 +172942,6 @@ function resolveSdkAgents(hostAgents) {
 var init_builtInAgents = __esm(() => {
   init_state();
   init_envUtils();
-  init_claudeCodeGuideAgent();
   init_exploreAgent();
   init_generalPurposeAgent();
   init_planAgent();
@@ -176816,6 +176749,40 @@ var init_agentSummary = __esm(() => {
   init_sessionStorage();
 });
 
+// src/session/bridge/sessionIdCompat.ts
+function toCompatSessionId(id) {
+  if (!id.startsWith("cse_"))
+    return id;
+  if (_isCseShimEnabled && !_isCseShimEnabled())
+    return id;
+  return "session_" + id.slice("cse_".length);
+}
+var _isCseShimEnabled;
+
+// src/constants/product.ts
+function isRemoteSessionStaging(sessionId, ingressUrl) {
+  return sessionId?.includes("_staging_") === true || ingressUrl?.includes("staging") === true;
+}
+function isRemoteSessionLocal(sessionId, ingressUrl) {
+  return sessionId?.includes("_local_") === true || ingressUrl?.includes("localhost") === true;
+}
+function getClaudeAiBaseUrl(sessionId, ingressUrl) {
+  if (isRemoteSessionLocal(sessionId, ingressUrl)) {
+    return CLAUDE_AI_LOCAL_BASE_URL;
+  }
+  if (isRemoteSessionStaging(sessionId, ingressUrl)) {
+    return CLAUDE_AI_STAGING_BASE_URL;
+  }
+  return CLAUDE_AI_BASE_URL;
+}
+function getRemoteSessionUrl(sessionId, ingressUrl) {
+  ;
+  const compatId = toCompatSessionId(sessionId);
+  const baseUrl = getClaudeAiBaseUrl(compatId, ingressUrl);
+  return `${baseUrl}/code/${compatId}`;
+}
+var TELEMETRY_SERVICE_NAME = "claude-code", CLAUDE_AI_BASE_URL = "https://claude.ai", CLAUDE_AI_STAGING_BASE_URL = "https://claude-ai.staging.ant.dev", CLAUDE_AI_LOCAL_BASE_URL = "http://localhost:4000";
+
 // src/session/tasks.ts
 import { join as join44 } from "path";
 function notifyTasksUpdated() {
@@ -177483,7 +177450,6 @@ NOTE: You just closed out 3+ tasks and none of them was a verification step. Bef
     }
   });
 });
-
 // src/providers/anthropic/policyLimits/types.ts
 var PolicyLimitsResponseSchema;
 var init_types8 = __esm(() => {
@@ -179230,7 +179196,8 @@ var init_coreSchemas = __esm(() => {
     type: literal("stdio").optional(),
     command: string2(),
     args: array(string2()).optional(),
-    env: record(string2(), string2()).optional()
+    env: record(string2(), string2()).optional(),
+    cwd: string2().optional()
   }));
   McpSSEServerConfigSchema2 = lazySchema(() => object2({
     type: literal("sse"),
@@ -185271,7 +185238,7 @@ function validateCommandPaths(command, args, cwd, toolPermissionContext, compoun
   if (validator && !validator(args)) {
     return {
       behavior: "ask",
-      message: `${command} with flags requires manual approval to ensure path safety. For security, Claude Code cannot automatically validate ${command} commands that use flags, as some flags like --target-directory=PATH can bypass path validation.`,
+      message: `${command} with flags requires manual approval to ensure path safety. For security, ${getBranding().productName} cannot automatically validate ${command} commands that use flags, as some flags like --target-directory=PATH can bypass path validation.`,
       decisionReason: {
         type: "other",
         reason: `${command} command with flags requires manual approval`
@@ -185281,7 +185248,7 @@ function validateCommandPaths(command, args, cwd, toolPermissionContext, compoun
   if (compoundCommandHasCd && operationType !== "read") {
     return {
       behavior: "ask",
-      message: `Commands that change directories and perform write operations require explicit approval to ensure paths are evaluated correctly. For security, Claude Code cannot automatically determine the final working directory when 'cd' is used in compound commands.`,
+      message: `Commands that change directories and perform write operations require explicit approval to ensure paths are evaluated correctly. For security, ${getBranding().productName} cannot automatically determine the final working directory when 'cd' is used in compound commands.`,
       decisionReason: {
         type: "other",
         reason: "Compound command contains cd with write operation - manual approval required to prevent path resolution bypass"
@@ -185293,7 +185260,7 @@ function validateCommandPaths(command, args, cwd, toolPermissionContext, compoun
     if (!allowed) {
       const workingDirs = Array.from(allWorkingDirectories(toolPermissionContext));
       const dirListStr = formatDirectoryList(workingDirs);
-      const message = decisionReason?.type === "other" || decisionReason?.type === "safetyCheck" ? decisionReason.reason : `${command} in '${resolvedPath}' was blocked. For security, Claude Code may only ${ACTION_VERBS[command]} the allowed working directories for this session: ${dirListStr}.`;
+      const message = decisionReason?.type === "other" || decisionReason?.type === "safetyCheck" ? decisionReason.reason : `${command} in '${resolvedPath}' was blocked. For security, ${getBranding().productName} may only ${ACTION_VERBS[command]} the allowed working directories for this session: ${dirListStr}.`;
       if (decisionReason?.type === "rule") {
         return {
           behavior: "deny",
@@ -185418,7 +185385,7 @@ function validateOutputRedirections(redirections, cwd, toolPermissionContext, co
   if (compoundCommandHasCd && redirections.length > 0) {
     return {
       behavior: "ask",
-      message: `Commands that change directories and write via output redirection require explicit approval to ensure paths are evaluated correctly. For security, Claude Code cannot automatically determine the final working directory when 'cd' is used in compound commands.`,
+      message: `Commands that change directories and write via output redirection require explicit approval to ensure paths are evaluated correctly. For security, ${getBranding().productName} cannot automatically determine the final working directory when 'cd' is used in compound commands.`,
       decisionReason: {
         type: "other",
         reason: "Compound command contains cd with output redirection - manual approval required to prevent path resolution bypass"
@@ -185433,7 +185400,7 @@ function validateOutputRedirections(redirections, cwd, toolPermissionContext, co
     if (!allowed) {
       const workingDirs = Array.from(allWorkingDirectories(toolPermissionContext));
       const dirListStr = formatDirectoryList(workingDirs);
-      const message = decisionReason?.type === "other" || decisionReason?.type === "safetyCheck" ? decisionReason.reason : decisionReason?.type === "rule" ? `Output redirection to '${resolvedPath}' was blocked by a deny rule.` : `Output redirection to '${resolvedPath}' was blocked. For security, Claude Code may only write to files in the allowed working directories for this session: ${dirListStr}.`;
+      const message = decisionReason?.type === "other" || decisionReason?.type === "safetyCheck" ? decisionReason.reason : decisionReason?.type === "rule" ? `Output redirection to '${resolvedPath}' was blocked by a deny rule.` : `Output redirection to '${resolvedPath}' was blocked. For security, ${getBranding().productName} may only write to files in the allowed working directories for this session: ${dirListStr}.`;
       if (decisionReason?.type === "rule") {
         return {
           behavior: "deny",
@@ -185640,6 +185607,7 @@ var init_pathValidation2 = __esm(() => {
   init_pathValidation();
   init_bashPermissions();
   init_sedValidation();
+  init_branding();
   PATH_EXTRACTORS = {
     cd: (args) => args.length === 0 ? [homedir16()] : [args.join(" ")],
     ls: (args) => {
@@ -193304,12 +193272,13 @@ async function loadLspServersFromManifest(declaration, pluginPath, pluginName, e
 }
 function resolvePluginLspEnvironment(config, plugin, userConfig, _errors) {
   const allMissingVars = [];
+  const envLookup = plugin.env ? { ...process.env, ...plugin.env } : process.env;
   const resolveValue = (value) => {
     let resolved = substitutePluginVariables(value, plugin);
     if (userConfig) {
       resolved = substituteUserConfigVariables(resolved, userConfig);
     }
-    const { expanded, missingVars } = expandEnvVarsInString(resolved);
+    const { expanded, missingVars } = expandEnvVarsInString(resolved, envLookup);
     allMissingVars.push(...missingVars);
     return expanded;
   };
@@ -198138,7 +198107,7 @@ function validateInputForSettingsFileEdit(filePath, originalContent, getUpdatedC
   if (!afterValidation.isValid) {
     return {
       result: false,
-      message: `Claude Code settings.json validation failed after edit:
+      message: `settings.json validation failed after edit:
 ${afterValidation.error}
 
 Full schema:
@@ -200422,7 +200391,7 @@ var LITERAL_BACKSLASH = "\\", SNAPSHOT_CREATION_TIMEOUT = 1e4, VCS_DIRECTORIES_T
       logForDebugging(`Looking for shell config file: ${configFile}`);
       const configFileExists = await pathExists(configFile);
       if (!configFileExists) {
-        logForDebugging(`Shell config file not found: ${configFile}, creating snapshot with Claude Code defaults only`);
+        logForDebugging(`Shell config file not found: ${configFile}, creating snapshot with ${getBranding().productName} defaults only`);
       }
       const timestamp = Date.now();
       const randomId = Math.random().toString(36).substring(2, 8);
@@ -200535,6 +200504,7 @@ var init_ShellSnapshot = __esm(() => {
   init_subprocessEnv();
   init_shellQuote();
   init_state2();
+  init_branding();
   VCS_DIRECTORIES_TO_EXCLUDE2 = [
     ".git",
     ".svn",
@@ -211345,6 +211315,7 @@ ${content}`;
           source: sourceName,
           dataPath: pluginDataPath
         });
+        finalContent = substitutePluginContentVariables(finalContent);
         if (pluginManifest.userConfig) {
           finalContent = substituteUserConfigInContent(finalContent, loadPluginOptions(sourceName), pluginManifest.userConfig);
         }
@@ -216933,7 +216904,7 @@ async function performMCPOAuthFlow(serverName, serverConfig, onAuthorizationUrl,
           }
           if (code) {
             res.writeHead(200, { "Content-Type": "text/html" });
-            res.end(`<h1>Authentication Successful</h1><p>You can close this window. Return to Claude Code.</p>`);
+            res.end(`<h1>Authentication Successful</h1><p>You can close this window. Return to ${import_xss2.default(getBranding().productName)}.</p>`);
             cleanup();
             resolveOnce(code);
           }
@@ -217099,7 +217070,7 @@ class ClaudeAuthProvider {
   }
   get clientMetadata() {
     const metadata = {
-      client_name: `Claude Code (${this.serverName})`,
+      client_name: `${getBranding().productName} (${this.serverName})`,
       redirect_uris: [this.redirectUri],
       grant_types: ["authorization_code", "refresh_token"],
       response_types: ["code"],
@@ -217118,7 +217089,7 @@ class ClaudeAuthProvider {
       logMCPDebug(this.serverName, `Using CIMD URL from env: ${override}`);
       return override;
     }
-    return MCP_CLIENT_METADATA_URL;
+    return getBranding().mcpOAuthClientMetadataUrl;
   }
   setMetadata(metadata) {
     this._metadata = metadata;
@@ -217686,7 +217657,7 @@ var init_auth6 = __esm(() => {
   init_auth5();
   init_errors8();
   init_auth4();
-  init_oauth();
+  init_branding();
   init_browser();
   init_envUtils();
   init_errors5();
@@ -222586,7 +222557,7 @@ function isIncludedMcpTool(tool) {
   return !tool.name.startsWith("mcp__ide__") || ALLOWED_IDE_TOOLS.includes(tool.name);
 }
 function getServerCacheKey(name, serverRef) {
-  return `${name}-${jsonStringify(serverRef)}`;
+  return `${name}-${jsonStringify(serverRef)}-${jsonStringify(getBranding())}`;
 }
 async function clearServerCache(name, serverRef) {
   const key = getServerCacheKey(name, serverRef);
@@ -223201,6 +223172,7 @@ var init_client5 = __esm(() => {
   ALLOWED_IDE_TOOLS = ["mcp__ide__executeCode", "mcp__ide__getDiagnostics"];
   connectToServer = memoize_default(async (name, serverRef, serverStats) => {
     const connectStartTime = Date.now();
+    const cacheKey = getServerCacheKey(name, serverRef);
     let inProcessServer;
     try {
       let transport;
@@ -223399,6 +223371,7 @@ var init_client5 = __esm(() => {
             ...subprocessEnv(),
             ...serverRef.env
           },
+          ...serverRef.cwd ? { cwd: serverRef.cwd } : {},
           stderr: "pipe"
         });
       } else {
@@ -223420,10 +223393,8 @@ var init_client5 = __esm(() => {
         }
       }
       const client = new Client({
-        name: TELEMETRY_SERVICE_NAME,
         ...getMcpClientInfo(),
-        version: "99.0.0",
-        websiteUrl: PRODUCT_URL
+        version: "99.0.0"
       }, {
         capabilities: {
           roots: {},
@@ -223633,12 +223604,11 @@ var init_client5 = __esm(() => {
         const uptime = Date.now() - connectionStartTime;
         const transportType = serverRef.type ?? "unknown";
         logMCPDebug(name, `${transportType.toUpperCase()} connection closed after ${Math.floor(uptime / 1000)}s (${hasErrorOccurred ? "with errors" : "cleanly"})`);
-        const key = getServerCacheKey(name, serverRef);
         fetchToolsForClient.cache.delete(name);
         fetchResourcesForClient.cache.delete(name);
         fetchCommandsForClient.cache.delete(name);
         if (false) {}
-        connectToServer.cache.delete(key);
+        connectToServer.cache.delete(cacheKey);
         logMCPDebug(name, `Cleared connection cache for reconnection`);
         if (originalOnclose) {
           originalOnclose();
@@ -224246,12 +224216,11 @@ async function* runPostToolUseFailureHooks(toolUseContext, tool, toolUseID, mess
 }
 async function resolveHookPermissionDecision(hookPermissionResult, tool, input, toolUseContext, canUseTool, assistantMessage, toolUseID) {
   const requiresInteraction = tool.requiresUserInteraction?.();
-  const requireCanUseTool = toolUseContext.requireCanUseTool;
   if (hookPermissionResult?.behavior === "allow") {
     const hookInput = hookPermissionResult.updatedInput ?? input;
     const interactionSatisfied = requiresInteraction && hookPermissionResult.updatedInput !== undefined;
-    if (requiresInteraction && !interactionSatisfied || requireCanUseTool) {
-      logForDebugging(`Hook approved tool use for ${tool.name}, but canUseTool is required`);
+    if (!interactionSatisfied) {
+      logForDebugging(`Hook approved tool use for ${tool.name}, deferring final decision to canUseTool`);
       return {
         decision: await consumePermissionPreDecision(toolUseContext, toolUseID, hookInput, () => canUseTool(tool, hookInput, toolUseContext, assistantMessage, toolUseID)),
         input: hookInput
@@ -224259,7 +224228,7 @@ async function resolveHookPermissionDecision(hookPermissionResult, tool, input,
     }
     const ruleCheck = await checkRuleBasedPermissions(tool, hookInput, toolUseContext);
     if (ruleCheck === null) {
-      logForDebugging(interactionSatisfied ? `Hook satisfied user interaction for ${tool.name} via updatedInput` : `Hook approved tool use for ${tool.name}, bypassing permission prompt`);
+      logForDebugging(`Hook satisfied user interaction for ${tool.name} via updatedInput`);
       return { decision: hookPermissionResult, input: hookInput };
     }
     if (ruleCheck.behavior === "deny") {
@@ -227327,7 +227296,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-10-09T14:01:34.561Z").getTime();
+  const buildTime = new Date("2026-10-20T14:00:47.620Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -231551,7 +231520,7 @@ async function getAttachments(input, toolUseContext, ideSelection, queuedCommand
     maybe("changed_files", () => getChangedFiles(context)),
     maybe("nested_memory", () => getNestedMemoryAttachments(context)),
     maybe("dynamic_skill", () => getDynamicSkillAttachments(context)),
-    maybe("skill_listing", () => getSkillListingAttachments(context)),
+    ...isSkillListingEnabled() ? [maybe("skill_listing", () => getSkillListingAttachments(context))] : [],
     maybe("plan_mode", () => getPlanModeAttachments(messages, toolUseContext)),
     maybe("plan_mode_exit", () => getPlanModeExitAttachment(toolUseContext)),
     ...[],
@@ -232380,6 +232349,9 @@ async function getDynamicSkillAttachments(toolUseContext) {
   }
   return attachments;
 }
+function isSkillListingEnabled() {
+  return !isEnvDefinedFalsy(resolveEnvVar("SKILL_LISTING"));
+}
 async function getSkillListingAttachments(toolUseContext) {
   if (false) {}
   if (!toolUseContext.options.tools.some((t) => toolMatchesName2(t, SKILL_TOOL_NAME))) {
@@ -241142,7 +241114,7 @@ function AUTO_REJECT_MESSAGE(toolName) {
   return `Permission to use ${toolName} has been denied. ${DENIAL_WORKAROUND_GUIDANCE}`;
 }
 function DONT_ASK_REJECT_MESSAGE(toolName) {
-  return `Permission to use ${toolName} has been denied because Claude Code is running in don't ask mode. ${DENIAL_WORKAROUND_GUIDANCE}`;
+  return `Permission to use ${toolName} has been denied because ${getBranding().productName} is running in don't ask mode. ${DENIAL_WORKAROUND_GUIDANCE}`;
 }
 function isSyntheticMessage(message) {
   return message.type !== "progress" && message.type !== "attachment" && message.type !== "system" && Array.isArray(message.message.content) && message.message.content[0]?.type === "text" && SYNTHETIC_MESSAGES.has(message.message.content[0].text);
@@ -243899,6 +243871,7 @@ var init_messages4 = __esm(() => {
   init_tasks();
   init_toolSearch();
   init_state2();
+  init_branding();
   DENIAL_WORKAROUND_GUIDANCE = `IMPORTANT: You *may* attempt to accomplish this action using other tools that might naturally be used to accomplish this goal, ` + `e.g. using head instead of cat. But you *should not* attempt to work around this denial in malicious ways, ` + `e.g. do not use your ability to run tests to execute non-test actions. ` + `You should only try to work around this restriction in reasonable ways that do not attempt to bypass the intent behind this denial. ` + `If you believe this capability is essential to complete the user's request, STOP and explain to the user ` + `what you were trying to do and why you need this permission. Let the user decide how to proceed.`;
   SYNTHETIC_MESSAGES = new Set([
     INTERRUPT_MESSAGE,
@@ -273255,10 +273228,11 @@ init_http2();
 init_log2();
 init_state2();
 init_mcpOutputStorage();
+init_branding();
 init_settings2();
 class DomainBlockedError extends Error {
   constructor(domain) {
-    super(`Claude Code is unable to fetch from ${domain}`);
+    super(`${getBranding().productName} is unable to fetch from ${domain}`);
     this.name = "DomainBlockedError";
   }
 }
@@ -278312,10 +278286,15 @@ function assertNoDependencyCycles(plugins) {
   for (const plugin of plugins)
     visit(plugin, []);
 }
+var HOST_PROVIDED_ENVIRONMENT_NAMES = new Set([
+  "CLAUDE_PLUGIN_ROOT",
+  "CLAUDE_PLUGIN_DATA"
+]);
 function collectEnvironmentNames(value, output) {
   if (typeof value === "string") {
     for (const match of value.matchAll(/\$\{([A-Z][A-Z0-9_]*)\}/g)) {
-      output.add(match[1]);
+      if (!HOST_PROVIDED_ENVIRONMENT_NAMES.has(match[1]))
+        output.add(match[1]);
     }
     return;
   }
@@ -278328,8 +278307,10 @@ function collectEnvironmentNames(value, output) {
     return;
   for (const [key, item] of Object.entries(value)) {
     if (key === "env" && item && typeof item === "object" && !Array.isArray(item)) {
-      for (const name of Object.keys(item))
-        output.add(name);
+      for (const name of Object.keys(item)) {
+        if (!HOST_PROVIDED_ENVIRONMENT_NAMES.has(name))
+          output.add(name);
+      }
     }
     collectEnvironmentNames(item, output);
   }
@@ -278458,6 +278439,8 @@ async function stageResolvedPlugins(revision, inputs) {
     plugin.source = input.id;
     plugin.repository = input.id;
     plugin.dataPath = dataPath;
+    if (input.env && Object.keys(input.env).length > 0)
+      plugin.env = { ...input.env };
     plugin.manifest = { ...plugin.manifest, userConfig: undefined };
     loadedPlugins.push(plugin);
     diagnostics.push(...errors.map((error) => diagnosticFromPluginError(input.id, error)));
@@ -278592,15 +278575,17 @@ async function stageManagedPluginSnapshot(snapshot, appliedState) {
   try {
     for (const plugin of snapshot.plugins)
       validateManagedPlugin(plugin);
+    const contentVariables = validateContentVariables(snapshot.contentVariables);
     const bundle = await stageResolvedPlugins(snapshot.revision, snapshot.plugins.map((plugin) => ({
       id: plugin.id,
       path: plugin.source.path,
       dataPath: plugin.dataPath,
-      permissionGrant: plugin.permissionGrant
+      permissionGrant: plugin.permissionGrant,
+      env: plugin.env
     })));
     return {
       status: "staged",
-      bundle,
+      bundle: { ...bundle, contentVariables },
       result: {
         status: "applied",
         requestedRevision: snapshot.revision,
@@ -278630,6 +278615,20 @@ async function inspectPluginSnapshot(snapshot) {
     return rejectResult(snapshot.revision, appliedState, error);
   }
 }
+var CONTENT_VARIABLE_NAME = /^[A-Z][A-Z0-9_]*$/;
+function validateContentVariables(variables) {
+  if (!variables)
+    return {};
+  for (const [name, value] of Object.entries(variables)) {
+    if (!CONTENT_VARIABLE_NAME.test(name)) {
+      throw new Error(`Invalid plugin content variable name: ${name}`);
+    }
+    if (typeof value !== "string") {
+      throw new Error(`Plugin content variable ${name} must be a string`);
+    }
+  }
+  return Object.freeze({ ...variables });
+}
 function validateManagedPlugin(plugin) {
   if (plugin.source.type !== "local")
     throw new Error(`Unsupported plugin source for ${plugin.id}`);
@@ -278842,7 +278841,8 @@ function optionsWithProviderRoutingEnv(options) {
   const reasoningEffort = options.reasoningEffort;
   const openaiResponses = options.providerSpecific?.openaiResponses;
   const extraBody = extraBodyFromOptions(options);
-  if (transport === undefined && reasoningEffort === undefined && openaiResponses === undefined && extraBody === undefined) {
+  const skillListing = options.skillListing;
+  if (transport === undefined && reasoningEffort === undefined && openaiResponses === undefined && extraBody === undefined && skillListing === undefined) {
     return options;
   }
   const mergedEnv = { ...options.env ?? {} };
@@ -278862,6 +278862,9 @@ function optionsWithProviderRoutingEnv(options) {
     mergedEnv[ENV_VARS.EXTRA_BODY.primary] = rawExtraBody;
     mergedEnv[QUERY_ENV_KEY_EXTRA_BODY] = rawExtraBody;
   }
+  if (typeof skillListing === "boolean") {
+    mergedEnv[ENV_VARS.SKILL_LISTING.primary] = skillListing ? "1" : "0";
+  }
   return { ...options, env: mergedEnv };
 }
 function createQueryLike(generator, runtimeState, finalize) {
@@ -279038,7 +279041,6 @@ function runSdkQueryRuntime(params) {
       const [clientTransport, serverTransport] = createLinkedTransportPair();
       await inProcessServer.connect(serverTransport);
       const client = new Client({
-        name: "claude-code",
         ...getMcpClientInfo(),
         version: "99.0.0"
       }, {
@@ -279079,7 +279081,7 @@ function runSdkQueryRuntime(params) {
         activePluginBundle = await stageStaticLocalPlugins(options.plugins, cwd);
       }
       if (activePluginBundle) {
-        setExplicitPluginRuntimeContext(activePluginBundle.dataPaths, activePluginBundle.lspManager);
+        setExplicitPluginRuntimeBundle(activePluginBundle);
         registerHookCallbacks2(activePluginBundle.hooks);
       }
       const shellCapabilities = await initializeShellCapabilities();
@@ -279479,7 +279481,7 @@ class SessionRuntime {
         this.projectContextIds.add(ctx.identity.sessionId);
         await runWithQueryContext(ctx, async () => {
           if (this.pluginBundle) {
-            setExplicitPluginRuntimeContext(this.pluginBundle.dataPaths, this.pluginBundle.lspManager);
+            setExplicitPluginRuntimeBundle(this.pluginBundle);
             registerHookCallbacks2(this.pluginBundle.hooks);
           }
           if (this.baseOptions.hooks) {
@@ -280498,4 +280500,4 @@ export {
   watchScheduledTasks
 };
 
-//# debugId=7505C50D413CC12764756E2164756E21
+//# debugId=7F28B624A121A3CF64756E2164756E21