Dashboard: promote candidates, fix tray icon, fix status dropdown alignment, remove dead formatConflictSummary

Author: ualtinok

packages/dashboard/src-tauri/Cargo.lock

@@ -27,6 +27,7 @@ md5 = "0.7"
 tauri-plugin-updater = "2"
 tauri-plugin-process = "2"
 tauri-plugin-dialog = "2"
+image = { version = "0.25.6", default-features = false, features = ["png"] }
 
 [features]
 custom-protocol = ["tauri/custom-protocol"]

packages/dashboard/src-tauri/Cargo.toml

@@ -410,6 +410,16 @@ pub fn delete_user_memory_candidate(
     db::delete_user_memory_candidate(&conn, id).map_err(|e| e.to_string())
 }
 
+#[tauri::command]
+pub fn promote_user_memory_candidate(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<(), String> {
+    let path = state.get_db_path()?;
+    let conn = db::open_readwrite(&path).map_err(|e| e.to_string())?;
+    db::promote_user_memory_candidate(&conn, id).map_err(|e| e.to_string())
+}
+
 // ── Health commands ─────────────────────────────────────────
 
 #[tauri::command]

packages/dashboard/src-tauri/icons/tray-icon.png

@@ -1766,6 +1766,31 @@ pub fn delete_user_memory_candidate(conn: &Connection, id: i64) -> Result<(), ru
     Ok(())
 }
 
+pub fn promote_user_memory_candidate(conn: &Connection, id: i64) -> Result<(), rusqlite::Error> {
+    let now = chrono::Utc::now().timestamp_millis();
+
+    // Read the candidate content
+    let content: String = conn.query_row(
+        "SELECT content FROM user_memory_candidates WHERE id = ?1",
+        rusqlite::params![id],
+        |row| row.get(0),
+    )?;
+
+    // Insert as a stable user memory
+    conn.execute(
+        "INSERT INTO user_memories (content, status, promoted_at, source_candidate_ids, created_at, updated_at) VALUES (?1, 'active', ?2, ?3, ?2, ?2)",
+        rusqlite::params![content, now, format!("[{}]", id)],
+    )?;
+
+    // Delete the candidate
+    conn.execute(
+        "DELETE FROM user_memory_candidates WHERE id = ?1",
+        rusqlite::params![id],
+    )?;
+
+    Ok(())
+}
+
 // ── Database health ───────────────────────────────────────
 
 pub fn get_db_health(db_path: &PathBuf) -> DbHealth {

packages/dashboard/src-tauri/src/commands.rs

@@ -85,6 +85,7 @@ fn main() {
             commands::dismiss_user_memory,
             commands::delete_user_memory,
             commands::delete_user_memory_candidate,
+            commands::promote_user_memory_candidate,
             // Health
             commands::get_db_health,
         ])
@@ -121,8 +122,13 @@ fn main() {
                     }
                 });
 
-            if let Some(icon) = app.default_window_icon().cloned() {
-                tray_builder = tray_builder.icon(icon);
+            {
+                let png_bytes = include_bytes!("../icons/tray-icon.png");
+                let img = image::load_from_memory(png_bytes).expect("failed to decode tray icon PNG");
+                let rgba = img.to_rgba8();
+                let (w, h) = rgba.dimensions();
+                let icon = tauri::image::Image::new_owned(rgba.into_raw(), w, h);
+                tray_builder = tray_builder.icon(icon).icon_as_template(true);
             }
 
             tray_builder.build(app)?;

packages/dashboard/src-tauri/src/db.rs

@@ -23,10 +23,6 @@
         "transparent": false
       }
     ],
-    "trayIcon": {
-      "iconPath": "icons/tray-icon.png",
-      "iconAsTemplate": true
-    },
     "security": {
       "csp": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:"
     },

packages/dashboard/src-tauri/src/main.rs

@@ -6,6 +6,7 @@ import {
   dismissUserMemory,
   deleteUserMemory,
   deleteUserMemoryCandidate,
+  promoteUserMemoryCandidate,
   formatRelativeTime,
   truncate,
 } from "../../lib/api";
@@ -66,6 +67,19 @@ export default function UserMemories() {
     }
   };
 
+  const handlePromoteCandidate = async (id: number) => {
+    try {
+      setError(null);
+      await promoteUserMemoryCandidate(id);
+      refetchCandidates();
+      refetchMemories();
+    } catch (e: unknown) {
+      setError(
+        `Failed to promote candidate: ${e instanceof Error ? e.message : String(e)}`,
+      );
+    }
+  };
+
   const statusPillClass = (status: string) => {
     switch (status) {
       case "active":
@@ -128,6 +142,7 @@ export default function UserMemories() {
           value={statusFilter()}
           onChange={setStatusFilter}
           placeholder="All status"
+          align="left"
           options={[
             { value: "", label: "All status" },
             { value: "active", label: "Active" },
@@ -282,6 +297,12 @@ export default function UserMemories() {
                         "margin-top": "8px",
                       }}
                     >
+                      <button
+                        class="btn sm"
+                        onClick={() => handlePromoteCandidate(candidate.id)}
+                      >
+                        Promote
+                      </button>
                       <button
                         class="btn sm danger"
                         onClick={() => handleDeleteCandidate(candidate.id)}

packages/dashboard/src-tauri/tauri.conf.json

@@ -228,6 +228,10 @@ export async function deleteUserMemoryCandidate(id: number): Promise<void> {
   return invoke("delete_user_memory_candidate", { id });
 }
 
+export async function promoteUserMemoryCandidate(id: number): Promise<void> {
+  return invoke("promote_user_memory_candidate", { id });
+}
+
 // ── Utilities ───────────────────────────────────────────────
 
 export function formatTimestamp(ts: number): string {

packages/dashboard/src/components/UserMemories/UserMemories.tsx

@@ -277,22 +277,6 @@ function readOmoDisabledHooks(directory: string): Set<string> {
     return disabled;
 }
 
-/**
- * Generate a user-facing summary of conflicts for display in dialogs/notifications.
- */
-export function formatConflictSummary(result: ConflictResult): string {
-    if (!result.hasConflict) return "";
-
-    const lines = [
-        "⚠️ Magic Context is disabled due to conflicting configuration:\n",
-        ...result.reasons.map((r) => `  • ${r}`),
-        "",
-        "Run `bunx @cortexkit/opencode-magic-context doctor` to fix,",
-        "or resolve these conflicts manually in your OpenCode config.",
-    ];
-    return lines.join("\n");
-}
-
 /**
  * Generate a short conflict summary for ignored message display.
  */