From 3d9fbd3567d738b8e7859a8830731a621d483919 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 00:49:23 -0700 Subject: [PATCH 01/17] Add Qoder session history and search with real CLI coverage --- .../qoder-1.1.64-generated-resumed.jsonl | 29 ++++ .../remote-session-scanner-sources.ts | 11 ++ .../ai-vault/session-scanner-agent-parser.ts | 3 + .../ai-vault/session-scanner-agent-sources.ts | 10 ++ .../session-scanner-log-agent-fixtures.ts | 14 ++ .../ai-vault/session-scanner-parse-cache.ts | 3 + .../ai-vault/session-scanner-qoder-parser.ts | 110 +++++++++++++ .../ai-vault/session-scanner-qoder.test.ts | 100 ++++++++++++ .../ai-vault/session-scanner-test-fixtures.ts | 1 + src/main/ai-vault/session-scanner-types.ts | 1 + src/main/qoder/real-cli.test.ts | 144 ++++++++++++++++++ src/shared/ai-vault-resume-command.ts | 1 + src/shared/ai-vault-types.ts | 2 + 13 files changed, 429 insertions(+) create mode 100644 src/main/ai-vault/__fixtures__/qoder-1.1.64-generated-resumed.jsonl create mode 100644 src/main/ai-vault/session-scanner-qoder-parser.ts create mode 100644 src/main/ai-vault/session-scanner-qoder.test.ts create mode 100644 src/main/qoder/real-cli.test.ts diff --git a/src/main/ai-vault/__fixtures__/qoder-1.1.64-generated-resumed.jsonl b/src/main/ai-vault/__fixtures__/qoder-1.1.64-generated-resumed.jsonl new file mode 100644 index 000000000000..23b8dca2b6c1 --- /dev/null +++ b/src/main/ai-vault/__fixtures__/qoder-1.1.64-generated-resumed.jsonl @@ -0,0 +1,29 @@ +{"type": "workspace-directories", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "directories": ["/tmp/qoder-proof"]} +{"type": "runtime-config", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "model": "qmodel_38max", "reasoningEffort": null, "contextWindow": null, "generation": null, "timestamp": 1790925189036} +{"type": "worktree-state", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "worktreeSession": null} +{"type": "user", "uuid": "5231d503-07ef-4da9-86a6-8b24ce29b5d9", "timestamp": "2026-10-02T07:13:09.827Z", "message": {"role": "user", "content": "Create proof.txt containing exactly QODER_ORCA_PROOF_1002. Then respond with QODER_ORCA_COMPLETE_1002."}, "permissionMode": "acceptEdits", "origin": {"kind": "human"}, "promptId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "humanInput": {"text": "Create proof.txt containing exactly QODER_ORCA_PROOF_1002. Then respond with QODER_ORCA_COMPLETE_1002.", "mode": "prompt"}, "requestSetId": "ed2acf2f-b319-48c6-be63-34e7489c0dd8", "parentUuid": null, "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "0d6e72ea-d565-472d-81b4-9fe05f0d97c8", "explicit": false, "timestamp": 1790925189964} +{"type": "assistant", "uuid": "31d468b2-4206-4e9f-8866-5ca51de917e9", "timestamp": "2026-10-02T07:13:12.821Z", "message": {"id": "chatcmpl-efc1370b-f5de-9bb4-87df-6376580124bd", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": null, "stop_sequence": null, "content": [{"type": "thinking", "thinking": "I'm creating the file now.\n", "signature": ""}]}, "parentUuid": "0d6e72ea-d565-472d-81b4-9fe05f0d97c8", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "assistant", "uuid": "45a9c19e-5c8c-4e9d-9a9b-5629fa545ec3", "timestamp": "2026-10-02T07:13:12.821Z", "message": {"id": "chatcmpl-efc1370b-f5de-9bb4-87df-6376580124bd", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": null, "stop_sequence": null, "content": [{"type": "text", "text": "Creating the file.\n\n", "citations": null}]}, "parentUuid": "31d468b2-4206-4e9f-8866-5ca51de917e9", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "assistant", "uuid": "7236b8c2-7833-4dd3-b7f0-e72acee559d0", "timestamp": "2026-10-02T07:13:12.821Z", "message": {"id": "chatcmpl-efc1370b-f5de-9bb4-87df-6376580124bd", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": "tool_use", "stop_sequence": null, "content": [{"type": "tool_use", "id": "call_f70efeb224b74814a8be55f8", "name": "Write", "input": {"content": "QODER_ORCA_PROOF_1002", "file_path": "/tmp/qoder-proof/proof.txt"}}], "usage": {"input_tokens": 0, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0, "output_tokens": 0}}, "parentUuid": "45a9c19e-5c8c-4e9d-9a9b-5629fa545ec3", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "7236b8c2-7833-4dd3-b7f0-e72acee559d0", "explicit": false, "timestamp": 1790925192821} +{"type": "user", "uuid": "ae5db723-c9f4-4a35-902d-d4b8de01e431", "timestamp": "2026-10-02T07:13:13.317Z", "message": {"role": "user", "content": [{"type": "tool_result", "tool_use_id": "call_f70efeb224b74814a8be55f8", "content": "File created successfully at: /tmp/qoder-proof/proof.txt"}]}, "sourceToolAssistantUUID": "7236b8c2-7833-4dd3-b7f0-e72acee559d0", "promptId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "toolUseResult": {"success": true, "file_path": "/tmp/qoder-proof/proof.txt", "bytesWritten": 21, "additions": 0, "deletions": 0}, "parentUuid": "7236b8c2-7833-4dd3-b7f0-e72acee559d0", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "ae5db723-c9f4-4a35-902d-d4b8de01e431", "explicit": false, "timestamp": 1790925193317} +{"type": "assistant", "uuid": "6fcecbbd-5bf1-4186-8766-369beb156bc9", "timestamp": "2026-10-02T07:13:15.794Z", "message": {"id": "chatcmpl-aee1d927-eb24-9aad-8b58-9d66ab7a1fb4", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": null, "stop_sequence": null, "content": [{"type": "thinking", "thinking": "\"Containing exactly QODER_ORCA_PROOF_1002\" — I wrote without trailing newline. That's exact.\n", "signature": ""}]}, "parentUuid": "ae5db723-c9f4-4a35-902d-d4b8de01e431", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "assistant", "uuid": "51a7fb68-5c13-4e92-bfd8-a26c25940566", "timestamp": "2026-10-02T07:13:15.794Z", "message": {"id": "chatcmpl-aee1d927-eb24-9aad-8b58-9d66ab7a1fb4", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": "end_turn", "stop_sequence": null, "content": [{"type": "text", "text": "QODER_ORCA_COMPLETE_1002", "citations": null}], "usage": {"input_tokens": 0, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0, "output_tokens": 0}}, "parentUuid": "6fcecbbd-5bf1-4186-8766-369beb156bc9", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "51a7fb68-5c13-4e92-bfd8-a26c25940566", "explicit": false, "timestamp": 1790925195794} +{"type": "last-prompt", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "lastPrompt": "Create proof.txt containing exactly QODER_ORCA_PROOF_1002. Then respond with QODER_ORCA_COMPLETE_1002."} +{"type": "workspace-directories", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "directories": ["/tmp/qoder-proof"]} +{"type": "runtime-config", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "model": "qmodel_38max", "reasoningEffort": null, "contextWindow": null, "generation": null, "timestamp": 1790925189036} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "51a7fb68-5c13-4e92-bfd8-a26c25940566", "explicit": false, "timestamp": 1790925195794} +{"type": "worktree-state", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "worktreeSession": null} +{"type": "runtime-config", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "model": "qmodel_38max", "reasoningEffort": null, "contextWindow": null, "generation": null, "timestamp": 1790925244267} +{"type": "user", "uuid": "029ca680-b833-4301-9ce2-0d3d372d93dc", "timestamp": "2026-10-02T07:14:04.785Z", "message": {"role": "user", "content": "What exact marker did you write to proof.txt? Reply only with that marker."}, "permissionMode": "default", "origin": {"kind": "human"}, "promptId": "fd63d141-bc1c-4fe5-b46e-117d6e84579c", "humanInput": {"text": "What exact marker did you write to proof.txt? Reply only with that marker.", "mode": "prompt"}, "requestSetId": "aa08407f-0504-47a9-8e97-53595595be15", "parentUuid": "51a7fb68-5c13-4e92-bfd8-a26c25940566", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "029ca680-b833-4301-9ce2-0d3d372d93dc", "explicit": false, "timestamp": 1790925244785} +{"type": "assistant", "uuid": "8212543a-36a1-489c-a5f6-65ee294d2faf", "timestamp": "2026-10-02T07:14:07.626Z", "message": {"id": "chatcmpl-dc06221e-db1d-97aa-9a40-69d27c884243", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": null, "stop_sequence": null, "content": [{"type": "thinking", "thinking": "The user asks what exact marker I wrote. Let me just answer. I could verify by reading the file, but the instruction says don't re-read a file just to verify. The user asks a direct question; answer with the marker only.\n\nBut accuracy matters — \"exact marker\". I'm confident it's QODER_ORCA_PROOF_1002.", "signature": ""}]}, "parentUuid": "029ca680-b833-4301-9ce2-0d3d372d93dc", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "assistant", "uuid": "3f2475e3-00e5-4e36-9b3c-0d02618d177a", "timestamp": "2026-10-02T07:14:07.626Z", "message": {"id": "chatcmpl-dc06221e-db1d-97aa-9a40-69d27c884243", "type": "message", "role": "assistant", "model": "qmodel_38max", "stop_reason": "end_turn", "stop_sequence": null, "content": [{"type": "text", "text": "QODER_ORCA_PROOF_1002", "citations": null}], "usage": {"input_tokens": 0, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0, "output_tokens": 0}}, "parentUuid": "8212543a-36a1-489c-a5f6-65ee294d2faf", "isSidechain": false, "cwd": "/tmp/qoder-proof", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "userType": "external", "entrypoint": "cli", "version": "1.1.64", "gitBranch": "HEAD"} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "3f2475e3-00e5-4e36-9b3c-0d02618d177a", "explicit": false, "timestamp": 1790925247626} +{"type": "last-prompt", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "lastPrompt": "What exact marker did you write to proof.txt? Reply only with that marker."} +{"type": "workspace-directories", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "directories": ["/tmp/qoder-proof"]} +{"type": "runtime-config", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "model": "qmodel_38max", "reasoningEffort": null, "contextWindow": null, "generation": null, "timestamp": 1790925244267} +{"type": "active-leaf", "sessionId": "faa75b79-790e-4c44-8f3e-c7145d18eb7e", "leafUuid": "3f2475e3-00e5-4e36-9b3c-0d02618d177a", "explicit": false, "timestamp": 1790925247626} diff --git a/src/main/ai-vault/remote-session-scanner-sources.ts b/src/main/ai-vault/remote-session-scanner-sources.ts index dfd012415d54..16b0938fee9a 100644 --- a/src/main/ai-vault/remote-session-scanner-sources.ts +++ b/src/main/ai-vault/remote-session-scanner-sources.ts @@ -1,3 +1,4 @@ +import { parseQoderSessionContent } from './session-scanner-qoder-parser' import { remoteSessionDocumentParsers } from './remote-session-document-parsers' import type { RemoteSessionContent } from './remote-session-content-lines' import type { AiVaultAgent, AiVaultSession } from '../../shared/ai-vault-types' @@ -77,6 +78,16 @@ export function remoteSessionSources( ), partitionSubagentTranscripts: partitionSubagentTranscriptPaths }, + { + ...jsonlSource( + 'qoder', + remoteHome, + hostPlatform, + ['.qoder', 'projects'], + parseQoderSessionContent + ), + partitionSubagentTranscripts: partitionSubagentTranscriptPaths + }, remoteAntigravitySource(remoteHome, hostPlatform), source( 'gemini', diff --git a/src/main/ai-vault/session-scanner-agent-parser.ts b/src/main/ai-vault/session-scanner-agent-parser.ts index 95910d208b73..be2783e215e7 100644 --- a/src/main/ai-vault/session-scanner-agent-parser.ts +++ b/src/main/ai-vault/session-scanner-agent-parser.ts @@ -1,3 +1,4 @@ +import { parseQoderSessionFile } from './session-scanner-qoder-parser' import { parseCodebuddySessionFile } from './session-scanner-codebuddy-parser' import type { AiVaultSession } from '../../shared/ai-vault-types' import { throwIfSignalAborted } from '../../shared/abort-signal-reason' @@ -88,6 +89,8 @@ export async function parseAgentSessionFile( signal?: AbortSignal ): Promise { switch (candidate.agent) { + case 'qoder': + return parseQoderSessionFile(candidate.file, platform, messages) case 'codebuddy': return parseCodebuddySessionFile(candidate.file, platform, messages) case 'claude': diff --git a/src/main/ai-vault/session-scanner-agent-sources.ts b/src/main/ai-vault/session-scanner-agent-sources.ts index 66d069b68cc2..b9b5756b8fd5 100644 --- a/src/main/ai-vault/session-scanner-agent-sources.ts +++ b/src/main/ai-vault/session-scanner-agent-sources.ts @@ -115,6 +115,16 @@ export const AI_VAULT_AGENT_SOURCES: AiVaultAgentSourceTable = { // their parent instead. directoryPredicate: (name) => name !== SUBAGENT_DIR_NAME }, + qoder: { + rootDirs: (options, wslHomeDirs) => + sessionRootDirs( + options.qoderProjectsDir ?? join(homedir(), '.qoder', 'projects'), + wslHomeDirs, + ['.qoder', 'projects'] + ), + extensions: ['.jsonl'], + directoryPredicate: (name) => name !== SUBAGENT_DIR_NAME + }, codebuddy: { rootDirs: (options, wslHomeDirs) => [ options.codebuddyProjectsDir ?? CODEBUDDY_PROJECTS_DIR, diff --git a/src/main/ai-vault/session-scanner-log-agent-fixtures.ts b/src/main/ai-vault/session-scanner-log-agent-fixtures.ts index be080271269c..c460ca7cc191 100644 --- a/src/main/ai-vault/session-scanner-log-agent-fixtures.ts +++ b/src/main/ai-vault/session-scanner-log-agent-fixtures.ts @@ -32,6 +32,20 @@ export async function writeLogAgentFixtures( ]) ) + await mkdir(join(roots.qoderProjectsDir, 'project'), { recursive: true }) + await writeFile( + join(roots.qoderProjectsDir, 'project', 'qoder-session.jsonl'), + jsonlBody([ + { type: 'workspace-directories', sessionId: 'qoder-session', directories: ['/tmp/qoder'] }, + { + type: 'user', + sessionId: 'qoder-session', + timestamp: '2026-05-01T10:00:00.000Z', + message: { role: 'user', content: 'Qoder title' } + } + ]) + ) + // CodeBuddy writes its own message-record shape under its own root. await mkdir(join(roots.codebuddyProjectsDir, 'project'), { recursive: true }) await writeFile( diff --git a/src/main/ai-vault/session-scanner-parse-cache.ts b/src/main/ai-vault/session-scanner-parse-cache.ts index a00f4edd2cfe..3fefd825833a 100644 --- a/src/main/ai-vault/session-scanner-parse-cache.ts +++ b/src/main/ai-vault/session-scanner-parse-cache.ts @@ -1,3 +1,4 @@ +import { createQoderSessionResumeState } from './session-scanner-qoder-parser' import type { AiVaultSession } from '../../shared/ai-vault-types' import { inSessionParseFileLane } from './session-parse-file-lane' import { createAntigravitySessionResumeState } from './session-scanner-antigravity-parser' @@ -52,6 +53,8 @@ function resumableStateFactoryFor( switch (candidate.agent) { case 'claude': return (messages) => createClaudeSessionResumeState(candidate.file, messages) + case 'qoder': + return (messages) => createQoderSessionResumeState(candidate.file, messages) case 'codebuddy': return (messages) => createCodebuddySessionResumeState(candidate.file, messages) case 'codex': diff --git a/src/main/ai-vault/session-scanner-qoder-parser.ts b/src/main/ai-vault/session-scanner-qoder-parser.ts new file mode 100644 index 000000000000..b575856a8502 --- /dev/null +++ b/src/main/ai-vault/session-scanner-qoder-parser.ts @@ -0,0 +1,110 @@ +import { createInterface } from 'node:readline' +import type { ExecutionHostId } from '../../shared/execution-host' +import { openTranscriptReadStream } from '../native-chat/wsl-transcript-fs-access' +import { accumulatorSessionIdentity, updateTimeline } from './session-scanner-accumulator' +import { + cloneClaudeSessionParseState, + consumeClaudeSessionLine, + createClaudeSessionParseState, + finalizeClaudeSessionParseState, + type ClaudeSessionParseState +} from './session-scanner-primary-parsers' +import { extractString, parseJsonObject } from './session-scanner-values' +import { + remoteSessionContentLines, + type RemoteSessionContent +} from './remote-session-content-lines' +import type { FileWithMtime, ResumableSessionParseState } from './session-scanner-types' +import type { TranscriptMessageSink } from './session-transcript-consumers' + +type ParserOptions = { + executionHostId?: ExecutionHostId + executionHostPlatform?: NodeJS.Platform | null +} + +function createQoderState( + file: FileWithMtime, + messages?: TranscriptMessageSink +): ClaudeSessionParseState { + const state = createClaudeSessionParseState(file, messages) + state.accumulator.agent = 'qoder' + return state +} + +function consumeQoderLine(state: ClaudeSessionParseState, line: string): void { + // Qoder 1.1.64 shares Claude's turns, titles and tool blocks, with extra startup records. + consumeClaudeSessionLine(state, line) + const record = parseJsonObject(line) + if (!record) { + return + } + if ( + record.type === 'workspace-directories' && + !state.accumulator.cwd && + Array.isArray(record.directories) + ) { + state.accumulator.cwd = extractString(record.directories[0]) + } + if (record.type === 'runtime-config') { + state.accumulator.model = extractString(record.model) ?? state.accumulator.model + updateTimeline(state.accumulator, record.timestamp) + } +} + +function resumeState(state: ClaudeSessionParseState): ResumableSessionParseState { + return { + consumeLine: (line) => consumeQoderLine(state, line), + identity: () => accumulatorSessionIdentity(state.accumulator), + clone: () => resumeState(cloneClaudeSessionParseState(state)), + touchFile: (file) => { + state.accumulator.modifiedAt = file.modifiedAt + }, + finalize: (platform, options) => finalizeClaudeSessionParseState(state, platform, options) + } +} + +export function createQoderSessionResumeState( + file: FileWithMtime, + messages?: TranscriptMessageSink +): ResumableSessionParseState { + return resumeState(createQoderState(file, messages)) +} + +export async function parseQoderSessionFile( + file: FileWithMtime, + platform: NodeJS.Platform = process.platform, + messages?: TranscriptMessageSink +) { + const stream = openTranscriptReadStream(file.path, { encoding: 'utf-8' }, 'scan') + const lines = createInterface({ input: stream, crlfDelay: Infinity }) + try { + return await parseLines(file, lines, platform, {}, messages) + } finally { + lines.close() + stream.destroy() + } +} + +export async function parseQoderSessionContent( + file: FileWithMtime, + content: RemoteSessionContent, + platform: NodeJS.Platform = process.platform, + options: ParserOptions = {}, + signal?: AbortSignal +) { + return parseLines(file, remoteSessionContentLines(content, signal), platform, options) +} + +async function parseLines( + file: FileWithMtime, + lines: AsyncIterable | Iterable, + platform: NodeJS.Platform, + options: ParserOptions, + messages?: TranscriptMessageSink +) { + const state = createQoderState(file, messages) + for await (const line of lines) { + consumeQoderLine(state, line) + } + return finalizeClaudeSessionParseState(state, platform, options) +} diff --git a/src/main/ai-vault/session-scanner-qoder.test.ts b/src/main/ai-vault/session-scanner-qoder.test.ts new file mode 100644 index 000000000000..c3f470fb7881 --- /dev/null +++ b/src/main/ai-vault/session-scanner-qoder.test.ts @@ -0,0 +1,100 @@ +import { readFile, mkdtemp, rm, stat } from 'node:fs/promises' +import { getRemoteHostPlatform } from '../ssh/ssh-remote-platform' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, expect, it } from 'vitest' +import { AI_VAULT_AGENT_SOURCES } from './session-scanner-agent-sources' +import { isolatedScanRoots, writeJsonlFile } from './session-scanner-test-fixtures' +import { scanAiVaultSessions } from './session-scanner' +import { + createQoderSessionResumeState, + parseQoderSessionContent +} from './session-scanner-qoder-parser' +import { remoteSessionSources } from './remote-session-scanner-sources' +import { resetSessionParseCacheForTests } from './session-scanner-parse-cache' +import type { TranscriptMessage } from './session-transcript-consumers' + +const roots: string[] = [] +afterEach(async () => { + resetSessionParseCacheForTests() + await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true }))) +}) + +it('decodes a real generated and resumed Qoder 1.1.64 session for preview and search', async () => { + const path = join(__dirname, '__fixtures__', 'qoder-1.1.64-generated-resumed.jsonl') + const content = await readFile(path, 'utf8') + const file = { path, mtimeMs: 1, modifiedAt: '2026-10-02T07:14:07.626Z' } + const messages: TranscriptMessage[] = [] + const state = createQoderSessionResumeState(file, { + active: true, + push: (message) => messages.push(message) + }) + const lines = content.trim().split('\n') + const split = lines.findIndex((line) => line.includes('What exact marker')) + for (const line of lines.slice(0, split)) { + state.consumeLine(line) + } + const before = await state.finalize('darwin') + const resumed = state.clone() + for (const line of lines.slice(split)) { + resumed.consumeLine(line) + } + const after = await resumed.finalize('darwin') + expect(after).toMatchObject({ + agent: 'qoder', + cwd: '/tmp/qoder-proof', + model: 'qmodel_38max', + sessionId: 'faa75b79-790e-4c44-8f3e-c7145d18eb7e' + }) + expect(after?.resumeCommand).toContain("qodercli --resume 'faa75b79-790e-4c44-8f3e-c7145d18eb7e'") + expect(after?.previewMessages.at(-1)?.text).toBe('QODER_ORCA_PROOF_1002') + expect(before?.previewMessages.at(-1)?.text).toBe('QODER_ORCA_COMPLETE_1002') + expect(messages.some((m) => m.role === 'assistant' && m.text === 'QODER_ORCA_PROOF_1002')).toBe( + true + ) + expect(messages.some((m) => m.text.includes("I'm creating the file now"))).toBe(false) + const remote = await parseQoderSessionContent(file, content, 'linux', { + executionHostId: 'ssh:test' + }) + expect(remote).toMatchObject({ + agent: 'qoder', + executionHostId: 'ssh:test', + cwd: '/tmp/qoder-proof' + }) +}) + +it('discovers Qoder folder history and prunes nested workers on local, WSL, and SSH hosts', async () => { + const root = await mkdtemp(join(tmpdir(), 'orca-qoder-vault-')) + roots.push(root) + const options = isolatedScanRoots(root) + const path = join(options.qoderProjectsDir, 'folder', 'qoder-session.jsonl') + const records = [ + { type: 'workspace-directories', sessionId: 'qoder-session', directories: ['/tmp/folder'] }, + { + type: 'user', + sessionId: 'qoder-session', + message: { role: 'user', content: 'Qoder folder proof' } + } + ] + await writeJsonlFile(path, records) + await writeJsonlFile( + join(options.qoderProjectsDir, 'folder', 'qoder-session', 'subagents', 'worker.jsonl'), + records + ) + const result = await scanAiVaultSessions({ ...options, wslHomeDirs: [] }) + const sessions = result.sessions.filter((s) => s.agent === 'qoder') + expect(sessions).toHaveLength(1) + expect(sessions[0]).toMatchObject({ title: 'Qoder folder proof', cwd: '/tmp/folder' }) + expect(AI_VAULT_AGENT_SOURCES.qoder?.rootDirs(options, ['/home/test'])).toContain( + join('/home/test', '.qoder', 'projects') + ) + for (const platform of ['darwin-arm64', 'linux-x64', 'win32-x64'] as const) { + const source = remoteSessionSources( + platform === 'win32-x64' ? 'C:\\Users\\test' : '/home/test', + getRemoteHostPlatform(platform) + ).find((s) => s.agent === 'qoder') + expect(source).toBeDefined() + expect(source?.partitionSubagentTranscripts).toBeDefined() + } + expect((await stat(path)).size).toBeGreaterThan(0) +}) diff --git a/src/main/ai-vault/session-scanner-test-fixtures.ts b/src/main/ai-vault/session-scanner-test-fixtures.ts index 0d9b8cef5aba..c21a7b9a7b32 100644 --- a/src/main/ai-vault/session-scanner-test-fixtures.ts +++ b/src/main/ai-vault/session-scanner-test-fixtures.ts @@ -55,6 +55,7 @@ export function isolatedScanRoots(root: string) { return { claudeProjectsDir: join(root, 'claude-projects'), codebuddyProjectsDir: join(root, 'codebuddy-projects'), + qoderProjectsDir: join(root, 'qoder-projects'), codexSessionsDir: join(root, 'codex-sessions'), geminiSessionsDir: join(root, 'gemini-sessions'), antigravityBrainDir: join(root, 'antigravity-brain'), diff --git a/src/main/ai-vault/session-scanner-types.ts b/src/main/ai-vault/session-scanner-types.ts index be97a4b3187b..2a285409ac27 100644 --- a/src/main/ai-vault/session-scanner-types.ts +++ b/src/main/ai-vault/session-scanner-types.ts @@ -15,6 +15,7 @@ import type { OpenCodeWslRuntime } from './session-scanner-opencode-wsl-runtime' export type AiVaultScanOptions = { claudeProjectsDir?: string codebuddyProjectsDir?: string + qoderProjectsDir?: string codexSessionsDir?: string additionalCodexSessionsDirs?: readonly string[] // Why: tests inject a sandbox "real ~/.codex" so real-home attribution diff --git a/src/main/qoder/real-cli.test.ts b/src/main/qoder/real-cli.test.ts new file mode 100644 index 000000000000..b5d0ebd39949 --- /dev/null +++ b/src/main/qoder/real-cli.test.ts @@ -0,0 +1,144 @@ +import { cp, mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises' +import { createServer } from 'node:http' +import { homedir, tmpdir } from 'node:os' +import type * as Os from 'node:os' +import { join } from 'node:path' +import { expect, it, vi } from 'vitest' +import { runProcess } from '../../shared/child-process/run-process' +import { createHookListenerState } from '../../shared/agent-hook-listener/listener-state' +import { normalizeAndAccept } from '../../shared/agent-hook-listener-test-harness' + +const sandbox = vi.hoisted(() => ({ home: '' })) +vi.mock('node:os', async (importOriginal) => { + const original = await importOriginal() + return { ...original, homedir: () => sandbox.home || original.homedir() } +}) +vi.mock('electron', () => ({ app: { getPath: () => sandbox.home } })) +import { qoderHookService } from './hook-service' +import { markQoderWorkspaceTrusted } from './workspace-trust' + +it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( + 'generates and resumes a real task through managed hooks', + async () => { + const realHome = homedir() + sandbox.home = await mkdtemp(join(tmpdir(), 'orca-qoder-real-')) + const config = join(sandbox.home, '.qoder') + const workspace = join(sandbox.home, 'folder') + const statuses: { + event: unknown + state: unknown + agent: unknown + session: string | undefined + }[] = [] + const listener = createHookListenerState() + const server = createServer(async (request, response) => { + let content = '' + for await (const chunk of request) { + content += chunk + } + const fields = new URLSearchParams(content) + const payload = JSON.parse(fields.get('payload') ?? '{}') + const normalized = normalizeAndAccept(listener, 'qoder', payload) + statuses.push({ + event: payload.hook_event_name, + state: normalized?.payload.state, + agent: normalized?.payload.agentType, + session: normalized?.providerSession?.id + }) + response.writeHead(request.url === '/hook/qoder' ? 200 : 404).end() + }) + try { + await mkdir(workspace) + await mkdir(config) + await cp(join(realHome, '.qoder', '.auth'), join(config, '.auth'), { recursive: true }) + await writeFile(join(config, 'settings.json'), '{}') + expect(qoderHookService.install().state).toBe('installed') + markQoderWorkspaceTrusted(workspace, sandbox.home) + await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)) + const address = server.address() + if (!address || typeof address === 'string') { + throw new Error('No test receiver port') + } + const env = { + ...process.env, + HOME: sandbox.home, + USERPROFILE: sandbox.home, + ORCA_AGENT_HOOK_PORT: String(address.port), + ORCA_AGENT_HOOK_TOKEN: 'test-token', + ORCA_PANE_KEY: 'qoder-proof-pane', + ORCA_AGENT_HOOK_ENDPOINT: '', + ORCA_AGENT_HOOK_TRANSPORT: '', + ORCA_BACKGROUND_LAUNCH: '1' + } + const command = process.env.ORCA_QODER_CLI_PATH ?? join(realHome, '.local', 'bin', 'qodercli') + const args = [ + '--config-dir', + config, + '--cwd', + workspace, + '--max-model-request-retries', + '0', + '--print' + ] + const generated = await runProcess({ + program: command, + args: [ + ...args, + '--permission-mode', + 'accept_edits', + 'Create proof.txt containing exactly QODER_MANAGED_PROOF. Then reply QODER_MANAGED_COMPLETE.' + ], + env, + timeoutMs: 90000 + }) + expect(generated.code).toBe(0) + expect(await readFile(join(workspace, 'proof.txt'), 'utf8')).toBe('QODER_MANAGED_PROOF') + const session = statuses.find((s) => s.event === 'SessionStart')?.session + expect(session).toBeTruthy() + if (!session) { + throw new Error('Qoder did not identify its session') + } + const resumed = await runProcess({ + program: command, + args: [ + ...args, + '--resume', + session, + 'What exact marker did you write? Reply only with that marker.' + ], + env, + timeoutMs: 90000 + }) + expect(resumed.code).toBe(0) + expect(resumed.stdout.trim()).toBe('QODER_MANAGED_PROOF') + expect(statuses).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + event: 'SessionStart', + state: 'done', + agent: 'qoder', + session + }), + expect.objectContaining({ event: 'UserPromptSubmit', state: 'working', agent: 'qoder' }), + expect.objectContaining({ event: 'Stop', state: 'done', agent: 'qoder' }) + ]) + ) + const evidencePath = process.env.ORCA_QODER_PROOF_PATH + if (evidencePath) { + await writeFile( + evidencePath, + JSON.stringify( + { generated: generated.stdout.trim(), resumed: resumed.stdout.trim(), statuses }, + null, + 2 + ) + ) + } + } finally { + await new Promise((resolve) => server.close(() => resolve())) + await rm(sandbox.home, { recursive: true, force: true }) + sandbox.home = '' + } + }, + 180000 +) diff --git a/src/shared/ai-vault-resume-command.ts b/src/shared/ai-vault-resume-command.ts index efb2ddbe5d3c..60f50023188f 100644 --- a/src/shared/ai-vault-resume-command.ts +++ b/src/shared/ai-vault-resume-command.ts @@ -218,6 +218,7 @@ function buildAgentResumeInvocation( return `${baseCommand} resume ${sessionArg}` case 'cline': return `${baseCommand} --id ${sessionArg}` + case 'qoder': case 'codebuddy': case 'claude': case 'zcode': diff --git a/src/shared/ai-vault-types.ts b/src/shared/ai-vault-types.ts index e337f98d7a08..26431f05810b 100644 --- a/src/shared/ai-vault-types.ts +++ b/src/shared/ai-vault-types.ts @@ -4,6 +4,7 @@ import type { ExecutionHostId, ExecutionHostScope } from './execution-host' export const AI_VAULT_AGENTS = [ 'claude', 'codebuddy', + 'qoder', 'codex', 'hermes', 'pi', @@ -53,6 +54,7 @@ export type AiVaultGroup = 'project' | 'folder' | 'agent' export const AI_VAULT_AGENT_LABELS = { claude: 'Claude', codebuddy: 'CodeBuddy', + qoder: 'Qoder', codex: 'Codex', hermes: 'Hermes', pi: 'Pi', From 4c8e68f6afe5823daddc52a53397d9a5601739e3 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 00:54:48 -0700 Subject: [PATCH 02/17] Allow the real Qoder marker file to end with a newline --- src/main/qoder/real-cli.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/qoder/real-cli.test.ts b/src/main/qoder/real-cli.test.ts index b5d0ebd39949..92aee602e521 100644 --- a/src/main/qoder/real-cli.test.ts +++ b/src/main/qoder/real-cli.test.ts @@ -92,7 +92,9 @@ it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( timeoutMs: 90000 }) expect(generated.code).toBe(0) - expect(await readFile(join(workspace, 'proof.txt'), 'utf8')).toBe('QODER_MANAGED_PROOF') + expect((await readFile(join(workspace, 'proof.txt'), 'utf8')).trim()).toBe( + 'QODER_MANAGED_PROOF' + ) const session = statuses.find((s) => s.event === 'SessionStart')?.session expect(session).toBeTruthy() if (!session) { From 12b75703288005f4f911b8e92bfb92c2994179af Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 01:05:39 -0700 Subject: [PATCH 03/17] Keep Qoder tool output out of history previews and search --- src/main/ai-vault/session-scanner-qoder-parser.ts | 10 ++++++++-- src/main/ai-vault/session-scanner-qoder.test.ts | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/ai-vault/session-scanner-qoder-parser.ts b/src/main/ai-vault/session-scanner-qoder-parser.ts index b575856a8502..47c56e973eb4 100644 --- a/src/main/ai-vault/session-scanner-qoder-parser.ts +++ b/src/main/ai-vault/session-scanner-qoder-parser.ts @@ -9,7 +9,7 @@ import { finalizeClaudeSessionParseState, type ClaudeSessionParseState } from './session-scanner-primary-parsers' -import { extractString, parseJsonObject } from './session-scanner-values' +import { asRecord, extractString, parseJsonObject } from './session-scanner-values' import { remoteSessionContentLines, type RemoteSessionContent @@ -33,11 +33,17 @@ function createQoderState( function consumeQoderLine(state: ClaudeSessionParseState, line: string): void { // Qoder 1.1.64 shares Claude's turns, titles and tool blocks, with extra startup records. - consumeClaudeSessionLine(state, line) const record = parseJsonObject(line) if (!record) { return } + const message = asRecord(record.message) + if (message && Array.isArray(message.content)) { + const content = message.content.filter((block) => asRecord(block)?.type === 'text') + consumeClaudeSessionLine(state, JSON.stringify({ ...record, message: { ...message, content } })) + } else { + consumeClaudeSessionLine(state, line) + } if ( record.type === 'workspace-directories' && !state.accumulator.cwd && diff --git a/src/main/ai-vault/session-scanner-qoder.test.ts b/src/main/ai-vault/session-scanner-qoder.test.ts index c3f470fb7881..78c99ddab886 100644 --- a/src/main/ai-vault/session-scanner-qoder.test.ts +++ b/src/main/ai-vault/session-scanner-qoder.test.ts @@ -53,6 +53,11 @@ it('decodes a real generated and resumed Qoder 1.1.64 session for preview and se true ) expect(messages.some((m) => m.text.includes("I'm creating the file now"))).toBe(false) + expect(messages.every((message) => message.role !== 'tool')).toBe(true) + expect(messages.some((message) => message.text.includes('File created successfully'))).toBe(false) + expect( + after?.previewMessages.some((message) => message.text.includes('File created successfully')) + ).toBe(false) const remote = await parseQoderSessionContent(file, content, 'linux', { executionHostId: 'ssh:test' }) From 8b7accb1ff8f9d157e90782e4eefec9880ad7029 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 01:47:59 -0700 Subject: [PATCH 04/17] Keep Qoder search pages readable by older clients --- .../session-search-scope-entry-points.test.ts | 4 +- .../session-search-scope-service.test.ts | 37 ++++++++--- .../session-search-service-registry.test.ts | 38 +++++++++++- .../session-search-service-registry.ts | 26 +++++++- src/main/qoder/real-cli.test.ts | 5 +- src/shared/ai-vault-search-client.ts | 2 +- src/shared/ai-vault-search-contract.ts | 1 + ...oder-history-search-downgrade.unit.test.ts | 61 +++++++++++++++++++ 8 files changed, 160 insertions(+), 14 deletions(-) create mode 100644 tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts diff --git a/src/main/ai-vault-search/session-search-scope-entry-points.test.ts b/src/main/ai-vault-search/session-search-scope-entry-points.test.ts index c1bba274e6c1..505dc3e4e2c8 100644 --- a/src/main/ai-vault-search/session-search-scope-entry-points.test.ts +++ b/src/main/ai-vault-search/session-search-scope-entry-points.test.ts @@ -78,7 +78,7 @@ describe('every search entry point carries the scope identity through', () => { const service = fakeSearchService() setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) - await relayHandler()({ query: 'needle', within: WITHIN }) + await relayHandler()({ query: 'needle', supportsQoderHistory: true, within: WITHIN }) expect(service.search).toHaveBeenCalledWith(expect.anything(), { kind: 'resolved', paths: ['/work/app'] @@ -88,7 +88,7 @@ describe('every search entry point carries the scope identity through', () => { it('hands the relay’s own verdict down, that host carrying no repo catalog', async () => { const service = fakeSearchService() setSessionSearchService(service) - await relayHandler()({ query: 'needle', within: WITHIN }) + await relayHandler()({ query: 'needle', supportsQoderHistory: true, within: WITHIN }) expect(service.search).toHaveBeenCalledWith( { query: 'needle', limit: 20 }, { diff --git a/src/main/ai-vault-search/session-search-scope-service.test.ts b/src/main/ai-vault-search/session-search-scope-service.test.ts index 394bcae4415c..595f47baef17 100644 --- a/src/main/ai-vault-search/session-search-scope-service.test.ts +++ b/src/main/ai-vault-search/session-search-scope-service.test.ts @@ -26,7 +26,11 @@ describe('scope identity at the search choke point', () => { setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) await searchSessionService( - { query: 'needle', within: { kind: 'workspace', worktreeId: 'repo-1::/work/app' } }, + { + query: 'needle', + supportsQoderHistory: true, + within: { kind: 'workspace', worktreeId: 'repo-1::/work/app' } + }, 'ipc' ) // Beside the request, not inside `filters.scopePaths`, which carries a wire cap. @@ -41,7 +45,11 @@ describe('scope identity at the search choke point', () => { setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) await searchSessionService( - { query: 'needle', within: { kind: 'project', projectKey: 'repo:repo-1' } }, + { + query: 'needle', + supportsQoderHistory: true, + within: { kind: 'project', projectKey: 'repo:repo-1' } + }, 'ipc' ) // An exact match, so a leaked `within` would fail here as an extra key. @@ -56,7 +64,11 @@ describe('scope identity at the search choke point', () => { setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) await searchSessionService( - { query: 'needle', within: { kind: 'project', projectKey: 'repo:elsewhere' } }, + { + query: 'needle', + supportsQoderHistory: true, + within: { kind: 'project', projectKey: 'repo:elsewhere' } + }, 'ipc' ) // The service owns the answer, because it owns the consent and readiness @@ -74,7 +86,11 @@ describe('scope identity at the search choke point', () => { const service = fakeSearchService() setSessionSearchService(service) await searchSessionService( - { query: 'needle', within: { kind: 'workspace', worktreeId: 'repo-1::/work/app' } }, + { + query: 'needle', + supportsQoderHistory: true, + within: { kind: 'workspace', worktreeId: 'repo-1::/work/app' } + }, 'ipc' ) expect(service.search).toHaveBeenCalledWith( @@ -98,7 +114,11 @@ describe('scope identity at the search choke point', () => { settings: { workspaceDir: '/home/me/ws', nestWorkspaces: false } })) await searchSessionService( - { query: 'needle', within: { kind: 'project', projectKey: 'repo:repo-1' } }, + { + query: 'needle', + supportsQoderHistory: true, + within: { kind: 'project', projectKey: 'repo:repo-1' } + }, 'ipc' ) const call = service.search.mock.lastCall @@ -113,7 +133,7 @@ describe('scope identity at the search choke point', () => { const service = fakeSearchService() setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) - await searchSessionService({ query: 'needle' }, 'ipc') + await searchSessionService({ query: 'needle', supportsQoderHistory: true }, 'ipc') expect(service.search).toHaveBeenCalledWith({ query: 'needle', limit: 20 }, undefined) }) @@ -121,7 +141,10 @@ describe('scope identity at the search choke point', () => { const service = fakeSearchService() setSessionSearchService(service) installSessionSearchScopeCatalogSource(() => CATALOG) - await searchSessionService({ query: 'needle', filters: { scopePaths: ['/other'] } }, 'ipc') + await searchSessionService( + { query: 'needle', supportsQoderHistory: true, filters: { scopePaths: ['/other'] } }, + 'ipc' + ) expect(service.search).toHaveBeenCalledWith( { query: 'needle', limit: 20, filters: { scopePaths: ['/other'] } }, undefined diff --git a/src/main/ai-vault-search/session-search-service-registry.test.ts b/src/main/ai-vault-search/session-search-service-registry.test.ts index b0f61ba6a99e..90fcb8b119c0 100644 --- a/src/main/ai-vault-search/session-search-service-registry.test.ts +++ b/src/main/ai-vault-search/session-search-service-registry.test.ts @@ -1,6 +1,8 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { fakeSearchService } from '../../shared/ai-vault-search-test-fixture' import { unavailableSessionSearchStatus } from '../../shared/ai-vault-search-client' +import { createSessionSearchClient } from '../../shared/ai-vault-search-client' +import { AI_VAULT_AGENTS } from '../../shared/ai-vault-types' import { setSessionSearchService, searchSessionService, @@ -51,12 +53,46 @@ describe('session search service registry', () => { 'ipc' ) expect(service.reconcile).not.toHaveBeenCalled() - expect(service.search).toHaveBeenCalledWith({ query: 'needle', limit: 20 }, undefined) + expect(service.search).toHaveBeenCalledWith( + { + query: 'needle', + limit: 20, + filters: { agents: AI_VAULT_AGENTS.filter((a) => a !== 'qoder') } + }, + undefined + ) expect(result).not.toHaveProperty('debug') expect(await searchSessionService({ query: 'needle', debug: true }, 'ipc')).toHaveProperty( 'debug' ) }) + it.each(['ipc', 'runtime', 'relay'] as const)( + 'negotiates Qoder hits before retrieval on %s, without widening explicit filters', + async (transport) => { + const service = fakeSearchService() + setSessionSearchService(service) + await searchSessionService( + { query: 'proof', filters: { agents: ['claude', 'qoder'] } }, + transport + ) + expect(service.search).toHaveBeenLastCalledWith( + { query: 'proof', limit: 20, filters: { agents: ['claude'] } }, + undefined + ) + expect( + await searchSessionService({ query: 'proof', filters: { agents: ['qoder'] } }, transport) + ).toMatchObject({ kind: 'results', hits: [], page: { cursor: null, hasMore: false } }) + const client = createSessionSearchClient( + (_method, request) => searchSessionService(request, transport), + transport + ) + await client.searchSessions({ query: 'proof', filters: { agents: ['qoder'] } }) + expect(service.search).toHaveBeenLastCalledWith( + { query: 'proof', limit: 20, filters: { agents: ['qoder'] } }, + undefined + ) + } + ) it('waits for reconcile before search, and clears its timeout', async () => { vi.useFakeTimers() const service = fakeSearchService() diff --git a/src/main/ai-vault-search/session-search-service-registry.ts b/src/main/ai-vault-search/session-search-service-registry.ts index deffbcfa18ff..123ca0989e0b 100644 --- a/src/main/ai-vault-search/session-search-service-registry.ts +++ b/src/main/ai-vault-search/session-search-service-registry.ts @@ -14,6 +14,7 @@ import { type SessionSearchTransport } from '../../shared/ai-vault-search-transport' import type { SessionSearchService } from './session-search-service' +import { AI_VAULT_AGENTS } from '../../shared/ai-vault-types' let service: SessionSearchService | null = null @@ -34,7 +35,23 @@ export async function searchSessionService( // The choke point every entry point funnels through, so every host kind // resolves alike; the verdict goes to the service, which answers off and // not-ready first. - const { within, ...request } = parsed + const { within, supportsQoderHistory, ...request } = parsed + // Older clients reject the whole page when a hit has an unknown agent tag. + const requestedAgents = request.filters?.agents + const compatibleAgents = (requestedAgents?.length ? requestedAgents : AI_VAULT_AGENTS).filter( + (agent) => supportsQoderHistory || agent !== 'qoder' + ) + const compatibleRequest = supportsQoderHistory + ? request + : { + ...request, + filters: { + ...request.filters, + agents: compatibleAgents.length + ? compatibleAgents + : AI_VAULT_AGENTS.filter((agent) => agent !== 'qoder') + } + } const hostScope = within ? resolveSessionSearchScope(within, sessionSearchScopeCatalog()) : undefined @@ -42,10 +59,15 @@ export async function searchSessionService( request.freshness === 'wait-until-current' ? await reconcileWithin(current, freshnessTimeoutMs) : false - const result = AiVaultSearchResponseSchema.parse(await current.search(request, hostScope)) + const result = AiVaultSearchResponseSchema.parse( + await current.search(compatibleRequest, hostScope) + ) if (result.kind !== 'results') { return result } + if (compatibleAgents.length === 0) { + return { ...result, hits: [], page: { cursor: null, hasMore: false } } + } const { debug, ...fields } = result return { ...fields, diff --git a/src/main/qoder/real-cli.test.ts b/src/main/qoder/real-cli.test.ts index 92aee602e521..948c11a5b2a3 100644 --- a/src/main/qoder/real-cli.test.ts +++ b/src/main/qoder/real-cli.test.ts @@ -51,7 +51,10 @@ it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( await mkdir(workspace) await mkdir(config) await cp(join(realHome, '.qoder', '.auth'), join(config, '.auth'), { recursive: true }) - await writeFile(join(config, 'settings.json'), '{}') + await writeFile( + join(config, 'settings.json'), + JSON.stringify({ general: { enableAutoUpdate: false } }) + ) expect(qoderHookService.install().state).toBe('installed') markQoderWorkspaceTrusted(workspace, sandbox.home) await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)) diff --git a/src/shared/ai-vault-search-client.ts b/src/shared/ai-vault-search-client.ts index dd68bbd6c67c..21ba89a4787b 100644 --- a/src/shared/ai-vault-search-client.ts +++ b/src/shared/ai-vault-search-client.ts @@ -48,7 +48,7 @@ export function createSessionSearchClient( const parsed = AiVaultSearchRequestSchema.parse(request) let raw: unknown try { - raw = await call('aiVault.searchSessions', parsed) + raw = await call('aiVault.searchSessions', { ...parsed, supportsQoderHistory: true }) } catch (error) { if (isUnknownSessionSearchMethod(error)) { return { kind: 'unavailable', reason: 'no-service' } diff --git a/src/shared/ai-vault-search-contract.ts b/src/shared/ai-vault-search-contract.ts index 157334002341..8aaf57552e5e 100644 --- a/src/shared/ai-vault-search-contract.ts +++ b/src/shared/ai-vault-search-contract.ts @@ -23,6 +23,7 @@ export const AiVaultSearchRequestSchema = z limit: z.number().optional().transform(resolveSessionSearchLimit), cursor: z.string().optional(), filters: AiVaultSearchFiltersSchema.optional(), + supportsQoderHistory: z.boolean().optional(), /** Scope by identity, resolved into paths by whichever host answers. */ within: AiVaultSearchScopeIdentitySchema.optional(), debug: z.boolean().optional() diff --git a/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts new file mode 100644 index 000000000000..4263afb89bd3 --- /dev/null +++ b/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts @@ -0,0 +1,61 @@ +import { afterEach, expect, test } from 'vitest' +import { createSessionSearchClient } from '../../../src/shared/ai-vault-search-client' +import { searchResults, fakeSearchService } from '../../../src/shared/ai-vault-search-test-fixture' +import { + searchSessionService, + setSessionSearchService +} from '../../../src/main/ai-vault-search/session-search-service-registry' +import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout' + +afterEach(() => setSessionSearchService(null)) + +test('a pre-Qoder release can read current host search pages without losing other agents', async () => { + const checkout = await materializeReleaseCheckout('v1.4.211') + const baseline = await importReleaseCheckoutModule( + checkout, + 'src/shared/ai-vault-search-contract.ts' + ) + const schema = baseline.AiVaultSearchResponseSchema + if ( + !schema || + typeof schema !== 'object' || + !('safeParse' in schema) || + typeof schema.safeParse !== 'function' + ) { + throw new Error('The pinned release has no search response parser') + } + const qoder = { ...searchResults().hits[0], agent: 'qoder' as const } + expect(schema.safeParse({ ...searchResults(), hits: [qoder] })).toHaveProperty('success', false) + const service = fakeSearchService() + service.search.mockImplementation(async (request) => ({ + ...searchResults(), + hits: + !request.filters?.agents || request.filters.agents.includes('qoder') + ? [qoder] + : searchResults().hits + })) + setSessionSearchService(service) + const oldResponse = await searchSessionService({ query: 'proof' }, 'relay') + expect(schema.safeParse(oldResponse)).toHaveProperty('success', true) + expect(oldResponse).toMatchObject({ hits: [{ agent: 'codex' }] }) + const client = createSessionSearchClient( + (_method, request) => searchSessionService(request, 'relay'), + 'relay' + ) + expect(await client.searchSessions({ query: 'proof' })).toMatchObject({ + hits: [{ agent: 'qoder' }] + }) + const oldRequest = baseline.AiVaultSearchRequestSchema + if ( + !oldRequest || + typeof oldRequest !== 'object' || + !('safeParse' in oldRequest) || + typeof oldRequest.safeParse !== 'function' + ) { + throw new Error('The pinned release has no search request parser') + } + expect(oldRequest.safeParse({ query: 'proof', supportsQoderHistory: true })).toHaveProperty( + 'success', + true + ) +}) From 3130e318959b1d5c523d566fadb89f7da186d495 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 02:02:13 -0700 Subject: [PATCH 05/17] Verify persisted Qoder history after a real generated and resumed task --- src/main/qoder/real-cli.test.ts | 44 ++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/src/main/qoder/real-cli.test.ts b/src/main/qoder/real-cli.test.ts index 948c11a5b2a3..7cd1e8a139d4 100644 --- a/src/main/qoder/real-cli.test.ts +++ b/src/main/qoder/real-cli.test.ts @@ -1,4 +1,14 @@ -import { cp, mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises' +import { + cp, + mkdtemp, + mkdir, + readFile, + readdir, + realpath, + rm, + stat, + writeFile +} from 'node:fs/promises' import { createServer } from 'node:http' import { homedir, tmpdir } from 'node:os' import type * as Os from 'node:os' @@ -7,6 +17,7 @@ import { expect, it, vi } from 'vitest' import { runProcess } from '../../shared/child-process/run-process' import { createHookListenerState } from '../../shared/agent-hook-listener/listener-state' import { normalizeAndAccept } from '../../shared/agent-hook-listener-test-harness' +import { parseQoderSessionFile } from '../ai-vault/session-scanner-qoder-parser' const sandbox = vi.hoisted(() => ({ home: '' })) vi.mock('node:os', async (importOriginal) => { @@ -21,7 +32,7 @@ it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( 'generates and resumes a real task through managed hooks', async () => { const realHome = homedir() - sandbox.home = await mkdtemp(join(tmpdir(), 'orca-qoder-real-')) + sandbox.home = await realpath(await mkdtemp(join(tmpdir(), 'orca-qoder-real-'))) const config = join(sandbox.home, '.qoder') const workspace = join(sandbox.home, 'folder') const statuses: { @@ -116,6 +127,23 @@ it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( }) expect(resumed.code).toBe(0) expect(resumed.stdout.trim()).toBe('QODER_MANAGED_PROOF') + const projects = join(config, 'projects') + const transcript = (await readdir(projects, { recursive: true })).find( + (path) => path.endsWith(`${session}.jsonl`) && !path.includes('subagents') + ) + if (!transcript) { + throw new Error('Qoder did not persist the generated and resumed session') + } + const path = join(projects, transcript) + const modified = await stat(path) + const history = await parseQoderSessionFile({ + path, + mtimeMs: modified.mtimeMs, + modifiedAt: modified.mtime.toISOString() + }) + expect(history).toMatchObject({ agent: 'qoder', sessionId: session, cwd: workspace }) + expect(history?.previewMessages.at(-1)?.text).toBe('QODER_MANAGED_PROOF') + expect(history?.resumeCommand).toContain(`qodercli --resume '${session}'`) expect(statuses).toEqual( expect.arrayContaining([ expect.objectContaining({ @@ -133,7 +161,17 @@ it.skipIf(process.env.ORCA_REAL_QODER_CLI_TEST !== '1')( await writeFile( evidencePath, JSON.stringify( - { generated: generated.stdout.trim(), resumed: resumed.stdout.trim(), statuses }, + { + generated: generated.stdout.trim(), + resumed: resumed.stdout.trim(), + statuses, + history: { + agent: history?.agent, + sessionId: history?.sessionId, + lastReply: history?.previewMessages.at(-1)?.text, + resumeVerified: true + } + }, null, 2 ) From 62202b385aa48c0e36d73738f7079775ed8e15b8 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 02:29:56 -0700 Subject: [PATCH 06/17] Negotiate Qoder filters before searching an older execution host --- src/cli/agent-session-search-format.ts | 5 +- .../session-search-service-registry.test.ts | 5 +- .../session-search-service-registry.ts | 7 +- src/main/ipc/ai-vault-search.test.ts | 6 +- .../right-sidebar/AiVaultPanelSearch.test.tsx | 6 ++ .../right-sidebar/AiVaultPanelSearch.tsx | 7 ++ src/renderer/src/i18n/locales/en.json | 1 + .../web-ai-vault-search-compat.test.ts | 3 +- src/shared/ai-vault-search-client.ts | 14 +++- src/shared/ai-vault-search-contract.ts | 6 +- ...oder-history-search-downgrade.unit.test.ts | 68 ++++++++++++++++++- 11 files changed, 115 insertions(+), 13 deletions(-) diff --git a/src/cli/agent-session-search-format.ts b/src/cli/agent-session-search-format.ts index ddcebaad94fb..ebefb6ff7afd 100644 --- a/src/cli/agent-session-search-format.ts +++ b/src/cli/agent-session-search-format.ts @@ -77,11 +77,14 @@ function formatDebug(debug: SessionSearchResults['debug']): string[] { } function formatUnavailable( - reason: 'disabled' | 'not-ready' | 'no-service' | 'scope-unknown' + reason: 'disabled' | 'not-ready' | 'no-service' | 'scope-unknown' | 'unsupported-agent' ): string { if (reason === 'disabled') { return 'Session search is off on this host.' } + if (reason === 'unsupported-agent') { + return 'This host does not support history search for the selected agent. Update Orca on that host or select another agent.' + } // The CLI scopes with --path, never with an identity, so this only reaches a // caller that built a request by hand. if (reason === 'scope-unknown') { diff --git a/src/main/ai-vault-search/session-search-service-registry.test.ts b/src/main/ai-vault-search/session-search-service-registry.test.ts index 90fcb8b119c0..27bcb6ca45cb 100644 --- a/src/main/ai-vault-search/session-search-service-registry.test.ts +++ b/src/main/ai-vault-search/session-search-service-registry.test.ts @@ -83,7 +83,10 @@ describe('session search service registry', () => { await searchSessionService({ query: 'proof', filters: { agents: ['qoder'] } }, transport) ).toMatchObject({ kind: 'results', hits: [], page: { cursor: null, hasMore: false } }) const client = createSessionSearchClient( - (_method, request) => searchSessionService(request, transport), + (method, request) => + method === 'aiVault.searchStatus' + ? sessionSearchServiceStatus(request, transport) + : searchSessionService(request, transport), transport ) await client.searchSessions({ query: 'proof', filters: { agents: ['qoder'] } }) diff --git a/src/main/ai-vault-search/session-search-service-registry.ts b/src/main/ai-vault-search/session-search-service-registry.ts index 123ca0989e0b..2740c34cac68 100644 --- a/src/main/ai-vault-search/session-search-service-registry.ts +++ b/src/main/ai-vault-search/session-search-service-registry.ts @@ -83,9 +83,10 @@ export async function sessionSearchServiceStatus( ): Promise { AiVaultSearchStatusRequestSchema.parse(raw) return redactStatusForTransport( - AiVaultSearchStatusSchema.parse( - service ? await service.status() : unavailableSessionSearchStatus() - ), + AiVaultSearchStatusSchema.parse({ + ...(service ? await service.status() : unavailableSessionSearchStatus()), + supportsQoderHistory: true + }), transport ) } diff --git a/src/main/ipc/ai-vault-search.test.ts b/src/main/ipc/ai-vault-search.test.ts index be4028460a09..bdcf8054f24f 100644 --- a/src/main/ipc/ai-vault-search.test.ts +++ b/src/main/ipc/ai-vault-search.test.ts @@ -85,7 +85,8 @@ describe('desktop IPC and preload search boundary', () => { const result = await aiVaultApi.searchSessions({ query: 'needle' }, 'ssh:ssh-host') expect(sshSearch).toHaveBeenCalledWith('ssh-host', 'aiVault.searchSessions', { query: 'needle', - limit: 20 + limit: 20, + supportsQoderHistory: true }) expect(result).toMatchObject({ hits: [{ executionHostId: 'ssh:ssh-host', source: { presence: 'present' } }] @@ -105,7 +106,8 @@ describe('desktop IPC and preload search boundary', () => { const result = await aiVaultApi.searchSessions({ query: 'needle' }, 'runtime:env-1') expect(runtimeSearch).toHaveBeenCalledWith('env-1', 'aiVault.searchSessions', { query: 'needle', - limit: 20 + limit: 20, + supportsQoderHistory: true }) expect(result).toMatchObject({ hits: [{ executionHostId: 'runtime:env-1', source: { presence: 'present' } }] diff --git a/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx index afce262f459c..75c7b6f3de64 100644 --- a/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx +++ b/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx @@ -49,6 +49,12 @@ function renderPanel(search: PanelSearch) { } describe('AiVaultPanelSearch', () => { + it('explains an unsupported agent without reporting zero matches or a missing host service', () => { + renderPanel(panelSearch({ response: { kind: 'unavailable', reason: 'unsupported-agent' } })) + expect(screen.getByRole('status').textContent).toContain( + 'does not support history search for the selected agent' + ) + }) it('names every computer the merge could not search, with its reason', () => { const response = searchResults() renderPanel( diff --git a/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.tsx b/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.tsx index 833921a9ce49..ecee06a14cd0 100644 --- a/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.tsx +++ b/src/renderer/src/components/right-sidebar/AiVaultPanelSearch.tsx @@ -24,6 +24,8 @@ function hostSkipReason(outcome: AiVaultSearchHostOutcome['outcome']): string | return 'unreachable' case 'scope-unknown': return 'scope not found there' + case 'unsupported-agent': + return 'agent not supported' } } @@ -111,6 +113,11 @@ export function AiVaultPanelSearch({ 'sessionSearch.panel.noService', 'Search is unavailable on this computer. It may need an Orca update or a runtime with search support.' ) + } else if (unavailable === 'unsupported-agent') { + message = translate( + 'sessionSearch.panel.unsupportedAgent', + 'This computer does not support history search for the selected agent. Update Orca on that computer or select another agent.' + ) } else if (unavailable === 'scope-unknown') { message = translate( 'sessionSearch.panel.scopeUnknown', diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 2f29e560803a..28b6544af248 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -18573,6 +18573,7 @@ "remoteDisabled": "Search is disabled on this computer. Enable transcript indexing on that computer to search its sessions.", "notReady": "The search index is not ready yet. Try again shortly.", "noService": "Search is unavailable on this computer. It may need an Orca update or a runtime with search support.", + "unsupportedAgent": "This computer does not support history search for the selected agent. Update Orca on that computer or select another agent.", "failed": "Could not search this computer. Check its connection and try again.", "changed": "The index changed while searching. Search again for current results.", "truncated": "Some results or matching text were limited. Narrow your search for more precise results.", diff --git a/src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts b/src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts index 215ffc928f59..1300be5499a9 100644 --- a/src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts +++ b/src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts @@ -20,7 +20,8 @@ describe('web session search preload compatibility', () => { const result = await api.searchSessions({ query: 'needle' }) expect(callRuntimeResult).toHaveBeenCalledExactlyOnceWith('aiVault.searchSessions', { query: 'needle', - limit: 20 + limit: 20, + supportsQoderHistory: true }) expect(result).toMatchObject({ kind: 'results', hits: [{ source: { presence: 'present' } }] }) expect(JSON.stringify(result)).not.toContain('resumeCommand') diff --git a/src/shared/ai-vault-search-client.ts b/src/shared/ai-vault-search-client.ts index 21ba89a4787b..66501b2994b8 100644 --- a/src/shared/ai-vault-search-client.ts +++ b/src/shared/ai-vault-search-client.ts @@ -46,9 +46,21 @@ export function createSessionSearchClient( return { searchSessions: async (request) => { const parsed = AiVaultSearchRequestSchema.parse(request) + let hostRequest = parsed let raw: unknown try { - raw = await call('aiVault.searchSessions', { ...parsed, supportsQoderHistory: true }) + // IPC and its all-hosts merge are this build; each remote leg negotiates its own host. + if (transport !== 'ipc' && parsed.filters?.agents?.includes('qoder')) { + const status = AiVaultSearchStatusSchema.parse(await call('aiVault.searchStatus', {})) + if (status.supportsQoderHistory !== true) { + const agents = parsed.filters.agents.filter((agent) => agent !== 'qoder') + if (agents.length === 0) { + return { kind: 'unavailable', reason: 'unsupported-agent' } + } + hostRequest = { ...parsed, filters: { ...parsed.filters, agents } } + } + } + raw = await call('aiVault.searchSessions', { ...hostRequest, supportsQoderHistory: true }) } catch (error) { if (isUnknownSessionSearchMethod(error)) { return { kind: 'unavailable', reason: 'no-service' } diff --git a/src/shared/ai-vault-search-contract.ts b/src/shared/ai-vault-search-contract.ts index 8aaf57552e5e..8966b1bfe771 100644 --- a/src/shared/ai-vault-search-contract.ts +++ b/src/shared/ai-vault-search-contract.ts @@ -91,7 +91,8 @@ export const AiVaultSearchHostOutcomeSchema = z.object({ 'no-service', 'unreachable', // This host does not know the workspace or project the scope named. - 'scope-unknown' + 'scope-unknown', + 'unsupported-agent' ]) }) const routeSchema = z.enum(['phrase', 'and', 'or', 'typo+phrase', 'typo+and', 'typo+or']) @@ -126,13 +127,14 @@ export const AiVaultSearchResponseSchema = z.discriminatedUnion('kind', [ kind: z.literal('unavailable'), // `scope-unknown` only ever answers a request that carried `within`, so a // client too old to send one can never receive a reason it cannot parse. - reason: z.enum(['disabled', 'not-ready', 'no-service', 'scope-unknown']) + reason: z.enum(['disabled', 'not-ready', 'no-service', 'scope-unknown', 'unsupported-agent']) }) ]) export const AiVaultSearchStatusRequestSchema = z.object({}) /** Consent flip for one host's index. Answered with that host's status after the change is applied. */ export const AiVaultSetSearchEnabledParamsSchema = z.object({ enabled: z.boolean() }) export const AiVaultSearchStatusSchema = z.object({ + supportsQoderHistory: z.boolean().optional(), enabled: z.boolean(), phase: z.enum(['idle', 'indexing', 'current', 'degraded', 'closed']), filesIndexed: z.number().int().nonnegative(), diff --git a/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts index 4263afb89bd3..0a00604408d5 100644 --- a/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/qoder-history-search-downgrade.unit.test.ts @@ -1,10 +1,14 @@ -import { afterEach, expect, test } from 'vitest' -import { createSessionSearchClient } from '../../../src/shared/ai-vault-search-client' +import { afterEach, expect, test, vi } from 'vitest' +import { + createSessionSearchClient, + unavailableSessionSearchStatus +} from '../../../src/shared/ai-vault-search-client' import { searchResults, fakeSearchService } from '../../../src/shared/ai-vault-search-test-fixture' import { searchSessionService, setSessionSearchService } from '../../../src/main/ai-vault-search/session-search-service-registry' +import { AI_VAULT_AGENTS } from '../../../src/shared/ai-vault-types' import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout' afterEach(() => setSessionSearchService(null)) @@ -59,3 +63,63 @@ test('a pre-Qoder release can read current host search pages without losing othe true ) }) + +test.each(['v1.4.211', 'b49abdb1f4da6b3d62dfa9ccf3c74dc9e74d291c'])( + 'a current client narrows Qoder filters before calling the actual %s request parser', + async (ref) => { + const checkout = await materializeReleaseCheckout(ref) + const baseline = await importReleaseCheckoutModule( + checkout, + 'src/shared/ai-vault-search-contract.ts' + ) + const requestSchema = baseline.AiVaultSearchRequestSchema + if ( + !requestSchema || + typeof requestSchema !== 'object' || + !('parse' in requestSchema) || + typeof requestSchema.parse !== 'function' + ) { + throw new Error('Pinned host has no search request parser') + } + const call = vi.fn(async (method: string, request: Record) => { + if (method === 'aiVault.searchStatus') { + return { ...unavailableSessionSearchStatus(), enabled: true, phase: 'current' } + } + requestSchema.parse(request) + return searchResults() + }) + const within = { kind: 'workspace' as const, worktreeId: 'folder:/task-owned/folder' } + const client = createSessionSearchClient(call, 'relay') + expect( + await client.searchSessions({ + query: 'proof', + filters: { agents: ['codex', 'qoder'] }, + within + }) + ).toMatchObject({ hits: [{ agent: 'codex' }] }) + expect(call).toHaveBeenLastCalledWith( + 'aiVault.searchSessions', + expect.objectContaining({ + filters: { agents: ['codex'] }, + within + }) + ) + call.mockClear() + expect( + await client.searchSessions({ query: 'proof', filters: { agents: ['qoder'] }, within }) + ).toEqual({ kind: 'unavailable', reason: 'unsupported-agent' }) + expect(call).toHaveBeenCalledTimes(1) + expect(call).toHaveBeenCalledWith('aiVault.searchStatus', {}) + if (ref.startsWith('b49')) { + expect( + await client.searchSessions({ query: 'proof', filters: { agents: [...AI_VAULT_AGENTS] } }) + ).toMatchObject({ hits: [{ agent: 'codex' }] }) + expect(call).toHaveBeenLastCalledWith( + 'aiVault.searchSessions', + expect.objectContaining({ + filters: { agents: AI_VAULT_AGENTS.filter((agent) => agent !== 'qoder') } + }) + ) + } + } +) From 7173a5a0b0dc659f7daeba6b3c4c065e06984c47 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 02:56:37 -0700 Subject: [PATCH 07/17] Combine search client imports for the CI plugin gate --- .../ai-vault-search/session-search-service-registry.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/ai-vault-search/session-search-service-registry.test.ts b/src/main/ai-vault-search/session-search-service-registry.test.ts index 27bcb6ca45cb..36ca58e7d808 100644 --- a/src/main/ai-vault-search/session-search-service-registry.test.ts +++ b/src/main/ai-vault-search/session-search-service-registry.test.ts @@ -1,7 +1,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { fakeSearchService } from '../../shared/ai-vault-search-test-fixture' -import { unavailableSessionSearchStatus } from '../../shared/ai-vault-search-client' -import { createSessionSearchClient } from '../../shared/ai-vault-search-client' +import { + unavailableSessionSearchStatus, + createSessionSearchClient +} from '../../shared/ai-vault-search-client' import { AI_VAULT_AGENTS } from '../../shared/ai-vault-types' import { setSessionSearchService, From 15d19545ecdaca35e616cff68d00ce6e84170944 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 04:00:11 -0700 Subject: [PATCH 08/17] Keep the relay search oracle aligned with legacy agent filtering --- src/relay/session-search-transport.test.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/relay/session-search-transport.test.ts b/src/relay/session-search-transport.test.ts index f0765af8f937..40752398159b 100644 --- a/src/relay/session-search-transport.test.ts +++ b/src/relay/session-search-transport.test.ts @@ -3,6 +3,7 @@ import { RelayDispatcher } from './dispatcher' import { AiVaultHandler } from './ai-vault-handler' import { SshChannelMultiplexer } from '../main/ssh/ssh-channel-multiplexer' import { createSessionSearchClient } from '../shared/ai-vault-search-client' +import { AI_VAULT_AGENTS } from '../shared/ai-vault-types' import { fakeSearchService } from '../shared/ai-vault-search-test-fixture' import { setSessionSearchService } from '../main/ai-vault-search/session-search-service-registry' @@ -52,7 +53,14 @@ describe('session search over real relay frames', () => { expect(JSON.stringify(raw)).not.toContain('/host/transcript') expect(JSON.stringify(raw)).not.toContain('/host/codex') expect(JSON.stringify(raw)).not.toContain('resumeCommand') - expect(service.search).toHaveBeenLastCalledWith({ query: 'needle', limit: 20 }, undefined) + expect(service.search).toHaveBeenLastCalledWith( + { + query: 'needle', + limit: 20, + filters: { agents: AI_VAULT_AGENTS.filter((agent) => agent !== 'qoder') } + }, + undefined + ) expect(service.reconcile).not.toHaveBeenCalled() expect(await client.searchStatus()).toMatchObject({ enabled: true, generation: 7 }) await expect(mux.request('aiVault.searchSessions', { query: 42 })).rejects.toThrow() From e12c4a3c8f08de6540581728d6f7fd9757f0b3fe Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 00:51:03 -0700 Subject: [PATCH 09/17] Register supervised Qoder China and Qwen lifecycle integration --- config/tsconfig.cli.json | 1 + .../components/mobile-agent-icon-assets.ts | 1 + mobile/src/tasks/mobile-tui-agents.ts | 1 + .../managed-agent-hook-registry.ts | 11 ++- .../managed-hook-command-contract.test.ts | 33 +++++++- ...ote-hook-service-registry-coverage.test.ts | 5 +- .../remote-managed-hook-installers.ts | 5 +- .../server-retired-pane-new-turn.test.ts | 2 + src/main/agent-workspace-trust-spawn.test.ts | 1 + src/main/claude/hook-settings.ts | 10 ++- src/main/execution-host-workspace-trust.ts | 4 + src/main/qoder/hook-service.test.ts | 52 +++++++++++- src/main/qoder/hook-service.ts | 13 +++ src/main/qoder/workspace-trust.ts | 8 +- src/main/qwen-code/hook-service.ts | 37 +++++++++ .../__fixtures__/qoder-cn-signin.meta.json | 15 ++++ .../runtime/__fixtures__/qoder-cn-signin.txt | 65 +++++++++++++++ .../__fixtures__/qoder-cn-startup.meta.json | 15 ++++ .../runtime/__fixtures__/qoder-cn-startup.txt | 65 +++++++++++++++ .../readiness-census/synthetic--qoder-cn.json | 79 +++++++++++++++++++ .../transcript--qoder-cn-signin@agent.json | 23 ++++++ .../transcript--qoder-cn-signin@unknown.json | 25 ++++++ .../transcript--qoder-cn-startup@agent.json | 21 +++++ .../transcript--qoder-cn-startup@unknown.json | 23 ++++++ src/main/runtime/qoder-transcripts.test.ts | 22 ++++++ .../readiness-census-synthetic-matrix.ts | 1 + .../readiness-census-transcript-catalog.ts | 1 + src/main/runtime/terminal-wait-detection.ts | 2 +- src/main/runtime/tui-idle-evidence.ts | 6 +- src/main/workspace-trust-test-fixtures.ts | 2 + src/relay/agent-workspace-trust-spawn.test.ts | 6 +- src/renderer/src/i18n/locales/en.json | 3 +- src/renderer/src/lib/agent-catalog.tsx | 12 ++- src/renderer/src/lib/agent-favicon-assets.ts | 1 + src/renderer/src/lib/agent-status.ts | 1 + .../agent-resume-host-authority-capability.ts | 4 + src/shared/agent-headless-command.ts | 1 + .../agent-hook-listener/provider-dispatch.ts | 15 ++++ .../provider-event-routing.ts | 4 + .../providers/compatible-lifecycle-events.ts | 2 +- .../agent-hook-listener/source-routing.ts | 2 + src/shared/agent-hook-relay.ts | 2 + src/shared/agent-hook-types.ts | 2 + src/shared/agent-kind.ts | 1 + src/shared/agent-process-recognition.ts | 5 ++ src/shared/agent-session-resume.ts | 8 ++ src/shared/agent-title-identity.ts | 2 +- src/shared/agent-title-status.ts | 3 +- src/shared/protocol-version.ts | 6 ++ src/shared/qoder-agent.test.ts | 43 ++++++++++ src/shared/skills-cli-agent-keys.ts | 1 + src/shared/telemetry-property-schemas.ts | 1 + src/shared/terminal-title-agent-type.ts | 4 +- src/shared/tui-agent-config-types.ts | 2 +- src/shared/tui-agent-config.ts | 6 ++ src/shared/tui-agent-display-names.ts | 1 + src/shared/tui-agent-permissions.ts | 1 + src/shared/tui-agent-rest-signal.test.ts | 1 + src/shared/tui-agent-rest-signal.ts | 3 +- src/shared/tui-agent-selection.ts | 1 + src/shared/tui-agent.ts | 1 + 61 files changed, 669 insertions(+), 25 deletions(-) create mode 100644 src/main/qwen-code/hook-service.ts create mode 100644 src/main/runtime/__fixtures__/qoder-cn-signin.meta.json create mode 100644 src/main/runtime/__fixtures__/qoder-cn-signin.txt create mode 100644 src/main/runtime/__fixtures__/qoder-cn-startup.meta.json create mode 100644 src/main/runtime/__fixtures__/qoder-cn-startup.txt create mode 100644 src/main/runtime/__fixtures__/readiness-census/synthetic--qoder-cn.json create mode 100644 src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@agent.json create mode 100644 src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@unknown.json create mode 100644 src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@agent.json create mode 100644 src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@unknown.json diff --git a/config/tsconfig.cli.json b/config/tsconfig.cli.json index 903562b67ede..ac791f506b1c 100644 --- a/config/tsconfig.cli.json +++ b/config/tsconfig.cli.json @@ -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", diff --git a/mobile/src/components/mobile-agent-icon-assets.ts b/mobile/src/components/mobile-agent-icon-assets.ts index 53745ead77e6..b1282c854f33 100644 --- a/mobile/src/components/mobile-agent-icon-assets.ts +++ b/mobile/src/components/mobile-agent-icon-assets.ts @@ -20,6 +20,7 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial> 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', diff --git a/src/main/agent-hooks/managed-agent-hook-registry.ts b/src/main/agent-hooks/managed-agent-hook-registry.ts index 11b642ee0900..ade721253124 100644 --- a/src/main/agent-hooks/managed-agent-hook-registry.ts +++ b/src/main/agent-hooks/managed-agent-hook-registry.ts @@ -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' @@ -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()], @@ -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()], @@ -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()], @@ -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()], diff --git a/src/main/agent-hooks/managed-hook-command-contract.test.ts b/src/main/agent-hooks/managed-hook-command-contract.test.ts index 247c50e7f903..c38c30ac77b5 100644 --- a/src/main/agent-hooks/managed-hook-command-contract.test.ts +++ b/src/main/agent-hooks/managed-hook-command-contract.test.ts @@ -92,6 +92,34 @@ const buildersByAgent = new Map([ 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', { @@ -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', '') diff --git a/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts b/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts index dea6c4a46634..1fb3dc75ee88 100644 --- a/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts +++ b/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts @@ -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' @@ -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] diff --git a/src/main/agent-hooks/remote-managed-hook-installers.ts b/src/main/agent-hooks/remote-managed-hook-installers.ts index b012af91ff35..a8367f64f19b 100644 --- a/src/main/agent-hooks/remote-managed-hook-installers.ts +++ b/src/main/agent-hooks/remote-managed-hook-installers.ts @@ -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' @@ -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)], diff --git a/src/main/agent-hooks/server-retired-pane-new-turn.test.ts b/src/main/agent-hooks/server-retired-pane-new-turn.test.ts index 23dbb56c6956..30f61a0238f8 100644 --- a/src/main/agent-hooks/server-retired-pane-new-turn.test.ts +++ b/src/main/agent-hooks/server-retired-pane-new-turn.test.ts @@ -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 = { qoder: 'SessionStart', + 'qoder-cn': 'SessionStart', + 'qwen-code': 'SessionStart', claude: 'SessionStart', kimi: 'UserPromptSubmit', codebuddy: 'UserPromptSubmit', diff --git a/src/main/agent-workspace-trust-spawn.test.ts b/src/main/agent-workspace-trust-spawn.test.ts index 17204bd0f5d8..b87d58ff855c 100644 --- a/src/main/agent-workspace-trust-spawn.test.ts +++ b/src/main/agent-workspace-trust-spawn.test.ts @@ -47,6 +47,7 @@ describe('applyAgentWorkspaceTrustToSpawn', () => { 'cursor', 'copilot', 'qoder', + 'qoder-cn', 'antigravity' ]) ) diff --git a/src/main/claude/hook-settings.ts b/src/main/claude/hook-settings.ts index bb89cf388201..40449344f20e 100644 --- a/src/main/claude/hook-settings.ts +++ b/src/main/claude/hook-settings.ts @@ -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' } diff --git a/src/main/execution-host-workspace-trust.ts b/src/main/execution-host-workspace-trust.ts index 52562e68064c..acb84ea7ef1d 100644 --- a/src/main/execution-host-workspace-trust.ts +++ b/src/main/execution-host-workspace-trust.ts @@ -52,6 +52,7 @@ export const AGENT_TRUST_INHERITS_FROM_A_HOME: Record cursor: false, copilot: true, qoder: true, + 'qoder-cn': true, antigravity: false } @@ -66,6 +67,7 @@ export const AGENT_TRUST_KEYED_BY_START_FOLDER: Record ({ 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-')) @@ -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] } + }) + } +) diff --git a/src/main/qoder/hook-service.ts b/src/main/qoder/hook-service.ts index ac9e869638c8..d69d6d656c7c 100644 --- a/src/main/qoder/hook-service.ts +++ b/src/main/qoder/hook-service.ts @@ -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 +}) diff --git a/src/main/qoder/workspace-trust.ts b/src/main/qoder/workspace-trust.ts index bb11aaebfcfb..043b35270235 100644 --- a/src/main/qoder/workspace-trust.ts +++ b/src/main/qoder/workspace-trust.ts @@ -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 diff --git a/src/main/qwen-code/hook-service.ts b/src/main/qwen-code/hook-service.ts new file mode 100644 index 000000000000..7488271380e5 --- /dev/null +++ b/src/main/qwen-code/hook-service.ts @@ -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 +}) diff --git a/src/main/runtime/__fixtures__/qoder-cn-signin.meta.json b/src/main/runtime/__fixtures__/qoder-cn-signin.meta.json new file mode 100644 index 000000000000..81ab5e8f43a0 --- /dev/null +++ b/src/main/runtime/__fixtures__/qoder-cn-signin.meta.json @@ -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 +} diff --git a/src/main/runtime/__fixtures__/qoder-cn-signin.txt b/src/main/runtime/__fixtures__/qoder-cn-signin.txt new file mode 100644 index 000000000000..81c7dd7fcd53 --- /dev/null +++ b/src/main/runtime/__fixtures__/qoder-cn-signin.txt @@ -0,0 +1,65 @@ +[?u]11;?\[>q[>4;?m ]0;◇ Qoder CLI CN | Ready ]8;;78 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[?25h[?25l[?1006l[?1002l[?1004h]0;◇ Qoder CLI CN | Ready [?2004h[?2004h[?1004h + ██████╭─Tipsforgettingstarted───────────────────────────────────╮ +████│1.UseAGENTS.mdfilestocustomizeinteractions│ +██████QoderCLI CN v1.1.65│2./helpformoreinformation│ +████│3.Askcodingquestions,editcodeorruncommands│ + ██████NotLoginPleaseAuth│4.Bespecificforthebestresults│ +╰──────────────────────────────────────────────────────────────╯ + + + Doyoutrustthefilesinthisfolder? +──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── +Pleaseconfirmthisisyourownprojectorfromatrustedsource.Oncetrusted,QoderCLICNcanread,modify,and +executefileshere,andwillloadlocalconfigurations(commands,hooks,MCPservers,agents,skills,settings). + +/private/tmp/orca-qoder-validation-1002/workspace + +❯1.Trustfolder +2.Don'ttrustandexit + +↑/↓navigate·Enterselect·Escback +[>0q  ● Warning: True color (24-bit) supportnotdetected.Usingaterminalwithtruecolorenabledwillresultinabetter  visual experience.   Do you trust the files in this folder? ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Please confirm this is your own project or from atrustedsource.Oncetrusted,QoderCLICNcanread,modify,and executefileshere,andwillloadlocalconfigurations(commands,hooks,MCPservers,agents,skills,settings).  /private/tmp/orca-qoder-validation-1002/workspace  ❯ 1. Trust folder +2.Don'ttrustandexit + +↑/↓navigate·Enterselect·Escback + Welcme to QoderCLI CN Sign in to getstarted, r exitthe applicatin.  ❯1.Signintocontinue  2. Exit the application ↑/↓ navigate · Enter select · Esc back     \ No newline at end of file diff --git a/src/main/runtime/__fixtures__/qoder-cn-startup.meta.json b/src/main/runtime/__fixtures__/qoder-cn-startup.meta.json new file mode 100644 index 000000000000..178f7bb8851b --- /dev/null +++ b/src/main/runtime/__fixtures__/qoder-cn-startup.meta.json @@ -0,0 +1,15 @@ +{ + "capturedAt": "2026-10-02T07:26:38.777Z", + "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; isolated config; no China account", + "exitCode": 129 +} diff --git a/src/main/runtime/__fixtures__/qoder-cn-startup.txt b/src/main/runtime/__fixtures__/qoder-cn-startup.txt new file mode 100644 index 000000000000..454d7fa86106 --- /dev/null +++ b/src/main/runtime/__fixtures__/qoder-cn-startup.txt @@ -0,0 +1,65 @@ +[?u]11;?\[>q[>4;?m ]0;◇ Qoder CLI CN | Ready ]8;;78 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[?25h[?25l[?1006l[?1002l[?1004h]0;◇ Qoder CLI CN | Ready [?2004h[?2004h[?1004h + ██████╭─Tipsforgettingstarted───────────────────────────────────╮ +████│1.UseAGENTS.mdfilestocustomizeinteractions│ +██████QoderCLI CN v1.1.65│2./helpformoreinformation│ +████│3.Askcodingquestions,editcodeorruncommands│ + ██████NotLoginPleaseAuth│4.Bespecificforthebestresults│ +╰──────────────────────────────────────────────────────────────╯ + + + Doyoutrustthefilesinthisfolder? +──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── +Pleaseconfirmthisisyourownprojectorfromatrustedsource.Oncetrusted,QoderCLICNcanread,modify,and +executefileshere,andwillloadlocalconfigurations(commands,hooks,MCPservers,agents,skills,settings). + +/private/tmp/orca-qoder-validation-1002/workspace + +❯1.Trustfolder +2.Don'ttrustandexit + +↑/↓navigate·Enterselect·Escback +[>0q  ● Warning: True color (24-bit) supportnotdetected.Usingaterminalwithtruecolorenabledwillresultinabetter  visual experience.   Do you trust the files in this folder? ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Please confirm this is your own project or from atrustedsource.Oncetrusted,QoderCLICNcanread,modify,and executefileshere,andwillloadlocalconfigurations(commands,hooks,MCPservers,agents,skills,settings).  /private/tmp/orca-qoder-validation-1002/workspace  ❯ 1. Trust folder +2.Don'ttrustandexit + +↑/↓navigate·Enterselect·Escback + \ No newline at end of file diff --git a/src/main/runtime/__fixtures__/readiness-census/synthetic--qoder-cn.json b/src/main/runtime/__fixtures__/readiness-census/synthetic--qoder-cn.json new file mode 100644 index 000000000000..210126a102cc --- /dev/null +++ b/src/main/runtime/__fixtures__/readiness-census/synthetic--qoder-cn.json @@ -0,0 +1,79 @@ +{ + "description": "qoder-cn: title x first-party status on a painted screen; screen x foreground under the titles that leave the low lanes open; dialog order x title. Each read clocked and clockless.", + "cases": { + "title=working-spinner status=none screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=none screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=done-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=done-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=done-stale screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=done-stale screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=working-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=working-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=working-stale screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=working-stale screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=blocked-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=blocked-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=working-spinner status=blocked-stale screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=working-spinner status=blocked-stale screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=name-only status=none screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=done-fresh screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=done-fresh screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=done-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=done-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=working-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=name-only status=working-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=name-only status=working-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=working-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=blocked-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=name-only status=blocked-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=name-only status=blocked-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=blocked-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=done-fresh screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=done-fresh screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=done-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=done-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=working-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=none status=working-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=none status=working-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=working-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=blocked-fresh screen=present fg=agent clock=clocked": "now=working edge=working quiet=working wait=pending", + "title=none status=blocked-fresh screen=present fg=agent clock=clockless": "verdict=working wait=pending", + "title=none status=blocked-stale screen=present fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=blocked-stale screen=present fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=none screen=present fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=present fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=none screen=untrusted fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=untrusted fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=none screen=untrusted fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=untrusted fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=none screen=absent fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=absent fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=name-only status=none screen=absent fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=name-only status=none screen=absent fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=present fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=present fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=untrusted fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=untrusted fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=untrusted fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=untrusted fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=absent fg=agent clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=absent fg=agent clock=clockless": "verdict=pending:closed wait=pending", + "title=none status=none screen=absent fg=shell clock=clocked": "now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "title=none status=none screen=absent fg=shell clock=clockless": "verdict=pending:closed wait=pending", + "title=working-spinner status=none screen=dialog-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=working-spinner status=none screen=dialog-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=working-spinner status=none screen=ready-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=working-spinner status=none screen=ready-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=name-only status=none screen=dialog-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=name-only status=none screen=dialog-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=name-only status=none screen=ready-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=name-only status=none screen=ready-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=none status=none screen=dialog-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=none status=none screen=dialog-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=none status=none screen=ready-last fg=agent clock=clocked": "now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "title=none status=none screen=ready-last fg=agent clock=clockless": "verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start" + } +} diff --git a/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@agent.json b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@agent.json new file mode 100644 index 000000000000..1234da5ab9f7 --- /dev/null +++ b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@agent.json @@ -0,0 +1,23 @@ +{ + "description": "qoder-cn recording at 120x40 replayed on the agent pane, one entry per chunk", + "observations": { + "clocked": [ + "0-23: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "24-36: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "42-45: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-65: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "66-79: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending" + ], + "clockless": [ + "0-23: verdict=pending:closed wait=pending", + "24-36: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: verdict=pending:closed wait=pending", + "42-45: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-65: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "66-79: verdict=pending:closed wait=pending" + ] + } +} diff --git a/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@unknown.json b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@unknown.json new file mode 100644 index 000000000000..2950beff30d5 --- /dev/null +++ b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-signin@unknown.json @@ -0,0 +1,25 @@ +{ + "description": "qoder-cn recording at 120x40 replayed on the unknown pane, one entry per chunk", + "observations": { + "clocked": [ + "0: now=pending:open edge=pending:open quiet=pending:open wait=ready@poll", + "1-23: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "24-36: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "42-45: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-65: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "66-79: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending" + ], + "clockless": [ + "0: verdict=pending:open wait=ready@poll", + "1-23: verdict=pending:closed wait=pending", + "24-36: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: verdict=pending:closed wait=pending", + "42-45: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-65: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "66-79: verdict=pending:closed wait=pending" + ] + } +} diff --git a/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@agent.json b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@agent.json new file mode 100644 index 000000000000..73efdc1ed133 --- /dev/null +++ b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@agent.json @@ -0,0 +1,21 @@ +{ + "description": "qoder-cn recording at 120x40 replayed on the agent pane, one entry per chunk", + "observations": { + "clocked": [ + "0-23: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "24-36: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "42-45: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-66: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll" + ], + "clockless": [ + "0-23: verdict=pending:closed wait=pending", + "24-36: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: verdict=pending:closed wait=pending", + "42-45: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-66: verdict=pending:closed wait=blocked:agent-trust-workspace@poll" + ] + } +} diff --git a/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@unknown.json b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@unknown.json new file mode 100644 index 000000000000..ac41c374b386 --- /dev/null +++ b/src/main/runtime/__fixtures__/readiness-census/transcript--qoder-cn-startup@unknown.json @@ -0,0 +1,23 @@ +{ + "description": "qoder-cn recording at 120x40 replayed on the unknown pane, one entry per chunk", + "observations": { + "clocked": [ + "0: now=pending:open edge=pending:open quiet=pending:open wait=ready@poll", + "1-23: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "24-36: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: now=pending:closed edge=pending:closed quiet=pending:closed wait=pending", + "42-45: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: now=blocked:agent-trust-workspace edge=blocked:agent-trust-workspace quiet=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-66: now=pending:closed edge=pending:closed quiet=pending:closed wait=blocked:agent-trust-workspace@poll" + ], + "clockless": [ + "0: verdict=pending:open wait=ready@poll", + "1-23: verdict=pending:closed wait=pending", + "24-36: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "37-41: verdict=pending:closed wait=pending", + "42-45: verdict=pending:closed wait=blocked:agent-trust-workspace@poll", + "46: verdict=blocked:agent-trust-workspace wait=blocked:agent-trust-workspace@start", + "47-66: verdict=pending:closed wait=blocked:agent-trust-workspace@poll" + ] + } +} diff --git a/src/main/runtime/qoder-transcripts.test.ts b/src/main/runtime/qoder-transcripts.test.ts index 89c5881382ad..cc44c70e5cab 100644 --- a/src/main/runtime/qoder-transcripts.test.ts +++ b/src/main/runtime/qoder-transcripts.test.ts @@ -48,3 +48,25 @@ describe('captured Qoder 1.1.64 startup', () => { } ) }) + +describe('captured Qoder China 1.1.65 startup', () => { + it.each(['qoder-cn-startup', 'qoder-cn-signin'])('checks the composer in %s', async (fixture) => { + const data = readFileSync(join(__dirname, '__fixtures__', `${fixture}.txt`), 'utf8') + const title = extractLastOscTitle( + data.replaceAll(`${String.fromCharCode(27)}]0;${String.fromCharCode(7)}`, '') + ) + expect(getAgentLabel(normalizeTerminalTitle(title ?? ''))).toBe('Qoder CLI CN') + const { runtime, handle } = await createTranscriptPane({ + paneTitle: title ?? '', + foregroundProcess: 'qoderclicn', + launchAgent: 'qoder-cn', + data, + size: { cols: 120, rows: 40 } + }) + expect((await runtime.showTerminal(handle)).agentIdentity).toBe('qoder-cn') + const readiness = await runtime + .waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 800 }) + .catch(() => null) + expect(readiness?.satisfied ?? false).toBe(false) + }) +}) diff --git a/src/main/runtime/readiness-census-synthetic-matrix.ts b/src/main/runtime/readiness-census-synthetic-matrix.ts index 0d555565e270..2273ba080e45 100644 --- a/src/main/runtime/readiness-census-synthetic-matrix.ts +++ b/src/main/runtime/readiness-census-synthetic-matrix.ts @@ -95,6 +95,7 @@ const READY_SCREEN_FIXTURES: Partial< codex: { name: 'codex-0157-plain-ready', cols: 120, rows: 40 }, muse: { name: 'muse-empty-folder-ready', cols: 120, rows: 32 }, qoder: { name: 'qoder-ready', cols: 100, rows: 32 }, + 'qoder-cn': { name: 'qoder-cn-signin', cols: 120, rows: 40 }, cursor: { name: 'cursor-agent-idle-after-approval', cols: 80, rows: 24 } } diff --git a/src/main/runtime/readiness-census-transcript-catalog.ts b/src/main/runtime/readiness-census-transcript-catalog.ts index 3ba056ef1e60..3b17119050f8 100644 --- a/src/main/runtime/readiness-census-transcript-catalog.ts +++ b/src/main/runtime/readiness-census-transcript-catalog.ts @@ -44,6 +44,7 @@ const RUNTIME_RECORDERS: readonly (readonly [string, Recorder])[] = [ ['muse-', { agent: 'muse', foregroundProcess: 'muse' }], ['omp-', { agent: 'omp', foregroundProcess: 'omp' }], ['prime-agent-', { agent: 'prime-agent', foregroundProcess: 'prime-agent' }], + ['qoder-cn-', { agent: 'qoder-cn', foregroundProcess: 'qoderclicn' }], ['qoder-', { agent: 'qoder', foregroundProcess: 'qodercli' }], ['zcode-', { agent: 'zcode', foregroundProcess: 'zcode' }] ] diff --git a/src/main/runtime/terminal-wait-detection.ts b/src/main/runtime/terminal-wait-detection.ts index fb24d21c1241..d2896153a0a5 100644 --- a/src/main/runtime/terminal-wait-detection.ts +++ b/src/main/runtime/terminal-wait-detection.ts @@ -66,7 +66,7 @@ export function isKnownReadyPromptBody( readScreenLines: () => readonly string[] | null, hasOutputClock: boolean ): boolean { - if (agent === 'qoder') { + if (agent === 'qoder' || agent === 'qoder-cn') { return isQoderComposerReady(readScreenLines()) } // Why before the rules: such an agent settles only on the quiet lane while it has a clock. diff --git a/src/main/runtime/tui-idle-evidence.ts b/src/main/runtime/tui-idle-evidence.ts index ce51d3104c58..c962abbf9c7e 100644 --- a/src/main/runtime/tui-idle-evidence.ts +++ b/src/main/runtime/tui-idle-evidence.ts @@ -271,7 +271,7 @@ export function evaluateTuiIdle(input: TuiIdleEvaluationInput): TuiIdleVerdict { return { kind: 'blocked', reason: blockedReason } } // Qoder publishes "Ready" before its trust dialog is dismissed; only its composer proves input is live. - if (input.agent === 'qoder') { + if (input.agent === 'qoder' || input.agent === 'qoder-cn') { if ( hasFreshWorkingFirstPartyStatus(input.firstPartyStatus) || input.record.lastAgentStatus === 'working' @@ -442,7 +442,9 @@ export function ptyTuiIdleEvidence( record: pty, readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText()), readPositiveBodyEvidence: () => - (agent !== 'qoder' && source.getAdoptedPtyIdleStatus(pty) === 'idle') || + (agent !== 'qoder' && + agent !== 'qoder-cn' && + source.getAdoptedPtyIdleStatus(pty) === 'idle') || isKnownReadyPromptBody(waitText(), agent, readScreen, pty.lastOutputAt !== null), readQuietReadyBodyEvidence: () => isQuietReadyScreenBody(waitText(), agent, readScreen), readAgentRuleVerdict: () => readAgentRuleVerdict(agent, pty, readScreen, waitText), diff --git a/src/main/workspace-trust-test-fixtures.ts b/src/main/workspace-trust-test-fixtures.ts index 273c14493299..d8afda34524c 100644 --- a/src/main/workspace-trust-test-fixtures.ts +++ b/src/main/workspace-trust-test-fixtures.ts @@ -15,6 +15,8 @@ export function workspaceTrustWritten(home: string, preset: AgentTrustPreset): b } case 'copilot': return existsSync(join(home, '.copilot', 'config.json')) + case 'qoder-cn': + return existsSync(join(home, '.qoder-cn', 'settings.json')) case 'qoder': return existsSync(join(home, '.qoder', 'settings.json')) case 'antigravity': diff --git a/src/relay/agent-workspace-trust-spawn.test.ts b/src/relay/agent-workspace-trust-spawn.test.ts index d7f20d2961c4..e17998e102e8 100644 --- a/src/relay/agent-workspace-trust-spawn.test.ts +++ b/src/relay/agent-workspace-trust-spawn.test.ts @@ -35,10 +35,11 @@ const AGENTS_WITH_A_RELAY_WRITER: [TuiAgent, AgentTrustPreset][] = [ ['codex', 'codex'], ['cursor', 'cursor'], ['copilot', 'copilot'], - ['qoder', 'qoder'] + ['qoder', 'qoder'], + ['qoder-cn', 'qoder-cn'] ] const AGENTS_THAT_INHERIT_TRUST = AGENTS_WITH_A_RELAY_WRITER.filter(([, preset]) => - ['claude', 'copilot', 'qoder'].includes(preset) + ['claude', 'copilot', 'qoder', 'qoder-cn'].includes(preset) ) const ALL_PRESETS: AgentTrustPreset[] = [ 'claude', @@ -46,6 +47,7 @@ const ALL_PRESETS: AgentTrustPreset[] = [ 'cursor', 'copilot', 'qoder', + 'qoder-cn', 'antigravity' ] diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 28b6544af248..d3082bd75402 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -638,7 +638,8 @@ "d443a47995": "Prime Agent", "mimo_code_label": "MiMo Code", "opencode2_label": "OpenCode 2", - "codebuddy_label": "CodeBuddy" + "codebuddy_label": "CodeBuddy", + "qoder_cn_label": "Qoder CLI China" }, "skill": { "cli": { diff --git a/src/renderer/src/lib/agent-catalog.tsx b/src/renderer/src/lib/agent-catalog.tsx index 325d838552d2..264001529433 100644 --- a/src/renderer/src/lib/agent-catalog.tsx +++ b/src/renderer/src/lib/agent-catalog.tsx @@ -121,6 +121,13 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] => searchAliases: ['deepseek', 'dsh', 'dst', 'deepseek harness'], homepageUrl: 'https://deepseek-harness.github.io/deepseek-harness/' }, + { + id: 'qoder-cn', + label: translate('auto.lib.agent.catalog.qoder_cn_label', 'Qoder CLI China'), + cmd: 'qoderclicn', + faviconDomain: 'qoder.cn', + homepageUrl: 'https://docs.qoder.cn/cli/overview' + }, { id: 'qoder', label: translate('auto.lib.agent.catalog.qoder_label', 'Qoder CLI'), @@ -391,10 +398,7 @@ export function AgentIcon({ if (agent === 'copilot') { return } - if (agent === 'opencode') { - return - } - if (agent === 'opencode2') { + if (agent === 'opencode' || agent === 'opencode2') { return } const catalogEntry = getAgentCatalog().find((a) => a.id === agent) diff --git a/src/renderer/src/lib/agent-favicon-assets.ts b/src/renderer/src/lib/agent-favicon-assets.ts index b041965736ef..226d4727380b 100644 --- a/src/renderer/src/lib/agent-favicon-assets.ts +++ b/src/renderer/src/lib/agent-favicon-assets.ts @@ -44,6 +44,7 @@ export const AGENT_FAVICON_ASSETS: Partial> = { trae: traeUrl, 'prime-agent': primeAgentUrl, qoder: qoderUrl, + 'qoder-cn': qoderUrl, gemini: geminiUrl, antigravity: antigravityUrl, goose: gooseUrl, diff --git a/src/renderer/src/lib/agent-status.ts b/src/renderer/src/lib/agent-status.ts index 04ecd728541a..f28277cc3c97 100644 --- a/src/renderer/src/lib/agent-status.ts +++ b/src/renderer/src/lib/agent-status.ts @@ -111,6 +111,7 @@ const ICONABLE_AGENT_TYPES: Record = { omp: true, 'prime-agent': true, qoder: true, + 'qoder-cn': true, gemini: true, antigravity: true, aider: true, diff --git a/src/renderer/src/runtime/agent-resume-host-authority-capability.ts b/src/renderer/src/runtime/agent-resume-host-authority-capability.ts index a5cefe6a74c5..0b219def56f4 100644 --- a/src/renderer/src/runtime/agent-resume-host-authority-capability.ts +++ b/src/renderer/src/runtime/agent-resume-host-authority-capability.ts @@ -3,6 +3,8 @@ import type { TuiAgent } from '../../../shared/tui-agent' import { AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY, + AGENT_SESSION_QODER_CN_RESUME_RUNTIME_CAPABILITY, + AGENT_SESSION_QWEN_CODE_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY, @@ -24,6 +26,8 @@ const RESUME_HOST_AUTHORITY_CAPABILITY_BY_AGENT = { codebuddy: AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY, codex: undefined, qoder: AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY, + 'qoder-cn': AGENT_SESSION_QODER_CN_RESUME_RUNTIME_CAPABILITY, + 'qwen-code': AGENT_SESSION_QWEN_CODE_RESUME_RUNTIME_CAPABILITY, gemini: undefined, antigravity: undefined, opencode: undefined, diff --git a/src/shared/agent-headless-command.ts b/src/shared/agent-headless-command.ts index 9f742a5355d1..b158cf868986 100644 --- a/src/shared/agent-headless-command.ts +++ b/src/shared/agent-headless-command.ts @@ -18,6 +18,7 @@ const HEADLESS_ONE_SHOT_MATCHERS: Partial< Record boolean> > = { qoder: isQoderHeadlessCommand, + 'qoder-cn': isQoderHeadlessCommand, claude: isPrintModeHeadlessOneShotCommand, codebuddy: isCodebuddyNonInteractiveCommand, trae: isPrintModeHeadlessOneShotCommand, diff --git a/src/shared/agent-hook-listener/provider-dispatch.ts b/src/shared/agent-hook-listener/provider-dispatch.ts index ab7e847c4cad..f9235da391a5 100644 --- a/src/shared/agent-hook-listener/provider-dispatch.ts +++ b/src/shared/agent-hook-listener/provider-dispatch.ts @@ -161,6 +161,21 @@ export function normalizeProviderEvent(input: { case 'devin': payload = normalizeDevinEvent(state, eventName, promptText, paneKey, hookPayload) break + case 'qoder-cn': + payload = normalizeCompatibleLifecycleEvent( + source, + state, + eventName, + promptText, + paneKey, + hookPayload + ) + break + case 'qwen-code': { + const normalized = normalizeClaudeEvent(state, eventName, promptText, paneKey, hookPayload) + payload = normalized ? { ...normalized, agentType: 'qwen-code' } : null + break + } case 'qoder': payload = normalizeQoderEvent(state, eventName, promptText, paneKey, hookPayload) break diff --git a/src/shared/agent-hook-listener/provider-event-routing.ts b/src/shared/agent-hook-listener/provider-event-routing.ts index 80cd0fdc91c9..eee05a646956 100644 --- a/src/shared/agent-hook-listener/provider-event-routing.ts +++ b/src/shared/agent-hook-listener/provider-event-routing.ts @@ -25,6 +25,8 @@ import { extractHermesToolFields } from './providers/hermes-tool-fields' export function isNewTurnEvent(source: AgentHookSource, eventName: unknown): boolean { // Why: exhaustive switch so a new AgentHookSource fails typecheck here instead of falling through to false. switch (source) { + case 'qoder-cn': + case 'qwen-code': case 'qoder': case 'claude': // Why: SessionStart lands an idle row (STA-3386) and must also drop stale @@ -140,6 +142,8 @@ export function extractToolFields( ): ToolSnapshot { // Why: exhaustive switch so a new AgentHookSource fails typecheck here instead of silently routing through OpenCode's extractor. switch (source) { + case 'qoder-cn': + case 'qwen-code': case 'qoder': case 'claude': // Why: Kimi Code uses Claude's tool_name/tool_input payload fields verbatim. diff --git a/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts b/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts index 2678dfc5e1ea..ba7362b824a3 100644 --- a/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts +++ b/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts @@ -48,7 +48,7 @@ function readCompatibleState( } export function normalizeCompatibleLifecycleEvent( - source: 'qoder' | 'codebuddy', + source: 'qoder' | 'qoder-cn' | 'codebuddy', state: HookListenerState, eventName: unknown, promptText: string, diff --git a/src/shared/agent-hook-listener/source-routing.ts b/src/shared/agent-hook-listener/source-routing.ts index 2940685665c4..7f4b4c393569 100644 --- a/src/shared/agent-hook-listener/source-routing.ts +++ b/src/shared/agent-hook-listener/source-routing.ts @@ -6,6 +6,8 @@ export const HOOK_SOURCE_BY_PATHNAME: Readonly> '/hook/claude': 'claude', '/hook/codex': 'codex', '/hook/qoder': 'qoder', + '/hook/qoder-cn': 'qoder-cn', + '/hook/qwen-code': 'qwen-code', '/hook/codebuddy': 'codebuddy', '/hook/gemini': 'gemini', '/hook/antigravity': 'antigravity', diff --git a/src/shared/agent-hook-relay.ts b/src/shared/agent-hook-relay.ts index 4a29fca868bf..f5aa61da329d 100644 --- a/src/shared/agent-hook-relay.ts +++ b/src/shared/agent-hook-relay.ts @@ -39,6 +39,8 @@ const AGENT_HOOK_SOURCES = [ 'claude', 'codex', 'qoder', + 'qoder-cn', + 'qwen-code', 'codebuddy', 'gemini', 'antigravity', diff --git a/src/shared/agent-hook-types.ts b/src/shared/agent-hook-types.ts index 0bc5b67bc284..191016259ac8 100644 --- a/src/shared/agent-hook-types.ts +++ b/src/shared/agent-hook-types.ts @@ -8,6 +8,8 @@ export const AGENT_HOOK_TARGETS = [ 'openclaude', 'codex', 'qoder', + 'qoder-cn', + 'qwen-code', 'codebuddy', 'gemini', 'antigravity', diff --git a/src/shared/agent-kind.ts b/src/shared/agent-kind.ts index 3fb112e61149..7b5ad97896fd 100644 --- a/src/shared/agent-kind.ts +++ b/src/shared/agent-kind.ts @@ -27,6 +27,7 @@ const TUI_AGENT_KIND_BY_AGENT = { omp: 'omp', 'prime-agent': 'prime-agent', qoder: 'qoder', + 'qoder-cn': 'qoder-cn', gemini: 'gemini', antigravity: 'antigravity', aider: 'aider', diff --git a/src/shared/agent-process-recognition.ts b/src/shared/agent-process-recognition.ts index a8262eb4760e..481b5c5baf36 100644 --- a/src/shared/agent-process-recognition.ts +++ b/src/shared/agent-process-recognition.ts @@ -74,6 +74,9 @@ function agentForNormalizedProcess(normalized: string): TuiAgent | undefined { return PROCESS_TO_AGENT.get('codex') } // Qoder's launcher resolves to a versioned native binary. + if (/^(?:qoderclicn|qodercn)-\d/.test(normalized)) { + return PROCESS_TO_AGENT.get('qoderclicn') + } if (/^qodercli-\d/.test(normalized)) { return PROCESS_TO_AGENT.get('qodercli') } @@ -162,6 +165,8 @@ export function isExpectedAgentProcess( return ( normalizedProcess === normalizedExpected || normalizedProcess.startsWith(`${normalizedExpected}.`) || + (['qoderclicn', 'qodercn'].includes(normalizedExpected) && + /^(?:qoderclicn|qodercn)(?:-\d.*)?$/.test(normalizedProcess)) || (normalizedExpected === 'qodercli' && /^qodercli-\d/.test(normalizedProcess)) || (normalizedExpected === 'muse' && normalizedProcess.startsWith('muse-bin-')) ) diff --git a/src/shared/agent-session-resume.ts b/src/shared/agent-session-resume.ts index 40a3699af3c3..93d2eba2f199 100644 --- a/src/shared/agent-session-resume.ts +++ b/src/shared/agent-session-resume.ts @@ -8,6 +8,8 @@ export const RESUMABLE_TUI_AGENTS = [ 'codebuddy', 'codex', 'qoder', + 'qoder-cn', + 'qwen-code', 'gemini', 'antigravity', 'opencode', @@ -196,6 +198,8 @@ export function extractAgentProviderSession( // Native-chat agents: also capture the hook's authoritative transcript_path, // since recent Claude Code names the transcript file with a UUID that differs // from the hook session_id (so the id-based glob no longer finds it). + case 'qoder-cn': + case 'qwen-code': case 'qoder': case 'codebuddy': case 'claude': @@ -285,6 +289,10 @@ export function getAgentResumeArgv( return providerSession.key === 'session_id' ? ['claude', '--resume', id] : null case 'codex': return providerSession.key === 'session_id' ? ['codex', 'resume', id] : null + case 'qoder-cn': + return providerSession.key === 'session_id' ? ['qoderclicn', '--resume', id] : null + case 'qwen-code': + return providerSession.key === 'session_id' ? ['qwen', '--resume', id] : null case 'qoder': return providerSession.key === 'session_id' ? ['qodercli', '--resume', id] : null case 'gemini': diff --git a/src/shared/agent-title-identity.ts b/src/shared/agent-title-identity.ts index 69d1531fb9e0..fe623188a5bc 100644 --- a/src/shared/agent-title-identity.ts +++ b/src/shared/agent-title-identity.ts @@ -74,7 +74,7 @@ function computeAgentLabel(title: string): string | null { return piStateBrand } if (isQoderTerminalTitle(title)) { - return 'Qoder CLI' + return title.includes('Qoder CLI CN') ? 'Qoder CLI CN' : 'Qoder CLI' } if (isGeminiTerminalTitle(title)) { return 'Gemini CLI' diff --git a/src/shared/agent-title-status.ts b/src/shared/agent-title-status.ts index 7cd7a2c292cd..5dbd8e4a876a 100644 --- a/src/shared/agent-title-status.ts +++ b/src/shared/agent-title-status.ts @@ -132,7 +132,8 @@ export function createAgentStatusTracker( export function normalizeTerminalTitle(title: string): string { const qoderStatus = qoderTitleStatus(title) if (qoderStatus) { - return `${qoderStatus === 'working' ? '✦' : qoderStatus === 'permission' ? '▲' : '◇'} Qoder CLI` + const label = title.includes('Qoder CLI CN') ? 'Qoder CLI CN' : 'Qoder CLI' + return `${qoderStatus === 'working' ? '✦' : qoderStatus === 'permission' ? '▲' : '◇'} ${label}` } if (!title) { return title diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts index 5d3217f00f3d..e8785869fd30 100644 --- a/src/shared/protocol-version.ts +++ b/src/shared/protocol-version.ts @@ -255,6 +255,10 @@ export const AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY = 'agent-session.muse- export const AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY = 'agent-session.dsh-resume.v1' as const export const AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY = 'agent-session.codebuddy-resume.v1' as const +export const AGENT_SESSION_QODER_CN_RESUME_RUNTIME_CAPABILITY = + 'agent-session.qoder-cn-resume.v1' as const +export const AGENT_SESSION_QWEN_CODE_RESUME_RUNTIME_CAPABILITY = + 'agent-session.qwen-code-resume.v1' as const export const AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY = 'agent-session.qoder-resume.v1' as const export const AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY = @@ -416,6 +420,8 @@ export const RUNTIME_CAPABILITIES = [ AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY, + AGENT_SESSION_QODER_CN_RESUME_RUNTIME_CAPABILITY, + AGENT_SESSION_QWEN_CODE_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY, AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY, FILE_MUTATION_OWNERSHIP_RUNTIME_CAPABILITY, diff --git a/src/shared/qoder-agent.test.ts b/src/shared/qoder-agent.test.ts index 8db665e72094..f7600368a102 100644 --- a/src/shared/qoder-agent.test.ts +++ b/src/shared/qoder-agent.test.ts @@ -158,3 +158,46 @@ it('settles manual compaction without interrupting automatic compaction', () => agentType: 'qoder' }) }) + +it.each(['qoder-cn', 'qwen-code'] as const)('keeps %s lifecycle and resume attributed', (agent) => { + const state = createHookListenerState() + const send = (hook_event_name: string, extra = {}) => + normalizeAndAccept(state, agent, { + hook_event_name, + session_id: 'provider-proof', + ...extra + }) + expect(send('SessionStart', { source: 'startup' })?.payload).toMatchObject({ + agentType: agent, + state: 'done', + sessionBoundary: true + }) + expect(send('UserPromptSubmit', { prompt: 'Create proof.txt' })?.payload).toMatchObject({ + agentType: agent, + state: 'working' + }) + expect(send('PermissionRequest', { tool_name: 'Write' })?.payload).toMatchObject({ + agentType: agent, + state: 'waiting' + }) + expect(send('Stop', { last_assistant_message: 'Done' })?.payload).toMatchObject({ + agentType: agent, + state: 'done' + }) + expect(send('SessionStart', { source: 'resume' })?.providerSession?.id).toBe('provider-proof') + expect(getAgentResumeArgv(agent, { key: 'session_id', id: 'provider-proof' })).toEqual([ + agent === 'qoder-cn' ? 'qoderclicn' : 'qwen', + '--resume', + 'provider-proof' + ]) +}) + +it.each([ + 'qoderclicn', + 'qodercn', + '/home/test/.qoder-cn/bin/qoderclicn-1.1.65', + 'C:\\Qoder\\qoderclicn.exe' +])('recognizes the China executable %s', (command) => { + expect(recognizeAgentProcessFromCommandLine(command)?.agent).toBe('qoder-cn') + expect(recognizeAgentProcessFromCommandLine(`${command} --print hello`)).toBeNull() +}) diff --git a/src/shared/skills-cli-agent-keys.ts b/src/shared/skills-cli-agent-keys.ts index 1955bfa6d581..0c3624ad2a87 100644 --- a/src/shared/skills-cli-agent-keys.ts +++ b/src/shared/skills-cli-agent-keys.ts @@ -26,6 +26,7 @@ export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = { omp: null, 'prime-agent': null, qoder: 'qoder', + 'qoder-cn': 'qoder-cn', gemini: 'gemini-cli', antigravity: 'antigravity', aider: null, diff --git a/src/shared/telemetry-property-schemas.ts b/src/shared/telemetry-property-schemas.ts index a45a2f8d9f20..b8ba933f5185 100644 --- a/src/shared/telemetry-property-schemas.ts +++ b/src/shared/telemetry-property-schemas.ts @@ -21,6 +21,7 @@ export const AGENT_KIND_VALUES = [ 'omp', 'prime-agent', 'qoder', + 'qoder-cn', 'gemini', 'antigravity', 'aider', diff --git a/src/shared/terminal-title-agent-type.ts b/src/shared/terminal-title-agent-type.ts index 045b0aeceece..65ba82e83d05 100644 --- a/src/shared/terminal-title-agent-type.ts +++ b/src/shared/terminal-title-agent-type.ts @@ -175,7 +175,7 @@ function computeAgentLabel(title: string): string | null { return 'DeepSeek Harness' } if (isQoderTerminalTitle(title)) { - return 'Qoder CLI' + return title.includes('Qoder CLI CN') ? 'Qoder CLI CN' : 'Qoder CLI' } if (isGeminiTerminalTitle(title)) { return 'Gemini CLI' @@ -258,6 +258,8 @@ const TITLE_LABEL_TO_AGENT: Partial> = { OpenClaude: 'openclaude', Codex: 'codex', 'Qoder CLI': 'qoder', + 'Qoder CLI CN': 'qoder-cn', + 'Qoder CLI China': 'qoder-cn', 'Gemini CLI': 'gemini', 'GitHub Copilot': 'copilot', Grok: 'grok', diff --git a/src/shared/tui-agent-config-types.ts b/src/shared/tui-agent-config-types.ts index aa393fd522b7..0729079d0936 100644 --- a/src/shared/tui-agent-config-types.ts +++ b/src/shared/tui-agent-config-types.ts @@ -38,7 +38,7 @@ export type TuiAgentConfig = { /** Claude Code follows pasted text only where the user's typed words ask, so dispatch briefs need a typed lead line. */ pasteNeedsTypedRequest?: boolean /** Trust Orca pre-writes at PTY spawn (agent-workspace-trust.ts) so the agent's first-launch "trust this folder?" menu doesn't consume the bracketed paste. */ - preflightTrust?: 'claude' | 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder' + preflightTrust?: 'claude' | 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder' | 'qoder-cn' /** Agent-specific signal that the composer is ready for paste, stronger than the default quiet-render window. */ draftPasteReadySignal?: DraftPasteReadySignal /** Hard deadline for the agent's composer readiness signal. */ diff --git a/src/shared/tui-agent-config.ts b/src/shared/tui-agent-config.ts index d9fdabb14c34..327214011646 100644 --- a/src/shared/tui-agent-config.ts +++ b/src/shared/tui-agent-config.ts @@ -146,6 +146,12 @@ const TUI_AGENT_CONFIG_SOURCE: Record = { promptInjectionMode: 'flag-prompt-interactive', preflightTrust: 'qoder' }, + 'qoder-cn': { + detectCmd: 'qoderclicn', + detectCmdAliases: ['qodercn'], + promptInjectionMode: 'flag-prompt-interactive', + preflightTrust: 'qoder-cn' + }, gemini: { detectCmd: 'gemini', promptInjectionMode: 'flag-prompt-interactive' diff --git a/src/shared/tui-agent-display-names.ts b/src/shared/tui-agent-display-names.ts index 31b6035a9530..106244368137 100644 --- a/src/shared/tui-agent-display-names.ts +++ b/src/shared/tui-agent-display-names.ts @@ -25,6 +25,7 @@ export const TUI_AGENT_DISPLAY_NAMES: Record = { omp: 'OMP', 'prime-agent': 'Prime Agent', qoder: 'Qoder CLI', + 'qoder-cn': 'Qoder CLI China', gemini: 'Gemini', antigravity: 'Antigravity', aider: 'Aider', diff --git a/src/shared/tui-agent-permissions.ts b/src/shared/tui-agent-permissions.ts index 9fc8eb0a6910..db014311459c 100644 --- a/src/shared/tui-agent-permissions.ts +++ b/src/shared/tui-agent-permissions.ts @@ -10,6 +10,7 @@ export const YOLO_TUI_AGENT_ARGS: Partial> = { openclaude: '--dangerously-skip-permissions', codex: '--dangerously-bypass-approvals-and-sandbox', qoder: '--dangerously-skip-permissions', + 'qoder-cn': '--dangerously-skip-permissions', gemini: '--yolo', antigravity: '--dangerously-skip-permissions', aider: '--yes-always', diff --git a/src/shared/tui-agent-rest-signal.test.ts b/src/shared/tui-agent-rest-signal.test.ts index 6e573acc0b06..ad375e657c6e 100644 --- a/src/shared/tui-agent-rest-signal.test.ts +++ b/src/shared/tui-agent-rest-signal.test.ts @@ -29,6 +29,7 @@ const EXPECTED_REST_SIGNALS: Record = { grok: 'title', muse: 'ready-body', qoder: 'ready-body', + 'qoder-cn': 'ready-body', codebuddy: 'none', autohand: 'none', ante: 'none', diff --git a/src/shared/tui-agent-rest-signal.ts b/src/shared/tui-agent-rest-signal.ts index 93f694a5d799..b15797113786 100644 --- a/src/shared/tui-agent-rest-signal.ts +++ b/src/shared/tui-agent-rest-signal.ts @@ -20,7 +20,8 @@ export type TuiAgentRestSignal = 'hook-done' | 'synthetic-title' | 'title' | 're const IDENTITY_REST_SIGNALS: Partial> = { dsh: 'hook-done', muse: 'ready-body', - qoder: 'ready-body' + qoder: 'ready-body', + 'qoder-cn': 'ready-body' } // Why derived, not declared per agent: the title tables are the evidence, so a second diff --git a/src/shared/tui-agent-selection.ts b/src/shared/tui-agent-selection.ts index acf305dad599..21390d9adfdb 100644 --- a/src/shared/tui-agent-selection.ts +++ b/src/shared/tui-agent-selection.ts @@ -18,6 +18,7 @@ export const TUI_AGENT_AUTO_PICK_ORDER = [ 'muse', 'dsh', 'qoder', + 'qoder-cn', 'zcode', 'pi', 'omp', diff --git a/src/shared/tui-agent.ts b/src/shared/tui-agent.ts index a98c45101fd6..281b7c5b60d7 100644 --- a/src/shared/tui-agent.ts +++ b/src/shared/tui-agent.ts @@ -13,6 +13,7 @@ export type TuiAgent = | 'pi' // Pi (pi.dev) | 'omp' // OMP (omp.sh) | 'qoder' // Qoder CLI + | 'qoder-cn' // Qoder CLI China | 'gemini' // Gemini CLI | 'antigravity' // Google Antigravity CLI | 'aider' // Aider From 6609843eb327d617f46aa24859fd26ad808714cf Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 01:51:43 -0700 Subject: [PATCH 10/17] Cover Qoder China mobile assets and mixed-host resume gates --- .../src/components/mobile-agent-icon-assets.ts | 2 +- ...gent-resume-host-authority-capability.test.ts | 4 ++++ .../runtime/remote-agent-session-launch.test.ts | 4 ++-- src/shared/agent-icons/qoder-cn.png | Bin 0 -> 2416 bytes 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 src/shared/agent-icons/qoder-cn.png diff --git a/mobile/src/components/mobile-agent-icon-assets.ts b/mobile/src/components/mobile-agent-icon-assets.ts index b1282c854f33..49f27df69900 100644 --- a/mobile/src/components/mobile-agent-icon-assets.ts +++ b/mobile/src/components/mobile-agent-icon-assets.ts @@ -20,7 +20,7 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial { codebuddy: AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY, codex: undefined, qoder: AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY, + 'qoder-cn': AGENT_SESSION_QODER_CN_RESUME_RUNTIME_CAPABILITY, + 'qwen-code': AGENT_SESSION_QWEN_CODE_RESUME_RUNTIME_CAPABILITY, gemini: undefined, antigravity: undefined, opencode: undefined, diff --git a/src/renderer/src/runtime/remote-agent-session-launch.test.ts b/src/renderer/src/runtime/remote-agent-session-launch.test.ts index dda22ff12fd4..53640283b87f 100644 --- a/src/renderer/src/runtime/remote-agent-session-launch.test.ts +++ b/src/renderer/src/runtime/remote-agent-session-launch.test.ts @@ -45,7 +45,7 @@ describe('remote agent-session launch routing', () => { expect(legacy).not.toHaveBeenCalled() }) - it.each(['kimi', 'muse', 'codebuddy'] as const)( + it.each(['kimi', 'muse', 'codebuddy', 'qoder', 'qoder-cn', 'qwen-code'] as const)( 'falls back to legacy when an older host lacks the %s resume capability', async (agent) => { const hostAuthority = vi.fn().mockResolvedValue('structured') @@ -70,7 +70,7 @@ describe('remote agent-session launch routing', () => { } ) - it.each(['muse', 'codebuddy'] as const)( + it.each(['muse', 'codebuddy', 'qoder', 'qoder-cn', 'qwen-code'] as const)( 'uses host authority when the host supports %s resume', async (agent) => { const hostAuthority = vi.fn().mockResolvedValue('host') diff --git a/src/shared/agent-icons/qoder-cn.png b/src/shared/agent-icons/qoder-cn.png new file mode 100644 index 0000000000000000000000000000000000000000..42c952ed33a1240c57832c8d71c093f59e76fa65 GIT binary patch literal 2416 zcmYM0c{J4j8pppAGZ z9|C|BKY;sh#%A9Sp2fZnX8z|~#h}0G{a*2*e`v#EuK(wQu`qgg%D(XtEv|$B0Ke#g zKtOK(vHe}rElrFZB0*DE`L5%7#rJ&ZSC?}p`|J=nUO6O)+>O`9C@X=CbcRM`J}dNn z1%pmw$BgakE3p?pnW=z~H+$rhK0cK>K~f?(%fNjdgneFN-1EvH2yp*d#FqtqdR`1C z_eY?1%R=MkTN);ox%EX`J!p@^@&2MwNN?u$-TGx|3qrWZVyEE05)f#`oTi zln#!zoZFx{!!a#MQu~AZQBDoAq8b@If+`?OS7{+!m7fA@d(y$MznzlbzTYfD5xbz*U z=dar1MSOSQt^+DjM~ADc$H3gSq&a^UrM7%N0~vL4Y$BzN+a0Fz!}rA+;8uVN%YaKu zfJ(DV94--Ls_bSI#r)Yb|E?8l-V?^vK3$`l$FHhgR|zq@n6rWO8V6^=R@)$LRGy=z zG~_&Ud#8wDXjkv6wCK-kzfva--?PzYN%#+HpEOZhl)dJLmJ6ue>{q7iJzYdDcwLeo z-o1M%AdzxMlFOM~Mg;o@PSuD>#}z!RRdvdQz&=kskU zWRTpnlnl!`(EzJ~`l4ZSaEiUcgt{mYPHBC0CPeI0j`t^)hkD>`h<|my`Pa1}N2a3! z8V~EZ4@y`})GWplF8yFXk$$&@R{(5_KWMU`1S?yk_q!olE}z6$^bw&i-Gepbg=Iu3 zDNl>q*~5&Q6Hoa>4KFfHzaenyq5ukb`K44+ThO@L{{N-Pns z^!m}h14N`+ov9Peim|)QC}*?>7iwmmnnER(z7o}fG>{_fZQn)VVinE;sI@tyCDjO} zM^{DL$3>^W&v~V8_-sxghO)YWm2*>#>Y|!^fwFnkNv+pjdQ~Nwnhl`6JR^NgD^5Y& zq#i}bxri`-#)u{=gz|Y8#j$3dSks-<&h;RG!+0x-tdCwvR3Hmh5PWI03sSFB+CKB> zsqE#9EX@0~3Pp)%uE=`|Q5>=EY8kif`^1J!C72hxCu(G!E&Kfq)V^)hT%16ewkxsD zpU*BvY{cBE+c-N~FJIp6EB~kNA((pQMi-p6JoqvvT-{qIM>Px`@ zqmJBJxD(&^^MQ1xhSp4$w~hQUs@XkhVaArx%7z>LjSdv2a{O!nCrmSScYMm}JNvNt z17rC*OoZs?`!udME58}iH@DWT`382zqkS3`geoIEvsXhF2cY-`N@KGRSI2Z4#03&_ z&$Yq?>i|CP?>M_@mMPhtQ5t+a=Ie7DKvZ}+^Dsj>Het1y+!|VA@Cy85JKr^g;(8~S z1u%4zmAyEr1g_yXkDCMy;RcwJUe*I1LD$BNzfdur>;ZJL1^QZGwR9V!X?I{%&L$8i>E9oL_(0xa%rC4lrGO`0Gd)`C zw-$VJml5nI{bqn2u}R|ht0EPz_YoHcC`W{V*x`sUo=gtbGOS!&i^?OM_p4y8_uQ0u zD*b%ofU139FS{_;5jdflbwkn+XJIrOjB}tUO7MoqC*(vmVs-V$^FRKY%C`U6kSY2cb0QuT$MYUk@cTh8z*Pd9z>7 z0uolxqX(UfQqiP~l!H6cCsOuM1byR=&)Ux+q;Vn_gHk@a@XX`tCH=B;^?Pu#$I< z6s|Cae^WXoLVEi2`=jAc-YG5$?1l*u2bNcrTR*-cC%^5Z8px4Taw9l05MR-Y4QKJRAa6y;i z(QmcRJ?lJq=tu}@J0W)Gb>`E(pwR~r6kSfLRR8;0fWaF?aD|D1ewnqpCVPFv Date: Fri, 2 Oct 2026 01:55:58 -0700 Subject: [PATCH 11/17] Verify Qoder provider tags against the older released wire parser --- .../qoder-registration-downgrade.unit.test.ts | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts diff --git a/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts new file mode 100644 index 000000000000..a431086b6a96 --- /dev/null +++ b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts @@ -0,0 +1,42 @@ +import { expect, test } from 'vitest' +import { EnsureAgentSessionParams } from '../../../src/shared/rpc-contract/agent-session-params' +import { normalizeAgentStatusPayload } from '../../../src/shared/agent-status-types' +import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout' + +test('a pre-registration release preserves new provider status tags but refuses unsupported resume', async () => { + const checkout = await materializeReleaseCheckout('v1.4.211') + const baselineStatus = await importReleaseCheckoutModule( + checkout, + 'src/shared/agent-status-types.ts' + ) + const normalize = baselineStatus.normalizeAgentStatusPayload + if (typeof normalize !== 'function') { + throw new Error('Pinned release has no status normalizer') + } + const baselineResume = await importReleaseCheckoutModule( + checkout, + 'src/shared/rpc-contract/agent-session-params.ts' + ) + const schema = baselineResume.EnsureAgentSessionParams + if ( + !schema || + typeof schema !== 'object' || + !('safeParse' in schema) || + typeof schema.safeParse !== 'function' + ) { + throw new Error('Pinned release has no resume request parser') + } + for (const agent of ['qoder-cn', 'qwen-code'] as const) { + const status = { state: 'working', agentType: agent } + expect(normalize(status)).toMatchObject(status) + expect(normalizeAgentStatusPayload(status)).toMatchObject(status) + const request = { + kind: 'explicit', + worktree: 'folder:/task-owned/folder', + agent, + providerSession: { key: 'session_id', id: 'test-session' } + } + expect(EnsureAgentSessionParams.safeParse(request).success).toBe(true) + expect(schema.safeParse(request)).toHaveProperty('success', false) + } +}) From a3e2d70f1a9fb008ef31937df19a90e25bbf8179 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 02:34:17 -0700 Subject: [PATCH 12/17] Verify China and Qwen keep independent Windows hook scripts --- src/main/claude/windows-hook-files.test.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/claude/windows-hook-files.test.ts b/src/main/claude/windows-hook-files.test.ts index a3d369e75ec4..25bae132e16d 100644 --- a/src/main/claude/windows-hook-files.test.ts +++ b/src/main/claude/windows-hook-files.test.ts @@ -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: '' } })) @@ -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 From 47ac8b67b611a6d061b1847c433c9b8f1f3b6e98 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 03:22:53 -0700 Subject: [PATCH 13/17] Verify Qoder registrations against the installed older Windows release --- .../qoder-registration-downgrade.unit.test.ts | 76 ++++++++++--------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts index a431086b6a96..6d432c7c644e 100644 --- a/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts @@ -3,40 +3,44 @@ import { EnsureAgentSessionParams } from '../../../src/shared/rpc-contract/agent import { normalizeAgentStatusPayload } from '../../../src/shared/agent-status-types' import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout' -test('a pre-registration release preserves new provider status tags but refuses unsupported resume', async () => { - const checkout = await materializeReleaseCheckout('v1.4.211') - const baselineStatus = await importReleaseCheckoutModule( - checkout, - 'src/shared/agent-status-types.ts' - ) - const normalize = baselineStatus.normalizeAgentStatusPayload - if (typeof normalize !== 'function') { - throw new Error('Pinned release has no status normalizer') - } - const baselineResume = await importReleaseCheckoutModule( - checkout, - 'src/shared/rpc-contract/agent-session-params.ts' - ) - const schema = baselineResume.EnsureAgentSessionParams - if ( - !schema || - typeof schema !== 'object' || - !('safeParse' in schema) || - typeof schema.safeParse !== 'function' - ) { - throw new Error('Pinned release has no resume request parser') - } - for (const agent of ['qoder-cn', 'qwen-code'] as const) { - const status = { state: 'working', agentType: agent } - expect(normalize(status)).toMatchObject(status) - expect(normalizeAgentStatusPayload(status)).toMatchObject(status) - const request = { - kind: 'explicit', - worktree: 'folder:/task-owned/folder', - agent, - providerSession: { key: 'session_id', id: 'test-session' } +test.each(['v1.4.205', 'v1.4.211'])( + 'release %s preserves new provider status tags but refuses unsupported resume', + async (ref) => { + const checkout = await materializeReleaseCheckout(ref) + const baselineStatus = await importReleaseCheckoutModule( + checkout, + 'src/shared/agent-status-types.ts' + ) + const normalize = baselineStatus.normalizeAgentStatusPayload + if (typeof normalize !== 'function') { + throw new Error('Pinned release has no status normalizer') } - expect(EnsureAgentSessionParams.safeParse(request).success).toBe(true) - expect(schema.safeParse(request)).toHaveProperty('success', false) - } -}) + const baselineResume = await importReleaseCheckoutModule( + checkout, + 'src/shared/rpc-contract/agent-session-params.ts' + ) + const schema = baselineResume.EnsureAgentSessionParams + if ( + !schema || + typeof schema !== 'object' || + !('safeParse' in schema) || + typeof schema.safeParse !== 'function' + ) { + throw new Error('Pinned release has no resume request parser') + } + for (const agent of ['qoder-cn', 'qwen-code'] as const) { + const status = { state: 'working', agentType: agent } + expect(normalize(status)).toMatchObject(status) + expect(normalizeAgentStatusPayload(status)).toMatchObject(status) + const request = { + kind: 'explicit', + worktree: 'folder:/task-owned/folder', + agent, + providerSession: { key: 'session_id', id: 'test-session' } + } + expect(EnsureAgentSessionParams.safeParse(request).success).toBe(true) + expect(schema.safeParse(request)).toHaveProperty('success', false) + } + }, + 120_000 +) From 00077d915fca6f5613188693a9c7cf1b9676a980 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 06:30:36 -0700 Subject: [PATCH 14/17] test(qoder): align search capability contracts and pin old-host fencing --- src/cli/handlers/search.test.ts | 11 +- src/cli/search-command-arguments.test.ts | 8 +- .../rpc/methods/ai-vault-search.test.ts | 28 +++- .../__fixtures__/pre-qoder-search-request.ts | 58 +++++++++ .../ai-vault-search-qoder-client.test.ts | 122 ++++++++++++++++++ 5 files changed, 223 insertions(+), 4 deletions(-) create mode 100644 src/shared/__fixtures__/pre-qoder-search-request.ts create mode 100644 src/shared/ai-vault-search-qoder-client.test.ts diff --git a/src/cli/handlers/search.test.ts b/src/cli/handlers/search.test.ts index 4df1d1ef8c9c..e970d08ac370 100644 --- a/src/cli/handlers/search.test.ts +++ b/src/cli/handlers/search.test.ts @@ -102,7 +102,11 @@ describe('orca search over the runtime RPC', () => { const { call } = await runSearch([['query', 'resize race']]) expect(call).toHaveBeenCalledTimes(1) - expect(call).toHaveBeenCalledWith('aiVault.searchSessions', { query: 'resize race', limit: 20 }) + expect(call).toHaveBeenCalledWith('aiVault.searchSessions', { + query: 'resize race', + limit: 20, + supportsQoderHistory: true + }) }) const flagCases: [string, CliFlags, Record][] = [ @@ -157,7 +161,10 @@ describe('orca search over the runtime RPC', () => { it.each(flagCases)('sends %s', async (_name, flags, params) => { const { call } = await runSearch(flags) - expect(call).toHaveBeenCalledWith('aiVault.searchSessions', params) + expect(call).toHaveBeenCalledWith('aiVault.searchSessions', { + ...params, + supportsQoderHistory: true + }) }) it('calls the status RPC for --index-status', async () => { diff --git a/src/cli/search-command-arguments.test.ts b/src/cli/search-command-arguments.test.ts index 27b06286f529..4e9a7fa8805e 100644 --- a/src/cli/search-command-arguments.test.ts +++ b/src/cli/search-command-arguments.test.ts @@ -126,10 +126,16 @@ describe('orca search argument parsing', () => { it('rejects an unknown --agent and names the known ones', () => { expect(() => parseSearch(['search', 'q', '--agent', 'claude', '--agent', 'bogus'])).toThrow( - /Unknown --agent "bogus"\. Known agents: claude, codebuddy, codex, / + /Unknown --agent "bogus"\. Known agents: claude, codebuddy, qoder, codex, / ) }) + it('accepts Qoder without changing another agent filter', () => { + expect( + request(['search', 'q', '--agent', 'qoder', '--agent', 'codex']).filters?.agents + ).toEqual(['qoder', 'codex']) + }) + it('rejects more --path values than the contract accepts', () => { const paths = Array.from({ length: 65 }, (_, index) => ['--path', `/p${index}`]).flat() expect(() => parseSearch(['search', 'q', ...paths])).toThrow('Too many --path values (65)') diff --git a/src/main/runtime/rpc/methods/ai-vault-search.test.ts b/src/main/runtime/rpc/methods/ai-vault-search.test.ts index ae4a6bf7a5f1..6f3b4301f701 100644 --- a/src/main/runtime/rpc/methods/ai-vault-search.test.ts +++ b/src/main/runtime/rpc/methods/ai-vault-search.test.ts @@ -1,4 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' +import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types' import { RpcDispatcher } from '../dispatcher' import { OrcaRuntimeService } from '../../orca-runtime' import { AI_VAULT_METHODS } from './ai-vault' @@ -52,7 +53,11 @@ describe('session search runtime RPC', () => { expect(text.includes('/host/transcript.jsonl')).toBe(clientKind === undefined) expect(text.includes('resumeCommand')).toBe(clientKind === undefined) expect(service.search).toHaveBeenCalledExactlyOnceWith( - { query: 'needle', limit: 20 }, + { + query: 'needle', + limit: 20, + filters: { agents: AI_VAULT_AGENTS.filter((agent) => agent !== 'qoder') } + }, undefined ) const status = await rpc.dispatch( @@ -62,6 +67,27 @@ describe('session search runtime RPC', () => { expect(status).toMatchObject({ ok: true, result: { enabled: true, generation: 7 } }) } ) + it.each([undefined, 'runtime', 'mobile'] as const)( + 'preserves explicitly supported Qoder filters for client kind %s', + async (clientKind) => { + const service = fakeSearchService() + setSessionSearchService(service) + expect( + await dispatcher().dispatch( + request({ + query: 'needle', + supportsQoderHistory: true, + filters: { agents: ['qoder', 'codex'] } + }), + { clientKind } + ) + ).toMatchObject({ ok: true }) + expect(service.search).toHaveBeenCalledExactlyOnceWith( + { query: 'needle', limit: 20, filters: { agents: ['qoder', 'codex'] } }, + undefined + ) + } + ) it('maps the old runtime dispatcher refusal and rejects malformed responses', async () => { const legacy = dispatcher(true) const client = createSessionSearchClient(async (method, params) => { diff --git a/src/shared/__fixtures__/pre-qoder-search-request.ts b/src/shared/__fixtures__/pre-qoder-search-request.ts new file mode 100644 index 000000000000..bfe585f03268 --- /dev/null +++ b/src/shared/__fixtures__/pre-qoder-search-request.ts @@ -0,0 +1,58 @@ +// Pre-Qoder b49abdb request parser and closed agent enum; keep independent of the current catalog. +import { resolveSessionSearchLimit } from '../ai-vault-search-limit' +import { z } from 'zod' +export const AI_VAULT_AGENTS = [ + 'claude', + 'codebuddy', + 'codex', + 'hermes', + 'pi', + 'omp', + 'prime-agent', + 'cursor', + 'gemini', + 'antigravity', + 'rovo', + 'copilot', + 'opencode', + 'opencode2', + 'zcode', + 'grok', + 'openclaw', + 'devin', + 'droid', + 'cline', + 'kimi', + 'muse' +] as const +const AI_VAULT_SCOPE_PATHS_MAX_COUNT = 64 +const AI_VAULT_SEARCH_SORTS = ['relevance', 'newest'] as const +import { AiVaultSearchScopeIdentitySchema } from '../ai-vault-search-scope' + +export const AiVaultSearchFiltersSchema = z.object({ + agents: z.array(z.enum(AI_VAULT_AGENTS)).optional(), + scopePaths: z.array(z.string().min(1).max(4096)).max(AI_VAULT_SCOPE_PATHS_MAX_COUNT).optional(), + since: z.string().datetime({ offset: true }).optional(), + sort: z.enum(AI_VAULT_SEARCH_SORTS).optional() +}) + +// Strip unknown fields so legacy tier/refresh are accepted without affecting the query. +export const AiVaultSearchRequestSchema = z + .object({ + query: z.string(), + scope: z.enum(['conversation', 'all']).optional(), + freshness: z.enum(['indexed', 'wait-until-current']).optional(), + limit: z.number().optional().transform(resolveSessionSearchLimit), + cursor: z.string().optional(), + filters: AiVaultSearchFiltersSchema.optional(), + /** Scope by identity, resolved into paths by whichever host answers. */ + within: AiVaultSearchScopeIdentitySchema.optional(), + debug: z.boolean().optional() + }) + // Two scopes in one request have no defined intersection, and guessing one + // would be the silent widening this field exists to remove. Neither is still + // legal and still means every session. + .refine( + (request) => request.within === undefined || (request.filters?.scopePaths ?? []).length === 0, + { message: 'A search carries either a scope identity or explicit scope paths, not both' } + ) diff --git a/src/shared/ai-vault-search-qoder-client.test.ts b/src/shared/ai-vault-search-qoder-client.test.ts new file mode 100644 index 000000000000..0df8dd802ea7 --- /dev/null +++ b/src/shared/ai-vault-search-qoder-client.test.ts @@ -0,0 +1,122 @@ +import { describe, expect, it, vi } from 'vitest' +import { createSessionSearchClient, unavailableSessionSearchStatus } from './ai-vault-search-client' +import { AiVaultSearchRequestSchema as LegacyRequestSchema } from './__fixtures__/pre-qoder-search-request' +import { searchHit, searchResults } from './ai-vault-search-test-fixture' + +describe('Qoder search negotiation', () => { + it('keeps the frozen old parser closed to Qoder', () => { + expect( + LegacyRequestSchema.safeParse({ query: 'q', filters: { agents: ['qoder'] } }).success + ).toBe(false) + }) + + it.each(['runtime', 'relay'] as const)( + 'sends no search request for sole unsupported Qoder over %s', + async (transport) => { + const search = vi.fn((params: unknown) => { + LegacyRequestSchema.parse(params) + return searchResults() + }) + const status = vi.fn(() => unavailableSessionSearchStatus()) + const client = createSessionSearchClient( + async (method, params) => (method === 'aiVault.searchStatus' ? status() : search(params)), + transport + ) + expect(await client.searchSessions({ query: 'q', filters: { agents: ['qoder'] } })).toEqual({ + kind: 'unavailable', + reason: 'unsupported-agent' + }) + expect(status).toHaveBeenCalledTimes(1) + expect(search).not.toHaveBeenCalled() + } + ) + + it.each(['runtime', 'relay'] as const)( + 'retains every non-Qoder filter through the actual old enum over %s', + async (transport) => { + const request = { + query: 'q', + scope: 'conversation' as const, + limit: 42, + cursor: 'page-1', + debug: true, + filters: { + agents: ['qoder', 'codex', 'claude'] as const, + scopePaths: ['/host/folder'], + since: '2026-08-01T00:00:00Z', + sort: 'newest' as const + } + } + const search = vi.fn((params: unknown) => { + expect(LegacyRequestSchema.parse(params)).toEqual({ + ...request, + filters: { ...request.filters, agents: ['codex', 'claude'] } + }) + return searchResults() + }) + const client = createSessionSearchClient( + async (method, params) => + method === 'aiVault.searchStatus' ? unavailableSessionSearchStatus() : search(params), + transport + ) + await client.searchSessions({ + ...request, + filters: { ...request.filters, agents: [...request.filters.agents] } + }) + expect(search).toHaveBeenCalledTimes(1) + } + ) + + it.each(['runtime', 'relay'] as const)( + 'preserves Qoder identity only after positive host attestation over %s', + async (transport) => { + const call = vi.fn(async (method: string) => + method === 'aiVault.searchStatus' + ? { ...unavailableSessionSearchStatus(), supportsQoderHistory: true } + : { ...searchResults(), hits: [{ ...searchHit(), agent: 'qoder' }] } + ) + const result = await createSessionSearchClient(call, transport).searchSessions({ + query: 'q', + filters: { agents: ['qoder'] } + }) + expect(call.mock.calls.map(([method]) => method)).toEqual([ + 'aiVault.searchStatus', + 'aiVault.searchSessions' + ]) + expect(call).toHaveBeenLastCalledWith('aiVault.searchSessions', { + query: 'q', + limit: 20, + filters: { agents: ['qoder'] }, + supportsQoderHistory: true + }) + expect(result).toMatchObject({ kind: 'results', hits: [{ agent: 'qoder' }] }) + } + ) + + it('does not gate local IPC before the per-host aggregator negotiates', async () => { + const call = vi.fn(async () => searchResults()) + await createSessionSearchClient(call, 'ipc').searchSessions({ + query: 'q', + filters: { agents: ['qoder'] } + }) + expect(call).toHaveBeenCalledExactlyOnceWith('aiVault.searchSessions', { + query: 'q', + limit: 20, + filters: { agents: ['qoder'] }, + supportsQoderHistory: true + }) + }) + + it('does not dispatch a search when the capability probe loses host contact', async () => { + const call = vi.fn(async () => { + throw new Error('host disconnected') + }) + await expect( + createSessionSearchClient(call, 'relay').searchSessions({ + query: 'q', + filters: { agents: ['qoder', 'codex'] } + }) + ).rejects.toThrow('host disconnected') + expect(call).toHaveBeenCalledExactlyOnceWith('aiVault.searchStatus', {}) + }) +}) From 13ba7ca28019c1c49e62b9b083433b1218492107 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 06:32:14 -0700 Subject: [PATCH 15/17] fix(qoder): rank exact picker identities and command aliases first --- .../src/lib/agent-picker-search.test.ts | 35 ++++++++++++- src/renderer/src/lib/agent-picker-search.ts | 15 ++++-- src/shared/qoder-cn-launch-recipe.test.ts | 49 +++++++++++++++++++ 3 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 src/shared/qoder-cn-launch-recipe.test.ts diff --git a/src/renderer/src/lib/agent-picker-search.test.ts b/src/renderer/src/lib/agent-picker-search.test.ts index caff18e5c671..c6f02089c0c6 100644 --- a/src/renderer/src/lib/agent-picker-search.test.ts +++ b/src/renderer/src/lib/agent-picker-search.test.ts @@ -66,12 +66,43 @@ describe('agent picker search', () => { expect(replaceSpy).not.toHaveBeenCalled() }) - it('resolves every catalog command alias to its agent first', () => { + it('resolves catalog commands to the first entry owning that command', () => { for (const agent of AGENT_CATALOG) { - expect(searchAgentPickerEntries(AGENT_CATALOG, agent.cmd)[0]?.id).toBe(agent.id) + const owner = AGENT_CATALOG.find((candidate) => candidate.cmd === agent.cmd) + expect(searchAgentPickerEntries(AGENT_CATALOG, agent.cmd)[0]?.id).toBe(owner?.id) } }) + it.each([ + ['qoder', 'qoder'], + ['qodercli', 'qoder'], + ['qoder-cn', 'qoder-cn'], + ['qoderclicn', 'qoder-cn'], + ['Qoder CLI China', 'qoder-cn'], + ['qwen', 'qwen-code'] + ] as const)('resolves explicit identity or command %s to %s', (query, expected) => { + expect(searchAgentPickerEntries(AGENT_CATALOG, query)[0]?.id).toBe(expected) + }) + + it('keeps a stable default for a shared binary while explicit CN remains selectable', () => { + const shared = [ + entry('qoder', 'Qoder CLI', 'qodercli'), + entry('qoder-cn', 'Qoder CLI China', 'qodercli') + ] + expect(searchAgentPickerEntries(shared, 'qodercli').map((agent) => agent.id)).toEqual([ + 'qoder', + 'qoder-cn' + ]) + expect(searchAgentPickerEntries(shared, 'qoder-cn')[0]?.id).toBe('qoder-cn') + expect(searchAgentPickerEntries(shared, 'Qoder CLI China')[0]?.id).toBe('qoder-cn') + expect( + searchAgentPickerEntries( + shared.filter((agent) => agent.id !== 'qoder'), + 'qodercli' + )[0]?.id + ).toBe('qoder-cn') + }) + it('returns no entries for unrelated text', () => { expect(searchAgentPickerEntries(agents, 'not-an-agent')).toEqual([]) }) diff --git a/src/renderer/src/lib/agent-picker-search.ts b/src/renderer/src/lib/agent-picker-search.ts index 24ee28967421..b3129feb8cc4 100644 --- a/src/renderer/src/lib/agent-picker-search.ts +++ b/src/renderer/src/lib/agent-picker-search.ts @@ -86,20 +86,25 @@ export function agentPickerBlankTerminalMatches(rawQuery: string): boolean { function scoreAgent(agent: AgentCatalogEntry, query: string): number { return Math.min( scoreCandidate(query, agent.label, 0), - scoreCandidate(query, agent.id, 600), - scoreCandidate(query, agent.cmd, 650), - ...(agent.searchAliases ?? []).map((alias) => scoreCandidate(query, alias, 650)) + scoreCandidate(query, agent.id, 600, 1), + scoreCandidate(query, agent.cmd, 650, 2), + ...(agent.searchAliases ?? []).map((alias) => scoreCandidate(query, alias, 650, 2)) ) } -function scoreCandidate(query: string, rawCandidate: string, baseScore: number): number { +function scoreCandidate( + query: string, + rawCandidate: string, + baseScore: number, + exactScore = baseScore +): number { const candidate = normalizeSearchText(rawCandidate) if (!candidate) { return NO_MATCH } if (candidate === query) { - return baseScore + return exactScore } if (candidate.startsWith(query)) { return baseScore + 10 diff --git a/src/shared/qoder-cn-launch-recipe.test.ts b/src/shared/qoder-cn-launch-recipe.test.ts new file mode 100644 index 000000000000..8ee9f12b3117 --- /dev/null +++ b/src/shared/qoder-cn-launch-recipe.test.ts @@ -0,0 +1,49 @@ +import { describe, expect, it } from 'vitest' +import { buildAgentStartupPlan, buildAgentResumeStartupPlan } from './tui-agent-startup' + +describe('Qoder China launch recipe identity', () => { + it.each(['darwin', 'linux', 'win32'] as const)( + 'preserves the official China executable on %s', + (platform) => { + const plan = buildAgentStartupPlan({ + agent: 'qoder-cn', + prompt: 'fixture', + cmdOverrides: {}, + platform + }) + expect(plan?.agent).toBe('qoder-cn') + expect(plan?.launchCommand).toBe("qoderclicn --prompt-interactive 'fixture'") + expect( + buildAgentResumeStartupPlan({ + agent: 'qoder-cn', + providerSession: { key: 'session_id', id: 'fixture-session' }, + cmdOverrides: {}, + platform + })?.launchCommand + ).toBe("qoderclicn --resume 'fixture-session'") + } + ) + + it.each(['darwin', 'linux', 'win32'] as const)( + 'preserves an explicitly configured shared-binary --cn recipe on %s', + (platform) => { + const cmdOverrides = { 'qoder-cn': 'qodercli --cn' } + const plan = buildAgentStartupPlan({ + agent: 'qoder-cn', + prompt: 'fixture', + cmdOverrides, + platform + }) + expect(plan?.agent).toBe('qoder-cn') + expect(plan?.launchCommand).toBe("qodercli --cn --prompt-interactive 'fixture'") + expect( + buildAgentResumeStartupPlan({ + agent: 'qoder-cn', + providerSession: { key: 'session_id', id: 'fixture-session' }, + cmdOverrides, + platform + })?.launchCommand + ).toBe("qodercli --cn --resume 'fixture-session'") + } + ) +}) From 9ef5bd376dc7712743dc60d8bbae4b6ab0e592b9 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 06:58:56 -0700 Subject: [PATCH 16/17] test(qoder): preserve the regional CLI shared icon expectation Keep the full bundled-asset and no-remote-image checks, with an explicit shared-logo basename for Qoder China. The map also works with older catalog type unions. --- src/renderer/src/components/agent/AgentCombobox.test.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/components/agent/AgentCombobox.test.tsx b/src/renderer/src/components/agent/AgentCombobox.test.tsx index 629aea0ee155..2ba0a0e2144c 100644 --- a/src/renderer/src/components/agent/AgentCombobox.test.tsx +++ b/src/renderer/src/components/agent/AgentCombobox.test.tsx @@ -199,9 +199,11 @@ describe('AgentCombobox', () => { it('renders bundled favicons for favicon-domain agents instead of the remote Google service', () => { // Why: previously loaded from Google's favicon service (#8451). Iterate the // full asset map so missing files/key mismatches fail the test. + const sharedIcons = new Map([['qoder-cn', 'qoder']]) for (const agent of Object.keys(AGENT_FAVICON_ASSETS) as TuiAgent[]) { const markup = renderToStaticMarkup() - expect(markup).toContain(`/shared/agent-icons/${agent}.png`) + const iconName = sharedIcons.get(agent) ?? agent + expect(markup).toContain(`/shared/agent-icons/${iconName}.png`) expect(markup).not.toContain('https://www.google.com/s2/favicons') } }) From 02cabc159deab22dd5727b5b928c33ddd795529e Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 2 Oct 2026 17:52:48 -0700 Subject: [PATCH 17/17] fix(qoder): align China catalog entry with fallback order --- src/renderer/src/lib/agent-catalog.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/lib/agent-catalog.tsx b/src/renderer/src/lib/agent-catalog.tsx index 264001529433..bef0244dd39b 100644 --- a/src/renderer/src/lib/agent-catalog.tsx +++ b/src/renderer/src/lib/agent-catalog.tsx @@ -121,13 +121,6 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] => searchAliases: ['deepseek', 'dsh', 'dst', 'deepseek harness'], homepageUrl: 'https://deepseek-harness.github.io/deepseek-harness/' }, - { - id: 'qoder-cn', - label: translate('auto.lib.agent.catalog.qoder_cn_label', 'Qoder CLI China'), - cmd: 'qoderclicn', - faviconDomain: 'qoder.cn', - homepageUrl: 'https://docs.qoder.cn/cli/overview' - }, { id: 'qoder', label: translate('auto.lib.agent.catalog.qoder_label', 'Qoder CLI'), @@ -135,6 +128,13 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] => faviconDomain: 'qoder.com', homepageUrl: 'https://docs.qoder.com/cli/overview' }, + { + id: 'qoder-cn', + label: translate('auto.lib.agent.catalog.qoder_cn_label', 'Qoder CLI China'), + cmd: 'qoderclicn', + faviconDomain: 'qoder.cn', + homepageUrl: 'https://docs.qoder.cn/cli/overview' + }, { id: 'zcode', label: translate('auto.lib.agent.catalog.zcode_label', 'ZCode'),