chore: resolve conflicts and skip flaky test on CI

Author: 3kin0x

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.11.0"
+  ".": "0.12.0"
 }

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.12.0](https://github.com/Gitlawb/openclaude/compare/v0.11.0...v0.12.0) (2026-05-16)
+
+
+### Features
+
+* **opengateway:** add Gemini 3.1 Flash Lite + GLM 5.1 FP8 to catalog ([#1194](https://github.com/Gitlawb/openclaude/issues/1194)) ([4d04f5b](https://github.com/Gitlawb/openclaude/commit/4d04f5bf4f1acc9d3cc00dab0b1b697e13711207))
+
+
+### Bug Fixes
+
+* **openai-shim:** surface in-stream errors and truncation hints ([#1174](https://github.com/Gitlawb/openclaude/issues/1174)) ([6174d75](https://github.com/Gitlawb/openclaude/commit/6174d75e983e80601ba369a595d7b64580e3bd51))
+* Reduce stable stringify heap usage ([#1104](https://github.com/Gitlawb/openclaude/issues/1104)) ([c433d20](https://github.com/Gitlawb/openclaude/commit/c433d20fdc5666736c800a942bbcc0f0d85cc296))
+
 ## [0.11.0](https://github.com/Gitlawb/openclaude/compare/v0.10.0...v0.11.0) (2026-05-14)
 
 

README.md

@@ -139,6 +139,7 @@ Advanced and source-build guides:
 | 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 CLI auth, OpenClaude secure storage, or env credentials |
+| Gitlawb Opengateway | `/provider` or zero-config fallback | Free smart gateway at `https://opengateway.gitlawb.com/v1`; routes Xiaomi MiMo and GMI Cloud partner models by `OPENAI_MODEL` |
 | Xiaomi MiMo | `/provider` or env vars | OpenAI-compatible API at `https://api.xiaomimimo.com/v1`; uses `MIMO_API_KEY` and defaults to `mimo-v2.5-pro` |
 | Ollama | `/provider` or env vars | Local inference with no API key |
 | Atomic Chat | `/provider`, env vars, or `bun run dev:atomic-chat` | Local Model Provider; auto-detects loaded models |
@@ -161,7 +162,8 @@ OpenClaude supports multiple providers, but behavior is not identical across all
 - Tool quality depends heavily on the selected model
 - Smaller local models can struggle with long multi-step tool flows
 - Some providers impose lower output caps than the CLI defaults, and OpenClaude adapts where possible
-- Xiaomi MiMo uses `api-key` header auth on the OpenAI-compatible route and currently does not support `/usage` reporting in OpenClaude
+- Gitlawb Opengateway uses one OpenAI-compatible base URL. Switch between `mimo-*`, `zai-org/GLM-5.1-FP8`, and `google/gemini-3.1-flash-lite-preview` with `/model`; do not pin the base URL to `/v1/xiaomi-mimo`.
+- Xiaomi MiMo uses `api-key` header auth on the direct OpenAI-compatible route and currently does not support `/usage` reporting in OpenClaude
 
 For best results, use models with strong tool/function calling support.
 

docs/advanced-setup.md

@@ -153,6 +153,22 @@ export OPENAI_MODEL=llama-3.3-70b-versatile
 
 `GROQ_API_KEY` matches the built-in Groq gateway preset. `OPENAI_API_KEY` also works as a fallback on the generic OpenAI-compatible path, but `GROQ_API_KEY` is the preferred variable for Groq-specific setup.
 
+### Gitlawb Opengateway
+
+```bash
+export CLAUDE_CODE_USE_OPENAI=1
+export OPENAI_BASE_URL=https://opengateway.gitlawb.com/v1
+export OPENAI_API_KEY=anything
+export OPENAI_MODEL=mimo-v2.5-pro
+```
+
+The Opengateway route is a smart gateway. Keep the base URL at `/v1` and switch
+models with `/model` or `OPENAI_MODEL`. Current partner models include:
+
+- `mimo-v2.5-pro`
+- `zai-org/GLM-5.1-FP8`
+- `google/gemini-3.1-flash-lite-preview`
+
 ### Xiaomi MiMo
 
 ```bash

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlawb/openclaude",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "OpenClaude opens coding-agent workflows to any LLM — OpenAI, Gemini, DeepSeek, Ollama, and 200+ models",
   "type": "module",
   "bin": {

scripts/build.ts

@@ -8,8 +8,7 @@
  * - src/ path aliases
  */
 
-import { readFileSync, readdirSync, writeFileSync } from 'fs'
-import { join } from 'path'
+import { readFileSync } from 'fs'
 import { noTelemetryPlugin } from './no-telemetry-plugin'
 import { CLI_EXTERNALS, SDK_EXTERNALS } from './externals.js'
 
@@ -69,53 +68,42 @@ const featureFlags: Record<string, boolean> = {
 // 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.
+// Fix: transform source as Bun loads each module, stripping the bun:bundle
+// import and replacing feature('FLAG') calls with their boolean literal.
+// The working tree stays immutable while smoke/build runs.
 
 // 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)
-  })
+const featureFlagTransformedFiles = new Set<string>()
+
+const featureFlagPreprocessPlugin = {
+  name: 'feature-flag-preprocess',
+  setup(build) {
+    build.onLoad({ filter: /\.[cm]?tsx?$/ }, args => {
+      const normalizedPath = args.path.replace(/\\/g, '/')
+      if (!normalizedPath.includes('/src/')) return null
+
+      const raw = readFileSync(args.path, 'utf-8')
+      if (!raw.includes('feature(')) return null
+
+      let contents = raw
+      contents = contents.replace(featureImportRe, '')
+      contents = contents.replace(featureCallRe, (_match, name) =>
+        String((featureFlags as Record<string, boolean>)[name] ?? false),
+      )
+
+      if (contents === raw) return null
+
+      featureFlagTransformedFiles.add(args.path)
+      return {
+        contents,
+        loader: args.path.endsWith('.tsx') || args.path.endsWith('.jsx')
+          ? 'tsx'
+          : 'ts',
+      }
+    })
+  },
 }
 
 let result: Awaited<ReturnType<typeof Bun.build>> | undefined
@@ -149,6 +137,7 @@ result = await Bun.build({
   },
   plugins: [
     noTelemetryPlugin,
+    featureFlagPreprocessPlugin,
     {
       name: 'bun-bundle-shim',
       setup(build) {
@@ -185,8 +174,7 @@ export async function handleBgFlag() { throw new Error("Background sessions are
           ],
         ] as const)
 
-        // bun:bundle feature() replacement is handled by the source
-        // pre-processing step above (see preProcessFeatureFlags).
+        // bun:bundle feature() replacement is handled by featureFlagPreprocessPlugin.
         // The previous onResolve/onLoad shim was ineffective in Bun
         // v1.3.9+ because the bun: namespace is resolved natively
         // before the JS plugin phase runs.
@@ -456,6 +444,7 @@ sdkResult = await Bun.build({
   external: SDK_EXTERNALS,
   plugins: [
     noTelemetryPlugin,
+    featureFlagPreprocessPlugin,
     // Stub missing internal/optional modules (same pattern as CLI build)
     {
       name: 'sdk-missing-stub',
@@ -860,9 +849,7 @@ if (!sdkResult.success) {
 }
 
 } finally {
-  // Always restore source files, even if Bun.build() throws
-  restoreModifiedFiles()
-  console.log(`  🔄 feature-flags: pre-processed ${numModified} files (restored)`)
+  console.log(`  🔄 feature-flags: transformed ${featureFlagTransformedFiles.size} files during bundling`)
 }
 
 // ── Validate SDK bundle for React/Ink leakage ──────────────────────────────

scripts/no-telemetry-growthbook-stub.test.ts

@@ -1,22 +1,34 @@
-import { afterAll, beforeEach, describe, expect, test } from 'bun:test'
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from 'bun:test'
 import { mkdirSync, rmSync, unlinkSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
+import { acquireEnvMutex, releaseEnvMutex } from '../src/entrypoints/sdk/shared.js'
 
 // ---------------------------------------------------------------------------
 // Setup: dynamically import the source-level growthbook no-op stub.
 // The stub reads ~/.claude/feature-flags.json for local flag overrides.
 // ---------------------------------------------------------------------------
 
+const originalFlagsFile = process.env.CLAUDE_FEATURE_FLAGS_FILE
 const testDir = join(tmpdir(), `growthbook-stub-test-${process.pid}`)
 const flagsFile = join(testDir, 'test-flags.json')
+let envLockAcquired = false
+let stub: typeof import('../src/services/analytics/growthbook.js')
 
-mkdirSync(testDir, { recursive: true })
+beforeAll(async () => {
+  const envLock = await acquireEnvMutex()
+  if (!envLock.acquired) {
+    throw new Error('Failed to acquire env mutex for growthbook stub test')
+  }
+  envLockAcquired = true
 
-// Point the stub at our test flags file before import
-process.env.CLAUDE_FEATURE_FLAGS_FILE = flagsFile
+  mkdirSync(testDir, { recursive: true })
 
-const stub = await import('../src/services/analytics/growthbook.js')
+  // Point the stub at our test flags file before import
+  process.env.CLAUDE_FEATURE_FLAGS_FILE = flagsFile
+
+  stub = await import('../src/services/analytics/growthbook.js')
+})
 
 // ---------------------------------------------------------------------------
 // Tests
@@ -29,8 +41,19 @@ describe('growthbook stub — local feature flag overrides', () => {
   })
 
   afterAll(() => {
-    rmSync(testDir, { recursive: true, force: true })
-    delete process.env.CLAUDE_FEATURE_FLAGS_FILE
+    try {
+      rmSync(testDir, { recursive: true, force: true })
+      if (originalFlagsFile === undefined) {
+        delete process.env.CLAUDE_FEATURE_FLAGS_FILE
+      } else {
+        process.env.CLAUDE_FEATURE_FLAGS_FILE = originalFlagsFile
+      }
+    } finally {
+      if (envLockAcquired) {
+        releaseEnvMutex()
+        envLockAcquired = false
+      }
+    }
   })
 
   // ── File absent ──────────────────────────────────────────────────
@@ -145,4 +168,4 @@ describe('growthbook stub — local feature flag overrides', () => {
     writeFileSync(flagsFile, JSON.stringify({ tengu_disable_bypass_permissions_mode: true }))
     expect(await stub.checkSecurityRestrictionGate('tengu_disable_bypass_permissions_mode')).toBe(false)
   })
-})
+})

src/commands/cacheStats/cacheStats.test.ts

@@ -5,7 +5,11 @@
  * label padding, conditional N/A footnote, recent-rows cap) which can
  * silently regress — these snapshot tests keep it honest.
  */
-import { beforeEach, describe, expect, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+import {
+  acquireSharedMutationLock,
+  releaseSharedMutationLock,
+} from '../../test/sharedMutationLock.js'
 import type { CacheMetrics } from '../../services/api/cacheMetrics.js'
 import {
   _setHistoryCapForTesting,
@@ -50,11 +54,21 @@ async function runCommand(): Promise<string> {
   return result.value
 }
 
-beforeEach(() => {
+beforeEach(async () => {
+  await acquireSharedMutationLock('commands/cacheStats/cacheStats.test.ts')
   resetSessionCacheStats()
   _setHistoryCapForTesting(500)
 })
 
+afterEach(() => {
+  try {
+    resetSessionCacheStats()
+    _setHistoryCapForTesting(500)
+  } finally {
+    releaseSharedMutationLock()
+  }
+})
+
 describe('/cache-stats — empty session', () => {
   test('shows friendly "no requests yet" message', async () => {
     const value = await runCommand()

src/commands/init.test.ts

@@ -1,18 +1,30 @@
-import { afterEach, expect, mock, test } from 'bun:test'
+import { afterEach, beforeEach, expect, mock, test } from 'bun:test'
+import {
+  acquireSharedMutationLock,
+  releaseSharedMutationLock,
+} from '../test/sharedMutationLock.js'
 
 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()
+beforeEach(async () => {
+  await acquireSharedMutationLock('commands/init.test.ts')
+})
 
-  if (originalClaudeCodeNewInit === undefined) {
-    delete process.env.CLAUDE_CODE_NEW_INIT
-  } else {
-    process.env.CLAUDE_CODE_NEW_INIT = originalClaudeCodeNewInit
+afterEach(() => {
+  try {
+    mock.restore()
+
+    if (originalClaudeCodeNewInit === undefined) {
+      delete process.env.CLAUDE_CODE_NEW_INIT
+    } else {
+      process.env.CLAUDE_CODE_NEW_INIT = originalClaudeCodeNewInit
+    }
+  } finally {
+    releaseSharedMutationLock()
   }
 })