F3: Kimi inference pipeline + full grok cloud-surface excision
Sampler / inference (PRD F3):
- kimi_compat.rs: single adaptation point for the Kimi chat/completions
dialect (thinking-field mapping, model_id stripping, empty-content
tool-call message fix, stream_options.include_usage), with kimi-cli
source citations
- Rate-limit handling reworked for Kimi/Moonshot semantics; UA kigi/{version}
- /models replaces the xAI models-v2 endpoint everywhere; idle model
refresh carries X-Msh-* device headers only (X-XAI-Token-Auth and
x-grok-client-mode/CLIENT_MODE_HEADER machinery deleted)
Cloud-surface excision (PRD §5, zero-egress):
- remote/ conversations lane, cli-chat-proxy-types crate, prod/ dir,
share command, credit bar: deleted (single local session lane;
paginate() replaces merge_and_paginate)
- Subscription/tier gate stack deleted end-to-end: AppView
gate/tier/team/ZDR fields, app/subscription.rs watch loop,
dispatch/billing.rs paywall + SuperGrok upsell, free-usage-exhausted
chain, tier-restricted commands, GateInfo, RemoteSettings gate fields,
SettingsUpdateNotification gate fields
- /privacy + coding-data-sharing setting deleted (backed by a dead xAI
RPC; Kigi is zero-egress — nothing to share or retain remotely)
Auth UX correctness (user-reported):
- Device-flow fixtures now mirror the live Kimi payload shape
(https://www.kimi.com/code/authorize_device?user_code=..., verified
against auth.kimi.com); the fabricated auth.kimi.com/device?code=...
URLs are gone
- open_browser_detached is a no-op under cfg(test): unit tests drove
wiremock fixture URLs into the real browser (root cause of the
"garbage mock link" ABCD-1234 tabs)
- Welcome/pager-minimal rebrand: Grok Build -> Kigi, grok.com ->
kimi.com, "Sign in to Grok" -> "Sign in to Kimi"
This commit is contained in:
1 parent
fe1f885bb3
commit
ea0ce9d15f
231 files changed
+4730
-26358
No files matched your search
@@ -1,7 +1,6 @@
|
||||
use crate::app::actions::Effect;
|
||||
use crate::app::app_view::{AppView, SessionPickerEntry};
|
||||
use crate::app::dispatch::ctx::get_active_agent_mut;
|
||||
use crate::app::effects::ConversationsPartial;
|
||||
use crate::views::modal::ActiveModal;
|
||||
use crate::views::picker::PickerState;
|
||||
use crate::views::session_picker::{
|
||||
@@ -61,7 +60,6 @@ impl PickerSurface<'_> {
|
||||
query: Option<String>,
|
||||
chat_mode: bool,
|
||||
empty_notice: String,
|
||||
partial_notice: Option<&'static str>,
|
||||
) -> Option<String> {
|
||||
let anchor = self.capture_selection();
|
||||
let is_search = query.is_some();
|
||||
@@ -88,11 +86,7 @@ impl PickerSurface<'_> {
|
||||
}
|
||||
} else {
|
||||
self.lanes.pending_notice = None;
|
||||
if chat_mode {
|
||||
partial_notice.map(str::to_owned)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
None
|
||||
};
|
||||
self.restore_selection(anchor);
|
||||
notice
|
||||
@@ -188,7 +182,6 @@ pub(in crate::app::dispatch) fn dispatch_fetch_session_list(app: &mut AppView) -
|
||||
pub(in crate::app::dispatch) fn handle_session_list_loaded(
|
||||
app: &mut AppView,
|
||||
sessions: Vec<SessionPickerEntry>,
|
||||
partial: Option<ConversationsPartial>,
|
||||
seq: u64,
|
||||
query: Option<String>,
|
||||
) -> Vec<Effect> {
|
||||
@@ -196,18 +189,7 @@ pub(in crate::app::dispatch) fn handle_session_list_loaded(
|
||||
return vec![];
|
||||
}
|
||||
app.session_picker_detail_generation += 1;
|
||||
if let Some(partial) = partial {
|
||||
crate::unified_log::warn(
|
||||
"session.list.partial",
|
||||
None,
|
||||
Some(serde_json::json!({ "reason": format!("{partial:?}") })),
|
||||
);
|
||||
}
|
||||
let empty_notice = partial.map_or_else(
|
||||
|| "No sessions found for this directory".to_owned(),
|
||||
|partial| partial.picker_notice().to_owned(),
|
||||
);
|
||||
let partial_notice = partial.map(ConversationsPartial::picker_notice);
|
||||
let empty_notice = "No sessions found for this directory".to_owned();
|
||||
let chat_mode = app.chat_mode;
|
||||
let mut sessions = Some(sessions);
|
||||
let mut notice = None;
|
||||
@@ -242,7 +224,6 @@ pub(in crate::app::dispatch) fn handle_session_list_loaded(
|
||||
query.clone(),
|
||||
chat_mode,
|
||||
empty_notice.clone(),
|
||||
partial_notice,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -260,7 +241,7 @@ pub(in crate::app::dispatch) fn handle_session_list_loaded(
|
||||
grouped: app.session_picker_grouped,
|
||||
current_repo,
|
||||
}
|
||||
.native_loaded(sessions, query, chat_mode, empty_notice, partial_notice);
|
||||
.native_loaded(sessions, query, chat_mode, empty_notice);
|
||||
}
|
||||
if let Some(notice) = notice {
|
||||
app.show_toast(¬ice);
|
||||
|
||||
@@ -206,15 +206,8 @@ pub(in crate::app::dispatch) fn dispatch_fork_resolved(
|
||||
.prompt
|
||||
.set_contextual_hints(app.contextual_hints.undo, app.contextual_hints.plan_mode);
|
||||
agent.set_session_recap_available(app.session_recap_available);
|
||||
agent.apply_app_scoped_gates(
|
||||
app.sharing_enabled,
|
||||
app.usage_visible,
|
||||
app.chat_mode,
|
||||
app.screen_mode,
|
||||
&app.tier_restricted_commands,
|
||||
);
|
||||
agent.apply_app_scoped_gates(app.usage_visible, app.chat_mode, app.screen_mode, &[]);
|
||||
agent.chat_kind = parent_chat_kind;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent
|
||||
.prompt
|
||||
.slash_controller
|
||||
@@ -353,7 +346,6 @@ pub(in crate::app::dispatch) fn dispatch_project_selected(
|
||||
let chat_kind = consume_chat_kind(app);
|
||||
if let Some(agent) = app.agents.get_mut(&id) {
|
||||
agent.chat_kind = chat_kind;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
}
|
||||
effects.push(Effect::CreateSession {
|
||||
agent_id: id,
|
||||
@@ -398,8 +390,6 @@ fn build_fork_placeholder(
|
||||
restore_degree: None,
|
||||
rate_limited: false,
|
||||
model_incompatible: false,
|
||||
credit_limit_blocked: false,
|
||||
free_usage_blocked: false,
|
||||
available_commands: app.bootstrap_acp_commands.clone(),
|
||||
available_commands_generation: 1,
|
||||
available_tools: None,
|
||||
@@ -543,7 +533,6 @@ pub(in crate::app::dispatch) fn handle_worktree_forked(
|
||||
}
|
||||
let effective_chat = conversation_entry || app.chat_mode;
|
||||
agent.chat_kind = effective_chat;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
return vec![Effect::LoadSession {
|
||||
agent_id,
|
||||
session_id: session_id_str,
|
||||
|
||||
@@ -304,8 +304,6 @@ pub(in crate::app::dispatch) fn dispatch_new_session_inner_with_id(
|
||||
restore_degree: None,
|
||||
rate_limited: false,
|
||||
model_incompatible: false,
|
||||
credit_limit_blocked: false,
|
||||
free_usage_blocked: false,
|
||||
available_commands: app.bootstrap_acp_commands.clone(),
|
||||
available_commands_generation: 1,
|
||||
available_tools: None,
|
||||
@@ -330,14 +328,7 @@ pub(in crate::app::dispatch) fn dispatch_new_session_inner_with_id(
|
||||
.prompt
|
||||
.set_contextual_hints(app.contextual_hints.undo, app.contextual_hints.plan_mode);
|
||||
agent.set_session_recap_available(app.session_recap_available);
|
||||
agent.apply_app_scoped_gates(
|
||||
app.sharing_enabled,
|
||||
app.usage_visible,
|
||||
app.chat_mode,
|
||||
app.screen_mode,
|
||||
&app.tier_restricted_commands,
|
||||
);
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent.apply_app_scoped_gates(app.usage_visible, app.chat_mode, app.screen_mode, &[]);
|
||||
agent
|
||||
.prompt
|
||||
.slash_controller
|
||||
@@ -353,7 +344,6 @@ pub(in crate::app::dispatch) fn dispatch_new_session_inner_with_id(
|
||||
let chat_kind = consume_chat_kind(app);
|
||||
if let Some(agent) = app.agents.get_mut(&agent_id) {
|
||||
agent.chat_kind = chat_kind;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent.mcp_init_progress = Some(McpInitProgress {
|
||||
total: 0,
|
||||
connected: 0,
|
||||
@@ -402,7 +392,7 @@ pub(in crate::app::dispatch) fn dispatch_trust_folder(app: &mut AppView) -> Vec<
|
||||
/// `AuthComplete` uses, so whichever gate resolves last drains exactly once.
|
||||
pub(in crate::app::dispatch) fn finish_trust(app: &mut AppView) -> Vec<Effect> {
|
||||
app.trust_state = TrustState::Done;
|
||||
app.welcome_prompt_focused = !app.is_access_blocked();
|
||||
app.welcome_prompt_focused = true;
|
||||
if app.session_startup_allowed() {
|
||||
drain_startup_actions(app)
|
||||
} else {
|
||||
@@ -629,8 +619,6 @@ pub(in crate::app::dispatch) fn dispatch_new_worktree_session(
|
||||
restore_degree: None,
|
||||
rate_limited: false,
|
||||
model_incompatible: false,
|
||||
credit_limit_blocked: false,
|
||||
free_usage_blocked: false,
|
||||
available_commands: app.bootstrap_acp_commands.clone(),
|
||||
available_commands_generation: 1,
|
||||
available_tools: None,
|
||||
@@ -667,15 +655,8 @@ pub(in crate::app::dispatch) fn dispatch_new_worktree_session(
|
||||
.prompt
|
||||
.set_contextual_hints(app.contextual_hints.undo, app.contextual_hints.plan_mode);
|
||||
agent.set_session_recap_available(app.session_recap_available);
|
||||
agent.apply_app_scoped_gates(
|
||||
app.sharing_enabled,
|
||||
app.usage_visible,
|
||||
app.chat_mode,
|
||||
app.screen_mode,
|
||||
&app.tier_restricted_commands,
|
||||
);
|
||||
agent.apply_app_scoped_gates(app.usage_visible, app.chat_mode, app.screen_mode, &[]);
|
||||
agent.chat_kind = chat_kind;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent
|
||||
.prompt
|
||||
.slash_controller
|
||||
@@ -764,7 +745,6 @@ pub(in crate::app::dispatch) fn skip_picker_and_create_session(
|
||||
let chat_kind = consume_chat_kind(app);
|
||||
if let Some(agent) = app.agents.get_mut(&agent_id) {
|
||||
agent.chat_kind = chat_kind;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent.mcp_init_progress = Some(McpInitProgress {
|
||||
total: 0,
|
||||
connected: 0,
|
||||
@@ -836,10 +816,6 @@ pub(in crate::app::dispatch) fn handle_session_created(
|
||||
session_id: session_id_clone.clone(),
|
||||
});
|
||||
effects.push(Effect::RefreshAvailableCommands { agent_id, cwd });
|
||||
effects.push(Effect::FetchBilling {
|
||||
agent_id,
|
||||
silent: true,
|
||||
});
|
||||
if let Some((model_id, effort)) = deferred {
|
||||
effects.push(Effect::SwitchModel {
|
||||
agent_id,
|
||||
@@ -916,10 +892,6 @@ pub(in crate::app::dispatch) fn handle_worktree_session_created(
|
||||
session_id: session_id_clone.clone(),
|
||||
});
|
||||
effects.push(Effect::RefreshAvailableCommands { agent_id, cwd });
|
||||
effects.push(Effect::FetchBilling {
|
||||
agent_id,
|
||||
silent: true,
|
||||
});
|
||||
if let Some((model_id, effort)) = deferred {
|
||||
effects.push(Effect::SwitchModel {
|
||||
agent_id,
|
||||
|
||||
@@ -162,8 +162,6 @@ fn dispatch_load_session_ungated(
|
||||
restore_degree: None,
|
||||
rate_limited: false,
|
||||
model_incompatible: false,
|
||||
credit_limit_blocked: false,
|
||||
free_usage_blocked: false,
|
||||
available_commands: app.bootstrap_acp_commands.clone(),
|
||||
available_commands_generation: 1,
|
||||
available_tools: None,
|
||||
@@ -195,15 +193,8 @@ fn dispatch_load_session_ungated(
|
||||
agent_mut.session.start_command(AgentCommand::RestoreCode);
|
||||
agent_mut.turn_started_at = Some(std::time::Instant::now());
|
||||
}
|
||||
agent_mut.apply_app_scoped_gates(
|
||||
app.sharing_enabled,
|
||||
app.usage_visible,
|
||||
app.chat_mode,
|
||||
app.screen_mode,
|
||||
&app.tier_restricted_commands,
|
||||
);
|
||||
agent_mut.apply_app_scoped_gates(app.usage_visible, app.chat_mode, app.screen_mode, &[]);
|
||||
agent_mut.chat_kind = chat_kind || app.chat_mode;
|
||||
agent_mut.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent_mut
|
||||
.prompt
|
||||
.slash_controller
|
||||
@@ -808,8 +799,6 @@ pub(in crate::app::dispatch) fn dispatch_load_session_with_restore(
|
||||
restore_degree: None,
|
||||
rate_limited: false,
|
||||
model_incompatible: false,
|
||||
credit_limit_blocked: false,
|
||||
free_usage_blocked: false,
|
||||
available_commands: app.bootstrap_acp_commands.clone(),
|
||||
available_commands_generation: 1,
|
||||
available_tools: None,
|
||||
@@ -836,15 +825,8 @@ pub(in crate::app::dispatch) fn dispatch_load_session_with_restore(
|
||||
.prompt
|
||||
.set_contextual_hints(app.contextual_hints.undo, app.contextual_hints.plan_mode);
|
||||
agent.set_session_recap_available(app.session_recap_available);
|
||||
agent.apply_app_scoped_gates(
|
||||
app.sharing_enabled,
|
||||
app.usage_visible,
|
||||
app.chat_mode,
|
||||
app.screen_mode,
|
||||
&app.tier_restricted_commands,
|
||||
);
|
||||
agent.apply_app_scoped_gates(app.usage_visible, app.chat_mode, app.screen_mode, &[]);
|
||||
agent.chat_kind = app.chat_mode;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent
|
||||
.prompt
|
||||
.slash_controller
|
||||
@@ -958,10 +940,6 @@ pub(in crate::app::dispatch) fn handle_session_loaded(
|
||||
agent_id,
|
||||
session_id: hydrate_sid.clone(),
|
||||
});
|
||||
effects.push(Effect::FetchBilling {
|
||||
agent_id,
|
||||
silent: true,
|
||||
});
|
||||
if let Some((model_id, effort)) = deferred {
|
||||
agent.session.model_switch_pending = true;
|
||||
effects.push(Effect::SwitchModel {
|
||||
@@ -1110,7 +1088,6 @@ pub(in crate::app::dispatch) fn handle_session_restored(
|
||||
supersede_open_reload_window(agent, agent_id, "SessionRestored");
|
||||
agent.bind_session_id(sid);
|
||||
agent.chat_kind = app.chat_mode;
|
||||
agent.apply_credit_balance(app.credit_balance.clone(), app.auto_topup.clone());
|
||||
agent.scrollback.push_block(RenderBlock::system(format!(
|
||||
"Session restored. Loading {local_session_id}..."
|
||||
)));
|
||||
|
||||
Reference in new issue
Block a user