Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2a057c6f1 | ||
|
|
08cc6f3287 | ||
|
|
84fcc7f7e0 | ||
|
|
ad11414def | ||
|
|
9419e8a4a2 | ||
|
|
41a86d05fa | ||
|
|
fa4b6a96c0 | ||
|
|
d03d77b110 | ||
|
|
15de1d6190 | ||
|
|
812facf024 | ||
|
|
2e39d2607a |
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -47,7 +47,7 @@ jobs:
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
|
||||
with:
|
||||
node-version: 20
|
||||
node-version: 24
|
||||
registry-url: https://registry.npmjs.org
|
||||
|
||||
- name: Set up Bun
|
||||
@@ -70,6 +70,11 @@ jobs:
|
||||
- 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
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
".": "0.2.0"
|
||||
".": "0.2.2"
|
||||
}
|
||||
|
||||
14
CHANGELOG.md
14
CHANGELOG.md
@@ -1,5 +1,19 @@
|
||||
# Changelog
|
||||
|
||||
## [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)
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@gitlawb/openclaude",
|
||||
"version": "0.2.0",
|
||||
"version": "0.2.2",
|
||||
"description": "Claude Code opened to any LLM — OpenAI, Gemini, DeepSeek, Ollama, and 200+ models",
|
||||
"type": "module",
|
||||
"bin": {
|
||||
@@ -140,7 +140,7 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://gitlawb.com/z6MkqDnb7Siv3Cwj7pGJq4T5EsUisECqR8KpnDLwcaZq5TPr/openclaude"
|
||||
"url": "https://github.com/Gitlawb/openclaude.git"
|
||||
},
|
||||
"keywords": [
|
||||
"claude-code",
|
||||
|
||||
@@ -11,7 +11,7 @@ export function getEditToolDescription(): string {
|
||||
|
||||
function getDefaultEditDescription(): string {
|
||||
const prefixFormat = isCompactLinePrefixEnabled()
|
||||
? 'line number + tab'
|
||||
? 'line number + arrow'
|
||||
: 'spaces + line number + arrow'
|
||||
const minimalUniquenessHint =
|
||||
process.env.USER_TYPE === 'ant'
|
||||
|
||||
51
src/utils/file.test.ts
Normal file
51
src/utils/file.test.ts
Normal file
@@ -0,0 +1,51 @@
|
||||
import { afterEach, describe, expect, mock, test } from 'bun:test'
|
||||
|
||||
async function importFileModuleWithKillswitchEnabled(
|
||||
killswitchEnabled: boolean,
|
||||
) {
|
||||
mock.module('../services/analytics/growthbook.js', () => ({
|
||||
getFeatureValue_CACHED_MAY_BE_STALE: () => killswitchEnabled,
|
||||
}))
|
||||
|
||||
return import(`./file.js?ts=${Date.now()}-${Math.random()}`)
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
mock.restore()
|
||||
})
|
||||
|
||||
describe('addLineNumbers', () => {
|
||||
test('uses unambiguous arrow compact prefix and preserves leading tabs', async () => {
|
||||
const { addLineNumbers } = await importFileModuleWithKillswitchEnabled(false)
|
||||
|
||||
const result = addLineNumbers({
|
||||
content: '\tfirst\n\t\tsecond',
|
||||
startLine: 41,
|
||||
})
|
||||
|
||||
expect(result).toBe('41→\tfirst\n42→\t\tsecond')
|
||||
})
|
||||
|
||||
test('keeps padded arrow format when compact mode is disabled', async () => {
|
||||
const { addLineNumbers } = await importFileModuleWithKillswitchEnabled(true)
|
||||
|
||||
const result = addLineNumbers({
|
||||
content: 'alpha\nbeta',
|
||||
startLine: 1,
|
||||
})
|
||||
|
||||
expect(result).toBe(' 1→alpha\n 2→beta')
|
||||
})
|
||||
})
|
||||
|
||||
describe('stripLineNumberPrefix', () => {
|
||||
test('strips compact arrow, padded arrow, and legacy tab prefixes', async () => {
|
||||
const { stripLineNumberPrefix } = await importFileModuleWithKillswitchEnabled(
|
||||
false,
|
||||
)
|
||||
|
||||
expect(stripLineNumberPrefix('41→\tfirst')).toBe('\tfirst')
|
||||
expect(stripLineNumberPrefix(' 2→beta')).toBe('beta')
|
||||
expect(stripLineNumberPrefix('7\t\tlegacy-tab')).toBe('\tlegacy-tab')
|
||||
})
|
||||
})
|
||||
@@ -267,7 +267,7 @@ export async function suggestPathUnderCwd(
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether to use the compact line-number prefix format (`N\t` instead of
|
||||
* Whether to use the compact line-number prefix format (`N→` instead of
|
||||
* ` N→`). The padded-arrow format costs 9 bytes/line overhead; at
|
||||
* 1.35B Read calls × 132 lines avg this is 2.18% of fleet uncached input
|
||||
* (bq-queries/read_line_prefix_overhead_verify.sql).
|
||||
@@ -303,7 +303,7 @@ export function addLineNumbers({
|
||||
|
||||
if (isCompactLinePrefixEnabled()) {
|
||||
return lines
|
||||
.map((line, index) => `${index + startLine}\t${line}`)
|
||||
.map((line, index) => `${index + startLine}→${line}`)
|
||||
.join('\n')
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,9 @@ import { afterEach, expect, test } from 'bun:test'
|
||||
import { getProviderValidationError } from './providerValidation.ts'
|
||||
|
||||
const originalEnv = {
|
||||
CLAUDE_CODE_USE_OPENAI: process.env.CLAUDE_CODE_USE_OPENAI,
|
||||
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
|
||||
OPENAI_BASE_URL: process.env.OPENAI_BASE_URL,
|
||||
CLAUDE_CODE_USE_GEMINI: process.env.CLAUDE_CODE_USE_GEMINI,
|
||||
GEMINI_API_KEY: process.env.GEMINI_API_KEY,
|
||||
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY,
|
||||
@@ -20,6 +23,9 @@ function restoreEnv(key: string, value: string | undefined): void {
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
restoreEnv('CLAUDE_CODE_USE_OPENAI', originalEnv.CLAUDE_CODE_USE_OPENAI)
|
||||
restoreEnv('OPENAI_API_KEY', originalEnv.OPENAI_API_KEY)
|
||||
restoreEnv('OPENAI_BASE_URL', originalEnv.OPENAI_BASE_URL)
|
||||
restoreEnv('CLAUDE_CODE_USE_GEMINI', originalEnv.CLAUDE_CODE_USE_GEMINI)
|
||||
restoreEnv('GEMINI_API_KEY', originalEnv.GEMINI_API_KEY)
|
||||
restoreEnv('GOOGLE_API_KEY', originalEnv.GOOGLE_API_KEY)
|
||||
@@ -71,3 +77,19 @@ test('still errors when no Gemini credential source is available', async () => {
|
||||
'GEMINI_API_KEY, GOOGLE_API_KEY, GEMINI_ACCESS_TOKEN, or Google ADC credentials are required when CLAUDE_CODE_USE_GEMINI=1.',
|
||||
)
|
||||
})
|
||||
|
||||
test('openai missing key error includes recovery guidance and config locations', async () => {
|
||||
process.env.CLAUDE_CODE_USE_OPENAI = '1'
|
||||
process.env.OPENAI_BASE_URL = 'https://api.openai.com/v1'
|
||||
delete process.env.OPENAI_API_KEY
|
||||
|
||||
const message = await getProviderValidationError(process.env)
|
||||
expect(message).toContain(
|
||||
'OPENAI_API_KEY is required when CLAUDE_CODE_USE_OPENAI=1 and OPENAI_BASE_URL is not local.',
|
||||
)
|
||||
expect(message).toContain(
|
||||
'set CLAUDE_CODE_USE_OPENAI=0 in your shell environment',
|
||||
)
|
||||
expect(message).toContain('Saved startup settings can come from')
|
||||
expect(message).toContain('.openclaude-profile.json')
|
||||
})
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
import { resolve } from 'node:path'
|
||||
import {
|
||||
getGithubEndpointType,
|
||||
isLocalProviderUrl,
|
||||
resolveCodexApiCredentials,
|
||||
resolveProviderRequest,
|
||||
} from '../services/api/providerConfig.js'
|
||||
import { getGlobalClaudeFile } from './env.js'
|
||||
import {
|
||||
type GeminiResolvedCredential,
|
||||
resolveGeminiCredential,
|
||||
} from './geminiAuth.js'
|
||||
import { redactSecretValueForDisplay } from './providerProfile.js'
|
||||
import { PROFILE_FILE_NAME, redactSecretValueForDisplay } from './providerProfile.js'
|
||||
|
||||
function isEnvTruthy(value: string | undefined): boolean {
|
||||
if (!value) return false
|
||||
@@ -61,6 +63,17 @@ function checkGithubTokenStatus(
|
||||
return 'valid'
|
||||
}
|
||||
|
||||
function getOpenAIMissingKeyMessage(): string {
|
||||
const globalConfigPath = getGlobalClaudeFile()
|
||||
const profilePath = resolve(process.cwd(), PROFILE_FILE_NAME)
|
||||
|
||||
return [
|
||||
'OPENAI_API_KEY is required when CLAUDE_CODE_USE_OPENAI=1 and OPENAI_BASE_URL is not local.',
|
||||
`To recover, run /provider and switch provider, or set CLAUDE_CODE_USE_OPENAI=0 in your shell environment.`,
|
||||
`Saved startup settings can come from ${globalConfigPath} or ${profilePath}.`,
|
||||
].join('\n')
|
||||
}
|
||||
|
||||
export async function getProviderValidationError(
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
options?: {
|
||||
@@ -137,7 +150,7 @@ export async function getProviderValidationError(
|
||||
if (useGithub && hasGithubToken) {
|
||||
return null
|
||||
}
|
||||
return 'OPENAI_API_KEY is required when CLAUDE_CODE_USE_OPENAI=1 and OPENAI_BASE_URL is not local.'
|
||||
return getOpenAIMissingKeyMessage()
|
||||
}
|
||||
|
||||
return null
|
||||
|
||||
Reference in New Issue
Block a user