@kirosnn/mosaic 0.0.91 → 0.73.0

package/src/web/storage.ts

@@ -26,6 +26,28 @@ export function getAllConversations(): Conversation[] {
     }
 }
 
+export function mergeConversations(incoming: Conversation[]): boolean {
+    if (!incoming.length) return false;
+
+    const existing = getAllConversations();
+    const byId = new Map(existing.map((conv) => [conv.id, conv]));
+    let changed = false;
+
+    for (const conv of incoming) {
+        const current = byId.get(conv.id);
+        if (!current || conv.updatedAt > current.updatedAt) {
+            byId.set(conv.id, conv);
+            changed = true;
+        }
+    }
+
+    if (changed) {
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(Array.from(byId.values())));
+    }
+
+    return changed;
+}
+
 export function getConversation(id: string): Conversation | null {
     const conversations = getAllConversations();
     return conversations.find(c => c.id === id) || null;
@@ -89,4 +111,4 @@ export function formatWorkspace(path: string | null | undefined): string {
     }
 
     return normalized;
-}
+}

package/src/web/types.ts

@@ -1,8 +1,9 @@
-export interface Message {
-    id: string;
-    role: 'user' | 'assistant' | 'tool';
-    content: string;
-    displayContent?: string;
+export interface Message {
+    id: string;
+    role: 'user' | 'assistant' | 'tool';
+    content: string;
+    images?: import("../utils/images").ImageAttachment[];
+    displayContent?: string;
     isError?: boolean;
     toolName?: string;
     toolArgs?: Record<string, unknown>;
@@ -14,4 +15,4 @@ export interface Message {
     runningStartTime?: number;
     responseDuration?: number;
     blendWord?: string;
-}
+}

package/src/utils/commands/redo.ts

@@ -1,74 +0,0 @@
-import type { Command, CommandResult } from './types';
-import { redo, canRedo, isGitRepository } from '../undoRedo';
-import { notifyUndoRedo } from '../undoRedoBridge';
-
-export const redoCommand: Command = {
-  name: 'redo',
-  description: 'Redo a previously undone message. Only available after using /undo. Any file changes will also be restored. Internally, this uses Git to manage the file changes if available.',
-  usage: '/redo',
-  aliases: ['r'],
-  execute: async (): Promise<CommandResult> => {
-    if (!canRedo()) {
-      return {
-        success: false,
-        content: 'Nothing to redo. Use /undo first, or the redo stack is empty.',
-        shouldAddToHistory: false
-      };
-    }
-
-    const result = redo();
-    if (!result) {
-      return {
-        success: false,
-        content: 'Failed to redo. Could not retrieve state.',
-        shouldAddToHistory: false
-      };
-    }
-
-    if (!result.success) {
-      return {
-        success: false,
-        content: `Failed to redo file changes:\n${result.error || 'Unknown error'}`,
-        shouldAddToHistory: false
-      };
-    }
-
-    notifyUndoRedo(result.state, 'redo');
-
-    const messageCountText = result.state.messages.length === 0 ? 'conversation restored' : `${result.state.messages.length} message(s) restored`;
-
-    let details = '';
-
-    if (result.gitChanges && result.gitChanges.length > 0) {
-      const fileDetails = result.gitChanges.map(f => {
-        switch (f.status) {
-          case 'M': return `  • ${f.path} (changes reapplied)`;
-          case 'A': return `  • ${f.path} (created/restored)`;
-          case 'D': return `  • ${f.path} (deleted)`;
-          case 'R': return `  • ${f.path} (renamed)`;
-          default: return `  • ${f.path} (status: ${f.status})`;
-        }
-      }).join('\n');
-      details = `\n- Files affected (${result.gitChanges.length}):\n${fileDetails}`;
-    } else if (result.state.fileSnapshots.length > 0) {
-      const fileDetails = result.state.fileSnapshots.map(f => {
-        if (!f.existed) {
-          return `  • ${f.path} (recreated)`;
-        } else if (f.content === '') {
-          return `  • ${f.path} (deleted)`;
-        } else {
-          return `  • ${f.path} (restored)`;
-        }
-      }).join('\n');
-      details = `\n- Files affected (${result.state.fileSnapshots.length}):\n${fileDetails}`;
-    } else if (result.state.gitCommitHash) {
-      details = `\n- Files restored via Git (commit: ${result.state.gitCommitHash.slice(0, 7)})`;
-    }
-
-    return {
-      success: true,
-      content: `Redone: conversation and file changes restored.${details}\n- ${messageCountText}`,
-      shouldAddToHistory: false
-    };
-  }
-};

package/src/utils/commands/sessions.ts

@@ -1,129 +0,0 @@
-import type { Command, CommandResult } from './types';
-import { getAllSessions, setCurrentSession, deleteSession } from '../undoRedoDb';
-
-export const sessionsCommand: Command = {
-  name: 'sessions',
-  description: 'Manage undo/redo sessions. List all sessions or switch to a specific session.',
-  usage: '/sessions [list|switch <session-id>|delete <session-id>]',
-  aliases: ['s'],
-  execute: async (args: string[], _fullCommand: string): Promise<CommandResult> => {
-    const parts = args;
-    const action = parts[0] || 'list';
-
-    if (action === 'list') {
-      const sessions = getAllSessions();
-
-      if (sessions.length === 0) {
-        return {
-          success: true,
-          content: 'No sessions found.',
-          shouldAddToHistory: false
-        };
-      }
-
-      const lines = ['Available sessions:\n'];
-      for (const session of sessions) {
-        const current = session.isCurrent ? ' (current)' : '';
-        const date = new Date(session.lastAccessedAt).toLocaleString();
-        lines.push(`- ${session.id}${current}`);
-        lines.push(`  Last accessed: ${date}`);
-      }
-
-      return {
-        success: true,
-        content: lines.join('\n'),
-        shouldAddToHistory: false
-      };
-    }
-
-    if (action === 'switch') {
-      const sessionId = parts[1];
-      if (!sessionId) {
-        return {
-          success: false,
-          content: 'Please provide a session ID to switch to.\nUsage: /sessions switch <session-id>',
-          shouldAddToHistory: false
-        };
-      }
-
-      const sessions = getAllSessions();
-      const targetSession = sessions.find(s => s.id === sessionId);
-
-      if (!targetSession) {
-        return {
-          success: false,
-          content: `Session not found: ${sessionId}`,
-          shouldAddToHistory: false
-        };
-      }
-
-      try {
-        setCurrentSession(sessionId);
-        return {
-          success: true,
-          content: `Switched to session: ${sessionId}`,
-          shouldAddToHistory: false
-        };
-      } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : 'Unknown error';
-        return {
-          success: false,
-          content: `Failed to switch session: ${errorMsg}`,
-          shouldAddToHistory: false
-        };
-      }
-    }
-
-    if (action === 'delete') {
-      const sessionId = parts[1];
-      if (!sessionId) {
-        return {
-          success: false,
-          content: 'Please provide a session ID to delete.\nUsage: /sessions delete <session-id>',
-          shouldAddToHistory: false
-        };
-      }
-
-      const sessions = getAllSessions();
-      const targetSession = sessions.find(s => s.id === sessionId);
-
-      if (!targetSession) {
-        return {
-          success: false,
-          content: `Session not found: ${sessionId}`,
-          shouldAddToHistory: false
-        };
-      }
-
-      if (targetSession.isCurrent) {
-        return {
-          success: false,
-          content: 'Cannot delete the current session. Switch to another session first.',
-          shouldAddToHistory: false
-        };
-      }
-
-      try {
-        deleteSession(sessionId);
-        return {
-          success: true,
-          content: `Deleted session: ${sessionId}`,
-          shouldAddToHistory: false
-        };
-      } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : 'Unknown error';
-        return {
-          success: false,
-          content: `Failed to delete session: ${errorMsg}`,
-          shouldAddToHistory: false
-        };
-      }
-    }
-
-    return {
-      success: false,
-      content: `Unknown action: ${action}\nUsage: /sessions [list|switch <session-id>|delete <session-id>]`,
-      shouldAddToHistory: false
-    };
-  }
-};

package/src/utils/commands/undo.ts

@@ -1,75 +0,0 @@
-import type { Command, CommandResult } from './types';
-import { undo, canUndo, isGitRepository } from '../undoRedo';
-import { notifyUndoRedo } from '../undoRedoBridge';
-
-export const undoCommand: Command = {
-  name: 'undo',
-  description: 'Undo last message in the conversation. Removes the most recent user message, all subsequent responses, and any file changes. Any file changes made will also be reverted. Internally, this uses Git to manage the file changes if available (local repository works too).',
-  usage: '/undo',
-  aliases: ['u'],
-  execute: async (): Promise<CommandResult> => {
-    if (!canUndo()) {
-      return {
-        success: false,
-        content: 'Nothing to undo. The undo stack is empty.',
-        shouldAddToHistory: false
-      };
-    }
-
-    const result = undo();
-    if (!result) {
-      return {
-        success: false,
-        content: 'Failed to undo. Could not retrieve previous state.',
-        shouldAddToHistory: false
-      };
-    }
-
-    if (!result.success) {
-      return {
-        success: false,
-        content: `Failed to undo file changes:\n${result.error || 'Unknown error'}`,
-        shouldAddToHistory: false
-      };
-    }
-
-    notifyUndoRedo(result.state, 'undo');
-
-    const messageCountText = result.state.messages.length === 0 ? 'conversation cleared' : `${result.state.messages.length} message(s) restored`;
-
-    let details = '';
-
-    if (result.gitChanges && result.gitChanges.length > 0) {
-      const fileDetails = result.gitChanges.map(f => {
-        switch (f.status) {
-          case 'M': return `  • ${f.path} (reverted changes)`;
-          case 'A': return `  • ${f.path} (restored - was deleted)`;
-          case 'D': return `  • ${f.path} (deleted - was created)`;
-          case 'R': return `  • ${f.path} (renamed back)`;
-          default: return `  • ${f.path} (status: ${f.status})`;
-        }
-      }).join('\n');
-      details = `\n- Files affected (${result.gitChanges.length}):\n${fileDetails}`;
-    } else if (result.state.fileSnapshots.length > 0) {
-      const filesAffected = result.state.fileSnapshots.map(f => f.path).join(', ');
-      const fileDetails = result.state.fileSnapshots.map(f => {
-        if (!f.existed) {
-          return `  • ${f.path} (deleted - was created)`;
-        } else if (f.content === '') {
-          return `  • ${f.path} (restored - was deleted)`;
-        } else {
-          return `  • ${f.path} (restored)`;
-        }
-      }).join('\n');
-      details = `\n- Files affected (${result.state.fileSnapshots.length}):\n${fileDetails}`;
-    } else if (result.state.gitCommitHash) {
-      details = `\n- Files reverted via Git (commit: ${result.state.gitCommitHash.slice(0, 7)})`;
-    }
-
-    return {
-      success: true,
-      content: `Undone last user message and all responses.${details}\n- ${messageCountText}`,
-      shouldAddToHistory: false
-    };
-  }
-};