feat(desktop): ask consent on attach and take over a foreign runtime with the bundled CLI - #5459
devin-ai-integration[bot] wants to merge 8 commits into
Conversation
…d service claim Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…he bundled CLI Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…g prompt on retry Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
|
I'll fix CI failures and address comments from users with write access. I'll skip comments containing "(aside)".
|
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configurationConfiguration used: Repository: lidge-jun/opencodex/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks 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. |
⏳ DRAFT
What to do
Review readiness checklist
2/4 boxes ticked. This PR stays in draft until every box above is ticked. |
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…ries Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…ver start path Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
리뷰 · 우선순위 64 / 80이 PR은 데스크톱 앱이, 이미 켜져 있는 ocx에 묻지 않고 붙던 길을 고칩니다. 예전에는 앱을 켜면 먼저 떠 있던 npm ocx에 손님으로 붙었습니다. 주인 기록은 비어 있고, 앱을 꺼도 그 ocx는 남았습니다. 물어보는 구분과 주인을 적는 함수는 있었는데, 앱이 그걸 호출하지 않았습니다.
앱은 이미 듣고 있는 런타임을 보면 창을 엽니다. 포트, 설정 폴더, 지금 주인을 보여 주고 "가져가기"와 "손님으로 남기"를 둡니다. 가져가기를 누르면 앱에 들어 있는 ocx로 그 런타임을 멈추고, 포트가 조용해진 뒤에 주인을 적고, 이어서 앱의 런타임을 켭니다. 거절하면 예전처럼 손님으로 붙습니다. 주인 기록을 못 읽거나 가져가기가 막혀 있으면 묻지 않습니다. 베이스는 라인 라인 라인 라인 메인테이너의 판단이 필요한 지점 터미널의 너의 추천 동의 글에서 "CLI가 옆에 런타임을 켜지 않는다"를 빼세요. 지금 맞는 설명은 "이 앱을 주인으로 적는다. 서비스로 켜는 시작은 막힌다. 터미널의 ocx start는 아직 그대로다"입니다. 이 댓글은 grok-bot이 작성했습니다 |
…laim honest about unknown records Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
|
@lidge-jun 리뷰 네 지적 모두 c0c6dd2ba에 반영했습니다.
|
… 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>
|
Closing as superseded. The changes from this PR (head This is on |
Summary
Windows validation of
devshowed the desktop app attaching silently as a guest to a pre-running npmocxproxy: no consent prompt, noservice-state.jsonownership record, and Quit left the npm runtime alive. The consent enum andrecordServiceOwnerexisted but nothing wired them end to end (ownership::resolvewas aNonestub). This PR closes that loop.CLI
ocx resolve --json(schema unchanged, additive) now carriestakeoverisassessServiceTakeoverCompatibilityfed by a new productionobserveManagingClis()(src/service/managing-cli.ts): probes--versionof the CLI baked into the service registration and of theocxfound on PATH (in-module PATH/PATHEXT scan,cmd.exe /cfor.cmdshims, never spawnsprocess.execPath— the fix(cli): probe endpoint liveness in-process so the standalone resolve does not fork execPath #5418 rule). Ownershipunknownstays exit 0; the shell fails closed on it.ocx service claim --owner <cli|desktop> --install-id <id> (--expect-none | --expect-owner/--expect-install-id/--expect-generation) --expect-revision <n> --expect-compatibility-token <hex> [--json]→recordServiceOwnerunder the existing lock/lease with the exact approved subject + token; mismatch/unknown/compatibility-changed → exit 1 with{"schema":"ocx-service-claim/1","ok":false,"code":...}. Not gated by install checks (a takeover is not an install).Desktop
resolve.rsparses the new fields (missing →Unknown/Blocked, fail-closed).Recorded::{None,Owned}gainrevision.LiveVerdict::Attach,attach_plan(consent, takeover):Held/Refuse/Blocked→ guest as before, with the reason in the Attaching detail.AskFirstTime/AskAgain+Supported→ window is shown and the bootstrap page renders an in-page consent panel (no native dialog, per the page's own rule) with Port, Configuration home, Current owner andTake over/Stay a guest. The startup deadline is extended by however long the user takes.Taking over the runtime that was already listening: bundledocx stop --json→ poll until the endpoint is silent (silence, not exit 0, is the receipt: on Windows a stop of a live runtime routinely exits 79history-incompletewith the proxy already gone) →ocx service claim … --json→ falls into the existing Starting/Waiting path. Stop still answering or claim refused →Failedwith Retry.decide_takeovertauri command; Retry drops a pending prompt.index.htmlnonce script (main.jsis gone).tests/clients/desktop-startup-surface.test.tsupdated for the two intentional shape changes (let mut deadline, a fourthreportPageFailure(entry point).Behavioural notes
ocx< 2.61.0 (e.g. the published npm 2.59.0), resolve reportstakeover.kind = "blocked" (managing-cli-unsupported: …)and the app stays a guest with that reason — the existing compatibility contract. Takeover is offered once the PATH CLI is ≥ 2.61.0.ocx startfrom an npm/standalone CLI does not consult the ownership record (it never did; onlyservice install/uninstalland the updater do). Verified on Windows: with the desktop owner recorded and no runtime live, npmocx startstarts a runtime anyway. Whetherocx startshould refuse for a foreign owner is a separate decision.Verification
bun run typecheck;bun test tests/cli/cli-resolve.test.ts tests/service/service-claim.test.ts tests/service/service-ownership-state.test.ts tests/clients/desktop-startup-surface.test.ts— 86 pass.desktop/src-tauri:cargo fmt --check,cargo clippy --all-targets -- -D warnings,cargo test— 80 pass.664930183(pre-merge,main.jsstill external; standalone CLI rebuilt →prepare-sidecar→build:local— the cachedbinaries/ocx-*.exeis otherwise stale), npmocx2.61.0 from this branch pre-started on 10100:10100; Configuration homeC:\Users\Administrator\.opencodex; Current ownerno recorded owner (an npm or standalone ocx install).Stay a guest→ Ready, npm PID 5492 unchanged, no ownership record; relaunch asks again.Take over→ npm PID gone,/healthzpid 1636 =ocx.exechild ofopencodex-desktop.exe,service-state.json→ownership: {owner:"desktop", installId:<install-id file>, consentGeneration:1}, revision 1.Checklist
Review readiness checklist
This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:
All CI tests are green on my local testing.
I pushed my PR to the latest dev commit.
I resolved all correct Codex and CodeRabbit findings.
My PR is ready for review.
Link to Devin session: https://app.devin.ai/sessions/022ec1407f51490e8a2bd493ed310229
Open in Devin Desktop: https://app.devin.ai/desktop/session/022ec1407f51490e8a2bd493ed310229?variant=devin
Requested by: @lidge-jun