tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: preprompt would show after loading session (#8744)

Browse Source 
Signed-off-by: Matt Toohey <contact@matttoohey.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Matt Toohey
2026-04-23 11:06:27 +12:00
committed by GitHub
parent e7e50320a1
commit 4928ce55e2
5 changed files with 148 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose/src/acp/server.rs
+79 -31
View File
@@ -28,28 +28,31 @@ use crate::providers::inventory::{
};
use crate::session::session_manager::SessionType;
use crate::session::{EnabledExtensionsState, Session, SessionManager};
use crate::utils::sanitize_unicode_tags;
use anyhow::Result;
use fs_err as fs;
use futures::future::{BoxFuture, Either};
use goose_acp_macros::custom_methods;
use rmcp::model::{CallToolResult, RawContent, ResourceContents, Role};
use rmcp::model::{
AnnotateAble, CallToolResult, RawContent, RawTextContent, ResourceContents, Role,
};
use sacp::schema::{
AgentCapabilities, AuthMethod, AuthMethodAgent, AuthenticateRequest, AuthenticateResponse,
BlobResourceContents, CancelNotification, CloseSessionRequest, CloseSessionResponse,
ConfigOptionUpdate, Content, ContentBlock, ContentChunk, CurrentModeUpdate, EmbeddedResource,
EmbeddedResourceResource, FileSystemCapabilities, ForkSessionRequest, ForkSessionResponse,
ImageContent, InitializeRequest, InitializeResponse, ListSessionsRequest, ListSessionsResponse,
LoadSessionRequest, LoadSessionResponse, McpCapabilities, McpServer, Meta, ModelId, ModelInfo,
NewSessionRequest, NewSessionResponse, PermissionOption, PermissionOptionKind,
PromptCapabilities, PromptRequest, PromptResponse, RequestPermissionOutcome,
RequestPermissionRequest, ResourceLink, SessionCapabilities, SessionCloseCapabilities,
SessionConfigOption, SessionConfigOptionCategory, SessionConfigSelectOption, SessionId,
SessionInfo, SessionListCapabilities, SessionMode, SessionModeId, SessionModeState,
SessionModelState, SessionNotification, SessionUpdate, SetSessionConfigOptionRequest,
SetSessionConfigOptionResponse, SetSessionModeRequest, SetSessionModeResponse,
SetSessionModelRequest, SetSessionModelResponse, StopReason, TextContent, TextResourceContents,
ToolCall, ToolCallContent, ToolCallId, ToolCallLocation, ToolCallStatus, ToolCallUpdate,
ToolCallUpdateFields, ToolKind, Usage, UsageUpdate,
AgentCapabilities, Annotations, AuthMethod, AuthMethodAgent, AuthenticateRequest,
AuthenticateResponse, BlobResourceContents, CancelNotification, CloseSessionRequest,
CloseSessionResponse, ConfigOptionUpdate, Content, ContentBlock, ContentChunk,
CurrentModeUpdate, EmbeddedResource, EmbeddedResourceResource, FileSystemCapabilities,
ForkSessionRequest, ForkSessionResponse, ImageContent, InitializeRequest, InitializeResponse,
ListSessionsRequest, ListSessionsResponse, LoadSessionRequest, LoadSessionResponse,
McpCapabilities, McpServer, Meta, ModelId, ModelInfo, NewSessionRequest, NewSessionResponse,
PermissionOption, PermissionOptionKind, PromptCapabilities, PromptRequest, PromptResponse,
RequestPermissionOutcome, RequestPermissionRequest, ResourceLink, SessionCapabilities,
SessionCloseCapabilities, SessionConfigOption, SessionConfigOptionCategory,
SessionConfigSelectOption, SessionId, SessionInfo, SessionListCapabilities, SessionMode,
SessionModeId, SessionModeState, SessionModelState, SessionNotification, SessionUpdate,
SetSessionConfigOptionRequest, SetSessionConfigOptionResponse, SetSessionModeRequest,
SetSessionModeResponse, SetSessionModelRequest, SetSessionModelResponse, StopReason,
TextContent, TextResourceContents, ToolCall, ToolCallContent, ToolCallId, ToolCallLocation,
ToolCallStatus, ToolCallUpdate, ToolCallUpdateFields, ToolKind, Usage, UsageUpdate,
};
use sacp::util::MatchDispatchFrom;
use sacp::{
@@ -1155,16 +1158,49 @@ impl GooseAcpAgent {
self.sessions.lock().await.contains_key(session_id)
}
fn convert_acp_prompt_to_message(&self, prompt: Vec<ContentBlock>) -> Message {
let mut user_message = Message::user();
/// Convert ACP prompt content blocks into a user message.
fn convert_acp_prompt_to_message(prompt: &[ContentBlock]) -> Message {
let mut message = Message::user();
for block in prompt {
match block {
ContentBlock::Text(text) => {
user_message = user_message.with_text(&text.text);
let annotated = if let Some(ref ann) = text.annotations {
let audience: Vec<Role> = ann
.audience
.as_ref()
.map(|roles| {
roles
.iter()
.filter_map(|r| match r {
sacp::schema::Role::Assistant => Some(Role::Assistant),
sacp::schema::Role::User => Some(Role::User),
_ => None,
})
.collect()
})
.unwrap_or_default();
let raw = RawTextContent {
text: sanitize_unicode_tags(&text.text),
meta: None,
};
if audience.is_empty() {
raw.no_annotation()
} else {
raw.no_annotation().with_audience(audience)
}
} else {
// No annotations — regular user text.
let sanitized = sanitize_unicode_tags(&text.text);
RawTextContent {
text: sanitized,
meta: None,
}
.no_annotation()
};
message = message.with_content(MessageContent::Text(annotated));
}
ContentBlock::Image(image) => {
user_message = user_message.with_image(&image.data, &image.mime_type);
message = message.with_image(&image.data, &image.mime_type);
}
ContentBlock::Resource(resource) => {
if let EmbeddedResourceResource::TextResourceContents(text_resource) =
@@ -1172,19 +1208,18 @@ impl GooseAcpAgent {
{
let header = format!("--- Resource: {} ---\n", text_resource.uri);
let content = format!("{}{}\n---\n", header, text_resource.text);
user_message = user_message.with_text(&content);
message = message.with_text(&content);
}
}
ContentBlock::ResourceLink(link) => {
if let Some(text) = read_resource_link(link) {
user_message = user_message.with_text(text)
if let Some(text) = read_resource_link(link.clone()) {
message = message.with_text(text);
}
}
ContentBlock::Audio(..) | _ => (),
}
}
user_message
message
}
async fn handle_message_content(
@@ -1943,9 +1978,21 @@ impl GooseAcpAgent {
for content_item in &message.content {
match content_item {
MessageContent::Text(text) => {
let chunk = ContentChunk::new(ContentBlock::Text(TextContent::new(
text.text.clone(),
)));
let mut tc = TextContent::new(text.text.clone());
if let Some(audience) = text.audience() {
tc = tc.annotations(
Annotations::new().audience(
audience
.iter()
.map(|r| match r {
Role::Assistant => sacp::schema::Role::Assistant,
Role::User => sacp::schema::Role::User,
})
.collect::<Vec<_>>(),
),
);
}
let chunk = ContentChunk::new(ContentBlock::Text(tc));
let update = match message.role {
Role::User => SessionUpdate::UserMessageChunk(chunk),
Role::Assistant => SessionUpdate::AgentMessageChunk(chunk),
@@ -2150,9 +2197,10 @@ impl GooseAcpAgent {
.await?;
debug!(target: "perf", sid = %sid, ms = t_agent.elapsed().as_millis() as u64, "perf: prompt get_session_agent (waits for agent setup)");
let user_message = self.convert_acp_prompt_to_message(args.prompt);
let user_message = Self::convert_acp_prompt_to_message(&args.prompt);
let t_persist = std::time::Instant::now();
// Persist user message (may contain assistant-only annotated blocks)
self.thread_manager
.append_message(&thread_id, Some(&internal_session_id), &user_message)
.await