You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Remove the already-no-op org_id parameters threaded through the per-session env/provider resolution path. These params are passed but never read (each consumer ignores them via _), so this is a pure signature simplification with zero behaviour change — provider/codex.toml selection never depended on org_id. The internal worker protocol is already org-free (fkst-shared/src/protocol/types.rs and sessions/dispatch.rs carry no org_id), so this is wire-compatible with running workers and needs no /internal/v1/* change.
Depends on #272, which deletes SessionDoc.org_id (the source of the args these functions receive). May be merged into #272 if the team prefers a single session-area PR.
Problem / Motivation
vault::list_for_scope takes _org_id: Option<&str> and ignores it; scope resolution is purely (owner_user_id, EnvScopeRef).
codex_provider threads org_id into resolve_provider_choice → resolve_from_entries → ChronoLlmCheck::is_chrono_llm_connected, and every consumer ignores it.
L176list_for_scope(owner_user_id, _org_id: Option<&str>, scope) → drop the _org_id param. Update callers and the vault tests (the None org arg at the test call sites).
Drop the _org/None org arg from FakeCheck::is_chrono_llm_connected and every resolve_from_entries/resolve_provider_choice call. Assertions unchanged (RAW>STRUCTURED>DEFAULT precedence + the missing-chrono-llm 422 coverage are preserved).
L2331-2338render_session_codex_config: drop session.org_id.as_deref() from codex_provider::resolve_provider_choice(...) (L2334).
(If #272 already changed L2300/L2334 to drop the org arg as part of its co-commit, this PR only removes the underlying params in vault/codex_provider; reconcile with the choice stated in #272.)
Scope Check
✅ In scope: the no-op org_id params in vault scope resolution + codex provider selection + their two call sites in service.rs.
❌ Out of scope / KEEP: the internal worker protocol (already org-free), dispatch.rs (no change), and all env-scope / provider-precedence behaviour.
Acceptance Criteria / Definition of Done
list_for_scope, is_chrono_llm_connected, resolve_provider_choice, resolve_from_entries take no org_id.
Provider-precedence and 422 tests pass unchanged.
cargo test -p fkst-control-plane green; cargo build -p fkst-worker green (worker untouched, still compiles).
Summary
Remove the already-no-op
org_idparameters threaded through the per-session env/provider resolution path. These params are passed but never read (each consumer ignores them via_), so this is a pure signature simplification with zero behaviour change — provider/codex.toml selection never depended onorg_id. The internal worker protocol is already org-free (fkst-shared/src/protocol/types.rsandsessions/dispatch.rscarry noorg_id), so this is wire-compatible with running workers and needs no/internal/v1/*change.Depends on #272, which deletes
SessionDoc.org_id(the source of the args these functions receive). May be merged into #272 if the team prefers a single session-area PR.Problem / Motivation
vault::list_for_scopetakes_org_id: Option<&str>and ignores it; scope resolution is purely(owner_user_id, EnvScopeRef).codex_providerthreadsorg_idintoresolve_provider_choice→resolve_from_entries→ChronoLlmCheck::is_chrono_llm_connected, and every consumer ignores it.SessionDoc.org_idto source these args from, so keeping the params would force passing a danglingNone— better to delete them.Proposed Solution — Implementation Spec
backend/fkst-control-plane/src/vault/service.rslist_for_scope(owner_user_id, _org_id: Option<&str>, scope)→ drop the_org_idparam. Update callers and the vault tests (theNoneorg arg at the test call sites).backend/fkst-control-plane/src/sessions/codex_provider/mod.rsChronoLlmCheck::is_chrono_llm_connected: drop theorg_id: Option<&str>param.AssumeConnectedimpl: drop the_org_idparam (L125).resolve_provider_choice: droporg_id(L147) and stop forwarding it tovault.list_for_scope(L151) andresolve_from_entries(L152).resolve_from_entries: droporg_id(L163) and stop forwarding it tocheck.is_chrono_llm_connected(L171).backend/fkst-control-plane/src/sessions/codex_provider/tests.rs_org/Noneorg arg fromFakeCheck::is_chrono_llm_connectedand everyresolve_from_entries/resolve_provider_choicecall. Assertions unchanged (RAW>STRUCTURED>DEFAULT precedence + the missing-chrono-llm 422 coverage are preserved).backend/fkst-control-plane/src/sessions/service.rsresolve_env_profile:vault.list_for_scope(owner_user_id, session.org_id.as_deref(), &scope)→list_for_scope(owner_user_id, &scope).render_session_codex_config: dropsession.org_id.as_deref()fromcodex_provider::resolve_provider_choice(...)(L2334).(If #272 already changed L2300/L2334 to drop the org arg as part of its co-commit, this PR only removes the underlying params in
vault/codex_provider; reconcile with the choice stated in #272.)Scope Check
org_idparams in vault scope resolution + codex provider selection + their two call sites inservice.rs.dispatch.rs(no change), and all env-scope / provider-precedence behaviour.Acceptance Criteria / Definition of Done
list_for_scope,is_chrono_llm_connected,resolve_provider_choice,resolve_from_entriestake noorg_id.cargo test -p fkst-control-planegreen;cargo build -p fkst-workergreen (worker untouched, still compiles).