Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions crates/aionui-api-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,10 @@ pub use system::{
UpdateClientPreferencesRequest, UpdateSettingsRequest,
};
pub use team::{
AddAgentRequest, CancelTeamChildTurnRequest, CancelTeamRunRequest, CreateTeamRequest, PauseTeamSlotRequest,
RenameAgentRequest, RenameTeamRequest, SendAgentMessageRequest, SendTeamMessageRequest, TeamAgentInput,
TeamAgentRemovedPayload, TeamAgentRenamedPayload, TeamAgentResponse, TeamAgentRuntimeStatus,
AdHocTeamAssociationResponse, AdHocTeamAssociationStatus, AdHocTeamFromConversationResponse, AddAgentRequest,
CancelTeamChildTurnRequest, CancelTeamRunRequest, CreateAdHocTeamFromConversationRequest, CreateTeamRequest,
PauseTeamSlotRequest, RenameAgentRequest, RenameTeamRequest, SendAgentMessageRequest, SendTeamMessageRequest,
TeamAgentInput, TeamAgentRemovedPayload, TeamAgentRenamedPayload, TeamAgentResponse, TeamAgentRuntimeStatus,
TeamAgentRuntimeStatusPayload, TeamAgentSpawnedPayload, TeamAgentStatusPayload, TeamChildTurnPayload,
TeamListResponse, TeamMcpRuntimeConfig, TeamMessageEnqueueStatus, TeamResponse, TeamRunAckResponse, TeamRunPayload,
TeamRunSource, TeamRunStateResponse, TeamRunStatus, TeamRunTargetRole, TeamRuntimeSeed,
Expand Down
52 changes: 52 additions & 0 deletions crates/aionui-api-types/src/team.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,51 @@ impl<'de> Deserialize<'de> for TeamAgentInput {
}
}

/// Request body for `POST /api/teams/from-conversation`.
///
/// Creates an ad-hoc team from an existing conversation. The source conversation
/// becomes the team's origin; its assistant is promoted to the team lead. A target
/// assistant may be added as a teammate.
#[derive(Debug, Deserialize)]
pub struct CreateAdHocTeamFromConversationRequest {
pub conversation_id: String,
pub user_id: String,
#[serde(default)]
pub target_assistant_id: Option<String>,
#[serde(default)]
pub name: Option<String>,
#[serde(default)]
pub workspace_mode: Option<String>,
}

/// Response body for `POST /api/teams/from-conversation`.
#[derive(Debug, Serialize)]
pub struct AdHocTeamFromConversationResponse {
pub team_id: String,
pub origin_conversation_id: String,
pub leader_slot_id: String,
pub target_slot_id: Option<String>,
pub created: bool,
}

/// Association status of an ad-hoc team created from a conversation.
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum AdHocTeamAssociationStatus {
Active,
Disbanded,
}

/// Response body for `GET /api/teams/by-conversation`.
#[derive(Debug, Serialize)]
pub struct AdHocTeamAssociationResponse {
pub team_id: String,
pub origin_conversation_id: String,
pub status: AdHocTeamAssociationStatus,
#[serde(skip_serializing_if = "Option::is_none")]
pub team: Option<TeamResponse>,
}

/// Request body for `POST /api/teams`.
///
/// Creates a team with the given name and agent list.
Expand Down Expand Up @@ -447,6 +492,8 @@ pub struct TeamResponse {
pub assistants: Vec<TeamAgentResponse>,
#[serde(skip_serializing_if = "Option::is_none", alias = "lead_agent_id")]
pub leader_assistant_id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub origin_conversation_id: Option<String>,
pub created_at: TimestampMs,
pub updated_at: TimestampMs,
}
Expand Down Expand Up @@ -972,6 +1019,7 @@ mod tests {
pending_confirmations: 0,
}],
leader_assistant_id: Some("slot-1".into()),
origin_conversation_id: Some("origin-1".into()),
created_at: 1700000000000,
updated_at: 1700001000000,
};
Expand All @@ -980,6 +1028,7 @@ mod tests {
assert_eq!(json["name"], "Alpha");
assert_eq!(json["workspace"], "/workspace/team-1");
assert_eq!(json["leader_assistant_id"], "slot-1");
assert_eq!(json["origin_conversation_id"], "origin-1");
assert_eq!(json["created_at"], 1700000000000_i64);
assert_eq!(json["updated_at"], 1700001000000_i64);
assert_eq!(json["assistants"].as_array().unwrap().len(), 1);
Expand All @@ -994,11 +1043,13 @@ mod tests {
workspace: String::new(),
assistants: vec![],
leader_assistant_id: None,
origin_conversation_id: None,
created_at: 1700000000000,
updated_at: 1700000000000,
};
let json = serde_json::to_value(&team).unwrap();
assert!(json.get("leader_assistant_id").is_none());
assert!(json.get("origin_conversation_id").is_none());
assert!(json["assistants"].as_array().unwrap().is_empty());
}

Expand Down Expand Up @@ -1128,6 +1179,7 @@ mod tests {
},
],
leader_assistant_id: Some("s1".into()),
origin_conversation_id: Some("origin-conv".into()),
created_at: 1000,
updated_at: 2000,
};
Expand Down
43 changes: 43 additions & 0 deletions crates/aionui-app/src/router/team_conversation_adapters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,49 @@ impl TeamConversationProvisioningPort for TeamConversationAdapters {
.map(str::to_owned))
}

async fn conversation_metadata(
&self,
conversation_id: &str,
) -> Result<Option<aionui_team::provisioning::ConversationMetadata>, TeamError> {
let Some(row) = self.conversation_repo.get(conversation_id).await? else {
return Ok(None);
};

let assistant_id = self.conversation_assistant_id(conversation_id).await?;
let extra: serde_json::Value = serde_json::from_str(&row.extra).unwrap_or(serde_json::Value::Null);
let workspace = extra
.get("workspace")
.and_then(serde_json::Value::as_str)
.map(str::trim)
.filter(|value| !value.is_empty())
.map(str::to_owned);
let (backend, model) = row
.model
.as_deref()
.and_then(|model_json| serde_json::from_str::<serde_json::Value>(model_json).ok())
.map(|model_value| {
let backend = model_value
.get("provider_id")
.and_then(serde_json::Value::as_str)
.map(str::to_owned);
let model = model_value
.get("model")
.and_then(serde_json::Value::as_str)
.map(str::to_owned);
(backend, model)
})
.unwrap_or_default();

Ok(Some(aionui_team::provisioning::ConversationMetadata {
conversation_id: row.id,
user_id: row.user_id,
assistant_id,
backend,
model,
workspace,
}))
}

async fn create_team_temp_workspace(&self, team_id: &str) -> Result<String, TeamError> {
self.conversation_service
.create_team_temp_workspace(team_id)
Expand Down
Loading