@cnwenf/occ 2.1.281 → 2.1.282

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.281","BUILD_TIME":"2026-07-24T09:21:36.637Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.282","BINARY_NAME":"occ","BUILD_TIME":"2026-07-24T09:40:02.332Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -59590,7 +59590,7 @@ var init_types2 = __esm(() => {
       sshHost: exports_external.string().describe('SSH host in format "user@hostname" or "hostname", or a host alias from ~/.ssh/config'),
       sshPort: exports_external.number().int().optional().describe("SSH port (default: 22)"),
       sshIdentityFile: exports_external.string().optional().describe("Path to SSH identity file (private key)"),
-      startDirectory: exports_external.string().optional().describe("Default working directory on the remote host. " + "Supports tilde expansion (e.g. ~/projects). " + "If not specified, defaults to the remote user home directory. " + "Can be overridden by the [dir] positional argument in `claude ssh <config> [dir]`.")
+      startDirectory: exports_external.string().optional().describe("Default working directory on the remote host. " + "Supports tilde expansion (e.g. ~/projects). " + "If not specified, defaults to the remote user home directory. " + "Can be overridden by the [dir] positional argument in `occ ssh <config> [dir]`.")
     })).optional().describe("SSH connection configurations for remote environments. " + "Typically set in managed settings by enterprise administrators " + "to pre-configure SSH connections for team members."),
     claudeMdExcludes: exports_external.array(exports_external.string()).optional().describe("Glob patterns or absolute paths of CLAUDE.md files to exclude from loading. " + "Patterns are matched against absolute file paths using picomatch. " + "Only applies to User, Project, and Local memory types (Managed/policy files cannot be excluded). " + 'Examples: "/home/user/monorepo/CLAUDE.md", "**/code/CLAUDE.md", "**/some-dir/.claude/rules/**"'),
     pluginTrustMessage: exports_external.string().optional().describe("Custom message to append to the plugin trust warning shown before installation. " + "Only read from policy settings (managed-settings.json / MDM). " + "Useful for enterprise administrators to add organization-specific context " + '(e.g., "All plugins from our internal marketplace are vetted and approved.").'),
@@ -60775,8 +60775,8 @@ function getRequiredVersionError(opts) {
     if (!min) {
       logForDebugging(`requiredMinimumVersion '${requiredMinimumVersion}' is not a valid semver version \u2014 ignoring`, { level: "error" });
     } else if (!gte(currentVersion, min)) {
-      return `Claude Code ${currentVersion} is older than the minimum version required by your organization (${requiredMinimumVersion}).
-Update Claude Code using your organization's approved method, then try again. If automatic updates are available, \`claude update\` may also work.`;
+      return `OCC ${currentVersion} is older than the minimum version required by your organization (${requiredMinimumVersion}).
+Update OCC using your organization's approved method, then try again. If automatic updates are available, \`occ update\` may also work.`;
     }
   }
   if (requiredMaximumVersion) {
@@ -60784,8 +60784,8 @@ Update Claude Code using your organization's approved method, then try again. If
     if (!max) {
       logForDebugging(`requiredMaximumVersion '${requiredMaximumVersion}' is not a valid semver version \u2014 ignoring`, { level: "error" });
     } else if (!lte(currentVersion, max)) {
-      return `Claude Code ${currentVersion} is newer than the maximum version allowed by your organization (${requiredMaximumVersion}).
-Your organization requires version ${requiredMaximumVersion} or older. Install an approved version using your organization's approved method. \`claude install <version>\` may also work.`;
+      return `OCC ${currentVersion} is newer than the maximum version allowed by your organization (${requiredMaximumVersion}).
+Your organization requires version ${requiredMaximumVersion} or older. Install an approved version using your organization's approved method. \`occ install <version>\` may also work.`;
     }
   }
   return null;
@@ -143048,8 +143048,8 @@ async function validateForceLoginOrg() {
       message: `Unable to verify organization for the current authentication token.
 This machine requires organization ${requiredOrgUuid} but the profile could not be fetched.
 This may be a network error, or the token may lack the user:profile scope required for
-verification (tokens from 'claude setup-token' do not include this scope).
-Try again, or obtain a full-scope token via 'claude auth login'.`
+verification (tokens from 'occ setup-token' do not include this scope).
+Try again, or obtain a full-scope token via 'occ auth login'.`
     };
   }
   const tokenOrgUuid = profile3.organization.uuid;
@@ -143074,7 +143074,7 @@ Remove the environment variable or obtain a token for the correct organization.`
     message: `Your authentication token belongs to organization ${tokenOrgUuid},
 but this machine requires organization ${requiredOrgUuid}.
 
-Please log in with the correct organization: claude auth login`
+Please log in with the correct organization: occ auth login`
   };
 }
 var DEFAULT_API_KEY_HELPER_TTL, _apiKeyHelperCache = null, _apiKeyHelperInflight = null, _apiKeyHelperEpoch = 0, _apiKeyHelperError = null, DEFAULT_AWS_STS_TTL, AWS_CREDENTIAL_EXPIRY_SAFETY_MARGIN_MS, AWS_CREDENTIAL_MIN_CACHE_TTL_MS, AWS_AUTH_REFRESH_TIMEOUT_MS, refreshAndGetAwsCredentials, awsCredentialProviderCache, AWS_PROVIDER_INVALIDATE_MIN_INTERVAL_MS, awsProviderInvalidateTimestamps, GCP_CREDENTIALS_CHECK_TIMEOUT_MS = 5000, DEFAULT_GCP_CREDENTIAL_TTL = 3600000, GCP_AUTH_REFRESH_TIMEOUT_MS = 180000, refreshGcpCredentialsIfNeeded, getApiKeyFromConfigOrMacOSKeychain, getClaudeAIOAuthTokens, lastCredentialsMtimeMs = 0, pending401Handlers, pendingRefreshCheck = null, cachedOtelHeaders = null, cachedOtelHeadersTimestamp = 0, DEFAULT_OTEL_HEADERS_DEBOUNCE_MS = 1740000, GcpCredentialsTimeoutError;
@@ -152544,13 +152544,13 @@ async function isBridgeEnabledBlocking() {
 async function getBridgeDisabledReason() {
   if (feature("BRIDGE_MODE")) {
     if (!isClaudeAISubscriber2()) {
-      return "Remote Control requires a claude.ai subscription. Run `claude auth login` to sign in with your claude.ai account.";
+      return "Remote Control requires a claude.ai subscription. Run `occ auth login` to sign in with your claude.ai account.";
     }
     if (!hasProfileScope2()) {
-      return "Remote Control requires a full-scope login token. Long-lived tokens (from `claude setup-token` or CLAUDE_CODE_OAUTH_TOKEN) are limited to inference-only for security reasons. Run `claude auth login` to use Remote Control.";
+      return "Remote Control requires a full-scope login token. Long-lived tokens (from `occ setup-token` or CLAUDE_CODE_OAUTH_TOKEN) are limited to inference-only for security reasons. Run `occ auth login` to use Remote Control.";
     }
     if (!getOauthAccountInfo2()?.organizationUuid) {
-      return "Unable to determine your organization for Remote Control eligibility. Run `claude auth login` to refresh your account information.";
+      return "Unable to determine your organization for Remote Control eligibility. Run `occ auth login` to refresh your account information.";
     }
     if (!await checkGate_CACHED_OR_BLOCKING("tengu_ccr_bridge")) {
       return "Remote Control is not yet enabled for your account.";
@@ -152590,8 +152590,8 @@ function checkBridgeMinVersion() {
   if (feature("BRIDGE_MODE")) {
     const config4 = getDynamicConfig_CACHED_MAY_BE_STALE("tengu_bridge_min_version", { minVersion: "0.0.0" });
     if (config4.minVersion && lt(MACRO.VERSION, config4.minVersion)) {
-      return `Your version of Claude Code (${MACRO.VERSION}) is too old for Remote Control.
-Version ${config4.minVersion} or higher is required. Run \`claude update\` to update.`;
+      return `Your version of OCC (${MACRO.VERSION}) is too old for Remote Control.
+Version ${config4.minVersion} or higher is required. Run \`occ update\` to update.`;
     }
   }
   return null;
@@ -380634,6 +380634,8 @@ var init_readOnlyValidation = __esm(() => {
     /^echo(?:\s+(?:'[^']*'|"[^"$<>\n\r]*"|[^|;&`$(){}><#\\!"'\s]+))*(?:\s+2>&1)?\s*$/,
     /^claude -h$/,
     /^claude --help$/,
+    /^occ -h$/,
+    /^occ --help$/,
     /^uniq(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+(?:=\S+)?|-[fsw]\s+\d+))*(?:\s|$)\s*$/,
     /^pwd$/,
     /^whoami$/,
@@ -392144,6 +392146,12 @@ var init_concurrentSessions = __esm(() => {
   init_teammate();
 });
 
+// src/constants/cli.ts
+var CLI_BINARY_NAME;
+var init_cli = __esm(() => {
+  CLI_BINARY_NAME = globalThis.MACRO?.BINARY_NAME ?? "occ";
+});
+
 // src/services/analytics/datadog.ts
 import { createHash as createHash15 } from "crypto";
 function camelToSnakeCase(str2) {
@@ -392412,7 +392420,7 @@ function printResumeHint() {
       }
       writeSync2(1, source_default.dim(`
 Resume this session with:
-claude --resume ${resumeArg}
+${CLI_BINARY_NAME} --resume ${resumeArg}
 `));
       resumeHintPrinted = true;
     } catch {}
@@ -392521,6 +392529,7 @@ var init_gracefulShutdown = __esm(() => {
   init_source();
   init_memoize();
   init_mjs();
+  init_cli();
   init_state();
   init_instances();
   init_csi();
@@ -392730,13 +392739,13 @@ async function checkGroveForNonInteractive() {
     });
     if (config6 === null || config6.notice_is_grace_period) {
       writeToStderr(`
-An update to our Consumer Terms and Privacy Policy will take effect on October 8, 2025. Run \`claude\` to review the updated terms.
+An update to our Consumer Terms and Privacy Policy will take effect on October 8, 2025. Run \`occ\` to review the updated terms.
 
 `);
       await markGroveNoticeViewed();
     } else {
       writeToStderr(`
-[ACTION REQUIRED] An update to our Consumer Terms and Privacy Policy has taken effect on October 8, 2025. You must run \`claude\` to review the updated terms.
+[ACTION REQUIRED] An update to our Consumer Terms and Privacy Policy has taken effect on October 8, 2025. You must run \`occ\` to review the updated terms.
 
 `);
       await gracefulShutdown(1);
@@ -433325,11 +433334,11 @@ async function assertMinVersion() {
     const versionConfig = await getDynamicConfig_BLOCKS_ON_INIT("tengu_version_config", { minVersion: "0.0.0" });
     if (versionConfig.minVersion && lt(MACRO.VERSION, versionConfig.minVersion)) {
       console.error(`
-It looks like your version of Claude Code (${MACRO.VERSION}) needs an update.
+It looks like your version of OCC (${MACRO.VERSION}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
 
 To update, please run:
-    claude update
+    occ update
 
 This will ensure you have access to the latest features and improvements.
 `);
@@ -433565,13 +433574,13 @@ async function installGlobalPackage(specificVersion) {
       console.error(`
 Error: Windows NPM detected in WSL
 
-You're running Claude Code in WSL but using the Windows NPM installation from /mnt/c/.
+You're running OCC in WSL but using the Windows NPM installation from /mnt/c/.
 This configuration is not supported for updates.
 
 To fix this issue:
   1. Install Node.js within your Linux distribution: e.g. sudo apt install nodejs npm
   2. Make sure Linux NPM is in your PATH before the Windows version
-  3. Try updating again with 'claude update'
+  3. Try updating again with 'occ update'
 `);
       return "install_failed";
     }
@@ -434069,7 +434078,7 @@ async function detectConfigurationIssues(type) {
     if (await isExternallyManagedLauncher(launcherPath)) {
       warnings.push({
         issue: `${launcherPath} was not created by the native installer (it is not a symlink into the versions/ directory), so auto-update leaves it untouched.`,
-        fix: `If you put a launcher wrapper there on purpose, this is expected \u2014 new versions still install under $XDG_DATA_HOME/claude/versions, your launcher decides what runs, and automatic version cleanup is disabled on this machine (the installer cannot tell which version your launcher needs, so it keeps them all). To let Claude Code manage the launcher again, remove ${launcherPath} and run \`claude update\`.`
+        fix: `If you put a launcher wrapper there on purpose, this is expected \u2014 new versions still install under $XDG_DATA_HOME/claude/versions, your launcher decides what runs, and automatic version cleanup is disabled on this machine (the installer cannot tell which version your launcher needs, so it keeps them all). To let OCC manage the launcher again, remove ${launcherPath} and run \`occ update\`.`
       });
     }
     const path21 = process.env.PATH || "";
@@ -434113,20 +434122,20 @@ async function detectConfigurationIssues(type) {
     if (type === "npm-local" && config6.installMethod !== "local") {
       warnings.push({
         issue: `Running from local installation but config install method is '${config6.installMethod}'`,
-        fix: "Consider using native installation: claude install"
+        fix: "Consider using native installation: occ install"
       });
     }
     if (type === "native" && config6.installMethod !== "native") {
       warnings.push({
         issue: `Running native installation but config install method is '${config6.installMethod}'`,
-        fix: "Run claude install to update configuration"
+        fix: "Run occ install to update configuration"
       });
     }
   }
   if (type === "npm-global" && await localInstallationExists()) {
     warnings.push({
       issue: "Local installation exists but not being used",
-      fix: "Consider using native installation: claude install"
+      fix: "Consider using native installation: occ install"
     });
   }
   const existingAlias = await findClaudeAlias();
@@ -434210,7 +434219,7 @@ async function getDoctorDiagnostic() {
     if (!hasUpdatePermissions && !getAutoUpdaterDisabledReason()) {
       warnings.push({
         issue: "Insufficient permissions for auto-updates",
-        fix: "Do one of: (1) Re-install node without sudo, or (2) Use `claude install` for native installation"
+        fix: "Do one of: (1) Re-install node without sudo, or (2) Use `occ install` for native installation"
       });
     }
   }
@@ -435345,7 +435354,7 @@ async function checkInstall(force = false) {
   if (isWindows3) {
     if (!await isPossibleClaudeBinary(dirs.executable)) {
       messages.push({
-        message: `installMethod is native, but claude command is missing or invalid at ${dirs.executable}`,
+        message: `installMethod is native, but the OCC command is missing or invalid at ${dirs.executable}`,
         userActionRequired: true,
         type: "error"
       });
@@ -435364,7 +435373,7 @@ async function checkInstall(force = false) {
     } catch (e4) {
       if (isENOENT(e4)) {
         messages.push({
-          message: `installMethod is native, but claude command not found at ${dirs.executable}`,
+          message: `installMethod is native, but the OCC command was not found at ${dirs.executable}`,
           userActionRequired: true,
           type: "error"
         });
@@ -436530,7 +436539,7 @@ async function authStatus(opts) {
 `);
     }
     if (!loggedIn) {
-      process.stdout.write(`Not logged in. Run claude auth login to authenticate.
+      process.stdout.write(`Not logged in. Run occ auth login to authenticate.
 `);
     }
   } else {
@@ -474245,7 +474254,7 @@ async function teleportResumeCodeSession(sessionId, onProgress) {
           sessionId
         });
         const notInRepoDisplay = repoValidation.sessionHost && repoValidation.sessionHost.toLowerCase() !== "github.com" ? `${repoValidation.sessionHost}/${repoValidation.sessionRepo}` : repoValidation.sessionRepo;
-        throw new TeleportOperationError(`You must run claude --teleport ${sessionId} from a checkout of ${notInRepoDisplay}.`, source_default.red(`You must run claude --teleport ${sessionId} from a checkout of ${source_default.bold(notInRepoDisplay)}.
+        throw new TeleportOperationError(`You must run occ --teleport ${sessionId} from a checkout of ${notInRepoDisplay}.`, source_default.red(`You must run occ --teleport ${sessionId} from a checkout of ${source_default.bold(notInRepoDisplay)}.
 `));
       }
       case "mismatch": {
@@ -474255,8 +474264,8 @@ async function teleportResumeCodeSession(sessionId, onProgress) {
         const hostsDiffer = repoValidation.sessionHost && repoValidation.currentHost && repoValidation.sessionHost.replace(/:\d+$/, "").toLowerCase() !== repoValidation.currentHost.replace(/:\d+$/, "").toLowerCase();
         const sessionDisplay = hostsDiffer ? `${repoValidation.sessionHost}/${repoValidation.sessionRepo}` : repoValidation.sessionRepo;
         const currentDisplay = hostsDiffer ? `${repoValidation.currentHost}/${repoValidation.currentRepo}` : repoValidation.currentRepo;
-        throw new TeleportOperationError(`You must run claude --teleport ${sessionId} from a checkout of ${sessionDisplay}.
-This repo is ${currentDisplay}.`, source_default.red(`You must run claude --teleport ${sessionId} from a checkout of ${source_default.bold(sessionDisplay)}.
+        throw new TeleportOperationError(`You must run occ --teleport ${sessionId} from a checkout of ${sessionDisplay}.
+This repo is ${currentDisplay}.`, source_default.red(`You must run occ --teleport ${sessionId} from a checkout of ${source_default.bold(sessionDisplay)}.
 This repo is ${source_default.bold(currentDisplay)}.
 `));
       }
@@ -608680,7 +608689,7 @@ async function removeMarketplaceSource(name3) {
   const entry = config7[name3];
   const seedDir = seedDirFor(entry.installLocation);
   if (seedDir) {
-    throw new Error(`Marketplace '${name3}' is registered from the read-only seed directory ` + `(${seedDir}) and will be re-registered on next startup. ` + `To stop using its plugins: claude plugin disable <plugin>@${name3}`);
+    throw new Error(`Marketplace '${name3}' is registered from the read-only seed directory ` + `(${seedDir}) and will be re-registered on next startup. ` + `To stop using its plugins: occ plugin disable <plugin>@${name3}`);
   }
   delete config7[name3];
   await saveKnownMarketplacesConfig(config7);
@@ -608884,7 +608893,7 @@ async function refreshMarketplace(name3, onProgress, options) {
       const cacheDir = resolve50(getMarketplacesCacheDir());
       const resolvedLoc = resolve50(installLocation);
       if (resolvedLoc !== cacheDir && !resolvedLoc.startsWith(cacheDir + sep36)) {
-        throw new Error(`Marketplace '${name3}' has a corrupted installLocation ` + `(${installLocation}) \u2014 expected a path inside ${cacheDir}. ` + `This can happen after cross-platform path writes or manual edits ` + `to known_marketplaces.json. ` + `Run: claude plugin marketplace remove "${name3}" and re-add it.`);
+        throw new Error(`Marketplace '${name3}' has a corrupted installLocation ` + `(${installLocation}) \u2014 expected a path inside ${cacheDir}. ` + `This can happen after cross-platform path writes or manual edits ` + `to known_marketplaces.json. ` + `Run: occ plugin marketplace remove "${name3}" and re-add it.`);
       }
     }
     if (name3 === OFFICIAL_MARKETPLACE_NAME) {
@@ -608931,7 +608940,7 @@ async function refreshMarketplace(name3, onProgress, options) {
 ` + `${reason}
 ` + `Source: ${sourceDisplay}
 
-` + `You can remove this marketplace with: claude plugin marketplace remove "${name3}"`);
+` + `You can remove this marketplace with: occ plugin marketplace remove "${name3}"`);
       }
     } else if (source2.source === "url") {
       await cacheMarketplaceFromUrl(source2.url, installLocation, source2.headers, onProgress);
@@ -609017,7 +609026,7 @@ var init_marketplaceManager = __esm(() => {
       throw new Error(`Marketplace '${name3}' not found in configuration. Available marketplaces: ${Object.keys(config7).join(", ")}`);
     }
     if (isLocalMarketplaceSource(entry.source) && !isAbsolute29(entry.source.path)) {
-      throw new Error(`Marketplace "${name3}" has a relative source path (${entry.source.path}) ` + `in known_marketplaces.json \u2014 this is stale state from an older ` + `Claude Code version. Run 'claude marketplace remove ${name3}' and ` + `re-add it from the original project directory.`);
+      throw new Error(`Marketplace "${name3}" has a relative source path (${entry.source.path}) ` + `in known_marketplaces.json \u2014 this is stale state from an older ` + `OCC version. Run 'occ marketplace remove ${name3}' and ` + `re-add it from the original project directory.`);
     }
     try {
       return await readCachedMarketplace(entry.installLocation);
@@ -622703,7 +622712,7 @@ async function performMCPXaaAuth(serverName, serverConfig, onAuthorizationUrl, a
   }
   const idp = getXaaIdpSettings();
   if (!idp) {
-    throw new Error("XAA: no IdP connection configured. Run 'claude mcp xaa setup --issuer <url> --client-id <id> --client-secret' to configure.");
+    throw new Error("XAA: no IdP connection configured. Run 'occ mcp xaa setup --issuer <url> --client-id <id> --client-secret' to configure.");
   }
   const clientId = serverConfig.oauth?.clientId;
   if (!clientId) {
@@ -634687,8 +634696,8 @@ async function regenerateCompletionCache() {
     return;
   }
   logForDebugging(`update: Regenerating ${shell.name} completion cache`);
-  const claudeBin = process.argv[1] || "claude";
-  const result = await execFileNoThrow(claudeBin, [
+  const cliBin = process.argv[1] || CLI_BINARY_NAME;
+  const result = await execFileNoThrow(cliBin, [
     "completion",
     shell.shellFlag,
     "--output",
@@ -634702,6 +634711,7 @@ async function regenerateCompletionCache() {
 }
 var init_completionCache = __esm(() => {
   init_color();
+  init_cli();
   init_supports_hyperlinks2();
   init_debug();
   init_errors();
@@ -639881,7 +639891,7 @@ function systemdUnitPath() {
 function installPersistentService() {
   const plat = detectInstallPlatform();
   if (plat === "unsupported") {
-    const msg = `claude daemon install isn't available on ${process.platform} (no launchd/systemd)`;
+    const msg = `occ daemon install isn't available on ${process.platform} (no launchd/systemd)`;
     logEvent2("daemon_install_unsupported", { platform: process.platform });
     return msg;
   }
@@ -639972,7 +639982,7 @@ function uninstallPersistentService() {
     logEvent2("daemon_uninstall_systemd", {});
     return `systemd unit removed`;
   }
-  return `claude daemon uninstall isn't available on ${process.platform} (no launchd/systemd)`;
+  return `occ daemon uninstall isn't available on ${process.platform} (no launchd/systemd)`;
 }
 var init_install2 = __esm(() => {
   init_analytics();
@@ -663723,7 +663733,7 @@ function MCPListPanel(t0) {
   if ($4[60] !== hasFailedClients) {
     t26 = hasFailedClients && /* @__PURE__ */ jsx_runtime234.jsx(ThemedText, {
       dimColor: true,
-      children: debugMode ? "\u203B Error logs shown inline with --debug" : "\u203B Run claude --debug to see error logs"
+      children: debugMode ? "\u203B Error logs shown inline with --debug" : "\u203B Run occ --debug to see error logs"
     });
     $4[60] = hasFailedClients;
     $4[61] = t26;
@@ -667116,7 +667126,7 @@ function MCPSettings(t0) {
         return;
       }
       if (servers.length === 0 && agentMcpServers.length === 0) {
-        onComplete("No MCP servers configured. Please run /doctor if this is unexpected. Otherwise, run `claude mcp --help` or visit https://code.claude.com/docs/en/mcp to learn more.");
+        onComplete("No MCP servers configured. Please run /doctor if this is unexpected. Otherwise, run `occ mcp --help` or visit https://code.claude.com/docs/en/mcp to learn more.");
       }
     };
     t8 = [servers.length, filteredClients.length, agentMcpServers.length, onComplete];
@@ -670843,7 +670853,7 @@ async function uninstallPluginOp(plugin, scope = "user", deleteDataDir = true) {
       if (actualScope === "project") {
         return {
           success: false,
-          message: `Plugin "${plugin}" is enabled at project scope (.claude/settings.json, shared with your team). To disable just for you: claude plugin disable ${plugin} --scope local`
+          message: `Plugin "${plugin}" is enabled at project scope (.claude/settings.json, shared with your team). To disable just for you: occ plugin disable ${plugin} --scope local`
         };
       }
       return {
@@ -676249,7 +676259,7 @@ When given a directory, automatically validates .claude-plugin/marketplace.json
 or .claude-plugin/plugin.json (prefers marketplace if both exist).
 
 Or from the command line:
-  claude plugin validate <path>`);
+  occ plugin validate <path>`);
           return;
         }
         try {
@@ -682387,7 +682397,7 @@ function createMovedToPluginCommand({
             text: `This command has been moved to a plugin. Tell the user:
 
 1. To install the plugin, run:
-   claude plugin install ${pluginName}@claude-code-marketplace
+   occ plugin install ${pluginName}@claude-code-marketplace
 
 2. After installation, use /${pluginName}:${pluginCommand} to run this command
 
@@ -684362,7 +684372,7 @@ function createProjectOnboardingFeed(steps) {
       text: `${checkmark}${text2}`
     };
   });
-  const warningText = getCwd() === homedir40() ? "Note: You have launched claude in your home directory. For the best experience, launch it in a project directory instead." : undefined;
+  const warningText = getCwd() === homedir40() ? "Note: You have launched OCC in your home directory. For the best experience, launch it in a project directory instead." : undefined;
   if (warningText) {
     lines2.push({
       text: warningText
@@ -686967,7 +686977,7 @@ var init_statusNoticeDefinitions = __esm(() => {
               apiKeySource,
               " instead of Anthropic Console key. Either unset ",
               apiKeySource,
-              ", or run `claude /logout`."
+              ", or run `occ /logout`."
             ]
           })
         ]
@@ -692125,7 +692135,7 @@ function checkCrossProjectResume(log3, showAllProjects, worktreePaths) {
   }
   if (process.env.USER_TYPE !== "ant") {
     const sessionId2 = getSessionIdFromLog(log3);
-    const command10 = `cd ${quote([log3.projectPath])} && claude --resume ${sessionId2}`;
+    const command10 = `cd ${quote([log3.projectPath])} && ${CLI_BINARY_NAME} --resume ${sessionId2}`;
     return {
       isCrossProject: true,
       isSameRepoWorktree: false,
@@ -692142,7 +692152,7 @@ function checkCrossProjectResume(log3, showAllProjects, worktreePaths) {
     };
   }
   const sessionId = getSessionIdFromLog(log3);
-  const command9 = `cd ${quote([log3.projectPath])} && claude --resume ${sessionId}`;
+  const command9 = `cd ${quote([log3.projectPath])} && ${CLI_BINARY_NAME} --resume ${sessionId}`;
   return {
     isCrossProject: true,
     isSameRepoWorktree: false,
@@ -692152,6 +692162,7 @@ function checkCrossProjectResume(log3, showAllProjects, worktreePaths) {
 }
 var init_crossProjectResume = __esm(() => {
   init_state();
+  init_cli();
   init_shellQuote();
   init_sessionStorage();
 });
@@ -693214,7 +693225,7 @@ function SessionInfo(t0) {
         children: [
           /* @__PURE__ */ jsx_runtime287.jsx(ThemedText, {
             color: "warning",
-            children: "Not in remote mode. Start with `claude --remote` to use this command."
+            children: "Not in remote mode. Start with `occ --remote` to use this command."
           }),
           /* @__PURE__ */ jsx_runtime287.jsx(ThemedText, {
             dimColor: true,
@@ -707439,7 +707450,7 @@ async function call63(onDone, context8, args) {
     };
     const titleInfo = title ? ` "${title}"` : "";
     const resumeHint = `
-To resume the original: claude -r ${originalSessionId}`;
+To resume the original: ${CLI_BINARY_NAME} -r ${originalSessionId}`;
     const successMessage = `Branched conversation${titleInfo}. You are now in the branch.${resumeHint}`;
     if (context8.resume) {
       await context8.resume(sessionId, forkLog, "fork");
@@ -707456,6 +707467,7 @@ To resume the original: claude -r ${originalSessionId}`;
 }
 var init_branch = __esm(() => {
   init_state();
+  init_cli();
   init_analytics();
   init_json();
   init_sessionStorage();
@@ -708557,11 +708569,11 @@ function handleErrorStatus(status2, data, context8) {
     case 401:
       throw new BridgeFatalError(`${context8}: Authentication failed (401)${detail ? `: ${detail}` : ""}. ${BRIDGE_LOGIN_INSTRUCTION}`, 401, errorType);
     case 403:
-      throw new BridgeFatalError(isExpiredErrorType(errorType) ? "Remote Control session has expired. Please restart with `claude remote-control` or /remote-control." : `${context8}: Access denied (403)${detail ? `: ${detail}` : ""}. Check your organization permissions.`, 403, errorType);
+      throw new BridgeFatalError(isExpiredErrorType(errorType) ? "Remote Control session has expired. Please restart with `occ remote-control` or /remote-control." : `${context8}: Access denied (403)${detail ? `: ${detail}` : ""}. Check your organization permissions.`, 403, errorType);
     case 404:
       throw new BridgeFatalError(detail ?? `${context8}: Not found (404). Remote Control may not be available for this organization.`, 404, errorType);
     case 410:
-      throw new BridgeFatalError(detail ?? "Remote Control session has expired. Please restart with `claude remote-control` or /remote-control.", 410, errorType ?? "environment_expired");
+      throw new BridgeFatalError(detail ?? "Remote Control session has expired. Please restart with `occ remote-control` or /remote-control.", 410, errorType ?? "environment_expired");
     case 429:
       throw new Error(`${context8}: Rate limited (429). Polling too frequently.`);
     default:
@@ -710659,14 +710671,14 @@ function ClaudeInChromeMenu(t0) {
               children: "Usage: "
             }),
             /* @__PURE__ */ jsx_runtime338.jsx(ThemedText, {
-              children: "claude --chrome"
+              children: "occ --chrome"
             }),
             /* @__PURE__ */ jsx_runtime338.jsx(ThemedText, {
               dimColor: true,
               children: " or "
             }),
             /* @__PURE__ */ jsx_runtime338.jsx(ThemedText, {
-              children: "claude --no-chrome"
+              children: "occ --no-chrome"
             })
           ]
         }),
@@ -713576,8 +713588,8 @@ async function getEnvLessBridgeConfig() {
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
   if (cfg.min_version && lt(MACRO.VERSION, cfg.min_version)) {
-    return `Your version of Claude Code (${MACRO.VERSION}) is too old for Remote Control.
-Version ${cfg.min_version} or higher is required. Run \`claude update\` to update.`;
+    return `Your version of OCC (${MACRO.VERSION}) is too old for Remote Control.
+Version ${cfg.min_version} or higher is required. Run \`occ update\` to update.`;
   }
   return null;
 }
@@ -716469,9 +716481,12 @@ var FORK_NAME_FALLBACK = "fork";
 
 // src/commands/fork/confirmation.ts
 function formatForkConfirmation(forkName, sessionId, sharesCheckout) {
-  const base2 = `Forked session ${forkName} (claude attach ${sessionId})`;
+  const base2 = `Forked session ${forkName} (${CLI_BINARY_NAME} attach ${sessionId})`;
   return sharesCheckout ? `${base2} (shares your checkout)` : base2;
 }
+var init_confirmation = __esm(() => {
+  init_cli();
+});
 
 // src/commands/fork/fork.ts
 var exports_fork = {};
@@ -716512,6 +716527,7 @@ var init_fork = __esm(() => {
   init_state();
   init_sessionStorage();
   init_pointer();
+  init_confirmation();
 });
 
 // src/commands/fork/index.ts
@@ -718538,7 +718554,7 @@ Include 3 friction categories with 2 examples each.`,
 
 ## CC FEATURES REFERENCE (pick from these for features_to_try):
 1. **MCP Servers**: Connect Claude to external tools, databases, and APIs via Model Context Protocol.
-   - How to use: Run \`claude mcp add <server-name> -- <command>\`
+   - How to use: Run \`occ mcp add <server-name> -- <command>\`
    - Good for: database queries, Slack integration, GitHub issue lookup, connecting to internal APIs
 
 2. **Custom Skills**: Reusable prompts you define as markdown files that run with a single /command.
@@ -718550,7 +718566,7 @@ Include 3 friction categories with 2 examples each.`,
    - Good for: auto-formatting code, running type checks, enforcing conventions
 
 4. **Headless Mode**: Run Claude non-interactively from scripts and CI/CD.
-   - How to use: \`claude -p "fix lint errors" --allowedTools "Edit,Read,Bash"\`
+   - How to use: \`occ -p "fix lint errors" --allowedTools "Edit,Read,Bash"\`
    - Good for: CI/CD integration, batch code fixes, automated reviews
 
 5. **Task Agents**: Claude spawns focused sub-agents for complex exploration or parallel work.
@@ -732504,7 +732520,7 @@ async function runBridgeLoop(config8, environmentId, environmentSecret, api5, sp
     await Promise.allSettled([...pendingCleanups]);
   }
   if (feature("KAIROS") && config8.spawnMode === "single-session" && initialSessionId && !fatalExit) {
-    logger30.logStatus(`Resume this session by running \`claude remote-control --continue\``);
+    logger30.logStatus(`Resume this session by running \`occ remote-control --continue\``);
     logForDebugging(`[bridge:shutdown] Skipping archive+deregister to allow resume of session ${initialSessionId}`);
     return;
   }
@@ -732675,7 +732691,7 @@ function parseArgs(args) {
       createSessionInDir = false;
     } else {
       return makeError2(`Unknown argument: ${arg}
-Run 'claude remote-control --help' for usage.`);
+Run 'occ remote-control --help' for usage.`);
     }
   }
   if (spawnMode === "single-session" && capacity !== undefined) {
@@ -732746,7 +732762,7 @@ async function printHelp() {
 Remote Control - Connect your local environment to claude.ai/code
 
 USAGE
-  claude remote-control [options]
+  occ remote-control [options]
 OPTIONS
   --name <name>                    Name for the session (shown in claude.ai/code)
 ${feature("KAIROS") ? `  -c, --continue                   Resume the last session in this directory
@@ -732765,7 +732781,7 @@ DESCRIPTION
 ${serverDescription}
 NOTES
   - You must be logged in with a Claude account that has a subscription
-  - Run \`claude\` first in the directory to accept the workspace trust dialog
+  - Run \`occ\` first in the directory to accept the workspace trust dialog
 ${serverNote}`;
   console.log(help2);
 }
@@ -732835,7 +732851,7 @@ async function bridgeMain(args) {
   setOriginalCwd2(dir);
   setCwdState2(dir);
   if (!checkHasTrustDialogAccepted2()) {
-    console.error(`Error: Workspace not trusted. Please run \`claude\` in ${dir} first to review and accept the workspace trust dialog.`);
+    console.error(`Error: Workspace not trusted. Please run \`occ\` in ${dir} first to review and accept the workspace trust dialog.`);
     process.exit(1);
   }
   const { clearOAuthTokenCache: clearOAuthTokenCache2, checkAndRefreshOAuthTokenIfNeeded: checkAndRefreshOAuthTokenIfNeeded2 } = await Promise.resolve().then(() => (init_auth6(), exports_auth));
@@ -732880,7 +732896,7 @@ You can disconnect remote access anytime by running /remote-control again.
     const { readBridgePointerAcrossWorktrees: readBridgePointerAcrossWorktrees2 } = await Promise.resolve().then(() => (init_bridgePointer(), exports_bridgePointer));
     const found = await readBridgePointerAcrossWorktrees2(dir);
     if (!found) {
-      console.error(`Error: No recent session found in this directory or its worktrees. Run \`claude remote-control\` to start a new one.`);
+      console.error(`Error: No recent session found in this directory or its worktrees. Run \`occ remote-control\` to start a new one.`);
       process.exit(1);
     }
     const { pointer, dir: pointerDir } = found;
@@ -732998,7 +733014,7 @@ Spawn mode for this project:
         const { clearBridgePointer: clearBridgePointer2 } = await Promise.resolve().then(() => (init_bridgePointer(), exports_bridgePointer));
         await clearBridgePointer2(resumePointerDir);
       }
-      console.error(`Error: Session ${resumeSessionId} not found. It may have been archived or expired, or your login may have lapsed (run \`claude /login\`).`);
+      console.error(`Error: Session ${resumeSessionId} not found. It may have been archived or expired, or your login may have lapsed (run \`occ /login\`).`);
       process.exit(1);
     }
     if (!session2.environment_id) {
@@ -733234,7 +733250,7 @@ async function runBridgeHeadless(opts, signal) {
   const { initSinks: initSinks2 } = await Promise.resolve().then(() => (init_sinks(), exports_sinks));
   initSinks2();
   if (!checkHasTrustDialogAccepted2()) {
-    throw new BridgeHeadlessPermanentError(`Workspace not trusted: ${dir}. Run \`claude\` in that directory first to accept the trust dialog.`);
+    throw new BridgeHeadlessPermanentError(`Workspace not trusted: ${dir}. Run \`occ\` in that directory first to accept the trust dialog.`);
   }
   if (!opts.getAccessToken()) {
     throw new Error(BRIDGE_LOGIN_ERROR);
@@ -733533,7 +733549,7 @@ function scheduledStatusPath() {
   return join172(getClaudeConfigHomeDir(), "daemon.scheduled.status.json");
 }
 function printDaemonUsage() {
-  console.log(`Usage: claude daemon <subcommand>
+  console.log(`Usage: occ daemon <subcommand>
 
 Subcommands:
   start              Start the supervisor (default)
@@ -733566,7 +733582,7 @@ async function daemonSubcommand(sub, args) {
       } else {
         const res = await stopExistingSupervisor();
         if (res.holder && !res.stopped) {
-          console.error("Run `claude daemon stop --any` to stop any background sessions and report on the holder");
+          console.error("Run `occ daemon stop --any` to stop any background sessions and report on the holder");
           process.exitCode = 1;
         } else if (res.stopped && res.holder) {
           console.log(`Stopped daemon (pid=${res.holder.supervisorPid}).`);
@@ -733599,7 +733615,7 @@ async function daemonSubcommand(sub, args) {
       const { connectRemoteControlClient: connectRemoteControlClient2, resolveRemoteControlEndpoint: resolveRemoteControlEndpoint2 } = await Promise.resolve().then(() => (init_remoteControlClient(), exports_remoteControlClient));
       const endpoint3 = await resolveRemoteControlEndpoint2();
       if (!endpoint3) {
-        console.log("remote-control: daemon not running or RC server not configured. Run `claude daemon start` first.");
+        console.log("remote-control: daemon not running or RC server not configured. Run `occ daemon start` first.");
         break;
       }
       try {
@@ -733677,7 +733693,7 @@ async function logsHandlerDaemon() {
 async function scheduledHandler(args) {
   const op = args[0];
   if (op !== "add" && op !== "remove" && op !== "rm" && op !== "list") {
-    console.error("Usage: claude daemon scheduled add|remove <task-id> [--schedule <cron>] [--prompt <text>]");
+    console.error("Usage: occ daemon scheduled add|remove <task-id> [--schedule <cron>] [--prompt <text>]");
     process.exitCode = 1;
     return;
   }
@@ -733753,7 +733769,7 @@ function writeScheduledConfig(tasks2) {
   });
 }
 async function renderDaemonHubStandalone() {
-  console.log("Claude daemon hub");
+  console.log("OCC daemon hub");
   await statusHandler();
   console.log(`
 (Press q to quit \u2014 interactive hub is a follow-up.)`);
@@ -742273,7 +742289,7 @@ async function initReplBridge(options) {
     const versionError2 = await checkEnvLessBridgeMinVersion();
     if (versionError2) {
       logBridgeSkip("version_too_old", `[bridge:repl] Skipping: ${versionError2}`, true);
-      onStateChange?.("failed", "run `claude update` to upgrade");
+      onStateChange?.("failed", "run `occ update` to upgrade");
       return null;
     }
     logForDebugging("[bridge:repl] Using env-less bridge path (tengu_bridge_repl_v2)");
@@ -742302,7 +742318,7 @@ async function initReplBridge(options) {
   const versionError = checkBridgeMinVersion();
   if (versionError) {
     logBridgeSkip("version_too_old", `[bridge:repl] Skipping: ${versionError}`);
-    onStateChange?.("failed", "run `claude update` to upgrade");
+    onStateChange?.("failed", "run `occ update` to upgrade");
     return null;
   }
   const branch2 = await getBranch();
@@ -759166,7 +759182,7 @@ function AutoUpdater({
           "\u2717 Auto-update failed \xB7 Try ",
           /* @__PURE__ */ jsx_runtime405.jsx(ThemedText, {
             bold: true,
-            children: "claude doctor"
+            children: "occ doctor"
           }),
           " or",
           " ",
@@ -792175,6 +792191,7 @@ async function getRelevantTips(context8) {
 var _isOfficialMarketplaceInstalledCache, externalTips, internalOnlyTips;
 var init_tipRegistry = __esm(() => {
   init_source();
+  init_cli();
   init_debug();
   init_fileHistory();
   init_settings2();
@@ -792439,7 +792456,7 @@ var init_tipRegistry = __esm(() => {
     },
     {
       id: "continue",
-      content: async () => "Run claude --continue or claude --resume to resume a conversation",
+      content: async () => `Run ${CLI_BINARY_NAME} --continue or ${CLI_BINARY_NAME} --resume to resume a conversation`,
       cooldownSessions: 10,
       isRelevant: async () => true
     },
@@ -796104,7 +796121,7 @@ async function _temp294() {
     priority: "high"
   };
 }
-var NPM_DEPRECATION_MESSAGE = "Claude Code has switched from npm to native installer. Run `claude install` or see https://docs.anthropic.com/en/docs/claude-code/getting-started for more options.";
+var NPM_DEPRECATION_MESSAGE = "OCC has switched from npm to native installer. Run `occ install` or see https://docs.anthropic.com/en/docs/claude-code/getting-started for more options.";
 var init_useNpmDeprecationNotification = __esm(() => {
   init_doctorDiagnostic();
   init_envUtils();
@@ -807874,7 +807891,7 @@ function TeleportRepoMismatchDialog(t0) {
             }),
             /* @__PURE__ */ jsx_runtime494.jsxs(ThemedText, {
               children: [
-                "Open Claude Code in ",
+                "Open OCC in ",
                 /* @__PURE__ */ jsx_runtime494.jsx(ThemedText, {
                   bold: true,
                   children: targetRepo
@@ -807907,7 +807924,7 @@ function TeleportRepoMismatchDialog(t0) {
         /* @__PURE__ */ jsx_runtime494.jsxs(ThemedText, {
           dimColor: true,
           children: [
-            "Run claude --teleport from a checkout of ",
+            "Run occ --teleport from a checkout of ",
             targetRepo
           ]
         })
@@ -808875,7 +808892,7 @@ ${tail}
 
 Debug logging was OFF for this session until now. Nothing prior to this /debug invocation was captured.
 
-Tell the user that debug logging is now active at \`${debugLogPath}\`, ask them to reproduce the issue, then re-read the log. If they can't reproduce, they can also restart with \`claude --debug\` to capture logs from startup.
+Tell the user that debug logging is now active at \`${debugLogPath}\`, ask them to reproduce the issue, then re-read the log. If they can't reproduce, they can also restart with \`occ --debug\` to capture logs from startup.
 `;
       const prompt = `# Debug Skill
 
@@ -810182,7 +810199,7 @@ function generateSettingsSchema() {
 function registerUpdateConfigSkill() {
   registerBundledSkill({
     name: "update-config",
-    description: 'Use this skill to configure the Claude Code harness via settings.json. Automated behaviors ("from now on when X", "each time X", "whenever X", "before/after X") require hooks configured in settings.json - the harness executes these, not Claude, so memory/preferences cannot fulfill them. Also use for: permissions ("allow X", "add permission", "move permission to"), env vars ("set X=Y"), hook troubleshooting, or any changes to settings.json/settings.local.json files. Examples: "allow npm commands", "add bq permission to global settings", "move permission to user settings", "set DEBUG=true", "when claude stops show X". For simple settings like theme/model, use Config tool.',
+    description: 'Use this skill to configure the OCC harness via settings.json. Automated behaviors ("from now on when X", "each time X", "whenever X", "before/after X") require hooks configured in settings.json - the harness executes these, not the model, so memory/preferences cannot fulfill them. Also use for: permissions ("allow X", "add permission", "move permission to"), env vars ("set X=Y"), hook troubleshooting, or any changes to settings.json/settings.local.json files. Examples: "allow npm commands", "add bq permission to global settings", "move permission to user settings", "set DEBUG=true", "when OCC stops show X". For simple settings like theme/model, use Config tool.',
     allowedTools: ["Read"],
     userInvocable: true,
     async getPromptForCommand(args) {
@@ -810643,7 +810660,7 @@ If a hook isn't running:
 3. **Check the matcher** - Does it match the tool name? (e.g., "Bash", "Write", "Edit")
 4. **Check hook type** - Is it "command", "prompt", or "agent"?
 5. **Test the command** - Run the hook command manually to see if it works
-6. **Use --debug** - Run \`claude --debug\` to see hook execution logs
+6. **Use --debug** - Run \`occ --debug\` to see hook execution logs
 `;
 });
 
@@ -810707,7 +810724,7 @@ tmp dir / a mock / a dry-run flag. If there's no safe mode and the
 diff touches the destructive path, say so and verify what you can
 around it.</p>
 `;
-var init_cli = () => {};
+var init_cli2 = () => {};
 
 // src/skills/bundled/verify/examples/server.md
 var server_default = `<h1>Verifying a server/API change</h1>
@@ -811005,7 +811022,7 @@ var init_SKILL = () => {};
 // src/skills/bundled/verifyContent.ts
 var SKILL_MD, SKILL_FILES;
 var init_verifyContent = __esm(() => {
-  init_cli();
+  init_cli2();
   init_server2();
   init_SKILL();
   SKILL_MD = SKILL_default;
@@ -812137,24 +812154,24 @@ function registerMcpAddCommand(mcp2) {
 
 ` + `Examples:
 ` + `  # Add HTTP server:
-` + `  claude mcp add --transport http sentry https://mcp.sentry.dev/mcp
+` + `  occ mcp add --transport http sentry https://mcp.sentry.dev/mcp
 
 ` + `  # Add HTTP server with headers:
-` + `  claude mcp add --transport http corridor https://app.corridor.dev/api/mcp --header "Authorization: Bearer ..."
+` + `  occ mcp add --transport http corridor https://app.corridor.dev/api/mcp --header "Authorization: Bearer ..."
 
 ` + `  # Add stdio server with environment variables:
-` + `  claude mcp add my-server -e API_KEY=xxx -- npx my-mcp-server
+` + `  occ mcp add my-server -e API_KEY=xxx -- npx my-mcp-server
 
 ` + `  # Add stdio server with subprocess flags:
-` + "  claude mcp add my-server -- my-command --some-flag arg1").option("-s, --scope <scope>", "Configuration scope (local, user, or project)", "local").option("-t, --transport <transport>", "Transport type (stdio, sse, http). Defaults to stdio if not specified.").option("-e, --env <env...>", "Set environment variables (e.g. -e KEY=value)").option("-H, --header <header...>", 'Set WebSocket headers (e.g. -H "X-Api-Key: abc123" -H "X-Custom: value")').option("--client-id <clientId>", "OAuth client ID for HTTP/SSE servers").option("--client-secret", "Prompt for OAuth client secret (or set MCP_CLIENT_SECRET env var)").option("--callback-port <port>", "Fixed port for OAuth callback (for servers requiring pre-registered redirect URIs)").helpOption("-h, --help", "Display help for command").addOption(new Option("--xaa", "Enable XAA (SEP-990) for this server. Requires 'claude mcp xaa setup' first. Also requires --client-id and --client-secret (for the MCP server's AS).").hideHelp(!isXaaEnabled())).action(async (name3, commandOrUrl, args, options) => {
+` + "  occ mcp add my-server -- my-command --some-flag arg1").option("-s, --scope <scope>", "Configuration scope (local, user, or project)", "local").option("-t, --transport <transport>", "Transport type (stdio, sse, http). Defaults to stdio if not specified.").option("-e, --env <env...>", "Set environment variables (e.g. -e KEY=value)").option("-H, --header <header...>", 'Set WebSocket headers (e.g. -H "X-Api-Key: abc123" -H "X-Custom: value")').option("--client-id <clientId>", "OAuth client ID for HTTP/SSE servers").option("--client-secret", "Prompt for OAuth client secret (or set MCP_CLIENT_SECRET env var)").option("--callback-port <port>", "Fixed port for OAuth callback (for servers requiring pre-registered redirect URIs)").helpOption("-h, --help", "Display help for command").addOption(new Option("--xaa", "Enable XAA (SEP-990) for this server. Requires 'occ mcp xaa setup' first. Also requires --client-id and --client-secret (for the MCP server's AS).").hideHelp(!isXaaEnabled())).action(async (name3, commandOrUrl, args, options) => {
     const actualCommand = commandOrUrl;
     const actualArgs = args;
     if (!name3) {
       cliError(`Error: Server name is required.
-` + "Usage: claude mcp add <name> <command> [args...]");
+` + "Usage: occ mcp add <name> <command> [args...]");
     } else if (!actualCommand) {
       cliError(`Error: Command is required when server name is provided.
-` + "Usage: claude mcp add <name> <command> [args...]");
+` + "Usage: occ mcp add <name> <command> [args...]");
     }
     try {
       const scope = ensureConfigScope(options.scope);
@@ -812170,7 +812187,7 @@ function registerMcpAddCommand(mcp2) {
         if (!options.clientSecret)
           missing.push("--client-secret");
         if (!getXaaIdpSettings()) {
-          missing.push("'claude mcp xaa setup' (settings.xaaIdp not configured)");
+          missing.push("'occ mcp xaa setup' (settings.xaaIdp not configured)");
         }
         if (missing.length) {
           cliError(`Error: --xaa requires: ${missing.join(", ")}`);
@@ -812251,9 +812268,9 @@ function registerMcpAddCommand(mcp2) {
           process.stderr.write(`
 Warning: The command "${actualCommand}" looks like a URL, but is being interpreted as a stdio server as --transport was not specified.
 `);
-          process.stderr.write(`If this is an HTTP server, use: claude mcp add --transport http ${name3} ${actualCommand}
+          process.stderr.write(`If this is an HTTP server, use: occ mcp add --transport http ${name3} ${actualCommand}
 `);
-          process.stderr.write(`If this is an SSE server, use: claude mcp add --transport sse ${name3} ${actualCommand}
+          process.stderr.write(`If this is an SSE server, use: occ mcp add --transport sse ${name3} ${actualCommand}
 `);
         }
         const env7 = parseEnvVars(options.env);
@@ -812332,7 +812349,7 @@ function registerMcpXaaIdpCommand(mcp2) {
   xaaIdp.command("login").description("Cache an IdP id_token so XAA-enabled MCP servers authenticate " + "silently. Default: run the OIDC browser login. With --id-token: " + "write a pre-obtained JWT directly (used by conformance/e2e tests " + "where the mock IdP does not serve /authorize).").option("--force", "Ignore any cached id_token and re-login (useful after IdP-side revocation)").option("--id-token <jwt>", "Write this pre-obtained id_token directly to cache, skipping the OIDC browser login").action(async (options) => {
     const idp = getXaaIdpSettings();
     if (!idp) {
-      return cliError("Error: no XAA IdP connection. Run 'claude mcp xaa setup' first.");
+      return cliError("Error: no XAA IdP connection. Run 'occ mcp xaa setup' first.");
     }
     if (options.idToken) {
       const expiresAt = saveIdpIdTokenFromJwt(idp.issuer, options.idToken);
@@ -812381,7 +812398,7 @@ function registerMcpXaaIdpCommand(mcp2) {
     }
     process.stdout.write(`Client secret: ${hasSecret ? "(stored in keychain)" : "(not set \u2014 PKCE-only)"}
 `);
-    process.stdout.write(`Logged in:     ${hasIdToken ? "yes (id_token cached)" : "no \u2014 run 'claude mcp xaa login'"}
+    process.stdout.write(`Logged in:     ${hasIdToken ? "yes (id_token cached)" : "no \u2014 run 'occ mcp xaa login'"}
 `);
     cliOk();
   });
@@ -818323,7 +818340,7 @@ async function loadInitialMessages(setAppState, options) {
       logEvent2("tengu_resume_print", {});
       const parsedSessionId = parseSessionIdentifier(typeof options.resume === "string" ? options.resume : "");
       if (!parsedSessionId) {
-        let errorMessage3 = "Error: --resume requires a valid session ID when used with --print. Usage: claude -p --resume <session-id>";
+        let errorMessage3 = `Error: --resume requires a valid session ID when used with --print. Usage: ${CLI_BINARY_NAME} -p --resume <session-id>`;
         if (typeof options.resume === "string") {
           errorMessage3 += `. Session IDs must be in UUID format (e.g., 550e8400-e29b-41d4-a716-446655440000). Provided value "${options.resume}" is not a valid UUID`;
         }
@@ -818705,6 +818722,7 @@ var init_print = __esm(() => {
   init_omit();
   init_reject2();
   init_policyLimits();
+  init_cli();
   init_bridgeStatusUtil();
   init_inboundMessages();
   init_inboundAttachments();
@@ -820045,7 +820063,7 @@ async function mcpRemoveHandler(name3, options) {
 To remove from a specific scope, use:
 `);
       scopes.forEach((scope) => {
-        process.stderr.write(`  claude mcp remove "${name3}" -s ${scope}
+        process.stderr.write(`  occ mcp remove "${name3}" -s ${scope}
 `);
       });
       cliError();
@@ -820060,7 +820078,7 @@ async function mcpListHandler() {
     servers: configs
   } = await getAllMcpConfigs();
   if (Object.keys(configs).length === 0) {
-    console.log("No MCP servers configured. Use `claude mcp add` to add a server.");
+    console.log("No MCP servers configured. Use `occ mcp add` to add a server.");
   } else {
     console.log(`Checking MCP server health\u2026
 `);
@@ -820158,7 +820176,7 @@ async function mcpGetHandler(name3) {
     }
   }
   console.log(`
-To remove this server, run: claude mcp remove "${name3}" -s ${server.scope}`);
+To remove this server, run: occ mcp remove "${name3}" -s ${server.scope}`);
   await gracefulShutdown(0);
 }
 async function mcpAddJsonHandler(name3, json2, options) {
@@ -820567,7 +820585,7 @@ async function pluginListHandler(options) {
   }
   if (pluginIds.length === 0 && inlinePlugins.length === 0) {
     if (inlineLoadErrors.length === 0) {
-      cliOk("No plugins installed. Use `claude plugin install` to install a plugin.");
+      cliOk("No plugins installed. Use `occ plugin install` to install a plugin.");
     }
   }
   if (pluginIds.length > 0) {
@@ -821185,7 +821203,7 @@ function Install({
                 /* @__PURE__ */ jsx_runtime501.jsx(ThemedText, {
                   color: "claude",
                   bold: true,
-                  children: "claude --help"
+                  children: "occ --help"
                 }),
                 /* @__PURE__ */ jsx_runtime501.jsx(ThemedText, {
                   dimColor: true,
@@ -821468,7 +821486,7 @@ async function agentsDashboard(json2) {
   if (rows.length === 0) {
     console.log("No background sessions found.");
     console.log(`
-Start the daemon with: claude daemon start`);
+Start the daemon with: occ daemon start`);
     return;
   }
   const running2 = rows.filter((r4) => r4.alive).length;
@@ -821895,7 +821913,7 @@ async function autoModeCritiqueHandler(options) {
     process.stdout.write(`No custom auto mode rules found.
 
 ` + `Add rules to your settings file under autoMode.{allow, soft_deny, environment}.
-` + "Run `claude auto-mode defaults` to see the default rules for reference.\n");
+` + "Run `occ auto-mode defaults` to see the default rules for reference.\n");
     return;
   }
   const model = options.model ? parseUserSpecifiedModel(options.model) : getMainLoopModel();
@@ -822080,7 +822098,7 @@ async function autoModeResetHandler(options, deps = defaultAutoModeResetDeps, st
   }
   emitResetMetric("success");
   stdout(`Auto mode configuration reset to defaults \u2014 autoMode section removed from ${path43}.
-Run \`claude auto-mode config\` to see the effective rules.
+Run \`occ auto-mode config\` to see the effective rules.
 `);
 }
 var CRITIQUE_SYSTEM_PROMPT, defaultStdout = (message) => {
@@ -822328,7 +822346,7 @@ async function update2() {
 `);
       process.stderr.write(String(error52) + `
 `);
-      process.stderr.write(`Try running "claude doctor" for diagnostics
+      process.stderr.write(`Try running "occ doctor" for diagnostics
 `);
       await gracefulShutdown(1);
     }
@@ -822443,7 +822461,7 @@ async function update2() {
       } else {
         process.stderr.write(`Try running with sudo or fix npm permissions
 `);
-        process.stderr.write(`Or consider using native installation with: claude install
+        process.stderr.write(`Or consider using native installation with: occ install
 `);
       }
       await gracefulShutdown(1);
@@ -822457,7 +822475,7 @@ async function update2() {
         process.stderr.write(`  cd ~/.claude/local && npm update ${MACRO.PACKAGE_URL}
 `);
       } else {
-        process.stderr.write(`Or consider using native installation with: claude install
+        process.stderr.write(`Or consider using native installation with: occ install
 `);
       }
       await gracefulShutdown(1);
@@ -822872,7 +822890,7 @@ async function main() {
       }
       const rest = rawCliArgs.slice(consumed);
       if (rest.includes("-p") || rest.includes("--print")) {
-        process.stderr.write(`Error: headless (-p/--print) mode is not supported with claude ssh
+        process.stderr.write(`Error: headless (-p/--print) mode is not supported with occ ssh
 `);
         gracefulShutdownSync(1);
         return;
@@ -823075,7 +823093,7 @@ async function run() {
     }
     if (prompt === "code") {
       logEvent2("tengu_code_prompt_ignored", {});
-      console.warn(source_default.yellow("Tip: You can launch Claude Code with just `claude`"));
+      console.warn(source_default.yellow("Tip: You can launch OCC with just `occ`"));
       prompt = undefined;
     }
     if (prompt && typeof prompt === "string" && !/\s/.test(prompt) && prompt.length > 0) {
@@ -824754,7 +824772,7 @@ Auth: unix socket -R \u2192 local proxy`, "info");
             await gracefulShutdown(0);
             process.exit(0);
           }
-          return await exitWithMessage2(root3, `Assistant installed in ${installedDir}. The daemon is starting up \u2014 run \`claude assistant\` again in a few seconds to connect.`, {
+          return await exitWithMessage2(root3, `Assistant installed in ${installedDir}. The daemon is starting up \u2014 run \`occ assistant\` again in a few seconds to connect.`, {
             exitCode: 0,
             beforeExit: () => gracefulShutdown(0)
           });
@@ -824856,7 +824874,7 @@ Auth: unix socket -R \u2192 local proxy`, "info");
         const isRemoteTuiEnabled = getFeatureValue_CACHED_MAY_BE_STALE("tengu_remote_backend", false);
         if (!isRemoteTuiEnabled && !hasInitialPrompt) {
           return await exitWithError2(root3, `Error: --remote requires a description.
-Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
+Usage: occ --remote "your task description"`, () => gracefulShutdown(1));
         }
         logEvent2("tengu_remote_create_session", {
           has_initial_prompt: String(hasInitialPrompt)
@@ -824877,7 +824895,7 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
 `);
           process.stdout.write(`View: ${getRemoteSessionUrl(createdSession.id)}?m=0
 `);
-          process.stdout.write(`Resume with: claude --teleport ${createdSession.id}
+          process.stdout.write(`Resume with: occ --teleport ${createdSession.id}
 `);
           await gracefulShutdown(0);
           process.exit(0);
@@ -824961,7 +824979,7 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
                     await gracefulShutdown(0);
                   }
                 } else {
-                  throw new TeleportOperationError(`You must run claude --teleport ${teleport} from a checkout of ${sessionRepo}.`, source_default.red(`You must run claude --teleport ${teleport} from a checkout of ${source_default.bold(sessionRepo)}.
+                  throw new TeleportOperationError(`You must run occ --teleport ${teleport} from a checkout of ${sessionRepo}.`, source_default.red(`You must run occ --teleport ${teleport} from a checkout of ${source_default.bold(sessionRepo)}.
 `));
                 }
               }
@@ -825258,7 +825276,7 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
       } = await Promise.resolve().then(() => exports_lockfile2);
       const existing = await probeRunningServer2();
       if (existing) {
-        process.stderr.write(`A claude server is already running (pid ${existing.pid}) at ${existing.httpUrl}
+        process.stderr.write(`An OCC server is already running (pid ${existing.pid}) at ${existing.httpUrl}
 `);
         process.exit(1);
       }
@@ -825304,10 +825322,10 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
   }
   if (feature("SSH_REMOTE")) {
     program3.command("ssh <host> [dir]").description("Run Claude Code on a remote host over SSH. Deploys the binary and " + "tunnels API auth back through your local machine \u2014 no remote setup needed.").option("--permission-mode <mode>", "Permission mode for the remote session").option("--dangerously-skip-permissions", "Skip all permission prompts on the remote (dangerous)").option("--local", "e2e test mode \u2014 spawn the child CLI locally (skip ssh/deploy). " + "Exercises the auth proxy and unix-socket plumbing without a remote host.").action(async () => {
-      process.stderr.write(`Usage: claude ssh <user@host | ssh-config-alias> [dir]
+      process.stderr.write(`Usage: occ ssh <user@host | ssh-config-alias> [dir]
 
-Runs Claude Code on a remote Linux host. You don't need to install
-` + "anything on the remote or run `claude auth login` there \u2014 the binary is\n" + `deployed over SSH and API auth tunnels back through your local machine.
+Runs OCC on a remote Linux host. You don't need to install
+` + "anything on the remote or run `occ auth login` there \u2014 the binary is\n" + `deployed over SSH and API auth tunnels back through your local machine.
 `);
       process.exit(1);
     });
@@ -825599,7 +825617,7 @@ Runs Claude Code on a remote Linux host. You don't need to install
   }
   if (feature("KAIROS")) {
     program3.command("assistant [sessionId]").description("Attach the REPL as a client to a running bridge session. Discovers sessions via API if no sessionId given.").action(() => {
-      process.stderr.write(`Usage: claude assistant [sessionId]
+      process.stderr.write(`Usage: occ assistant [sessionId]
 
 Attach the REPL as a viewer client to a running bridge session.
 Omit sessionId to discover and pick from available sessions.
@@ -825947,6 +825965,7 @@ var feature2 = (name3) => _FEATURE_ALLOWLIST.has(name3);
 if (typeof globalThis.MACRO === "undefined") {
   globalThis.MACRO = {
     VERSION: "2.1.270",
+    BINARY_NAME: "occ",
     BUILD_TIME: new Date().toISOString(),
     FEEDBACK_CHANNEL: "",
     ISSUES_EXPLAINER: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.281",
+  "version": "2.1.282",
   "license": "MIT",
   "type": "module",
   "bin": {