@chrysb/alphaclaw 0.4.6-beta.1 → 0.4.6-beta.3

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

@@ -43,7 +43,7 @@ const DoctorEmptyStateIcon = () => html`
   </svg>
 `;
 
-export const DoctorTab = ({ isActive = false }) => {
+export const DoctorTab = ({ isActive = false, onOpenFile = () => {} }) => {
   const statusPoll = usePolling(fetchDoctorStatus, kIdlePollMs, {
     enabled: isActive,
   });
@@ -327,10 +327,8 @@ export const DoctorTab = ({ isActive = false }) => {
                           })}
                         </span>
                       </span>
-                      <span
-                        class=${`text-xs ${changeLabel.meaningful ? "text-yellow-300" : "text-gray-500"}`}
-                      >
-                        ${changeLabel.text}
+                      <span class="text-xs text-gray-500">
+                        ${changeLabel}
                       </span>
                     </div>
                   `
@@ -481,6 +479,8 @@ export const DoctorTab = ({ isActive = false }) => {
                   busyCardId=${busyCardId}
                   onAskAgentFix=${setFixCard}
                   onUpdateStatus=${handleUpdateStatus}
+                  onOpenFile=${onOpenFile}
+                  changedPaths=${doctorStatus?.changeSummary?.changedPaths || []}
                   showRunMeta=${selectedRunFilter === "all"}
                   hideEmptyState=${selectedRunIsInProgress}
                 />

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/editor-surface.js

@@ -63,6 +63,7 @@ export const EditorSurface = ({
           <div
             class="file-viewer-editor-line-num"
             key=${lineNumber}
+            data-line-row
             ref=${(element) => {
               editorLineNumberRowRefs.current[lineNumber - 1] = element;
             }}

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

@@ -20,6 +20,8 @@ export const FileViewer = ({
   filePath = "",
   isPreviewOnly = false,
   browseView = "edit",
+  lineTarget = 0,
+  lineEndTarget = 0,
   onRequestEdit = () => {},
   onRequestClearSelection = () => {},
 }) => {
@@ -28,6 +30,8 @@ export const FileViewer = ({
     filePath,
     isPreviewOnly,
     browseView,
+    lineTarget,
+    lineEndTarget,
     onRequestClearSelection,
     onRequestEdit,
   });

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/file-viewer/use-editor-selection-restore.js

@@ -1,8 +1,58 @@
-import { useEffect } from "https://esm.sh/preact/hooks";
+import { useEffect, useRef } from "https://esm.sh/preact/hooks";
 import { readStoredEditorSelection } from "./storage.js";
 import { clampSelectionIndex } from "./utils.js";
 import { getScrollRatio } from "./scroll-sync.js";
 
+const getCharOffsetForLine = (text, lineNumber) => {
+  const lines = String(text || "").split("\n");
+  const targetIndex = Math.max(0, Math.min(lineNumber - 1, lines.length - 1));
+  let offset = 0;
+  for (let i = 0; i < targetIndex; i += 1) offset += lines[i].length + 1;
+  return offset;
+};
+
+const scrollEditorToLine = ({
+  lineIndex,
+  textareaElement,
+  editorLineNumbersRef,
+  editorHighlightRef,
+  viewScrollRatioRef,
+}) => {
+  const computedStyle = window.getComputedStyle(textareaElement);
+  const parsedLineHeight = Number.parseFloat(computedStyle.lineHeight || "");
+  const lineHeight =
+    Number.isFinite(parsedLineHeight) && parsedLineHeight > 0 ? parsedLineHeight : 20;
+  const nextScrollTop = Math.max(
+    0,
+    lineIndex * lineHeight - textareaElement.clientHeight * 0.4,
+  );
+  textareaElement.scrollTop = nextScrollTop;
+  if (editorLineNumbersRef.current) {
+    editorLineNumbersRef.current.scrollTop = nextScrollTop;
+  }
+  if (editorHighlightRef.current) {
+    editorHighlightRef.current.scrollTop = nextScrollTop;
+  }
+  viewScrollRatioRef.current = getScrollRatio(textareaElement);
+};
+
+const clearLineHighlights = (lineNumbersContainer) => {
+  if (!lineNumbersContainer) return;
+  const highlighted = lineNumbersContainer.querySelectorAll(".line-highlight-flash");
+  for (const row of highlighted) row.classList.remove("line-highlight-flash");
+};
+
+const highlightLineRange = (lineNumbersContainer, startIndex, endIndex) => {
+  if (!lineNumbersContainer) return;
+  clearLineHighlights(lineNumbersContainer);
+  const rows = lineNumbersContainer.querySelectorAll("[data-line-row]");
+  const safeEnd = Math.min(endIndex, rows.length - 1);
+  for (let i = startIndex; i <= safeEnd; i += 1) {
+    const row = rows[i];
+    if (row) row.classList.add("line-highlight-flash");
+  }
+};
+
 export const useEditorSelectionRestore = ({
   canEditFile,
   isEditBlocked,
@@ -13,11 +63,81 @@ export const useEditorSelectionRestore = ({
   restoredSelectionPathRef,
   viewMode,
   content,
+  lineTarget = 0,
+  lineEndTarget = 0,
   editorTextareaRef,
   editorLineNumbersRef,
   editorHighlightRef,
   viewScrollRatioRef,
 }) => {
+  const appliedLineTargetRef = useRef("");
+
+  useEffect(() => {
+    if (lineTarget && lineTarget >= 1) return;
+    if (!appliedLineTargetRef.current) return;
+    clearLineHighlights(editorLineNumbersRef.current);
+    appliedLineTargetRef.current = "";
+  }, [lineTarget, normalizedPath, editorLineNumbersRef]);
+
+  useEffect(() => {
+    if (isEditBlocked || !canEditFile || loading || !hasSelectedPath) return () => {};
+    if (loadedFilePathRef.current !== normalizedPath) return () => {};
+    if (viewMode !== "edit") return () => {};
+    if (!lineTarget || lineTarget < 1) return () => {};
+    const effectiveEnd = lineEndTarget && lineEndTarget >= lineTarget ? lineEndTarget : lineTarget;
+    const lineKey = `${normalizedPath}:${lineTarget}-${effectiveEnd}`;
+    if (appliedLineTargetRef.current === lineKey) return () => {};
+    let frameId = 0;
+    let attempts = 0;
+    const applyLineTarget = () => {
+      const textareaElement = editorTextareaRef.current;
+      if (!textareaElement) {
+        attempts += 1;
+        if (attempts < 6) frameId = window.requestAnimationFrame(applyLineTarget);
+        return;
+      }
+      const safeContent = String(content || "");
+      const charOffset = getCharOffsetForLine(safeContent, lineTarget);
+      textareaElement.setSelectionRange(charOffset, charOffset);
+      const startIndex = lineTarget - 1;
+      const endIndex = effectiveEnd - 1;
+      window.requestAnimationFrame(() => {
+        const nextTextareaElement = editorTextareaRef.current;
+        if (!nextTextareaElement) return;
+        scrollEditorToLine({
+          lineIndex: startIndex,
+          textareaElement: nextTextareaElement,
+          editorLineNumbersRef,
+          editorHighlightRef,
+          viewScrollRatioRef,
+        });
+        highlightLineRange(editorLineNumbersRef.current, startIndex, endIndex);
+      });
+      appliedLineTargetRef.current = lineKey;
+      restoredSelectionPathRef.current = normalizedPath;
+    };
+    frameId = window.requestAnimationFrame(applyLineTarget);
+    return () => {
+      if (frameId) window.cancelAnimationFrame(frameId);
+    };
+  }, [
+    canEditFile,
+    isEditBlocked,
+    loading,
+    hasSelectedPath,
+    normalizedPath,
+    content,
+    viewMode,
+    lineTarget,
+    lineEndTarget,
+    loadedFilePathRef,
+    restoredSelectionPathRef,
+    editorTextareaRef,
+    editorLineNumbersRef,
+    editorHighlightRef,
+    viewScrollRatioRef,
+  ]);
+
   useEffect(() => {
     if (isEditBlocked) {
       restoredSelectionPathRef.current = "";
@@ -27,6 +147,7 @@ export const useEditorSelectionRestore = ({
     if (loadedFilePathRef.current !== normalizedPath) return () => {};
     if (restoredSelectionPathRef.current === normalizedPath) return () => {};
     if (viewMode !== "edit") return () => {};
+    if (lineTarget && lineTarget >= 1) return () => {};
     const storedSelection = readStoredEditorSelection(normalizedPath);
     if (!storedSelection) {
       restoredSelectionPathRef.current = normalizedPath;
@@ -52,22 +173,13 @@ export const useEditorSelectionRestore = ({
         const safeContent = String(content || "");
         const safeStart = clampSelectionIndex(start, safeContent.length);
         const lineIndex = safeContent.slice(0, safeStart).split("\n").length - 1;
-        const computedStyle = window.getComputedStyle(nextTextareaElement);
-        const parsedLineHeight = Number.parseFloat(computedStyle.lineHeight || "");
-        const lineHeight =
-          Number.isFinite(parsedLineHeight) && parsedLineHeight > 0 ? parsedLineHeight : 20;
-        const nextScrollTop = Math.max(
-          0,
-          lineIndex * lineHeight - nextTextareaElement.clientHeight * 0.4,
-        );
-        nextTextareaElement.scrollTop = nextScrollTop;
-        if (editorLineNumbersRef.current) {
-          editorLineNumbersRef.current.scrollTop = nextScrollTop;
-        }
-        if (editorHighlightRef.current) {
-          editorHighlightRef.current.scrollTop = nextScrollTop;
-        }
-        viewScrollRatioRef.current = getScrollRatio(nextTextareaElement);
+        scrollEditorToLine({
+          lineIndex,
+          textareaElement: nextTextareaElement,
+          editorLineNumbersRef,
+          editorHighlightRef,
+          viewScrollRatioRef,
+        });
       });
       restoredSelectionPathRef.current = normalizedPath;
     };
@@ -83,6 +195,7 @@ export const useEditorSelectionRestore = ({
     normalizedPath,
     content,
     viewMode,
+    lineTarget,
     loadedFilePathRef,
     restoredSelectionPathRef,
     editorTextareaRef,

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

@@ -32,6 +32,8 @@ export const useFileViewer = ({
   filePath = "",
   isPreviewOnly = false,
   browseView = "edit",
+  lineTarget = 0,
+  lineEndTarget = 0,
   onRequestClearSelection = () => {},
   onRequestEdit = () => {},
 }) => {
@@ -242,6 +244,8 @@ export const useFileViewer = ({
     restoredSelectionPathRef,
     viewMode,
     content,
+    lineTarget,
+    lineEndTarget,
     editorTextareaRef,
     editorLineNumbersRef,
     editorHighlightRef,

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/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 {};