fix: switch copaw-worker runtime entrypoint to qwenpaw#950
Conversation
📊 CI Metrics ReportSummary
By Role
Per-Test Breakdown
Trends✅ 1 test(s) improved (fewer LLM calls) Generated by HiClaw CI on 2026-07-07 17:48:55 UTC |
|
这个迁移方向是合理的,但当前实现还有几个合并前需要补齐的运行时接线问题。
建议二选一:
Dockerfile 已经把 Matrix channel 覆盖到
PR 描述里说 TeamHarness adapter 会调用
现在用的是
这个 PR 修改了 另外,CI 评论里有旧提交上的集成测试失败,以及 最后,@maplefeng-a 也在做相关的工作,可以看看是否存在逻辑上不一致的地方。 This migration direction is reasonable, but the current implementation still has several runtime wiring issues that need to be patched before merging.
It is recommended to choose one of the two:
The Dockerfile has overwritten the Matrix channel to
The PR description says that the TeamHarness adapter will call
Currently,
This PR modifies the content that will enter the image under In addition, there are integration test failures on old commits in the CI comments, and the token/call of Finally, @mapplefeng-a is also doing related work to see if there are any logical inconsistencies. |
1. Working dir: export QWENPAW_WORKING_DIR alongside COPAW_WORKING_DIR so qwenpaw.constant resolves the runtime dir without relying on legacy COPAW_ fallback alone. 2. Dockerfile: add qwenpaw CLI symlink to PATH for TeamHarness adapter compatibility. 3. bridge.py: change agents.profiles injection from shallow setdefault() to nested merge. Previously, if config.json already had an 'agents' key, profiles/active_agent/workspace_dir were not injected. Now each sub-key is setdefault'd individually. 4. chanhelog: add PR agentscope-ai#950 entries for copaw/ image-affecting changes. Note on Matrix config overlay: the maintainer asked about potential inconsistency between the config.py overlay (copied to copaw/config/) and qwenpaw.config.config. Analysis confirms no inconsistency: - Matrix channel.py (overlaid to qwenpaw/app/channels/matrix/) does not import from config.py at all — it only depends on BaseChannel and agentscope_runtime, both available via the dual fallback. - The HiClaw config overlay (copaw/src/matrix/config.py) adds HiClaw-specific channel types to copaw.config.config and is only needed by copaw.app. qwenpaw.app loads qwenpaw.config.config (its own module), and the channel layer is config-agnostic.
maplefeng-a
left a comment
There was a problem hiding this comment.
Thanks for the follow-up. I checked the latest head, and this PR still has conflicts with main (copaw/Dockerfile, copaw/scripts/copaw-worker-entrypoint.sh, copaw/src/copaw_worker/bridge.py, and copaw/src/copaw_worker/worker.py).
Please rebase or merge main and resolve those conflicts first. Once the branch is clean again, I can continue the code review on the updated diff.
我看了最新 head,目前这个 PR 仍然和 main 有冲突,涉及 copaw/Dockerfile、copaw/scripts/copaw-worker-entrypoint.sh、copaw/src/copaw_worker/bridge.py 和 copaw/src/copaw_worker/worker.py。
请先 rebase 或 merge main 并解决冲突;分支干净后我再继续基于最新 diff 做代码 review。
1. Working dir: export QWENPAW_WORKING_DIR alongside COPAW_WORKING_DIR so qwenpaw.constant resolves the runtime dir without relying on legacy COPAW_ fallback alone. 2. Dockerfile: add qwenpaw CLI symlink to PATH for TeamHarness adapter compatibility. 3. bridge.py: change agents.profiles injection from shallow setdefault() to nested merge. Previously, if config.json already had an 'agents' key, profiles/active_agent/workspace_dir were not injected. Now each sub-key is setdefault'd individually. 4. chanhelog: add PR agentscope-ai#950 entries for copaw/ image-affecting changes. Note on Matrix config overlay: the maintainer asked about potential inconsistency between the config.py overlay (copied to copaw/config/) and qwenpaw.config.config. Analysis confirms no inconsistency: - Matrix channel.py (overlaid to qwenpaw/app/channels/matrix/) does not import from config.py at all — it only depends on BaseChannel and agentscope_runtime, both available via the dual fallback. - The HiClaw config overlay (copaw/src/matrix/config.py) adds HiClaw-specific channel types to copaw.config.config and is only needed by copaw.app. qwenpaw.app loads qwenpaw.config.config (its own module), and the channel layer is config-agnostic.
3014704 to
9911d12
Compare
… logging (agentscope-ai#950) - Replace qwenpaw health API (false positive: token check != sync complete) with Matrix /_matrix/client/v3/joined_rooms polling in background task. Marker file written when >= 1 room joined → true readiness signal. - Add logger output to build_worker_readiness() model check to eliminate diagnostic blind spot (previously model check was silent during probes). - test-helpers.sh: print last readyz JSON on probe timeout; increase docker logs --tail from 100 to 200 to preserve startup diagnostics.
833b17c to
59782d5
Compare
… logging (agentscope-ai#950) - Replace qwenpaw health API (false positive: token check != sync complete) with Matrix /_matrix/client/v3/joined_rooms polling in background task. Marker file written when >= 1 room joined -> true readiness signal. - Add logger output to build_worker_readiness() model check to eliminate diagnostic blind spot (previously model check was silent during probes). - test-helpers.sh: print last readyz JSON on probe timeout; increase docker logs --tail from 100 to 200 to preserve startup diagnostics.
1. Working dir: export QWENPAW_WORKING_DIR alongside COPAW_WORKING_DIR so qwenpaw.constant resolves the runtime dir without relying on legacy COPAW_ fallback alone. 2. Dockerfile: add qwenpaw CLI symlink to PATH for TeamHarness adapter compatibility. 3. bridge.py: change agents.profiles injection from shallow setdefault() to nested merge. Previously, if config.json already had an 'agents' key, profiles/active_agent/workspace_dir were not injected. Now each sub-key is setdefault'd individually. 4. chanhelog: add PR agentscope-ai#950 entries for copaw/ image-affecting changes. Note on Matrix config overlay: the maintainer asked about potential inconsistency between the config.py overlay (copied to copaw/config/) and qwenpaw.config.config. Analysis confirms no inconsistency: - Matrix channel.py (overlaid to qwenpaw/app/channels/matrix/) does not import from config.py at all — it only depends on BaseChannel and agentscope_runtime, both available via the dual fallback. - The HiClaw config overlay (copaw/src/matrix/config.py) adds HiClaw-specific channel types to copaw.config.config and is only needed by copaw.app. qwenpaw.app loads qwenpaw.config.config (its own module), and the channel layer is config-agnostic.
… logging (agentscope-ai#950) - Replace qwenpaw health API (false positive: token check != sync complete) with Matrix /_matrix/client/v3/joined_rooms polling in background task. Marker file written when >= 1 room joined -> true readiness signal. - Add logger output to build_worker_readiness() model check to eliminate diagnostic blind spot (previously model check was silent during probes). - test-helpers.sh: print last readyz JSON on probe timeout; increase docker logs --tail from 100 to 200 to preserve startup diagnostics.
e69bcea to
b791cd6
Compare
9898301 to
9bd3cb2
Compare
Worker changes: - copaw/Dockerfile: install qwenpaw after copaw-worker (standard venv) - entrypoint.sh: set QWENPAW_WORKING_DIR for qwenpaw config path - worker.py: switch copaw.app._app → qwenpaw.app._app (console + headless) - bridge.py: inject agents.profiles into config.json (required by qwenpaw) - matrix_channel.py: dual fallback — try qwenpaw BaseChannel first, then copaw - health.py: update docstring reference Manager changes: - Dockerfile.copaw: install qwenpaw after copaw-worker overlay (agentscope 1.0.20) - start-copaw-manager.sh: export QWENPAW_WORKING_DIR + launch python3 -m qwenpaw app CI health check changes: - test-helpers.sh: pgrep checks for 'copaw app' OR 'qwenpaw app' - test-01-manager-boot.sh: same dual pgrep pattern
87e6087 to
b3d1e5b
Compare
…e, qwenpaw symlink - changelog/current.md: add copaw→qwenpaw migration entry - copaw/Dockerfile: ln -sf qwenpaw to /usr/local/bin for CLI PATH - bridge.py: nested setdefault merge for agents.profiles (handle partially-populated blocks instead of only top-level setdefault)
The worker Dockerfile has two venvs: standard (console mode) and lite (headless mode, default when no CONSOLE_PORT is set). Both worker.py code paths (_run_copaw_with_console and _run_copaw_headless) now import from qwenpaw, but qwenpaw was only installed in the standard venv. Lite mode would crash with ImportError on startup. CI only tests standard mode (with console port), so this bug was invisible in CI. Production Workers without console ports would be affected.
Summary
Switch copaw-worker from copaw.app to qwenpaw.app as the runtime
entrypoint. qwenpaw is already present in the image as a dependency
of copaw; this change makes Workers use it directly, enabling
spawn_subagent and the full qwenpaw multi-agent feature set.
Changes (6 files, +31/-12)
Validation
Relation to TeamHarness
This PR is a prerequisite for TeamHarness Phase 4 (QwenPaw Worker
integration). The adapter code in
plugins/teamharness/adapters/qwenpaw/already imports from
qwenpaw.*modules and callsqwenpaw plugin install,but those can't work until Workers actually start
qwenpaw.app.The
agents.profilesinjection inbridge.pyfeeds directly intoTeamHarness's
_iter_qwenpaw_agents().What this does NOT change
HICLAW_COPAW_WORKER_IMAGEdefault value