fix: lazy-load all Anthropic-internal packages and add missing deps

- Convert static imports of @ant/computer-use-mcp,
  @ant/claude-for-chrome-mcp, @ant/computer-use-input, and
  color-diff-napi to lazy require() with no-op fallbacks
- Add cli-boxes and qrcode as runtime dependencies
- Prevents "Cannot find package" errors in Next.js and other
  bundled environments where internal packages are unavailable

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

README.md

@@ -18,6 +18,14 @@ Set your API key:
 export ANTHROPIC_API_KEY=your-api-key
 ```
 
+Or use a third-party provider like [OpenRouter](https://openrouter.ai/):
+
+```sh
+export ANTHROPIC_BASE_URL=https://openrouter.ai/api
+export ANTHROPIC_API_KEY=your-openrouter-api-key
+export ANTHROPIC_MODEL=anthropic/claude-sonnet-4-6
+```
+
 ## Quick start
 
 ### One-shot query (compatible with official SDK)
@@ -312,6 +320,16 @@ npx tsx examples/01-simple-query.ts
 
 File issues at [github.com/shipany-ai/open-agent-sdk/issues](https://github.com/shipany-ai/open-agent-sdk/issues).
 
+## Contributors
+
+<a href="https://github.com/shipany-ai/open-agent-sdk/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=shipany-ai/open-agent-sdk" />
+</a>
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=shipany-ai/open-agent-sdk&type=Timeline)](https://star-history.com/#shipany-ai/open-agent-sdk&Timeline)
+
 ## License
 
 MIT

examples/01-simple-query.ts

@@ -12,7 +12,7 @@ async function main() {
   console.log('--- Example 1: Simple Query ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 10,
   })
 

examples/02-multi-tool.ts

@@ -12,7 +12,7 @@ async function main() {
   console.log('--- Example 2: Multi-Tool Orchestration ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 15,
   })
 

examples/03-multi-turn.ts

@@ -12,7 +12,7 @@ async function main() {
   console.log('--- Example 3: Multi-Turn Conversation ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 5,
   })
 

examples/04-prompt-api.ts

@@ -12,7 +12,7 @@ async function main() {
   console.log('--- Example 4: Simple Prompt API ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 5,
   })
 

examples/05-custom-system-prompt.ts

@@ -11,7 +11,7 @@ async function main() {
   console.log('--- Example 5: Custom System Prompt ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 5,
     systemPrompt:
       'You are a senior code reviewer. When asked to review code, focus on: ' +

examples/06-mcp-server.ts

@@ -16,7 +16,7 @@ async function main() {
   console.log('--- Example 6: MCP Server Integration ---\n')
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 10,
     mcpServers: {
       filesystem: {

examples/07-custom-tools.ts

@@ -92,7 +92,7 @@ async function main() {
   const allTools = [...builtinTools, weatherTool, calculatorTool]
 
   const agent = createAgent({
-    model: 'claude-sonnet-4-6',
+    model: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-6',
     maxTurns: 10,
     tools: allTools,
   })

package.json

@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/shipany-ai/open-agent-sdk/issues"
   },
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Open-source Agent SDK inspired by @anthropic-ai/claude-agent-sdk. Runs the agent loop in-process — no local CLI required. Deploy anywhere: cloud, serverless, Docker, CI/CD.",
   "type": "module",
   "main": "./dist/sdk.js",
@@ -38,6 +38,7 @@
     "dev:watch": "tsc --watch",
     "test": "node --experimental-vm-modules node_modules/.bin/vitest run",
     "lint": "tsc --noEmit",
+    "postinstall": "node scripts/create-shims.mjs",
     "prepublishOnly": "npm run build"
   },
   "engines": {
@@ -57,6 +58,7 @@
     "@opentelemetry/sdk-metrics": "^2.6.1",
     "@opentelemetry/sdk-trace-base": "^2.6.1",
     "@opentelemetry/semantic-conventions": "^1.40.0",
+    "@shipany/open-agent-sdk": "^0.1.4",
     "ajv": "^8.17.0",
     "asciichart": "^1.5.25",
     "auto-bind": "^5.0.1",
@@ -64,6 +66,7 @@
     "bidi-js": "^1.0.0",
     "chalk": "^5.3.0",
     "chokidar": "^4.0.0",
+    "cli-boxes": "^4.0.1",
     "cli-highlight": "^2.1.11",
     "code-excerpt": "^4.0.0",
     "commander": "^12.1.0",
@@ -87,6 +90,7 @@
     "p-map": "^7.0.0",
     "picomatch": "^4.0.0",
     "proper-lockfile": "^4.1.2",
+    "qrcode": "^1.5.4",
     "react": "^19.2.4",
     "react-reconciler": "^0.32.0",
     "semver": "^7.6.0",

scripts/create-shims.mjs

@@ -0,0 +1,168 @@
+#!/usr/bin/env node
+/**
+ * Creates stub/shim packages for optional dependencies that are not available.
+ * These are Anthropic-internal packages, cloud SDKs, native addons, etc.
+ * Run automatically after npm install via postinstall hook.
+ */
+import { mkdirSync, writeFileSync, existsSync } from 'fs'
+import { join } from 'path'
+
+const nodeModules = join(import.meta.dirname, '..', 'node_modules')
+
+const noop = 'function noop() {}'
+const noopAsync = 'async function noopAsync() {}'
+const noopClass = 'class NoopClass {}'
+
+// Map of package name to module source code
+const shims = {
+  'color-diff-napi': `
+export class ColorDiff {}
+export class ColorFile {}
+export function getSyntaxTheme() { return {}; }
+export default {};
+`,
+  '@ant/computer-use-mcp': `
+export const BROWSER_TOOLS = [];
+export const API_RESIZE_PARAMS = {};
+export const DEFAULT_GRANT_FLAGS = {};
+export function buildComputerUseTools() { return []; }
+export function createComputerUseMcpServer() {}
+export function bindSessionContext() {}
+export function targetImageSize() {}
+export function getSentinelCategory() {}
+export default {};
+`,
+  '@ant/computer-use-swift': `export default {};`,
+  '@ant/computer-use-input': `export default {};`,
+  '@ant/claude-for-chrome-mcp': `
+export const BROWSER_TOOLS = [];
+export function createClaudeForChromeMcpServer() {}
+export default {};
+`,
+  '@anthropic-ai/sandbox-runtime': `
+export class SandboxManager {
+  static getSandboxUnavailableReason() { return undefined; }
+  static isSandboxRequired() { return false; }
+  static isSandboxingEnabled() { return false; }
+  static async initialize() {}
+  static getDependencyChecks() { return []; }
+}
+export class SandboxViolationStore {
+  getViolations() { return []; }
+  clear() {}
+}
+export const SandboxRuntimeConfigSchema = { parse: (x) => x, safeParse: (x) => ({ success: true, data: x }) };
+export default {};
+`,
+  '@anthropic-ai/bedrock-sdk': `
+export class AnthropicBedrock { constructor() {} }
+export default AnthropicBedrock;
+`,
+  '@anthropic-ai/foundry-sdk': `
+export class AnthropicFoundry { constructor() {} }
+export default AnthropicFoundry;
+`,
+  '@anthropic-ai/vertex-sdk': `
+export class AnthropicVertex { constructor() {} }
+export default AnthropicVertex;
+`,
+  '@anthropic-ai/mcpb': `
+export const McpbManifestSchema = { parse: (x) => x, safeParse: (x) => ({ success: true, data: x }) };
+export function getMcpConfigForManifest() { return {}; }
+export default {};
+`,
+  '@aws-sdk/client-bedrock': `
+export class BedrockClient { async send() { return {}; } }
+export class ListInferenceProfilesCommand { constructor() {} }
+export class GetInferenceProfileCommand { constructor() {} }
+export class ListFoundationModelsCommand { constructor() {} }
+export default {};
+`,
+  '@aws-sdk/client-bedrock-runtime': `
+export class BedrockRuntimeClient { async send() { return {}; } }
+export class CountTokensCommand { constructor() {} }
+export default {};
+`,
+  '@aws-sdk/client-sts': `
+export class STSClient { async send() { return {}; } }
+export class GetCallerIdentityCommand { constructor() {} }
+export default {};
+`,
+  '@aws-sdk/credential-provider-node': `
+export function defaultProvider() { return async () => ({}); }
+export default {};
+`,
+  '@azure/identity': `
+export class DefaultAzureCredential {}
+export function getBearerTokenProvider() { return async () => ''; }
+export default {};
+`,
+  '@smithy/core': `
+export class NoAuthSigner { async sign(req) { return req; } }
+export const middleware = {};
+export default {};
+`,
+  '@smithy/node-http-handler': `
+export class NodeHttpHandler { constructor() {} }
+export default {};
+`,
+  'audio-capture-napi': `export default {};`,
+  'modifiers-napi': `export default {};`,
+  'fflate': `
+export function zipSync() { return new Uint8Array(); }
+export function unzipSync() { return {}; }
+export default {};
+`,
+  'qrcode': `
+export function toString() { return Promise.resolve(''); }
+export default { toString };
+`,
+  'yaml': `
+export function parse(s) { return {}; }
+export function stringify(o) { return ''; }
+export default { parse, stringify };
+`,
+}
+
+// OpenTelemetry exporters - all follow the same pattern
+for (const suffix of [
+  'logs-otlp-grpc', 'logs-otlp-http', 'logs-otlp-proto',
+  'metrics-otlp-grpc', 'metrics-otlp-http', 'metrics-otlp-proto',
+  'prometheus',
+  'trace-otlp-grpc', 'trace-otlp-http', 'trace-otlp-proto',
+]) {
+  const name = `@opentelemetry/exporter-${suffix}`
+  const className = suffix.includes('metrics') ? 'OTLPMetricExporter'
+    : suffix.includes('logs') ? 'OTLPLogExporter'
+    : suffix.includes('prometheus') ? 'PrometheusExporter'
+    : 'OTLPTraceExporter'
+  shims[name] = `
+export class ${className} { constructor() {} shutdown() { return Promise.resolve(); } }
+export default {};
+`
+}
+
+let created = 0
+for (const [pkg, source] of Object.entries(shims)) {
+  const dir = join(nodeModules, pkg)
+  if (existsSync(join(dir, 'package.json'))) continue
+  mkdirSync(dir, { recursive: true })
+  writeFileSync(
+    join(dir, 'package.json'),
+    JSON.stringify({
+      name: pkg,
+      version: '0.0.0',
+      type: 'module',
+      main: 'index.js',
+      exports: {
+        '.': { import: './index.js', default: './index.js' },
+        './*': { import: './index.js', default: './index.js' },
+      },
+    }),
+  )
+  writeFileSync(join(dir, 'index.js'), source.trim() + '\n')
+  created++
+}
+if (created > 0) {
+  console.log(`Created ${created} shim packages for optional dependencies`)
+}

src/agent.ts

@@ -248,19 +248,23 @@ export class Agent {
 
   /**
    * Resolve options from env map (compatible with @anthropic-ai/claude-agent-sdk)
+   * and fall back to process.env for standard environment variables.
    */
   private resolveEnvOptions(): void {
     const env = this.options.env
-    if (!env) return
 
     if (!this.options.apiKey) {
-      this.options.apiKey = env.ANTHROPIC_API_KEY || env.ANTHROPIC_AUTH_TOKEN
+      this.options.apiKey =
+        env?.ANTHROPIC_API_KEY || env?.ANTHROPIC_AUTH_TOKEN ||
+        process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN
     }
-    if (!this.options.baseURL && env.ANTHROPIC_BASE_URL) {
-      this.options.baseURL = env.ANTHROPIC_BASE_URL
+    if (!this.options.baseURL) {
+      this.options.baseURL =
+        env?.ANTHROPIC_BASE_URL || process.env.ANTHROPIC_BASE_URL
     }
-    if (!this.options.model && env.ANTHROPIC_MODEL) {
-      this.options.model = env.ANTHROPIC_MODEL
+    if (!this.options.model) {
+      this.options.model =
+        env?.ANTHROPIC_MODEL || process.env.ANTHROPIC_MODEL
     }
   }
 

src/cli/print.ts

@@ -554,17 +554,12 @@ export async function runHeadless(
   // Start headless profiler for first turn
   headlessProfilerStartTurn()
   headlessProfilerCheckpoint('runHeadless_entry')
-  console.error('[DEBUG:print] runHeadless entered')
 
   // Check Grove requirements for non-interactive consumer subscribers
-  console.error('[DEBUG:print] before isQualifiedForGrove')
   if (await isQualifiedForGrove()) {
-    console.error('[DEBUG:print] grove qualified, checking...')
     await checkGroveForNonInteractive()
   }
-  console.error('[DEBUG:print] after grove check')
   headlessProfilerCheckpoint('after_grove_check')
-  console.error('[DEBUG:print] before structuredIO/sandbox');
 
   // Initialize GrowthBook so feature flags take effect in headless mode.
   // Without this, the disk cache is empty and all flags fall back to defaults.
@@ -684,7 +679,6 @@ export async function runHeadless(
   }
 
   headlessProfilerCheckpoint('before_loadInitialMessages')
-  console.error('[DEBUG:print] before loadInitialMessages')
   const appState = getAppState()
   const {
     messages: initialMessages,

src/components/StructuredDiff/colorDiff.ts

@@ -1,38 +1,47 @@
 // @ts-nocheck
-import {
-  ColorDiff,
-  ColorFile,
-  getSyntaxTheme as nativeGetSyntaxTheme,
-  type SyntaxTheme,
-} from 'color-diff-napi'
 import { isEnvDefinedFalsy } from '../../utils/envUtils.js'
 
-export type ColorModuleUnavailableReason = 'env'
+export type SyntaxTheme = any
+export type ColorModuleUnavailableReason = 'env' | 'missing'
+
+let _mod: any = null
+let _loaded = false
+function loadModule(): any {
+  if (!_loaded) {
+    _loaded = true
+    try { _mod = require('color-diff-napi') } catch { _mod = null }
+  }
+  return _mod
+}
 
 /**
  * Returns a static reason why the color-diff module is unavailable, or null if available.
  * 'env' = disabled via CLAUDE_CODE_SYNTAX_HIGHLIGHT
- *
- * The TS port of color-diff works in all build modes, so the only way to
- * disable it is via the env var.
+ * 'missing' = color-diff-napi package not installed
  */
 export function getColorModuleUnavailableReason(): ColorModuleUnavailableReason | null {
   if (isEnvDefinedFalsy(process.env.CLAUDE_CODE_SYNTAX_HIGHLIGHT)) {
     return 'env'
   }
+  if (!loadModule()) {
+    return 'missing'
+  }
   return null
 }
 
-export function expectColorDiff(): typeof ColorDiff | null {
-  return getColorModuleUnavailableReason() === null ? ColorDiff : null
+export function expectColorDiff(): any | null {
+  const mod = loadModule()
+  return getColorModuleUnavailableReason() === null ? mod?.ColorDiff : null
 }
 
-export function expectColorFile(): typeof ColorFile | null {
-  return getColorModuleUnavailableReason() === null ? ColorFile : null
+export function expectColorFile(): any | null {
+  const mod = loadModule()
+  return getColorModuleUnavailableReason() === null ? mod?.ColorFile : null
 }
 
 export function getSyntaxTheme(themeName: string): SyntaxTheme | null {
+  const mod = loadModule()
   return getColorModuleUnavailableReason() === null
-    ? nativeGetSyntaxTheme(themeName)
+    ? mod?.getSyntaxTheme?.(themeName)
     : null
 }

src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx

@@ -1,7 +1,58 @@
 import { c as _c } from '../../../shims/react-compiler-runtime.js';
-import { getSentinelCategory } from '@ant/computer-use-mcp/sentinelApps';
-import type { CuPermissionRequest, CuPermissionResponse } from '@ant/computer-use-mcp/types';
-import { DEFAULT_GRANT_FLAGS } from '@ant/computer-use-mcp/types';
+
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-mcp package is not installed.
+type CuPermissionRequest = any
+type CuPermissionResponse = any
+
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/computer-use-mcp sub-modules (optional dependency)
+// ---------------------------------------------------------------------------
+let _sentinelAppsModule: any = null
+let _sentinelAppsLoadAttempted = false
+
+function getSentinelAppsModule(): any {
+  if (!_sentinelAppsLoadAttempted) {
+    _sentinelAppsLoadAttempted = true
+    try {
+      _sentinelAppsModule = require('@ant/computer-use-mcp/sentinelApps')
+    } catch {
+      _sentinelAppsModule = null
+    }
+  }
+  return _sentinelAppsModule
+}
+
+function getSentinelCategory(...args: any[]): any {
+  const mod = getSentinelAppsModule()
+  return mod?.getSentinelCategory?.(...args) ?? null
+}
+
+let _computerUseMcpTypesModule: any = null
+let _computerUseMcpTypesLoadAttempted = false
+
+function getComputerUseMcpTypesModule(): any {
+  if (!_computerUseMcpTypesLoadAttempted) {
+    _computerUseMcpTypesLoadAttempted = true
+    try {
+      _computerUseMcpTypesModule = require('@ant/computer-use-mcp/types')
+    } catch {
+      _computerUseMcpTypesModule = null
+    }
+  }
+  return _computerUseMcpTypesModule
+}
+
+function getDEFAULT_GRANT_FLAGS(): any {
+  const mod = getComputerUseMcpTypesModule()
+  if (!mod?.DEFAULT_GRANT_FLAGS) {
+    // Provide a sensible fallback
+    return { clipboardRead: false, clipboardWrite: false, systemKeyCombos: false }
+  }
+  return mod.DEFAULT_GRANT_FLAGS
+}
+
+const DEFAULT_GRANT_FLAGS = getDEFAULT_GRANT_FLAGS();
 import figures from 'figures';
 import * as React from 'react';
 import { useMemo, useState } from 'react';

src/main.tsx

@@ -907,19 +907,15 @@ async function run(): Promise<CommanderCommand> {
   // not when displaying help. This avoids the need for env variable signaling.
   program.hook('preAction', async thisCommand => {
     profileCheckpoint('preAction_start');
-    console.error('[DEBUG] preAction start');
     // Await async subprocess loads started at module evaluation (lines 12-20).
     // Nearly free — subprocesses complete during the ~135ms of imports above.
     // Must resolve before init() which triggers the first settings read
     // (applySafeConfigEnvironmentVariables → getSettingsForSource('policySettings')
     // → isRemoteManagedSettingsEligible → sync keychain reads otherwise ~65ms).
-    console.error('[DEBUG] before MDM/keychain');
     await Promise.all([ensureMdmSettingsLoaded(), ensureKeychainPrefetchCompleted()]);
     profileCheckpoint('preAction_after_mdm');
-    console.error('[DEBUG] before init()');
     await init();
     profileCheckpoint('preAction_after_init');
-    console.error('[DEBUG] after init()');
 
     // process.title on Windows sets the console title directly; on POSIX,
     // terminal shell integration may mirror the process name to the tab.
@@ -1010,7 +1006,6 @@ async function run(): Promise<CommanderCommand> {
   // --plugin-dir takes exactly one arg; repeat the flag for multiple dirs.
   .option('--plugin-dir <path>', 'Load plugins from a directory for this session only (repeatable: --plugin-dir A --plugin-dir B)', (val: string, prev: string[]) => [...prev, val], [] as string[]).option('--disable-slash-commands', 'Disable all skills', () => true).option('--chrome', 'Enable Claude in Chrome integration').option('--no-chrome', 'Disable Claude in Chrome integration').option('--file <specs...>', 'File resources to download at startup. Format: file_id:relative_path (e.g., --file file_abc:doc.txt file_def:img.png)').action(async (prompt, options) => {
     profileCheckpoint('action_handler_start');
-    console.error('[DEBUG] action_handler_start');
 
     // --bare = one-switch minimal mode. Sets SIMPLE so all the existing
     // gates fire (CLAUDE.md, skills, hooks inside executeHooks, agent
@@ -1747,7 +1742,6 @@ async function run(): Promise<CommanderCommand> {
       }
     }
 
-    console.error('[DEBUG] before initializeToolPermissionContext');
     // This await replaces blocking existsSync/statSync calls that were already in
     // the startup path. Wall-clock time is unchanged; we just yield to the event
     // loop during the fs I/O instead of blocking it. See #19661.
@@ -1782,7 +1776,6 @@ async function run(): Promise<CommanderCommand> {
       // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.error(warning);
     });
-    console.error('[DEBUG] after initializeToolPermissionContext');
     void assertMinVersion();
 
     // claude.ai config fetch: -p mode only (interactive uses useManageMCPConnections
@@ -1866,22 +1859,17 @@ async function run(): Promise<CommanderCommand> {
       process.exit(1);
     }
     const effectivePrompt = prompt || '';
-    console.error('[DEBUG] before getInputPrompt, effectivePrompt=', JSON.stringify(effectivePrompt), 'isTTY=', process.stdin.isTTY);
     let inputPrompt = await getInputPrompt(effectivePrompt, (inputFormat ?? 'text') as 'text' | 'stream-json');
-    console.error('[DEBUG] after getInputPrompt');
     profileCheckpoint('action_after_input_prompt');
 
     // Activate proactive mode BEFORE getTools() so SleepTool.isEnabled()
     // (which returns isProactiveActive()) passes and Sleep is included.
     // The later REPL-path maybeActivateProactive() calls are idempotent.
-    console.error('[DEBUG] before getTools');
     maybeActivateProactive(options);
     let tools: any;
     try {
       tools = getTools(toolPermissionContext);
-      console.error('[DEBUG] after getTools, count=', tools.length);
     } catch (e: any) {
-      console.error('[DEBUG] getTools ERROR:', e.message, e.stack?.slice(0, 500));
       throw e;
     }
 
@@ -1921,7 +1909,6 @@ async function run(): Promise<CommanderCommand> {
     // IMPORTANT: setup() must be called before any other code that depends on the cwd or worktree setup
     profileCheckpoint('action_before_setup');
     logForDebugging('[STARTUP] Running setup()...');
-    console.error('[DEBUG] before setup()');
     const setupStart = Date.now();
     const {
       setup
@@ -1951,7 +1938,6 @@ async function run(): Promise<CommanderCommand> {
     commandsPromise?.catch(() => {});
     agentDefsPromise?.catch(() => {});
     await setupPromise;
-    console.error('[DEBUG] after setup()');
     logForDebugging(`[STARTUP] setup() completed in ${Date.now() - setupStart}ms`);
     profileCheckpoint('action_after_setup');
 
@@ -2047,7 +2033,6 @@ async function run(): Promise<CommanderCommand> {
     // Join the promises kicked before setup() (or start fresh if
     // worktreeEnabled gated the early kick). Both memoized by cwd.
     const [commands, agentDefinitionsResult] = await Promise.all([commandsPromise ?? getCommands(currentCwd), agentDefsPromise ?? getAgentDefinitionsWithOverrides(currentCwd)]);
-    console.error('[DEBUG] commands and agents loaded');
     logForDebugging(`[STARTUP] Commands and agents loaded in ${Date.now() - commandsStart}ms`);
     profileCheckpoint('action_commands_loaded');
 
@@ -2258,10 +2243,8 @@ async function run(): Promise<CommanderCommand> {
         durationMs: Math.round(process.uptime() * 1000)
       });
       logForDebugging('[STARTUP] Running showSetupScreens()...');
-      console.error('[DEBUG] before showSetupScreens() - isNonInteractive:', getIsNonInteractiveSession());
       const setupScreensStart = Date.now();
       const onboardingShown = await showSetupScreens(root, permissionMode, allowDangerouslySkipPermissions, commands, enableClaudeInChrome, devChannels);
-      console.error('[DEBUG] after showSetupScreens()');
       logForDebugging(`[STARTUP] showSetupScreens() completed in ${Date.now() - setupScreensStart}ms`);
 
       // Now that trust is established and GrowthBook has auth headers,
@@ -2579,9 +2562,7 @@ async function run(): Promise<CommanderCommand> {
       // skip — no-op
     } else if (isNonInteractiveSession) {
       // In headless mode, await to ensure plugin sync completes before CLI exits
-      console.error('[DEBUG] before initializeVersionedPlugins');
       await initializeVersionedPlugins();
-      console.error('[DEBUG] after initializeVersionedPlugins');
       profileCheckpoint('action_after_plugins_init');
       void cleanupOrphanedPluginVersionsInBackground().then(() => getGlobExclusionsForPluginCache());
     } else {
@@ -2635,10 +2616,8 @@ async function run(): Promise<CommanderCommand> {
       // rejection — this just prevents the spurious global handler fire.
       sessionStartHooksPromise?.catch(() => {});
       profileCheckpoint('before_validateForceLoginOrg');
-      console.error('[DEBUG] before validateForceLoginOrg');
       // Validate org restriction for non-interactive sessions
       const orgValidation = await validateForceLoginOrg();
-      console.error('[DEBUG] after validateForceLoginOrg');
       if (!orgValidation.valid) {
         process.stderr.write(orgValidation.message + '\n');
         process.exit(1);
@@ -2753,9 +2732,7 @@ async function run(): Promise<CommanderCommand> {
       // fetch was kicked off early (line ~2558) so only residual time blocks
       // here. --bare skips claude.ai entirely for perf-sensitive scripts.
       profileCheckpoint('before_connectMcp');
-      console.error('[DEBUG] before connectMcpBatch regular, count:', Object.keys(regularMcpConfigs).length);
       await connectMcpBatch(regularMcpConfigs, 'regular');
-      console.error('[DEBUG] after connectMcpBatch regular');
       profileCheckpoint('after_connectMcp');
       // Dedup: suppress plugin MCP servers that duplicate a claude.ai
       // connector (connector wins), then connect claude.ai servers.
@@ -2850,12 +2827,10 @@ async function run(): Promise<CommanderCommand> {
         }
       }
       logSessionTelemetry();
-      console.error('[DEBUG] before print import');
       profileCheckpoint('before_print_import');
       const {
         runHeadless
       } = await import('./cli/print.js');
-      console.error('[DEBUG] after print import, calling runHeadless');
       profileCheckpoint('after_print_import');
       void runHeadless(inputPrompt, () => headlessStore.getState(), headlessStore.setState, commandsHeadless, tools, sdkMcpConfigs, agentDefinitions.activeAgents, {
         continue: options.continue,

src/setup.ts

@@ -66,7 +66,6 @@ export async function setup(
   messagingSocketPath?: string,
 ): Promise<void> {
   logForDiagnosticsNoPII('info', 'setup_started')
-  console.error('[DEBUG:setup] entered')
 
   // Check for Node.js version < 18
   const nodeVersion = process.version.match(/^v(\d+)\./)?.[1]
@@ -111,17 +110,13 @@ export async function setup(
     captureTeammateModeSnapshot()
   }
 
-  console.error('[DEBUG:setup] before terminal backup checks, isNonInteractive:', getIsNonInteractiveSession())
   // Terminal backup restoration — interactive only. Print mode doesn't
   // interact with terminal settings; the next interactive session will
   // detect and restore any interrupted setup.
   if (!getIsNonInteractiveSession()) {
-    console.error('[DEBUG:setup] interactive mode - checking backups, swarmsEnabled:', isAgentSwarmsEnabled())
     // iTerm2 backup check only when swarms enabled
     if (isAgentSwarmsEnabled()) {
-      console.error('[DEBUG:setup] before iTerm2 backup check')
       const restoredIterm2Backup = await checkAndRestoreITerm2Backup()
-      console.error('[DEBUG:setup] after iTerm2 backup check')
       if (restoredIterm2Backup.status === 'restored') {
         // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(
@@ -140,10 +135,8 @@ export async function setup(
     }
 
     // Check and restore Terminal.app backup if setup was interrupted
-    console.error('[DEBUG:setup] before Terminal.app backup check')
     try {
       const restoredTerminalBackup = await checkAndRestoreTerminalBackup()
-      console.error('[DEBUG:setup] after Terminal.app backup check')
       if (restoredTerminalBackup.status === 'restored') {
         // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(
@@ -165,17 +158,13 @@ export async function setup(
     }
   }
 
-  console.error('[DEBUG:setup] before setCwd')
   // IMPORTANT: setCwd() must be called before any other code that depends on the cwd
   setCwd(cwd)
-  console.error('[DEBUG:setup] after setCwd')
 
-  console.error('[DEBUG:setup] before captureHooksConfigSnapshot')
   // Capture hooks configuration snapshot to avoid hidden hook modifications.
   // IMPORTANT: Must be called AFTER setCwd() so hooks are loaded from the correct directory
   const hooksStart = Date.now()
   captureHooksConfigSnapshot()
-  console.error('[DEBUG:setup] after captureHooksConfigSnapshot')
   logForDiagnosticsNoPII('info', 'setup_hooks_captured', {
     duration_ms: Date.now() - hooksStart,
   })

src/skills/bundled/claudeInChrome.ts

@@ -1,4 +1,27 @@
-import { BROWSER_TOOLS } from '@ant/claude-for-chrome-mcp'
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/claude-for-chrome-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _chromeModule: any = null
+let _chromeLoadAttempted = false
+
+function getChromeModule(): any {
+  if (!_chromeLoadAttempted) {
+    _chromeLoadAttempted = true
+    try {
+      _chromeModule = require('@ant/claude-for-chrome-mcp')
+    } catch {
+      _chromeModule = null
+    }
+  }
+  return _chromeModule
+}
+
+function getBROWSER_TOOLS(): any[] {
+  const mod = getChromeModule()
+  return mod?.BROWSER_TOOLS ?? []
+}
+
+const BROWSER_TOOLS = getBROWSER_TOOLS()
 import { BASE_CHROME_PROMPT } from '../../utils/claudeInChrome/prompt.js'
 import { shouldAutoEnableClaudeInChrome } from '../../utils/claudeInChrome/setup.js'
 import { registerBundledSkill } from '../bundledSkills.js'

src/utils/claudeInChrome/mcpServer.ts

@@ -1,9 +1,34 @@
-import {
-  type ClaudeForChromeContext,
-  createClaudeForChromeMcpServer,
-  type Logger,
-  type PermissionMode,
-} from '@ant/claude-for-chrome-mcp'
+// Types – declared locally so the file compiles even when the optional
+// @ant/claude-for-chrome-mcp package is not installed.
+type ClaudeForChromeContext = any
+type Logger = any
+type PermissionMode = any
+
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/claude-for-chrome-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _chromeModule: any = null
+let _chromeLoadAttempted = false
+
+function getChromeModule(): any {
+  if (!_chromeLoadAttempted) {
+    _chromeLoadAttempted = true
+    try {
+      _chromeModule = require('@ant/claude-for-chrome-mcp')
+    } catch {
+      _chromeModule = null
+    }
+  }
+  return _chromeModule
+}
+
+function createClaudeForChromeMcpServer(...args: any[]): any {
+  const mod = getChromeModule()
+  if (!mod?.createClaudeForChromeMcpServer) {
+    throw new Error('@ant/claude-for-chrome-mcp is not available')
+  }
+  return mod.createClaudeForChromeMcpServer(...args)
+}
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { format } from 'util'
 import { shutdownDatadog } from '../../services/analytics/datadog.js'

src/utils/claudeInChrome/setup.ts

@@ -1,4 +1,27 @@
-import { BROWSER_TOOLS } from '@ant/claude-for-chrome-mcp'
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/claude-for-chrome-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _chromeModule: any = null
+let _chromeLoadAttempted = false
+
+function getChromeModule(): any {
+  if (!_chromeLoadAttempted) {
+    _chromeLoadAttempted = true
+    try {
+      _chromeModule = require('@ant/claude-for-chrome-mcp')
+    } catch {
+      _chromeModule = null
+    }
+  }
+  return _chromeModule
+}
+
+function getBROWSER_TOOLS(): any[] {
+  const mod = getChromeModule()
+  return mod?.BROWSER_TOOLS ?? []
+}
+
+const BROWSER_TOOLS = getBROWSER_TOOLS()
 import { chmod, mkdir, readFile, writeFile } from 'fs/promises'
 import { homedir } from 'os'
 import { join } from 'path'

src/utils/computerUse/executor.ts

@@ -28,17 +28,49 @@
  * Clipboard via `pbcopy`/`pbpaste`. No Electron `clipboard` module.
  */
 
-import type {
-  ComputerExecutor,
-  DisplayGeometry,
-  FrontmostApp,
-  InstalledApp,
-  ResolvePrepareCaptureResult,
-  RunningApp,
-  ScreenshotResult,
-} from '@ant/computer-use-mcp'
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-mcp package is not installed.
+type ComputerExecutor = any
+type DisplayGeometry = any
+type FrontmostApp = any
+type InstalledApp = any
+type ResolvePrepareCaptureResult = any
+type RunningApp = any
+type ScreenshotResult = any
 
-import { API_RESIZE_PARAMS, targetImageSize } from '@ant/computer-use-mcp'
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/computer-use-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _computerUseMcpModule: any = null
+let _computerUseMcpLoadAttempted = false
+
+function getComputerUseMcpModule(): any {
+  if (!_computerUseMcpLoadAttempted) {
+    _computerUseMcpLoadAttempted = true
+    try {
+      _computerUseMcpModule = require('@ant/computer-use-mcp')
+    } catch {
+      _computerUseMcpModule = null
+    }
+  }
+  return _computerUseMcpModule
+}
+
+function getApiResizeParams(): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.API_RESIZE_PARAMS) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.API_RESIZE_PARAMS
+}
+
+function getTargetImageSize(): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.targetImageSize) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.targetImageSize
+}
 import { logForDebugging } from '../debug.js'
 import { errorMessage } from '../errors.js'
 import { execFileNoThrow } from '../execFileNoThrow.js'
@@ -65,7 +97,7 @@ function computeTargetDims(
 ): [number, number] {
   const physW = Math.round(logicalW * scaleFactor)
   const physH = Math.round(logicalH * scaleFactor)
-  return targetImageSize(physW, physH, API_RESIZE_PARAMS)
+  return getTargetImageSize()(physW, physH, getApiResizeParams())
 }
 
 async function readClipboardViaPbpaste(): Promise<string> {

src/utils/computerUse/gates.ts

@@ -1,4 +1,7 @@
-import type { CoordinateMode, CuSubGates } from '@ant/computer-use-mcp/types'
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-mcp package is not installed.
+type CoordinateMode = any
+type CuSubGates = any
 
 import { getDynamicConfig_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
 import { getSubscriptionType } from '../auth.js'

src/utils/computerUse/hostAdapter.ts

@@ -1,7 +1,7 @@
-import type {
-  ComputerUseHostAdapter,
-  Logger,
-} from '@ant/computer-use-mcp/types'
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-mcp package is not installed.
+type ComputerUseHostAdapter = any
+type Logger = any
 import { format } from 'util'
 import { logForDebugging } from '../debug.js'
 import { COMPUTER_USE_MCP_SERVER_NAME } from './common.js'

src/utils/computerUse/inputLoader.ts

@@ -1,7 +1,7 @@
-import type {
-  ComputerUseInput,
-  ComputerUseInputAPI,
-} from '@ant/computer-use-input'
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-input package is not installed.
+type ComputerUseInput = any
+type ComputerUseInputAPI = any
 
 let cached: ComputerUseInputAPI | undefined
 
@@ -21,8 +21,13 @@ let cached: ComputerUseInputAPI | undefined
  */
 export function requireComputerUseInput(): ComputerUseInputAPI {
   if (cached) return cached
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const input = require('@ant/computer-use-input') as ComputerUseInput
+  let input: ComputerUseInput
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    input = require('@ant/computer-use-input') as ComputerUseInput
+  } catch {
+    throw new Error('@ant/computer-use-input is not available')
+  }
   if (!input.isSupported) {
     throw new Error('@ant/computer-use-input is not supported on this platform')
   }

src/utils/computerUse/mcpServer.ts

@@ -1,8 +1,38 @@
 // @ts-nocheck
-import {
-  buildComputerUseTools,
-  createComputerUseMcpServer,
-} from '@ant/computer-use-mcp'
+
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/computer-use-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _computerUseMcpModule: any = null
+let _computerUseMcpLoadAttempted = false
+
+function getComputerUseMcpModule(): any {
+  if (!_computerUseMcpLoadAttempted) {
+    _computerUseMcpLoadAttempted = true
+    try {
+      _computerUseMcpModule = require('@ant/computer-use-mcp')
+    } catch {
+      _computerUseMcpModule = null
+    }
+  }
+  return _computerUseMcpModule
+}
+
+function buildComputerUseTools(...args: any[]): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.buildComputerUseTools) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.buildComputerUseTools(...args)
+}
+
+function createComputerUseMcpServer(...args: any[]): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.createComputerUseMcpServer) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.createComputerUseMcpServer(...args)
+}
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
 import { homedir } from 'os'

src/utils/computerUse/setup.ts

@@ -1,5 +1,30 @@
 // @ts-nocheck
-import { buildComputerUseTools } from '@ant/computer-use-mcp'
+
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/computer-use-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _computerUseMcpModule: any = null
+let _computerUseMcpLoadAttempted = false
+
+function getComputerUseMcpModule(): any {
+  if (!_computerUseMcpLoadAttempted) {
+    _computerUseMcpLoadAttempted = true
+    try {
+      _computerUseMcpModule = require('@ant/computer-use-mcp')
+    } catch {
+      _computerUseMcpModule = null
+    }
+  }
+  return _computerUseMcpModule
+}
+
+function buildComputerUseTools(...args: any[]): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.buildComputerUseTools) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.buildComputerUseTools(...args)
+}
 import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { buildMcpToolName } from '../../services/mcp/mcpStringUtils.js'

src/utils/computerUse/wrapper.tsx

@@ -17,7 +17,47 @@
  * GrowthBook gate `tengu_malort_pedway` (see gates.ts).
  */
 
-import { bindSessionContext, type ComputerUseSessionContext, type CuCallToolResult, type CuPermissionRequest, type CuPermissionResponse, DEFAULT_GRANT_FLAGS, type ScreenshotDims } from '@ant/computer-use-mcp';
+// Types – declared locally so the file compiles even when the optional
+// @ant/computer-use-mcp package is not installed.
+type ComputerUseSessionContext = any
+type CuCallToolResult = any
+type CuPermissionRequest = any
+type CuPermissionResponse = any
+type ScreenshotDims = any
+
+// ---------------------------------------------------------------------------
+// Lazy-load @ant/computer-use-mcp (optional dependency)
+// ---------------------------------------------------------------------------
+let _computerUseMcpModule: any = null
+let _computerUseMcpLoadAttempted = false
+
+function getComputerUseMcpModule(): any {
+  if (!_computerUseMcpLoadAttempted) {
+    _computerUseMcpLoadAttempted = true
+    try {
+      _computerUseMcpModule = require('@ant/computer-use-mcp')
+    } catch {
+      _computerUseMcpModule = null
+    }
+  }
+  return _computerUseMcpModule
+}
+
+function bindSessionContext(...args: any[]): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.bindSessionContext) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.bindSessionContext(...args)
+}
+
+function getDEFAULT_GRANT_FLAGS(): any {
+  const mod = getComputerUseMcpModule()
+  if (!mod?.DEFAULT_GRANT_FLAGS) {
+    throw new Error('@ant/computer-use-mcp is not available')
+  }
+  return mod.DEFAULT_GRANT_FLAGS
+}
 import * as React from 'react';
 import { getSessionId } from '../../bootstrap/state.js';
 import { ComputerUseApproval } from '../../components/permissions/ComputerUseApproval/ComputerUseApproval.js';
@@ -61,7 +101,7 @@ export function buildSessionContext(): ComputerUseSessionContext {
   return {
     // ── Read state fresh via the per-call ref ─────────────────────────────
     getAllowedApps: () => tuc().getAppState().computerUseMcpState?.allowedApps ?? [],
-    getGrantFlags: () => tuc().getAppState().computerUseMcpState?.grantFlags ?? DEFAULT_GRANT_FLAGS,
+    getGrantFlags: () => tuc().getAppState().computerUseMcpState?.grantFlags ?? getDEFAULT_GRANT_FLAGS(),
     // cc-2 has no Settings page for user-denied apps yet.
     getUserDeniedBundleIds: () => [],
     getSelectedDisplayId: () => tuc().getAppState().computerUseMcpState?.selectedDisplayId,
@@ -302,7 +342,7 @@ async function runPermissionDialog(req: CuPermissionRequest): Promise<CuPermissi
     return {
       granted: [],
       denied: [],
-      flags: DEFAULT_GRANT_FLAGS
+      flags: getDEFAULT_GRANT_FLAGS()
     };
   }
   try {

src/utils/profilerBase.ts

@@ -4,19 +4,13 @@
  * line format for detailed reports.
  */
 
+import { performance as _perf } from 'perf_hooks'
 import type { performance as PerformanceType } from 'perf_hooks'
 import { formatFileSize } from './format.js'
 
-// Lazy-load performance API only when profiling is enabled.
-// Shared across all profilers — perf_hooks.performance is a process-wide singleton.
-let performance: typeof PerformanceType | null = null
-
+// perf_hooks.performance is a process-wide singleton.
 export function getPerformance(): typeof PerformanceType {
-  if (!performance) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    performance = require('perf_hooks').performance
-  }
-  return performance!
+  return _perf
 }
 
 export function formatMs(ms: number): string {