@chrysb/alphaclaw 0.4.6-beta.0 → 0.4.6-beta.2

package/lib/public/js/components/doctor/findings-list.js

@@ -35,11 +35,15 @@ export const DoctorFindingsList = ({
                     <div class="space-y-2">
                       <div class="flex flex-wrap items-start justify-between gap-3">
                         <div class="space-y-2 min-w-0">
-                          <h3 class="text-sm font-semibold text-gray-100">${card.title}</h3>
                           <div class="flex flex-wrap items-center gap-2">
                             <${Badge} tone=${getDoctorPriorityTone(card.priority)}>
                               ${card.priority}
                             </${Badge}>
+                            <h3 class="text-sm font-semibold text-gray-100">
+                              ${card.title}
+                            </h3>
+                          </div>
+                          <div class="flex flex-wrap items-center gap-2">
                             <${Badge} tone=${getDoctorCategoryTone(card.category)}>
                               ${formatDoctorCategory(card.category)}
                             </${Badge}>

package/lib/public/js/components/doctor/fix-card-modal.js

@@ -1,10 +1,16 @@
 import { h } from "https://esm.sh/preact";
-import { useEffect, useMemo, useState } from "https://esm.sh/preact/hooks";
+import { useEffect, useState } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
 import { ModalShell } from "../modal-shell.js";
 import { ActionButton } from "../action-button.js";
-import { fetchAgentSessions, sendDoctorCardFix } from "../../lib/api.js";
+import { Badge } from "../badge.js";
+import {
+  sendDoctorCardFix,
+  updateDoctorCardStatus,
+} from "../../lib/api.js";
 import { showToast } from "../toast.js";
+import { getDoctorPriorityTone } from "./helpers.js";
+import { useAgentSessions } from "../../hooks/useAgentSessions.js";
 
 const html = htm.bind(h);
 
@@ -14,54 +20,22 @@ export const DoctorFixCardModal = ({
   onClose = () => {},
   onComplete = () => {},
 }) => {
-  const [sessions, setSessions] = useState([]);
-  const [selectedSessionKey, setSelectedSessionKey] = useState("");
-  const [loadingSessions, setLoadingSessions] = useState(false);
+  const {
+    sessions,
+    selectedSessionKey,
+    setSelectedSessionKey,
+    selectedSession,
+    loading: loadingSessions,
+    error: loadError,
+  } = useAgentSessions({ enabled: visible });
+
   const [sending, setSending] = useState(false);
-  const [loadError, setLoadError] = useState("");
+  const [promptText, setPromptText] = useState("");
 
   useEffect(() => {
     if (!visible) return;
-    let active = true;
-    const loadSessions = async () => {
-      try {
-        setLoadingSessions(true);
-        setLoadError("");
-        const data = await fetchAgentSessions();
-        if (!active) return;
-        const nextSessions = Array.isArray(data?.sessions) ? data.sessions : [];
-        setSessions(nextSessions);
-        const preferredSession =
-          nextSessions.find((sessionRow) => {
-            const key = String(sessionRow?.key || "").toLowerCase();
-            return key === "agent:main:main";
-          }) ||
-          nextSessions.find((sessionRow) => {
-            const key = String(sessionRow?.key || "").toLowerCase();
-            return key.includes(":direct:") || key.includes(":group:");
-          }) ||
-          nextSessions[0] ||
-          null;
-        setSelectedSessionKey(String(preferredSession?.key || ""));
-      } catch (error) {
-        if (!active) return;
-        setSessions([]);
-        setSelectedSessionKey("");
-        setLoadError(error.message || "Could not load agent sessions");
-      } finally {
-        if (active) setLoadingSessions(false);
-      }
-    };
-    loadSessions();
-    return () => {
-      active = false;
-    };
-  }, [visible, card?.id]);
-
-  const selectedSession = useMemo(
-    () => sessions.find((sessionRow) => String(sessionRow?.key || "") === selectedSessionKey) || null,
-    [sessions, selectedSessionKey],
-  );
+    setPromptText(String(card?.fixPrompt || ""));
+  }, [visible, card?.fixPrompt, card?.id]);
 
   const handleSend = async () => {
     if (!card?.id || sending) return;
@@ -72,9 +46,18 @@ export const DoctorFixCardModal = ({
         sessionId: selectedSession?.sessionId || "",
         replyChannel: selectedSession?.replyChannel || "",
         replyTo: selectedSession?.replyTo || "",
+        prompt: promptText,
       });
-      showToast("Doctor fix request sent to your agent", "success");
-      onComplete();
+      try {
+        await updateDoctorCardStatus({ cardId: card.id, status: "fixed" });
+        showToast("Doctor fix request sent and finding marked fixed", "success");
+      } catch (statusError) {
+        showToast(
+          statusError.message || "Doctor fix request sent, but could not mark the finding fixed",
+          "warning",
+        );
+      }
+      await onComplete();
       onClose();
     } catch (error) {
       showToast(error.message || "Could not send Doctor fix request", "error");
@@ -96,8 +79,14 @@ export const DoctorFixCardModal = ({
         </p>
       </div>
       <div class="ac-surface-inset p-3 space-y-1">
-        <div class="text-xs text-gray-500 uppercase tracking-wide">${card?.priority || "P2"}</div>
-        <div class="text-sm text-gray-200">${card?.title || "Doctor finding"}</div>
+        <div class="flex items-center gap-2 min-w-0">
+          <${Badge} tone=${getDoctorPriorityTone(card?.priority || "P2")}>
+            ${card?.priority || "P2"}
+          </${Badge}>
+          <div class="text-sm font-semibold text-gray-200 leading-5 min-w-0">
+            ${card?.title || "Doctor finding"}
+          </div>
+        </div>
         <div class="text-xs text-gray-400">${card?.recommendation || ""}</div>
       </div>
       <div class="space-y-2">
@@ -116,11 +105,23 @@ export const DoctorFixCardModal = ({
             `,
           )}
         </select>
-        ${loadingSessions
-          ? html`<div class="text-xs text-gray-500">Loading sessions...</div>`
-          : null}
+        ${
+          loadingSessions
+            ? html`<div class="text-xs text-gray-500">Loading sessions...</div>`
+            : null
+        }
         ${loadError ? html`<div class="text-xs text-red-400">${loadError}</div>` : null}
       </div>
+      <div class="space-y-2">
+        <label class="text-xs text-gray-500">Instructions</label>
+        <textarea
+          value=${promptText}
+          onInput=${(event) => setPromptText(String(event.currentTarget?.value || ""))}
+          disabled=${sending}
+          rows="8"
+          class="w-full bg-black/30 border border-border rounded-lg px-3 py-2 text-xs text-gray-200 focus:border-gray-500 font-mono leading-5"
+        ></textarea>
+      </div>
       <div class="flex items-center justify-end gap-2">
         <${ActionButton}
           onClick=${onClose}
@@ -131,7 +132,7 @@ export const DoctorFixCardModal = ({
         />
         <${ActionButton}
           onClick=${handleSend}
-          disabled=${!selectedSession || loadingSessions || !!loadError}
+          disabled=${!selectedSession || loadingSessions || !!loadError || !String(promptText || "").trim()}
           loading=${sending}
           tone="primary"
           size="md"

package/lib/public/js/components/doctor/helpers.js

@@ -81,41 +81,10 @@ export const getDoctorWarningMessage = (doctorStatus = null) => {
   return "Doctor has not been run in the last week.";
 };
 
-export const getDoctorDriftRisk = (changeSummary = null) => {
-  const deltaScore = Number(changeSummary?.deltaScore || 0);
+export const getDoctorChangeLabel = (changeSummary = null) => {
   const changedFilesCount = Number(changeSummary?.changedFilesCount || 0);
-  const hasBaseline = !!changeSummary?.hasBaseline;
-  const baselineSource = String(changeSummary?.baselineSource || "none");
-  if (!hasBaseline) {
-    return {
-      label: "Unknown",
-      tone: "neutral",
-      detail: "No prior baseline yet",
-    };
-  }
-  if (deltaScore >= 8 || changedFilesCount >= 8) {
-    return {
-      label: "High",
-      tone: "danger",
-      detail: `${changedFilesCount} changed file${changedFilesCount === 1 ? "" : "s"}`,
-    };
-  }
-  if (deltaScore >= 4 || changedFilesCount >= 4) {
-    return {
-      label: "Moderate",
-      tone: "warning",
-      detail: `${changedFilesCount} changed file${changedFilesCount === 1 ? "" : "s"}`,
-    };
-  }
-  return {
-    label: "Low",
-    tone: "info",
-    detail: changedFilesCount
-      ? `${changedFilesCount} changed file${changedFilesCount === 1 ? "" : "s"}`
-      : baselineSource === "initial_install"
-        ? "Compared to initial install"
-        : "No detected changes",
-  };
+  if (changedFilesCount === 0) return "No changes since last run";
+  return `${changedFilesCount} change${changedFilesCount === 1 ? "" : "s"} since last run`;
 };
 
 export const getDoctorRunPillDetail = (run = null) => {

package/lib/public/js/components/doctor/index.js

@@ -11,7 +11,6 @@ import {
 } from "../../lib/api.js";
 import { formatLocaleDateTime } from "../../lib/format.js";
 import { ActionButton } from "../action-button.js";
-import { Badge } from "../badge.js";
 import { LoadingSpinner } from "../loading-spinner.js";
 import { PageHeader } from "../page-header.js";
 import { showToast } from "../toast.js";
@@ -21,7 +20,7 @@ import { DoctorFixCardModal } from "./fix-card-modal.js";
 import {
   buildDoctorRunMarkers,
   buildDoctorStatusFilterOptions,
-  getDoctorDriftRisk,
+  getDoctorChangeLabel,
   getDoctorRunPillDetail,
   shouldShowDoctorWarning,
 } from "./helpers.js";
@@ -167,8 +166,8 @@ export const DoctorTab = ({ isActive = false }) => {
     () => buildDoctorStatusFilterOptions(),
     [],
   );
-  const driftRisk = useMemo(
-    () => getDoctorDriftRisk(doctorStatus?.changeSummary || null),
+  const changeLabel = useMemo(
+    () => getDoctorChangeLabel(doctorStatus?.changeSummary || null),
     [doctorStatus],
   );
   const canRunDoctor = useMemo(() => {
@@ -183,6 +182,7 @@ export const DoctorTab = ({ isActive = false }) => {
     () => shouldShowDoctorWarning(doctorStatus, 0),
     [doctorStatus],
   );
+  const hasCompletedDoctorRun = !!doctorStatus?.lastRunAt;
   const hasRuns = runs.length > 0;
   const hasLoadedRuns = runsPoll.data !== null || runsPoll.error !== null;
   const hasLoadedCards = cardsPoll.data !== null || cardsPoll.error !== null;
@@ -314,25 +314,25 @@ export const DoctorTab = ({ isActive = false }) => {
         ? html`
             <${DoctorSummaryCards} cards=${openCards} />
             <div class="space-y-2">
-              <div
-                class="bg-surface border border-border rounded-xl p-4 flex flex-wrap items-center justify-between gap-3"
-              >
-                <div class="flex flex-wrap items-center gap-2 text-xs text-gray-500">
-                  <${Badge} tone=${driftRisk.tone}
-                    >${driftRisk.label} drift risk${
-                      driftRisk.detail ? ` · ${driftRisk.detail}` : ""
-                    }</${Badge}
-                  >
-                </div>
-                <div class="flex items-center gap-3 text-xs text-gray-500">
-                  <span>Last run</span>
-                  <span class="text-gray-300">
-                    ${formatLocaleDateTime(doctorStatus?.lastRunAt, {
-                      fallback: "Never",
-                    })}
-                  </span>
-                </div>
-              </div>
+              ${hasCompletedDoctorRun
+                ? html`
+                    <div
+                      class="bg-surface border border-border rounded-xl p-4 flex flex-wrap items-center justify-between gap-3"
+                    >
+                      <span class="text-xs text-gray-500">
+                        Last run ·${" "}
+                        <span class="text-gray-300">
+                          ${formatLocaleDateTime(doctorStatus?.lastRunAt, {
+                            fallback: "Never",
+                          })}
+                        </span>
+                      </span>
+                      <span class="text-xs text-gray-500">
+                        ${changeLabel}
+                      </span>
+                    </div>
+                  `
+                : null}
               ${
                 showDoctorStaleBanner
                   ? html`
@@ -376,7 +376,7 @@ export const DoctorTab = ({ isActive = false }) => {
                         setSelectedRunFilter(String(run.id || ""))}
                     >
                       <span class="font-medium">Run #${run.id}</span>
-                      <span class="inline-flex items-center gap-1.5">
+                      <span class="inline-flex items-center gap-1">
                         ${markers.map(
                           (marker) => html`
                             <span

package/lib/public/js/components/file-tree.js

@@ -52,7 +52,7 @@ const kTreeIndentPx = 9;
 const kFolderBasePaddingPx = 10;
 const kFileBasePaddingPx = 14;
 const kTreeRefreshIntervalMs = 5000;
-const kExpandedFoldersStorageKey = "alphaclaw.browse.expandedFolders";
+import { kExpandedFoldersStorageKey } from "../lib/storage-keys.js";
 
 const readStoredExpandedPaths = () => {
   try {

package/lib/public/js/components/file-viewer/constants.js

@@ -1,6 +1,7 @@
-export const kFileViewerModeStorageKey = "alphaclaw.browse.fileViewerMode";
-export const kLegacyFileViewerModeStorageKey = "alphaclawBrowseFileViewerMode";
-export const kEditorSelectionStorageKey = "alphaclaw.browse.editorSelectionByPath";
+export {
+  kFileViewerModeStorageKey,
+  kEditorSelectionStorageKey,
+} from "../../lib/storage-keys.js";
 export const kLoadingIndicatorDelayMs = 1000;
 export const kFileRefreshIntervalMs = 5000;
 export const kSqlitePageSize = 50;

package/lib/public/js/components/file-viewer/storage.js

@@ -1,15 +1,12 @@
 import {
   kEditorSelectionStorageKey,
   kFileViewerModeStorageKey,
-  kLegacyFileViewerModeStorageKey,
 } from "./constants.js";
 
 export const readStoredFileViewerMode = () => {
   try {
     const storedMode = String(
-      window.localStorage.getItem(kFileViewerModeStorageKey) ||
-        window.localStorage.getItem(kLegacyFileViewerModeStorageKey) ||
-        "",
+      window.localStorage.getItem(kFileViewerModeStorageKey) || "",
     ).trim();
     return storedMode === "preview" ? "preview" : "edit";
   } catch {

package/lib/public/js/components/google/gmail-setup-wizard.js

@@ -1,12 +1,13 @@
 import { h } from "https://esm.sh/preact";
-import { useEffect, useMemo, useState } from "https://esm.sh/preact/hooks";
+import { useCallback, useEffect, useMemo, useState } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
 import { ModalShell } from "../modal-shell.js";
 import { PageHeader } from "../page-header.js";
 import { CloseIcon } from "../icons.js";
 import { ActionButton } from "../action-button.js";
-import { fetchAgentSessions, sendAgentMessage } from "../../lib/api.js";
+import { sendAgentMessage } from "../../lib/api.js";
 import { showToast } from "../toast.js";
+import { useAgentSessions } from "../../hooks/useAgentSessions.js";
 
 const html = htm.bind(h);
 
@@ -45,6 +46,11 @@ const kStepTitles = [
 const kTotalSteps = kStepTitles.length;
 const kNoSessionSelectedValue = "__none__";
 
+const kDirectOrGroupFilter = (sessionRow) => {
+  const key = String(sessionRow?.key || "").toLowerCase();
+  return key.includes(":direct:") || key.includes(":group:");
+};
+
 const renderCommandBlock = (command = "", onCopy = () => {}) => html`
   <div class="rounded-lg border border-border bg-black/30 p-3">
     <pre
@@ -80,10 +86,14 @@ export const GmailSetupWizard = ({
   const [watchEnabled, setWatchEnabled] = useState(false);
   const [sendingToAgent, setSendingToAgent] = useState(false);
   const [agentMessageSent, setAgentMessageSent] = useState(false);
-  const [agentSessions, setAgentSessions] = useState([]);
-  const [selectedSessionKey, setSelectedSessionKey] = useState("");
-  const [loadingAgentSessions, setLoadingAgentSessions] = useState(false);
-  const [agentSessionsError, setAgentSessionsError] = useState("");
+
+  const {
+    sessions: selectableAgentSessions,
+    selectedSessionKey,
+    setSelectedSessionKey,
+    loading: loadingAgentSessions,
+    error: agentSessionsError,
+  } = useAgentSessions({ enabled: visible, filter: kDirectOrGroupFilter });
 
   useEffect(() => {
     if (!visible) return;
@@ -94,41 +104,6 @@ export const GmailSetupWizard = ({
     setWatchEnabled(false);
     setSendingToAgent(false);
     setAgentMessageSent(false);
-    setAgentSessions([]);
-    setSelectedSessionKey("");
-    setLoadingAgentSessions(false);
-    setAgentSessionsError("");
-  }, [visible, account?.id]);
-
-  useEffect(() => {
-    if (!visible) return;
-    let active = true;
-    const loadAgentSessions = async () => {
-      try {
-        setLoadingAgentSessions(true);
-        setAgentSessionsError("");
-        const data = await fetchAgentSessions();
-        if (!active) return;
-        const sessions = Array.isArray(data?.sessions) ? data.sessions : [];
-        setAgentSessions(sessions);
-        const defaultSession = sessions.find((sessionRow) => {
-          const key = String(sessionRow?.key || "").toLowerCase();
-          return key.includes(":direct:") || key.includes(":group:");
-        });
-        setSelectedSessionKey((currentKey) => currentKey || String(defaultSession?.key || ""));
-      } catch (err) {
-        if (!active) return;
-        setAgentSessions([]);
-        setSelectedSessionKey("");
-        setAgentSessionsError(err.message || "Could not load sessions");
-      } finally {
-        if (active) setLoadingAgentSessions(false);
-      }
-    };
-    loadAgentSessions();
-    return () => {
-      active = false;
-    };
   }, [visible, account?.id]);
 
   const commands = clientConfig?.commands || null;
@@ -150,23 +125,15 @@ export const GmailSetupWizard = ({
     }
     return true;
   }, [needsProjectId, projectIdInput]);
-  const selectableAgentSessions = useMemo(
-    () =>
-      agentSessions.filter((sessionRow) => {
-        const key = String(sessionRow?.key || "").toLowerCase();
-        return key.includes(":direct:") || key.includes(":group:");
-      }),
-    [agentSessions],
-  );
 
-  const handleCopy = async (value) => {
+  const handleCopy = useCallback(async (value) => {
     const ok = await copyText(value);
     if (ok) {
       showToast("Copied to clipboard", "success");
       return;
     }
     showToast("Could not copy text", "error");
-  };
+  }, []);
 
   const handleFinish = async () => {
     try {

package/lib/public/js/components/google/gmail-watch-toggle.js

@@ -7,7 +7,10 @@ import { InfoTooltip } from "../info-tooltip.js";
 const html = htm.bind(h);
 
 const resolveWatchState = ({ watchStatus, busy = false }) => {
-  if (busy) return { label: "Starting", tone: "warning" };
+  if (busy) {
+    const label = watchStatus?.enabled ? "Stopping" : "Starting";
+    return { label, tone: "warning" };
+  }
   if (!watchStatus?.enabled) return { label: "Stopped", tone: "neutral" };
   if (watchStatus.enabled && !watchStatus.running)
     return { label: "Error", tone: "danger" };

package/lib/public/js/components/onboarding/use-welcome-storage.js

@@ -1,6 +1,7 @@
 import { useEffect, useState } from "https://esm.sh/preact/hooks";
 
-export const kOnboardingStorageKey = "openclaw_setup";
+import { kOnboardingStorageKey } from "../../lib/storage-keys.js";
+export { kOnboardingStorageKey };
 export const kOnboardingStepKey = "_step";
 export const kPairingChannelKey = "_pairingChannel";
 export const kOnboardingSetupErrorKey = "_lastSetupError";

package/lib/public/js/components/telegram-workspace/index.js

@@ -23,8 +23,11 @@ const kSteps = [
   { id: "summary", label: "Summary" },
 ];
 
-const kTelegramWorkspaceStorageKey = "telegram-workspace-state-v1";
-const kTelegramWorkspaceCacheKey = "telegram-workspace-cache-v1";
+import {
+  kTelegramWorkspaceStorageKey,
+  kTelegramWorkspaceCacheKey,
+} from "../../lib/storage-keys.js";
+
 const loadTelegramWorkspaceState = () => {
   try {
     const raw = window.localStorage.getItem(kTelegramWorkspaceStorageKey);

package/lib/public/js/hooks/useAgentSessions.js

@@ -0,0 +1,128 @@
+import { useState, useEffect, useMemo, useCallback } from "https://esm.sh/preact/hooks";
+import { fetchAgentSessions } from "../lib/api.js";
+import {
+  kAgentSessionsCacheKey,
+  kAgentLastSessionKey,
+} from "../lib/storage-keys.js";
+
+const readCachedSessions = () => {
+  try {
+    const raw = localStorage.getItem(kAgentSessionsCacheKey);
+    if (!raw) return [];
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+};
+
+const writeCachedSessions = (sessions) => {
+  try {
+    localStorage.setItem(kAgentSessionsCacheKey, JSON.stringify(sessions));
+  } catch {}
+};
+
+const readLastSessionKey = () => {
+  try {
+    return localStorage.getItem(kAgentLastSessionKey) || "";
+  } catch {
+    return "";
+  }
+};
+
+const writeLastSessionKey = (key) => {
+  try {
+    localStorage.setItem(kAgentLastSessionKey, String(key || ""));
+  } catch {}
+};
+
+const pickPreferredSession = (sessions, lastKey) => {
+  if (lastKey) {
+    const lastMatch = sessions.find((row) => String(row?.key || "") === lastKey);
+    if (lastMatch) return lastMatch;
+  }
+  return (
+    sessions.find((row) => String(row?.key || "").toLowerCase() === "agent:main:main") ||
+    sessions.find((row) => {
+      const key = String(row?.key || "").toLowerCase();
+      return key.includes(":direct:") || key.includes(":group:");
+    }) ||
+    sessions[0] ||
+    null
+  );
+};
+
+/**
+ * Shared hook for agent session selection with localStorage caching.
+ *
+ * @param {object} options
+ * @param {boolean} options.enabled - Whether to load sessions (tie to modal visibility, etc.)
+ * @param {(sessions: Array) => Array} [options.filter] - Optional filter applied to the session list before exposing it.
+ * @returns {{ sessions, selectedSessionKey, setSelectedSessionKey, selectedSession, loading, error }}
+ */
+export const useAgentSessions = ({ enabled = false, filter } = {}) => {
+  const [allSessions, setAllSessions] = useState([]);
+  const [selectedSessionKey, setSelectedSessionKeyState] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState("");
+
+  const setSelectedSessionKey = useCallback((key) => {
+    const normalized = String(key || "");
+    setSelectedSessionKeyState(normalized);
+    writeLastSessionKey(normalized);
+  }, []);
+
+  useEffect(() => {
+    if (!enabled) return;
+    let active = true;
+
+    const cached = readCachedSessions();
+    const lastKey = readLastSessionKey();
+    if (cached.length > 0) {
+      setAllSessions(cached);
+      const preferred = pickPreferredSession(cached, lastKey);
+      setSelectedSessionKeyState(String(preferred?.key || ""));
+    }
+
+    const load = async () => {
+      try {
+        if (cached.length === 0) setLoading(true);
+        setError("");
+        const data = await fetchAgentSessions();
+        if (!active) return;
+        const nextSessions = Array.isArray(data?.sessions) ? data.sessions : [];
+        setAllSessions(nextSessions);
+        writeCachedSessions(nextSessions);
+        if (cached.length === 0 || !lastKey) {
+          const preferred = pickPreferredSession(nextSessions, lastKey);
+          setSelectedSessionKeyState(String(preferred?.key || ""));
+        }
+      } catch (err) {
+        if (!active) return;
+        if (cached.length === 0) {
+          setAllSessions([]);
+          setSelectedSessionKeyState("");
+          setError(err.message || "Could not load agent sessions");
+        }
+      } finally {
+        if (active) setLoading(false);
+      }
+    };
+    load();
+    return () => {
+      active = false;
+    };
+  }, [enabled]);
+
+  const sessions = useMemo(
+    () => (filter ? allSessions.filter(filter) : allSessions),
+    [allSessions, filter],
+  );
+
+  const selectedSession = useMemo(
+    () => sessions.find((row) => String(row?.key || "") === selectedSessionKey) || null,
+    [sessions, selectedSessionKey],
+  );
+
+  return { sessions, selectedSessionKey, setSelectedSessionKey, selectedSession, loading, error };
+};

package/lib/public/js/lib/api.js

@@ -261,6 +261,7 @@ export const sendDoctorCardFix = async ({
   sessionId = "",
   replyChannel = "",
   replyTo = "",
+  prompt = "",
 } = {}) => {
   const res = await authFetch(
     `/api/doctor/findings/${encodeURIComponent(String(cardId || ""))}/fix`,
@@ -271,6 +272,7 @@ export const sendDoctorCardFix = async ({
         sessionId: String(sessionId || ""),
         replyChannel: String(replyChannel || ""),
         replyTo: String(replyTo || ""),
+        prompt: String(prompt || ""),
       }),
     },
   );

package/lib/public/js/lib/browse-draft-state.js

@@ -1,20 +1,21 @@
-export const kFileDraftStorageKeyPrefix = "alphaclaw.browse.draft.";
-export const kLegacyFileDraftStorageKeyPrefix = "alphaclawBrowseDraft:";
-export const kDraftIndexStorageKey = "alphaclaw.draftIndex";
+import {
+  kFileDraftStorageKeyPrefix,
+  kDraftIndexStorageKey,
+} from "./storage-keys.js";
+
+export { kFileDraftStorageKeyPrefix, kDraftIndexStorageKey };
 export const kDraftIndexChangedEventName = "alphaclaw:browse-draft-index-changed";
 
 const getStorage = (storage) => storage || window.localStorage;
 
-export const getFileDraftStorageKey = (filePath, useLegacyPrefix = false) =>
-  `${useLegacyPrefix ? kLegacyFileDraftStorageKeyPrefix : kFileDraftStorageKeyPrefix}${String(filePath || "").trim()}`;
+export const getFileDraftStorageKey = (filePath) =>
+  `${kFileDraftStorageKeyPrefix}${String(filePath || "").trim()}`;
 
 export const readStoredFileDraft = (filePath, storage) => {
   try {
     if (!filePath) return "";
     const localStorage = getStorage(storage);
-    const draft =
-      localStorage.getItem(getFileDraftStorageKey(filePath)) ||
-      localStorage.getItem(getFileDraftStorageKey(filePath, true));
+    const draft = localStorage.getItem(getFileDraftStorageKey(filePath));
     return typeof draft === "string" ? draft : "";
   } catch {
     return "";
@@ -34,7 +35,6 @@ export const clearStoredFileDraft = (filePath, storage) => {
     if (!filePath) return;
     const localStorage = getStorage(storage);
     localStorage.removeItem(getFileDraftStorageKey(filePath));
-    localStorage.removeItem(getFileDraftStorageKey(filePath, true));
   } catch {}
 };
 
@@ -94,10 +94,6 @@ export const readStoredDraftPaths = (storage) => {
         const path = key.slice(kFileDraftStorageKeyPrefix.length).trim();
         if (path) nextDraftPaths.add(path);
       }
-      if (key.startsWith(kLegacyFileDraftStorageKeyPrefix)) {
-        const path = key.slice(kLegacyFileDraftStorageKeyPrefix.length).trim();
-        if (path) nextDraftPaths.add(path);
-      }
     }
     if (nextDraftPaths.size > 0) {
       writeDraftIndex(nextDraftPaths, { storage: localStorage });

package/lib/public/js/lib/storage-keys.js

@@ -0,0 +1,28 @@
+// Centralized localStorage key registry.
+// All standalone localStorage keys used by the Setup UI should be defined here
+// so they stay discoverable, consistently prefixed, and free of collisions.
+//
+// Naming convention: "alphaclaw.<area>.<purpose>"
+
+// --- UI settings (single JSON blob containing sub-keys) ---
+export const kUiSettingsStorageKey = "alphaclaw.ui.settings";
+
+// --- Browse / file viewer ---
+export const kFileViewerModeStorageKey = "alphaclaw.browse.viewerMode";
+export const kEditorSelectionStorageKey = "alphaclaw.browse.editorSelection";
+export const kExpandedFoldersStorageKey = "alphaclaw.browse.expandedFolders";
+
+// --- Browse / drafts ---
+export const kFileDraftStorageKeyPrefix = "alphaclaw.browse.draft.";
+export const kDraftIndexStorageKey = "alphaclaw.browse.draftIndex";
+
+// --- Onboarding ---
+export const kOnboardingStorageKey = "alphaclaw.onboarding.state";
+
+// --- Telegram workspace ---
+export const kTelegramWorkspaceStorageKey = "alphaclaw.telegram.workspaceState";
+export const kTelegramWorkspaceCacheKey = "alphaclaw.telegram.workspaceCache";
+
+// --- Agent sessions (shared across session pickers) ---
+export const kAgentSessionsCacheKey = "alphaclaw.agent.sessionsCache";
+export const kAgentLastSessionKey = "alphaclaw.agent.lastSessionKey";

package/lib/public/js/lib/ui-settings.js

@@ -1,4 +1,6 @@
-export const kUiSettingsStorageKey = "alphaclaw.uiSettings";
+import { kUiSettingsStorageKey } from "./storage-keys.js";
+
+export { kUiSettingsStorageKey };
 
 const parseSettings = (rawValue) => {
   if (!rawValue) return {};

package/lib/server/doctor/prompt.js

@@ -1,11 +1,26 @@
 const renderList = (items = []) =>
   items.length ? items.map((item) => `- ${item}`).join("\n") : "- (none)";
 
+const renderResolvedCards = (cards = []) => {
+  if (!cards.length) return "";
+  const lines = cards.map(
+    (card) =>
+      `- [${card.status}] ${card.title}` +
+      (card.category ? ` (${card.category})` : ""),
+  );
+  return `
+
+Previously resolved findings (do not re-suggest these):
+${lines.join("\n")}
+`;
+};
+
 const buildDoctorPrompt = ({
   workspaceRoot = "",
   managedRoot = "",
   protectedPaths = [],
   lockedPaths = [],
+  resolvedCards = [],
   promptVersion = "doctor-v1",
 }) => `
 You are AlphaClaw Doctor. Analyze this OpenClaw workspace for guidance drift, redundancy, misplacement, and cleanup opportunities.
@@ -74,10 +89,11 @@ Return exactly this JSON shape:
   ]
 }
 
-Constraints:
+${renderResolvedCards(resolvedCards)}Constraints:
 - Maximum 12 cards
 - Use relative paths in evidence and targetPaths
 - Do not include duplicate cards
+- Do not re-suggest findings that appear in the "Previously resolved" list above
 - Do not create cards for healthy default-template behavior
 - Do not create cards whose primary recommendation is to refactor AlphaClaw-managed file structure
 - If there are no meaningful findings, return an empty cards array

package/lib/server/doctor/service.js

@@ -156,11 +156,20 @@ const createDoctorService = ({
 
   const executeDoctorRun = async (runId) => {
     try {
+      const allCards = listDoctorCards();
+      const resolvedCards = allCards
+        .filter((card) => card.status === "dismissed" || card.status === "fixed")
+        .map((card) => ({
+          status: card.status,
+          title: card.title || "",
+          category: card.category || "",
+        }));
       const prompt = buildDoctorPrompt({
         workspaceRoot,
         managedRoot,
         protectedPaths,
         lockedPaths,
+        resolvedCards,
         promptVersion: kDoctorPromptVersion,
       });
       const gatewayTimeoutMs = kDoctorRunTimeoutMs + 30000;
@@ -331,12 +340,13 @@ const createDoctorService = ({
     sessionId = "",
     replyChannel = "",
     replyTo = "",
+    prompt = "",
   } = {}) => {
     const card = getDoctorCard(cardId);
     if (!card) throw new Error("Doctor card not found");
-    const prompt = String(card.fixPrompt || "").trim();
-    if (!prompt) throw new Error("Doctor card does not include a fix prompt");
-    let command = `agent --agent main --message ${shellEscapeArg(prompt)}`;
+    const resolvedPrompt = String(prompt || card.fixPrompt || "").trim();
+    if (!resolvedPrompt) throw new Error("Doctor card does not include a fix prompt");
+    let command = `agent --agent main --message ${shellEscapeArg(resolvedPrompt)}`;
     const trimmedSessionId = String(sessionId || "").trim();
     const trimmedReplyChannel = String(replyChannel || "").trim();
     const trimmedReplyTo = String(replyTo || "").trim();

package/lib/server/doctor/workspace-fingerprint.js

@@ -4,6 +4,17 @@ const crypto = require("crypto");
 
 const kIgnoredDirectoryNames = new Set([".git", "node_modules"]);
 
+const kContentFileExtensions = new Set([
+  ".md", ".json", ".js", ".ts", ".jsx", ".tsx", ".yaml", ".yml",
+  ".txt", ".sh", ".css", ".html", ".xml", ".toml", ".ini", ".cfg",
+  ".py", ".rb", ".go", ".rs", ".java", ".c", ".cpp", ".h",
+]);
+
+const isContentFile = (relativePath = "") => {
+  const ext = path.extname(String(relativePath || "")).toLowerCase();
+  return kContentFileExtensions.has(ext);
+};
+
 const hashFile = (filePath) => {
   const buffer = fs.readFileSync(filePath);
   return crypto.createHash("sha256").update(buffer).digest("hex");
@@ -34,11 +45,21 @@ const buildWorkspaceManifest = (rootDir) => {
   const normalizedRootDir = path.resolve(String(rootDir || ""));
   const files = walkFiles(normalizedRootDir);
   return files.reduce((manifest, filePath) => {
-    manifest[normalizeRelativePath(normalizedRootDir, filePath)] = hashFile(filePath);
+    const stat = fs.statSync(filePath);
+    manifest[normalizeRelativePath(normalizedRootDir, filePath)] = {
+      hash: hashFile(filePath),
+      size: stat.size,
+    };
     return manifest;
   }, {});
 };
 
+const getManifestEntryHash = (entry) =>
+  typeof entry === "object" && entry !== null ? String(entry.hash || "") : String(entry || "");
+
+const getManifestEntrySize = (entry) =>
+  typeof entry === "object" && entry !== null ? Number(entry.size || 0) : 0;
+
 const computeWorkspaceFingerprintFromManifest = (manifest = {}) => {
   const hash = crypto.createHash("sha256");
   const entries = Object.entries(manifest).sort(([leftPath], [rightPath]) =>
@@ -46,10 +67,10 @@ const computeWorkspaceFingerprintFromManifest = (manifest = {}) => {
   );
 
   hash.update("workspace-fingerprint-v1");
-  for (const [relativePath, fileHash] of entries) {
+  for (const [relativePath, entry] of entries) {
     hash.update(relativePath);
     hash.update("\0");
-    hash.update(fileHash);
+    hash.update(getManifestEntryHash(entry));
     hash.update("\0");
   }
 
@@ -84,6 +105,20 @@ const getPathChangeWeight = (relativePath = "") => {
   return 1;
 };
 
+const kByteDeltaSmallThreshold = 100;
+const kByteDeltaSignificantThreshold = 500;
+
+const getModifiedFileScore = (relativePath, previousEntry, currentEntry) => {
+  if (!isContentFile(relativePath)) return 1;
+  const previousSize = getManifestEntrySize(previousEntry);
+  const currentSize = getManifestEntrySize(currentEntry);
+  if (!previousSize && !currentSize) return getPathChangeWeight(relativePath);
+  const byteDelta = Math.abs(currentSize - previousSize);
+  if (byteDelta < kByteDeltaSmallThreshold) return 1;
+  if (byteDelta < kByteDeltaSignificantThreshold) return 2;
+  return getPathChangeWeight(relativePath);
+};
+
 const calculateWorkspaceDelta = ({ previousManifest = {}, currentManifest = {} } = {}) => {
   const previousPaths = Object.keys(previousManifest);
   const currentPaths = Object.keys(currentManifest);
@@ -100,19 +135,23 @@ const calculateWorkspaceDelta = ({ previousManifest = {}, currentManifest = {} }
   };
 
   for (const relativePath of allPaths) {
-    const previousHash = previousManifest[relativePath] || "";
-    const currentHash = currentManifest[relativePath] || "";
+    const previousEntry = previousManifest[relativePath];
+    const currentEntry = currentManifest[relativePath];
+    const previousHash = getManifestEntryHash(previousEntry);
+    const currentHash = getManifestEntryHash(currentEntry);
     if (!previousHash && currentHash) {
       changeSummary.addedFilesCount += 1;
+      changeSummary.deltaScore += getPathChangeWeight(relativePath);
     } else if (previousHash && !currentHash) {
       changeSummary.removedFilesCount += 1;
+      changeSummary.deltaScore += getPathChangeWeight(relativePath);
     } else if (previousHash !== currentHash) {
       changeSummary.modifiedFilesCount += 1;
+      changeSummary.deltaScore += getModifiedFileScore(relativePath, previousEntry, currentEntry);
     } else {
       continue;
     }
     changeSummary.changedFilesCount += 1;
-    changeSummary.deltaScore += getPathChangeWeight(relativePath);
     changeSummary.changedPaths.push(relativePath);
   }
 
@@ -123,4 +162,5 @@ module.exports = {
   calculateWorkspaceDelta,
   computeWorkspaceFingerprintFromManifest,
   computeWorkspaceSnapshot,
+  isContentFile,
 };

package/lib/server/routes/doctor.js

@@ -109,6 +109,7 @@ const registerDoctorRoutes = ({ app, requireAuth, doctorService }) => {
         sessionId: req.body?.sessionId,
         replyChannel: req.body?.replyChannel,
         replyTo: req.body?.replyTo,
+        prompt: req.body?.prompt,
       });
       return res.json(result);
     } catch (error) {

package/lib/server/routes/system.js

@@ -20,6 +20,7 @@ const registerSystemRoutes = ({
   onExpectedGatewayRestart,
   OPENCLAW_DIR,
   restartRequiredState,
+  topicRegistry,
 }) => {
   let envRestartPending = false;
   const kEnvVarsReservedForUserInput = new Set([
@@ -73,6 +74,19 @@ const registerSystemRoutes = ({
     if (telegramMatch) {
       return `Telegram ${telegramMatch[1]}`;
     }
+    const telegramTopicMatch = key.match(/:telegram:group:([^:]+):topic:([^:]+)$/);
+    if (telegramTopicMatch) {
+      const [, groupId, topicId] = telegramTopicMatch;
+      let groupEntry = null;
+      try {
+        groupEntry = topicRegistry?.getGroup?.(groupId) || null;
+      } catch {}
+      const groupName = String(groupEntry?.name || "").trim();
+      const topicName = String(groupEntry?.topics?.[topicId]?.name || "").trim();
+      if (groupName && topicName) return `Telegram ${groupName} · ${topicName}`;
+      if (topicName) return `Telegram Topic ${topicName}`;
+      return `Telegram Topic ${topicId}`;
+    }
     const directMatch = key.match(/:direct:([^:]+)$/);
     if (directMatch) {
       return `Direct ${directMatch[1]}`;

package/lib/server.js

@@ -43,6 +43,7 @@ const {
   getSessionDetail,
   getSessionTimeSeries,
 } = require("./server/db/usage");
+const topicRegistry = require("./server/topic-registry");
 const {
   initDoctorDb,
   listDoctorRuns,
@@ -239,6 +240,7 @@ registerSystemRoutes({
   onExpectedGatewayRestart: () => watchdog.onExpectedRestart(),
   OPENCLAW_DIR: constants.OPENCLAW_DIR,
   restartRequiredState,
+  topicRegistry,
 });
 registerBrowseRoutes({
   app,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.4.6-beta.0",
+  "version": "0.4.6-beta.2",
   "publishConfig": {
     "access": "public"
   },