Use session IDs for scratches and queued messages (Vibe Kanban) (#1613)
* All changes have been completed. Here's a summary of what was done: ## Summary Changed both scratches and queued messages to use session IDs instead of workspace IDs: ### Files Modified 1. **`frontend/src/components/tasks/TaskFollowUpSection.tsx`** - Changed `useScratch(ScratchType.DRAFT_FOLLOW_UP, workspaceId ?? '')` → `useScratch(ScratchType.DRAFT_FOLLOW_UP, sessionId ?? '')` 2. **`crates/server/src/routes/sessions/queue.rs`** - Changed `session.workspace_id` → `session.id` in all three queue operations (queue, cancel, get status) 3. **`crates/services/src/services/queued_message.rs`** - Renamed `task_attempt_id` → `session_id` in `QueuedMessage` struct - Updated all method parameters and comments 4. **`crates/local-deployment/src/container.rs`** - Changed `ctx.workspace.id` → `ctx.session.id` for queue lookups and scratch deletion - Updated log messages to reference "session" instead of "workspace" 5. **`shared/types.ts`** (auto-generated) - `QueuedMessage.task_attempt_id` → `QueuedMessage.session_id` * Cleanup script changes for task attempt 4df90bcd-f261-41ca-bac3-8f7c2fc576c5 * Build passes. The fix has been applied. Found and fixed one missed instance in `sessions/mod.rs` where `Scratch::delete` was using `workspace.id` instead of `session.id`.
This commit is contained in:
@@ -7,19 +7,19 @@ use serde::{Deserialize, Serialize};
|
||||
use ts_rs::TS;
|
||||
use uuid::Uuid;
|
||||
|
||||
/// Represents a queued follow-up message for a task attempt
|
||||
/// Represents a queued follow-up message for a session
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
|
||||
#[ts(export)]
|
||||
pub struct QueuedMessage {
|
||||
/// The task attempt this message is queued for
|
||||
pub task_attempt_id: Uuid,
|
||||
/// The session this message is queued for
|
||||
pub session_id: Uuid,
|
||||
/// The follow-up data (message + variant)
|
||||
pub data: DraftFollowUpData,
|
||||
/// Timestamp when the message was queued
|
||||
pub queued_at: DateTime<Utc>,
|
||||
}
|
||||
|
||||
/// Status of the queue for a task attempt (for frontend display)
|
||||
/// Status of the queue for a session (for frontend display)
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
|
||||
#[serde(tag = "status", rename_all = "snake_case")]
|
||||
#[ts(export)]
|
||||
@@ -31,7 +31,7 @@ pub enum QueueStatus {
|
||||
}
|
||||
|
||||
/// In-memory service for managing queued follow-up messages.
|
||||
/// One queued message per task attempt.
|
||||
/// One queued message per session.
|
||||
#[derive(Clone)]
|
||||
pub struct QueuedMessageService {
|
||||
queue: Arc<DashMap<Uuid, QueuedMessage>>,
|
||||
@@ -44,41 +44,41 @@ impl QueuedMessageService {
|
||||
}
|
||||
}
|
||||
|
||||
/// Queue a message for a task attempt. Replaces any existing queued message.
|
||||
pub fn queue_message(&self, task_attempt_id: Uuid, data: DraftFollowUpData) -> QueuedMessage {
|
||||
/// Queue a message for a session. Replaces any existing queued message.
|
||||
pub fn queue_message(&self, session_id: Uuid, data: DraftFollowUpData) -> QueuedMessage {
|
||||
let queued = QueuedMessage {
|
||||
task_attempt_id,
|
||||
session_id,
|
||||
data,
|
||||
queued_at: Utc::now(),
|
||||
};
|
||||
self.queue.insert(task_attempt_id, queued.clone());
|
||||
self.queue.insert(session_id, queued.clone());
|
||||
queued
|
||||
}
|
||||
|
||||
/// Cancel/remove a queued message for a task attempt
|
||||
pub fn cancel_queued(&self, task_attempt_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.remove(&task_attempt_id).map(|(_, v)| v)
|
||||
/// Cancel/remove a queued message for a session
|
||||
pub fn cancel_queued(&self, session_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.remove(&session_id).map(|(_, v)| v)
|
||||
}
|
||||
|
||||
/// Get the queued message for a task attempt (if any)
|
||||
pub fn get_queued(&self, task_attempt_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.get(&task_attempt_id).map(|r| r.clone())
|
||||
/// Get the queued message for a session (if any)
|
||||
pub fn get_queued(&self, session_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.get(&session_id).map(|r| r.clone())
|
||||
}
|
||||
|
||||
/// Take (remove and return) the queued message for a task attempt.
|
||||
/// Take (remove and return) the queued message for a session.
|
||||
/// Used by finalization flow to consume the queued message.
|
||||
pub fn take_queued(&self, task_attempt_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.remove(&task_attempt_id).map(|(_, v)| v)
|
||||
pub fn take_queued(&self, session_id: Uuid) -> Option<QueuedMessage> {
|
||||
self.queue.remove(&session_id).map(|(_, v)| v)
|
||||
}
|
||||
|
||||
/// Check if a task attempt has a queued message
|
||||
pub fn has_queued(&self, task_attempt_id: Uuid) -> bool {
|
||||
self.queue.contains_key(&task_attempt_id)
|
||||
/// Check if a session has a queued message
|
||||
pub fn has_queued(&self, session_id: Uuid) -> bool {
|
||||
self.queue.contains_key(&session_id)
|
||||
}
|
||||
|
||||
/// Get queue status for frontend display
|
||||
pub fn get_status(&self, task_attempt_id: Uuid) -> QueueStatus {
|
||||
match self.get_queued(task_attempt_id) {
|
||||
pub fn get_status(&self, session_id: Uuid) -> QueueStatus {
|
||||
match self.get_queued(session_id) {
|
||||
Some(msg) => QueueStatus::Queued { message: msg },
|
||||
None => QueueStatus::Empty,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user