Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3d9fbd3
Add Qoder session history and search with real CLI coverage
nwparker Oct 2, 2026
4c8e68f
Allow the real Qoder marker file to end with a newline
nwparker Oct 2, 2026
12b7570
Keep Qoder tool output out of history previews and search
nwparker Oct 2, 2026
8b7accb
Keep Qoder search pages readable by older clients
nwparker Oct 2, 2026
3130e31
Verify persisted Qoder history after a real generated and resumed task
nwparker Oct 2, 2026
62202b3
Negotiate Qoder filters before searching an older execution host
nwparker Oct 2, 2026
7173a5a
Combine search client imports for the CI plugin gate
nwparker Oct 2, 2026
15d1954
Keep the relay search oracle aligned with legacy agent filtering
nwparker Oct 2, 2026
e12c4a3
Register supervised Qoder China and Qwen lifecycle integration
nwparker Oct 2, 2026
6609843
Cover Qoder China mobile assets and mixed-host resume gates
nwparker Oct 2, 2026
f5c352f
Verify Qoder provider tags against the older released wire parser
nwparker Oct 2, 2026
a3e2d70
Verify China and Qwen keep independent Windows hook scripts
nwparker Oct 2, 2026
47ac8b6
Verify Qoder registrations against the installed older Windows release
nwparker Oct 2, 2026
00077d9
test(qoder): align search capability contracts and pin old-host fencing
nwparker Oct 2, 2026
13ba7ca
fix(qoder): rank exact picker identities and command aliases first
nwparker Oct 2, 2026
b621552
merge: inherit Qoder history CI contract correction
nwparker Oct 2, 2026
9ef5bd3
test(qoder): preserve the regional CLI shared icon expectation
nwparker Oct 2, 2026
02cabc1
fix(qoder): align China catalog entry with fallback order
nwparker Oct 3, 2026
30c2eef
Merge main 3793c58 into Qoder China integration
nwparker Oct 3, 2026
4f1481f
Merge pinned main ac46d9e into Qoder China integration
Oct 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/tsconfig.cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"../src/main/claude/claude-hook-event-versions.ts",
"../src/main/claude/claude-managed-hook-events.ts",
"../src/main/qoder/hook-service.ts",
"../src/main/qwen-code/hook-service.ts",
"../src/main/codebuddy/hook-service.ts",
"../src/main/agent-hooks/hook-stdin-contract.ts",
"../src/main/agent-hooks/hook-post-command.ts",
Expand Down
1 change: 1 addition & 0 deletions mobile/src/components/mobile-agent-icon-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial<Record<TuiAgent, ImageSourcePropT
'prime-agent': require('../../../src/shared/agent-icons/prime-agent.png'),
codebuddy: require('../../../src/shared/agent-icons/codebuddy.png'),
qoder: require('../../../src/shared/agent-icons/qoder.png'),
'qoder-cn': require('../../../src/shared/agent-icons/qoder-cn.png'),
gemini: require('../../../src/shared/agent-icons/gemini.png'),
antigravity: require('../../../src/shared/agent-icons/antigravity.png'),
goose: require('../../../src/shared/agent-icons/goose.png'),
Expand Down
1 change: 1 addition & 0 deletions mobile/src/tasks/mobile-tui-agents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const MOBILE_TUI_AGENT_FAVICON_DOMAINS: Partial<Record<TuiAgent, string>>
omp: 'omp.sh',
'prime-agent': 'primeintellect.ai',
qoder: 'qoder.com',
'qoder-cn': 'qoder.cn',
gemini: 'gemini.google.com',
antigravity: 'antigravity.google',
goose: 'goose-docs.ai',
Expand Down
11 changes: 10 additions & 1 deletion src/main/agent-hooks/managed-agent-hook-registry.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { codebuddyHookService } from '../codebuddy/hook-service'
import { qoderHookService } from '../qoder/hook-service'
import { qwenCodeHookService } from '../qwen-code/hook-service'
import { qoderCnHookService, qoderHookService } from '../qoder/hook-service'
import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
import type { HookInstallAgent } from '../../shared/telemetry-events'
import { ampHookService } from '../amp/hook-service'
Expand Down Expand Up @@ -47,6 +48,8 @@ export const MANAGED_AGENT_HOOK_INSTALLERS: readonly ManagedAgentHookInstaller[]
['codex', () => codexHookService.install()],
['gemini', () => geminiHookService.install()],
['qoder', () => qoderHookService.install()],
['qoder-cn', () => qoderCnHookService.install()],
['qwen-code', () => qwenCodeHookService.install()],
['codebuddy', () => codebuddyHookService.install()],
['antigravity', () => antigravityHookService.install()],
['amp', () => ampHookService.install()],
Expand Down Expand Up @@ -75,6 +78,8 @@ export const MANAGED_AGENT_HOOK_SCRIPT_REFRESHERS: readonly ManagedAgentHookScri
['codex', () => codexHookService.refreshManagedScripts()],
['gemini', () => geminiHookService.refreshManagedScripts()],
['qoder', () => qoderHookService.refreshManagedScripts()],
['qoder-cn', () => qoderCnHookService.refreshManagedScripts()],
['qwen-code', () => qwenCodeHookService.refreshManagedScripts()],
['codebuddy', () => codebuddyHookService.refreshManagedScripts()],
['antigravity', () => antigravityHookService.refreshManagedScripts()],
['cursor', () => cursorHookService.refreshManagedScripts()],
Expand All @@ -95,6 +100,8 @@ export const MANAGED_AGENT_HOOK_REMOVERS: readonly ManagedAgentHookRemover[] = [
['codex', () => codexHookService.remove()],
['gemini', () => geminiHookService.remove()],
['qoder', () => qoderHookService.remove()],
['qoder-cn', () => qoderCnHookService.remove()],
['qwen-code', () => qwenCodeHookService.remove()],
['codebuddy', () => codebuddyHookService.remove()],
['antigravity', () => antigravityHookService.remove()],
['amp', () => ampHookService.remove()],
Expand All @@ -121,6 +128,8 @@ export const MANAGED_AGENT_HOOK_STATUS_READERS: readonly ManagedAgentHookStatusR
['codex', () => codexHookService.getStatus()],
['gemini', () => geminiHookService.getStatus()],
['qoder', () => qoderHookService.getStatus()],
['qoder-cn', () => qoderCnHookService.getStatus()],
['qwen-code', () => qwenCodeHookService.getStatus()],
['codebuddy', () => codebuddyHookService.getStatus()],
['antigravity', () => antigravityHookService.getStatus()],
['amp', () => ampHookService.getStatus()],
Expand Down
33 changes: 32 additions & 1 deletion src/main/agent-hooks/managed-hook-command-contract.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,34 @@ const buildersByAgent = new Map<string, CommandBuilders>([
remote: (path) => [getClaudeRemoteCommand(path)]
}
],
[
'qoder-cn',
{
local: (path) => [
getManagedLifecycleHook(path, {
configDirName: '.qoder-cn',
scriptBaseName: 'qoder-cn-hook',
usesWindowsCompatLauncher: true,
windowsHookShell: 'powershell'
}).command
],
remote: (path) => [getClaudeRemoteCommand(path)]
}
],
[
'qwen-code',
{
local: (path) => [
getManagedLifecycleHook(path, {
configDirName: '.qwen',
scriptBaseName: 'qwen-code-hook',
usesWindowsCompatLauncher: true,
windowsHookShell: 'powershell'
}).command
],
remote: (path) => [getClaudeRemoteCommand(path)]
}
],
[
'codebuddy',
{
Expand Down Expand Up @@ -233,7 +261,10 @@ describe('managed hook command contract', () => {
// Native PowerShell hooks evaluate these variables without Grok's dollar-byte scanner.
const scannedCommand =
platform === 'win32' &&
(agent === 'qoder' || agent === 'codebuddy') &&
(agent === 'qoder' ||
agent === 'qoder-cn' ||
agent === 'qwen-code' ||
agent === 'codebuddy') &&
command.startsWith('$scriptPath = Join-Path')
? command
.replaceAll('$LASTEXITCODE', '')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import { kimiHookService } from '../kimi/hook-service'
import { dshHookService } from '../dsh/hook-service'
import { museHookService } from '../muse/hook-service'
import { openClaudeHookService } from '../openclaude/hook-service'
import { qoderHookService } from '../qoder/hook-service'
import { qwenCodeHookService } from '../qwen-code/hook-service'
import { qoderCnHookService, qoderHookService } from '../qoder/hook-service'
import { zcodeHookService } from '../zcode/hook-service'
import { MANAGED_AGENT_HOOK_INSTALLERS } from './managed-agent-hook-controls'
import { REMOTE_MANAGED_HOOK_INSTALLER_AGENTS } from './remote-managed-hook-installers'
Expand Down Expand Up @@ -54,6 +55,8 @@ describe('remote hook service registry coverage', () => {
['kimi', kimiHookService],
['muse', museHookService],
['qoder', qoderHookService],
['qoder-cn', qoderCnHookService],
['qwen-code', qwenCodeHookService],
['codebuddy', codebuddyHookService],
['zcode', zcodeHookService],
['dsh', dshHookService]
Expand Down
5 changes: 4 additions & 1 deletion src/main/agent-hooks/remote-managed-hook-installers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { codebuddyHookService } from '../codebuddy/hook-service'
import { qoderHookService } from '../qoder/hook-service'
import { qwenCodeHookService } from '../qwen-code/hook-service'
import { qoderCnHookService, qoderHookService } from '../qoder/hook-service'
import type { SFTPWrapper } from 'ssh2'
import type { AgentHookInstallStatus, AgentHookTarget } from '../../shared/agent-hook-types'
import { ampHookService } from '../amp/hook-service'
Expand Down Expand Up @@ -65,6 +66,8 @@ const REMOTE_MANAGED_HOOK_INSTALLERS: readonly RemoteManagedHookInstaller[] = [
],
['gemini', (sftp, remoteHome) => geminiHookService.installRemote(sftp, remoteHome)],
['qoder', (sftp, remoteHome) => qoderHookService.installRemote(sftp, remoteHome)],
['qoder-cn', (sftp, remoteHome) => qoderCnHookService.installRemote(sftp, remoteHome)],
['qwen-code', (sftp, remoteHome) => qwenCodeHookService.installRemote(sftp, remoteHome)],
['codebuddy', (sftp, remoteHome) => codebuddyHookService.installRemote(sftp, remoteHome)],
['antigravity', (sftp, remoteHome) => antigravityHookService.installRemote(sftp, remoteHome)],
['amp', (sftp, remoteHome) => ampHookService.installRemote(sftp, remoteHome)],
Expand Down
2 changes: 2 additions & 0 deletions src/main/agent-hooks/server-retired-pane-new-turn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ afterEach(() => vi.restoreAllMocks())
* mimo-code's boundary is an explicit-prompt MessagePart, which the gate handles separately. */
const NEW_TURN_EVENT: Record<AgentHookSource, string | null> = {
qoder: 'SessionStart',
'qoder-cn': 'SessionStart',
'qwen-code': 'SessionStart',
claude: 'SessionStart',
kimi: 'UserPromptSubmit',
codebuddy: 'UserPromptSubmit',
Expand Down
1 change: 1 addition & 0 deletions src/main/agent-workspace-trust-spawn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ describe('applyAgentWorkspaceTrustToSpawn', () => {
'cursor',
'copilot',
'qoder',
'qoder-cn',
'antigravity'
])
)
Expand Down
10 changes: 8 additions & 2 deletions src/main/claude/hook-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ import { wrapWindowsDirectCmdHookCommand } from '../agent-hooks/windows-direct-c
import type { ClaudeManagedHookPlan } from './claude-managed-hook-events'

export type ClaudeCompatibleHookSettings = {
configDirName: '.claude' | '.openclaude' | '.qoder' | '.codebuddy'
scriptBaseName: 'claude-hook' | 'openclaude-hook' | 'qoder-hook' | 'codebuddy-hook'
configDirName: '.claude' | '.openclaude' | '.qoder' | '.qoder-cn' | '.qwen' | '.codebuddy'
scriptBaseName:
| 'claude-hook'
| 'openclaude-hook'
| 'qoder-hook'
| 'qoder-cn-hook'
| 'qwen-code-hook'
| 'codebuddy-hook'
usesWindowsCompatLauncher: boolean
windowsHookShell?: 'powershell'
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/claude/windows-hook-files.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { ClaudeHookService } from './hook-service'
import { getWindowsManagedLifecycleHook } from './hook-settings'
import { getWindowsClaudeHookEntry, getWindowsClaudeHookPayloadPath } from './windows-hook-files'
import { codebuddyHookService } from '../codebuddy/hook-service'
import { qoderHookService } from '../qoder/hook-service'
import { qoderHookService, qoderCnHookService } from '../qoder/hook-service'
import { qwenCodeHookService } from '../qwen-code/hook-service'
import { openClaudeHookService } from '../openclaude/hook-service'

const { home } = vi.hoisted(() => ({ home: { path: '' } }))
Expand Down Expand Up @@ -143,15 +144,16 @@ describe('Windows Claude hook files', () => {
it('keeps compatible agents on their existing single-file scripts', async () => {
for (const [name, compatible] of [
['qoder', qoderHookService],
['qoder-cn', qoderCnHookService],
['qwen-code', qwenCodeHookService],
['codebuddy', codebuddyHookService],
['openclaude', openClaudeHookService]
] as const) {
expect(compatible.install().state).toBe('installed')
await compatible.refreshManagedScripts()
const path = join(home.path, '.orca', 'agent-hooks', `${name}-hook.cmd`)
expect(readFileSync(path, 'utf8')).toContain(
`/hook/${name === 'openclaude' ? 'claude' : name}`
)
const source = name === 'openclaude' ? 'claude' : name
expect(readFileSync(path, 'utf8')).toContain(`/hook/${source}`)
expect(readFileSync(path, 'utf8')).not.toContain('claude-hook-impl.cmd')
expect(existsSync(join(home.path, '.orca', 'agent-hooks', `${name}-hook-impl.cmd`))).toBe(
false
Expand Down
4 changes: 4 additions & 0 deletions src/main/execution-host-workspace-trust.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const AGENT_TRUST_INHERITS_FROM_A_HOME: Record<AgentTrustPreset, boolean>
cursor: false,
copilot: true,
qoder: true,
'qoder-cn': true,
antigravity: false
}

Expand All @@ -66,6 +67,7 @@ export const AGENT_TRUST_KEYED_BY_START_FOLDER: Record<AgentTrustPreset, boolean
cursor: false,
copilot: false,
qoder: false,
'qoder-cn': false,
antigravity: false
}

Expand Down Expand Up @@ -106,6 +108,8 @@ async function writePreset(
return markCursorWorkspaceTrusted(storedPath, host.agentHome)
case 'copilot':
return markCopilotFolderTrusted(storedPath, host.agentHome)
case 'qoder-cn':
return markQoderWorkspaceTrusted(storedPath, host.agentHome, '.qoder-cn')
case 'qoder':
return markQoderWorkspaceTrusted(storedPath, host.agentHome)
case 'antigravity':
Expand Down
52 changes: 51 additions & 1 deletion src/main/qoder/hook-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ vi.mock('node:os', async (importOriginal) => ({
vi.mock('electron', () => ({ app: { getPath: () => sandbox.home } }))
import { getManagedLifecycleHook, hasSameManagedHookInvocation } from '../claude/hook-settings'
import { createManagedCommandMatcher } from '../agent-hooks/installer-utils'
import { qoderHookService, QODER_HOOK_EVENTS } from './hook-service'
import { qoderCnHookService, qoderHookService, QODER_HOOK_EVENTS } from './hook-service'
import { markQoderWorkspaceTrusted, withQoderTrustedWorkspace } from './workspace-trust'
import { qwenCodeHookService, QWEN_CODE_HOOK_EVENTS } from '../qwen-code/hook-service'

beforeAll(() => {
sandbox.home = mkdtempSync(join(tmpdir(), 'orca-qoder-test-'))
Expand Down Expand Up @@ -96,3 +97,52 @@ describe('Qoder Windows hook shell', () => {
}
})
})

it.each([
{
service: qoderCnHookService,
directory: '.qoder-cn',
source: 'qoder-cn',
events: QODER_HOOK_EVENTS
},
{
service: qwenCodeHookService,
directory: '.qwen',
source: 'qwen-code',
events: QWEN_CODE_HOOK_EVENTS
}
])(
'installs and removes $source hooks without changing user settings',
({ service, directory, source, events }) => {
const configDir = join(sandbox.home, directory)
mkdirSync(configDir, { recursive: true })
const path = join(configDir, 'settings.json')
const userHook = { matcher: '', hooks: [{ type: 'command', command: 'echo user-owned' }] }
writeFileSync(
path,
JSON.stringify({
model: 'custom',
statusLine: { command: 'user-status' },
hooks: { Stop: [userHook] }
})
)
expect(service.install().state).toBe('installed')
const installed = JSON.parse(readFileSync(path, 'utf8'))
expect(Object.keys(installed.hooks).sort()).toEqual([...events].sort())
expect(installed.statusLine).toEqual({ command: 'user-status' })
expect(
readFileSync(join(sandbox.home, '.orca', 'agent-hooks', `${source}-hook.sh`), 'utf8')
).toContain(`/hook/${source}`)
if (source === 'qoder-cn') {
markQoderWorkspaceTrusted('/cn-workspace', sandbox.home, '.qoder-cn')
expect(JSON.parse(readFileSync(path, 'utf8')).permissions.trustDirectories).toEqual([
'/cn-workspace'
])
}
expect(service.remove().state).toBe('not_installed')
expect(JSON.parse(readFileSync(path, 'utf8'))).toMatchObject({
model: 'custom',
hooks: { Stop: [userHook] }
})
}
)
13 changes: 13 additions & 0 deletions src/main/qoder/hook-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,16 @@ export const qoderHookService = new ClaudeHookService({
},
hookPlan: QODER_MANAGED_HOOK_PLAN
})

export const qoderCnHookService = new ClaudeHookService({
agent: 'qoder-cn',
source: 'qoder-cn',
displayName: 'Qoder CLI China',
settings: {
configDirName: '.qoder-cn',
scriptBaseName: 'qoder-cn-hook',
usesWindowsCompatLauncher: true,
windowsHookShell: 'powershell'
},
hookPlan: QODER_MANAGED_HOOK_PLAN
})
8 changes: 6 additions & 2 deletions src/main/qoder/workspace-trust.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ export function withQoderTrustedWorkspace(
}
}

export function markQoderWorkspaceTrusted(workspacePath: string, home: string): void {
export function markQoderWorkspaceTrusted(
workspacePath: string,
home: string,
configDirName: '.qoder' | '.qoder-cn' = '.qoder'
): void {
let canonicalPath = workspacePath
try {
canonicalPath = realpathSync.native(workspacePath)
} catch {
/* Keep the supplied path when absent. */
}
const configPath = join(home, '.qoder', 'settings.json')
const configPath = join(home, configDirName, 'settings.json')
const config = readHooksJson(configPath)
if (!config) {
return
Expand Down
37 changes: 37 additions & 0 deletions src/main/qwen-code/hook-service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { ClaudeHookService } from '../claude/hook-service'
import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events'

// Qwen's hook enum is authoritative; Claude's version table and statusline do not apply.
export const QWEN_CODE_HOOK_EVENTS = [
'SessionStart',
'SessionEnd',
'UserPromptSubmit',
'PreToolUse',
'PostToolUse',
'PostToolUseFailure',
'PermissionRequest',
'Stop',
'StopFailure',
'Notification',
'SubagentStart',
'SubagentStop'
] as const

export const QWEN_CODE_MANAGED_HOOK_PLAN: ClaudeManagedHookPlan = {
install: QWEN_CODE_HOOK_EVENTS.map((eventName) => ({ eventName, definition: {} })),
retire: [],
statusLine: 'leave'
}

export const qwenCodeHookService = new ClaudeHookService({
agent: 'qwen-code',
source: 'qwen-code',
displayName: 'Qwen Code',
settings: {
configDirName: '.qwen',
scriptBaseName: 'qwen-code-hook',
usesWindowsCompatLauncher: true,
windowsHookShell: 'powershell'
},
hookPlan: QWEN_CODE_MANAGED_HOOK_PLAN
})
15 changes: 15 additions & 0 deletions src/main/runtime/__fixtures__/qoder-cn-signin.meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"capturedAt": "2026-10-02T07:27:56.152Z",
"platform": "darwin",
"command": [
"qoderclicn",
"--config-dir",
"/tmp/orca-qoder-validation-1002/cn-config",
"--cwd",
"/tmp/orca-qoder-validation-1002/workspace"
],
"cols": 120,
"rows": 40,
"note": "Qoder CLI China 1.1.65; accepted trust in isolated config; sign-in dialog; no China account",
"exitCode": 129
}
Loading
Loading