fix(theme): remove stale React Compiler memo wrappers from theme hooks

Rebase on current main (includes #589 reconciler fix). The React Compiler memo caches (_c) in useTheme() and usePreviewTheme() use referential equality checks on destructured context values. These caches can return stale references when the ThemeProvider's useMemo recreates the context value object but the individual property references (setThemeSetting, setPreviewTheme, etc.) compare equal — the memo short-circuits and returns a cached tuple/object that still holds the old closure captures. This is a distinct bug from #589 (which fixed the ink reconciler's commitUpdate path for host prop updates). #589 ensures that when React _does_ re-render a component with new props, those props actually reach the DOM node. But the memo wrappers here prevent React from _even seeing_ the new context value in the first place — the hook returns the stale cached result. Removing the memo wrappers ensures useTheme() and usePreviewTheme() always read the current context value, eliminating the stale-reference path entirely.
2026-04-12 07:39:39 +00:00
192 changed files with 1980 additions and 16509 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,16 +0,0 @@
 node_modules
 dist
 .git
 .gitignore
 .env
 .env.*
 !.env.example
 coverage
 reports
 vscode-extension
 python
 docs
 *.md
 !README.md
 .github
 .tsbuildinfo
--- a/.env.example
+++ b/.env.example
@@ -225,30 +225,6 @@ ANTHROPIC_API_KEY=sk-ant-your-key-here
 # GOOGLE_CLOUD_PROJECT=your-gcp-project-id
 # -----------------------------------------------------------------------------
 # Option 9: NVIDIA NIM
 # -----------------------------------------------------------------------------
 # NVIDIA NIM provides hosted inference endpoints for NVIDIA models.
 # Get your API key from https://build.nvidia.com/
 #
 # CLAUDE_CODE_USE_OPENAI=1
 # NVIDIA_API_KEY=nvapi-your-key-here
 # OPENAI_BASE_URL=https://integrate.api.nvidia.com/v1
 # OPENAI_MODEL=nvidia/llama-3.1-nemotron-70b-instruct
 # -----------------------------------------------------------------------------
 # Option 10: MiniMax
 # -----------------------------------------------------------------------------
 # MiniMax API provides text generation models.
 # Get your API key from https://platform.minimax.io/
 #
 # CLAUDE_CODE_USE_OPENAI=1
 # MINIMAX_API_KEY=your-minimax-key-here
 # OPENAI_BASE_URL=https://api.minimax.io/v1
 # OPENAI_MODEL=MiniMax-M2.5
 # =============================================================================
 # OPTIONAL TUNING
 # =============================================================================
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,144 +0,0 @@
 name: Auto Release
 on:
  push:
    branches:
      - main
 concurrency:
  group: auto-release-${{ github.ref }}
  cancel-in-progress: false
 jobs:
  release-please:
    if: ${{ github.repository == 'Gitlawb/openclaude' }}
    name: Release Please
    runs-on: ubuntu-latest
    permissions:
      contents: write
      pull-requests: write
    outputs:
      release_created: ${{ steps.release.outputs.release_created }}
      tag_name: ${{ steps.release.outputs.tag_name }}
      version: ${{ steps.release.outputs.version }}
    steps:
      - name: Run release-please
        id: release
        uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          release-type: node
  publish-npm:
    name: Publish to npm
    needs: release-please
    if: ${{ needs.release-please.outputs.release_created == 'true' }}
    runs-on: ubuntu-latest
    environment: release
    permissions:
      contents: read
      id-token: write
    steps:
      - name: Checkout release tag
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
        with:
          ref: ${{ needs.release-please.outputs.tag_name }}
          fetch-depth: 0
      - name: Set up Node.js
        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
        with:
          node-version: 24
          registry-url: https://registry.npmjs.org
      - name: Set up Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6
        with:
          bun-version: 1.3.11
      - name: Install dependencies
        run: bun install --frozen-lockfile
      - name: Run unit tests
        run: bun test --max-concurrency=1
      - name: Smoke test
        run: bun run smoke
      - name: Build
        run: bun run build
      - name: Dry-run package
        run: npm pack --dry-run
      - name: Clear token auth for trusted publishing
        run: |
          unset NODE_AUTH_TOKEN
          echo "NODE_AUTH_TOKEN=" >> "$GITHUB_ENV"
      - name: Publish to npm
        run: npm publish --access public --provenance
      - name: Release summary
        run: |
          {
            echo "## Released ${{ needs.release-please.outputs.tag_name }}"
            echo
            echo "- npm: https://www.npmjs.com/package/@gitlawb/openclaude"
            echo "- GitHub: https://github.com/Gitlawb/openclaude/releases/tag/${{ needs.release-please.outputs.tag_name }}"
          } >> "$GITHUB_STEP_SUMMARY"
  docker:
    name: Build & Push Docker Image
    needs: release-please
    if: ${{ needs.release-please.outputs.release_created == 'true' }}
    runs-on: ubuntu-latest
    permissions:
      contents: read
      packages: write
    steps:
      - name: Checkout release tag
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          ref: ${{ needs.release-please.outputs.tag_name }}
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
      - name: Log in to GitHub Container Registry
        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Extract metadata
        id: meta
        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: ghcr.io/${{ github.repository }}
          tags: |
            type=semver,pattern={{version}},value=${{ needs.release-please.outputs.version }}
            type=semver,pattern={{major}}.{{minor}},value=${{ needs.release-please.outputs.version }}
            type=raw,value=latest
      - name: Build and load locally
        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
        with:
          context: .
          load: true
          tags: openclaude:smoke
          cache-from: type=gha
      - name: Smoke test
        run: docker run --rm openclaude:smoke --version
      - name: Build and push
        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
        with:
          context: .
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +0,0 @@
 {
  ".": "0.5.1"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,141 +0,0 @@
 # Changelog
 ## [0.5.1](https://github.com/Gitlawb/openclaude/compare/v0.5.0...v0.5.1) (2026-04-20)
 ### Bug Fixes
 * enforce Bash path constraints after sandbox allow ([#777](https://github.com/Gitlawb/openclaude/issues/777)) ([7002cb3](https://github.com/Gitlawb/openclaude/commit/7002cb302b78ea2a19da3f26226de24e2903fa1d))
 * enforce MCP OAuth callback state before errors ([#775](https://github.com/Gitlawb/openclaude/issues/775)) ([739b8d1](https://github.com/Gitlawb/openclaude/commit/739b8d1f40fde0e401a5cbd2b9a55d88bd5124ad))
 * require trusted approval for sandbox override ([#778](https://github.com/Gitlawb/openclaude/issues/778)) ([aab4890](https://github.com/Gitlawb/openclaude/commit/aab489055c53dd64369414116fe93226d2656273))
 ## [0.5.0](https://github.com/Gitlawb/openclaude/compare/v0.4.0...v0.5.0) (2026-04-20)
 ### Features
 * add OPENCLAUDE_DISABLE_STRICT_TOOLS env var to opt out of strict MCP tool schema normalization ([#770](https://github.com/Gitlawb/openclaude/issues/770)) ([e6e8d9a](https://github.com/Gitlawb/openclaude/commit/e6e8d9a24897e4c9ef08b72df20fabbf8ef27f38))
 * mask provider api key input ([#772](https://github.com/Gitlawb/openclaude/issues/772)) ([13e9f22](https://github.com/Gitlawb/openclaude/commit/13e9f22a83a2b0f85f557b1e12c9442ba61241e4))
 ### Bug Fixes
 * allow provider recovery during startup ([#765](https://github.com/Gitlawb/openclaude/issues/765)) ([f828171](https://github.com/Gitlawb/openclaude/commit/f828171ef1ab94e2acf73a28a292799e4e26cc0d))
 * **api:** drop orphan tool results to satisfy strict role sequence ([#745](https://github.com/Gitlawb/openclaude/issues/745)) ([b786b76](https://github.com/Gitlawb/openclaude/commit/b786b765f01f392652eaf28ed3579a96b7260a53))
 * **help:** prevent /help tab crash from undefined descriptions ([#732](https://github.com/Gitlawb/openclaude/issues/732)) ([3d1979f](https://github.com/Gitlawb/openclaude/commit/3d1979ff066db32415e0c8321af916d81f5f2621))
 * **mcp:** sync required array with properties in tool schemas ([#754](https://github.com/Gitlawb/openclaude/issues/754)) ([002a8f1](https://github.com/Gitlawb/openclaude/commit/002a8f1f6de2fcfc917165d828501d3047bad61f))
 * remove cached mcpClient in diagnostic tracking to prevent stale references ([#727](https://github.com/Gitlawb/openclaude/issues/727)) ([2c98be7](https://github.com/Gitlawb/openclaude/commit/2c98be700274a4241963b5f43530bf3bd8f8963f))
 * use raw context window for auto-compact percentage display ([#748](https://github.com/Gitlawb/openclaude/issues/748)) ([55c5f26](https://github.com/Gitlawb/openclaude/commit/55c5f262a9a5a8be0aa9ae8dc6c7dafc465eb2c6))
 ## [0.4.0](https://github.com/Gitlawb/openclaude/compare/v0.3.0...v0.4.0) (2026-04-17)
 ### Features
 * add Alibaba Coding Plan (DashScope) provider support ([#509](https://github.com/Gitlawb/openclaude/issues/509)) ([43ac6db](https://github.com/Gitlawb/openclaude/commit/43ac6dba75537282da1e2ad8f855082bc4e25f1e))
 * add NVIDIA NIM and MiniMax provider support ([#552](https://github.com/Gitlawb/openclaude/issues/552)) ([51191d6](https://github.com/Gitlawb/openclaude/commit/51191d61326e1f8319d70b3a3c0d9229e185a564))
 * add ripgrep to Dockerfile for faster file searching ([#688](https://github.com/Gitlawb/openclaude/issues/688)) ([12dd375](https://github.com/Gitlawb/openclaude/commit/12dd3755c619cc27af3b151ae8fdb9d425a7b9a2))
 * **api:** classify openai-compatible provider failures ([#708](https://github.com/Gitlawb/openclaude/issues/708)) ([80a00ac](https://github.com/Gitlawb/openclaude/commit/80a00acc2c6dc4657a78de7366f7a9ebc920bfbb))
 * **vscode:** add full chat interface to OpenClaude extension ([#608](https://github.com/Gitlawb/openclaude/issues/608)) ([fbcd928](https://github.com/Gitlawb/openclaude/commit/fbcd928f7f8511da795aea3ad318bddf0ab9a1a7))
 ### Bug Fixes
 * focus "Done" option after completing provider manager actions ([#718](https://github.com/Gitlawb/openclaude/issues/718)) ([d6f5130](https://github.com/Gitlawb/openclaude/commit/d6f5130c204d8ffe582212466768706cd7fd6774))
 * **models:** prevent /models crash from non-string saved model values ([#691](https://github.com/Gitlawb/openclaude/issues/691)) ([6b2121d](https://github.com/Gitlawb/openclaude/commit/6b2121da12189fa7ce1f33394d18abd24cf8a01b))
 * prevent crash in commands tab when description is undefined ([#730](https://github.com/Gitlawb/openclaude/issues/730)) ([eed77e6](https://github.com/Gitlawb/openclaude/commit/eed77e6579866a98384dcc948a0ad6406614ede3))
 * strip comments before scanning for missing imports ([#676](https://github.com/Gitlawb/openclaude/issues/676)) ([a00b792](https://github.com/Gitlawb/openclaude/commit/a00b7928de9662ffb7ef6abd8cd040afe6f4f122))
 * **ui:** show correct endpoint URL in intro screen for custom Anthropic endpoints ([#735](https://github.com/Gitlawb/openclaude/issues/735)) ([3424663](https://github.com/Gitlawb/openclaude/commit/34246635fb9a09499047a52e7f96ca9b36c8a85a))
 ## [0.3.0](https://github.com/Gitlawb/openclaude/compare/v0.2.3...v0.3.0) (2026-04-14)
 ### Features
 * activate coordinator mode in open build ([#647](https://github.com/Gitlawb/openclaude/issues/647)) ([99a1714](https://github.com/Gitlawb/openclaude/commit/99a17144ee285b892a0801acb6abcc9af68879af))
 * activate local-only team memory in open build ([#648](https://github.com/Gitlawb/openclaude/issues/648)) ([24d485f](https://github.com/Gitlawb/openclaude/commit/24d485f42f5b1405d2fab13f2f497d5edd3b5300))
 * activate message actions in open build ([#632](https://github.com/Gitlawb/openclaude/issues/632)) ([252808b](https://github.com/Gitlawb/openclaude/commit/252808bbd0a12a6ccf97e2cb09752a0212ea3acd))
 * add allowBypassPermissionsMode setting ([#658](https://github.com/Gitlawb/openclaude/issues/658)) ([31be66d](https://github.com/Gitlawb/openclaude/commit/31be66d7645ea3473334c9ce89ea1a5095b8df6e))
 * add Docker image build and push to GHCR on release ([#656](https://github.com/Gitlawb/openclaude/issues/656)) ([658d076](https://github.com/Gitlawb/openclaude/commit/658d076909e14eb0459bcb98aee9aa0472118265))
 * implement /loop command with fixed and dynamic scheduling ([#621](https://github.com/Gitlawb/openclaude/issues/621)) ([64298a6](https://github.com/Gitlawb/openclaude/commit/64298a663f1391b16aa1f5a49e8a877e1d3742f2))
 * implement Monitor tool for streaming shell output ([#649](https://github.com/Gitlawb/openclaude/issues/649)) ([b818dd5](https://github.com/Gitlawb/openclaude/commit/b818dd5958f4e8428566ce25a1a6be5fd4fe66f8))
 * local feature flag overrides via ~/.claude/feature-flags.json ([#639](https://github.com/Gitlawb/openclaude/issues/639)) ([0e48884](https://github.com/Gitlawb/openclaude/commit/0e48884f56c6c008f047a7926d3b2cb924170625))
 * open useful USER_TYPE-gated features to all users ([#644](https://github.com/Gitlawb/openclaude/issues/644)) ([c1beea9](https://github.com/Gitlawb/openclaude/commit/c1beea98676a413c54152a45a6b9fbe7fb9ed028))
 ### Bug Fixes
 * bump axios 1.14.0 → 1.15.0 (Dependabot [#4](https://github.com/Gitlawb/openclaude/issues/4), [#5](https://github.com/Gitlawb/openclaude/issues/5)) ([#670](https://github.com/Gitlawb/openclaude/issues/670)) ([a07e5ef](https://github.com/Gitlawb/openclaude/commit/a07e5ef990a5ed01a72e83fdbd1fcab36f515a08))
 * extend provider guard to protect anthropic profiles from cross-terminal override ([#641](https://github.com/Gitlawb/openclaude/issues/641)) ([03e0b06](https://github.com/Gitlawb/openclaude/commit/03e0b06e0784e4ea46945b3950840b10b6e3ca49))
 * improve fetch diagnostics for bootstrap and session requests ([#646](https://github.com/Gitlawb/openclaude/issues/646)) ([df2b9f2](https://github.com/Gitlawb/openclaude/commit/df2b9f2b7b4c661ee3d9ed5dc58b3064de0599d1))
 * **openai-shim:** preserve tool result images and local token caps ([#659](https://github.com/Gitlawb/openclaude/issues/659)) ([30c866d](https://github.com/Gitlawb/openclaude/commit/30c866d31ad8538496460667d86ed5efbd4a8547))
 * replace broken bun:bundle shim with source pre-processing ([#657](https://github.com/Gitlawb/openclaude/issues/657)) ([adbe391](https://github.com/Gitlawb/openclaude/commit/adbe391e63721918b5d147f4f845111c1a3143db))
 * resolve 12 bugs across API, MCP, agent tools, web search, and context overflow ([#674](https://github.com/Gitlawb/openclaude/issues/674)) ([25ce2ca](https://github.com/Gitlawb/openclaude/commit/25ce2ca7bff8937b0b79ad7f85c6dc1c68432069))
 * route OpenAI Codex shortcuts to correct endpoint ([#566](https://github.com/Gitlawb/openclaude/issues/566)) ([7c8bdcc](https://github.com/Gitlawb/openclaude/commit/7c8bdcc3e2ac1ecb98286c705c85671044be3d6b))
 ## [0.2.3](https://github.com/Gitlawb/openclaude/compare/v0.2.2...v0.2.3) (2026-04-12)
 ### Bug Fixes
 * prevent infinite auto-compact loop for unknown 3P models ([#635](https://github.com/Gitlawb/openclaude/issues/635)) ([#636](https://github.com/Gitlawb/openclaude/issues/636)) ([aeaa658](https://github.com/Gitlawb/openclaude/commit/aeaa658f776fb8df95721e8b8962385f8b00f66a))
 ## [0.2.2](https://github.com/Gitlawb/openclaude/compare/v0.2.1...v0.2.2) (2026-04-12)
 ### Bug Fixes
 * **read/edit:** make compact line prefix unambiguous for tab-indented files ([#613](https://github.com/Gitlawb/openclaude/issues/613)) ([08cc6f3](https://github.com/Gitlawb/openclaude/commit/08cc6f328711cd93ce9fa53351266c29a0b0a341))
 ## [0.2.1](https://github.com/Gitlawb/openclaude/compare/v0.2.0...v0.2.1) (2026-04-12)
 ### Bug Fixes
 * **provider:** add recovery guidance for missing OpenAI API key ([#616](https://github.com/Gitlawb/openclaude/issues/616)) ([9419e8a](https://github.com/Gitlawb/openclaude/commit/9419e8a4a21b3771d9ddb10f7072e0a8c5b5b631))
 ## [0.2.0](https://github.com/Gitlawb/openclaude/compare/v0.1.8...v0.2.0) (2026-04-12)
 ### Features
 * add /cache-probe diagnostic command ([#580](https://github.com/Gitlawb/openclaude/issues/580)) ([9ccaa7a](https://github.com/Gitlawb/openclaude/commit/9ccaa7a6759b6991f4a566b4118c06e68a2398fe)), closes [#515](https://github.com/Gitlawb/openclaude/issues/515)
 * add auto-fix service — auto-lint and test after AI file edits ([#508](https://github.com/Gitlawb/openclaude/issues/508)) ([c385047](https://github.com/Gitlawb/openclaude/commit/c385047abba4366866f4c87bfb5e0b0bd4dcbb9d))
 * Add Gemini support with thought_signature fix  ([#404](https://github.com/Gitlawb/openclaude/issues/404)) ([5012c16](https://github.com/Gitlawb/openclaude/commit/5012c160c9a2dff9418e7ee19dc9a4d29ef2b024))
 * add headless gRPC server for external agent integration ([#278](https://github.com/Gitlawb/openclaude/issues/278)) ([26eef92](https://github.com/Gitlawb/openclaude/commit/26eef92fe72e9c3958d61435b8d3571e12bf2b74))
 * add wiki mvp commands ([#532](https://github.com/Gitlawb/openclaude/issues/532)) ([c328fdf](https://github.com/Gitlawb/openclaude/commit/c328fdf9e2fe59ad101b049301298ce9ff24caca))
 * GitHub provider lifecycle and onboarding hardening ([#351](https://github.com/Gitlawb/openclaude/issues/351)) ([ff7d499](https://github.com/Gitlawb/openclaude/commit/ff7d49990de515825ddbe4099f3a39b944b61370))
 ### Bug Fixes
 * add File polyfill for Node &lt; 20 to prevent startup deadlock with proxy ([#442](https://github.com/Gitlawb/openclaude/issues/442)) ([85aa8b0](https://github.com/Gitlawb/openclaude/commit/85aa8b0985c8f3cb8801efa5141114a0ab0f6a83))
 * add GitHub Copilot model context windows and output limits ([#576](https://github.com/Gitlawb/openclaude/issues/576)) ([a7f5982](https://github.com/Gitlawb/openclaude/commit/a7f5982f6438ab0ddc3f0daae31ea68ac7ac206c)), closes [#515](https://github.com/Gitlawb/openclaude/issues/515)
 * add LiteLLM-style aliases for GitHub Copilot context windows ([#606](https://github.com/Gitlawb/openclaude/issues/606)) ([2e0e14d](https://github.com/Gitlawb/openclaude/commit/2e0e14d71313e0e501efaa9e55c6c56f2742fb10))
 * add store:false to Chat Completions and /responses fallback ([#578](https://github.com/Gitlawb/openclaude/issues/578)) ([8aaa4f2](https://github.com/Gitlawb/openclaude/commit/8aaa4f22ac5b942d82aa9cad54af30d56034515a))
 * address code scanning alerts ([#434](https://github.com/Gitlawb/openclaude/issues/434)) ([e365cb4](https://github.com/Gitlawb/openclaude/commit/e365cb4010becabacd7cbccb4c3e59ea23a41e90))
 * avoid sync github credential reads in provider manager ([#428](https://github.com/Gitlawb/openclaude/issues/428)) ([aff2bd8](https://github.com/Gitlawb/openclaude/commit/aff2bd87e4f2821992f74fb95481c505d0ba5d5d))
 * convert dragged file paths to [@mentions](https://github.com/mentions) for attachment ([#382](https://github.com/Gitlawb/openclaude/issues/382)) ([112df59](https://github.com/Gitlawb/openclaude/commit/112df5911791ea71ee9efbb98ea59c5ded1ea161))
 * custom web search — WEB_URL_TEMPLATE not recognized, timeout too short, silent native fallback ([#537](https://github.com/Gitlawb/openclaude/issues/537)) ([32fbd0c](https://github.com/Gitlawb/openclaude/commit/32fbd0c7b4168b32dcb13a5b69342e2727269201))
 * defer startup checks and suppress recommendation dialogs during startup window (issue [#363](https://github.com/Gitlawb/openclaude/issues/363)) ([#504](https://github.com/Gitlawb/openclaude/issues/504)) ([2caf2fd](https://github.com/Gitlawb/openclaude/commit/2caf2fd982af1ec845c50152ad9d28d1a597f82f))
 * display selected model in startup screen instead of hardcoded sonnet 4.6 ([#587](https://github.com/Gitlawb/openclaude/issues/587)) ([b126e38](https://github.com/Gitlawb/openclaude/commit/b126e38b1affddd2de83fcc3ba26f2e44b42a509))
 * handle missing skill parameter in SkillTool ([#485](https://github.com/Gitlawb/openclaude/issues/485)) ([f9ce81b](https://github.com/Gitlawb/openclaude/commit/f9ce81bfb384e909353813fb6f6760cadd508ae7))
 * include MCP tool results in microcompact to reduce token waste ([#348](https://github.com/Gitlawb/openclaude/issues/348)) ([52d33a8](https://github.com/Gitlawb/openclaude/commit/52d33a87a047b943aedaaaf772cd48636c263509))
 * **ink:** restore host prop updates in React 19 reconciler ([#589](https://github.com/Gitlawb/openclaude/issues/589)) ([6e94dd9](https://github.com/Gitlawb/openclaude/commit/6e94dd913688b2d6433a9abe62a245c5f031b776))
 * let saved provider profiles win on restart ([#513](https://github.com/Gitlawb/openclaude/issues/513)) ([cb8f8b7](https://github.com/Gitlawb/openclaude/commit/cb8f8b7ac2e3e74516ee219a3a48156db7c6ed78))
 * normalize malformed Bash tool arguments from OpenAI-compatible providers ([#385](https://github.com/Gitlawb/openclaude/issues/385)) ([b4bd95b](https://github.com/Gitlawb/openclaude/commit/b4bd95b47715c9896240d708c106777507fd26ec))
 * preserve only originally-required properties in strict tool schemas ([#471](https://github.com/Gitlawb/openclaude/issues/471)) ([ccaa193](https://github.com/Gitlawb/openclaude/commit/ccaa193eec5761f0972ffb58eb3189a81a9244b0))
 * preserve unicode in Windows clipboard fallback ([#388](https://github.com/Gitlawb/openclaude/issues/388)) ([c193497](https://github.com/Gitlawb/openclaude/commit/c1934974aaf64db460cc850a044bd13cc744cce7))
 * rebrand prompt identity to openclaude ([#496](https://github.com/Gitlawb/openclaude/issues/496)) ([598651f](https://github.com/Gitlawb/openclaude/commit/598651f42389ce76311ec00e8a9c701c939ead27))
 * replace isDeepStrictEqual with navigation-aware options comparison ([#507](https://github.com/Gitlawb/openclaude/issues/507)) ([537c469](https://github.com/Gitlawb/openclaude/commit/537c469c3a2f7cb0eed05fa2f54dca57b6bc273f)), closes [#472](https://github.com/Gitlawb/openclaude/issues/472)
 * report cache reads in streaming and correct cost calculation ([#577](https://github.com/Gitlawb/openclaude/issues/577)) ([f4ac709](https://github.com/Gitlawb/openclaude/commit/f4ac709fa6eda732bf45204fcab625ba6c5674b9))
 * restore default context window for unknown 3p models ([#494](https://github.com/Gitlawb/openclaude/issues/494)) ([69ea1f1](https://github.com/Gitlawb/openclaude/commit/69ea1f1e4a99e9436215d8cb391a116a64442b94))
 * restore Grep and Glob reliability on OpenAI paths ([#461](https://github.com/Gitlawb/openclaude/issues/461)) ([600c01f](https://github.com/Gitlawb/openclaude/commit/600c01faf761a080a2c7dede872ddbe05a132f23))
 * restore Ollama auto-detect in first-run setup ([#561](https://github.com/Gitlawb/openclaude/issues/561)) ([68c2968](https://github.com/Gitlawb/openclaude/commit/68c296833dcef54ce44cb18b24357230b5204dbc))
 * scrub canonical Anthropic headers from 3P shim requests ([#499](https://github.com/Gitlawb/openclaude/issues/499)) ([07621a6](https://github.com/Gitlawb/openclaude/commit/07621a6f8d0918170281869a47b5dbff90e71594))
 * strip Anthropic params from 3P resume paths ([#479](https://github.com/Gitlawb/openclaude/issues/479)) ([4975cfc](https://github.com/Gitlawb/openclaude/commit/4975cfc2e0ddbe34aa4e8e3f52ee5eba07fbe465))
 * suppress startup dialogs when input is buffered ([#423](https://github.com/Gitlawb/openclaude/issues/423)) ([8ece290](https://github.com/Gitlawb/openclaude/commit/8ece2900872dadd157e798ef501ddf126dac66c4))
 * **tui:** restore prompt rendering on startup ([#498](https://github.com/Gitlawb/openclaude/issues/498)) ([e30ad17](https://github.com/Gitlawb/openclaude/commit/e30ad17ae0056787273be2caafd6cf5340b6ab57))
 * update theme preview on focus change ([#562](https://github.com/Gitlawb/openclaude/issues/562)) ([6924718](https://github.com/Gitlawb/openclaude/commit/692471850fc789ee0797190089272407f9a4d953))
 * **web-search:** close SSRF bypasses in custom provider hostname guard ([#610](https://github.com/Gitlawb/openclaude/issues/610)) ([a02c441](https://github.com/Gitlawb/openclaude/commit/a02c44143b257fbee7f38f1b93873cc0ea68a1f9))
 * WebSearch providers + MCPTool bugs ([#593](https://github.com/Gitlawb/openclaude/issues/593)) ([91e4cfb](https://github.com/Gitlawb/openclaude/commit/91e4cfb15b62c04615834fd3c417fe38b4feb914))
--- a/46
+++ b/46
@@ -1,46 +0,0 @@
 # ---- build stage ----
 FROM node:22-slim AS build
 # Install Bun
 RUN npm install -g bun@1.3.11
 WORKDIR /app
 # Copy dependency manifests first for better layer caching
 COPY package.json bun.lock ./
 # Install all dependencies (including devDependencies for build)
 RUN bun install --frozen-lockfile
 # Copy source code
 COPY src/ src/
 COPY scripts/ scripts/
 COPY bin/ bin/
 COPY tsconfig.json ./
 # Build the CLI bundle
 RUN bun run build
 # Prune devDependencies
 RUN rm -rf node_modules && bun install --frozen-lockfile --production
 # ---- runtime stage ----
 FROM node:22-slim
 WORKDIR /app
 # Copy only what's needed to run
 COPY --from=build /app/dist/cli.mjs dist/cli.mjs
 COPY --from=build /app/bin/ bin/
 COPY --from=build /app/node_modules/ node_modules/
 COPY --from=build /app/package.json package.json
 COPY README.md ./
 # Install git and ripgrep — many CLI tool operations depend on them
 RUN apt-get update && apt-get install -y --no-install-recommends git ripgrep \
    && rm -rf /var/lib/apt/lists/*
 # Run as non-root user
 USER node
 ENTRYPOINT ["node", "/app/dist/cli.mjs"]
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 OpenClaude is an open-source coding-agent CLI for cloud and local model providers.
-Use OpenAI-compatible APIs, Gemini, GitHub Models, Codex OAuth, Codex, Ollama, Atomic Chat, and other supported backends while keeping one terminal-first workflow: prompts, tools, agents, MCP, slash commands, and streaming output.
+Use OpenAI-compatible APIs, Gemini, GitHub Models, Codex, Ollama, Atomic Chat, and other supported backends while keeping one terminal-first workflow: prompts, tools, agents, MCP, slash commands, and streaming output.
 [![PR Checks](https://github.com/Gitlawb/openclaude/actions/workflows/pr-checks.yml/badge.svg?branch=main)](https://github.com/Gitlawb/openclaude/actions/workflows/pr-checks.yml)
 [![Release](https://img.shields.io/github/v/tag/Gitlawb/openclaude?label=release&color=0ea5e9)](https://github.com/Gitlawb/openclaude/tags)
@@ -10,20 +10,13 @@ Use OpenAI-compatible APIs, Gemini, GitHub Models, Codex OAuth, Codex, Ollama, A
 [![Security Policy](https://img.shields.io/badge/security-policy-0f766e)](SECURITY.md)
 [![License](https://img.shields.io/badge/license-MIT-2563eb)](LICENSE)
 OpenClaude is also mirrored to GitLawb:
 [gitlawb.com/node/repos/z6MkqDnb/openclaude](https://gitlawb.com/node/repos/z6MkqDnb/openclaude)
 [Quick Start](#quick-start) | [Setup Guides](#setup-guides) | [Providers](#supported-providers) | [Source Build](#source-build-and-local-development) | [VS Code Extension](#vs-code-extension) | [Community](#community)
 ## Star History
 [![Star History Chart](https://api.star-history.com/chart?repos=gitlawb/openclaude&type=date&legend=top-left)](https://www.star-history.com/?repos=gitlawb%2Fopenclaude&type=date&legend=top-left)
 ## Why OpenClaude
 - Use one CLI across cloud APIs and local model backends
 - Save provider profiles inside the app with `/provider`
- Run with OpenAI-compatible services, Gemini, GitHub Models, Codex OAuth, Codex, Ollama, Atomic Chat, and other supported providers
+- Run with OpenAI-compatible services, Gemini, GitHub Models, Codex, Ollama, Atomic Chat, and other supported providers
 - Keep coding-agent workflows in one place: bash, file tools, grep, glob, agents, tasks, MCP, and web tools
 - Use the bundled VS Code extension for launch integration and theme support
@@ -92,16 +85,6 @@ $env:OPENAI_MODEL="qwen2.5-coder:7b"
 openclaude
 ```
 ### Using Ollama's launch command
 If you have [Ollama](https://ollama.com) installed, you can skip the env var setup entirely:
 ```bash
 ollama launch openclaude --model qwen2.5-coder:7b
 ```
 This automatically sets `ANTHROPIC_BASE_URL`, model routing, and auth so all API traffic goes through your local Ollama instance. Works with any model you have pulled — local or cloud.
 ## Setup Guides
 Beginner-friendly guides:
@@ -122,9 +105,8 @@ Advanced and source-build guides:
 | OpenAI-compatible | `/provider` or env vars | Works with OpenAI, OpenRouter, DeepSeek, Groq, Mistral, LM Studio, and other compatible `/v1` servers |
 | Gemini | `/provider` or env vars | Supports API key, access token, or local ADC workflow on current `main` |
 | GitHub Models | `/onboard-github` | Interactive onboarding with saved credentials |
-| Codex OAuth | `/provider` | Opens ChatGPT sign-in in your browser and stores Codex credentials securely |
+| Codex | `/provider` | Uses existing Codex credentials when available |
-| Codex | `/provider` | Uses existing Codex CLI auth, OpenClaude secure storage, or env credentials |
+| Ollama | `/provider` or env vars | Local inference with no API key |
 | Ollama | `/provider`, env vars, or `ollama launch` | Local inference with no API key |
 | Atomic Chat | advanced setup | Local Apple Silicon backend |
 | Bedrock / Vertex / Foundry | env vars | Additional provider integrations for supported environments |
@@ -331,8 +313,7 @@ For larger changes, open an issue first so the scope is clear before implementat
 - `bun run build`
 - `bun run test:coverage`
 - `bun run smoke`
- focused `bun test ...` runs for files and flows you changed
+- focused `bun test ...` runs for touched areas
 ## Disclaimer
--- a/bun.lock
+++ b/bun.lock
@@ -30,7 +30,7 @@
        "@opentelemetry/semantic-conventions": "1.40.0",
        "ajv": "8.18.0",
        "auto-bind": "5.0.1",
-        "axios": "1.15.0",
+        "axios": "1.14.0",
        "bidi-js": "1.0.3",
        "chalk": "5.6.2",
        "chokidar": "4.0.3",
@@ -479,7 +479,7 @@
    "auto-bind": ["auto-bind@5.0.1", "", {}, "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="],
-    "axios": ["axios@1.15.0", "", { "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q=="],
+    "axios": ["axios@1.14.0", "", { "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ=="],
    "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="],
@@ -1151,8 +1151,6 @@
    "@emnapi/runtime/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
    "@mendable/firecrawl-js/axios": ["axios@1.14.0", "", { "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ=="],
    "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/core": ["@opentelemetry/core@1.30.1", "", { "dependencies": { "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ=="],
    "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.57.2", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/otlp-transformer": "0.57.2" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-XdxEzL23Urhidyebg5E6jZoaiW5ygP/mRjxLHixogbqwDy2Faduzb5N0o/Oi+XTIJu+iyxXdVORjXax+Qgfxag=="],
@@ -1379,8 +1377,6 @@
    "cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
    "firecrawl/axios": ["axios@1.14.0", "", { "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ=="],
    "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
    "gaxios/is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="],
--- a/docs/advanced-setup.md
+++ b/docs/advanced-setup.md
@@ -48,8 +48,6 @@ export OPENAI_MODEL=gpt-4o
 `codexplan` maps to GPT-5.4 on the Codex backend with high reasoning.
 `codexspark` maps to GPT-5.3 Codex Spark for faster loops.
 If you use the in-app provider wizard, choose `Codex OAuth` to open ChatGPT sign-in in your browser and let OpenClaude store Codex credentials securely.
 If you already use the Codex CLI, OpenClaude reads `~/.codex/auth.json` automatically. You can also point it elsewhere with `CODEX_AUTH_JSON_PATH` or override the token directly with `CODEX_API_KEY`.
 ```bash
@@ -84,16 +82,6 @@ OpenRouter model availability changes over time. If a model stops working, try a
 ### Ollama
 Using `ollama launch` (recommended if you have Ollama installed):
 ```bash
 ollama launch openclaude --model llama3.3:70b
 ```
 This handles all environment setup automatically — no env vars needed. Works with any local or cloud model available in your Ollama instance.
 Using environment variables manually:
 ```bash
 ollama pull llama3.3:70b
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gitlawb/openclaude",
-  "version": "0.5.1",
+  "version": "0.1.8",
  "description": "Claude Code opened to any LLM — OpenAI, Gemini, DeepSeek, Ollama, and 200+ models",
  "type": "module",
  "bin": {
@@ -76,7 +76,7 @@
    "@opentelemetry/semantic-conventions": "1.40.0",
    "ajv": "8.18.0",
    "auto-bind": "5.0.1",
-    "axios": "1.15.0",
+    "axios": "1.14.0",
    "bidi-js": "1.0.3",
    "chalk": "5.6.2",
    "chokidar": "4.0.3",
@@ -140,7 +140,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "https://github.com/Gitlawb/openclaude.git"
+    "url": "https://gitlawb.com/z6MkqDnb7Siv3Cwj7pGJq4T5EsUisECqR8KpnDLwcaZq5TPr/openclaude"
  },
  "keywords": [
    "claude-code",
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -1,11 +0,0 @@
 {
  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
  "packages": {
    ".": {
      "release-type": "node",
      "package-name": "@gitlawb/openclaude",
      "bump-minor-pre-major": true,
      "include-v-in-tag": true
    }
  }
 }
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -8,8 +8,7 @@
 * - src/ path aliases
 */
-import { readFileSync, readdirSync, writeFileSync } from 'fs'
+import { readFileSync } from 'fs'
 import { join } from 'path'
 import { noTelemetryPlugin } from './no-telemetry-plugin'
 const pkg = JSON.parse(readFileSync('./package.json', 'utf-8'))
@@ -25,84 +24,25 @@ const featureFlags: Record<string, boolean> = {
  BRIDGE_MODE: false,
  DAEMON: false,
  AGENT_TRIGGERS: false,
-  MONITOR_TOOL: true,
+  MONITOR_TOOL: false,
  ABLATION_BASELINE: false,
  DUMP_SYSTEM_PROMPT: false,
  CACHED_MICROCOMPACT: false,
-  COORDINATOR_MODE: true,
+  COORDINATOR_MODE: false,
  BUILTIN_EXPLORE_PLAN_AGENTS: true,
  CONTEXT_COLLAPSE: false,
  COMMIT_ATTRIBUTION: false,
-  TEAMMEM: true,
+  TEAMMEM: false,
  UDS_INBOX: false,
  BG_SESSIONS: false,
  AWAY_SUMMARY: false,
  TRANSCRIPT_CLASSIFIER: false,
  WEB_BROWSER_TOOL: false,
-  MESSAGE_ACTIONS: true,
+  MESSAGE_ACTIONS: false,
  BUDDY: true,
  CHICAGO_MCP: false,
  COWORKER_TYPE_TELEMETRY: false,
 }
 // ── Pre-process: replace feature() calls with boolean literals ──────
 // Bun v1.3.9+ resolves `import { feature } from 'bun:bundle'` natively
 // before plugins can intercept it via onResolve. The bun: namespace is
 // handled by Bun's C++ resolver which runs before the JS plugin phase,
 // so the previous onResolve/onLoad shim was silently ineffective — ALL
 // feature() calls evaluated to false regardless of the featureFlags map.
 //
 // Fix: pre-process source files to strip the bun:bundle import and
 // replace feature('FLAG') calls with their boolean literal. Files are
 // modified in-place before Bun.build() and restored in a finally block.
 // Match feature('FLAG') calls, including multi-line: feature(\n  'FLAG',\n)
 const featureCallRe = /\bfeature\(\s*['"](\w+)['"][,\s]*\)/gs
 const featureImportRe = /import\s*\{[^}]*\bfeature\b[^}]*\}\s*from\s*['"]bun:bundle['"];?\s*\n?/g
 const modifiedFiles = new Map<string, string>() // path → original content
 function preProcessFeatureFlags(dir: string) {
  for (const ent of readdirSync(dir, { withFileTypes: true })) {
    const full = join(dir, ent.name)
    if (ent.isDirectory()) { preProcessFeatureFlags(full); continue }
    if (!/\.(ts|tsx)$/.test(ent.name)) continue
    const raw = readFileSync(full, 'utf-8')
    if (!raw.includes('feature(')) continue
    let contents = raw
    contents = contents.replace(featureImportRe, '')
    contents = contents.replace(featureCallRe, (_match, name) =>
      String((featureFlags as Record<string, boolean>)[name] ?? false),
    )
    if (contents !== raw) {
      modifiedFiles.set(full, raw)
      writeFileSync(full, contents)
    }
  }
 }
 function restoreModifiedFiles() {
  for (const [path, original] of modifiedFiles) {
    writeFileSync(path, original)
  }
  modifiedFiles.clear()
 }
 preProcessFeatureFlags(join(import.meta.dir, '..', 'src'))
 const numModified = modifiedFiles.size
 // Restore source files on abrupt termination (Ctrl+C, kill, etc.)
 for (const signal of ['SIGINT', 'SIGTERM'] as const) {
  process.on(signal, () => {
    restoreModifiedFiles()
    process.exit(signal === 'SIGINT' ? 130 : 143)
  })
 }
 try {
 const result = await Bun.build({
  entrypoints: ['./src/entrypoints/cli.tsx'],
  outdir: './dist',
@@ -163,11 +103,18 @@ export async function handleBgFlag() { throw new Error("Background sessions are
          ],
        ] as const)
-        // bun:bundle feature() replacement is handled by the source
+        // Resolve `import { feature } from 'bun:bundle'` to a shim
-        // pre-processing step above (see preProcessFeatureFlags).
+        build.onResolve({ filter: /^bun:bundle$/ }, () => ({
-        // The previous onResolve/onLoad shim was ineffective in Bun
+          path: 'bun:bundle',
-        // v1.3.9+ because the bun: namespace is resolved natively
+          namespace: 'bun-bundle-shim',
-        // before the JS plugin phase runs.
+        }))
        build.onLoad(
          { filter: /.*/, namespace: 'bun-bundle-shim' },
          () => ({
            contents: `const featureFlags = ${JSON.stringify(featureFlags)};\nexport function feature(name) { return featureFlags[name] ?? false; }`,
            loader: 'js',
          }),
        )
        build.onResolve(
          { filter: /^\.\.\/(daemon\/workerRegistry|daemon\/main|cli\/bg|cli\/handlers\/templateJobs|environment-runner\/main|self-hosted-runner\/main)\.js$/ },
@@ -327,7 +274,16 @@ export const SeverityNumber = {};
        // Scan source to find imports that can't resolve
        function scanForMissingImports() {
-          function checkAndRegister(specifier: string, fileDir: string, namedPart: string) {
+          function walk(dir: string) {
            for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
              const full = pathMod.join(dir, ent.name)
              if (ent.isDirectory()) { walk(full); continue }
              if (!/\.(ts|tsx)$/.test(ent.name)) continue
              const code: string = fs.readFileSync(full, 'utf-8')
              // Collect all imports
              for (const m of code.matchAll(/import\s+(?:\{([^}]*)\}|(\w+))?\s*(?:,\s*\{([^}]*)\})?\s*from\s+['"](.*?)['"]/g)) {
                const specifier = m[4]
                const namedPart = m[1] || m[3] || ''
                const names = namedPart.split(',')
                  .map((s: string) => s.trim().replace(/^type\s+/, ''))
                  .filter((s: string) => s && !s.startsWith('type '))
@@ -347,7 +303,8 @@ export const SeverityNumber = {};
                }
                // Check relative .js imports
                else if (specifier.endsWith('.js') && (specifier.startsWith('./') || specifier.startsWith('../'))) {
-                  const resolved = pathMod.resolve(fileDir, specifier)
+                  const dir2 = pathMod.dirname(full)
                  const resolved = pathMod.resolve(dir2, specifier)
                  const tsVariant = resolved.replace(/\.js$/, '.ts')
                  const tsxVariant = resolved.replace(/\.js$/, '.tsx')
                  if (!fs.existsSync(resolved) && !fs.existsSync(tsVariant) && !fs.existsSync(tsxVariant)) {
@@ -360,38 +317,6 @@ export const SeverityNumber = {};
                  if (!missingModuleExports.has(specifier)) missingModuleExports.set(specifier, new Set())
                  for (const n of names) missingModuleExports.get(specifier)!.add(n)
                }
          }
          function walk(dir: string) {
            for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
              const full = pathMod.join(dir, ent.name)
              if (ent.isDirectory()) { walk(full); continue }
              if (!/\.(ts|tsx)$/.test(ent.name)) continue
              const rawCode: string = fs.readFileSync(full, 'utf-8')
              const fileDir = pathMod.dirname(full)
              // Strip comments before scanning for imports/requires.
              // The regex scanner matches require()/import() patterns
              // inside JSDoc comments, causing false-positive missing
              // module detection that breaks the build with noop stubs.
              const code = rawCode
                .replace(/\/\*[\s\S]*?\*\//g, '')  // block comments
                .replace(/\/\/.*$/gm, '')           // line comments
              // Collect static imports: import { X } from '...'
              for (const m of code.matchAll(/import\s+(?:\{([^}]*)\}|(\w+))?\s*(?:,\s*\{([^}]*)\})?\s*from\s+['"](.*?)['"]/g)) {
                checkAndRegister(m[4], fileDir, m[1] || m[3] || '')
              }
              // Collect dynamic requires: require('...') — these are used
              // behind feature() gates and become live when flags are enabled.
              for (const m of code.matchAll(/require\(\s*['"](\.\.?\/[^'"]+)['"]\s*\)/g)) {
                checkAndRegister(m[1], fileDir, '')
              }
              // Collect dynamic imports: import('...')
              for (const m of code.matchAll(/import\(\s*['"](\.\.?\/[^'"]+)['"]\s*\)/g)) {
                checkAndRegister(m[1], fileDir, '')
              }
            }
          }
@@ -464,13 +389,7 @@ if (!result.success) {
  for (const log of result.logs) {
    console.error(log)
  }
-  process.exitCode = 1
+  process.exit(1)
 } else {
  console.log(`✓ Built openclaude v${version} → dist/cli.mjs`)
 }
-} finally {
+console.log(`✓ Built openclaude v${version} → dist/cli.mjs`)
  // Always restore source files, even if Bun.build() throws
  restoreModifiedFiles()
  console.log(`  🔄 feature-flags: pre-processed ${numModified} files (restored)`)
 }
--- a/scripts/no-telemetry-growthbook-stub.test.ts
+++ b/scripts/no-telemetry-growthbook-stub.test.ts
@@ -1,146 +0,0 @@
 import { afterAll, beforeEach, describe, expect, test } from 'bun:test'
 import { mkdirSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 // ---------------------------------------------------------------------------
 // Setup: extract the growthbook stub from no-telemetry-plugin.ts, write it to
 // a temp .mjs file, and dynamically import it so we can test the real code
 // that gets bundled.
 // ---------------------------------------------------------------------------
 const pluginSource = readFileSync(join(__dirname, 'no-telemetry-plugin.ts'), 'utf-8')
 const stubMatch = pluginSource.match(/'services\/analytics\/growthbook': `([\s\S]*?)`/)
 if (!stubMatch) throw new Error('Could not extract growthbook stub from no-telemetry-plugin.ts')
 const testDir = join(tmpdir(), `growthbook-stub-test-${process.pid}`)
 const stubFile = join(testDir, 'growthbook-stub.mjs')
 const flagsFile = join(testDir, 'test-flags.json')
 mkdirSync(testDir, { recursive: true })
 writeFileSync(stubFile, stubMatch[1])
 // Point the stub at our test flags file (checked by _loadFlags on first access)
 process.env.CLAUDE_FEATURE_FLAGS_FILE = flagsFile
 const stub = await import(stubFile)
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
 describe('growthbook stub — local feature flag overrides', () => {
  beforeEach(() => {
    stub.resetGrowthBook()
    try { unlinkSync(flagsFile) } catch { /* may not exist */ }
  })
  afterAll(() => {
    rmSync(testDir, { recursive: true, force: true })
    delete process.env.CLAUDE_FEATURE_FLAGS_FILE
  })
  // ── File absent ──────────────────────────────────────────────────
  test('returns defaultValue when flags file is absent', () => {
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 42)).toBe(42)
  })
  test('getAllGrowthBookFeatures returns {} when file is absent', () => {
    expect(stub.getAllGrowthBookFeatures()).toEqual({})
  })
  // ── Valid JSON object ────────────────────────────────────────────
  test('loads and returns values from a valid JSON file', () => {
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: true, tengu_bar: 'hello' }))
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', false)).toBe(true)
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_bar', 'default')).toBe('hello')
  })
  test('returns defaultValue for keys not present in the file', () => {
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: true }))
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_missing', 99)).toBe(99)
  })
  test('getAllGrowthBookFeatures returns the full flags object', () => {
    const flags = { tengu_a: true, tengu_b: false, tengu_c: 42 }
    writeFileSync(flagsFile, JSON.stringify(flags))
    expect(stub.getAllGrowthBookFeatures()).toEqual(flags)
  })
  // ── Malformed / non-object JSON ──────────────────────────────────
  test('falls back to defaults on malformed JSON', () => {
    writeFileSync(flagsFile, '{not valid json!!!')
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'fallback')).toBe('fallback')
  })
  test('falls back to defaults when JSON is a primitive (true)', () => {
    writeFileSync(flagsFile, 'true')
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'fallback')).toBe('fallback')
  })
  test('falls back to defaults when JSON is an array', () => {
    writeFileSync(flagsFile, '["a", "b"]')
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'fallback')).toBe('fallback')
  })
  // ── Cache invalidation ───────────────────────────────────────────
  test('resetGrowthBook clears cache so the file is re-read', () => {
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: 'first' }))
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'x')).toBe('first')
    // Update the file — cached value is still 'first'
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: 'second' }))
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'x')).toBe('first')
    // After reset, the new value is picked up
    stub.resetGrowthBook()
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'x')).toBe('second')
  })
  test('refreshGrowthBookFeatures clears cache', async () => {
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: 'v1' }))
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'x')).toBe('v1')
    writeFileSync(flagsFile, JSON.stringify({ tengu_foo: 'v2' }))
    await stub.refreshGrowthBookFeatures()
    expect(stub.getFeatureValue_CACHED_MAY_BE_STALE('tengu_foo', 'x')).toBe('v2')
  })
  // ── Multiple getter variants ─────────────────────────────────────
  test('all getter functions read from local flags', async () => {
    writeFileSync(flagsFile, JSON.stringify({ tengu_gate: true, tengu_config: { a: 1 } }))
    expect(await stub.getFeatureValue_DEPRECATED('tengu_gate', false)).toBe(true)
    stub.resetGrowthBook()
    expect(stub.getFeatureValue_CACHED_WITH_REFRESH('tengu_gate', false)).toBe(true)
    stub.resetGrowthBook()
    expect(stub.checkStatsigFeatureGate_CACHED_MAY_BE_STALE('tengu_gate')).toBe(true)
    stub.resetGrowthBook()
    expect(await stub.checkGate_CACHED_OR_BLOCKING('tengu_gate')).toBe(true)
    stub.resetGrowthBook()
    expect(await stub.getDynamicConfig_BLOCKS_ON_INIT('tengu_config', {})).toEqual({ a: 1 })
    stub.resetGrowthBook()
    expect(stub.getDynamicConfig_CACHED_MAY_BE_STALE('tengu_config', {})).toEqual({ a: 1 })
  })
  // ── Security gate ────────────────────────────────────────────────
  test('checkSecurityRestrictionGate always returns false regardless of flags', async () => {
    writeFileSync(flagsFile, JSON.stringify({
      tengu_disable_bypass_permissions_mode: true,
    }))
    expect(await stub.checkSecurityRestrictionGate()).toBe(false)
  })
 })
--- a/scripts/no-telemetry-plugin.ts
+++ b/scripts/no-telemetry-plugin.ts
@@ -34,55 +34,28 @@ export function _resetForTesting() {}
 `,
 	'services/analytics/growthbook': `
 import _fs from 'node:fs';
 import _path from 'node:path';
 import _os from 'node:os';
 let _flags = undefined;
 function _loadFlags() {
  if (_flags !== undefined) return;
  try {
    const flagsPath = process.env.CLAUDE_FEATURE_FLAGS_FILE
      || _path.join(_os.homedir(), '.claude', 'feature-flags.json');
    const parsed = JSON.parse(_fs.readFileSync(flagsPath, 'utf-8'));
    _flags = (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) ? parsed : null;
  } catch {
    _flags = null;
  }
 }
 function _getFlagValue(key, defaultValue) {
  _loadFlags();
  if (_flags != null && Object.hasOwn(_flags, key)) return _flags[key];
  return defaultValue;
 }
 const noop = () => {};
 export function onGrowthBookRefresh() { return noop; }
 export function hasGrowthBookEnvOverride() { return false; }
-export function getAllGrowthBookFeatures() { _loadFlags(); return _flags || {}; }
+export function getAllGrowthBookFeatures() { return {}; }
 export function getGrowthBookConfigOverrides() { return {}; }
 export function setGrowthBookConfigOverride() {}
 export function clearGrowthBookConfigOverrides() {}
 export function getApiBaseUrlHost() { return undefined; }
 export const initializeGrowthBook = async () => null;
-export async function getFeatureValue_DEPRECATED(feature, defaultValue) { return _getFlagValue(feature, defaultValue); }
+export async function getFeatureValue_DEPRECATED(feature, defaultValue) { return defaultValue; }
-export function getFeatureValue_CACHED_MAY_BE_STALE(feature, defaultValue) { return _getFlagValue(feature, defaultValue); }
+export function getFeatureValue_CACHED_MAY_BE_STALE(feature, defaultValue) { return defaultValue; }
-export function getFeatureValue_CACHED_WITH_REFRESH(feature, defaultValue) { return _getFlagValue(feature, defaultValue); }
+export function getFeatureValue_CACHED_WITH_REFRESH(feature, defaultValue) { return defaultValue; }
-export function checkStatsigFeatureGate_CACHED_MAY_BE_STALE(gate) { return Boolean(_getFlagValue(gate, false)); }
+export function checkStatsigFeatureGate_CACHED_MAY_BE_STALE() { return false; }
-// Security killswitch — always false in the open build. Anthropic uses this
+export async function checkSecurityRestrictionGate() { return false; }
-// gate to remotely disable bypassPermissions mode; exposing it via local flags
+export async function checkGate_CACHED_OR_BLOCKING() { return false; }
 // would let users accidentally lock themselves out of --dangerously-skip-permissions.
 export async function checkSecurityRestrictionGate(gate) { return false; }
 export async function checkGate_CACHED_OR_BLOCKING(gate) { return Boolean(_getFlagValue(gate, false)); }
 export function refreshGrowthBookAfterAuthChange() {}
-export function resetGrowthBook() { _flags = undefined; }
+export function resetGrowthBook() {}
-export async function refreshGrowthBookFeatures() { _flags = undefined; }
+export async function refreshGrowthBookFeatures() {}
 export function setupPeriodicGrowthBookRefresh() {}
 export function stopPeriodicGrowthBookRefresh() {}
-export async function getDynamicConfig_BLOCKS_ON_INIT(configName, defaultValue) { return _getFlagValue(configName, defaultValue); }
+export async function getDynamicConfig_BLOCKS_ON_INIT(configName, defaultValue) { return defaultValue; }
-export function getDynamicConfig_CACHED_MAY_BE_STALE(configName, defaultValue) { return _getFlagValue(configName, defaultValue); }
+export function getDynamicConfig_CACHED_MAY_BE_STALE(configName, defaultValue) { return defaultValue; }
 `,
 	'services/analytics/sink': `
--- a/src/tests/bugfixes.test.ts
+++ b/src/tests/bugfixes.test.ts
@@ -1,282 +0,0 @@
 /**
 * Tests for Bug Fixes applied to openclaude.
 *
 * Covers:
 * 1. Gemini `store: false` rejection fix
 * 2. Session timeout / 500 error fix (stream idle timeout)
 * 3. Agent loop continuation nudge
 * 4. Web search result count improvements
 */
 import { describe, test, expect } from 'bun:test'
 import { resolve } from 'path'
 const SRC = resolve(import.meta.dir, '..')
 const file = (relative: string) => Bun.file(resolve(SRC, relative))
 // ---------------------------------------------------------------------------
 // Fix 1: Gemini `store: false` rejection
 // ---------------------------------------------------------------------------
 describe('Gemini store field fix', () => {
  test('isGeminiMode is imported and used in openaiShim', async () => {
    const content = await file('services/api/openaiShim.ts').text()
    // Verify the fix: store deletion should check for Gemini mode
    expect(content).toContain('isGeminiMode()')
    expect(content).toContain("mistral and gemini don't recognize body.store")
    // Ensure the delete body.store is guarded for both Mistral and Gemini
    expect(content).toMatch(/isMistral\s*\|\|\s*isGeminiMode\(\)/)
  })
  test('store: false is still set by default (OpenAI needs it)', async () => {
    const content = await file('services/api/openaiShim.ts').text()
    // The body should still have store: false by default
    expect(content).toMatch(/store:\s*false/)
    // But it should be deleted for non-OpenAI providers
    expect(content).toMatch(/delete body\.store/)
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 2: Session timeout — stream idle timeout
 // ---------------------------------------------------------------------------
 describe('Session timeout fix', () => {
  test('openaiShim has idle timeout for SSE streams', async () => {
    const content = await file('services/api/openaiShim.ts').text()
    expect(content).toContain('STREAM_IDLE_TIMEOUT_MS')
    expect(content).toContain('readWithTimeout')
    expect(content).toMatch(/readWithTimeout\(\)/)
  })
  test('codexShim has idle timeout for SSE streams', async () => {
    const content = await file('services/api/codexShim.ts').text()
    expect(content).toContain('STREAM_IDLE_TIMEOUT_MS')
    expect(content).toContain('readWithTimeout')
    expect(content).toMatch(/readWithTimeout\(\)/)
  })
  test('idle timeout is set to a reasonable value (>= 60s)', async () => {
    const content = await file('services/api/openaiShim.ts').text()
    // Extract the timeout value (supports numeric separators like 120_000)
    const match = content.match(/STREAM_IDLE_TIMEOUT_MS\s*=\s*([\d_]+)/)
    expect(match).not.toBeNull()
    const timeoutMs = parseInt(match![1].replace(/_/g, ''), 10)
    expect(timeoutMs).toBeGreaterThanOrEqual(60_000)
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 3: Agent loop continuation nudge
 // ---------------------------------------------------------------------------
 describe('Agent loop continuation nudge', () => {
  test('query.ts has continuation signal detection', async () => {
    const content = await file('query.ts').text()
    expect(content).toContain('continuationSignals')
    expect(content).toContain('Continuation nudge triggered')
    expect(content).toContain('continuation_nudge')
  })
  test('continuation signals include tightened patterns', async () => {
    const content = await file('query.ts').text()
    // Should detect tightened patterns requiring explicit action verbs
    expect(content).toMatch(/so now \(i\|let me\|we\)/)
    expect(content).toContain('completionMarkers')
    expect(content).toContain('MAX_CONTINUATION_NUDGES')
    // Verify the nudge counter guard exists
    expect(content).toMatch(/continuationNudgeCount\s*<\s*MAX_CONTINUATION_NUDGES/)
  })
  test('nudge creates a meta user message to continue', async () => {
    const content = await file('query.ts').text()
    expect(content).toContain(
      'Continue with the task. Use the appropriate tools to proceed.',
    )
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 4: Web search result count improvements
 // ---------------------------------------------------------------------------
 describe('Web search result count improvements', () => {
  test('Bing provider requests at least 15 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/bing.ts',
    ).text()
    expect(content).toMatch(/count.*['"]15['"]/)
  })
  test('Tavily provider requests at least 15 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/tavily.ts',
    ).text()
    expect(content).toMatch(/max_results:\s*15/)
  })
  test('Exa provider requests at least 15 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/exa.ts',
    ).text()
    expect(content).toMatch(/numResults:\s*15/)
  })
  test('Firecrawl provider requests at least 15 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/firecrawl.ts',
    ).text()
    expect(content).toMatch(/limit:\s*15/)
  })
  test('Mojeek provider requests at least 10 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/mojeek.ts',
    ).text()
    // Mojeek uses 't' param for result count — verify it's set to 10
    expect(content).toMatch(/searchParams\.set\('t',\s*'10'\)/)
  })
  test('You.com provider requests at least 10 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/you.ts',
    ).text()
    expect(content).toMatch(/num_web_results.*['"]10['"]/)
  })
  test('Jina provider requests at least 10 results', async () => {
    const content = await file(
      'tools/WebSearchTool/providers/jina.ts',
    ).text()
    expect(content).toMatch(/count.*['"]10['"]/)
  })
  test('Native Anthropic web search max_uses increased to 15', async () => {
    const content = await file(
      'tools/WebSearchTool/WebSearchTool.ts',
    ).text()
    expect(content).toMatch(/max_uses:\s*15/)
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 5: MCP tool timeout fix
 // ---------------------------------------------------------------------------
 describe('MCP tool timeout fix', () => {
  test('default MCP tool timeout is reasonable (not 27 hours)', async () => {
    const content = await file('services/mcp/client.ts').text()
    // Should NOT have the old ~27.8 hour default
    expect(content).not.toContain('100_000_000')
    // Should have a reasonable timeout (5 minutes = 300_000ms)
    expect(content).toMatch(/DEFAULT_MCP_TOOL_TIMEOUT_MS\s*=\s*300_000/)
  })
  test('MCP tools/list has retry logic', async () => {
    const content = await file('services/mcp/client.ts').text()
    expect(content).toContain('tools/list failed (attempt')
    expect(content).toContain('Retrying...')
  })
  test('MCP URL elicitation checks abort signal', async () => {
    const content = await file('services/mcp/client.ts').text()
    expect(content).toContain('signal.aborted')
    expect(content).toContain('Tool call aborted during URL elicitation')
  })
  test('MCP tool error messages include server and tool name in telemetry', async () => {
    const content = await file('services/mcp/client.ts').text()
    // Telemetry message should include context like "MCP tool [serverName] toolName: error"
    // The human-readable message stays unchanged to avoid breaking error consumers
    expect(content).toContain('MCP tool [${name}] ${tool}:')
  })
 })
 // ---------------------------------------------------------------------------
 // Cross-cutting: verify no regressions
 // ---------------------------------------------------------------------------
 describe('Regression checks', () => {
  test('store field is still set for OpenAI (not deleted unconditionally)', async () => {
    const content = await file('services/api/openaiShim.ts').text()
    // store: false should exist in body construction
    expect(content).toMatch(/store:\s*false/)
    // But delete body.store should be conditional (guarded by if)
    const deleteLines = content.split('\n').filter(l => l.includes('delete body.store'))
    expect(deleteLines.length).toBeGreaterThan(0)
    // Verify the delete is inside a conditional block by checking surrounding context
    for (const line of deleteLines) {
      const trimmed = line.trim()
      // Should be either inside an if block (indented delete) or a comment
      expect(
        trimmed.startsWith('delete') && !trimmed.includes('// unconditional'),
      ).toBe(true)
    }
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 6: SendMessageTool race condition guard
 // ---------------------------------------------------------------------------
 describe('SendMessageTool race condition fix', () => {
  test('SendMessageTool has double-check for concurrent resume', async () => {
    const content = await file('tools/SendMessageTool/SendMessageTool.ts').text()
    // Should have a second status check before resuming to prevent race
    expect(content).toContain('was concurrently resumed')
    // The freshTask check should re-read from getAppState
    expect(content).toMatch(/const freshTask = context\.getAppState\(\)\.tasks\[agentId\]/)
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 7: AgentTool dump state cleanup
 // ---------------------------------------------------------------------------
 describe('AgentTool cleanup fix', () => {
  test('backgrounded agent always cleans up dump state', async () => {
    const content = await file('tools/AgentTool/AgentTool.tsx').text()
    // The backgrounded agent's finally block should clean up regardless
    // of whether the agent crashed or completed normally
    expect(content).toContain('Defensive cleanup: wrap each call so one failure')
    // Verify cleanup is wrapped in try/catch for defensive execution
    expect(content).toMatch(/try\s*\{\s*clearInvokedSkillsForAgent/)
    expect(content).toMatch(/try\s*\{\s*clearDumpState/)
  })
 })
 // ---------------------------------------------------------------------------
 // Fix 8: Context overflow 500 error handling
 // ---------------------------------------------------------------------------
 describe('Context overflow 500 fix', () => {
  test('errors.ts has handler for context overflow 500 errors', async () => {
    const content = await file('services/api/errors.ts').text()
    expect(content).toContain('500 errors caused by context overflow')
    expect(content).toContain('too many tokens')
    expect(content).toContain('The conversation has grown too large')
  })
  test('query.ts has circuit breaker safety net for oversized context', async () => {
    const content = await file('query.ts').text()
    expect(content).toContain('Safety net: when auto-compact')
    expect(content).toContain('circuit breaker has tripped')
    expect(content).toContain('automatic compaction has failed')
  })
 })
--- a/src/tests/providerCounts.test.ts
+++ b/src/tests/providerCounts.test.ts
@@ -1,55 +0,0 @@
 /**
 * Tests for Web Search Provider result count configurations.
 */
 import { describe, test, expect } from 'bun:test'
 import { resolve } from 'path'
 const SRC = resolve(import.meta.dir, '..', 'tools', 'WebSearchTool', 'providers')
 const file = (name: string) => Bun.file(resolve(SRC, name))
 describe('Provider result counts', () => {
  const providers = [
    'bing.ts',
    'tavily.ts',
    'exa.ts',
    'firecrawl.ts',
    'mojeek.ts',
    'you.ts',
    'jina.ts',
    'duckduckgo.ts',
    // linkup.ts excluded — uses depth param, not a result count field
  ]
  for (const name of providers) {
    test(`${name} exists and is readable`, async () => {
      const f = file(name)
      expect(await f.exists()).toBe(true)
      const content = await f.text()
      expect(content.length).toBeGreaterThan(100)
    })
  }
  test('No provider hardcodes a limit below 10', async () => {
    const suspiciousPatterns = [
      /count['":\s]*['"]([1-9])['"]/i,
      /limit['":\s]*([1-9])\b/,
      /max_results['":\s]*([1-9])\b/,
      /numResults['":\s]*([1-9])\b/,
    ]
    for (const name of providers) {
      const content = await file(name).text()
      for (const pattern of suspiciousPatterns) {
        const match = content.match(pattern)
        if (match) {
          const num = parseInt(match[1], 10)
          expect(num).toBeGreaterThanOrEqual(
            10,
            `${name} has suspiciously low result count: ${match[0]}`,
          )
        }
      }
    }
  })
 })
--- a/src/bootstrap/state.ts
+++ b/src/bootstrap/state.ts
@@ -1562,8 +1562,29 @@ export function clearInvokedSkillsForAgent(agentId: string): void {
  }
 }
-// Slow operations tracking removed (was internal-only).
+// Slow operations tracking for dev bar
-// Functions kept as no-ops to avoid breaking callers.
+const MAX_SLOW_OPERATIONS = 10
 const SLOW_OPERATION_TTL_MS = 10000
 export function addSlowOperation(operation: string, durationMs: number): void {
  if (process.env.USER_TYPE !== 'ant') return
  // Skip tracking for editor sessions (user editing a prompt file in $EDITOR)
  // These are intentionally slow since the user is drafting text
  if (operation.includes('exec') && operation.includes('claude-prompt-')) {
    return
  }
  const now = Date.now()
  // Remove stale operations
  STATE.slowOperations = STATE.slowOperations.filter(
    op => now - op.timestamp < SLOW_OPERATION_TTL_MS,
  )
  // Add new operation
  STATE.slowOperations.push({ operation, durationMs, timestamp: now })
  // Keep only the most recent operations
  if (STATE.slowOperations.length > MAX_SLOW_OPERATIONS) {
    STATE.slowOperations = STATE.slowOperations.slice(-MAX_SLOW_OPERATIONS)
  }
 }
 const EMPTY_SLOW_OPERATIONS: ReadonlyArray<{
  operation: string
@@ -1571,17 +1592,32 @@ const EMPTY_SLOW_OPERATIONS: ReadonlyArray<{
  timestamp: number
 }> = []
 export function addSlowOperation(
  _operation: string,
  _durationMs: number,
 ): void {}
 export function getSlowOperations(): ReadonlyArray<{
  operation: string
  durationMs: number
  timestamp: number
 }> {
-  return EMPTY_SLOW_OPERATIONS
+  // Most common case: nothing tracked. Return a stable reference so the
  // caller's setState() can bail via Object.is instead of re-rendering at 2fps.
  if (STATE.slowOperations.length === 0) {
    return EMPTY_SLOW_OPERATIONS
  }
  const now = Date.now()
  // Only allocate a new array when something actually expired; otherwise keep
  // the reference stable across polls while ops are still fresh.
  if (
    STATE.slowOperations.some(op => now - op.timestamp >= SLOW_OPERATION_TTL_MS)
  ) {
    STATE.slowOperations = STATE.slowOperations.filter(
      op => now - op.timestamp < SLOW_OPERATION_TTL_MS,
    )
    if (STATE.slowOperations.length === 0) {
      return EMPTY_SLOW_OPERATIONS
    }
  }
  // Safe to return directly: addSlowOperation() reassigns STATE.slowOperations
  // before pushing, so the array held in React state is never mutated.
  return STATE.slowOperations
 }
 export function getMainThreadAgentType(): string | undefined {
--- a/src/bridge/bridgeConfig.ts
+++ b/src/bridge/bridgeConfig.ts
@@ -14,14 +14,21 @@
 import { getOauthConfig } from '../constants/oauth.js'
 import { getClaudeAIOAuthTokens } from '../utils/auth.js'
-/** Dev override: CLAUDE_BRIDGE_OAUTH_TOKEN, else undefined. */
+/** Ant-only dev override: CLAUDE_BRIDGE_OAUTH_TOKEN, else undefined. */
 export function getBridgeTokenOverride(): string | undefined {
-  return process.env.CLAUDE_BRIDGE_OAUTH_TOKEN || undefined
+  return (
    (process.env.USER_TYPE === 'ant' &&
      process.env.CLAUDE_BRIDGE_OAUTH_TOKEN) ||
    undefined
  )
 }
-/** Dev override: CLAUDE_BRIDGE_BASE_URL, else undefined. */
+/** Ant-only dev override: CLAUDE_BRIDGE_BASE_URL, else undefined. */
 export function getBridgeBaseUrlOverride(): string | undefined {
-  return process.env.CLAUDE_BRIDGE_BASE_URL || undefined
+  return (
    (process.env.USER_TYPE === 'ant' && process.env.CLAUDE_BRIDGE_BASE_URL) ||
    undefined
  )
 }
 /**
--- a/src/bridge/bridgeMain.ts
+++ b/src/bridge/bridgeMain.ts
@@ -2194,10 +2194,14 @@ export async function bridgeMain(args: string[]): Promise<void> {
  // Session ingress URL for WebSocket connections. In production this is the
  // same as baseUrl (Envoy routes /v1/session_ingress/* to session-ingress).
-  // Locally, session-ingress may run on a different port, so
+  // Locally, session-ingress runs on a different port (9413) than the
-  // CLAUDE_BRIDGE_SESSION_INGRESS_URL can override the default.
+  // contain-provide-api (8211), so CLAUDE_BRIDGE_SESSION_INGRESS_URL must be
  // set explicitly. Ant-only, matching CLAUDE_BRIDGE_BASE_URL.
  const sessionIngressUrl =
-    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL || baseUrl
+    process.env.USER_TYPE === 'ant' &&
    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      ? process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      : baseUrl
  const { getBranch, getRemoteUrl, findGitRoot } = await import(
    '../utils/git.js'
@@ -2847,7 +2851,10 @@ export async function runBridgeHeadless(
    )
  }
  const sessionIngressUrl =
-    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL || baseUrl
+    process.env.USER_TYPE === 'ant' &&
    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      ? process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      : baseUrl
  const { getBranch, getRemoteUrl, findGitRoot } = await import(
    '../utils/git.js'
--- a/src/bridge/createSession.ts
+++ b/src/bridge/createSession.ts
@@ -217,39 +217,25 @@ export async function getBridgeSession(
  }
  const url = `${opts?.baseUrl ?? getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}`
  const timeoutMs = 10_000
  logForDebugging(`[bridge] Fetching session ${sessionId}`)
  let response
  try {
    response = await axios.get<{ environment_id?: string; title?: string }>(
      url,
-      { headers, timeout: timeoutMs, validateStatus: s => s < 500 },
+      { headers, timeout: 10_000, validateStatus: s => s < 500 },
    )
  } catch (err: unknown) {
-    if (axios.isAxiosError(err)) {
+    logForDebugging(
-      const status = err.response?.status ?? 'no-response'
+      `[bridge] Session fetch request failed: ${errorMessage(err)}`,
-      const code = err.code ?? 'unknown-code'
+    )
      const requestUrl = err.config?.url ?? url
      const method = err.config?.method?.toUpperCase() ?? 'GET'
      const message = err.message ?? errorMessage(err)
      const timeout = err.config?.timeout ?? timeoutMs
      logForDebugging(
        `[bridge] Session fetch request failed: status=${status} code=${code} method=${method} url=${requestUrl} timeout=${timeout} message=${message}`,
      )
    } else {
      logForDebugging(
        `[bridge] Session fetch request failed: url=${url} timeout=${timeoutMs} message=${errorMessage(err)}`,
      )
    }
    return null
  }
  if (response.status !== 200) {
    const detail = extractErrorDetail(response.data)
    logForDebugging(
-      `[bridge] Session fetch failed with status ${response.status} url=${url}${detail ? `: ${detail}` : ''}`,
+      `[bridge] Session fetch failed with status ${response.status}${detail ? `: ${detail}` : ''}`,
    )
    return null
  }
--- a/src/bridge/initReplBridge.ts
+++ b/src/bridge/initReplBridge.ts
@@ -465,7 +465,10 @@ export async function initReplBridge(
  const branch = await getBranch()
  const gitRepoUrl = await getRemoteUrl()
  const sessionIngressUrl =
-    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL || baseUrl
+    process.env.USER_TYPE === 'ant' &&
    process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      ? process.env.CLAUDE_BRIDGE_SESSION_INGRESS_URL
      : baseUrl
  // Assistant-mode sessions advertise a distinct worker_type so the web UI
  // can filter them into a dedicated picker. KAIROS guard keeps the
--- a/src/cli/handlers/mcp.tsx
+++ b/src/cli/handlers/mcp.tsx
@@ -11,12 +11,7 @@ import { MCPServerDesktopImportDialog } from '../../components/MCPServerDesktopI
 import { render } from '../../ink.js';
 import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
 import { type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, logEvent } from '../../services/analytics/index.js';
-import {
+import { clearMcpClientConfig, clearServerTokensFromLocalStorage, readClientSecret, saveMcpClientSecret } from '../../services/mcp/auth.js';
  clearMcpClientConfig,
  clearServerTokensFromSecureStorage,
  readClientSecret,
  saveMcpClientSecret,
 } from '../../services/mcp/auth.js'
 import { doctorAllServers, doctorServer, type McpDoctorReport, type McpDoctorScopeFilter } from '../../services/mcp/doctor.js';
 import { connectToServer, getMcpServerConnectionBatchSize } from '../../services/mcp/client.js';
 import { addMcpConfig, getAllMcpConfigs, getMcpConfigByName, getMcpConfigsByScope, removeMcpConfig } from '../../services/mcp/config.js';
--- a/src/cli/print.ts
+++ b/src/cli/print.ts
@@ -362,9 +362,15 @@ const proactiveModule =
  feature('PROACTIVE') || feature('KAIROS')
    ? (require('../proactive/index.js') as typeof import('../proactive/index.js'))
    : null
-const cronSchedulerModule = require('../utils/cronScheduler.js') as typeof import('../utils/cronScheduler.js')
+const cronSchedulerModule = feature('AGENT_TRIGGERS')
-const cronJitterConfigModule = require('../utils/cronJitterConfig.js') as typeof import('../utils/cronJitterConfig.js')
+  ? (require('../utils/cronScheduler.js') as typeof import('../utils/cronScheduler.js'))
-const cronGate = require('../tools/ScheduleCronTool/prompt.js') as typeof import('../tools/ScheduleCronTool/prompt.js')
+  : null
 const cronJitterConfigModule = feature('AGENT_TRIGGERS')
  ? (require('../utils/cronJitterConfig.js') as typeof import('../utils/cronJitterConfig.js'))
  : null
 const cronGate = feature('AGENT_TRIGGERS')
  ? (require('../tools/ScheduleCronTool/prompt.js') as typeof import('../tools/ScheduleCronTool/prompt.js'))
  : null
 const extractMemoriesModule = feature('EXTRACT_MEMORIES')
  ? (require('../services/extractMemories/extractMemories.js') as typeof import('../services/extractMemories/extractMemories.js'))
  : null
@@ -2695,7 +2701,11 @@ function runHeadlessStreaming(
  // the end of run() picks up the queued command.
  let cronScheduler: import('../utils/cronScheduler.js').CronScheduler | null =
    null
-  if (cronGate.isKairosCronEnabled()) {
+  if (
    feature('AGENT_TRIGGERS') &&
    cronSchedulerModule &&
    cronGate?.isKairosCronEnabled()
  ) {
    cronScheduler = cronSchedulerModule.createCronScheduler({
      onFire: prompt => {
        if (inputClosed) return
@@ -2717,8 +2727,8 @@ function runHeadlessStreaming(
        void run()
      },
      isLoading: () => running || inputClosed,
-      getJitterConfig: cronJitterConfigModule.getCronJitterConfig,
+      getJitterConfig: cronJitterConfigModule?.getCronJitterConfig,
-      isKilled: () => !cronGate.isKairosCronEnabled(),
+      isKilled: () => !cronGate?.isKairosCronEnabled(),
    })
    cronScheduler.start()
  }
@@ -4582,7 +4592,7 @@ function handleSetPermissionMode(
          subtype: 'error',
          request_id: requestId,
          error:
-            'Cannot set permission mode to bypassPermissions. Enable it with --allow-dangerously-skip-permissions or set permissions.allowBypassPermissionsMode in settings.json',
+            'Cannot set permission mode to bypassPermissions because the session was not launched with --dangerously-skip-permissions',
        },
      })
      return toolPermissionContext
--- a/src/commands.test.ts
+++ b/src/commands.test.ts
@@ -1,30 +0,0 @@
 import { formatDescriptionWithSource } from './commands.js'
 describe('formatDescriptionWithSource', () => {
  test('returns empty text for prompt commands missing a description', () => {
    const command = {
      name: 'example',
      type: 'prompt',
      source: 'builtin',
      description: undefined,
    } as any
    expect(formatDescriptionWithSource(command)).toBe('')
  })
  test('formats plugin commands with missing description safely', () => {
    const command = {
      name: 'example',
      type: 'prompt',
      source: 'plugin',
      description: undefined,
      pluginInfo: {
        pluginManifest: {
          name: 'MyPlugin',
        },
      },
    } as any
    expect(formatDescriptionWithSource(command)).toBe('(MyPlugin) ')
  })
 })
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -740,23 +740,23 @@ export function getCommand(commandName: string, commands: Command[]): Command {
 */
 export function formatDescriptionWithSource(cmd: Command): string {
  if (cmd.type !== 'prompt') {
-    return cmd.description ?? ''
+    return cmd.description
  }
  if (cmd.kind === 'workflow') {
-    return `${cmd.description ?? ''} (workflow)`
+    return `${cmd.description} (workflow)`
  }
  if (cmd.source === 'plugin') {
    const pluginName = cmd.pluginInfo?.pluginManifest.name
    if (pluginName) {
-      return `(${pluginName}) ${cmd.description ?? ''}`
+      return `(${pluginName}) ${cmd.description}`
    }
-    return `${cmd.description ?? ''} (plugin)`
+    return `${cmd.description} (plugin)`
  }
  if (cmd.source === 'builtin' || cmd.source === 'mcp') {
-    return cmd.description ?? ''
+    return cmd.description
  }
  if (cmd.source === 'bundled') {
--- a/src/commands/commit-push-pr.ts
+++ b/src/commands/commit-push-pr.ts
@@ -45,7 +45,7 @@ function getPromptContent(
 <!-- CHANGELOG:END -->`
  let slackStep = `
-5. After creating/updating the PR, check if the user's AGENTS.md or CLAUDE.md mentions posting to Slack channels. If it does, use ToolSearch to search for "slack send message" tools. If ToolSearch finds a Slack tool, ask the user if they'd like you to post the PR URL to the relevant Slack channel. Only post if the user confirms. If ToolSearch returns no results or errors, skip this step silently—do not mention the failure, do not attempt workarounds, and do not try alternative approaches.`
+5. After creating/updating the PR, check if the user's CLAUDE.md mentions posting to Slack channels. If it does, use ToolSearch to search for "slack send message" tools. If ToolSearch finds a Slack tool, ask the user if they'd like you to post the PR URL to the relevant Slack channel. Only post if the user confirms. If ToolSearch returns no results or errors, skip this step silently—do not mention the failure, do not attempt workarounds, and do not try alternative approaches.`
  if (process.env.USER_TYPE === 'ant' && isUndercover()) {
    prefix = getUndercoverInstructions() + '\n'
    reviewerArg = ''
--- a/src/commands/init.test.ts
+++ b/src/commands/init.test.ts
@@ -1,43 +0,0 @@
 import { afterEach, expect, mock, test } from 'bun:test'
 const originalClaudeCodeNewInit = process.env.CLAUDE_CODE_NEW_INIT
 async function importInitCommand() {
  return (await import(`./init.ts?ts=${Date.now()}-${Math.random()}`)).default
 }
 afterEach(() => {
  mock.restore()
  if (originalClaudeCodeNewInit === undefined) {
    delete process.env.CLAUDE_CODE_NEW_INIT
  } else {
    process.env.CLAUDE_CODE_NEW_INIT = originalClaudeCodeNewInit
  }
 })
 test('NEW_INIT prompt preserves existing root CLAUDE.md by default', async () => {
  process.env.CLAUDE_CODE_NEW_INIT = '1'
  mock.module('../projectOnboardingState.js', () => ({
    maybeMarkProjectOnboardingComplete: () => {},
  }))
  mock.module('./initMode.js', () => ({
    isNewInitEnabled: () => true,
  }))
  const command = await importInitCommand()
  const blocks = await command.getPromptForCommand()
  expect(blocks).toHaveLength(1)
  expect(blocks[0]?.type).toBe('text')
  expect(String(blocks[0]?.text)).toContain(
    'checked-in root `CLAUDE.md` and does NOT already have a root `AGENTS.md`',
  )
  expect(String(blocks[0]?.text)).toContain(
    'do NOT silently create a second root instruction file',
  )
  expect(String(blocks[0]?.text)).toContain(
    'update the existing root `CLAUDE.md` in place by default',
  )
 })
--- a/src/commands/init.ts
+++ b/src/commands/init.ts
@@ -1,6 +1,7 @@
 import { feature } from 'bun:bundle'
 import type { Command } from '../commands.js'
 import { maybeMarkProjectOnboardingComplete } from '../projectOnboardingState.js'
-import { isNewInitEnabled } from './initMode.js'
+import { isEnvTruthy } from '../utils/envUtils.js'
 const OLD_INIT_PROMPT = `Please analyze this codebase and create a CLAUDE.md file, which will be given to future instances of Claude Code to operate in this repository.
@@ -24,19 +25,19 @@ Usage notes:
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 \`\`\``
-const NEW_INIT_PROMPT = `Set up a minimal AGENTS.md (and optionally CLAUDE.local.md, skills, and hooks) for this repo. The root project instruction file is loaded into every Claude Code session, so it must be concise — only include what Claude would get wrong without it.
+const NEW_INIT_PROMPT = `Set up a minimal CLAUDE.md (and optionally skills and hooks) for this repo. CLAUDE.md is loaded into every Claude Code session, so it must be concise — only include what Claude would get wrong without it.
 ## Phase 1: Ask what to set up
 Use AskUserQuestion to find out what the user wants:
- "Which instruction files should /init set up?"
+- "Which CLAUDE.md files should /init set up?"
-  Options: "Project AGENTS.md" | "Personal CLAUDE.local.md" | "Both project + personal"
+  Options: "Project CLAUDE.md" | "Personal CLAUDE.local.md" | "Both project + personal"
  Description for project: "Team-shared instructions checked into source control — architecture, coding standards, common workflows."
  Description for personal: "Your private preferences for this project (gitignored, not shared) — your role, sandbox URLs, preferred test data, workflow quirks."
 - "Also set up skills and hooks?"
-  Options: "Skills + hooks" | "Skills only" | "Hooks only" | "Neither, just the instruction file(s)"
+  Options: "Skills + hooks" | "Skills only" | "Hooks only" | "Neither, just CLAUDE.md"
  Description for skills: "On-demand capabilities you or Claude invoke with \`/skill-name\` — good for repeatable workflows and reference knowledge."
  Description for hooks: "Deterministic shell commands that run on tool events (e.g., format after every edit). Claude can't skip them."
@@ -58,24 +59,24 @@ Note what you could NOT figure out from code alone — these become interview qu
 ## Phase 3: Fill in the gaps
-Use AskUserQuestion to gather what you still need to write good instruction files and skills. Ask only things the code can't answer.
+Use AskUserQuestion to gather what you still need to write good CLAUDE.md files and skills. Ask only things the code can't answer.
-If the user chose project AGENTS.md or both: ask about codebase practices — non-obvious commands, gotchas, branch/PR conventions, required env setup, testing quirks. Skip things already in README or obvious from manifest files. Do not mark any options as "recommended" — this is about how their team works, not best practices.
+If the user chose project CLAUDE.md or both: ask about codebase practices — non-obvious commands, gotchas, branch/PR conventions, required env setup, testing quirks. Skip things already in README or obvious from manifest files. Do not mark any options as "recommended" — this is about how their team works, not best practices.
 If the user chose personal CLAUDE.local.md or both: ask about them, not the codebase. Do not mark any options as "recommended" — this is about their personal preferences, not best practices. Examples of questions:
  - What's their role on the team? (e.g., "backend engineer", "data scientist", "new hire onboarding")
  - How familiar are they with this codebase and its languages/frameworks? (so Claude can calibrate explanation depth)
  - Do they have personal sandbox URLs, test accounts, API key paths, or local setup details Claude should know?
-  - Only if Phase 2 found multiple git worktrees: ask whether their worktrees are nested inside the main repo (e.g., \`.claude/worktrees/<name>/\`) or siblings/external (e.g., \`../myrepo-feature/\`). If nested, the upward file walk finds the main repo's CLAUDE.local.md automatically — no special handling needed. If sibling/external, the personal content should live in a home-directory file (e.g., \`~/.claude/<project-name>-instructions.md\`) and each worktree gets a one-line CLAUDE.local.md stub that imports it: \`@~/.claude/<project-name>-instructions.md\`. Never put this import in the project AGENTS.md — that would check a personal reference into the team-shared file.
+  - Only if Phase 2 found multiple git worktrees: ask whether their worktrees are nested inside the main repo (e.g., \`.claude/worktrees/<name>/\`) or siblings/external (e.g., \`../myrepo-feature/\`). If nested, the upward file walk finds the main repo's CLAUDE.local.md automatically — no special handling needed. If sibling/external, the personal content should live in a home-directory file (e.g., \`~/.claude/<project-name>-instructions.md\`) and each worktree gets a one-line CLAUDE.local.md stub that imports it: \`@~/.claude/<project-name>-instructions.md\`. Never put this import in the project CLAUDE.md — that would check a personal reference into the team-shared file.
  - Any communication preferences? (e.g., "be terse", "always explain tradeoffs", "don't summarize at the end")
-**Synthesize a proposal from Phase 2 findings** — e.g., format-on-edit if a formatter exists, a project verification workflow if tests exist, an AGENTS.md note for anything from the gap-fill answers that's a guideline rather than a workflow. For each, pick the artifact type that fits, **constrained by the Phase 1 skills+hooks choice**:
+**Synthesize a proposal from Phase 2 findings** — e.g., format-on-edit if a formatter exists, a project verification workflow if tests exist, a CLAUDE.md note for anything from the gap-fill answers that's a guideline rather than a workflow. For each, pick the artifact type that fits, **constrained by the Phase 1 skills+hooks choice**:
  - **Hook** (stricter) — deterministic shell command on a tool event; Claude can't skip it. Fits mechanical, fast, per-edit steps: formatting, linting, running a quick test on the changed file.
  - **Skill** (on-demand) — you or Claude invoke \`/skill-name\` when you want it. Fits workflows that don't belong on every edit: deep verification, session reports, deploys.
-  - **AGENTS.md note** (looser) — influences Claude's behavior but not enforced. Fits communication/thinking preferences: "plan before coding", "be terse", "explain tradeoffs".
+  - **CLAUDE.md note** (looser) — influences Claude's behavior but not enforced. Fits communication/thinking preferences: "plan before coding", "be terse", "explain tradeoffs".
-  **Respect Phase 1's skills+hooks choice as a hard filter**: if the user picked "Skills only", downgrade any hook you'd suggest to a skill or an AGENTS.md note. If "Hooks only", downgrade skills to hooks (where mechanically possible) or notes. If "Neither", everything becomes an AGENTS.md note. Never propose an artifact type the user didn't opt into.
+  **Respect Phase 1's skills+hooks choice as a hard filter**: if the user picked "Skills only", downgrade any hook you'd suggest to a skill or a CLAUDE.md note. If "Hooks only", downgrade skills to hooks (where mechanically possible) or notes. If "Neither", everything becomes a CLAUDE.md note. Never propose an artifact type the user didn't opt into.
 **Show the proposal via AskUserQuestion's \`preview\` field, not as a separate text message** — the dialog overlays your output, so preceding text is hidden. The \`preview\` field renders markdown in a side-panel (like plan mode); the \`question\` field is plain-text-only. Structure it as:
@@ -85,19 +86,17 @@ If the user chose personal CLAUDE.local.md or both: ask about them, not the code
    • **Format-on-edit hook** (automatic) — \`ruff format <file>\` via PostToolUse
    • **Verification workflow** (on-demand) — \`make lint && make typecheck && make test\`
-    • **AGENTS.md note** (guideline) — "run lint/typecheck/test before marking done"
+    • **CLAUDE.md note** (guideline) — "run lint/typecheck/test before marking done"
  - Option labels stay short ("Looks good", "Drop the hook", "Drop the skill") — the tool auto-adds an "Other" free-text option, so don't add your own catch-all.
 **Build the preference queue** from the accepted proposal. Each entry: {type: hook|skill|note, description, target file, any Phase-2-sourced details like the actual test/format command}. Phases 4-7 consume this queue.
-## Phase 4: Write AGENTS.md (if user chose project or both)
+## Phase 4: Write CLAUDE.md (if user chose project or both)
-Write a minimal AGENTS.md at the project root. Every line must pass this test: "Would removing this cause Claude to make mistakes?" If no, cut it.
+Write a minimal CLAUDE.md at the project root. Every line must pass this test: "Would removing this cause Claude to make mistakes?" If no, cut it.
-If the repo already has a checked-in root \`CLAUDE.md\` and does NOT already have a root \`AGENTS.md\`, do NOT silently create a second root instruction file. In that case, update the existing root \`CLAUDE.md\` in place by default. Only create or migrate to root \`AGENTS.md\` if the user explicitly asks to migrate.
+**Consume \`note\` entries from the Phase 3 preference queue whose target is CLAUDE.md** (team-level notes) — add each as a concise line in the most relevant section. These are the behaviors the user wants Claude to follow but didn't need guaranteed (e.g., "propose a plan before implementing", "explain the tradeoffs when refactoring"). Leave personal-targeted notes for Phase 5.
 **Consume \`note\` entries from the Phase 3 preference queue whose target is AGENTS.md** (team-level notes) — add each as a concise line in the most relevant section. These are the behaviors the user wants Claude to follow but didn't need guaranteed (e.g., "propose a plan before implementing", "explain the tradeoffs when refactoring"). Leave personal-targeted notes for Phase 5.
 Include:
 - Build/test/lint commands Claude can't guess (non-standard scripts, flags, or sequences)
@@ -112,7 +111,7 @@ Exclude:
 - File-by-file structure or component lists (Claude can discover these by reading the codebase)
 - Standard language conventions Claude already knows
 - Generic advice ("write clean code", "handle errors")
- Detailed API docs or long references — use \`@path/to/import\` syntax instead (e.g., \`@docs/api-reference.md\`) to inline content on demand without bloating AGENTS.md
+- Detailed API docs or long references — use \`@path/to/import\` syntax instead (e.g., \`@docs/api-reference.md\`) to inline content on demand without bloating CLAUDE.md
 - Information that changes frequently — reference the source with \`@path/to/import\` so Claude always reads the current version
 - Long tutorials or walkthroughs (move to a separate file and reference with \`@path/to/import\`, or put in a skill)
 - Commands obvious from manifest files (e.g., standard "npm test", "cargo test", "pytest")
@@ -124,20 +123,20 @@ Do not repeat yourself and do not make up sections like "Common Development Task
 Prefix the file with:
 \`\`\`
-# AGENTS.md
+# CLAUDE.md
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 \`\`\`
-If AGENTS.md already exists: read it, propose specific changes as diffs, and explain why each change improves it. Do not silently overwrite.
+If CLAUDE.md already exists: read it, propose specific changes as diffs, and explain why each change improves it. Do not silently overwrite.
-For projects with multiple concerns, suggest organizing instructions into \`.claude/rules/\` as separate focused files (e.g., \`code-style.md\`, \`testing.md\`, \`security.md\`). These are loaded automatically alongside AGENTS.md and can be scoped to specific file paths using \`paths\` frontmatter.
+For projects with multiple concerns, suggest organizing instructions into \`.claude/rules/\` as separate focused files (e.g., \`code-style.md\`, \`testing.md\`, \`security.md\`). These are loaded automatically alongside CLAUDE.md and can be scoped to specific file paths using \`paths\` frontmatter.
-For projects with distinct subdirectories (monorepos, multi-module projects, etc.): mention that subdirectory AGENTS.md files can be added for module-specific instructions (they're loaded automatically when Claude works in those directories). Offer to create them if the user wants.
+For projects with distinct subdirectories (monorepos, multi-module projects, etc.): mention that subdirectory CLAUDE.md files can be added for module-specific instructions (they're loaded automatically when Claude works in those directories). Offer to create them if the user wants.
 ## Phase 5: Write CLAUDE.local.md (if user chose personal or both)
-Write a minimal CLAUDE.local.md at the project root. This file is automatically loaded alongside AGENTS.md. After creating it, add \`CLAUDE.local.md\` to the project's .gitignore so it stays private.
+Write a minimal CLAUDE.local.md at the project root. This file is automatically loaded alongside CLAUDE.md. After creating it, add \`CLAUDE.local.md\` to the project's .gitignore so it stays private.
 **Consume \`note\` entries from the Phase 3 preference queue whose target is CLAUDE.local.md** (personal-level notes) — add each as a concise line. If the user chose personal-only in Phase 1, this is the sole consumer of note entries.
@@ -148,7 +147,7 @@ Include:
 Keep it short — only include what would make Claude's responses noticeably better for this user.
-If Phase 2 found multiple git worktrees and the user confirmed they use sibling/external worktrees (not nested inside the main repo): the upward file walk won't find a single CLAUDE.local.md from all worktrees. Write the actual personal content to \`~/.claude/<project-name>-instructions.md\` and make CLAUDE.local.md a one-line stub that imports it: \`@~/.claude/<project-name>-instructions.md\`. The user can copy this one-line stub to each sibling worktree. Never put this import in the project AGENTS.md. If worktrees are nested inside the main repo (e.g., \`.claude/worktrees/\`), no special handling is needed — the main repo's CLAUDE.local.md is found automatically.
+If Phase 2 found multiple git worktrees and the user confirmed they use sibling/external worktrees (not nested inside the main repo): the upward file walk won't find a single CLAUDE.local.md from all worktrees. Write the actual personal content to \`~/.claude/<project-name>-instructions.md\` and make CLAUDE.local.md a one-line stub that imports it: \`@~/.claude/<project-name>-instructions.md\`. The user can copy this one-line stub to each sibling worktree. Never put this import in the project CLAUDE.md. If worktrees are nested inside the main repo (e.g., \`.claude/worktrees/\`), no special handling is needed — the main repo's CLAUDE.local.md is found automatically.
 If CLAUDE.local.md already exists: read it, propose specific additions, and do not silently overwrite.
@@ -184,7 +183,7 @@ Both the user (\`/<skill-name>\`) and Claude can invoke skills by default. For w
 ## Phase 7: Suggest additional optimizations
-Tell the user you're going to suggest a few additional optimizations now that AGENTS.md and skills (if chosen) are in place.
+Tell the user you're going to suggest a few additional optimizations now that CLAUDE.md and skills (if chosen) are in place.
 Check the environment and ask about each gap you find (use AskUserQuestion):
@@ -196,7 +195,7 @@ Check the environment and ask about each gap you find (use AskUserQuestion):
  For each hook preference (from the queue or the formatter fallback):
-  1. Target file: default based on the Phase 1 instruction-file choice — project → \`.claude/settings.json\` (team-shared, committed); personal → \`.claude/settings.local.json\`. Only ask if the user chose "both" in Phase 1 or the preference is ambiguous. Ask once for all hooks, not per-hook.
+  1. Target file: default based on the Phase 1 CLAUDE.md choice — project → \`.claude/settings.json\` (team-shared, committed); personal → \`.claude/settings.local.json\`. Only ask if the user chose "both" in Phase 1 or the preference is ambiguous. Ask once for all hooks, not per-hook.
  2. Pick the event and matcher from the preference:
     - "after every edit" → \`PostToolUse\` with matcher \`Write|Edit\`
@@ -228,9 +227,11 @@ const command = {
  type: 'prompt',
  name: 'init',
  get description() {
-    return isNewInitEnabled()
+    return feature('NEW_INIT') &&
-      ? 'Initialize new project instruction file(s) and optional skills/hooks with codebase documentation'
+      (process.env.USER_TYPE === 'ant' ||
-      : 'Initialize a new project instruction file with codebase documentation'
+        isEnvTruthy(process.env.CLAUDE_CODE_NEW_INIT))
      ? 'Initialize new CLAUDE.md file(s) and optional skills/hooks with codebase documentation'
      : 'Initialize a new CLAUDE.md file with codebase documentation'
  },
  contentLength: 0, // Dynamic content
  progressMessage: 'analyzing your codebase',
@@ -241,7 +242,12 @@ const command = {
    return [
      {
        type: 'text',
-        text: isNewInitEnabled() ? NEW_INIT_PROMPT : OLD_INIT_PROMPT,
+        text:
          feature('NEW_INIT') &&
          (process.env.USER_TYPE === 'ant' ||
            isEnvTruthy(process.env.CLAUDE_CODE_NEW_INIT))
            ? NEW_INIT_PROMPT
            : OLD_INIT_PROMPT,
      },
    ]
  },
--- a/src/commands/initMode.ts
+++ b/src/commands/initMode.ts
@@ -1,13 +0,0 @@
 import { feature } from 'bun:bundle'
 import { isEnvTruthy } from '../utils/envUtils.js'
 export function isNewInitEnabled(): boolean {
  if (feature('NEW_INIT')) {
    return (
      process.env.USER_TYPE === 'ant' ||
      isEnvTruthy(process.env.CLAUDE_CODE_NEW_INIT)
    )
  }
  return false
 }
--- a/src/commands/insights.ts
+++ b/src/commands/insights.ts
@@ -1,12 +1,17 @@
 import { execFileSync } from 'child_process'
 import { diffLines } from 'diff'
 import { constants as fsConstants } from 'fs'
 import {
  copyFile,
  mkdir,
  mkdtemp,
  readdir,
  readFile,
  rm,
  unlink,
  writeFile,
 } from 'fs/promises'
 import { tmpdir } from 'os'
 import { extname, join } from 'path'
 import type { Command } from '../commands.js'
 import { queryWithModel } from '../services/api/claude.js'
@@ -17,6 +22,7 @@ import {
 import type { LogOption } from '../types/logs.js'
 import { getClaudeConfigHomeDir } from '../utils/envUtils.js'
 import { toError } from '../utils/errors.js'
 import { execFileNoThrow } from '../utils/execFileNoThrow.js'
 import { logError } from '../utils/log.js'
 import { extractTextContent } from '../utils/messages.js'
 import { getDefaultOpusModel } from '../utils/model/model.js'
@@ -41,6 +47,180 @@ function getInsightsModel(): string {
  return getDefaultOpusModel()
 }
 // ============================================================================
 // Homespace Data Collection
 // ============================================================================
 type RemoteHostInfo = {
  name: string
  sessionCount: number
 }
 /* eslint-disable custom-rules/no-process-env-top-level */
 const getRunningRemoteHosts: () => Promise<string[]> =
  process.env.USER_TYPE === 'ant'
    ? async () => {
        const { stdout, code } = await execFileNoThrow(
          'coder',
          ['list', '-o', 'json'],
          { timeout: 30000 },
        )
        if (code !== 0) return []
        try {
          const workspaces = jsonParse(stdout) as Array<{
            name: string
            latest_build?: { status?: string }
          }>
          return workspaces
            .filter(w => w.latest_build?.status === 'running')
            .map(w => w.name)
        } catch {
          return []
        }
      }
    : async () => []
 const getRemoteHostSessionCount: (hs: string) => Promise<number> =
  process.env.USER_TYPE === 'ant'
    ? async (homespace: string) => {
        const { stdout, code } = await execFileNoThrow(
          'ssh',
          [
            `${homespace}.coder`,
            'find /root/.claude/projects -name "*.jsonl" 2>/dev/null | wc -l',
          ],
          { timeout: 30000 },
        )
        if (code !== 0) return 0
        return parseInt(stdout.trim(), 10) || 0
      }
    : async () => 0
 const collectFromRemoteHost: (
  hs: string,
  destDir: string,
 ) => Promise<{ copied: number; skipped: number }> =
  process.env.USER_TYPE === 'ant'
    ? async (homespace: string, destDir: string) => {
        const result = { copied: 0, skipped: 0 }
        // Create temp directory
        const tempDir = await mkdtemp(join(tmpdir(), 'claude-hs-'))
        try {
          // SCP the projects folder
          const scpResult = await execFileNoThrow(
            'scp',
            ['-rq', `${homespace}.coder:/root/.claude/projects/`, tempDir],
            { timeout: 300000 },
          )
          if (scpResult.code !== 0) {
            // SCP failed
            return result
          }
          const projectsDir = join(tempDir, 'projects')
          let projectDirents: Awaited<ReturnType<typeof readdir>>
          try {
            projectDirents = await readdir(projectsDir, { withFileTypes: true })
          } catch {
            return result
          }
          // Merge into destination (parallel per project directory)
          await Promise.all(
            projectDirents.map(async dirent => {
              const projectName = dirent.name
              const projectPath = join(projectsDir, projectName)
              // Skip if not a directory
              if (!dirent.isDirectory()) return
              const destProjectName = `${projectName}__${homespace}`
              const destProjectPath = join(destDir, destProjectName)
              try {
                await mkdir(destProjectPath, { recursive: true })
              } catch {
                // Directory may already exist
              }
              // Copy session files (skip existing)
              let files: Awaited<ReturnType<typeof readdir>>
              try {
                files = await readdir(projectPath, { withFileTypes: true })
              } catch {
                return
              }
              await Promise.all(
                files.map(async fileDirent => {
                  const fileName = fileDirent.name
                  if (!fileName.endsWith('.jsonl')) return
                  const srcFile = join(projectPath, fileName)
                  const destFile = join(destProjectPath, fileName)
                  try {
                    await copyFile(srcFile, destFile, fsConstants.COPYFILE_EXCL)
                    result.copied++
                  } catch {
                    // EEXIST from COPYFILE_EXCL means dest already exists
                    result.skipped++
                  }
                }),
              )
            }),
          )
        } finally {
          try {
            await rm(tempDir, { recursive: true, force: true })
          } catch {
            // Ignore cleanup errors
          }
        }
        return result
      }
    : async () => ({ copied: 0, skipped: 0 })
 const collectAllRemoteHostData: (destDir: string) => Promise<{
  hosts: RemoteHostInfo[]
  totalCopied: number
  totalSkipped: number
 }> =
  process.env.USER_TYPE === 'ant'
    ? async (destDir: string) => {
        const rHosts = await getRunningRemoteHosts()
        const result: RemoteHostInfo[] = []
        let totalCopied = 0
        let totalSkipped = 0
        // Collect from all hosts in parallel (SCP per host can take seconds)
        const hostResults = await Promise.all(
          rHosts.map(async hs => {
            const sessionCount = await getRemoteHostSessionCount(hs)
            if (sessionCount > 0) {
              const { copied, skipped } = await collectFromRemoteHost(
                hs,
                destDir,
              )
              return { name: hs, sessionCount, copied, skipped }
            }
            return { name: hs, sessionCount, copied: 0, skipped: 0 }
          }),
        )
        for (const hr of hostResults) {
          result.push({ name: hr.name, sessionCount: hr.sessionCount })
          totalCopied += hr.copied
          totalSkipped += hr.skipped
        }
        return { hosts: result, totalCopied, totalSkipped }
      }
    : async () => ({ hosts: [], totalCopied: 0, totalSkipped: 0 })
 /* eslint-enable custom-rules/no-process-env-top-level */
 // ============================================================================
 // Types
 // ============================================================================
@@ -2479,6 +2659,7 @@ export type InsightsExport = {
    claude_code_version: string
    date_range: { start: string; end: string }
    session_count: number
    remote_hosts_collected?: string[]
  }
  aggregated_data: AggregatedData
  insights: InsightResults
@@ -2499,9 +2680,14 @@ export function buildExportData(
  data: AggregatedData,
  insights: InsightResults,
  facets: Map<string, SessionFacets>,
  remoteStats?: { hosts: RemoteHostInfo[]; totalCopied: number },
 ): InsightsExport {
  const version = typeof MACRO !== 'undefined' ? MACRO.VERSION : 'unknown'
  const remote_hosts_collected = remoteStats?.hosts
    .filter(h => h.sessionCount > 0)
    .map(h => h.name)
  const facets_summary = {
    total: facets.size,
    goal_categories: {} as Record<string, number>,
@@ -2539,6 +2725,10 @@ export function buildExportData(
      claude_code_version: version,
      date_range: data.date_range,
      session_count: data.total_sessions,
      ...(remote_hosts_collected &&
        remote_hosts_collected.length > 0 && {
          remote_hosts_collected,
        }),
    },
    aggregated_data: data,
    insights,
@@ -2603,12 +2793,24 @@ async function scanAllSessions(): Promise<LiteSessionInfo[]> {
 // Main Function
 // ============================================================================
-export async function generateUsageReport(): Promise<{
+export async function generateUsageReport(options?: {
  collectRemote?: boolean
 }): Promise<{
  insights: InsightResults
  htmlPath: string
  data: AggregatedData
  remoteStats?: { hosts: RemoteHostInfo[]; totalCopied: number }
  facets: Map<string, SessionFacets>
 }> {
  let remoteStats: { hosts: RemoteHostInfo[]; totalCopied: number } | undefined
  // Optionally collect data from remote hosts first (internal-only)
  if (process.env.USER_TYPE === 'ant' && options?.collectRemote) {
    const destDir = join(getClaudeConfigHomeDir(), 'projects')
    const { hosts, totalCopied } = await collectAllRemoteHostData(destDir)
    remoteStats = { hosts, totalCopied }
  }
  // Phase 1: Lite scan — filesystem metadata only (no JSONL parsing)
  const allScannedSessions = await scanAllSessions()
  const totalSessionsScanned = allScannedSessions.length
@@ -2815,6 +3017,7 @@ export async function generateUsageReport(): Promise<{
    insights,
    htmlPath,
    data: aggregated,
    remoteStats,
    facets: substantiveFacets,
  }
 }
@@ -2840,8 +3043,31 @@ const usageReport: Command = {
  contentLength: 0, // Dynamic content
  progressMessage: 'analyzing your sessions',
  source: 'builtin',
-  async getPromptForCommand(_args) {
+  async getPromptForCommand(args) {
-    const { insights, htmlPath, data } = await generateUsageReport()
+    let collectRemote = false
    let remoteHosts: string[] = []
    let hasRemoteHosts = false
    if (process.env.USER_TYPE === 'ant') {
      // Parse --homespaces flag
      collectRemote = args?.includes('--homespaces') ?? false
      // Check for available remote hosts
      remoteHosts = await getRunningRemoteHosts()
      hasRemoteHosts = remoteHosts.length > 0
      // Show collection message if collecting
      if (collectRemote && hasRemoteHosts) {
        // biome-ignore lint/suspicious/noConsole: intentional
        console.error(
          `Collecting sessions from ${remoteHosts.length} homespace(s): ${remoteHosts.join(', ')}...`,
        )
      }
    }
    const { insights, htmlPath, data, remoteStats } = await generateUsageReport(
      { collectRemote },
    )
    let reportUrl = `file://${htmlPath}`
    let uploadHint = ''
@@ -2859,6 +3085,20 @@ const usageReport: Command = {
      `${data.git_commits} commits`,
    ].join(' · ')
    // Build remote host info (internal-only)
    let remoteInfo = ''
    if (process.env.USER_TYPE === 'ant') {
      if (remoteStats && remoteStats.totalCopied > 0) {
        const hsNames = remoteStats.hosts
          .filter(h => h.sessionCount > 0)
          .map(h => h.name)
          .join(', ')
        remoteInfo = `\n_Collected ${remoteStats.totalCopied} new sessions from: ${hsNames}_\n`
      } else if (!collectRemote && hasRemoteHosts) {
        // Suggest using --homespaces if they have remote hosts but didn't use the flag
        remoteInfo = `\n_Tip: Run \`/insights --homespaces\` to include sessions from your ${remoteHosts.length} running homespace(s)_\n`
      }
    }
    // Build markdown summary from insights
    const atAGlance = insights.at_a_glance
@@ -2878,6 +3118,7 @@ ${atAGlance.ambitious_workflows ? `**Ambitious workflows:** ${atAGlance.ambitiou
 ${stats}
 ${data.date_range.start} to ${data.date_range.end}
 ${remoteInfo}
 `
    const userSummary = `${header}${summaryText}
--- a/src/commands/provider/provider.test.tsx
+++ b/src/commands/provider/provider.test.tsx
@@ -1,28 +1,20 @@
 import { PassThrough } from 'node:stream'
-import { afterEach, expect, mock, test } from 'bun:test'
+import { expect, test } from 'bun:test'
 import React from 'react'
 import stripAnsi from 'strip-ansi'
 import { createRoot, render, useApp } from '../../ink.js'
 import { AppStateProvider } from '../../state/AppState.js'
 import {
  applySavedProfileToCurrentSession,
  buildCodexOAuthProfileEnv,
  buildCurrentProviderSummary,
  buildProfileSaveMessage,
  getProviderWizardDefaults,
  ProviderWizard,
  TextEntryDialog,
 } from './provider.js'
 import { createProfileFile } from '../../utils/providerProfile.js'
 const SYNC_START = '\x1B[?2026h'
 const SYNC_END = '\x1B[?2026l'
 const ORIGINAL_SIMPLE_ENV = process.env.CLAUDE_CODE_SIMPLE
 const ORIGINAL_CODEX_API_KEY = process.env.CODEX_API_KEY
 const ORIGINAL_CHATGPT_ACCOUNT_ID = process.env.CHATGPT_ACCOUNT_ID
 const ORIGINAL_CODEX_ACCOUNT_ID = process.env.CODEX_ACCOUNT_ID
 function extractLastFrame(output: string): string {
  let lastFrame: string | null = null
@@ -68,51 +60,6 @@ async function renderFinalFrame(node: React.ReactNode): Promise<string> {
  return stripAnsi(extractLastFrame(getOutput()))
 }
 async function waitForOutput(
  getOutput: () => string,
  predicate: (output: string) => boolean,
  timeoutMs = 2500,
 ): Promise<string> {
  const startedAt = Date.now()
  while (Date.now() - startedAt < timeoutMs) {
    const output = stripAnsi(extractLastFrame(getOutput()))
    if (predicate(output)) {
      return output
    }
    await Bun.sleep(10)
  }
  throw new Error('Timed out waiting for ProviderWizard test output')
 }
 async function renderProviderWizardFrame(): Promise<string> {
  const { stdout, stdin, getOutput } = createTestStreams()
  const root = await createRoot({
    stdout: stdout as unknown as NodeJS.WriteStream,
    stdin: stdin as unknown as NodeJS.ReadStream,
    patchConsole: false,
  })
  root.render(
    <AppStateProvider>
      <ProviderWizard onDone={() => {}} />
    </AppStateProvider>,
  )
  try {
    return await waitForOutput(
      getOutput,
      output => output.includes('Set up a provider profile'),
    )
  } finally {
    root.unmount()
    stdin.end()
    stdout.end()
    await Bun.sleep(0)
  }
 }
 function createTestStreams(): {
  stdout: PassThrough
  stdin: PassThrough & {
@@ -147,34 +94,6 @@ function createTestStreams(): {
  }
 }
 afterEach(() => {
  mock.restore()
  if (ORIGINAL_SIMPLE_ENV === undefined) {
    delete process.env.CLAUDE_CODE_SIMPLE
  } else {
    process.env.CLAUDE_CODE_SIMPLE = ORIGINAL_SIMPLE_ENV
  }
  if (ORIGINAL_CODEX_API_KEY === undefined) {
    delete process.env.CODEX_API_KEY
  } else {
    process.env.CODEX_API_KEY = ORIGINAL_CODEX_API_KEY
  }
  if (ORIGINAL_CHATGPT_ACCOUNT_ID === undefined) {
    delete process.env.CHATGPT_ACCOUNT_ID
  } else {
    process.env.CHATGPT_ACCOUNT_ID = ORIGINAL_CHATGPT_ACCOUNT_ID
  }
  if (ORIGINAL_CODEX_ACCOUNT_ID === undefined) {
    delete process.env.CODEX_ACCOUNT_ID
  } else {
    process.env.CODEX_ACCOUNT_ID = ORIGINAL_CODEX_ACCOUNT_ID
  }
 })
 function StepChangeHarness(): React.ReactNode {
  const { exit } = useApp()
  const [step, setStep] = React.useState<'api' | 'model'>('api')
@@ -314,167 +233,6 @@ test('buildProfileSaveMessage describes Gemini access token / ADC mode clearly',
  expect(message).not.toContain('AIza')
 })
 test('buildProfileSaveMessage reflects immediate Codex activation for existing credentials', () => {
  const message = buildProfileSaveMessage(
    'codex',
    {
      OPENAI_MODEL: 'codexplan',
      OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
      CHATGPT_ACCOUNT_ID: 'acct_codex',
    },
    'D:/codings/Opensource/openclaude/.openclaude-profile.json',
    {
      activatedInSession: true,
    },
  )
  expect(message).toContain('Saved Codex profile.')
  expect(message).toContain('OpenClaude switched to it for this session.')
  expect(message).not.toContain('Restart OpenClaude to use it.')
 })
 test('buildProfileSaveMessage reflects immediate Codex OAuth activation when the session switched successfully', () => {
  const message = buildProfileSaveMessage(
    'codex',
    {
      OPENAI_MODEL: 'codexplan',
      OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
      CHATGPT_ACCOUNT_ID: 'acct_codex',
      CODEX_CREDENTIAL_SOURCE: 'oauth',
    },
    'D:/codings/Opensource/openclaude/.openclaude-profile.json',
    {
      activatedInSession: true,
    },
  )
  expect(message).toContain('Saved Codex profile.')
  expect(message).toContain('OpenClaude switched to it for this session.')
  expect(message).not.toContain('Restart OpenClaude to use it.')
 })
 test('buildCodexOAuthProfileEnv uses the fresh OAuth account id without persisting an API key', () => {
  process.env.CODEX_API_KEY = 'stale-codex-key'
  process.env.CHATGPT_ACCOUNT_ID = 'acct_stale'
  const env = buildCodexOAuthProfileEnv({
    accessToken: 'oauth-access-token',
    accountId: 'acct_oauth',
  })
  expect(env).toEqual({
    OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
    OPENAI_MODEL: 'codexplan',
    CHATGPT_ACCOUNT_ID: 'acct_oauth',
    CODEX_CREDENTIAL_SOURCE: 'oauth',
  })
  expect(env).not.toHaveProperty('CODEX_API_KEY')
 })
 test('buildCodexProfileEnv derives oauth source from secure storage when no explicit source is provided', async () => {
  const actualProviderConfig = await import('../../services/api/providerConfig.js')
  mock.module('../../services/api/providerConfig.js', () => ({
    ...actualProviderConfig,
    resolveCodexApiCredentials: () => ({
      apiKey: 'stored-access-token',
      accountId: 'acct_secure_storage',
      source: 'secure-storage' as const,
    }),
  }))
  // @ts-expect-error cache-busting query string for Bun module mocks
  const { buildCodexProfileEnv } = await import(
    '../../utils/providerProfile.js?secure-storage-codex-source'
  )
  const env = buildCodexProfileEnv({
    model: 'codexplan',
    processEnv: {},
  })
  expect(env).toEqual({
    OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
    OPENAI_MODEL: 'codexplan',
    CHATGPT_ACCOUNT_ID: 'acct_secure_storage',
    CODEX_CREDENTIAL_SOURCE: 'oauth',
  })
 })
 test('explicitly declared env takes precedence over applySavedProfileToCurrentSession', async () => {
  // @ts-expect-error cache-busting query string for Bun module mocks
  const { applySavedProfileToCurrentSession } = await import(
    '../../utils/providerProfile.js?apply-saved-profile-codex'
  )
  const processEnv: NodeJS.ProcessEnv = {
    CLAUDE_CODE_USE_OPENAI: '1',
    OPENAI_MODEL: 'gpt-4o',
    OPENAI_BASE_URL: 'https://api.openai.com/v1',
    OPENAI_API_KEY: 'sk-openai',
    CODEX_API_KEY: 'codex-live',
    CHATGPT_ACCOUNT_ID: 'acct_codex',
    CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED: '1',
    CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED_ID: 'provider_old',
  }
  const profileFile = createProfileFile('codex', {
    OPENAI_MODEL: 'codexplan',
    OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
    CODEX_API_KEY: 'codex-live',
    CHATGPT_ACCOUNT_ID: 'acct_codex',
  })
  const warning = await applySavedProfileToCurrentSession({
    profileFile,
    processEnv,
  })
  expect(warning).toBeNull()
  expect(processEnv.CLAUDE_CODE_USE_OPENAI).toBe('1')
  expect(processEnv.OPENAI_MODEL).toBe('gpt-4o')
  expect(processEnv.OPENAI_BASE_URL).toBe(
    "https://api.openai.com/v1",
  )
  expect(processEnv.CODEX_API_KEY).toBeUndefined()
  expect(processEnv.CHATGPT_ACCOUNT_ID).toBeUndefined()
  expect(processEnv.OPENAI_API_KEY).toBe("sk-openai")
  expect(processEnv.CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED).toBeUndefined()
  expect(processEnv.CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED_ID).toBeUndefined()
 })
 test('explicitly declared env takes precedence over applySavedProfileToCurrentSession', async () => {
  // @ts-expect-error cache-busting query string for Bun module mocks
  const { applySavedProfileToCurrentSession } = await import(
    '../../utils/providerProfile.js?apply-saved-profile-codex-oauth'
  )
  const processEnv: NodeJS.ProcessEnv = {
    CLAUDE_CODE_USE_OPENAI: '1',
    OPENAI_MODEL: 'gpt-4o',
    OPENAI_BASE_URL: 'https://api.openai.com/v1',
    CODEX_API_KEY: 'stale-codex-key',
    CHATGPT_ACCOUNT_ID: 'acct_stale',
  }
  const profileFile = createProfileFile('codex', {
    OPENAI_MODEL: 'codexplan',
    OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
    CHATGPT_ACCOUNT_ID: 'acct_oauth',
    CODEX_CREDENTIAL_SOURCE: 'oauth',
  })
  const warning = await applySavedProfileToCurrentSession({
    profileFile,
    processEnv,
  })
  expect(warning).not.toBeUndefined()
  expect(processEnv.OPENAI_MODEL).toBe('gpt-4o')
  expect(processEnv.OPENAI_BASE_URL).toBe(
    "https://api.openai.com/v1",
  )
  expect(processEnv.CODEX_API_KEY).toBe("stale-codex-key")
  expect(processEnv.CHATGPT_ACCOUNT_ID).toBe('acct_stale')
  expect(processEnv.CHATGPT_ACCOUNT_ID).toBeTruthy()
 })
 test('buildCurrentProviderSummary redacts poisoned model and endpoint values', () => {
  const summary = buildCurrentProviderSummary({
    processEnv: {
@@ -487,8 +245,8 @@ test('buildCurrentProviderSummary redacts poisoned model and endpoint values', (
  })
  expect(summary.providerLabel).toBe('OpenAI-compatible')
-  expect(summary.modelLabel).toBe('sk-...678')
+  expect(summary.modelLabel).toBe('sk-...5678')
-  expect(summary.endpointLabel).toBe('sk-...678')
+  expect(summary.endpointLabel).toBe('sk-...5678')
 })
 test('buildCurrentProviderSummary labels generic local openai-compatible providers', () => {
@@ -506,7 +264,7 @@ test('buildCurrentProviderSummary labels generic local openai-compatible provide
  expect(summary.endpointLabel).toBe('http://127.0.0.1:8080/v1')
 })
-test('buildCurrentProviderSummary does not relabel local gpt-5.4 providers as Codex when custom base URL is set', () => {
+test('buildCurrentProviderSummary does not relabel local gpt-5.4 providers as Codex', () => {
  const summary = buildCurrentProviderSummary({
    processEnv: {
      CLAUDE_CODE_USE_OPENAI: '1',
@@ -549,12 +307,3 @@ test('getProviderWizardDefaults ignores poisoned current provider values', () =>
  expect(defaults.openAIBaseUrl).toBe('https://api.openai.com/v1')
  expect(defaults.geminiModel).toBe('gemini-2.0-flash')
 })
 test('ProviderWizard hides Codex OAuth while running in bare mode', async () => {
  process.env.CLAUDE_CODE_SIMPLE = '1'
  const output = await renderProviderWizardFrame()
  expect(output).toContain('Set up a provider profile')
  expect(output).not.toContain('Codex OAuth')
 })
--- a/src/commands/provider/provider.tsx
+++ b/src/commands/provider/provider.tsx
@@ -10,12 +10,8 @@ import {
 } from '../../components/CustomSelect/index.js'
 import { Dialog } from '../../components/design-system/Dialog.js'
 import { LoadingState } from '../../components/design-system/LoadingState.js'
 import { useCodexOAuthFlow } from '../../components/useCodexOAuthFlow.js'
 import { useTerminalSize } from '../../hooks/useTerminalSize.js'
 import { Box, Text } from '../../ink.js'
 import {
  type CodexOAuthTokens,
 } from '../../services/api/codexOAuth.js'
 import {
  DEFAULT_CODEX_BASE_URL,
  DEFAULT_OPENAI_BASE_URL,
@@ -24,8 +20,6 @@ import {
  resolveProviderRequest,
 } from '../../services/api/providerConfig.js'
 import {
  applySavedProfileToCurrentSession as applySharedProfileToCurrentSession,
  buildCodexOAuthProfileEnv as buildSharedCodexOAuthProfileEnv,
  buildCodexProfileEnv,
  buildGeminiProfileEnv,
  buildMistralProfileEnv,
@@ -55,7 +49,6 @@ import {
  readGeminiAccessToken,
  saveGeminiAccessToken,
 } from '../../utils/geminiCredentials.js'
 import { isBareMode } from '../../utils/envUtils.js'
 import {
  getGoalDefaultOpenAIModel,
  normalizeRecommendationGoal,
@@ -64,13 +57,12 @@ import {
  type RecommendationGoal,
 } from '../../utils/providerRecommendation.js'
 import {
  getOllamaChatBaseUrl,
  getLocalOpenAICompatibleProviderLabel,
  hasLocalOllama,
  listOllamaModels,
 } from '../../utils/providerDiscovery.js'
-type ProviderChoice = 'auto' | ProviderProfile | 'codex-oauth' | 'clear'
+type ProviderChoice = 'auto' | ProviderProfile | 'clear'
 type Step =
  | { name: 'choose' }
@@ -101,7 +93,6 @@ type Step =
      apiKey?: string
      authMode: 'api-key' | 'access-token' | 'adc'
    }
  | { name: 'codex-oauth' }
  | { name: 'codex-check' }
 type CurrentProviderSummary = {
@@ -140,8 +131,6 @@ type ProviderWizardDefaults = {
  mistralBaseUrl: string
 }
 type SecretSourceEnv = NodeJS.ProcessEnv & Partial<ProfileEnv>
 function isEnvTruthy(value: string | undefined): boolean {
  if (!value) return false
  const normalized = value.trim().toLowerCase()
@@ -150,7 +139,7 @@ function isEnvTruthy(value: string | undefined): boolean {
 function getSafeDisplayValue(
  value: string | undefined,
-  processEnv: SecretSourceEnv,
+  processEnv: NodeJS.ProcessEnv,
  profileEnv?: ProfileEnv,
  fallback = '(not set)',
 ): string {
@@ -162,15 +151,14 @@ function getSafeDisplayValue(
 export function getProviderWizardDefaults(
  processEnv: NodeJS.ProcessEnv = process.env,
 ): ProviderWizardDefaults {
  const secretSource = processEnv as SecretSourceEnv
  const safeOpenAIModel =
-    sanitizeProviderConfigValue(processEnv.OPENAI_MODEL, secretSource) ||
+    sanitizeProviderConfigValue(processEnv.OPENAI_MODEL, processEnv) ||
    'gpt-4o'
  const safeOpenAIBaseUrl =
-    sanitizeProviderConfigValue(processEnv.OPENAI_BASE_URL, secretSource) ||
+    sanitizeProviderConfigValue(processEnv.OPENAI_BASE_URL, processEnv) ||
    DEFAULT_OPENAI_BASE_URL
  const safeGeminiModel =
-    sanitizeProviderConfigValue(processEnv.GEMINI_MODEL, secretSource) ||
+    sanitizeProviderConfigValue(processEnv.GEMINI_MODEL, processEnv) ||
    DEFAULT_GEMINI_MODEL
  const safeMistralModel =
    sanitizeProviderConfigValue(processEnv.MISTRAL_MODEL, processEnv) ||
@@ -193,7 +181,6 @@ export function buildCurrentProviderSummary(options?: {
  persisted?: ProfileFile | null
 }): CurrentProviderSummary {
  const processEnv = options?.processEnv ?? process.env
  const secretSource = processEnv as SecretSourceEnv
  const persisted = options?.persisted ?? loadProfileFile()
  const savedProfileLabel = persisted?.profile ?? 'none'
@@ -202,11 +189,11 @@ export function buildCurrentProviderSummary(options?: {
      providerLabel: 'Google Gemini',
      modelLabel: getSafeDisplayValue(
        processEnv.GEMINI_MODEL ?? DEFAULT_GEMINI_MODEL,
-        secretSource,
+        processEnv,
      ),
      endpointLabel: getSafeDisplayValue(
        processEnv.GEMINI_BASE_URL ?? DEFAULT_GEMINI_BASE_URL,
-        secretSource,
+        processEnv,
      ),
      savedProfileLabel,
    }
@@ -232,13 +219,13 @@ export function buildCurrentProviderSummary(options?: {
      providerLabel: 'GitHub Models',
      modelLabel: getSafeDisplayValue(
        processEnv.OPENAI_MODEL ?? 'github:copilot',
-        secretSource,
+        processEnv,
      ),
      endpointLabel: getSafeDisplayValue(
        processEnv.OPENAI_BASE_URL ??
          processEnv.OPENAI_API_BASE ??
          'https://models.github.ai/inference',
-        secretSource,
+        processEnv,
      ),
      savedProfileLabel,
    }
@@ -259,8 +246,8 @@ export function buildCurrentProviderSummary(options?: {
    return {
      providerLabel,
-      modelLabel: getSafeDisplayValue(request.requestedModel, secretSource),
+      modelLabel: getSafeDisplayValue(request.requestedModel, processEnv),
-      endpointLabel: getSafeDisplayValue(request.baseUrl, secretSource),
+      endpointLabel: getSafeDisplayValue(request.baseUrl, processEnv),
      savedProfileLabel,
    }
  }
@@ -271,11 +258,11 @@ export function buildCurrentProviderSummary(options?: {
      processEnv.ANTHROPIC_MODEL ??
        processEnv.CLAUDE_MODEL ??
        'claude-sonnet-4-6',
-      secretSource,
+      processEnv,
    ),
    endpointLabel: getSafeDisplayValue(
      processEnv.ANTHROPIC_BASE_URL ?? 'https://api.anthropic.com',
-      secretSource,
+      processEnv,
    ),
    savedProfileLabel,
  }
@@ -389,10 +376,6 @@ export function buildProfileSaveMessage(
  profile: ProviderProfile,
  env: ProfileEnv,
  filePath: string,
  options?: {
    activatedInSession?: boolean
    activationWarning?: string | null
  },
 ): string {
  const summary = buildSavedProfileSummary(profile, env)
  const lines = [
@@ -406,24 +389,13 @@ export function buildProfileSaveMessage(
  }
  lines.push(`Profile: ${filePath}`)
-  if (options?.activatedInSession) {
+  lines.push('Restart OpenClaude to use it.')
    lines.push('OpenClaude switched to it for this session.')
  } else if (options?.activationWarning) {
    lines.push(
      `Saved for next startup. Warning: could not activate it in this session (${options.activationWarning}).`,
    )
  } else {
    lines.push('Restart OpenClaude to use it.')
  }
  return lines.join('\n')
 }
 function buildUsageText(): string {
  const summary = buildCurrentProviderSummary()
  const availableProviders = isBareMode()
    ? 'Choose Auto, Ollama, OpenAI-compatible, Gemini, or Codex, then save a provider profile.'
    : 'Choose Auto, Ollama, OpenAI-compatible, Gemini, Codex, or Codex OAuth, then save a provider profile.'
  return [
    'Usage: /provider',
    '',
@@ -434,7 +406,7 @@ function buildUsageText(): string {
    `Current endpoint: ${summary.endpointLabel}`,
    `Saved profile: ${summary.savedProfileLabel}`,
    '',
-    availableProviders,
+    'Choose Auto, Ollama, OpenAI-compatible, Gemini, or Codex, then save a profile for the next OpenClaude restart.',
  ].join('\n')
 }
@@ -443,45 +415,12 @@ function finishProfileSave(
  profile: ProviderProfile,
  env: ProfileEnv,
 ): void {
  void saveProfileAndNotify(onDone, profile, env)
 }
 export function buildCodexOAuthProfileEnv(
  tokens: Pick<CodexOAuthTokens, 'accessToken' | 'idToken' | 'accountId'>,
 ): ProfileEnv | null {
  return buildSharedCodexOAuthProfileEnv(tokens)
 }
 export async function applySavedProfileToCurrentSession(options: {
  profileFile: ProfileFile
  processEnv?: NodeJS.ProcessEnv
 }): Promise<string | null> {
  return applySharedProfileToCurrentSession(options)
 }
 async function saveProfileAndNotify(
  onDone: LocalJSXCommandOnDone,
  profile: ProviderProfile,
  env: ProfileEnv,
 ): Promise<void> {
  try {
    const profileFile = createProfileFile(profile, env)
    const filePath = saveProfileFile(profileFile)
-    const shouldActivateInSession = profile === 'codex'
+    onDone(buildProfileSaveMessage(profile, env, filePath), {
-    const activationWarning = shouldActivateInSession
+      display: 'system',
-      ? await applySharedProfileToCurrentSession({ profileFile })
+    })
      : null
    onDone(
      buildProfileSaveMessage(profile, env, filePath, {
        activatedInSession:
          shouldActivateInSession && activationWarning === null,
        activationWarning,
      }),
      {
        display: 'system',
      },
    )
  } catch (error) {
    const message = error instanceof Error ? error.message : String(error)
    onDone(`Failed to save provider profile: ${message}`, {
@@ -565,10 +504,6 @@ function ProviderChooser({
  onCancel: () => void
 }): React.ReactNode {
  const summary = buildCurrentProviderSummary()
  const canUseCodexOAuth = !isBareMode()
  const helperText = canUseCodexOAuth
    ? 'Save a provider profile without editing environment variables first. Codex profiles backed by env, auth.json, or OpenClaude secure storage can switch this session immediately when validation succeeds.'
    : 'Save a provider profile without editing environment variables first. Codex profiles backed by env or auth.json can switch this session immediately.'
  const options: OptionWithDescription<ProviderChoice>[] = [
    {
      label: 'Auto',
@@ -602,16 +537,6 @@ function ProviderChooser({
      value: 'codex',
      description: 'Use existing ChatGPT Codex CLI auth or env credentials',
    },
    ...(canUseCodexOAuth
      ? [
          {
            label: 'Codex OAuth',
            value: 'codex-oauth' as const,
            description:
              'Sign in with ChatGPT in your browser and store Codex tokens securely',
          },
        ]
      : []),
  ]
  if (summary.savedProfileLabel !== 'none') {
@@ -629,7 +554,10 @@ function ProviderChooser({
      onCancel={onCancel}
    >
      <Box flexDirection="column" gap={1}>
-        <Text>{helperText}</Text>
+        <Text>
          Save a provider profile for the next OpenClaude restart without
          editing environment variables first.
        </Text>
        <Box flexDirection="column">
          <Text dimColor>Current model: {summary.modelLabel}</Text>
          <Text dimColor>Current endpoint: {summary.endpointLabel}</Text>
@@ -781,9 +709,7 @@ function AutoRecommendationStep({
              { label: 'Back', value: 'back' },
              { label: 'Cancel', value: 'cancel' },
            ]}
-            onChange={(value: string) =>
+            onChange={value => (value === 'back' ? onBack() : onCancel())}
              value === 'back' ? onBack() : onCancel()
            }
            onCancel={onCancel}
          />
        </Box>
@@ -806,7 +732,7 @@ function AutoRecommendationStep({
              { label: 'Back', value: 'back' },
              { label: 'Cancel', value: 'cancel' },
            ]}
-            onChange={(value: string) => {
+            onChange={value => {
              if (value === 'continue') {
                onNeedOpenAI(status.defaultModel)
              } else if (value === 'back') {
@@ -839,7 +765,7 @@ function AutoRecommendationStep({
            { label: 'Back', value: 'back' },
            { label: 'Cancel', value: 'cancel' },
          ]}
-          onChange={(value: string) => {
+          onChange={value => {
            if (value === 'save') {
              onSave(
                'ollama',
@@ -941,9 +867,7 @@ function OllamaModelStep({
              { label: 'Back', value: 'back' },
              { label: 'Cancel', value: 'cancel' },
            ]}
-            onChange={(value: string) =>
+            onChange={value => (value === 'back' ? onBack() : onCancel())}
              value === 'back' ? onBack() : onCancel()
            }
            onCancel={onCancel}
          />
        </Box>
@@ -964,7 +888,7 @@ function OllamaModelStep({
          defaultFocusValue={status.defaultValue}
          inlineDescriptions
          visibleOptionCount={Math.min(8, status.options.length)}
-          onChange={(value: string) => {
+          onChange={value => {
            onSave(
              'ollama',
              buildOllamaProfileEnv(value, {
@@ -979,84 +903,6 @@ function OllamaModelStep({
  )
 }
 function CodexOAuthStep({
  onSave,
  onBack,
  onCancel,
 }: {
  onSave: (profile: ProviderProfile, env: ProfileEnv) => void
  onBack: () => void
  onCancel: () => void
 }): React.ReactNode {
  const handleAuthenticated = React.useCallback(async (
    tokens: CodexOAuthTokens,
    persistCredentials: (options?: { profileId?: string }) => void,
  ) => {
    const env = buildCodexOAuthProfileEnv(tokens)
    if (!env) {
      throw new Error(
        'Codex OAuth succeeded, but OpenClaude could not build a Codex profile from the stored credentials.',
      )
    }
    persistCredentials()
    onSave('codex', env)
  }, [onSave])
  const status = useCodexOAuthFlow({
    onAuthenticated: handleAuthenticated,
  })
  if (status.state === 'error') {
    return (
      <Dialog title="Codex OAuth failed" onCancel={onCancel} color="warning">
        <Box flexDirection="column" gap={1}>
          <Text>{status.message}</Text>
          <Select
            options={[
              { label: 'Back', value: 'back' },
              { label: 'Cancel', value: 'cancel' },
            ]}
            onChange={(value: string) =>
              value === 'back' ? onBack() : onCancel()
            }
            onCancel={onCancel}
          />
        </Box>
      </Dialog>
    )
  }
  if (status.state === 'starting') {
    return <LoadingState message="Starting Codex OAuth..." />
  }
  return (
    <Dialog title="Codex OAuth" onCancel={onBack}>
      <Box flexDirection="column" gap={1}>
        <Text>
          Finish signing in with ChatGPT in your browser. OpenClaude will store
          the resulting Codex credentials securely for future sessions.
        </Text>
        {status.browserOpened === false ? (
          <Text color="warning">
            Browser did not open automatically. Visit this URL to continue:
          </Text>
        ) : status.browserOpened === true ? (
          <Text dimColor>
            Browser opened. Complete the sign-in there, then OpenClaude will
            finish setup automatically.
          </Text>
        ) : (
          <Text dimColor>Opening your browser...</Text>
        )}
        <Text>{status.authUrl}</Text>
        <Text dimColor>Press Esc to cancel and go back.</Text>
      </Box>
    </Dialog>
  )
 }
 function CodexCredentialStep({
  onSave,
  onBack,
@@ -1078,9 +924,7 @@ function CodexCredentialStep({
              { label: 'Back', value: 'back' },
              { label: 'Cancel', value: 'cancel' },
            ]}
-            onChange={(value: string) =>
+            onChange={value => (value === 'back' ? onBack() : onCancel())}
              value === 'back' ? onBack() : onCancel()
            }
            onCancel={onCancel}
          />
        </Box>
@@ -1114,10 +958,9 @@ function CodexCredentialStep({
          defaultFocusValue="codexplan"
          inlineDescriptions
          visibleOptionCount={options.length}
-          onChange={(value: string) => {
+          onChange={value => {
            const env = buildCodexProfileEnv({
              model: value,
              credentialSource: credentials.credentialSource,
              processEnv: process.env,
            })
            if (env) {
@@ -1132,16 +975,9 @@ function CodexCredentialStep({
 }
 function resolveCodexCredentials(processEnv: NodeJS.ProcessEnv):
-  | {
+  | { ok: true; sourceDescription: string }
      ok: true
      sourceDescription: string
      credentialSource: 'oauth' | 'existing'
    }
  | { ok: false; message: string } {
  const credentials = resolveCodexApiCredentials(processEnv)
  const oauthHint = isBareMode()
    ? 'Re-login with the Codex CLI'
    : 'Choose Codex OAuth in /provider, or re-login with the Codex CLI'
  if (!credentials.apiKey) {
    const authHint = credentials.authPath
@@ -1149,7 +985,7 @@ function resolveCodexCredentials(processEnv: NodeJS.ProcessEnv):
      : 'Set CODEX_API_KEY or re-login with the Codex CLI.'
    return {
      ok: false,
-      message: `Codex setup needs existing credentials. ${oauthHint}, or set CODEX_API_KEY. ${authHint}`,
+      message: `Codex setup needs existing credentials. Re-login with the Codex CLI or set CODEX_API_KEY. ${authHint}`,
    }
  }
@@ -1157,19 +993,15 @@ function resolveCodexCredentials(processEnv: NodeJS.ProcessEnv):
    return {
      ok: false,
      message:
-        `Codex auth is missing chatgpt_account_id. ${oauthHint}, or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID first.`,
+        'Codex auth is missing chatgpt_account_id. Re-login with the Codex CLI or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID first.',
    }
  }
  return {
    ok: true,
    credentialSource:
      credentials.source === 'secure-storage' ? 'oauth' : 'existing',
    sourceDescription:
      credentials.source === 'env'
        ? 'the current shell environment'
        : credentials.source === 'secure-storage'
          ? 'OpenClaude secure storage'
        : credentials.authPath ?? DEFAULT_CODEX_BASE_URL,
  }
 }
@@ -1203,8 +1035,6 @@ export function ProviderWizard({
                name: 'mistral-key',
                defaultModel: defaults.mistralModel,
              })
            } else if (value === 'codex-oauth') {
              setStep({ name: 'codex-oauth' })
            } else if (value === 'clear') {
              const filePath = deleteProfileFile()
              onDone(`Removed saved provider profile at ${filePath}. Restart OpenClaude to go back to normal startup.`, {
@@ -1484,7 +1314,7 @@ export function ProviderWizard({
              options={options}
              inlineDescriptions
              visibleOptionCount={options.length}
-              onChange={(value: string) => {
+              onChange={value => {
                if (value === 'api-key') {
                  setStep({ name: 'gemini-key' })
                } else if (value === 'access-token') {
@@ -1640,15 +1470,6 @@ export function ProviderWizard({
          onCancel={() => onDone()}
        />
      )
    case 'codex-oauth':
      return (
        <CodexOAuthStep
          onSave={(profile, env) => finishProfileSave(onDone, profile, env)}
          onBack={() => setStep({ name: 'choose' })}
          onCancel={() => onDone()}
        />
      )
  }
 }
--- a/src/components/EffortPicker.tsx
+++ b/src/components/EffortPicker.tsx
@@ -101,9 +101,9 @@ export function EffortPicker({ onSelect, onCancel }: Props) {
      <Box marginBottom={1} flexDirection="column">
        <Text color="remember" bold={true}>Set effort level</Text>
        <Text dimColor={true}>
-            {supportsEffort && usesOpenAIEffort
+          {usesOpenAIEffort
-              ? `OpenAI/Codex provider (${provider})`
+            ? `OpenAI/Codex provider (${provider})`
-              : supportsEffort
+            : supportsEffort
              ? `Claude model · ${provider} provider`
              : `Effort not supported for this model`
          }
--- a/src/components/ProviderManager.test.tsx
+++ b/src/components/ProviderManager.test.tsx
@@ -5,14 +5,13 @@ import React from 'react'
 import stripAnsi from 'strip-ansi'
 import { createRoot } from '../ink.js'
 import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
 import { AppStateProvider } from '../state/AppState.js'
 import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
 const SYNC_START = '\x1B[?2026h'
 const SYNC_END = '\x1B[?2026l'
 const ORIGINAL_ENV = {
  CLAUDE_CODE_SIMPLE: process.env.CLAUDE_CODE_SIMPLE,
  CLAUDE_CODE_USE_GITHUB: process.env.CLAUDE_CODE_USE_GITHUB,
  GITHUB_TOKEN: process.env.GITHUB_TOKEN,
  GH_TOKEN: process.env.GH_TOKEN,
@@ -110,9 +109,6 @@ function createDeferred<T>(): {
 function mockProviderProfilesModule(options?: {
  addProviderProfile?: (...args: unknown[]) => unknown
  getProviderProfiles?: () => unknown[]
  updateProviderProfile?: (...args: unknown[]) => unknown
  setActiveProviderProfile?: (...args: unknown[]) => unknown
 }): void {
  mock.module('../utils/providerProfiles.js', () => ({
    addProviderProfile: options?.addProviderProfile ?? (() => null),
@@ -135,20 +131,17 @@ function mockProviderProfilesModule(options?: {
            model: 'mock-model',
            apiKey: '',
          },
-    getProviderProfiles: options?.getProviderProfiles ?? (() => []),
+    getProviderProfiles: () => [],
-    setActiveProviderProfile: options?.setActiveProviderProfile ?? (() => null),
+    setActiveProviderProfile: () => null,
-    updateProviderProfile: options?.updateProviderProfile ?? (() => null),
+    updateProviderProfile: () => null,
  }))
 }
 function mockProviderManagerDependencies(
-  githubSyncRead: () => string | undefined,
+  syncRead: () => string | undefined,
-  githubAsyncRead: () => Promise<string | undefined>,
+  asyncRead: () => Promise<string | undefined>,
  options?: {
    addProviderProfile?: (...args: unknown[]) => unknown
    applySavedProfileToCurrentSession?: (...args: unknown[]) => Promise<string | null>
    clearCodexCredentials?: () => { success: boolean; warning?: string }
    getProviderProfiles?: () => unknown[]
    hasLocalOllama?: () => Promise<boolean>
    listOllamaModels?: () => Promise<
      Array<{
@@ -160,33 +153,9 @@ function mockProviderManagerDependencies(
        quantizationLevel?: string | null
      }>
    >
    codexSyncRead?: () => unknown
    codexAsyncRead?: () => Promise<unknown>
    updateProviderProfile?: (...args: unknown[]) => unknown
    setActiveProviderProfile?: (...args: unknown[]) => unknown
    useCodexOAuthFlow?: (options: {
      onAuthenticated: (tokens: {
        accessToken: string
        refreshToken: string
        accountId?: string
        idToken?: string
        apiKey?: string
      }, persistCredentials: (options?: { profileId?: string }) => void) =>
        void | Promise<void>
    }) => {
      state: 'starting' | 'waiting' | 'error'
      authUrl?: string
      browserOpened?: boolean | null
      message?: string
    }
  },
 ): void {
-  mockProviderProfilesModule({
+  mockProviderProfilesModule({ addProviderProfile: options?.addProviderProfile })
    addProviderProfile: options?.addProviderProfile,
    getProviderProfiles: options?.getProviderProfiles,
    updateProviderProfile: options?.updateProviderProfile,
    setActiveProviderProfile: options?.setActiveProviderProfile,
  })
  mock.module('../utils/providerDiscovery.js', () => ({
    hasLocalOllama: options?.hasLocalOllama ?? (async () => false),
@@ -197,65 +166,13 @@ function mockProviderManagerDependencies(
    clearGithubModelsToken: () => ({ success: true }),
    GITHUB_MODELS_HYDRATED_ENV_MARKER: 'CLAUDE_CODE_GITHUB_TOKEN_HYDRATED',
    hydrateGithubModelsTokenFromSecureStorage: () => {},
-    readGithubModelsToken: githubSyncRead,
+    readGithubModelsToken: syncRead,
-    readGithubModelsTokenAsync: githubAsyncRead,
+    readGithubModelsTokenAsync: asyncRead,
  }))
  mock.module('../utils/codexCredentials.js', () => ({
    attachCodexProfileIdToStoredCredentials: () => ({ success: true }),
    clearCodexCredentials:
      options?.clearCodexCredentials ?? (() => ({ success: true })),
    readCodexCredentials:
      options?.codexSyncRead ?? (() => undefined),
    readCodexCredentialsAsync:
      options?.codexAsyncRead ?? (async () => undefined),
  }))
  mock.module('../utils/providerProfile.js', () => ({
    applySavedProfileToCurrentSession:
      options?.applySavedProfileToCurrentSession ?? (async () => null),
    buildCodexOAuthProfileEnv: (tokens: {
      accessToken: string
      accountId?: string
      idToken?: string
    }) => {
      const accountId =
        tokens.accountId ??
        (tokens.idToken ? 'acct_from_id_token' : undefined) ??
        (tokens.accessToken ? 'acct_from_access_token' : undefined)
      if (!accountId) {
        return null
      }
      return {
        OPENAI_BASE_URL: 'https://chatgpt.com/backend-api/codex',
        OPENAI_MODEL: 'codexplan',
        CHATGPT_ACCOUNT_ID: accountId,
        CODEX_CREDENTIAL_SOURCE: 'oauth' as const,
      }
    },
    clearPersistedCodexOAuthProfile: () => null,
    createProfileFile: (profile: string, env: Record<string, unknown>) => ({
      profile,
      env,
      createdAt: '2026-04-10T00:00:00.000Z',
    }),
  }))
  mock.module('../utils/settings/settings.js', () => ({
    updateSettingsForSource: () => ({ error: null }),
  }))
  mock.module('./useCodexOAuthFlow.js', () => ({
    useCodexOAuthFlow:
      options?.useCodexOAuthFlow ??
      (() => ({
        state: 'waiting' as const,
        authUrl: 'https://chatgpt.com/codex',
        browserOpened: true,
      })),
  }))
 }
 async function waitForFrameOutput(
@@ -323,9 +240,9 @@ async function renderProviderManagerFrame(
    onDone: (result?: unknown) => void
  }>,
  options?: {
    mode?: 'first-run' | 'manage'
    waitForOutput?: (output: string) => boolean
    timeoutMs?: number
    mode?: 'first-run' | 'manage'
  },
 ): Promise<string> {
  const mounted = await mountProviderManager(ProviderManager, {
@@ -388,47 +305,6 @@ test('ProviderManager resolves GitHub virtual provider from async storage withou
  expect(asyncRead).toHaveBeenCalled()
 })
 test('ProviderManager avoids first-frame false negative while stored-token lookup is pending', async () => {
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const syncRead = mock(() => {
    throw new Error('sync credential read should not run in ProviderManager render flow')
  })
  const deferredStoredToken = createDeferred<string | undefined>()
  const asyncRead = mock(async () => deferredStoredToken.promise)
  mockProviderManagerDependencies(syncRead, asyncRead)
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const mounted = await mountProviderManager(ProviderManager)
  const firstFrame = await waitForFrameOutput(
    mounted.getOutput,
    frame => frame.includes('Provider manager'),
  )
  expect(firstFrame).toContain('Checking GitHub Models credentials...')
  expect(firstFrame).not.toContain('No provider profiles configured yet.')
  deferredStoredToken.resolve('stored-token')
  const resolvedFrame = await waitForFrameOutput(
    mounted.getOutput,
    frame => frame.includes('GitHub Models') && frame.includes('token stored'),
  )
  expect(resolvedFrame).toContain('GitHub Models')
  expect(resolvedFrame).toContain('token stored')
  await mounted.dispose()
  expect(syncRead).not.toHaveBeenCalled()
  expect(asyncRead).toHaveBeenCalled()
 })
 test('ProviderManager first-run Ollama preset auto-detects installed models', async () => {
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
@@ -519,411 +395,43 @@ test('ProviderManager first-run Ollama preset auto-detects installed models', as
  await mounted.dispose()
 })
-test('ProviderManager first-run Codex OAuth switches the current session after login completes', async () => {
+test('ProviderManager avoids first-frame false negative while stored-token lookup is pending', async () => {
  delete process.env.CLAUDE_CODE_SIMPLE
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
-  const onDone = mock(() => {})
+  const syncRead = mock(() => {
-  const applySavedProfileToCurrentSession = mock(async () => null)
+    throw new Error('sync credential read should not run in ProviderManager render flow')
  const persistCredentials = mock(() => {})
  const addProviderProfile = mock((payload: {
    provider: string
    name: string
    baseUrl: string
    model: string
    apiKey?: string
  }) => ({
    id: 'provider_codex_oauth',
    provider: payload.provider,
    name: payload.name,
    baseUrl: payload.baseUrl,
    model: payload.model,
    apiKey: payload.apiKey,
  }))
  mockProviderManagerDependencies(
    () => undefined,
    async () => undefined,
    {
      addProviderProfile,
      applySavedProfileToCurrentSession,
      useCodexOAuthFlow: ({ onAuthenticated }) => {
        React.useEffect(() => {
          void onAuthenticated({
            accessToken: 'oauth-access-token',
            refreshToken: 'oauth-refresh-token',
            accountId: 'acct_oauth',
          }, persistCredentials)
        }, [onAuthenticated])
        return {
          state: 'waiting',
          authUrl: 'https://chatgpt.com/codex',
          browserOpened: true,
        }
      },
    },
  )
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const mounted = await mountProviderManager(ProviderManager, {
    mode: 'first-run',
    onDone,
  })
  const deferredStoredToken = createDeferred<string | undefined>()
  const asyncRead = mock(async () => deferredStoredToken.promise)
-  await waitForFrameOutput(
+  mockProviderManagerDependencies(syncRead, asyncRead)
    mounted.getOutput,
    frame => frame.includes('Set up provider') && frame.includes('Codex OAuth'),
  )
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('\r')
  await waitForCondition(() => onDone.mock.calls.length > 0)
  expect(addProviderProfile).toHaveBeenCalledWith(
    expect.objectContaining({
      provider: 'openai',
      name: 'Codex OAuth',
      baseUrl: 'https://chatgpt.com/backend-api/codex',
      model: 'codexplan',
      apiKey: '',
    }),
    expect.objectContaining({ makeActive: true }),
  )
  expect(applySavedProfileToCurrentSession).toHaveBeenCalled()
  expect(persistCredentials).toHaveBeenCalledWith({
    profileId: 'provider_codex_oauth',
  })
  expect(onDone).toHaveBeenCalledWith(
    expect.objectContaining({
      action: 'saved',
      message:
        'Codex OAuth configured. OpenClaude switched to it for this session.',
    }),
  )
  await mounted.dispose()
 })
 test('ProviderManager first-run Codex OAuth reports next-startup fallback when session activation fails', async () => {
  delete process.env.CLAUDE_CODE_SIMPLE
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const onDone = mock(() => {})
  const applySavedProfileToCurrentSession = mock(
    async () => 'validation failed',
  )
  const persistCredentials = mock(() => {})
  const addProviderProfile = mock((payload: {
    provider: string
    name: string
    baseUrl: string
    model: string
    apiKey?: string
  }) => ({
    id: 'provider_codex_oauth',
    provider: payload.provider,
    name: payload.name,
    baseUrl: payload.baseUrl,
    model: payload.model,
    apiKey: payload.apiKey,
  }))
  mockProviderManagerDependencies(
    () => undefined,
    async () => undefined,
    {
      addProviderProfile,
      applySavedProfileToCurrentSession,
      useCodexOAuthFlow: ({ onAuthenticated }) => {
        React.useEffect(() => {
          void onAuthenticated({
            accessToken: 'oauth-access-token',
            refreshToken: 'oauth-refresh-token',
            accountId: 'acct_oauth',
          }, persistCredentials)
        }, [onAuthenticated])
        return {
          state: 'waiting',
          authUrl: 'https://chatgpt.com/codex',
          browserOpened: true,
        }
      },
    },
  )
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const mounted = await mountProviderManager(ProviderManager, {
    mode: 'first-run',
    onDone,
  })
  await waitForFrameOutput(
    mounted.getOutput,
    frame => frame.includes('Set up provider') && frame.includes('Codex OAuth'),
  )
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('\r')
  await waitForCondition(() => onDone.mock.calls.length > 0)
  expect(persistCredentials).toHaveBeenCalledWith({
    profileId: 'provider_codex_oauth',
  })
  expect(onDone).toHaveBeenCalledWith(
    expect.objectContaining({
      action: 'saved',
      message:
        'Codex OAuth configured. Saved for next startup. Warning: validation failed.',
    }),
  )
  await mounted.dispose()
 })
 test('ProviderManager does not hijack a manual Codex profile when OAuth credentials are not yet linked', async () => {
  delete process.env.CLAUDE_CODE_SIMPLE
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const onDone = mock(() => {})
  const manualProfile = {
    id: 'provider_manual_codex',
    provider: 'openai',
    name: 'Codex OAuth',
    baseUrl: 'https://chatgpt.com/backend-api/codex',
    model: 'gpt-5.4',
    apiKey: 'manual-key',
  }
  const addProviderProfile = mock((payload: {
    provider: string
    name: string
    baseUrl: string
    model: string
    apiKey?: string
  }) => ({
    id: 'provider_codex_oauth',
    provider: payload.provider,
    name: payload.name,
    baseUrl: payload.baseUrl,
    model: payload.model,
    apiKey: payload.apiKey,
  }))
  const updateProviderProfile = mock(() => manualProfile)
  const persistCredentials = mock(() => {})
  mockProviderManagerDependencies(
    () => undefined,
    async () => undefined,
    {
      addProviderProfile,
      getProviderProfiles: () => [manualProfile],
      updateProviderProfile,
      useCodexOAuthFlow: ({ onAuthenticated }) => {
        const hasAuthenticated = React.useRef(false)
        React.useEffect(() => {
          if (hasAuthenticated.current) {
            return
          }
          hasAuthenticated.current = true
          void onAuthenticated({
            accessToken: 'oauth-access-token',
            refreshToken: 'oauth-refresh-token',
            accountId: 'acct_oauth',
          }, persistCredentials)
        }, [onAuthenticated])
        return {
          state: 'waiting',
          authUrl: 'https://chatgpt.com/codex',
          browserOpened: true,
        }
      },
    },
  )
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const mounted = await mountProviderManager(ProviderManager, {
    mode: 'first-run',
    onDone,
  })
  await waitForFrameOutput(
    mounted.getOutput,
    frame => frame.includes('Set up provider') && frame.includes('Codex OAuth'),
  )
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('j')
  await Bun.sleep(25)
  mounted.stdin.write('\r')
  await waitForCondition(() => onDone.mock.calls.length > 0)
  expect(addProviderProfile).toHaveBeenCalledTimes(1)
  expect(updateProviderProfile).not.toHaveBeenCalled()
  expect(persistCredentials).toHaveBeenCalledWith({
    profileId: 'provider_codex_oauth',
  })
  await mounted.dispose()
 })
 test('ProviderManager keeps Codex OAuth as next-startup only when activating the session fails from the menu', async () => {
  delete process.env.CLAUDE_CODE_SIMPLE
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const codexProfile = {
    id: 'provider_codex_oauth',
    provider: 'openai',
    name: 'Codex OAuth',
    baseUrl: 'https://chatgpt.com/backend-api/codex',
    model: 'codexplan',
    apiKey: '',
  }
  const applySavedProfileToCurrentSession = mock(
    async () => 'validation failed',
  )
  const setActiveProviderProfile = mock(() => codexProfile)
  mockProviderManagerDependencies(
    () => undefined,
    async () => undefined,
    {
      applySavedProfileToCurrentSession,
      getProviderProfiles: () => [codexProfile],
      setActiveProviderProfile,
      codexAsyncRead: async () => ({
        accessToken: 'oauth-access-token',
        refreshToken: 'oauth-refresh-token',
        accountId: 'acct_oauth',
        profileId: 'provider_codex_oauth',
      }),
    },
  )
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const mounted = await mountProviderManager(ProviderManager)
-  await waitForFrameOutput(
+  const firstFrame = await waitForFrameOutput(
    mounted.getOutput,
-    frame =>
+    frame => frame.includes('Provider manager'),
      frame.includes('Provider manager') &&
      frame.includes('Set active provider') &&
      frame.includes('Log out Codex OAuth'),
  )
-  mounted.stdin.write('j')
+  expect(firstFrame).toContain('Checking GitHub Models credentials...')
-  await Bun.sleep(25)
+  expect(firstFrame).not.toContain('No provider profiles configured yet.')
  mounted.stdin.write('\r')
-  await waitForFrameOutput(
+  deferredStoredToken.resolve('stored-token')
  const resolvedFrame = await waitForFrameOutput(
    mounted.getOutput,
-    frame => frame.includes('Set active provider') && frame.includes('Codex OAuth'),
+    frame => frame.includes('GitHub Models') && frame.includes('token stored'),
  )
-  await Bun.sleep(25)
+  expect(resolvedFrame).toContain('GitHub Models')
-  mounted.stdin.write('\r')
+  expect(resolvedFrame).toContain('token stored')
  await waitForCondition(() => setActiveProviderProfile.mock.calls.length > 0)
  await waitForCondition(
    () => applySavedProfileToCurrentSession.mock.calls.length > 0,
  )
  await Bun.sleep(50)
  const output = stripAnsi(extractLastFrame(mounted.getOutput()))
  expect(output).toContain(
    'Active provider: Codex OAuth. Saved for next startup. Warning: validation failed.',
  )
  expect(applySavedProfileToCurrentSession).toHaveBeenCalled()
  expect(setActiveProviderProfile).toHaveBeenCalledWith('provider_codex_oauth')
  await mounted.dispose()
-})
+
-
+  expect(syncRead).not.toHaveBeenCalled()
-test('ProviderManager resolves Codex OAuth state from async storage without sync reads in render flow', async () => {
+  expect(asyncRead).toHaveBeenCalled()
  delete process.env.CLAUDE_CODE_SIMPLE
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const githubSyncRead = mock(() => undefined)
  const githubAsyncRead = mock(async () => undefined)
  const codexSyncRead = mock(() => {
    throw new Error('sync codex credential read should not run in ProviderManager render flow')
  })
  const codexAsyncRead = mock(async () => ({
    accessToken: 'codex-access-token',
    refreshToken: 'codex-refresh-token',
  }))
  mockProviderManagerDependencies(githubSyncRead, githubAsyncRead, {
    codexSyncRead,
    codexAsyncRead,
  })
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const output = await renderProviderManagerFrame(ProviderManager, {
    waitForOutput: frame =>
      frame.includes('Provider manager') &&
      frame.includes('Log out Codex OAuth'),
  })
  expect(output).toContain('Provider manager')
  expect(output).toContain('Log out Codex OAuth')
  expect(codexSyncRead).not.toHaveBeenCalled()
  expect(codexAsyncRead).toHaveBeenCalled()
 })
 test('ProviderManager hides Codex OAuth setup in bare mode', async () => {
  process.env.CLAUDE_CODE_SIMPLE = '1'
  delete process.env.CLAUDE_CODE_USE_GITHUB
  delete process.env.GITHUB_TOKEN
  delete process.env.GH_TOKEN
  const githubSyncRead = mock(() => undefined)
  const githubAsyncRead = mock(async () => undefined)
  mockProviderManagerDependencies(githubSyncRead, githubAsyncRead)
  const nonce = `${Date.now()}-${Math.random()}`
  const { ProviderManager } = await import(`./ProviderManager.js?ts=${nonce}`)
  const output = await renderProviderManagerFrame(ProviderManager, {
    mode: 'first-run',
    waitForOutput: frame =>
      frame.includes('Set up provider') && frame.includes('OpenAI'),
  })
  expect(output).toContain('Set up provider')
  expect(output).not.toContain('Codex OAuth')
 })
--- a/src/components/ProviderManager.tsx
+++ b/src/components/ProviderManager.tsx
@@ -1,22 +1,9 @@
 import figures from 'figures'
 import * as React from 'react'
 import { DEFAULT_CODEX_BASE_URL } from '../services/api/providerConfig.js'
 import { Box, Text } from '../ink.js'
 import { useKeybinding } from '../keybindings/useKeybinding.js'
 import { useSetAppState } from '../state/AppState.js'
 import type { ProviderProfile } from '../utils/config.js'
-import {
+import { hasLocalOllama, listOllamaModels } from '../utils/providerDiscovery.js'
  clearCodexCredentials,
  readCodexCredentialsAsync,
 } from '../utils/codexCredentials.js'
 import { isBareMode, isEnvTruthy } from '../utils/envUtils.js'
 import { getPrimaryModel, hasMultipleModels, parseModelList } from '../utils/providerModels.js'
 import {
  applySavedProfileToCurrentSession,
  buildCodexOAuthProfileEnv,
  clearPersistedCodexOAuthProfile,
  createProfileFile,
 } from '../utils/providerProfile.js'
 import {
  addProviderProfile,
  applyActiveProviderProfileFromConfig,
@@ -29,6 +16,10 @@ import {
  type ProviderProfileInput,
  updateProviderProfile,
 } from '../utils/providerProfiles.js'
 import {
  rankOllamaModels,
  recommendOllamaModel,
 } from '../utils/providerRecommendation.js'
 import {
  clearGithubModelsToken,
  GITHUB_MODELS_HYDRATED_ENV_MARKER,
@@ -36,23 +27,11 @@ import {
  readGithubModelsToken,
  readGithubModelsTokenAsync,
 } from '../utils/githubModelsCredentials.js'
-import {
+import { isEnvTruthy } from '../utils/envUtils.js'
  hasLocalOllama,
  listOllamaModels,
 } from '../utils/providerDiscovery.js'
 import {
  rankOllamaModels,
  recommendOllamaModel,
 } from '../utils/providerRecommendation.js'
 import { updateSettingsForSource } from '../utils/settings/settings.js'
-import {
+import { type OptionWithDescription, Select } from './CustomSelect/index.js'
  type OptionWithDescription,
  Select,
 } from './CustomSelect/index.js'
 import { Pane } from './design-system/Pane.js'
 import TextInput from './TextInput.js'
 import { useCodexOAuthFlow } from './useCodexOAuthFlow.js'
 import { useSetAppState } from '../state/AppState.js'
 export type ProviderManagerResult = {
  action: 'saved' | 'cancelled'
@@ -69,7 +48,6 @@ type Screen =
  | 'menu'
  | 'select-preset'
  | 'select-ollama-model'
  | 'codex-oauth'
  | 'form'
  | 'select-active'
  | 'select-edit'
@@ -111,8 +89,8 @@ const FORM_STEPS: Array<{
  {
    key: 'model',
    label: 'Default model',
-    placeholder: 'e.g. llama3.1:8b or glm-4.7, glm-4.7-flash',
+    placeholder: 'e.g. llama3.1:8b',
-    helpText: 'Model name(s) to use. Separate multiple with commas; first is default.',
+    helpText: 'Model name to use when this provider is active.',
  },
  {
    key: 'apiKey',
@@ -127,8 +105,6 @@ const GITHUB_PROVIDER_ID = '__github_models__'
 const GITHUB_PROVIDER_LABEL = 'GitHub Models'
 const GITHUB_PROVIDER_DEFAULT_MODEL = 'github:copilot'
 const GITHUB_PROVIDER_DEFAULT_BASE_URL = 'https://models.github.ai/inference'
 const CODEX_OAUTH_PROVIDER_NAME = 'Codex OAuth'
 const CODEX_OAUTH_PROVIDER_MODEL = 'codexplan'
 type GithubCredentialSource = 'stored' | 'env' | 'none'
@@ -156,12 +132,7 @@ function profileSummary(profile: ProviderProfile, isActive: boolean): string {
  const keyInfo = profile.apiKey ? 'key set' : 'no key'
  const providerKind =
    profile.provider === 'anthropic' ? 'anthropic' : 'openai-compatible'
-  const models = parseModelList(profile.model)
+  return `${providerKind} · ${profile.baseUrl} · ${profile.model} · ${keyInfo}${activeSuffix}`
  const modelDisplay =
    models.length <= 3
      ? models.join(', ')
      : `${models[0]}, ${models[1]} + ${models.length - 2} more`
  return `${providerKind} · ${profile.baseUrl} · ${modelDisplay} · ${keyInfo}${activeSuffix}`
 }
 function getGithubCredentialSourceFromEnv(
@@ -222,113 +193,7 @@ function getGithubProviderSummary(
  return `github-models · ${GITHUB_PROVIDER_DEFAULT_BASE_URL} · ${getGithubProviderModel(processEnv)} · ${credentialSummary}${activeSuffix}`
 }
 function findCodexOAuthProfile(
  profiles: ProviderProfile[],
  profileId?: string,
 ): ProviderProfile | undefined {
  if (!profileId) {
    return undefined
  }
  return profiles.find(profile => profile.id === profileId)
 }
 function isCodexOAuthProfile(
  profile: ProviderProfile | null | undefined,
  profileId?: string,
 ): boolean {
  return Boolean(profile && profileId && profile.id === profileId)
 }
 function CodexOAuthSetup({
  onBack,
  onConfigured,
 }: {
  onBack: () => void
  onConfigured: (tokens: {
    accessToken: string
    refreshToken: string
    accountId?: string
    idToken?: string
    apiKey?: string
  }, persistCredentials: (options?: { profileId?: string }) => void) => void | Promise<void>
 }): React.ReactNode {
  const handleAuthenticated = React.useCallback(async (tokens: {
    accessToken: string
    refreshToken: string
    accountId?: string
    idToken?: string
    apiKey?: string
  }, persistCredentials: (options?: { profileId?: string }) => void) => {
    await onConfigured(tokens, persistCredentials)
  }, [onConfigured])
  useKeybinding('confirm:no', onBack, [onBack])
  const status = useCodexOAuthFlow({
    onAuthenticated: handleAuthenticated,
  })
  if (status.state === 'error') {
    return (
      <Box flexDirection="column" gap={1}>
        <Text color="error" bold>
          Codex OAuth failed
        </Text>
        <Text>{status.message}</Text>
        <Text dimColor>Press Enter or Esc to go back.</Text>
        <Select
          options={[
            {
              value: 'back',
              label: 'Back',
              description: 'Return to provider presets',
            },
          ]}
          onChange={onBack}
          onCancel={onBack}
          visibleOptionCount={1}
        />
      </Box>
    )
  }
  return (
    <Box flexDirection="column" gap={1}>
      <Text color="remember" bold>
        Codex OAuth
      </Text>
      <Text>
        Sign in with your ChatGPT account in the browser. OpenClaude will store
        the resulting Codex credentials securely and switch this session to the
        new Codex login when setup completes.
      </Text>
      {status.state === 'starting' ? (
        <Text dimColor>Starting local callback and preparing your browser...</Text>
      ) : status.browserOpened === false ? (
        <>
          <Text color="warning">
            Browser did not open automatically. Visit this URL to continue:
          </Text>
          <Text>{status.authUrl}</Text>
        </>
      ) : status.browserOpened === true ? (
        <>
          <Text dimColor>
            Browser opened. Finish the ChatGPT sign-in there and this setup will
            complete automatically.
          </Text>
          <Text>{status.authUrl}</Text>
        </>
      ) : (
        <Text dimColor>Opening your browser...</Text>
      )}
      <Text dimColor>Press Esc to cancel and go back.</Text>
    </Box>
  )
 }
 export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
  const setAppState = useSetAppState()
  const initialGithubCredentialSource = getGithubCredentialSourceFromEnv()
  const initialIsGithubActive = isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB)
  const initialHasGithubCredential = initialGithubCredentialSource !== 'none'
@@ -347,7 +212,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
  const [isGithubCredentialSourceResolved, setIsGithubCredentialSourceResolved] =
    React.useState(() => initialHasGithubCredential || initialIsGithubActive)
  const githubRefreshEpochRef = React.useRef(0)
  const codexRefreshEpochRef = React.useRef(0)
  const [screen, setScreen] = React.useState<Screen>(
    mode === 'first-run' ? 'select-preset' : 'menu',
  )
@@ -362,11 +226,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
  const [cursorOffset, setCursorOffset] = React.useState(0)
  const [statusMessage, setStatusMessage] = React.useState<string | undefined>()
  const [errorMessage, setErrorMessage] = React.useState<string | undefined>()
  const [menuFocusValue, setMenuFocusValue] = React.useState<string | undefined>()
  const [hasStoredCodexOAuthCredentials, setHasStoredCodexOAuthCredentials] =
    React.useState(false)
  const [storedCodexOAuthProfileId, setStoredCodexOAuthProfileId] =
    React.useState<string | undefined>()
  const [ollamaSelection, setOllamaSelection] = React.useState<OllamaSelectionState>({
    state: 'idle',
  })
@@ -404,102 +263,19 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
    })()
  }, [])
  const refreshCodexOAuthCredentialState = React.useCallback((): void => {
    if (isBareMode()) {
      codexRefreshEpochRef.current += 1
      setHasStoredCodexOAuthCredentials(false)
      setStoredCodexOAuthProfileId(undefined)
      return
    }
    const refreshEpoch = ++codexRefreshEpochRef.current
    void (async () => {
      const credentials = await readCodexCredentialsAsync()
      if (refreshEpoch !== codexRefreshEpochRef.current) {
        return
      }
      setHasStoredCodexOAuthCredentials(
        Boolean(
          credentials?.apiKey ||
            credentials?.accessToken ||
            credentials?.refreshToken ||
            credentials?.idToken,
        ),
      )
      setStoredCodexOAuthProfileId(credentials?.profileId)
    })()
  }, [])
  React.useEffect(() => {
    refreshGithubProviderState()
    refreshCodexOAuthCredentialState()
    return () => {
      githubRefreshEpochRef.current += 1
      codexRefreshEpochRef.current += 1
    }
-  }, [refreshCodexOAuthCredentialState, refreshGithubProviderState])
+  }, [refreshGithubProviderState])
  React.useEffect(() => {
    if (screen !== 'select-ollama-model') {
      return
    }
    let cancelled = false
    setOllamaSelection({ state: 'loading' })
    void (async () => {
      const available = await hasLocalOllama(draft.baseUrl)
      if (!available) {
        if (!cancelled) {
          setOllamaSelection({
            state: 'unavailable',
            message:
              'Could not reach Ollama. Start Ollama first, or enter the endpoint manually.',
          })
        }
        return
      }
      const models = await listOllamaModels(draft.baseUrl)
      if (models.length === 0) {
        if (!cancelled) {
          setOllamaSelection({
            state: 'unavailable',
            message:
              'Ollama is running, but no installed models were found. Pull a chat model such as qwen2.5-coder:7b or llama3.1:8b first, or enter details manually.',
          })
        }
        return
      }
      const ranked = rankOllamaModels(models, 'balanced')
      const recommended = recommendOllamaModel(models, 'balanced')
      if (!cancelled) {
        setOllamaSelection({
          state: 'ready',
          defaultValue: recommended?.name ?? ranked[0]?.name,
          options: ranked.map(model => ({
            label: model.name,
            value: model.name,
            description: model.summary,
          })),
        })
      }
    })()
    return () => {
      cancelled = true
    }
  }, [draft.baseUrl, screen])
  function refreshProfiles(): void {
    const nextProfiles = getProviderProfiles()
    setProfiles(nextProfiles)
    setActiveProfileId(getActiveProviderProfile()?.id)
    refreshGithubProviderState()
    refreshCodexOAuthCredentialState()
  }
  function clearStartupProviderOverrideFromUserSettings(): string | null {
@@ -516,152 +292,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
    return error ? error.message : null
  }
  function buildCodexOAuthActivationMessage(options: {
    prefix: string
    activationWarning: string | null
    warnings: string[]
  }): string {
    if (options.activationWarning) {
      return `${options.prefix}. Saved for next startup. Warning: ${options.warnings.join('; ')}.`
    }
    if (options.warnings.length > 0) {
      return `${options.prefix}. OpenClaude switched to it for this session with warnings: ${options.warnings.join('; ')}.`
    }
    return `${options.prefix}. OpenClaude switched to it for this session.`
  }
  async function activateCodexOAuthSession(tokens?: {
    accessToken: string
    refreshToken?: string
    accountId?: string
    idToken?: string
  }): Promise<string | null> {
    const oauthEnv = buildCodexOAuthProfileEnv({
      accessToken: tokens?.accessToken ?? '',
      accountId: tokens?.accountId,
      idToken: tokens?.idToken,
    })
    if (oauthEnv) {
      return applySavedProfileToCurrentSession({
        profileFile: createProfileFile('codex', oauthEnv),
      })
    }
    const storedCredentials = await readCodexCredentialsAsync()
    if (!storedCredentials) {
      return 'stored Codex OAuth credentials could not be loaded'
    }
    const storedEnv = buildCodexOAuthProfileEnv({
      accessToken: storedCredentials.accessToken,
      accountId: storedCredentials.accountId,
      idToken: storedCredentials.idToken,
    })
    if (!storedEnv) {
      return 'stored Codex OAuth credentials are missing a ChatGPT account id'
    }
    return applySavedProfileToCurrentSession({
      profileFile: createProfileFile('codex', storedEnv),
    })
  }
  async function activateSelectedProvider(profileId: string): Promise<void> {
    let providerLabel = 'provider'
    try {
      if (profileId === GITHUB_PROVIDER_ID) {
        providerLabel = GITHUB_PROVIDER_LABEL
        const githubError = activateGithubProvider()
        if (githubError) {
          setErrorMessage(`Could not activate GitHub provider: ${githubError}`)
          returnToMenu()
          return
        }
        setAppState(prev => ({
          ...prev,
          mainLoopModel: GITHUB_PROVIDER_DEFAULT_MODEL,
          mainLoopModelForSession: null,
        }))
        refreshProfiles()
        setAppState(prev => ({
          ...prev,
          mainLoopModel: GITHUB_PROVIDER_DEFAULT_MODEL,
        }))
        setStatusMessage(`Active provider: ${GITHUB_PROVIDER_LABEL}`)
        returnToMenu()
        return
      }
      const active = setActiveProviderProfile(profileId)
      if (!active) {
        setErrorMessage('Could not change active provider.')
        returnToMenu()
        return
      }
      // Update the session model to the new provider's first model.
      // persistActiveProviderProfileModel (called by onChangeAppState) will
      // not overwrite the multi-model list because it checks if the model
      // is already in the profile's comma-separated model list.
      const newModel = getPrimaryModel(active.model)
      setAppState(prev => ({
        ...prev,
        mainLoopModel: newModel,
      }))
      providerLabel = active.name
      setAppState(prev => ({
        ...prev,
        mainLoopModel: active.model,
        mainLoopModelForSession: null,
      }))
      const settingsOverrideError =
        clearStartupProviderOverrideFromUserSettings()
      const isActiveCodexOAuth = isCodexOAuthProfile(
        active,
        storedCodexOAuthProfileId,
      )
      const activationWarning = isActiveCodexOAuth
        ? await activateCodexOAuthSession()
        : null
      refreshProfiles()
      setStatusMessage(
        isActiveCodexOAuth
          ? buildCodexOAuthActivationMessage({
              prefix: `Active provider: ${active.name}`,
              activationWarning,
              warnings: [
                activationWarning,
                settingsOverrideError
                  ? `could not clear startup provider override (${settingsOverrideError})`
                  : null,
              ].filter((warning): warning is string => Boolean(warning)),
            })
          : settingsOverrideError
            ? `Active provider: ${active.name}. Warning: could not clear startup provider override (${settingsOverrideError}).`
            : `Active provider: ${active.name}`,
      )
      returnToMenu()
    } catch (error) {
      refreshProfiles()
      setStatusMessage(undefined)
      const detail = error instanceof Error ? error.message : String(error)
      setErrorMessage(`Could not finish activating ${providerLabel}: ${detail}`)
      returnToMenu()
    }
  }
  function returnToMenu(): void {
    setMenuFocusValue('done')
    setScreen('menu')
  }
  function closeWithCancelled(message: string): void {
    onDone({ action: 'cancelled', message })
  }
@@ -753,6 +383,59 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
    return null
  }
  React.useEffect(() => {
    if (screen !== 'select-ollama-model') {
      return
    }
    let cancelled = false
    setOllamaSelection({ state: 'loading' })
    void (async () => {
      const available = await hasLocalOllama(draft.baseUrl)
      if (!available) {
        if (!cancelled) {
          setOllamaSelection({
            state: 'unavailable',
            message:
              'Could not reach Ollama. Start Ollama first, or enter the endpoint manually.',
          })
        }
        return
      }
      const models = await listOllamaModels(draft.baseUrl)
      if (models.length === 0) {
        if (!cancelled) {
          setOllamaSelection({
            state: 'unavailable',
            message:
              'Ollama is running, but no installed models were found. Pull a chat model such as qwen2.5-coder:7b or llama3.1:8b first, or enter details manually.',
          })
        }
        return
      }
      const ranked = rankOllamaModels(models, 'balanced')
      const recommended = recommendOllamaModel(models, 'balanced')
      if (!cancelled) {
        setOllamaSelection({
          state: 'ready',
          defaultValue: recommended?.name ?? ranked[0]?.name,
          options: ranked.map(model => ({
            label: model.name,
            value: model.name,
            description: model.summary,
          })),
        })
      }
    })()
    return () => {
      cancelled = true
    }
  }, [draft.baseUrl, screen])
  function startCreateFromPreset(preset: ProviderPreset): void {
    const defaults = getProviderPresetDefaults(preset)
    const nextDraft = {
@@ -812,13 +495,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
    }
    const isActiveSavedProfile = getActiveProviderProfile()?.id === saved.id
    if (isActiveSavedProfile) {
      setAppState(prev => ({
        ...prev,
        mainLoopModel: saved.model,
        mainLoopModelForSession: null,
      }))
    }
    const settingsOverrideError = isActiveSavedProfile
      ? clearStartupProviderOverrideFromUserSettings()
      : null
@@ -846,7 +522,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
    setEditingProfileId(null)
    setFormStepIndex(0)
    setErrorMessage(undefined)
-    returnToMenu()
+    setScreen('menu')
  }
  function renderOllamaSelection(): React.ReactNode {
@@ -881,7 +557,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
                description: 'Choose another provider preset',
              },
            ]}
-            onChange={(value: string) => {
+            onChange={value => {
              if (value === 'manual') {
                setFormStepIndex(0)
                setCursorOffset(draft.name.length)
@@ -912,7 +588,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
          defaultFocusValue={ollamaSelection.defaultValue}
          inlineDescriptions
          visibleOptionCount={Math.min(8, ollamaSelection.options.length)}
-          onChange={(value: string) => {
+          onChange={value => {
            const nextDraft = {
              ...draft,
              model: value,
@@ -969,7 +645,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
      return
    }
-    returnToMenu()
+    setScreen('menu')
  }
  useKeybinding('confirm:no', handleBackFromForm, {
@@ -978,7 +654,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
  })
  function renderPresetSelection(): React.ReactNode {
    const canUseCodexOAuth = !isBareMode()
    const options = [
      {
        value: 'anthropic',
@@ -995,16 +670,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        label: 'OpenAI',
        description: 'OpenAI API with API key',
      },
      ...(canUseCodexOAuth
        ? [
            {
              value: 'codex-oauth',
              label: 'Codex OAuth',
              description:
                'Sign in with ChatGPT in your browser and store Codex credentials securely',
            },
          ]
        : []),
      {
        value: 'moonshotai',
        label: 'Moonshot AI',
@@ -1050,31 +715,11 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        label: 'LM Studio',
        description: 'Local LM Studio endpoint',
      },
      {
        value: 'dashscope-cn',
        label: 'Alibaba Coding Plan (China)',
        description: 'Alibaba DashScope China endpoint',
      },
      {
        value: 'dashscope-intl',
        label: 'Alibaba Coding Plan',
        description: 'Alibaba DashScope International endpoint',
      },
      {
        value: 'custom',
        label: 'Custom',
        description: 'Any OpenAI-compatible provider',
      },
      {
        value: 'nvidia-nim',
        label: 'NVIDIA NIM',
        description: 'NVIDIA NIM endpoint',
      },
      {
        value: 'minimax',
        label: 'MiniMax',
        description: 'MiniMax API endpoint',
      },
      ...(mode === 'first-run'
        ? [
            {
@@ -1096,15 +741,11 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        </Text>
        <Select
          options={options}
-          onChange={(value: string) => {
+          onChange={value => {
            if (value === 'skip') {
              closeWithCancelled('Provider setup skipped')
              return
            }
            if (value === 'codex-oauth') {
              setScreen('codex-oauth')
              return
            }
            startCreateFromPreset(value as ProviderPreset)
          }}
          onCancel={() => {
@@ -1112,9 +753,9 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
              closeWithCancelled('Provider setup skipped')
              return
            }
-            returnToMenu()
+            setScreen('menu')
          }}
-          visibleOptionCount={Math.min(13, options.length)}
+          visibleOptionCount={Math.min(12, options.length)}
        />
      </Box>
    )
@@ -1150,7 +791,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
            focus={true}
            showCursor={true}
            placeholder={`${currentStep.placeholder}${figures.ellipsis}`}
            mask={currentStepKey === 'apiKey' ? '*' : undefined}
            columns={80}
            cursorOffset={cursorOffset}
            onChangeCursorOffset={setCursorOffset}
@@ -1192,15 +832,6 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        description: 'Remove a provider profile',
        disabled: !hasSelectableProviders,
      },
      ...(hasStoredCodexOAuthCredentials
        ? [
            {
              value: 'logout-codex-oauth',
              label: 'Log out Codex OAuth',
              description: 'Clear securely stored Codex OAuth credentials',
            },
          ]
        : []),
      {
        value: 'done',
        label: 'Done',
@@ -1245,7 +876,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        </Box>
        <Select
          options={options}
-          onChange={(value: string) => {
+          onChange={value => {
            setErrorMessage(undefined)
            switch (value) {
              case 'add':
@@ -1266,54 +897,12 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
                  setScreen('select-delete')
                }
                break
              case 'logout-codex-oauth': {
                const cleared = clearCodexCredentials()
                if (!cleared.success) {
                  setErrorMessage(
                    cleared.warning ??
                      'Could not clear Codex OAuth credentials.',
                  )
                  break
                }
                setHasStoredCodexOAuthCredentials(false)
                setStoredCodexOAuthProfileId(undefined)
                const codexProfile = findCodexOAuthProfile(
                  getProviderProfiles(),
                  storedCodexOAuthProfileId,
                )
                let settingsOverrideError: string | null = null
                if (codexProfile) {
                  const result = deleteProviderProfile(codexProfile.id)
                  if (!result.removed) {
                    setErrorMessage(
                      'Codex OAuth credentials were cleared, but the Codex profile could not be removed.',
                    )
                    refreshProfiles()
                    break
                  }
                  clearPersistedCodexOAuthProfile()
                  settingsOverrideError = result.activeProfileId
                    ? clearStartupProviderOverrideFromUserSettings()
                    : null
                }
                refreshProfiles()
                setStatusMessage(
                  settingsOverrideError
                    ? `Codex OAuth logged out. Warning: could not clear startup provider override (${settingsOverrideError}).`
                    : 'Codex OAuth logged out.',
                )
                break
              }
              default:
                closeWithCancelled('Provider manager closed')
                break
            }
          }}
          onCancel={() => closeWithCancelled('Provider manager closed')}
          defaultFocusValue={menuFocusValue}
          visibleOptionCount={options.length}
        />
      </Box>
@@ -1361,8 +950,8 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
                description: 'Return to provider manager',
              },
            ]}
-            onChange={() => returnToMenu()}
+            onChange={() => setScreen('menu')}
-            onCancel={() => returnToMenu()}
+            onCancel={() => setScreen('menu')}
            visibleOptionCount={1}
          />
        </Box>
@@ -1377,7 +966,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
        <Select
          options={selectOptions}
          onChange={onSelect}
-          onCancel={() => returnToMenu()}
+          onCancel={() => setScreen('menu')}
          visibleOptionCount={Math.min(10, Math.max(2, selectOptions.length))}
        />
      </Box>
@@ -1386,100 +975,51 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
  let content: React.ReactNode
-  switch (screen) {
+    switch (screen) {
-    case 'select-preset':
+      case 'select-preset':
-      content = renderPresetSelection()
+        content = renderPresetSelection()
-      break
+        break
-    case 'select-ollama-model':
+      case 'select-ollama-model':
-      content = renderOllamaSelection()
+        content = renderOllamaSelection()
-      break
+        break
-    case 'codex-oauth':
+      case 'form':
-      content = (
+        content = renderForm()
-        <CodexOAuthSetup
+        break
          onBack={() => setScreen('select-preset')}
          onConfigured={async (tokens, persistCredentials) => {
            const payload: ProviderProfileInput = {
              provider: 'openai',
              name: CODEX_OAUTH_PROVIDER_NAME,
              baseUrl: DEFAULT_CODEX_BASE_URL,
              model: CODEX_OAUTH_PROVIDER_MODEL,
              apiKey: '',
            }
            const existing = findCodexOAuthProfile(
              getProviderProfiles(),
              storedCodexOAuthProfileId,
            )
            const saved = existing
              ? updateProviderProfile(existing.id, payload)
              : addProviderProfile(payload, { makeActive: true })
            if (!saved) {
              setErrorMessage(
                'Codex OAuth login finished, but the provider profile could not be saved.',
              )
              returnToMenu()
              return
            }
            const active =
              existing && activeProfileId !== saved.id
                ? setActiveProviderProfile(saved.id)
                : saved
            if (!active) {
              setErrorMessage(
                'Codex OAuth login finished, but the provider could not be set as the startup provider.',
              )
              returnToMenu()
              return
            }
            persistCredentials({ profileId: saved.id })
            const settingsOverrideError =
              clearStartupProviderOverrideFromUserSettings()
            const activationWarning = await activateCodexOAuthSession(tokens)
            setHasStoredCodexOAuthCredentials(true)
            setStoredCodexOAuthProfileId(saved.id)
            refreshProfiles()
            const warnings = [
              activationWarning,
              settingsOverrideError
                ? `could not clear startup provider override (${settingsOverrideError})`
                : null,
            ].filter((warning): warning is string => Boolean(warning))
            const message = buildCodexOAuthActivationMessage({
              prefix: 'Codex OAuth configured',
              activationWarning,
              warnings,
            })
            if (mode === 'first-run') {
              onDone({
                action: 'saved',
                activeProfileId: active.id,
                message,
              })
              return
            }
            setStatusMessage(message)
            setErrorMessage(undefined)
            returnToMenu()
          }}
        />
      )
      break
    case 'form':
      content = renderForm()
      break
    case 'select-active':
      content = renderProfileSelection(
        'Set active provider',
        'No providers available. Add one first.',
        profileId => {
-          void activateSelectedProvider(profileId)
+          if (profileId === GITHUB_PROVIDER_ID) {
            const githubError = activateGithubProvider()
            if (githubError) {
              setErrorMessage(`Could not activate GitHub provider: ${githubError}`)
              setScreen('menu')
              return
            }
            refreshProfiles()
            setStatusMessage(`Active provider: ${GITHUB_PROVIDER_LABEL}`)
            setScreen('menu')
            return
          }
          const active = setActiveProviderProfile(profileId)
          if (!active) {
            setErrorMessage('Could not change active provider.')
            setScreen('menu')
            return
          }
          const settingsOverrideError =
            clearStartupProviderOverrideFromUserSettings()
          refreshProfiles()
          setStatusMessage(
            settingsOverrideError
              ? `Active provider: ${active.name}. Warning: could not clear startup provider override (${settingsOverrideError}).`
              : `Active provider: ${active.name}`,
          )
          setScreen('menu')
        },
-        { includeGithub: true },
+          { includeGithub: true },
      )
      break
    case 'select-edit':
@@ -1504,31 +1044,14 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
              refreshProfiles()
              setStatusMessage('GitHub provider deleted')
            }
-            returnToMenu()
+            setScreen('menu')
            return
          }
          const deletedCodexOAuthProfile =
            findCodexOAuthProfile(
              profiles,
              storedCodexOAuthProfileId,
            )?.id === profileId
          const result = deleteProviderProfile(profileId)
          if (!result.removed) {
            setErrorMessage('Could not delete provider.')
          } else {
            if (deletedCodexOAuthProfile) {
              const cleared = clearCodexCredentials()
              if (!cleared.success) {
                setErrorMessage(
                  cleared.warning ??
                    'Provider deleted, but Codex OAuth credentials could not be cleared.',
                )
              } else {
                setStoredCodexOAuthProfileId(undefined)
              }
              clearPersistedCodexOAuthProfile()
            }
            const settingsOverrideError = result.activeProfileId
              ? clearStartupProviderOverrideFromUserSettings()
              : null
@@ -1539,7 +1062,7 @@ export function ProviderManager({ mode, onDone }: Props): React.ReactNode {
                : 'Provider deleted',
            )
          }
-          returnToMenu()
+          setScreen('menu')
        },
        { includeGithub: true },
      )
--- a/src/components/StartupScreen.ts
+++ b/src/components/StartupScreen.ts
@@ -5,7 +5,7 @@
 * Addresses: https://github.com/Gitlawb/openclaude/issues/55
 */
-import { isLocalProviderUrl, resolveProviderRequest } from '../services/api/providerConfig.js'
+import { isLocalProviderUrl } from '../services/api/providerConfig.js'
 import { getLocalOpenAICompatibleProviderLabel } from '../utils/providerDiscovery.js'
 import { getSettings_DEPRECATED } from '../utils/settings/settings.js'
 import { parseUserSpecifiedModel } from '../utils/model/model.js'
@@ -110,40 +110,39 @@ function detectProvider(): { name: string; model: string; baseUrl: string; isLoc
  if (useOpenAI) {
    const rawModel = process.env.OPENAI_MODEL || 'gpt-4o'
-    const resolvedRequest = resolveProviderRequest({
+    const baseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1'
      model: rawModel,
      baseUrl: process.env.OPENAI_BASE_URL,
    })
    const baseUrl = resolvedRequest.baseUrl
    const isLocal = isLocalProviderUrl(baseUrl)
    let name = 'OpenAI'
-    if (/nvidia/i.test(baseUrl) || /nvidia/i.test(rawModel) || process.env.NVIDIA_NIM)
+    if (/deepseek/i.test(baseUrl) || /deepseek/i.test(rawModel))       name = 'DeepSeek'
-      name = 'NVIDIA NIM'
+    else if (/openrouter/i.test(baseUrl))                             name = 'OpenRouter'
-    else if (/minimax/i.test(baseUrl) || /minimax/i.test(rawModel) || process.env.MINIMAX_API_KEY)
+    else if (/together/i.test(baseUrl))                               name = 'Together AI'
-      name = 'MiniMax'
+    else if (/groq/i.test(baseUrl))                                   name = 'Groq'
-    else if (resolvedRequest.transport === 'codex_responses' || baseUrl.includes('chatgpt.com/backend-api/codex'))
+    else if (/mistral/i.test(baseUrl) || /mistral/i.test(rawModel))     name = 'Mistral'
-      name = 'Codex'
+    else if (/azure/i.test(baseUrl))                                  name = 'Azure OpenAI'
-    else if (/deepseek/i.test(baseUrl) || /deepseek/i.test(rawModel))
+    else if (/llama/i.test(rawModel))                                    name = 'Meta Llama'
-      name = 'DeepSeek'
+    else if (isLocal)                                                  name = getLocalOpenAICompatibleProviderLabel(baseUrl)
    else if (/openrouter/i.test(baseUrl))
      name = 'OpenRouter'
    else if (/together/i.test(baseUrl))
      name = 'Together AI'
    else if (/groq/i.test(baseUrl))
      name = 'Groq'
    else if (/mistral/i.test(baseUrl) || /mistral/i.test(rawModel))
      name = 'Mistral'
    else if (/azure/i.test(baseUrl))
      name = 'Azure OpenAI'
    else if (/llama/i.test(rawModel))
      name = 'Meta Llama'
    else if (isLocal)
      name = getLocalOpenAICompatibleProviderLabel(baseUrl)
    // Resolve model alias to actual model name + reasoning effort
-    let displayModel = resolvedRequest.resolvedModel
+    let displayModel = rawModel
-    if (resolvedRequest.reasoning?.effort) {
+    const codexAliases: Record<string, { model: string; reasoningEffort?: string }> = {
-      displayModel = `${displayModel} (${resolvedRequest.reasoning.effort})`
+      codexplan: { model: 'gpt-5.4', reasoningEffort: 'high' },
      'gpt-5.4': { model: 'gpt-5.4', reasoningEffort: 'high' },
      'gpt-5.3-codex': { model: 'gpt-5.3-codex', reasoningEffort: 'high' },
      'gpt-5.3-codex-spark': { model: 'gpt-5.3-codex-spark' },
      codexspark: { model: 'gpt-5.3-codex-spark' },
      'gpt-5.2-codex': { model: 'gpt-5.2-codex', reasoningEffort: 'high' },
      'gpt-5.1-codex-max': { model: 'gpt-5.1-codex-max', reasoningEffort: 'high' },
      'gpt-5.1-codex-mini': { model: 'gpt-5.1-codex-mini' },
      'gpt-5.4-mini': { model: 'gpt-5.4-mini', reasoningEffort: 'medium' },
      'gpt-5.2': { model: 'gpt-5.2', reasoningEffort: 'medium' },
    }
    const alias = rawModel.toLowerCase()
    if (alias in codexAliases) {
      const resolved = codexAliases[alias]
      displayModel = resolved.model
      if (resolved.reasoningEffort) {
        displayModel = `${displayModel} (${resolved.reasoningEffort})`
      }
    }
    return { name, model: displayModel, baseUrl, isLocal }
@@ -153,9 +152,7 @@ function detectProvider(): { name: string; model: string; baseUrl: string; isLoc
  const settings = getSettings_DEPRECATED() || {}
  const modelSetting = settings.model || process.env.ANTHROPIC_MODEL || process.env.CLAUDE_MODEL || 'claude-sonnet-4-6'
  const resolvedModel = parseUserSpecifiedModel(modelSetting)
-  const baseUrl = process.env.ANTHROPIC_BASE_URL ?? 'https://api.anthropic.com'
+  return { name: 'Anthropic', model: resolvedModel, baseUrl: 'https://api.anthropic.com', isLocal: false }
  const isLocal = isLocalProviderUrl(baseUrl)
  return { name: 'Anthropic', model: resolvedModel, baseUrl, isLocal }
 }
 // ─── Box drawing ──────────────────────────────────────────────────────────────
--- a/src/components/TextInput.test.tsx
+++ b/src/components/TextInput.test.tsx
@@ -6,7 +6,6 @@ import stripAnsi from 'strip-ansi'
 import { createRoot } from '../ink.js'
 import { AppStateProvider } from '../state/AppState.js'
 import { maskTextWithVisibleEdges } from '../utils/Cursor.js'
 import TextInput from './TextInput.js'
 import VimTextInput from './VimTextInput.js'
@@ -200,13 +199,6 @@ test('TextInput renders typed characters before delayed parent value commits', a
  expect(output).not.toContain('Type here...')
 })
 test('maskTextWithVisibleEdges preserves only the first and last three chars', () => {
  expect(maskTextWithVisibleEdges('sk-secret-12345678', '*')).toBe(
    'sk-************678',
  )
  expect(maskTextWithVisibleEdges('abcdef', '*')).toBe('******')
 })
 test('VimTextInput preserves rapid typed characters before delayed parent value commits', async () => {
  const { stdout, stdin, getOutput } = createTestStreams()
  const root = await createRoot({
--- a/src/components/design-system/ThemeProvider.tsx
+++ b/src/components/design-system/ThemeProvider.tsx
@@ -1,4 +1,3 @@
 import { c as _c } from "react-compiler-runtime";
 import { feature } from 'bun:bundle';
 import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import useStdin from '../../ink/hooks/use-stdin.js';
@@ -120,21 +119,8 @@ export function ThemeProvider({
 * accepts any ThemeSetting (including 'auto').
 */
 export function useTheme() {
-  const $ = _c(3);
+  const { currentTheme, setThemeSetting } = useContext(ThemeContext);
-  const {
+  return [currentTheme, setThemeSetting] as const;
    currentTheme,
    setThemeSetting
  } = useContext(ThemeContext);
  let t0;
  if ($[0] !== currentTheme || $[1] !== setThemeSetting) {
    t0 = [currentTheme, setThemeSetting];
    $[0] = currentTheme;
    $[1] = setThemeSetting;
    $[2] = t0;
  } else {
    t0 = $[2];
  }
  return t0;
 }
 /**
@@ -145,25 +131,10 @@ export function useThemeSetting() {
  return useContext(ThemeContext).themeSetting;
 }
 export function usePreviewTheme() {
-  const $ = _c(4);
+  const { setPreviewTheme, savePreview, cancelPreview } = useContext(ThemeContext);
-  const {
+  return {
    setPreviewTheme,
    savePreview,
-    cancelPreview
+    cancelPreview,
-  } = useContext(ThemeContext);
+  };
  let t0;
  if ($[0] !== cancelPreview || $[1] !== savePreview || $[2] !== setPreviewTheme) {
    t0 = {
      setPreviewTheme,
      savePreview,
      cancelPreview
    };
    $[0] = cancelPreview;
    $[1] = savePreview;
    $[2] = setPreviewTheme;
    $[3] = t0;
  } else {
    t0 = $[3];
  }
  return t0;
 }
--- a/src/components/memory/MemoryFileSelector.tsx
+++ b/src/components/memory/MemoryFileSelector.tsx
@@ -2,7 +2,7 @@ import { c as _c } from "react-compiler-runtime";
 import { feature } from 'bun:bundle';
 import chalk from 'chalk';
 import { mkdir } from 'fs/promises';
-import { basename, join } from 'path';
+import { join } from 'path';
 import * as React from 'react';
 import { use, useEffect, useState } from 'react';
 import { getOriginalCwd } from '../../bootstrap/state.js';
@@ -24,7 +24,6 @@ import { projectIsInGitRepo } from '../../utils/memory/versions.js';
 import { updateSettingsForSource } from '../../utils/settings/settings.js';
 import { Select } from '../CustomSelect/index.js';
 import { ListItem } from '../design-system/ListItem.js';
 import { getProjectMemoryPathForSelector } from './memoryFileSelectorPaths.js';
 /* eslint-disable @typescript-eslint/no-require-imports */
 const teamMemPaths = feature('TEAMMEM') ? require('../../memdir/teamMemPaths.js') as typeof import('../../memdir/teamMemPaths.js') : null;
@@ -49,10 +48,8 @@ export function MemoryFileSelector(t0) {
    onCancel
  } = t0;
  const existingMemoryFiles = use(getMemoryFiles());
  const originalCwd = getOriginalCwd();
  const userMemoryPath = join(getClaudeConfigHomeDir(), "CLAUDE.md");
-  const projectMemoryPath = getProjectMemoryPathForSelector(existingMemoryFiles, originalCwd);
+  const projectMemoryPath = join(getOriginalCwd(), "CLAUDE.md");
  const projectMemoryFileName = basename(projectMemoryPath);
  const hasUserMemory = existingMemoryFiles.some(f => f.path === userMemoryPath);
  const hasProjectMemory = existingMemoryFiles.some(f_0 => f_0.path === projectMemoryPath);
  const allMemoryFiles = [...existingMemoryFiles.filter(_temp).map(_temp2), ...(hasUserMemory ? [] : [{
@@ -88,12 +85,12 @@ export function MemoryFileSelector(t0) {
      }
    }
    let description;
-    const isGit = projectIsInGitRepo(originalCwd);
+    const isGit = projectIsInGitRepo(getOriginalCwd());
    if (file.type === "User" && !file.isNested) {
      description = "Saved in ~/.claude/CLAUDE.md";
    } else {
      if (file.type === "Project" && !file.isNested && file.path === projectMemoryPath) {
-        description = `${isGit ? "Checked in at" : "Saved in"} ./${projectMemoryFileName}`;
+        description = `${isGit ? "Checked in at" : "Saved in"} ./CLAUDE.md`;
      } else {
        if (file.parent) {
          description = "@-imported";
--- a/src/components/memory/memoryFileSelectorPaths.test.ts
+++ b/src/components/memory/memoryFileSelectorPaths.test.ts
@@ -1,69 +0,0 @@
 import { describe, expect, test } from 'bun:test'
 import { join } from 'node:path'
 import type { MemoryFileInfo } from '../../utils/claudemd.js'
 import { getProjectMemoryPathForSelector } from './memoryFileSelectorPaths.js'
 function projectFile(path: string): MemoryFileInfo {
  return {
    path,
    type: 'Project',
    content: '',
  }
 }
 describe('getProjectMemoryPathForSelector', () => {
  test('uses the loaded repo-level AGENTS.md from a nested cwd', () => {
    const repoDir = '/repo'
    const nestedDir = join(repoDir, 'packages', 'app')
    expect(
      getProjectMemoryPathForSelector(
        [projectFile(join(repoDir, 'AGENTS.md'))],
        nestedDir,
      ),
    ).toBe(join(repoDir, 'AGENTS.md'))
  })
  test('uses the loaded repo-level CLAUDE.md fallback from a nested cwd', () => {
    const repoDir = '/repo'
    const nestedDir = join(repoDir, 'packages', 'app')
    expect(
      getProjectMemoryPathForSelector(
        [projectFile(join(repoDir, 'CLAUDE.md'))],
        nestedDir,
      ),
    ).toBe(join(repoDir, 'CLAUDE.md'))
  })
  test('prefers the closest loaded ancestor instruction file', () => {
    const repoDir = '/repo'
    const nestedProjectDir = join(repoDir, 'packages', 'app')
    expect(
      getProjectMemoryPathForSelector(
        [
          projectFile(join(repoDir, 'AGENTS.md')),
          projectFile(join(nestedProjectDir, 'CLAUDE.md')),
        ],
        join(nestedProjectDir, 'src'),
      ),
    ).toBe(join(nestedProjectDir, 'CLAUDE.md'))
  })
  test('defaults to a new AGENTS.md in the current cwd when no project file is loaded', () => {
    expect(getProjectMemoryPathForSelector([], '/repo/packages/app')).toBe(
      '/repo/packages/app/AGENTS.md',
    )
  })
  test('ignores loaded project instruction files outside the current cwd ancestry', () => {
    expect(
      getProjectMemoryPathForSelector(
        [projectFile('/other-worktree/AGENTS.md')],
        '/repo/packages/app',
      ),
    ).toBe('/repo/packages/app/AGENTS.md')
  })
 })
--- a/src/components/memory/memoryFileSelectorPaths.ts
+++ b/src/components/memory/memoryFileSelectorPaths.ts
@@ -1,34 +0,0 @@
 import { basename, join } from 'path'
 import type { MemoryFileInfo } from '../../utils/claudemd.js'
 import {
  findProjectInstructionFilePathInAncestors,
  isProjectInstructionFileName,
  PRIMARY_PROJECT_INSTRUCTION_FILE,
 } from '../../utils/projectInstructions.js'
 function isLoadedProjectInstructionFile(file: MemoryFileInfo): boolean {
  return (
    file.type === 'Project' &&
    file.parent === undefined &&
    isProjectInstructionFileName(basename(file.path))
  )
 }
 export function getProjectMemoryPathForSelector(
  existingMemoryFiles: MemoryFileInfo[],
  cwd: string,
 ): string {
  const loadedProjectInstructionPaths = new Set(
    existingMemoryFiles
      .filter(isLoadedProjectInstructionFile)
      .map(file => file.path),
  )
  return (
    findProjectInstructionFilePathInAncestors(
      cwd,
      path => loadedProjectInstructionPaths.has(path),
    ) ?? join(cwd, PRIMARY_PROJECT_INSTRUCTION_FILE)
  )
 }
--- a/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx
+++ b/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx
@@ -1,173 +0,0 @@
 import React from 'react'
 import { getOriginalCwd } from '../../../bootstrap/state.js'
 import { Box, Text } from '../../../ink.js'
 import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
 import { env } from '../../../utils/env.js'
 import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
 import { usePermissionRequestLogging } from '../hooks.js'
 import { PermissionDialog } from '../PermissionDialog.js'
 import {
  PermissionPrompt,
  type PermissionPromptOption,
 } from '../PermissionPrompt.js'
 import type { PermissionRequestProps } from '../PermissionRequest.js'
 import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
 import { logUnaryPermissionEvent } from '../utils.js'
 type OptionValue = 'yes' | 'yes-dont-ask-again' | 'no'
 export function MonitorPermissionRequest({
  toolUseConfirm,
  onDone,
  onReject,
  workerBadge,
 }: PermissionRequestProps) {
  const { command, description } = toolUseConfirm.input as {
    command?: string
    description?: string
  }
  usePermissionRequestLogging(toolUseConfirm, {
    completion_type: 'tool_use_single',
    language_name: 'none',
  })
  const handleSelect = (
    value: OptionValue,
    feedback?: string,
  ) => {
    switch (value) {
      case 'yes': {
        logUnaryPermissionEvent({
          completion_type: 'tool_use_single',
          event: 'accept',
          metadata: {
            language_name: 'none',
            message_id: toolUseConfirm.assistantMessage.message.id,
            platform: env.platform,
          },
        })
        toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback)
        onDone()
        break
      }
      case 'yes-dont-ask-again': {
        logUnaryPermissionEvent({
          completion_type: 'tool_use_single',
          event: 'accept',
          metadata: {
            language_name: 'none',
            message_id: toolUseConfirm.assistantMessage.message.id,
            platform: env.platform,
          },
        })
        // Save the rule under 'Bash' toolName because checkPermissions
        // delegates to bashToolHasPermission which matches rules against
        // BashTool. Using 'Monitor' here would create a rule that's never
        // checked. Command-specific prefix (like BashTool's shellRuleMatching).
        const cmdForRule = command?.trim() || ''
        const prefix = cmdForRule.split(/\s+/).slice(0, 2).join(' ')
        toolUseConfirm.onAllow(toolUseConfirm.input, prefix ? [
          {
            type: 'addRules',
            rules: [{ toolName: 'Bash', ruleContent: `${prefix}:*` }],
            behavior: 'allow',
            destination: 'localSettings',
          },
        ] : [])
        onDone()
        break
      }
      case 'no': {
        logUnaryPermissionEvent({
          completion_type: 'tool_use_single',
          event: 'reject',
          metadata: {
            language_name: 'none',
            message_id: toolUseConfirm.assistantMessage.message.id,
            platform: env.platform,
          },
        })
        toolUseConfirm.onReject(feedback)
        onReject()
        onDone()
        break
      }
    }
  }
  const handleCancel = () => {
    logUnaryPermissionEvent({
      completion_type: 'tool_use_single',
      event: 'reject',
      metadata: {
        language_name: 'none',
        message_id: toolUseConfirm.assistantMessage.message.id,
        platform: env.platform,
      },
    })
    toolUseConfirm.onReject()
    onReject()
    onDone()
  }
  const showAlwaysAllow = shouldShowAlwaysAllowOptions()
  const originalCwd = getOriginalCwd()
  const options: PermissionPromptOption<OptionValue>[] = [
    {
      label: 'Yes',
      value: 'yes',
      feedbackConfig: { type: 'accept' },
    },
  ]
  if (showAlwaysAllow) {
    options.push({
      label: (
        <Text>
          Yes, and don&apos;t ask again for{' '}
          <Text bold>Monitor</Text> commands in{' '}
          <Text bold>{originalCwd}</Text>
        </Text>
      ),
      value: 'yes-dont-ask-again',
    })
  }
  options.push({
    label: 'No',
    value: 'no',
    feedbackConfig: { type: 'reject' },
  })
  const toolAnalyticsContext = {
    toolName: sanitizeToolNameForAnalytics(toolUseConfirm.tool.name),
    isMcp: toolUseConfirm.tool.isMcp ?? false,
  }
  return (
    <PermissionDialog title="Monitor" workerBadge={workerBadge}>
      <Box flexDirection="column" paddingX={2} paddingY={1}>
        <Text>
          Monitor({command ?? ''})
        </Text>
        {description ? (
          <Text dimColor>{description}</Text>
        ) : null}
      </Box>
      <Box flexDirection="column">
        <PermissionRuleExplanation
          permissionResult={toolUseConfirm.permissionResult}
          toolType="tool"
        />
        <PermissionPrompt
          options={options}
          onSelect={handleSelect}
          onCancel={handleCancel}
          toolAnalyticsContext={toolAnalyticsContext}
        />
      </Box>
    </PermissionDialog>
  )
 }
--- a/src/components/useCodexOAuthFlow.test.tsx
+++ b/src/components/useCodexOAuthFlow.test.tsx
@@ -1,220 +0,0 @@
 import { PassThrough } from 'node:stream'
 import { afterEach, expect, mock, test } from 'bun:test'
 import React from 'react'
 import { createRoot, Text } from '../ink.js'
 const SYNC_START = '\x1B[?2026h'
 const SYNC_END = '\x1B[?2026l'
 function createTestStreams(): {
  stdout: PassThrough
  stdin: PassThrough & {
    isTTY: boolean
    setRawMode: (mode: boolean) => void
    ref: () => void
    unref: () => void
  }
  getOutput: () => string
 } {
  let output = ''
  const stdout = new PassThrough()
  const stdin = new PassThrough() as PassThrough & {
    isTTY: boolean
    setRawMode: (mode: boolean) => void
    ref: () => void
    unref: () => void
  }
  stdin.isTTY = true
  stdin.setRawMode = () => {}
  stdin.ref = () => {}
  stdin.unref = () => {}
  ;(stdout as unknown as { columns: number }).columns = 120
  stdout.on('data', chunk => {
    output += chunk.toString()
  })
  return {
    stdout,
    stdin,
    getOutput: () => output,
  }
 }
 async function waitForCondition(
  predicate: () => boolean,
  options?: { timeoutMs?: number; intervalMs?: number },
 ): Promise<void> {
  const timeoutMs = options?.timeoutMs ?? 5000
  const intervalMs = options?.intervalMs ?? 10
  const startedAt = Date.now()
  while (Date.now() - startedAt < timeoutMs) {
    if (predicate()) {
      return
    }
    await Bun.sleep(intervalMs)
  }
  throw new Error('Timed out waiting for useCodexOAuthFlow test condition')
 }
 function extractLastFrame(output: string): string {
  let lastFrame: string | null = null
  let cursor = 0
  while (cursor < output.length) {
    const start = output.indexOf(SYNC_START, cursor)
    if (start === -1) break
    const contentStart = start + SYNC_START.length
    const end = output.indexOf(SYNC_END, contentStart)
    if (end === -1) break
    const frame = output.slice(contentStart, end)
    if (frame.trim().length > 0) {
      lastFrame = frame
    }
    cursor = end + SYNC_END.length
  }
  return lastFrame ?? output
 }
 const TOKENS = {
  accessToken: 'oauth-access-token',
  refreshToken: 'oauth-refresh-token',
  accountId: 'acct_oauth',
  idToken: 'oauth-id-token',
  apiKey: 'oauth-api-key',
 }
 afterEach(() => {
  mock.restore()
 })
 test('does not persist credentials when downstream setup rejects', async () => {
  const saveCodexCredentials = mock(() => ({ success: true }))
  const cleanup = mock(() => {})
  const onAuthenticated = mock(async () => {
    throw new Error('profile save failed')
  })
  const deps = {
    createOAuthService: () => ({
      async startOAuthFlow(
        onAuthorizationUrl: (authUrl: string) => void | Promise<void>,
      ) {
        await onAuthorizationUrl('https://chatgpt.com/codex')
        return TOKENS
      },
      cleanup,
    }),
    openBrowser: async () => true,
    saveCodexCredentials,
    isBareMode: () => false,
  }
  const { useCodexOAuthFlow } = await import(
    `./useCodexOAuthFlow.js?real-reject-${Date.now()}-${Math.random()}`
  )
  function Harness(): React.ReactNode {
    const handleAuthenticated = React.useCallback(onAuthenticated, [onAuthenticated])
    const status = useCodexOAuthFlow({
      onAuthenticated: handleAuthenticated,
      deps,
    })
    return <Text>{status.state === 'error' ? status.message : status.state}</Text>
  }
  const streams = createTestStreams()
  const root = await createRoot({
    stdout: streams.stdout as unknown as NodeJS.WriteStream,
    stdin: streams.stdin as unknown as NodeJS.ReadStream,
    patchConsole: false,
  })
  root.render(<Harness />)
  try {
    await waitForCondition(() => onAuthenticated.mock.calls.length === 1)
    await Bun.sleep(0)
    await Bun.sleep(0)
    expect(onAuthenticated).toHaveBeenCalled()
    expect(saveCodexCredentials).not.toHaveBeenCalled()
  } finally {
    root.unmount()
    streams.stdin.end()
    streams.stdout.end()
    await Bun.sleep(0)
  }
 })
 test('persists credentials with profile linkage after downstream setup succeeds', async () => {
  const saveCodexCredentials = mock(() => ({ success: true }))
  const onAuthenticated = mock(
    async (
      _tokens: typeof TOKENS,
      persistCredentials: (options?: { profileId?: string }) => void,
    ) => {
      persistCredentials({ profileId: 'profile_codex_oauth' })
    },
  )
  const cleanup = mock(() => {})
  const deps = {
    createOAuthService: () => ({
      async startOAuthFlow(
        onAuthorizationUrl: (authUrl: string) => void | Promise<void>,
      ) {
        await onAuthorizationUrl('https://chatgpt.com/codex')
        return TOKENS
      },
      cleanup,
    }),
    openBrowser: async () => true,
    saveCodexCredentials,
    isBareMode: () => false,
  }
  const { useCodexOAuthFlow } = await import(
    `./useCodexOAuthFlow.js?real-persist-${Date.now()}-${Math.random()}`
  )
  function Harness(): React.ReactNode {
    const handleAuthenticated = React.useCallback(onAuthenticated, [onAuthenticated])
    useCodexOAuthFlow({
      onAuthenticated: handleAuthenticated,
      deps,
    })
    return <Text>waiting</Text>
  }
  const streams = createTestStreams()
  const root = await createRoot({
    stdout: streams.stdout as unknown as NodeJS.WriteStream,
    stdin: streams.stdin as unknown as NodeJS.ReadStream,
    patchConsole: false,
  })
  root.render(<Harness />)
  try {
    await waitForCondition(() => onAuthenticated.mock.calls.length === 1)
    await waitForCondition(() => saveCodexCredentials.mock.calls.length === 1)
    expect(onAuthenticated).toHaveBeenCalled()
    expect(saveCodexCredentials).toHaveBeenCalledWith({
      apiKey: TOKENS.apiKey,
      accessToken: TOKENS.accessToken,
      refreshToken: TOKENS.refreshToken,
      idToken: TOKENS.idToken,
      accountId: TOKENS.accountId,
      profileId: 'profile_codex_oauth',
    })
  } finally {
    root.unmount()
    streams.stdin.end()
    streams.stdout.end()
    await Bun.sleep(0)
  }
 })
--- a/src/components/useCodexOAuthFlow.ts
+++ b/src/components/useCodexOAuthFlow.ts
@@ -1,134 +0,0 @@
 import * as React from 'react'
 import {
  CodexOAuthService,
  type CodexOAuthTokens,
 } from '../services/api/codexOAuth.js'
 import { openBrowser } from '../utils/browser.js'
 import { saveCodexCredentials } from '../utils/codexCredentials.js'
 import { isBareMode } from '../utils/envUtils.js'
 export type CodexOAuthFlowStatus =
  | { state: 'starting' }
  | {
      state: 'waiting'
      authUrl: string
      browserOpened: boolean | null
    }
  | {
      state: 'error'
      message: string
    }
 type PersistCodexOAuthCredentials = (options?: {
  profileId?: string
 }) => void
 type CodexOAuthFlowDependencies = {
  createOAuthService?: () => Pick<
    CodexOAuthService,
    'startOAuthFlow' | 'cleanup'
  >
  openBrowser?: typeof openBrowser
  saveCodexCredentials?: typeof saveCodexCredentials
  isBareMode?: typeof isBareMode
 }
 function createDefaultOAuthService(): Pick<
  CodexOAuthService,
  'startOAuthFlow' | 'cleanup'
 > {
  return new CodexOAuthService()
 }
 export function useCodexOAuthFlow(options: {
  onAuthenticated: (
    tokens: CodexOAuthTokens,
    persistCredentials: PersistCodexOAuthCredentials,
  ) => void | Promise<void>
  deps?: CodexOAuthFlowDependencies
 }): CodexOAuthFlowStatus {
  const { onAuthenticated } = options
  const createOAuthService =
    options.deps?.createOAuthService ?? createDefaultOAuthService
  const openBrowserFn = options.deps?.openBrowser ?? openBrowser
  const saveCredentials =
    options.deps?.saveCodexCredentials ?? saveCodexCredentials
  const isBareModeFn = options.deps?.isBareMode ?? isBareMode
  const [status, setStatus] = React.useState<CodexOAuthFlowStatus>({
    state: 'starting',
  })
  React.useEffect(() => {
    if (isBareModeFn()) {
      setStatus({
        state: 'error',
        message:
          'Codex OAuth is unavailable in --bare because secure storage is disabled.',
      })
      return
    }
    let cancelled = false
    const oauthService = createOAuthService()
    void oauthService
      .startOAuthFlow(async authUrl => {
        if (cancelled) return
        setStatus({
          state: 'waiting',
          authUrl,
          browserOpened: null,
        })
        const browserOpened = await openBrowserFn(authUrl)
        if (cancelled) return
        setStatus({
          state: 'waiting',
          authUrl,
          browserOpened,
        })
      })
      .then(async tokens => {
        if (cancelled) return
        const persistCredentials: PersistCodexOAuthCredentials = options => {
          const saved = saveCredentials({
            apiKey: tokens.apiKey,
            accessToken: tokens.accessToken,
            refreshToken: tokens.refreshToken,
            idToken: tokens.idToken,
            accountId: tokens.accountId,
            profileId: options?.profileId,
          })
          if (!saved.success) {
            throw new Error(
              saved.warning ??
                'Codex OAuth succeeded, but credentials could not be saved securely.',
            )
          }
        }
        await onAuthenticated(tokens, persistCredentials)
      })
      .catch(error => {
        if (cancelled) return
        setStatus({
          state: 'error',
          message: error instanceof Error ? error.message : String(error),
        })
      })
    return () => {
      cancelled = true
      oauthService.cleanup()
    }
  }, [
    createOAuthService,
    isBareModeFn,
    onAuthenticated,
    openBrowserFn,
    saveCredentials,
  ])
  return status
 }
--- a/src/constants/promptIdentity.test.ts
+++ b/src/constants/promptIdentity.test.ts
@@ -1,16 +1,5 @@
 import { afterEach, expect, test } from 'bun:test'
 // MACRO is replaced at build time by Bun.define but not in test mode.
 // Define it globally so tests that import modules using MACRO don't crash.
 ;(globalThis as Record<string, unknown>).MACRO = {
  VERSION: '99.0.0',
  DISPLAY_VERSION: '0.0.0-test',
  BUILD_TIME: new Date().toISOString(),
  ISSUES_EXPLAINER: 'report the issue at https://github.com/anthropics/claude-code/issues',
  PACKAGE_URL: '@gitlawb/openclaude',
  NATIVE_PACKAGE_URL: undefined,
 }
 import { getSystemPrompt, DEFAULT_AGENT_PROMPT } from './prompts.js'
 import { CLI_SYSPROMPT_PREFIXES, getCLISyspromptPrefix } from './system.js'
 import { CLAUDE_CODE_GUIDE_AGENT } from '../tools/AgentTool/built-in/claudeCodeGuideAgent.js'
--- a/src/constants/tools.ts
+++ b/src/constants/tools.ts
@@ -37,6 +37,8 @@ export const ALL_AGENT_DISALLOWED_TOOLS = new Set([
  TASK_OUTPUT_TOOL_NAME,
  EXIT_PLAN_MODE_V2_TOOL_NAME,
  ENTER_PLAN_MODE_TOOL_NAME,
  // Allow Agent tool for agents when user is ant (enables nested agents)
  ...(process.env.USER_TYPE === 'ant' ? [] : [AGENT_TOOL_NAME]),
  ASK_USER_QUESTION_TOOL_NAME,
  TASK_STOP_TOOL_NAME,
  // Prevent recursive workflow execution inside subagents.
@@ -80,9 +82,9 @@ export const IN_PROCESS_TEAMMATE_ALLOWED_TOOLS = new Set([
  SEND_MESSAGE_TOOL_NAME,
  // Teammate-created crons are tagged with the creating agentId and routed to
  // that teammate's pendingUserMessages queue (see useScheduledTasks.ts).
-  CRON_CREATE_TOOL_NAME,
+  ...(feature('AGENT_TRIGGERS')
-  CRON_DELETE_TOOL_NAME,
+    ? [CRON_CREATE_TOOL_NAME, CRON_DELETE_TOOL_NAME, CRON_LIST_TOOL_NAME]
-  CRON_LIST_TOOL_NAME,
+    : []),
 ])
 /*
--- a/src/coordinator/workerAgent.ts
+++ b/src/coordinator/workerAgent.ts
@@ -1,18 +0,0 @@
 import type { BuiltInAgentDefinition } from '../tools/AgentTool/loadAgentsDir.js'
 import { EXPLORE_AGENT } from '../tools/AgentTool/built-in/exploreAgent.js'
 import { GENERAL_PURPOSE_AGENT } from '../tools/AgentTool/built-in/generalPurposeAgent.js'
 import { PLAN_AGENT } from '../tools/AgentTool/built-in/planAgent.js'
 // The coordinator system prompt instructs the model to spawn workers with
 // subagent_type: "worker". This agent definition matches that type so
 // AgentTool.tsx can resolve it. It reuses GENERAL_PURPOSE_AGENT's capabilities.
 const WORKER_AGENT: BuiltInAgentDefinition = {
  ...GENERAL_PURPOSE_AGENT,
  agentType: 'worker',
  whenToUse:
    'Worker agent for coordinator mode. Executes tasks autonomously — research, implementation, or verification.',
 }
 export function getCoordinatorAgents(): BuiltInAgentDefinition[] {
  return [WORKER_AGENT, GENERAL_PURPOSE_AGENT, EXPLORE_AGENT, PLAN_AGENT]
 }
--- a/src/entrypoints/cli.tsx
+++ b/src/entrypoints/cli.tsx
@@ -5,7 +5,7 @@ import {
 } from '../utils/providerProfile.js'
 import {
  getProviderValidationError,
-  validateProviderEnvForStartupOrExit,
+  validateProviderEnvOrExit,
 } from '../utils/providerValidation.js'
 // OpenClaude: polyfill globalThis.File for Node < 20.
@@ -132,7 +132,7 @@ async function main(): Promise<void> {
    hydrateGithubModelsTokenFromSecureStorage()
  }
-  await validateProviderEnvForStartupOrExit()
+  await validateProviderEnvOrExit()
  // Print the gradient startup screen before the Ink UI loads
  const { printStartupScreen } = await import('../components/StartupScreen.js')
--- a/src/entrypoints/mcp.test.ts
+++ b/src/entrypoints/mcp.test.ts
@@ -1,75 +0,0 @@
 import { describe, it, expect, mock } from 'bun:test'
 import { getCombinedTools, loadReexposedMcpTools } from './mcp.js'
 import type { Tool as InternalTool } from '../Tool.js'
 import type { MCPServerConnection } from '../services/mcp/types.js'
 import type { Tool } from '@modelcontextprotocol/sdk/types.js'
 // Mock the MCP client service to control the tools and connections returned
 const mockGetMcpToolsCommandsAndResources = mock(async (onConnectionAttempt: any) => {})
 mock.module('../services/mcp/client.js', () => ({
  getMcpToolsCommandsAndResources: mockGetMcpToolsCommandsAndResources
 }))
 describe('getCombinedTools', () => {
  it('deduplicates builtins when mcpTools have the same name, prioritizing mcpTools', () => {
    const builtinBash = { name: 'Bash', isMcp: false } as unknown as InternalTool
    const builtinRead = { name: 'Read', isMcp: false } as unknown as InternalTool
    const mcpBash = { name: 'Bash', isMcp: true } as unknown as InternalTool
    const builtins = [builtinBash, builtinRead]
    const mcpTools = [mcpBash]
    const result = getCombinedTools(builtins, mcpTools)
    expect(result).toHaveLength(2)
    expect(result[0]).toBe(mcpBash)
    expect(result[1]).toBe(builtinRead)
  })
 })
 describe('loadReexposedMcpTools', () => {
  it('loads tools and clients regardless of connection state (including needs-auth)', async () => {
    // Setup the mock to simulate yielding a needs-auth server and a connected server
    mockGetMcpToolsCommandsAndResources.mockImplementation(async (onConnectionAttempt) => {
      const needsAuthClient = {
        name: 'auth-server',
        type: 'needs-auth',
        config: {}
      } as MCPServerConnection
      const authTool = {
        name: 'mcp__auth-server__authenticate',
        isMcp: true
      } as unknown as InternalTool
      const connectedClient = {
        name: 'connected-server',
        type: 'connected',
        config: {},
        client: {}
      } as MCPServerConnection
      const connectedTool = {
        name: 'mcp__connected-server__do_thing',
        isMcp: true
      } as unknown as InternalTool
      // Simulate the callback behavior
      onConnectionAttempt({ client: needsAuthClient, tools: [authTool], commands: [] })
      onConnectionAttempt({ client: connectedClient, tools: [connectedTool], commands: [] })
    })
    const { mcpClients, mcpTools } = await loadReexposedMcpTools()
    expect(mcpClients).toHaveLength(2)
    expect(mcpClients[0].type).toBe('needs-auth')
    expect(mcpClients[1].type).toBe('connected')
    expect(mcpTools).toHaveLength(2)
    expect(mcpTools[0].name).toBe('mcp__auth-server__authenticate')
    expect(mcpTools[1].name).toBe('mcp__connected-server__do_thing')
    // Reset mock for other tests
    mockGetMcpToolsCommandsAndResources.mockReset()
  })
 })
--- a/src/entrypoints/mcp.ts
+++ b/src/entrypoints/mcp.ts
@@ -7,7 +7,6 @@ process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS ??= 'true'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { ZodError } from 'zod'
 import {
  CallToolRequestSchema,
  type CallToolResult,
@@ -18,12 +17,9 @@ import {
 import { getDefaultAppState } from 'src/state/AppStateStore.js'
 import review from '../commands/review.js'
 import type { Command } from '../commands.js'
 import { getMcpToolsCommandsAndResources } from '../services/mcp/client.js'
 import type { MCPServerConnection } from '../services/mcp/types.js'
 import {
  findToolByName,
  getEmptyToolPermissionContext,
  type Tool as InternalTool,
  type ToolUseContext,
 } from '../Tool.js'
 import { getTools } from '../tools.js'
@@ -43,32 +39,6 @@ type ToolOutput = Tool['outputSchema']
 const MCP_COMMANDS: Command[] = [review]
 export function getCombinedTools(
  builtins: InternalTool[],
  mcpTools: InternalTool[],
 ): InternalTool[] {
  const mcpToolNames = new Set(mcpTools.map(t => t.name))
  const deduplicatedBuiltins = builtins.filter(t => !mcpToolNames.has(t.name))
  return [...mcpTools, ...deduplicatedBuiltins]
 }
 export async function loadReexposedMcpTools(): Promise<{
  mcpClients: MCPServerConnection[]
  mcpTools: InternalTool[]
 }> {
  const mcpClients: MCPServerConnection[] = []
  const mcpTools: InternalTool[] = []
  // Load configured MCP clients and their tools
  await getMcpToolsCommandsAndResources(({ client, tools: clientTools }) => {
    mcpClients.push(client)
    mcpTools.push(...clientTools)
  })
  return { mcpClients, mcpTools }
 }
 export async function startMCPServer(
  cwd: string,
  debug: boolean,
@@ -93,13 +63,12 @@ export async function startMCPServer(
    },
  )
  const { mcpClients, mcpTools } = await loadReexposedMcpTools()
  server.setRequestHandler(
    ListToolsRequestSchema,
    async (): Promise<ListToolsResult> => {
      // TODO: Also re-expose any MCP tools
      const toolPermissionContext = getEmptyToolPermissionContext()
-      const tools = getCombinedTools(getTools(toolPermissionContext), mcpTools)
+      const tools = getTools(toolPermissionContext)
      return {
        tools: await Promise.all(
          tools.map(async tool => {
@@ -125,7 +94,7 @@ export async function startMCPServer(
                tools,
                agents: [],
              }),
-              inputSchema: (tool.inputJSONSchema ?? zodToJsonSchema(tool.inputSchema)) as ToolInput,
+              inputSchema: zodToJsonSchema(tool.inputSchema) as ToolInput,
              outputSchema,
            }
          }),
@@ -138,7 +107,8 @@ export async function startMCPServer(
    CallToolRequestSchema,
    async ({ params: { name, arguments: args } }): Promise<CallToolResult> => {
      const toolPermissionContext = getEmptyToolPermissionContext()
-      const tools = getCombinedTools(getTools(toolPermissionContext), mcpTools)
+      // TODO: Also re-expose any MCP tools
      const tools = getTools(toolPermissionContext)
      const tool = findToolByName(tools, name)
      if (!tool) {
        throw new Error(`Tool ${name} not found`)
@@ -153,7 +123,7 @@ export async function startMCPServer(
          tools,
          mainLoopModel: getMainLoopModel(),
          thinkingConfig: { type: 'disabled' },
-          mcpClients,
+          mcpClients: [],
          mcpResources: {},
          isNonInteractiveSession: true,
          debug,
@@ -170,16 +140,13 @@ export async function startMCPServer(
        updateAttributionState: () => {},
      }
      // TODO: validate input types with zod
      try {
        if (!tool.isEnabled()) {
          throw new Error(`Tool ${name} is not enabled`)
        }
        // Validate input types with zod
        const parsedArgs = tool.inputSchema.parse(args ?? {})
        const validationResult = await tool.validateInput?.(
-          (parsedArgs as never) ?? {},
+          (args as never) ?? {},
          toolUseContext,
        )
        if (validationResult && !validationResult.result) {
@@ -188,7 +155,7 @@ export async function startMCPServer(
          )
        }
        const finalResult = await tool.call(
-          (parsedArgs ?? {}) as never,
+          (args ?? {}) as never,
          toolUseContext,
          hasPermissionsToUseTool,
          createAssistantMessage({
@@ -196,50 +163,20 @@ export async function startMCPServer(
          }),
        )
        let content: CallToolResult['content']
        const data = finalResult.data as string | { type: string; text?: string; source?: { type: string; media_type: string; data: string } }[] | unknown
        if (typeof data === 'string') {
          content = [{ type: 'text', text: data }]
        } else if (Array.isArray(data)) {
          content = data.map((block: any) => {
            if (block.type === 'text') {
              return { type: 'text', text: block.text || '' }
            } else if (block.type === 'image' && block.source) {
              return {
                type: 'image',
                data: block.source.data,
                mimeType: block.source.media_type,
              }
            } else {
              // eslint-disable-next-line custom-rules/no-top-level-side-effects, no-console
              console.warn(`Unmapped content block type from tool ${name}: ${block.type || 'unknown'}`)
              return { type: 'text', text: jsonStringify(block) }
            }
          }) as CallToolResult['content']
        } else {
          content = [{ type: 'text', text: jsonStringify(data) }]
        }
        return {
-          content,
+          content: [
-          isError: !!(finalResult as any).isError,
+            {
              type: 'text' as const,
              text:
                typeof finalResult === 'string'
                  ? finalResult
                  : jsonStringify(finalResult.data),
            },
          ],
        }
      } catch (error) {
        logError(error)
        if (error instanceof ZodError) {
          return {
            isError: true,
            content: [
              {
                type: 'text',
                text: `Tool ${name} input is invalid:\n${error.errors.map(e => `- ${e.path.join('.')}: ${e.message}`).join('\n')}`,
              },
            ],
          }
        }
        const parts =
          error instanceof Error ? getErrorParts(error) : [String(error)]
        const errorText = parts.filter(Boolean).join('\n').trim() || 'Error'
@@ -264,4 +201,3 @@ export async function startMCPServer(
  return await runServer()
 }
--- a/src/entrypoints/sandboxTypes.ts
+++ b/src/entrypoints/sandboxTypes.ts
@@ -114,8 +114,8 @@ export const SandboxSettingsSchema = lazySchema(() =>
        .boolean()
        .optional()
        .describe(
-          'Allow trusted, user-initiated commands to run outside the sandbox. ' +
+          'Allow commands to run outside the sandbox via the dangerouslyDisableSandbox parameter. ' +
-            'When false, sandbox override requests are ignored and all commands must run sandboxed. ' +
+            'When false, the dangerouslyDisableSandbox parameter is completely ignored and all commands must run sandboxed. ' +
            'Default: true.',
        ),
      network: SandboxNetworkConfigSchema(),
--- a/src/hooks/useApiKeyVerification.test.tsx
+++ b/src/hooks/useApiKeyVerification.test.tsx
@@ -1,123 +0,0 @@
 import { PassThrough } from 'node:stream'
 import { afterEach, expect, mock, test } from 'bun:test'
 import React from 'react'
 import { createRoot, Text } from '../ink.js'
 type AuthState = {
  anthropicAuthEnabled: boolean
  claudeSubscriber: boolean
  key?: string
  source?: string
 }
 function createTestStreams(): {
  stdout: PassThrough
  stdin: PassThrough & {
    isTTY: boolean
    setRawMode: (mode: boolean) => void
    ref: () => void
    unref: () => void
  }
 } {
  const stdout = new PassThrough()
  const stdin = new PassThrough() as PassThrough & {
    isTTY: boolean
    setRawMode: (mode: boolean) => void
    ref: () => void
    unref: () => void
  }
  stdin.isTTY = true
  stdin.setRawMode = () => {}
  stdin.ref = () => {}
  stdin.unref = () => {}
  ;(stdout as unknown as { columns: number }).columns = 120
  return { stdout, stdin }
 }
 async function waitForCondition(
  predicate: () => boolean,
  timeoutMs = 2000,
 ): Promise<void> {
  const startedAt = Date.now()
  while (Date.now() - startedAt < timeoutMs) {
    if (predicate()) {
      return
    }
    await Bun.sleep(10)
  }
  throw new Error('Timed out waiting for useApiKeyVerification test state')
 }
 afterEach(() => {
  mock.restore()
 })
 test('useApiKeyVerification resets stale missing status when the session switches to a third-party provider', async () => {
  const authState: AuthState = {
    anthropicAuthEnabled: true,
    claudeSubscriber: false,
  }
  const seenStatuses: string[] = []
  mock.module('../utils/auth.js', () => ({
    getAnthropicApiKeyWithSource: () => ({
      key: authState.key,
      source: authState.source,
    }),
    getApiKeyFromApiKeyHelper: async () => undefined,
    isAnthropicAuthEnabled: () => authState.anthropicAuthEnabled,
    isClaudeAISubscriber: () => authState.claudeSubscriber,
  }))
  mock.module('../bootstrap/state.js', () => ({
    getIsNonInteractiveSession: () => false,
  }))
  mock.module('../services/api/claude.js', () => ({
    verifyApiKey: async () => true,
  }))
  // @ts-expect-error cache-busting query string for Bun module mocks
  const { useApiKeyVerification } = await import(
    './useApiKeyVerification.ts?switch-to-third-party'
  )
  function Harness(): React.ReactNode {
    const { status } = useApiKeyVerification()
    React.useEffect(() => {
      seenStatuses.push(status)
    }, [status])
    return <Text>{status}</Text>
  }
  const { stdout, stdin } = createTestStreams()
  const root = await createRoot({
    stdout: stdout as unknown as NodeJS.WriteStream,
    stdin: stdin as unknown as NodeJS.ReadStream,
    patchConsole: false,
  })
  root.render(<Harness />)
  await waitForCondition(() => seenStatuses.includes('missing'))
  authState.anthropicAuthEnabled = false
  root.render(<Harness />)
  await waitForCondition(() => seenStatuses.includes('valid'))
  root.unmount()
  stdin.end()
  stdout.end()
  await Bun.sleep(0)
  expect(seenStatuses[0]).toBe('missing')
  expect(seenStatuses).toContain('valid')
 })
--- a/src/hooks/useApiKeyVerification.ts
+++ b/src/hooks/useApiKeyVerification.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { getIsNonInteractiveSession } from '../bootstrap/state.js'
 import { verifyApiKey } from '../services/api/claude.js'
 import {
@@ -21,43 +21,24 @@ export type ApiKeyVerificationResult = {
  error: Error | null
 }
 function getInitialVerificationStatus(): VerificationStatus {
  if (!isAnthropicAuthEnabled() || isClaudeAISubscriber()) {
    return 'valid'
  }
  // Use skipRetrievingKeyFromApiKeyHelper to avoid executing apiKeyHelper
  // before trust dialog is shown (security: prevents RCE via settings.json)
  const { key, source } = getAnthropicApiKeyWithSource({
    skipRetrievingKeyFromApiKeyHelper: true,
  })
  // If apiKeyHelper is configured, we have a key source even though we
  // haven't executed it yet - return 'loading' to indicate we'll verify later
  if (key || source === 'apiKeyHelper') {
    return 'loading'
  }
  return 'missing'
 }
 export function useApiKeyVerification(): ApiKeyVerificationResult {
-  const [status, setStatus] = useState<VerificationStatus>(
+  const [status, setStatus] = useState<VerificationStatus>(() => {
-    getInitialVerificationStatus,
+    if (!isAnthropicAuthEnabled() || isClaudeAISubscriber()) {
-  )
+      return 'valid'
  const [error, setError] = useState<Error | null>(null)
  const anthropicVerificationEnabled =
    isAnthropicAuthEnabled() && !isClaudeAISubscriber()
  useEffect(() => {
    const nextStatus = anthropicVerificationEnabled
      ? getInitialVerificationStatus()
      : 'valid'
    setStatus(currentStatus =>
      currentStatus === nextStatus ? currentStatus : nextStatus,
    )
    if (nextStatus !== 'error') {
      setError(null)
    }
-  }, [anthropicVerificationEnabled])
+    // Use skipRetrievingKeyFromApiKeyHelper to avoid executing apiKeyHelper
    // before trust dialog is shown (security: prevents RCE via settings.json)
    const { key, source } = getAnthropicApiKeyWithSource({
      skipRetrievingKeyFromApiKeyHelper: true,
    })
    // If apiKeyHelper is configured, we have a key source even though we
    // haven't executed it yet - return 'loading' to indicate we'll verify later
    if (key || source === 'apiKeyHelper') {
      return 'loading'
    }
    return 'missing'
  })
  const [error, setError] = useState<Error | null>(null)
  const verify = useCallback(async (): Promise<void> => {
    if (!isAnthropicAuthEnabled() || isClaudeAISubscriber()) {
--- a/src/hooks/useReplBridge.tsx
+++ b/src/hooks/useReplBridge.tsx
@@ -434,7 +434,7 @@ export function useReplBridge(messages: Message[], setMessages: (action: React.S
                if (!store.getState().toolPermissionContext.isBypassPermissionsModeAvailable) {
                  return {
                    ok: false,
-                    error: 'Cannot set permission mode to bypassPermissions. Enable it with --allow-dangerously-skip-permissions or set permissions.allowBypassPermissionsMode in settings.json'
+                    error: 'Cannot set permission mode to bypassPermissions because the session was not launched with --dangerously-skip-permissions'
                  };
                }
              }
--- a/src/ink/termio/osc.ts
+++ b/src/ink/termio/osc.ts
@@ -481,16 +481,16 @@ export const CLEAR_TAB_STATUS = osc(
 )
 /**
- * Gate for emitting OSC 21337 (tab-status indicator). Currently disabled
+ * Gate for emitting OSC 21337 (tab-status indicator). Ant-only while the
- * (spec is unstable). Terminals that don't recognize it discard silently,
+ * spec is unstable. Terminals that don't recognize it discard silently, so
- * so emission is safe unconditionally — we don't gate on terminal detection
+ * emission is safe unconditionally — we don't gate on terminal detection
 * since support is expected across several terminals.
 *
 * Callers must wrap output with wrapForMultiplexer() so tmux/screen
 * DCS-passthrough carries the sequence to the outer terminal.
 */
 export function supportsTabStatus(): boolean {
-  return false
+  return process.env.USER_TYPE === 'ant'
 }
 /**
--- a/src/memdir/teamMemPaths.ts
+++ b/src/memdir/teamMemPaths.ts
@@ -74,7 +74,7 @@ export function isTeamMemoryEnabled(): boolean {
  if (!isAutoMemoryEnabled()) {
    return false
  }
-  return getFeatureValue_CACHED_MAY_BE_STALE('tengu_herring_clock', true)
+  return getFeatureValue_CACHED_MAY_BE_STALE('tengu_herring_clock', false)
 }
 /**
--- a/src/projectOnboardingState.test.ts
+++ b/src/projectOnboardingState.test.ts
@@ -1,62 +0,0 @@
 import { afterEach, describe, expect, test } from 'bun:test'
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import {
  getSteps,
  isProjectOnboardingComplete,
 } from './projectOnboardingSteps.js'
 import { runWithCwdOverride } from './utils/cwd.js'
 let tempDir: string | undefined
 afterEach(async () => {
  if (tempDir) {
    await rm(tempDir, { recursive: true, force: true })
    tempDir = undefined
  }
 })
 describe('project onboarding completion', () => {
  test('is incomplete when neither AGENTS.md nor CLAUDE.md exists', async () => {
    tempDir = await mkdtemp(join(tmpdir(), 'project-onboarding-'))
    await runWithCwdOverride(tempDir, async () => {
      expect(isProjectOnboardingComplete()).toBe(false)
      expect(getSteps()[1]?.text).toContain('/init')
      expect(getSteps()[1]?.text).toContain('AGENTS.md')
      expect(getSteps()[1]?.text).toContain('CLAUDE.md')
    })
  })
  test('is complete when only CLAUDE.md exists', async () => {
    tempDir = await mkdtemp(join(tmpdir(), 'project-onboarding-'))
    await writeFile(join(tempDir, 'CLAUDE.md'), '# CLAUDE.md\n')
    await runWithCwdOverride(tempDir, async () => {
      expect(isProjectOnboardingComplete()).toBe(true)
    })
  })
  test('is complete when only AGENTS.md exists', async () => {
    tempDir = await mkdtemp(join(tmpdir(), 'project-onboarding-'))
    await writeFile(join(tempDir, 'AGENTS.md'), '# AGENTS.md\n')
    await runWithCwdOverride(tempDir, async () => {
      expect(isProjectOnboardingComplete()).toBe(true)
    })
  })
  test('is complete from a nested cwd when repo instructions exist in an ancestor directory', async () => {
    tempDir = await mkdtemp(join(tmpdir(), 'project-onboarding-'))
    const nestedDir = join(tempDir, 'packages', 'app')
    await writeFile(join(tempDir, 'AGENTS.md'), '# AGENTS.md\n')
    await mkdir(nestedDir, { recursive: true })
    await writeFile(join(nestedDir, 'index.ts'), 'export {}\n')
    await runWithCwdOverride(nestedDir, async () => {
      expect(isProjectOnboardingComplete()).toBe(true)
    })
  })
 })
--- a/src/projectOnboardingState.ts
+++ b/src/projectOnboardingState.ts
@@ -1,14 +1,50 @@
 import memoize from 'lodash-es/memoize.js'
 import { join } from 'path'
 import {
  getCurrentProjectConfig,
  saveCurrentProjectConfig,
 } from './utils/config.js'
-export {
+import { getCwd } from './utils/cwd.js'
-  getSteps,
+import { isDirEmpty } from './utils/file.js'
-  isProjectOnboardingComplete,
+import { getFsImplementation } from './utils/fsOperations.js'
-  type Step,
+
-} from './projectOnboardingSteps.js'
+export type Step = {
-import { isProjectOnboardingComplete } from './projectOnboardingSteps.js'
+  key: string
  text: string
  isComplete: boolean
  isCompletable: boolean
  isEnabled: boolean
 }
 export function getSteps(): Step[] {
  const hasClaudeMd = getFsImplementation().existsSync(
    join(getCwd(), 'CLAUDE.md'),
  )
  const isWorkspaceDirEmpty = isDirEmpty(getCwd())
  return [
    {
      key: 'workspace',
      text: 'Ask Claude to create a new app or clone a repository',
      isComplete: false,
      isCompletable: true,
      isEnabled: isWorkspaceDirEmpty,
    },
    {
      key: 'claudemd',
      text: 'Run /init to create a CLAUDE.md file with instructions for Claude',
      isComplete: hasClaudeMd,
      isCompletable: true,
      isEnabled: !isWorkspaceDirEmpty,
    },
  ]
 }
 export function isProjectOnboardingComplete(): boolean {
  return getSteps()
    .filter(({ isCompletable, isEnabled }) => isCompletable && isEnabled)
    .every(({ isComplete }) => isComplete)
 }
 export function maybeMarkProjectOnboardingComplete(): void {
  // Short-circuit on cached config — isProjectOnboardingComplete() hits
--- a/src/projectOnboardingSteps.ts
+++ b/src/projectOnboardingSteps.ts
@@ -1,44 +0,0 @@
 import { getCwd } from './utils/cwd.js'
 import { isDirEmpty } from './utils/file.js'
 import { getFsImplementation } from './utils/fsOperations.js'
 import { findProjectInstructionFilePathInAncestors } from './utils/projectInstructions.js'
 export type Step = {
  key: string
  text: string
  isComplete: boolean
  isCompletable: boolean
  isEnabled: boolean
 }
 export function getSteps(): Step[] {
  const hasRepoInstructions =
    findProjectInstructionFilePathInAncestors(
      getCwd(),
      getFsImplementation().existsSync,
    ) !== null
  const isWorkspaceDirEmpty = isDirEmpty(getCwd())
  return [
    {
      key: 'workspace',
      text: 'Ask Claude to create a new app or clone a repository',
      isComplete: false,
      isCompletable: true,
      isEnabled: isWorkspaceDirEmpty,
    },
    {
      key: 'claudemd',
      text: 'Set up repo instructions (/init creates AGENTS.md or updates existing CLAUDE.md; either file counts)',
      isComplete: hasRepoInstructions,
      isCompletable: true,
      isEnabled: !isWorkspaceDirEmpty,
    },
  ]
 }
 export function isProjectOnboardingComplete(): boolean {
  return getSteps()
    .filter(({ isCompletable, isEnabled }) => isCompletable && isEnabled)
    .every(({ isComplete }) => isComplete)
 }
--- a/src/query.ts
+++ b/src/query.ts
@@ -160,7 +160,6 @@ function* yieldMissingToolResultBlocks(
 * rules, ye will be punished with an entire day of debugging and hair pulling.
 */
 const MAX_OUTPUT_TOKENS_RECOVERY_LIMIT = 3
 const MAX_CONTINUATION_NUDGES = 3
 /**
 * Is this a max_output_tokens error message? If so, the streaming loop should
@@ -210,10 +209,6 @@ type State = {
  pendingToolUseSummary: Promise<ToolUseSummaryMessage | null> | undefined
  stopHookActive: boolean | undefined
  turnCount: number
  // Count of consecutive continuation nudges within the current turn.
  // Capped at MAX_CONTINUATION_NUDGES to prevent infinite nudge loops
  // when the model keeps matching continuation signals without tool calls.
  continuationNudgeCount: number
  // Why the previous iteration continued. Undefined on first iteration.
  // Lets tests assert recovery paths fired without inspecting message contents.
  transition: Continue | undefined
@@ -277,7 +272,6 @@ async function* queryLoop(
    maxOutputTokensRecoveryCount: 0,
    hasAttemptedReactiveCompact: false,
    turnCount: 1,
    continuationNudgeCount: 0,
    pendingToolUseSummary: undefined,
    transition: undefined,
  }
@@ -651,35 +645,6 @@ async function* queryLoop(
      }
    }
    // Safety net: when auto-compact's circuit breaker has tripped (3+
    // consecutive failures), the normal blocking check above is gated on
    // reactiveCompact. If reactiveCompact is also enabled but ALSO fails
    // (or is disabled), the oversized context goes straight to the API and
    // gets a 500. This check catches that gap — if compaction is exhausted
    // and context is still over the autocompact threshold, block immediately
    // with a clear message instead of burning an API call that will 500.
    if (
      tracking?.consecutiveFailures !== undefined &&
      tracking.consecutiveFailures >= 3 &&
      isAutoCompactEnabled()
    ) {
      const model = toolUseContext.options.mainLoopModel
      const tokenUsage = tokenCountWithEstimation(messagesForQuery) - snipTokensFreed
      const { isAboveAutoCompactThreshold } = calculateTokenWarningState(
        tokenUsage,
        model,
      )
      if (isAboveAutoCompactThreshold) {
        yield createAssistantAPIErrorMessage({
          content:
            'The conversation has exceeded the context limit and automatic compaction has failed. ' +
            'Press esc twice to go up a few messages and try again, or start a new session with /new.',
          error: 'invalid_request',
        })
        return { reason: 'blocking_limit' }
      }
    }
    let attemptWithFallback = true
    queryCheckpoint('query_api_loop_start')
@@ -1137,7 +1102,6 @@ async function* queryLoop(
              pendingToolUseSummary: undefined,
              stopHookActive: undefined,
              turnCount,
              continuationNudgeCount: state.continuationNudgeCount,
              transition: {
                reason: 'collapse_drain_retry',
                committed: drained.committed,
@@ -1191,7 +1155,6 @@ async function* queryLoop(
            pendingToolUseSummary: undefined,
            stopHookActive: undefined,
            turnCount,
            continuationNudgeCount: state.continuationNudgeCount,
            transition: { reason: 'reactive_compact_retry' },
          }
          state = next
@@ -1247,7 +1210,6 @@ async function* queryLoop(
            pendingToolUseSummary: undefined,
            stopHookActive: undefined,
            turnCount,
            continuationNudgeCount: state.continuationNudgeCount,
            transition: { reason: 'max_output_tokens_escalate' },
          }
          state = next
@@ -1276,7 +1238,6 @@ async function* queryLoop(
            pendingToolUseSummary: undefined,
            stopHookActive: undefined,
            turnCount,
            continuationNudgeCount: state.continuationNudgeCount,
            transition: {
              reason: 'max_output_tokens_recovery',
              attempt: maxOutputTokensRecoveryCount + 1,
@@ -1334,7 +1295,6 @@ async function* queryLoop(
          pendingToolUseSummary: undefined,
          stopHookActive: true,
          turnCount,
          continuationNudgeCount: state.continuationNudgeCount,
          transition: { reason: 'stop_hook_blocking' },
        }
        state = next
@@ -1371,7 +1331,6 @@ async function* queryLoop(
            pendingToolUseSummary: undefined,
            stopHookActive: undefined,
            turnCount,
            continuationNudgeCount: state.continuationNudgeCount,
            transition: { reason: 'token_budget_continuation' },
          }
          continue
@@ -1391,77 +1350,6 @@ async function* queryLoop(
        }
      }
      // Continuation nudge: detect when the model signals intent to continue
      // (e.g., "so now I have to do it", "let me now...", "I'll need to...")
      // but returned no tool calls. This prevents premature task completion.
      //
      // Guard: capped at MAX_CONTINUATION_NUDGES to prevent infinite loops
      // when the model keeps matching signals without ever calling tools.
      if (
        assistantMessages.length > 0 &&
        turnCount < (maxTurns ?? Infinity) &&
        state.continuationNudgeCount < MAX_CONTINUATION_NUDGES
      ) {
        const lastAssistant = assistantMessages.at(-1)
        if (lastAssistant?.type === 'assistant') {
          const lastText = lastAssistant.message.content
            .filter((b): b is { type: 'text'; text: string } => b.type === 'text')
            .map(b => b.text)
            .join(' ')
            .toLowerCase()
          // Tightened patterns: require explicit action verbs and exclude
          // common explanatory phrasing to reduce false positives.
          const continuationSignals = [
            // Only match "so now I/let me/we" followed by an action verb
            /\bso now (i|let me|we) (need to|have to|should|must|will) (do|create|write|edit|update|fix|implement|add|run|check|make|build|set up)\b/,
            // "now I'll" + action (not "now I'll explain" etc.)
            /\bnow i('ll| will) (do|create|write|edit|update|fix|implement|add|run|check|make|build|set up|go|proceed)\b/,
            // "let me" + action (not "let me think/explain/show")
            /\blet me (go ahead and |now )?(do|create|write|edit|update|fix|implement|add|run|check|make|build|set up|proceed)\b/,
            // "I'll/I need to/I have to" + action, only if message is short (<80 chars)
            ...(lastText.length < 80
              ? [/\b(i('ll| will| need to| have to| must) (now )?(do|create|write|edit|update|fix|implement|add|run|check|make|build|set up))\b/]
              : []),
            // "time to" + action
            /\btime to (do|create|write|edit|update|fix|implement|add|run|check|make|build|get started|begin)\b/,
            // "next, I'll/let me" + action, only if message is short
            ...(lastText.length < 80
              ? [/\bnext,?\s+(i('ll| will)|let me|i need to) (do|create|write|edit|update|fix|implement|add|run|check|make|build)\b/]
              : []),
          ]
          // Don't nudge if the text contains completion markers
          const completionMarkers = /\b(done|finished|completed|complete|summary|that's all|that is all|all set|hope this helps|let me know if)\b/
          if (completionMarkers.test(lastText)) {
            // Model signaled completion — don't nudge
          } else if (continuationSignals.some(re => re.test(lastText))) {
            logForDebugging(
              `Continuation nudge triggered (${state.continuationNudgeCount + 1}/${MAX_CONTINUATION_NUDGES}): model said "${lastText.slice(-120)}" without tool calls`,
            )
            const nudge = createUserMessage({
              content: 'Continue with the task. Use the appropriate tools to proceed.',
              isMeta: true,
            })
            const next: State = {
              messages: [...messagesForQuery, ...assistantMessages, nudge],
              toolUseContext,
              autoCompactTracking: tracking,
              maxOutputTokensRecoveryCount: 0,
              hasAttemptedReactiveCompact: false,
              maxOutputTokensOverride: undefined,
              pendingToolUseSummary: undefined,
              stopHookActive: undefined,
              turnCount,
              continuationNudgeCount: state.continuationNudgeCount + 1,
              transition: { reason: 'continuation_nudge' },
            }
            state = next
            continue
          }
        }
      }
      return { reason: 'completed' }
    }
@@ -1827,7 +1715,6 @@ async function* queryLoop(
      turnCount: nextTurnCount,
      maxOutputTokensRecoveryCount: 0,
      hasAttemptedReactiveCompact: false,
      continuationNudgeCount: 0,
      pendingToolUseSummary: nextPendingToolUseSummary,
      maxOutputTokensOverride: undefined,
      stopHookActive,
--- a/src/screens/REPL.tsx
+++ b/src/screens/REPL.tsx
@@ -196,7 +196,7 @@ const PROACTIVE_NO_OP_SUBSCRIBE = (_cb: () => void) => () => { };
 const PROACTIVE_FALSE = () => false;
 const SUGGEST_BG_PR_NOOP = (_p: string, _n: string): boolean => false;
 const useProactive = feature('PROACTIVE') || feature('KAIROS') ? require('../proactive/useProactive.js').useProactive : null;
-const useScheduledTasks = require('../hooks/useScheduledTasks.js').useScheduledTasks;
+const useScheduledTasks = feature('AGENT_TRIGGERS') ? require('../hooks/useScheduledTasks.js').useScheduledTasks : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 import { isAgentSwarmsEnabled } from '../utils/agentSwarmsEnabled.js';
 import { useTaskListWatcher } from '../hooks/useTaskListWatcher.js';
@@ -4076,13 +4076,21 @@ export function REPL({
  });
  // Scheduled tasks from .claude/scheduled_tasks.json (CronCreate/Delete/List)
-  // and session-only /loop runs.
+  if (feature('AGENT_TRIGGERS')) {
-  const assistantMode = store.getState().kairosEnabled;
+    // Assistant mode bypasses the isLoading gate (the proactive tick →
-  useScheduledTasks({
+    // Sleep → tick loop would otherwise starve the scheduler).
-    isLoading,
+    // kairosEnabled is set once in initialState (main.tsx) and never mutated — no
-    assistantMode,
+    // subscription needed. The tengu_kairos_cron runtime gate is checked inside
-    setMessages
+    // useScheduledTasks's effect (not here) since wrapping a hook call in a dynamic
-  });
+    // condition would break rules-of-hooks.
    const assistantMode = store.getState().kairosEnabled;
    // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
    useScheduledTasks!({
      isLoading,
      assistantMode,
      setMessages
    });
  }
  // Note: Permission polling is now handled by useInboxPoller
  // - Workers receive permission responses via mailbox messages
--- a/src/services/api/bootstrap.ts
+++ b/src/services/api/bootstrap.ts
@@ -116,21 +116,9 @@ async function fetchBootstrapAPI(): Promise<BootstrapResponse | null> {
      return parsed.data
    })
  } catch (error) {
-    if (axios.isAxiosError(error)) {
+    logForDebugging(
-      const status = error.response?.status ?? 'no-response'
+      `[Bootstrap] Fetch failed: ${axios.isAxiosError(error) ? (error.response?.status ?? error.code) : 'unknown'}`,
-      const code = error.code ?? 'unknown-code'
+    )
      const method = error.config?.method?.toUpperCase() ?? 'UNKNOWN'
      const requestUrl = error.config?.url ?? 'unknown-url'
      const message = error.message ?? 'unknown axios error'
      logForDebugging(
        `[Bootstrap] Fetch failed: status=${status} code=${code} method=${method} url=${requestUrl} message=${message}`,
      )
    } else {
      const message = error instanceof Error ? error.message : String(error)
      logForDebugging(`[Bootstrap] Fetch failed: ${message}`)
    }
    throw error
  }
 }
--- a/src/services/api/codexOAuth.test.ts
+++ b/src/services/api/codexOAuth.test.ts
@@ -1,166 +0,0 @@
 import { createServer } from 'node:http'
 import { afterEach, expect, mock, test } from 'bun:test'
 import { CodexOAuthService } from './codexOAuth.js'
 const originalFetch = globalThis.fetch
 const originalCallbackPort = process.env.CODEX_OAUTH_CALLBACK_PORT
 const originalClientId = process.env.CODEX_OAUTH_CLIENT_ID
 afterEach(() => {
  mock.restore()
  globalThis.fetch = originalFetch
  if (originalCallbackPort === undefined) {
    delete process.env.CODEX_OAUTH_CALLBACK_PORT
  } else {
    process.env.CODEX_OAUTH_CALLBACK_PORT = originalCallbackPort
  }
  if (originalClientId === undefined) {
    delete process.env.CODEX_OAUTH_CLIENT_ID
  } else {
    process.env.CODEX_OAUTH_CLIENT_ID = originalClientId
  }
 })
 async function getFreePort(): Promise<number> {
  return await new Promise((resolve, reject) => {
    const server = createServer()
    server.once('error', reject)
    server.listen(0, '127.0.0.1', () => {
      const address = server.address()
      if (!address || typeof address === 'string') {
        server.close(() => reject(new Error('Failed to allocate test port.')))
        return
      }
      const { port } = address
      server.close(error => {
        if (error) {
          reject(error)
          return
        }
        resolve(port)
      })
    })
  })
 }
 function buildCallbackRequest(authUrl: string): string {
  const authorizeUrl = new URL(authUrl)
  const redirectUri = authorizeUrl.searchParams.get('redirect_uri')
  const state = authorizeUrl.searchParams.get('state')
  if (!redirectUri || !state) {
    throw new Error('Codex OAuth test did not receive a valid authorization URL.')
  }
  const callbackUrl = new URL(redirectUri)
  callbackUrl.searchParams.set('code', 'auth-code')
  callbackUrl.searchParams.set('state', state)
  return callbackUrl.toString()
 }
 test('serves updated success copy after a successful Codex OAuth flow', async () => {
  const callbackPort = await getFreePort()
  process.env.CODEX_OAUTH_CALLBACK_PORT = String(callbackPort)
  process.env.CODEX_OAUTH_CLIENT_ID = 'test-client-id'
  globalThis.fetch = mock(async (input, init) => {
    const url = String(input)
    if (url.startsWith('http://localhost:')) {
      return originalFetch(input, init)
    }
    return new Response(
      JSON.stringify({
        access_token: 'access-token',
        refresh_token: 'refresh-token',
      }),
      {
        status: 200,
        headers: { 'Content-Type': 'application/json' },
      },
    )
  }) as typeof fetch
  const service = new CodexOAuthService()
  let callbackResponsePromise!: Promise<Response>
  const flowPromise = service.startOAuthFlow(async authUrl => {
    callbackResponsePromise = originalFetch(buildCallbackRequest(authUrl))
  })
  const tokens = await flowPromise
  const callbackResponse = await callbackResponsePromise
  const html = await callbackResponse.text()
  expect(tokens.accessToken).toBe('access-token')
  expect(tokens.refreshToken).toBe('refresh-token')
  expect(html).toContain('You can return to OpenClaude now.')
  expect(html).toContain(
    'OpenClaude will finish activating your new Codex OAuth login.',
  )
  expect(html).not.toContain('continue automatically')
 })
 test('cancellation during token exchange returns a cancelled page and rejects the flow', async () => {
  const callbackPort = await getFreePort()
  process.env.CODEX_OAUTH_CALLBACK_PORT = String(callbackPort)
  process.env.CODEX_OAUTH_CLIENT_ID = 'test-client-id'
  let resolveFetchStart!: () => void
  const fetchStarted = new Promise<void>(resolve => {
    resolveFetchStart = resolve
  })
  globalThis.fetch = mock((input, init) => {
    const url = String(input)
    if (url.startsWith('http://localhost:')) {
      return originalFetch(input, init)
    }
    return new Promise<Response>((_resolve, reject) => {
      resolveFetchStart()
      const signal = init?.signal
      if (!signal) {
        return
      }
      if (signal.aborted) {
        reject(signal.reason)
        return
      }
      signal.addEventListener(
        'abort',
        () => {
          reject(signal.reason)
        },
        { once: true },
      )
    })
  }) as typeof fetch
  const service = new CodexOAuthService()
  let callbackResponsePromise!: Promise<Response>
  const flowPromise = service.startOAuthFlow(async authUrl => {
    callbackResponsePromise = originalFetch(buildCallbackRequest(authUrl))
  })
  await fetchStarted
  service.cleanup()
  await expect(flowPromise).rejects.toThrow('Codex OAuth flow was cancelled.')
  const callbackResponse = await callbackResponsePromise
  const html = await callbackResponse.text()
  expect(html).toContain('Codex login cancelled')
  expect(html).toContain('retry in OpenClaude')
 })
--- a/src/services/api/codexOAuth.ts
+++ b/src/services/api/codexOAuth.ts
@@ -1,307 +0,0 @@
 import { AuthCodeListener } from '../oauth/auth-code-listener.js'
 import {
  generateCodeChallenge,
  generateCodeVerifier,
  generateState,
 } from '../oauth/crypto.js'
 import {
  asTrimmedString,
  CODEX_OAUTH_ISSUER,
  CODEX_OAUTH_ORIGINATOR,
  CODEX_OAUTH_SCOPE,
  escapeHtml,
  exchangeCodexIdTokenForApiKey,
  getCodexOAuthCallbackPort,
  getCodexOAuthClientId,
  parseChatgptAccountId,
 } from './codexOAuthShared.js'
 type CodexOAuthTokenResponse = {
  id_token?: string
  access_token?: string
  refresh_token?: string
 }
 export type CodexOAuthTokens = {
  apiKey?: string
  accessToken: string
  refreshToken: string
  idToken?: string
  accountId?: string
 }
 function buildCodexAuthorizeUrl(options: {
  port: number
  codeChallenge: string
  state: string
 }): string {
  const redirectUri = `http://localhost:${options.port}/auth/callback`
  const authUrl = new URL(`${CODEX_OAUTH_ISSUER}/oauth/authorize`)
  authUrl.searchParams.append('response_type', 'code')
  authUrl.searchParams.append('client_id', getCodexOAuthClientId())
  authUrl.searchParams.append('redirect_uri', redirectUri)
  authUrl.searchParams.append('scope', CODEX_OAUTH_SCOPE)
  authUrl.searchParams.append('code_challenge', options.codeChallenge)
  authUrl.searchParams.append('code_challenge_method', 'S256')
  authUrl.searchParams.append('id_token_add_organizations', 'true')
  authUrl.searchParams.append('codex_cli_simplified_flow', 'true')
  authUrl.searchParams.append('state', options.state)
  authUrl.searchParams.append('originator', CODEX_OAUTH_ORIGINATOR)
  return authUrl.toString()
 }
 function renderSuccessPage(): string {
  return `<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>Codex Login Complete</title>
    <style>
      body { font-family: sans-serif; padding: 32px; line-height: 1.5; color: #111827; }
      h1 { margin: 0 0 12px; font-size: 22px; }
      p { margin: 0 0 10px; }
    </style>
  </head>
  <body>
    <h1>Codex login complete</h1>
    <p>You can return to OpenClaude now.</p>
    <p>OpenClaude will finish activating your new Codex OAuth login.</p>
  </body>
 </html>`
 }
 function renderErrorPage(message: string): string {
  const safeMessage = escapeHtml(message)
  return `<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>Codex Login Failed</title>
    <style>
      body { font-family: sans-serif; padding: 32px; line-height: 1.5; color: #111827; }
      h1 { margin: 0 0 12px; font-size: 22px; color: #991b1b; }
      p { margin: 0 0 10px; }
    </style>
  </head>
  <body>
    <h1>Codex login failed</h1>
    <p>${safeMessage}</p>
    <p>You can close this window and try again in OpenClaude.</p>
  </body>
 </html>`
 }
 function renderCancelledPage(): string {
  return `<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>Codex Login Cancelled</title>
    <style>
      body { font-family: sans-serif; padding: 32px; line-height: 1.5; color: #111827; }
      h1 { margin: 0 0 12px; font-size: 22px; }
      p { margin: 0 0 10px; }
    </style>
  </head>
  <body>
    <h1>Codex login cancelled</h1>
    <p>You can close this window and retry in OpenClaude.</p>
  </body>
 </html>`
 }
 async function exchangeAuthorizationCode(options: {
  authorizationCode: string
  codeVerifier: string
  port: number
  signal?: AbortSignal
 }): Promise<CodexOAuthTokens> {
  const redirectUri = `http://localhost:${options.port}/auth/callback`
  const body = new URLSearchParams({
    grant_type: 'authorization_code',
    code: options.authorizationCode,
    redirect_uri: redirectUri,
    client_id: getCodexOAuthClientId(),
    code_verifier: options.codeVerifier,
  })
  const response = await fetch(`${CODEX_OAUTH_ISSUER}/oauth/token`, {
    method: 'POST',
    headers: {
      'Content-Type': 'application/x-www-form-urlencoded',
    },
    body,
    signal: options.signal
      ? AbortSignal.any([options.signal, AbortSignal.timeout(15_000)])
      : AbortSignal.timeout(15_000),
  })
  if (!response.ok) {
    const errorText = await response.text().catch(() => '')
    throw new Error(
      errorText.trim()
        ? `Codex OAuth token exchange failed (${response.status}): ${errorText.trim()}`
        : `Codex OAuth token exchange failed with status ${response.status}.`,
    )
  }
  const payload = (await response.json()) as CodexOAuthTokenResponse
  const accessToken = asTrimmedString(payload.access_token)
  const refreshToken = asTrimmedString(payload.refresh_token)
  if (!accessToken || !refreshToken) {
    throw new Error(
      'Codex OAuth completed, but the token response was missing credentials.',
    )
  }
  const idToken = asTrimmedString(payload.id_token)
  const apiKey = idToken
    ? await exchangeCodexIdTokenForApiKey(idToken).catch(() => undefined)
    : undefined
  return {
    apiKey,
    accessToken,
    refreshToken,
    idToken,
    accountId:
      parseChatgptAccountId(idToken) ?? parseChatgptAccountId(accessToken),
  }
 }
 export class CodexOAuthService {
  private authCodeListener: AuthCodeListener | null = null
  private port: number | null = null
  private tokenExchangeAbortController: AbortController | null = null
  private buildCancellationError(): Error {
    return new Error('Codex OAuth flow was cancelled.')
  }
  async startOAuthFlow(
    authURLHandler: (authUrl: string) => Promise<void>,
  ): Promise<CodexOAuthTokens> {
    const codeVerifier = generateCodeVerifier()
    const callbackPort = getCodexOAuthCallbackPort()
    const authCodeListener = new AuthCodeListener('/auth/callback')
    this.authCodeListener = authCodeListener
    this.port = null
    try {
      const port = await authCodeListener.start(callbackPort)
      this.port = port
      const state = generateState()
      const codeChallenge = await generateCodeChallenge(codeVerifier)
      const authUrl = buildCodexAuthorizeUrl({
        port,
        codeChallenge,
        state,
      })
      try {
        const authorizationCode = await authCodeListener.waitForAuthorization(
          state,
          async () => {
            await authURLHandler(authUrl)
          },
        )
        const tokenExchangeAbortController = new AbortController()
        this.tokenExchangeAbortController = tokenExchangeAbortController
        let tokens: CodexOAuthTokens
        try {
          tokens = await exchangeAuthorizationCode({
            authorizationCode,
            codeVerifier,
            port,
            signal: tokenExchangeAbortController.signal,
          })
        } finally {
          if (
            this.tokenExchangeAbortController === tokenExchangeAbortController
          ) {
            this.tokenExchangeAbortController = null
          }
        }
        if (this.authCodeListener !== authCodeListener) {
          throw this.buildCancellationError()
        }
        authCodeListener.handleSuccessRedirect([], res => {
          res.writeHead(200, {
            'Content-Type': 'text/html; charset=utf-8',
          })
          res.end(renderSuccessPage())
        })
        return tokens
      } catch (error) {
        const resolvedError =
          this.authCodeListener === authCodeListener
            ? error
            : this.buildCancellationError()
        if (authCodeListener.hasPendingResponse()) {
          const isCancellation =
            resolvedError instanceof Error &&
            resolvedError.message === 'Codex OAuth flow was cancelled.'
          authCodeListener.handleErrorRedirect(res => {
            res.writeHead(isCancellation ? 200 : 400, {
              'Content-Type': 'text/html; charset=utf-8',
            })
            res.end(
              isCancellation
                ? renderCancelledPage()
                : renderErrorPage(
                    resolvedError instanceof Error
                      ? resolvedError.message
                      : String(resolvedError),
                  ),
            )
          })
        }
        throw resolvedError
      } finally {
        this.cleanup()
      }
    } catch (error) {
      const message = error instanceof Error ? error.message : String(error)
      if (
        message.includes('EADDRINUSE') ||
        message.includes(String(callbackPort))
      ) {
        throw new Error(
          `Codex OAuth needs localhost:${callbackPort} for its callback. Close any app already using that port and try again.`,
        )
      }
      throw error
    }
  }
  cleanup(): void {
    const cancellationError = this.buildCancellationError()
    this.tokenExchangeAbortController?.abort(cancellationError)
    this.tokenExchangeAbortController = null
    if (this.authCodeListener?.hasPendingResponse()) {
      this.authCodeListener.handleErrorRedirect(res => {
        res.writeHead(200, {
          'Content-Type': 'text/html; charset=utf-8',
        })
        res.end(renderCancelledPage())
      })
    }
    this.authCodeListener?.cancelPendingAuthorization(cancellationError)
    this.authCodeListener = null
    this.port = null
  }
 }
--- a/src/services/api/codexOAuthShared.ts
+++ b/src/services/api/codexOAuthShared.ts
@@ -1,139 +0,0 @@
 export const CODEX_OAUTH_ISSUER = 'https://auth.openai.com'
 export const CODEX_REFRESH_URL = `${CODEX_OAUTH_ISSUER}/oauth/token`
 export const DEFAULT_CODEX_OAUTH_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann'
 export const DEFAULT_CODEX_OAUTH_CALLBACK_PORT = 1455
 export const CODEX_OAUTH_SCOPE =
  'openid profile email offline_access api.connectors.read api.connectors.invoke'
 export const CODEX_OAUTH_ORIGINATOR = 'codex_cli_rs'
 export const CODEX_API_KEY_TOKEN_NAME = 'openai-api-key'
 export const CODEX_ID_TOKEN_SUBJECT_TYPE =
  'urn:ietf:params:oauth:token-type:id_token'
 export const CODEX_TOKEN_EXCHANGE_GRANT =
  'urn:ietf:params:oauth:grant-type:token-exchange'
 export function asTrimmedString(value: unknown): string | undefined {
  if (typeof value !== 'string') return undefined
  const trimmed = value.trim()
  return trimmed ? trimmed : undefined
 }
 export function getCodexOAuthClientId(
  env: NodeJS.ProcessEnv = process.env,
 ): string {
  return asTrimmedString(env.CODEX_OAUTH_CLIENT_ID) ?? DEFAULT_CODEX_OAUTH_CLIENT_ID
 }
 export function getCodexOAuthCallbackPort(
  env: NodeJS.ProcessEnv = process.env,
 ): number {
  const rawPort = asTrimmedString(env.CODEX_OAUTH_CALLBACK_PORT)
  if (!rawPort) {
    return DEFAULT_CODEX_OAUTH_CALLBACK_PORT
  }
  const parsed = Number.parseInt(rawPort, 10)
  if (Number.isInteger(parsed) && parsed > 0 && parsed <= 65535) {
    return parsed
  }
  return DEFAULT_CODEX_OAUTH_CALLBACK_PORT
 }
 export function decodeJwtPayload(
  token: string,
 ): Record<string, unknown> | undefined {
  const parts = token.split('.')
  if (parts.length < 2) return undefined
  try {
    const normalized = parts[1].replace(/-/g, '+').replace(/_/g, '/')
    const padded = normalized + '='.repeat((4 - (normalized.length % 4)) % 4)
    const json = Buffer.from(padded, 'base64').toString('utf8')
    const parsed = JSON.parse(json)
    return parsed && typeof parsed === 'object'
      ? (parsed as Record<string, unknown>)
      : undefined
  } catch {
    return undefined
  }
 }
 export function parseChatgptAccountId(
  token: string | undefined,
 ): string | undefined {
  if (!token) return undefined
  const payload = decodeJwtPayload(token)
  const nestedAuth =
    payload?.['https://api.openai.com/auth'] &&
    typeof payload['https://api.openai.com/auth'] === 'object'
      ? (payload['https://api.openai.com/auth'] as Record<string, unknown>)
      : undefined
  return (
    asTrimmedString(
      nestedAuth?.chatgpt_account_id ??
        payload?.['https://api.openai.com/auth.chatgpt_account_id'] ??
        payload?.chatgpt_account_id,
    ) ?? undefined
  )
 }
 export function escapeHtml(value: string): string {
  return value.replace(/[&<>"']/g, char => {
    switch (char) {
      case '&':
        return '&amp;'
      case '<':
        return '&lt;'
      case '>':
        return '&gt;'
      case '"':
        return '&quot;'
      case '\'':
        return '&#39;'
      default:
        return char
    }
  })
 }
 export async function exchangeCodexIdTokenForApiKey(
  idToken: string,
 ): Promise<string> {
  const body = new URLSearchParams({
    grant_type: CODEX_TOKEN_EXCHANGE_GRANT,
    client_id: getCodexOAuthClientId(),
    requested_token: CODEX_API_KEY_TOKEN_NAME,
    subject_token: idToken,
    subject_token_type: CODEX_ID_TOKEN_SUBJECT_TYPE,
  })
  const response = await fetch(CODEX_REFRESH_URL, {
    method: 'POST',
    headers: {
      'Content-Type': 'application/x-www-form-urlencoded',
    },
    body,
    signal: AbortSignal.timeout(15_000),
  })
  if (!response.ok) {
    const bodyText = await response.text().catch(() => '')
    throw new Error(
      bodyText.trim()
        ? `Codex API key exchange failed (${response.status}): ${bodyText.trim()}`
        : `Codex API key exchange failed with status ${response.status}.`,
    )
  }
  const payload = (await response.json()) as { access_token?: string }
  const apiKey = asTrimmedString(payload.access_token)
  if (!apiKey) {
    throw new Error(
      'Codex API key exchange completed, but no API key token was returned.',
    )
  }
  return apiKey
 }
--- a/src/services/api/codexShim.test.ts
+++ b/src/services/api/codexShim.test.ts
@@ -8,13 +8,16 @@ import {
  convertCodexResponseToAnthropicMessage,
  convertToolsToResponsesTools,
 } from './codexShim.js'
 import {
  resolveCodexApiCredentials,
  resolveProviderRequest,
 } from './providerConfig.js'
 const tempDirs: string[] = []
 const originalEnv = {
  OPENAI_BASE_URL: process.env.OPENAI_BASE_URL,
  OPENAI_API_BASE: process.env.OPENAI_API_BASE,
  CLAUDE_CODE_USE_GITHUB: process.env.CLAUDE_CODE_USE_GITHUB,
  OPENAI_MODEL: process.env.OPENAI_MODEL,
 }
 afterEach(() => {
@@ -27,9 +30,6 @@ afterEach(() => {
  if (originalEnv.CLAUDE_CODE_USE_GITHUB === undefined) delete process.env.CLAUDE_CODE_USE_GITHUB
  else process.env.CLAUDE_CODE_USE_GITHUB = originalEnv.CLAUDE_CODE_USE_GITHUB
  if (originalEnv.OPENAI_MODEL === undefined) delete process.env.OPENAI_MODEL
  else process.env.OPENAI_MODEL = originalEnv.OPENAI_MODEL
  while (tempDirs.length > 0) {
    const dir = tempDirs.pop()
    if (dir) rmSync(dir, { recursive: true, force: true })
@@ -59,10 +59,6 @@ async function collectStreamEventTypes(responseText: string): Promise<string[]>
  return events
 }
 async function importFreshProviderConfigModule() {
  return import(`./providerConfig.js?ts=${Date.now()}-${Math.random()}`)
 }
 describe('Codex provider config', () => {
  const originalOpenaiBaseUrl = process.env.OPENAI_BASE_URL
  const originalOpenaiApiBase = process.env.OPENAI_API_BASE
@@ -79,8 +75,7 @@ describe('Codex provider config', () => {
    else process.env.OPENAI_API_BASE = originalOpenaiApiBase
  })
-  test('resolves codexplan alias to Codex transport with reasoning', async () => {
+  test('resolves codexplan alias to Codex transport with reasoning', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    delete process.env.OPENAI_BASE_URL
    delete process.env.OPENAI_API_BASE
    delete process.env.CLAUDE_CODE_USE_GITHUB
@@ -89,23 +84,9 @@ describe('Codex provider config', () => {
    expect(resolved.transport).toBe('codex_responses')
    expect(resolved.resolvedModel).toBe('gpt-5.4')
    expect(resolved.reasoning).toEqual({ effort: 'high' })
    expect(resolved.baseUrl).toBe('https://chatgpt.com/backend-api/codex')
  })
-  test('resolves codexspark alias to Codex transport with Codex base URL', async () => {
+  test('does not force Codex transport when a local non-Codex base URL is explicit', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    delete process.env.OPENAI_BASE_URL
    delete process.env.OPENAI_API_BASE
    delete process.env.CLAUDE_CODE_USE_GITHUB
    const resolved = resolveProviderRequest({ model: 'codexspark' })
    expect(resolved.transport).toBe('codex_responses')
    expect(resolved.resolvedModel).toBe('gpt-5.3-codex-spark')
    expect(resolved.baseUrl).toBe('https://chatgpt.com/backend-api/codex')
  })
  test('does not force Codex transport when a local non-Codex base URL is explicit', async () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    const resolved = resolveProviderRequest({
      model: 'codexplan',
      baseUrl: 'http://127.0.0.1:8080/v1',
@@ -116,8 +97,7 @@ describe('Codex provider config', () => {
    expect(resolved.resolvedModel).toBe('gpt-5.4')
  })
-  test('resolves codexplan to Codex transport even when OPENAI_BASE_URL is the string "undefined"', async () => {
+  test('resolves codexplan to Codex transport even when OPENAI_BASE_URL is the string "undefined"', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    // On Windows, env vars can leak as the literal string "undefined" instead of
    // the JS value undefined when not properly unset (issue #336).
    process.env.OPENAI_BASE_URL = 'undefined'
@@ -125,57 +105,20 @@ describe('Codex provider config', () => {
    expect(resolved.transport).toBe('codex_responses')
  })
-  test('resolves codexplan to Codex transport even when OPENAI_BASE_URL is an empty string', async () => {
+  test('resolves codexplan to Codex transport even when OPENAI_BASE_URL is an empty string', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    process.env.OPENAI_BASE_URL = ''
    const resolved = resolveProviderRequest({ model: 'codexplan' })
    expect(resolved.transport).toBe('codex_responses')
  })
-  test('prefers explicit baseUrl option over env var', async () => {
+  test('prefers explicit baseUrl option over env var', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    process.env.OPENAI_BASE_URL = 'https://example.com/v1'
    const resolved = resolveProviderRequest({ model: 'codexplan', baseUrl: 'https://chatgpt.com/backend-api/codex' })
    expect(resolved.transport).toBe('codex_responses')
    expect(resolved.baseUrl).toBe('https://chatgpt.com/backend-api/codex')
  })
-  test('default gpt-4o uses OpenAI base URL (no regression)', async () => {
+  test('loads Codex credentials from auth.json fallback', () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    delete process.env.OPENAI_BASE_URL
    delete process.env.CLAUDE_CODE_USE_GITHUB
    const resolved = resolveProviderRequest({ model: 'gpt-4o' })
    expect(resolved.transport).toBe('chat_completions')
    expect(resolved.baseUrl).toBe('https://api.openai.com/v1')
    expect(resolved.resolvedModel).toBe('gpt-4o')
  })
  test('resolves codexplan from env var OPENAI_MODEL to Codex endpoint', async () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    process.env.OPENAI_MODEL = 'codexplan'
    delete process.env.OPENAI_BASE_URL
    delete process.env.CLAUDE_CODE_USE_GITHUB
    const resolved = resolveProviderRequest()
    expect(resolved.transport).toBe('codex_responses')
    expect(resolved.baseUrl).toBe('https://chatgpt.com/backend-api/codex')
    expect(resolved.resolvedModel).toBe('gpt-5.4')
  })
  test('does not override custom base URL for codexplan (e.g., local provider)', async () => {
    const { resolveProviderRequest } = await importFreshProviderConfigModule()
    process.env.OPENAI_MODEL = 'codexplan'
    process.env.OPENAI_BASE_URL = 'http://localhost:11434/v1'
    delete process.env.CLAUDE_CODE_USE_GITHUB
    const resolved = resolveProviderRequest()
    expect(resolved.transport).toBe('chat_completions')
    expect(resolved.baseUrl).toBe('http://localhost:11434/v1')
  })
  test('loads Codex credentials from auth.json fallback', async () => {
    const { resolveCodexApiCredentials } = await importFreshProviderConfigModule()
    const authPath = createTempAuthJson({
      tokens: {
        access_token: 'header.payload.signature',
@@ -191,31 +134,6 @@ describe('Codex provider config', () => {
    expect(credentials.accountId).toBe('acct_test')
    expect(credentials.source).toBe('auth.json')
  })
  test('does not treat auth.json id_token as a Codex bearer credential', async () => {
    const { resolveCodexApiCredentials } = await importFreshProviderConfigModule()
    const idTokenPayload = Buffer.from(
      JSON.stringify({
        'https://api.openai.com/auth': {
          chatgpt_account_id: 'acct_from_id_token',
        },
      }),
      'utf8',
    ).toString('base64url')
    const authPath = createTempAuthJson({
      tokens: {
        id_token: `header.${idTokenPayload}.signature`,
      },
    })
    const credentials = resolveCodexApiCredentials({
      CODEX_AUTH_JSON_PATH: authPath,
    } as NodeJS.ProcessEnv)
    expect(credentials.apiKey).toBe('')
    expect(credentials.accountId).toBe('acct_from_id_token')
    expect(credentials.source).toBe('none')
  })
 })
 describe('Codex request translation', () => {
--- a/src/services/api/codexShim.ts
+++ b/src/services/api/codexShim.ts
@@ -1,5 +1,4 @@
 import { APIError } from '@anthropic-ai/sdk'
 import { fetchWithProxyRetry } from './fetchWithProxyRetry.js'
 import type {
  ResolvedCodexCredentials,
  ResolvedProviderRequest,
@@ -560,15 +559,12 @@ export async function performCodexRequest(options: {
  }
  headers.originator ??= 'openclaude'
-  const response = await fetchWithProxyRetry(
+  const response = await fetch(`${options.request.baseUrl}/responses`, {
-    `${options.request.baseUrl}/responses`,
+    method: 'POST',
-    {
+    headers,
-      method: 'POST',
+    body: JSON.stringify(body),
-      headers,
+    signal: options.signal,
-      body: JSON.stringify(body),
+  })
      signal: options.signal,
    },
  )
  if (!response.ok) {
    const errorBody = await response.text().catch(() => 'unknown error')
@@ -584,55 +580,15 @@ export async function performCodexRequest(options: {
  return response
 }
-async function* readSseEvents(response: Response, signal?: AbortSignal): AsyncGenerator<CodexSseEvent> {
+async function* readSseEvents(response: Response): AsyncGenerator<CodexSseEvent> {
  const reader = response.body?.getReader()
  if (!reader) return
  const decoder = new TextDecoder()
  let buffer = ''
  const STREAM_IDLE_TIMEOUT_MS = 120_000 // 2 minutes without data
  let lastDataTime = Date.now()
  /**
   * Read from the stream with an idle timeout. Respects the caller's
   * AbortSignal — clears the idle timer on abort so the AbortError
   * surfaces cleanly instead of a spurious idle timeout.
   */
  async function readWithTimeout(): Promise<ReadableStreamReadResult<Uint8Array>> {
    return new Promise((resolve, reject) => {
      const timeoutId = setTimeout(() => {
        const elapsed = Math.round((Date.now() - lastDataTime) / 1000)
        reject(new Error(
          `Codex SSE stream idle for ${elapsed}s (limit: ${STREAM_IDLE_TIMEOUT_MS / 1000}s). Connection likely dropped.`,
        ))
      }, STREAM_IDLE_TIMEOUT_MS)
      let abortCleanup: (() => void) | undefined
      if (signal) {
        abortCleanup = () => {
          clearTimeout(timeoutId)
        }
        signal.addEventListener('abort', abortCleanup, { once: true })
      }
      reader.read().then(
        result => {
          clearTimeout(timeoutId)
          if (signal && abortCleanup) signal.removeEventListener('abort', abortCleanup)
          if (result.value) lastDataTime = Date.now()
          resolve(result)
        },
        err => {
          clearTimeout(timeoutId)
          if (signal && abortCleanup) signal.removeEventListener('abort', abortCleanup)
          reject(err)
        },
      )
    })
  }
  while (true) {
-    const { done, value } = await readWithTimeout()
+    const { done, value } = await reader.read()
    if (done) break
    buffer += decoder.decode(value, { stream: true })
@@ -693,11 +649,10 @@ function determineStopReason(
 export async function collectCodexCompletedResponse(
  response: Response,
  signal?: AbortSignal,
 ): Promise<Record<string, any>> {
  let completedResponse: Record<string, any> | undefined
-  for await (const event of readSseEvents(response, signal)) {
+  for await (const event of readSseEvents(response)) {
    if (event.event === 'response.failed') {
      const msg = event.data?.response?.error?.message ??
        event.data?.error?.message ?? 'Codex response failed'
@@ -726,7 +681,6 @@ export async function collectCodexCompletedResponse(
 export async function* codexStreamToAnthropic(
  response: Response,
  model: string,
  signal?: AbortSignal,
 ): AsyncGenerator<AnthropicStreamEvent> {
  const messageId = makeMessageId()
  const toolBlocksByItemId = new Map<
@@ -788,7 +742,7 @@ export async function* codexStreamToAnthropic(
    },
  }
-  for await (const event of readSseEvents(response, signal)) {
+  for await (const event of readSseEvents(response)) {
    const payload = event.data
    if (event.event === 'response.output_item.added') {
--- a/src/services/api/codexUsage.ts
+++ b/src/services/api/codexUsage.ts
@@ -1,13 +1,7 @@
 import {
  readCodexCredentialsAsync,
  refreshCodexAccessTokenIfNeeded,
 } from '../../utils/codexCredentials.js'
 import { logForDebugging } from '../../utils/debug.js'
 import { isBareMode } from '../../utils/envUtils.js'
 import {
  DEFAULT_CODEX_BASE_URL,
  isCodexBaseUrl,
-  resolveRuntimeCodexCredentials,
+  resolveCodexApiCredentials,
  resolveProviderRequest,
 } from './providerConfig.js'
@@ -397,18 +391,6 @@ export function getCodexUsageUrl(baseUrl = DEFAULT_CODEX_BASE_URL): string {
 }
 export async function fetchCodexUsage(): Promise<CodexUsageData> {
  const refreshResult = await refreshCodexAccessTokenIfNeeded().catch(
    async error => {
      logForDebugging(
        `[codex] access token refresh failed before usage fetch: ${error instanceof Error ? error.message : String(error)}`,
        { level: 'warn' },
      )
      return {
        refreshed: false,
        credentials: await readCodexCredentialsAsync(),
      }
    },
  )
  const request = resolveProviderRequest({
    model: process.env.OPENAI_MODEL,
    baseUrl: process.env.OPENAI_BASE_URL,
@@ -419,19 +401,16 @@ export async function fetchCodexUsage(): Promise<CodexUsageData> {
    )
  }
-  const credentials = resolveRuntimeCodexCredentials({
+  const credentials = resolveCodexApiCredentials()
    storedCredentials: refreshResult.credentials,
  })
  if (!credentials.apiKey) {
    const oauthHint = isBareMode() ? '' : ', choose Codex OAuth in /provider'
    const authHint = credentials.authPath
-      ? `${oauthHint} or place a Codex auth.json at ${credentials.authPath}`
+      ? ` or place a Codex auth.json at ${credentials.authPath}`
-      : oauthHint
+      : ''
    throw new Error(`Codex auth is required. Set CODEX_API_KEY${authHint}.`)
  }
  if (!credentials.accountId) {
    throw new Error(
-      'Codex auth is missing chatgpt_account_id. Re-login with Codex OAuth, the Codex CLI, or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID.',
+      'Codex auth is missing chatgpt_account_id. Re-login with the Codex CLI or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID.',
    )
  }
--- a/src/services/api/errors.openaiCompatibility.test.ts
+++ b/src/services/api/errors.openaiCompatibility.test.ts
@@ -1,44 +0,0 @@
 import { APIError } from '@anthropic-ai/sdk'
 import { expect, test } from 'bun:test'
 import { getAssistantMessageFromError } from './errors.js'
 function getFirstText(message: ReturnType<typeof getAssistantMessageFromError>): string {
  const first = message.message.content[0]
  if (!first || typeof first !== 'object' || !('text' in first)) {
    return ''
  }
  return typeof first.text === 'string' ? first.text : ''
 }
 test('maps endpoint_not_found category markers to actionable setup guidance', () => {
  const error = APIError.generate(
    404,
    undefined,
    'OpenAI API error 404: Not Found [openai_category=endpoint_not_found] Hint: Confirm OPENAI_BASE_URL includes /v1.',
    new Headers(),
  )
  const message = getAssistantMessageFromError(error, 'qwen2.5-coder:7b')
  const text = getFirstText(message)
  expect(message.isApiErrorMessage).toBe(true)
  expect(text).toContain('Provider endpoint was not found')
  expect(text).toContain('OPENAI_BASE_URL')
  expect(text).toContain('/v1')
 })
 test('maps tool_call_incompatible category markers to model/tool guidance', () => {
  const error = APIError.generate(
    400,
    undefined,
    'OpenAI API error 400: tool_calls are not supported [openai_category=tool_call_incompatible]',
    new Headers(),
  )
  const message = getAssistantMessageFromError(error, 'qwen2.5-coder:7b')
  const text = getFirstText(message)
  expect(text).toContain('rejected tool-calling payloads')
  expect(text).toContain('/model')
 })
--- a/src/services/api/errors.ts
+++ b/src/services/api/errors.ts
@@ -50,110 +50,9 @@ import {
 } from '../claudeAiLimits.js'
 import { shouldProcessRateLimits } from '../rateLimitMocking.js' // Used for /mock-limits command
 import { extractConnectionErrorDetails, formatAPIError } from './errorUtils.js'
 import {
  extractOpenAICategoryMarker,
  type OpenAICompatibilityFailureCategory,
 } from './openaiErrorClassification.js'
 export const API_ERROR_MESSAGE_PREFIX = 'API Error'
 function stripOpenAICompatibilityMetadata(message: string): string {
  return message
    .replace(/\s*\[openai_category=[a-z_]+\]\s*/g, ' ')
    .replace(/\s{2,}/g, ' ')
    .trim()
 }
 function mapOpenAICompatibilityFailureToAssistantMessage(options: {
  category: OpenAICompatibilityFailureCategory
  model: string
  rawMessage: string
 }): AssistantMessage {
  const switchCmd = getIsNonInteractiveSession() ? '--model' : '/model'
  const compactHint = getIsNonInteractiveSession()
    ? 'Reduce prompt size or start a new session.'
    : 'Run /compact or start a new session with /new.'
  switch (options.category) {
    case 'localhost_resolution_failed':
    case 'connection_refused':
      return createAssistantAPIErrorMessage({
        content:
          'Could not connect to the local OpenAI-compatible provider. Ensure the local server is running, then use OPENAI_BASE_URL=http://127.0.0.1:11434/v1 for Ollama.',
        error: 'unknown',
      })
    case 'endpoint_not_found':
      return createAssistantAPIErrorMessage({
        content:
          'Provider endpoint was not found. Confirm OPENAI_BASE_URL targets an OpenAI-compatible /v1 endpoint (for Ollama: http://127.0.0.1:11434/v1).',
        error: 'invalid_request',
      })
    case 'model_not_found':
      return createAssistantAPIErrorMessage({
        content: `The selected model (${options.model}) is not available on this provider. Run ${switchCmd} to choose another model, or verify installed local models (for Ollama: ollama list).`,
        error: 'invalid_request',
      })
    case 'auth_invalid':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: Authentication failed for your OpenAI-compatible provider. Verify OPENAI_API_KEY and endpoint-specific auth requirements.`,
        error: 'authentication_failed',
      })
    case 'rate_limited':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: Provider rate limit reached. Retry in a few seconds.`,
        error: 'rate_limit',
      })
    case 'request_timeout':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: Provider request timed out. Local models may be loading or overloaded; retry shortly or increase API_TIMEOUT_MS.`,
        error: 'unknown',
      })
    case 'context_overflow':
      return createAssistantAPIErrorMessage({
        content: `The conversation exceeded the provider context limit. ${compactHint}`,
        error: 'invalid_request',
      })
    case 'tool_call_incompatible':
      return createAssistantAPIErrorMessage({
        content: `The selected provider/model rejected tool-calling payloads. Try ${switchCmd} to pick a tool-capable model or continue without tools.`,
        error: 'invalid_request',
      })
    case 'malformed_provider_response':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: Provider returned a malformed response. Confirm endpoint compatibility and check local proxy/network middleware.`,
        error: 'unknown',
        errorDetails: stripOpenAICompatibilityMetadata(options.rawMessage),
      })
    case 'provider_unavailable':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: Provider is temporarily unavailable. Retry in a moment.`,
        error: 'unknown',
      })
    case 'network_error':
    case 'unknown':
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: ${stripOpenAICompatibilityMetadata(options.rawMessage)}`,
        error: 'unknown',
      })
    default:
      return createAssistantAPIErrorMessage({
        content: `${API_ERROR_MESSAGE_PREFIX}: ${stripOpenAICompatibilityMetadata(options.rawMessage)}`,
        error: 'unknown',
      })
  }
 }
 export function startsWithApiErrorPrefix(text: string): boolean {
  return (
    text.startsWith(API_ERROR_MESSAGE_PREFIX) ||
@@ -558,19 +457,6 @@ export function getAssistantMessageFromError(
    })
  }
  // OpenAI-compatible transport and HTTP failures include structured category
  // markers from openaiShim.ts for actionable end-user remediation.
  if (error instanceof APIError) {
    const openaiCategory = extractOpenAICategoryMarker(error.message)
    if (openaiCategory) {
      return mapOpenAICompatibilityFailureToAssistantMessage({
        category: openaiCategory,
        model,
        rawMessage: error.message,
      })
    }
  }
  // Check for emergency capacity off switch for Opus PAYG users
  if (
    error instanceof Error &&
@@ -1038,30 +924,6 @@ export function getAssistantMessageFromError(
    })
  }
  // 500 errors caused by context overflow — the API returns 500 instead of 400
  // when the request body (including conversation context) exceeds limits.
  // This happens when auto-compact fails or the token estimation undercounts.
  // Detect by checking for context-related keywords in 500 responses.
  if (
    error instanceof APIError &&
    error.status >= 500 &&
    (error.message.toLowerCase().includes('too many tokens') ||
      error.message.toLowerCase().includes('request too large') ||
      error.message.toLowerCase().includes('context length') ||
      error.message.toLowerCase().includes('maximum context') ||
      error.message.toLowerCase().includes('input length') ||
      error.message.toLowerCase().includes('payload too large'))
  ) {
    const rewindInstruction = getIsNonInteractiveSession()
      ? ''
      : ' Press esc twice to go up a few messages, or run /compact to reduce context.'
    return createAssistantAPIErrorMessage({
      content: `The conversation has grown too large for the API to process.${rewindInstruction} Alternatively, start a new session with /new.`,
      error: 'invalid_request',
      errorDetails: `Context overflow (500): ${error.message}`,
    })
  }
  // Connection errors (non-timeout) — use formatAPIError for detailed messages
  if (error instanceof APIConnectionError) {
    return createAssistantAPIErrorMessage({
--- a/src/services/api/fetchWithProxyRetry.test.ts
+++ b/src/services/api/fetchWithProxyRetry.test.ts
@@ -1,86 +0,0 @@
 import { afterEach, beforeEach, expect, test } from 'bun:test'
 import { _resetKeepAliveForTesting } from '../../utils/proxy.js'
 import {
  fetchWithProxyRetry,
  isRetryableFetchError,
 } from './fetchWithProxyRetry.js'
 type FetchType = typeof globalThis.fetch
 const originalFetch = globalThis.fetch
 const originalEnv = {
  HTTP_PROXY: process.env.HTTP_PROXY,
  HTTPS_PROXY: process.env.HTTPS_PROXY,
 }
 function restoreEnv(key: 'HTTP_PROXY' | 'HTTPS_PROXY', value: string | undefined): void {
  if (value === undefined) {
    delete process.env[key]
  } else {
    process.env[key] = value
  }
 }
 beforeEach(() => {
  process.env.HTTP_PROXY = 'http://127.0.0.1:15236'
  delete process.env.HTTPS_PROXY
  _resetKeepAliveForTesting()
 })
 afterEach(() => {
  globalThis.fetch = originalFetch
  restoreEnv('HTTP_PROXY', originalEnv.HTTP_PROXY)
  restoreEnv('HTTPS_PROXY', originalEnv.HTTPS_PROXY)
  _resetKeepAliveForTesting()
 })
 test('isRetryableFetchError matches Bun socket-closed failures', () => {
  expect(
    isRetryableFetchError(
      new Error(
        'The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()',
      ),
    ),
  ).toBe(true)
 })
 test('fetchWithProxyRetry retries once with keepalive disabled after socket closure', async () => {
  const calls: Array<RequestInit | undefined> = []
  globalThis.fetch = (async (_input, init) => {
    calls.push(init)
    if (calls.length === 1) {
      throw new Error(
        'The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()',
      )
    }
    return new Response('ok')
  }) as FetchType
  const response = await fetchWithProxyRetry('https://example.com/search', {
    method: 'POST',
  })
  expect(await response.text()).toBe('ok')
  expect(calls).toHaveLength(2)
  expect((calls[0] as RequestInit & { proxy?: string }).proxy).toBe(
    'http://127.0.0.1:15236',
  )
  expect((calls[0] as RequestInit).keepalive).toBeUndefined()
  expect((calls[1] as RequestInit).keepalive).toBe(false)
 })
 test('fetchWithProxyRetry does not retry non-network errors', async () => {
  let attempts = 0
  globalThis.fetch = (async () => {
    attempts += 1
    throw new Error('400 bad request')
  }) as FetchType
  await expect(fetchWithProxyRetry('https://example.com')).rejects.toThrow(
    '400 bad request',
  )
  expect(attempts).toBe(1)
 })
--- a/src/services/api/fetchWithProxyRetry.ts
+++ b/src/services/api/fetchWithProxyRetry.ts
@@ -1,44 +0,0 @@
 import { disableKeepAlive, getProxyFetchOptions } from '../../utils/proxy.js'
 const RETRYABLE_FETCH_ERROR_PATTERN =
  /socket connection was closed unexpectedly|ECONNRESET|EPIPE|socket hang up|Connection reset by peer|fetch failed/i
 export function isRetryableFetchError(error: unknown): boolean {
  if (!(error instanceof Error)) {
    return false
  }
  if (error.name === 'AbortError') {
    return false
  }
  return RETRYABLE_FETCH_ERROR_PATTERN.test(error.message)
 }
 export async function fetchWithProxyRetry(
  input: string | URL | Request,
  init?: RequestInit,
  options?: { forAnthropicAPI?: boolean; maxAttempts?: number },
 ): Promise<Response> {
  const maxAttempts = Math.max(1, options?.maxAttempts ?? 2)
  let lastError: unknown
  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
    try {
      return await fetch(input, {
        ...init,
        ...getProxyFetchOptions({
          forAnthropicAPI: options?.forAnthropicAPI,
        }),
      })
    } catch (error) {
      lastError = error
      if (attempt >= maxAttempts || !isRetryableFetchError(error)) {
        throw error
      }
      disableKeepAlive()
    }
  }
  throw lastError instanceof Error
    ? lastError
    : new Error('Fetch failed without an error object')
 }
--- a/src/services/api/openaiErrorClassification.test.ts
+++ b/src/services/api/openaiErrorClassification.test.ts
@@ -1,97 +0,0 @@
 import { expect, test } from 'bun:test'
 import {
  buildOpenAICompatibilityErrorMessage,
  classifyOpenAIHttpFailure,
  classifyOpenAINetworkFailure,
  extractOpenAICategoryMarker,
  formatOpenAICategoryMarker,
 } from './openaiErrorClassification.js'
 test('classifies localhost ECONNREFUSED as connection_refused', () => {
  const error = Object.assign(new TypeError('fetch failed'), {
    code: 'ECONNREFUSED',
  })
  const failure = classifyOpenAINetworkFailure(error, {
    url: 'http://localhost:11434/v1/chat/completions',
  })
  expect(failure.category).toBe('connection_refused')
  expect(failure.retryable).toBe(true)
  expect(failure.code).toBe('ECONNREFUSED')
  expect(failure.hint).toContain('local server is running')
 })
 test('classifies localhost ENOTFOUND as localhost_resolution_failed', () => {
  const error = Object.assign(new TypeError('getaddrinfo ENOTFOUND localhost'), {
    code: 'ENOTFOUND',
  })
  const failure = classifyOpenAINetworkFailure(error, {
    url: 'http://localhost:11434/v1/chat/completions',
  })
  expect(failure.category).toBe('localhost_resolution_failed')
  expect(failure.retryable).toBe(true)
  expect(failure.code).toBe('ENOTFOUND')
  expect(failure.hint).toContain('127.0.0.1')
 })
 test('classifies model-not-found 404 responses', () => {
  const failure = classifyOpenAIHttpFailure({
    status: 404,
    body: 'The model qwen2.5-coder:7b was not found',
  })
  expect(failure.category).toBe('model_not_found')
  expect(failure.retryable).toBe(false)
 })
 test('classifies generic 404 responses as endpoint_not_found', () => {
  const failure = classifyOpenAIHttpFailure({
    status: 404,
    body: 'Not Found',
  })
  expect(failure.category).toBe('endpoint_not_found')
  expect(failure.hint).toContain('/v1')
 })
 test('classifies context-overflow responses', () => {
  const failure = classifyOpenAIHttpFailure({
    status: 500,
    body: 'request too large: maximum context length exceeded',
  })
  expect(failure.category).toBe('context_overflow')
  expect(failure.retryable).toBe(false)
 })
 test('classifies tool compatibility failures', () => {
  const failure = classifyOpenAIHttpFailure({
    status: 400,
    body: 'tool_calls are not supported by this model',
  })
  expect(failure.category).toBe('tool_call_incompatible')
 })
 test('embeds and extracts category markers in formatted messages', () => {
  const marker = formatOpenAICategoryMarker('endpoint_not_found')
  expect(marker).toBe('[openai_category=endpoint_not_found]')
  const formatted = buildOpenAICompatibilityErrorMessage('OpenAI API error 404: Not Found', {
    category: 'endpoint_not_found',
    hint: 'Confirm OPENAI_BASE_URL includes /v1.',
  })
  expect(formatted).toContain('[openai_category=endpoint_not_found]')
  expect(formatted).toContain('Hint: Confirm OPENAI_BASE_URL includes /v1.')
  expect(extractOpenAICategoryMarker(formatted)).toBe('endpoint_not_found')
 })
 test('ignores unknown category markers during extraction', () => {
  const malformed = 'OpenAI API error 500 [openai_category=totally_fake_category]'
  expect(extractOpenAICategoryMarker(malformed)).toBeUndefined()
 })
--- a/src/services/api/openaiErrorClassification.ts
+++ b/src/services/api/openaiErrorClassification.ts
@@ -1,355 +0,0 @@
 export type OpenAICompatibilityFailureCategory =
  | 'connection_refused'
  | 'localhost_resolution_failed'
  | 'request_timeout'
  | 'network_error'
  | 'auth_invalid'
  | 'rate_limited'
  | 'model_not_found'
  | 'endpoint_not_found'
  | 'context_overflow'
  | 'tool_call_incompatible'
  | 'malformed_provider_response'
  | 'provider_unavailable'
  | 'unknown'
 export type OpenAICompatibilityFailure = {
  source: 'network' | 'http'
  category: OpenAICompatibilityFailureCategory
  retryable: boolean
  message: string
  hint?: string
  code?: string
  status?: number
 }
 const OPENAI_CATEGORY_MARKER_PREFIX = '[openai_category='
 const LOCALHOST_HOSTNAMES = new Set(['localhost', '127.0.0.1', '::1'])
 const OPENAI_COMPATIBILITY_FAILURE_CATEGORIES: ReadonlySet<OpenAICompatibilityFailureCategory> =
  new Set<OpenAICompatibilityFailureCategory>([
    'connection_refused',
    'localhost_resolution_failed',
    'request_timeout',
    'network_error',
    'auth_invalid',
    'rate_limited',
    'model_not_found',
    'endpoint_not_found',
    'context_overflow',
    'tool_call_incompatible',
    'malformed_provider_response',
    'provider_unavailable',
    'unknown',
  ])
 function isOpenAICompatibilityFailureCategory(
  value: string,
 ): value is OpenAICompatibilityFailureCategory {
  return OPENAI_COMPATIBILITY_FAILURE_CATEGORIES.has(
    value as OpenAICompatibilityFailureCategory,
  )
 }
 function getErrorCode(error: unknown): string | undefined {
  let current: unknown = error
  const maxDepth = 5
  for (let depth = 0; depth < maxDepth; depth++) {
    if (
      current &&
      typeof current === 'object' &&
      'code' in current &&
      typeof (current as { code?: unknown }).code === 'string'
    ) {
      return (current as { code: string }).code
    }
    if (
      current &&
      typeof current === 'object' &&
      'cause' in current &&
      (current as { cause?: unknown }).cause !== current
    ) {
      current = (current as { cause?: unknown }).cause
      continue
    }
    break
  }
  return undefined
 }
 function getHostname(url: string): string | null {
  try {
    return new URL(url).hostname.toLowerCase()
  } catch {
    return null
  }
 }
 function isLocalhostLikeHostname(hostname: string | null): boolean {
  if (!hostname) return false
  if (LOCALHOST_HOSTNAMES.has(hostname)) return true
  return /^127\./.test(hostname)
 }
 function isContextOverflowMessage(body: string): boolean {
  const lower = body.toLowerCase()
  return (
    lower.includes('too many tokens') ||
    lower.includes('request too large') ||
    lower.includes('context length') ||
    lower.includes('maximum context') ||
    lower.includes('input length') ||
    lower.includes('payload too large') ||
    lower.includes('prompt is too long')
  )
 }
 function isToolCompatibilityMessage(body: string): boolean {
  const lower = body.toLowerCase()
  return (
    lower.includes('tool_calls') ||
    lower.includes('tool_call') ||
    lower.includes('tool_use') ||
    lower.includes('tool_result') ||
    lower.includes('function calling') ||
    lower.includes('function call')
  )
 }
 function isMalformedProviderResponse(body: string): boolean {
  const lower = body.toLowerCase()
  return (
    lower.includes('<!doctype html') ||
    lower.includes('<html') ||
    lower.includes('invalid json') ||
    lower.includes('malformed') ||
    lower.includes('unexpected token') ||
    lower.includes('cannot parse') ||
    lower.includes('not valid json')
  )
 }
 function isModelNotFoundMessage(body: string): boolean {
  const lower = body.toLowerCase()
  return (
    lower.includes('model') &&
    (
      lower.includes('not found') ||
      lower.includes('does not exist') ||
      lower.includes('unknown model') ||
      lower.includes('unavailable model')
    )
  )
 }
 export function formatOpenAICategoryMarker(
  category: OpenAICompatibilityFailureCategory,
 ): string {
  return `${OPENAI_CATEGORY_MARKER_PREFIX}${category}]`
 }
 export function extractOpenAICategoryMarker(
  message: string,
 ): OpenAICompatibilityFailureCategory | undefined {
  const match = message.match(/\[openai_category=([a-z_]+)]/)
  const category = match?.[1]
  if (!category || !isOpenAICompatibilityFailureCategory(category)) {
    return undefined
  }
  return category
 }
 export function buildOpenAICompatibilityErrorMessage(
  baseMessage: string,
  failure: Pick<OpenAICompatibilityFailure, 'category' | 'hint'>,
 ): string {
  const marker = formatOpenAICategoryMarker(failure.category)
  const hint = failure.hint ? ` Hint: ${failure.hint}` : ''
  return `${baseMessage} ${marker}${hint}`
 }
 export function classifyOpenAINetworkFailure(
  error: unknown,
  options: { url: string },
 ): OpenAICompatibilityFailure {
  const message = error instanceof Error ? error.message : String(error)
  const lowerMessage = message.toLowerCase()
  const code = getErrorCode(error)
  const hostname = getHostname(options.url)
  const isLocalHost = isLocalhostLikeHostname(hostname)
  if (
    code === 'ETIMEDOUT' ||
    code === 'UND_ERR_CONNECT_TIMEOUT' ||
    lowerMessage.includes('timeout') ||
    lowerMessage.includes('timed out') ||
    lowerMessage.includes('aborterror')
  ) {
    return {
      source: 'network',
      category: 'request_timeout',
      retryable: true,
      message,
      code,
      hint: 'The provider took too long to respond. Check local model load time or increase API timeout.',
    }
  }
  if (
    isLocalHost &&
    (
      code === 'ENOTFOUND' ||
      code === 'EAI_AGAIN' ||
      lowerMessage.includes('getaddrinfo') ||
      (code === undefined && lowerMessage.includes('fetch failed'))
    )
  ) {
    return {
      source: 'network',
      category: 'localhost_resolution_failed',
      retryable: true,
      message,
      code,
      hint: 'Localhost failed for this request. Retry with 127.0.0.1 and confirm Ollama is serving on the configured port.',
    }
  }
  if (code === 'ECONNREFUSED') {
    return {
      source: 'network',
      category: 'connection_refused',
      retryable: true,
      message,
      code,
      hint: isLocalHost
        ? 'Connection to the local provider was refused. Ensure the local server is running and listening on the configured port.'
        : 'Connection was refused by the provider endpoint. Ensure the server is running and the port is correct.',
    }
  }
  return {
    source: 'network',
    category: 'network_error',
    retryable: true,
    message,
    code,
    hint: 'Network transport failed before a provider response was received.',
  }
 }
 export function classifyOpenAIHttpFailure(options: {
  status: number
  body: string
 }): OpenAICompatibilityFailure {
  const body = options.body ?? ''
  if (options.status === 401 || options.status === 403) {
    return {
      source: 'http',
      category: 'auth_invalid',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'Authentication failed. Verify API key, token source, and endpoint-specific auth headers.',
    }
  }
  if (options.status === 429) {
    return {
      source: 'http',
      category: 'rate_limited',
      retryable: true,
      status: options.status,
      message: body,
      hint: 'Provider rate-limited the request. Retry after backoff.',
    }
  }
  if (options.status === 404 && isModelNotFoundMessage(body)) {
    return {
      source: 'http',
      category: 'model_not_found',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'The selected model is not installed or not available on this endpoint.',
    }
  }
  if (options.status === 404) {
    return {
      source: 'http',
      category: 'endpoint_not_found',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'Endpoint was not found. Confirm OPENAI_BASE_URL includes /v1 for OpenAI-compatible local providers.',
    }
  }
  if (
    options.status === 413 ||
    ((options.status === 400 || options.status >= 500) &&
      isContextOverflowMessage(body))
  ) {
    return {
      source: 'http',
      category: 'context_overflow',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'Prompt context exceeded model/server limits. Reduce context or increase provider context length.',
    }
  }
  if (options.status === 400 && isToolCompatibilityMessage(body)) {
    return {
      source: 'http',
      category: 'tool_call_incompatible',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'Provider/model rejected tool-calling payload. Retry without tools or use a tool-capable model.',
    }
  }
  if (
    (options.status >= 200 && options.status < 300 && isMalformedProviderResponse(body)) ||
    (options.status >= 400 && isMalformedProviderResponse(body))
  ) {
    return {
      source: 'http',
      category: 'malformed_provider_response',
      retryable: false,
      status: options.status,
      message: body,
      hint: 'Provider returned malformed or non-JSON response where JSON was expected.',
    }
  }
  if (options.status >= 500) {
    return {
      source: 'http',
      category: 'provider_unavailable',
      retryable: true,
      status: options.status,
      message: body,
      hint: 'Provider reported a server-side failure. Retry after a short delay.',
    }
  }
  return {
    source: 'http',
    category: 'unknown',
    retryable: false,
    status: options.status,
    message: body,
  }
 }
--- a/src/services/api/openaiShim.diagnostics.test.ts
+++ b/src/services/api/openaiShim.diagnostics.test.ts
@@ -1,119 +0,0 @@
 import { afterEach, expect, mock, test } from 'bun:test'
 const originalFetch = globalThis.fetch
 const originalEnv = {
  OPENAI_BASE_URL: process.env.OPENAI_BASE_URL,
  OPENAI_API_KEY: process.env.OPENAI_API_KEY,
  OPENAI_MODEL: process.env.OPENAI_MODEL,
 }
 function restoreEnv(key: string, value: string | undefined): void {
  if (value === undefined) {
    delete process.env[key]
  } else {
    process.env[key] = value
  }
 }
 afterEach(() => {
  globalThis.fetch = originalFetch
  restoreEnv('OPENAI_BASE_URL', originalEnv.OPENAI_BASE_URL)
  restoreEnv('OPENAI_API_KEY', originalEnv.OPENAI_API_KEY)
  restoreEnv('OPENAI_MODEL', originalEnv.OPENAI_MODEL)
  mock.restore()
 })
 test('logs classified transport diagnostics with category and code', async () => {
  const debugSpy = mock(() => {})
  mock.module('../../utils/debug.js', () => ({
    logForDebugging: debugSpy,
  }))
  const nonce = `${Date.now()}-${Math.random()}`
  const { createOpenAIShimClient } = await import(`./openaiShim.ts?ts=${nonce}`)
  process.env.OPENAI_BASE_URL = 'http://localhost:11434/v1'
  process.env.OPENAI_API_KEY = 'ollama'
  const transportError = Object.assign(new TypeError('fetch failed'), {
    code: 'ECONNREFUSED',
  })
  globalThis.fetch = mock(async () => {
    throw transportError
  }) as typeof globalThis.fetch
  const client = createOpenAIShimClient({}) as {
    beta: {
      messages: {
        create: (params: Record<string, unknown>) => Promise<unknown>
      }
    }
  }
  await expect(
    client.beta.messages.create({
      model: 'qwen2.5-coder:7b',
      messages: [{ role: 'user', content: 'hello' }],
      max_tokens: 64,
      stream: false,
    }),
  ).rejects.toThrow('openai_category=connection_refused')
  const transportLog = debugSpy.mock.calls.find(call =>
    typeof call?.[0] === 'string' && call[0].includes('transport failure'),
  )
  expect(transportLog).toBeDefined()
  expect(String(transportLog?.[0])).toContain('category=connection_refused')
  expect(String(transportLog?.[0])).toContain('code=ECONNREFUSED')
  expect(transportLog?.[1]).toEqual({ level: 'warn' })
 })
 test('redacts credentials in transport diagnostic URL logs', async () => {
  const debugSpy = mock(() => {})
  mock.module('../../utils/debug.js', () => ({
    logForDebugging: debugSpy,
  }))
  const nonce = `${Date.now()}-${Math.random()}`
  const { createOpenAIShimClient } = await import(`./openaiShim.ts?ts=${nonce}`)
  process.env.OPENAI_BASE_URL = 'http://user:supersecret@localhost:11434/v1'
  process.env.OPENAI_API_KEY = 'supersecret'
  const transportError = Object.assign(new TypeError('fetch failed'), {
    code: 'ECONNREFUSED',
  })
  globalThis.fetch = mock(async () => {
    throw transportError
  }) as typeof globalThis.fetch
  const client = createOpenAIShimClient({}) as {
    beta: {
      messages: {
        create: (params: Record<string, unknown>) => Promise<unknown>
      }
    }
  }
  await expect(
    client.beta.messages.create({
      model: 'qwen2.5-coder:7b',
      messages: [{ role: 'user', content: 'hello' }],
      max_tokens: 64,
      stream: false,
    }),
  ).rejects.toThrow('openai_category=connection_refused')
  const transportLog = debugSpy.mock.calls.find(call =>
    typeof call?.[0] === 'string' && call[0].includes('transport failure'),
  )
  expect(transportLog).toBeDefined()
  const logLine = String(transportLog?.[0])
  expect(logLine).toContain('url=http://redacted:redacted@localhost:11434/v1/chat/completions')
  expect(logLine).not.toContain('user:supersecret')
  expect(logLine).not.toContain('supersecret@')
 })
--- a/src/services/api/openaiShim.test.ts
+++ b/src/services/api/openaiShim.test.ts
@@ -403,97 +403,6 @@ test('preserves usage from final OpenAI stream chunk with empty choices', async
  expect(usageEvent?.usage?.output_tokens).toBe(45)
 })
 test('uses max_tokens instead of max_completion_tokens for local providers', async () => {
  process.env.OPENAI_BASE_URL = 'http://localhost:11434/v1'
  globalThis.fetch = (async (_input, init) => {
    const body = JSON.parse(String(init?.body))
    expect(body.max_tokens).toBe(64)
    expect(body.max_completion_tokens).toBeUndefined()
    expect(body.stream_options).toBeUndefined()
    return new Response(
      JSON.stringify({
        id: 'chatcmpl-1',
        model: 'llama3.1:8b',
        choices: [
          {
            message: {
              role: 'assistant',
              content: 'hello',
            },
            finish_reason: 'stop',
          },
        ],
        usage: {
          prompt_tokens: 5,
          completion_tokens: 1,
          total_tokens: 6,
        },
      }),
      {
        headers: {
          'Content-Type': 'application/json',
        },
      },
    )
  }) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await client.beta.messages.create({
    model: 'llama3.1:8b',
    messages: [{ role: 'user', content: 'hello' }],
    max_tokens: 64,
    stream: false,
  })
 })
 test('keeps max_completion_tokens for non-local non-github providers', async () => {
  process.env.OPENAI_BASE_URL = 'https://api.openai.com/v1'
  globalThis.fetch = (async (_input, init) => {
    const body = JSON.parse(String(init?.body))
    expect(body.max_completion_tokens).toBe(64)
    expect(body.max_tokens).toBeUndefined()
    return new Response(
      JSON.stringify({
        id: 'chatcmpl-1',
        model: 'gpt-4o',
        choices: [
          {
            message: {
              role: 'assistant',
              content: 'hello',
            },
            finish_reason: 'stop',
          },
        ],
        usage: {
          prompt_tokens: 5,
          completion_tokens: 1,
          total_tokens: 6,
        },
      }),
      {
        headers: {
          'Content-Type': 'application/json',
        },
      },
    )
  }) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await client.beta.messages.create({
    model: 'gpt-4o',
    messages: [{ role: 'user', content: 'hello' }],
    max_tokens: 64,
    stream: false,
  })
 })
 test('preserves Gemini tool call extra_content in follow-up requests', async () => {
  let requestBody: Record<string, unknown> | undefined
@@ -780,117 +689,9 @@ test('preserves image tool results as placeholders in follow-up requests', async
  const toolMessage = (requestBody?.messages as Array<Record<string, unknown>>).find(
    message => message.role === 'tool',
-  ) as {
+  ) as { content?: string } | undefined
    content?: Array<{
      type: string
      text?: string
      image_url?: { url: string }
    }> | string
  } | undefined
-  expect(Array.isArray(toolMessage?.content)).toBe(true)
+  expect(toolMessage?.content).toContain('[image:image/png]')
  const parts = toolMessage?.content as Array<{
    type: string
    text?: string
    image_url?: { url: string }
  }>
  const imagePart = parts.find(part => part.type === 'image_url')
  expect(imagePart?.image_url?.url).toBe('data:image/png;base64,ZmFrZQ==')
 })
 test('preserves mixed text and image tool results as multipart content', async () => {
  let requestBody: Record<string, unknown> | undefined
  globalThis.fetch = (async (_input, init) => {
    requestBody = JSON.parse(String(init?.body))
    return new Response(
      JSON.stringify({
        id: 'chatcmpl-1',
        model: 'gpt-4o',
        choices: [
          {
            message: {
              role: 'assistant',
              content: 'done',
            },
            finish_reason: 'stop',
          },
        ],
        usage: {
          prompt_tokens: 12,
          completion_tokens: 4,
          total_tokens: 16,
        },
      }),
      {
        headers: {
          'Content-Type': 'application/json',
        },
      },
    )
  }) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await client.beta.messages.create({
    model: 'gpt-4o',
    system: 'test system',
    messages: [
      { role: 'user', content: 'Read this screenshot' },
      {
        role: 'assistant',
        content: [
          {
            type: 'tool_use',
            id: 'call_image_2',
            name: 'Read',
            input: { file_path: 'C:\\temp\\screenshot.png' },
          },
        ],
      },
      {
        role: 'user',
        content: [
          {
            type: 'tool_result',
            tool_use_id: 'call_image_2',
            content: [
              { type: 'text', text: 'Screenshot captured' },
              {
                type: 'image',
                source: {
                  type: 'base64',
                  media_type: 'image/png',
                  data: 'ZmFrZQ==',
                },
              },
            ],
          },
        ],
      },
    ],
    max_tokens: 64,
    stream: false,
  })
  const toolMessage = (requestBody?.messages as Array<Record<string, unknown>>).find(
    message => message.role === 'tool',
  ) as {
    content?: Array<{
      type: string
      text?: string
      image_url?: { url: string }
    }>
  } | undefined
  expect(Array.isArray(toolMessage?.content)).toBe(true)
  const parts = toolMessage?.content ?? []
  expect(parts[0]).toEqual({ type: 'text', text: 'Screenshot captured' })
  expect(parts[1]).toEqual({
    type: 'image_url',
    image_url: { url: 'data:image/png;base64,ZmFrZQ==' },
  })
 })
 test('uses GEMINI_ACCESS_TOKEN for Gemini OpenAI-compatible requests', async () => {
@@ -2775,172 +2576,3 @@ test('streaming: strips leaked reasoning preamble when split across multiple con
  expect(textDeltas).toEqual(['Hey! How can I help you today?'])
 })
 test('classifies localhost transport failures with actionable category marker', async () => {
  process.env.OPENAI_BASE_URL = 'http://localhost:11434/v1'
  const transportError = Object.assign(new TypeError('fetch failed'), {
    code: 'ECONNREFUSED',
  })
  globalThis.fetch = (async () => {
    throw transportError
  }) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await expect(
    client.beta.messages.create({
      model: 'qwen2.5-coder:7b',
      messages: [{ role: 'user', content: 'hello' }],
      max_tokens: 64,
      stream: false,
    }),
  ).rejects.toThrow('openai_category=connection_refused')
  await expect(
    client.beta.messages.create({
      model: 'qwen2.5-coder:7b',
      messages: [{ role: 'user', content: 'hello' }],
      max_tokens: 64,
      stream: false,
    }),
  ).rejects.toThrow('local server is running')
 })
 test('propagates AbortError without wrapping it as transport failure', async () => {
  process.env.OPENAI_BASE_URL = 'http://localhost:11434/v1'
  const abortError = new DOMException('The operation was aborted.', 'AbortError')
  globalThis.fetch = (async () => {
    throw abortError
  }) as FetchType
  const controller = new AbortController()
  controller.abort()
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await expect(
    client.beta.messages.create(
      {
        model: 'qwen2.5-coder:7b',
        messages: [{ role: 'user', content: 'hello' }],
        max_tokens: 64,
        stream: false,
      },
      { signal: controller.signal },
    ),
  ).rejects.toBe(abortError)
 })
 test('classifies chat-completions endpoint 404 failures with endpoint_not_found marker', async () => {
  process.env.OPENAI_BASE_URL = 'http://localhost:11434'
  globalThis.fetch = (async () =>
    new Response('Not Found', {
      status: 404,
      headers: {
        'Content-Type': 'text/plain',
      },
    })) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await expect(
    client.beta.messages.create({
      model: 'qwen2.5-coder:7b',
      messages: [{ role: 'user', content: 'hello' }],
      max_tokens: 64,
      stream: false,
    }),
  ).rejects.toThrow('openai_category=endpoint_not_found')
 })
 test('preserves valid tool_result and drops orphan tool_result', async () => {
  let requestBody: Record<string, unknown> | undefined
  globalThis.fetch = (async (_input, init) => {
    requestBody = JSON.parse(String(init?.body))
    return new Response(
      JSON.stringify({
        id: 'chatcmpl-1',
        model: 'mistral-large-latest',
        choices: [
          {
            message: {
              role: 'assistant',
              content: 'done',
            },
            finish_reason: 'stop',
          },
        ],
        usage: {
          prompt_tokens: 12,
          completion_tokens: 4,
          total_tokens: 16,
        },
      }),
      {
        headers: {
          'Content-Type': 'application/json',
        },
      },
    )
  }) as FetchType
  const client = createOpenAIShimClient({}) as OpenAIShimClient
  await client.beta.messages.create({
    model: 'mistral-large-latest',
    system: 'test system',
    messages: [
      { role: 'user', content: 'Search and then I will interrupt' },
      {
        role: 'assistant',
        content: [
          {
            type: 'tool_use',
            id: 'valid_call_1',
            name: 'Search',
            input: { query: 'openclaude' },
          },
        ],
      },
      {
        role: 'user',
        content: [
          {
            type: 'tool_result',
            tool_use_id: 'valid_call_1',
            content: 'Found it!',
          },
          {
            type: 'tool_result',
            tool_use_id: 'orphan_call_2',
            content: 'Interrupted result',
          },
          {
            role: 'user',
            content: 'What happened?',
          }
        ],
      },
    ],
    max_tokens: 64,
    stream: false,
  })
  const messages = requestBody?.messages as Array<Record<string, unknown>>
  // Should have: system, user, assistant (tool_use), tool (valid_call_1), user
  // Should NOT have: tool (orphan_call_2)
  const toolMessages = messages.filter(m => m.role === 'tool')
  expect(toolMessages.length).toBe(1)
  expect(toolMessages[0].tool_call_id).toBe('valid_call_1')
  const orphanMessage = toolMessages.find(m => m.tool_call_id === 'orphan_call_2')
  expect(orphanMessage).toBeUndefined()
 })
--- a/src/services/api/openaiShim.ts
+++ b/src/services/api/openaiShim.ts
@@ -22,12 +22,7 @@
 */
 import { APIError } from '@anthropic-ai/sdk'
-import {
+import { isEnvTruthy } from '../../utils/envUtils.js'
  readCodexCredentialsAsync,
  refreshCodexAccessTokenIfNeeded,
 } from '../../utils/codexCredentials.js'
 import { logForDebugging } from '../../utils/debug.js'
 import { isBareMode, isEnvTruthy } from '../../utils/envUtils.js'
 import { resolveGeminiCredential } from '../../utils/geminiAuth.js'
 import { hydrateGeminiAccessTokenFromSecureStorage } from '../../utils/geminiCredentials.js'
 import { hydrateGithubModelsTokenFromSecureStorage } from '../../utils/githubModelsCredentials.js'
@@ -47,18 +42,12 @@ import {
  type AnthropicUsage,
  type ShimCreateParams,
 } from './codexShim.js'
 import { fetchWithProxyRetry } from './fetchWithProxyRetry.js'
 import {
  isLocalProviderUrl,
-  resolveRuntimeCodexCredentials,
+  resolveCodexApiCredentials,
  resolveProviderRequest,
  getGithubEndpointType,
 } from './providerConfig.js'
 import {
  buildOpenAICompatibilityErrorMessage,
  classifyOpenAIHttpFailure,
  classifyOpenAINetworkFailure,
 } from './openaiErrorClassification.js'
 import { sanitizeSchemaForOpenAICompat } from '../../utils/schemaSanitizer.js'
 import { redactSecretValueForDisplay } from '../../utils/providerProfile.js'
 import {
@@ -88,19 +77,6 @@ const COPILOT_HEADERS: Record<string, string> = {
  'Copilot-Integration-Id': 'vscode-chat',
 }
 const SENSITIVE_URL_QUERY_PARAM_NAMES = [
  'api_key',
  'key',
  'token',
  'access_token',
  'refresh_token',
  'signature',
  'sig',
  'secret',
  'password',
  'authorization',
 ]
 function isGithubModelsMode(): boolean {
  return isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB)
 }
@@ -150,34 +126,6 @@ function formatRetryAfterHint(response: Response): string {
  return ra ? ` (Retry-After: ${ra})` : ''
 }
 function shouldRedactUrlQueryParam(name: string): boolean {
  const lower = name.toLowerCase()
  return SENSITIVE_URL_QUERY_PARAM_NAMES.some(token => lower.includes(token))
 }
 function redactUrlForDiagnostics(url: string): string {
  try {
    const parsed = new URL(url)
    if (parsed.username) {
      parsed.username = 'redacted'
    }
    if (parsed.password) {
      parsed.password = 'redacted'
    }
    for (const key of parsed.searchParams.keys()) {
      if (shouldRedactUrlQueryParam(key)) {
        parsed.searchParams.set(key, 'redacted')
      }
    }
    const serialized = parsed.toString()
    return redactSecretValueForDisplay(serialized, process.env as SecretValueSource) ?? serialized
  } catch {
    return redactSecretValueForDisplay(url, process.env as SecretValueSource) ?? url
  }
 }
 function sleepMs(ms: number): Promise<void> {
  return new Promise(resolve => setTimeout(resolve, ms))
 }
@@ -228,61 +176,35 @@ function convertSystemPrompt(
  return String(system)
 }
-function convertToolResultContent(
+function convertToolResultContent(content: unknown): string {
-  content: unknown,
+  if (typeof content === 'string') return content
-  isError?: boolean,
+  if (!Array.isArray(content)) return JSON.stringify(content ?? '')
 ): string | Array<{ type: string; text?: string; image_url?: { url: string } }> {
  if (typeof content === 'string') {
    return isError ? `Error: ${content}` : content
  }
  if (!Array.isArray(content)) {
    const text = JSON.stringify(content ?? '')
    return isError ? `Error: ${text}` : text
  }
-  const parts: Array<{
+  const chunks: string[] = []
    type: string
    text?: string
    image_url?: { url: string }
  }> = []
  for (const block of content) {
    if (block?.type === 'text' && typeof block.text === 'string') {
-      parts.push({ type: 'text', text: block.text })
+      chunks.push(block.text)
      continue
    }
    if (block?.type === 'image') {
      const source = block.source
      if (source?.type === 'url' && source.url) {
-        parts.push({ type: 'image_url', image_url: { url: source.url } })
+        chunks.push(`[Image](${source.url})`)
-      } else if (source?.type === 'base64' && source.media_type && source.data) {
+      } else if (source?.type === 'base64') {
-        parts.push({
+        chunks.push(`[image:${source.media_type ?? 'unknown'}]`)
-          type: 'image_url',
+      } else {
-          image_url: {
+        chunks.push('[image]')
            url: `data:${source.media_type};base64,${source.data}`,
          },
        })
      }
      continue
    }
    if (typeof block?.text === 'string') {
-      parts.push({ type: 'text', text: block.text })
+      chunks.push(block.text)
    }
  }
-  if (parts.length === 0) return ''
+  return chunks.join('\n')
  if (parts.length === 1 && parts[0].type === 'text') {
    const text = parts[0].text ?? ''
    return isError ? `Error: ${text}` : text
  }
  if (isError && parts[0]?.type === 'text') {
    parts[0] = { ...parts[0], text: `Error: ${parts[0].text ?? ''}` }
  } else if (isError) {
    parts.unshift({ type: 'text', text: 'Error:' })
  }
  return parts
 }
 function convertContentBlocks(
@@ -349,7 +271,6 @@ function convertMessages(
  system: unknown,
 ): OpenAIMessage[] {
  const result: OpenAIMessage[] = []
  const knownToolCallIds = new Set<string>()
  // System message first
  const sysText = convertSystemPrompt(system)
@@ -369,21 +290,14 @@ function convertMessages(
        const toolResults = content.filter((b: { type?: string }) => b.type === 'tool_result')
        const otherContent = content.filter((b: { type?: string }) => b.type !== 'tool_result')
-        // Emit tool results as tool messages, but ONLY if we have a matching tool_use ID.
+        // Emit tool results as tool messages
        // Mistral/OpenAI strictly require tool messages to follow an assistant message with tool_calls.
        // If the user interrupted (ESC) and a synthetic tool_result was generated without a recorded tool_use,
        // emitting it here would cause a "role must alternate" or "unexpected role" error.
        for (const tr of toolResults) {
-          const id = tr.tool_use_id ?? 'unknown'
+          const trContent = convertToolResultContent(tr.content)
-          if (knownToolCallIds.has(id)) {
+          result.push({
-            result.push({
+            role: 'tool',
-              role: 'tool',
+            tool_call_id: tr.tool_use_id ?? 'unknown',
-              tool_call_id: id,
+            content: tr.is_error ? `Error: ${trContent}` : trContent,
-              content: convertToolResultContent(tr.content, tr.is_error),
+          })
            })
          } else {
            logForDebugging(`Dropping orphan tool_result for ID: ${id} to prevent API error`)
          }
        }
        // Emit remaining user content
@@ -424,11 +338,9 @@ function convertMessages(
              input?: unknown
              extra_content?: Record<string, unknown>
              signature?: string
-            }) => {
+            }, index) => {
              const id = tu.id ?? `call_${crypto.randomUUID().replace(/-/g, '')}`
              knownToolCallIds.add(id)
              const toolCall: NonNullable<OpenAIMessage['tool_calls']>[number] = {
-                id,
+                id: tu.id ?? `call_${crypto.randomUUID().replace(/-/g, '')}`,
                type: 'function' as const,
                function: {
                  name: tu.name ?? 'unknown',
@@ -453,6 +365,7 @@ function convertMessages(
                // Merge into existing google-specific metadata if present
                const existingGoogle = (toolCall.extra_content?.google as Record<string, unknown>) ?? {}
                toolCall.extra_content = {
                  ...toolCall.extra_content,
                  google: {
@@ -607,10 +520,7 @@ function convertTools(
        function: {
          name: t.name,
          description: t.description ?? '',
-          parameters: normalizeSchemaForOpenAI(
+          parameters: normalizeSchemaForOpenAI(schema, !isGemini),
            schema,
            !isGemini && !isEnvTruthy(process.env.OPENCLAUDE_DISABLE_STRICT_TOOLS),
          ),
        },
      }
    })
@@ -701,7 +611,6 @@ function repairPossiblyTruncatedObjectJson(raw: string): string | null {
 async function* openaiStreamToAnthropic(
  response: Response,
  model: string,
  signal?: AbortSignal,
 ): AsyncGenerator<AnthropicStreamEvent> {
  const messageId = makeMessageId()
  let contentBlockIndex = 0
@@ -749,51 +658,6 @@ async function* openaiStreamToAnthropic(
  const decoder = new TextDecoder()
  let buffer = ''
  const STREAM_IDLE_TIMEOUT_MS = 120_000 // 2 minutes without data = connection likely dead
  let lastDataTime = Date.now()
  /**
   * Read from the stream with an idle timeout. If no data arrives within
   * STREAM_IDLE_TIMEOUT_MS, assume the connection is dead and throw so
   * withRetry can reconnect. This prevents indefinite hangs on stale
   * SSE connections from OpenAI/Gemini during long-running sessions.
   * Respects the caller's AbortSignal — clears the idle timer on abort
   * so the rejection reason is AbortError, not a spurious idle timeout.
   */
  async function readWithTimeout(): Promise<ReadableStreamReadResult<Uint8Array>> {
    return new Promise((resolve, reject) => {
      const timeoutId = setTimeout(() => {
        const elapsed = Math.round((Date.now() - lastDataTime) / 1000)
        reject(new Error(
          `OpenAI/Gemini SSE stream idle for ${elapsed}s (limit: ${STREAM_IDLE_TIMEOUT_MS / 1000}s). Connection likely dropped.`,
        ))
      }, STREAM_IDLE_TIMEOUT_MS)
      // If the caller aborts, clear the timer so the AbortError surfaces
      // cleanly instead of being masked by a spurious idle timeout.
      let abortCleanup: (() => void) | undefined
      if (signal) {
        abortCleanup = () => {
          clearTimeout(timeoutId)
        }
        signal.addEventListener('abort', abortCleanup, { once: true })
      }
      reader.read().then(
        result => {
          clearTimeout(timeoutId)
          if (signal && abortCleanup) signal.removeEventListener('abort', abortCleanup)
          if (result.value) lastDataTime = Date.now()
          resolve(result)
        },
        err => {
          clearTimeout(timeoutId)
          if (signal && abortCleanup) signal.removeEventListener('abort', abortCleanup)
          reject(err)
        },
      )
    })
  }
  const closeActiveContentBlock = async function* () {
    if (!hasEmittedContentStart) return
@@ -821,7 +685,7 @@ async function* openaiStreamToAnthropic(
  try {
    while (true) {
-      const { done, value } = await readWithTimeout()
+      const { done, value } = await reader.read()
      if (done) break
      buffer += decoder.decode(value, { stream: true })
@@ -1181,13 +1045,13 @@ class OpenAIShimMessages {
        const isResponsesStream = response.url?.includes('/responses')
        return new OpenAIShimStream(
          (request.transport === 'codex_responses' || isResponsesStream)
-            ? codexStreamToAnthropic(response, request.resolvedModel, options?.signal)
+            ? codexStreamToAnthropic(response, request.resolvedModel)
-            : openaiStreamToAnthropic(response, request.resolvedModel, options?.signal),
+            : openaiStreamToAnthropic(response, request.resolvedModel),
        )
      }
      if (request.transport === 'codex_responses') {
-        const data = await collectCodexCompletedResponse(response, options?.signal)
+        const data = await collectCodexCompletedResponse(response)
        return convertCodexResponseToAnthropicMessage(
          data,
          request.resolvedModel,
@@ -1250,6 +1114,7 @@ class OpenAIShimMessages {
    const githubEndpointType = getGithubEndpointType(request.baseUrl)
    const isGithubMode = isGithubModelsMode()
    const isGithubWithCodexTransport = isGithubMode && request.transport === 'codex_responses'
    const isGithubCopilotEndpoint = isGithubMode && githubEndpointType === 'copilot'
    if (isGithubWithCodexTransport) {
      const apiKey = this.providerOverride?.apiKey ?? process.env.OPENAI_API_KEY ?? ''
@@ -1276,26 +1141,11 @@ class OpenAIShimMessages {
    }
    if (request.transport === 'codex_responses' && !isGithubMode) {
-      const refreshResult = await refreshCodexAccessTokenIfNeeded().catch(
+      const credentials = resolveCodexApiCredentials()
        async error => {
          logForDebugging(
            `[codex] access token refresh failed before request: ${error instanceof Error ? error.message : String(error)}`,
            { level: 'warn' },
          )
          return {
            refreshed: false,
            credentials: await readCodexCredentialsAsync(),
          }
        },
      )
      const credentials = resolveRuntimeCodexCredentials({
        storedCredentials: refreshResult.credentials,
      })
      if (!credentials.apiKey) {
        const oauthHint = isBareMode() ? '' : ', choose Codex OAuth in /provider'
        const authHint = credentials.authPath
-          ? `${oauthHint} or place a Codex auth.json at ${credentials.authPath}`
+          ? ` or place a Codex auth.json at ${credentials.authPath}`
-          : oauthHint
+          : ''
        const safeModel =
          redactSecretValueForDisplay(request.requestedModel, process.env as SecretValueSource) ??
          'the requested model'
@@ -1305,7 +1155,7 @@ class OpenAIShimMessages {
      }
      if (!credentials.accountId) {
        throw new Error(
-          'Codex auth is missing chatgpt_account_id. Re-login with Codex OAuth, the Codex CLI, or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID.',
+          'Codex auth is missing chatgpt_account_id. Re-login with the Codex CLI or set CHATGPT_ACCOUNT_ID/CODEX_ACCOUNT_ID.',
        )
      }
@@ -1366,20 +1216,18 @@ class OpenAIShimMessages {
    const isGithub = isGithubModelsMode()
    const isMistral = isMistralMode()
    const isLocal = isLocalProviderUrl(request.baseUrl)
    const githubEndpointType = getGithubEndpointType(request.baseUrl)
    const isGithubCopilot = isGithub && githubEndpointType === 'copilot'
    const isGithubModels = isGithub && (githubEndpointType === 'models' || githubEndpointType === 'custom')
-    if ((isGithub || isMistral || isLocal) && body.max_completion_tokens !== undefined) {
+    if ((isGithub || isMistral) && body.max_completion_tokens !== undefined) {
      body.max_tokens = body.max_completion_tokens
      delete body.max_completion_tokens
    }
-    // mistral and gemini don't recognize body.store — Gemini returns 400
+    // mistral also doesn't recognize body.store
-    // "Invalid JSON payload received. Unknown name 'store': Cannot find field."
+    if (isMistral) {
    if (isMistral || isGeminiMode()) {
      delete body.store
    }
@@ -1420,12 +1268,8 @@ class OpenAIShimMessages {
      ...filterAnthropicHeaders(options?.headers),
    }
-    const isGemini = isGeminiMode()
+    const isGemini = isEnvTruthy(process.env.CLAUDE_CODE_USE_GEMINI)
-    const isMiniMax = !!process.env.MINIMAX_API_KEY
+    const apiKey = this.providerOverride?.apiKey ?? process.env.OPENAI_API_KEY ?? ''
    const apiKey =
      this.providerOverride?.apiKey ??
      process.env.OPENAI_API_KEY ??
      (isMiniMax ? process.env.MINIMAX_API_KEY : '')
    // Detect Azure endpoints by hostname (not raw URL) to prevent bypass via
    // path segments like https://evil.com/cognitiveservices.azure.com/
    let isAzure = false
@@ -1489,97 +1333,12 @@ class OpenAIShimMessages {
    }
    const maxAttempts = isGithub ? GITHUB_429_MAX_RETRIES : 1
    const throwClassifiedTransportError = (
      error: unknown,
      requestUrl: string,
    ): never => {
      if (options?.signal?.aborted) {
        throw error
      }
      const failure = classifyOpenAINetworkFailure(error, {
        url: requestUrl,
      })
      const redactedUrl = redactUrlForDiagnostics(requestUrl)
      const safeMessage =
        redactSecretValueForDisplay(
          failure.message,
          process.env as SecretValueSource,
        ) || 'Request failed'
      logForDebugging(
        `[OpenAIShim] transport failure category=${failure.category} retryable=${failure.retryable} code=${failure.code ?? 'unknown'} method=POST url=${redactedUrl} model=${request.resolvedModel} message=${safeMessage}`,
        { level: 'warn' },
      )
      throw APIError.generate(
        503,
        undefined,
        buildOpenAICompatibilityErrorMessage(
          `OpenAI API transport error: ${safeMessage}${failure.code ? ` (code=${failure.code})` : ''}`,
          failure,
        ),
        new Headers(),
      )
    }
    const throwClassifiedHttpError = (
      status: number,
      errorBody: string,
      parsedBody: object | undefined,
      responseHeaders: Headers,
      requestUrl: string,
      rateHint = '',
    ): never => {
      const failure = classifyOpenAIHttpFailure({
        status,
        body: errorBody,
      })
      const redactedUrl = redactUrlForDiagnostics(requestUrl)
      logForDebugging(
        `[OpenAIShim] request failed category=${failure.category} retryable=${failure.retryable} status=${status} method=POST url=${redactedUrl} model=${request.resolvedModel}`,
        { level: 'warn' },
      )
      throw APIError.generate(
        status,
        parsedBody,
        buildOpenAICompatibilityErrorMessage(
          `OpenAI API error ${status}: ${errorBody}${rateHint}`,
          failure,
        ),
        responseHeaders,
      )
    }
    let response: Response | undefined
    for (let attempt = 0; attempt < maxAttempts; attempt++) {
-      try {
+      response = await fetch(chatCompletionsUrl, fetchInit)
        response = await fetchWithProxyRetry(chatCompletionsUrl, fetchInit)
      } catch (error) {
        const isAbortError =
          fetchInit.signal?.aborted === true ||
          (typeof DOMException !== 'undefined' &&
            error instanceof DOMException &&
            error.name === 'AbortError') ||
          (typeof error === 'object' &&
            error !== null &&
            'name' in error &&
            error.name === 'AbortError')
        if (isAbortError) {
          throw error
        }
        throwClassifiedTransportError(error, chatCompletionsUrl)
      }
      if (response.ok) {
        return response
      }
      if (
        isGithub &&
        response.status === 429 &&
@@ -1649,43 +1408,34 @@ class OpenAIShimMessages {
            }
          }
-          let responsesResponse: Response
+          const responsesResponse = await fetch(responsesUrl, {
-          try {
+            method: 'POST',
-            responsesResponse = await fetchWithProxyRetry(responsesUrl, {
+            headers,
-              method: 'POST',
+            body: JSON.stringify(responsesBody),
-              headers,
+            signal: options?.signal,
-              body: JSON.stringify(responsesBody),
+          })
              signal: options?.signal,
            })
          } catch (error) {
            throwClassifiedTransportError(error, responsesUrl)
          }
          if (responsesResponse.ok) {
            return responsesResponse
          }
          const responsesErrorBody = await responsesResponse.text().catch(() => 'unknown error')
          let responsesErrorResponse: object | undefined
          try { responsesErrorResponse = JSON.parse(responsesErrorBody) } catch { /* raw text */ }
-          throwClassifiedHttpError(
+          throw APIError.generate(
            responsesResponse.status,
            responsesErrorBody,
            responsesErrorResponse,
            `OpenAI API error ${responsesResponse.status}: ${responsesErrorBody}`,
            responsesResponse.headers,
            responsesUrl,
          )
        }
      }
      let errorResponse: object | undefined
      try { errorResponse = JSON.parse(errorBody) } catch { /* raw text */ }
-      throwClassifiedHttpError(
+      throw APIError.generate(
        response.status,
        errorBody,
        errorResponse,
        `OpenAI API error ${response.status}: ${errorBody}${rateHint}`,
        response.headers as unknown as Headers,
        chatCompletionsUrl,
        rateHint,
      )
    }
--- a/src/services/api/providerConfig.codexSecureStorage.test.ts
+++ b/src/services/api/providerConfig.codexSecureStorage.test.ts
@@ -1,225 +0,0 @@
 import { afterEach, describe, expect, mock, test } from 'bun:test'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import * as realOs from 'node:os'
 function makeJwt(payload: Record<string, unknown>): string {
  const header = Buffer.from(JSON.stringify({ alg: 'none', typ: 'JWT' }))
    .toString('base64url')
  const body = Buffer.from(JSON.stringify(payload)).toString('base64url')
  return `${header}.${body}.signature`
 }
 describe('resolveCodexApiCredentials with secure storage', () => {
  afterEach(() => {
    mock.restore()
  })
  test('loads Codex credentials from OpenClaude secure storage', async () => {
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => false,
      readCodexCredentials: () => ({
        apiKey: 'codex-api-key-token',
        accessToken: 'header.payload.signature',
        accountId: 'acct_secure',
      }),
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-secure-storage'
    )
    const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
    expect(credentials.apiKey).toBe('codex-api-key-token')
    expect(credentials.accountId).toBe('acct_secure')
    expect(credentials.source).toBe('secure-storage')
  })
  test('prefers explicit env credentials over secure storage', async () => {
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => false,
      readCodexCredentials: () => ({
        accessToken: 'stored-token',
        accountId: 'acct_stored',
      }),
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-env-precedence'
    )
    const credentials = resolveCodexApiCredentials({
      CODEX_API_KEY: 'env-token',
      CHATGPT_ACCOUNT_ID: 'acct_env',
    } as NodeJS.ProcessEnv)
    expect(credentials.apiKey).toBe('env-token')
    expect(credentials.accountId).toBe('acct_env')
    expect(credentials.source).toBe('env')
  })
  test('parses nested chatgpt_account_id from a CODEX_API_KEY JWT', async () => {
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => false,
      readCodexCredentials: () => undefined,
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-env-nested-account'
    )
    const credentials = resolveCodexApiCredentials({
      CODEX_API_KEY: makeJwt({
        'https://api.openai.com/auth': {
          chatgpt_account_id: 'acct_nested_env',
        },
      }),
    } as NodeJS.ProcessEnv)
    expect(credentials.accountId).toBe('acct_nested_env')
    expect(credentials.source).toBe('env')
  })
  test('parses nested chatgpt_account_id from auth.json tokens', async () => {
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => false,
      readCodexCredentials: () => undefined,
    }))
    const tempDir = mkdtempSync(join(tmpdir(), 'openclaude-codex-auth-'))
    const authPath = join(tempDir, 'auth.json')
    writeFileSync(
      authPath,
      JSON.stringify({
        openai_api_key: makeJwt({
          'https://api.openai.com/auth': {
            chatgpt_account_id: 'acct_nested_auth_json',
          },
        }),
      }),
      'utf8',
    )
    try {
      // @ts-expect-error cache-busting query string for Bun module mocks
      const { resolveCodexApiCredentials } = await import(
        './providerConfig.js?codex-auth-json-nested-account'
      )
      const credentials = resolveCodexApiCredentials({
        CODEX_AUTH_JSON_PATH: authPath,
      } as NodeJS.ProcessEnv)
      expect(credentials.accountId).toBe('acct_nested_auth_json')
      expect(credentials.source).toBe('auth.json')
    } finally {
      rmSync(tempDir, { force: true, recursive: true })
    }
  })
  test('does not read default auth.json when secure storage already has Codex credentials', async () => {
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => false,
      readCodexCredentials: () => ({
        apiKey: 'codex-api-key-token',
        accessToken: 'header.payload.signature',
        accountId: 'acct_secure',
      }),
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-secure-storage-no-auth-io'
    )
    const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
    expect(credentials.apiKey).toBe('codex-api-key-token')
    expect(credentials.accountId).toBe('acct_secure')
    expect(credentials.source).toBe('secure-storage')
  })
  test('falls back to the default auth.json when stored Codex refresh is cooling down', async () => {
    const tempHomeDir = mkdtempSync(join(tmpdir(), 'openclaude-codex-home-'))
    const authJson = JSON.stringify({
      openai_api_key: makeJwt({
        'https://api.openai.com/auth': {
          chatgpt_account_id: 'acct_auth_json',
        },
      }),
    })
    mkdirSync(join(tempHomeDir, '.codex'), { recursive: true })
    writeFileSync(join(tempHomeDir, '.codex', 'auth.json'), authJson, 'utf8')
    mock.module('node:os', () => ({
      ...realOs,
      homedir: () => tempHomeDir,
    }))
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => true,
      readCodexCredentials: () => ({
        accessToken: 'stored-token',
        refreshToken: 'refresh-stored',
        accountId: 'acct_stored',
        lastRefreshFailureAt: Date.now(),
      }),
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-refresh-cooldown-fallback'
    )
    try {
      const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
      expect(credentials.source).toBe('auth.json')
      expect(credentials.accountId).toBe('acct_auth_json')
      expect(credentials.apiKey).not.toBe('stored-token')
    } finally {
      rmSync(tempHomeDir, { force: true, recursive: true })
    }
  })
  test('preserves the stored account id when auth.json fallback lacks one', async () => {
    const tempHomeDir = mkdtempSync(join(tmpdir(), 'openclaude-codex-home-'))
    const authJson = JSON.stringify({
      openai_api_key: 'auth-json-access-token',
    })
    mkdirSync(join(tempHomeDir, '.codex'), { recursive: true })
    writeFileSync(join(tempHomeDir, '.codex', 'auth.json'), authJson, 'utf8')
    mock.module('node:os', () => ({
      ...realOs,
      homedir: () => tempHomeDir,
    }))
    mock.module('../../utils/codexCredentials.js', () => ({
      isCodexRefreshFailureCoolingDown: () => true,
      readCodexCredentials: () => ({
        accessToken: 'stored-token',
        refreshToken: 'refresh-stored',
        accountId: 'acct_stored',
        lastRefreshFailureAt: Date.now(),
      }),
    }))
    // @ts-expect-error cache-busting query string for Bun module mocks
    const { resolveCodexApiCredentials } = await import(
      './providerConfig.js?codex-refresh-cooldown-account-id-fallback'
    )
    try {
      const credentials = resolveCodexApiCredentials({} as NodeJS.ProcessEnv)
      expect(credentials.source).toBe('auth.json')
      expect(credentials.apiKey).toBe('auth-json-access-token')
      expect(credentials.accountId).toBe('acct_stored')
    } finally {
      rmSync(tempHomeDir, { force: true, recursive: true })
    }
  })
 })
--- a/src/services/api/providerConfig.envDiagnostics.test.ts
+++ b/src/services/api/providerConfig.envDiagnostics.test.ts
@@ -1,107 +0,0 @@
 import { afterEach, expect, mock, test } from 'bun:test'
 const originalEnv = {
  CLAUDE_CODE_USE_OPENAI: process.env.CLAUDE_CODE_USE_OPENAI,
  CLAUDE_CODE_USE_MISTRAL: process.env.CLAUDE_CODE_USE_MISTRAL,
  OPENAI_BASE_URL: process.env.OPENAI_BASE_URL,
  OPENAI_MODEL: process.env.OPENAI_MODEL,
  OPENAI_API_BASE: process.env.OPENAI_API_BASE,
  MISTRAL_BASE_URL: process.env.MISTRAL_BASE_URL,
  MISTRAL_MODEL: process.env.MISTRAL_MODEL,
 }
 function restoreEnv(key: string, value: string | undefined): void {
  if (value === undefined) {
    delete process.env[key]
  } else {
    process.env[key] = value
  }
 }
 afterEach(() => {
  restoreEnv('CLAUDE_CODE_USE_OPENAI', originalEnv.CLAUDE_CODE_USE_OPENAI)
  restoreEnv('CLAUDE_CODE_USE_MISTRAL', originalEnv.CLAUDE_CODE_USE_MISTRAL)
  restoreEnv('OPENAI_BASE_URL', originalEnv.OPENAI_BASE_URL)
  restoreEnv('OPENAI_MODEL', originalEnv.OPENAI_MODEL)
  restoreEnv('OPENAI_API_BASE', originalEnv.OPENAI_API_BASE)
  restoreEnv('MISTRAL_BASE_URL', originalEnv.MISTRAL_BASE_URL)
  restoreEnv('MISTRAL_MODEL', originalEnv.MISTRAL_MODEL)
  mock.restore()
 })
 test('logs a warning when OPENAI_BASE_URL is literal undefined', async () => {
  const debugSpy = mock(() => {})
  mock.module('../../utils/debug.js', () => ({
    logForDebugging: debugSpy,
  }))
  process.env.CLAUDE_CODE_USE_OPENAI = '1'
  process.env.OPENAI_BASE_URL = 'undefined'
  process.env.OPENAI_MODEL = 'gpt-4o'
  delete process.env.OPENAI_API_BASE
  const nonce = `${Date.now()}-${Math.random()}`
  const { resolveProviderRequest } = await import(`./providerConfig.ts?ts=${nonce}`)
  const resolved = resolveProviderRequest()
  expect(resolved.baseUrl).toBe('https://api.openai.com/v1')
  const warningCall = debugSpy.mock.calls.find(call =>
    typeof call?.[0] === 'string' &&
    call[0].includes('OPENAI_BASE_URL') &&
    call[0].includes('"undefined"'),
  )
  expect(warningCall).toBeDefined()
  expect(warningCall?.[1]).toEqual({ level: 'warn' })
 })
 test('does not warn for OPENAI_API_BASE when OPENAI_BASE_URL is active', async () => {
  const debugSpy = mock(() => {})
  mock.module('../../utils/debug.js', () => ({
    logForDebugging: debugSpy,
  }))
  process.env.CLAUDE_CODE_USE_OPENAI = '1'
  delete process.env.CLAUDE_CODE_USE_MISTRAL
  process.env.OPENAI_BASE_URL = 'http://127.0.0.1:11434/v1'
  process.env.OPENAI_MODEL = 'qwen2.5-coder:7b'
  process.env.OPENAI_API_BASE = 'undefined'
  const nonce = `${Date.now()}-${Math.random()}`
  const { resolveProviderRequest } = await import(`./providerConfig.ts?ts=${nonce}`)
  const resolved = resolveProviderRequest()
  expect(resolved.baseUrl).toBe('http://127.0.0.1:11434/v1')
  const aliasWarning = debugSpy.mock.calls.find(call =>
    typeof call?.[0] === 'string' &&
    call[0].includes('OPENAI_API_BASE') &&
    call[0].includes('"undefined"'),
  )
  expect(aliasWarning).toBeUndefined()
 })
 test('uses OPENAI_API_BASE as fallback in mistral mode when MISTRAL_BASE_URL is unset', async () => {
  const debugSpy = mock(() => {})
  mock.module('../../utils/debug.js', () => ({
    logForDebugging: debugSpy,
  }))
  delete process.env.CLAUDE_CODE_USE_OPENAI
  process.env.CLAUDE_CODE_USE_MISTRAL = '1'
  delete process.env.MISTRAL_BASE_URL
  process.env.MISTRAL_MODEL = 'mistral-medium-latest'
  process.env.OPENAI_API_BASE = 'http://127.0.0.1:11434/v1'
  const nonce = `${Date.now()}-${Math.random()}`
  const { resolveProviderRequest } = await import(`./providerConfig.ts?ts=${nonce}`)
  const resolved = resolveProviderRequest()
  expect(resolved.baseUrl).toBe('http://127.0.0.1:11434/v1')
  expect(debugSpy.mock.calls).toHaveLength(0)
 })
--- a/src/services/api/providerConfig.runtimeCodexCredentials.test.ts
+++ b/src/services/api/providerConfig.runtimeCodexCredentials.test.ts
@@ -1,107 +0,0 @@
 import { afterEach, expect, mock, test } from 'bun:test'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { resolveRuntimeCodexCredentials } from './providerConfig.js'
 afterEach(() => {
  mock.restore()
 })
 function makeJwt(payload: Record<string, unknown>): string {
  const header = Buffer.from(JSON.stringify({ alg: 'none', typ: 'JWT' }))
    .toString('base64url')
  const body = Buffer.from(JSON.stringify(payload)).toString('base64url')
  return `${header}.${body}.signature`
 }
 test('runtime credential resolution honors explicit auth.json over stored secure-storage tokens', () => {
  const tempDir = mkdtempSync(join(tmpdir(), 'openclaude-codex-explicit-auth-'))
  const authPath = join(tempDir, 'auth.json')
  writeFileSync(
    authPath,
    JSON.stringify({
      openai_api_key: makeJwt({
        'https://api.openai.com/auth': {
          chatgpt_account_id: 'acct_explicit_auth_json',
        },
      }),
    }),
    'utf8',
  )
  try {
    const credentials = resolveRuntimeCodexCredentials({
      env: {
        CODEX_AUTH_JSON_PATH: authPath,
      } as NodeJS.ProcessEnv,
      storedCredentials: {
        apiKey: 'stored-api-key',
        accessToken: 'stored-access-token',
        accountId: 'acct_stored',
      },
    })
    expect(credentials.source).toBe('auth.json')
    expect(credentials.accountId).toBe('acct_explicit_auth_json')
    expect(credentials.apiKey).not.toBe('stored-api-key')
  } finally {
    rmSync(tempDir, { force: true, recursive: true })
  }
 })
 test('runtime credential resolution preserves an explicit auth.json path even when it is missing', () => {
  const tempDir = mkdtempSync(join(tmpdir(), 'openclaude-codex-missing-auth-'))
  const authPath = join(tempDir, 'missing-auth.json')
  try {
    const credentials = resolveRuntimeCodexCredentials({
      env: {
        CODEX_AUTH_JSON_PATH: authPath,
      } as NodeJS.ProcessEnv,
      storedCredentials: {
        apiKey: 'stored-api-key',
        accessToken: 'stored-access-token',
        accountId: 'acct_stored',
      },
    })
    expect(credentials.source).toBe('none')
    expect(credentials.authPath).toBe(authPath)
    expect(credentials.apiKey).toBe('')
  } finally {
    rmSync(tempDir, { force: true, recursive: true })
  }
 })
 test('runtime credential resolution avoids sync secure-storage reads when async credentials are provided', async () => {
  let syncReadCalled = false
  mock.module('../../utils/codexCredentials.js', () => ({
    isCodexRefreshFailureCoolingDown: () => false,
    readCodexCredentials: () => {
      syncReadCalled = true
      throw new Error('sync secure-storage read should not run in runtime resolution')
    },
  }))
  // @ts-expect-error cache-busting query string for Bun module mocks
  const { resolveRuntimeCodexCredentials } = await import(
    './providerConfig.js?runtime-no-sync-secure-storage'
  )
  const credentials = resolveRuntimeCodexCredentials({
    env: {} as NodeJS.ProcessEnv,
    storedCredentials: {
      accessToken: 'stored-access-token',
      accountId: 'acct_stored',
    },
  })
  expect(syncReadCalled).toBe(false)
  expect(credentials.source).toBe('secure-storage')
  expect(credentials.apiKey).toBe('stored-access-token')
  expect(credentials.accountId).toBe('acct_stored')
 })
--- a/src/services/api/providerConfig.ts
+++ b/src/services/api/providerConfig.ts
@@ -3,25 +3,13 @@ import { isIP } from 'node:net'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 import {
  isCodexRefreshFailureCoolingDown,
  readCodexCredentials,
  type CodexCredentialBlob,
 } from '../../utils/codexCredentials.js'
 import { logForDebugging } from '../../utils/debug.js'
 import { isEnvTruthy } from '../../utils/envUtils.js'
 import {
  asTrimmedString,
  parseChatgptAccountId,
 } from './codexOAuthShared.js'
 import { DEFAULT_GEMINI_BASE_URL } from 'src/utils/providerProfile.js'
 export const DEFAULT_OPENAI_BASE_URL = 'https://api.openai.com/v1'
 export const DEFAULT_CODEX_BASE_URL = 'https://chatgpt.com/backend-api/codex'
 export const DEFAULT_MISTRAL_BASE_URL = 'https://api.mistral.ai/v1'
 /** Default GitHub Copilot API model when user selects copilot / github:copilot */
 export const DEFAULT_GITHUB_MODELS_API_MODEL = 'gpt-4o'
 const warnedUndefinedEnvNames = new Set<string>()
 const CODEX_ALIAS_MODELS: Record<
  string,
@@ -72,8 +60,6 @@ const CODEX_ALIAS_MODELS: Record<
 type CodexAlias = keyof typeof CODEX_ALIAS_MODELS
 type ReasoningEffort = 'low' | 'medium' | 'high' | 'xhigh'
 const OPENAI_CODEX_SHORTCUT_ALIASES = new Set(['codexplan', 'codexspark'])
 export type ProviderTransport = 'chat_completions' | 'codex_responses'
 export type ResolvedProviderRequest = {
@@ -90,7 +76,7 @@ export type ResolvedCodexCredentials = {
  apiKey: string
  accountId?: string
  authPath?: string
-  source: 'env' | 'secure-storage' | 'auth.json' | 'none'
+  source: 'env' | 'auth.json' | 'none'
 }
 type ModelDescriptor = {
@@ -126,39 +112,19 @@ function isPrivateIpv6Address(hostname: string): boolean {
  return (prefix & 0xfe00) === 0xfc00 || (prefix & 0xffc0) === 0xfe80
 }
 function asTrimmedString(value: unknown): string | undefined {
  if (typeof value !== 'string') return undefined
  const trimmed = value.trim()
  return trimmed ? trimmed : undefined
 }
 // Reads an env-var-style string intended as a URL or path, rejecting both
 // empty strings and the literal string "undefined" that Windows shells can
 // write when a variable is unset-then-referenced without quotes (issue #336).
 function asEnvUrl(value: string | undefined): string | undefined {
  if (!value) return undefined
  const trimmed = value.trim()
-  if (!trimmed) return undefined
+  if (!trimmed || trimmed === 'undefined') return undefined
  if (trimmed === 'undefined') {
    return undefined
  }
  return trimmed
 }
 function asNamedEnvUrl(
  value: string | undefined,
  envName: string,
 ): string | undefined {
  if (!value) return undefined
  const trimmed = value.trim()
  if (!trimmed) return undefined
  if (trimmed === 'undefined') {
    if (!warnedUndefinedEnvNames.has(envName)) {
      warnedUndefinedEnvNames.add(envName)
      logForDebugging(
        `[provider-config] Environment variable ${envName} is the literal string "undefined"; ignoring it.`,
        { level: 'warn' },
      )
    }
    return undefined
  }
  return trimmed
 }
@@ -183,6 +149,23 @@ function readNestedString(
  return undefined
 }
 function decodeJwtPayload(token: string): Record<string, unknown> | undefined {
  const parts = token.split('.')
  if (parts.length < 2) return undefined
  try {
    const normalized = parts[1].replace(/-/g, '+').replace(/_/g, '/')
    const padded = normalized + '='.repeat((4 - (normalized.length % 4)) % 4)
    const json = Buffer.from(padded, 'base64').toString('utf8')
    const parsed = JSON.parse(json)
    return parsed && typeof parsed === 'object'
      ? (parsed as Record<string, unknown>)
      : undefined
  } catch {
    return undefined
  }
 }
 function parseReasoningEffort(value: string | undefined): ReasoningEffort | undefined {
  if (!value) return undefined
  const normalized = value.trim().toLowerCase()
@@ -237,12 +220,6 @@ export function isCodexAlias(model: string): boolean {
  return base in CODEX_ALIAS_MODELS
 }
 function isOpenAICodexShortcutAlias(model: string): boolean {
  const normalized = model.trim().toLowerCase()
  const base = normalized.split('?', 1)[0] ?? normalized
  return OPENAI_CODEX_SHORTCUT_ALIASES.has(base)
 }
 export function shouldUseCodexTransport(
  model: string,
  baseUrl: string | undefined,
@@ -382,77 +359,20 @@ export function resolveProviderRequest(options?: {
 }): ResolvedProviderRequest {
  const isGithubMode = isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB)
  const isMistralMode = isEnvTruthy(process.env.CLAUDE_CODE_USE_MISTRAL)
  const isGeminiMode = isEnvTruthy(process.env.CLAUDE_CODE_USE_GEMINI)
  const requestedModel =
    options?.model?.trim() ||
    (isMistralMode
      ? process.env.MISTRAL_MODEL?.trim()
      : process.env.OPENAI_MODEL?.trim()) ||
    (isGeminiMode
      ? process.env.GEMINI_MODEL?.trim()
      : process.env.OPENAI_MODEL?.trim()) ||
    options?.fallbackModel?.trim() ||
    (isGithubMode ? 'github:copilot' : 'gpt-4o')
  const descriptor = parseModelDescriptor(requestedModel)
-  const explicitBaseUrl = asEnvUrl(options?.baseUrl)
+  const rawBaseUrl =
-
+    asEnvUrl(options?.baseUrl) ??
-  const normalizedMistralEnvBaseUrl = asNamedEnvUrl(
+    asEnvUrl(
-    process.env.MISTRAL_BASE_URL,
+      isMistralMode ? (process.env.MISTRAL_BASE_URL ?? DEFAULT_MISTRAL_BASE_URL) : process.env.OPENAI_BASE_URL,
-    'MISTRAL_BASE_URL',
+    ) ??
-  )
+    asEnvUrl(process.env.OPENAI_API_BASE)
  const normalizedGeminiEnvBaseUrl = asNamedEnvUrl(
    process.env.GEMINI_BASE_URL,
    'GEMINI_BASE_URL',
  )
  const primaryEnvBaseUrl = isMistralMode
    ? normalizedMistralEnvBaseUrl
    : isGeminiMode
    ? normalizedGeminiEnvBaseUrl
    : asNamedEnvUrl(process.env.OPENAI_BASE_URL, 'OPENAI_BASE_URL')
  const fallbackEnvBaseUrl = isMistralMode
    ? (primaryEnvBaseUrl === undefined
      ? asNamedEnvUrl(process.env.OPENAI_API_BASE, 'OPENAI_API_BASE') ?? DEFAULT_MISTRAL_BASE_URL
      : undefined)
    : isGeminiMode
    ? (primaryEnvBaseUrl === undefined
      ? asNamedEnvUrl(process.env.OPENAI_API_BASE, 'OPENAI_API_BASE') ?? DEFAULT_GEMINI_BASE_URL
      : undefined)
    : (primaryEnvBaseUrl === undefined
      ? asNamedEnvUrl(process.env.OPENAI_API_BASE, 'OPENAI_API_BASE')
      : undefined)
  const envBaseUrlRaw =
    explicitBaseUrl ??
    primaryEnvBaseUrl ??
    fallbackEnvBaseUrl
  const isCodexModelForGithub = isGithubMode && isCodexAlias(requestedModel)
  const envBaseUrl =
    isCodexModelForGithub && envBaseUrlRaw && getGithubEndpointType(envBaseUrlRaw) === 'custom'
      ? undefined
      : envBaseUrlRaw
  const rawBaseUrl = explicitBaseUrl ?? envBaseUrl
  const shellModel = process.env.OPENAI_MODEL?.trim() ?? ''
  const envIsCodexShortcut = isOpenAICodexShortcutAlias(shellModel)
  const envResolvedCodexModel = envIsCodexShortcut
    ? parseModelDescriptor(shellModel).baseModel
    : null
  const requestedMatchesEnvCodexShortcut =
    Boolean(options?.model) &&
    Boolean(envResolvedCodexModel) &&
    descriptor.baseModel === envResolvedCodexModel
  const isCodexAliasModel =
    isOpenAICodexShortcutAlias(requestedModel) || requestedMatchesEnvCodexShortcut
  const hasUserSetBaseUrl = rawBaseUrl && rawBaseUrl !== DEFAULT_OPENAI_BASE_URL
  const finalBaseUrl =
    !isGithubMode && isCodexAliasModel && !hasUserSetBaseUrl
      ? DEFAULT_CODEX_BASE_URL
      : rawBaseUrl
  const githubEndpointType = isGithubMode
    ? getGithubEndpointType(rawBaseUrl)
@@ -466,7 +386,7 @@ export function resolveProviderRequest(options?: {
    : requestedModel
  const transport: ProviderTransport =
-    shouldUseCodexTransport(requestedModel, finalBaseUrl) ||
+    shouldUseCodexTransport(requestedModel, rawBaseUrl) ||
      (isGithubCopilot && shouldUseGithubResponsesApi(githubResolvedModel))
      ? 'codex_responses'
      : 'chat_completions'
@@ -490,7 +410,7 @@ export function resolveProviderRequest(options?: {
    requestedModel,
    resolvedModel,
    baseUrl:
-      (finalBaseUrl ??
+      (rawBaseUrl ??
        (isGithubCopilot && transport === 'codex_responses'
          ? GITHUB_COPILOT_BASE_URL
          : (isGithubMode
@@ -538,6 +458,18 @@ export function resolveCodexAuthPath(
  return join(homedir(), '.codex', 'auth.json')
 }
 export function parseChatgptAccountId(
  token: string | undefined,
 ): string | undefined {
  if (!token) return undefined
  const payload = decodeJwtPayload(token)
  const fromClaim = asTrimmedString(
    payload?.['https://api.openai.com/auth.chatgpt_account_id'],
  )
  if (fromClaim) return fromClaim
  return asTrimmedString(payload?.chatgpt_account_id)
 }
 function loadCodexAuthJson(
  authPath: string,
 ): Record<string, unknown> | undefined {
@@ -553,97 +485,8 @@ function loadCodexAuthJson(
  }
 }
-function resolveCodexAuthJsonCredentials(options: {
+export function resolveCodexApiCredentials(
-  authJson: Record<string, unknown> | undefined
+  env: NodeJS.ProcessEnv = process.env,
  authPath: string
  envAccountId?: string
  missingSource?: ResolvedCodexCredentials['source']
 }): ResolvedCodexCredentials {
  const { authJson, authPath, envAccountId } = options
  if (!authJson) {
    return {
      apiKey: '',
      authPath,
      source: options.missingSource ?? 'none',
    }
  }
  const apiKey = readNestedString(authJson, [
    ['openai_api_key'],
    ['openaiApiKey'],
    ['access_token'],
    ['accessToken'],
    ['tokens', 'access_token'],
    ['tokens', 'accessToken'],
    ['auth', 'access_token'],
    ['auth', 'accessToken'],
    ['token', 'access_token'],
    ['token', 'accessToken'],
  ])
  // OIDC identity tokens can carry the ChatGPT account id, but they are not
  // valid bearer credentials for Codex API requests.
  const idToken = readNestedString(authJson, [
    ['id_token'],
    ['idToken'],
    ['tokens', 'id_token'],
    ['tokens', 'idToken'],
  ])
  const accountId =
    envAccountId ??
    readNestedString(authJson, [
      ['account_id'],
      ['accountId'],
      ['tokens', 'account_id'],
      ['tokens', 'accountId'],
      ['auth', 'account_id'],
      ['auth', 'accountId'],
    ]) ??
    parseChatgptAccountId(apiKey) ??
    parseChatgptAccountId(idToken)
  if (!apiKey) {
    return {
      apiKey: '',
      accountId,
      authPath,
      source: options.missingSource ?? 'none',
    }
  }
  return {
    apiKey,
    accountId,
    authPath,
    source: 'auth.json',
  }
 }
 export function resolveStoredCodexCredentials(options: {
  storedCredentials: Pick<
    CodexCredentialBlob,
    'apiKey' | 'accessToken' | 'idToken' | 'accountId'
  >
  envAccountId?: string
 }): ResolvedCodexCredentials {
  const { storedCredentials, envAccountId } = options
  return {
    apiKey: storedCredentials.apiKey ?? storedCredentials.accessToken,
    accountId:
      envAccountId ??
      storedCredentials.accountId ??
      parseChatgptAccountId(storedCredentials.idToken) ??
      parseChatgptAccountId(storedCredentials.accessToken),
    source: 'secure-storage',
  }
 }
 function resolveEnvOrAuthJsonCodexCredentials(
  env: NodeJS.ProcessEnv,
  options?: {
    explicitAuthPathOnly?: boolean
  },
 ): ResolvedCodexCredentials {
  const envApiKey = asTrimmedString(env.CODEX_API_KEY)
  const envAccountId =
@@ -658,127 +501,55 @@ function resolveEnvOrAuthJsonCodexCredentials(
    }
  }
-  const explicitAuthPathConfigured = Boolean(
+  const authPath = resolveCodexAuthPath(env)
-    asTrimmedString(env.CODEX_AUTH_JSON_PATH) ?? asTrimmedString(env.CODEX_HOME),
+  const authJson = loadCodexAuthJson(authPath)
-  )
+  if (!authJson) {
  if (!explicitAuthPathConfigured && options?.explicitAuthPathOnly) {
    return {
      apiKey: '',
-      accountId: envAccountId,
+      authPath,
      source: 'none',
    }
  }
-  const authPath = resolveCodexAuthPath(env)
+  const apiKey = readNestedString(authJson, [
-  const authJson = loadCodexAuthJson(authPath)
+    ['access_token'],
-  return resolveCodexAuthJsonCredentials({
+    ['accessToken'],
-    authJson,
+    ['tokens', 'access_token'],
-    authPath,
+    ['tokens', 'accessToken'],
-    envAccountId,
+    ['auth', 'access_token'],
-  })
+    ['auth', 'accessToken'],
-}
+    ['token', 'access_token'],
    ['token', 'accessToken'],
    ['tokens', 'id_token'],
    ['tokens', 'idToken'],
  ])
  const accountId =
    envAccountId ??
    readNestedString(authJson, [
      ['account_id'],
      ['accountId'],
      ['tokens', 'account_id'],
      ['tokens', 'accountId'],
      ['auth', 'account_id'],
      ['auth', 'accountId'],
    ]) ??
    parseChatgptAccountId(apiKey)
-export function resolveRuntimeCodexCredentials(options?: {
+  if (!apiKey) {
-  env?: NodeJS.ProcessEnv
+    return {
-  storedCredentials?: Pick<
+      apiKey: '',
-    CodexCredentialBlob,
+      accountId,
    'apiKey' | 'accessToken' | 'idToken' | 'accountId'
  >
 }): ResolvedCodexCredentials {
  const env = options?.env ?? process.env
  const explicitCredentials = resolveEnvOrAuthJsonCodexCredentials(env, {
    explicitAuthPathOnly: true,
  })
  const explicitAuthPathConfigured = Boolean(
    asTrimmedString(env.CODEX_AUTH_JSON_PATH) ?? asTrimmedString(env.CODEX_HOME),
  )
  const hasStoredCredentialsOption = Boolean(
    options &&
      Object.prototype.hasOwnProperty.call(options, 'storedCredentials'),
  )
  if (
    explicitAuthPathConfigured ||
    explicitCredentials.source === 'env' ||
    explicitCredentials.source === 'auth.json'
  ) {
    return explicitCredentials
  }
  if (options?.storedCredentials?.accessToken) {
    return resolveStoredCodexCredentials({
      storedCredentials: options.storedCredentials,
      envAccountId:
        asTrimmedString(env.CODEX_ACCOUNT_ID) ??
        asTrimmedString(env.CHATGPT_ACCOUNT_ID),
    })
  }
  if (hasStoredCredentialsOption) {
    return resolveEnvOrAuthJsonCodexCredentials(env)
  }
  return resolveCodexApiCredentials(env)
 }
 export function resolveCodexApiCredentials(
  env: NodeJS.ProcessEnv = process.env,
 ): ResolvedCodexCredentials {
  const envAccountId =
    asTrimmedString(env.CODEX_ACCOUNT_ID) ??
    asTrimmedString(env.CHATGPT_ACCOUNT_ID)
  const envOrExplicitAuthJsonCredentials = resolveEnvOrAuthJsonCodexCredentials(
    env,
    {
      explicitAuthPathOnly: true,
    },
  )
  if (
    envOrExplicitAuthJsonCredentials.source === 'env' ||
    envOrExplicitAuthJsonCredentials.source === 'auth.json' ||
    envOrExplicitAuthJsonCredentials.authPath
  ) {
    return envOrExplicitAuthJsonCredentials
  }
  const storedCredentials = readCodexCredentials()
  if (storedCredentials?.accessToken) {
    const resolvedStoredCredentials = resolveStoredCodexCredentials({
      storedCredentials,
      envAccountId,
    })
    const shouldCheckDefaultAuthJson =
      !resolvedStoredCredentials.accountId ||
      isCodexRefreshFailureCoolingDown(storedCredentials)
    if (!shouldCheckDefaultAuthJson) {
      return resolvedStoredCredentials
    }
    const authPath = resolveCodexAuthPath(env)
    const authJson = loadCodexAuthJson(authPath)
    const resolvedAuthJsonCredentials = resolveCodexAuthJsonCredentials({
      authJson,
      authPath,
-      envAccountId,
+      source: 'none',
    })
    if (resolvedAuthJsonCredentials.apiKey) {
      return {
        ...resolvedAuthJsonCredentials,
        accountId:
          resolvedAuthJsonCredentials.accountId ??
          resolvedStoredCredentials.accountId,
      }
    }
    return resolvedStoredCredentials
  }
-  return resolveEnvOrAuthJsonCodexCredentials(env)
+  return {
    apiKey,
    accountId,
    authPath,
    source: 'auth.json',
  }
 }
 export function getReasoningEffortForModel(model: string): ReasoningEffort | undefined {
@@ -788,18 +559,3 @@ export function getReasoningEffortForModel(model: string): ReasoningEffort | und
  const aliasConfig = CODEX_ALIAS_MODELS[alias]
  return aliasConfig?.reasoningEffort
 }
 export function supportsCodexReasoningEffort(model: string): boolean {
  const normalized = model.trim().toLowerCase()
  const base = normalized.split('?', 1)[0] ?? normalized
  if (base === 'gpt-5.3-codex-spark' || base === 'codexspark') {
    return false
  }
  if (getReasoningEffortForModel(base) !== undefined) {
    return true
  }
  return /^gpt-5(?:[.-]|$)/.test(base)
 }
--- a/src/services/compact/autoCompact.test.ts
+++ b/src/services/compact/autoCompact.test.ts
@@ -1,46 +0,0 @@
 import { describe, expect, test } from 'bun:test'
 import {
  getEffectiveContextWindowSize,
  getAutoCompactThreshold,
 } from './autoCompact.ts'
 describe('getEffectiveContextWindowSize', () => {
  test('returns positive value for known models with large context windows', () => {
    // claude-sonnet-4 has 200k context
    const effective = getEffectiveContextWindowSize('claude-sonnet-4')
    expect(effective).toBeGreaterThan(0)
  })
  test('never returns negative even for unknown 3P models (issue #635)', () => {
    // Previously, unknown 3P models got 8k context → effective context was
    // 8k minus 20k summary reservation = -12k, causing infinite auto-compact.
    // Now the fallback is 128k and there's a floor, so effective is always
    // at least reservedTokensForSummary + buffer.
    process.env.CLAUDE_CODE_USE_OPENAI = '1'
    try {
      const effective = getEffectiveContextWindowSize('some-unknown-3p-model')
      expect(effective).toBeGreaterThan(0)
      // Must be at least summary reservation (20k) + buffer (13k) = 33k
      expect(effective).toBeGreaterThanOrEqual(33_000)
    } finally {
      delete process.env.CLAUDE_CODE_USE_OPENAI
    }
  })
 })
 describe('getAutoCompactThreshold', () => {
  test('returns positive threshold for known models', () => {
    const threshold = getAutoCompactThreshold('claude-sonnet-4')
    expect(threshold).toBeGreaterThan(0)
  })
  test('never returns negative threshold even for unknown 3P models (issue #635)', () => {
    process.env.CLAUDE_CODE_USE_OPENAI = '1'
    try {
      const threshold = getAutoCompactThreshold('some-unknown-3p-model')
      expect(threshold).toBeGreaterThan(0)
    } finally {
      delete process.env.CLAUDE_CODE_USE_OPENAI
    }
  })
 })
--- a/src/services/compact/autoCompact.ts
+++ b/src/services/compact/autoCompact.ts
@@ -45,12 +45,7 @@ export function getEffectiveContextWindowSize(model: string): number {
    }
  }
-  // Floor: effective context must be at least the summary reservation plus a
+  return contextWindow - reservedTokensForSummary
  // usable buffer. If it goes lower, the auto-compact threshold becomes
  // negative and fires on every message (issue #635).
  const autocompactBuffer = 13_000 // must match AUTOCOMPACT_BUFFER_TOKENS
  const effectiveContext = contextWindow - reservedTokensForSummary
  return Math.max(effectiveContext, reservedTokensForSummary + autocompactBuffer)
 }
 export type AutoCompactTrackingState = {
@@ -110,14 +105,9 @@ export function calculateTokenWarningState(
    ? autoCompactThreshold
    : getEffectiveContextWindowSize(model)
  // Use the raw context window (without output reservation) for the percentage
  // display, so users see remaining context relative to the model's full capacity.
  // The threshold (which subtracts buffer) should only affect when we warn/compact,
  // not what percentage we display.
  const rawContextWindow = getContextWindowForModel(model, getSdkBetas())
  const percentLeft = Math.max(
    0,
-    Math.round(((rawContextWindow - tokenUsage) / rawContextWindow) * 100),
+    Math.round(((threshold - tokenUsage) / threshold) * 100),
  )
  const warningThreshold = threshold - WARNING_THRESHOLD_BUFFER_TOKENS
--- a/src/services/compact/compact.ts
+++ b/src/services/compact/compact.ts
@@ -9,10 +9,7 @@ const sessionTranscriptModule = feature('KAIROS')
 import { APIUserAbortError } from '@anthropic-ai/sdk'
 import { markPostCompaction } from 'src/bootstrap/state.js'
-import {
+import { getInvokedSkillsForAgent } from '../../bootstrap/state.js'
  getInvokedSkillsForAgent,
  getOriginalCwd,
 } from '../../bootstrap/state.js'
 import type { QuerySource } from '../../constants/querySource.js'
 import type { CanUseToolFn } from '../../hooks/useCanUseTool.js'
 import type { Tool, ToolUseContext } from '../../Tool.js'
@@ -71,7 +68,6 @@ import {
 } from '../../utils/messages.js'
 import { expandPath } from '../../utils/path.js'
 import { getPlan, getPlanFilePath } from '../../utils/plans.js'
 import { getProjectInstructionFilePaths } from '../../utils/projectInstructions.js'
 import {
  isSessionActivityTrackingActive,
  sendSessionActivitySignal,
@@ -1693,13 +1689,8 @@ function shouldExcludeFromPostCompactRestore(
  // and to also match child directory memory files (.claude/rules/*.md, etc.)
  try {
    const normalizedMemoryPaths = new Set(
-      MEMORY_TYPE_VALUES.filter(type => type !== 'Project').map(type =>
+      MEMORY_TYPE_VALUES.map(type => expandPath(getMemoryPath(type))),
        expandPath(getMemoryPath(type)),
      ),
    )
    for (const path of getProjectInstructionFilePaths(getOriginalCwd())) {
      normalizedMemoryPaths.add(expandPath(path))
    }
    if (normalizedMemoryPaths.has(normalizedFilename)) {
      return true
--- a/src/services/diagnosticTracking.test.ts
+++ b/src/services/diagnosticTracking.test.ts
@@ -1,152 +0,0 @@
 import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
 import { DiagnosticTrackingService } from './diagnosticTracking.js'
 import type { MCPServerConnection } from './mcp/types.js'
 // Mock the IDE client utility
 const mockGetConnectedIdeClient = (clients: MCPServerConnection[]) => 
  clients.find(client => client.type === 'connected')
 describe('DiagnosticTrackingService', () => {
  let service: DiagnosticTrackingService
  let mockClients: MCPServerConnection[]
  let mockIdeClient: MCPServerConnection
  beforeEach(() => {
    // Get fresh instance for each test
    service = DiagnosticTrackingService.getInstance()
    // Setup mock clients
    mockIdeClient = {
      type: 'connected',
      name: 'test-ide',
      capabilities: {},
      config: {},
      cleanup: async () => {},
      client: {
        request: async () => ({}),
        setNotificationHandler: () => {},
        close: async () => {},
      },
    } as unknown as MCPServerConnection
    mockClients = [
      { type: 'disconnected', name: 'test-disconnected', config: {} } as unknown as MCPServerConnection,
      mockIdeClient,
    ]
  })
  afterEach(async () => {
    await service.shutdown()
  })
  describe('handleQueryStart', () => {
    test('should store MCP clients and initialize service', async () => {
      await service.handleQueryStart(mockClients)
      // Service should be initialized
      expect(service).toBeDefined()
      // Should be able to get IDE client from stored clients
      // We can't directly test private methods, but we can test the behavior
      const result = await service.getNewDiagnosticsCompat()
      expect(result).toEqual([]) // Should return empty when no diagnostics
    })
    test('should reset service if already initialized', async () => {
      // Initialize first
      await service.handleQueryStart(mockClients)
      // Call again - should reset without error
      await service.handleQueryStart(mockClients)
      // Should still work
      const result = await service.getNewDiagnosticsCompat()
      expect(result).toEqual([])
    })
  })
  describe('backward-compatible methods', () => {
    beforeEach(async () => {
      await service.handleQueryStart(mockClients)
    })
    test('beforeFileEditedCompat should work without explicit client', async () => {
      // Should not throw error and should return undefined when no IDE client
      const result = await service.beforeFileEditedCompat('/test/file.ts')
      expect(result).toBeUndefined()
    })
    test('getNewDiagnosticsCompat should work without explicit client', async () => {
      const result = await service.getNewDiagnosticsCompat()
      expect(Array.isArray(result)).toBe(true)
    })
    test('ensureFileOpenedCompat should work without explicit client', async () => {
      const result = await service.ensureFileOpenedCompat('/test/file.ts')
      expect(result).toBeUndefined()
    })
  })
  describe('new explicit client methods', () => {
    test('beforeFileEdited should require client parameter', async () => {
      // Should not work without client
      const result = await service.beforeFileEdited('/test/file.ts', undefined as any)
      expect(result).toBeUndefined()
    })
    test('getNewDiagnostics should require client parameter', async () => {
      // Should not work without client
      const result = await service.getNewDiagnostics(undefined as any)
      expect(result).toEqual([])
    })
    test('ensureFileOpened should require client parameter', async () => {
      // Should not work without client
      const result = await service.ensureFileOpened('/test/file.ts', undefined as any)
      expect(result).toBeUndefined()
    })
  })
  describe('shutdown', () => {
    test('should clear stored clients on shutdown', async () => {
      await service.handleQueryStart(mockClients)
      // Verify service is working
      const beforeResult = await service.getNewDiagnosticsCompat()
      expect(Array.isArray(beforeResult)).toBe(true)
      // Shutdown
      await service.shutdown()
      // After shutdown, compat methods should return empty results
      const afterResult = await service.getNewDiagnosticsCompat()
      expect(afterResult).toEqual([])
    })
  })
  describe('integration with existing functionality', () => {
    test('should maintain existing diagnostic tracking behavior', async () => {
      await service.handleQueryStart(mockClients)
      // Test baseline tracking
      await service.beforeFileEditedCompat('/test/file.ts')
      // Test getting new diagnostics (should be empty since no IDE client is actually connected)
      const newDiagnostics = await service.getNewDiagnosticsCompat()
      expect(Array.isArray(newDiagnostics)).toBe(true)
    })
    test('should handle missing IDE client gracefully', async () => {
      // Test with no connected clients
      const noIdeClients = [
        { type: 'disconnected', name: 'test-disconnected-2', config: {} } as unknown as MCPServerConnection,
      ]
      await service.handleQueryStart(noIdeClients)
      // Should handle gracefully
      const result = await service.getNewDiagnosticsCompat()
      expect(result).toEqual([])
    })
  })
 })
--- a/src/services/diagnosticTracking.ts
+++ b/src/services/diagnosticTracking.ts
@@ -32,7 +32,7 @@ export class DiagnosticTrackingService {
  private baseline: Map<string, Diagnostic[]> = new Map()
  private initialized = false
-  private currentMcpClients: MCPServerConnection[] = []
+  private mcpClient: MCPServerConnection | undefined
  // Track when files were last processed/fetched
  private lastProcessedTimestamps: Map<string, number> = new Map()
@@ -48,17 +48,18 @@ export class DiagnosticTrackingService {
    return DiagnosticTrackingService.instance
  }
-  initialize() {
+  initialize(mcpClient: MCPServerConnection) {
    if (this.initialized) {
      return
    }
    // TODO: Do not cache the connected mcpClient since it can change.
    this.mcpClient = mcpClient
    this.initialized = true
  }
  async shutdown(): Promise<void> {
    this.initialized = false
    this.currentMcpClients = []
    this.baseline.clear()
    this.rightFileDiagnosticsState.clear()
    this.lastProcessedTimestamps.clear()
@@ -74,46 +75,6 @@ export class DiagnosticTrackingService {
    this.lastProcessedTimestamps.clear()
  }
  /**
   * Get the current IDE client from stored MCP clients
   */
  private getCurrentIdeClient(): MCPServerConnection | undefined {
    return getConnectedIdeClient(this.currentMcpClients)
  }
  /**
   * Backward-compatible method that uses stored IDE client
   */
  async beforeFileEditedCompat(filePath: string): Promise<void> {
    const ideClient = this.getCurrentIdeClient()
    if (!ideClient) {
      return
    }
    return await this.beforeFileEdited(filePath, ideClient)
  }
  /**
   * Backward-compatible method that uses stored IDE client
   */
  async getNewDiagnosticsCompat(): Promise<DiagnosticFile[]> {
    const ideClient = this.getCurrentIdeClient()
    if (!ideClient) {
      return []
    }
    return await this.getNewDiagnostics(ideClient)
  }
  /**
   * Backward-compatible method that uses stored IDE client
   */
  async ensureFileOpenedCompat(fileUri: string): Promise<void> {
    const ideClient = this.getCurrentIdeClient()
    if (!ideClient) {
      return
    }
    return await this.ensureFileOpened(fileUri, ideClient)
  }
  private normalizeFileUri(fileUri: string): string {
    // Remove our protocol prefixes
    const protocolPrefixes = [
@@ -139,11 +100,11 @@ export class DiagnosticTrackingService {
   * Ensure a file is opened in the IDE before processing.
   * This is important for language services like diagnostics to work properly.
   */
-  async ensureFileOpened(fileUri: string, mcpClient: MCPServerConnection): Promise<void> {
+  async ensureFileOpened(fileUri: string): Promise<void> {
    if (
      !this.initialized ||
-      !mcpClient ||
+      !this.mcpClient ||
-      mcpClient.type !== 'connected'
+      this.mcpClient.type !== 'connected'
    ) {
      return
    }
@@ -160,7 +121,7 @@ export class DiagnosticTrackingService {
          selectToEndOfLine: false,
          makeFrontmost: false,
        },
-        mcpClient,
+        this.mcpClient,
      )
    } catch (error) {
      logError(error as Error)
@@ -171,11 +132,11 @@ export class DiagnosticTrackingService {
   * Capture baseline diagnostics for a specific file before editing.
   * This is called before editing a file to ensure we have a baseline to compare against.
   */
-  async beforeFileEdited(filePath: string, mcpClient: MCPServerConnection): Promise<void> {
+  async beforeFileEdited(filePath: string): Promise<void> {
    if (
      !this.initialized ||
-      !mcpClient ||
+      !this.mcpClient ||
-      mcpClient.type !== 'connected'
+      this.mcpClient.type !== 'connected'
    ) {
      return
    }
@@ -186,7 +147,7 @@ export class DiagnosticTrackingService {
      const result = await callIdeRpc(
        'getDiagnostics',
        { uri: `file://${filePath}` },
-        mcpClient,
+        this.mcpClient,
      )
      const diagnosticFile = this.parseDiagnosticResult(result)[0]
      if (diagnosticFile) {
@@ -224,11 +185,11 @@ export class DiagnosticTrackingService {
   * Get new diagnostics from file://, _claude_fs_right, and _claude_fs_ URIs that aren't in the baseline.
   * Only processes diagnostics for files that have been edited.
   */
-  async getNewDiagnostics(mcpClient: MCPServerConnection): Promise<DiagnosticFile[]> {
+  async getNewDiagnostics(): Promise<DiagnosticFile[]> {
    if (
      !this.initialized ||
-      !mcpClient ||
+      !this.mcpClient ||
-      mcpClient.type !== 'connected'
+      this.mcpClient.type !== 'connected'
    ) {
      return []
    }
@@ -239,7 +200,7 @@ export class DiagnosticTrackingService {
      const result = await callIdeRpc(
        'getDiagnostics',
        {}, // Empty params fetches all diagnostics
-        mcpClient,
+        this.mcpClient,
      )
      allDiagnosticFiles = this.parseDiagnosticResult(result)
    } catch (_error) {
@@ -367,16 +328,13 @@ export class DiagnosticTrackingService {
   * @param shouldQuery Whether a query is actually being made (not just a command)
   */
  async handleQueryStart(clients: MCPServerConnection[]): Promise<void> {
    // Store the current MCP clients for later use
    this.currentMcpClients = clients
    // Only proceed if we should query and have clients
    if (!this.initialized) {
      // Find the connected IDE client
      const connectedIdeClient = getConnectedIdeClient(clients)
      if (connectedIdeClient) {
-        this.initialize()
+        this.initialize(connectedIdeClient)
      }
    } else {
      // Reset diagnostic tracking for new query loops
--- a/src/services/github/deviceFlow.test.ts
+++ b/src/services/github/deviceFlow.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
 import {
  DEFAULT_GITHUB_DEVICE_SCOPE,
@@ -12,15 +12,22 @@ async function importFreshModule() {
  return import(`./deviceFlow.ts?ts=${Date.now()}-${Math.random()}`)
 }
 afterEach(() => {
  mock.restore()
 })
 describe('requestDeviceCode', () => {
  const originalFetch = globalThis.fetch
  beforeEach(() => {
    mock.restore()
    globalThis.fetch = originalFetch
  })
  afterEach(() => {
    globalThis.fetch = originalFetch
  })
  test('parses successful device code response', async () => {
    const { requestDeviceCode } = await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(
        new Response(
          JSON.stringify({
@@ -37,7 +44,7 @@ describe('requestDeviceCode', () => {
    const r = await requestDeviceCode({
      clientId: 'test-client',
-      fetchImpl,
+      fetchImpl: globalThis.fetch,
    })
    expect(r.device_code).toBe('abc')
    expect(r.user_code).toBe('ABCD-1234')
@@ -50,17 +57,17 @@ describe('requestDeviceCode', () => {
    const { requestDeviceCode, GitHubDeviceFlowError } =
      await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(new Response('bad', { status: 500 })),
    )
    await expect(
-      requestDeviceCode({ clientId: 'x', fetchImpl }),
+      requestDeviceCode({ clientId: 'x', fetchImpl: globalThis.fetch }),
    ).rejects.toThrow(GitHubDeviceFlowError)
  })
  test('uses OAuth-safe default scope', async () => {
    let capturedScope = ''
-    const fetchImpl = mock((_url: RequestInfo | URL, init?: RequestInit) => {
+    globalThis.fetch = mock((_url: RequestInfo | URL, init?: RequestInit) => {
      const body = init?.body
      if (body instanceof URLSearchParams) {
        capturedScope = body.get('scope') ?? ''
@@ -80,7 +87,7 @@ describe('requestDeviceCode', () => {
      )
    })
-    await requestDeviceCode({ clientId: 'test-client', fetchImpl })
+    await requestDeviceCode({ clientId: 'test-client', fetchImpl: globalThis.fetch })
    expect(capturedScope).toBe(DEFAULT_GITHUB_DEVICE_SCOPE)
    expect(capturedScope).toBe('read:user')
  })
@@ -89,7 +96,7 @@ describe('requestDeviceCode', () => {
    const scopesSeen: string[] = []
    let callCount = 0
-    const fetchImpl = mock((_url: RequestInfo | URL, init?: RequestInit) => {
+    globalThis.fetch = mock((_url: RequestInfo | URL, init?: RequestInit) => {
      const body = init?.body
      const scope =
        body instanceof URLSearchParams
@@ -125,7 +132,7 @@ describe('requestDeviceCode', () => {
    const result = await requestDeviceCode({
      clientId: 'test-client',
      scope: 'read:user,models:read',
-      fetchImpl,
+      fetchImpl: globalThis.fetch,
    })
    expect(result.device_code).toBe('abc')
@@ -135,11 +142,17 @@ describe('requestDeviceCode', () => {
 })
 describe('pollAccessToken', () => {
  const originalFetch = globalThis.fetch
  afterEach(() => {
    globalThis.fetch = originalFetch
  })
  test('returns token when GitHub responds with access_token immediately', async () => {
    const { pollAccessToken } = await importFreshModule()
    let calls = 0
-    const fetchImpl = mock(() => {
+    globalThis.fetch = mock(() => {
      calls++
      return Promise.resolve(
        new Response(JSON.stringify({ access_token: 'tok-xyz' }), {
@@ -150,7 +163,7 @@ describe('pollAccessToken', () => {
    const token = await pollAccessToken('dev-code', {
      clientId: 'cid',
-      fetchImpl,
+      fetchImpl: globalThis.fetch,
    })
    expect(token).toBe('tok-xyz')
    expect(calls).toBe(1)
@@ -159,7 +172,7 @@ describe('pollAccessToken', () => {
  test('throws on access_denied', async () => {
    const { pollAccessToken } = await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(
        new Response(JSON.stringify({ error: 'access_denied' }), {
          status: 200,
@@ -169,17 +182,23 @@ describe('pollAccessToken', () => {
    await expect(
      pollAccessToken('dc', {
        clientId: 'c',
-        fetchImpl,
+        fetchImpl: globalThis.fetch,
      }),
    ).rejects.toThrow(/denied/)
  })
 })
 describe('exchangeForCopilotToken', () => {
  const originalFetch = globalThis.fetch
  afterEach(() => {
    globalThis.fetch = originalFetch
  })
  test('parses successful Copilot token response', async () => {
    const { exchangeForCopilotToken } = await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(
        new Response(
          JSON.stringify({
@@ -195,7 +214,7 @@ describe('exchangeForCopilotToken', () => {
      ),
    )
-    const result = await exchangeForCopilotToken('oauth-token', fetchImpl)
+    const result = await exchangeForCopilotToken('oauth-token', globalThis.fetch)
    expect(result.token).toBe('copilot-token-xyz')
    expect(result.expires_at).toBe(1700000000)
    expect(result.refresh_in).toBe(3600)
@@ -206,24 +225,24 @@ describe('exchangeForCopilotToken', () => {
    const { exchangeForCopilotToken, GitHubDeviceFlowError } =
      await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(new Response('unauthorized', { status: 401 })),
    )
    await expect(
-      exchangeForCopilotToken('bad-token', fetchImpl),
+      exchangeForCopilotToken('bad-token', globalThis.fetch),
    ).rejects.toThrow(GitHubDeviceFlowError)
  })
  test('throws on malformed response', async () => {
    const { exchangeForCopilotToken } = await importFreshModule()
-    const fetchImpl = mock(() =>
+    globalThis.fetch = mock(() =>
      Promise.resolve(
        new Response(JSON.stringify({ invalid: 'data' }), { status: 200 }),
      ),
    )
    await expect(
-      exchangeForCopilotToken('oauth-token', fetchImpl),
+      exchangeForCopilotToken('oauth-token', globalThis.fetch),
    ).rejects.toThrow(/Malformed/)
  })
 })
--- a/src/services/mcp/auth.test.ts
+++ b/src/services/mcp/auth.test.ts
@@ -1,61 +0,0 @@
 import assert from 'node:assert/strict'
 import test from 'node:test'
 import { validateOAuthCallbackParams } from './auth.js'
 test('OAuth callback rejects error parameters before state validation can be bypassed', () => {
  const result = validateOAuthCallbackParams(
    {
      error: 'access_denied',
      error_description: 'denied by provider',
    },
    'expected-state',
  )
  assert.deepEqual(result, { type: 'state_mismatch' })
 })
 test('OAuth callback accepts provider errors only when state matches', () => {
  const result = validateOAuthCallbackParams(
    {
      state: 'expected-state',
      error: 'access_denied',
      error_description: 'denied by provider',
      error_uri: 'https://example.test/error',
    },
    'expected-state',
  )
  assert.deepEqual(result, {
    type: 'error',
    error: 'access_denied',
    errorDescription: 'denied by provider',
    errorUri: 'https://example.test/error',
    message:
      'OAuth error: access_denied - denied by provider (See: https://example.test/error)',
  })
 })
 test('OAuth callback accepts authorization codes only when state matches', () => {
  assert.deepEqual(
    validateOAuthCallbackParams(
      {
        state: 'expected-state',
        code: 'auth-code',
      },
      'expected-state',
    ),
    { type: 'code', code: 'auth-code' },
  )
  assert.deepEqual(
    validateOAuthCallbackParams(
      {
        state: 'wrong-state',
        code: 'auth-code',
      },
      'expected-state',
    ),
    { type: 'state_mismatch' },
  )
 })
--- a/src/services/mcp/auth.ts
+++ b/src/services/mcp/auth.ts
@@ -124,74 +124,6 @@ function redactSensitiveUrlParams(url: string): string {
  }
 }
 type OAuthCallbackParamValue = string | string[] | null | undefined
 type OAuthCallbackValidationResult =
  | { type: 'code'; code: string }
  | {
      type: 'error'
      error: string
      errorDescription: string
      errorUri: string
      message: string
    }
  | { type: 'missing_result' }
  | { type: 'state_mismatch' }
 function getFirstOAuthCallbackParam(
  value: OAuthCallbackParamValue,
 ): string | undefined {
  if (Array.isArray(value)) {
    return value.find(item => item.length > 0)
  }
  return value && value.length > 0 ? value : undefined
 }
 export function validateOAuthCallbackParams(
  params: {
    code?: OAuthCallbackParamValue
    state?: OAuthCallbackParamValue
    error?: OAuthCallbackParamValue
    error_description?: OAuthCallbackParamValue
    error_uri?: OAuthCallbackParamValue
  },
  oauthState: string,
 ): OAuthCallbackValidationResult {
  const code = getFirstOAuthCallbackParam(params.code)
  const state = getFirstOAuthCallbackParam(params.state)
  const error = getFirstOAuthCallbackParam(params.error)
  const errorDescription =
    getFirstOAuthCallbackParam(params.error_description) ?? ''
  const errorUri = getFirstOAuthCallbackParam(params.error_uri) ?? ''
  if (state !== oauthState) {
    return { type: 'state_mismatch' }
  }
  if (error) {
    let message = `OAuth error: ${error}`
    if (errorDescription) {
      message += ` - ${errorDescription}`
    }
    if (errorUri) {
      message += ` (See: ${errorUri})`
    }
    return {
      type: 'error',
      error,
      errorDescription,
      errorUri,
      message,
    }
  }
  if (code) {
    return { type: 'code', code }
  }
  return { type: 'missing_result' }
 }
 /**
 * Some OAuth servers (notably Slack) return HTTP 200 for all responses,
 * signaling errors via the JSON body instead. The SDK's executeTokenRequest
@@ -1126,31 +1058,30 @@ export async function performMCPOAuthFlow(
        options.onWaitingForCallback((callbackUrl: string) => {
          try {
            const parsed = new URL(callbackUrl)
-            const result = validateOAuthCallbackParams(
+            const code = parsed.searchParams.get('code')
-              {
+            const state = parsed.searchParams.get('state')
-                code: parsed.searchParams.get('code'),
+            const error = parsed.searchParams.get('error')
                state: parsed.searchParams.get('state'),
                error: parsed.searchParams.get('error'),
                error_description:
                  parsed.searchParams.get('error_description'),
                error_uri: parsed.searchParams.get('error_uri'),
              },
              oauthState,
            )
-            if (result.type === 'state_mismatch') {
+            if (error) {
-              // Ignore so a stray or malicious URL cannot cancel an active flow.
+              const errorDescription =
-              return
+                parsed.searchParams.get('error_description') || ''
            }
            if (result.type === 'missing_result') {
              // Not a valid callback URL, ignore so the user can try again.
              return
            }
            if (result.type === 'error') {
              cleanup()
-              rejectOnce(new Error(result.message))
+              rejectOnce(
                new Error(`OAuth error: ${error} - ${errorDescription}`),
              )
              return
            }
            if (!code) {
              // Not a valid callback URL, ignore so the user can try again
              return
            }
            if (state !== oauthState) {
              cleanup()
              rejectOnce(
                new Error('OAuth state mismatch - possible CSRF attack'),
              )
              return
            }
@@ -1159,7 +1090,7 @@ export async function performMCPOAuthFlow(
              `Received auth code via manual callback URL`,
            )
            cleanup()
-            resolveOnce(result.code)
+            resolveOnce(code)
          } catch {
            // Invalid URL, ignore so the user can try again
          }
@@ -1170,49 +1101,53 @@ export async function performMCPOAuthFlow(
        const parsedUrl = parse(req.url || '', true)
        if (parsedUrl.pathname === '/callback') {
-          const result = validateOAuthCallbackParams(
+          const code = parsedUrl.query.code as string
-            parsedUrl.query,
+          const state = parsedUrl.query.state as string
-            oauthState,
+          const error = parsedUrl.query.error
-          )
+          const errorDescription = parsedUrl.query.error_description as string
          const errorUri = parsedUrl.query.error_uri as string
          // Validate OAuth state to prevent CSRF attacks
-          if (result.type === 'state_mismatch') {
+          if (!error && state !== oauthState) {
            res.writeHead(400, { 'Content-Type': 'text/html' })
            res.end(
              `<h1>Authentication Error</h1><p>Invalid state parameter. Please try again.</p><p>You can close this window.</p>`,
            )
            cleanup()
            rejectOnce(new Error('OAuth state mismatch - possible CSRF attack'))
            return
          }
-          if (result.type === 'missing_result') {
+          if (error) {
            res.writeHead(400, { 'Content-Type': 'text/html' })
            res.end(
              `<h1>Authentication Error</h1><p>Missing OAuth result. Please try again.</p><p>You can close this window.</p>`,
            )
            return
          }
          if (result.type === 'error') {
            res.writeHead(200, { 'Content-Type': 'text/html' })
            // Sanitize error messages to prevent XSS
-            const sanitizedError = xss(result.error)
+            const sanitizedError = xss(String(error))
-            const sanitizedErrorDescription = result.errorDescription
+            const sanitizedErrorDescription = errorDescription
-              ? xss(result.errorDescription)
+              ? xss(String(errorDescription))
              : ''
            res.end(
              `<h1>Authentication Error</h1><p>${sanitizedError}: ${sanitizedErrorDescription}</p><p>You can close this window.</p>`,
            )
            cleanup()
-            rejectOnce(new Error(result.message))
+            let errorMessage = `OAuth error: ${error}`
            if (errorDescription) {
              errorMessage += ` - ${errorDescription}`
            }
            if (errorUri) {
              errorMessage += ` (See: ${errorUri})`
            }
            rejectOnce(new Error(errorMessage))
            return
          }
-          res.writeHead(200, { 'Content-Type': 'text/html' })
+          if (code) {
-          res.end(
+            res.writeHead(200, { 'Content-Type': 'text/html' })
-            `<h1>Authentication Successful</h1><p>You can close this window. Return to Claude Code.</p>`,
+            res.end(
-          )
+              `<h1>Authentication Successful</h1><p>You can close this window. Return to Claude Code.</p>`,
-          cleanup()
+            )
-          resolveOnce(result.code)
+            cleanup()
            resolveOnce(code)
          }
        }
      })
--- a/src/services/mcp/client.ts
+++ b/src/services/mcp/client.ts
@@ -206,12 +206,9 @@ export function isMcpSessionExpiredError(error: Error): boolean {
 }
 /**
- * Default timeout for MCP tool calls (5 minutes — reasonable for most tools).
+ * Default timeout for MCP tool calls (effectively infinite - ~27.8 hours).
 * Use MCP_TOOL_TIMEOUT env var to override per-server.
 * The previous default of ~27.8 hours effectively meant no timeout, causing
 * tools to hang indefinitely on unresponsive servers.
 */
-const DEFAULT_MCP_TOOL_TIMEOUT_MS = 300_000
+const DEFAULT_MCP_TOOL_TIMEOUT_MS = 100_000_000
 /**
 * Cap on MCP tool descriptions and server instructions sent to the model.
@@ -1767,32 +1764,10 @@ export const fetchToolsForClient = memoizeWithLRU(
        return []
      }
-      // Retry tool list fetch up to 2 times on transient failures.
+      const result = (await client.client.request(
-      // Without retry, a single timeout during tools/list makes all MCP tools
+        { method: 'tools/list' },
-      // silently disappear from the model's context until the next reconnect.
+        ListToolsResultSchema,
-      let result: ListToolsResult | undefined
+      )) as ListToolsResult
      let lastError: unknown
      for (let attempt = 0; attempt < 3; attempt++) {
        try {
          result = (await client.client.request(
            { method: 'tools/list' },
            ListToolsResultSchema,
          )) as ListToolsResult
          break
        } catch (err) {
          lastError = err
          if (attempt < 2) {
            logMCPDebug(
              client.name,
              `tools/list failed (attempt ${attempt + 1}/3): ${errorMessage(err)}. Retrying...`,
            )
            await sleep(1000 * (attempt + 1))
          }
        }
      }
      if (!result) {
        throw lastError ?? new Error('tools/list failed after 3 attempts')
      }
      // Sanitize tool data from MCP server
      const toolsToProcess = recursivelySanitizeUnicode(result.tools)
@@ -2889,11 +2864,6 @@ export async function callMCPToolWithUrlElicitationRetry({
 }): Promise<MCPToolCallResult> {
  const MAX_URL_ELICITATION_RETRIES = 3
  for (let attempt = 0; ; attempt++) {
    // Check abort signal before each attempt — without this, a cancelled
    // elicitation retry loop continues spinning until MAX retries
    if (signal.aborted) {
      throw new Error('Tool call aborted during URL elicitation')
    }
    try {
      return await callToolFn({
        client: connectedClient,
@@ -3186,12 +3156,9 @@ async function callMCPTool({
        errorDetails = String(result.error)
      }
      logMCPError(name, errorDetails)
      // Include server and tool name in telemetry for debugging, but keep
      // the human-readable message unchanged to avoid breaking error consumers
      // that parse the message string.
      throw new McpToolCallError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS(
        errorDetails,
-        `MCP tool [${name}] ${tool}: ${errorDetails}`,
+        'MCP tool returned error',
        '_meta' in result && result._meta ? { _meta: result._meta } : undefined,
      )
    }
--- a/src/services/oauth/auth-code-listener.analytics.test.ts
+++ b/src/services/oauth/auth-code-listener.analytics.test.ts
@@ -1,155 +0,0 @@
 import { afterEach, expect, mock, test } from 'bun:test'
 afterEach(() => {
  mock.restore()
 })
 test('custom error responses log the error redirect analytics event', async () => {
  const events: Array<{
    name: string
    metadata: Record<string, boolean | number | undefined>
  }> = []
  mock.module('src/services/analytics/index.js', () => ({
    logEvent: (
      name: string,
      metadata: Record<string, boolean | number | undefined>,
    ) => {
      events.push({ name, metadata })
    },
  }))
  const { AuthCodeListener } = await import(
    `./auth-code-listener.js?ts=${Date.now()}-${Math.random()}`
  )
  const listener = new AuthCodeListener('/callback')
  const response = {
    writeHead: () => {},
    end: () => {},
  }
  ;(listener as any).pendingResponse = response
  listener.handleErrorRedirect(res => {
    res.writeHead(400, {
      'Content-Type': 'text/plain; charset=utf-8',
    })
    res.end('cancelled')
  })
  expect(events).toEqual([
    {
      name: 'tengu_oauth_automatic_redirect_error',
      metadata: { custom_handler: true },
    },
  ])
 })
 test('custom handlers that do not end the response are closed automatically and still log analytics', async () => {
  const events: Array<{
    name: string
    metadata: Record<string, boolean | number | undefined>
  }> = []
  const response = {
    destroyed: false,
    headersSent: false,
    writableEnded: false,
    writeHead: () => {
      response.headersSent = true
    },
    end: () => {
      response.writableEnded = true
    },
  }
  mock.module('src/services/analytics/index.js', () => ({
    logEvent: (
      name: string,
      metadata: Record<string, boolean | number | undefined>,
    ) => {
      events.push({ name, metadata })
    },
  }))
  mock.module('../../utils/log.js', () => ({
    logError: () => {},
  }))
  const { AuthCodeListener } = await import(
    `./auth-code-listener.js?ts=${Date.now()}-${Math.random()}`
  )
  const listener = new AuthCodeListener('/callback')
  ;(listener as any).pendingResponse = response
  listener.handleErrorRedirect(res => {
    res.writeHead(400, {
      'Content-Type': 'text/plain; charset=utf-8',
    })
  })
  expect(response.writableEnded).toBe(true)
  expect((listener as any).pendingResponse).toBeNull()
  expect(events).toEqual([
    {
      name: 'tengu_oauth_automatic_redirect_error',
      metadata: { custom_handler: true },
    },
  ])
 })
 test('custom handlers that throw are logged, converted to a fallback response, and do not log analytics', async () => {
  const events: Array<{
    name: string
    metadata: Record<string, boolean | number | undefined>
  }> = []
  const loggedErrors: unknown[] = []
  const response = {
    destroyed: false,
    headersSent: false,
    writableEnded: false,
    statusCode: 0,
    body: '',
    writeHead: (statusCode: number) => {
      response.headersSent = true
      response.statusCode = statusCode
    },
    end: (body = '') => {
      response.writableEnded = true
      response.body = body
    },
  }
  mock.module('src/services/analytics/index.js', () => ({
    logEvent: (
      name: string,
      metadata: Record<string, boolean | number | undefined>,
    ) => {
      events.push({ name, metadata })
    },
  }))
  mock.module('../../utils/log.js', () => ({
    logError: (error: unknown) => {
      loggedErrors.push(error)
    },
  }))
  const { AuthCodeListener } = await import(
    `./auth-code-listener.js?ts=${Date.now()}-${Math.random()}`
  )
  const listener = new AuthCodeListener('/callback')
  ;(listener as any).pendingResponse = response
  listener.handleErrorRedirect(() => {
    throw new Error('handler exploded')
  })
  expect(response.statusCode).toBe(500)
  expect(response.body).toBe('Authentication redirect failed')
  expect(response.writableEnded).toBe(true)
  expect((listener as any).pendingResponse).toBeNull()
  expect(loggedErrors).toHaveLength(1)
  expect(events).toEqual([])
 })
--- a/src/services/oauth/auth-code-listener.test.ts
+++ b/src/services/oauth/auth-code-listener.test.ts
@@ -1,31 +0,0 @@
 import { afterEach, expect, test } from 'bun:test'
 import { AuthCodeListener } from './auth-code-listener.js'
 const listeners: AuthCodeListener[] = []
 afterEach(() => {
  while (listeners.length > 0) {
    listeners.pop()?.close()
  }
 })
 test('cancelPendingAuthorization rejects a pending OAuth wait', async () => {
  const listener = new AuthCodeListener('/callback')
  listeners.push(listener)
  await listener.start()
  const pendingAuthorization = listener.waitForAuthorization(
    'state-test',
    async () => {},
  )
  listener.cancelPendingAuthorization(
    new Error('Codex OAuth flow was cancelled.'),
  )
  await expect(pendingAuthorization).rejects.toThrow(
    'Codex OAuth flow was cancelled.',
  )
 })
--- a/src/services/oauth/auth-code-listener.ts
+++ b/src/services/oauth/auth-code-listener.ts
@@ -71,42 +71,6 @@ export class AuthCodeListener {
    })
  }
  private respondToPendingRequest(options: {
    handler: (res: ServerResponse) => void
    analyticsEvent:
      | 'tengu_oauth_automatic_redirect'
      | 'tengu_oauth_automatic_redirect_error'
    analyticsMetadata?: Record<string, boolean>
  }): void {
    if (!this.pendingResponse) return
    const response = this.pendingResponse
    try {
      options.handler(response)
      if (!response.writableEnded && !response.destroyed) {
        response.end()
      }
      logEvent(options.analyticsEvent, options.analyticsMetadata ?? {})
    } catch (error) {
      logError(error)
      if (!response.headersSent && !response.destroyed) {
        response.writeHead(500, {
          'Content-Type': 'text/plain; charset=utf-8',
        })
      }
      if (!response.writableEnded && !response.destroyed) {
        response.end('Authentication redirect failed')
      }
    } finally {
      if (this.pendingResponse === response) {
        this.pendingResponse = null
      }
    }
  }
  /**
   * Completes the OAuth flow by redirecting the user's browser to a success page.
   * Different success pages are shown based on the granted scopes.
@@ -121,13 +85,9 @@ export class AuthCodeListener {
    // If custom handler provided, use it instead of default redirect
    if (customHandler) {
-      this.respondToPendingRequest({
+      customHandler(this.pendingResponse, scopes)
-        handler: res => {
+      this.pendingResponse = null
-          customHandler(res, scopes)
+      logEvent('tengu_oauth_automatic_redirect', { custom_handler: true })
        },
        analyticsEvent: 'tengu_oauth_automatic_redirect',
        analyticsMetadata: { custom_handler: true },
      })
      return
    }
@@ -137,48 +97,29 @@ export class AuthCodeListener {
      : getOauthConfig().CONSOLE_SUCCESS_URL
    // Send browser to success page
-    this.respondToPendingRequest({
+    this.pendingResponse.writeHead(302, { Location: successUrl })
-      handler: res => {
+    this.pendingResponse.end()
-        res.writeHead(302, { Location: successUrl })
+    this.pendingResponse = null
-        res.end()
+
-      },
+    logEvent('tengu_oauth_automatic_redirect', {})
      analyticsEvent: 'tengu_oauth_automatic_redirect',
    })
  }
  /**
   * Handles error case by sending a redirect to the appropriate success page with an error indicator,
   * ensuring the browser flow is completed properly.
   */
-  handleErrorRedirect(customHandler?: (res: ServerResponse) => void): void {
+  handleErrorRedirect(): void {
    if (!this.pendingResponse) return
    if (customHandler) {
      this.respondToPendingRequest({
        handler: customHandler,
        analyticsEvent: 'tengu_oauth_automatic_redirect_error',
        analyticsMetadata: { custom_handler: true },
      })
      return
    }
    // TODO: swap to a different url once we have an error page
    const errorUrl = getOauthConfig().CLAUDEAI_SUCCESS_URL
-    this.respondToPendingRequest({
+    // Send browser to error page
-      handler: res => {
+    this.pendingResponse.writeHead(302, { Location: errorUrl })
-        res.writeHead(302, { Location: errorUrl })
+    this.pendingResponse.end()
-        res.end()
+    this.pendingResponse = null
      },
      analyticsEvent: 'tengu_oauth_automatic_redirect_error',
    })
  }
-  cancelPendingAuthorization(
+    logEvent('tengu_oauth_automatic_redirect_error', {})
    error: Error = new Error('OAuth authorization was cancelled.'),
  ): void {
    this.reject(error)
    this.close()
  }
  private startLocalListener(onReady: () => Promise<void>): void {
@@ -235,7 +176,8 @@ export class AuthCodeListener {
  private handleError(err: Error): void {
    logError(err)
-    this.cancelPendingAuthorization(err)
+    this.close()
    this.reject(err)
  }
  private resolve(authorizationCode: string): void {
@@ -243,7 +185,6 @@ export class AuthCodeListener {
      this.promiseResolver(authorizationCode)
      this.promiseResolver = null
      this.promiseRejecter = null
      this.expectedState = null
    }
  }
@@ -252,7 +193,6 @@ export class AuthCodeListener {
      this.promiseRejecter(error)
      this.promiseResolver = null
      this.promiseRejecter = null
      this.expectedState = null
    }
  }
@@ -267,8 +207,5 @@ export class AuthCodeListener {
      this.localServer.removeAllListeners()
      this.localServer.close()
    }
    this.expectedState = null
    this.port = 0
  }
 }
--- a/src/services/tips/tipRegistry.ts
+++ b/src/services/tips/tipRegistry.ts
@@ -109,6 +109,7 @@ const externalTips: Tip[] = [
      `Use Plan Mode to prepare for a complex request before making changes. Press ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} twice to enable.`,
    cooldownSessions: 5,
    isRelevant: async () => {
      if (process.env.USER_TYPE === 'ant') return false
      const config = getGlobalConfig()
      // Show to users who haven't used plan mode recently (7+ days)
      const daysSinceLastUse = config.lastPlanModeUse
@@ -400,7 +401,9 @@ const externalTips: Tip[] = [
  {
    id: 'shift-tab',
    content: async () =>
-      `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default mode, auto-accept edit mode, and plan mode`,
+      process.env.USER_TYPE === 'ant'
        ? `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default mode and auto mode`
        : `Hit ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} to cycle between default mode, auto-accept edit mode, and plan mode`,
    cooldownSessions: 10,
    isRelevant: async () => true,
  },
@@ -473,6 +476,7 @@ const externalTips: Tip[] = [
      `Your default model setting is Opus Plan Mode. Press ${getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab')} twice to activate Plan Mode and plan with Claude Opus.`,
    cooldownSessions: 2,
    async isRelevant() {
      if (process.env.USER_TYPE === 'ant') return false
      const config = getGlobalConfig()
      const modelSetting = getUserSpecifiedModelSetting()
      const hasOpusPlanMode = modelSetting === 'opusplan'
@@ -620,12 +624,33 @@ const externalTips: Tip[] = [
    content: async () => 'Use /feedback to help us improve!',
    cooldownSessions: 15,
    async isRelevant() {
      if (process.env.USER_TYPE === 'ant') {
        return false
      }
      const config = getGlobalConfig()
      return config.numStartups > 5
    },
  },
 ]
-const internalOnlyTips: Tip[] = []
+const internalOnlyTips: Tip[] =
  process.env.USER_TYPE === 'ant'
    ? [
        {
          id: 'important-claudemd',
          content: async () =>
            '[internal] Use "IMPORTANT:" prefix for must-follow CLAUDE.md rules',
          cooldownSessions: 30,
          isRelevant: async () => true,
        },
        {
          id: 'skillify',
          content: async () =>
            '[internal] Use /skillify to turn repeatable recurring workflows into reusable project skills',
          cooldownSessions: 15,
          isRelevant: async () => true,
        },
      ]
    : []
 function getCustomTips(): Tip[] {
  const settings = getInitialSettings()
--- a/src/skills/bundled/index.ts
+++ b/src/skills/bundled/index.ts
@@ -4,7 +4,6 @@ import { registerBatchSkill } from './batch.js'
 import { registerClaudeInChromeSkill } from './claudeInChrome.js'
 import { registerDebugSkill } from './debug.js'
 import { registerKeybindingsSkill } from './keybindings.js'
 import { registerLoopSkill } from './loop.js'
 import { registerSimplifySkill } from './simplify.js'
 import { registerUpdateConfigSkill } from './updateConfig.js'
@@ -35,10 +34,15 @@ export function initBundledSkills(): void {
    /* eslint-enable @typescript-eslint/no-require-imports */
    registerHunterSkill()
  }
-  // /loop's isEnabled delegates to isKairosCronEnabled() — registered
+  if (feature('AGENT_TRIGGERS')) {
-  // unconditionally so the static import is bundled; visibility is gated
+    /* eslint-disable @typescript-eslint/no-require-imports */
-  // at runtime by the isEnabled callback.
+    const { registerLoopSkill } = require('./loop.js')
-  registerLoopSkill()
+    /* eslint-enable @typescript-eslint/no-require-imports */
    // /loop's isEnabled delegates to isKairosCronEnabled() — same lazy
    // per-invocation pattern as the cron tools. Registered unconditionally;
    // the skill's own isEnabled callback decides visibility.
    registerLoopSkill()
  }
  if (feature('AGENT_TRIGGERS_REMOTE')) {
    /* eslint-disable @typescript-eslint/no-require-imports */
    const {
--- a/src/skills/bundled/loop.test.ts
+++ b/src/skills/bundled/loop.test.ts
@@ -1,125 +0,0 @@
 import { afterEach, expect, test } from 'bun:test'
 import { clearBundledSkills, getBundledSkills } from '../bundledSkills.js'
 import { registerLoopSkill } from './loop.js'
 afterEach(() => {
  clearBundledSkills()
 })
 test('bare /loop returns dynamic maintenance instructions', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  expect(skill).toBeDefined()
  expect(skill?.type).toBe('prompt')
  const blocks = await skill!.getPromptForCommand('', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — dynamic rescheduling')
  expect(text).toContain('If .claude/loop.md exists, read it and use it.')
  expect(text).toContain('continue any unfinished work from the conversation')
  expect(text).toContain('Set the scheduled prompt to this exact text so the next iteration stays in dynamic mode:')
  expect(text).toContain('/loop')
 })
 test('prompt-only /loop returns dynamic rescheduling instructions', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('check the deploy', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — dynamic rescheduling')
  expect(text).toContain('check the deploy')
  expect(text).toContain('choose the next delay dynamically between 1 minute and 1 hour')
  expect(text).toContain('/loop check the deploy')
 })
 test('interval /loop returns fixed recurring instructions', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('5m check the deploy', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — fixed recurring interval')
  expect(text).toContain('Requested interval:')
  expect(text).toContain('5m')
  expect(text).toContain('Call CronCreate')
  expect(text).toContain('recurring: true')
  expect(text).toContain('Immediately execute the effective prompt now')
 })
 test('interval-only /loop becomes fixed maintenance mode', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('15m', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — fixed recurring interval')
  expect(text).toContain('15m')
  expect(text).toContain('This is a maintenance loop with no explicit prompt.')
  expect(text).toContain('Scheduled maintenance loop iteration.')
 })
 test('trailing every clause parses interval and prompt', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('check the deploy every 20m', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — fixed recurring interval')
  expect(text).toContain('20m')
  expect(text).toContain('check the deploy')
 })
 test('trailing every clause with word unit parses correctly', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('run tests every 5 minutes', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — fixed recurring interval')
  expect(text).toContain('5m')
  expect(text).toContain('run tests')
 })
 test('"check every PR" is not treated as an interval', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('check every PR', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — dynamic rescheduling')
  expect(text).toContain('check every PR')
 })
 test('human-readable hour unit parses correctly', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('2h check logs', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('# /loop — fixed recurring interval')
  expect(text).toContain('2h')
  expect(text).toContain('check logs')
 })
 test('prompt delimiters are present and unambiguous', async () => {
  registerLoopSkill()
  const skill = getBundledSkills().find(command => command.name === 'loop')
  const blocks = await skill!.getPromptForCommand('5m say hi', {} as never)
  const text = (blocks[0] as { text: string }).text
  expect(text).toContain('--- BEGIN PROMPT ---')
  expect(text).toContain('say hi')
  expect(text).toContain('--- END PROMPT ---')
 })
--- a/src/skills/bundled/loop.ts
+++ b/src/skills/bundled/loop.ts
@@ -6,218 +6,87 @@ import {
 } from '../../tools/ScheduleCronTool/prompt.js'
 import { registerBundledSkill } from '../bundledSkills.js'
-type LoopMode =
+const DEFAULT_INTERVAL = '10m'
  | 'dynamic-prompt'
  | 'dynamic-maintenance'
  | 'fixed-prompt'
  | 'fixed-maintenance'
-type ParsedLoopArgs = {
+const USAGE_MESSAGE = `Usage: /loop [interval] <prompt>
  mode: LoopMode
  interval?: string
  prompt?: string
 }
-const DYNAMIC_MIN_DELAY = '1 minute'
+Run a prompt or slash command on a recurring interval.
 const DYNAMIC_MAX_DELAY = '1 hour'
-const MAINTENANCE_PROMPT = `Scheduled maintenance loop iteration.
+Intervals: Ns, Nm, Nh, Nd (e.g. 5m, 30m, 2h, 1d). Minimum granularity is 1 minute.
 If no interval is specified, defaults to ${DEFAULT_INTERVAL}.
-If .claude/loop.md exists, read it and follow it.
+Examples:
-Otherwise, if ~/.claude/loop.md exists, read it and follow it.
+  /loop 5m /babysit-prs
-Otherwise:
+  /loop 30m check the deploy
- continue any unfinished work from the conversation
+  /loop 1h /standup 1
- tend to the current branch's pull request: review comments, failed CI runs, merge conflicts
+  /loop check the deploy          (defaults to ${DEFAULT_INTERVAL})
- run cleanup passes such as bug hunts or simplification when nothing else is pending
+  /loop check the deploy every 20m`
-Do not start new initiatives outside that scope.
+function buildPrompt(args: string): string {
-Irreversible actions such as pushing or deleting only proceed when they continue something the transcript already authorized.`
+  return `# /loop — schedule a recurring prompt
-function normalizeIntervalUnit(rawUnit: string): 's' | 'm' | 'h' | 'd' | null {
+Parse the input below into \`[interval] <prompt…>\` and schedule it with ${CRON_CREATE_TOOL_NAME}.
  const unit = rawUnit.toLowerCase()
  if (['s', 'sec', 'secs', 'second', 'seconds'].includes(unit)) return 's'
  if (['m', 'min', 'mins', 'minute', 'minutes'].includes(unit)) return 'm'
  if (['h', 'hr', 'hrs', 'hour', 'hours'].includes(unit)) return 'h'
  if (['d', 'day', 'days'].includes(unit)) return 'd'
  return null
 }
-function parseIntervalToken(token: string): string | null {
+## Parsing (in priority order)
  const match = token.trim().match(/^(\d+)\s*([a-zA-Z]+)$/)
  if (!match) return null
  const value = Number.parseInt(match[1]!, 10)
  if (!Number.isFinite(value) || value < 1) return null
  const unit = normalizeIntervalUnit(match[2]!)
  if (!unit) return null
  return `${value}${unit}`
 }
-function parseTrailingEveryClause(input: string): {
+1. **Leading token**: if the first whitespace-delimited token matches \`^\\d+[smhd]$\` (e.g. \`5m\`, \`2h\`), that's the interval; the rest is the prompt.
-  prompt: string
+2. **Trailing "every" clause**: otherwise, if the input ends with \`every <N><unit>\` or \`every <N> <unit-word>\` (e.g. \`every 20m\`, \`every 5 minutes\`, \`every 2 hours\`), extract that as the interval and strip it from the prompt. Only match when what follows "every" is a time expression — \`check every PR\` has no interval.
-  interval: string
+3. **Default**: otherwise, interval is \`${DEFAULT_INTERVAL}\` and the entire input is the prompt.
 } | null {
  const match = input.match(/^(.*?)(?:\s+every\s+)(\d+)\s*([a-zA-Z]+)\s*$/i)
  if (!match) return null
  const interval = parseIntervalToken(`${match[2]!}${match[3]!}`)
  if (!interval) return null
  return {
    prompt: match[1]!.trim(),
    interval,
  }
 }
-function parseLoopArgs(args: string): ParsedLoopArgs {
+If the resulting prompt is empty, show usage \`/loop [interval] <prompt>\` and stop — do not call ${CRON_CREATE_TOOL_NAME}.
  const trimmed = args.trim()
  if (!trimmed) return { mode: 'dynamic-maintenance' }
-  const bareInterval = parseIntervalToken(trimmed)
+Examples:
-  if (bareInterval) {
+- \`5m /babysit-prs\` → interval \`5m\`, prompt \`/babysit-prs\` (rule 1)
-    return { mode: 'fixed-maintenance', interval: bareInterval }
+- \`check the deploy every 20m\` → interval \`20m\`, prompt \`check the deploy\` (rule 2)
-  }
+- \`run tests every 5 minutes\` → interval \`5m\`, prompt \`run tests\` (rule 2)
 - \`check the deploy\` → interval \`${DEFAULT_INTERVAL}\`, prompt \`check the deploy\` (rule 3)
 - \`check every PR\` → interval \`${DEFAULT_INTERVAL}\`, prompt \`check every PR\` (rule 3 — "every" not followed by time)
 - \`5m\` → empty prompt → show usage
-  const [firstToken, ...restTokens] = trimmed.split(/\s+/)
+## Interval → cron
  const leadingInterval = parseIntervalToken(firstToken ?? '')
  if (leadingInterval) {
    const prompt = restTokens.join(' ').trim()
    if (!prompt) return { mode: 'fixed-maintenance', interval: leadingInterval }
    return {
      mode: 'fixed-prompt',
      interval: leadingInterval,
      prompt,
    }
  }
-  const trailingEvery = parseTrailingEveryClause(trimmed)
+Supported suffixes: \`s\` (seconds, rounded up to nearest minute, min 1), \`m\` (minutes), \`h\` (hours), \`d\` (days). Convert:
  if (trailingEvery) {
    if (!trailingEvery.prompt) {
      return {
        mode: 'fixed-maintenance',
        interval: trailingEvery.interval,
      }
    }
    return {
      mode: 'fixed-prompt',
      interval: trailingEvery.interval,
      prompt: trailingEvery.prompt,
    }
  }
-  return {
+| Interval pattern      | Cron expression     | Notes                                    |
-    mode: 'dynamic-prompt',
+|-----------------------|---------------------|------------------------------------------|
-    prompt: trimmed,
+| \`Nm\` where N ≤ 59   | \`*/N * * * *\`     | every N minutes                          |
-  }
+| \`Nm\` where N ≥ 60   | \`0 */H * * *\`     | round to hours (H = N/60, must divide 24)|
-}
+| \`Nh\` where N ≤ 23   | \`0 */N * * *\`     | every N hours                            |
 | \`Nd\`                | \`0 0 */N * *\`     | every N days at midnight local           |
 | \`Ns\`                | treat as \`ceil(N/60)m\` | cron minimum granularity is 1 minute  |
-function buildFixedPrompt(parsed: ParsedLoopArgs): string {
+**If the interval doesn't cleanly divide its unit** (e.g. \`7m\` → \`*/7 * * * *\` gives uneven gaps at :56→:00; \`90m\` → 1.5h which cron can't express), pick the nearest clean interval and tell the user what you rounded to before scheduling.
  const targetInstructions = parsed.prompt
    ? `Use this prompt verbatim for both the immediate run and the recurring scheduled task:
--- BEGIN PROMPT ---
+## Action
 ${parsed.prompt}
 --- END PROMPT ---
 `
    : `This is a maintenance loop with no explicit prompt.
-For the recurring scheduled task, use this exact maintenance prompt body:
+1. Call ${CRON_CREATE_TOOL_NAME} with:
   - \`cron\`: the expression from the table above
   - \`prompt\`: the parsed prompt from above, verbatim (slash commands are passed through unchanged)
   - \`recurring\`: \`true\`
 2. Briefly confirm: what's scheduled, the cron expression, the human-readable cadence, that recurring tasks auto-expire after ${DEFAULT_MAX_AGE_DAYS} days, and that they can cancel sooner with ${CRON_DELETE_TOOL_NAME} (include the job ID).
 3. **Then immediately execute the parsed prompt now** — don't wait for the first cron fire. If it's a slash command, invoke it via the Skill tool; otherwise act on it directly.
--- BEGIN MAINTENANCE PROMPT ---
+## Input
 ${MAINTENANCE_PROMPT}
 --- END MAINTENANCE PROMPT ---
 `
-  return `# /loop — fixed recurring interval
+${args}`
 The user invoked /loop with a fixed interval.
 Requested interval: ${parsed.interval}
 ${targetInstructions}
 ## Instructions
 1. Convert the requested interval to a recurring cron expression.
   - Supported suffixes: s, m, h, d.
   - Seconds must be rounded up to the nearest minute because cron has minute granularity.
   - If the requested interval does not map cleanly to cron cadence, choose the nearest clean recurring interval and tell the user what you picked.
 2. Call ${CRON_CREATE_TOOL_NAME} with:
   - the recurring cron expression
   - the effective prompt body above
   - recurring: true
   - durable: false
 3. Briefly confirm what was scheduled, the cron expression, the human cadence, that recurring tasks auto-expire after ${DEFAULT_MAX_AGE_DAYS} days, and that the user can cancel sooner with ${CRON_DELETE_TOOL_NAME} using the returned job ID.
 4. Immediately execute the effective prompt now — do not wait for the first cron fire.
   - If the effective prompt starts with a slash command, invoke it via the Skill tool.
   - Otherwise, act on it directly.
 `
 }
 function buildDynamicPrompt(parsed: ParsedLoopArgs): string {
  const effectivePromptInstructions = parsed.prompt
    ? `Use this prompt verbatim as the effective prompt for this iteration:
 --- BEGIN PROMPT ---
 ${parsed.prompt}
 --- END PROMPT ---
 `
    : `This is a maintenance loop with no explicit prompt.
 Determine the effective prompt in this order:
 1. If .claude/loop.md exists, read it and use it.
 2. Otherwise, if ~/.claude/loop.md exists, read it and use it.
 3. Otherwise, use this built-in maintenance prompt:
 --- BEGIN MAINTENANCE PROMPT ---
 ${MAINTENANCE_PROMPT}
 --- END MAINTENANCE PROMPT ---
 `
  const reschedulePrompt = parsed.prompt ? `/loop ${parsed.prompt}` : '/loop'
  return `# /loop — dynamic rescheduling
 The user invoked /loop without a fixed interval.
 ${effectivePromptInstructions}
 ## Instructions
 1. Execute the effective prompt now.
   - If it starts with a slash command, invoke it via the Skill tool.
   - Otherwise, act on it directly.
 2. After the work finishes, choose the next delay dynamically between ${DYNAMIC_MIN_DELAY} and ${DYNAMIC_MAX_DELAY}.
   - Use shorter delays while active work is progressing or likely to change soon.
   - Use longer delays when the situation is quiet or stable.
 3. Briefly tell the user the chosen delay and the reason.
 4. Schedule exactly one session-only follow-up run with ${CRON_CREATE_TOOL_NAME}.
   - Use recurring: false.
   - Use durable: false.
   - Pin the cron expression to a specific future local-time minute that matches the chosen delay.
   - Set the scheduled prompt to this exact text so the next iteration stays in dynamic mode:
 --- BEGIN SCHEDULED PROMPT ---
 ${reschedulePrompt}
 --- END SCHEDULED PROMPT ---
 5. Confirm the next run time and the returned job ID.
 6. Do not create a recurring cron for this mode.
 `
 }
 export function registerLoopSkill(): void {
  registerBundledSkill({
    name: 'loop',
    description:
-      'Run a prompt on a fixed interval or dynamically reschedule it, including bare maintenance-mode loops.',
+      'Run a prompt or slash command on a recurring interval (e.g. /loop 5m /foo, defaults to 10m)',
    whenToUse:
-      'When the user wants to poll for status, babysit a workflow, run recurring maintenance, or keep re-running a prompt within the current session.',
+      'When the user wants to set up a recurring task, poll for status, or run something repeatedly on an interval (e.g. "check the deploy every 5 minutes", "keep running /babysit-prs"). Do NOT invoke for one-off tasks.',
-    argumentHint: '[interval] [prompt]',
+    argumentHint: '[interval] <prompt>',
    userInvocable: true,
    isEnabled: isKairosCronEnabled,
    async getPromptForCommand(args) {
-      const parsed = parseLoopArgs(args)
+      const trimmed = args.trim()
-      const text =
+      if (!trimmed) {
-        parsed.mode === 'fixed-prompt' || parsed.mode === 'fixed-maintenance'
+        return [{ type: 'text', text: USAGE_MESSAGE }]
-          ? buildFixedPrompt(parsed)
+      }
-          : buildDynamicPrompt(parsed)
+      return [{ type: 'text', text: buildPrompt(trimmed) }]
      return [{ type: 'text', text }]
    },
  })
 }
--- a/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
+++ b/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
@@ -1,102 +0,0 @@
 // MonitorMcpTask — task registry entry for the 'monitor_mcp' type.
 //
 // Architecture: MonitorTool spawns shell processes as LocalShellTask
 // (type: 'local_bash', kind: 'monitor'). The 'monitor_mcp' type exists
 // in TaskType for forward-compatibility with MCP-based monitoring (not
 // yet implemented). This module satisfies the import from tasks.ts and
 // provides killMonitorMcpTasksForAgent for agent-scoped cleanup of
 // monitor-kind shell tasks.
 import type { AppState } from '../../state/AppState.js'
 import type { SetAppState, Task, TaskStateBase } from '../../Task.js'
 import type { AgentId } from '../../types/ids.js'
 import { logForDebugging } from '../../utils/debug.js'
 import { dequeueAllMatching } from '../../utils/messageQueueManager.js'
 import { evictTaskOutput } from '../../utils/task/diskOutput.js'
 import { updateTaskState } from '../../utils/task/framework.js'
 import { isLocalShellTask } from '../LocalShellTask/guards.js'
 import { killTask } from '../LocalShellTask/killShellTasks.js'
 export type MonitorMcpTaskState = TaskStateBase & {
  type: 'monitor_mcp'
  agentId?: AgentId
 }
 function isMonitorMcpTask(task: unknown): task is MonitorMcpTaskState {
  return (
    typeof task === 'object' &&
    task !== null &&
    'type' in task &&
    task.type === 'monitor_mcp'
  )
 }
 export const MonitorMcpTask: Task = {
  name: 'MonitorMcpTask',
  type: 'monitor_mcp',
  async kill(taskId, setAppState) {
    updateTaskState<MonitorMcpTaskState>(taskId, setAppState, task => {
      if (task.status !== 'running') {
        return task
      }
      return {
        ...task,
        status: 'killed',
        notified: true,
        endTime: Date.now(),
      }
    })
    void evictTaskOutput(taskId)
  },
 }
 /**
 * Kill all monitor tasks owned by a given agent.
 *
 * MonitorTool spawns tasks as local_bash with kind='monitor'. When an agent
 * exits, killShellTasksForAgent already handles those. This function provides
 * additional cleanup for any monitor_mcp-typed tasks and also kills any
 * local_bash tasks with kind='monitor' that might have been missed (belt and
 * suspenders). Finally, it purges queued notifications for the dead agent.
 */
 export function killMonitorMcpTasksForAgent(
  agentId: AgentId,
  getAppState: () => AppState,
  setAppState: SetAppState,
 ): void {
  const tasks = getAppState().tasks ?? {}
  for (const [taskId, task] of Object.entries(tasks)) {
    // Kill monitor_mcp tasks for this agent
    if (
      isMonitorMcpTask(task) &&
      task.agentId === agentId &&
      task.status === 'running'
    ) {
      logForDebugging(
        `killMonitorMcpTasksForAgent: killing monitor_mcp task ${taskId} (agent ${agentId} exiting)`,
      )
      void MonitorMcpTask.kill(taskId, setAppState)
    }
    // Also kill local_bash tasks with kind='monitor' for this agent
    // (killShellTasksForAgent already does this, but being explicit
    // guards against ordering issues)
    if (
      isLocalShellTask(task) &&
      task.kind === 'monitor' &&
      task.agentId === agentId &&
      task.status === 'running'
    ) {
      logForDebugging(
        `killMonitorMcpTasksForAgent: killing monitor shell task ${taskId} (agent ${agentId} exiting)`,
      )
      killTask(taskId, setAppState)
    }
  }
  // Purge any queued notifications addressed to this agent — its query loop
  // has exited and won't drain them.
  dequeueAllMatching(cmd => cmd.agentId === agentId)
 }
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -12,18 +12,27 @@ import { WebFetchTool } from './tools/WebFetchTool/WebFetchTool.js'
 import { TaskStopTool } from './tools/TaskStopTool/TaskStopTool.js'
 import { BriefTool } from './tools/BriefTool/BriefTool.js'
 // Dead code elimination: conditional import for internal-only tools
-/* eslint-disable @typescript-eslint/no-require-imports */
+/* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-const REPLTool = null
+const REPLTool =
-const SuggestBackgroundPRTool = null
+  process.env.USER_TYPE === 'ant'
    ? require('./tools/REPLTool/REPLTool.js').REPLTool
    : null
 const SuggestBackgroundPRTool =
  process.env.USER_TYPE === 'ant'
    ? require('./tools/SuggestBackgroundPRTool/SuggestBackgroundPRTool.js')
        .SuggestBackgroundPRTool
    : null
 const SleepTool =
  feature('PROACTIVE') || feature('KAIROS')
    ? require('./tools/SleepTool/SleepTool.js').SleepTool
    : null
-const cronTools = [
+const cronTools = feature('AGENT_TRIGGERS')
-  require('./tools/ScheduleCronTool/CronCreateTool.js').CronCreateTool,
+  ? [
-  require('./tools/ScheduleCronTool/CronDeleteTool.js').CronDeleteTool,
+      require('./tools/ScheduleCronTool/CronCreateTool.js').CronCreateTool,
-  require('./tools/ScheduleCronTool/CronListTool.js').CronListTool,
+      require('./tools/ScheduleCronTool/CronDeleteTool.js').CronDeleteTool,
-]
+      require('./tools/ScheduleCronTool/CronListTool.js').CronListTool,
    ]
  : []
 const RemoteTriggerTool = feature('AGENT_TRIGGERS_REMOTE')
  ? require('./tools/RemoteTriggerTool/RemoteTriggerTool.js').RemoteTriggerTool
  : null
@@ -48,6 +57,7 @@ import { TodoWriteTool } from './tools/TodoWriteTool/TodoWriteTool.js'
 import { ExitPlanModeV2Tool } from './tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
 import { TestingPermissionTool } from './tools/testing/TestingPermissionTool.js'
 import { GrepTool } from './tools/GrepTool/GrepTool.js'
 import { TungstenTool } from './tools/TungstenTool/TungstenTool.js'
 // Lazy require to break circular dependency: tools.ts -> TeamCreateTool/TeamDeleteTool -> ... -> tools.ts
 /* eslint-disable @typescript-eslint/no-require-imports */
 const getTeamCreateTool = () =>
@@ -68,6 +78,7 @@ import { ToolSearchTool } from './tools/ToolSearchTool/ToolSearchTool.js'
 import { EnterPlanModeTool } from './tools/EnterPlanModeTool/EnterPlanModeTool.js'
 import { EnterWorktreeTool } from './tools/EnterWorktreeTool/EnterWorktreeTool.js'
 import { ExitWorktreeTool } from './tools/ExitWorktreeTool/ExitWorktreeTool.js'
 import { ConfigTool } from './tools/ConfigTool/ConfigTool.js'
 import { TaskCreateTool } from './tools/TaskCreateTool/TaskCreateTool.js'
 import { TaskGetTool } from './tools/TaskGetTool/TaskGetTool.js'
 import { TaskUpdateTool } from './tools/TaskUpdateTool/TaskUpdateTool.js'
@@ -200,6 +211,8 @@ export function getAllBaseTools(): Tools {
    AskUserQuestionTool,
    SkillTool,
    EnterPlanModeTool,
    ...(process.env.USER_TYPE === 'ant' ? [ConfigTool] : []),
    ...(process.env.USER_TYPE === 'ant' ? [TungstenTool] : []),
    ...(SuggestBackgroundPRTool ? [SuggestBackgroundPRTool] : []),
    ...(WebBrowserTool ? [WebBrowserTool] : []),
    ...(isTodoV2Enabled()
--- a/src/tools/AgentTool/AgentTool.tsx
+++ b/src/tools/AgentTool/AgentTool.tsx
@@ -1042,12 +1042,10 @@ export const AgentTool = buildTool({
                    });
                  } finally {
                    stopBackgroundedSummarization?.();
-                    // Defensive cleanup: wrap each call so one failure doesn't
+                    clearInvokedSkillsForAgent(syncAgentId);
-                    // prevent the other from running. Without this, if
+                    clearDumpState(syncAgentId);
-                    // clearInvokedSkillsForAgent throws, clearDumpState is
+                    // Note: worktree cleanup is done before enqueueAgentNotification
-                    // skipped and dump state leaks.
+                    // in both try and catch paths so we can include worktree info
                    try { clearInvokedSkillsForAgent(syncAgentId); } catch { /* cleanup best-effort */ }
                    try { clearDumpState(syncAgentId); } catch { /* cleanup best-effort */ }
                  }
                });
--- a/Show More
+++ b/Show More