Skip to content

checkpoint: preserve E6 continuation and unified conversation permissions - #614

Merged
tianxiaochannel-oss88 merged 197 commits into
mainfrom
codex/e6-safe-continuation
Nov 2, 2026
Merged

tianxiaochannel-oss88 merged 197 commits into
mainfrom
codex/e6-safe-continuation

Conversation

@tianxiaochannel-oss88

Copy link
Copy Markdown
Collaborator

Status

Draft checkpoint only. Not merge-ready, not release approval. 用户要求先保存当前代码并创建 PR;不启用自动合并,不发布,不启用或手动触发主 CI。

本 PR 保留 E6 分支已有提交历史,不只包含最后一次 UI 文案改动。创建前,远端分支相对 main 有 129 个未合入提交,另落后 main 4 个提交;本次新增的权限统一检查点在此基础上保存,未重写历史。

Summary

  • 保留 E6 的运行、委派、恢复与可靠性工作:完成事务、恢复调用去重、运行归属、排空/停机观察和资源生命周期修复,以及各自的定向测试和记录。
  • 保留频道操作与问答续接:冻结待决操作、按回答补充输入范围、从有效频道策略继承 Node 输入范围、权限 epoch/ABA fencing、审批与命令工作目录绑定、报告来源与可见性隔离。
  • 保留共享会话展示与观察恢复:工具证据归属、blocked 协议的安全展示、SSE 观察续接、侧栏初始化和 UI/Host 请求归属。
  • 保留引擎设置/安装生命周期竞态修复、API 分操作超时、Daemon 排空,以及 Office/GStack 隔离 QA 的审核输入、构建资源守卫和已有验收记录。
  • 本次新保存:普通会话、频道、队友私聊共用一个紧凑权限组件;沙盒配置留在设置;确认完全访问后同时使用 authorizationMode=always 与 workspaceAccessMode=full_access,并携带确认凭据。取消不变,退出恢复原沙盒;系统权限与 Host 拒绝规则不被绕过。
  • 菜单长名“完全访问权限”、按钮短名“完全访问”,补齐中文/英文说明及三种会话请求参数回归。其他 53 个 locale 的三条新增消息暂用英文兜底,已有译文保持不变。

Verification

以下结果仅适用于各自记录的输入与范围,不代表整个累计分支已联合验收:

  • 最新权限相关单测:33/33,覆盖选择、取消、恢复、owner/policy ABA、锁定、卸载、确认 scope 与已有翻译否定语义。
  • 最新权限浏览器组合:17/17;另有中文桌面/390px 菜单与确认框检查 2/2。HTTP/SSE 均为 mock,不能代替真实 Daemon/模型或 packaged macOS 验收。
  • Web TypeScript、lint、i18n audit、55/55 catalog audit 与 localization 编译通过;提交前再次检查 diff。
  • 更早的三种权限统一实现曾通过 Web 1085/1085 与浏览器组合 27/27;保留为此前对应输入的证据,不把它们称为当前整条分支的新验收。
  • 已有原生 pending-authority 用例与包装记录按其各自固定输入保留。本次没有打新包,也没有重跑它们作为新 UI 验收。

Pre-landing review and remaining work

最终合并审查尚未完成,不提供完整 ship/merge-ready 证明。 创建草稿仅是用户授权的备份检查点。

  • 尚未整合 main 的四个提交:a39aa463(迁移幂等)、3a7c4a82(翻译自动化)、80a6b8e2(中文翻译)、60ed9488(稳定版通知/v0.1.3)。整合后需检查重叠并验证受影响范围。
  • 新权限 UI 尚未纳入新的审核/冻结输入并完成 macOS 三种会话的真实客户端验收。当前旧 QA 包不含本次权限统一改动。
  • 两项既有 E2E 失败仍保留:私聊 blocked lineage diagnostic 数量不符;普通会话 reasoning-summary 控件断言不符。两者在未改 HEAD 的独立快照同位置复现,未放松断言或隐藏失败。
  • 原 E6 总目标的 P3 联合验收(小项目、多 required participant、SSE/Daemon 恢复)、H09 有预算的真实评估及最终 Office/macOS 验收等未完成项不因创建 PR 被标记完成。
  • 新增三条文案的其他语言翻译未完成:既有翻译服务两次 TLS ECONNRESET,使用显式英文兜底,不宣称已翻译。
  • 不包含未归属的研究文档、临时 catalog consumer 目录、自动生成的截图目录或 ignored QA profile/数据库/凭据/包产物;均保留在本地,不删除。

Documentation

上述是对应功能的设计/验证记录,不是整个累计分支的新独立文档审计或发布批准。

Test plan

  • 权限相关单测、mock 浏览器交互/请求参数、TypeScript/lint/i18n/catalog 检查(见上方范围与输入限制)。
  • 整合最新 main,并完成累计待合并范围的最终审查和针对性回归。
  • 新包三种会话权限入口、确认/取消、权限继承与实际运行的 macOS 客户端验收。
  • 处理或明确审定上述两项既有 E2E 失败及剩余 E6 验收项。
  • 人工决定是否转为可合并状态;本 PR 不启用自动合并。

Created with Codex. This is a preservation checkpoint, not a completion claim.

…ation

# Conflicts:
#	apps/web/src/features/workspace/ThreadReplyPanel.tsx
#	apps/web/src/shared/conversation/timeline/ConversationTimelineUserInputRenderer.tsx
#	packages/core/src/run-types.ts
#	packages/core/src/storage/sqlite/resource-lease-store.ts
#	packages/core/src/storage/sqlite/run-event-store.ts
#	packages/core/src/storage/sqlite/runtime-semaphore-store.ts
#	packages/core/src/storage/sqlite/user-input-host-continuation-store.ts
#	packages/core/src/workflow-step-start-owner.ts
#	packages/daemon/src/features/runs/cancellation.ts
#	packages/daemon/src/features/runs/orchestrator.ts
#	packages/daemon/src/features/runs/user-input-delivery-worker.ts
#	packages/daemon/src/index.ts
#	packages/daemon/src/run-control.ts
#	packages/daemon/src/runtime/store-registry.ts
#	packages/daemon/src/runtime/supervisor.ts
#	packages/daemon/src/server/router.ts
User-requested source backup before integrating native-engine main. Preserve 81 implementation/test/design changes plus status and SHA-256 manifest. Current regressions, Q2 and H10 writer remain incomplete; dynamic delegation stays off. No main merge, release or QA approval. Exclude the local Daemon crash report.
…ation

# Conflicts:
#	packages/core/src/run-types.ts
#	packages/core/src/storage/sqlite-run-store.ts
#	packages/core/src/storage/sqlite/runtime-recovery-coordinator.ts
#	packages/core/test/channel-runtime-store.test.mjs
#	packages/daemon/src/context.ts
#	packages/daemon/src/features/runs/approvals.ts
#	packages/daemon/src/features/runs/orchestrator.ts
#	packages/daemon/src/features/runs/threads.ts
#	packages/daemon/src/index.ts
#	packages/daemon/test/channel-turn-dispatch-recovery.test.mjs
#	packages/daemon/test/p2-stop-attempt-fencing.test.mjs
#	packages/daemon/test/provider-capability-save-boundary.test.mjs
#	packages/daemon/test/recovery-discovery-fair-scan.test.mjs
#	packages/localization/catalogs/my-MM.json
Persist original-source suspension, final settlement and terminal handoff, recovery/retention pinning, approval late-drain and post-CAS notification isolation. Preserve diagnostics and QA launch alignment with regression coverage and scoped independent-review receipts.

Core 4431/4431, Runner 567/567, A28 14/14 and final neighbors 93/93 have actual exit 0. Final complete Daemon suite remains in progress. This is a local checkpoint, not Office approval, packaged GUI acceptance, PR merge or release. The pre-existing crash report is excluded.
Pinned resource reconstruction and first executable selection passed. Preserve question fixtures and the previously approved Office snapshot. macOS packaging remains unaccepted: the Builder copy repair still needs its new specific QA review approval and a fresh package run. No release or GUI acceptance is claimed.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8771d5a1c6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4ac76b4fd0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 36970f89a6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d2d3a56a8f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7708f81d66

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@tianxiaochannel-oss88
tianxiaochannel-oss88 merged commit 1047b00 into main Nov 2, 2026
20 checks passed
@tianxiaochannel-oss88
tianxiaochannel-oss88 deleted the codex/e6-safe-continuation branch November 2, 2026 03:08
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