Skip to content

Fix distill-replace creating new conversation entry in UI #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okottorika wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix distill-replace creating new conversation entry in UI #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 64 additions & 12 deletions server/distill_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,15 +765,24 @@ func TestDistillReplaceConversation(t *testing.T) {
t.Fatal("timed out waiting for distilled user message")
}

// Verify slug swap: new conversation should have the original slug
newConv, err := h.db.GetConversationByID(context.Background(), newConvID)
if err != nil {
t.Fatalf("failed to get new conversation: %v", err)
// Wait for the slug swap to complete (happens asynchronously after distillation)
var newConv *generated.Conversation
for i := 0; i < 100; i++ {
newConv, err = h.db.GetConversationByID(context.Background(), newConvID)
if err != nil {
t.Fatalf("failed to get new conversation: %v", err)
}
if newConv.Slug != nil && *newConv.Slug == originalSlug {
break
}
time.Sleep(50 * time.Millisecond)
}
if newConv.Slug == nil || *newConv.Slug != originalSlug {
t.Fatalf("expected new conv slug %q, got %v", originalSlug, newConv.Slug)
}

// Verify slug swap: new conversation should have the original slug

// Verify source conversation was renamed
sourceConv, err := h.db.GetConversationByID(context.Background(), sourceConvID)
if err != nil {
Expand Down Expand Up @@ -897,20 +906,36 @@ func TestDistillReplaceConversationNoSlug(t *testing.T) {
done:

// The new conversation should have gotten its own generated slug (not
// transferred from source, since source had none).
newConv, err := h.db.GetConversationByID(context.Background(), newConvID)
if err != nil {
t.Fatalf("failed to get new conversation: %v", err)
// transferred from source, since source had none). Wait for it to be generated.
var newConv *generated.Conversation
for i := 0; i < 100; i++ {
newConv, err = h.db.GetConversationByID(context.Background(), newConvID)
if err != nil {
t.Fatalf("failed to get new conversation: %v", err)
}
if newConv.Slug != nil {
break
}
time.Sleep(50 * time.Millisecond)
}
if newConv.Slug == nil {
t.Fatal("expected new conversation to have a generated slug")
}

// Verify source is archived and parented
sourceConvAfter, err := h.db.GetConversationByID(context.Background(), sourceConvID)
if err != nil {
t.Fatalf("failed to get source conversation: %v", err)
// Wait for source to be archived and parented (happens asynchronously)
var sourceConvAfter *generated.Conversation
for i := 0; i < 100; i++ {
sourceConvAfter, err = h.db.GetConversationByID(context.Background(), sourceConvID)
if err != nil {
t.Fatalf("failed to get source conversation: %v", err)
}
if sourceConvAfter.Archived && sourceConvAfter.ParentConversationID != nil {
break
}
time.Sleep(50 * time.Millisecond)
}

// Verify source is archived and parented
if !sourceConvAfter.Archived {
t.Fatal("expected source conversation to be archived")
}
Expand Down Expand Up @@ -955,6 +980,15 @@ func TestDistillReplaceMultiPass(t *testing.T) {
// Wait for first distillation to complete
waitForDistillComplete(t, h.db, conv1ID)

// Wait for first slug swap to complete
for i := 0; i < 100; i++ {
conv1Check, _ := h.db.GetConversationByID(context.Background(), conv1ID)
if conv1Check.Slug != nil && *conv1Check.Slug == originalSlug {
break
}
time.Sleep(50 * time.Millisecond)
}

// Verify first pass: conv1 has the original slug, source renamed to -prev
conv1, _ := h.db.GetConversationByID(context.Background(), conv1ID)
if conv1.Slug == nil || *conv1.Slug != originalSlug {
Expand Down Expand Up @@ -986,6 +1020,15 @@ func TestDistillReplaceMultiPass(t *testing.T) {
// Wait for second distillation to complete
waitForDistillComplete(t, h.db, conv2ID)

// Wait for second slug swap to complete
for i := 0; i < 100; i++ {
conv2Check, _ := h.db.GetConversationByID(context.Background(), conv2ID)
if conv2Check.Slug != nil && *conv2Check.Slug == originalSlug {
break
}
time.Sleep(50 * time.Millisecond)
}

// Verify second pass:
// - conv2 has the original slug
// - conv1 renamed to -prev-2 (since -prev is taken by the original source)
Expand Down Expand Up @@ -1023,6 +1066,15 @@ func TestDistillReplaceMultiPass(t *testing.T) {

waitForDistillComplete(t, h.db, conv3ID)

// Wait for third slug swap to complete
for i := 0; i < 100; i++ {
conv3Check, _ := h.db.GetConversationByID(context.Background(), conv3ID)
if conv3Check.Slug != nil && *conv3Check.Slug == originalSlug {
break
}
time.Sleep(50 * time.Millisecond)
}

// Verify third pass:
// - conv3 has the original slug
// - conv2 renamed to -prev-3
Expand Down
59 changes: 57 additions & 2 deletions ui/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ function App() {
conversation_id: string;
working: boolean;
} | null>(null);
// Track active distill-replace operations: sourceConvID -> newConvID
const [distillReplaceOperations, setDistillReplaceOperations] = useState<Record<string, string>>(
{},
);
const initialSlugResolved = useRef(false);

// Resolve initial slug from URL - uses the captured initialSlugFromUrl
Expand Down Expand Up @@ -342,7 +346,28 @@ function App() {
}

// If the conversation is archived, remove it from the active list
// If this was a distill-replace source, navigate to the new conversation
if (update.conversation.archived) {
// Check if this is a distill-replace source conversation
const newConvId = distillReplaceOperations[update.conversation.conversation_id];
if (newConvId) {
// Clean up the tracking entry
setDistillReplaceOperations((prev) => {
const { [update.conversation!.conversation_id]: _, ...rest } = prev;
return rest;
});
// Navigate to the new conversation after state updates complete
setTimeout(() => {
setConversations((convs) => {
const newConv = convs.find((c) => c.conversation_id === newConvId);
if (newConv) {
setCurrentConversationId(newConvId);
setViewedConversation(newConv);
}
return convs;
});
}, 0);
}
setConversations((prev) =>
prev.filter((c) => c.conversation_id !== update.conversation!.conversation_id),
);
Expand Down Expand Up @@ -384,7 +409,7 @@ function App() {
setConversations((prev) => prev.filter((c) => c.conversation_id !== update.conversation_id));
conversationCache.delete(update.conversation_id);
}
}, []);
}, [distillReplaceOperations, conversationCache]);

// Handle conversation state updates (working state changes)
const handleConversationStateUpdate = useCallback(
Expand Down Expand Up @@ -661,9 +686,39 @@ function App() {
try {
const response = await api.distillReplaceConversation(sourceConversationId, model, cwd);
const newConversationId = response.conversation_id;

// Track this distill-replace operation so we can navigate when the source is archived
setDistillReplaceOperations((prev) => ({
...prev,
[sourceConversationId]: newConversationId,
}));

// Refresh conversations list but don't navigate yet — we'll navigate
// when we receive the SSE update showing the source was archived.
const updatedConvs = await api.getConversations();
setConversations(updatedConvs);
setCurrentConversationId(newConversationId);

// Fallback: if the SSE connection drops or the archive update never arrives,
// navigate anyway after a timeout so the user isn't stuck.
setTimeout(() => {
setDistillReplaceOperations((prev) => {
const targetConvId = prev[sourceConversationId];
if (targetConvId && targetConvId === newConversationId) {
// Still tracked — SSE update didn't fire. Navigate anyway.
setConversations((convs) => {
const newConv = convs.find((c) => c.conversation_id === newConversationId);
if (newConv) {
setCurrentConversationId(newConversationId);
setViewedConversation(newConv);
}
return convs;
});
const { [sourceConversationId]: _, ...rest } = prev;
return rest;
}
return prev; // Already handled by SSE update
});
}, 15000);
} catch (err) {
console.error("Failed to distill-replace conversation:", err);
setError("Failed to distill-replace conversation");
Expand Down