0 Fork 0

mirror of https://github.com/QwenLM/qwen-code.git synced 2026-11-07 06:19:43 -10:00

Files

T

易良andQwen-Coder 73aa65a4b4 chore(desktop): rename packages/desktop-shell to packages/desktop (#12653 )

* chore(desktop): rename packages/desktop-shell to packages/desktop

The Electron-era packages/desktop was removed in #9085 and the OpenWork
downstream has forked, so the short name is free and the shell suffix is
the only thing left of the transition. Rename the package directory and
every load-bearing reference: workspace negations (npm + pnpm), the ci.yml
crate filter, desktop-release.yml, the isolation guard, lint/ignore configs,
scripts tests, CLI workspace-fixture tests, and living docs.

User-facing identity is untouched: the crate stays qwen-code-desktop,
productName stays "Qwen Code Desktop", the bundle identifier, updater
feed, release tag scheme, and the legacy electron-bridge asset names are
all unchanged. check-desktop-isolation now guards both path names so the
old one cannot re-enter a workspace set. Dated design docs under
docs/design/ keep their historical paths deliberately.

Refs #8596

* docs(design): follow the rename in the undated notification design notes

The web-shell-browser-notification-details pair is a living doc without a
date prefix, so it falls under the PR's update rule rather than the
historical-record exception.

* docs(desktop): stop citing paths the rename invalidated

Three prose sites and one CI comment still described the pre-rename world,
or contradicted themselves once `packages/desktop` named both the removed
Electron app and the living Tauri shell.

- ci.yml `desktop_shell`: the comment this branch added credited the
  Cargo.toml guard with keeping "branches from either side of the rename"
  green. It does not. A pre-rename head's files sit under
  `packages/desktop-shell`, which the changed-files filter no longer
  matches, so the job skips before the guard ever runs. Say that, and say
  what the guard does cover (a head the filter matched because ci.yml
  itself changed, with no crate at the new path).
- docs/design/web-shell-user-message-links.md: "desktop-shell routing" /
  "desktop-shell clicks" -> "desktop-host", the wording this branch already
  chose in LinkifiedText.tsx for the same rule.
- docs/design/telemetry-runtime-client-attribution-design.md: repoint the
  `runtime.rs` citation. It backs the live `QWEN_CODE_DESKTOP=1` claim, and
  the other document of record for that invariant -- the comment in
  acp-channel-fallback.ts -- was already repointed by this branch, so the
  two disagreed. Only the path token changes; the doc's dated findings are
  untouched.
- brand-create.mjs / SKILL.md / src-tauri/src/main.rs: name the historical
  referent as historical (the Electron `packages/desktop` removed in PR
  9085) instead of letting it read as a self-reference. In main.rs the
  citation `packages/desktop/packages/shared/src/config/storage.ts` now
  looked like a subpath of the file's own package. Rewritten, not deleted:
  the `QWEN_DEFAULT_WORKSPACE_DIR` clause next to it is the only in-code
  documentation of that override and still resolves.

Deliberately not swept: `scripts/check-desktop-isolation.js`'s
`packages/desktop-shell` tripwire, ci.yml's #8132 history comment,
`docs/design/9152-architecture-invariant-classification.md` (names both
spellings and is accurate), and the date-prefixed
`docs/design/2026-07-31-desktop-web-shell-release.md`.

Co-authored-by: Qwen-Coder <[email protected]>
Patrol-Run: qwen-pr-closeout/jmug1iw422v

* test(scripts): pin the desktop crate path and the isolation guard's coverage

Both invariants fail green today, and this rename is the second time the
crate directory has moved.

`scripts/check-desktop-isolation.js` gained `'packages/desktop'` in
`nativePrefixes` -- the only production-logic line in this branch -- and
nothing read it. Deleting that line leaves the guard's output and exit code
byte-identical, because `isNativeLocation('packages/desktop')` then matches
no remaining prefix; a later PR that drops `!packages/desktop` from the root
workspace list would re-admit the package with CI green.

The `desktop_shell` job names the crate directory in five places (the
changed-files filter, the Cargo.toml guard and its `::notice::` text, the
rust-cache `workspaces:`, and two `working-directory:` values). Nothing
asserted they agree with each other or with a directory that exists, so the
next drift reports a skipped job as a passed one.

The new suite parses both instead of re-running them, and is superset-shaped
on purpose: `nativePrefixes` carries a fourth entry (the
`packages/desktop-shell` tripwire) that nothing negates, and an exact-match
assertion would invite deleting it. The npm/pnpm mirror of the negation list
is already pinned by package-scripts.test.js, so this reads package.json only.

Verified by mutation, each applied alone and then restored: reverting the
filter alternative or either `working-directory` to `packages/desktop-shell`,
dropping `'packages/desktop'` from `nativePrefixes`, and dropping
`!packages/desktop` from package.json all turn this suite red. Today no other
test does.

Co-authored-by: Qwen-Coder <[email protected]>
Patrol-Run: qwen-pr-closeout/jmug1iw422v

* test(scripts): pin what the desktop-isolation tests actually claim

Four review findings on scripts/tests/desktop-isolation.test.js, each
verified by mutating the thing it claims to pin, before and after.

- The comment above the local `isNativeLocation` copy claimed a change to
  the script's rule "has to be made here too". Nothing reads the rule back
  from the producer -- `nativePrefixesFromSource` parses the array literal
  only -- and narrowing the script's rule to prefix equality leaves the
  suite green. Describe the copy instead of claiming coupling that does not
  exist.
- `still carries the Cargo.toml existence guard` matched only the guard's
  condition text. Flip the body's `changed=false` to `changed=true`, or move
  it after `fi`, and the suite stayed green at 5/5 while the job runs every
  gated step against a crate that is not there. Assert the assignment sits
  inside the guard's own `if ... fi` body.
- Both on-disk checks keyed on the bare directory, so git-ignored residue
  under `packages/desktop-shell` (`node_modules`, which survives a branch
  switch with an empty `git status`) reddened two tests on a tree with no
  defect and blamed the root workspace set. Key on `package.json`, which is
  what `packages/*` requires to make a directory a workspace member; a real
  re-entry still reddens both.
- The `startsWith(filterAlternative)` assertion compared a path built from
  `crateDir` -- `filterAlternative` with one trailing slash stripped -- back
  against `filterAlternative`, so it could not fail for any input. Dropping
  the trailing slash from the changed-files filter in ci.yml left it green.
  Replace it with the property that makes the alternative a path prefix
  rather than a bare string prefix.

Co-authored-by: Qwen-Coder <[email protected]>
Patrol-Run: qwen-pr-closeout/jmugedurp3j

---------

Co-authored-by: Qwen-Coder <[email protected]>

2026-09-25 05:41:25 +00:00

5.5 KiB

Raw Permalink Blame History

Telemetry: Daemon 会话的 channel 归因

配套 issue: #8660 基于 2026-08-07 对 qwen-code main 分支的代码复核

1. 背景

默认 usage-statistics（qwen-logger RUM）载荷中只有一个入口维度 properties.channel，它来自 --channel 标志：

VS Code 伴生插件直接启动 qwen --acp --channel=VSCode
Electron 桌面端直接启动 qwen --acp --channel=desktop
TS/Python/Java SDK 的主入口（query()）直接 spawn CLI（stream-json 模式），自带 --channel=SDK
--acp 未显式指定 channel 时回退为 ACP（packages/cli/src/config/config.ts 的 ACP fallback）

但 qwen serve（daemon）的 spawn 工厂启动的是不带 channel 的 qwen --acp 子进程（packages/acp-bridge/src/spawnChannel.ts），因此经 daemon 承载的会话——SDK 的 daemon 客户端入口（如 TS SDK 的 DaemonClient/DaemonSessionClient）、Web Shell、Tauri 桌面 shell——全部上报为 ACP，无法区分。Tauri shell 启动 daemon 时设置了 QWEN_CODE_DESKTOP=1（packages/desktop/src-tauri/src/runtime.rs），但 telemetry 从未读取该变量。

app.channel 是来自 ~/.qwen/source.json 的安装来源，与入口归因是不同概念，不应被重载。

2. 方案

复用现有 properties.channel 维度，不新增 payload 键。getChannel() 经复核没有任何行为消费方（只有 telemetry 读取），channel 是纯上报维度，扩展其取值无副作用。

daemon 在每个子进程环境中设置 QWEN_CODE_SERVE=1 标记，覆盖两个 spawn 点：

packages/acp-bridge/src/spawnChannel.ts（ACP 会话子进程）
packages/cli/src/serve/channel-worker-supervisor.ts（channel worker；worker 内 channels/base/AcpBridge.ts 通过 {...process.env} 继续继承该标记）

CLI 的 ACP channel 回退（packages/cli/src/config/acp-channel-fallback.ts）按标记解析：

条件	channel 取值
显式 `--channel=X`	`X`（不变，显式参数优先）
`QWEN_CODE_DESKTOP=1`	`desktop`（Tauri shell 会话，与 Electron 桌面端同一客户端身份）
`QWEN_CODE_SERVE=1`	`daemon`（daemon 承载的会话）
其余	`ACP`（直接三方 ACP 启动，不变）

归因矩阵：

场景	properties.channel
交互/无头 CLI	（无）
三方直接 ACP	`ACP`
VS Code 伴生	`VSCode`
Electron 桌面端（直连，不走 daemon）	`desktop`
SDK `query()` 直连（TS/Python/Java，不走 daemon）	`SDK`（SDK 自带，不变）
daemon 会话（SDK daemon 客户端、Web Shell 等）	`daemon`
daemon 会话（Tauri desktop shell）	`desktop`
docker/podman sandbox 内的 daemon 会话	继承外层 `daemon`/`desktop`
daemon channel worker	worker 名（如 feishu，不变）

3. 为什么 daemon 会话不能像 VS Code 那样直接传 `--channel`

VS Code 伴生插件自己拥有 spawn：一个客户端 = 一个专属子进程，所以能传 --channel=VSCode。

daemon 的桥接模型不同（packages/acp-bridge/src/bridge.ts）：一个 bridge（一个 workspace）至多一个 qwen --acp 子进程，所有客户端的会话经 connection.newSession() 多路复用到同一个进程上，共享进程/OAuth/FileReadCache。因此：

spawn 时不知道哪个客户端会连进来（子进程可能预热）；
同一进程内同时跑着不同客户端的会话，进程级参数无法表达会话级身份；
qwen-logger payload 是进程级构造，进程级 channel 无法按会话区分客户端。

环境标记 + 回退解析因此是当前模型下唯一的进程级归因手段。

4. Schema 影响与兼容性

零新增键。properties.channel 仅新增一个可能取值：daemon（desktop 是既有取值，Tauri shell 会话并入其中）。
app.channel 语义与取值不变；显式 --channel 的既有取值（VSCode/desktop/SDK/worker 名）不变。
QWEN_CODE_SERVE 为信息性标记，不含敏感信息；不进入 SCRUBBED_CHILD_ENV_KEYS（denylist 语义不受影响）。
docker/podman sandbox 会显式透传 QWEN_CODE_SERVE / QWEN_CODE_DESKTOP，避免 sandbox 内子进程退回 ACP；项目 .env/settings.env 不能设置这两个标记，避免 workspace 伪造客户端归因。

5. 后续工作（不在本次范围）

按 SDK/Web Shell 细分客户端需要会话级归因：各客户端在创建会话时经由 daemon 自我声明，现有 qwen.session.source meta → config.setSessionSource(sourceType, sourceId) 管道（#8155 为生命周期钩子引入）是自然的扩展点。当前 Web Shell 主会话仅使用 sourceType: 'default'。由于默认 payload 是进程级的，会话级身份落到 telemetry 还需要会话维度的支持，届时再决定是否引入独立的 client 键。

5.5 KiB Raw Permalink Blame History Unescape Escape