Skip to content

perf(cli): let tests resolve core modules individually #10917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiliang114 merged 15 commits into from
Sep 6, 2026
Merged

perf(cli): let tests resolve core modules individually #10917

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8822672
perf(cli): let tests resolve core modules individually, and stop two …
yiliang114 Sep 3, 2026
8b3d0b0
fix(cli): restore the named core subpaths the previous commit dropped
yiliang114 Sep 3, 2026
a1a84a2
Merge branch 'main' into perf/core-subpath-imports
yiliang114 Sep 3, 2026
76809a4
fix(cli): name the migrated core imports so plain Node resolves them
yiliang114 Sep 3, 2026
9b48531
test(scripts): guard core subpath exports resolution under plain Node
yiliang114 Sep 3, 2026
80eeca7
fix(cli): name every core subpath import in cli tsconfig paths
yiliang114 Sep 4, 2026
8cb9801
test(scripts): pin subpath exports targets and guard bundle resolution
yiliang114 Sep 4, 2026
0d06850
fix: cover goalWire in the core-subpath guard and make it OS-independent
yiliang114 Sep 4, 2026
a0f08a9
test: guard acp-bridge-routed core subpaths in the bundle arm
yiliang114 Sep 4, 2026
bd7c7b5
Merge origin/main into perf/core-subpath-imports
yiliang114 Sep 4, 2026
b15e73f
fix(cli): guard the conversationsRuntimeMarker subpath route
yiliang114 Sep 4, 2026
637ea97
fix(sdk): guard the sdk-routed core subpath resolution
yiliang114 Sep 4, 2026
d4996ed
fix(sdk): reference core from the sdk composite reference project
yiliang114 Sep 4, 2026
4653a34
fix(sdk): keep the declaration build on the exports map
yiliang114 Sep 4, 2026
27185b6
fix(scripts): route core subpaths to src in the dev loader
yiliang114 Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/remoteInput/RemoteInputWatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
watchFile,
} from 'node:fs';
import { createInterface } from 'node:readline';
import { createDebugLogger } from '@qwen-code/qwen-code-core';
import { createDebugLogger } from '@qwen-code/qwen-code-core/debugLogger';
Comment thread
yiliang114 marked this conversation as resolved.
Resolved

const debugLogger = createDebugLogger('REMOTE_INPUT');

Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/services/tips/tipHistory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

import * as fs from 'node:fs';
import * as path from 'node:path';
import { atomicWriteFileSync, Storage } from '@qwen-code/qwen-code-core';
import { Storage } from '@qwen-code/qwen-code-core/storage';
import { atomicWriteFileSync } from '@qwen-code/qwen-code-core/atomicFileWrite';

interface TipHistoryEntry {
totalShown: number;
Expand Down
334 changes: 190 additions & 144 deletions packages/cli/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,152 +8,198 @@
import { defineConfig } from 'vitest/config';
import path from 'node:path';

const CORE_SRC = path.resolve(__dirname, '../core/src');

// Vite takes `alias` as an object or as an ordered array of {find,
// replacement}; only the array form accepts a RegExp, and core needs one.
// Order is precedence — the first entry whose `find` matches wins.
const toAliases = (map: Record<string, string>) =>
Object.entries(map).map(([find, replacement]) => ({ find, replacement }));

export default defineConfig({
resolve: {
alias: {
'@qwen-code/qwen-code-core/noFollowOpen': path.resolve(
__dirname,
'../core/src/utils/no-follow-open.ts',
),
'@qwen-code/qwen-code-core/subSessionConstants': path.resolve(
__dirname,
'../core/src/tools/sub-session-constants.ts',
),
'@qwen-code/qwen-code-core/goalWire': path.resolve(
__dirname,
'../core/src/goals/goal-wire.ts',
),
'@qwen-code/qwen-code-core/transcriptRecords': path.resolve(
__dirname,
'../core/src/utils/transcript-records.ts',
),
'@qwen-code/qwen-code-core/userPromptSubmitContext': path.resolve(
__dirname,
'../core/src/hooks/user-prompt-submit-context.ts',
),
'@qwen-code/qwen-code-core/memoryScopes': path.resolve(
__dirname,
'../core/src/memory/scopes.ts',
),
'@qwen-code/qwen-code-core/toolWriteOrigin': path.resolve(
__dirname,
'../core/src/services/tool-write-origin.ts',
),
'@qwen-code/qwen-code-core/envVarResolver': path.resolve(
__dirname,
'../core/src/utils/envVarResolver.ts',
),
'@qwen-code/qwen-code-core': path.resolve(__dirname, '../core/index.ts'),
// cli's daemon-status-provider.test.ts imports `FakeAgent` /
// `makeChannel` from acp-bridge's package-private
// `internal/testUtils` module. This alias overrides the runtime
// resolution so vitest reads the .ts source directly instead of
// the build-then-stale `dist/` copy.
'@qwen-code/acp-bridge/internal/testUtils': path.resolve(
__dirname,
'../acp-bridge/src/internal/testUtils.ts',
),
// Same rationale as above: bridgeErrors and status subpaths
// resolve to dist/ via package.json exports, but tests in the
// monorepo worktree need the live source (dist may be stale or
// absent during development).
'@qwen-code/acp-bridge/bridgeErrors': path.resolve(
__dirname,
'../acp-bridge/src/bridgeErrors.ts',
),
'@qwen-code/acp-bridge/status': path.resolve(
__dirname,
'../acp-bridge/src/status.ts',
),
'@qwen-code/acp-bridge/bridge': path.resolve(
__dirname,
'../acp-bridge/src/bridge.ts',
),
'@qwen-code/acp-bridge/spawnChannel': path.resolve(
__dirname,
'../acp-bridge/src/spawnChannel.ts',
),
'@qwen-code/acp-bridge/processRegistry': path.resolve(
__dirname,
'../acp-bridge/src/process-registry.ts',
),
'@qwen-code/acp-bridge/daemonMemoryBudget': path.resolve(
__dirname,
'../acp-bridge/src/daemon-memory-budget.ts',
),
'@qwen-code/acp-bridge/ndJsonStream': path.resolve(
__dirname,
'../acp-bridge/src/ndJsonStream.ts',
),
'@qwen-code/acp-bridge/logRedaction': path.resolve(
__dirname,
'../acp-bridge/src/logRedaction.ts',
),
'@qwen-code/acp-bridge/bridgeClient': path.resolve(
__dirname,
'../acp-bridge/src/bridgeClient.ts',
),
'@qwen-code/acp-bridge/bridgeOptions': path.resolve(
__dirname,
'../acp-bridge/src/bridgeOptions.ts',
),
'@qwen-code/acp-bridge/promptLedger': path.resolve(
__dirname,
'../acp-bridge/src/prompt-ledger.ts',
),
'@qwen-code/acp-bridge/bridgeTypes': path.resolve(
__dirname,
'../acp-bridge/src/bridgeTypes.ts',
),
'@qwen-code/acp-bridge/bridgeFileSystem': path.resolve(
__dirname,
'../acp-bridge/src/bridgeFileSystem.ts',
),
'@qwen-code/acp-bridge/sessionArtifacts': path.resolve(
__dirname,
'../acp-bridge/src/sessionArtifacts.ts',
),
'@qwen-code/acp-bridge/eventBus': path.resolve(
__dirname,
'../acp-bridge/src/eventBus.ts',
),
'@qwen-code/acp-bridge/replayWindowLimits': path.resolve(
__dirname,
'../acp-bridge/src/replayWindowLimits.ts',
),
'@qwen-code/acp-bridge/transcriptReplay': path.resolve(
__dirname,
'../acp-bridge/src/transcript-replay.ts',
),
'@qwen-code/acp-bridge/workspacePaths': path.resolve(
__dirname,
'../acp-bridge/src/workspacePaths.ts',
),
'@qwen-code/acp-bridge/externalToolGuard': path.resolve(
__dirname,
'../acp-bridge/src/externalToolGuard.ts',
),
'@qwen-code/audio-capture': path.resolve(
__dirname,
'../audio-capture/src/index.ts',
),
'@qwen-code/sdk/daemon/transcript': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/transcript.ts',
),
'@qwen-code/sdk/daemon/ui/transcript': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/ui/transcript.ts',
),
'@qwen-code/sdk/daemon/types': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/types.ts',
),
'@qwen-code/sdk/daemon': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/index.ts',
),
},
alias: [
// Named core subpaths. None of these targets can be derived from the
// specifier (noFollowOpen lives at utils/no-follow-open.ts), so they
// have to be matched ahead of the wildcard below. A new named subpath
// added to packages/cli/tsconfig.json must be added here too, above
// the wildcard, or the wildcard will claim it and point at a file
// that does not exist.
...toAliases({
'@qwen-code/qwen-code-core/noFollowOpen': path.resolve(
__dirname,
'../core/src/utils/no-follow-open.ts',
),
'@qwen-code/qwen-code-core/subSessionConstants': path.resolve(
__dirname,
'../core/src/tools/sub-session-constants.ts',
),
'@qwen-code/qwen-code-core/goalWire': path.resolve(
__dirname,
'../core/src/goals/goal-wire.ts',
),
'@qwen-code/qwen-code-core/transcriptRecords': path.resolve(
__dirname,
'../core/src/utils/transcript-records.ts',
),
'@qwen-code/qwen-code-core/userPromptSubmitContext': path.resolve(
__dirname,
'../core/src/hooks/user-prompt-submit-context.ts',
),
'@qwen-code/qwen-code-core/memoryScopes': path.resolve(
__dirname,
'../core/src/memory/scopes.ts',
),
'@qwen-code/qwen-code-core/toolWriteOrigin': path.resolve(
__dirname,
'../core/src/services/tool-write-origin.ts',
),
'@qwen-code/qwen-code-core/envVarResolver': path.resolve(
__dirname,
'../core/src/utils/envVarResolver.ts',
),
'@qwen-code/qwen-code-core/storage': path.resolve(
__dirname,
'../core/src/config/storage.ts',
),
'@qwen-code/qwen-code-core/atomicFileWrite': path.resolve(
__dirname,
'../core/src/utils/atomicFileWrite.ts',
),
'@qwen-code/qwen-code-core/debugLogger': path.resolve(
__dirname,
'../core/src/utils/debugLogger.ts',
),
}),
// Mirrors `"@qwen-code/qwen-code-core/*": ["../core/src/*"]` from
// packages/cli/tsconfig.json. esbuild reads that paths block when it
// bundles; Vitest does not read tsconfig paths at all, so this file is
// the only place the mapping exists for a test run and the two have to
// be kept in sync by hand. Importing one core module rather than the
// package root depends on this entry.
{
find: /^@qwen-code\/qwen-code-core\/(.*)$/,
Comment thread
yiliang114 marked this conversation as resolved.
Resolved
replacement: `${CORE_SRC}/$1`,
},
// The package root is matched exactly. Spelled as a string it would
// also match everything beneath it and rewrite each subpath into a
// path under index.ts.
{
find: /^@qwen-code\/qwen-code-core$/,
replacement: path.resolve(__dirname, '../core/index.ts'),
},
...toAliases({
// cli's daemon-status-provider.test.ts imports `FakeAgent` /
// `makeChannel` from acp-bridge's package-private
// `internal/testUtils` module. This alias overrides the runtime
// resolution so vitest reads the .ts source directly instead of
// the build-then-stale `dist/` copy.
'@qwen-code/acp-bridge/internal/testUtils': path.resolve(
__dirname,
'../acp-bridge/src/internal/testUtils.ts',
),
// Same rationale as above: bridgeErrors and status subpaths
// resolve to dist/ via package.json exports, but tests in the
// monorepo worktree need the live source (dist may be stale or
// absent during development).
'@qwen-code/acp-bridge/bridgeErrors': path.resolve(
__dirname,
'../acp-bridge/src/bridgeErrors.ts',
),
'@qwen-code/acp-bridge/status': path.resolve(
__dirname,
'../acp-bridge/src/status.ts',
),
'@qwen-code/acp-bridge/bridge': path.resolve(
__dirname,
'../acp-bridge/src/bridge.ts',
),
'@qwen-code/acp-bridge/spawnChannel': path.resolve(
__dirname,
'../acp-bridge/src/spawnChannel.ts',
),
'@qwen-code/acp-bridge/processRegistry': path.resolve(
__dirname,
'../acp-bridge/src/process-registry.ts',
),
'@qwen-code/acp-bridge/daemonMemoryBudget': path.resolve(
__dirname,
'../acp-bridge/src/daemon-memory-budget.ts',
),
'@qwen-code/acp-bridge/ndJsonStream': path.resolve(
__dirname,
'../acp-bridge/src/ndJsonStream.ts',
),
'@qwen-code/acp-bridge/logRedaction': path.resolve(
__dirname,
'../acp-bridge/src/logRedaction.ts',
),
'@qwen-code/acp-bridge/bridgeClient': path.resolve(
__dirname,
'../acp-bridge/src/bridgeClient.ts',
),
'@qwen-code/acp-bridge/bridgeOptions': path.resolve(
__dirname,
'../acp-bridge/src/bridgeOptions.ts',
),
'@qwen-code/acp-bridge/promptLedger': path.resolve(
__dirname,
'../acp-bridge/src/prompt-ledger.ts',
),
'@qwen-code/acp-bridge/bridgeTypes': path.resolve(
__dirname,
'../acp-bridge/src/bridgeTypes.ts',
),
'@qwen-code/acp-bridge/bridgeFileSystem': path.resolve(
__dirname,
'../acp-bridge/src/bridgeFileSystem.ts',
),
'@qwen-code/acp-bridge/sessionArtifacts': path.resolve(
__dirname,
'../acp-bridge/src/sessionArtifacts.ts',
),
'@qwen-code/acp-bridge/eventBus': path.resolve(
__dirname,
'../acp-bridge/src/eventBus.ts',
),
'@qwen-code/acp-bridge/replayWindowLimits': path.resolve(
__dirname,
'../acp-bridge/src/replayWindowLimits.ts',
),
'@qwen-code/acp-bridge/transcriptReplay': path.resolve(
__dirname,
'../acp-bridge/src/transcript-replay.ts',
),
'@qwen-code/acp-bridge/workspacePaths': path.resolve(
__dirname,
'../acp-bridge/src/workspacePaths.ts',
),
'@qwen-code/acp-bridge/externalToolGuard': path.resolve(
__dirname,
'../acp-bridge/src/externalToolGuard.ts',
),
'@qwen-code/audio-capture': path.resolve(
__dirname,
'../audio-capture/src/index.ts',
),
'@qwen-code/sdk/daemon/transcript': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/transcript.ts',
),
'@qwen-code/sdk/daemon/ui/transcript': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/ui/transcript.ts',
),
'@qwen-code/sdk/daemon/types': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/types.ts',
),
'@qwen-code/sdk/daemon': path.resolve(
__dirname,
'../sdk-typescript/src/daemon/index.ts',
),
}),
],
},
test: {
// See packages/core/vitest.config.ts: raise the per-test ceiling above
Expand Down
12 changes: 12 additions & 0 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@
"types": "./dist/src/utils/no-follow-open.d.ts",
"import": "./dist/src/utils/no-follow-open.js"
},
"./storage": {
"types": "./dist/src/config/storage.d.ts",
"import": "./dist/src/config/storage.js"
},
"./atomicFileWrite": {
"types": "./dist/src/utils/atomicFileWrite.d.ts",
"import": "./dist/src/utils/atomicFileWrite.js"
},
"./debugLogger": {
"types": "./dist/src/utils/debugLogger.d.ts",
"import": "./dist/src/utils/debugLogger.js"
},
"./package.json": "./package.json",
"./dist/*": "./dist/*",
"./src/*": "./src/*"
Expand Down
Loading
Loading