* fix: normalize malformed Bash tool arguments from OpenAI-compatible providers
* fix: keep invalid Bash tool args from becoming commands
* fix: preserve malformed Bash JSON literals
* test: stabilize rebased PR 385 checks
* test: isolate provider profile env assertions
* fix: extend tool argument normalization to all tools and harden edge cases
- Extend STRING_ARGUMENT_TOOL_FIELDS to normalize Read, Write, Edit,
Glob, and Grep plain-string arguments (fixes "Invalid tool parameters"
errors reported by VennDev)
- Normalize streaming Bash args regardless of finish_reason, not only
when finish_reason is 'tool_calls'
- Broaden isLikelyStructuredObjectLiteral to catch malformed object-shaped
strings like {command:"pwd"} and {'command':'pwd'} (fixes CR2 from
Vasanthdev2004)
- Apply blank/object-literal guard to all tools, not just Bash
- Extract duplicated JSON repair suffix combinations into shared constant
- Add 32 isolated unit tests for toolArgumentNormalization
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: skip streaming normalization on finish_reason length
Truncated tool calls (finish_reason: 'length') now preserve the raw
buffer instead of normalizing into executable commands, preventing
incomplete commands from becoming runnable.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: comprehensive tool argument normalization hardening
- Remove all { raw: ... } returns that caused InputValidationError with
z.strictObject schemas — return {} instead for clean Zod errors
- Extend normalizeAtStop buffering to all mapped tools (Read, Write,
Edit, Glob, Grep) so streaming paths also get normalized
- Make repairPossiblyTruncatedObjectJson generic — repair any valid
JSON object, not just ones with a command field
- Export hasToolFieldMapping for streaming normalizeAtStop decision
- Skip normalization on finish_reason: length to preserve raw truncated
buffer
- Update all test expectations to match new behavior
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
148 lines
4.5 KiB
TypeScript
148 lines
4.5 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
|
|
import { join } from 'node:path'
|
|
|
|
const originalEnv = { ...process.env }
|
|
const originalPlatform = process.platform
|
|
const mockedClipboardPath = join(process.cwd(), 'openclaude-clipboard.txt')
|
|
|
|
const generateTempFilePathMock = mock(() => mockedClipboardPath)
|
|
|
|
const execFileNoThrowMock = mock(
|
|
async () => ({ code: 0, stdout: '', stderr: '' }),
|
|
)
|
|
|
|
mock.module('../../utils/execFileNoThrow.js', () => ({
|
|
execFileNoThrow: execFileNoThrowMock,
|
|
}))
|
|
|
|
mock.module('../../utils/tempfile.js', () => ({
|
|
generateTempFilePath: generateTempFilePathMock,
|
|
}))
|
|
|
|
async function importFreshOscModule() {
|
|
return import(`./osc.ts?ts=${Date.now()}-${Math.random()}`)
|
|
}
|
|
|
|
async function flushClipboardCopy(): Promise<void> {
|
|
await new Promise(resolve => setTimeout(resolve, 0))
|
|
}
|
|
|
|
async function waitForExecCall(
|
|
command: string,
|
|
attempts = 20,
|
|
): Promise<(typeof execFileNoThrowMock.mock.calls)[number] | undefined> {
|
|
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
const call = execFileNoThrowMock.mock.calls.find(([cmd]) => cmd === command)
|
|
if (call) {
|
|
return call
|
|
}
|
|
await flushClipboardCopy()
|
|
}
|
|
|
|
return undefined
|
|
}
|
|
|
|
describe('Windows clipboard fallback', () => {
|
|
beforeEach(() => {
|
|
execFileNoThrowMock.mockClear()
|
|
generateTempFilePathMock.mockClear()
|
|
process.env = { ...originalEnv }
|
|
delete process.env['SSH_CONNECTION']
|
|
delete process.env['TMUX']
|
|
Object.defineProperty(process, 'platform', { value: 'win32' })
|
|
})
|
|
|
|
afterEach(() => {
|
|
process.env = { ...originalEnv }
|
|
Object.defineProperty(process, 'platform', { value: originalPlatform })
|
|
})
|
|
|
|
test('uses PowerShell instead of clip.exe for local Windows copy', async () => {
|
|
const { setClipboard } = await importFreshOscModule()
|
|
|
|
await setClipboard('Привет мир')
|
|
await flushClipboardCopy()
|
|
|
|
expect(execFileNoThrowMock.mock.calls.some(([cmd]) => cmd === 'clip')).toBe(
|
|
false,
|
|
)
|
|
expect(
|
|
execFileNoThrowMock.mock.calls.some(([cmd]) => cmd === 'powershell'),
|
|
).toBe(true)
|
|
})
|
|
|
|
test('passes Windows clipboard text through a UTF-8 temp file instead of stdin', async () => {
|
|
const { setClipboard } = await importFreshOscModule()
|
|
|
|
await setClipboard('Привет мир')
|
|
await flushClipboardCopy()
|
|
|
|
const windowsCall = await waitForExecCall('powershell')
|
|
|
|
expect(windowsCall?.[2]).toMatchObject({
|
|
stdin: 'ignore',
|
|
})
|
|
expect(windowsCall?.[2]).not.toMatchObject({ input: 'Привет мир' })
|
|
expect(windowsCall?.[2]).not.toMatchObject({
|
|
env: expect.objectContaining({
|
|
OPENCLAUDE_CLIPBOARD_TEXT_B64: expect.any(String),
|
|
}),
|
|
})
|
|
expect(windowsCall?.[1]).toContain(
|
|
`$text = [System.IO.File]::ReadAllText('${mockedClipboardPath.replace(/'/g, "''")}', [System.Text.Encoding]::UTF8); Set-Clipboard -Value $text`,
|
|
)
|
|
})
|
|
})
|
|
|
|
describe('clipboard path behavior remains stable', () => {
|
|
beforeEach(() => {
|
|
execFileNoThrowMock.mockClear()
|
|
process.env = { ...originalEnv }
|
|
delete process.env['SSH_CONNECTION']
|
|
delete process.env['TMUX']
|
|
})
|
|
|
|
afterEach(() => {
|
|
process.env = { ...originalEnv }
|
|
Object.defineProperty(process, 'platform', { value: originalPlatform })
|
|
})
|
|
|
|
test('getClipboardPath stays native on local macOS', async () => {
|
|
Object.defineProperty(process, 'platform', { value: 'darwin' })
|
|
const { getClipboardPath } = await importFreshOscModule()
|
|
|
|
expect(getClipboardPath()).toBe('native')
|
|
})
|
|
|
|
test('getClipboardPath stays tmux-buffer when TMUX is set', async () => {
|
|
Object.defineProperty(process, 'platform', { value: 'linux' })
|
|
process.env['TMUX'] = '/tmp/tmux-1000/default,123,0'
|
|
const { getClipboardPath } = await importFreshOscModule()
|
|
|
|
expect(getClipboardPath()).toBe('tmux-buffer')
|
|
})
|
|
|
|
test('Windows clipboard fallback is skipped over SSH', async () => {
|
|
Object.defineProperty(process, 'platform', { value: 'win32' })
|
|
process.env['SSH_CONNECTION'] = '1 2 3 4'
|
|
const { setClipboard } = await importFreshOscModule()
|
|
|
|
await setClipboard('Привет мир')
|
|
|
|
expect(execFileNoThrowMock.mock.calls.some(([cmd]) => cmd === 'powershell')).toBe(
|
|
false,
|
|
)
|
|
})
|
|
|
|
test('local macOS clipboard fallback still uses pbcopy', async () => {
|
|
Object.defineProperty(process, 'platform', { value: 'darwin' })
|
|
const { setClipboard } = await importFreshOscModule()
|
|
|
|
await setClipboard('hello')
|
|
|
|
expect(execFileNoThrowMock.mock.calls.some(([cmd]) => cmd === 'pbcopy')).toBe(
|
|
true,
|
|
)
|
|
})
|
|
})
|