feat(desktop): complete shared Session Guest controls - #4608
Merged
M4n5ter merged 1 commit intoSep 3, 2026
Merged
Conversation
M4n5ter
force-pushed
the
chore/shared-session-guest-ux
branch
3 times, most recently
from
September 3, 2026 05:25
9abd0f5 to
9cfd24d
Compare
M4n5ter
marked this pull request as ready for review
September 3, 2026 05:44
jackwener
approved these changes
Sep 3, 2026
jackwener
left a comment
Member
There was a problem hiding this comment.
Approved at exact head 9cfd24de7bc4889623ffba5255c923ff940f9de5 at the explicit direction of M4n5ter. No technical review was performed as part of this action; M4n5ter requested the approval and accepts responsibility for subsequent handling.
Review notice: This approval was submitted by an automated review agent operated by jackwener and is published at the direction of M4n5ter, who requested this action and is the human accountable for it.
Generated-by: Codex
M4n5ter
force-pushed
the
chore/shared-session-guest-ux
branch
from
September 3, 2026 06:00
9cfd24d to
9b400e4
Compare
6 tasks
Joob1n
added a commit
to Joob1n/maka-agent
that referenced
this pull request
Sep 3, 2026
Two new system_note kinds and the reshaped lastRequestAnchor land in @maka/core's closed allowlists. A merge-base client handshakes on strict epoch equality and would then fail to decode the first transcript carrying them; the epoch moves so the pair refuses each other at the handshake (main is at 101 after apache#4608, so this lands as 102). Refs apache#4559 Generated-by: Claude Code Claude-Session: https://claude.ai/code/session_014ajaRxC4jydavY9nYUFj5J
6 tasks
6 tasks
Joob1n
added a commit
to Joob1n/maka-agent
that referenced
this pull request
Sep 3, 2026
Two new system_note kinds and the reshaped lastRequestAnchor land in @maka/core's closed allowlists. A merge-base client handshakes on strict epoch equality and would then fail to decode the first transcript carrying them; the epoch moves so the pair refuses each other at the handshake (main is at 101 after apache#4608, so this lands as 102). Refs apache#4559 Generated-by: Claude Code Claude-Session: https://claude.ai/code/session_014ajaRxC4jydavY9nYUFj5J
Joob1n
added a commit
to Joob1n/maka-agent
that referenced
this pull request
Sep 3, 2026
Two new system_note kinds and the reshaped lastRequestAnchor land in @maka/core's closed allowlists. A merge-base client handshakes on strict epoch equality and would then fail to decode the first transcript carrying them; the epoch moves so the pair refuses each other at the handshake (main is at 101 after apache#4608, so this lands as 102). Refs apache#4559 Generated-by: Claude Code Claude-Session: https://claude.ai/code/session_014ajaRxC4jydavY9nYUFj5J
Joob1n
added a commit
to Joob1n/maka-agent
that referenced
this pull request
Sep 3, 2026
Two new system_note kinds and the reshaped lastRequestAnchor land in @maka/core's closed allowlists. A merge-base client handshakes on strict epoch equality and would then fail to decode the first transcript carrying them; the epoch moves so the pair refuses each other at the handshake (main is at 101 after apache#4608, so this lands as 102). Refs apache#4559 Generated-by: Claude Code Claude-Session: https://claude.ai/code/session_014ajaRxC4jydavY9nYUFj5J
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
English
Summary
Complete the shared-Session Guest controls without giving a Guest direct execution authority:
AskUserQuestionon the Owner that approved the work;Approved regeneration still executes through the existing Host
turn.regeneratehandler. The Guest can request an operation, but cannot approve or execute it.Protocol compatibility
This adds a regeneration form to the Turn-request intent and a Guest-scoped withdrawal command. Runtime Host compatibility epoch 101 rejects older peers that do not share that command vocabulary or Guest grant.
Verification
npm run buildnpm --workspace @maka/desktop run typechecknpm run lint -- --diagnostic-level=errornpm run format:check -- --diagnostic-level=errornpm run check:renderer-architecture -- --base 4b08b088c2c7a776c748ce10af9d7e20ddfd9494npm run astryx:surface-inventorynpx knip --workspace apps/desktopnpm run astryx:theme -- --checkProduct/Shared Session Guest / Request QueueandReconnecting: withdrawal remained removed after refresh; a typed reconnecting draft survived Enter; the disabled send control exposed the reconnect explanationStack
Depends on #4601, which fixes the durable success boundary for joining a shared Session.
AI use
Select exactly one:
Tool(s) and scope: OpenAI Codex implemented the protocol, Host admission path, Desktop controls, Storybook scenarios, and focused tests. The commit contains a
Generated-by: Codextrailer.Checklist
Does this PR entail a change in behavior?
中文
概要
补齐共享会话 Guest 端的常用操作,但不把任务执行权直接交给 Guest:
AskUserQuestion等需要人处理的交互,仍由批准这次工作的 Owner 正常处理;审批通过后,“重新生成”仍调用 Host 已有的
turn.regenerate。Guest 只有发起请求的权力,没有审批权,也不能绕过 Host 直接执行。协议兼容性
轮次请求新增了“重新生成”意图,同时增加了仅供 Guest 撤回自己待审批请求的命令。Runtime Host compatibility epoch 提升到 101,旧端若不理解这些命令和授权范围,会在握手阶段明确拒绝,不会带着不同语义继续运行。
验证
npm run buildnpm --workspace @maka/desktop run typechecknpm run lint -- --diagnostic-level=errornpm run format:check -- --diagnostic-level=errornpm run check:renderer-architecture -- --base 4b08b088c2c7a776c748ce10af9d7e20ddfd9494npm run astryx:surface-inventorynpx knip --workspace apps/desktopnpm run astryx:theme -- --checkProduct/Shared Session Guest / Request Queue和Reconnecting场景完成交互检查:撤回后刷新不会重新出现;重连时输入草稿在按下 Enter 后仍保留;不可用的发送按钮能显示完整重连说明Stack
依赖 #4601;前一个 PR 修正了加入共享会话时的持久成功边界。
AI 使用
工具及范围:OpenAI Codex 实现协议、Host 准入路径、Desktop 交互、Storybook 场景和聚焦测试。提交中包含
Generated-by: Codextrailer。检查清单
本 PR 是否改变行为?