feat(config): add OPENCLAUDE_CONFIG_DIR env var as preferred alias for CLAUDE_CONFIG_DIR (#454)

The legacy CLAUDE_CONFIG_DIR name was the only way to point openclaude
at a non-default config home, which leaked Anthropic branding for a
fork that has otherwise rebranded to OpenClaude. Add OPENCLAUDE_CONFIG_DIR
as the preferred name. CLAUDE_CONFIG_DIR continues to work for
backward compatibility; when both are set with different values,
OPENCLAUDE_CONFIG_DIR wins and a one-time warning is logged.

- src/utils/envUtils.ts: introduce resolveConfigDirEnv() that picks
  OPENCLAUDE_CONFIG_DIR over CLAUDE_CONFIG_DIR and emits a conflict
  warning. Memoize cache key now tracks both env vars so changing
  either invalidates the cached result.
- src/utils/env.ts: getGlobalClaudeFile() previously read
  CLAUDE_CONFIG_DIR directly, missing the new alias. Route through
  resolveConfigDirEnv() so the global config file path follows the
  same precedence.
- src/utils/secureStorage/macOsKeychainHelpers.ts: the "is default
  dir" check used by keychain service-name scoping now considers
  both env vars.
- src/utils/swarm/spawnUtils.ts: forward OPENCLAUDE_CONFIG_DIR to
  teammate processes alongside the legacy var.
- src/utils/openclaudePaths.test.ts: +6 unit tests covering the new
  alias, fallthrough, conflict warning, and resolveConfigDirEnv()
  in isolation.
- .env.example: document both env vars and the precedence rule.

Verified locally on Linux: with only OPENCLAUDE_CONFIG_DIR set, with
only CLAUDE_CONFIG_DIR set (legacy still works), with both set
matching (silent), with both set conflicting (warn once + OPENCLAUDE
wins), with neither set (default ~/.openclaude). Memo cache
invalidates across 4 sequential env transitions. Built dist/cli.mjs
honors the new var and emits the conflict warning to the user.

.env.example

@@ -421,3 +421,16 @@ ANTHROPIC_API_KEY=sk-ant-your-key-here
 # WEB_CUSTOM_ALLOW_HTTP=false                — set "true" to allow http:// URLs
 # WEB_CUSTOM_ALLOW_PRIVATE=false             — set "true" to target localhost/private IPs
 #                                               (needed for self-hosted SearXNG)
+
+# ── Config directory override ───────────────────────────────────────
+#
+# By default openclaude stores per-user state under ~/.openclaude
+# (and falls back to ~/.claude for installs that pre-date the rename).
+# Set this to point openclaude at a different directory — useful for
+# isolating profiles or sharing config across machines.
+#
+# OPENCLAUDE_CONFIG_DIR=/path/to/dir         — preferred name
+# CLAUDE_CONFIG_DIR=/path/to/dir             — legacy alias (still works)
+#
+# When both are set with different values, OPENCLAUDE_CONFIG_DIR wins
+# and a warning is logged once per process.

src/constants/querySource.ts

@@ -1,7 +0,0 @@
-/**
- * Stub — query source enum not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type QuerySource = any

src/entrypoints/agentSdkTypes.ts

@@ -442,84 +442,7 @@ export async function connectRemoteControl(
   throw new Error('not implemented')
 }
 
-// add exit reason types for removing the error within gracefulShutdown file
+// add exit reason types for removing the error within gracefulShutdown file 
 export type ExitReason = {
-
-}
-
-// ============================================================================
-// Stub re-exports — types not included in source snapshot.
-//
-// The upstream Anthropic SDK defines these in sub-files (sdk/coreTypes,
-// sdk/runtimeTypes, sdk/controlTypes, sdk/toolTypes) that are stubbed
-// in this open repo. Until the real definitions are restored, alias the
-// names to `any` so callers can resolve their imports and `tsc` becomes
-// actionable. See issue #473 for the typecheck-foundation effort.
-// ============================================================================
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type AnyZodRawShape = any
-export type ApiKeySource = any
-export type AsyncHookJSONOutput = any
-export type ConfigChangeHookInput = any
-export type CwdChangedHookInput = any
-export type ElicitationHookInput = any
-export type ElicitationResultHookInput = any
-export type FileChangedHookInput = any
-export type ForkSessionOptions = any
-export type ForkSessionResult = any
-export type GetSessionInfoOptions = any
-export type GetSessionMessagesOptions = any
-export type HookEvent = any
-export type HookInput = any
-export type HookJSONOutput = any
-export type InferShape<_T> = any
-export type InstructionsLoadedHookInput = any
-export type InternalOptions = any
-export type InternalQuery = any
-export type ListSessionsOptions = any
-export type McpSdkServerConfigWithInstance = any
-export type McpServerConfigForProcessTransport = any
-export type McpServerStatus = any
-export type ModelInfo = any
-export type ModelUsage = any
-export type NotificationHookInput = any
-export type Options = any
-export type PermissionDeniedHookInput = any
-export type PermissionMode = any
-export type PermissionRequestHookInput = any
-export type PermissionResult = any
-export type PermissionUpdate = any
-export type PostCompactHookInput = any
-export type PostToolUseFailureHookInput = any
-export type PostToolUseHookInput = any
-export type PreCompactHookInput = any
-export type PreToolUseHookInput = any
-export type Query = any
-export type RewindFilesResult = any
-export type SDKAssistantMessage = any
-export type SDKAssistantMessageError = any
-export type SDKCompactBoundaryMessage = any
-export type SdkMcpToolDefinition = any
-export type SDKPartialAssistantMessage = any
-export type SDKPermissionDenial = any
-export type SDKRateLimitInfo = any
-export type SDKStatus = any
-export type SDKStatusMessage = any
-export type SDKSystemMessage = any
-export type SDKToolProgressMessage = any
-export type SDKUserMessageReplay = any
-export type SessionEndHookInput = any
-export type SessionMessage = any
-export type SessionMutationOptions = any
-export type SessionStartHookInput = any
-export type SetupHookInput = any
-export type StopFailureHookInput = any
-export type StopHookInput = any
-export type SubagentStartHookInput = any
-export type SubagentStopHookInput = any
-export type SyncHookJSONOutput = any
-export type TaskCompletedHookInput = any
-export type TaskCreatedHookInput = any
-export type TeammateIdleHookInput = any
-export type UserPromptSubmitHookInput = any
+  
+}

src/entrypoints/sdk/controlTypes.ts

@@ -1,10 +0,0 @@
-/**
- * Stub — control protocol types not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type SDKControlRequest = any
-export type SDKControlResponse = any
-export type SDKControlPermissionRequest = any
-export type StdoutMessage = any

src/global.d.ts

@@ -1,16 +0,0 @@
-/**
- * Build-time globals replaced by the bundler at build time.
- *
- * `scripts/build.ts` substitutes these via Bun's `define` option, so at
- * runtime the references are inlined as string literals. This declaration
- * exists only to make `tsc --noEmit` aware of them — without it, every
- * `MACRO.*` access fires TS2304 "Cannot find name 'MACRO'".
- */
-declare const MACRO: {
-  VERSION: string
-  DISPLAY_VERSION: string
-  BUILD_TIME: string
-  ISSUES_EXPLAINER: string
-  PACKAGE_URL: string
-  NATIVE_PACKAGE_URL: string | undefined
-}

src/types/message.ts

@@ -1,25 +0,0 @@
-/**
- * Stub — message type definitions not included in source snapshot.
- *
- * The upstream Anthropic source defines a rich Message discriminated union
- * with structured Content blocks, role tags, tool_use payloads, and so on.
- * That file is not mirrored to this open snapshot. This stub exists so
- * `tsc --noEmit` can resolve `import { Message, ... } from 'src/types/message'`
- * across the ~21 callers without fixing every transitive type the call
- * sites use.
- *
- * Once the real definitions are restored upstream-side or reconstructed
- * from runtime usage, replace these `any` aliases with proper types and
- * delete this comment. See issue #473 for the typecheck-foundation effort.
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type Message = any
-export type AssistantMessage = any
-export type UserMessage = any
-export type SystemMessage = any
-export type SystemAPIErrorMessage = any
-export type AttachmentMessage = any
-export type ProgressMessage = any
-export type HookResultMessage = any
-export type NormalizedUserMessage = any

src/types/tools.ts

@@ -1,7 +0,0 @@
-/**
- * Stub — tool type definitions not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type ShellProgress = any

src/types/utils.ts

@@ -1,15 +0,0 @@
-/**
- * Stub — utility type definitions not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type DeepImmutable<T> = T extends any[]
-  ? readonly DeepImmutable<T[number]>[]
-  : T extends object
-    ? { readonly [K in keyof T]: DeepImmutable<T[K]> }
-    : T
-
-export type Permutations<T extends string, U extends string = T> = T extends T
-  ? T | `${T}${Permutations<Exclude<U, T>>}`
-  : never

src/utils/env.ts

@@ -3,7 +3,11 @@ import { homedir } from 'os'
 import { join } from 'path'
 import { fileSuffixForOauthConfig } from '../constants/oauth.js'
 import { isRunningWithBun } from './bundledMode.js'
-import { getClaudeConfigHomeDir, isEnvTruthy } from './envUtils.js'
+import {
+  getClaudeConfigHomeDir,
+  isEnvTruthy,
+  resolveConfigDirEnv,
+} from './envUtils.js'
 import { findExecutable } from './findExecutable.js'
 import { getFsImplementation } from './fsOperations.js'
 import { which } from './which.js'
@@ -22,7 +26,11 @@ export const getGlobalClaudeFile = memoize((): string => {
   }
 
   const oauthSuffix = fileSuffixForOauthConfig()
-  const configDir = process.env.CLAUDE_CONFIG_DIR || homedir()
+  const configDir =
+    resolveConfigDirEnv({
+      openClaudeConfigDir: process.env.OPENCLAUDE_CONFIG_DIR,
+      legacyConfigDir: process.env.CLAUDE_CONFIG_DIR,
+    }) ?? homedir()
 
   // Default to .openclaude.json. Fall back to .claude.json only if the new
   // file doesn't exist yet and the legacy one does (same migration pattern

src/utils/envUtils.ts

@@ -3,6 +3,39 @@ import { existsSync } from 'fs'
 import { homedir } from 'os'
 import { join } from 'path'
 
+/**
+ * Resolves the override env value for the config home directory.
+ * `OPENCLAUDE_CONFIG_DIR` is preferred — `CLAUDE_CONFIG_DIR` is the legacy
+ * Anthropic name kept working for backward compatibility. When both are set
+ * and disagree, `OPENCLAUDE_CONFIG_DIR` wins and we warn once so the user
+ * can clean up. Exported for tests.
+ */
+let warnedAboutConflictingConfigDirEnvs = false
+
+export function resolveConfigDirEnv(options?: {
+  openClaudeConfigDir?: string
+  legacyConfigDir?: string
+  warn?: (message: string) => void
+}): string | undefined {
+  const open = options?.openClaudeConfigDir
+  const legacy = options?.legacyConfigDir
+  if (open && legacy && open !== legacy && !warnedAboutConflictingConfigDirEnvs) {
+    warnedAboutConflictingConfigDirEnvs = true
+    options?.warn?.(
+      `Both OPENCLAUDE_CONFIG_DIR and CLAUDE_CONFIG_DIR are set to different values. Using OPENCLAUDE_CONFIG_DIR=${open}; ignoring CLAUDE_CONFIG_DIR=${legacy}.`,
+    )
+  }
+  return open || legacy || undefined
+}
+
+/**
+ * Test-only escape hatch — resets the once-per-process conflict warning so
+ * unit tests can re-trigger it.
+ */
+export function __resetConfigDirEnvWarningForTesting(): void {
+  warnedAboutConflictingConfigDirEnvs = false
+}
+
 export function resolveClaudeConfigHomeDir(options?: {
   configDirEnv?: string
   homeDir?: string
@@ -30,13 +63,21 @@ export function resolveClaudeConfigHomeDir(options?: {
   return openClaudeDir.normalize('NFC')
 }
 
-// Memoized: 150+ callers, many on hot paths. Keyed off CLAUDE_CONFIG_DIR so
-// tests that change the env var get a fresh value without explicit cache.clear.
+// Memoized: 150+ callers, many on hot paths. Keyed off both override env
+// vars so tests that change either get a fresh value without explicit
+// cache.clear.
 export const getClaudeConfigHomeDir = memoize(
   (): string => resolveClaudeConfigHomeDir({
-    configDirEnv: process.env.CLAUDE_CONFIG_DIR,
+    configDirEnv: resolveConfigDirEnv({
+      openClaudeConfigDir: process.env.OPENCLAUDE_CONFIG_DIR,
+      legacyConfigDir: process.env.CLAUDE_CONFIG_DIR,
+      warn: message => {
+        // eslint-disable-next-line no-console
+        console.warn(`[openclaude] ${message}`)
+      },
+    }),
   }),
-  () => process.env.CLAUDE_CONFIG_DIR,
+  () => `${process.env.OPENCLAUDE_CONFIG_DIR ?? ''}|${process.env.CLAUDE_CONFIG_DIR ?? ''}`,
 )
 
 export function getTeamsDir(): string {

src/utils/openclaudePaths.test.ts

@@ -51,7 +51,8 @@ describe('OpenClaude paths', () => {
     ).toBe(join(homedir(), '.claude'))
   })
 
-  test('uses CLAUDE_CONFIG_DIR override when provided', async () => {
+  test('uses CLAUDE_CONFIG_DIR override when provided (legacy)', async () => {
+    delete process.env.OPENCLAUDE_CONFIG_DIR
     process.env.CLAUDE_CONFIG_DIR = '/tmp/custom-openclaude'
     const { getClaudeConfigHomeDir, resolveClaudeConfigHomeDir } =
       await importFreshEnvUtils()
@@ -64,6 +65,83 @@ describe('OpenClaude paths', () => {
     ).toBe('/tmp/custom-openclaude')
   })
 
+  test('OPENCLAUDE_CONFIG_DIR overrides the default (issue #454)', async () => {
+    delete process.env.CLAUDE_CONFIG_DIR
+    process.env.OPENCLAUDE_CONFIG_DIR = '/tmp/oc-config-only'
+    const { getClaudeConfigHomeDir } = await importFreshEnvUtils()
+
+    expect(getClaudeConfigHomeDir()).toBe('/tmp/oc-config-only')
+  })
+
+  test('OPENCLAUDE_CONFIG_DIR wins when both env vars are set with different values', async () => {
+    process.env.OPENCLAUDE_CONFIG_DIR = '/tmp/oc-wins'
+    process.env.CLAUDE_CONFIG_DIR = '/tmp/legacy-loses'
+    const { getClaudeConfigHomeDir } = await importFreshEnvUtils()
+
+    expect(getClaudeConfigHomeDir()).toBe('/tmp/oc-wins')
+  })
+
+  test('CLAUDE_CONFIG_DIR is still honored when OPENCLAUDE_CONFIG_DIR is unset', async () => {
+    delete process.env.OPENCLAUDE_CONFIG_DIR
+    process.env.CLAUDE_CONFIG_DIR = '/tmp/legacy-only'
+    const { getClaudeConfigHomeDir } = await importFreshEnvUtils()
+
+    expect(getClaudeConfigHomeDir()).toBe('/tmp/legacy-only')
+  })
+
+  test('empty OPENCLAUDE_CONFIG_DIR falls through to CLAUDE_CONFIG_DIR', async () => {
+    process.env.OPENCLAUDE_CONFIG_DIR = ''
+    process.env.CLAUDE_CONFIG_DIR = '/tmp/legacy-fallback'
+    const { getClaudeConfigHomeDir } = await importFreshEnvUtils()
+
+    expect(getClaudeConfigHomeDir()).toBe('/tmp/legacy-fallback')
+  })
+
+  test('resolveConfigDirEnv prefers OPENCLAUDE over CLAUDE and warns on conflict', async () => {
+    const { resolveConfigDirEnv, __resetConfigDirEnvWarningForTesting } =
+      await importFreshEnvUtils()
+    __resetConfigDirEnvWarningForTesting()
+
+    const warnings: string[] = []
+    const result = resolveConfigDirEnv({
+      openClaudeConfigDir: '/a',
+      legacyConfigDir: '/b',
+      warn: m => warnings.push(m),
+    })
+
+    expect(result).toBe('/a')
+    expect(warnings.length).toBe(1)
+    expect(warnings[0]).toContain('OPENCLAUDE_CONFIG_DIR=/a')
+    expect(warnings[0]).toContain('CLAUDE_CONFIG_DIR=/b')
+  })
+
+  test('resolveConfigDirEnv does not warn when both env vars agree', async () => {
+    const { resolveConfigDirEnv, __resetConfigDirEnvWarningForTesting } =
+      await importFreshEnvUtils()
+    __resetConfigDirEnvWarningForTesting()
+
+    const warnings: string[] = []
+    const result = resolveConfigDirEnv({
+      openClaudeConfigDir: '/same',
+      legacyConfigDir: '/same',
+      warn: m => warnings.push(m),
+    })
+
+    expect(result).toBe('/same')
+    expect(warnings).toEqual([])
+  })
+
+  test('resolveConfigDirEnv returns undefined when neither env var is set', async () => {
+    const { resolveConfigDirEnv } = await importFreshEnvUtils()
+
+    expect(
+      resolveConfigDirEnv({
+        openClaudeConfigDir: undefined,
+        legacyConfigDir: undefined,
+      }),
+    ).toBeUndefined()
+  })
+
   test('project and local settings paths use .openclaude', async () => {
     const { getRelativeSettingsFilePathForSource } = await importFreshSettings()
 

src/utils/secureStorage/macOsKeychainHelpers.ts

@@ -34,7 +34,8 @@ export function getSecureStorageServiceName(
   serviceSuffix: string = '',
 ): string {
   const configDir = getClaudeConfigHomeDir()
-  const isDefaultDir = !process.env.CLAUDE_CONFIG_DIR
+  const isDefaultDir =
+    !process.env.OPENCLAUDE_CONFIG_DIR && !process.env.CLAUDE_CONFIG_DIR
 
   // Use a hash of the config dir path to create a unique but stable suffix
   // Only add suffix for non-default directories to maintain backwards compatibility

src/utils/swarm/spawnUtils.ts

@@ -117,7 +117,8 @@ const TEAMMATE_ENV_VARS = [
   'MISTRAL_BASE_URL',
   // Custom API endpoint
   'ANTHROPIC_BASE_URL',
-  // Config directory override
+  // Config directory override (preferred name + legacy alias)
+  'OPENCLAUDE_CONFIG_DIR',
   'CLAUDE_CONFIG_DIR',
   // CCR marker — teammates need this for CCR-aware code paths. Auth finds
   // its own way via /home/claude/.claude/remote/.oauth_token regardless;

tsconfig.json

@@ -1,14 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2023",
-    "lib": ["ES2023", "DOM"],
+    "target": "ES2022",
     "module": "ESNext",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
     "strict": true,
-    "noImplicitAny": false,
-    "noEmit": true,
-    "allowImportingTsExtensions": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,