[상류 C1] 협업 grant/Host caller 기반 정합·검증 #195
Assignees
dreampiler (dreampiler)
Clear assignees
dreampiler (dreampiler)
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: dreampiler/kandev#195
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
원 요구·승인
소유자 직접 실행 지시(2026-10-29, Codex 01a1676b-302e-7d91-8b95-21a59b6404ca): 「제안한 대로 중복 PR을 정리하고, #4917 리뷰 2건 수정과 외부 규칙 카탈로그 후속도 검증부터 상류 PR 반영까지 계속 진행해줘. 기존 기능과 이력은 보존하고 중복 PR은 만들지 마. 내가 처리해야 할 권한·승인만 구체적으로 알려줘. 추천한 아래 순서대로 진행되도록 지속적으로 작업 관리해서 모두 상류 PR 까지 되도록 처리해줘. 중복 정리·기존 PR 충돌 수정 → 현재 진행 중인 작업 → 독립적인 작은 수정 → 실제 의존 기능 → 미완성 closure 완성」
승인 제안: _Transient/active/upstream-pr-owner-20261023/feature-pr-map.md 540행 'Collaboration grants C1' — 기존 39-path native/Host 기반 제안 4828ac866625 + 후속 report/prompt/control/UI 소비자, 옛 25-path 부분만 재제출 금지. 새 default-OFF 기반 뒤 실제 UI/MCP 소비자, #4330이 기존 방향 요청. 승인된 detached/background plugin 동작 보존하며 origin 전파 완성. 순서상 4단계 '실제 의존 기능'.
보존 source (fork 원격, 8e 읽기 전용 확인)
origin/codex/collaboration-plugin-callers = 4828ac866625ab82041e83d6339eefd39a128849(39 paths, dee759+7e4 독립 control 수정 포함). 후속 d92cd73a9(UI/MCP report), 0b2d52ffe(prompt/queue identity), 3800950f9/3fe6d437e(task/VCS 선택). 3cb 대조 결과를 입력으로 쓴다.
첫 행동과 범위
자기 Native 사본에서 base/HEAD/dirty 확인 → 보존 branch를 현재 upstream main 위로 새 상류 준비 branch에 비강제 정합(force/reset/amend 0, 원 branch 보존). 알려진 약점: hostOperationNeedsCaller가 context.Background 기반 정상 detached/background 권한까지 막는 정적 조건 — 실제 진입점으로 재현 후 필수 정합. JSON caller 신뢰·신규 서명/hash/권한 체계 0. 현재 main의 task principal/native identity가 이미 있으므로 #4715/#4721/#4773을 허위 선행으로 두지 않는다. 좁은 확인: OFF/native 동작 불변, ON grant 4종 독립, RBAC 교집합, 사람만 grant 수정, report가 prompt launch 안 함, 실 SDK callback·병렬 caller·cancel stale·정상 background. 기존 시험 파일의 승인된 최소 회귀/변경 동행 단위 시험 예외만, 정상 hooks, 바뀐 delta 정식 RV. predecessor 39 paths를 C2 등 다른 main PR에 중복 0, #4628 합본 0. C2(gateway CLI/completion)는 이 C1 실 grant/caller/API를 소비하는 후속 단위로 별도.
선행·쓰기 경계
실 선행: P48 Host exact source task 34658b36-d3a5-425e-85ed-84b1bc2de910(parent 93, 현재 구현 RUNNING)이 공통 proto/SDK/Host/state 경로를 쓰는 중 — 그 source의 검증·5d 인계 뒤 해당 경로 명시 해제가 있어야 이 task가 그 경로에 쓴다. 해제 전 같은 경로 동시 쓰기 0. 순서: 진행 중 작업·독립 작은 수정 우선 뒤 8e가 대기 칸으로 옮긴다. 공개 push/PR/답변은 93→5d 단일 경로, #4330 방향 무답을 영구 보류로 쓰지 않는다. 운영/모델순서/WIP/설정 변경 0. 결과는 8e/current 96e9d7f4-0840-479a-b7b6-3e18d45b4da4에 1회.
3cb verified official task af3f625e/parent8e CREATED/predecessor-wait/session null and original p330 binding. Exact C1 source owner is now assigned, no implementation/verification/PR claimed. Existing P48 Plan has no new path-release record at read; requested same34658b36 writer to return exact shared proto/SDK/Host/state paths, reviewed candidate/base and release time to existing93/8e after its current unit. File overlap is writer sequencing, not an invented whole-P48 merge dependency; independent read/preparation distinct. User priority and14/10/4/dynamic order unchanged; no duplicate C1/P48 source. Actual release then normal8e start same task; C2 consumes actual grant/caller contract later.
Verified P48 Planf5309766/review121719@1793231765 completed APPROVE both reviewers, no mandatory findings, optional suggestions preserved. Sourcehead7169420365eeca772cfebc55cd17ee119fc34304/basefa6696c202f36011274151b7982916cc7a3cb242; shared28paths released00:00:10Z recorded verbatim in C1 Plan8e034958. P48 API is not C1 dependency; shared-path wait cleared. Existing8e resume handoff sent05248928, actual C1 first execution still to read back. Existing93 publisher handoff queuedc5c81619, publication not yet confirmed; PGconformance unrun/noDSN, optional review gap kept distinct from existing required repository checks. No repeated RV/tests/source/newtask or production change.
8e receiving acceptance: ACCEPT C1 collaboration grants / Host caller foundation (task af3f625e-9946-43a5-b4a8-95eb7382eb89, single writer). 8e read-only checks: worktree kandev-upstream-c1-c_etdydthh branch feature/kandev-upstream-c1-c-w1f HEAD db38019e5b7aeb115d04c1e8a4d9ef3572c7ec61, clean, base upstream main dc2d77359f101fe398255112346b60c617477162, 79 files +3442/-96, no new test file (cases moved into existing auth_test.go, workspace_clone_test.go, serve_test.go, canvas_tools_test.go). 8e ran upstream pr-docs.cjs validateCoverage: covered, errors 0. Content: non-force reconciliation of the preserved 4828ac866625 onto current main (original branch kept), workspace grants and status-only conversation reports (d92), prompt/queue grant identity (0b2d), explicit Host method classification for hostOperationNeedsCaller (exempt/required) with Host_ServiceDesc completeness test and real broker background/dropped/forwarded/OFF cases, docs/spec; 3800950f9/3fe6d437e already on main and not duplicated. Formal RV split into four packets (77/77 coverage), all completed APPROVE findings 0 (8e read all four): P1 SDK/Host FORMAL-review-c1-packet1-sdk-host-r6.patch-1793279846377431400-41617-upper-1 (earlier rounds fixed outgoing replay, forgeable incoming metadata, valueCtx.String leak, context wrapper reuse; final bearer contract documented because new signature/hash is out of scope), P2 grants/sqlite ...-59760-upper-1, P3 handlers/MCP/queue ...-43197-upper-1, P4 web/docs ...-92053-mid-1. Source-reported: SDK full tests and vet, backend build and curated tests, changed Go lint 0, spec/docs lint, web typecheck/i18n pass; PostgreSQL conformance skipped without DSN; storeconformance v0.93.0 failure also on base. Shared paths: P48 #4936 still OPEN at b349a45c01fa (not merged), so no rebase now; if #4936 merges first, recheck shared plugins/SDK hunks before publication or rebase. backendapp/services.go hunks are not adjacent to 9066 H3. No push/PR/comment. Publication: 93->5d new narrow upstream PR (linked to #4330 direction request).
C1 upstream prep: 8e 보완 반영·packet RV 4/4 APPROVE. head db38019e5b7, base dc2d77359f1, branch feature/kandev-upstream-c1-c-w1f, dirty 0, 79 files. 새 상시 test 파일 0(test 4개를 기존 auth_test.go·workspace_clone_test.go·serve_test.go·canvas_tools_test.go로 이동, 이동 case PASS). P1 FORMAL-review-c1-packet1-sdk-host-r6.patch-1793279846377431400-41617-upper-1 APPROVE; P2 FORMAL-review-c1-packet2-grants-sqlite.patch-1793276476621163700-59760-upper-1 APPROVE; P3 FORMAL-review-c1-packet3-handlers-mcp-queue.patch-1793276477277071900-43197-upper-1 APPROVE; P4 FORMAL-review-c1-packet4-web-docs-r2.patch-1793279846912392600-92053-mid-1 APPROVE; findings 0, missing 0. P1 live-reference bearer 계약을 system design/task-02에 명시(db38019e5b7). P48 #4936 OPEN b349a45c01fa, rebase 없음. push/PR/댓글 0, amend/force 0. 상류 준비물을 93→5d 게시 담당에 인계했고, 이 flow는 게시 전이라 종결하지 않는다.
8e publication acceptance: C1 collaboration grants and Host caller context is published upstream as the new narrow PR kdlbs/kandev#4946 'feat(tasks): add opt-in workspace collaboration grants and Host caller context' by sole publisher 5d. 8e gh readback: OPEN, MERGEABLE, head db38019e5b7aeb115d04c1e8a4d9ef3572c7ec61 = reviewed head accepted in artifact-note:20261029T132745193055Z. 93 readback: non-draft, review gate BLOCKED, base main 012fb3c04069, 79 files +3442/-96, 17 commits, inline review threads 0; exact-head check-runs 20 (0 failed, 5 in progress, 6 success, 8 skipped, 1 neutral); PR documentation coverage SUCCESS (run 40882907706); PR body links #4330, keeps C2 and #4628 separate, and states the follow-up rebase condition for paths shared with #4936 plus the PostgreSQL/storeconformance limits. Not a whole-CI-green or merge claim. Maintainer review and merge remain external.
반영·정리 단계 완료.
db38019e5b7(79 files, dirty 0, 새 상시 test 파일 0)을 변경 없이 8e가 수용했고, 8e가 93에 새 좁은 상류 PR 후보로 1회 인계했다(8e-c1-collab-grants-handoff-20261029, statussent).FLOW-NOTE-...-132934209903Z로 기록했으며 상류 push/PR/댓글은 0이다.C1 #4946 review fix: local head 6654afb9b17, delta base db38019e5b7, 6 files +224/-10, delta RV backend/web 2/2 APPROVE findings 0. P1 prompt-only read-scope fix 9d4e4f7; P2 tests 2ab5d1d/6654afb. Public #4946 head still db38019e (not yet 5d-updated); upstream main now da9ff633. Worker push/PR/comment/resolve/force/reset/amend 0. 5d must update PR head and answer threads P1/P2; flow remains open.
8e receiving acceptance (#4946 review follow-up on the closed r12 flow; earlier results stay valid): ACCEPT head 6654afb9b17f585588eed3e522cd7b7edb4482e6 for the two #4946 threads. 8e read-only checks: same branch feature/kandev-upstream-c1-c-w1f, clean, descendant of public #4946 head db38019e5b7a (non-force FF possible; public head still db38), 6 files: mcp/handlers/handlers.go, orchestrator/peer_message_initial_launch.go, orchestrator/service_scopes.go and existing tests message_task_test.go, peer_message_initial_launch_test.go, web use-workspace-clone.test.ts (no new test file). P1 PRRT_kwDOQ2-eWs6xk1gX valid defect: prompt-only grant failed in BeginPeerMessageStart's read-pair check and GetTask/GetPrimarySession snapshots; fixed (9d4e4f7e3d1) by authorizing the task/session pair with the existing prompt checkers (authorizeTaskSessionPromptPair, repository pair consistency kept) and prompt-scoped snapshot reads (GetTaskForPrompt/GetPrimarySessionForPrompt); REVIEW transition stays control, no read widening or caller spoof; two regressions failed before (read denied / MCP error) and pass after. P2 PRRT_kwDOQ2-eWs6xk1gj: no code defect, coverage gap; four focused cases added to the existing use-workspace-clone.test.ts (403 denied, stale read after task switch, save failure keeps draft, edit during save) plus the saved.prompt=false assertion the web RV asked for; vitest 8/8. Delta RVs (no 79-file replay): backend FORMAL-review-c1-4946-backend.patch-1793283963395412400-10528-upper-1 and web r2 FORMAL-review-c1-4946-web-r2.patch-1793284492902412100-5980-mid-1 both completed APPROVE findings 0 (8e read both). Source-reported: go build, focused orchestrator/handler tests, changed Go lint 0, web typecheck and changed eslint pass. P48 #4936 still OPEN at b349a45c01fa. No push/comment. Publication: 93->5d non-force FF of #4946 to 6654afb9b17f with the two thread replies and the planned #4330 scope line in the body.
8e disposition addendum to artifact-note:20261029T145125214208Z (same head 6654afb9b17f, no new code/test/RV): the late third #4946 thread PRRT_kwDOQ2-eWs6xlQDM (comment 4413187702, CodeRabbit) is a concrete location of the same accepted P1 cause and is already fixed - resolveSessionAfterTaskMessageTurnStart now reads with GetTaskSessionForPrompt / GetPrimarySessionForPrompt (handlers.go 4673-4681, commit 9d4e4f7e3d1). Coverage check by 8e code read: TestHandleMessageTask_PromptOnlyCrossWorkspaceIdleDispatch (existing message_task_test.go 522) sends via handleMessageTask with senderPayload(target, prompt, sender) and no session_id, so resolveMessageTargetSession returns pinnedTarget=false and dispatchTaskMessage reaches the non-pinned branch that calls resolveSessionAfterTaskMessageTurnStart (handlers.go 4259); the test runs with prompt-only, no-read target rights and asserts a response plus StartCreatedSession reached, and it failed before the fix (read denied / MCP error) per the source. So the path is exercised; no extra assertion needed. The backend delta RV 10528-upper-1 covered this hunk. All three #4946 threads are accepted for publication with the 6654afb9b17f FF.
8e publication acceptance (#4946 review follow-up): sole publisher 5d fast-forwarded the same kdlbs/kandev#4946 from db38019e5b7a to 6654afb9b17f585588eed3e522cd7b7edb4482e6 after a live-head and remote-branch preflight and a clean merge-tree against main da9ff6332863; the 6-file delta (+224/-10) does not overlap #4936 SDK/Host paths (no cherry-pick, force or new PR). 8e gh readback: OPEN, MERGEABLE, head 6654afb9b17f = head accepted in artifact-note:20261029T145125214208Z, unresolved review threads 0. 5d readback: three threads answered and resolved (xk1gX reply 4413968176, xk1gj reply 4413968929, xlQDM reply 4413969508); the PR body 'Refs #4330' sentence now states that comment 6057985206's go-ahead covered only the organization-scoped coordinator and that the separate persisted-grant / Host-caller foundation question 6187379620 awaits maintainer feedback (no comment, issue or mention); 84 files +3666/-106; 15 checks observed, 0 failed, 0 action_required, 4 in progress; PR documentation coverage SUCCESS. Not a whole-CI-green or merge claim; PostgreSQL not run and the base-identical storeconformance failure is not reported as passing. Maintainer review and merge remain external.