Synced from monorepo
Changes: - Non-blocking coding-data sharing upsell banner - Consolidate remediation in Doctor - Auto mode defers fail-closed gate asks to the classifier - Coalesce marketplace list fetches - Allow removing a marketplace source by name - Contain hung git marketplace sources (timeouts, non-blocking refresh, unbrick modal) - Label failed workspace RPCs with error_kind - Drop redundant explicit tonic/prost deps from xai-grok-shell - Report real exit codes for completed background shells - Narrow the date-rollover reminder to date-bearing templates - Wire toolOverrides through the session and agent - Security: Bash(git:*) allowlist matches whole command chain by prefix - Split prompt-trigger telemetry and record classifier provenance - Raise connectors-manager timeout to 60s - Auto classifier honors recorded approvals for repeat actions - Apply doctor fixes in the TUI - Auto-mode classifier timeouts prompt instead of silently denying - Scope subagent completion drains to the owning session - Add the toolOverrides wire types - Set client_identifier=grok-agent-sdk - Accept both spellings of the workspace-teleport kill switch - Persist one-shot occurrence journal - Stop turns that poll the exact same tool call 16x in a row - Copy compaction checkpoint files when forking sessions - Auto-focus permission prompt from scrollback - Esc cancels the running turn in non-vim and minimal modes - List Ctrl+Z undo and redo in keyboard shortcuts - Out-of-process macOS mic capture - Show active auth mode on session-info - Install the npm binary under $GROK_HOME - Remove hover/click dead zones between dashboard items - Route startup warnings to doctor - Document [feedback.user] author identity config - Extend bang command timeout - Close combine-queued edit-hold race - Integrate relocation recovery - Expose privacy notice rollout flag - Break harness discovery ref cycle so connections can idle-evict - Shift/Alt+Enter inserts newline when editing a queued prompt - Gate project Claude permissions on folder trust - Echo response.create.event_id on response.created - Toast when session creation fails from disk full - Add shared test process lifecycle - Enable dynamic workflows by default - Add relocation transaction state machine - Add shared test sandbox - Surface auth failures on model-switch compact - Persist durable scheduler expiry - Confirm before removing extensions-modal items - Re-run compact and prompt after login when compact hit expired auth - Recap sends hosted tools under backend search
This commit is contained in:
parent
3af4d5d398
commit
a5727c5960
482 changed files with 37627 additions and 13402 deletions
|
|
@ -1180,7 +1180,7 @@ impl SamplingClient {
|
|||
deployment_id: request.x_grok_deployment_id.as_deref(),
|
||||
user_id: request.x_grok_user_id.as_deref(),
|
||||
};
|
||||
let extra_raw_tools = std::mem::take(&mut request.extra_raw_tools);
|
||||
let extra_tool_entries = std::mem::take(&mut request.extra_tool_entries);
|
||||
let mut request_body = serde_json::to_value(&request.inner).map_err(|e| {
|
||||
tracing::error!("Failed to serialize responses request: {}", e);
|
||||
SamplingError::Serialization(e)
|
||||
|
|
@ -1191,11 +1191,11 @@ impl SamplingClient {
|
|||
}
|
||||
// Inject xAI-specific tools (e.g., x_search) that can't be expressed
|
||||
// via async_openai's rs::Tool enum.
|
||||
if !extra_raw_tools.is_empty() {
|
||||
if !extra_tool_entries.is_empty() {
|
||||
if let Some(tools) = request_body.get_mut("tools").and_then(|v| v.as_array_mut()) {
|
||||
tools.extend(extra_raw_tools);
|
||||
tools.extend(extra_tool_entries);
|
||||
} else {
|
||||
request_body["tools"] = serde_json::Value::Array(extra_raw_tools);
|
||||
request_body["tools"] = serde_json::Value::Array(extra_tool_entries);
|
||||
}
|
||||
}
|
||||
xai_grok_sampling_types::patch_reasoning_text_types(&mut request_body);
|
||||
|
|
@ -1731,7 +1731,7 @@ impl SamplingClient {
|
|||
|
||||
// Collect xAI-specific tools that can't be expressed via rs::Tool
|
||||
// (e.g., x_search). These are injected as raw JSON after serialization.
|
||||
let extra_tools = xai_grok_sampling_types::extra_raw_tools(&request.hosted_tools);
|
||||
let extra_tools = xai_grok_sampling_types::extra_tool_entries(&request.hosted_tools);
|
||||
|
||||
let responses_request: rs::CreateResponse = (&request).into();
|
||||
|
||||
|
|
@ -1741,7 +1741,7 @@ impl SamplingClient {
|
|||
wrapper.x_grok_session_id = x_grok_session_id;
|
||||
wrapper.x_grok_turn_idx = x_grok_turn_idx;
|
||||
wrapper.x_grok_agent_id = x_grok_agent_id;
|
||||
wrapper.extra_raw_tools = extra_tools;
|
||||
wrapper.extra_tool_entries = extra_tools;
|
||||
|
||||
if let Some(trace) = trace {
|
||||
wrapper.trace = Some(trace);
|
||||
|
|
|
|||
Loading…
Reference in a new issue