Conversation
…d service claim Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 1cc2446)
…he bundled CLI Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 9457ae0)
…g prompt on retry Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 6649301)
…ries Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 2fdcf94)
…ver start path Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 07697f9)
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit 5143843)
…laim honest about unknown records Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit c0c6dd2)
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
… boundaries Carries the acceptance text and contract tests of upstream #5457 (source 8ed7916). The generation clause is corrected: relaunch reuse compares owner and installId only, while the write path revalidates the full subject including consentGeneration. Co-authored-by: sanggyulee <andy53295774@gmail.com>
Synthetic fixture render of desktop/ui/index.html at cd58b63 under headless Chrome; the consent panel shows the port, the configuration home and the recorded owner with both choices enabled. No live app, proxy or service was touched.
…ansitions The guard previously read consent and the deadline under separate locks and published the terminal state after releasing them, so a prompt posted between the check and the publish could be overwritten by Failed while the run kept waiting on a decision nobody could see. The consent state and the deadline now live under the run's live lock: expire_run performs the expiry check and the failure publish in one critical section, await_consent refuses to post a prompt once the run is terminal, and the answer's deadline extension and prompt clear land as one write. Adds synchronous unit tests for the expired-publish, pending-blocks-expiry, terminal-posts-no-prompt and superseded-guard paths. Not run: no cargo toolchain on this machine.
A probe resuming after the expiry landed could move the terminal state back to a live phase, which also reopened the consent gate the terminal state had just ruled out. Live::publish now refuses any report once the run is settled, emit follows that refusal so a stale event never reaches the page, and finish does not navigate the window away from a terminal state it could not publish. The expire -> late report -> await_consent sequence is pinned by a regression test.
…/desktop-claim-5459
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: trueThanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
✅ Deterministic PR hygiene checks passed. |
리뷰 · 우선순위 58 / 80이 PR은 데스크톱이 이미 떠 있는 런타임을 만났을 때, 그냥 손님으로 붙을지 주인으로 가져갈지 사용자에게 묻고, 가져가기로 하면 번들 CLI로 멈추고·소유를 적고·다시 시작하는 흐름을 한곳에 모은 작업이다. 원래 열려 있던 #5459(실제 가져가기·동의 UI·클레임)와 #5457(소유 수락 규칙·계약 테스트)을 라인 - 메인테이너의 판단이 필요한 지점 정지 후 클레임 실패를 “허용된 부재”로 둘지, 아니면 복구·재시도·명시적 handback이 필요한 실패로 올릴지. 평문 너의 추천 방향(동의→정지 증명→클레임→시작, unknown/비호환은 손님·차단, 동의·마감 원자성)은 이 댓글은 grok-bot이 작성했습니다 |
|
Carried into #5619 at 8d6b1e1 with your authorship and the co-author trailers kept. The review screenshot stays in the #5619 description instead of the tree. Follow-ups revalidate ownership right before the stop and bind it to the approved runtime through an opt-in guarded stop. Unresolved or unreadable outcomes now fail closed before any claim. Closing in favor of #5619. Thank you! |
… fixes (#5619) * fix(cursor): bound capability reads and buffered tool budgets (#5533) Carries #5533 (and the closed #5233 it consolidates) onto current dev. Co-authored-by: Epinephrine <luvs01@hanmail.net> * fix(moonshot): bound normalized tool-schema expansion (#5547) Carries #5547, which consolidates #5464 and the request-wide inline budget, onto current dev. Co-authored-by: yeongjunyoo <47925973+yeongjunyoo@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Epinephrine <luvs01@hanmail.net> * fix(moonshot): restore rejected inline budgets and charge nested growth once A rejected sibling-reference expansion now restores the byte, node and expansion allowances it consumed, and outer growth no longer re-charges nested copies, so later independent expansions in the same request keep their allowance. Documents the provider-driven object type inference as a deliberate tradeoff and rewrites ADR-0355 in English. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * feat(reasoning): consolidate replay, opt-in tag parsing, and summary policy (#5566) Carries #5566, which consolidates #5449, #5205 and #5491, onto current dev. The provider guide keeps the current bridge replay paragraph and adds the inline-tag and summary paragraphs. Co-authored-by: Joonsuh Park <trckstr4422@gmail.com> Co-authored-by: Daniel Sjöstrand <16033062+Danielsjostrand1979@users.noreply.github.com> Co-authored-by: alexph-dev <alexph-dev@users.noreply.github.com> Co-authored-by: Yum-wu <1172989563@qq.com> * fix: bound Fernet slot runs, Kiro error-body read, and skill-path line slice (#5310) Carries #5310 onto current dev. The follow-up commit makes the Fernet run cap fail closed and moves the Kiro regression out of the capped stream suite. * docs(reasoning): reconcile inline-tag whitespace contract Interleaved inline-tag parsing preserves answer whitespace; only Kiro single-block mode drops the whitespace after its leading block. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(responses): fail closed on Fernet run overflow and keep the Kiro suite under its cap A slot with more than 64 structurally valid Fernet runs is now treated as unreadable or omitted as a whole, so no unexamined tail reaches the provider as text. The bounded Kiro fallback error-body regression moves byte for byte into a registered sibling file, and the Kiro, Responses and inbound contracts document the new bounds. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(reasoning): scan inline think tags with a moving cursor The parser copied, rescanned and reserved the whole remaining response after every block, so one upstream chunk carrying many short blocks cost quadratic work. It now scans each chunk from an offset and charges the translator budget only for retained carry: undecided leading input or a trailing tag fragment. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(reasoning): keep undecided leading whitespace incremental Before the format was decided, every content delta rebuilt, trimmed and re-reserved the whole leading prefix, so a stream of one-character whitespace deltas cost quadratic work. Leading whitespace is now kept in segments whose bytes are reserved once and joined only when the format is decided or the stream flushes. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(meta-muse): consolidate login admission and bounded response handling (#5591) Carries #5591, which consolidates the closed #5234 and #5432, onto current dev. The provider contract keeps the inline-tag paragraph and adds the Meta Muse admission paragraph. Co-authored-by: Epinephrine <luvs01@hanmail.net> * fix(claude-desktop): keep applied state consistent across profile edits (#5590) Carries #5590, which consolidates the closed #5337, onto current dev. Co-authored-by: Epinephrine <luvs01@hanmail.net> Co-authored-by: luvs01 <luvs01@users.noreply.github.com> * fix(claude-desktop): commit applied markers only over the observed baseline Both Desktop writers, provider-change auto-apply and client sync, now capture the desired profile and its applied marker before the Desktop write and commit the new marker only if profile presence, content, fingerprint and timestamp are unchanged. A concurrent edit, deletion or newer marker keeps its state and the write reports a skipped marker. The provider-change path no longer saves a whole stale config snapshot. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(claude-desktop): commit profile edits against the persisted marker The Desktop profile PUT built its response from an earlier snapshot and saved that whole snapshot, so a marker committed by another writer during the awaited state build could be replaced by an older one. The edit now commits in one persisted-config mutation that keeps the latest marker for unchanged content and answers 409 when the profile itself changed meanwhile. The Meta Muse overflow test now asserts that the bounded-body limit, not a generic failure, produced the error. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(claude-desktop): report an unreadable config separately from an edit conflict A missing or invalid config now answers 500 with its reason; only a concurrent profile change or exhausted rebase answers 409. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * feat(desktop): consolidate consent-based runtime takeover and ownership contracts (#5564) Carries #5564, which consolidates #5459 and #5457, onto current dev. The review screenshot stays in the pull request description rather than the tree. Co-authored-by: jun <bitkyc08@gmail.com> Co-authored-by: sanggyulee <andy53295774@gmail.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(desktop): bind takeover stop to the approved runtime and fail closed Desktop takeover re-resolves ownership immediately before stopping and passes the approved PID, endpoint, config home, CLI version and compatibility token to an opt-in guarded stop. The guard is checked under the ownership mutation lease before any manager or signal stop; the approved PID and endpoint must settle and the service manager must then be proven inactive, otherwise the stop answers approval-changed or manager-still-active and the desktop neither waits for silence nor claims. Unreadable or unparseable stop output is terminal as well. A second unreadable service-state read now blocks takeover, Windows managing-CLI discovery follows PATHEXT with file-only candidates and refuses command-interpreter metacharacters, the claim refusal test uses real sandbox state, and the runtime and desktop contracts record that the claim token is a consistency check rather than consent proof. Plain ocx stop is unchanged. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(desktop): keep plain stop entry points and format the takeover changes Desktop exit keeps its plain runtime_stop::run entry while takeover uses run_approved, AttachPlan::Ask no longer carries an unread field, the Rust changes follow rustfmt, the plain CLI stop path keeps its literal outcome return, the stop source oracles follow the reader and outcome union that now include the two guarded refusals, and the runtime contract fits its 600-line budget. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(desktop): run takeover seam tests without tokio macros and harden manager and shim checks The two async takeover seam tests now run on the shell runtime already used by the crate instead of tokio test macros, which this crate does not enable. Windows command-shim probes refuse command-interpreter metacharacters in every recorded argument as well as the executable, and the guarded stop re-inspects the service manager identity immediately before the manager command, answering approval-changed without stopping if it moved. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(responses): keep effort-based reasoning visible after routing Final-route normalization recomputed hideThinkingSummary without the validated active-effort condition, so routed Chat and Kiro requests with an active effort and an omitted summary still hid raw reasoning. It now uses the same predicate as the parser; explicit "none" and requests without an active effort stay hidden. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(service): match the running CLI case-insensitively only on Windows On case-sensitive filesystems a PATH executable that differs only in case is a different file, so it must get its own version probe instead of reporting the running CLI version. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(meta-muse): require the dashboard session for manual login codes The manual-code continuation now applies the same dashboard-session admission as the login start, so a management token cannot advance a pending Meta Muse login. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(reasoning): reserve the joined leading-whitespace copy Joining retained leading whitespace allocated a second copy outside the translator budget; the join is now reserved first and released once the segments are cleared. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(service): skip CLI probes for an absent runtime and treat failed systemd units as stopped Resolve no longer spawns managing-CLI version probes when no runtime is live, since takeover is only offered for a live runtime. A systemd unit reported failed with no main PID is stopped, so a guarded stop that leaves it failed succeeds and a leftover failed unit does not block takeover. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> * fix(service): keep failed systemd units fail-closed and assess takeover only for a live runtime in tests systemd can report failed before an automatic restart, so failed with no main PID is again treated as unknown rather than stopped. The resolve contract tests that assert ownership and takeover fields now use a live runtime, matching the skip of managing-CLI probes when no runtime is live. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --------- Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> Co-authored-by: Epinephrine <luvs01@hanmail.net> Co-authored-by: yeongjunyoo <47925973+yeongjunyoo@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Joonsuh Park <trckstr4422@gmail.com> Co-authored-by: Daniel Sjöstrand <16033062+Danielsjostrand1979@users.noreply.github.com> Co-authored-by: alexph-dev <alexph-dev@users.noreply.github.com> Co-authored-by: Yum-wu <1172989563@qq.com> Co-authored-by: luvs01 <luvs01@users.noreply.github.com> Co-authored-by: sanggyulee <andy53295774@gmail.com>
Summary
Consolidate #5459 and #5457 into one desktop ownership review. When the desktop finds an existing runtime, show the endpoint, configuration home and recorded owner before offering takeover. Approval uses the bundled CLI to stop, claim and start the runtime; declining preserves guest attachment. Unknown ownership, incompatible managing CLIs and unproven stop outcomes remain explicit failures or blocked takeover states.
The source PRs remain open and unchanged. This proposal does not decide the separate policy questions around a stopped-but-unclaimed runtime or plain
ocx startwith a foreign owner. The existing retry rejection while a stalled run remains active is also unresolved; clearing the running flag alone would permit overlapping runs.Verification
c0c6dd2ba4c81e4e40425020649573145e857073; docs(desktop): state runtime takeover acceptance #54578ed791675d6254e9eb09ca333888ab2a7bfa3dd8.8d6b1e15d8cf9afed0d15c075810af4bb53e8275, based on deva6b54297b03fc218105273887ce147c901848d89. All seven source carries preserve author, author date and credit. Five clean carries have equal zero-context patch IDs; two adapted carries preserve the current bootstrap and deadline integration. All 20 source file occurrences were classified; 13 implementation or test files match feat(desktop): ask consent on attach and take over a foreign runtime with the bundled CLI #5459 byte-for-byte, and docs(desktop): state runtime takeover acceptance #5457's four added contract tests are preserved.e6277c19: 49 passed / 0 failed / 260 assertions across four files. The subsequent two commits contain only Rust formatting and terminal-payload indirection; TypeScript, documentation and test files are unchanged. The test wrapper installed missing dashboard dependencies into a normal directory in the isolated worktree; no shared dependency junction or live runtime was changed.8d6b1e15d8boxes that payload without changing the state machine or emitted data. The exact-head desktop shell job now passed Rust formatting, Clippy and Rust unit tests. Earlier failures are retained as such; no local Cargo execution is claimed.cicheck reports failure. The completed Rust job remains a pass, but this is not a full cross-platform pass. Cancellation cause is not established by the available job records, and no automatic rerun is claimed.Checklist
Co-authored-by: jun bitkyc08@gmail.com
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: sanggyulee andy53295774@gmail.com