Skip to content

test(integration): combine all open PRs for dev validation - #36

Closed
ZeroPointSix wants to merge 27 commits into
mainfrom
codexweb/integration-all-open-prs-20260812
Closed

test(integration): combine all open PRs for dev validation#36
ZeroPointSix wants to merge 27 commits into
mainfrom
codexweb/integration-all-open-prs-20260812

Conversation

@ZeroPointSix

Copy link
Copy Markdown
Owner

Summary

这是全部开放 PR 的隔离集成与一比一测试分支。当前已合并并验证 W1 的 #31#30;后续会继续合并 #33#35#34#32

Review Contract

Goal

在不修改 main 和原 PR 分支的前提下,将当前开放 PR #30#35 全部纳入同一可测试分支,解决重叠实现与冲突,并执行仓库现有 Web/Rust 门禁和运行验收。

Non-goals

  • 本 Draft PR 不授权自动合并到 main。
  • 不改写任何原 PR 的 head 分支。
  • 不改变现有部署或生产环境。

Accepted Residual Risks

Acceptance Criteria

Merge Ledger

cursoragent and others added 27 commits August 12, 2026 04:17
Replace ProTable sessions list and detail pages with a read-only
three-column SessionWorkbenchPage using Ant Design X Conversations for
the sidebar, status bar + transcript placeholder in the main panel,
and metadata/alerts/events tabs in the inspector.

Co-authored-by: ZeroPointSix <ZeroPointSix@users.noreply.github.com>
- 左栏新增 New chat 禁用占位(会话创建 W6 开放)
- 中栏状态条补齐 Profile / workdir 字段
- 底部只读条内嵌 SSE 连接态:新增 StreamStatusContext,复用 AdminLayout 同一 SSE,不新建连接
- 新增 useMediaQuery,≤1100px 左右栏折叠为 Drawer,390 下顶栏不溢出
- 版本号 0.2.3 → 0.3.0
- 重新构建并提交 web/app.js 与 web/styles.css 产物
…-all-open-prs-20260812

# Conflicts:
#	web/app.js
#	web/src/components/SessionTable.tsx
#	web/src/pages/SessionDetailPage.tsx
…-all-open-prs-20260812

# Conflicts:
#	web/app.js
#	web/package.json
#	web/pnpm-lock.yaml
#	web/src/components/AdminLayout.tsx
#	web/src/components/RecentSessionsTable.tsx
#	web/src/pages/OverviewPage.tsx
#	web/src/pages/SessionWorkbenchPage.tsx
#	web/src/styles.css
#	web/styles.css
…-all-open-prs-20260812

# Conflicts:
#	web/app.js
#	web/src/lib/session.test.ts
#	web/src/pages/OverviewPage.tsx
#	web/src/pages/SessionDetailPage.tsx
…-all-open-prs-20260812

# Conflicts:
#	crates/openab-core/src/session_snapshot.rs
#	crates/openab-core/src/slack.rs
#	crates/openab-gateway/src/session_admin.rs
#	web/src/components/RecentSessionsTable.tsx
#	web/src/components/StatusTag.tsx
#	web/src/hooks/useSessionStream.ts
#	web/src/lib/format.ts
#	web/src/lib/session.test.ts
#	web/src/pages/OverviewPage.tsx
#	web/src/pages/SessionDetailPage.tsx
…-all-open-prs-20260812

# Conflicts:
#	crates/openab-gateway/src/session_admin.rs
ZeroPointSix added a commit that referenced this pull request Aug 13, 2026
Resolve the diverged #36 and #37 integration trees by retaining the current #39 tree, which contains the complete #30-#35 integration plus #38. The second parent preserves the exact #36/#41 head for ancestry and auditability without reintroducing its incomplete duplicate workbench implementation.
@ZeroPointSix

Copy link
Copy Markdown
Owner Author

已由 #46 的干净 ZER-404 W1–W5 只读工作台整合替代。#46 从最新 main 重建并保留了明确的只读范围与完整验证,此早期全量开放 PR 验证分支关闭归档。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants