M2 audit: excise the Computer Hub stack — Kigi's last remote-cloud surface
Removed root-and-branch for the zero-egress guarantee (the hub was xAI's remote-workspace/cloud-sandbox service): - Crates deleted: kigi-computer-hub-core, kigi-computer-hub-sdk, kigi-computer-hub-mcp-adapter, kigi-workspace-client (hub-proxied workspace RPC client), and kigi-tracing (its sole network path was the OTLP gRPC exporter; zero consumers remained). kigi-tracing-macros (purely local) stays. - kigi-workspace: every hub surface deleted — hub server/channel/auth, HITL-over-hub permissions, donation/metrics pumps, file upload RPCs, hub tool-snapshot merge (resolve pipeline is MCP-only now), WorkspaceOps::Proxy. Local worktrees, sessions, leader IPC, MCP, and the ACP permission prompt path are untouched; LocalRegistry re-homed into kigi-tool-runtime on the existing ToolDyn types so in-process tool dispatch is unchanged. - kigi-shell: leader workspace-exposure control surface (incl. the wss://computer-hub... URL), [hub] config, ObservabilityBridge, hub WebSocket proxy, dead OTLP config knobs. ClientMode::Headless (never constructed) removed. - kigi-tui/bin: hidden `kigi workspace` command removed (`kigi worktree` stays). - Renames: --xai-api-base-url → --api-base-url / KIGI_API_BASE_URL / [endpoints] api_base_url (serde alias keeps old configs working; the flag feeds BYOK/custom-endpoint routing, not main inference); grok_version → kigi_version in inspect/models-cache/trace metadata (old caches self-heal via version-mismatch refetch). - Dependency tree: dropped fastrace*, opentelemetry-otlp/http/proto, tokio-tungstenite from the workspace; fixed the 4 real useless_format violations the fastrace lint allowance was masking and removed the allowance. - marketplaceAllowlist kept: it gates the LOCAL plugin-marketplace feature, not an xAI service. Known §9 leftover (deliberate, for the M3 sweep): the BYOK default base URL string. Gates: workspace check/clippy 0/0, fmt, deny ok; suites green (workspace 1042, shell 4918, tui 6634, tools 2608, tool-runtime 47, mcp 154).
This commit is contained in:
@@ -928,9 +928,6 @@ pub(crate) struct SessionActor {
|
||||
/// Centralized event tracking: event log, turn-end guard, active tool,
|
||||
/// doom loop terminate flag. All event-related state lives here.
|
||||
pub(crate) events: crate::session::events::EventTracker,
|
||||
/// Optional hub-side session event emitter (always constructed without a
|
||||
/// harness client in the agent; methods no-op with `None` transport).
|
||||
pub(crate) observability_bridge: kigi_computer_hub_sdk::ObservabilityBridge,
|
||||
/// Turn number captured at the start of each turn (before prompt index
|
||||
/// increment). Used by `ToolCallStarted` bridge emissions so they
|
||||
/// report the same turn number as `TurnStarted` / `TurnEnded`.
|
||||
@@ -1522,8 +1519,6 @@ mod fs_injection_regression_tests;
|
||||
#[path = "acp_session_tests/interjection_actor_tests.rs"]
|
||||
mod interjection_actor_tests;
|
||||
#[cfg(test)]
|
||||
#[path = "acp_session_tests/observability_bridge_mapping_tests.rs"]
|
||||
mod observability_bridge_mapping_tests;
|
||||
#[cfg(test)]
|
||||
#[path = "acp_session_tests/permission_auto_mode_tests.rs"]
|
||||
mod permission_auto_mode_tests;
|
||||
|
||||
@@ -251,34 +251,8 @@ pub(crate) async fn spawn_session_actor(
|
||||
.as_ref()
|
||||
.map(kigi_workspace::permission::resolution::deny_read_globs_from_config)
|
||||
.unwrap_or_default();
|
||||
let hub_permission = if kigi_workspace::permission::hitl_permission_live_enabled() {
|
||||
let server = match workspace_ops.workspace_handle() {
|
||||
Some(handle) => handle.hub_server_blocking().await,
|
||||
None => None,
|
||||
};
|
||||
let transport = server
|
||||
.and_then(|server| {
|
||||
kigi_workspace::permission::ToolServerPermissionTransport::from_session_id(
|
||||
server,
|
||||
session_info.id.0.as_ref(),
|
||||
)
|
||||
})
|
||||
.map(|t| {
|
||||
std::sync::Arc::new(t)
|
||||
as std::sync::Arc<dyn kigi_workspace::permission::PermissionHookTransport>
|
||||
});
|
||||
if transport.is_none() {
|
||||
tracing::debug!(
|
||||
session_id = % session_info.id.0,
|
||||
"hitl permission live enabled but no remote transport available; using local prompt"
|
||||
);
|
||||
}
|
||||
transport
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let (permissions, _permission_events_rx) =
|
||||
kigi_workspace::permission::spawn_permission_manager_with_hub(
|
||||
kigi_workspace::permission::spawn_permission_manager(
|
||||
session_info.id.clone(),
|
||||
gateway.clone(),
|
||||
tool_context.cwd.clone(),
|
||||
@@ -289,7 +263,6 @@ pub(crate) async fn spawn_session_actor(
|
||||
session_yolo_mode,
|
||||
session_client_identifier.clone(),
|
||||
crate::util::config::remember_tool_approvals_from_disk(),
|
||||
hub_permission,
|
||||
);
|
||||
if crate::util::config::auto_mode_session_active(
|
||||
crate::util::config::auto_permission_mode_enabled_from_disk(),
|
||||
@@ -975,11 +948,6 @@ pub(crate) async fn spawn_session_actor(
|
||||
let (goal_update_tx, goal_update_rx) = tokio::sync::mpsc::unbounded_channel::<
|
||||
kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope,
|
||||
>();
|
||||
let obs_bridge = {
|
||||
let sid = kigi_tool_protocol::SessionId::new(&*session_info.id.0)
|
||||
.unwrap_or_else(|_| kigi_tool_protocol::SessionId::new("unknown").expect("valid"));
|
||||
kigi_computer_hub_sdk::ObservabilityBridge::new(None, sid)
|
||||
};
|
||||
let mut effective_config = crate::config::load_effective_config()
|
||||
.ok()
|
||||
.and_then(|raw| crate::agent::config::Config::new_from_toml_cfg(&raw).ok())
|
||||
@@ -1199,7 +1167,6 @@ pub(crate) async fn spawn_session_actor(
|
||||
events: crate::session::events::EventTracker::new(
|
||||
&crate::session::persistence::session_dir(&session_info),
|
||||
),
|
||||
observability_bridge: obs_bridge,
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -323,15 +323,6 @@ impl SessionActor {
|
||||
self.emit_event(crate::session::events::Event::ToolStarted {
|
||||
tool_name: call.function.name.clone(),
|
||||
});
|
||||
self.observability_bridge
|
||||
.emit(
|
||||
kigi_tool_protocol::session_event::SessionEvent::ToolCallStarted {
|
||||
tool_call_id: call.id.clone(),
|
||||
tool_name: call.function.name.clone(),
|
||||
turn_number: self.current_turn_number.get(),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
let call_name = call.function.name.clone();
|
||||
match self
|
||||
.prepare_tool_call(call, &mut deferred_followups)
|
||||
@@ -653,16 +644,6 @@ impl SessionActor {
|
||||
duration_ms,
|
||||
outcome: tool_outcome,
|
||||
});
|
||||
self.observability_bridge
|
||||
.emit(
|
||||
kigi_tool_protocol::session_event::SessionEvent::ToolCallCompleted {
|
||||
tool_call_id: prepared.call_id.clone(),
|
||||
tool_name: prepared.tool_name.clone(),
|
||||
duration_ms,
|
||||
outcome: map_tool_outcome(tool_outcome),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
tracing::info_span!(
|
||||
"tool.execution", tool_name = % prepared.tool_name, tool_use_id = %
|
||||
prepared.call_id, tool_input_size_bytes = prepared.raw_arguments.len() as
|
||||
|
||||
@@ -394,15 +394,6 @@ impl SessionActor {
|
||||
schema_version: crate::session::events::EVENT_SCHEMA_VERSION.into(),
|
||||
redirect_kind,
|
||||
});
|
||||
self.observability_bridge
|
||||
.emit(
|
||||
kigi_tool_protocol::session_event::SessionEvent::TurnStarted {
|
||||
turn_number,
|
||||
model_id: model_id.clone(),
|
||||
yolo_mode,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
self.send_before_turn_event(kigi_tool_protocol::turn_hook::BeforeTurnPayload {
|
||||
turn_number: self.chat_state_handle.get_prompt_index().await as u64,
|
||||
model_id: model_id.clone(),
|
||||
@@ -733,15 +724,6 @@ impl SessionActor {
|
||||
);
|
||||
let turn_tool_count = self.events.tool_count_this_turn();
|
||||
let bridge_outcome = turn_result_to_hook_outcome(&result);
|
||||
self.observability_bridge
|
||||
.emit(kigi_tool_protocol::session_event::SessionEvent::TurnEnded {
|
||||
turn_number: current_prompt_index as u64,
|
||||
outcome: bridge_outcome,
|
||||
duration_ms: turn_duration_ms,
|
||||
tool_call_count: turn_tool_count,
|
||||
model_id: turn_model_id.clone(),
|
||||
})
|
||||
.await;
|
||||
match &result {
|
||||
Ok(TurnOutcome::Completed { .. }) => {
|
||||
self.emit_turn_ended(
|
||||
@@ -1678,13 +1660,6 @@ impl SessionActor {
|
||||
self.emit_event(crate::session::events::Event::PhaseChanged {
|
||||
phase: crate::session::events::Phase::WaitingForModel,
|
||||
});
|
||||
self.observability_bridge
|
||||
.emit(
|
||||
kigi_tool_protocol::session_event::SessionEvent::PhaseChanged {
|
||||
phase: kigi_tool_protocol::session_event::SessionPhase::Sampling,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
kigi_log::unified_log::info(
|
||||
"shell.turn.inference_start",
|
||||
Some(self.session_info.id.0.as_ref()),
|
||||
@@ -1989,13 +1964,6 @@ impl SessionActor {
|
||||
self.emit_event(crate::session::events::Event::PhaseChanged {
|
||||
phase: crate::session::events::Phase::ToolExecution,
|
||||
});
|
||||
self.observability_bridge
|
||||
.emit(
|
||||
kigi_tool_protocol::session_event::SessionEvent::PhaseChanged {
|
||||
phase: kigi_tool_protocol::session_event::SessionPhase::ToolExecution,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
let execute_tool_calls_result = self.execute_tool_calls(tool_call_responses).await;
|
||||
match execute_tool_calls_result {
|
||||
Ok(ToolLoop::PermissionReject { tool_name, reason }) => {
|
||||
|
||||
@@ -256,7 +256,6 @@ async fn persist_ack_waits_for_disk_flush_before_success() {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
@@ -695,7 +694,6 @@ async fn first_turn_memory_injection_disabled_does_not_persist_to_chat_history()
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
@@ -943,7 +941,6 @@ async fn cancel_running_task_teardown_clears_running_and_pending_work() {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
@@ -1924,7 +1921,6 @@ async fn cancel_propagates_to_sampler_handle_so_no_further_emission() {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
-1
@@ -62,7 +62,6 @@ async fn tool_bridge_routes_writes_through_injected_fs() {
|
||||
video_gen_config: Default::default(),
|
||||
app_builder_deployer_config: Default::default(),
|
||||
api_key_provider: None,
|
||||
auth_provider: None,
|
||||
attribution_callback: None,
|
||||
system_reminder_tag: kigi_tools::reminders::DEFAULT_REMINDER_TAG,
|
||||
};
|
||||
|
||||
@@ -285,7 +285,6 @@ async fn test_e2e_idle_resume_refreshes_model_metadata() {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
-3
@@ -214,7 +214,6 @@ async fn create_test_actor(
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
@@ -655,7 +654,6 @@ async fn create_test_actor_with_memory(
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
@@ -1410,7 +1408,6 @@ async fn test_e2e_idle_resume_refreshes_model_metadata() {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -276,7 +276,6 @@ async fn create_test_actor_with_memory(
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -33,6 +33,7 @@ fn install_real_permissions(actor: &mut SessionActor) {
|
||||
vec![],
|
||||
false,
|
||||
None,
|
||||
true,
|
||||
);
|
||||
actor.permissions = handle;
|
||||
}
|
||||
|
||||
-1
@@ -222,7 +222,6 @@ pub(super) async fn make_replay_send_update_fixture() -> ReplaySendUpdateFixture
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -12,12 +12,6 @@ pub(crate) const HARNESS_VERIFIES_SENTENCE: &str =
|
||||
pub(crate) const PLAN_SEED_TODOS_PHRASE: &str =
|
||||
"Seed todos from the plan's acceptance criteria via";
|
||||
#[cfg(test)]
|
||||
pub(crate) fn noop_observability_bridge() -> kigi_computer_hub_sdk::ObservabilityBridge {
|
||||
kigi_computer_hub_sdk::ObservabilityBridge::new(
|
||||
None,
|
||||
kigi_tool_protocol::SessionId::new("test").expect("valid"),
|
||||
)
|
||||
}
|
||||
#[cfg(test)]
|
||||
pub(crate) async fn test_agent_default() -> kigi_agent::Agent {
|
||||
test_agent_with_tools(vec![]).await
|
||||
@@ -99,7 +93,6 @@ async fn test_agent_from_config(
|
||||
video_gen_config: Default::default(),
|
||||
app_builder_deployer_config: Default::default(),
|
||||
api_key_provider: None,
|
||||
auth_provider: None,
|
||||
attribution_callback: None,
|
||||
system_reminder_tag: kigi_tools::reminders::DEFAULT_REMINDER_TAG,
|
||||
};
|
||||
@@ -336,7 +329,6 @@ pub(crate) async fn create_test_actor_ex(
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -41,7 +41,6 @@ async fn web_search_errors_when_disabled() {
|
||||
video_gen_config: Default::default(),
|
||||
app_builder_deployer_config: Default::default(),
|
||||
api_key_provider: None,
|
||||
auth_provider: None,
|
||||
attribution_callback: None,
|
||||
system_reminder_tag: kigi_tools::reminders::DEFAULT_REMINDER_TAG,
|
||||
};
|
||||
|
||||
@@ -2312,7 +2312,6 @@ mod inline_auto_compact_flow_tests {
|
||||
plugin_registry: std::cell::RefCell::new(None),
|
||||
plugin_registry_handle: None,
|
||||
events: crate::session::events::EventTracker::new(std::path::Path::new("/tmp")),
|
||||
observability_bridge: noop_observability_bridge(),
|
||||
current_turn_number: std::cell::Cell::new(0),
|
||||
last_recap_main_turn: std::cell::Cell::new(0),
|
||||
recap_in_flight: std::cell::Cell::new(false),
|
||||
|
||||
@@ -1052,7 +1052,7 @@ async fn test_load_prompts_only_large_session() {
|
||||
info.id.clone(),
|
||||
acp::SessionUpdate::UserMessageChunk(
|
||||
acp::ContentChunk::new(
|
||||
acp::ContentBlock::Text(acp::TextContent::new(format!("part2"))),
|
||||
acp::ContentBlock::Text(acp::TextContent::new("part2".to_string())),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user