合并 tjwater-cli 到 main #1

Merged

jiang merged 73 commits from tjwater-cli into main 2026-08-18 17:56:45 +08:00

Conversation 0 Commits 73 Files Changed 172

+13212 -5019

jiang commented 2026-08-18 16:38:54 +08:00

Owner

Copy Link

Copy Source

合并说明

将 tjwater-cli@18e8b25 合并到 main，统一 Agent 服务、TJWater CLI、权限控制、结果引用和容器门禁。客户交付版不在本 PR 范围内。

已完成 main 祖先整合，并修复 CLI 子进程无界输出、超时孤儿进程、SIGKILL 兜底和 stdin EPIPE 问题。Server 的传感器布置公开合同已同步收敛，现有 CLI 请求字段可通过后端验证。

最终门禁

• TypeScript 主工程和 OpenCode 类型检查通过。
• Agent OpenAPI 合同校验通过。
• Node CLI 端到端测试：6/6。
• Bun：96/96 tests。
• Docker test target 构建通过。

后续事项

• ci-templates@main 与 uv/install.sh 仍是既有供应链基线风险，发布前确认是否固定版本。
• timeout 上限、带引号参数解析及成功但非 JSON 的语义可在后续 PR 收敛。

本次仅合并代码主线，不打 tag、不发布、不部署。

## 合并说明 将 `tjwater-cli@18e8b25` 合并到 `main`，统一 Agent 服务、TJWater CLI、权限控制、结果引用和容器门禁。客户交付版不在本 PR 范围内。 已完成 `main` 祖先整合，并修复 CLI 子进程无界输出、超时孤儿进程、SIGKILL 兜底和 stdin EPIPE 问题。Server 的传感器布置公开合同已同步收敛，现有 CLI 请求字段可通过后端验证。 ## 最终门禁 - TypeScript 主工程和 OpenCode 类型检查通过。 - Agent OpenAPI 合同校验通过。 - Node CLI 端到端测试：6/6。 - Bun：96/96 tests。 - Docker `test` target 构建通过。 ## 后续事项 - `ci-templates@main` 与 `uv/install.sh` 仍是既有供应链基线风险，发布前确认是否固定版本。 - timeout 上限、带引号参数解析及成功但非 JSON 的语义可在后续 PR 收敛。 本次仅合并代码主线，不打 tag、不发布、不部署。

jiang added 71 commits 2026-08-18 16:38:54 +08:00

新增应用样式工具 20329bb771

后端服务将通过tjwater-cli形式访问 5b285ad7a5

重新整理提示词和工具说明。 a825c3c31d

更新tjwater-cli skill和环境 96e5d25518

避免abort后创建新的session 76d4b510f4

重构会话管理，简化上下文存储逻辑 04ded0ceb0

refactor: unify agent session persistence 0ecb2babf3

重建会话记录逻辑 0188240d62

更新memory读取机制，新增前需要先list阅读已有的内容 8a1785c244

增加流式信息中断处理机制 f4749d6e2e

refactor(agent): 移除旧工具桥 10c11a5254

fix(chat): 解决token传输、本地文件存储顺序、读取的问题 fc0e76439d

完善 skill_manager 的技能维护能力 ad31956f53

提示词禁止使用 read/cat 读取文件，避免输出过长信息到终端 8f0e93ceec

Remove .opencode/skills/ from git tracking 67d027e60c

更新 .gitignore 5e0c16f8b2

refactor: remove legacy data compatibility 1ed7e56f35

refactor: keep runtime context in memory 9d4e5486e9

style(opencode): format tool definitions ba46258845

feat(auth): validate agent requests 5020e58b7e

build(docker): fix agent image build 741e39b444

build(docker): include tjwater cli 8a7964dc57

build(cli): replace bundled binary cli 4b03aa3a91

fix(cli): show group help ff87817fb5

refactor(cli): split tjwater cli modules 93d70da8be

build(agent): include cli in build stage 359b1e6e55

暂时移除后端的认证校验 2295bdcb97

fix(chat): guard abort and early idle races 6f3b72628f

升级@opencode-ai版本到1.16.2 7dbbeb4aa9

添加不使用自代理的要求 4e31b141e7

feat: handle opencode permission requests 05d36aa8ca

feat(chat): 支持自动始终允许权限 f61389ab07

fix(chat): 支持重新生成前撤销消息 0e1ca2418f

fix: regenerate from target turn f3b62ed108

更新 store_render_ref.ts render_junctions.ts 工具使用说明 f20847399a

fix(chat): handle question and todo state 15c3263369

fix(chat): restore forked context 801f611ce5

refactor(chat): drop branch groups state 60b9080c47

fix(chat): hide raw permission metadata 8ed73b1da6

fix(agent): warm up opencode on startup 873c169c2c

feat(tools): add search and map tools 20b93c688f

docs: add repository guidelines d1b91a4b1e

fix(tools): clarify chart data format cf6cada538

refactor(chat): centralize session persistence fa2c28c1c0

chore(model): default to deepseek flash 366c05b752

feat(chat): expose model options config c823e3935e

refactor(sessions): remove transcript truncate fc7393fa2b

chore(model): use flash agent model 4b572d9264

feat(auth): validate agent context upstream 8857b18dc9

refactor(agent): normalize API naming ead76185b7

fix(cli): use renamed backend APIs d75b98a61b

fix(style): validate layer style configuration 40c0395fb1

fix(session): propagate network context d782b7fa11

fix(docker): vendor bun binary for image builds 9aad38acb1

fix(ci): build docker image with host network 78f9f6fb42

fix(docker): make ubuntu apt mirror optional d7faaa2ecb

docs: 编写中文 README 2415f75841

feat(api): expose REST-only agent routes 94529cb141

fix(agent): complete opencode warmup before serving ... 07016451d6

The previous fire-and-forget startup only created the SDK client, leaving the first chat to await project and tool initialization. Warm the real session/tool path and gate port listening on completion.

feat(opencode): migrate agent runtime to v2 764a1f4e82

fix(opencode): restore stable v1 runtime 1407dd3bbe

fix(cli): map timeseries element types for backend a53839e157

fix(agent): preserve runtime request context ... 2dc37e3fd8

OpenCode tools run in a child service, so they cannot read the Agent process-local session map. Hydrate a sanitized context through the authenticated internal bridge and centralize backend project headers to prevent context loss across both boundaries.

feat(agent): add credential refresh and unify learning tools 258f4996eb

test(cli): remove Python parity dependency a5e91ac2b8

feat(agent): 完善权限与结果引用安全 b19af8846a

fix(agent): disable unobservable task subagents f66b9c3e9d

fix(permissions): require approval for backend queries 4cbeca4e09

ci(agent): 添加新版发布与传输验证工作流 c565e89d60

ci: activate Agent v2 deployment workflow 31fdb36e48

fix(container): isolate Agent runtime state b49290bd91

jiang added 2 commits 2026-08-18 17:00:45 +08:00

merge(agent): integrate main into tjwater-cli 9aa5a96e60

fix(agent): bound CLI subprocess execution 18e8b25f48

jiang marked the pull request as ready for review 2026-08-18 17:53:43 +08:00

jiang merged commit 11ebf428bb into main 2026-08-18 17:56:45 +08:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

jiang xkl

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: OrgTJWater/TJWaterAgent#1